@zeedhi/common 1.49.0 → 1.50.0

package/dist/zd-common.esm.js

@@ -2813,6 +2813,16 @@ class ModalService {
             return this.create(modal);
         });
     }
+    /**
+     * Creates a new modal instance from JSON
+     * @param modal modal structure
+     */
+    static createFromJsonPost(modalPath, params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const modal = yield Metadata.post(modalPath, params);
+            return this.create(modal);
+        });
+    }
     /**
      * Deletes modal
      * @param modal modal instance
@@ -3103,7 +3113,7 @@ class Dashboard extends ComponentRender {
         ];
         this.editingMode = this.getInitValue('editingMode', props.editingMode, this.editingMode);
         this.moveMode = this.getInitValue('moveMode', props.moveMode, this.moveMode);
-        this.cards = props.cards || this.cards;
+        this.cards = this.getInitValue('cards', props.cards, this.cards);
         this.overrideNamedProps = props.overrideNamedProps || this.overrideNamedProps;
         this.removePadding = this.getInitValue('removePadding', props.removePadding, this.removePadding);
         this.height = this.getInitValue('height', props.height, this.height);
@@ -3131,13 +3141,7 @@ class Dashboard extends ComponentRender {
     addCard() {
         const addCardForm = Metadata.getInstance('addCardForm');
         if (addCardForm.validate()) {
-            const newCard = {
-                cardId: this.getCardId(),
-                path: addCardForm.value.inputPath,
-                local: addCardForm.value.inputLocal,
-                height: addCardForm.value.inputHeight,
-                width: addCardForm.value.inputWidth,
-            };
+            const newCard = Object.assign({ cardId: this.getCardId(), path: addCardForm.value.inputPath, local: addCardForm.value.inputLocal, height: addCardForm.value.inputHeight, width: addCardForm.value.inputWidth }, addCardForm.value);
             this.cards.push(newCard);
             this.modalCancelClick();
         }
@@ -9060,7 +9064,9 @@ class TreeDataStructure {
                 originalData.splice(index + 1, 0, ...data);
                 this.originalDatasource.data = originalData;
                 this.originalDatasource.currentRow = this.clearRow(row);
+                return data;
             }
+            return undefined;
         });
     }
     /**
@@ -9248,6 +9254,10 @@ class SelectTree extends TextInput {
          */
         this.lazyLoad = true;
         this.selectValue = null;
+        /**
+         * Uses delayed loading to load tree branches
+         */
+        this.fetchOnDemand = false;
         this.nodes = this.getInitValue('nodes', props.nodes, this.nodes);
         this.alwaysOpen = this.getInitValue('alwaysOpen', props.alwaysOpen, this.alwaysOpen);
         this.flattenSearchResults = this.getInitValue('flattenSearchResults', props.flattenSearchResults, this.flattenSearchResults);
@@ -9266,6 +9276,7 @@ class SelectTree extends TextInput {
         this.dataDisabled = this.getInitValue('dataDisabled', props.dataDisabled, this.dataDisabled);
         this.disabledItems = this.getInitValue('disabledItems', props.disabledItems, this.disabledItems);
         this.preventLoadOnFocus = this.getInitValue('preventLoadOnFocus', props.preventLoadOnFocus, this.preventLoadOnFocus);
+        this.fetchOnDemand = this.getInitValue('fetchOnDemand', props.fetchOnDemand, this.fetchOnDemand);
         if (props.datasource && Object.keys(props.datasource).length) {
             this.lazyLoad = props.datasource.lazyLoad !== false;
             const searchFields = Array.isArray(this.dataText) ? this.dataText : [this.dataText];
@@ -9302,7 +9313,7 @@ class SelectTree extends TextInput {
             datasource: this.datasource,
             parentField: this.parentField,
             openLevelOnLoad: false,
-            fetchOnDemand: false,
+            fetchOnDemand: this.fetchOnDemand,
         });
         if (!this.lazyLoad) {
             this.datasource.get().then(() => { this.createNodesFromDatasource(false); });
@@ -9322,7 +9333,16 @@ class SelectTree extends TextInput {
         }
     }
     createNodeFromRow(row) {
-        const children = this.createChildrenNodes(row.tree__children);
+        let children;
+        if (this.fetchOnDemand) {
+            children = null;
+        }
+        else {
+            children = this.createChildrenNodes(row.tree__children);
+            if (!children.length) {
+                children = undefined;
+            }
+        }
         const dataTextArr = Array.isArray(this.dataText) ? this.dataText : [this.dataText];
         const dataTextNames = [];
         const masks = [];
@@ -9357,15 +9377,18 @@ class SelectTree extends TextInput {
         return {
             id: row[this.dataValue],
             label: dataText,
-            children: children.length ? children : undefined,
+            children,
             row,
         };
     }
     createChildrenNodes(rows) {
         const newNodes = [];
         rows.forEach((row) => {
-            const newNode = this.createNodeFromRow(row);
-            newNodes.push(newNode);
+            if (Object.keys(row).length > 0) {
+                const newNode = this.createNodeFromRow(row);
+                row.tree__node = newNode;
+                newNodes.push(newNode);
+            }
         });
         return newNodes;
     }
@@ -9401,7 +9424,7 @@ class SelectTree extends TextInput {
         return this.disabledItems.indexOf(node.id) !== -1;
     }
     getDisabledNodes(nodes) {
-        return nodes.map((node) => (Object.assign(Object.assign({}, node), { isDisabled: this.isDisable(node), children: node.children ? this.getDisabledNodes(node.children) : undefined })));
+        return nodes.map((node) => (Object.assign(Object.assign({}, node), { isDisabled: this.isDisable(node), children: node.children ? this.getDisabledNodes(node.children) : node.children })));
     }
     getNodes() {
         return this.getDisabledNodes(this.nodes);
@@ -9468,6 +9491,22 @@ class SelectTree extends TextInput {
         }
         this.selectValue = val;
     }
+    loadChildren(parentNode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.treeDataStructure.toggleExpand(parentNode.row).then((data) => {
+                const node = parentNode.row.tree__node;
+                if (node) {
+                    if (!data || data.length === 0) {
+                        node.children = undefined;
+                    }
+                    else {
+                        const nodes = this.createChildrenNodes(data);
+                        node.children = nodes;
+                    }
+                }
+            });
+        });
+    }
 }
 
 /**
@@ -10540,6 +10579,10 @@ class Tree extends ComponentRender {
                 children: [],
             };
             newNode = merge(newNode, node, override);
+            if (typeof node.isLeaf === 'undefined') {
+                const hasChildren = newNode.children.length > 0;
+                newNode.isLeaf = !hasChildren;
+            }
             newNode.children = this.initNodes(node.children || [], override);
             return newNode;
         });
@@ -10614,6 +10657,7 @@ class Tree extends ComponentRender {
     insertNode(newNode) {
         const initNode = this.initNodes([newNode])[0];
         if (this.selectedNodes.length) {
+            this.updateNodeData(this.selectedNodes[0], { isLeaf: false });
             const cursorPosition = {
                 node: this.selectedNodes[0],
                 placement: 'inside',
@@ -10624,31 +10668,44 @@ class Tree extends ComponentRender {
             this.nodes.push(initNode);
         }
     }
+    /** Import multiples nodes by the current cursor position */
     importNodes(nodes) {
         if (this.selectedNodes.length) {
-            const cursorPosition = {
-                node: this.selectedNodes[0],
-                placement: 'inside',
-            };
             nodes.reverse().forEach((node) => {
-                this.tree.insert(cursorPosition, node);
+                this.insertNode(node);
             });
         }
         else {
             nodes.forEach((node) => {
-                this.nodes.push(node);
+                this.insertNode(node);
             });
         }
     }
     /** Remove selected node */
     removeSelected() {
+        const parentNodesPath = [];
         if (this.selectedNodes.length) {
-            const selectedPaths = this.selectedNodes.map((item) => item.path);
+            const selectedPaths = this.selectedNodes.map((item) => {
+                const parent = this.getParentNode(item);
+                if (parent) {
+                    parentNodesPath.push(parent.path);
+                }
+                return item.path;
+            });
             this.tree.remove(selectedPaths);
+            parentNodesPath.forEach((path) => {
+                const parent = this.getNode(path);
+                if (parent && parent.children && parent.children.length === 0) {
+                    this.tree.updateNode(path, { isLeaf: true });
+                }
+            });
         }
     }
     /** Update selected node */
     updateNodeData(node, value) {
+        if (node.children && node.children.length === 0) {
+            this.tree.updateNode(node.path, { isLeaf: true });
+        }
         this.tree.updateNode(node.path, value);
     }
     setTree(tree) {
@@ -10782,7 +10839,7 @@ class Tree extends ComponentRender {
     }
     getParentNode(node) {
         const hasParent = Array.isArray(node.path) && node.path.length > 1;
-        if (node.path && hasParent) {
+        if (hasParent) {
             return this.tree.getNode(node.path.slice(0, -1));
         }
         return undefined;

package/dist/zd-common.umd.js

@@ -2820,6 +2820,16 @@
               return this.create(modal);
           });
       }
+      /**
+       * Creates a new modal instance from JSON
+       * @param modal modal structure
+       */
+      static createFromJsonPost(modalPath, params) {
+          return __awaiter(this, void 0, void 0, function* () {
+              const modal = yield core.Metadata.post(modalPath, params);
+              return this.create(modal);
+          });
+      }
       /**
        * Deletes modal
        * @param modal modal instance
@@ -3110,7 +3120,7 @@
           ];
           this.editingMode = this.getInitValue('editingMode', props.editingMode, this.editingMode);
           this.moveMode = this.getInitValue('moveMode', props.moveMode, this.moveMode);
-          this.cards = props.cards || this.cards;
+          this.cards = this.getInitValue('cards', props.cards, this.cards);
           this.overrideNamedProps = props.overrideNamedProps || this.overrideNamedProps;
           this.removePadding = this.getInitValue('removePadding', props.removePadding, this.removePadding);
           this.height = this.getInitValue('height', props.height, this.height);
@@ -3138,13 +3148,7 @@
       addCard() {
           const addCardForm = core.Metadata.getInstance('addCardForm');
           if (addCardForm.validate()) {
-              const newCard = {
-                  cardId: this.getCardId(),
-                  path: addCardForm.value.inputPath,
-                  local: addCardForm.value.inputLocal,
-                  height: addCardForm.value.inputHeight,
-                  width: addCardForm.value.inputWidth,
-              };
+              const newCard = Object.assign({ cardId: this.getCardId(), path: addCardForm.value.inputPath, local: addCardForm.value.inputLocal, height: addCardForm.value.inputHeight, width: addCardForm.value.inputWidth }, addCardForm.value);
               this.cards.push(newCard);
               this.modalCancelClick();
           }
@@ -9067,7 +9071,9 @@
                   originalData.splice(index + 1, 0, ...data);
                   this.originalDatasource.data = originalData;
                   this.originalDatasource.currentRow = this.clearRow(row);
+                  return data;
               }
+              return undefined;
           });
       }
       /**
@@ -9255,6 +9261,10 @@
            */
           this.lazyLoad = true;
           this.selectValue = null;
+          /**
+           * Uses delayed loading to load tree branches
+           */
+          this.fetchOnDemand = false;
           this.nodes = this.getInitValue('nodes', props.nodes, this.nodes);
           this.alwaysOpen = this.getInitValue('alwaysOpen', props.alwaysOpen, this.alwaysOpen);
           this.flattenSearchResults = this.getInitValue('flattenSearchResults', props.flattenSearchResults, this.flattenSearchResults);
@@ -9273,6 +9283,7 @@
           this.dataDisabled = this.getInitValue('dataDisabled', props.dataDisabled, this.dataDisabled);
           this.disabledItems = this.getInitValue('disabledItems', props.disabledItems, this.disabledItems);
           this.preventLoadOnFocus = this.getInitValue('preventLoadOnFocus', props.preventLoadOnFocus, this.preventLoadOnFocus);
+          this.fetchOnDemand = this.getInitValue('fetchOnDemand', props.fetchOnDemand, this.fetchOnDemand);
           if (props.datasource && Object.keys(props.datasource).length) {
               this.lazyLoad = props.datasource.lazyLoad !== false;
               const searchFields = Array.isArray(this.dataText) ? this.dataText : [this.dataText];
@@ -9309,7 +9320,7 @@
               datasource: this.datasource,
               parentField: this.parentField,
               openLevelOnLoad: false,
-              fetchOnDemand: false,
+              fetchOnDemand: this.fetchOnDemand,
           });
           if (!this.lazyLoad) {
               this.datasource.get().then(() => { this.createNodesFromDatasource(false); });
@@ -9329,7 +9340,16 @@
           }
       }
       createNodeFromRow(row) {
-          const children = this.createChildrenNodes(row.tree__children);
+          let children;
+          if (this.fetchOnDemand) {
+              children = null;
+          }
+          else {
+              children = this.createChildrenNodes(row.tree__children);
+              if (!children.length) {
+                  children = undefined;
+              }
+          }
           const dataTextArr = Array.isArray(this.dataText) ? this.dataText : [this.dataText];
           const dataTextNames = [];
           const masks = [];
@@ -9364,15 +9384,18 @@
           return {
               id: row[this.dataValue],
               label: dataText,
-              children: children.length ? children : undefined,
+              children,
               row,
           };
       }
       createChildrenNodes(rows) {
           const newNodes = [];
           rows.forEach((row) => {
-              const newNode = this.createNodeFromRow(row);
-              newNodes.push(newNode);
+              if (Object.keys(row).length > 0) {
+                  const newNode = this.createNodeFromRow(row);
+                  row.tree__node = newNode;
+                  newNodes.push(newNode);
+              }
           });
           return newNodes;
       }
@@ -9408,7 +9431,7 @@
           return this.disabledItems.indexOf(node.id) !== -1;
       }
       getDisabledNodes(nodes) {
-          return nodes.map((node) => (Object.assign(Object.assign({}, node), { isDisabled: this.isDisable(node), children: node.children ? this.getDisabledNodes(node.children) : undefined })));
+          return nodes.map((node) => (Object.assign(Object.assign({}, node), { isDisabled: this.isDisable(node), children: node.children ? this.getDisabledNodes(node.children) : node.children })));
       }
       getNodes() {
           return this.getDisabledNodes(this.nodes);
@@ -9475,6 +9498,22 @@
           }
           this.selectValue = val;
       }
+      loadChildren(parentNode) {
+          return __awaiter(this, void 0, void 0, function* () {
+              return this.treeDataStructure.toggleExpand(parentNode.row).then((data) => {
+                  const node = parentNode.row.tree__node;
+                  if (node) {
+                      if (!data || data.length === 0) {
+                          node.children = undefined;
+                      }
+                      else {
+                          const nodes = this.createChildrenNodes(data);
+                          node.children = nodes;
+                      }
+                  }
+              });
+          });
+      }
   }
 
   /**
@@ -10547,6 +10586,10 @@
                   children: [],
               };
               newNode = merge__default["default"](newNode, node, override);
+              if (typeof node.isLeaf === 'undefined') {
+                  const hasChildren = newNode.children.length > 0;
+                  newNode.isLeaf = !hasChildren;
+              }
               newNode.children = this.initNodes(node.children || [], override);
               return newNode;
           });
@@ -10621,6 +10664,7 @@
       insertNode(newNode) {
           const initNode = this.initNodes([newNode])[0];
           if (this.selectedNodes.length) {
+              this.updateNodeData(this.selectedNodes[0], { isLeaf: false });
               const cursorPosition = {
                   node: this.selectedNodes[0],
                   placement: 'inside',
@@ -10631,31 +10675,44 @@
               this.nodes.push(initNode);
           }
       }
+      /** Import multiples nodes by the current cursor position */
       importNodes(nodes) {
           if (this.selectedNodes.length) {
-              const cursorPosition = {
-                  node: this.selectedNodes[0],
-                  placement: 'inside',
-              };
               nodes.reverse().forEach((node) => {
-                  this.tree.insert(cursorPosition, node);
+                  this.insertNode(node);
               });
           }
           else {
               nodes.forEach((node) => {
-                  this.nodes.push(node);
+                  this.insertNode(node);
               });
           }
       }
       /** Remove selected node */
       removeSelected() {
+          const parentNodesPath = [];
           if (this.selectedNodes.length) {
-              const selectedPaths = this.selectedNodes.map((item) => item.path);
+              const selectedPaths = this.selectedNodes.map((item) => {
+                  const parent = this.getParentNode(item);
+                  if (parent) {
+                      parentNodesPath.push(parent.path);
+                  }
+                  return item.path;
+              });
               this.tree.remove(selectedPaths);
+              parentNodesPath.forEach((path) => {
+                  const parent = this.getNode(path);
+                  if (parent && parent.children && parent.children.length === 0) {
+                      this.tree.updateNode(path, { isLeaf: true });
+                  }
+              });
           }
       }
       /** Update selected node */
       updateNodeData(node, value) {
+          if (node.children && node.children.length === 0) {
+              this.tree.updateNode(node.path, { isLeaf: true });
+          }
           this.tree.updateNode(node.path, value);
       }
       setTree(tree) {
@@ -10789,7 +10846,7 @@
       }
       getParentNode(node) {
           const hasParent = Array.isArray(node.path) && node.path.length > 1;
-          if (node.path && hasParent) {
+          if (hasParent) {
               return this.tree.getNode(node.path.slice(0, -1));
           }
           return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.49.0",
+  "version": "1.50.0",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -37,5 +37,5 @@
     "lodash.times": "^4.3.2",
     "mockdate": "^3.0.2"
   },
-  "gitHead": "c470a0a057bc8e1c5b97197258b551b9b158b744"
+  "gitHead": "47f7e1870055d3ad9bba54c0f96b1e34176b70b6"
 }

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

@@ -2,7 +2,7 @@ import { IEventParam } from '@zeedhi/core';
 import { Dashboard } from './dashboard';
 import { IComponentRender, IComponentEvents } from '../zd-component/interfaces';
 import { IButton } from '../zd-button/interfaces';
-import { ICardEvents } from '../zd-card/interfaces';
+import { ICard } from '../zd-card/interfaces';
 export declare type IDashboardEventParam = IEventParam<Dashboard>;
 export declare type IDashboardLoadEvent<T> = (event: T) => Promise<any>;
 export interface IDashboardEvents<T = IEventParam<any>> extends IComponentEvents<T> {
@@ -19,13 +19,11 @@ export interface IDashboard extends IComponentRender {
     height?: string | number;
     heightAdjust?: string | number;
 }
-export interface IDashboardCard {
+export interface IDashboardCard extends Omit<ICard, 'name' | 'component'> {
     cardId: string;
     path: string;
     local: boolean;
     height: number | string;
-    width: number;
-    flat?: boolean;
-    events?: ICardEvents;
+    width: number | string;
     overrideNamedProps?: any;
 }

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

@@ -6,7 +6,8 @@ export interface ISelectTreeNode<T> {
     label: string;
     isDisabled?: boolean;
     isDefaultExpanded?: boolean;
-    children?: ISelectTreeNode<T>[];
+    children?: ISelectTreeNode<T>[] | null;
+    row?: IDictionary<any>;
 }
 export interface ISelectTree extends IComponentRender {
     nodes?: ISelectTreeNode<IDictionary>[];
@@ -28,6 +29,7 @@ export interface ISelectTree extends IComponentRender {
     dataText?: string | any[];
     dataDisabled?: string;
     disabledItems?: any[];
+    fetchOnDemand?: boolean;
 }
 export interface ISelectTreeCloseEvent extends IEventParam<SelectTree> {
     selectedNodes: ISelectTreeNode<IDictionary>[];

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

@@ -89,6 +89,10 @@ export declare class SelectTree extends TextInput implements ISelectTree {
      */
     private lazyLoad;
     selectValue: any;
+    /**
+     * Uses delayed loading to load tree branches
+     */
+    fetchOnDemand: boolean;
     /**
      * Creates a new instance of SelectTree
      * @param props
@@ -135,4 +139,5 @@ export declare class SelectTree extends TextInput implements ISelectTree {
     get value(): any;
     set value(value: any);
     setValue(value: any): void;
+    loadChildren(parentNode: ISelectTreeNode<IDictionary>): Promise<void>;
 }

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

@@ -68,7 +68,7 @@ export declare class Tree extends ComponentRender implements ITree {
     /**
      * Initialize all the properties of the declared nodes (reactivity)
      */
-    protected initNodes(nodes: ITreeNodeModel<IDictionary>[], override?: IDictionary): ITreeNodeModel<IDictionary>[];
+    initNodes(nodes: ITreeNodeModel<IDictionary>[], override?: IDictionary): ITreeNodeModel<IDictionary>[];
     /** Nodes */
     get nodes(): ITreeNodeModel<IDictionary>[];
     set nodes(value: ITreeNodeModel<IDictionary>[]);
@@ -82,6 +82,7 @@ export declare class Tree extends ComponentRender implements ITree {
     private createChildrenNodes;
     /** Insert nodes by the current cursor position */
     insertNode(newNode: ITreeNodeModel<IDictionary>): void;
+    /** Import multiples nodes by the current cursor position */
     importNodes(nodes: ITreeNodeModel<IDictionary>[]): void;
     /** Remove selected node */
     removeSelected(): void;

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

@@ -17,6 +17,11 @@ export declare class ModalService {
      * @param modal modal structure
      */
     static createFromJson(modalPath: string, local?: boolean): Promise<Modal>;
+    /**
+     * Creates a new modal instance from JSON
+     * @param modal modal structure
+     */
+    static createFromJsonPost(modalPath: string, params?: object): Promise<Modal>;
     /**
      * Deletes modal
      * @param modal modal instance

package/types/utils/tree-data-structure/tree-data-structure.d.ts

@@ -105,7 +105,7 @@ export declare class TreeDataStructure {
      * @param row Row object
      * @param rowIndex Row index
      */
-    toggleExpand(row: IDictionary<any>, rowIndex?: number): Promise<void>;
+    toggleExpand(row: IDictionary<any>, rowIndex?: number): Promise<IDictionary<any>[] | undefined>;
     /**
      * Return row with tree data
      * @param row datasource row