Merge pull request #3887 from m4theushw/fix-sorting-with-filters

[RFR] Prevent calling an outdated updateSort
marmelab · Oct 28, 2019 · 0630de5 · 0630de5
2 parents e9b1943 + 1a6e23d
commit 0630de5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/cypress/integration/list.js b/cypress/integration/list.js
@@ -262,5 +262,20 @@ describe('List Page', () => {
                 )
             ).should('exist');
         });
+
+        it('should keep filters when sorting a column', () => {
+            ListPagePosts.setFilterValue('q', 'quis culpa impedit');
+            cy.get(ListPagePosts.elements.recordRows).should(el =>
+                expect(el).to.have.length(1)
+            );
+
+            ListPagePosts.toggleColumnSort('title');
+            ListPagePosts.waitUntilDataLoaded();
+
+            cy.get(ListPagePosts.elements.filter('q')).should(
+                'have.value',
+                'quis culpa impedit'
+            );
+        });
     });
 });
diff --git a/packages/ra-core/src/controller/useListParams.ts b/packages/ra-core/src/controller/useListParams.ts
@@ -141,7 +141,7 @@ const useListParams = ({
 
     const changeParams = useCallback(action => {
         const newQuery = getQuery({
-            location: window.location,
+            location,
             params,
             filterDefaultValues,
             sort,

diff --git a/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js b/packages/ra-ui-materialui/src/list/DatagridHeaderCell.js
@@ -94,8 +94,6 @@ DatagridHeaderCell.propTypes = {
 
 export default shouldUpdate(
     (props, nextProps) =>
-        props.isSorting !== nextProps.isSorting ||
-        (nextProps.isSorting &&
-            props.currentSort.order !== nextProps.currentSort.order) ||
+        props.updateSort !== nextProps.updateSort ||
         (nextProps.isSorting && props.sortable !== nextProps.sortable)
 )(DatagridHeaderCell);