From f0a08c2059d909f6c2c3ebe12489e2a0de95bb7f Mon Sep 17 00:00:00 2001 From: Krishna Subramanian Date: Tue, 19 Sep 2023 14:58:23 +0200 Subject: [PATCH] Revert sorting rollout targets by address --- .../repository/builder/RolloutCreate.java | 9 -------- .../hawkbit/repository/model/Rollout.java | 2 -- .../TenantConfigurationProperties.java | 5 ----- .../builder/AbstractRolloutUpdateCreate.java | 17 --------------- .../repository/jpa/JpaRolloutExecutor.java | 15 ++----------- .../repository/jpa/JpaRolloutManagement.java | 1 - .../jpa/builder/JpaRolloutCreate.java | 1 - .../repository/jpa/model/JpaRollout.java | 7 ------- ...emove_column_is_sorted_by_address__DB2.sql | 2 ++ ...remove_column_is_sorted_by_address__H2.sql | 2 ++ ...ove_column_is_sorted_by_address__MYSQL.sql | 2 ++ ...olumn_is_sorted_by_address__POSTGRESQL.sql | 2 ++ ...olumn_is_sorted_by_address__SQL_SERVER.sql | 2 ++ .../mappers/RolloutToProxyRolloutMapper.java | 1 - .../ui/common/data/proxies/ProxyRollout.java | 21 ------------------- .../common/data/proxies/ProxyRolloutForm.java | 5 ----- .../data/proxies/ProxyRolloutWindow.java | 20 ------------------ .../window/components/RolloutFormLayout.java | 17 --------------- .../AddRolloutWindowController.java | 3 +-- .../layouts/AddRolloutWindowLayout.java | 2 +- .../layouts/UpdateRolloutWindowLayout.java | 2 +- .../ui/utils/UIComponentIdProvider.java | 6 ------ .../src/main/resources/messages.properties | 1 - 23 files changed, 15 insertions(+), 130 deletions(-) create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_30__remove_column_is_sorted_by_address__DB2.sql create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_30__remove_column_is_sorted_by_address__H2.sql create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_30__remove_column_is_sorted_by_address__MYSQL.sql create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/POSTGRESQL/V1_12_30__remove_column_is_sorted_by_address__POSTGRESQL.sql create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_30__remove_column_is_sorted_by_address__SQL_SERVER.sql diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java index 7cc1c32aec..f8cd2e6b21 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java @@ -111,15 +111,6 @@ RolloutCreate targetFilterQuery( */ RolloutCreate startAt(Long startAt); - /** - * set isSortedByAddress - * - * @param isSortedByAddress - * for {@link Rollout#getIsSortedByAddress()} ()} - * @return updated builder instance - */ - RolloutCreate isSortedByAddress(boolean isSortedByAddress); - /** * @return peek on current state of {@link Rollout} in the builder */ diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java index 58f792169c..2fac6b9ba4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java @@ -44,8 +44,6 @@ public interface Rollout extends NamedEntity { boolean getIsCleanedUp(); - boolean getIsSortedByAddress(); - /** * @return {@link DistributionSet} that is rolled out */ diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java index 05b2c0d93a..c442ef55cc 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java @@ -121,11 +121,6 @@ public static class TenantConfigurationKey { */ public static final String ROLLOUT_APPROVAL_ENABLED = "rollout.approval.enabled"; - /** - * Represents setting if targets within a rollout group should be sorted by address - */ - public static final String ROLLOUT_SORT_OPTION_ENALBED = "rollout.sort.enabled"; - /** * Option setting for text search in target attributes */ diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java index dd4316711b..f43e374b6c 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java @@ -34,7 +34,6 @@ public abstract class AbstractRolloutUpdateCreate extends AbstractNamedEntity protected ActionType actionType; protected Long forcedTime; protected Long startAt; - protected boolean isSortedByAddress; @Min(Action.WEIGHT_MIN) @Max(Action.WEIGHT_MAX) @@ -112,18 +111,6 @@ public T startAt(final Long startAt) { return (T) this; } - /** - * Set start of the Rollout - * - * @param isSortedByAddress - * start time point - * @return this builder - */ - public T isSortedByAddress(final boolean isSortedByAddress) { - this.isSortedByAddress = isSortedByAddress; - return (T) this; - } - public Optional getSet() { return Optional.ofNullable(set); } @@ -143,8 +130,4 @@ public Optional getWeight() { public Optional getStartAt() { return Optional.ofNullable(startAt); } - - public boolean getIsSortedByAddress() { - return isSortedByAddress; - } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java index 6944ef9a97..d16a38d1de 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java @@ -574,21 +574,10 @@ private Long assignTargetsToGroupInNewTransaction(final JpaRollout rollout, fina final PageRequest pageRequest = PageRequest.of(0, Math.toIntExact(limit)); final List readyGroups = RolloutHelper.getGroupsByStatusIncludingGroup(rollout.getRolloutGroups(), RolloutGroupStatus.READY, group); - final boolean useAddressForSorting = rollout.getIsSortedByAddress(); - - final Comparator addressStringComparator = Comparator.comparing(o -> o.getAddress().toString()); final Slice targets = targetManagement.findByTargetFilterQueryAndNotInRolloutGroupsAndCompatible( pageRequest, readyGroups, targetFilter, rollout.getDistributionSet().getType()); - List targetList = targets.stream().collect(Collectors.toList()); - - if (useAddressForSorting) { - targetList = targetList.stream().sorted(addressStringComparator).collect(Collectors.toList()); - } - - LOGGER.debug("Assigning {} targets to rollout with Id {}", targets.getNumberOfElements(), rollout.getId()); - LOGGER.debug("Targets in the rollout group are \n{}", targetList.stream().map(target -> target.getId() + ":" + target.getAddress()).collect(Collectors.joining(", ", "{", "}"))); - createAssignmentOfTargetsToGroup(targetList, group); + createAssignmentOfTargetsToGroup(targets, group); return Long.valueOf(targets.getNumberOfElements()); }); } @@ -652,7 +641,7 @@ private Long createActionsForTargetsInNewTransaction(final long rolloutId, final }); } - private void createAssignmentOfTargetsToGroup(final List targets, final RolloutGroup group) { + private void createAssignmentOfTargetsToGroup(final Slice targets, final RolloutGroup group) { targets.forEach(target -> rolloutTargetGroupRepository.save(new RolloutTargetGroup(group, target))); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java index 1aab59a64c..a0ec603ced 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java @@ -536,7 +536,6 @@ public Rollout update(final RolloutUpdate u) { update.getActionType().ifPresent(rollout::setActionType); update.getForcedTime().ifPresent(rollout::setForcedTime); update.getWeight().ifPresent(rollout::setWeight); - rollout.setIsSortedByAddress(update.getIsSortedByAddress()); // reseting back to manual start is done by setting start at time to // null diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java index 93d566ed32..faa1b08555 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java @@ -30,7 +30,6 @@ public JpaRollout build() { rollout.setTargetFilterQuery(targetFilterQuery); rollout.setStartAt(startAt); rollout.setWeight(weight); - rollout.setIsSortedByAddress(isSortedByAddress); if (actionType != null) { rollout.setActionType(actionType); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java index 5bc0deae94..e461c6536d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java @@ -143,9 +143,6 @@ public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, Event @Column(name = "is_cleaned_up", nullable = false) private boolean isCleanedUp = false; - @Column(name = "is_sorted_by_address", nullable = false) - private boolean isSortedByAddress = false; - @Transient private transient TotalTargetCountStatus totalTargetCountStatus; @@ -232,10 +229,6 @@ public void setWeight(final Integer weight) { public void setIsCleanedUp(final boolean isCleanedUp) { this.isCleanedUp = isCleanedUp; } - public boolean getIsSortedByAddress() { return isSortedByAddress; } - - public void setIsSortedByAddress(final boolean isSortedByAddress) { this.isSortedByAddress = isSortedByAddress; } - @Override public long getTotalTargets() { return totalTargets; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_30__remove_column_is_sorted_by_address__DB2.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_30__remove_column_is_sorted_by_address__DB2.sql new file mode 100644 index 0000000000..b3d342eb44 --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_30__remove_column_is_sorted_by_address__DB2.sql @@ -0,0 +1,2 @@ +ALTER TABLE sp_rollout +DROP COLUMN is_sorted_by_address; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_30__remove_column_is_sorted_by_address__H2.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_30__remove_column_is_sorted_by_address__H2.sql new file mode 100644 index 0000000000..b3d342eb44 --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_30__remove_column_is_sorted_by_address__H2.sql @@ -0,0 +1,2 @@ +ALTER TABLE sp_rollout +DROP COLUMN is_sorted_by_address; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_30__remove_column_is_sorted_by_address__MYSQL.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_30__remove_column_is_sorted_by_address__MYSQL.sql new file mode 100644 index 0000000000..b3d342eb44 --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_30__remove_column_is_sorted_by_address__MYSQL.sql @@ -0,0 +1,2 @@ +ALTER TABLE sp_rollout +DROP COLUMN is_sorted_by_address; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/POSTGRESQL/V1_12_30__remove_column_is_sorted_by_address__POSTGRESQL.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/POSTGRESQL/V1_12_30__remove_column_is_sorted_by_address__POSTGRESQL.sql new file mode 100644 index 0000000000..b3d342eb44 --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/POSTGRESQL/V1_12_30__remove_column_is_sorted_by_address__POSTGRESQL.sql @@ -0,0 +1,2 @@ +ALTER TABLE sp_rollout +DROP COLUMN is_sorted_by_address; \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_30__remove_column_is_sorted_by_address__SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_30__remove_column_is_sorted_by_address__SQL_SERVER.sql new file mode 100644 index 0000000000..b3d342eb44 --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_30__remove_column_is_sorted_by_address__SQL_SERVER.sql @@ -0,0 +1,2 @@ +ALTER TABLE sp_rollout +DROP COLUMN is_sorted_by_address; \ No newline at end of file diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java index 3e93a82ba7..b29d8564a2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java @@ -38,7 +38,6 @@ public ProxyRollout map(final Rollout rollout) { proxyRollout.setActionType(rollout.getActionType()); proxyRollout.setTargetFilterQuery(rollout.getTargetFilterQuery()); proxyRollout.setStartAt(rollout.getStartAt()); - proxyRollout.setIsSortedByAddress(rollout.getIsSortedByAddress()); return proxyRollout; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java index e99c52508e..9bd4b0348d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java @@ -44,8 +44,6 @@ public class ProxyRollout extends ProxyNamedEntity { private ActionType actionType; - private boolean isSortedByAddress; - /** * Constructor */ @@ -245,25 +243,6 @@ public void setStartAt(final Long startAt) { this.startAt = startAt; } - /** - * Gets the boolean isSortedByAddress - * - * @return isSortedByAddress - */ - public boolean getIsSortedByAddress() { - return isSortedByAddress; - } - - /** - * Sets the boolean isSortedByAddress - * - * @param isSortedByAddress - * A boolean that indicates if targets within a rollout group should be sorted by IP address - */ - public void setIsSortedByAddress(final boolean isSortedByAddress) { - this.isSortedByAddress = isSortedByAddress; - } - /** * Gets the total count of all the rollout status * diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java index d107e9a988..9bf109178d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java @@ -35,7 +35,6 @@ public class ProxyRolloutForm implements Serializable, NameAware, DsIdAware, Tar private Long forcedTime; private AutoStartOption autoStartOption; private Long startAt; - private boolean isSortedByAddress; /** * Gets the rollout form id @@ -147,8 +146,4 @@ public Long getStartAt() { public void setStartAt(final Long startAt) { this.startAt = startAt; } - public boolean getIsSortedByAddress() { - return isSortedByAddress; - } - public void setIsSortedByAddress(final boolean sortedByAddress) { this.isSortedByAddress = sortedByAddress; } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java index 23e7c03907..984dd63ec6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java @@ -55,7 +55,6 @@ public ProxyRolloutWindow(final ProxyRollout rollout) { setTargetFilterQuery(rollout.getTargetFilterQuery()); setDistributionSetInfo(rollout.getDsInfo()); setNumberOfGroups(rollout.getNumberOfGroups()); - setIsSortedByAddress(rollout.getIsSortedByAddress()); } /** @@ -471,23 +470,4 @@ public void setRolloutApproval(final ProxyRolloutApproval rolloutApproval) { public enum GroupDefinitionMode { SIMPLE, ADVANCED; } - - /** - * Sets the form isSortedByAddress - * - * @param isSortedByAddress - * rollout form isSortedByAddress - */ - public void setIsSortedByAddress(final boolean isSortedByAddress) { - rolloutForm.setIsSortedByAddress(isSortedByAddress); - } - - /** - * Gets the rollout form isSortedByAddress - * - * @return form isSortedByAddress - */ - public boolean getIsSortedByAddress() { - return rolloutForm.getIsSortedByAddress(); - } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java index daf0703f9b..36cf5f2f60 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java @@ -44,8 +44,6 @@ public class RolloutFormLayout extends ValidatableLayout { private static final String TEXTFIELD_NAME = "textfield.name"; private static final String CAPTION_ROLLOUT_START_TYPE = "caption.rollout.start.type"; private static final String CAPTION_ROLLOUT_ACTION_TYPE = "caption.rollout.action.type"; - private static final String CAPTION_ROLLOUT_SORT_OPTION = "caption.rollout.sort_option"; - private static final int CAPTION_COLUMN = 0; private static final int FIELD_COLUMN = 1; @@ -65,8 +63,6 @@ public class RolloutFormLayout extends ValidatableLayout { private final TextArea descriptionField; private final BoundComponent actionTypeLayout; private final BoundComponent autoStartOptionGroupLayout; - private final CheckBox sortOptionsCheckBox; - private Long rolloutId; private Long totalTargets; @@ -101,21 +97,11 @@ public RolloutFormLayout(final VaadinMessageSource i18n, this.descriptionField = createDescription(); this.actionTypeLayout = createActionTypeOptionGroupLayout(); this.autoStartOptionGroupLayout = createAutoStartOptionGroupLayout(); - this.sortOptionsCheckBox = createSortOptionsCheckBox(); addValueChangeListeners(); setValidationStatusByBinder(binder); } - /** - * Create checkbox for sorting targets in rollout group - * - * @return input component - */ - private CheckBox createSortOptionsCheckBox() { - return FormComponentBuilder.createCheckBox(UIComponentIdProvider.ROLLOUT_SORT_ENABLED_CHECKBOX, binder, ProxyRolloutForm::getIsSortedByAddress, ProxyRolloutForm::setIsSortedByAddress); - } - /** * Create name field. * @@ -277,9 +263,6 @@ private void addFormToLayout(final GridLayout layout, final Component targetFilt layout.addComponent(SPUIComponentProvider.generateLabel(i18n, CAPTION_ROLLOUT_START_TYPE), CAPTION_COLUMN, 5); layout.addComponent(autoStartOptionGroupLayout.getComponent(), FIELD_COLUMN, 5, lastColumn, 5); - - layout.addComponent(SPUIComponentProvider.generateLabel(i18n, CAPTION_ROLLOUT_SORT_OPTION), CAPTION_COLUMN, 6); - layout.addComponent(sortOptionsCheckBox, FIELD_COLUMN, 6, lastColumn, 6); } /** diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java index fdc53159be..bddb5a620c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java @@ -109,8 +109,7 @@ protected Rollout persistEntityInRepository(final ProxyRolloutWindow entity) { .targetFilterQuery(entity.getTargetFilterQuery()).actionType(entity.getActionType()) .forcedTime(entity.getActionType() == ActionType.TIMEFORCED ? entity.getForcedTime() : RepositoryModelConstants.NO_FORCE_TIME) - .startAt(entity.getStartAtByOption()) - .isSortedByAddress(entity.getIsSortedByAddress()); + .startAt(entity.getStartAtByOption()); final Rollout rolloutToCreate; if (GroupDefinitionMode.SIMPLE == entity.getGroupDefinitionMode()) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java index 377e851ff3..4345b47c97 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java @@ -79,7 +79,7 @@ public AddRolloutWindowLayout(final RolloutWindowDependencies dependencies) { @Override protected void addComponents(final GridLayout rootLayout) { - rootLayout.setRows(8); + rootLayout.setRows(7); final int lastRowIdx = rootLayout.getRows() - 1; final int lastColumnIdx = rootLayout.getColumns() - 1; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java index 2e08a59585..d5e69d4602 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java @@ -42,7 +42,7 @@ public UpdateRolloutWindowLayout(final RolloutWindowDependencies dependencies) { @Override protected void addComponents(final GridLayout rootLayout) { - rootLayout.setRows(7); + rootLayout.setRows(6); final int lastColumnIdx = rootLayout.getColumns() - 1; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java index dce2f04ae4..ccf0473131 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java @@ -1574,12 +1574,6 @@ public final class UIComponentIdProvider { */ public static final String ROLLOUT_APPROVAL_ENABLED_CHECKBOX = "rollout.approve.enabled.checkbox"; - /** - * Configuration checkbox for - * {@link TenantConfigurationKey#ROLLOUT_SORT_OPTION_ENALBED} - */ - public static final String ROLLOUT_SORT_ENABLED_CHECKBOX = "rollout.sort.enabled.checkbox"; - /** * Configuration checkbox for * {@link TenantConfigurationKey#TARGET_SEARCH_ATTRIBUTES_ENABLED} diff --git a/hawkbit-ui/src/main/resources/messages.properties b/hawkbit-ui/src/main/resources/messages.properties index aa0d90a1c6..86493c6f6d 100644 --- a/hawkbit-ui/src/main/resources/messages.properties +++ b/hawkbit-ui/src/main/resources/messages.properties @@ -843,7 +843,6 @@ caption.rollout.action.type = Action type message.rollout.remaining.targets.error = Not all targets are addressed textfield.rollout.copied.name = Copy of {0} label.rollout.targets.in.group = {0} in {1} -caption.rollout.sort_option = Sort targets by address caption.rollout.start.type = Start type caption.rollout.start.manual = Manual caption.rollout.start.manual.desc = The user starts the rollout manually.