From 2905feca07aee75498305a7e9dd998faa2bc1129 Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Mon, 15 Apr 2024 15:48:21 +0300
Subject: [PATCH] ui fixes on users listing > role editor

---
 .../src/app/core/common/enum/app-role.ts      |  3 +-
 .../services/utilities/enum-utils.service.ts  |  1 +
 .../user-role-editor.component.html           | 59 +++++++++++--------
 .../user-role-editor.component.scss           | 18 ++++++
 dmp-frontend/src/assets/i18n/en.json          |  3 +-
 5 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/dmp-frontend/src/app/core/common/enum/app-role.ts b/dmp-frontend/src/app/core/common/enum/app-role.ts
index b5fbdc70f..30579da65 100644
--- a/dmp-frontend/src/app/core/common/enum/app-role.ts
+++ b/dmp-frontend/src/app/core/common/enum/app-role.ts
@@ -2,5 +2,6 @@ export enum AppRole {
 	Admin = "Admin",
 	Manager = "Manager",
 	User = "User",
-	DescriptionTemplateEditor = "DescriptionTemplateEditor"
+	DescriptionTemplateEditor = "DescriptionTemplateEditor",
+	TenantAdmin = "TenantAdmin"
 }
diff --git a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
index 0a4067e14..efbb64600 100644
--- a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
+++ b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
@@ -62,6 +62,7 @@ export class EnumUtils {
 			case AppRole.User: return this.language.instant('TYPES.APP-ROLE.USER');
 			case AppRole.Manager: return this.language.instant('TYPES.APP-ROLE.MANAGER');
 			case AppRole.DescriptionTemplateEditor: return this.language.instant('TYPES.APP-ROLE.DESCRIPTION-TEMPLATE-EDITOR');
+			case AppRole.TenantAdmin: return this.language.instant('TYPES.APP-ROLE.TENANT-ADMIN');
 		}
 	}
 
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html
index cf5271771..98fa906a2 100644
--- a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html
@@ -1,32 +1,39 @@
 <form class="row user-role-editor" *ngIf="formGroup" [formGroup]="formGroup" (ngSubmit)="formSubmit()">
-	<div class="row align-items-center">
-	<div *ngIf="!this.nowEditing"class="roles col">
-		<ng-container *ngFor="let role of this.formGroup.get('roles').value">
-			<div>
-				<span  class="user-role" [ngClass]="{'user': role == appRole.User, 'manager': role == appRole.Manager, 'admin': role == appRole.Admin, 'description-template-editor': role == appRole.DescriptionTemplateEditor}">
-					{{enumUtils.toAppRoleString(role)}}
-				</span>
+	<div class="container-fluid">
+		<div class="row align-items-center">
+			<div *ngIf="!this.nowEditing"class="roles col-8">
+				<div *ngFor="let role of this.formGroup.get('roles').value" class="row">
+					<div class="col-auto p-0">
+						<span class="user-role" [ngClass]="{'user': role == appRole.User, 'manager': role == appRole.Manager, 'admin': role == appRole.Admin, 'description-template-editor': role == appRole.DescriptionTemplateEditor, 'tenant-admin': role == appRole.TenantAdmin}">
+							{{enumUtils.toAppRoleString(role)}}
+						</span>
+					</div>
+				</div>
 			</div>
-		</ng-container>
-	</div>
-	<div class="col-8">
-		<mat-form-field *ngIf="this.nowEditing" class="w-100">
-			<mat-select formControlName="roles" multiple required>
-				<ng-container *ngFor="let role of appRoleEnumValues">
-					<mat-option [value]="role">{{enumUtils.toAppRoleString(role)}}</mat-option>
-				</ng-container>
-			</mat-select>
-			<mat-error *ngIf="formGroup.get('roles').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-		</mat-form-field>
+			<div *ngIf="this.nowEditing" class="pl-0 col-8">
+				<mat-form-field class="w-100">
+					<mat-select formControlName="roles" [panelWidth]="auto" multiple required>
+						<ng-container *ngFor="let role of appRoleEnumValues">
+							<mat-option [value]="role">{{enumUtils.toAppRoleString(role)}}</mat-option>
+						</ng-container>
+					</mat-select>
+					<mat-error *ngIf="formGroup.get('roles').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+				</mat-form-field>
+			</div>
+
+			<div *ngIf="!this.nowEditing" class="col-2 p-0">
+				<button mat-icon-button color="primary" type="button" (click)="editItem()">
+					<mat-icon class="mat-24" matTooltip="{{'USER-LISTING.ACTIONS.EDIT' | translate}}">edit</mat-icon>
+					<span class="row-action"></span>
+				</button>
+			</div>
+			<div *ngIf="this.nowEditing" class="col-2 p-0">
+				<button class="save-button" mat-icon-button color="primary" type="submit">
+					<mat-icon class="mat-24" matTooltip="{{'USER-LISTING.ACTIONS.SAVE' | translate}}">save</mat-icon>
+				</button>
+			</div>
+		</div>
 	</div>
 
-	<button *ngIf="!this.nowEditing" class="col" mat-icon-button color="primary" type="button" (click)="editItem()">
-		<mat-icon class="mat-24" matTooltip="{{'USER-LISTING.ACTIONS.EDIT' | translate}}">edit</mat-icon>
-		<span class="row-action"></span>
-	</button>
-	<button *ngIf="this.nowEditing" class="col-auto save-button" mat-icon-button color="primary" type="submit">
-		<mat-icon class="mat-24" matTooltip="{{'USER-LISTING.ACTIONS.SAVE' | translate}}">save</mat-icon>
-	</button>
-	</div>
 
 </form>
diff --git a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
index e551c69e1..7aa863d71 100644
--- a/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
+++ b/dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss
@@ -85,6 +85,24 @@
 		padding-right: 10px;
 	}
 
+	.tenant-admin {
+		// display: flex;
+		// justify-content: center;
+		// align-items: center;
+		min-width: 77px;
+		min-height: 28px;
+		color: #ffa631;
+		background: #ffe6c6 0% 0% no-repeat padding-box;
+		border-radius: 44px;
+		letter-spacing: 0.11px;
+		font-weight: 400;
+		opacity: 1;
+		margin-top: 0.5em;
+		margin-bottom: 0.5em;
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+
 	.description-template-editor {
 		// display: flex;
 		// justify-content: center;
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 21437a610..a5caceea3 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -1578,7 +1578,8 @@
 			"ADMIN": "Admin",
 			"USER": "User",
 			"MANAGER": "Manager",
-			"DESCRIPTION-TEMPLATE-EDITOR": "Description Template Editor"
+			"DESCRIPTION-TEMPLATE-EDITOR": "Description Template Editor",
+			"TENANT-ADMIN": "Tenant Admin"
 		},
 		"IS-ACTIVE": {
 			"ACTIVE": "Active",