@zeedhi/common 1.84.0 → 1.85.0

package/dist/zd-common.esm.js

@@ -5540,13 +5540,7 @@ class Iterable extends ComponentRender {
      * Get pagination length
      */
     get paginationLength() {
-        let { limit, total } = this.datasource;
-        limit = Number(limit);
-        total = Number(total);
-        if (!limit || Number.isNaN(total) || Number.isNaN(limit)) {
-            return 0;
-        }
-        return Math.ceil(total / limit);
+        return this.datasource.getPaginationLength();
     }
     /**
      * Return cells with conditions applied for each row
@@ -6638,11 +6632,12 @@ class GridEditable extends Grid {
             const { data, page } = this.datasource;
             const allData = this.datasource.allData || data;
             Promise.resolve(allData);
-            allData.forEach((row, index) => {
-                if (row[this.newRowIdentifier]) {
+            for (let index = allData.length - 1; index >= 0; index -= 1) {
+                const row = allData[index];
+                if (this.addedRows[row[this.datasource.uniqueKey]]) {
                     allData.splice(index, 1);
                 }
-            });
+            }
             yield this.datasource.updateData(allData);
             yield this.datasource.get();
             yield this.datasource.setPage(page);
@@ -6665,6 +6660,7 @@ class GridEditable extends Grid {
             const response = yield Promise.all(this.getEditedRows(revalidate).map((row) => this.addDataRow(row)));
             this.editing = false;
             this.editedRows = {};
+            this.addedRows = {};
             this.invalidComponents = {};
             this.addedRows = {};
             yield this.datasource.get();
@@ -6679,11 +6675,8 @@ class GridEditable extends Grid {
     getEditedRows(revalidate = false) {
         const editedRows = [];
         Object.keys(this.editedRows).forEach((key) => {
-            this.addedRows = {};
             const row = Object.assign(Object.assign({}, this.editedRows[key].originalRow), this.editedRows[key]);
             delete row.originalRow;
-            if (row[this.newRowIdentifier])
-                this.addedRows[key] = row;
             delete row[this.newRowIdentifier];
             Object.keys(row).forEach((attr) => {
                 if (Object.prototype.hasOwnProperty.call(row, `${attr}_original`)) {
@@ -6738,7 +6731,8 @@ class GridEditable extends Grid {
             yield this.datasource.updateData(data);
             const id = row[this.datasource.uniqueKey];
             if (id) {
-                this.editedRows[id] = row;
+                this.editedRows[id] = Object.assign({}, row);
+                this.addedRows[id] = Object.assign({}, row);
             }
             this.editing = true;
         });

package/dist/zd-common.umd.js

@@ -5547,13 +5547,7 @@
        * Get pagination length
        */
       get paginationLength() {
-          let { limit, total } = this.datasource;
-          limit = Number(limit);
-          total = Number(total);
-          if (!limit || Number.isNaN(total) || Number.isNaN(limit)) {
-              return 0;
-          }
-          return Math.ceil(total / limit);
+          return this.datasource.getPaginationLength();
       }
       /**
        * Return cells with conditions applied for each row
@@ -6645,11 +6639,12 @@
               const { data, page } = this.datasource;
               const allData = this.datasource.allData || data;
               Promise.resolve(allData);
-              allData.forEach((row, index) => {
-                  if (row[this.newRowIdentifier]) {
+              for (let index = allData.length - 1; index >= 0; index -= 1) {
+                  const row = allData[index];
+                  if (this.addedRows[row[this.datasource.uniqueKey]]) {
                       allData.splice(index, 1);
                   }
-              });
+              }
               yield this.datasource.updateData(allData);
               yield this.datasource.get();
               yield this.datasource.setPage(page);
@@ -6672,6 +6667,7 @@
               const response = yield Promise.all(this.getEditedRows(revalidate).map((row) => this.addDataRow(row)));
               this.editing = false;
               this.editedRows = {};
+              this.addedRows = {};
               this.invalidComponents = {};
               this.addedRows = {};
               yield this.datasource.get();
@@ -6686,11 +6682,8 @@
       getEditedRows(revalidate = false) {
           const editedRows = [];
           Object.keys(this.editedRows).forEach((key) => {
-              this.addedRows = {};
               const row = Object.assign(Object.assign({}, this.editedRows[key].originalRow), this.editedRows[key]);
               delete row.originalRow;
-              if (row[this.newRowIdentifier])
-                  this.addedRows[key] = row;
               delete row[this.newRowIdentifier];
               Object.keys(row).forEach((attr) => {
                   if (Object.prototype.hasOwnProperty.call(row, `${attr}_original`)) {
@@ -6745,7 +6738,8 @@
               yield this.datasource.updateData(data);
               const id = row[this.datasource.uniqueKey];
               if (id) {
-                  this.editedRows[id] = row;
+                  this.editedRows[id] = Object.assign({}, row);
+                  this.addedRows[id] = Object.assign({}, row);
               }
               this.editing = true;
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.84.0",
+  "version": "1.85.0",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -43,5 +43,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "98ba15335f7f421c7856de217ebbea4a8506af95"
+  "gitHead": "8324a7087a2b3daa9349bb5551bc1c708ad1c38f"
 }

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;
+}