From fcc3dd760972df0fda6557d03306d32bde4239df Mon Sep 17 00:00:00 2001
From: Diamantis Tziotzios <dtziotzios@cite.gr>
Date: Tue, 2 Apr 2024 21:23:59 +0300
Subject: [PATCH] minor ui changes

---
 .../app/core/services/utilities/enum-utils.service.ts |  6 ------
 .../editor/dmp-blueprint-editor.component.html        |  2 +-
 .../auth/login/post-login/post-login.component.html   |  8 ++++----
 .../editor/description-editor.component.html          |  2 +-
 dmp-frontend/src/app/ui/sidebar/sidebar.component.ts  | 10 +++++-----
 dmp-frontend/src/assets/i18n/en.json                  | 11 +++++++++++
 6 files changed, 22 insertions(+), 17 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 92da9e3ae..a23adcf07 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
@@ -75,12 +75,6 @@ export class EnumUtils {
 		}
 	}
 
-	toDmpBlueprintTypeString(type: DmpBlueprintType): string {
-		switch (type) {
-			case DmpBlueprintType.Input: return this.language.instant('TYPES.DMP-PROFILE-FIELD.TYPE.INPUT');
-		}
-	}
-
 	toDmpStatusString(status: DmpStatus): string {
 		switch (status) {
 			case DmpStatus.Draft: return this.language.instant('TYPES.DMP.DRAFT');
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html
index 432ee061e..16c5b3fc5 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html
@@ -288,7 +288,7 @@
 													</div>
 												</div>
 												<div class="row">
-													<div *ngIf="section.get('hasTemplates').value == true" class="col-lg-6 col-12">
+													<div *ngIf="section.get('hasTemplates').value == true" class="col-12">
 														<mat-form-field class="w-100 mt-3">
 															<mat-label>{{'DMP-BLUEPRINT-EDITOR.FIELDS.PREFILLING-SOURCES' | translate}}</mat-label>
 															<app-multiple-auto-complete [formControl]="section.get('prefillingSourcesIds')" [configuration]="prefillingSourceService.multipleAutocompleteConfiguration"></app-multiple-auto-complete>
diff --git a/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html b/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html
index d91ff3ad1..799bfa81a 100644
--- a/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html
+++ b/dmp-frontend/src/app/ui/auth/login/post-login/post-login.component.html
@@ -1,13 +1,13 @@
 <div class="tenant-choose-dialog row">
 	<mat-card class="col-md-4 offset-md-4">
 		<mat-card-header>
-			<h1 mat-card-title> {{'APP.TENANT-CHOOSE-DIALOG.TITLE' | translate}}</h1>
+			<h1 mat-card-title> {{'TENANT-CHOOSE-DIALOG.TITLE' | translate}}</h1>
 		</mat-card-header>
 		<mat-card-content>
 			<form *ngIf="formGroup" class="dialog-form" (ngSubmit)="formSubmit()" [formGroup]="formGroup">
 				<div class="row">
 					<mat-form-field appearance="fill" class="col-md-12">
-						<mat-label>{{'APP.TENANT-CHOOSE-DIALOG.FIELDS.TENANT-CODE' | translate}}</mat-label>
+						<mat-label>{{'TENANT-CHOOSE-DIALOG.FIELDS.TENANT-CODE' | translate}}</mat-label>
 						<mat-select formControlName="tenantCode">
 							<mat-option *ngFor="let tenant of tenants" [value]="tenant.code">
 								{{tenant.code}}
@@ -19,8 +19,8 @@
 				</div>
 				<div class="col-12 pt-2">
 					<div class="row editor-actions">
-						<div class="col"><button mat-raised-button color="button" (click)="cancel()" type="button">{{'APP.EDITOR-ACTIONS.BACK' | translate}}</button></div>
-						<div class="col-auto"><button mat-raised-button color="primary" (click)="save($event)" type="primary">{{'APP.TENANT-CHOOSE-DIALOG.ACTIONS.SUBMIT' | translate}}</button></div>
+						<div class="col"><button mat-raised-button color="button" (click)="cancel()" type="button">{{'TENANT-CHOOSE-DIALOG.ACTIONS.BACK' | translate}}</button></div>
+						<div class="col-auto"><button mat-raised-button color="primary" (click)="save($event)" type="primary">{{'TENANT-CHOOSE-DIALOG.ACTIONS.SUBMIT' | translate}}</button></div>
 					</div>
 				</div>
 			</form>
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
index 8ab752844..ad7880ccd 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
@@ -10,7 +10,7 @@
 								<ng-container *ngIf="!viewOnly else viewOnlyTemplate">
 									<div *ngIf="isNew" class="description-title">{{'DESCRIPTION-EDITOR.TITLE-ADD-DESCRIPTION' | translate}}</div>
 									<div *ngIf="!isNew" class="description-title">{{'DESCRIPTION-EDITOR.TITLE-EDIT-DESCRIPTION' | translate}}</div>
-									<div class="description-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="description-changes">({{'DESCRIPTION-EDITOR.CHANGES' | translate}})</span></div>
+									<div class="description-subtitle">{{ formGroup.get('label').value }} <span *ngIf="isDirty()" class="description-changes">{{'DESCRIPTION-EDITOR.UNSAVED-CHANGES' | translate}}</span></div>
 								</ng-container>
 								<ng-template #viewOnlyTemplate>
 									<div class="description-title">{{'DESCRIPTION-EDITOR.TITLE-PREVIEW-DESCRIPTION' | translate}}</div>
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
index f71882124..7658dccf8 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
@@ -109,16 +109,16 @@ export class SidebarComponent implements OnInit {
 		if (this.authentication.hasPermission(AppPermission.ViewDmpBlueprintPage)) this.adminItems.routes.push({ path: '/dmp-blueprints', title: 'SIDE-BAR.DMP-BLUEPRINTS', icon: 'library_books' });
 		if (this.authentication.hasPermission(AppPermission.ViewDescriptionTemplatePage)) this.adminItems.routes.push({ path: '/description-templates', title: 'SIDE-BAR.DESCRIPTION-TEMPLATES', icon: 'description' });
 		if (this.authentication.hasPermission(AppPermission.ViewDescriptionTemplateTypePage)) this.adminItems.routes.push({ path: '/description-template-type', title: 'SIDE-BAR.DESCRIPTION-TEMPLATE-TYPES', icon: 'stack' });
-		if (this.authentication.hasPermission(AppPermission.ViewEntityLockPage)) this.adminItems.routes.push({ path: '/entity-locks', title: 'SIDE-BAR.ENTITY-LOCKS', icon: 'build' });
+		if (this.authentication.hasPermission(AppPermission.ViewEntityLockPage)) this.adminItems.routes.push({ path: '/entity-locks', title: 'SIDE-BAR.ENTITY-LOCKS', icon: 'lock_person' });
 		if (this.authentication.hasPermission(AppPermission.ViewReferencePage)) this.adminItems.routes.push({ path: '/references', title: 'SIDE-BAR.REFERENCES', icon: 'dataset_linked' });
 		if (this.authentication.hasPermission(AppPermission.ViewReferenceTypePage)) this.adminItems.routes.push({ path: '/reference-type', title: 'SIDE-BAR.REFERENCE-TYPES', icon: 'add_link' });
-		if (this.authentication.hasPermission(AppPermission.ViewPrefillingSourcePage)) this.adminItems.routes.push({ path: '/prefilling-sources', title: 'SIDE-BAR.PREFILLING-SOURCES', icon: 'add_link' });
+		if (this.authentication.hasPermission(AppPermission.ViewPrefillingSourcePage)) this.adminItems.routes.push({ path: '/prefilling-sources', title: 'SIDE-BAR.PREFILLING-SOURCES', icon: 'quick_reference_all' });
 		if (this.authentication.hasPermission(AppPermission.ViewTenantPage)) this.adminItems.routes.push({ path: '/tenants', title: 'SIDE-BAR.TENANTS', icon: 'tenancy' });
 		if (this.authentication.hasPermission(AppPermission.ViewUserPage)) this.adminItems.routes.push({ path: '/users', title: 'SIDE-BAR.USERS', icon: 'people' });
 		if (this.authentication.hasPermission(AppPermission.ViewLanguagePage)) this.adminItems.routes.push({ path: '/languages', title: 'SIDE-BAR.LANGUAGES', icon: 'language' });
-		if (this.authentication.hasPermission(AppPermission.ViewSupportiveMaterialPage)) this.adminItems.routes.push({ path: '/supportive-material', title: 'SIDE-BAR.SUPPORTIVE-MATERIAL', icon: 'dataset_linked' });
-		if (this.authentication.hasPermission(AppPermission.ViewNotificationTemplatePage)) this.adminItems.routes.push({ path: '/notification-templates', title: 'SIDE-BAR.NOTIFICATION-TEMPLATES', icon: 'build' });
-		if (this.authentication.hasPermission(AppPermission.ViewNotificationPage)) this.adminItems.routes.push({ path: '/notifications', title: 'SIDE-BAR.NOTIFICATIONS', icon: 'build' });
+		if (this.authentication.hasPermission(AppPermission.ViewSupportiveMaterialPage)) this.adminItems.routes.push({ path: '/supportive-material', title: 'SIDE-BAR.SUPPORTIVE-MATERIAL', icon: 'help_center' });
+		if (this.authentication.hasPermission(AppPermission.ViewNotificationTemplatePage)) this.adminItems.routes.push({ path: '/notification-templates', title: 'SIDE-BAR.NOTIFICATION-TEMPLATES', icon: 'grid_guides' });
+		if (this.authentication.hasPermission(AppPermission.ViewNotificationPage)) this.adminItems.routes.push({ path: '/notifications', title: 'SIDE-BAR.NOTIFICATIONS', icon: 'notifications' });
 		if (this.authentication.hasPermission(AppPermission.ViewMaintenancePage)) this.adminItems.routes.push({ path: '/index-managment', title: 'SIDE-BAR.MAINTENANCE', icon: 'build' });
 		this.groupMenuItems.push(this.adminItems);
 
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 621edf6d0..428831044 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -670,6 +670,7 @@
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
 		"TO-DMP": "Previewing Description",
+		"UNSAVED-CHANGES": "(unsaved changes)",
 		"DMP": "Plan",
 		"TOC": {
 			"TITLE": "Guide steps",
@@ -1464,6 +1465,16 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Not bind with source"
 	},
+	"TENANT-CHOOSE-DIALOG": {
+		"TITLE": "Please select your Tenant",
+		"FIELDS": {
+			"TENANT-CODE": "Tenant"
+		},
+		"ACTIONS": {
+			"BACK": "Back",
+			"SUBMIT": "Submit"
+		}
+	},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",