Browse Source

resolved comments

pull/12446/head
mpetrov 2 years ago
parent
commit
f8dd68226c
  1. 2
      ui-ngx/src/app/core/http/domain.service.ts
  2. 3
      ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts

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

@ -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';
if (oauth2ClientIds?.length) {
url += `?oauth2ClientIds=${oauth2ClientIds.join(',')}`;

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

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

Loading…
Cancel
Save