dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved comments

Browse Source
This commit is contained in:
mpetrov 2025-01-16 12:01:07 +02:00
parent a5fa699c45
commit f8dd68226c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/core/http/domain.service.ts
View File

@ -32,7 +32,7 @@ export class DomainService {
) { ) {
} }
public saveDomain(domain: Domain, oauth2ClientIds: Array<string>, config?: RequestConfig): Observable<Domain> { public saveDomain(domain: Domain, oauth2ClientIds?: Array<string>, config?: RequestConfig): Observable<Domain> {
let url = '/api/domain'; let url = '/api/domain';
if (oauth2ClientIds?.length) { if (oauth2ClientIds?.length) {
url += `?oauth2ClientIds=${oauth2ClientIds.join(',')}`; url += `?oauth2ClientIds=${oauth2ClientIds.join(',')}`;

3
ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts
View File

@ -85,11 +85,12 @@ export class DomainTableConfigResolver {
this.config.loadEntity = id => this.domainService.getDomainInfoById(id.id); this.config.loadEntity = id => this.domainService.getDomainInfoById(id.id);
this.config.saveEntity = (domain, originalDomain) => { this.config.saveEntity = (domain, originalDomain) => {
const clientsIds = domain.oauth2ClientInfos as Array<string> || []; const clientsIds = domain.oauth2ClientInfos as Array<string> || [];
const newDomainClients = domain.oauth2ClientInfos;
delete domain.oauth2ClientInfos; delete domain.oauth2ClientInfos;
return this.domainService.saveDomain(domain, domain.id ? [] : clientsIds).pipe( return this.domainService.saveDomain(domain, domain.id ? [] : clientsIds).pipe(
switchMap(savedDomain => { switchMap(savedDomain => {
const shouldUpdateClients = domain.id && !isEqual(domain.oauth2ClientInfos?.sort(), const shouldUpdateClients = domain.id && !isEqual(newDomainClients?.sort(),
originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort()); originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort());
return shouldUpdateClients return shouldUpdateClients
? this.domainService.updateOauth2Clients(domain.id.id, clientsIds).pipe(map(() => savedDomain)) ? this.domainService.updateOauth2Clients(domain.id.id, clientsIds).pipe(map(() => savedDomain))