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

refactoring

Browse Source
This commit is contained in:
mpetrov 2025-01-16 16:26:53 +02:00
parent f8dd68226c
commit 7edba5edb6
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,17 +85,15 @@ 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; const shouldUpdateClients = domain.id && !isEqual(domain.oauth2ClientInfos?.sort(),
originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort());
delete domain.oauth2ClientInfos; delete domain.oauth2ClientInfos;
return this.domainService.saveDomain(domain, domain.id ? [] : clientsIds).pipe( return this.domainService.saveDomain(domain, domain.id ? null : clientsIds).pipe(
switchMap(savedDomain => { switchMap(savedDomain => shouldUpdateClients
const shouldUpdateClients = domain.id && !isEqual(newDomainClients?.sort(), ? this.domainService.updateOauth2Clients(domain.id.id, clientsIds).pipe(map(() => savedDomain))
originalDomain.oauth2ClientInfos?.map(info => info.id ? info.id.id : info).sort()); : of(savedDomain)
return shouldUpdateClients ),
? this.domainService.updateOauth2Clients(domain.id.id, clientsIds).pipe(map(() => savedDomain))
: of(savedDomain);
}),
map(savedDomain => { map(savedDomain => {
(savedDomain as DomainInfo).oauth2ClientInfos = clientsIds; (savedDomain as DomainInfo).oauth2ClientInfos = clientsIds;
return savedDomain; return savedDomain;
@ -119,7 +117,7 @@ export class DomainTableConfigResolver {
oauth2Enabled: !domain.oauth2Enabled oauth2Enabled: !domain.oauth2Enabled
}; };
this.domainService.saveDomain(modifiedDomain, domain.oauth2ClientInfos.map(clientInfo => clientInfo.id.id), this.domainService.saveDomain(modifiedDomain, null,
{ignoreLoading: true}) {ignoreLoading: true})
.subscribe((result) => { .subscribe((result) => {
domain.oauth2Enabled = result.oauth2Enabled; domain.oauth2Enabled = result.oauth2Enabled;
@ -137,7 +135,7 @@ export class DomainTableConfigResolver {
propagateToEdge: !domain.propagateToEdge propagateToEdge: !domain.propagateToEdge
}; };
this.domainService.saveDomain(modifiedDomain, domain.oauth2ClientInfos.map(clientInfo => clientInfo.id.id), this.domainService.saveDomain(modifiedDomain, null,
{ignoreLoading: true}) {ignoreLoading: true})
.subscribe((result) => { .subscribe((result) => {
domain.propagateToEdge = result.propagateToEdge; domain.propagateToEdge = result.propagateToEdge;