From 6f1e07d2581ad0e181886fe4c7824a6beabac2d4 Mon Sep 17 00:00:00 2001
From: venu1278 <venugopal.boodidadinne@in.bosch.com>
Date: Thu, 4 Feb 2016 12:56:27 +0530
Subject: [PATCH] 
 MECS-1452_Support_additional_field_name_and_operators_in_search_query

Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
---
 .../hawkbit/repository/TargetFields.java      |  2 ++
 .../CustomTargetBeanQuery.java                | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

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..0f38671d8 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
@@ -52,6 +52,8 @@ public enum TargetFields implements FieldNameProvider {
     ATTRIBUTE("targetInfo.controllerAttributes", true),
 
     ASSIGNEDDS("assignedDistributionSet", "name", "version"),
+
+    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..8cc0be3d7 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
@@ -99,11 +99,11 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
         Slice<Target> targetBeans;
         final List<ProxyTarget> proxyTargetBeans = new ArrayList<>();
         if (!Strings.isNullOrEmpty(filterQuery)) {
-            targetBeans = targetManagement.findTargetsAll(filterQuery,
-                    new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort));
+            targetBeans = targetManagement.findTargetsAll(filterQuery, new PageRequest(startIndex
+                    / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort));
         } else {
-            targetBeans = targetManagement.findTargetsAll(
-                    new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort));
+            targetBeans = targetManagement.findTargetsAll(new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE,
+                    SPUIDefinitions.PAGE_SIZE, sort));
         }
 
         for (final Target targ : targetBeans) {
@@ -126,17 +126,20 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
             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());
             prxyTarget.setTargetInfo(targ.getTargetInfo());
-            prxyTarget.setPollStatusToolTip(
-                    HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo().getPollStatus(), getI18N()));
+            prxyTarget.setPollStatusToolTip(HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo()
+                    .getPollStatus(), getI18N()));
             proxyTargetBeans.add(prxyTarget);
         }
         return proxyTargetBeans;