ATLAS-2018: UI: Attribute filter does not preserve state

dashboardv2/public/js/router/Router.js

@@ -54,7 +54,11 @@ define([
                 'classificationDefCollection': this.classificationDefCollection
             }
             this.sharedObj = {
-                searchTableColumns: {}
+                searchTableColumns: {},
+                searchTableFilters: {
+                    tagFilters: {},
+                    entityFilters: {}
+                }
             }
         },
         bindCommonEvents: function() {

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -408,7 +408,11 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                 _.each(attrObj, function(obj) {
                     attrQuery.push(obj.id + "::" + obj.operator + "::" + obj.value + "::" + obj.type);
                 });
-                return attrQuery.join();
+                if (attrQuery.length) {
+                    return attrQuery.join();
+                } else {
+                    return null;
+                }
             } else {
                 return null;
             }

dashboardv2/public/js/views/business_catalog/SideNavLayoutView.js

@@ -83,7 +83,7 @@ define(['require',
             return events;
         },
         initialize: function(options) {
-            _.extend(this, _.pick(options, 'url', 'value', 'tag', 'selectFirst', 'classificationDefCollection', 'typeHeaders', 'searchVent', 'entityDefCollection', 'enumDefCollection', 'searchTableColumns'));
+            _.extend(this, _.pick(options, 'url', 'value', 'tag', 'selectFirst', 'classificationDefCollection', 'typeHeaders', 'searchVent', 'entityDefCollection', 'enumDefCollection', 'searchTableColumns', 'searchTableFilters'));
             if (Globals.taxonomy) {
                 this.tabClass = "tab col-sm-4";
             } else {
@@ -128,7 +128,8 @@ define(['require',
                     entityDefCollection: that.entityDefCollection,
                     enumDefCollection: that.enumDefCollection,
                     classificationDefCollection: that.classificationDefCollection,
-                    searchTableColumns: that.searchTableColumns
+                    searchTableColumns: that.searchTableColumns,
+                    searchTableFilters: that.searchTableFilters
                 }));
             });
         },

dashboardv2/public/js/views/search/QueryBuilderView.js

@@ -52,7 +52,7 @@ define(['require',
              * @constructs
              */
             initialize: function(options) {
-                _.extend(this, _.pick(options, 'attrObj', 'value', 'typeHeaders', 'entityDefCollection', 'enumDefCollection', 'tag'));
+                _.extend(this, _.pick(options, 'attrObj', 'value', 'typeHeaders', 'entityDefCollection', 'enumDefCollection', 'tag', 'searchTableFilters'));
                 this.attrObj = _.sortBy(this.attrObj, 'name');
                 this.filterType = this.tag ? 'tagFilters' : 'entityFilters';
             },
@@ -134,7 +134,7 @@ define(['require',
                 var that = this,
                     filters = [];
                 if (this.value) {
-                    var rules_widgets = CommonViewFunction.attributeFilter.extractUrl(this.value[this.filterType]);
+                    var rules_widgets = CommonViewFunction.attributeFilter.extractUrl(this.searchTableFilters[this.filterType][(this.tag ? this.value.tag : this.value.type)]);
                 }
                 _.each(this.attrObj, function(obj) {
                     var returnObj = that.getObjDef(obj, rules_widgets);

dashboardv2/public/js/views/search/SearchQueryView.js

@@ -50,7 +50,7 @@ define(['require',
              * @constructs
              */
             initialize: function(options) {
-                _.extend(this, _.pick(options, 'value', 'entityDefCollection', 'typeHeaders', 'searchVent', 'enumDefCollection', 'classificationDefCollection', 'tag'));
+                _.extend(this, _.pick(options, 'value', 'entityDefCollection', 'typeHeaders', 'searchVent', 'enumDefCollection', 'classificationDefCollection', 'tag', 'searchTableFilters'));
                 this.bindEvents();
                 var that = this;
                 this.modal = new Modal({
@@ -83,7 +83,8 @@ define(['require',
                     searchVent: this.searchVent,
                     entityDefCollection: this.entityDefCollection,
                     enumDefCollection: this.enumDefCollection,
-                    classificationDefCollection: this.classificationDefCollection
+                    classificationDefCollection: this.classificationDefCollection,
+                    searchTableFilters: this.searchTableFilters
                 }
 
                 if (this.tag) {