@zeedhi/teknisa-components-common 1.97.0 → 1.97.3

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 */
@@ -2292,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();

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 */
@@ -2296,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-common",
-  "version": "1.97.0",
+  "version": "1.97.3",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -32,5 +32,5 @@
   "peerDependencies": {
     "@zeedhi/core": "~1.97.0"
   },
-  "gitHead": "97190b2ae31761e5474dae76eca0d3874144b4f5"
+  "gitHead": "2aea0238fb3917e862b21fd096f2851f74e44337"
 }

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

@@ -79,7 +79,11 @@ export declare class TekGrid extends GridEditable implements ITekGrid {
      * @param props TekGrid properties
      */
     constructor(props: ITekGrid);
+    protected getDatasourceDefaults(): {
+        lazyLoad: boolean;
+    };
     private defaultLazy;
+    private getDefaultLazy;
     onCreated(): void;
     onMounted(element: HTMLElement): void;
     onBeforeDestroy(): void;