diff --git a/hawkbit-runtime/hawkbit-simple-ui/pom.xml b/hawkbit-runtime/hawkbit-simple-ui/pom.xml index db31aec64..620a0926c 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/pom.xml +++ b/hawkbit-runtime/hawkbit-simple-ui/pom.xml @@ -18,7 +18,6 @@ ${revision} - org.eclipse.hawkbit hawkbit-simple-ui ${revision} jar @@ -27,6 +26,7 @@ 24.2.2 4.0.4 + 13.0 @@ -86,18 +86,13 @@ io.github.openfeign feign-hc5 - 13.0 + ${openfeign-hc5.version} org.springframework.boot spring-boot-starter-validation - - - org.projectlombok - lombok - diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java index 4acd021c5..eb341b8cb 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java @@ -22,6 +22,7 @@ public interface Constants { String CREATED_AT = "Created at"; String LAST_MODIFIED_BY = "Last modified by"; String LAST_MODIFIED_AT = "Last modified at"; + String SECURITY_TOKEN = "Security Token"; // rollout String GROUP_COUNT = "Group Count"; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java index 82955ac69..92530c9ed 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java @@ -211,13 +211,15 @@ public class TargetView extends TableView { private final TextField createdAt = Utils.textField(Constants.CREATED_AT); private final TextField lastModifiedBy = Utils.textField(Constants.LAST_MODIFIED_BY); private final TextField lastModifiedAt = Utils.textField(Constants.LAST_MODIFIED_AT); + private final TextField securityToken = Utils.textField(Constants.SECURITY_TOKEN); private TargetDetails() { description.setMinLength(2); Stream.of( description, createdBy, createdAt, - lastModifiedBy, lastModifiedAt) + lastModifiedBy, lastModifiedAt, + securityToken) .forEach(field -> { field.setReadOnly(true); add(field); @@ -228,11 +230,12 @@ public class TargetView extends TableView { } private void setItem(final MgmtTarget target) { - description.setValue(target.getDescription()); + description.setValue(target.getDescription() == null ? "N/A" : target.getDescription()); createdBy.setValue(target.getCreatedBy()); createdAt.setValue(new Date(target.getCreatedAt()).toString()); lastModifiedBy.setValue(target.getLastModifiedBy()); lastModifiedAt.setValue(new Date(target.getLastModifiedAt()).toString()); + securityToken.setValue(target.getSecurityToken()); } }