@zeedhi/teknisa-components-common 1.96.3 → 1.97.1

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

@@ -1,4 +1,4 @@
-import { KeyMap, I18n, FormatterParserProvider, Messages, DatasourceFactory, Metadata, MemoryDatasource, URL, Utils, RestDatasource, Config, Loader, DateHelper, Http, Singleton, VersionService } from '@zeedhi/core';
+import { KeyMap, I18n, FormatterParserProvider, Messages, DatasourceFactory, Metadata, MemoryDatasource, URL, Utils, RestDatasource, Config, Accessor, Loader, DateHelper, Http, Singleton, VersionService } from '@zeedhi/core';
 import { Form, Button, Tooltip, GridEditable, Grid, ComponentRender, Iterable, Carousel, IterableComponentRender as IterableComponentRender$1, Loading as Loading$1, GridColumnEditable, Report, ColumnNotFoundError, IterableColumnsButtonController, IterableColumnsButton, ModalService, SelectMultiple, TreeGridEditable, List } from '@zeedhi/common';
 import debounce from 'lodash.debounce';
 import merge from 'lodash.merge';
@@ -2108,8 +2108,7 @@ class TekGrid extends GridEditable {
      * @param props TekGrid properties
      */
     constructor(props) {
-        var _a;
-        super(Object.assign(Object.assign({}, props), { datasource: Object.assign(Object.assign({}, props.datasource), { lazyLoad: true }) }));
+        super(props);
         /* Grid Title */
         this.title = '';
         /* Show Add button */
@@ -2222,6 +2221,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 +2253,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;
@@ -2290,10 +2291,24 @@ class TekGrid extends GridEditable {
             },
         };
         this.createAccessors();
+        this.defaultLazy = this.getDefaultLazy(props);
         this.gridBase = new GridBase(this);
         this.filterOperationsDatasource = this.gridBase.getFilterOperationsDatasource();
         this.filterRelationsDatasource = this.gridBase.getFilterRelationsDatasource();
-        this.defaultLazy = (_a = props.datasource) === null || _a === void 0 ? void 0 : _a.lazyLoad;
+    }
+    getDatasourceDefaults() {
+        return { lazyLoad: true };
+    }
+    getDefaultLazy(props) {
+        if (typeof props.datasource === 'object') {
+            return props.datasource.lazyLoad;
+        }
+        if (typeof props.datasource === 'string' && Accessor.isAccessorDefinition(props.datasource)) {
+            const [controller, accessor] = Accessor.getAccessor(props.datasource);
+            const instance = Loader.getInstance(controller);
+            return instance[accessor].lazyLoad || false;
+        }
+        return false;
     }
     onCreated() {
         super.onCreated();
@@ -2342,7 +2357,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 +2971,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 +3005,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 +3602,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 +3619,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

@@ -2112,8 +2112,7 @@
        * @param props TekGrid properties
        */
       constructor(props) {
-          var _a;
-          super(Object.assign(Object.assign({}, props), { datasource: Object.assign(Object.assign({}, props.datasource), { lazyLoad: true }) }));
+          super(props);
           /* Grid Title */
           this.title = '';
           /* Show Add button */
@@ -2226,6 +2225,7 @@
           this.toolbarSlotProps = false;
           this.editNewRowsOnly = false;
           this.showCheckboxAllFilter = core.Config.gridShowCheckboxAllFilter || false;
+          this.defaultFilter = {};
           this.defaultLazy = false;
           this.groups = [];
           this.summary = {};
@@ -2257,6 +2257,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;
@@ -2294,10 +2295,24 @@
               },
           };
           this.createAccessors();
+          this.defaultLazy = this.getDefaultLazy(props);
           this.gridBase = new GridBase(this);
           this.filterOperationsDatasource = this.gridBase.getFilterOperationsDatasource();
           this.filterRelationsDatasource = this.gridBase.getFilterRelationsDatasource();
-          this.defaultLazy = (_a = props.datasource) === null || _a === void 0 ? void 0 : _a.lazyLoad;
+      }
+      getDatasourceDefaults() {
+          return { lazyLoad: true };
+      }
+      getDefaultLazy(props) {
+          if (typeof props.datasource === 'object') {
+              return props.datasource.lazyLoad;
+          }
+          if (typeof props.datasource === 'string' && core.Accessor.isAccessorDefinition(props.datasource)) {
+              const [controller, accessor] = core.Accessor.getAccessor(props.datasource);
+              const instance = core.Loader.getInstance(controller);
+              return instance[accessor].lazyLoad || false;
+          }
+          return false;
       }
       onCreated() {
           super.onCreated();
@@ -2346,7 +2361,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 +2975,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 +3009,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 +3606,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 +3623,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.3",
+  "version": "1.97.1",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -30,7 +30,7 @@
     "@types/lodash.merge": "4.6.*"
   },
   "peerDependencies": {
-    "@zeedhi/core": "*"
+    "@zeedhi/core": "~1.97.0"
   },
-  "gitHead": "4519a44d100e36f2c6cd4438e219376446afd668"
+  "gitHead": "ff6f76c07441863c96758cecfb84300f914a15d3"
 }

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

@@ -5,6 +5,8 @@ import {
 } from '@zeedhi/common';
 import {
   KeyMap, Http, Metadata, IDictionary, IEventParam,
+  Datasource,
+  init,
 } from '@zeedhi/core';
 import {
   ITekGrid,
@@ -19,6 +21,13 @@ jest.mock('lodash.debounce', () => jest.fn((fn) => fn));
 
 jest.useFakeTimers();
 
+class AppController {
+  public datasource = {
+    uniqueKey: 'id',
+    data: [{ id: '1' }],
+  };
+}
+
 const clickOnFilterButton = (grid: TekGrid, event?: any) => {
   const buttonProps = getChild<ITekGridFilterButton>(grid.toolbarSlot, `${grid.name}_filterButton`);
   const filterButton = new TekGridFilterButton(buttonProps);
@@ -177,6 +186,22 @@ describe('TekGrid', () => {
       expect((instance as any).gridBase.exportConfigButtons[0].flat).toBeTruthy();
       expect((instance as any).gridBase.exportConfigButtons[0].events).toBeDefined();
     });
+
+    it('should create new TekGrid with accessor datasource', () => {
+      init({
+        controllers: {
+          AppController,
+        },
+      });
+      const instance = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        datasource: '{{AppController.datasource}}' as any,
+      });
+
+      expect(instance.datasource).toBeInstanceOf(Datasource);
+      expect(instance.datasource.data).toEqual([{ id: '1' }]);
+    });
   });
 
   describe('getReport()', () => {

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

@@ -73,12 +73,17 @@ export declare class TekGrid extends GridEditable implements ITekGrid {
     editNewRowsOnly: boolean;
     protected keyShortcutKeyMapping: any;
     showCheckboxAllFilter: boolean;
+    defaultFilter: IDictionary;
     /**
      * TekGrid class constructor
      * @param props TekGrid properties
      */
     constructor(props: ITekGrid);
+    protected getDatasourceDefaults(): {
+        lazyLoad: boolean;
+    };
     private defaultLazy;
+    private getDefaultLazy;
     onCreated(): void;
     onMounted(element: HTMLElement): void;
     onBeforeDestroy(): void;
@@ -89,7 +94,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