From 959479757aa71e45b3394366cbfb4607c6853daa Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 7 Apr 2021 10:25:03 +0300
Subject: [PATCH] Add The new user role to the user role listing and editor

---
 .../services/utilities/enum-utils.service.ts   |  3 ++-
 .../user-role-editor.component.html            |  2 +-
 .../user-role-editor.component.scss            | 18 ++++++++++++++++++
 dmp-frontend/src/assets/i18n/de.json           |  5 +++--
 dmp-frontend/src/assets/i18n/en.json           |  5 +++--
 dmp-frontend/src/assets/i18n/es.json           |  5 +++--
 dmp-frontend/src/assets/i18n/gr.json           |  5 +++--
 dmp-frontend/src/assets/i18n/pt.json           |  5 +++--
 dmp-frontend/src/assets/i18n/sk.json           |  5 +++--
 dmp-frontend/src/assets/i18n/sr.json           |  5 +++--
 dmp-frontend/src/assets/i18n/tr.json           |  5 +++--
 11 files changed, 45 insertions(+), 18 deletions(-)

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 7edcb5100..a7dada1f9 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
@@ -30,6 +30,7 @@ export class EnumUtils {
 			case AppRole.Admin: return this.language.instant('TYPES.APP-ROLE.ADMIN');
 			case AppRole.User: return this.language.instant('TYPES.APP-ROLE.USER');
 			case AppRole.Manager: return this.language.instant('TYPES.APP-ROLE.MANAGER');
+			case AppRole.DatasetTemplateEditor: return this.language.instant('TYPES.APP-ROLE.DATASET-TEMPLATE-EDITOR');
 		}
 	}
 
@@ -113,7 +114,7 @@ export class EnumUtils {
 			case ViewStyleType.Validation: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.VALIDATION');
 			case ViewStyleType.Other: return this.language.instant('TYPES.DATASET-PROFILE-FIELD-VIEW-STYLE.OTHER');
 		}
-		
+
 	}
 
 	toDatasetProfileComboBoxTypeString(status: DatasetProfileComboBoxType): string {
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 2a5f4693a..6bcd97c29 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,6 +1,6 @@
 <form class="d-flex user-role-editor" [formGroup]="formGroup" (ngSubmit)="formSubmit()">
 	<div *ngIf="!this.nowEditing"class="roles">
-		<div *ngFor="let role of this.formGroup.get('appRoles').value" [ngClass]="{'user': role == 0, 'manager': role == 1, 'admin': role == 2}">
+		<div *ngFor="let role of this.formGroup.get('appRoles').value" [ngClass]="{'user': role == 0, 'manager': role == 1, 'admin': role == 2, 'dataset-template-editor': role == 3}">
 			{{getPrincipalAppRoleWithLanguage(role)}}
 		</div>
 	</div>
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 0691742c2..7b8e37455 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
@@ -74,6 +74,24 @@
 		padding-left: 10px;
 		padding-right: 10px;
 	}
+
+	.dataset-template-editor {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		min-width: 77px;
+		height: 28px;
+		color: #d633ff;
+		background: #fad3ff 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;
+	}
 }
 
 :host ::ng-deep .mat-form-field-wrapper {
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index 46b1c0328..0a2fce512 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Administrator",
 			"USER": "Benutzer",
-			"MANAGER": "Manager"
+			"MANAGER": "Manager",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Finalized",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 78c40cc2e..0422884f0 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Admin",
 			"USER": "User",
-			"MANAGER": "Manager"
+			"MANAGER": "Manager",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Finalized",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index 255762740..5629b39b5 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Administrador",
 			"USER": "Usuario",
-			"MANAGER": "Director"
+			"MANAGER": "Director",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Finalizado",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index e0c16bf11..094d857f9 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Διαχειριστής",
 			"USER": "Χρήστης",
-			"MANAGER": "Υπεύθυνος"
+			"MANAGER": "Υπεύθυνος",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Οριστικοποιημένα",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json
index 19e9f9f38..ab5fe2d83 100644
--- a/dmp-frontend/src/assets/i18n/pt.json
+++ b/dmp-frontend/src/assets/i18n/pt.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Administrador",
 			"USER": "Utilizador",
-			"MANAGER": "Gestor"
+			"MANAGER": "Gestor",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Concluído",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index 708d96c52..e7b1bb1f7 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Admin",
 			"USER": "Používateľ",
-			"MANAGER": "Manažér"
+			"MANAGER": "Manažér",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Dokončené",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json
index 20a246eeb..81e284b2b 100644
--- a/dmp-frontend/src/assets/i18n/sr.json
+++ b/dmp-frontend/src/assets/i18n/sr.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Administrator",
 			"USER": "Korisnik",
-			"MANAGER": "Menadžer"
+			"MANAGER": "Menadžer",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Završeno",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index 73f36148f..2316b6a87 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -1197,7 +1197,8 @@
 		"APP-ROLE": {
 			"ADMIN": "Admin",
 			"USER": "Kullanıcı",
-			"MANAGER": "Yönetici"
+			"MANAGER": "Yönetici",
+			"DATASET-TEMPLATE-EDITOR": "Dataset Template Editor"
 		},
 		"DMP-PROFILE-FIELD": {
 			"DATA-TYPE": {
@@ -1705,4 +1706,4 @@
 		"FINALIZED": "Tamamlandı",
 		"DELETED": "Deleted"
 	}
-}
\ No newline at end of file
+}