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 3dc89f416..5b5bf2d0f 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 @@ -325,9 +325,11 @@ public class DashBoardManager { recentActivityModels.addAll(dmps1.stream().map(dmp -> { DatasetCriteria datasetCriteria1 = new DatasetCriteria(); datasetCriteria1.setDmpIds(Collections.singletonList(dmp.getId())); + datasetCriteria1.setAllVersions(false); if (isAuthenticated) { dmp.setDataset(retrieveRelevantDatasets(datasetCriteria1, principal.getId())); } else { + datasetCriteria1.setIsPublic(true); dmp.setDataset(retrieveRelevantDatasets(datasetCriteria1)); } return new RecentDmpModel().fromDataModel(dmp); @@ -447,14 +449,14 @@ public class DashBoardManager { roles.add(1); datasetItems = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().getAuthenticated(datasetItems, userInfo, roles); } - Long maxDatasets = datasetItems.count(); + Long maxDatasets = datasetItems.distinct().count(); DatasetTableRequest datasetTableRequest = new DatasetTableRequest(); datasetTableRequest.setOffset(0); datasetTableRequest.setLength(3); Set datasetsSet = new LinkedHashSet<>(); try { datasetItems = PaginationManager.applyPaging(datasetItems, datasetTableRequest); - List datasets = datasetItems.toList(); + List datasets = datasetItems.distinct().toList(); datasetsSet.addAll(datasets); for (int i = 0; i < maxDatasets - datasets.size(); i++) { Dataset fakedataset = new Dataset();