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

Add Simple UI Source & rename java package (#1542)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-01-11 18:50:14 +02:00
committed by GitHub
parent d1bdca04a1
commit ae47b1b338
17 changed files with 106 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hawkbit-runtime/hawkbit-simple-ui/pom.xml
View File

@@ -241,6 +241,18 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

4
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitClient.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitClient.java
View File

@@ -7,9 +7,9 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui; package org.eclipse.hawkbit.ui.simple;
import org.eclipse.hawkbit.ui.view.util.Utils; import org.eclipse.hawkbit.ui.simple.view.util.Utils;
import feign.Client; import feign.Client;
import feign.Contract; import feign.Contract;
import feign.Feign; import feign.Feign;

14
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java
View File

@@ -7,14 +7,14 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui; package org.eclipse.hawkbit.ui.simple;
import org.eclipse.hawkbit.ui.view.RolloutView; import org.eclipse.hawkbit.ui.simple.view.TargetView;
import org.eclipse.hawkbit.ui.view.TargetView; import org.eclipse.hawkbit.ui.simple.view.RolloutView;
import org.eclipse.hawkbit.ui.security.AuthenticatedUser; import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser;
import org.eclipse.hawkbit.ui.view.AboutView; import org.eclipse.hawkbit.ui.simple.view.AboutView;
import org.eclipse.hawkbit.ui.view.DistributionSetView; import org.eclipse.hawkbit.ui.simple.view.DistributionSetView;
import org.eclipse.hawkbit.ui.view.SoftwareModuleView; import org.eclipse.hawkbit.ui.simple.view.SoftwareModuleView;
import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.Unit;
import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.applayout.AppLayout;
import com.vaadin.flow.component.applayout.DrawerToggle; import com.vaadin.flow.component.applayout.DrawerToggle;

2
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleUIApp.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java
View File

@@ -7,7 +7,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui; package org.eclipse.hawkbit.ui.simple;
import com.vaadin.flow.component.page.AppShellConfigurator; import com.vaadin.flow.component.page.AppShellConfigurator;
import com.vaadin.flow.server.PWA; import com.vaadin.flow.server.PWA;

2
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java
View File

@@ -7,7 +7,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.security; package org.eclipse.hawkbit.ui.simple.security;
import com.vaadin.flow.spring.security.AuthenticationContext; import com.vaadin.flow.spring.security.AuthenticationContext;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

4
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java
View File

@@ -7,9 +7,9 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.security; package org.eclipse.hawkbit.ui.simple.security;
import org.eclipse.hawkbit.ui.view.LoginView; import org.eclipse.hawkbit.ui.simple.view.LoginView;
import com.vaadin.flow.spring.security.VaadinWebSecurity; import com.vaadin.flow.spring.security.VaadinWebSecurity;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

4
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java
View File

@@ -7,9 +7,9 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view; package org.eclipse.hawkbit.ui.simple.view;
import org.eclipse.hawkbit.ui.MainLayout; import org.eclipse.hawkbit.ui.simple.MainLayout;
import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.H2;
import com.vaadin.flow.component.html.Image; import com.vaadin.flow.component.html.Image;
import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout;

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

@@ -7,7 +7,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view; package org.eclipse.hawkbit.ui.simple.view;
public interface Constants { public interface Constants {

14
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java
View File

@@ -7,14 +7,14 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view; package org.eclipse.hawkbit.ui.simple.view;
import org.eclipse.hawkbit.ui.HawkbitClient; import org.eclipse.hawkbit.ui.simple.MainLayout;
import org.eclipse.hawkbit.ui.view.util.Filter; import org.eclipse.hawkbit.ui.simple.HawkbitClient;
import org.eclipse.hawkbit.ui.MainLayout; import org.eclipse.hawkbit.ui.simple.view.util.Filter;
import org.eclipse.hawkbit.ui.view.util.SelectionGrid; import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
import org.eclipse.hawkbit.ui.view.util.TableView; import org.eclipse.hawkbit.ui.simple.view.util.TableView;
import org.eclipse.hawkbit.ui.view.util.Utils; import org.eclipse.hawkbit.ui.simple.view.util.Utils;
import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.Key; import com.vaadin.flow.component.Key;
import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.Button;

4
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java
View File

@@ -7,9 +7,9 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view; package org.eclipse.hawkbit.ui.simple.view;
import org.eclipse.hawkbit.ui.security.AuthenticatedUser; import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser;
import com.vaadin.flow.component.login.LoginI18n; import com.vaadin.flow.component.login.LoginI18n;
import com.vaadin.flow.component.login.LoginOverlay; import com.vaadin.flow.component.login.LoginOverlay;
import com.vaadin.flow.router.BeforeEnterEvent; import com.vaadin.flow.router.BeforeEnterEvent;

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

@@ -7,14 +7,14 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view; package org.eclipse.hawkbit.ui.simple.view;
import org.eclipse.hawkbit.ui.HawkbitClient; import org.eclipse.hawkbit.ui.simple.HawkbitClient;
import org.eclipse.hawkbit.ui.view.util.Filter; import org.eclipse.hawkbit.ui.simple.MainLayout;
import org.eclipse.hawkbit.ui.MainLayout; import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
import org.eclipse.hawkbit.ui.view.util.SelectionGrid; import org.eclipse.hawkbit.ui.simple.view.util.TableView;
import org.eclipse.hawkbit.ui.view.util.TableView; import org.eclipse.hawkbit.ui.simple.view.util.Utils;
import org.eclipse.hawkbit.ui.view.util.Utils; import org.eclipse.hawkbit.ui.simple.view.util.Filter;
import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.Key; import com.vaadin.flow.component.Key;
import com.vaadin.flow.component.Text; import com.vaadin.flow.component.Text;
@@ -69,14 +69,15 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
private final RolloutDetails details = new RolloutDetails(hawkbitClient); private final RolloutDetails details = new RolloutDetails(hawkbitClient);
@Override @Override
protected void addColumns(final Grid<MgmtRolloutResponseBody> grid) { protected void addColumns(final Grid<MgmtRolloutResponseBody> grid) {
grid.addColumn(MgmtRolloutResponseBody::getRolloutId).setHeader(ID).setAutoWidth(true); grid.addColumn(MgmtRolloutResponseBody::getRolloutId).setHeader(Constants.ID).setAutoWidth(true);
grid.addColumn(MgmtRolloutResponseBody::getName).setHeader(NAME).setAutoWidth(true); grid.addColumn(MgmtRolloutResponseBody::getName).setHeader(Constants.NAME).setAutoWidth(true);
grid.addColumn(MgmtRolloutResponseBody::getTotalGroups).setHeader(GROUP_COUNT).setAutoWidth(true); grid.addColumn(MgmtRolloutResponseBody::getTotalGroups).setHeader(Constants.GROUP_COUNT).setAutoWidth(true);
grid.addColumn(MgmtRolloutResponseBody::getTotalTargets).setHeader(TARGET_COUNT).setAutoWidth(true); grid.addColumn(MgmtRolloutResponseBody::getTotalTargets).setHeader(Constants.TARGET_COUNT).setAutoWidth(true);
grid.addColumn(MgmtRolloutResponseBody::getTotalTargetsPerStatus).setHeader(STATS).setAutoWidth(true); grid.addColumn(MgmtRolloutResponseBody::getTotalTargetsPerStatus).setHeader(Constants.STATS).setAutoWidth(true);
grid.addColumn(MgmtRolloutResponseBody::getStatus).setHeader(STATUS).setAutoWidth(true); grid.addColumn(MgmtRolloutResponseBody::getStatus).setHeader(Constants.STATUS).setAutoWidth(true);
grid.addComponentColumn(rollout -> new Actions(rollout, grid, hawkbitClient)).setHeader(ACTIONS).setAutoWidth(true); grid.addComponentColumn(rollout -> new Actions(rollout, grid, hawkbitClient)).setHeader(
Constants.ACTIONS).setAutoWidth(true);
grid.setItemDetailsRenderer(new ComponentRenderer<>( grid.setItemDetailsRenderer(new ComponentRenderer<>(
() -> details, RolloutDetails::setItem)); () -> details, RolloutDetails::setItem));
@@ -84,7 +85,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
}, },
(query, rsqlFilter) -> hawkbitClient.getRolloutRestApi() (query, rsqlFilter) -> hawkbitClient.getRolloutRestApi()
.getRollouts( .getRollouts(
query.getOffset(), query.getPageSize(), NAME_ASC, rsqlFilter, null) query.getOffset(), query.getPageSize(), Constants.NAME_ASC, rsqlFilter, null)
.getBody() .getBody()
.getContent() .getContent()
.stream(), .stream(),
@@ -102,11 +103,11 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
new SelectionGrid.EntityRepresentation<>(MgmtRolloutGroupResponseBody.class, MgmtRolloutGroupResponseBody::getRolloutGroupId) { new SelectionGrid.EntityRepresentation<>(MgmtRolloutGroupResponseBody.class, MgmtRolloutGroupResponseBody::getRolloutGroupId) {
@Override @Override
protected void addColumns(final Grid<MgmtRolloutGroupResponseBody> grid) { protected void addColumns(final Grid<MgmtRolloutGroupResponseBody> grid) {
grid.addColumn(MgmtRolloutGroupResponseBody::getRolloutGroupId).setHeader(ID).setAutoWidth(true); grid.addColumn(MgmtRolloutGroupResponseBody::getRolloutGroupId).setHeader(Constants.ID).setAutoWidth(true);
grid.addColumn(MgmtRolloutGroupResponseBody::getName).setHeader(NAME).setAutoWidth(true); grid.addColumn(MgmtRolloutGroupResponseBody::getName).setHeader(Constants.NAME).setAutoWidth(true);
grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargets).setHeader(TARGET_COUNT).setAutoWidth(true); grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargets).setHeader(Constants.TARGET_COUNT).setAutoWidth(true);
grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargetsPerStatus).setHeader(STATS).setAutoWidth(true); grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargetsPerStatus).setHeader(Constants.STATS).setAutoWidth(true);
grid.addColumn(MgmtRolloutGroupResponseBody::getStatus).setHeader(STATUS).setAutoWidth(true); grid.addColumn(MgmtRolloutGroupResponseBody::getStatus).setHeader(Constants.STATUS).setAutoWidth(true);
} }
}); });
} }
@@ -163,7 +164,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
private static class RolloutFilter implements Filter.Rsql { private static class RolloutFilter implements Filter.Rsql {
private final TextField name = Utils.textField(NAME); private final TextField name = Utils.textField(Constants.NAME);
private RolloutFilter() { private RolloutFilter() {
name.setPlaceholder("<name filter>"); name.setPlaceholder("<name filter>");
@@ -184,15 +185,15 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
private final transient HawkbitClient hawkbitClient; private final transient HawkbitClient hawkbitClient;
private final TextArea description = new TextArea(DESCRIPTION); private final TextArea description = new TextArea(Constants.DESCRIPTION);
private final TextField createdBy = Utils.textField(CREATED_BY); private final TextField createdBy = Utils.textField(Constants.CREATED_BY);
private final TextField createdAt = Utils.textField(CREATED_AT); private final TextField createdAt = Utils.textField(Constants.CREATED_AT);
private final TextField lastModifiedBy = Utils.textField(LAST_MODIFIED_BY); private final TextField lastModifiedBy = Utils.textField(Constants.LAST_MODIFIED_BY);
private final TextField lastModifiedAt = Utils.textField(LAST_MODIFIED_AT); private final TextField lastModifiedAt = Utils.textField(Constants.LAST_MODIFIED_AT);
private final TextField targetFilter = Utils.textField(TARGET_FILTER); private final TextField targetFilter = Utils.textField(Constants.TARGET_FILTER);
private final TextField distributionSet = Utils.textField(DISTRIBUTION_SET); private final TextField distributionSet = Utils.textField(Constants.DISTRIBUTION_SET);
private final TextField actonType = Utils.textField(ACTION_TYPE); private final TextField actonType = Utils.textField(Constants.ACTION_TYPE);
private final TextField startAt = Utils.textField(START_AT); private final TextField startAt = Utils.textField(Constants.START_AT);
private final SelectionGrid<MgmtRolloutGroupResponseBody, Long> groupGrid; private final SelectionGrid<MgmtRolloutGroupResponseBody, Long> groupGrid;
private RolloutDetails(final HawkbitClient hawkbitClient) { private RolloutDetails(final HawkbitClient hawkbitClient) {
@@ -228,9 +229,9 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
.getDistributionSet(rollout.getDistributionSetId()).getBody(); .getDistributionSet(rollout.getDistributionSetId()).getBody();
distributionSet.setValue(distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion()); distributionSet.setValue(distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion());
actonType.setValue(switch (rollout.getType()) { actonType.setValue(switch (rollout.getType()) {
case SOFT -> SOFT; case SOFT -> Constants.SOFT;
case FORCED -> FORCED; case FORCED -> Constants.FORCED;
case DOWNLOAD_ONLY -> DOWNLOAD_ONLY; case DOWNLOAD_ONLY -> Constants.DOWNLOAD_ONLY;
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());
@@ -261,7 +262,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
private final Select<MgmtActionType> actionType; private final Select<MgmtActionType> actionType;
private final DateTimePicker forceTime = new DateTimePicker("Force Time"); private final DateTimePicker forceTime = new DateTimePicker("Force Time");
private final Select<StartType> startType; private final Select<StartType> startType;
private final DateTimePicker startAt = new DateTimePicker(START_AT); private final DateTimePicker startAt = new DateTimePicker(Constants.START_AT);
private final NumberField groupNumber; private final NumberField groupNumber;
private final NumberField triggerThreshold; private final NumberField triggerThreshold;
private final NumberField errorThreshold; private final NumberField errorThreshold;
@@ -277,7 +278,7 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
"Distribution Set", "Distribution Set",
this::readyToCreate, this::readyToCreate,
hawkbitClient.getDistributionSetRestApi() hawkbitClient.getDistributionSetRestApi()
.getDistributionSets(0, 30, NAME_ASC, null) .getDistributionSets(0, 30, Constants.NAME_ASC, null)
.getBody() .getBody()
.getContent() .getContent()
.toArray(new MgmtDistributionSet[0])); .toArray(new MgmtDistributionSet[0]));
@@ -289,54 +290,54 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
"Target Filter", "Target Filter",
this::readyToCreate, this::readyToCreate,
hawkbitClient.getTargetFilterQueryRestApi() hawkbitClient.getTargetFilterQueryRestApi()
.getFilters(0, 30, NAME_ASC, null, null) .getFilters(0, 30, Constants.NAME_ASC, null, null)
.getBody() .getBody()
.getContent() .getContent()
.toArray(new MgmtTargetFilterQuery[0])); .toArray(new MgmtTargetFilterQuery[0]));
targetFilter.setRequiredIndicatorVisible(true); targetFilter.setRequiredIndicatorVisible(true);
targetFilter.setItemLabelGenerator(MgmtTargetFilterQuery::getName); targetFilter.setItemLabelGenerator(MgmtTargetFilterQuery::getName);
targetFilter.setWidthFull(); targetFilter.setWidthFull();
description = new TextArea(DESCRIPTION); description = new TextArea(Constants.DESCRIPTION);
description.setMinLength(2); description.setMinLength(2);
description.setWidthFull(); description.setWidthFull();
actionType = new Select<>(); actionType = new Select<>();
actionType.setLabel(ACTION_TYPE); actionType.setLabel(Constants.ACTION_TYPE);
actionType.setItems(MgmtActionType.values()); actionType.setItems(MgmtActionType.values());
actionType.setValue(MgmtActionType.FORCED); actionType.setValue(MgmtActionType.FORCED);
final ComponentRenderer<Component, MgmtActionType> actionTypeRenderer = new ComponentRenderer<>(actionTypeO -> final ComponentRenderer<Component, MgmtActionType> actionTypeRenderer = new ComponentRenderer<>(actionTypeO ->
switch (actionTypeO) { switch (actionTypeO) {
case SOFT -> new Text(SOFT); case SOFT -> new Text(Constants.SOFT);
case FORCED -> new Text(FORCED); case FORCED -> new Text(Constants.FORCED);
case DOWNLOAD_ONLY -> new Text(DOWNLOAD_ONLY); case DOWNLOAD_ONLY -> new Text(Constants.DOWNLOAD_ONLY);
case TIMEFORCED -> forceTime; case TIMEFORCED -> forceTime;
}); });
actionType.addValueChangeListener(e -> actionType.setRenderer(actionTypeRenderer)); actionType.addValueChangeListener(e -> actionType.setRenderer(actionTypeRenderer));
actionType.setItemLabelGenerator(startTypeO -> actionType.setItemLabelGenerator(startTypeO ->
switch (startTypeO) { switch (startTypeO) {
case SOFT -> SOFT; case SOFT -> Constants.SOFT;
case FORCED -> FORCED; case FORCED -> Constants.FORCED;
case DOWNLOAD_ONLY -> DOWNLOAD_ONLY; case DOWNLOAD_ONLY -> Constants.DOWNLOAD_ONLY;
case TIMEFORCED -> "Time Forced at " + (forceTime.isEmpty() ? "" : " " + forceTime.getValue()); case TIMEFORCED -> "Time Forced at " + (forceTime.isEmpty() ? "" : " " + forceTime.getValue());
}); });
actionType.setWidthFull(); actionType.setWidthFull();
startType = new Select<>(); startType = new Select<>();
startType.setValue(StartType.MANUAL); startType.setValue(StartType.MANUAL);
startType.setLabel(START_TYPE); startType.setLabel(Constants.START_TYPE);
startType.setItems(StartType.values()); startType.setItems(StartType.values());
startType.setValue(StartType.MANUAL); startType.setValue(StartType.MANUAL);
final ComponentRenderer<Component, StartType> startTypeRenderer = new ComponentRenderer<>(startTypeO -> final ComponentRenderer<Component, StartType> startTypeRenderer = new ComponentRenderer<>(startTypeO ->
switch (startTypeO) { switch (startTypeO) {
case MANUAL -> new Text(MANUAL); case MANUAL -> new Text(Constants.MANUAL);
case AUTO -> new Text(AUTO); case AUTO -> new Text(Constants.AUTO);
case SCHEDULED -> startAt; case SCHEDULED -> startAt;
}); });
startType.setRenderer(startTypeRenderer); startType.setRenderer(startTypeRenderer);
startType.addValueChangeListener(e -> startType.setRenderer(startTypeRenderer)); startType.addValueChangeListener(e -> startType.setRenderer(startTypeRenderer));
startType.setItemLabelGenerator(startTypeO -> startType.setItemLabelGenerator(startTypeO ->
switch (startTypeO) { switch (startTypeO) {
case MANUAL -> MANUAL; case MANUAL -> Constants.MANUAL;
case AUTO -> AUTO; case AUTO -> Constants.AUTO;
case SCHEDULED -> "Scheduled" + (startAt.isEmpty() ? "" : " at " + startAt.getValue()); case SCHEDULED -> "Scheduled" + (startAt.isEmpty() ? "" : " at " + startAt.getValue());
}); });
startType.setWidthFull(); startType.setWidthFull();

14
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java
View File

@@ -7,14 +7,14 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view; package org.eclipse.hawkbit.ui.simple.view;
import org.eclipse.hawkbit.ui.HawkbitClient; import org.eclipse.hawkbit.ui.simple.HawkbitClient;
import org.eclipse.hawkbit.ui.view.util.Filter; import org.eclipse.hawkbit.ui.simple.MainLayout;
import org.eclipse.hawkbit.ui.view.util.SelectionGrid; import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
import org.eclipse.hawkbit.ui.MainLayout; import org.eclipse.hawkbit.ui.simple.view.util.TableView;
import org.eclipse.hawkbit.ui.view.util.TableView; import org.eclipse.hawkbit.ui.simple.view.util.Utils;
import org.eclipse.hawkbit.ui.view.util.Utils; import org.eclipse.hawkbit.ui.simple.view.util.Filter;
import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.Key; import com.vaadin.flow.component.Key;
import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.Button;

14
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java
View File

@@ -7,14 +7,14 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view; package org.eclipse.hawkbit.ui.simple.view;
import org.eclipse.hawkbit.ui.HawkbitClient; import org.eclipse.hawkbit.ui.simple.HawkbitClient;
import org.eclipse.hawkbit.ui.view.util.Filter; import org.eclipse.hawkbit.ui.simple.view.util.Filter;
import org.eclipse.hawkbit.ui.MainLayout; import org.eclipse.hawkbit.ui.simple.MainLayout;
import org.eclipse.hawkbit.ui.view.util.SelectionGrid; import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
import org.eclipse.hawkbit.ui.view.util.TableView; import org.eclipse.hawkbit.ui.simple.view.util.TableView;
import org.eclipse.hawkbit.ui.view.util.Utils; import org.eclipse.hawkbit.ui.simple.view.util.Utils;
import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.Key; import com.vaadin.flow.component.Key;
import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.Button;

2
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java
View File

@@ -7,7 +7,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view.util; package org.eclipse.hawkbit.ui.simple.view.util;
import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.HasValue; import com.vaadin.flow.component.HasValue;

2
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java
View File

@@ -7,7 +7,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view.util; package org.eclipse.hawkbit.ui.simple.view.util;
import com.google.common.collect.Streams; import com.google.common.collect.Streams;
import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.grid.Grid;

4
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java
View File

@@ -7,9 +7,9 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view.util; package org.eclipse.hawkbit.ui.simple.view.util;
import org.eclipse.hawkbit.ui.view.Constants; import org.eclipse.hawkbit.ui.simple.view.Constants;
import com.vaadin.flow.component.html.Div; import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.data.provider.Query; import com.vaadin.flow.data.provider.Query;

2
hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java → hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java
View File

@@ -7,7 +7,7 @@
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
package org.eclipse.hawkbit.ui.view.util; package org.eclipse.hawkbit.ui.simple.view.util;
import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.HasValue; import com.vaadin.flow.component.HasValue;