Fixed and improved the recent activity manager
This commit is contained in:
parent
7197892352
commit
acf8b58728
|
@ -224,25 +224,33 @@ public class DashBoardManager {
|
||||||
.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
|
.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
|
||||||
.orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
|
.orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
|
||||||
.skip(tableRequest.getOffset())
|
.skip(tableRequest.getOffset())
|
||||||
.take(tableRequest.getSize())
|
.take(tableRequest.getLength())
|
||||||
.selectAsync(item -> {
|
.selectAsync(item -> {
|
||||||
return new RecentDmpModel().fromEntity(item);
|
return new RecentDmpModel().fromEntity(item);
|
||||||
})
|
})
|
||||||
.whenComplete((dmpActivities, throwable) -> recentActivityModels.addAll(dmpActivities));
|
.whenComplete((dmpActivities, throwable) -> {
|
||||||
|
if (dmpActivities != null) {
|
||||||
|
recentActivityModels.addAll(dmpActivities);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
CompletableFuture<List<RecentActivityModel>> datasets = datasetList
|
CompletableFuture<List<RecentActivityModel>> datasets = datasetList
|
||||||
.withHint(HintedModelFactory.getHint(DatasetListingModel.class))
|
.withHint(HintedModelFactory.getHint(DatasetListingModel.class))
|
||||||
.orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
|
.orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
|
||||||
.skip(tableRequest.getOffset())
|
.skip(tableRequest.getOffset())
|
||||||
.take(tableRequest.getSize())
|
.take(tableRequest.getLength())
|
||||||
.selectAsync(item -> {
|
.selectAsync(item -> {
|
||||||
return new RecentDatasetModel().fromEntity(item);
|
return new RecentDatasetModel().fromEntity(item);
|
||||||
})
|
})
|
||||||
.whenComplete((datasetActivities, throwable) -> recentActivityModels.addAll(datasetActivities));
|
.whenComplete((datasetActivities, throwable) -> {
|
||||||
|
if (datasetActivities != null) {
|
||||||
|
recentActivityModels.addAll(datasetActivities);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
CompletableFuture.allOf(dmps, datasets).join();
|
CompletableFuture.allOf(dmps, datasets).join();
|
||||||
|
|
||||||
return recentActivityModels.stream().sorted(this.comparators.get(tableRequest.getCriteria().getOrder())).collect(Collectors.toList());
|
return recentActivityModels.stream().sorted(this.comparators.get(tableRequest.getCriteria().getOrder())).limit(tableRequest.getLength()).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SearchBarItem> searchUserData(String like, Principal principal) {
|
public List<SearchBarItem> searchUserData(String like, Principal principal) {
|
||||||
|
|
Loading…
Reference in New Issue