lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Simple UI: Add support for dynamic rollouts (#1635)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-02-09 16:32:59 +02:00
committed by GitHub
parent ab10b67d4e
commit 8446929e3b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java
View File

@@ -41,6 +41,7 @@ public interface Constants {
String START_TYPE = "Start Type"; String START_TYPE = "Start Type";
String MANUAL = "Manual"; String MANUAL = "Manual";
String AUTO = "Auto"; String AUTO = "Auto";
String DYNAMIC = "Dynamic";
String NAME_ASC = "name:asc"; String NAME_ASC = "name:asc";
} }

9
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java
View File

@@ -9,6 +9,7 @@
*/ */
package org.eclipse.hawkbit.ui.simple.view; package org.eclipse.hawkbit.ui.simple.view;
import com.vaadin.flow.component.checkbox.Checkbox;
import org.eclipse.hawkbit.ui.simple.HawkbitClient; import org.eclipse.hawkbit.ui.simple.HawkbitClient;
import org.eclipse.hawkbit.ui.simple.MainLayout; import org.eclipse.hawkbit.ui.simple.MainLayout;
import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
@@ -194,6 +195,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
private final TextField distributionSet = Utils.textField(Constants.DISTRIBUTION_SET); private final TextField distributionSet = Utils.textField(Constants.DISTRIBUTION_SET);
private final TextField actonType = Utils.textField(Constants.ACTION_TYPE); private final TextField actonType = Utils.textField(Constants.ACTION_TYPE);
private final TextField startAt = Utils.textField(Constants.START_AT); private final TextField startAt = Utils.textField(Constants.START_AT);
private final Checkbox dynamic = new Checkbox(Constants.DYNAMIC);
private final SelectionGrid<MgmtRolloutGroupResponseBody, Long> groupGrid; private final SelectionGrid<MgmtRolloutGroupResponseBody, Long> groupGrid;
private RolloutDetails(final HawkbitClient hawkbitClient) { private RolloutDetails(final HawkbitClient hawkbitClient) {
@@ -211,6 +213,9 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
field.setReadOnly(true); field.setReadOnly(true);
add(field); add(field);
}); });
dynamic.setReadOnly(true);
dynamic.setEnabled(false);
add(dynamic);
add(groupGrid); add(groupGrid);
setResponsiveSteps(new ResponsiveStep("0", 2)); setResponsiveSteps(new ResponsiveStep("0", 2));
@@ -235,6 +240,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
case TIMEFORCED -> "Scheduled at " + new Date(rollout.getForcetime()); case TIMEFORCED -> "Scheduled at " + new Date(rollout.getForcetime());
}); });
startAt.setValue(ObjectUtils.isEmpty(rollout.getStartAt()) ? "" : new Date(rollout.getStartAt()).toString()); startAt.setValue(ObjectUtils.isEmpty(rollout.getStartAt()) ? "" : new Date(rollout.getStartAt()).toString());
dynamic.setValue(rollout.isDynamic());
groupGrid.setItems(query -> groupGrid.setItems(query ->
hawkbitClient.getRolloutRestApi() hawkbitClient.getRolloutRestApi()
@@ -266,6 +272,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
private final NumberField groupNumber; private final NumberField groupNumber;
private final NumberField triggerThreshold; private final NumberField triggerThreshold;
private final NumberField errorThreshold; private final NumberField errorThreshold;
private final Checkbox dynamic = new Checkbox(Constants.DYNAMIC);
private final Button create = new Button("Create"); private final Button create = new Button("Create");
@@ -374,6 +381,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
name, distributionSet, targetFilter, description, name, distributionSet, targetFilter, description,
actionType, startType, actionType, startType,
groupNumber, triggerThreshold, errorThreshold, groupNumber, triggerThreshold, errorThreshold,
dynamic,
actions); actions);
add(layout); add(layout);
open(); open();
@@ -430,6 +438,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
request.setErrorAction( request.setErrorAction(
new MgmtRolloutErrorAction( new MgmtRolloutErrorAction(
MgmtRolloutErrorAction.ErrorAction.PAUSE, "")); MgmtRolloutErrorAction.ErrorAction.PAUSE, ""));
request.setDynamic(dynamic.getValue());
hawkbitClient.getRolloutRestApi().create(request).getBody(); hawkbitClient.getRolloutRestApi().create(request).getBody();
}); });
} }