open_in_new{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}
group_add{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}
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 0ac0dfe6a..6a24d7c2d 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
@@ -141,11 +141,6 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
this.router.navigate(['/plans/edit/' + dmp.id]);
}
- cloneClicked(dmp: DmpListingModel) {
- let url = this.router.createUrlTree(['/plans/clone/', dmp.id]);
- window.open(url.toString(), '_blank');
- }
-
deleteDmpClicked(dmp: DmpListingModel) {
this.lockService.checkLockStatus(dmp.id).pipe(takeUntil(this._destroyed))
.subscribe(lockStatus => {
@@ -375,19 +370,20 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
return filename;
}
- addDataset(activityId: String) {
- this.router.navigate(['/datasets/new/' + activityId]);
- }
-
newVersion(id: String, label: String) {
- this.router.navigate(['/plans/new_version/' + id, { dmpLabel: label }]);
+ let url = this.router.createUrlTree(['/plans/new_version/', id, { dmpLabel: label }]);
+ window.open(url.toString(), '_blank');
}
viewVersions(rowId: String, rowLabel: String, activity: DmpListingModel) {
- if (activity.public && !this.isUserOwner) {
- this.router.navigate(['/explore-plans/versions/' + rowId], { queryParams: { groupLabel: rowLabel } });
+ if (activity.public && !this.isUserOwner(activity)) {
+ let url = this.router.createUrlTree(['/explore-plans/versions/', rowId, { groupLabel: rowLabel }]);
+ window.open(url.toString(), '_blank');
+ // this.router.navigate(['/explore-plans/versions/' + rowId], { queryParams: { groupLabel: rowLabel } });
} else {
- this.router.navigate(['/plans/versions/' + rowId], { queryParams: { groupLabel: rowLabel } });
+ let url = this.router.createUrlTree(['/plans/versions/', rowId, { groupLabel: rowLabel }]);
+ window.open(url.toString(), '_blank');
+ // this.router.navigate(['/plans/versions/' + rowId], { queryParams: { groupLabel: rowLabel } });
}
}
@@ -409,8 +405,10 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
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');
+ // this.router.navigate(['/datasets/copy/' + result.datasetId], { queryParams: { newDmpId: newDmpId } });
}
});
}
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 81547c174..802b5895f 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
@@ -21,7 +21,7 @@