reset filtered column if it's been deselected from the column selector

iamisti · Oct 24, 2016 · 8a8c595 · 8a8c595
1 parent 097879c
commit 8a8c595
Show file tree

Hide file tree

Showing 6 changed files with 732 additions and 667 deletions.
diff --git a/app/modules/main/features/ColumnFilterFeature/ColumnFilterFeature.js b/app/modules/main/features/ColumnFilterFeature/ColumnFilterFeature.js
@@ -121,6 +121,19 @@
             }
         };
 
+        service.resetFiltersForColumn = function(dataStorage, index){
+            if(dataStorage.header[index].columnFilter
+                && dataStorage.header[index].columnFilter.isEnabled
+                && dataStorage.header[index].columnFilter.filtersApplied.length){
+
+                dataStorage.header[index].columnFilter.filtersApplied = [];
+
+                return true;
+            }
+
+            return false;
+        };
+
         /**
          * Set the position of the column filter panel. It's required to attach it to the outer container 
          * of the component because otherwise some parts of the panel can became partially or fully hidden

diff --git a/app/modules/main/features/ColumnSelectorFeature/ColumnSelectorFeature.js b/app/modules/main/features/ColumnSelectorFeature/ColumnSelectorFeature.js
@@ -72,7 +72,7 @@
             var rt = ($(window).width() - (elementPosition.left + elementToPosition.outerWidth()));
 
             var targetMetrics = {
-                top: elementPosition.top + 60,
+                top: elementPosition.top + 55,
                 right: rt
             };
 

diff --git a/app/modules/main/features/ColumnSelectorFeature/directives/mdtColumnSelectorDirective.js b/app/modules/main/features/ColumnSelectorFeature/directives/mdtColumnSelectorDirective.js
@@ -1,7 +1,7 @@
 (function() {
     'use strict';
 
-    function mdtColumnSelectorDirective(ColumnSelectorFeature){
+    function mdtColumnSelectorDirective(ColumnSelectorFeature, ColumnFilterFeature, PaginatorTypeProvider){
         return{
             restrict: 'E',
             templateUrl: '/main/templates/mdtColumnSelector.html',
@@ -79,12 +79,31 @@
                     return result ? false : true;
                 };
 
-                $scope.confirmCallback = function(){
+                $scope.confirmCallback = function(params){
+                    var paginator = params.paginator;
+                    var isAnyResetHappened = false;
+
                     _.each($scope.dataStorage.header, function(item, index){
                         item.columnSelectorFeature.isVisible = $scope.headerRowsData[index].isVisible;
+
+                        if(!item.columnSelectorFeature.isVisible){
+                            var result = ColumnFilterFeature.resetFiltersForColumn($scope.dataStorage, index);
+
+                            if(result){
+                                isAnyResetHappened = true;
+                            }
+                        }
                     });
 
                     $scope.columnSelectorFeature.isActive = false;
+
+                    if(isAnyResetHappened){
+                        if(paginator.paginatorType === PaginatorTypeProvider.AJAX){
+                            paginator.getFirstPage();
+                        }else{
+                            // no support for non-ajax yet
+                        }
+                    }
                 };
 
                 $scope.cancelCallback = function(){

diff --git a/app/modules/main/templates/mdtColumnSelector.html b/app/modules/main/templates/mdtColumnSelector.html
@@ -22,7 +22,7 @@
             </div>
 
             <div class="p-b-sm p-t-sm p-l-sm" layout="row" layout-align="start center">
-                <md-button class="md-raised md-primary" ng-click="confirmCallback()">Ok</md-button>
+                <md-button class="md-raised md-primary" ng-click="confirmCallback({paginator: mdtPaginationHelper})">Ok</md-button>
                 <md-button class="md-raised" ng-click="cancelCallback()">Cancel</md-button>
             </div>
         </md-content>

diff --git a/dist/md-data-table-templates.js b/dist/md-data-table-templates.js