From 74779d8054c8c0fd416d5e52bfea751554a8c210 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Thu, 25 Jul 2019 17:09:14 +0300
Subject: [PATCH] Fixed "XX Datasets" redirect links on DMP overview model.
 (Issue #144)

---
 .../listing/listing-item/dmp-listing-item.component.html    | 4 ++--
 .../dmp/listing/listing-item/dmp-listing-item.component.ts  | 4 ++--
 .../src/app/ui/dmp/overview/dmp-overview.component.html     | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
index 4f8155e6e..e591f89b5 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
@@ -55,10 +55,10 @@
 				<h4 class="mt-1 ml-1 mr-3 p-1">{{roleDisplay(dmp.users).toUpperCase()}}</h4>
 
 				<div class="datasets-counter">
-					<mat-icon (click)="$event.stopImmediatePropagation(); datasetClicked(dmp)" class="gray-icon pt-2" matTooltip="{{'DMP-LISTING.TOOLTIP.INVOLVED-DATASETS' | translate}}">
+					<mat-icon (click)="$event.stopImmediatePropagation(); datasetClicked(dmp.id)" class="gray-icon pt-2" matTooltip="{{'DMP-LISTING.TOOLTIP.INVOLVED-DATASETS' | translate}}">
 						storage
 					</mat-icon>
-					<h4 (click)="$event.stopImmediatePropagation(); datasetClicked(dmp)" class="mt-1 ml-1 mr-3 p-1">
+					<h4 (click)="$event.stopImmediatePropagation(); datasetClicked(dmp.id)" class="mt-1 ml-1 mr-3 p-1">
 						{{dmp.datasets.length}}</h4>
 				</div>
 
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
index 6ce67dd58..21a349f45 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
@@ -88,8 +88,8 @@ export class DmpListingItemComponent implements OnInit {
 		this.router.navigate(['/projects/edit/' + projectId]);
 	}
 
-	datasetClicked(dmp: DmpListingModel) {
-		this.router.navigate(['/datasets'], { queryParams: { dmpId: dmp.id } });
+	datasetClicked(dmpId: string) {
+		this.router.navigate(['/plans/edit/' + dmpId], { queryParams: { tab: "datasetDescriptions" } });
 	}
 
 	roleDisplay(value: any) {
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 55a23b67d..92d380926 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -66,7 +66,7 @@
 									<mat-icon matTooltip="{{'DMP-OVERVIEW.TOOLTIP.LEVEL-OF-ACCESS' | translate}}" class="gray-icon pt-2">settings</mat-icon>
 									<p class="mt-2 ml-1 mr-3 p-1">{{ roleDisplay(dmp.users) }}</p>
 
-									<div class="datasets-counter">
+									<div class="datasets-counter" *ngIf="!isPublishedDMP(dmp)">
 										<mat-icon matTooltip="{{'DMP-OVERVIEW.TOOLTIP.INVOLVED-DATASETS' | translate}}" class="gray-icon pt-2" (click)="datasetsClicked(dmp.id)">storage
 										</mat-icon>
 										<p class="mt-2 ml-1 p-1" (click)="datasetsClicked(dmp.id)">
@@ -75,6 +75,10 @@
 											{{'NAV-BAR.DATASETS' | translate}}</p>
 									</div>
 
+									<mat-icon matTooltip="{{'DMP-OVERVIEW.TOOLTIP.INVOLVED-DATASETS' | translate}}" class="gray-icon pt-2" *ngIf="isPublishedDMP(dmp)">storage</mat-icon>
+									<p class="mt-2 ml-1 p-1" *ngIf="isPublishedDMP(dmp)">{{ dmp.datasets.length }}</p>
+									<p class="mt-2 mr-3 p-1" *ngIf="isPublishedDMP(dmp)">{{'NAV-BAR.DATASETS' | translate}}</p>
+
 									<mat-icon matTooltip="{{'DMP-OVERVIEW.TOOLTIP.TEMPLATES-INVOLVED' | translate}}" class="gray-icon pt-2">assignment</mat-icon>
 									<p class="mt-2 ml-1 p-1">{{ dmp.associatedProfiles.length }}</p>
 									<p class="mt-2 mr-3 p-1">{{ 'DMP-EDITOR.FIELDS.TEMPLATES' | translate }}</p>