From c53806f5b33c2fc218b35b2ac8af30e1daa663d2 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 9 Feb 2023 16:30:24 +0200 Subject: [PATCH] 1. Add cache in get managers and members methods. 2. Add delete Authorization level with values curator and manager in role users for managers. Authorization level for mebers are always manager. 3. Clear cache when managers and members list has been updated. --- .../role-users/role-users.component.html | 8 +++--- .../users/role-users/role-users.component.ts | 18 +++++++++++++ .../role-verification.component.ts | 6 ++++- services/user-registry.service.ts | 27 ++++++++++--------- 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dashboard/users/role-users/role-users.component.html b/dashboard/users/role-users/role-users.component.html index 83681f59..f9f2e444 100644 --- a/dashboard/users/role-users/role-users.component.html +++ b/dashboard/users/role-users/role-users.component.html @@ -67,9 +67,11 @@
{{(showCurrent) ? item.email : item}}
-
- diff --git a/dashboard/users/role-users/role-users.component.ts b/dashboard/users/role-users/role-users.component.ts index 59ad68df..2acc7edc 100644 --- a/dashboard/users/role-users/role-users.component.ts +++ b/dashboard/users/role-users/role-users.component.ts @@ -11,6 +11,7 @@ import {StringUtils} from "../../../utils/string-utils.class"; import {NotificationService} from "../../../notifications/notification.service"; import {Subscription} from "rxjs"; import {NotificationHandler} from "../../../utils/notification-handler"; +import {ClearCacheService} from "../../../services/clear-cache.service"; @Component({ selector: 'role-users', @@ -29,6 +30,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { @Input() public role: "member" | "manager" = "manager"; @Input() + public deleteAuthorizationLevel: 'curator' | 'manager' = 'curator'; + @Input() public message: string = null; @Input() public emailComposer: Function; @@ -63,6 +66,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { constructor(private userRegistryService: UserRegistryService, private userManagementService: UserManagementService, + private clearCacheService: ClearCacheService, private notificationService: NotificationService, private router: Router, private fb: UntypedFormBuilder) { @@ -73,6 +77,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { this.updateLists(); this.userManagementService.getUserInfo().subscribe(user => { this.user = user; + console.log(this.canDelete) }); } @@ -196,6 +201,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { } this.filterActiveBySearch(this.filterForm.value.active); this.userManagementService.updateUserInfo(); + this.clearCacheService.clearCache(this.role + 's of ' + this.id + ' have been updated'); NotificationHandler.rise(this.selectedUser + ' is no longer ' + this.role + ' of ' + this.name + ' Dashboard'); this.loadActive = false; }, error => { @@ -267,6 +273,18 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { }); } + public get canDelete() { + return (this.deleteAuthorizationLevel === 'curator'?this.isCurator:this.isManager); + } + + public isMe(userId: string) { + return userId.includes(this.user.id) && !this.isCurator; + } + + public get isManager(): boolean { + return this.isCurator || !!Session.isManager(this.type, this.id, this.user); + } + public get isCurator(): boolean { return this.isPortalAdmin || !!Session.isCurator(this.type, this.user); } diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index 1f2b3a72..253fa91c 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -10,6 +10,7 @@ import {AlertModal} from "../utils/modal/alert"; import {properties} from "../../../environments/environment"; import {EmailService} from "../utils/email/email.service"; import {Composer} from "../utils/email/composer"; +import {ClearCacheService} from "../services/clear-cache.service"; @Component({ selector: 'role-verification', @@ -106,7 +107,8 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn private fb: UntypedFormBuilder, private emailService: EmailService, private userManagementService: UserManagementService, - private userRegistryService: UserRegistryService) { + private userRegistryService: UserRegistryService, + private clearCacheService: ClearCacheService) { } ngOnInit() { @@ -195,6 +197,7 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn public verifyManager() { this.loading = true; this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value).subscribe(() => { + this.clearCacheService.clearCache('Managers updated'); this.managerModal.cancel(); this.error = null; this.userManagementService.updateUserInfo(() => { @@ -232,6 +235,7 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn this.loading = true; if (!this.isMember) { this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value, "member").subscribe(() => { + this.clearCacheService.clearCache('Members updated'); this.loading = false; this.error = null; this.userManagementService.updateUserInfo(() => { diff --git a/services/user-registry.service.ts b/services/user-registry.service.ts index f3d2dcc8..0e8db8ea 100644 --- a/services/user-registry.service.ts +++ b/services/user-registry.service.ts @@ -14,50 +14,52 @@ export class UserRegistryService { } public createRole(type: string, id: string): Observable { - return this.http.post(properties.registryUrl + 'create/' + encodeURIComponent(type) + '/' + encodeURIComponent(id), null, + return this.http.post(properties.registryUrl + 'create/' + type + '/' + id, null, CustomOptions.registryOptions()).pipe(map((response: any) => response.response)); } public getMembersCount(type: string, id: string): Observable { - return this.http.get(properties.registryUrl + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/members/count'); + let url = properties.registryUrl + type + '/' + id + '/members/count'; + return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url); } public subscribeTo(type: string, id: string): Observable { - return this.http.post(properties.registryUrl + 'subscribe/' + encodeURIComponent(type) + '/' + encodeURIComponent(id), + return this.http.post(properties.registryUrl + 'subscribe/' + type + '/' + id, null, CustomOptions.registryOptions()); } public unsubscribeFrom(type: string, id: string): Observable { - return this.http.post(properties.registryUrl + 'unsubscribe/' + encodeURIComponent(type) + '/' + encodeURIComponent(id), + return this.http.post(properties.registryUrl + 'unsubscribe/' + type + '/' + id, null, CustomOptions.registryOptions()); } public remove(type: string, id: string, email: string, role: "member" | "manager" = "manager"): Observable { return this.http.delete(properties.registryUrl + - encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions()); + type + '/' + id + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions()); } public invite(type: string, id: string, details: any, role: "member" | "manager" = "manager"): Observable { return this.http.post(properties.registryUrl + 'invite/' + - encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + role, details, + type + '/' + id + '/' + role, details, CustomOptions.registryOptions()).pipe(map((response: any) => response.response)); } public verify(id: string, code: string, role: "member" | "manager" = "manager"): Observable { - return this.http.post(properties.registryUrl + 'verification/' + role + '/' + encodeURIComponent(id), code, CustomOptions.registryOptions()); + return this.http.post(properties.registryUrl + 'verification/' + role + '/' + id, code, CustomOptions.registryOptions()); } public getInvitation(id: string): Observable { - return this.http.get(properties.registryUrl + 'verification/' + encodeURIComponent(id), CustomOptions.registryOptions()) + return this.http.get(properties.registryUrl + 'verification/' + id, CustomOptions.registryOptions()) .pipe(map((response: any) => response.response)); } public deleteVerification(id: string): Observable { - return this.http.delete(properties.registryUrl + 'verification/' + encodeURIComponent(id), CustomOptions.registryOptions()); + return this.http.delete(properties.registryUrl + 'verification/' + id, CustomOptions.registryOptions()); } public getActive(type: string, id: string, role: "member" | "manager" = "manager"): Observable { - return this.http.get(properties.registryUrl + encodeURIComponent(type) + '/' + encodeURIComponent(id) + "/" + role + 's', + let url = properties.registryUrl + type + '/' + id + "/" + role + 's'; + return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url, CustomOptions.registryOptions()).pipe(map((response:any) => response.response), map(users => { if(users.length > 0 && !users[0].email) { return []; @@ -68,13 +70,14 @@ export class UserRegistryService { } public getPending(type: string, id: string, role: "member" | "manager" = "manager"): Observable { - return this.http.get(properties.registryUrl + 'invite/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + "/" + role + 's/', + let url = properties.registryUrl + 'invite/' +type + '/' +id + "/" + role + 's/'; + return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url, CustomOptions.registryOptions()).pipe(map((response: any) => response.response)); } public cancelInvitation(type: string, id: string, email: string, role: "member" | "manager" = "manager"): Observable { return this.http.delete(properties.registryUrl + 'invite/' + - encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + role + '/' + encodeURIComponent(email), + type + '/' + id + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions()); } }