@adaptabletools/adaptable 16.2.0-canary.1 → 16.2.0-canary.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "16.2.0-canary.1",
+  "version": "16.2.0-canary.2",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1700058069186;
+declare const _default: 1700505989891;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/DataImportOptions.d.ts

@@ -20,7 +20,7 @@ export interface DataImportOptions<T = Record<string, unknown>> {
      */
     applyImport?: (context: DataImportApplyImportContext<T>) => void;
     /**
-     * Function to pre-process the data before it is Imported
+     * Function to pre-process the data before it is imported
      */
     preprocessData?: (context: PreprocessDataContext<T>) => Record<string, unknown>[];
     /**

package/src/Api/Events/DataImported.d.ts

@@ -1,22 +1,19 @@
+import { IRowNode } from '@ag-grid-community/core';
 import { BaseEventInfo } from './BaseEventInfo';
 /**
  * Object returned by the `DataImported` event
  */
 export interface DataImportedInfo extends BaseEventInfo {
     /**
-     * Rows which were inserted into grid
-     */
-    gridDataRows: any[];
-    /**
-     * Actual data that was imported
+     * Raw data that was imported
      */
     importData: any[];
     /**
-     * Number of new Rows added
+     * Rows that were added
      */
-    newRowCount: number;
+    addedRows: IRowNode[];
     /**
-     * Number of existing rows updated
+     * Rows that were updated
      */
-    updatedRowCount: number;
+    updatedRows: IRowNode[];
 }

package/src/Api/Internal/DataImportInternalApi.d.ts

@@ -1,9 +1,10 @@
 import { ApiBase } from '../Implementation/ApiBase';
+import { IRowNode } from '@ag-grid-community/core';
 export declare class DataImportInternalApi extends ApiBase {
     importData(partialRows: any[]): Promise<void>;
     /**
      * Publishes an event when Data has been imported
      * @param gridDataRows Rows that were imported
      */
-    publishDataImportedEvent(gridDataRows: any[], importData: any[], newRowCount: number, updatedRowCount: number): void;
+    publishDataImportedEvent(importData: any[], addedRows: IRowNode[], updatedRows: IRowNode[]): void;
 }

package/src/Api/Internal/DataImportInternalApi.js

@@ -28,7 +28,7 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
             updatedRowCount += 1;
             return Object.assign(Object.assign({}, node === null || node === void 0 ? void 0 : node.data), dataRow);
         });
-        await gridApi.addOrUpdateGridData(preparedDataRows);
+        const { addedRows, updatedRows } = await gridApi.addOrUpdateGridData(preparedDataRows);
         let message = '';
         if (newRowCount && updatedRowCount) {
             message = `Added: ${newRowCount} new Row${newRowCount > 1 ? 's' : ''}; Updated: ${updatedRowCount} existing Row${updatedRowCount > 1 ? 's' : ''}`;
@@ -48,20 +48,19 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
                 } }),
         };
         this.getAlertApi().showAdaptableAlert(alert);
-        this.publishDataImportedEvent(preparedDataRows, importData, newRowCount, updatedRowCount);
+        this.publishDataImportedEvent(importData, addedRows, updatedRows);
     }
     /**
      * Publishes an event when Data has been imported
      * @param gridDataRows Rows that were imported
      */
-    publishDataImportedEvent(gridDataRows, importData, newRowCount, updatedRowCount) {
+    publishDataImportedEvent(importData, addedRows, updatedRows) {
         const adaptableApi = this.getAdaptableApi();
         const dataImportedInfo = {
             adaptableApi: adaptableApi,
-            gridDataRows,
             importData,
-            newRowCount,
-            updatedRowCount,
+            addedRows,
+            updatedRows,
             userName: adaptableApi.optionsApi.getUserName(),
             adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };

package/src/Strategy/Fdc3Module.js

@@ -28,6 +28,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 .forEach((broadcastConfig) => {
                 contextMenuItems.push(this.buildBroadcastMenuItem(broadcastConfig, currentRowNode));
             });
+            contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
                     module: this.moduleInfo.ModuleName,

package/src/View/DataImport/DataImportWizard/DataImportWizard.js

@@ -25,8 +25,9 @@ const DataImportWizard = (props) => {
     // - new data is loaded
     const [importType, setImportType] = React.useState('file');
     const primaryKey = adaptable.api.optionsApi.getPrimaryKey();
+    const hasDynamicallyAddedPrimaryKey = typeof dataImportOptions.getPrimaryKeyValue === 'function';
     const getPrimaryKeyValue = (rowData) => {
-        if (typeof dataImportOptions.getPrimaryKeyValue === 'function') {
+        if (hasDynamicallyAddedPrimaryKey) {
             return dataImportOptions.getPrimaryKeyValue(Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(adaptable.api)), { rowData }));
         }
         return rowData[primaryKey];
@@ -215,7 +216,8 @@ const DataImportWizard = (props) => {
                     if (columnsErrors && Object.keys(columnsErrors).length > 0) {
                         return 'Some fields do not have a corresponding column.';
                     }
-                    if (!(columnsMap === null || columnsMap === void 0 ? void 0 : columnsMap.some((map) => { var _a; return ((_a = map === null || map === void 0 ? void 0 : map.abColumn) === null || _a === void 0 ? void 0 : _a.field) === primaryKey; }))) {
+                    if (!hasDynamicallyAddedPrimaryKey &&
+                        !(columnsMap === null || columnsMap === void 0 ? void 0 : columnsMap.some((map) => { var _a; return ((_a = map === null || map === void 0 ? void 0 : map.abColumn) === null || _a === void 0 ? void 0 : _a.field) === primaryKey; }))) {
                         return 'You need to select a column for the primary key.';
                     }
                     return true;