@zeedhi/common 1.70.0 → 1.72.0

package/dist/zd-common.esm.js

@@ -2869,9 +2869,9 @@ class ModalService {
      * Creates a new modal instance from JSON
      * @param modal modal structure
      */
-    static createFromJson(modalPath, local) {
+    static createFromJson(modalPath, local, JSONCache) {
         return __awaiter(this, void 0, void 0, function* () {
-            const modal = yield Metadata.get(modalPath, local);
+            const modal = yield Metadata.get(modalPath, local, JSONCache);
             return this.create(modal);
         });
     }
@@ -2948,37 +2948,6 @@ class LoadingService {
     }
 }
 
-class JsonCacheService {
-    static saveJSONCache(jsonCollection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const jsonCollectionInCache = jsonCollection.map((jsonItem) => __awaiter(this, void 0, void 0, function* () {
-                const { path } = jsonItem;
-                const metadata = yield Metadata.get(path, true);
-                localStorage.setItem(path, JSON.stringify(metadata));
-            }));
-            yield Promise.all(jsonCollectionInCache);
-        });
-    }
-    static getJSONCache(path) {
-        const getMetadaFromCache = localStorage.getItem(path);
-        let metadataValueReturn = false;
-        if (typeof getMetadaFromCache === 'string') {
-            metadataValueReturn = JSON.parse(getMetadaFromCache);
-        }
-        return metadataValueReturn;
-    }
-    static clearJSONCache(jsonCollection) {
-        jsonCollection.map((jsonItem) => __awaiter(this, void 0, void 0, function* () {
-            const { path } = jsonItem;
-            localStorage.removeItem(path);
-        }));
-    }
-}
-/**
- * jsons collection
- */
-JsonCacheService.jsonCollection = [];
-
 /**
  * Base class for Dashboard component.
  */
@@ -4589,18 +4558,8 @@ class Frame extends ComponentRender {
     }
     getMetadata() {
         return __awaiter(this, void 0, void 0, function* () {
-            let page;
             try {
-                if (this.JSONCache) {
-                    page = JsonCacheService.getJSONCache(this.path);
-                    if (page === false) {
-                        yield JsonCacheService.saveJSONCache([{ path: this.path }]);
-                        page = yield this.requestPage();
-                    }
-                }
-                else {
-                    page = yield this.requestPage();
-                }
+                const page = yield this.requestPage();
                 if (typeof page !== 'object')
                     throw new Error();
                 this.metadata = merge(page, this.override);
@@ -4640,7 +4599,7 @@ class Frame extends ComponentRender {
                 if (this.type === 'post') {
                     return Metadata.post(this.path, this.params);
                 }
-                return Metadata.get(this.path, this.local);
+                return Metadata.get(this.path, this.local, this.JSONCache);
             }
             const url = Metadata.getMetadataUrl(this.path, this.local);
             const cache = yield caches.open(Frame.cacheName);
@@ -4753,6 +4712,7 @@ class Column extends Component {
         this.align = 'left';
         this.label = '';
         this.mask = '';
+        this.actionFixed = false;
         this.sortable = true;
         this.loading = false;
         this.componentProps = {};
@@ -4801,6 +4761,7 @@ class Column extends Component {
         this.mask = this.getInitValue('mask', props.mask, this.mask);
         this.overflow = this.getInitValue('overflow', props.overflow, this.overflow);
         this.type = this.getInitValue('type', props.type, this.type);
+        this.actionFixed = this.getInitValue('actionFixed', props.actionFixed, this.actionFixed);
         this.sortable = this.getInitValue('sortable', props.sortable, this.sortable);
         this.loading = this.getInitValue('loading', props.loading, this.loading);
         this.style = this.getInitValue('style', props.style, this.style);
@@ -4866,9 +4827,15 @@ class Column extends Component {
             this.lookupData[value] = this.lookupDatasource.data[dataIndex];
             return this.lookupData[value];
         }
-        this.dataToLookup = (this.dataToLookup || []);
-        this.dataToLookup.push(value);
-        this.lookup(lookupColumn);
+        const hasLookupColumn = this.lookupDatasource.data.every((row) => Reflect.has(row, lookupColumn));
+        if (hasLookupColumn) {
+            this.dataToLookup = (this.dataToLookup || []);
+            this.dataToLookup.push(value);
+            this.lookup(lookupColumn);
+        }
+        else {
+            console.warn(`Row datasource do not have a key: ${lookupColumn}`);
+        }
         return emptyRow;
     }
     /**
@@ -11609,6 +11576,7 @@ class TreeGrid extends Grid {
         this.parentField = this.getInitValue('parentField', props.parentField, this.parentField);
         this.fetchOnDemand = this.getInitValue('fetchOnDemand', props.fetchOnDemand, this.fetchOnDemand);
         this.flat = this.getInitValue('flat', props.flat, this.flat);
+        this.fieldHasChild = this.getInitValue('fieldHasChild', props.fieldHasChild, this.fieldHasChild);
         this.detach = this.getInitValue('detach', props.detach, this.detach);
         this.treeDataStructure = new TreeDataStructure(this);
         this.createAccessors();
@@ -11727,7 +11695,9 @@ class TreeGrid extends Grid {
      * @param isSelected row is selected
      */
     selectRow(row, isSelected) {
-        const childrenRows = !this.flat ? this.treeDataStructure.getChildren(row) : [];
+        const childrenRows = !this.flat
+            ? this.treeDataStructure.getChildren(row)
+            : [];
         const rows = [row, ...childrenRows];
         if (isSelected) {
             this.selectedRows = this.removeDuplicates(this.selectedRows.concat(rows), this.datasource.uniqueKey);
@@ -11770,7 +11740,9 @@ class TreeGrid extends Grid {
     selectParents(row) {
         if (row[this.parentField]) {
             const parentRow = this.treeDataStructure.getRowData(row).tree__parent;
-            const every = this.treeDataStructure.getChildren(parentRow).every((item) => {
+            const every = this.treeDataStructure
+                .getChildren(parentRow)
+                .every((item) => {
                 const index = this.treeDataStructure.findDataIndex(this.selectedRows, item[this.datasource.uniqueKey]);
                 if (index > -1)
                     return true;
@@ -13438,4 +13410,4 @@ const AutoNumeric = require('@zeedhi/autonumeric/dist/autoNumeric');
 const packageContent = require('../package.json');
 VersionService.addPackageVersion(packageContent.name, packageContent.version);
 
-export { Alert, AlertService, ApexChart, AutoNumeric, Badge, Breadcrumbs, Button, ButtonGroup, CSVReport, Card, Carousel, Checkbox, CheckboxMultiple, ChildNotFoundError, Chip, CodeEditor, Col, CollapseCard, Column, ColumnNotFoundError, Component, ComponentRender, Container, Currency, Dashboard, Date$1 as Date, DateRange, Dialog, DialogService, Divider, Dropdown, FileInput, Footer, Form, Frame, FramePage, Grid, GridColumn, GridColumnEditable, GridEditable, Header, Icon, Icons, Image, Increment, Input, Iterable, IterableColumnsButton, IterableColumnsButtonController, IterableComponentRender, IterablePageComponent, IterablePageInfo, IterablePageSize, IterablePagination, JsonCacheService, List, ListGroup, ListItem, Loading, LoadingService, Login, LoginButton, MasterDetail, Menu, MenuButton, MenuGroup, MenuLink, MenuSeparator, Modal, ModalCloseButton, ModalService, Month, Number$1 as Number, PDFReport, Password, Progress, Radio, RangeSlider, Report, Row, Search, Select, SelectMultiple, SelectTree, SelectTreeMultiple, SelectableList, SpeedDial, Steppers, SvgMap, Switch, Tab, Table, Tabs, Tag, Text, TextInput, Textarea, Time, Toggleable, Tooltip, Tree, TreeDataStructure, TreeGrid, TreeGridEditable, WatchURL, XLS2Report, XLS3Report, XLSReport, initTheme };
+export { Alert, AlertService, ApexChart, AutoNumeric, Badge, Breadcrumbs, Button, ButtonGroup, CSVReport, Card, Carousel, Checkbox, CheckboxMultiple, ChildNotFoundError, Chip, CodeEditor, Col, CollapseCard, Column, ColumnNotFoundError, Component, ComponentRender, Container, Currency, Dashboard, Date$1 as Date, DateRange, Dialog, DialogService, Divider, Dropdown, FileInput, Footer, Form, Frame, FramePage, Grid, GridColumn, GridColumnEditable, GridEditable, Header, Icon, Icons, Image, Increment, Input, Iterable, IterableColumnsButton, IterableColumnsButtonController, IterableComponentRender, IterablePageComponent, IterablePageInfo, IterablePageSize, IterablePagination, List, ListGroup, ListItem, Loading, LoadingService, Login, LoginButton, MasterDetail, Menu, MenuButton, MenuGroup, MenuLink, MenuSeparator, Modal, ModalCloseButton, ModalService, Month, Number$1 as Number, PDFReport, Password, Progress, Radio, RangeSlider, Report, Row, Search, Select, SelectMultiple, SelectTree, SelectTreeMultiple, SelectableList, SpeedDial, Steppers, SvgMap, Switch, Tab, Table, Tabs, Tag, Text, TextInput, Textarea, Time, Toggleable, Tooltip, Tree, TreeDataStructure, TreeGrid, TreeGridEditable, WatchURL, XLS2Report, XLS3Report, XLSReport, initTheme };

package/dist/zd-common.umd.js

@@ -2876,9 +2876,9 @@
        * Creates a new modal instance from JSON
        * @param modal modal structure
        */
-      static createFromJson(modalPath, local) {
+      static createFromJson(modalPath, local, JSONCache) {
           return __awaiter(this, void 0, void 0, function* () {
-              const modal = yield core.Metadata.get(modalPath, local);
+              const modal = yield core.Metadata.get(modalPath, local, JSONCache);
               return this.create(modal);
           });
       }
@@ -2955,37 +2955,6 @@
       }
   }
 
-  class JsonCacheService {
-      static saveJSONCache(jsonCollection) {
-          return __awaiter(this, void 0, void 0, function* () {
-              const jsonCollectionInCache = jsonCollection.map((jsonItem) => __awaiter(this, void 0, void 0, function* () {
-                  const { path } = jsonItem;
-                  const metadata = yield core.Metadata.get(path, true);
-                  localStorage.setItem(path, JSON.stringify(metadata));
-              }));
-              yield Promise.all(jsonCollectionInCache);
-          });
-      }
-      static getJSONCache(path) {
-          const getMetadaFromCache = localStorage.getItem(path);
-          let metadataValueReturn = false;
-          if (typeof getMetadaFromCache === 'string') {
-              metadataValueReturn = JSON.parse(getMetadaFromCache);
-          }
-          return metadataValueReturn;
-      }
-      static clearJSONCache(jsonCollection) {
-          jsonCollection.map((jsonItem) => __awaiter(this, void 0, void 0, function* () {
-              const { path } = jsonItem;
-              localStorage.removeItem(path);
-          }));
-      }
-  }
-  /**
-   * jsons collection
-   */
-  JsonCacheService.jsonCollection = [];
-
   /**
    * Base class for Dashboard component.
    */
@@ -4596,18 +4565,8 @@
       }
       getMetadata() {
           return __awaiter(this, void 0, void 0, function* () {
-              let page;
               try {
-                  if (this.JSONCache) {
-                      page = JsonCacheService.getJSONCache(this.path);
-                      if (page === false) {
-                          yield JsonCacheService.saveJSONCache([{ path: this.path }]);
-                          page = yield this.requestPage();
-                      }
-                  }
-                  else {
-                      page = yield this.requestPage();
-                  }
+                  const page = yield this.requestPage();
                   if (typeof page !== 'object')
                       throw new Error();
                   this.metadata = merge__default["default"](page, this.override);
@@ -4647,7 +4606,7 @@
                   if (this.type === 'post') {
                       return core.Metadata.post(this.path, this.params);
                   }
-                  return core.Metadata.get(this.path, this.local);
+                  return core.Metadata.get(this.path, this.local, this.JSONCache);
               }
               const url = core.Metadata.getMetadataUrl(this.path, this.local);
               const cache = yield caches.open(Frame.cacheName);
@@ -4760,6 +4719,7 @@
           this.align = 'left';
           this.label = '';
           this.mask = '';
+          this.actionFixed = false;
           this.sortable = true;
           this.loading = false;
           this.componentProps = {};
@@ -4808,6 +4768,7 @@
           this.mask = this.getInitValue('mask', props.mask, this.mask);
           this.overflow = this.getInitValue('overflow', props.overflow, this.overflow);
           this.type = this.getInitValue('type', props.type, this.type);
+          this.actionFixed = this.getInitValue('actionFixed', props.actionFixed, this.actionFixed);
           this.sortable = this.getInitValue('sortable', props.sortable, this.sortable);
           this.loading = this.getInitValue('loading', props.loading, this.loading);
           this.style = this.getInitValue('style', props.style, this.style);
@@ -4873,9 +4834,15 @@
               this.lookupData[value] = this.lookupDatasource.data[dataIndex];
               return this.lookupData[value];
           }
-          this.dataToLookup = (this.dataToLookup || []);
-          this.dataToLookup.push(value);
-          this.lookup(lookupColumn);
+          const hasLookupColumn = this.lookupDatasource.data.every((row) => Reflect.has(row, lookupColumn));
+          if (hasLookupColumn) {
+              this.dataToLookup = (this.dataToLookup || []);
+              this.dataToLookup.push(value);
+              this.lookup(lookupColumn);
+          }
+          else {
+              console.warn(`Row datasource do not have a key: ${lookupColumn}`);
+          }
           return emptyRow;
       }
       /**
@@ -11616,6 +11583,7 @@
           this.parentField = this.getInitValue('parentField', props.parentField, this.parentField);
           this.fetchOnDemand = this.getInitValue('fetchOnDemand', props.fetchOnDemand, this.fetchOnDemand);
           this.flat = this.getInitValue('flat', props.flat, this.flat);
+          this.fieldHasChild = this.getInitValue('fieldHasChild', props.fieldHasChild, this.fieldHasChild);
           this.detach = this.getInitValue('detach', props.detach, this.detach);
           this.treeDataStructure = new TreeDataStructure(this);
           this.createAccessors();
@@ -11734,7 +11702,9 @@
        * @param isSelected row is selected
        */
       selectRow(row, isSelected) {
-          const childrenRows = !this.flat ? this.treeDataStructure.getChildren(row) : [];
+          const childrenRows = !this.flat
+              ? this.treeDataStructure.getChildren(row)
+              : [];
           const rows = [row, ...childrenRows];
           if (isSelected) {
               this.selectedRows = this.removeDuplicates(this.selectedRows.concat(rows), this.datasource.uniqueKey);
@@ -11777,7 +11747,9 @@
       selectParents(row) {
           if (row[this.parentField]) {
               const parentRow = this.treeDataStructure.getRowData(row).tree__parent;
-              const every = this.treeDataStructure.getChildren(parentRow).every((item) => {
+              const every = this.treeDataStructure
+                  .getChildren(parentRow)
+                  .every((item) => {
                   const index = this.treeDataStructure.findDataIndex(this.selectedRows, item[this.datasource.uniqueKey]);
                   if (index > -1)
                       return true;
@@ -13499,7 +13471,6 @@
   exports.IterablePageInfo = IterablePageInfo;
   exports.IterablePageSize = IterablePageSize;
   exports.IterablePagination = IterablePagination;
-  exports.JsonCacheService = JsonCacheService;
   exports.List = List;
   exports.ListGroup = ListGroup;
   exports.ListItem = ListItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.70.0",
+  "version": "1.72.0",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -39,5 +39,5 @@
     "lodash.times": "^4.3.2",
     "mockdate": "^3.0.2"
   },
-  "gitHead": "5d3e8cfdd580a87208edf3d4033e2a974161fd1a"
+  "gitHead": "4844a8a23f08e63110e73fddb458514a7f3bfa18"
 }

package/types/components/zd-iterable/column.d.ts

@@ -12,6 +12,7 @@ export declare class Column extends Component implements IColumn {
     minWidth?: string;
     mask: string;
     type?: ColumnType;
+    actionFixed: boolean;
     sortable: boolean;
     loading: boolean;
     componentProps: any;

package/types/components/zd-iterable/interfaces.d.ts

@@ -17,6 +17,7 @@ export interface IColumn extends IComponent {
     overflow?: string | number;
     mask?: string;
     type?: ColumnType;
+    actionFixed?: boolean;
     sortable?: boolean;
     loading?: boolean;
     componentProps?: IComponent;

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

@@ -5,6 +5,7 @@ export interface ITreeGrid extends IGrid {
     parentField?: string;
     openLevelOnLoad?: number | boolean;
     fetchOnDemand?: boolean;
+    fieldHasChild?: string;
     flat?: boolean;
     detach?: boolean;
 }

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

@@ -19,6 +19,10 @@ export declare class TreeGrid extends Grid implements ITreeGrid {
      * Defines if the tree will be fetch data only when opening a level
      */
     fetchOnDemand: boolean;
+    /**
+     * Defines if the node tree has child
+     */
+    fieldHasChild?: string;
     /**
      * Defines if should wait and not execute GET method when Datasource is created
      */

package/types/services/index.d.ts

@@ -2,4 +2,3 @@ export * from './zd-alert/alert-service';
 export * from './zd-dialog/dialog-service';
 export * from './zd-modal/modal-service';
 export * from './zd-loading/loading-service';
-export * from './zd-json-cache/json-cache-service';

package/types/services/zd-modal/modal-service.d.ts

@@ -16,7 +16,7 @@ export declare class ModalService {
      * Creates a new modal instance from JSON
      * @param modal modal structure
      */
-    static createFromJson(modalPath: string, local?: boolean): Promise<Modal>;
+    static createFromJson(modalPath: string, local?: boolean, JSONCache?: boolean): Promise<Modal>;
     /**
      * Creates a new modal instance from JSON
      * @param modal modal structure