From a4dbbffe20618566a2e3d994e25629ce5ef1b03e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 26 Jan 2023 12:35:05 +0200 Subject: [PATCH 1/4] Portals: Add piwik as a column. Add pid in search --- dashboard/portal/portals.component.html | 8 ++++++-- dashboard/portal/portals.component.ts | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dashboard/portal/portals.component.html b/dashboard/portal/portals.component.html index 9f57de8c..6910431c 100644 --- a/dashboard/portal/portals.component.html +++ b/dashboard/portal/portals.component.html @@ -55,11 +55,11 @@ Bulk Actions ({{getSelectedPortals().length}})
-
@@ -67,6 +67,7 @@ Name Type + Piwik Actions @@ -81,6 +82,9 @@
{{check.portal.type}}
+ +
{{check.portal.piwik}}
+
diff --git a/dashboard/portal/portals.component.ts b/dashboard/portal/portals.component.ts index be2ed599..d9dec3ec 100644 --- a/dashboard/portal/portals.component.ts +++ b/dashboard/portal/portals.component.ts @@ -229,11 +229,11 @@ export class PortalsComponent implements OnInit { public filterByType(portal: Portal): boolean { let type = this.filterForm.get("type").value; - return type == "all" || (type == portal.type); + return type == "all" || (type === portal.type); } public filterPortals(portal: Portal): boolean { - return this.searchText.toString() === '' || (portal.name || portal.type).match(this.searchText) != null; + return this.searchText.toString() === '' || (portal.name + portal.type + portal.pid).match(this.searchText) != null; } handleUpdateError(message: string, error = null) { From 1e35eb5d6f544621b8f5d6a3446d59f5647e95a8 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 9 Feb 2023 16:30:24 +0200 Subject: [PATCH 2/4] 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()); } } From 8d3a83821bf79943d4582d665e717ec7f4b47835 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 21 Mar 2023 14:00:47 +0200 Subject: [PATCH 3/4] Modal: Add uikit close event, in order to catch click outside close events. --- utils/modal/alert.ts | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index be4bb605..8f7fada7 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -1,4 +1,14 @@ -import {Component, ElementRef, EventEmitter, Input, Output, ViewChild, ViewEncapsulation} from '@angular/core'; +import { + AfterViewInit, + Component, + ElementRef, + EventEmitter, + Input, OnDestroy, + OnInit, + Output, + ViewChild, + ViewEncapsulation +} from '@angular/core'; declare var UIkit: any; @@ -48,7 +58,7 @@ declare var UIkit: any; /** * API to an open alert window. */ -export class AlertModal { +export class AlertModal implements OnInit, AfterViewInit, OnDestroy { private static MODAL_COUNTER: number = 0; id: string = "modal"; @@ -136,6 +146,7 @@ export class AlertModal { @Output() public cancelOutput: EventEmitter = new EventEmitter(); @ViewChild('element') element: ElementRef; + private subscriptions: any[] = []; constructor() { } @@ -145,6 +156,14 @@ export class AlertModal { this.id = 'modal-' + AlertModal.MODAL_COUNTER; } + ngAfterViewInit() { + if(this.element) { + this.subscriptions.push(UIkit.util.on(document, 'hide', '#' + this.id, () => { + this.cancelOutput.emit(true); + })); + } + } + ngOnDestroy() { if(typeof document !== "undefined") { const element = document.getElementById("modal-container"); @@ -155,6 +174,11 @@ export class AlertModal { } } } + this.subscriptions.forEach(subscription => { + if(subscription instanceof Function) { + subscription(); + } + }); } /** @@ -186,6 +210,5 @@ export class AlertModal { */ cancel() { UIkit.modal(this.element.nativeElement).hide(); - this.cancelOutput.emit(true); } } From ed19051fc063d97a34b7ee4601bc5fd68aac3baa Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 21 Mar 2023 14:02:59 +0200 Subject: [PATCH 4/4] 1. Fix a bug with get stakeholder promise. 2. Fix a bug with infinity loop in user-info page. 3. Fix a bug with verify member error modal open on success. --- .../users/role-users/role-users.component.ts | 4 +- login/user.component.ts | 4 +- monitor/services/stakeholder.service.ts | 5 +- .../role-verification.component.ts | 76 +++++++++++-------- 4 files changed, 53 insertions(+), 36 deletions(-) diff --git a/dashboard/users/role-users/role-users.component.ts b/dashboard/users/role-users/role-users.component.ts index 2acc7edc..222f8530 100644 --- a/dashboard/users/role-users/role-users.component.ts +++ b/dashboard/users/role-users/role-users.component.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild} from '@angular/core'; +import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild} from '@angular/core'; import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms'; import {AlertModal} from "../../../utils/modal/alert"; import {UserRegistryService} from "../../../services/user-registry.service"; @@ -278,7 +278,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { } public isMe(userId: string) { - return userId.includes(this.user.id) && !this.isCurator; + return userId && userId.includes(this.user.id) && !this.isCurator; } public get isManager(): boolean { diff --git a/login/user.component.ts b/login/user.component.ts index 1fcdc867..15922fe7 100644 --- a/login/user.component.ts +++ b/login/user.component.ts @@ -43,8 +43,8 @@ export class UserComponent { this.loginUrl = this.properties.loginUrl; if (typeof document !== 'undefined') { this.server = false; - this.userManagementsService.updateUserInfo(() => { - this.user = this.userManagementsService.user; + this.userManagementsService.getUserInfo().subscribe( user => { + this.user = user; this.loggedIn = !!this.user; this.errorMessage = ""; this.loading = true; diff --git a/monitor/services/stakeholder.service.ts b/monitor/services/stakeholder.service.ts index 272cbb39..c71f7f8e 100644 --- a/monitor/services/stakeholder.service.ts +++ b/monitor/services/stakeholder.service.ts @@ -58,7 +58,10 @@ export class StakeholderService { } async getStakeholderAsync() { - await this.promise; + if(this.promise) { + await this.promise; + this.promise = null; + } this.clearSubscriptions(); return this.stakeholderSubject.getValue(); } diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index 253fa91c..9030d636 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -1,4 +1,4 @@ -import {AfterViewInit, Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core"; +import {AfterViewInit, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core"; import {User} from "../login/utils/helper.class"; import {ActivatedRoute, Router} from "@angular/router"; import {UserManagementService} from "../services/user-management.service"; @@ -35,7 +35,7 @@ import {ClearCacheService} from "../services/clear-cache.service";
+ (alertOutput)="verifyMember()" [okDisabled]="(code.invalid || loading) && !isMember">
You have been invited to join {{name}} Monitor Dashboard as a member. @@ -108,7 +108,8 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn private emailService: EmailService, private userManagementService: UserManagementService, private userRegistryService: UserRegistryService, - private clearCacheService: ClearCacheService) { + private clearCacheService: ClearCacheService, + private cdr: ChangeDetectorRef) { } ngOnInit() { @@ -122,33 +123,42 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn this.paramsSubscription.unsubscribe(); } this.paramsSubscription = this.route.queryParams.subscribe(params => { - if (params && params['verify']) { - if (this.user) { - this.subscriptions.push(this.userRegistryService.getInvitation(params['verify']).subscribe(verification => { - this.verification = verification; - if (this.user.email === this.verification.email.toLowerCase() && this.id === this.verification.entity && this.type === this.verification.type) { - if (this.verification.verificationType === 'manager') { - this.openManagerModal(); - } else if (this.verification.verificationType === 'member' && this.service === "monitor") { - this.openMemberModal(); + if (params) { + this.isMember = !!params['isMember']; + this.cdr.detectChanges(); + if(params['verify'] && !this.isMember) { + if (this.user) { + this.subscriptions.push(this.userRegistryService.getInvitation(params['verify']).subscribe(verification => { + this.verification = verification; + if (this.user.email === this.verification.email.toLowerCase() && this.id === this.verification.entity && this.type === this.verification.type) { + if (this.verification.verificationType === 'manager') { + this.openManagerModal(); + } else if (this.verification.verificationType === 'member' && this.service === "monitor") { + this.openMemberModal(); + } else { + this.openErrorModal(); + } } else { this.openErrorModal(); } - } else { + }, error => { this.openErrorModal(); - } - }, error => { - this.openErrorModal(); - })); - } else { - this.router.navigate(['user-info'], { - queryParams: { - 'errorCode': LoginErrorCodes.NOT_LOGIN, - 'redirectUrl': this.router.url - }, - relativeTo: this.route - }); + })); + } else { + this.router.navigate(['user-info'], { + queryParams: { + 'errorCode': LoginErrorCodes.NOT_LOGIN, + 'redirectUrl': this.router.url + }, + relativeTo: this.route + }); + } + } else if(this.isMember) { + this.openMemberModal(); } + } else { + this.isMember = false; + this.cdr.detectChanges(); } }); })); @@ -177,12 +187,18 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn public openMemberModal() { this.error = null; - this.isMember = false; + if(this.isMember) { + this.memberModal.cancelButton = false; + this.memberModal.okButtonText = 'Close'; + } else { + this.memberModal.cancelButton = true; + this.memberModal.okButtonText = 'Accept'; + } this.memberModal.okButtonLeft = false; - this.memberModal.okButtonText = 'Accept'; this.memberModal.stayOpen = true; this.memberModal.cancelButtonText = 'Cancel'; this.memberModal.alertTitle = 'Member Invitation'; + this.cdr.detectChanges(); this.memberModal.open(); } @@ -239,9 +255,7 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn this.loading = false; this.error = null; this.userManagementService.updateUserInfo(() => { - this.memberModal.cancelButton = false; - this.memberModal.okButtonText = 'Close'; - this.isMember = true; + this.router.navigate([], {queryParams: {'verify': null, 'isMember': true}}); }); }, error => { this.loading = false; @@ -257,6 +271,6 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn } cancel() { - this.router.navigate([this.router.url.split('?')[0]]); + this.router.navigate([], {queryParams: {'verify': null, 'isMember': null}}); } }