Merge pull request #1366 from marmelab/fix-pinned-filter-initialization

[RFR] Update filters on view initialization
marmelab · Sep 29, 2017 · eb8b125 · eb8b125
2 parents 3828607 + 234d4aa
commit eb8b125
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/javascripts/ng-admin/Crud/list/ListLayoutController.js b/src/javascripts/ng-admin/Crud/list/ListLayoutController.js
@@ -53,6 +53,10 @@ export default class ListLayoutController {
             $scope.selection = [];
         }
 
+        if(this.hasFilters){
+            this.updateFilters();
+        }
+
         $scope.$on('$destroy', this.destroy.bind(this));
     }
 

diff --git a/src/javascripts/test/unit/Crud/list/ListLayoutControllerSpec.js b/src/javascripts/test/unit/Crud/list/ListLayoutControllerSpec.js
@@ -1,6 +1,42 @@
 /*global describe,it,expect,beforeEach*/
+import ListLayoutController, {getCurrentSearchParam} from '../../../../ng-admin/Crud/list/ListLayoutController'
+
 describe('ListLayoutController', function () {
-    var getCurrentSearchParam = require('../../../../ng-admin/Crud/list/ListLayoutController').getCurrentSearchParam;
+    describe('constructor', () => {
+        it('should update filters if initialized with any', () => {
+            spyOn(ListLayoutController.prototype, 'updateFilters');
+            spyOn(ListLayoutController, 'getCurrentSearchParam')
+                .and.returnValue({});
+
+            const $scope = {
+                $watch: () => {},
+                $on: () => {},
+            };
+
+            const $location = {
+                path: () => '/my_entity',
+                search: () => '',
+            };
+
+            const view = {
+                getEntity: () => 'my_entity',
+                batchActions: () => [],
+                actions: () => [],
+                filters: () => [{
+                    my_column: 17,
+                    pinned: () => true,
+                }],
+            };
+
+            const listLayoutController = new ListLayoutController(
+                $scope, null, null, $location, null, view, null
+            );
+
+            expect(ListLayoutController.prototype.updateFilters)
+                .toHaveBeenCalled();
+        });
+    });
+
 
     describe('getCurrentSearchParam', function () {
         it('should return search url parameter mapped by filter', function () {