From b7d622e330ccb36fe5bda0e1c6d33e72550bf81e Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 30 Nov 2021 12:21:03 +0200
Subject: [PATCH] #7225: In dataset template, rename "users" to "editors" and
 add hint | #7226: In dataset templates, default descending sorting by
 "created". 1.  dataset-profile-listing.component.html: #7226: In <mat-table>
 added matSortActive="created" matSortDirection="desc". 2.
 dataset-profile-editor.component.html: #7225: Added hint in section 1.4 to
 make prominent when the new editors will receive an informative email. 3.
 assets/i18n/: #7225: In every language file, renamed "users" to "editors"
 (DATASET-TEMPLATE-USERS, DATASET-TEMPLATE-REMOVE-USER,
 DATASET-TEMPLATE-NO-USERS-YET, DATASET-TEMPLATE-VALIDATE-AND-ADD-USER) and
 added DATASET-TEMPLATE-USERS-HINT.

---
 .../dataset-profile-editor.component.html       | 17 +++++++++--------
 .../dataset-profile-listing.component.html      |  2 +-
 dmp-frontend/src/assets/i18n/de.json            |  9 +++++----
 dmp-frontend/src/assets/i18n/en.json            |  9 +++++----
 dmp-frontend/src/assets/i18n/es.json            | 15 ++++++++-------
 dmp-frontend/src/assets/i18n/gr.json            |  9 +++++----
 dmp-frontend/src/assets/i18n/pt.json            |  9 +++++----
 dmp-frontend/src/assets/i18n/sk.json            |  9 +++++----
 dmp-frontend/src/assets/i18n/sr.json            |  9 +++++----
 dmp-frontend/src/assets/i18n/tr.json            |  9 +++++----
 10 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html
index 59acb45c5..3b4d633c5 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html
@@ -21,14 +21,14 @@
 						<span *ngIf="isNewVersion">{{'DATASET-PROFILE-EDITOR.TITLE.NEW-PROFILE-VERSION' | translate}}</span>
 						{{form.get('label').value}}
 					</h3>
-	
+
 					<h3 *ngIf="!isNew">{{form.get('label').value}}</h3>
 				</div>
 
 				<!-- <div class="d-flex justify-content-end" style="gap: 1em">
 					<button mat-raised-button *ngIf="form.get('status').value==1" class="template_action_btn" (click)="downloadXML();" type="button" [@action-btn]>{{
 						'DATASET-WIZARD.ACTIONS.DOWNLOAD-XML' | translate }}</button>
-	
+
 					<ng-container *ngIf="!viewOnly">
 						<button mat-raised-button class="template_action_btn" type="button"
 							*ngIf="stepper.selectedIndex !=2 && !newVersionId"
@@ -168,7 +168,7 @@
 								</div>
 							</div>
 						</div>
-	
+
 						<div class="col-12">
 							<!-- <div class="heading">1.3 {{'DMP-EDITOR.FIELDS.LANGUAGE' | translate}}</div> -->
 							<div class="heading">1.3 {{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-LANGUAGE'| translate}} *</div>
@@ -186,6 +186,7 @@
 						</div>
 						<div class="col-12">
 							<div class="heading">1.4 {{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}</div>
+							<div class="hint">{{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS-HINT'| translate}}</div>
 							<div class="full-width basic-info-input">
 								<table class="col-12 user-table">
 									<thead class="user-table-header">
@@ -212,7 +213,7 @@
 								</table>
 							</div>
 						</div>
-						
+
 						<div class="col-12">
 							<div class="row justify-content-end">
 								<div class="col d-flex justify-content-end" style="overflow: hidden;">
@@ -222,7 +223,7 @@
 										</mat-form-field>
 									</div>
 								</div>
-	
+
 								<div class="col-auto">
 									<button mat-mini-fab color="primary" (click)="addUser(email)" (focus)="onUserButtonFocus()" (blur)="onUserButtonBlur()" [matTooltip]="'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-VALIDATE-AND-ADD-USER'| translate" [disabled]="userFormDisabled">
 										<ng-container *ngIf="inputUserState === 'untriggered' else triggericon">
@@ -238,7 +239,7 @@
 
 					</div>
 
-					
+
 					<!-- <div class="col-12">
 						<button mat-button class="full-width" (click)="addPage()"
 							[disabled]="viewOnly">{{'DATASET-PROFILE-EDITOR.ACTIONS.NEXT' | translate}}</button>
@@ -377,7 +378,7 @@
 						</div>
 						<div class="col">
 							<app-final-preview-component [formGroup]="formGroup" [visibilityRules]="visibilityRules">
-		
+
 							</app-final-preview-component>
 						</div>
 					</div>
@@ -394,7 +395,7 @@
 		</mat-horizontal-stepper>
 
 
-<!-- 
+<!--
 		<ng-container *ngIf="false">
 
 			<div class="d-flex">
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html
index 45f9e968c..d24280f2b 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html
@@ -21,7 +21,7 @@
 		<div class="mat-elevation-z6">
 
 		<!-- <mat-card class="row mat-card"> -->
-			<mat-table [dataSource]="dataSource" matSort (matSortChange)="refresh()">
+			<mat-table [dataSource]="dataSource" matSort (matSortChange)="refresh()" matSortActive="created" matSortDirection="desc">
 
 				<!-- Column Definition: Name -->
 				<ng-container cdkColumnDef="label">
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index e1dff9949..927a98f10 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Dataset is about, it's scope and objectives.",
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Users",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No users yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index ae8af2e0b..ea7c76aea 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Dataset is about, it's scope and objectives.",
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Users",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No users yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index ee158ee03..5bf81b680 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -84,7 +84,7 @@
 			"JSON-FILES": "ficheros .json",
 			"PRODUCED": "producido",
 			"RDA-SPECIFICATIONS": "de acuerdo a las especificaciones RDA",
-			"MACHINE-ACTIONABLE": "para PGDs procesables por máquinas", 
+			"MACHINE-ACTIONABLE": "para PGDs procesables por máquinas",
 			"UPLOAD-FILE": "Subir fichero",
 			"REPLACE-FILE": "Reemplar ichero"
 		},
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "Una breve descripción acerca del Dataset, su alcance y objetivos.",
 				"DATASET-TEMPLATE-LANGUAGE": "Idioma de la plantilla del Dataset",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Seleccione un idioma",
-				"DATASET-TEMPLATE-USERS": "Usuarios",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... Aún no hay usuarios",
-				"DATASET-TEMPLATE-REMOVE-USER": "Eliminar usuario",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validar y añadir usuario",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Descripción de la plantilla del Dataset",
 				"UNTITLED": "Sin título",
 				"QUESTION": "Pregunta",
@@ -431,7 +432,7 @@
 						"FIELD-MULTIPLE-AUTOCOMPLETE": "Autocompeltado múltiple",
 						"FIELD-MULTIPLE-WORDLIST": "Selección múltiple",
 						"FIELD-CURRENCY-TITLE": "Datos de moneda",
-						"FIELD-CURRENCY-PLACEHOLDER": "Introduzca marcador del texto",  
+						"FIELD-CURRENCY-PLACEHOLDER": "Introduzca marcador del texto",
 						"FIELD-REGISTRIES-TITLE": "Datos de registros",
 						"FIELD-REGISTRIES-PLACEHOLDER": "Introduzca marcador del texto",
 						"FIELD-SERVICES-TITLE": "Datos de servicios",
@@ -1240,7 +1241,7 @@
 			"EXTERNAL-LINK": "Facilite una URL"
 		},
 		"HINT": {
-			"DESCRIPTION": "Describa brevemente el contexto y propósito del Dataset", 
+			"DESCRIPTION": "Describa brevemente el contexto y propósito del Dataset",
 			"TITLE": "Una breve descripción sobre el ",
 			"TITLE-REST": "  su alcance y objetivos."
 		},
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 264f52dd3..5ba205304 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Dataset is about, it's scope and objectives.",
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Users",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No users yet",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json
index 53e7b1c83..76503ef92 100644
--- a/dmp-frontend/src/assets/i18n/pt.json
+++ b/dmp-frontend/src/assets/i18n/pt.json
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "Uma breve descrição do que é o modelo de dados, o seu âmbito e objetivos.",
 				"DATASET-TEMPLATE-LANGUAGE": "Idioma do modelo de dados",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Selecione o idioma",
-				"DATASET-TEMPLATE-USERS": "Utilizadores",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remover Utilizador",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... Ainda sem utilizadores",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validar e adicionar utilizador",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Descrição do modelo de dados",
 				"UNTITLED": "Sem título",
 				"QUESTION": "Questão",
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index f659c6741..3a8726434 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Dataset is about, it's scope and objectives.",
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Users",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No users yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json
index ead608601..be76fe7be 100644
--- a/dmp-frontend/src/assets/i18n/sr.json
+++ b/dmp-frontend/src/assets/i18n/sr.json
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Dataset is about, it's scope and objectives.",
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Users",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No users yet",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index 165c783ac..05590c73d 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -289,10 +289,11 @@
 				"DATASET-TEMPLATE-DESCRIPTION-HINT": "A brief description of what the Dataset is about, it's scope and objectives.",
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
-				"DATASET-TEMPLATE-USERS": "Users",
-				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
-				"DATASET-TEMPLATE-NO-USERS-YET": "... No users yet",
-				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
+				"DATASET-TEMPLATE-USERS": "Editors",
+				"DATASET-TEMPLATE-USERS-HINT": "Add editors and save changes to notify them.",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove Editor",
+				"DATASET-TEMPLATE-NO-USERS-YET": "... No editors yet",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add Editor",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",