@adaptabletools/adaptable 16.2.2 → 16.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "16.2.2",
+  "version": "16.2.3",
   "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: 1701089574640;
+declare const _default: 1701111826846;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/DataImportOptions.d.ts

@@ -3,7 +3,7 @@ import { IRowNode } from '@ag-grid-community/core';
 /**
  * Options for managing the Data Import function
  */
-export interface DataImportOptions<T = Record<string, unknown>> {
+export interface DataImportOptions<T = Record<string, any>> {
     /**
      * File extensions that the Data Import function accepts
      */
@@ -25,7 +25,7 @@ export interface DataImportOptions<T = Record<string, unknown>> {
      *
      * @experimental It might change in a future version
      */
-    _preprocessData?: (context: PreprocessDataContext<T>) => Record<string, unknown>[];
+    _preprocessRowData?: (context: PreprocessRowDataContext<T>) => Record<string, any>;
     /**
      * Function to get the Primary Key value for a data row (defaults to value of the primaryKey column)
      *
@@ -36,16 +36,16 @@ export interface DataImportOptions<T = Record<string, unknown>> {
 /**
  * Context used when pre-processing Import Data
  */
-export interface PreprocessDataContext<T = Record<string, unknown>> extends BaseContext {
+export interface PreprocessRowDataContext<T = Record<string, any>> extends BaseContext {
     /**
      * Data which has been imported
      */
-    data: T[];
+    rowData: T;
 }
 /**
  * Context used when importing Data
  */
-export interface HandleImportedDataContext<T = Record<string, unknown>> extends BaseContext {
+export interface HandleImportedDataContext<T = Record<string, any>> extends BaseContext {
     /**
      * Data which has been imported
      */
@@ -54,7 +54,7 @@ export interface HandleImportedDataContext<T = Record<string, unknown>> extends
 /**
  * Files that can be handled by Data Import
  */
-export interface DataImportFileHandler<T = Record<string, unknown>> {
+export interface DataImportFileHandler<T = Record<string, any>> {
     /**
      * Name of File Extension
      */
@@ -80,7 +80,7 @@ export interface DataImportValidationError {
 /**
  * Context passed to the `validate` function
  */
-export interface DataImportValidateContext<T = Record<string, unknown>> extends BaseContext {
+export interface DataImportValidateContext<T = Record<string, any>> extends BaseContext {
     /**
      * Imported Row Data
      */
@@ -89,7 +89,7 @@ export interface DataImportValidateContext<T = Record<string, unknown>> extends
 /**
  * Context passed to the `getPrimaryKeyValue` function
  */
-export interface GetPrimaryKeyValueContext<T = Record<string, unknown>> extends BaseContext {
+export interface GetPrimaryKeyValueContext<T = Record<string, any>> extends BaseContext {
     /**
      * Data being imported
      */

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

@@ -43,5 +43,5 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getFlashingCellOptions(): FlashingCellOptions;
     getSettingsPanelOptions(): SettingsPanelOptions;
     getFdc3Options(): Fdc3Options;
-    getDataImportOptions(): import("../../types").DataImportOptions<Record<string, unknown>>;
+    getDataImportOptions(): import("../../types").DataImportOptions<Record<string, any>>;
 }

package/src/Api/Internal/DataImportInternalApi.js

@@ -8,9 +8,6 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
     async importData(partialRows) {
         const dataImportOptions = this.getOptions().dataImportOptions;
         let importData = partialRows;
-        if (typeof dataImportOptions._preprocessData === 'function') {
-            importData = dataImportOptions._preprocessData(Object.assign({ data: partialRows }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
-        }
         if (typeof dataImportOptions.handleImportedData === 'function') {
             const resolution = await dataImportOptions.handleImportedData(Object.assign({ data: importData }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
             if (resolution && (resolution === null || resolution === void 0 ? void 0 : resolution.emitDataImportedEvent)) {

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

@@ -32,6 +32,20 @@ const DataImportWizard = (props) => {
         }
         return rowData[primaryKey];
     };
+    const preprocessRowData = (rowData) => {
+        if (typeof (dataImportOptions === null || dataImportOptions === void 0 ? void 0 : dataImportOptions._preprocessRowData) === 'function') {
+            return dataImportOptions._preprocessRowData(Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(adaptable.api)), { rowData }));
+        }
+        // by default just trim the keys
+        let processedRowData = {};
+        if (rowData) {
+            processedRowData = Object.keys(rowData).reduce((acc, key) => {
+                acc[key.trim()] = rowData[key];
+                return acc;
+            }, processedRowData);
+        }
+        return processedRowData;
+    };
     // ---- COLUMNS ----
     const [columnsMap, setColumnsMap] = React.useState(null);
     const mappedRowDataToColumns = React.useMemo(() => {
@@ -57,9 +71,10 @@ const DataImportWizard = (props) => {
     }, [columnsMap]);
     const handleNewRowData = React.useCallback((data) => {
         if (Array.isArray(data)) {
-            setRowData(data);
+            const processedData = data.map((rowData) => preprocessRowData(rowData));
+            setRowData(processedData);
             const fields = new Set();
-            data.forEach((row) => {
+            processedData.forEach((row) => {
                 Object.keys(row).forEach((field) => {
                     fields.add(field);
                 });

package/src/View/DataImport/systemFileHandlers.d.ts

@@ -1,3 +1,3 @@
 import { DataImportFileHandler } from '../../types';
 export declare const parseCSV: (content: string) => Record<string, unknown>[];
-export declare const systemFileHandlers: DataImportFileHandler<Record<string, unknown>>[];
+export declare const systemFileHandlers: DataImportFileHandler<Record<string, any>>[];

package/src/metamodel/adaptable.metamodel.d.ts

@@ -4108,16 +4108,6 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal?: undefined;
         })[];
     };
-    PreprocessDataContext: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-        }[];
-    };
     PreProcessExportContext: {
         name: string;
         kind: string;
@@ -4134,6 +4124,16 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    PreprocessRowDataContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     QueryableColumnContext: {
         name: string;
         kind: string;