@zeedhi/common 1.97.4 → 1.97.6

package/dist/zd-common.esm.js

@@ -6979,29 +6979,36 @@ class GridEditable extends Grid {
      */
     addNewRow(row, position = 'end') {
         return __awaiter(this, void 0, void 0, function* () {
-            let data;
-            if (this.datasource instanceof MemoryDatasource) {
-                data = this.datasource.allData;
-            }
-            else {
-                data = this.datasource.data;
-            }
-            row[this.newRowIdentifier] = true;
-            if (position === 'start') {
-                data.unshift(row);
-            }
-            else {
-                data.push(row);
-            }
+            const data = this.insertRowInDatasource(row, position);
+            this.saveRowReference(row);
             yield this.datasource.updateData(data);
-            const id = row[this.datasource.uniqueKey];
-            if (id) {
-                this.editedRows = Object.assign(Object.assign({}, this.editedRows), { [id]: Object.assign({}, row) });
-                this.addedRows = Object.assign(Object.assign({}, this.addedRows), { [id]: Object.assign({}, row) });
-            }
             this.editing = true;
         });
     }
+    saveRowReference(row) {
+        const id = row[this.datasource.uniqueKey];
+        if (id) {
+            this.editedRows = Object.assign(Object.assign({}, this.editedRows), { [id]: Object.assign({}, row) });
+            this.addedRows = Object.assign(Object.assign({}, this.addedRows), { [id]: Object.assign({}, row) });
+        }
+    }
+    insertRowInDatasource(row, position) {
+        let data;
+        if (this.datasource instanceof MemoryDatasource) {
+            data = this.datasource.allData;
+        }
+        else {
+            data = this.datasource.data;
+        }
+        row[this.newRowIdentifier] = true;
+        if (position === 'start') {
+            data.unshift(row);
+        }
+        else {
+            data.push(row);
+        }
+        return data;
+    }
     /**
      * Gets the editable component name
      * @param key Row unique key
@@ -10327,7 +10334,20 @@ class SelectMultiple extends Select {
                 this.datasource.loadAll = true;
                 yield this.datasource.get();
             }
-            this.setValue(this.datasource.data);
+            // remove disabled values
+            const filteredData = this.datasource.data.filter((row) => {
+                if (row[this.dataDisabled])
+                    return false;
+                const disabledValues = this.disabledItems.map((item) => {
+                    if (typeof item === 'object')
+                        return item[this.dataValue];
+                    return item;
+                });
+                if (disabledValues.includes(row[this.dataValue]))
+                    return false;
+                return true;
+            });
+            this.setValue(filteredData);
             if (!this.datasource.search) {
                 this.setCache();
             }

package/dist/zd-common.umd.js

@@ -6986,29 +6986,36 @@
        */
       addNewRow(row, position = 'end') {
           return __awaiter(this, void 0, void 0, function* () {
-              let data;
-              if (this.datasource instanceof core.MemoryDatasource) {
-                  data = this.datasource.allData;
-              }
-              else {
-                  data = this.datasource.data;
-              }
-              row[this.newRowIdentifier] = true;
-              if (position === 'start') {
-                  data.unshift(row);
-              }
-              else {
-                  data.push(row);
-              }
+              const data = this.insertRowInDatasource(row, position);
+              this.saveRowReference(row);
               yield this.datasource.updateData(data);
-              const id = row[this.datasource.uniqueKey];
-              if (id) {
-                  this.editedRows = Object.assign(Object.assign({}, this.editedRows), { [id]: Object.assign({}, row) });
-                  this.addedRows = Object.assign(Object.assign({}, this.addedRows), { [id]: Object.assign({}, row) });
-              }
               this.editing = true;
           });
       }
+      saveRowReference(row) {
+          const id = row[this.datasource.uniqueKey];
+          if (id) {
+              this.editedRows = Object.assign(Object.assign({}, this.editedRows), { [id]: Object.assign({}, row) });
+              this.addedRows = Object.assign(Object.assign({}, this.addedRows), { [id]: Object.assign({}, row) });
+          }
+      }
+      insertRowInDatasource(row, position) {
+          let data;
+          if (this.datasource instanceof core.MemoryDatasource) {
+              data = this.datasource.allData;
+          }
+          else {
+              data = this.datasource.data;
+          }
+          row[this.newRowIdentifier] = true;
+          if (position === 'start') {
+              data.unshift(row);
+          }
+          else {
+              data.push(row);
+          }
+          return data;
+      }
       /**
        * Gets the editable component name
        * @param key Row unique key
@@ -10334,7 +10341,20 @@
                   this.datasource.loadAll = true;
                   yield this.datasource.get();
               }
-              this.setValue(this.datasource.data);
+              // remove disabled values
+              const filteredData = this.datasource.data.filter((row) => {
+                  if (row[this.dataDisabled])
+                      return false;
+                  const disabledValues = this.disabledItems.map((item) => {
+                      if (typeof item === 'object')
+                          return item[this.dataValue];
+                      return item;
+                  });
+                  if (disabledValues.includes(row[this.dataValue]))
+                      return false;
+                  return true;
+              });
+              this.setValue(filteredData);
               if (!this.datasource.search) {
                   this.setCache();
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.97.4",
+  "version": "1.97.6",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -43,5 +43,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "052cd88ccb75d186580d431224412c56801353de"
+  "gitHead": "0776a456419f953c332c764c6cdf098b25660481"
 }

package/types/components/zd-grid/grid-editable-controller.d.ts

@@ -0,0 +1,8 @@
+import { IDictionary } from '@zeedhi/core';
+import { GridEditable } from './grid-editable';
+export declare class GridEditableController {
+    private grid;
+    constructor(grid: GridEditable);
+    get hasAddedRows(): boolean;
+    isAddedRow({ row }: IDictionary): boolean;
+}

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

@@ -173,6 +173,8 @@ export declare class GridEditable extends Grid implements IGridEditable {
      * @param position whether the new Row will be inserted at the beginning or end of the data array
      */
     addNewRow(row: IDictionary, position?: 'end' | 'start'): Promise<void>;
+    protected saveRowReference(row: IDictionary<any>): void;
+    protected insertRowInDatasource(row: IDictionary<any>, position: 'end' | 'start'): IDictionary<any>[];
     /**
      * Gets the editable component name
      * @param key Row unique key

package/types/services/zd-json-cache/json-cache-service.d.ts

@@ -0,0 +1,12 @@
+export interface IJSONObject {
+    path: string;
+}
+export declare class JsonCacheService {
+    /**
+     * jsons collection
+     */
+    static jsonCollection: IJSONObject[];
+    static saveJSONCache(jsonCollection: IJSONObject[]): Promise<void>;
+    static getJSONCache(path: string): any;
+    static clearJSONCache(jsonCollection: IJSONObject[]): void;
+}

package/types/utils/data-value-out/data-value-out.d.ts

@@ -0,0 +1,5 @@
+import { ISelectDataValueOut } from './interfaces';
+export declare class DataValueOutHelper {
+    private static getFormParent;
+    static setDataValueOut(select: ISelectDataValueOut, value: any): void;
+}

package/types/utils/data-value-out/index.d.ts

@@ -0,0 +1,2 @@
+export * from './interfaces';
+export * from './data-value-out';

package/types/utils/data-value-out/interfaces.d.ts

@@ -0,0 +1,8 @@
+export interface ISelectDataValueOutItem {
+    column: string;
+    columnOnForm: string;
+}
+export interface ISelectDataValueOut {
+    dataValueOut?: ISelectDataValueOutItem[];
+    dataValueOutFormName?: string;
+}

package/types/utils/report/errors/empty-data-error.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Empty data error
+ */
+export declare class EmptyDataError extends Error {
+    constructor();
+}