From 3f97ab9f41f7018342e4fb5fe544540ba0a07f24 Mon Sep 17 00:00:00 2001
From: dtziotzios <dtziotzios@cite.gr>
Date: Fri, 15 Feb 2019 16:19:07 +0200
Subject: [PATCH] Delete SnackBar Dmp Error

---
 .../java/eu/eudat/models/data/dmp/DataManagementPlan.java  | 2 +-
 .../src/app/ui/dmp/editor/dmp-editor.component.html        | 2 +-
 dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts | 7 ++++++-
 dmp-frontend/src/assets/i18n/en.json                       | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
index a96fc00e6..b4afc8806 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
@@ -212,7 +212,7 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
         if (this.definition != null && this.definition.getFields() != null && !this.definition.getFields().isEmpty() && this.properties != null) {
             this.definition.getFields().forEach(item -> {
                 Optional<Map<String, Object>> fieldOptional = ((List<Map<String, Object>>) this.properties.get("fields")).stream().filter(field -> field.get("id").equals(item.getId().toString())).findFirst();
-                item.setValue(fieldOptional.orElse(null).get("value"));
+                if (fieldOptional.isPresent()) item.setValue(fieldOptional.get().get("value"));
             });
         }
         if (entity.getCreator() != null) this.creator.fromDataModel(entity.getCreator());
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
index 6d3aed63c..283c7e03b 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
@@ -129,7 +129,7 @@
 
 					<!-- <h4 mat-subheader class="col-12">{{'DMP-EDITOR.FIELDS.PROFILE' | translate}}</h4> -->
 					<mat-form-field class="col-md-6">
-						<app-single-auto-complete required='false' [formControl]="formGroup.get('profile')"
+						<app-single-auto-complete [required]='false' [formControl]="formGroup.get('profile')"
 							placeholder="{{'DMP-EDITOR.FIELDS.PROFILE' | translate}}"
 							[configuration]="dmpProfileAutoCompleteConfiguration">
 						</app-single-auto-complete>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
index 10e45e768..e23a7c811 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
@@ -193,6 +193,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(Option => {
 				if (Option instanceof Object) {
+					this.selectedDmpProfileDefinition=null;
 					this.dmpProfileService.getSingle(Option.id)
 						.pipe(takeUntil(this._destroyed))
 						.subscribe(result => {
@@ -257,6 +258,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 
 	onCallbackError(error: any) {
 		this.setErrorModel(error.error);
+
 		//this.validateAllFormFields(this.formGroup);
 	}
 
@@ -337,11 +339,14 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 					.pipe(takeUntil(this._destroyed))
 					.subscribe(
 						complete => { this.onCallbackSuccess() },
-						error => this.onCallbackError(error)
+						error => this.onDeleteCallbackError(error)
 					);
 			}
 		});
 	}
+	onDeleteCallbackError(error){
+		this.uiNotificationService.snackBarNotification(error.error.message? error.error.message : this.language.instant('GENERAL.SNACK-BAR.UNSUCCESSFUL-DELETE'), SnackBarNotificationLevel.Error);
+	}
 
 	// selectOption(option: any) {
 	// 	this.dmp.definition = null;
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index d4fea2439..3d1a50b55 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -19,7 +19,8 @@
 			"UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
 			"UNSUCCESSFUL-LOGIN": "Unsuccessful Login",
 			"SUCCESSFUL-DATASET-PROFILE-DELETE": "Successful Delete",
-			"UNSUCCESSFUL-DATASET-PROFILE-DELETE": "This profile can not deleted, because Datasets are associated with it"
+			"UNSUCCESSFUL-DATASET-PROFILE-DELETE": "This profile can not deleted, because Datasets are associated with it",
+			"UNSUCCESSFUL-DELETE":"Unsuccessful Delete"
 		},
 		"ERRORS": {
 			"HTTP-REQUEST-ERROR": "An Unexpected Error Has Occured"