From 62d6ac01dff991b9c185095e403de23f844d4580 Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Fri, 24 Jul 2020 12:43:09 +0300
Subject: [PATCH] Change the profile of DatasetListingModel &
 RecentActivityModel from String to DatasetProfileModel and Update profileId
 in openDmpSearchDialogue()

---
 dmp-frontend/src/app/core/model/dataset/dataset-listing.ts | 4 +++-
 .../core/model/recent-activity/recent-activity.model.ts    | 3 ++-
 .../src/app/ui/dashboard/drafts/drafts.component.html      | 2 +-
 .../src/app/ui/dashboard/drafts/drafts.component.ts        | 2 +-
 .../recent-edited-activity.component.ts                    | 2 +-
 .../recent-edited-dataset-activity.component.html          | 2 +-
 .../recent-edited-dataset-activity.component.ts            | 2 +-
 .../listing/listing-item/dataset-listing-item.component.ts | 7 ++++---
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
index 3ce5fa9cb..c4aa19530 100644
--- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
+++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
@@ -1,3 +1,5 @@
+import { DatasetProfileModel } from './dataset-profile';
+
 export interface DatasetListingModel {
 	id: string;
 	label: String;
@@ -6,7 +8,7 @@ export interface DatasetListingModel {
 	grant: String;
 	grantId: String;
 	grantAbbreviation: String;
-	profile: String;
+	profile: DatasetProfileModel;
 	dataRepositories: String;
 	registries: String;
 	services: String;
diff --git a/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts b/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts
index 871211661..b1cf43c60 100644
--- a/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts
+++ b/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts
@@ -1,5 +1,6 @@
 import { RecentActivityType } from '@app/core/common/enum/recent-activity-type';
 import { UserInfoListingModel } from '../user/user-info-listing';
+import { DatasetProfileModel } from '../dataset/dataset-profile';
 
 export class RecentActivityModel {
 	id: string;
@@ -14,7 +15,7 @@ export class RecentActivityModel {
 	grantId: String;
 	finalizedAt: Date;
 	publishedAt: Date;
-	profile: String;
+	profile: DatasetProfileModel;
 	type: RecentActivityType;
 	users: UserInfoListingModel[];
 	public: boolean;
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
index 6a45a9359..54a29ff83 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
@@ -53,7 +53,7 @@
 				<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 			</div>
 			<mat-menu #actionsMenu="matMenu">
-				<button mat-menu-item (click)="openDmpSearchDialogue(activity.id)" class="menu-item">
+				<button mat-menu-item (click)="openDmpSearchDialogue(activity)" class="menu-item">
 					<mat-icon>file_copy</mat-icon>{{'DATASET-WIZARD.ACTIONS.COPY-DATASET' | translate}}
 				</button>
 				<button mat-menu-item *ngIf="!lockStatusMap.get(activity.id)" (click)="openConfirm(activity.id)" class="menu-item">
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
index 42a12f192..1de3f2530 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
@@ -152,7 +152,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 			data: {
 				formControl: formControl,
 				datasetId: dataset.id,
-				datasetProfileId: dataset.profile,
+				datasetProfileId: dataset.profile.id,
 				datasetProfileExist: false,
 				confirmButton: this.language.instant('DATASET-WIZARD.DIALOGUE.COPY'),
 				cancelButton: this.language.instant('DATASET-WIZARD.DIALOGUE.CANCEL')
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
index 31019d41d..aa7f92fe9 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
@@ -385,7 +385,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 			data: {
 				formControl: formControl,
 				datasetId: dataset.id,
-				datasetProfileId: dataset.profile,
+				datasetProfileId: dataset.profile.id,
 				datasetProfileExist: false,
 				confirmButton: this.language.instant('DATASET-WIZARD.DIALOGUE.COPY'),
 				cancelButton: this.language.instant('DATASET-WIZARD.DIALOGUE.CANCEL')
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
index 41168feab..ab1d466a3 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
@@ -53,7 +53,7 @@
 				<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 			</div>
 			<mat-menu #actionsMenu="matMenu">
-				<button mat-menu-item *ngIf="isAuthenticated()" (click)="openDmpSearchDialogue(activity.id)" class="menu-item">
+				<button mat-menu-item *ngIf="isAuthenticated()" (click)="openDmpSearchDialogue(activity)" class="menu-item">
 					<mat-icon>file_copy</mat-icon>{{'DATASET-WIZARD.ACTIONS.COPY-DATASET' | translate}}
 				</button>
 				<button mat-menu-item *ngIf="!lockStatusMap.get(activity.id)" (click)="openConfirm(activity.id)" class="menu-item">
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
index 33d6a1b47..0785a1d8f 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
@@ -165,7 +165,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
 			data: {
 				formControl: formControl,
 				datasetId: dataset.id,
-				datasetProfileId: dataset.profile,
+				datasetProfileId: dataset.profile.id,
 				datasetProfileExist: false,
 				confirmButton: this.language.instant('DATASET-WIZARD.DIALOGUE.COPY'),
 				cancelButton: this.language.instant('DATASET-WIZARD.DIALOGUE.CANCEL')
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
index 33c1d0079..8558a5e88 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
@@ -164,7 +164,7 @@ export class DatasetListingItemComponent extends BaseComponent implements OnInit
 			data: {
 				formControl: formControl,
 				datasetId: dataset.id,
-				datasetProfileId: dataset.profile,
+				datasetProfileId: dataset.profile.id,
 				datasetProfileExist: false,
 				confirmButton: this.language.instant('DATASET-WIZARD.DIALOGUE.COPY'),
 				cancelButton: this.language.instant('DATASET-WIZARD.DIALOGUE.CANCEL')
@@ -174,8 +174,9 @@ export class DatasetListingItemComponent extends BaseComponent implements OnInit
 		dialogRef.afterClosed().pipe(takeUntil(this._destroyed))
 			.subscribe(result => {
 				if (result && result.datasetProfileExist) {
-					const newDmpId = result.formControl.value.id
-					this.router.navigate(['/datasets/copy/' + result.datasetId], { queryParams: { newDmpId: newDmpId } });
+					const newDmpId = result.formControl.value.id;
+					let url = this.router.createUrlTree(['/datasets/copy/', result.datasetId, { newDmpId: newDmpId }]);
+					window.open(url.toString(), '_blank');
 				}
 			});
 	}