Merge pull request #222 from nmaas-platform/212-domain-name-not-displ…

…ayed-in-privileges-section-of-user-profile-view 212 domain name not displayed in privileges section of user profile view
nmaas-platform · Apr 9, 2024 · d8bf8a1 · d8bf8a1
2 parents b3cbfeb + d320d4f
commit d8bf8a1
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/app/shared/users/privileges/userprivileges.component.ts b/src/app/shared/users/privileges/userprivileges.component.ts
@@ -97,30 +97,33 @@ export class UserPrivilegesComponent extends BaseComponent implements OnInit {
         if (this.authService.hasRole(Role[Role.ROLE_SYSTEM_ADMIN])) {
             this.domainService.getAll().subscribe((domains) => {
                 this.domains = domains
-                this.saveDomainsInCache(domains);
+                this.saveMultipleDomainsInCache(domains);
             });
         } else if (this.authService.hasRole(Role[Role.ROLE_DOMAIN_ADMIN])) {
             const domainIds: number[] = this.authService.getDomainsWithRole(Role[Role.ROLE_DOMAIN_ADMIN]);
             domainIds.forEach((domainId) => {
-                this.domainService.getOne(domainId).subscribe((domain) => this.domains.push(domain));
+                this.domainService.getOne(domainId).subscribe((domain) => {
+                    this.domains.push(domain)
+                    this.saveDomainInCache(domain)
+                });
             });
         } else {
             this.getMyDomains();
         }
     }
 
-    private saveDomainsInCache(domains: Domain[]) {
-        domains.forEach(domain => {
-            if (!this.domainCache.hasData(domain.id)) {
-                this.domainCache.setData(domain.id, domain)
-            }
-        })
+    private saveMultipleDomainsInCache(domains: Domain[]) {
+        domains.forEach(domain => this.saveDomainInCache(domain))
+    }
+
+    private saveDomainInCache(domain: Domain) {
+        if (!this.domainCache.hasData(domain.id)) {
+            this.domainCache.setData(domain.id, domain)
+        }
     }
 
     public getMyDomains() {
-        this.domainService.getMyDomains().subscribe(domains => {
-            this.saveDomainsInCache(domains)
-        })
+        this.domainService.getMyDomains().subscribe(domains => this.saveMultipleDomainsInCache(domains))
     }
 
     public add(): void {