Production release May 2024 [EXPLORE] #40

Merged
konstantina.galouni merged 81 commits from develop into master 2024-05-23 18:26:50 +02:00
1 changed files with 9 additions and 2 deletions
Showing only changes of commit c69d1cd94d - Show all commits

View File

@ -38,7 +38,7 @@ import {StringUtils} from "../utils/string-utils.class";
(alertOutput)="verifyMember()" [okDisabled]="(code.invalid || loading)">
<div>
<div>
You have been invited to join <span class="uk-text-bold">{{name}}</span> {{(dashboard)}} as a {{stakeholderUtils.roles.member}}.
You have been invited to join <span class="uk-text-bold">{{name}}</span> {{(dashboard)}} Dashboard as a {{stakeholderUtils.roles.member}}.
<span class="uk-text-primary">Fill</span> in the <span class="uk-text-primary">verification code</span>, sent
to your email, to accept the invitation request.
</div>
@ -115,6 +115,11 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
}
ngAfterViewInit() {
this.init();
}
init() {
this.ngOnDestroy();
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user;
this.paramsSubscription = this._route.queryParams.subscribe(params => {
@ -239,6 +244,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
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;
this.userManagementService.updateUserInfo(() => {
@ -258,6 +264,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
}
cancel() {
this._router.navigate([]);
this._router.navigate([], {relativeTo: this.relativeTo});
this.init();
}
}