From d76188a382213cc029131c6f0505d326f08dac2c Mon Sep 17 00:00:00 2001 From: AnbazhakanSubramaniam <49298739+AnbazhakanSubramaniam@users.noreply.github.com> Date: Thu, 1 Aug 2019 12:43:59 +0530 Subject: [PATCH] Default sort order for targets and rollouts (ref #764) (#874) * Default sort order for targets and rollouts (ref #764) The default sort order has been change in order to show the newest targets and rollouts are always on the top. * Review Point handled : TARGET_TABLE_CREATE_AT_SORT_ORDER has been removed Signed-off-by: Anbazhakan Subramaniam --- .../hawkbit/ui/management/targettable/TargetBeanQuery.java | 2 +- .../eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java | 2 +- .../main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java index 71ff00e5c..590da14a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java @@ -44,7 +44,7 @@ public class TargetBeanQuery extends AbstractBeanQuery { private static final long serialVersionUID = -5645680058303167558L; - private Sort sort = new Sort(SPUIDefinitions.TARGET_TABLE_CREATE_AT_SORT_ORDER, "id"); + private Sort sort = new Sort(SPUIDefinitions.TARGET_TABLE_LASTMODIFIED_AT_SORT_ORDER, "lastModifiedAt"); private transient Collection status; private transient Boolean overdueState; private String[] targetTags; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java index 5d0ad67a9..0d3112741 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java @@ -43,7 +43,7 @@ public class RolloutBeanQuery extends AbstractBeanQuery { private final String searchText; - private Sort sort = new Sort(Direction.ASC, "id"); + private Sort sort = new Sort(Direction.DESC, "lastModifiedAt"); private transient RolloutManagement rolloutManagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java index 3cf21a8da..226c6bd31 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java @@ -346,7 +346,7 @@ public final class SPUIDefinitions { /** * Sort order of column - created at in target table. */ - public static final Direction TARGET_TABLE_CREATE_AT_SORT_ORDER = Direction.ASC; + public static final Direction TARGET_TABLE_LASTMODIFIED_AT_SORT_ORDER = Direction.DESC; /** * BUTTON- STATUS.