From b3b9de697977ff97643248a2da52a70b27718647 Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Thu, 6 Aug 2020 11:14:42 +0300
Subject: [PATCH 1/2] Add researchers to dmp in DatasetOverviewModel

---
 .../listingmodels/DataManagementPlanOverviewModel.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
index 362cd510d..e90d044c1 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
@@ -177,6 +177,9 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         this.label = entity.getLabel();
         this.groupId = entity.getGroupId();
         this.status = entity.getStatus();
+        if (entity.getResearchers() != null) {
+            this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
+        }
         return this;
     }
 
@@ -192,7 +195,9 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         this.datasets = entity.getDataset().stream().filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue()) && !dataset.getStatus().equals(Dataset.Status.CANCELED.getValue())).map(x-> new DatasetOverviewModel().fromDataModel(x)).collect(Collectors.toList());
         this.users = entity.getUsers().stream().map(x -> new UserInfoListingModel().fromDataModel(x)).collect(Collectors.toList());
         this.description = entity.getDescription();
-        this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
+        if (entity.getResearchers() != null) {
+            this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
+        }
 
         if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
             this.associatedProfiles = new LinkedList<>();

From 8fde8a684cdad16d3beea96a48aeb704a77b26e4 Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Thu, 6 Aug 2020 12:46:15 +0300
Subject: [PATCH 2/2] Navigate to dmp publicOverview from dataset overview when
 view is public

---
 .../ui/dataset/overview/dataset-overview.component.html  | 2 +-
 .../ui/dataset/overview/dataset-overview.component.ts    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 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 e178cd073..2787116db 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
@@ -65,7 +65,7 @@
 					</div>
 					<div class="row header">{{'DATASET-LISTING.TOOLTIP.PART-OF' | translate}}</div>
 					<div class="row ">
-						<button class="dmp-btn" (click)="dmpClicked(dataset.dmp.id)">
+						<button class="dmp-btn" (click)="dmpClicked(dataset.dmp)">
 							<div class="dmp-btn-label">
 								{{ this.dataset.dmp.label }}
 							</div>
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 62085aae5..afb0f5033 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
@@ -30,6 +30,7 @@ import { ResearcherModel } from '@app/core/model/researcher/researcher';
 import { LockService } from '@app/core/services/lock/lock.service';
 import { DatasetWizardModel } from '@app/core/model/dataset/dataset-wizard';
 import { DmpStatus } from '@app/core/common/enum/dmp-status';
+import { DmpOverviewModel } from '@app/core/model/dmp/dmp-overview';
 
 
 @Component({
@@ -269,8 +270,12 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
 		});
 	}
 
-	dmpClicked(dmpId: String) {
-		this.router.navigate(['/plans/overview/' + dmpId]);
+	dmpClicked(dmp: DmpOverviewModel) {
+		if (this.isPublicView) {
+			this.router.navigate(['/explore-plans/publicOverview/' + dmp.id]);
+		} else {
+			this.router.navigate(['/plans/overview/' + dmp.id]);
+		}
 	}
 
 	onDeleteCallbackSuccess(): void {