@adaptabletools/adaptable 16.1.0-canary.2 → 16.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "16.1.0-canary.2",
+  "version": "16.1.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",
@@ -64,6 +64,6 @@
     "uuid": "^3.3.2"
   },
   "peerDependencies": {
-    "@ag-grid-community/core": ">=30.0.0"
+    "@ag-grid-community/core": ">=30.1.0"
   }
 }

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1697637650202;
+declare const _default: 1698160309123;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1697637650202;
+exports.default = 1698160309123;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -161,6 +161,10 @@ export interface IAdaptable {
     getFilteredData(): any[];
     updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     addRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
+    addOrUpdateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<{
+        added: IRowNode[];
+        updated: IRowNode[];
+    }>;
     deleteRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     selectColumn(columnId: string, config?: {
         keepExistingSelection?: boolean;

package/src/Api/GridApi.d.ts

@@ -47,7 +47,10 @@ export interface GridApi {
      * @param dataRows rows to add or update
      * @param config batch option and callback function to run post change
      */
-    addOrUpdateGridData(dataRows: any[], config?: DataUpdateConfig): Promise<IRowNode[]>;
+    addOrUpdateGridData(dataRows: any[], config?: DataUpdateConfig): Promise<{
+        addedRows: IRowNode[];
+        updatedRows: IRowNode[];
+    }>;
     /**
      * Adds rows to AdapTable (and AG Grid)
      * @param dataRows rows to add; ensure all 'mandatory' fields are included and Primary Key is unique

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -23,7 +23,10 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridData(): any[];
     getFilteredData(): any[];
     updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
-    addOrUpdateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
+    addOrUpdateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<{
+        addedRows: IRowNode[];
+        updatedRows: IRowNode[];
+    }>;
     addGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     undoCellEdit(cellDataChangedInfo: CellDataChangedInfo): boolean;
     deleteGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;

package/src/Api/Implementation/GridApiImpl.js

@@ -36,30 +36,17 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return rowNodes;
     }
     async addOrUpdateGridData(dataRows, dataUpdateConfig) {
-        let addRows = [];
-        let updateRows = [];
-        const primaryKey = this.getOptions().primaryKey;
-        dataRows.forEach((dataRow) => {
-            const node = this.getRowNodeForPrimaryKey(dataRow[primaryKey]);
-            if (node) {
-                updateRows.push(dataRow);
-            }
-            else {
-                addRows.push(dataRow);
-            }
-        });
-        let returnNodes = [];
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(updateRows)) {
-            const updatedNodes = await this.adaptable.updateRows(updateRows, dataUpdateConfig);
-            this.internalApi.fireGridDataChangedEvent(dataRows, updatedNodes, 'Edit');
-            (await returnNodes).push(...updatedNodes);
+        const { added, updated } = await this.adaptable.addOrUpdateRows(dataRows, dataUpdateConfig);
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(updated)) {
+            this.internalApi.fireGridDataChangedEvent(dataRows, updated, 'Edit');
         }
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(addRows)) {
-            const addedNodes = await this.adaptable.addRows(addRows, dataUpdateConfig);
-            this.internalApi.fireGridDataChangedEvent(dataRows, addedNodes, 'Add');
-            (await returnNodes).push(...addedNodes);
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(added)) {
+            this.internalApi.fireGridDataChangedEvent(dataRows, added, 'Add');
         }
-        return returnNodes;
+        return {
+            addedRows: added,
+            updatedRows: updated,
+        };
     }
     async addGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.addRows(dataRows, dataUpdateConfig);

package/src/agGrid/Adaptable.d.ts

@@ -382,6 +382,10 @@ export declare class Adaptable implements IAdaptable {
     getFilteredData(): any[];
     updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     addRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
+    addOrUpdateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<{
+        added: IRowNode[];
+        updated: IRowNode[];
+    }>;
     deleteRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     getFirstGroupedColumn(): AdaptableColumn | undefined;
     private checkColumnsDataTypeSet;

package/src/agGrid/Adaptable.js

@@ -4370,6 +4370,48 @@ class Adaptable {
             return Promise.resolve(transaction === null || transaction === void 0 ? void 0 : transaction.add);
         }
     }
+    addOrUpdateRows(dataRows, dataUpdateConfig) {
+        const addDataRows = [];
+        const updateDataRows = [];
+        const primaryKey = this.adaptableOptions.primaryKey;
+        dataRows.forEach((dataRow) => {
+            const node = this.getRowNodeForPrimaryKey(dataRow[primaryKey]);
+            if (node) {
+                updateDataRows.push(dataRow);
+            }
+            else {
+                addDataRows.push(dataRow);
+            }
+        });
+        if (this.hasAutogeneratedPrimaryKey()) {
+            this.addSyntheticPrimaryKeyIfMissing(addDataRows);
+        }
+        dataUpdateConfig = dataUpdateConfig || {};
+        if (dataUpdateConfig.runAsync) {
+            return new Promise((resolve) => {
+                this.gridOptions.api.applyTransactionAsync({ update: updateDataRows, add: addDataRows, addIndex: dataUpdateConfig.addIndex }, (transaction) => {
+                    if (typeof dataUpdateConfig.callback === 'function') {
+                        dataUpdateConfig.callback(transaction);
+                    }
+                    resolve({
+                        added: transaction === null || transaction === void 0 ? void 0 : transaction.add,
+                        updated: transaction === null || transaction === void 0 ? void 0 : transaction.update,
+                    });
+                });
+            });
+        }
+        else {
+            const transaction = this.gridOptions.api.applyTransaction({
+                update: updateDataRows,
+                add: addDataRows,
+                addIndex: dataUpdateConfig.addIndex,
+            });
+            return Promise.resolve({
+                added: transaction === null || transaction === void 0 ? void 0 : transaction.add,
+                updated: transaction === null || transaction === void 0 ? void 0 : transaction.update,
+            });
+        }
+    }
     deleteRows(dataRows, dataUpdateConfig) {
         dataUpdateConfig = dataUpdateConfig || {};
         if (dataUpdateConfig.runAsync) {

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "16.1.0-canary.2";
+declare const _default: "16.1.0";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '16.1.0-canary.2'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '16.1.0'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version