RecentActivity can now be sorted by finalizedAt and publishedAt
This commit is contained in:
parent
83bd977484
commit
1c876cbcca
|
@ -50,7 +50,8 @@ public class DashBoardManager {
|
||||||
{ "created", Comparator.comparing(o -> ((RecentActivityModel)o).getCreated()).reversed()},
|
{ "created", Comparator.comparing(o -> ((RecentActivityModel)o).getCreated()).reversed()},
|
||||||
{ "label", Comparator.comparing(o -> ((RecentActivityModel)o).getTitle())},
|
{ "label", Comparator.comparing(o -> ((RecentActivityModel)o).getTitle())},
|
||||||
{ "status", Comparator.comparing(o -> ((RecentActivityModel)o).getStatus()).reversed()},
|
{ "status", Comparator.comparing(o -> ((RecentActivityModel)o).getStatus()).reversed()},
|
||||||
{ "finalized", Comparator.comparing(o -> ((RecentActivityModel)o).getFinalizedAt()).reversed()}
|
{ "finalizedAt", Comparator.comparing(o -> ((RecentActivityModel)o).getFinalizedAt(), Comparator.nullsLast(Comparator.naturalOrder())).reversed()},
|
||||||
|
{ "publishedAt", Comparator.comparing(o -> ((RecentActivityModel)o).getPublishedAt(), Comparator.nullsLast(Comparator.naturalOrder())).reversed()}
|
||||||
}).collect(Collectors.toMap(data -> (String) data[0], data -> (Comparator<RecentActivityModel>)data[1]));
|
}).collect(Collectors.toMap(data -> (String) data[0], data -> (Comparator<RecentActivityModel>)data[1]));
|
||||||
|
|
||||||
private ApiContext apiContext;
|
private ApiContext apiContext;
|
||||||
|
@ -265,6 +266,13 @@ public class DashBoardManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
PaginationService.applyOrder(dmpList, tableRequest.getOrderings());
|
PaginationService.applyOrder(dmpList, tableRequest.getOrderings());
|
||||||
|
for (int i = 0; i< tableRequest.getOrderings().getFields().length; i++) {
|
||||||
|
if (tableRequest.getOrderings().getFields()[i].contains("publishedAt")) {
|
||||||
|
String newField = tableRequest.getOrderings().getFields()[i].toCharArray()[0] + "dmp:publishedAt|join|";
|
||||||
|
tableRequest.getOrderings().getFields()[i] = newField;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PaginationService.applyOrder(datasetList, tableRequest.getOrderings());
|
||||||
|
|
||||||
/*CompletableFuture future = CompletableFuture.runAsync(() -> */{
|
/*CompletableFuture future = CompletableFuture.runAsync(() -> */{
|
||||||
recentActivityModels.addAll(dmpList
|
recentActivityModels.addAll(dmpList
|
||||||
|
|
|
@ -2,5 +2,7 @@ export enum RecentActivityOrder {
|
||||||
LABEL = "label",
|
LABEL = "label",
|
||||||
CREATED = "created",
|
CREATED = "created",
|
||||||
MODIFIED = "modified",
|
MODIFIED = "modified",
|
||||||
STATUS = "status"
|
STATUS = "status",
|
||||||
|
FINALIZED = "finalizedAt",
|
||||||
|
PUBLISHED = "publishedAt"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue