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

[#2527]: Simple UI/TargetView - handle no last poll (#2530)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-07-03 09:08:40 +03:00
committed by GitHub
parent 670ba00ff5
commit 047f94d4cb
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,4 +54,6 @@ public interface Constants {
String CANCEL_ESC = "Cancel (Esc)"; String CANCEL_ESC = "Cancel (Esc)";
String NAME_ASC = "name:asc"; String NAME_ASC = "name:asc";
String NOT_AVAILABLE_NULL = "n/a (null)";
} }

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

@@ -225,11 +225,9 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
targetFilter.setValue(rollout.getTargetFilterQuery()); targetFilter.setValue(rollout.getTargetFilterQuery());
final MgmtDistributionSet distributionSetMgmt = hawkbitClient.getDistributionSetRestApi() final MgmtDistributionSet distributionSetMgmt = hawkbitClient.getDistributionSetRestApi()
.getDistributionSet(rollout.getDistributionSetId()).getBody(); .getDistributionSet(rollout.getDistributionSetId()).getBody();
if (distributionSetMgmt == null) { // should not be here distributionSet.setValue(distributionSetMgmt == null
distributionSet.setValue("n/a (null)"); ? NOT_AVAILABLE_NULL // should not be the case
} else { : distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion());
distributionSet.setValue(distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion());
}
actonType.setValue(switch (rollout.getType()) { actonType.setValue(switch (rollout.getType()) {
case SOFT -> Constants.SOFT; case SOFT -> Constants.SOFT;
case FORCED -> Constants.FORCED; case FORCED -> Constants.FORCED;

4
hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java
View File

@@ -379,8 +379,8 @@ public class TargetView extends TableView<MgmtTarget, String> {
lastModifiedAt.setValue(new Date(target.getLastModifiedAt()).toString()); lastModifiedAt.setValue(new Date(target.getLastModifiedAt()).toString());
securityToken.setValue(target.getSecurityToken()); securityToken.setValue(target.getSecurityToken());
MgmtPollStatus pollStatus = target.getPollStatus(); final MgmtPollStatus pollStatus = target.getPollStatus();
lastPoll.setValue(new Date(pollStatus.getLastRequestAt()).toString()); lastPoll.setValue(pollStatus == null ? NOT_AVAILABLE_NULL : new Date(pollStatus.getLastRequestAt()).toString());
final ResponseEntity<MgmtTargetAttributes> response = hawkbitClient.getTargetRestApi().getAttributes(target.getControllerId()); final ResponseEntity<MgmtTargetAttributes> response = hawkbitClient.getTargetRestApi().getAttributes(target.getControllerId());
if (response.getStatusCode().is2xxSuccessful()) { if (response.getStatusCode().is2xxSuccessful()) {
targetAttributes.setValue(Objects.requireNonNullElse(response.getBody(), Collections.emptyMap()).entrySet().stream() targetAttributes.setValue(Objects.requireNonNullElse(response.getBody(), Collections.emptyMap()).entrySet().stream()