From 84830ba5d200b142027c2d457b87c6709002fd1f Mon Sep 17 00:00:00 2001
From: venu1278 <venugopal.boodidadinne@in.bosch.com>
Date: Thu, 4 Feb 2016 11:19:45 +0530
Subject: [PATCH] MECS-1454_Search_filter_improvements

Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
---
 .../CreateOrUpdateFilterHeader.java           | 38 ++++++++++---------
 .../FilterManagementView.java                 |  4 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
index 328b47b0b..c7ec3c008 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
@@ -117,8 +117,6 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
 
     private LayoutClickListener nameLayoutClickListner;
 
-    private Label targetFilterStatusLabel;
-
     private String newFilterQuery;
 
     /**
@@ -158,7 +156,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
             setUpCaptionLayout(true);
             resetComponents();
         } else if (custFUIEvent == CustomFilterUIEvent.TARGET_FILTER_STATUS_HIDE) {
-            this.getUI().access(() -> targetFilterStatusLabel.setVisible(false));
+            this.getUI().access(() -> showValidationSuccesIcon());
         }
 
     }
@@ -188,8 +186,10 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
 
     private Label createStatusIcon() {
         final Label statusIcon = new Label(FontAwesome.CHECK_CIRCLE.getHtml(), ContentMode.HTML);
-        statusIcon.addStyleName(SPUIStyleDefinitions.SUCCESS_ICON);
-        statusIcon.setSizeUndefined();
+        statusIcon.setValue(null);
+        statusIcon.addStyleName(SPUIStyleDefinitions.TARGET_FILTER_SEARCH_PROGRESS_INDICATOR_STYLE);
+        statusIcon.setVisible(false);
+        statusIcon.setImmediate(true);
         return statusIcon;
     }
 
@@ -203,11 +203,6 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
         nameTextField = createNameTextField();
         nameTextField.setWidth(380, Unit.PIXELS);
 
-        targetFilterStatusLabel = new Label();
-        targetFilterStatusLabel.addStyleName(SPUIStyleDefinitions.TARGET_FILTER_SEARCH_PROGRESS_INDICATOR_STYLE);
-        targetFilterStatusLabel.setVisible(false);
-        targetFilterStatusLabel.setImmediate(true);
-
         queryTextField = createSearchField();
         addSearchLisenter();
 
@@ -358,7 +353,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
 
     private void processQueryChange() {
         this.getUI().access(() -> {
-            targetFilterStatusLabel.setVisible(true);
+            validationIcon.setVisible(true);
             onQueryChange(newFilterQuery);
 
         });
@@ -368,12 +363,11 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
         boolean validationFailed = false;
         if (!Strings.isNullOrEmpty(text)) {
             final String input = text.toLowerCase();
-            searchLayout.addComponentAsFirst(targetFilterStatusLabel);
-            searchLayout.setComponentAlignment(targetFilterStatusLabel, Alignment.MIDDLE_CENTER);
-            searchLayout.addComponent(validationIcon, 2);
+            searchLayout.addComponentAsFirst(validationIcon);
+            searchLayout.setComponentAlignment(validationIcon, Alignment.MIDDLE_CENTER);
+            showValidationInProgress();
             final ValidationResult validationResult = FilterQueryValidation.getExpectedTokens(input);
             if (!validationResult.getIsValidationFailed()) {
-                showValidationSuccesIcon();
                 filterManagementUIState.setFilterQueryValue(input);
                 filterManagementUIState.setIsFilterByInvalidFilterQuery(Boolean.FALSE);
             } else {
@@ -417,14 +411,22 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
     }
 
     private void showValidationSuccesIcon() {
-        validationIcon.setValue(FontAwesome.CHECK_CIRCLE.getHtml());
-        validationIcon.setStyleName(SPUIStyleDefinitions.SUCCESS_ICON);
-        validationIcon.setDescription("");
+        if (null != filterManagementUIState.getFilterQueryValue()) {
+            validationIcon.setValue(FontAwesome.CHECK_CIRCLE.getHtml());
+            validationIcon.setStyleName(SPUIStyleDefinitions.SUCCESS_ICON);
+            validationIcon.setDescription("");
+        }
     }
 
     private void showValidationFailureIcon() {
         validationIcon.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
         validationIcon.setStyleName(SPUIStyleDefinitions.ERROR_ICON);
+
+    }
+
+    private void showValidationInProgress() {
+        validationIcon.setValue(null);
+        validationIcon.setStyleName(SPUIStyleDefinitions.TARGET_FILTER_SEARCH_PROGRESS_INDICATOR_STYLE);
     }
 
     private SPUIButton createSearchResetIcon() {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
index 072256203..606417311 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
@@ -63,8 +63,6 @@ public class FilterManagementView extends VerticalLayout implements View {
     @Autowired
     private transient EventBus.SessionEventBus eventBus;
 
-    private HorizontalLayout messageLabelLayout;
-
     @Override
     public void enter(final ViewChangeEvent event) {
         setSizeFull();
@@ -151,7 +149,7 @@ public class FilterManagementView extends VerticalLayout implements View {
     }
 
     private HorizontalLayout addTargetFilterMessageLabel() {
-        messageLabelLayout = new HorizontalLayout();
+        final HorizontalLayout messageLabelLayout = new HorizontalLayout();
         messageLabelLayout.addComponent(targetFilterCountMessageLabel);
         messageLabelLayout.addStyleName("footer-layout");
         messageLabelLayout.setWidth("100%");