@zeedhi/teknisa-components-common 1.77.1 → 1.78.0

package/dist/tek-components-common.esm.js

@@ -675,6 +675,18 @@ class ReportFilter {
     }
 }
 
+/**
+ * Delete rows error
+ */
+class TekGridDeleteRowsError extends Error {
+    constructor() {
+        super('TekGrid can\'t automatically delete rows when selectAllPages property is true.'
+            + ' You should delete them manually using the beforeDelete event and preventing'
+            + ' the default execution');
+        this.name = 'TekGridDeleteRowsError';
+    }
+}
+
 class GridBase {
     constructor(grid) {
         this.exportConfigButtons = [];
@@ -925,6 +937,9 @@ class GridBase {
     deleteButtonClick({ event }) {
         this.grid.callEvent('beforeDelete', { component: this.grid, event });
         if (!event.defaultPrevented) {
+            if (this.grid.selectAllPages) {
+                throw new TekGridDeleteRowsError();
+            }
             this.grid.deleteRows();
             this.grid.callEvent('afterDelete', { component: this.grid });
         }
@@ -1598,10 +1613,18 @@ class GridController {
         return !this.isEditing;
     }
     get disableDeleteButton() {
-        return !((this.grid.deleteButton === 'selection'
-            && this.grid.selectedRows.length > 0)
-            || (this.grid.deleteButton === 'currentRow'
-                && this.grid.datasource.currentRow[this.grid.datasource.uniqueKey]));
+        if (this.grid.deleteButton === 'selection') {
+            if (this.grid.selectAllPages) {
+                const { allSelected, except } = this.grid.selectionState;
+                return (allSelected && except.length === this.grid.datasource.total)
+                    || (!allSelected && except.length === 0);
+            }
+            return this.grid.selectedRows.length === 0;
+        }
+        if (this.grid.deleteButton === 'currentRow') {
+            return !this.grid.datasource.currentRow[this.grid.datasource.uniqueKey];
+        }
+        return false;
     }
 }
 
@@ -1967,13 +1990,35 @@ class TekMemoryDatasource extends MemoryDatasource {
      * Updates filtered data
      */
     updateFilteredData() {
-        super.updateFilteredData();
+        // first apply filters (simple and dynamic)
+        this.filteredData = Object.keys(this.filter).length
+            ? this.allData.filter((row) => this.getRowByFilter(row))
+            : Array.from(this.allData);
         if (this.dynamicFilter && Object.keys(this.dynamicFilter).length) {
             this.filteredData = this.filteredData.filter((row) => this.getRowByDynamicFilter(row));
         }
+        const searchWithoutSearchJoin = (row) => {
+            const searchRow = Object.assign({}, row);
+            if (this.searchJoin) {
+                // do not search on columns with searchJoin
+                Object.keys(this.searchJoin).forEach((key) => delete searchRow[key]);
+            }
+            return this.getRowBySearch(searchRow);
+        };
+        // only after do the search
+        const searchData = this.search
+            ? this.filteredData.filter(searchWithoutSearchJoin)
+            : this.filteredData;
+        let searchIds = searchData.map((row) => row[this.uniqueKey]);
         if (this.searchJoin && Object.keys(this.searchJoin).length) {
-            this.filteredData = this.filteredData.filter((row) => this.getRowBySearchJoin(row));
-        }
+            const searchJoinData = this.filteredData.filter((row) => this.getRowBySearchJoin(row));
+            // get the ids from search and searchJoin
+            searchIds = searchIds
+                .concat(searchJoinData.map((row) => row[this.uniqueKey]))
+                .sort();
+        }
+        // filter filteredData using searchIds
+        this.filteredData = this.allData.filter((row) => searchIds.indexOf(row[this.uniqueKey]) !== -1);
     }
     getRowByDynamicFilter(row) {
         let filtered;

package/dist/tek-components-common.umd.js

@@ -680,6 +680,18 @@
       }
   }
 
+  /**
+   * Delete rows error
+   */
+  class TekGridDeleteRowsError extends Error {
+      constructor() {
+          super('TekGrid can\'t automatically delete rows when selectAllPages property is true.'
+              + ' You should delete them manually using the beforeDelete event and preventing'
+              + ' the default execution');
+          this.name = 'TekGridDeleteRowsError';
+      }
+  }
+
   class GridBase {
       constructor(grid) {
           this.exportConfigButtons = [];
@@ -930,6 +942,9 @@
       deleteButtonClick({ event }) {
           this.grid.callEvent('beforeDelete', { component: this.grid, event });
           if (!event.defaultPrevented) {
+              if (this.grid.selectAllPages) {
+                  throw new TekGridDeleteRowsError();
+              }
               this.grid.deleteRows();
               this.grid.callEvent('afterDelete', { component: this.grid });
           }
@@ -1603,10 +1618,18 @@
           return !this.isEditing;
       }
       get disableDeleteButton() {
-          return !((this.grid.deleteButton === 'selection'
-              && this.grid.selectedRows.length > 0)
-              || (this.grid.deleteButton === 'currentRow'
-                  && this.grid.datasource.currentRow[this.grid.datasource.uniqueKey]));
+          if (this.grid.deleteButton === 'selection') {
+              if (this.grid.selectAllPages) {
+                  const { allSelected, except } = this.grid.selectionState;
+                  return (allSelected && except.length === this.grid.datasource.total)
+                      || (!allSelected && except.length === 0);
+              }
+              return this.grid.selectedRows.length === 0;
+          }
+          if (this.grid.deleteButton === 'currentRow') {
+              return !this.grid.datasource.currentRow[this.grid.datasource.uniqueKey];
+          }
+          return false;
       }
   }
 
@@ -1972,13 +1995,35 @@
        * Updates filtered data
        */
       updateFilteredData() {
-          super.updateFilteredData();
+          // first apply filters (simple and dynamic)
+          this.filteredData = Object.keys(this.filter).length
+              ? this.allData.filter((row) => this.getRowByFilter(row))
+              : Array.from(this.allData);
           if (this.dynamicFilter && Object.keys(this.dynamicFilter).length) {
               this.filteredData = this.filteredData.filter((row) => this.getRowByDynamicFilter(row));
           }
+          const searchWithoutSearchJoin = (row) => {
+              const searchRow = Object.assign({}, row);
+              if (this.searchJoin) {
+                  // do not search on columns with searchJoin
+                  Object.keys(this.searchJoin).forEach((key) => delete searchRow[key]);
+              }
+              return this.getRowBySearch(searchRow);
+          };
+          // only after do the search
+          const searchData = this.search
+              ? this.filteredData.filter(searchWithoutSearchJoin)
+              : this.filteredData;
+          let searchIds = searchData.map((row) => row[this.uniqueKey]);
           if (this.searchJoin && Object.keys(this.searchJoin).length) {
-              this.filteredData = this.filteredData.filter((row) => this.getRowBySearchJoin(row));
-          }
+              const searchJoinData = this.filteredData.filter((row) => this.getRowBySearchJoin(row));
+              // get the ids from search and searchJoin
+              searchIds = searchIds
+                  .concat(searchJoinData.map((row) => row[this.uniqueKey]))
+                  .sort();
+          }
+          // filter filteredData using searchIds
+          this.filteredData = this.allData.filter((row) => searchIds.indexOf(row[this.uniqueKey]) !== -1);
       }
       getRowByDynamicFilter(row) {
           let filtered;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-common",
-  "version": "1.77.1",
+  "version": "1.78.0",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -31,5 +31,5 @@
   "peerDependencies": {
     "@zeedhi/core": "*"
   },
-  "gitHead": "f449cf3db69633dff27d0e7205fb67c8f85ab522"
+  "gitHead": "84ea35b74e9d917e6ea29e012a01bc8a525f7e4f"
 }

package/tests/unit/components/tek-datasource/memory-datasource.spec.ts

@@ -342,6 +342,7 @@ describe('TekMemoryDatasource', () => {
       instance.searchJoin = {
         name: ['name 1', 'name 2'],
       };
+      instance.search = 'aaa';
       await instance.get();
       expect(instance.data.length).toBe(2);
     });

package/tests/unit/components/tek-grid/grid.spec.ts

@@ -660,6 +660,56 @@ describe('TekGrid', () => {
       }
       spy.mockReset();
     });
+
+    it('when deleteButton is clicked with selectAllPages, should throw', () => {
+      const instance = new TekGrid({
+        name: 'grid_deleteButtonClick1',
+        component: 'TekGrid',
+        deleteButton: 'selection',
+        selectAllPages: true,
+        datasource: {
+          data: [{ id: '1' }],
+        },
+      });
+
+      instance.onCreated();
+      const notEditingSpan = instance.toolbarSlot[2];
+      if (notEditingSpan && notEditingSpan.children && notEditingSpan.children.length > 1) {
+        const deleteTooltip = notEditingSpan.children[1];
+        if (deleteTooltip && deleteTooltip.children && deleteTooltip.children.length > 0) {
+          const deleteButton = deleteTooltip.children[0];
+          const button = new Button(deleteButton);
+          const event = new Event('click');
+          expect(button.isVisible).toBeTruthy();
+          expect(button.disabled).toBeTruthy();
+          instance.selectAll(true);
+          expect(button.disabled).toBeFalsy();
+          expect(() => button.click(event, {} as HTMLElement)).toThrow();
+        }
+      }
+    });
+  });
+
+  describe('disableDeleteButton', () => {
+    it('should not disable deleteButton when deleteButton equals none', () => {
+      const instance = new TekGrid({
+        name: 'grid_deleteButtonClick1',
+        component: 'TekGrid',
+        deleteButton: 'none',
+      });
+
+      instance.onCreated();
+      const notEditingSpan = instance.toolbarSlot[2];
+      if (notEditingSpan && notEditingSpan.children && notEditingSpan.children.length > 1) {
+        const deleteTooltip = notEditingSpan.children[1];
+        if (deleteTooltip && deleteTooltip.children && deleteTooltip.children.length > 0) {
+          const deleteButton = deleteTooltip.children[0];
+          const button = new Button(deleteButton);
+          expect(button.isVisible).toBeFalsy();
+          expect(button.disabled).toBeFalsy();
+        }
+      }
+    });
   });
 
   describe('navigation', () => {

package/types/error/delete-rows-error.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Delete rows error
+ */
+export declare class TekGridDeleteRowsError extends Error {
+    constructor();
+}