From eb8e4a96e603d51ee4023ebf0cd46b081669e3ba Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Mon, 27 Jul 2020 18:16:32 +0300
Subject: [PATCH 1/3] Reworked Recent Activity ordering and force status to be
 ordered in reverse of the others

---
 .../eudat/data/query/PaginationService.java   |  7 +++++--
 .../logic/managers/DashBoardManager.java      | 21 +++++++++++++++++--
 .../RecentActivityTableRequest.java           | 10 +++++++++
 .../ui/dashboard/drafts/drafts.component.ts   |  6 +++---
 .../recent-edited-activity.component.ts       |  8 +++----
 ...ecent-edited-dataset-activity.component.ts |  6 +++---
 .../recent-edited-dmp-activity.component.ts   |  6 +++---
 .../listing/dataset-listing.component.ts      |  4 ++--
 .../ui/dmp/listing/dmp-listing.component.ts   |  4 ++--
 9 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java
index 7ee93cd6f..c21344140 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java
@@ -21,9 +21,12 @@ public class PaginationService {
             items.withFields(Arrays.asList(tableRequest.getSelection().getFields()));
         return items;
     }
-
     public static <T extends DataEntity> void applyOrder(QueryableList<T> items, TableQuery tableRequest)  {
-        ColumnOrderings columnOrderings = tableRequest.getOrderings();
+        applyOrder(items, tableRequest.getOrderings());
+    }
+
+
+    public static <T extends DataEntity> void applyOrder(QueryableList<T> items, ColumnOrderings columnOrderings)  {
         for (Ordering ordering : columnOrderings.getFieldOrderings()) {
             if (ordering.getOrderByType() == Ordering.OrderByType.ASC)
                 applyAscOrder(items, ordering);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
index d3c662182..b9761b6f9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
@@ -7,6 +7,7 @@ import eu.eudat.data.dao.entities.DatasetDao;
 import eu.eudat.data.dao.entities.OrganisationDao;
 import eu.eudat.data.dao.entities.GrantDao;
 import eu.eudat.data.entities.*;
+import eu.eudat.data.query.PaginationService;
 import eu.eudat.data.query.items.table.dmp.DataManagmentPlanPublicTableRequest;
 import eu.eudat.elastic.entities.Dmp;
 import eu.eudat.logic.builders.model.models.RecentActivityDataBuilder;
@@ -263,10 +264,12 @@ public class DashBoardManager {
 
         }
 
+        PaginationService.applyOrder(dmpList, tableRequest.getOrderings());
+
         /*CompletableFuture future = CompletableFuture.runAsync(() -> */{
             recentActivityModels.addAll(dmpList
                     .withHint(HintedModelFactory.getHint(RecentDmpModel.class))
-                    .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
+                   // .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
                     .skip(tableRequest.getDmpOffset())
                     .take(tableRequest.getLength())
                     .select(item -> {
@@ -282,7 +285,7 @@ public class DashBoardManager {
 
             recentActivityModels.addAll(datasetList
                     .withHint(HintedModelFactory.getHint(RecentDatasetModel.class))
-                    .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
+                  //  .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
                     .skip(tableRequest.getDatasetOffset())
                     .take(tableRequest.getLength())
                     .select(item -> {
@@ -290,6 +293,20 @@ public class DashBoardManager {
                     }));
         }/*);*/
 
+        //GK: Shuffle the deck otherwise we will summon the DMPodia when sorting with status
+        int pos = -1;
+        for (int i = (recentActivityModels.size() / 2); i < recentActivityModels.size(); i++) {
+            RecentActivityModel recentActivityModel = recentActivityModels.remove(i);
+
+            while (pos < recentActivityModels.size()) {
+                pos++;
+                if (pos % 2 != 0) {
+                    break;
+                }
+
+            }
+            recentActivityModels.add(pos, recentActivityModel);
+        }
 
         //CompletableFuture.allOf(future).join();
        // CompletableFuture.allOf(dmps, datasets).join();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java
index 39ce2933e..e50c8336d 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java
@@ -1,8 +1,10 @@
 package eu.eudat.models.data.dashboard.recent.tablerequest;
 
 import eu.eudat.criteria.RecentActivityCriteria;
+import eu.eudat.data.query.definition.helpers.ColumnOrderings;
 
 public class RecentActivityTableRequest {
+	private ColumnOrderings orderings;
 	private RecentActivityCriteria criteria;
 	private int dmpOffset;
 	private int datasetOffset;
@@ -39,4 +41,12 @@ public class RecentActivityTableRequest {
 	public void setCriteria(RecentActivityCriteria criteria) {
 		this.criteria = criteria;
 	}
+
+	public ColumnOrderings getOrderings() {
+		return orderings;
+	}
+
+	public void setOrderings(ColumnOrderings orderings) {
+		this.orderings = orderings;
+	}
 }
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 8efdd2a0a..8ab0d76b4 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
@@ -69,7 +69,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 		// const fields: Array<string> = [];
 		// fields.push('-modified');
 		this.formGroup.get('order').setValue(this.order.MODIFIED);
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		const dmpDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 5, { fields: fields });
 		dmpDataTableRequest.criteria = new DatasetCriteria();
 		dmpDataTableRequest.criteria.status = DmpStatus.Draft;
@@ -301,7 +301,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 	refresh(): void {
 		// const fields: Array<string> = [];
 		// fields.push('-modified');
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		this.startIndex = 0;
 		const dmpDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 5, { fields: fields });
 		dmpDataTableRequest.criteria = new DatasetCriteria();
@@ -317,7 +317,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 	public loadMore() {
 		this.startIndex = this.startIndex + this.pageSize;
 		// const fields: Array<string> = ["-modified"];
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
 		request.criteria = new DatasetCriteria();
 		request.criteria.status = DmpStatus.Draft;
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 6a24d7c2d..2b44bf203 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
@@ -75,12 +75,12 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 
 	ngOnInit() {
 		if (this.isAuthenticated()) {
-			const fields: Array<string> = [];
+			this.formGroup.get('order').setValue(this.order.MODIFIED);
+			const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 			// const fields: Array<string> = ["-modified"];
 			const allDataTableRequest: DataTableMultiTypeRequest<RecentActivityCriteria> = new DataTableMultiTypeRequest(0, 0, 5, { fields: fields });
 			allDataTableRequest.criteria = new RecentActivityCriteria();
 			allDataTableRequest.criteria.like = "";
-			this.formGroup.get('order').setValue(this.order.MODIFIED);
 			allDataTableRequest.criteria.order = this.formGroup.get('order').value;
 			this.dashboardService
 				.getRecentActivity(allDataTableRequest)
@@ -458,7 +458,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 	}
 
 	refresh(): void {
-		const fields: Array<string> = [];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		// const fields: Array<string> = ["-modified"];
 		this.startIndex = 0;
 		const allDataTableRequest: DataTableMultiTypeRequest<RecentActivityCriteria> = new DataTableMultiTypeRequest(0, 0, this.pageSize, { fields: fields });
@@ -481,7 +481,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 	}
 
 	public loadMore() {
-		const fields: Array<string> = [];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		// const fields: Array<string> = ["-modified"];
 		const request = new DataTableMultiTypeRequest<RecentActivityCriteria>(this.dmpOffset, this.datasetOffset, this.pageSize, { fields: fields });
 		request.criteria = new RecentActivityCriteria();
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 2c36090ed..b9ab17782 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
@@ -66,7 +66,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
 		if (this.isAuthenticated()) {
 			// const fields: Array<string> = ["-modified"];
 			this.formGroup.get('order').setValue(this.order.MODIFIED);
-			const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+			const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 			const datasetDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
 			datasetDataTableRequest.criteria = new DatasetCriteria();
 			datasetDataTableRequest.criteria.like = "";
@@ -88,7 +88,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
 
 	refresh(): void {
 		// const fields: Array<string> = ["-modified"];
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		this.startIndex = 0;
 		const datasetDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
 		datasetDataTableRequest.criteria = new DatasetCriteria();
@@ -105,7 +105,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
 	public loadMore() {
 		this.startIndex = this.startIndex + this.pageSize;
 		// const fields: Array<string> = ["-modified"];
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
 
 		request.criteria = new DatasetCriteria();
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
index e6ffc7132..eb2717c9c 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
@@ -68,7 +68,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
 		if (this.isAuthenticated()) {
 			// const fields: Array<string> = ["-modified"];
 			this.formGroup.get('order').setValue(this.order.MODIFIED);
-			const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+			const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 			const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(0, 5, { fields: fields });
 			dmpDataTableRequest.criteria = new DmpCriteria();
 			dmpDataTableRequest.criteria.like = "";
@@ -345,7 +345,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
 
 	refresh(): void {
 		// const fields: Array<string> = ["-modified"];
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		this.startIndex = 0;
 		const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields });
 		dmpDataTableRequest.criteria = new DmpCriteria();
@@ -362,7 +362,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
 	public loadMore() {
 		this.startIndex = this.startIndex + this.pageSize;
 		// const fields: Array<string> = ["-modified"];
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
 
 		request.criteria = new DmpCriteria();
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
index 0081ce8e5..fb0231159 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
@@ -152,7 +152,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 		// let fields: Array<string> = new Array();
 		// fields.push('-modified');
 		//if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; }
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
 		this.criteria.isPublic = this.isPublic;
 		request.criteria = this.criteria;
@@ -168,7 +168,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 	public loadMore() {
 		this.startIndex = this.startIndex + this.pageSize;
 		// const fields: Array<string> = ["-modified"];
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
 		this.criteria.isPublic = this.isPublic;
 		request.criteria = this.criteria;
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index e3461242d..8d10cf54a 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -185,7 +185,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 		// let fields: Array<string> = new Array();
 		// if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; }
 		// fields.push('-modified');
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 
 		const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
 		this.setPublicCriteria();
@@ -209,7 +209,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 	public loadMore() {
 		this.startIndex = this.startIndex + this.pageSize;
 		// const fields: Array<string> = ["-modified"];
-		const fields: Array<string> = ["-" + this.formGroup.get('order').value];
+		const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
 		const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
 		this.setPublicCriteria();
 		request.criteria = this.criteria;

From bd04e1b00f7c64b164655b3e058cc218e7327689 Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Tue, 28 Jul 2020 09:55:46 +0300
Subject: [PATCH 2/3] dashboard card width changed

---
 dmp-frontend/src/app/ui/dashboard/dashboard.component.html | 2 +-
 dmp-frontend/src/app/ui/dashboard/dashboard.component.scss | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index 72930cbfa..defc195ae 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -38,7 +38,7 @@
 				|| dashboardStatisticsData?.totalOrganisationCount !== 0">
 			<div class="main-content">
 				<div class="col">
-					<div class="card mt-0" [style.display]="isVisible ? 'block' : 'none'">
+					<div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'">
 						<a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a>
 						<p class="card-content mb-0 pt-0">
 							{{'DASHBOARD.DMP-ABOUT-BEG' | translate}}
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
index 7be22ca89..881873112 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
@@ -13,7 +13,8 @@
   background: #ffffff 0% 0% no-repeat padding-box;
   box-shadow: 0px 3px 6px #00000029;
   border-radius: 4px;
-  width: 712px;
+  max-width: 712px;
+  min-width: 17.5rem;
   margin-bottom: 3.75rem;
   /* height: 407px; */
   opacity: 1;

From b2aec001dc7cc10c32b4fa337399e01b39364d3d Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Tue, 28 Jul 2020 11:23:45 +0300
Subject: [PATCH 3/3] open listing items in the same page

---
 .../src/app/ui/dashboard/drafts/drafts.component.html         | 2 +-
 .../recent-edited-activity.component.html                     | 4 ++--
 .../recent-edited-dataset-activity.component.html             | 2 +-
 .../recent-edited-dmp-activity.component.html                 | 2 +-
 .../listing/listing-item/dataset-listing-item.component.html  | 2 +-
 .../dmp/listing/listing-item/dmp-listing-item.component.html  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

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 a48626cb8..85ff1e9f8 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
@@ -21,7 +21,7 @@
 	</div>
 	<div *ngFor="let activity of datasetDrafts">
 		<div class="dataset-card">
-			<a [routerLink]="['../datasets/overview/' + activity.id]" target="_blank" class="pointer">
+			<a [routerLink]="['../datasets/overview/' + activity.id]" class="pointer">
 				<div class="d-flex flex-direction-row">
 					<div class="col-auto dataset-label">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}</div>
 					<div class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index 7e402570a..f638431c6 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -22,7 +22,7 @@
 	<div *ngFor="let activity of allRecentActivities">
 		<div *ngIf="activity && activity.type === recentActivityTypeEnum.Dmp.valueOf()">
 			<div class="dmp-card">
-				<a [routerLink]="['../plans/overview/' + activity.id]" target="_blank" class="pointer">
+				<a [routerLink]="['../plans/overview/' + activity.id]" class="pointer">
 					<div class="d-flex flex-direction-row">
 						<div class="col-auto dmp-label">{{ 'DMP-LISTING.DMP' | translate }}</div>
 						<div class="col-auto ml-auto edited-date">{{ 'DMP-LISTING.EDITED' | translate }}: {{ activity.modified | date: "longDate" }}</div>
@@ -90,7 +90,7 @@
 		</div>
 		<div *ngIf="activity && activity.type === recentActivityTypeEnum.Dataset.valueOf()">
 			<div class="dataset-card">
-				<a [routerLink]="['../datasets/overview/' + activity.id]" target="_blank" class="pointer">
+				<a [routerLink]="['../datasets/overview/' + activity.id]" class="pointer">
 					<div class="d-flex flex-direction-row">
 						<div class="col-auto dataset-label">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}</div>
 						<div class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
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 802b5895f..0d8902156 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 @@
 	</div>
 	<div *ngFor="let activity of datasetActivities">
 		<div class="dataset-card">
-			<a [routerLink]="['../datasets/overview/' + activity.id]" target="_blank" class="pointer">
+			<a [routerLink]="['../datasets/overview/' + activity.id]" class="pointer">
 				<div class="d-flex flex-direction-row">
 					<div class="col-auto dataset-label">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}</div>
 					<div class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}</div>
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
index 43d543868..77a0cfb0e 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
@@ -21,7 +21,7 @@
 	</div>
 	<div *ngFor="let activity of dmpActivities">
 		<div class="dmp-card">
-			<a [routerLink]="['../plans/overview/' + activity.id]" target="_blank" class="pointer">
+			<a [routerLink]="['../plans/overview/' + activity.id]" class="pointer">
 				<div class="d-flex flex-direction-row">
 					<div class="col-auto dmp-label">{{ 'DMP-LISTING.DMP' | translate }}</div>
 					<div class="col-auto ml-auto edited-date">{{ 'DMP-LISTING.EDITED' | translate }}: {{ activity.modifiedTime | date: "longDate" }}</div>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
index d3ef8fcbc..2c0ffa8b2 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
@@ -1,5 +1,5 @@
 <div class="dataset-card">
-	<a [routerLink]="isPublic ? ['/datasets/publicOverview/' + dataset.id] : ['/datasets/overview/' + dataset.id]" target="_blank" class="pointer">
+	<a [routerLink]="isPublic ? ['/datasets/publicOverview/' + dataset.id] : ['/datasets/overview/' + dataset.id]" class="pointer">
 		<div class="d-flex flex-direction-row">
 			<div class="col-auto dataset-label">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}</div>
 			<div class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}</div>
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 807a4acd0..4af83d5d0 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
@@ -1,5 +1,5 @@
 <div class="dmp-card">
-	<a [routerLink]="isPublic ? ['/explore-plans/publicOverview/' + dmp.id] : ['/plans/overview/' + dmp.id]" target="_blank" class="pointer">
+	<a [routerLink]="isPublic ? ['/explore-plans/publicOverview/' + dmp.id] : ['/plans/overview/' + dmp.id]" class="pointer">
 		<div class="d-flex flex-direction-row">
 			<div class="col-auto dmp-label">{{ 'DMP-LISTING.DMP' | translate }}</div>
 			<div class="col-auto ml-auto edited-date">{{ 'DMP-LISTING.EDITED' | translate }}: {{ dmp.modifiedTime | date: "longDate" }}</div>