@adaptabletools/adaptable-cjs 19.1.0-canary.0 → 19.1.1

package/src/Api/Internal/PredicateInternalApi.js

@@ -21,7 +21,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     getSystemFilterPredicateIds(scope) {
         const systemFilterPredicates = this.getPredicateOptions().systemFilterPredicates;
         if (typeof systemFilterPredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('columnFilter'), moduleScope: 'columnFilter', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('columnFilter'), moduleScope: 'columnFilter', columnScope: scope });
             return systemFilterPredicates(systemPredicateContext);
         }
         return systemFilterPredicates;
@@ -36,7 +36,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     getSystemAlertPredicateIds(scope) {
         const systemAlertPredicates = this.getPredicateOptions().systemAlertPredicates;
         if (typeof systemAlertPredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('alert'), moduleScope: 'alert', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('alert'), moduleScope: 'alert', columnScope: scope });
             return systemAlertPredicates(systemPredicateContext);
         }
         return systemAlertPredicates;
@@ -44,7 +44,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     getSystemBadgeStylePredicateIds(scope) {
         const systemBadgeStylePredicates = this.getPredicateOptions().systemBadgeStylePredicates;
         if (typeof systemBadgeStylePredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('badgeStyle'), moduleScope: 'badgeStyle', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('badgeStyle'), moduleScope: 'badgeStyle', columnScope: scope });
             return systemBadgeStylePredicates(systemPredicateContext);
         }
         return systemBadgeStylePredicates;
@@ -59,7 +59,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     getSystemFormatColumnPredicateIds(scope) {
         const systemFormatColumnPredicates = this.getPredicateOptions().systemFormatColumnPredicates;
         if (typeof systemFormatColumnPredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('formatColumn'), moduleScope: 'formatColumn', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('formatColumn'), moduleScope: 'formatColumn', columnScope: scope });
             return systemFormatColumnPredicates(systemPredicateContext);
         }
         return systemFormatColumnPredicates;
@@ -74,7 +74,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
     getSystemFlashingCellPredicateIds(scope) {
         const systemFlashingCellPredicates = this.getPredicateOptions().systemFlashingCellPredicates;
         if (typeof systemFlashingCellPredicates === 'function') {
-            const systemPredicateContext = Object.assign({ systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('flashingcell'), moduleScope: 'flashingcell', columnScope: scope }, this.getAdaptableApi().internalApi.buildBaseContext());
+            const systemPredicateContext = Object.assign({ systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('flashingcell'), moduleScope: 'flashingcell', columnScope: scope }, this.getAdaptableInternalApi().buildBaseContext());
             return systemFlashingCellPredicates(systemPredicateContext);
         }
         return systemFlashingCellPredicates;

package/src/Api/Internal/ScheduleInternalApi.js

@@ -8,7 +8,7 @@ class ScheduleInternalApi extends ApiBase_1.ApiBase {
      */
     fireScheduleTriggeredEvent(schedule) {
         const adaptableApi = this.getAdaptableApi();
-        const scheduleTriggeredInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { schedule: schedule });
+        const scheduleTriggeredInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { schedule: schedule });
         adaptableApi.eventApi.emit('ScheduleTriggered', scheduleTriggeredInfo);
     }
 }

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -9,13 +9,13 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        return this.adaptable.getMinMaxCachedValueForColumn(column, 'min');
+        return this._adaptable.getMinMaxCachedValueForColumn(column, 'min');
     }
     getMaxValueForNumericColumn(column) {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        return this.adaptable.getMinMaxCachedValueForColumn(column, 'max');
+        return this._adaptable.getMinMaxCachedValueForColumn(column, 'max');
     }
     /**
      * Gets the Minimum Value to display for a Styled Column

package/src/Api/Internal/SystemStatusInternalApi.js

@@ -10,7 +10,7 @@ class SystemStatusInternalApi extends ApiBase_1.ApiBase {
      * @param systemStatusMessageInfo Info about new System Status Message
      */
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
-        const systemStatusMessageDisplayedInfo = Object.assign({ systemStatusMessageInfo: systemStatusMessageInfo }, this.getAdaptableApi().internalApi.buildBaseContext());
+        const systemStatusMessageDisplayedInfo = Object.assign({ systemStatusMessageInfo: systemStatusMessageInfo }, this.getAdaptableInternalApi().buildBaseContext());
         this.getAdaptableApi().eventApi.emit('SystemStatusMessageDisplayed', systemStatusMessageDisplayedInfo);
     }
     addSystemStatusMessageInfo(systemStatusMessageInfo) {

package/src/Api/Internal/TeamSharingInternalApi.js

@@ -8,8 +8,8 @@ class TeamSharingInternalApi extends ApiBase_1.ApiBase {
      * @param sharedEntity Entity that has been changed
      */
     fireTeamSharingEntityChangedEvent(sharedEntity) {
-        if (this.adaptable.isReady) {
-            const teamSharingEntityChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { sharedEntity: sharedEntity });
+        if (this.isAdapTableReady()) {
+            const teamSharingEntityChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { sharedEntity: sharedEntity });
             this.getAdaptableApi().eventApi.emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);
         }
     }

package/src/Api/Internal/ThemeInternalApi.js

@@ -13,7 +13,7 @@ class ThemeInternalApi extends ApiBase_1.ApiBase {
         return `ab--theme-${theme}`;
     }
     openInWindow() {
-        this.getAdaptableApi().internalApi.showPopupWindow({
+        this.getAdaptableInternalApi().showPopupWindow({
             id: windowFactory_1.SHOW_THEME_EDITOR,
             title: 'Theme',
             icon: 'theme',

package/src/Strategy/NoteModule.d.ts

@@ -3,7 +3,6 @@ import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class NoteModule extends AdaptableModuleBase implements IModule {
-    private adaptable;
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
     createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoClickFunction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];

package/src/Strategy/NoteModule.js

@@ -8,7 +8,6 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.NoteModuleId, ModuleConstants.NoteFriendlyName, 'note', 'NotePopup', 'Notes', api);
-        this.adaptable = api.internalApi.getAdaptableInstance();
     }
     isModuleAvailable() {
         // Note module doesn't support autogenerated primary keys
@@ -25,17 +24,17 @@ class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (menuContext.isRowGroupColumn || menuContext.isGroupedNode) {
             return;
         }
-        const isReadOnly = this.adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
+        const isReadOnly = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
         if (isReadOnly) {
             return undefined;
         }
-        const isCellNotable = typeof ((_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable) === 'function'
-            ? this.adaptable.api.optionsApi.getNoteOptions().isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))
+        const isCellNotable = typeof ((_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable) === 'function'
+            ? this.api.optionsApi.getNoteOptions().isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))
             : true;
         if (!isCellNotable) {
             return;
         }
-        const note = this.adaptable.api.noteApi.getNoteForCell({
+        const note = this.api.noteApi.getNoteForCell({
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         });

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -245,7 +245,7 @@ exports.scalarExpressionFunctions = {
                 // expression is syntactically valid, but operates with incompatible values
                 return;
             }
-            return sanitizedArguments.reduce((a, b) => a + b) / args.length;
+            return sanitizedArguments.reduce((a, b) => a + b) / sanitizedArguments.length;
         },
         description: 'Returns the average of inputted numbers',
         signatures: ['AVG(number, number, ...number)'],

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -42,7 +42,7 @@ class AggregatedScalarLiveValue {
         const aggregationValue = this.getAggregationValue(rowNode);
         if (aggregationValue == undefined) {
             logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`, (message) => {
-                this.adaptableApi.internalApi.getAdaptableInstance().logger.warn(message);
+                this.adaptableApi.logWarn(message);
             });
             return;
         }

package/src/Utilities/Services/CellPopupService.js

@@ -78,8 +78,8 @@ class CellPopupService {
             this.hidePopup();
             return;
         }
-        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellPosition);
-        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
+        const cellNote = this.api.noteApi.getNoteForCell(cellPosition);
+        const cellComments = this.api.commentApi.getCommentThread(cellPosition);
         const hasNotesOrComments = cellNote || cellComments;
         // call only if it is different
         if (CellPopupService.isSameAddress(openCellAddress, cellPosition)) {
@@ -96,8 +96,8 @@ class CellPopupService {
             return;
         }
         // if open but this has no note, close
-        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellAddress);
-        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
+        const cellNote = this.api.noteApi.getNoteForCell(cellAddress);
+        const cellComments = this.api.commentApi.getCommentThread(cellAddress);
         const hasNotesOrComments = cellNote || cellComments;
         if (openCellAddress && !hasNotesOrComments) {
             // hide only if in edit mode

package/src/Utilities/Services/Fdc3Service.js

@@ -125,9 +125,7 @@ class Fdc3Service {
         if (!this.getFdc3Options().enableLogging) {
             return;
         }
-        this.adaptableApi.internalApi
-            .getAdaptableInstance()
-            .logger.consoleLog(`FDC3::${type} - `, params.join(' : '));
+        this.adaptableApi.consoleLog(`FDC3::${type} - `, params.join(' : '));
     }
     logFdc3Error(error) {
         this.adaptableApi.consoleError(`FDC3 error`, error);

package/src/Utilities/Services/FlashingCellService.d.ts

@@ -1,4 +1,3 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableApi, AdaptableFlashingCell } from '../../types';
 import { TypeUuid } from '../../PredefinedConfig/Uuid';
 import { IAdaptableService } from './Interface/IAdaptableService';
@@ -8,7 +7,6 @@ export declare const FLASHING_CELL_ROW_KEY = "__ROW";
  */
 export declare class FlashingCellService implements IAdaptableService {
     private api;
-    adaptable: IAdaptable;
     gridCellsCurrentlyFlashing: Record<string, Record<string, TypeUuid>>;
     flashingCellsMapping: Record<TypeUuid, AdaptableFlashingCell>;
     constructor(api: AdaptableApi);

package/src/Utilities/Services/FlashingCellService.js

@@ -8,7 +8,6 @@ exports.FLASHING_CELL_ROW_KEY = '__ROW';
 class FlashingCellService {
     constructor(api) {
         this.api = api;
-        this.adaptable = api.internalApi.getAdaptableInstance();
         this.gridCellsCurrentlyFlashing = {};
         this.flashingCellsMapping = {};
     }
@@ -53,7 +52,7 @@ class FlashingCellService {
     clearAllGridCellFlashes() {
         this.gridCellsCurrentlyFlashing = {};
         this.flashingCellsMapping = {};
-        this.adaptable.refreshAllCells(true);
+        this.api.gridApi.refreshAllCells(true);
     }
     isAnyFlashingCellActive() {
         return Object.keys(this.gridCellsCurrentlyFlashing).length > 0;
@@ -63,7 +62,7 @@ class FlashingCellService {
         if (!cellDataChangedInfo) {
             return;
         }
-        this.adaptable.refreshCells([cellDataChangedInfo.rowNode], Object.keys(flashingCell.flashColumnIds), true);
+        this.api.gridApi.refreshCells([cellDataChangedInfo.rowNode], Object.keys(flashingCell.flashColumnIds), true);
     }
 }
 exports.FlashingCellService = FlashingCellService;

package/src/Utilities/Services/RowEditService.js

@@ -4,9 +4,8 @@ exports.RowEditService = void 0;
 class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        const adaptableInstance = this.adaptableApi.internalApi.getAdaptableInstance();
-        if (adaptableInstance.adaptableOptions.actionRowOptions.autoHandle) {
-            adaptableInstance.api.eventApi.on('ActionRowSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
+        if (adaptableApi.optionsApi.getActionRowOptions().autoHandle) {
+            adaptableApi.eventApi.on('ActionRowSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
         }
     }
     autoHandleActionRowButtons(actionRowSubmittedInfo) {
@@ -23,8 +22,7 @@ class RowEditService {
         }
         if (actionRowSubmittedInfo.type === 'rowCreated') {
             const { formData } = actionRowSubmittedInfo;
-            const setPrimaryKeyValueFunction = adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.actionRowOptions
-                .setPrimaryKeyValue;
+            const setPrimaryKeyValueFunction = adaptableApi.optionsApi.getActionRowOptions().setPrimaryKeyValue;
             const newRowData = typeof setPrimaryKeyValueFunction === 'function'
                 ? setPrimaryKeyValueFunction(Object.assign({ rowData: formData }, adaptableApi.internalApi.buildBaseContext()))
                 : Object.assign({}, formData);

package/src/View/Alert/AlertStatusSubPanel.js

@@ -11,16 +11,16 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const ActiveAlertsPanel_1 = require("./ActiveAlertsPanel");
 const initialStyle = { color: '', background: '' };
 const AlertStatusPanel = () => {
-    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const adaptableApi = (0, AdaptableContext_1.useAdaptable)().api;
     const [style, setStyle] = React.useState(initialStyle);
-    const module = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
-    const statusbarHighlightDuration = adaptable.adaptableOptions.alertOptions.statusbarHighlightDuration;
+    const module = adaptableApi.internalApi.getModuleService().getModuleById(ModuleConstants.AlertModuleId);
+    const statusbarHighlightDuration = adaptableApi.optionsApi.getAlertOptions().statusbarHighlightDuration;
     /**
      * Using a selector to so the component updates each time an alert is triggered.
      */
     const alerts = (0, react_redux_1.useSelector)((state) => state.System.AdaptableAlerts);
     const text = alerts.length == 0 ? '0 Alerts' : alerts.length == 1 ? '1 Alert' : alerts.length + ' Alerts';
-    const handleAction = React.useCallback(() => adaptable.api.alertApi.openAlertSettingsPanel(), []);
+    const handleAction = React.useCallback(() => adaptableApi.alertApi.openAlertSettingsPanel(), []);
     // blinking logic
     const previousAlerts = React.useRef(alerts);
     const timeoutId = React.useRef();

package/src/View/Charting/ShowChartButton.js

@@ -25,13 +25,13 @@ const BaseShowChartButton = (props) => {
         React.createElement(SimpleButton_1.default, { variant: "raised", tone: "success" }, "Open")));
 };
 const ShowAgChartButton = (props) => {
-    var _a, _b;
-    const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const chartingOptions = (_a = adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.chartingOptions;
+    var _a;
+    const adaptableApi = (0, AdaptableContext_1.useAdaptable)().api;
+    const chartingOptions = adaptableApi.optionsApi.getChartingOptions();
     const chartContainers = chartingOptions === null || chartingOptions === void 0 ? void 0 : chartingOptions.chartContainers;
     const { isOpen, showChart, closeChart } = (0, useAgChartState_1.useAgChartState)(props.chartDefinition);
     const containerOptions = [
-        Object.assign({ label: (_b = chartingOptions.agGridContainerName) !== null && _b !== void 0 ? _b : GeneralConstants_1.AG_GRID_CHART_WINDOW, onClick: () => {
+        Object.assign({ label: (_a = chartingOptions.agGridContainerName) !== null && _a !== void 0 ? _a : GeneralConstants_1.AG_GRID_CHART_WINDOW, onClick: () => {
                 showChart(null);
             } }, (chartContainers
             ? chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.map((contianerDef) => ({

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

@@ -15,8 +15,9 @@ const ValidationSection_1 = require("./sections/ValidationSection");
 const DataImportWizard = (props) => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const dataImportOptions = adaptable.api.optionsApi.getDataImportOptions();
-    const module = adaptable.ModuleService.getModuleById('DataImport');
+    const adaptableApi = adaptable.api;
+    const dataImportOptions = adaptableApi.optionsApi.getDataImportOptions();
+    const module = adaptableApi.internalApi.getModuleService().getModuleById('DataImport');
     const [rowData, setRowData] = React.useState(null);
     const [file, setFile] = React.useState(null);
     const [text, setText] = React.useState('');
@@ -24,17 +25,17 @@ const DataImportWizard = (props) => {
     // - columnsMap changes
     // - new data is loaded
     const [importType, setImportType] = React.useState('file');
-    const primaryKey = adaptable.api.optionsApi.getPrimaryKey();
+    const primaryKey = adaptableApi.optionsApi.getPrimaryKey();
     const hasDynamicallyAddedPrimaryKey = typeof dataImportOptions._getPrimaryKeyValue === 'function';
     const getPrimaryKeyValue = (rowData) => {
         if (hasDynamicallyAddedPrimaryKey) {
-            return dataImportOptions._getPrimaryKeyValue(Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(adaptable.api)), { rowData }));
+            return dataImportOptions._getPrimaryKeyValue(Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(adaptableApi)), { rowData }));
         }
         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 }));
+            return dataImportOptions._preprocessRowData(Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(adaptableApi)), { rowData }));
         }
         // by default just trim the keys
         let processedRowData = {};
@@ -79,7 +80,7 @@ const DataImportWizard = (props) => {
                     fields.add(field);
                 });
             });
-            const allAbColumns = adaptable.api.columnApi.getColumns();
+            const allAbColumns = adaptableApi.columnApi.getColumns();
             const columnsMap = Array.from(fields).map((field) => {
                 const abColumn = allAbColumns.find((c) => {
                     // exact field match
@@ -132,7 +133,7 @@ const DataImportWizard = (props) => {
     // ---- FILE HANDLERS ----
     const fileHandlers = React.useMemo(() => {
         var _a, _b;
-        const userDefinedHandlers = (_b = (_a = adaptable.api.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
+        const userDefinedHandlers = (_b = (_a = adaptableApi.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
         return [...userDefinedHandlers, ...systemFileHandlers_1.systemFileHandlers];
     }, []);
     const supportedFileFormats = React.useMemo(() => {
@@ -140,11 +141,11 @@ const DataImportWizard = (props) => {
     }, [fileHandlers]);
     const readFile = React.useCallback(async (file) => {
         var _a, _b;
-        const userDefinedFileHandlers = (_b = (_a = adaptable.api.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
+        const userDefinedFileHandlers = (_b = (_a = adaptableApi.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
         const fileExtension = `.${file.name.split('.').pop()}`;
         const handler = [...userDefinedFileHandlers, ...systemFileHandlers_1.systemFileHandlers].find((fh) => fh.fileExtension === fileExtension);
         if (!handler) {
-            adaptable.api.logError(`No file handler found for file extension ${fileExtension}. Please provide a file handler in Data Import Options.`);
+            adaptableApi.logError(`No file handler found for file extension ${fileExtension}. Please provide a file handler in Data Import Options.`);
             return;
         }
         try {
@@ -154,7 +155,7 @@ const DataImportWizard = (props) => {
             return data;
         }
         catch (_c) {
-            adaptable.api.logError(`Error reading file ${file.name}. Please check the file is valid.`);
+            adaptableApi.logError(`Error reading file ${file.name}. Please check the file is valid.`);
         }
     }, [adaptable]);
     const fileMessage = file ? (React.createElement(HelpBlock_1.default, { mb: 2 },
@@ -168,7 +169,7 @@ const DataImportWizard = (props) => {
     const handleTextChange = React.useCallback(async (text) => {
         var _a;
         //
-        let textHandler = (_a = adaptable.api.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.textHandler;
+        let textHandler = (_a = adaptableApi.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.textHandler;
         if (!textHandler) {
             // regex to test for json
             const jsonRegex = /^\s*[\[{]/;
@@ -212,7 +213,7 @@ const DataImportWizard = (props) => {
             return null;
         }
         return (_a = rowData === null || rowData === void 0 ? void 0 : rowData.reduce) === null || _a === void 0 ? void 0 : _a.call(rowData, (acc, rowData) => {
-            const error = dataImportOptions.validate(Object.assign({ rowData }, (0, ObjectFactory_1.createBaseContext)(adaptable.api)));
+            const error = dataImportOptions.validate(Object.assign({ rowData }, (0, ObjectFactory_1.createBaseContext)(adaptableApi)));
             const primaryKeyValue = getPrimaryKeyValue(rowData);
             if (error && primaryKeyValue && error.length) {
                 acc[primaryKeyValue] = error;
@@ -226,7 +227,7 @@ const DataImportWizard = (props) => {
             const rowErrors = errors[getPrimaryKeyValue(row)];
             return !rowErrors || rowErrors.length === 0;
         });
-        adaptable.api.dataImportApi.internalApi.importData(validData);
+        adaptableApi.dataImportApi.internalApi.importData(validData);
     };
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { data: null, moduleInfo: module.moduleInfo, finishText: "Import", onFinish: () => {
             handleFinish();

package/src/agGrid/FloatingFilterWrapper.js

@@ -14,11 +14,12 @@ const filterContainerStyle = {
     position: 'relative',
 };
 const FloatingFilterWrapperFactory = (adaptable) => {
+    const adaptableApi = adaptable.api;
     function getContainerId(colId) {
         return `floatingFilter_${colId}_${adaptable.adaptableOptions.adaptableId}`;
     }
     function getFilterProps(colId) {
-        const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
+        const column = adaptableApi.columnApi.getColumnWithColumnId(colId);
         const columnFilterProps = {
             Column: column,
             Adaptable: adaptable,
@@ -57,7 +58,7 @@ const FloatingFilterWrapperFactory = (adaptable) => {
     if (adaptable.variant === 'react') {
         return (0, react_1.forwardRef)(function ReactFloatingFilterWrapper(props, ref) {
             const colId = props.column.getId();
-            const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
+            const column = adaptableApi.columnApi.getColumnWithColumnId(colId);
             (0, react_1.useImperativeHandle)(ref, () => {
                 return {
                     onParentModelChanged() { },
@@ -84,7 +85,7 @@ const FloatingFilterWrapperFactory = (adaptable) => {
                 //@ts-ignore
                 this.filterContainer.style[key] = filterContainerStyle[key];
             });
-            const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
+            const column = adaptableApi.columnApi.getColumnWithColumnId(colId);
             if (column) {
                 const filterProps = getFilterProps(colId);
                 this.unmountReactRoot = adaptable.renderReactRoot((0, QuickFilterForm_1.QuickFilterFormReact)(filterProps), this.filterContainer);

package/src/components/Datepicker/index.d.ts

@@ -15,4 +15,4 @@ export type DatepickerProps = Omit<BoxProps, 'value' | 'onChange' | 'defaultValu
     showWeekNumber?: boolean;
     showOutsideDays?: boolean;
 };
-export declare const Datepicker: React.ForwardRefExoticComponent<Pick<DatepickerProps, "children" | "size" | "name" | "tabIndex" | "color" | "style" | "cite" | "data" | "form" | "label" | "p" | "slot" | "span" | "summary" | "title" | "pattern" | "start" | "hidden" | "content" | "default" | "flex" | "wrap" | "open" | "padding" | "multiple" | "disabled" | "checked" | "download" | "list" | "order" | "target" | "rows" | "src" | "className" | "onTransitionEnd" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEndCapture" | "opacity" | "value" | "step" | "sizes" | "variant" | "tx" | "as" | "css" | "key" | "m" | "margin" | "mt" | "marginTop" | "mr" | "marginRight" | "mb" | "marginBottom" | "ml" | "marginLeft" | "mx" | "marginX" | "my" | "marginY" | "pt" | "paddingTop" | "pr" | "paddingRight" | "pb" | "paddingBottom" | "pl" | "paddingLeft" | "px" | "paddingX" | "py" | "paddingY" | "width" | "height" | "minWidth" | "minHeight" | "maxWidth" | "maxHeight" | "display" | "verticalAlign" | "overflow" | "overflowX" | "overflowY" | "fontFamily" | "fontSize" | "fontWeight" | "lineHeight" | "letterSpacing" | "fontStyle" | "textAlign" | "bg" | "backgroundColor" | "alignItems" | "alignContent" | "justifyItems" | "justifyContent" | "flexWrap" | "flexDirection" | "flexGrow" | "flexShrink" | "flexBasis" | "justifySelf" | "alignSelf" | "sx" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "srcDoc" | "srcLang" | "srcSet" | "type" | "useMap" | "wmode" | "showClearButton" | "onHide" | "datepickerButtons" | "dateProps" | "showWeekNumber" | "showOutsideDays"> & React.RefAttributes<HTMLInputElement>>;
+export declare const Datepicker: React.ForwardRefExoticComponent<Pick<DatepickerProps, "children" | "size" | "name" | "tabIndex" | "color" | "style" | "cite" | "data" | "form" | "label" | "p" | "slot" | "span" | "summary" | "title" | "pattern" | "start" | "hidden" | "content" | "default" | "flex" | "wrap" | "open" | "padding" | "multiple" | "disabled" | "checked" | "download" | "list" | "order" | "target" | "rows" | "src" | "className" | "onTransitionEnd" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEndCapture" | "opacity" | "value" | "step" | "sizes" | "variant" | "tx" | "as" | "css" | "key" | "m" | "margin" | "mt" | "marginTop" | "mr" | "marginRight" | "mb" | "marginBottom" | "ml" | "marginLeft" | "mx" | "marginX" | "my" | "marginY" | "pt" | "paddingTop" | "pr" | "paddingRight" | "pb" | "paddingBottom" | "pl" | "paddingLeft" | "px" | "paddingX" | "py" | "paddingY" | "width" | "height" | "minWidth" | "minHeight" | "maxWidth" | "maxHeight" | "display" | "verticalAlign" | "overflow" | "overflowX" | "overflowY" | "fontFamily" | "fontSize" | "fontWeight" | "lineHeight" | "letterSpacing" | "fontStyle" | "textAlign" | "bg" | "backgroundColor" | "alignItems" | "alignContent" | "justifyItems" | "justifyContent" | "flexWrap" | "flexDirection" | "flexGrow" | "flexShrink" | "flexBasis" | "justifySelf" | "alignSelf" | "sx" | "accept" | "acceptCharset" | "action" | "allowFullScreen" | "allowTransparency" | "alt" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "headers" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "media" | "mediaGroup" | "method" | "min" | "minLength" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "srcDoc" | "srcLang" | "srcSet" | "type" | "useMap" | "wmode" | "onHide" | "showClearButton" | "datepickerButtons" | "dateProps" | "showWeekNumber" | "showOutsideDays"> & React.RefAttributes<HTMLInputElement>>;

package/src/components/ExpressionEditor/DataTableEditor.js

@@ -15,15 +15,15 @@ const AdaptableContext_1 = require("../../View/AdaptableContext");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../View/Components/AdaptableInput"));
 const DataTableEditor = ({ fields, dataFormatter, data: initialData, type = 'column', labels, }) => {
     var _a, _b;
-    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const adaptableApi = (0, AdaptableContext_1.useAdaptable)().api;
     const [data, setData] = React.useState(initialData);
     const [showColumnIds, setShowValues] = React.useState(false);
     const [searchInputValue, setSearchInputValue] = React.useState('');
     const getColValue = (fieldValue) => {
-        return adaptable.api.internalApi.getValueUsingField(data, fieldValue);
+        return adaptableApi.internalApi.getValueUsingField(data, fieldValue);
     };
     const updateColValue = (rowData, fielValue, newValue) => {
-        const updatedRowData = adaptable.api.internalApi.setValueUsingField(rowData, fielValue, newValue);
+        const updatedRowData = adaptableApi.internalApi.setValueUsingField(rowData, fielValue, newValue);
         return Object.assign({}, updatedRowData);
     };
     const getColDateValue = (fieldValue) => {

package/src/components/ExpressionEditor/ExpressionPreview.js

@@ -6,12 +6,12 @@ const React = tslib_1.__importStar(require("react"));
 const AdaptableContext_1 = require("../../View/AdaptableContext");
 const ExpressionPreview = (props) => {
     var _a;
-    const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const displayColumnFriendlyNames = (_a = adaptable.api.optionsApi.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
+    const adaptableApi = (0, AdaptableContext_1.useAdaptable)().api;
+    const displayColumnFriendlyNames = (_a = adaptableApi.optionsApi.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
     if (!displayColumnFriendlyNames) {
-        return React.createElement(React.Fragment, null, adaptable.api.expressionApi.getAdaptableQueryExpression(props.query));
+        return React.createElement(React.Fragment, null, adaptableApi.expressionApi.getAdaptableQueryExpression(props.query));
     }
-    const expressionWithFriendlyNames = adaptable.api.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(props.query);
+    const expressionWithFriendlyNames = adaptableApi.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(props.query);
     // '[Column Name] > 2' => ['[Column Name]', '>', '2']
     // not the prettiest
     const strWithMarkedGroupes = expressionWithFriendlyNames.replace(/\]/gi, '],').split(',');

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1730460314968 || Date.now(),
-    VERSION: "19.1.0-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1731319587104 || Date.now(),
+    VERSION: "19.1.1" || '--current-version--',
 };