CardView - Fix selectAll when some filter is applied - T1298718 (#30449)

Author: Tucchhaa

packages/devextreme/js/__internal/grids/new/grid_core/filtering/public_methods.ts

@@ -9,10 +9,5 @@ export function PublicMethods<T extends Constructor<GridCoreNewBase>>(GridCore:
     public clearFilter(): void {
       this.filterSyncController.clearFilters();
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    public getCombinedFilter(): any {
-      return this.filterController.displayFilter.peek();
-    }
   };
 }

packages/devextreme/js/__internal/grids/new/grid_core/selection/controller.integration.test.ts

@@ -174,3 +174,128 @@ describe('when keyExpr is missing', () => {
     });
   });
 });
+
+describe('selectAll with filters', () => {
+  it('should select only cards matching filterValue', () => {
+    const cardView = setup({
+      keyExpr: 'id',
+      columns: ['id', 'category'],
+      dataSource: [
+        { id: 1, category: 'A' },
+        { id: 2, category: 'A' },
+        { id: 3, category: 'B' },
+        { id: 4, category: 'B' },
+      ],
+      selection: {
+        mode: 'multiple',
+        allowSelectAll: true,
+      },
+      filterPanel: {
+        filterEnabled: true,
+      },
+    });
+
+    cardView.option('filterValue', ['category', '=', 'A']);
+    cardView.selectAll();
+
+    expect(cardView.getSelectedCardKeys()).toEqual([1, 2]);
+  });
+
+  it('should select only cards matching headerFilter', () => {
+    const cardView = setup({
+      keyExpr: 'id',
+      columns: ['id', 'category'],
+      dataSource: [
+        { id: 1, category: 'A' },
+        { id: 2, category: 'A' },
+        { id: 3, category: 'B' },
+        { id: 4, category: 'B' },
+      ],
+      selection: {
+        mode: 'multiple',
+        allowSelectAll: true,
+      },
+      filterPanel: {
+        filterEnabled: true,
+      },
+    });
+
+    cardView.columnOption('category', 'filterValues', ['A']);
+    cardView.selectAll();
+
+    expect(cardView.getSelectedCardKeys()).toEqual([1, 2]);
+  });
+
+  it('should select only cards matching dataSource.filter()', () => {
+    const cardView = setup({
+      keyExpr: 'id',
+      columns: ['id', 'category'],
+      dataSource: [
+        { id: 1, category: 'A' },
+        { id: 2, category: 'A' },
+        { id: 3, category: 'B' },
+        { id: 4, category: 'B' },
+      ],
+      selection: {
+        mode: 'multiple',
+        allowSelectAll: true,
+      },
+      filterPanel: {
+        filterEnabled: true,
+      },
+    });
+
+    cardView.getDataSource().filter(['category', '=', 'A']);
+    cardView.selectAll();
+
+    expect(cardView.getSelectedCardKeys()).toEqual([1, 2]);
+  });
+
+  it('should select only cards matching filterValue, headerFilter and dataSource.filter()', () => {
+    const cardView = setup({
+      keyExpr: 'id',
+      columns: ['id', 'category1', 'category2', 'category3'],
+      dataSource: [
+        {
+          id: 1, category1: 'A', category2: '1', category3: true,
+        },
+        {
+          id: 2, category1: 'A', category2: '1', category3: false,
+        },
+        {
+          id: 3, category1: 'A', category2: '2', category3: true,
+        },
+        {
+          id: 4, category1: 'A', category2: '2', category3: false,
+        },
+        {
+          id: 5, category1: 'B', category2: '3', category3: true,
+        },
+        {
+          id: 6, category1: 'B', category2: '3', category3: false,
+        },
+        {
+          id: 7, category1: 'B', category2: '4', category3: true,
+        },
+        {
+          id: 8, category1: 'B', category2: '4', category3: false,
+        },
+      ],
+      selection: {
+        mode: 'multiple',
+        allowSelectAll: true,
+      },
+      filterPanel: {
+        filterEnabled: true,
+      },
+    });
+
+    cardView.option('filterValue', ['category1', '=', 'A']);
+    cardView.columnOption('category2', 'filterValues', ['1']);
+    cardView.getDataSource().filter(['category3', '=', true]);
+
+    cardView.selectAll();
+
+    expect(cardView.getSelectedCardKeys()).toEqual([1]);
+  });
+});

packages/devextreme/js/__internal/grids/new/grid_core/selection/controller.ts

@@ -167,6 +167,7 @@ export class SelectionController {
 
   private getSelectionConfig(dataSource, selectionOption): object {
     const selectedCardKeys = this.selectedCardKeys.peek();
+    const { dataController } = this;
 
     return {
       selectedKeys: selectedCardKeys,
@@ -189,8 +190,7 @@ export class SelectionController {
         return dataSource.items();
       },
       filter() {
-        // TODO Salimov: Need to take combined filter
-        return dataSource.filter();
+        return dataController.getCombinedFilter();
       },
       totalCount: () => dataSource.totalCount(),
       onSelectionChanging: this.selectionChanging.bind(this),

packages/testcafe-models/gridCore/index.ts

@@ -153,4 +153,3 @@ export default abstract class GridCore extends Widget {
     )();
   }
 }
-