From 1a160edecefb37a99e01ef3a6d4373c9fbc9671a Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Fri, 22 Nov 2019 17:06:47 +0200
Subject: [PATCH 1/3] Adds "Update" button on finalized "Dataset Template".

---
 .../editor/dataset-profile-editor.component.html     | 11 ++++++++---
 .../editor/dataset-profile-editor.component.ts       | 12 ++++++++++++
 .../dataset-wizard/dataset-wizard.component.ts       |  2 +-
 dmp-frontend/src/assets/i18n/en.json                 |  4 +++-
 4 files changed, 24 insertions(+), 5 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 18bce0c76..210c1cdac 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
@@ -70,12 +70,17 @@
 			<!-- SAVE BUTTON -->
 			<div class="col-6 d-flex" *ngIf="!viewOnly">
 				<div class="row mt-4">
-					<button mat-raised-button class="col-auto mr-2" color="primary" type="button col-auto" (click)='onSubmit()' [disabled]="!form.valid">Save</button>
-					<button mat-raised-button class="col-auto" color="primary" type="button col-auto" (click)='finalize()' [disabled]="!form.valid">Finalize</button>
+					<button mat-raised-button class="col-auto mr-2" color="primary" type="button col-auto" (click)='onSubmit()' [disabled]="!form.valid">{{'DATASET-PROFILE-EDITOR.ACTIONS.SAVE' | translate}}</button>
+					<button mat-raised-button class="col-auto" color="primary" type="button col-auto" (click)='finalize()' [disabled]="!form.valid">{{'DATASET-PROFILE-EDITOR.ACTIONS.FINALIZE' | translate}}</button>
+				</div>
+			</div>
+			<!-- SAVE BUTTON  WHEN FINALIZED-->
+			<div class="col-6 d-flex" *ngIf="showUpdateButton()">
+				<div class="row mt-4">
+					<button mat-raised-button class="col-auto mr-2" color="primary" type="button col-auto" (click)='updateFinalized()' [disabled]="!form.valid">{{'DATASET-PROFILE-EDITOR.ACTIONS.UPDATE' | translate}}</button>
 				</div>
 			</div>
 			<!-- DELETE BUTTON -->
-			<div class="col-6" *ngIf="viewOnly"></div>
 			<div class="col-6 d-flex justify-content-end" *ngIf="!isNew">
 				<div class="row mt-4">
 					<button mat-raised-button color="primary" (click)="delete()">
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts
index 1307ab4c7..4dd912dfa 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts
@@ -222,6 +222,18 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
 		this.onSubmit();
 	}
 
+	updateFinalized() {
+		this.datasetProfileService.updateForm(this.datasetProfileId, this.form.getRawValue())
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(() => {
+				this.router.navigate(['/dataset-profiles']);
+			});
+	}
+
+	showUpdateButton() {
+		return !this.isNew && this.dataModel.status === DatasetProfileEnum.FINALIZED;
+	}
+
 	isStepActive(step: number) {
 		return this.stepper && this.stepper.selectedIndex === step;
 	}
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
index c8019b93c..c938fceee 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
@@ -136,7 +136,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
 					// this.availableProfiles = this.datasetWizardModel.dmp.profiles;
 				},
 					error => {
-						this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-WIZARD.MESSAGES.DATAESET-NOT-FOUND'), SnackBarNotificationLevel.Error);
+						this.uiNotificationService.snackBarNotification(this.language.instant('DATASET-WIZARD.MESSAGES.DATASET-NOT-FOUND'), SnackBarNotificationLevel.Error);
 						this.router.navigate(['/datasets/edit/' + this.itemId]);
 						return observableOf(null);
 					});
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d83361069..d0c9ba3a8 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -330,6 +330,8 @@
 		},
 		"ACTIONS": {
 			"SAVE": "Save",
+			"FINALIZE": "Finalize",
+			"UPDATE": "Update",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete",
 			"ADD-PAGE": "Add Page +",
@@ -453,7 +455,7 @@
 			"UPDATE-DATASET-PROFILE": "Update Template"
 		},
 		"MESSAGES": {
-			"DATAESET-NOT-FOUND": "Dataset Description does not exist",
+			"DATASET-NOT-FOUND": "Dataset Description does not exist",
 			"SUCCESS-UPDATE-DATASET-PROFILE": "Dataset Description Template updated successfully"
 		},
 		"UPLOAD": {

From 0b573e4256c7476e301ffd701e28f50f885b2b6f Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Fri, 22 Nov 2019 18:28:20 +0200
Subject: [PATCH 2/3] Adds user default login icon

---
 .../src/app/ui/misc/navigation/navigation.component.html    | 1 +
 .../src/app/ui/misc/navigation/navigation.component.ts      | 6 +++++-
 .../misc/navigation/user-dialog/user-dialog.component.html  | 4 ++--
 .../ui/misc/navigation/user-dialog/user-dialog.component.ts | 6 +++++-
 dmp-frontend/src/app/ui/navbar/navbar.component.html        | 4 ++--
 dmp-frontend/src/app/ui/navbar/navbar.component.ts          | 6 +++++-
 dmp-frontend/src/app/ui/sidebar/sidebar.component.html      | 4 ++--
 dmp-frontend/src/app/ui/sidebar/sidebar.component.ts        | 6 +++++-
 8 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html
index 6cb8c962b..bd512164c 100644
--- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html
+++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html
@@ -22,6 +22,7 @@
 
 	<div *ngIf="isAuthenticated();else loginoption" class="col-auto">
 		<img mat-card-avatar *ngIf="this.principalHasAvatar()" [src]="this.getPrincipalAvatar()" (click)="openProfile()">
+		<img mat-card-avatar *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()" (click)="openProfile()">
 	</div>
 
 	<ng-template #loginoption>
diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts
index f3a288b66..b16e560ce 100644
--- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts
+++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts
@@ -92,13 +92,17 @@ export class NavigationComponent extends BaseComponent implements OnInit {
 	}
 
 	public principalHasAvatar(): boolean {
-		return this.authentication.current().avatarUrl != null;
+		return this.authentication.current().avatarUrl != null && this.authentication.current().avatarUrl.length > 0;
 	}
 
 	public getPrincipalAvatar(): string {
 		return this.authentication.current().avatarUrl;
 	}
 
+	public getDefaultAvatar(): string {
+		return 'assets/images/profile-placeholder.png';
+	}
+
 	openProfile() {
 		const dialogRef = this.dialog.open(UserDialogComponent, {
 			hasBackdrop: true,
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html
index f922a2279..df07a6a64 100644
--- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html
+++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html
@@ -2,8 +2,8 @@
 	<div mat-dialog-title>
 		<div class="row">
 			<div class="col-auto">
-				<img mat-card-avatar class="my-mat-card-avatar" *ngIf="this.principalHasAvatar()"
-					[src]="this.getPrincipalAvatar()">
+				<img mat-card-avatar class="my-mat-card-avatar" *ngIf="this.principalHasAvatar()" [src]="this.getPrincipalAvatar()">
+				<img mat-card-avatar class="my-mat-card-avatar" *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()">
 			</div>
 			<span class="user-label col">{{this.getPrincipalName()}}</span>
 		</div>
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts
index 1486663fa..80404784a 100644
--- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts
+++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts
@@ -36,13 +36,17 @@ export class UserDialogComponent implements OnInit {
 	}
 
 	public principalHasAvatar(): boolean {
-		return this.authentication.current() && this.authentication.current().avatarUrl != null;
+		return this.authentication.current() && this.authentication.current().avatarUrl != null && this.authentication.current().avatarUrl.length > 0;
 	}
 
 	public getPrincipalAvatar(): string {
 		return this.authentication.current() && this.authentication.current().avatarUrl;
 	}
 
+	public getDefaultAvatar(): string {
+		return 'assets/images/profile-placeholder.png';
+	}
+
 	public navigateToProfile() {
 		this.dialogRef.close();
 		this.router.navigate(['/profile']);
diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html
index dd338bbf3..023476217 100644
--- a/dmp-frontend/src/app/ui/navbar/navbar.component.html
+++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html
@@ -54,8 +54,8 @@
 
 				<!-- Login -->
 				<li class="nav-item" *ngIf="isAuthenticated();else loginoption">
-					<img mat-card-avatar class="my-mat-card-avatar" *ngIf="this.principalHasAvatar()"
-						[src]="this.getPrincipalAvatar()" (click)="openProfile()">
+					<img mat-card-avatar class="my-mat-card-avatar" *ngIf="this.principalHasAvatar()" [src]="this.getPrincipalAvatar()" (click)="openProfile()">
+					<img mat-card-avatar class="my-mat-card-avatar" *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()" (click)="openProfile()">
 				</li>
 				<ng-template #loginoption>
 					<button mat-button [routerLink]=" ['/login'] ">
diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.ts b/dmp-frontend/src/app/ui/navbar/navbar.component.ts
index 4bb6d9652..fad635899 100644
--- a/dmp-frontend/src/app/ui/navbar/navbar.component.ts
+++ b/dmp-frontend/src/app/ui/navbar/navbar.component.ts
@@ -152,13 +152,17 @@ export class NavbarComponent extends BaseComponent implements OnInit {
 	}
 
 	public principalHasAvatar(): boolean {
-		return this.authentication.current().avatarUrl != null;
+		return this.authentication.current().avatarUrl != null && this.authentication.current().avatarUrl.length > 0;
 	}
 
 	public getPrincipalAvatar(): string {
 		return this.authentication.current().avatarUrl;
 	}
 
+	public getDefaultAvatar(): string {
+		return 'assets/images/profile-placeholder.png';
+	}
+
 	public isAdmin(): boolean {
 		if (!this.authentication.current()) { return false; }
 		const principalRoles = this.authentication.current().authorities;
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
index 50156656d..df25ff991 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
@@ -29,8 +29,8 @@
 			<li class="nav-item">
 				<a class="nav-link" *ngIf="isAuthenticated();else loginoption">
 					<p style="display: flex; align-items: center;" [routerLink]=" ['/profile']">
-						<img mat-card-avatar class="my-mat-card-avatar" *ngIf="this.principalHasAvatar()"
-							[src]="this.getPrincipalAvatar()">
+						<img mat-card-avatar class="my-mat-card-avatar" *ngIf="this.principalHasAvatar()" [src]="this.getPrincipalAvatar()">
+						<img mat-card-avatar class="my-mat-card-avatar" *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()">
 						<span class="d-lg-none d-md-block">{{ 'SIDE-BAR.ACCOUNT' | translate }}</span>
 					</p>
 				</a>
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
index 3ecc0de2b..f456542fe 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
@@ -146,13 +146,17 @@ export class SidebarComponent implements OnInit {
 	}
 
 	public principalHasAvatar(): boolean {
-		return this.authentication.current().avatarUrl != null;
+		return this.authentication.current().avatarUrl != null && this.authentication.current().avatarUrl.length > 0;
 	}
 
 	public getPrincipalAvatar(): string {
 		return this.authentication.current().avatarUrl;
 	}
 
+	public getDefaultAvatar(): string {
+		return 'assets/images/profile-placeholder.png';
+	}
+
 	public isAuthenticated(): boolean {
 		const myBollean = this.isAdmin();
 		return !(!this.authentication.current());

From 247aac72febbc9367894ce6fe262e8e4c5bc983c Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Mon, 25 Nov 2019 11:48:59 +0200
Subject: [PATCH 3/3] Fixes how "Reference" is created on Grand, Funder and
 Project.

---
 .../eu/eudat/models/data/funder/Funder.java     | 17 +++++++++++++++--
 .../java/eu/eudat/models/data/grant/Grant.java  | 17 +++++++++++++++--
 .../eu/eudat/models/data/project/Project.java   | 17 +++++++++++++++--
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java
index baa830ddd..22fe5d6d6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java
@@ -90,7 +90,12 @@ public class Funder implements DataModel<eu.eudat.data.entities.Funder, Funder>
 		this.status = entity.getStatus();
 		this.created = entity.getCreated();
 		this.modified = entity.getModified();
-		this.source = "Internal";
+		String source = entity.getReference().substring(0, entity.getReference().indexOf(":"));
+		if (source.equals("dmp")) {
+			this.source = "Internal";
+		} else {
+			this.source = source;
+		}
 		return this;
 	}
 
@@ -100,7 +105,15 @@ public class Funder implements DataModel<eu.eudat.data.entities.Funder, Funder>
 		entity.setId(this.id);
 		entity.setLabel(this.label);
 		entity.setType(this.type);
-		entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference);
+		if (this.source != null && this.source.equals("Internal")) this.source = "dmp";
+		if (this.reference != null && !this.reference.trim().isEmpty()
+				&& this.source != null && !this.source.trim().isEmpty()) {
+			if (this.source.equals(this.reference.substring(0, this.source.length()))) {
+				entity.setReference(this.reference);
+			} else {
+				entity.setReference(this.source.toLowerCase() + ":" + this.reference);
+			}
+		}
 		entity.setDefinition(this.definition);
 		entity.setCreated(this.created == null ? new Date() : this.created);
 		entity.setStatus(this.status != null ? this.getStatus() : eu.eudat.data.entities.Grant.Status.ACTIVE.getValue());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
index f8cde3ca3..56884fe73 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
@@ -177,7 +177,12 @@ public class Grant implements DataModel<eu.eudat.data.entities.Grant, Grant> {
         this.files = entity.getContent() != null ? Arrays.asList(new ContentFile(entity.getContent().getLabel(), UUID.fromString(entity.getContent().getUri().split(":")[1]), "final", entity.getContent().getExtension())) : Arrays.asList(new ContentFile("default.png", null, null, null));
         if (entity.getFunder() != null)
             this.funderId = entity.getFunder().getId();
-        this.source = "Internal";
+        String source = entity.getReference().substring(0, entity.getReference().indexOf(":"));
+        if (source.equals("dmp")) {
+            this.source = "Internal";
+        } else {
+            this.source = source;
+        }
 
         return this;
     }
@@ -189,7 +194,15 @@ public class Grant implements DataModel<eu.eudat.data.entities.Grant, Grant> {
         entity.setAbbreviation(this.abbreviation);
         entity.setLabel(this.label);
         entity.setType(this.type);
-        entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference);
+        if (this.source != null && this.source.equals("Internal")) this.source = "dmp";
+        if (this.reference != null && !this.reference.trim().isEmpty()
+                && this.source != null && !this.source.trim().isEmpty()) {
+            if (this.source.equals(this.reference.substring(0, this.source.length()))) {
+                entity.setReference(this.reference);
+            } else {
+                entity.setReference(this.source.toLowerCase() + ":" + this.reference);
+            }
+        }
         entity.setUri(this.uri);
         entity.setDefinition(this.definition);
         entity.setStartdate(this.startDate);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
index fe9da0885..8752e0bd6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
@@ -165,7 +165,12 @@ public class Project implements DataModel<eu.eudat.data.entities.Project, Projec
 		this.modified = entity.getModified();
 		this.description = entity.getDescription();
 		this.files = entity.getContent() != null ? Arrays.asList(new ContentFile(entity.getContent().getLabel(), UUID.fromString(entity.getContent().getUri().split(":")[1]), "final", entity.getContent().getExtension())) : Arrays.asList(new ContentFile("default.png", null, null, null));
-		this.source = "Internal";
+		String source = entity.getReference().substring(0, entity.getReference().indexOf(":"));
+		if (source.equals("dmp")) {
+			this.source = "Internal";
+		} else {
+			this.source = source;
+		}
 		return this;
 	}
 
@@ -176,7 +181,15 @@ public class Project implements DataModel<eu.eudat.data.entities.Project, Projec
 		entity.setAbbreviation(this.abbreviation);
 		entity.setLabel(this.label);
 		entity.setType(this.type);
-		entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference);
+		if (this.source != null && this.source.equals("Internal")) this.source = "dmp";
+		if (this.reference != null && !this.reference.trim().isEmpty()
+				&& this.source != null && !this.source.trim().isEmpty()) {
+			if (this.source.equals(this.reference.substring(0, this.source.length()))) {
+				entity.setReference(this.reference);
+			} else {
+				entity.setReference(this.source.toLowerCase() + ":" + this.reference);
+			}
+		}
 		entity.setUri(this.uri);
 		entity.setDefinition(this.definition);
 		entity.setStartdate(this.startDate);