@zeedhi/teknisa-components-common 1.96.2 → 1.97.0

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

@@ -2222,6 +2222,7 @@ class TekGrid extends GridEditable {
         this.toolbarSlotProps = false;
         this.editNewRowsOnly = false;
         this.showCheckboxAllFilter = Config.gridShowCheckboxAllFilter || false;
+        this.defaultFilter = {};
         this.defaultLazy = false;
         this.groups = [];
         this.summary = {};
@@ -2253,6 +2254,7 @@ class TekGrid extends GridEditable {
         this.groupsOpened = this.getInitValue('groupsOpened', props.groupsOpened, this.groupsOpened);
         this.showSummaryTotal = this.getInitValue('showSummaryTotal', props.showSummaryTotal, this.showSummaryTotal);
         this.showCheckboxAllFilter = this.getInitValue('showCheckboxAllFilter', props.showCheckboxAllFilter, this.showCheckboxAllFilter);
+        this.defaultFilter = this.getInitValue('defaultFilter', props.defaultFilter, this.defaultFilter);
         this.editNewRowsOnly = this.getInitValue('editNewRowsOnly', props.editNewRowsOnly, this.editNewRowsOnly);
         this.mainGrid = this.getInitValue('mainGrid', props.mainGrid, this.mainGrid);
         this.actions = props.actions || this.actions;
@@ -2342,7 +2344,7 @@ class TekGrid extends GridEditable {
             const dynamicFilter = this.datasource.dynamicFilter[column.name];
             return dynamicFilter && dynamicFilter.length > 0;
         }
-        return this.datasource.filter[column.name];
+        return this.datasource.filter[column.name] && this.datasource.filter[column.name].length > 0;
     }
     buildReportGroups() {
         return this.columns
@@ -2956,9 +2958,10 @@ class TekGridFilterButton extends Button {
         const { datasource } = this.grid;
         if (datasource instanceof TekRestDatasource || datasource instanceof TekMemoryDatasource) {
             const { dynamicFilter } = datasource;
-            Object.keys(dynamicFilter).forEach((column) => {
-                if (dynamicFilter[column] && dynamicFilter[column].length > 0) {
-                    dynamicFilter[column].forEach((filterItem, index) => {
+            const newDynamicFilter = Object.assign(Object.assign({}, this.grid.defaultFilter), dynamicFilter);
+            Object.keys(newDynamicFilter).forEach((column) => {
+                if (newDynamicFilter[column] && newDynamicFilter[column].length > 0) {
+                    newDynamicFilter[column].forEach((filterItem, index) => {
                         const relation = filterItem.relation || 'AND';
                         const operation = filterItem.operation || 'CONTAINS';
                         const compName = `${this.grid.name}-filter-${relation}-${operation}-${column}-${index}`;
@@ -2989,11 +2992,12 @@ class TekGridFilterButton extends Button {
         }
         else {
             const { filter } = datasource;
-            Object.keys(filter).forEach((item) => {
-                if (filter[item]) {
+            const newFilter = Object.assign(Object.assign({}, this.grid.defaultFilter), filter);
+            Object.keys(newFilter).forEach((item) => {
+                if (newFilter[item]) {
                     const compName = `${this.grid.name}-filter-AND-CONTAINS-${item}-0`;
                     changedCompNames.push(compName);
-                    component.value[compName] = filter[item];
+                    component.value[compName] = newFilter[item];
                 }
             });
         }
@@ -3585,6 +3589,7 @@ class TekTreeGrid extends TreeGridEditable {
         ];
         this.toolbarSlotProps = false;
         this.showCheckboxAllFilter = false;
+        this.defaultFilter = {};
         this.title = this.getInitValue('title', props.title, this.title);
         this.addButton = this.getInitValue('addButton', props.addButton, this.addButton);
         this.deleteButton = this.getInitValue('deleteButton', props.deleteButton, this.deleteButton);
@@ -3601,6 +3606,7 @@ class TekTreeGrid extends TreeGridEditable {
         this.showReload = this.getInitValue('showReload', props.showReload, this.showReload);
         this.exportConfig = this.getInitValue('exportConfig', props.exportConfig, this.exportConfig);
         this.showCheckboxAllFilter = this.getInitValue('showCheckboxAllFilter', props.showCheckboxAllFilter, this.showCheckboxAllFilter);
+        this.defaultFilter = this.getInitValue('defaultFilter', props.defaultFilter, this.defaultFilter);
         this.exportActions = props.exportActions || this.exportActions;
         this.actions = props.actions || this.actions;
         this.toolbarSlotProps = props.toolbarSlot !== undefined;

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

@@ -2226,6 +2226,7 @@
           this.toolbarSlotProps = false;
           this.editNewRowsOnly = false;
           this.showCheckboxAllFilter = core.Config.gridShowCheckboxAllFilter || false;
+          this.defaultFilter = {};
           this.defaultLazy = false;
           this.groups = [];
           this.summary = {};
@@ -2257,6 +2258,7 @@
           this.groupsOpened = this.getInitValue('groupsOpened', props.groupsOpened, this.groupsOpened);
           this.showSummaryTotal = this.getInitValue('showSummaryTotal', props.showSummaryTotal, this.showSummaryTotal);
           this.showCheckboxAllFilter = this.getInitValue('showCheckboxAllFilter', props.showCheckboxAllFilter, this.showCheckboxAllFilter);
+          this.defaultFilter = this.getInitValue('defaultFilter', props.defaultFilter, this.defaultFilter);
           this.editNewRowsOnly = this.getInitValue('editNewRowsOnly', props.editNewRowsOnly, this.editNewRowsOnly);
           this.mainGrid = this.getInitValue('mainGrid', props.mainGrid, this.mainGrid);
           this.actions = props.actions || this.actions;
@@ -2346,7 +2348,7 @@
               const dynamicFilter = this.datasource.dynamicFilter[column.name];
               return dynamicFilter && dynamicFilter.length > 0;
           }
-          return this.datasource.filter[column.name];
+          return this.datasource.filter[column.name] && this.datasource.filter[column.name].length > 0;
       }
       buildReportGroups() {
           return this.columns
@@ -2960,9 +2962,10 @@
           const { datasource } = this.grid;
           if (datasource instanceof TekRestDatasource || datasource instanceof TekMemoryDatasource) {
               const { dynamicFilter } = datasource;
-              Object.keys(dynamicFilter).forEach((column) => {
-                  if (dynamicFilter[column] && dynamicFilter[column].length > 0) {
-                      dynamicFilter[column].forEach((filterItem, index) => {
+              const newDynamicFilter = Object.assign(Object.assign({}, this.grid.defaultFilter), dynamicFilter);
+              Object.keys(newDynamicFilter).forEach((column) => {
+                  if (newDynamicFilter[column] && newDynamicFilter[column].length > 0) {
+                      newDynamicFilter[column].forEach((filterItem, index) => {
                           const relation = filterItem.relation || 'AND';
                           const operation = filterItem.operation || 'CONTAINS';
                           const compName = `${this.grid.name}-filter-${relation}-${operation}-${column}-${index}`;
@@ -2993,11 +2996,12 @@
           }
           else {
               const { filter } = datasource;
-              Object.keys(filter).forEach((item) => {
-                  if (filter[item]) {
+              const newFilter = Object.assign(Object.assign({}, this.grid.defaultFilter), filter);
+              Object.keys(newFilter).forEach((item) => {
+                  if (newFilter[item]) {
                       const compName = `${this.grid.name}-filter-AND-CONTAINS-${item}-0`;
                       changedCompNames.push(compName);
-                      component.value[compName] = filter[item];
+                      component.value[compName] = newFilter[item];
                   }
               });
           }
@@ -3589,6 +3593,7 @@
           ];
           this.toolbarSlotProps = false;
           this.showCheckboxAllFilter = false;
+          this.defaultFilter = {};
           this.title = this.getInitValue('title', props.title, this.title);
           this.addButton = this.getInitValue('addButton', props.addButton, this.addButton);
           this.deleteButton = this.getInitValue('deleteButton', props.deleteButton, this.deleteButton);
@@ -3605,6 +3610,7 @@
           this.showReload = this.getInitValue('showReload', props.showReload, this.showReload);
           this.exportConfig = this.getInitValue('exportConfig', props.exportConfig, this.exportConfig);
           this.showCheckboxAllFilter = this.getInitValue('showCheckboxAllFilter', props.showCheckboxAllFilter, this.showCheckboxAllFilter);
+          this.defaultFilter = this.getInitValue('defaultFilter', props.defaultFilter, this.defaultFilter);
           this.exportActions = props.exportActions || this.exportActions;
           this.actions = props.actions || this.actions;
           this.toolbarSlotProps = props.toolbarSlot !== undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-common",
-  "version": "1.96.2",
+  "version": "1.97.0",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -18,8 +18,8 @@
     "watch": "npm run build -- -w"
   },
   "dependencies": {
-    "@zeedhi/zd-drag-grid-common": "*",
-    "@zeedhi/zd-user-info-common": "*",
+    "@zeedhi/zd-drag-grid-common": "<=1.0.6",
+    "@zeedhi/zd-user-info-common": "^1.3.2",
     "lodash.debounce": "4.0.*",
     "lodash.get": "4.4.*",
     "lodash.merge": "4.6.*"
@@ -30,7 +30,7 @@
     "@types/lodash.merge": "4.6.*"
   },
   "peerDependencies": {
-    "@zeedhi/core": "*"
+    "@zeedhi/core": "~1.97.0"
   },
-  "gitHead": "23195c214009cb263eb404224929e8acfd63ed3c"
+  "gitHead": "97190b2ae31761e5474dae76eca0d3874144b4f5"
 }

package/types/components/tek-grid/grid.d.ts

@@ -73,6 +73,7 @@ export declare class TekGrid extends GridEditable implements ITekGrid {
     editNewRowsOnly: boolean;
     protected keyShortcutKeyMapping: any;
     showCheckboxAllFilter: boolean;
+    defaultFilter: IDictionary;
     /**
      * TekGrid class constructor
      * @param props TekGrid properties
@@ -89,7 +90,7 @@ export declare class TekGrid extends GridEditable implements ITekGrid {
      * @param columns Grid columns parameter
      */
     protected getColumns(columns: ITekGridColumn[]): TekGridColumn[];
-    columnHasFilterData(column: TekGridColumn): any;
+    columnHasFilterData(column: TekGridColumn): boolean;
     private buildReportGroups;
     private buildReportAggregations;
     getReport(type: string, portrait?: boolean, rowObj?: any): Promise<Window | null>;

package/types/components/tek-grid/interfaces.d.ts

@@ -60,6 +60,7 @@ export interface ITekGrid extends IGridEditable {
     layoutOptions?: TekGridLayoutOptions;
     mainGrid?: boolean;
     showCheckboxAllFilter?: boolean;
+    defaultFilter?: IDictionary;
 }
 export declare type MultiOptionParams = {
     iconName: string;

package/types/components/tek-tree-grid/interfaces.d.ts

@@ -1,4 +1,5 @@
 import { IComponentRender, ITreeGridEditable } from '@zeedhi/common';
+import { IDictionary } from '@zeedhi/core';
 import { ITekGridColumn, ITekGridEvents, ITekGridExportConfig, TekGridLayoutOptions, IModalFilterProps } from '..';
 export interface ITekTreeGrid extends ITreeGridEditable {
     actions?: IComponentRender[];
@@ -22,4 +23,5 @@ export interface ITekTreeGrid extends ITreeGridEditable {
     exportActions?: IComponentRender[];
     layoutOptions?: TekGridLayoutOptions;
     showCheckboxAllFilter?: boolean;
+    defaultFilter?: IDictionary;
 }

package/types/components/tek-tree-grid/tree-grid.d.ts

@@ -63,6 +63,7 @@ export declare class TekTreeGrid extends TreeGridEditable implements ITekTreeGri
     filterRelationsDatasource: Datasource;
     filterOperationsDatasource: Datasource;
     showCheckboxAllFilter: boolean;
+    defaultFilter: IDictionary;
     /**
      * TekTreeGrid class constructor
      * @param props TekTreeGrid properties