From 302a22e20acfa7eebe2c4eecac1a0552a4021cf0 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Fri, 20 Sep 2019 13:54:37 +0300
Subject: [PATCH] Fixes home page redirect bug and links of  'VIEW ALL' button
 - (Issue #161)

---
 .../app/ui/dashboard/dashboard.component.html | 35 ++++++-------------
 .../app/ui/dashboard/dashboard.component.ts   |  6 +++-
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index de1c123b3..7eec343f1 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -8,37 +8,27 @@
 	<div *ngIf="this.isAuthenticated()" class="container-fluid">
 		<div class="row" *ngIf="this.isAuthenticated()">
 			<div class="col-sm-6 col-md-6 col-lg-6">
-				<app-wizard title="{{'QUICKWIZARD.CREATE-ADD.CREATE.TITLE' | translate}}"
-					subtitle="{{'QUICKWIZARD.CREATE-ADD.CREATE.SUBTITLE' | translate}}" routerLink="/quick-wizard" icon="play_circle_outline">
+				<app-wizard title="{{'QUICKWIZARD.CREATE-ADD.CREATE.TITLE' | translate}}" subtitle="{{'QUICKWIZARD.CREATE-ADD.CREATE.SUBTITLE' | translate}}" routerLink="/quick-wizard" icon="play_circle_outline">
 				</app-wizard>
 			</div>
 			<div class="col-sm-6 col-md-6 col-lg-6">
-				<app-wizard title="{{'QUICKWIZARD.CREATE-ADD.ADD.TITLE' | translate}}"
-					subtitle="{{'QUICKWIZARD.CREATE-ADD.ADD.SUBTITLE' | translate}}" routerLink="/datasetcreatewizard"
-					icon="play_circle_outline"></app-wizard>
+				<app-wizard title="{{'QUICKWIZARD.CREATE-ADD.ADD.TITLE' | translate}}" subtitle="{{'QUICKWIZARD.CREATE-ADD.ADD.SUBTITLE' | translate}}" routerLink="/datasetcreatewizard" icon="play_circle_outline"></app-wizard>
 			</div>
 		</div>
 		<div class="row">
 			<div class="col-md-9">
 				<div class="row">
 					<div class="col-lg-3 col-md-6 col-sm-6">
-						<app-info-counter [title]="'DASHBOARD.MY-DMPS'"
-							[subtitle]="dashboardStatisticsData?.totalDataManagementPlanCount" routerLink='/plans'
-							buttonRedirectLink="/plans/new" icon="view_agenda"></app-info-counter>
+						<app-info-counter [title]="'DASHBOARD.MY-DMPS'" [subtitle]="dashboardStatisticsData?.totalDataManagementPlanCount" routerLink='/plans' buttonRedirectLink="/plans/new" icon="view_agenda"></app-info-counter>
 					</div>
 					<div class="col-lg-3 col-md-6 col-sm-6">
-						<app-info-counter [title]="'DASHBOARD.MY-DATASETS'"
-							[subtitle]="dashboardStatisticsData?.totalDataSetCount" routerLink='/datasets'
-							buttonRedirectLink="/datasets/new" icon="library_books"></app-info-counter>
+						<app-info-counter [title]="'DASHBOARD.MY-DATASETS'" [subtitle]="dashboardStatisticsData?.totalDataSetCount" routerLink='/datasets' buttonRedirectLink="/datasets/new" icon="library_books"></app-info-counter>
 					</div>
 					<div class="col-lg-3 col-md-6 col-sm-6">
-						<app-info-counter [title]="'DASHBOARD.MY-GRANTS'"
-							[subtitle]="dashboardStatisticsData?.totalGrantCount" routerLink='/grants'
-							buttonRedirectLink="/grants/new" icon="work_outline"></app-info-counter>
+						<app-info-counter [title]="'DASHBOARD.MY-GRANTS'" [subtitle]="dashboardStatisticsData?.totalGrantCount" routerLink='/grants' buttonRedirectLink="/grants/new" icon="work_outline"></app-info-counter>
 					</div>
 					<div class="col-lg-3 col-md-6 col-sm-6">
-						<app-info-counter [title]="'DASHBOARD.ORGANIZATIONS'"
-							[subtitle]="dashboardStatisticsData?.totalOrganisationCount" icon="scatter_plot">
+						<app-info-counter [title]="'DASHBOARD.ORGANIZATIONS'" [subtitle]="dashboardStatisticsData?.totalOrganisationCount" icon="scatter_plot">
 						</app-info-counter>
 					</div>
 				</div>
@@ -56,21 +46,16 @@
 	<div *ngIf="!this.isAuthenticated()" class="container-fluid">
 		<div class="row non-auth-stats">
 			<div class="col-lg-3 col-md-6 col-sm-6">
-				<app-info-counter [title]="'DASHBOARD.DMPS'"
-					[subtitle]="dashboardStatisticsData?.totalDataManagementPlanCount" routerLink='/plans'
-					buttonRedirectLink="/plans/new" icon="view_agenda"></app-info-counter>
+				<app-info-counter [title]="'DASHBOARD.DMPS'" [subtitle]="dashboardStatisticsData?.totalDataManagementPlanCount" routerLink='/explore-plans' buttonRedirectLink="/plans/new" icon="view_agenda"></app-info-counter>
 			</div>
 			<div class="col-lg-3 col-md-6 col-sm-6">
-				<app-info-counter [title]="'DASHBOARD.DATASETS'" [subtitle]="dashboardStatisticsData?.totalDataSetCount"
-					routerLink='/datasets' buttonRedirectLink="/datasets/new" icon="library_books"></app-info-counter>
+				<app-info-counter [title]="'DASHBOARD.DATASETS'" [subtitle]="dashboardStatisticsData?.totalDataSetCount" routerLink='/explore' buttonRedirectLink="/datasets/new" icon="library_books"></app-info-counter>
 			</div>
 			<div class="col-lg-3 col-md-6 col-sm-6">
-				<app-info-counter [title]="'DASHBOARD.GRANTS'" [subtitle]="dashboardStatisticsData?.totalGrantCount"
-					routerLink='/grants' buttonRedirectLink="/grants/new" icon="work_outline"></app-info-counter>
+				<app-info-counter [title]="'DASHBOARD.GRANTS'" [subtitle]="dashboardStatisticsData?.totalGrantCount" buttonRedirectLink="/grants/new" icon="work_outline"></app-info-counter>
 			</div>
 			<div class="col-lg-3 col-md-6 col-sm-6">
-				<app-info-counter title="Related Organizations"
-					[subtitle]="dashboardStatisticsData?.totalOrganisationCount" icon="scatter_plot"></app-info-counter>
+				<app-info-counter title="Related Organizations" [subtitle]="dashboardStatisticsData?.totalOrganisationCount" icon="scatter_plot"></app-info-counter>
 			</div>
 		</div>
 		<div class="d-flex flex-column align-items-center non-auth-title-container">
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
index c489236cf..7d7a429f4 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
@@ -162,7 +162,11 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
 	}
 
 	dmpClicked(dmp: DmpListingModel) {
-		this.router.navigate(['/plans/publicEdit/' + dmp.id]);
+		if (!this.isAuthenticated()) {
+			this.router.navigate(['../explore-plans/overview', dmp.id], { relativeTo: this.route });
+		} else {
+			this.router.navigate(['/plans/publicEdit/' + dmp.id]);
+		}
 	}
 
 	datasetClicked(dataset: DatasetListingModel) {