diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java index 1b4daaf66..0a696fdb6 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java @@ -51,7 +51,16 @@ public enum TargetFields implements FieldNameProvider { */ ATTRIBUTE("targetInfo.controllerAttributes", true), + /** + * distribution sets which is assigned to the target. + */ ASSIGNEDDS("assignedDistributionSet", "name", "version"), + + /** + * distribution sets which is installed on the target. + */ + INSTALLEDDS("targetInfo.installedDistributionSet", "name", "version"), + /** * The tags field. */ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java index 6cc44ce9f..51e384946 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java @@ -126,11 +126,14 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery { prxyTarget.setInstalledDistributionSet(installedDistributionSet); final DistributionSet assignedDistributionSet = target.getAssignedDistributionSet(); prxyTarget.setAssignedDistributionSet(assignedDistributionSet); + if (null != assignedDistributionSet) { - prxyTarget.setAssignedDistNameVersion(assignedDistributionSet.getName()); + prxyTarget.setAssignedDistNameVersion(HawkbitCommonUtil.getFormattedNameVersion( + assignedDistributionSet.getName(), assignedDistributionSet.getVersion())); } if (null != installedDistributionSet) { - prxyTarget.setInstalledDistNameVersion(installedDistributionSet.getName()); + prxyTarget.setInstalledDistNameVersion(HawkbitCommonUtil.getFormattedNameVersion( + installedDistributionSet.getName(), installedDistributionSet.getVersion())); } prxyTarget.setUpdateStatus(targ.getTargetInfo().getUpdateStatus()); prxyTarget.setLastTargetQuery(targ.getTargetInfo().getLastTargetQuery());