ATLAS-2272 : UI - Save the state of dragged columns using save search API.

dashboardv2/public/css/scss/search.scss

@@ -112,9 +112,18 @@ $color_celeste_approx: #1D1F2B;
         }
     }
 }
+.table-responsive{
+    position: relative;
+}
 
 .sindu_dragger {
     @extend .gu-mirror;
+    &.sindu_column {
+        li {
+            float: none !important;
+            display: table-cell !important;
+        }
+    }
     .gu-transit {
         box-shadow: 0px 1px 15px inset;
     }

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -296,26 +296,34 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
     CommonViewFunction.generateObjectForSaveSearchApi = function(options) {
         var obj = {
             name: options.name,
-            guid: options.guid,
-            searchParameters: {}
+            guid: options.guid
         };
         var value = options.value;
         if (value) {
-            _.each(Enums.extractFromUrlForSearch, function(v, k) {
+            _.each(Enums.extractFromUrlForSearch, function(svalue, skey) {
+                if (_.isObject(svalue)) {
+                    _.each(svalue, function(v, k) {
                         var val = value[k];
                         if (!_.isUndefinedNull(val)) {
                             if (k == "attributes") {
                                 val = val.split(',');
-                    } else if (_.contains(["tagFilters","entityFilters"],k)) {
+                            } else if (_.contains(["tagFilters", "entityFilters"], k)) {
                                 val = CommonViewFunction.attributeFilter.generateAPIObj(val);
-                    } else if (_.contains(["includeDE","excludeST","excludeSC"],k)) {
+                            } else if (_.contains(["includeDE", "excludeST", "excludeSC"], k)) {
                                 val = val ? false : true;
                             }
                         }
-                if (_.contains(["includeDE","excludeST","excludeSC"],k)) {
+                        if (_.contains(["includeDE", "excludeST", "excludeSC"], k)) {
                             val = _.isUndefinedNull(val) ? true : val;
                         }
-                obj.searchParameters[v] = val;
+                        if (!obj[skey]) {
+                            obj[skey] = {};
+                        }
+                        obj[skey][v] = val;
+                    });
+                } else {
+                    obj[skey] = value[skey];
+                }
             });
             return obj;
         }
@@ -326,14 +334,16 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
             entityDefCollection = options.entityDefCollection,
             obj = {};
         if (value) {
-            _.each(Enums.extractFromUrlForSearch, function(v, k) {
-                var val = value[v];
+            _.each(Enums.extractFromUrlForSearch, function(svalue, skey) {
+                if(_.isObject(svalue)) {
+                    _.each(svalue, function(v, k) {
+                        var val = value[skey][v];
                         if (!_.isUndefinedNull(val)) {
                             if (k == "attributes") {
                                 val = val.join(',');
                             } else if (k == "tagFilters") {
                                 if (classificationDefCollection) {
-                            var classificationDef = classificationDefCollection.fullCollection.findWhere({ 'name': value.classification })
+                                    var classificationDef = classificationDefCollection.fullCollection.findWhere({ 'name': value[skey].classification })
                                     attributeDefs = Utils.getNestedSuperTypeObj({
                                         collection: classificationDefCollection,
                                         attrMerge: true,
@@ -350,7 +360,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                                 val = CommonViewFunction.attributeFilter.generateUrl({ "value": val.criterion });
                             } else if (k == "entityFilters") {
                                 if (entityDefCollection) {
-                            var entityDef = entityDefCollection.fullCollection.findWhere({ 'name': value.typeName }),
+                                    var entityDef = entityDefCollection.fullCollection.findWhere({ 'name': value[skey].typeName }),
                                         attributeDefs = Utils.getNestedSuperTypeObj({
                                             collection: entityDefCollection,
                                             attrMerge: true,
@@ -365,12 +375,16 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                                     });
                                 }
                                 val = CommonViewFunction.attributeFilter.generateUrl({ "value": val.criterion });
-                    } else if (_.contains(["includeDE","excludeST","excludeSC"],k)) {
+                            } else if (_.contains(["includeDE", "excludeST", "excludeSC"], k)) {
                                 val = val ? false : true;
                             }
                         }
                         obj[k] = val;
                     });
+                }else{
+                    obj[skey] = value[skey];
+                }
+            });
             return obj;
         }
     }

dashboardv2/public/js/utils/Enums.js

@@ -57,6 +57,7 @@ define(['require'], function(require) {
         'annual': "Annual Distribution"
     }
     Enums.extractFromUrlForSearch = {
+        "searchParameters": {
             "pageLimit": "limit",
             "type": "typeName",
             "tag": "classification",
@@ -68,6 +69,8 @@ define(['require'], function(require) {
             "tagFilters": "tagFilters",
             "entityFilters": "entityFilters",
             "attributes": "attributes"
+        },
+        "uiParameters": "uiParameters"
     }
 
     return Enums;

dashboardv2/public/js/views/search/SearchLayoutView.js

@@ -161,7 +161,7 @@ define(['require',
                         },
                         applyValue: function(model, searchType) {
                             that.manualRender(_.extend(searchType, CommonViewFunction.generateUrlFromSaveSearchObject({
-                                value: model.get('searchParameters'),
+                                value: { "searchParameters": model.get('searchParameters'), 'uiParameters': model.get('uiParameters') },
                                 classificationDefCollection: that.classificationDefCollection,
                                 entityDefCollection: that.entityDefCollection
                             })));

dashboardv2/public/js/views/search/SearchResultLayoutView.js

@@ -211,6 +211,7 @@ define(['require',
                                 this.ui.columnEmptyInfo.hide();
                             }
                         }
+                        this.columnOrder = this.getColumnOrder(this.REntityTableLayoutView.$el.find('.colSort th.renderable'));
                         this.triggerUrl();
                         var attributes = this.searchCollection.filterObj.attributes;
                         if ((excludeDefaultColumn && attributes) && (excludeDefaultColumn.length > attributes.length || _.difference(excludeDefaultColumn, attributes).length)) {
@@ -297,10 +298,16 @@ define(['require',
                     }
                 }
             },
+            getColumnOrderWithPosition: function() {
+                var that = this;
+                return _.map(that.columnOrder, function(value, key) {
+                    return key + "::" + value;
+                }).join(",");
+            },
             triggerUrl: function(options) {
                 Utils.setUrl(_.extend({
                     url: Utils.getUrlState.getQueryUrl().queyParams[0],
-                    urlParams: this.value,
+                    urlParams: this.columnOrder ? _.extend(this.value, { 'uiParameters': this.getColumnOrderWithPosition() }) : this.value,
                     mergeBrowserUrl: false,
                     trigger: false,
                     updateTabState: true
@@ -502,6 +509,11 @@ define(['require',
                 var that = this;
                 require(['utils/TableLayout'], function(TableLayout) {
                     // displayOrder added for column manager
+                    if (that.value.uiParameters) {
+                        var savedColumnOrder = _.object(that.value.uiParameters.split(',').map(function(a) {
+                            return a.split('::');
+                        })); // get Column position from string to object
+                    }
                     var columnCollection = Backgrid.Columns.extend({
                         sortKey: "displayOrder",
                         comparator: function(item) {
@@ -509,24 +521,28 @@ define(['require',
                         },
                         setPositions: function() {
                             _.each(this.models, function(model, index) {
-                                model.set("displayOrder", (that.columnOrder == null ? index : that.columnOrder[model.get('label')]) + 1, { silent: true });
+                                model.set("displayOrder", (savedColumnOrder == null ? index : parseInt(savedColumnOrder[model.get('label')])) + 1, { silent: true });
                             });
                             return this;
                         }
                     });
                     var columns = new columnCollection((that.searchCollection.dynamicTable ? that.getDaynamicColumns(that.searchCollection.toJSON()) : that.getFixedDslColumn()));
                     columns.setPositions().sort();
-                    that.REntityTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, {
+                    var table = new TableLayout(_.extend({}, that.commonTableOptions, {
                         columns: columns
-                    })));
+                    }));
+                    that.REntityTableLayoutView.show(table);
                     if (that.value.searchType !== "dsl") {
                         that.ui.containerCheckBox.show();
                     } else {
                         that.ui.containerCheckBox.hide();
                     }
                     that.$(".ellipsis .inputAssignTag").hide();
+                    table.trigger("grid:refresh"); /*Event fire when table rendered*/
                     tableDragger(document.querySelector(".colSort")).on('drop', function(from, to, el) {
-                        that.columnOrder = that.getColumnOrder(el.querySelectorAll('th'));
+                        that.columnOrder = that.getColumnOrder(el.querySelectorAll('th.renderable'));
+                        table.trigger("grid:refresh:update");
+                        that.triggerUrl();
                     });
                     that.checkTableFetch();
                 });

dashboardv2/public/js/views/search/save/SaveSearchView.js

@@ -147,7 +147,7 @@ define(['require',
             if (options && options.model) {
                 var searchParameters = options.model.toJSON().searchParameters,
                     params = CommonViewFunction.generateUrlFromSaveSearchObject({
-                        value: searchParameters,
+                        value: {"searchParameters" : searchParameters, "uiParameters": options.model.get('uiParameters')},
                         classificationDefCollection: this.classificationDefCollection,
                         entityDefCollection: this.entityDefCollection
                     });