From 2492f737b87a5c78a5e09a54f94a30eec2209c2e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 9 Dec 2022 18:01:18 +0200 Subject: [PATCH] 1. Change message in role verification if an error is occurred. 2. Add isCurator in create a category. 3. Hide delete section if it not permitted and make manage roles visible to curators and superAdmins --- login/user.component.html | 32 +++---------------- login/user.component.ts | 6 +++- login/userMiniModule.module.ts | 5 +++ .../role-verification.component.ts | 10 ++++-- role-verification/role-verification.module.ts | 3 +- utils/icons/icons.ts | 5 +++ 6 files changed, 29 insertions(+), 32 deletions(-) diff --git a/login/user.component.html b/login/user.component.html index 732c4faf..a69412e4 100644 --- a/login/user.component.html +++ b/login/user.component.html @@ -5,9 +5,7 @@
-
-
User Information
@@ -19,13 +17,13 @@
Roles {{getTheRolesFormatted(user.role)}}
-
- + Manage your roles {{" "}} - Manage role requests{{" "}} - Manage users
@@ -33,25 +31,6 @@
-
The requested page requires authentication. Please sign in to continue. @@ -68,10 +47,7 @@
There is no research community selected.
-
{{errorMessage}}
- -
diff --git a/login/user.component.ts b/login/user.component.ts index 1f6ee1d8..1fcdc867 100644 --- a/login/user.component.ts +++ b/login/user.component.ts @@ -99,8 +99,12 @@ export class UserComponent { } return formattedRoles.join(", "); } + + get isCurator() { + return Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user); + } - isUserManager() { + get isUserManager() { return Session.isUserManager(this.user); } diff --git a/login/userMiniModule.module.ts b/login/userMiniModule.module.ts index f8af2807..b48df909 100644 --- a/login/userMiniModule.module.ts +++ b/login/userMiniModule.module.ts @@ -5,6 +5,8 @@ import { RouterModule } from "@angular/router"; import {UserMiniComponent} from "./userMini.component"; import {IconsModule} from "../utils/icons/icons.module"; +import {IconsService} from "../utils/icons/icons.service"; +import {login} from "../utils/icons/icons"; @NgModule({ imports: [ @@ -19,4 +21,7 @@ import {IconsModule} from "../utils/icons/icons.module"; ] }) export class UserMiniModule { + constructor(private iconsService: IconsService) { + this.iconsService.registerIcons([login]) + } } diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index bb7f61fa..1eb7e836 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -62,13 +62,17 @@ import {Composer} from "../utils/email/composer";
- We are unable to process the request because the link is invalid, or it has expired. + We are unable to process the request. What happened? +
    +
  1. You are logged in with a different email, than the one you have received the invitation.
    2. +
  2. The invitation has been canceled.
    3. +
  3. The URL is invalid.
    4. +
` }) export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewInit { - @Input() public id: string; @Input() @@ -77,6 +81,8 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn public name: string; @Input() public service: "connect" | "monitor" = "monitor"; + @Input() + public userInfoLinkPrefix = ''; public user: User; public verification: any; public code: UntypedFormControl; diff --git a/role-verification/role-verification.module.ts b/role-verification/role-verification.module.ts index ffc66714..0a39dfdb 100644 --- a/role-verification/role-verification.module.ts +++ b/role-verification/role-verification.module.ts @@ -6,9 +6,10 @@ import {ReactiveFormsModule} from "@angular/forms"; import {LoadingModule} from "../utils/loading/loading.module"; import {InputModule} from "../sharedComponents/input/input.module"; import {EmailService} from "../utils/email/email.service"; +import {RouterModule} from "@angular/router"; @NgModule({ - imports: [CommonModule, AlertModalModule, ReactiveFormsModule, LoadingModule, InputModule], + imports: [CommonModule, AlertModalModule, ReactiveFormsModule, LoadingModule, InputModule, RouterModule], declarations: [RoleVerificationComponent], exports: [RoleVerificationComponent], providers: [EmailService] diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts index ebd3ff0f..fb4fab03 100644 --- a/utils/icons/icons.ts +++ b/utils/icons/icons.ts @@ -107,4 +107,9 @@ export const newsletter = { name: 'newsletter', data: '' } + +export const login = { + name: 'login', + data: '' +} /** Add new icon under this line to be sure that it will be added on preview */