diff --git a/dashboard/plugins/components/stats/monitor.component.ts b/dashboard/plugins/components/stats/monitor.component.ts index 00603d86..3285bb8c 100644 --- a/dashboard/plugins/components/stats/monitor.component.ts +++ b/dashboard/plugins/components/stats/monitor.component.ts @@ -22,6 +22,7 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent { stakeholder = null; @Input() pluginObject: PluginStats; profiles; + public chartsActiveType: Map = new Map(); constructor(protected _route: ActivatedRoute, protected _router: Router, protected _meta: Meta, diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index ca2b7655..931ad733 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -152,11 +152,8 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit, relativeTo: this.relativeTo }); } - } else if(this.isMember) { - this.openMemberModal(); } } else { - this.isMember = false; this.cdr.detectChanges(); } }); @@ -211,17 +208,17 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit, this.userManagementService.login(properties.domain + '/admin/' + this.verification.entity); } else { this.subscriptions.push(this.emailService.notifyManagers(this.id, 'manager', - Composer.composeEmailToInformOldManagersForTheNewOnes(this.name, this.id)).subscribe(() => { + Composer.composeEmailToInformOldManagersForTheNewOnes(this.name, this.id)).subscribe(() => { this.subscriptions.push(this.emailService.notifyNewManager(Composer.composeEmailForNewManager(this.id, this.name)).subscribe( - () => { - this.loading = false; - window.location.href = properties.adminPortalURL + '/' + this.verification.entity; - }, - error1 => { - console.error(error1); - this.loading = false; - window.location.href = properties.adminPortalURL + '/' + this.verification.entity; - } + () => { + this.loading = false; + window.location.href = properties.adminPortalURL + '/' + this.verification.entity; + }, + error1 => { + console.error(error1); + this.loading = false; + window.location.href = properties.adminPortalURL + '/' + this.verification.entity; + } )); }, error => { console.error(error); @@ -237,16 +234,16 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit, public verifyMember() { this.loading = true; - this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value, "member").subscribe(() => { - // this.clearCacheService.clearCache('Members updated'); - this.memberModal.cancel(); - this.loading = false; - this.error = null; - window.location.href = window.location.href.split('?')[0]; - }, error => { - this.loading = false; - this.error = 'The verification code is invalid'; - })); + this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value, "member").subscribe(() => { + // this.clearCacheService.clearCache('Members updated'); + this.memberModal.cancel(); + this.loading = false; + this.error = null; + window.location.href = window.location.href.split('?')[0]; + }, error => { + this.loading = false; + this.error = 'The verification code is invalid'; + })); } public reset() {