From 71604b0ae19d24cce51156076f0c6981d8fdab3e Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Thu, 30 May 2019 17:40:32 +0300
Subject: [PATCH] Fixes bug on cancel button of dmp creation form

---
 .../app/ui/dmp/editor/dmp-editor.component.html | 17 +++++++++++++----
 .../app/ui/dmp/editor/dmp-editor.component.scss |  4 ++++
 .../app/ui/dmp/editor/dmp-editor.component.ts   |  4 ++++
 3 files changed, 21 insertions(+), 4 deletions(-)

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 bc0fc9549..394572d7f 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
@@ -2,10 +2,13 @@
 	<div class="container-fluid">
 		<div *ngIf="dmp" class="card">
 			<div class="card-header card-header-plain d-flex">
-				<div class="card-desc d-flex flex-column justify-content-center">
+				<div *ngIf="!isNew" class="card-desc d-flex flex-column justify-content-center">
 					<h4 class="card-title">{{ dmp.label }}</h4>
 				</div>
-				<div class="d-flex ml-auto p-2">
+				<div *ngIf="isNew" class="card-desc new-dmp d-flex flex-column justify-content-center">
+					<h4 class="card-title">{{ 'DMP-EDITOR.TITLE.NEW' | translate }}</h4>
+				</div>
+				<div class="d-flex ml-auto p-2" *ngIf="!isNew">
 					<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon"
 						(click)="$event.stopImmediatePropagation();">
 						<mat-icon class="more-horiz">more_horiz</mat-icon>
@@ -37,7 +40,7 @@
 				<div class="d-flex flex-column">
 					<mat-tab-group class="mt-3">
 						<mat-tab>
-							<ng-template mat-tab-label class="tab-label">
+							<ng-template mat-tab-label>
 								<i class="material-icons-outlined mr-2">view_agenda</i>
 								{{ 'SIDE-BAR.GENERAL' | translate }}
 							</ng-template>
@@ -73,12 +76,18 @@
 					</mat-tab-group>
 
 					<div class="d-flex justify-content-end pt-2 pb-4 pl-2 pr-2">
-						<div>
+						<div *ngIf="!isNew">
 							<button mat-raised-button color="primary" (click)="cancel(dmp.id)" type="button"
 								class="lightblue-btn text-uppercase mr-2">
 								{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
 							</button>
 						</div>
+						<div *ngIf="isNew">
+							<button mat-raised-button color="primary" (click)="cancelCreation()" type="button"
+								class="lightblue-btn text-uppercase mr-2">
+								{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
+							</button>
+						</div>
 						<!-- <div class="col"></div> -->
 						<!-- <div class="col-auto" *ngIf="!isNew && this.formGroup.enabled">
 										<button mat-raised-button color="primary" type="button" (click)="delete()">
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
index 14ef70cc5..c5aeb2373 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
@@ -7,6 +7,10 @@
   color: #aaaaaa;
 }
 
+.new-dmp {
+  height: 3.5em;
+}
+
 .more-icon :hover {
   color: #4687e6;
 }
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 74735a84b..da7dd6b16 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
@@ -255,6 +255,10 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 		// this.router.navigate(['/plans']);
 	}
 
+	public cancelCreation(): void {
+		this.router.navigate(['/plans']);
+	}
+
 	public invite(): void {
 		this.router.navigate(['/invite/' + this.dmp.id]);
 	}