@adaptabletools/adaptable 19.1.2 → 19.2.1-canary.0

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -52,7 +52,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getReportSchedules(config) {
         var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.getAdaptableApi().exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
+        return ((_a = this.handleLayoutAssociatedObjects(this.getExportApi().getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getActiveReportSchedules() {
         return this.getReportSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -163,7 +163,7 @@ export class ScheduleApiImpl extends ApiBase {
         }
         else if (scheduleType == 'Report') {
             const reportSchedule = schedule;
-            this.getAdaptableApi().exportApi.runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
+            this.getExportApi().runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
         }
         else if (scheduleType == 'ipushpull') {
             const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -83,7 +83,7 @@ export class TeamSharingApiImpl extends ApiBase {
             this.dispatchAction(TeamSharingRedux.TeamSharingImportItem(sharedEntity));
         }
         else {
-            const customSharedEntityImportHandler = this.getAdaptableApi().optionsApi.getTeamSharingOptions().handleCustomSharedEntityImport;
+            const customSharedEntityImportHandler = this.getTeamSharingOptions().handleCustomSharedEntityImport;
             if (!customSharedEntityImportHandler) {
                 this.logError(`Could NOT import custom shared entity because 'TeamSharingOptions.handleCustomSharedEntityImport(...)' is NOT defined!`, sharedEntity);
                 return;

package/src/Api/Implementation/ThemeApiImpl.js

@@ -58,7 +58,7 @@ export class ThemeApiImpl extends ApiBase {
         }
         this._adaptable.applyAdaptableTheme(currentTheme);
         let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { trigger: 'ThemeSelected', theme: currentTheme });
-        this.getAdaptableApi().eventApi.emit('ThemeChanged', themeChangedInfo);
+        this.getEventApi().emit('ThemeChanged', themeChangedInfo);
     }
     getUserThemes() {
         var _a;
@@ -79,7 +79,7 @@ export class ThemeApiImpl extends ApiBase {
     editTheme(theme) {
         this.dispatchAction(ThemeRedux.ThemeEdit(theme));
         let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { trigger: 'ThemeEdited', theme: theme });
-        this.getAdaptableApi().eventApi.emit('ThemeChanged', themeChangedInfo);
+        this.getEventApi().emit('ThemeChanged', themeChangedInfo);
         const currentTheme = this.getCurrentTheme();
         if (currentTheme === theme.Name) {
             this._adaptable.applyAdaptableTheme(theme);

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -41,21 +41,21 @@ export class UserInterfaceApiImpl extends ApiBase {
         // columns id
         permittedValuesItem = permittedValues.find((permittedValue) => {
             return ('ColumnIds' in permittedValue.scope &&
-                this.getAdaptableApi().columnScopeApi.isColumnInScope(column, permittedValue.scope));
+                this.getColumnScopeApi().isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
         }
         permittedValuesItem = permittedValues.find((permittedValue) => {
             return ('DataTypes' in permittedValue.scope &&
-                this.getAdaptableApi().columnScopeApi.isColumnInScope(column, permittedValue.scope));
+                this.getColumnScopeApi().isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
         }
         permittedValuesItem = permittedValues.find((permittedValue) => {
             return ('All' in permittedValue.scope &&
-                this.getAdaptableApi().columnScopeApi.isColumnInScope(column, permittedValue.scope));
+                this.getColumnScopeApi().isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
@@ -137,7 +137,7 @@ export class UserInterfaceApiImpl extends ApiBase {
         if (!editLookUpItem || !gridCell || !gridCell.column) {
             return undefined;
         }
-        return this.getAdaptableApi().gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
+        return this.getGridApi().internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
     }
     getEditableCellStyle() {
         return this.getUserInterfaceOptions().editableCellStyle;
@@ -161,9 +161,9 @@ export class UserInterfaceApiImpl extends ApiBase {
         }
     }
     getCustomIconDefinition(iconName) {
-        var _a, _b;
+        var _a;
         let customIcon = undefined;
-        const customIcons = (_b = (_a = this.getAdaptableApi().optionsApi.getAdaptableOptions().userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.customIcons) !== null && _b !== void 0 ? _b : [];
+        const customIcons = (_a = this.getUserInterfaceOptions().customIcons) !== null && _a !== void 0 ? _a : [];
         customIcon = customIcons.find((icon) => icon.name === iconName);
         if (customIcon) {
             return customIcon.icon;

package/src/Api/Internal/ActionRowInternalApi.js

@@ -45,13 +45,12 @@ export class ActionRowInternalApi extends ApiBase {
         return Object.assign(Object.assign({ rowNode }, this.getAdaptableInternalApi().buildBaseContext()), { type: type });
     }
     buildActionRowFields(actionRowType, rowNode) {
-        const relevantColumns = this.getAdaptableApi()
-            .columnApi.getColumns()
+        const relevantColumns = this.getColumnApi().getColumns()
             .filter((column) => {
             // if there is NO rowNode, do NOT display the non-editable fields as they will be empty
             return !!rowNode || this.isCellEditable(column, rowNode);
         })
-            .filter((column) => !this.getAdaptableApi().columnApi.isActionRowButtonColumn(column.columnId) &&
+            .filter((column) => !this.getColumnApi().isActionRowButtonColumn(column.columnId) &&
             this.showColumnInActionRowForm(column, actionRowType));
         return relevantColumns.map((column) => this.buildFormField(actionRowType, column, rowNode));
     }
@@ -88,7 +87,7 @@ export class ActionRowInternalApi extends ApiBase {
                 // we need to filter out the textOutput fields and add the primaryKey
                 const eventInfo = type === 'rowCreated'
                     ? Object.assign(Object.assign({ type: 'rowCreated', formData: this.prepareCreateData(formFields, context) }, this.getAdaptableInternalApi().buildBaseContext()), { clonedRowNode: rowNode }) : Object.assign({ type: 'rowEdited', formData: this.prepareEditData(formFields, context), rowNode: rowNode }, this.getAdaptableInternalApi().buildBaseContext());
-                this.getAdaptableApi().eventApi.emit('ActionRowSubmitted', eventInfo);
+                this.getEventApi().emit('ActionRowSubmitted', eventInfo);
                 (_b = (_a = this.actionRowFormOptions) === null || _a === void 0 ? void 0 : _a.onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
             },
         };
@@ -120,8 +119,8 @@ export class ActionRowInternalApi extends ApiBase {
         if (!rowNode) {
             return !column.readOnly;
         }
-        const gridCell = this.getAdaptableApi().gridApi.getGridCellFromRowNode(rowNode, column.columnId);
-        return this.getAdaptableApi().gridApi.isCellEditable(gridCell);
+        const gridCell = this.getGridApi().getGridCellFromRowNode(rowNode, column.columnId);
+        return this.getGridApi().isCellEditable(gridCell);
     }
     buildFormField(type, column, rowNode) {
         const isCellEditable = this.isCellEditable(column, rowNode);
@@ -133,8 +132,8 @@ export class ActionRowInternalApi extends ApiBase {
             : 'textOutput';
         const defaultValue = rowNode
             ? isCellEditable
-                ? this.getAdaptableApi().gridApi.getRawValueFromRowNode(rowNode, column.columnId)
-                : this.getAdaptableApi().gridApi.getDisplayValueFromRowNode(rowNode, column.columnId)
+                ? this.getGridApi().getRawValueFromRowNode(rowNode, column.columnId)
+                : this.getGridApi().getDisplayValueFromRowNode(rowNode, column.columnId)
             : null;
         return {
             label: this.getFormFieldLabel(type, column, rowNode),
@@ -173,9 +172,9 @@ export class ActionRowInternalApi extends ApiBase {
             return;
         }
         const gridCell = rowNode
-            ? this.getAdaptableApi().gridApi.getGridCellFromRowNode(rowNode, column.columnId)
+            ? this.getGridApi().getGridCellFromRowNode(rowNode, column.columnId)
             : undefined;
-        const editLookUpValues = this.getAdaptableApi().gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, column, gridCell);
+        const editLookUpValues = this.getGridApi().internalApi.getEditLookUpValuesForColumn(editLookUpItem, column, gridCell);
         return editLookUpValues === null || editLookUpValues === void 0 ? void 0 : editLookUpValues.map((value) => ({
             value,
             label: value,

package/src/Api/Internal/AdaptableInternalApi.js

@@ -439,7 +439,7 @@ export class AdaptableInternalApi extends ApiBase {
         }
         // lastly filter by scope
         if (scope) {
-            locatedAdaptableObjects = locatedAdaptableObjects.filter((adaptableObject) => this.getAdaptableApi().columnScopeApi.isScopeInScope(adaptableObject.Scope, scope));
+            locatedAdaptableObjects = locatedAdaptableObjects.filter((adaptableObject) => this.getColumnScopeApi().isScopeInScope(adaptableObject.Scope, scope));
         }
         return locatedAdaptableObjects;
     }
@@ -453,7 +453,7 @@ export class AdaptableInternalApi extends ApiBase {
     getActionButtonsAndActionColumn(colDef) {
         var _a;
         let actionColumn;
-        if (this.getAdaptableApi().columnApi.isActionRowButtonColumn(colDef.colId)) {
+        if (this.getColumnApi().isActionRowButtonColumn(colDef.colId)) {
             const actionButtons = this.getActionRowApi().internalApi.getActionRowButtonDefs();
             actionColumn = {
                 columnId: ADAPTABLE_ROW_ACTION_BUTTONS,

package/src/Api/Internal/AlertInternalApi.js

@@ -502,7 +502,7 @@ export class AlertInternalApi extends ApiBase {
     getAlertDefinitionsForCellDataChange(dataChangedEvent) {
         const allActiveNonReactiveDefinitions = this.getActiveNonReactiveAlertDefinitions();
         let relatedAlertDefinitions = allActiveNonReactiveDefinitions
-            .filter((v) => this.getAdaptableApi().columnScopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
+            .filter((v) => this.getColumnScopeApi().isColumnInScope(dataChangedEvent.column, v.Scope))
             .filter((alertDefinition) => !isReactiveQuery(alertDefinition.Rule));
         let triggeredAlerts = [];
         if (ArrayExtensions.IsNotNullOrEmpty(relatedAlertDefinitions)) {
@@ -511,7 +511,7 @@ export class AlertInternalApi extends ApiBase {
                     let expression = alertDefinition.Rule.BooleanExpression;
                     let rowNode = dataChangedEvent.rowNode;
                     if (!rowNode) {
-                        rowNode = this.getAdaptableApi().gridApi.getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
+                        rowNode = this.getGridApi().getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
                     }
                     const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(expression, 'Alert', `Invalid Alert boolean expression '${expression}'`);
                     const isSatisfiedExpression = isValidExpression &&
@@ -557,7 +557,7 @@ export class AlertInternalApi extends ApiBase {
         const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
             // TODO send real display value
             displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.getAdaptableInternalApi().buildBaseContext());
-        return this.getAdaptableApi().predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
+        return this.getPredicateApi().handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
     }
     isAlertDefinitionForRowChangeEvent(alertDefinition) {
         return (this.isAlertDefinitionForAddedRowChangeEvent(alertDefinition) ||

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -84,7 +84,7 @@ export class CalculatedColumnInternalApi extends ApiBase {
     fireCalculatedColumnChangedEvent(trigger, calculatedColumn) {
         const adaptableApi = this.getAdaptableApi();
         const calculatedColumnChangedInfo = Object.assign({ actionName: trigger, calculatedColumn: calculatedColumn, calculatedColumnExpressionAST: adaptableApi.expressionApi.getASTForExpression(this.getExpressionFromCalculatedColumn(calculatedColumn)) }, this.getAdaptableInternalApi().buildBaseContext());
-        this.getAdaptableApi().eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
+        this.getEventApi().emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
     }
     getColDefsForCalculatedColumns() {
         const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();

package/src/Api/Internal/ChartingInternalApi.js

@@ -12,8 +12,8 @@ export class ChartingInternalApi extends ApiBase {
         return element;
     }
     getContainerElemetnByName(containerName) {
-        var _a, _b, _c;
-        const chartContainers = (_c = (_b = (_a = this.getAdaptableApi().optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers) !== null && _c !== void 0 ? _c : [];
+        var _a;
+        const chartContainers = (_a = this.getChartingOptions().chartContainers) !== null && _a !== void 0 ? _a : [];
         const chartContainer = chartContainers.find((container) => container.name === containerName);
         return this.getContainerElement(chartContainer);
     }
@@ -24,7 +24,7 @@ export class ChartingInternalApi extends ApiBase {
     }
     // External lib charting service
     isExternalChartOpened(chartDefinition) {
-        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.isChartOpened)) {
             return false;
         }
@@ -34,28 +34,28 @@ export class ChartingInternalApi extends ApiBase {
         return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
     onHideExternalChart(chartDefinition) {
-        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onHideChart)) {
             return;
         }
         externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
     onShowExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onShowChart)) {
             return;
         }
         externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.getAdaptableApi())));
     }
     onPreviewExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onPreviewChart)) {
             return;
         }
         return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.getAdaptableApi())));
     }
     onDeleteExternalChart(chartDefinition) {
-        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onDeleteChart)) {
             return;
         }

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -43,7 +43,7 @@ export class ColumnFilterInternalApi extends ApiBase {
         const filter = {
             ColumnId: column.columnId,
             Predicate: {
-                PredicateId: this.getAdaptableApi().predicateApi.internalApi.getEqualityPredicateForDataType(column.dataType),
+                PredicateId: this.getPredicateApi().internalApi.getEqualityPredicateForDataType(column.dataType),
                 Inputs: [...new Set([gridCell.rawValue])],
             },
         };
@@ -55,11 +55,11 @@ export class ColumnFilterInternalApi extends ApiBase {
      * @param columnFilter Column Filter to use
      */
     columnFilterToString(columnFilter) {
-        const friendlyName = this.getAdaptableApi().columnApi.getFriendlyNameForColumnId(columnFilter.ColumnId);
+        const friendlyName = this.getColumnApi().getFriendlyNameForColumnId(columnFilter.ColumnId);
         return ('[' +
             friendlyName +
             '] ' +
-            this.getAdaptableApi().predicateApi.predicateToString(columnFilter.Predicate));
+            this.getPredicateApi().predicateToString(columnFilter.Predicate));
     }
     /**
      * Retrieves descriptions of given Column Filters
@@ -90,18 +90,18 @@ export class ColumnFilterInternalApi extends ApiBase {
         if (someInputsAreEmpty) {
             return true;
         }
-        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnFilter.ColumnId);
+        const column = this.getColumnApi().getColumnWithColumnId(columnFilter.ColumnId);
         if (!column) {
             return true;
         }
-        const gridCell = this.getAdaptableApi().gridApi.getGridCellFromRowNode(node, columnFilter.ColumnId);
+        const gridCell = this.getGridApi().getGridCellFromRowNode(node, columnFilter.ColumnId);
         if (!gridCell) {
             return true;
         }
         let value = gridCell.normalisedValue;
         const predicateDefHandlerContext = Object.assign({ value: value, oldValue: null, displayValue: gridCell.displayValue, node,
             column }, this.getAdaptableInternalApi().buildBaseContext());
-        return this.getAdaptableApi().predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
+        return this.getPredicateApi().handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
     }
     /**
      * Checks if the filter action should trigger Column Filtering
@@ -165,13 +165,13 @@ export class ColumnFilterInternalApi extends ApiBase {
     fireColumnFilterAppliedEvent() {
         if (this.isAdapTableReady()) {
             const columnFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableInternalApi().buildBaseContext());
-            this.getAdaptableApi().eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
+            this.getEventApi().emit('ColumnFilterApplied', columnFilterAppliedInfo);
         }
     }
     fireGridFilterAppliedEvent() {
         if (this.isAdapTableReady()) {
             const gridFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableInternalApi().buildBaseContext());
-            this.getAdaptableApi().eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
+            this.getEventApi().emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }
     /**

package/src/Api/Internal/CustomSortInternalApi.js

@@ -3,7 +3,7 @@ export class CustomSortInternalApi extends ApiBase {
     getCustomSortComparer(columnId) {
         var _a;
         const column = this.getColumnApi().getColumnWithColumnId(columnId);
-        return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.getAdaptableApi().columnScopeApi.isColumnInScope(column, csc.scope));
+        return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.getColumnScopeApi().isColumnInScope(column, csc.scope));
     }
     getDefaultCustomSortComparer(columnId, columnValues) {
         // have to return a function that may not have access to this

package/src/Api/Internal/DashboardInternalApi.js

@@ -31,7 +31,7 @@ export class DashboardInternalApi extends ApiBase {
             isToolbarStateChangedToVisible,
             isToolbarStateChangedToHidden });
         if (!isEqual(oldDashboardState, newDashboardState)) {
-            setTimeout(() => this.getAdaptableApi().eventApi.emit('DashboardChanged', dashboardChangedInfo));
+            setTimeout(() => this.getEventApi().emit('DashboardChanged', dashboardChangedInfo));
         }
     }
     isToolbarInActiveTab(toolbarName, dashboardState) {

package/src/Api/Internal/DataSetInternalApi.js

@@ -7,7 +7,7 @@ export class DataSetInternalApi extends ApiBase {
     fireDataSetSelectedEvent(dataSet) {
         if (this.isAdapTableReady()) {
             const dataSetSelectedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { dataSet });
-            this.getAdaptableApi().eventApi.emit('DataSetSelected', dataSetSelectedInfo);
+            this.getEventApi().emit('DataSetSelected', dataSetSelectedInfo);
         }
     }
 }

package/src/Api/Internal/ExportInternalApi.js

@@ -33,12 +33,12 @@ export class ExportInternalApi extends ApiBase {
                 break;
             case 'ScopeColumns':
                 // use the Scope object which will tell us if the Column is relevant
-                if (!this.getAdaptableApi().columnScopeApi.isColumnInScopeColumns(cellDataChangedInfo.column, report.Scope)) {
+                if (!this.getColumnScopeApi().isColumnInScopeColumns(cellDataChangedInfo.column, report.Scope)) {
                     return false;
                 }
                 break;
             case 'SelectedColumns':
-                let selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
+                let selectedCellInfo = this.getGridApi().getSelectedCellInfo();
                 if (selectedCellInfo) {
                     if (selectedCellInfo.columns.find((c) => c.columnId == cellDataChangedInfo.column.columnId) == null) {
                         return false;
@@ -59,7 +59,7 @@ export class ExportInternalApi extends ApiBase {
             case 'ExpressionRows':
                 return true; // TODO this is the only difficult one - do we check AdapTableQL?  if we can then that is good as we can then do a delta after all...
             case 'SelectedCellRows':
-                let selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
+                let selectedCellInfo = this.getGridApi().getSelectedCellInfo();
                 if (selectedCellInfo && selectedCellInfo.gridCells) {
                     if (selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;
@@ -67,7 +67,7 @@ export class ExportInternalApi extends ApiBase {
                 }
                 return false;
             case 'SelectedRows':
-                let selectedRowInfo = this.getAdaptableApi().gridApi.getSelectedRowInfo();
+                let selectedRowInfo = this.getGridApi().getSelectedRowInfo();
                 if (selectedRowInfo && selectedRowInfo.gridRows) {
                     if (selectedRowInfo.gridRows.find((gr) => gr.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;
@@ -217,10 +217,10 @@ export class ExportInternalApi extends ApiBase {
     }
     isSystemReportActive(reportName) {
         if (reportName == SELECTED_CELLS_REPORT) {
-            return this.getAdaptableApi().gridApi.isGridRangeSelectable();
+            return this.getGridApi().isGridRangeSelectable();
         }
         if (reportName == SELECTED_ROWS_REPORT) {
-            return this.getAdaptableApi().gridApi.isGridRowSelectable();
+            return this.getGridApi().isGridRowSelectable();
         }
         if (reportName === VISUAL_DATA_REPORT) {
             return this.getAdaptableApi()
@@ -231,13 +231,13 @@ export class ExportInternalApi extends ApiBase {
     }
     isSystemExportDestinationActive(exportDestination) {
         if (exportDestination === ExportDestination.Excel) {
-            return this.getAdaptableApi().exportApi.canExportToExcel();
+            return this.getExportApi().canExportToExcel();
         }
         return true;
     }
     getReportColumnScopeShortDescription(report) {
         var _a, _b;
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
+        if (this.getExportApi().isExternalReport(report)) {
             return ['[Custom Columns]'];
         }
         switch (report.ReportColumnScope) {
@@ -249,13 +249,13 @@ export class ExportInternalApi extends ApiBase {
                 return ['[Selected Columns]'];
             case 'ScopeColumns':
                 if ('ColumnIds' in (report === null || report === void 0 ? void 0 : report.Scope)) {
-                    return (_b = (_a = report.Scope.ColumnIds).map) === null || _b === void 0 ? void 0 : _b.call(_a, (columnId) => { var _a; return (_a = this.getAdaptableApi().columnApi.getFriendlyNameForColumnId(columnId)) !== null && _a !== void 0 ? _a : columnId; });
+                    return (_b = (_a = report.Scope.ColumnIds).map) === null || _b === void 0 ? void 0 : _b.call(_a, (columnId) => { var _a; return (_a = this.getColumnApi().getFriendlyNameForColumnId(columnId)) !== null && _a !== void 0 ? _a : columnId; });
                 }
                 return ['[Bespoke Columns]'];
         }
     }
     getReportColumnScopeLongDescription(report) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
+        if (this.getExportApi().isExternalReport(report)) {
             return '[Custom Columns]';
         }
         switch (report.ReportColumnScope) {
@@ -266,11 +266,11 @@ export class ExportInternalApi extends ApiBase {
             case 'SelectedColumns':
                 return '[Selected Columns]';
             case 'ScopeColumns':
-                return this.getAdaptableApi().columnScopeApi.getScopeDescription(report.Scope);
+                return this.getColumnScopeApi().getScopeDescription(report.Scope);
         }
     }
     getReportExpressionDescription(report, cols) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
+        if (this.getExportApi().isExternalReport(report)) {
             return '[Custom Data]';
         }
         if (this.isSystemReport(report.Name)) {
@@ -305,8 +305,8 @@ export class ExportInternalApi extends ApiBase {
     }
     getReportDataColumns(report, includePrimaryKey = false) {
         let reportColumns = [];
-        let gridColumns = this.getAdaptableApi().columnApi.getExportableColumns();
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
+        let gridColumns = this.getColumnApi().getExportableColumns();
+        if (this.getExportApi().isExternalReport(report)) {
             return reportColumns;
         }
         // first get the cols depending on the Column Scope
@@ -326,10 +326,10 @@ export class ExportInternalApi extends ApiBase {
                 break;
             case 'ScopeColumns':
                 if ('ColumnIds' in report.Scope) {
-                    reportColumns = report.Scope.ColumnIds.map((columnId) => this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId)).filter((c) => c);
+                    reportColumns = report.Scope.ColumnIds.map((columnId) => this.getColumnApi().getColumnWithColumnId(columnId)).filter((c) => c);
                 }
                 else {
-                    reportColumns = this.getAdaptableApi().columnScopeApi.getColumnsForScope(report.Scope);
+                    reportColumns = this.getColumnScopeApi().getColumnsForScope(report.Scope);
                 }
                 break;
         }
@@ -337,8 +337,8 @@ export class ExportInternalApi extends ApiBase {
             const pkColumn = reportColumns.find((column) => column.columnId === this.getAdaptableApi().optionsApi.getPrimaryKey());
             // TODO simplify after we fix the IsPrimaryKey bug
             // const pkColumn = reportColumns.find(column => column.IsPrimaryKey);
-            if (!pkColumn && !!this.getAdaptableApi().columnApi.getPrimaryKeyColumn()) {
-                reportColumns.push(this.getAdaptableApi().columnApi.getPrimaryKeyColumn());
+            if (!pkColumn && !!this.getColumnApi().getPrimaryKeyColumn()) {
+                reportColumns.push(this.getColumnApi().getPrimaryKeyColumn());
             }
         }
         return reportColumns.map((column) => {
@@ -380,12 +380,12 @@ export class ExportInternalApi extends ApiBase {
                 });
                 break;
             case 'SelectedCellRows':
-                const selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
+                const selectedCellInfo = this.getGridApi().getSelectedCellInfo();
                 const { gridCells: GridCells } = selectedCellInfo;
                 let selectedCellsByPrimaryKey = groupBy(GridCells, 'primaryKeyValue');
                 // we iterate over all visibleRowNodes to preserve the current order
                 this.getAdaptableInternalApi().forAllVisibleRowNodesDo((rowNode) => {
-                    const rowPrimaryKeyValue = this.getAdaptableApi().gridApi.getPrimaryKeyValueForRowNode(rowNode);
+                    const rowPrimaryKeyValue = this.getGridApi().getPrimaryKeyValueForRowNode(rowNode);
                     const selectedRowCells = selectedCellsByPrimaryKey[rowPrimaryKeyValue];
                     if (selectedRowCells) {
                         const selectedRowColumnIds = selectedRowCells.map((rowCell) => rowCell.column.columnId);
@@ -399,11 +399,11 @@ export class ExportInternalApi extends ApiBase {
                 });
                 break;
             case 'SelectedRows':
-                const selectedRowInfo = this.getAdaptableApi().gridApi.getSelectedRowInfo();
+                const selectedRowInfo = this.getGridApi().getSelectedRowInfo();
                 const selectedGridRowPrimaryKeys = (_b = (_a = selectedRowInfo === null || selectedRowInfo === void 0 ? void 0 : selectedRowInfo.gridRows) === null || _a === void 0 ? void 0 : _a.filter((gr) => gr.rowInfo.isGroup == false).map((gridRow) => gridRow.primaryKeyValue)) !== null && _b !== void 0 ? _b : [];
                 if (selectedGridRowPrimaryKeys.length) {
                     this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
-                        const rowPrimaryKeyValue = this.getAdaptableApi().gridApi.getPrimaryKeyValueForRowNode(rowNode);
+                        const rowPrimaryKeyValue = this.getGridApi().getPrimaryKeyValueForRowNode(rowNode);
                         if (selectedGridRowPrimaryKeys.includes(rowPrimaryKeyValue)) {
                             resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
                         }
@@ -414,8 +414,8 @@ export class ExportInternalApi extends ApiBase {
         return resultRowData;
     }
     getReportData(report, includePrimaryKey = false) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return this.getAdaptableApi().exportApi.runExternalReport(report.Name);
+        if (this.getExportApi().isExternalReport(report)) {
+            return this.getExportApi().runExternalReport(report.Name);
         }
         const columns = this.getReportDataColumns(report, includePrimaryKey);
         const rows = this.getReportDataRows(report, columns, includePrimaryKey);
@@ -439,16 +439,16 @@ export class ExportInternalApi extends ApiBase {
     }
     publishLiveLiveDataChangedEvent(reportDestination, liveDataTrigger, liveReport) {
         const liveDataChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { reportDestination: reportDestination, liveDataTrigger: liveDataTrigger, liveReport: liveReport });
-        this.getAdaptableApi().eventApi.emit('LiveDataChanged', liveDataChangedInfo);
+        this.getEventApi().emit('LiveDataChanged', liveDataChangedInfo);
     }
     getCellExportValueFromRowNode(rowNode, columnId, reportName) {
-        return this.getCellExportValueFromRawValue(rowNode, this.getAdaptableApi().gridApi.getRawValueFromRowNode(rowNode, columnId), columnId, reportName);
+        return this.getCellExportValueFromRawValue(rowNode, this.getGridApi().getRawValueFromRowNode(rowNode, columnId), columnId, reportName);
     }
     getCellExportValueFromRawValue(rowNode, cellRawValue, columnId, reportName) {
         if (StringExtensions.IsNullOrEmpty(cellRawValue)) {
             return cellRawValue;
         }
-        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        const column = this.getColumnApi().getColumnWithColumnId(columnId);
         const columnDataType = column.dataType;
         // 1. if it is a Visual Data report then we always ONLY send the formatted value and ignore all other properties
         if (reportName == VISUAL_DATA_REPORT) {
@@ -462,12 +462,12 @@ export class ExportInternalApi extends ApiBase {
             });
         }
         // 3. in all other cases check the general export format types
-        const cellExportFormat = this.getAdaptableApi().exportApi.internalApi.getCellExportFormatType(column, columnDataType);
+        const cellExportFormat = this.getExportApi().internalApi.getCellExportFormatType(column, columnDataType);
         return this.getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, cellExportFormat);
     }
     getReportFileName(reportName, destination) {
         let fileName;
-        const reportFilename = this.getAdaptableApi().optionsApi.getExportOptions().reportFilename;
+        const reportFilename = this.getExportOptions().reportFilename;
         if (reportFilename) {
             const reportFileNameContext = Object.assign(Object.assign({}, createBaseContext(this.getAdaptableApi())), { reportName,
                 destination });
@@ -475,7 +475,7 @@ export class ExportInternalApi extends ApiBase {
         }
         else {
             fileName = StringExtensions.ReplaceEmptySpacesWithUnderscore(reportName);
-            if (this.getAdaptableApi().optionsApi.getExportOptions().appendFileTimestamp) {
+            if (this.getExportOptions().appendFileTimestamp) {
                 fileName = `${fileName}_${DateFormatter(new Date(), {
                     Pattern: 'yyyyMMdd_HHmmss',
                 })}`;
@@ -484,7 +484,7 @@ export class ExportInternalApi extends ApiBase {
         return fileName;
     }
     getCustomExportDateFormat() {
-        return this.getAdaptableApi().optionsApi.getExportOptions().exportDateFormat;
+        return this.getExportOptions().exportDateFormat;
     }
     getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, 
     // default to rawValue if, for some reason, the configs provide invalid values
@@ -492,7 +492,7 @@ export class ExportInternalApi extends ApiBase {
         return type === 'rawValue'
             ? cellRawValue
             : // type === formattedValue
-                this.getAdaptableApi().gridApi.getDisplayValueFromRawValue(rowNode, columnId, cellRawValue);
+                this.getGridApi().getDisplayValueFromRawValue(rowNode, columnId, cellRawValue);
     }
     // aggregate and merge all acive Adaptable styles with the user proviided ExcelStyles
     buildExcelStylesForVisualReports() {
@@ -510,7 +510,7 @@ export class ExportInternalApi extends ApiBase {
             if (memoizedColumn) {
                 return memoizedColumn;
             }
-            const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+            const abColumn = this.getColumnApi().getColumnWithColumnId(columnId);
             adaptableColumnMap[columnId] = abColumn;
             return abColumn;
         };
@@ -547,7 +547,7 @@ export class ExportInternalApi extends ApiBase {
                 var _a, _b, _c;
                 const colDef = colDefs[columnIndex];
                 const columnId = column.getId();
-                const adaptableColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+                const adaptableColumn = this.getColumnApi().getColumnWithColumnId(columnId);
                 const isDateCellExportedAsFormattedValue = this.isDateCellExportedAsFormattedValue(adaptableColumn);
                 let cellClassParams;
                 const getLazyCellClassParams = () => {
@@ -557,7 +557,7 @@ export class ExportInternalApi extends ApiBase {
                             node,
                             column,
                             data: node.data,
-                            value: this.getAdaptableApi().gridApi.getRawValueFromRowNode(node, columnId),
+                            value: this.getGridApi().getRawValueFromRowNode(node, columnId),
                             rowIndex,
                             api: agGridApi,
                             context: {},
@@ -594,7 +594,7 @@ export class ExportInternalApi extends ApiBase {
                     excelStyles.push(this.convertCSSToExcelStyle(sanitizedAdaptableStyle));
                 }
                 const excelDataType = this.getExcelDataType(colDef === null || colDef === void 0 ? void 0 : colDef.type);
-                const rawValue = this.getAdaptableApi().gridApi.getRawValueFromRowNode(node, column.getId());
+                const rawValue = this.getGridApi().getRawValueFromRowNode(node, column.getId());
                 // don't add the cell style if it has no adaptable custom styles
                 if (!excelStyles.length &&
                     // if this is a formatted Date value, we still need to add the AG GRID specific type & numberFormat below
@@ -604,7 +604,7 @@ export class ExportInternalApi extends ApiBase {
                 const cellClassId = this._adaptable.agGridColumnAdapter.getExcelClassNameForCell(column.getId(), this._adaptable.getPrimaryKeyValueFromRowNode(node), userDefinedCellClass);
                 const finalCellExcelStyle = Object.assign({}, ...excelStyles);
                 if (excelDataType === 'DateTime' && isDateCellExportedAsFormattedValue) {
-                    let dateFormatPattern = this.getAdaptableApi().optionsApi.getExportOptions().exportDateFormat;
+                    let dateFormatPattern = this.getExportOptions().exportDateFormat;
                     const abColumn = getAdaptableColumnWithColumnId(column.getColId());
                     if (!dateFormatPattern) {
                         const mostRelevantFormatColumn = this.getAdaptableApi().formatColumnApi.internalApi.getMostRelevantFormatColumnForColumn(getFormatColumnsWithDisplayFormatForColumn(column.getColId()), abColumn, { node, value: rawValue });

package/src/Api/Internal/ExpressionInternalApi.js

@@ -24,7 +24,7 @@ export class ExpressionInternalApi extends ApiBase {
             context.expression = expression;
             context.referencedColumns = this.getAdaptableApi()
                 .expressionApi.getColumnsFromExpression(expression)
-                .map((columnId) => this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId));
+                .map((columnId) => this.getColumnApi().getColumnWithColumnId(columnId));
         }
         return !evaluateExpressionExternallyFn(context);
     }