From e4e009f5b138c7146d73b6f1c04cbc2d36e9cfa2 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 18 Feb 2022 15:57:17 +0200
Subject: [PATCH] Fix after prefill datase editor behaviour - 7545

---
 .../dataset-wizard/dataset-wizard.component.html  |  4 ++--
 .../dataset-wizard/dataset-wizard.component.ts    |  3 +++
 .../src/app/ui/dmp/editor/dmp-editor.component.ts | 15 ++-------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
index 9a0a489c8..ec1cb77f6 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
@@ -89,7 +89,7 @@
 							<span class="material-icons">chevron_right</span>
 							<div>{{'DMP-EDITOR.STEPPER.NEXT' | translate}}</div>
 						</div>
-						<div *ngIf="(this.step === this.maxStep) && !lockStatus && formGroup.get('profile').value && !viewOnly" mat-raised-button type="button" class="col-auto stepper-btn add-dataset-btn ml-auto">
+						<div *ngIf="(step === maxStep) && !lockStatus && formGroup.get('profile').value && !viewOnly" mat-raised-button type="button" class="col-auto stepper-btn add-dataset-btn ml-auto">
 							<div (click)="save(saveAnd.addNew)">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-ADD' | translate }}</div>
 						</div>
 					</div>
@@ -107,7 +107,7 @@
 </div>
 
 <!-- <mat-slide-toggle [(ngModel)]="showtocentriesErrors">
-	
+
 </mat-slide-toggle> -->
 
 <!-- <div class="row">
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 62443db96..166fe8862 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
@@ -259,6 +259,9 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
 								this.formGroup = this.datasetWizardModel.buildForm();
 								this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
 								this.formGroup.get('dmp').disable();
+								this.maxStep = 1;
+								this.loadDatasetProfiles();
+								this.registerFormListeners();
 							}
 						})
 						this.loadDatasetProfiles();
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 8baa9e0e8..122dcb1a2 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
@@ -574,19 +574,8 @@ export class DmpEditorComponent extends  CheckDeactivateBaseComponent implements
 	}
 
 	onCallbackSuccessAddNew(dmp?: DmpModel) {
-		// this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
-		// this.router.navigate(['/datasets', 'new', dmp.id]);
-		// const showDialog = this.isNew && (this.formGroup.get('datasets') );
-
-		let showDialog = false;
-
-		try{
-			showDialog = this.isNew && !this.formGroup.get('datasets').value.length;
-		}catch{
-
-		}
-
-		this.editDataset(dmp.id, true, showDialog);
+		// this.editDataset(dmp.id, true, this.isNew && !this.formGroup.get('datasets').value.length);
+		this.editDataset(dmp.id, true, false);
 	}
 
 	public setErrorModel(validationErrorModel: ValidationErrorModel) {