From 5fc779a172da7030fa281f3e26e6d1a0ecf61c1f Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Wed, 22 Jul 2020 11:21:03 +0300
Subject: [PATCH] dataset-overview: dmp label changed & copy-edit urls open in
 new tab

---
 .../overview/dataset-overview.component.html       |  2 +-
 .../dataset/overview/dataset-overview.component.ts | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
index 5fda70400..72ba949d8 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
@@ -64,7 +64,7 @@
 					<div class="row ">
 						<button class="dmp-btn" (click)="dmpClicked(dataset.dmp.id)">
 							<div class="dmp-btn-label">
-								{{ this.dataset.dmp.label }}: {{ dataset.datasetTemplate.label }}
+								{{ this.dataset.dmp.label }}
 								<!-- {{ 'DATASET-LISTING.TOOLTIP.DMP-FOR' | translate }}: {{ dataset.datasetTemplate.label }} -->
 							</div>
 							<mat-icon>launch</mat-icon>
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
index 673705876..e9c41df5e 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
@@ -138,7 +138,8 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
   }
 
   getDatasetWizardModel(id: string) {
-    this.datasetWizardService.getSingle(id).pipe(takeUntil(this._destroyed))
+    this.datasetWizardService.getSingle(id)
+      .pipe(takeUntil(this._destroyed))
       .subscribe(data => {
         this.datasetWizardEditorModel = new DatasetWizardEditorModel().fromModel(data);
         this.datasetWizardModel = data;
@@ -165,7 +166,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
   }
 
   reloadPage(): void {
-    this.router.navigateByUrl('/datasets', { skipLocationChange: true }).then(() => {
+    this.router.navigateByUrl('/reload', { skipLocationChange: true }).then(() => {
       this.router.navigate([`/datasets/overview/${this.dataset.id}`]);
     });
   }
@@ -263,9 +264,11 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
 
   editClicked(dataset: DatasetOverviewModel) {
     if (dataset.public) {
-      this.router.navigate(['/datasets/publicEdit/' + dataset.id]);
+      let url = this.router.createUrlTree(['/datasets/publicEdit/', dataset.id])
+		  window.open(url.toString(), '_blank')
     } else {
-      this.router.navigate(['/datasets/edit/' + dataset.id]);
+      let url = this.router.createUrlTree(['/datasets/edit/', dataset.id])
+		  window.open(url.toString(), '_blank')
     }
   }
 
@@ -406,7 +409,8 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
       .subscribe(result => {
         if (result && result.datasetProfileExist) {
           const newDmpId = result.formControl.value.id
-          this.router.navigate(['/datasets/copy/' + result.datasetId], { queryParams: { newDmpId: newDmpId } });
+          let url = this.router.createUrlTree(['/datasets/copy/', result.datasetId, { newDmpId: newDmpId } ])
+		      window.open(url.toString(), '_blank')
         }
       });
   }