HPCC-23007 Files menu: file list, warning

Filter Icon updated, along with new color change feature and hover to display warning. Signed-off-by: Kunal Aswani <Kunal.Aswani@lexisnexisrisk.com>
hpcc-systems · Feb 24, 2020 · 4bac436 · 4bac436
1 parent 4d63d82
commit 4bac436
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/esp/src/eclwatch/DFUQueryWidget.js b/esp/src/eclwatch/DFUQueryWidget.js
@@ -77,6 +77,7 @@ define([
             this.inherited(arguments);
             this.workunitsTab = registry.byId(this.id + "_Workunits");
             this.filter = registry.byId(this.id + "Filter");
+            this.iconFilter = registry.byId(this.id + "IconFilter");
             this.clusterTargetSelect = registry.byId(this.id + "ClusterTargetSelect");
             this.importForm = registry.byId(this.id + "ImportForm");
             this.importTargetSelect = registry.byId(this.id + "ImportTargetSelect");
@@ -394,8 +395,8 @@ define([
             }).then(function (response) {
                 if (lang.exists("DFUQueryResponse", response)) {
                     if (response.DFUQueryResponse.Warning && dojo.byId(context.id).offsetParent !== null) {
-                        context.filter.open();
-                        context.filter.setFilterMessage(context.i18n.FilesWarning);
+                        context.filter.iconFilter.style.color = "red";
+                        context.filter.iconFilter.title = response.DFUQueryResponse.Warning;
                     } else {
                         context.filter.setFilterMessage("");
                     }
@@ -444,11 +445,13 @@ define([
             this.filter.on("clear", function (evt) {
                 context.refreshHRef();
                 context.refreshGrid();
+                context.checkIfWarning();
             });
             this.filter.on("apply", function (evt) {
                 context.refreshHRef();
                 context.workunitsGrid._currentPage = 0;
                 context.refreshGrid();
+                context.checkIfWarning();
             });
             topic.subscribe("hpcc/dfu_wu_completed", function (topic) {
                 context.refreshGrid();

diff --git a/esp/src/eclwatch/FilterDropDownWidget.js b/esp/src/eclwatch/FilterDropDownWidget.js
@@ -151,13 +151,15 @@ define([
 
         refreshState: function () {
             if (this.exists()) {
-                this.iconFilter.src = Utility.getImageURL("filter1.png");
+                this.iconFilter.style.color = "#1A9BD7";
+                this.iconFilter.title = this.i18n.Filter;
                 dom.byId(this.id + "FilterDropDown_label").innerHTML = this.params.ownLabel !== undefined && this.params.ownLabel !== null ? this.params.ownLabel : this.i18n.FilterSet;
                 domStyle.set(this.id + "FilterDropDown_label", {
                     "font-weight": "bold"
                 });
             } else {
-                this.iconFilter.src = Utility.getImageURL("noFilter1.png");
+                this.iconFilter.style.color = "lightgrey";
+                this.iconFilter.title = this.i18n.Filter;
                 dom.byId(this.id + "FilterDropDown_label").innerHTML = this.i18n.Filter;
                 domStyle.set(this.id + "FilterDropDown_label", {
                     "font-weight": "normal"

diff --git a/esp/src/eclwatch/templates/FilterDropDownWidget.html b/esp/src/eclwatch/templates/FilterDropDownWidget.html
@@ -1,5 +1,7 @@
 <span class="${baseClass}">
-    <img id="${id}IconFilter" src="${dojoConfig.urlInfo.resourcePath}/img/noFilter1.png" class="iconNoFilter" />
+    <span style="vertical-align: middle; font-size: 20px; color: lightgrey">
+        <i class="fa fa-filter" title="${i18n.Filter}" id="${id}IconFilter"></i>
+    </span>
     <div id="${id}FilterDropDown" data-dojo-type="dijit.form.DropDownButton">
         <span id="${id}FilterLabel">${i18n.Filter}</span>
         <div class="toolTip" data-dojo-type="dijit.TooltipDialog">