@adaptabletools/adaptable 18.0.0-canary.25 → 18.0.0-canary.27

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -28,7 +28,7 @@ export class CalculatedColumnInternalApi extends ApiBase {
         this.getCalculatedColumnApi()
             .getCalculatedColumns()
             .forEach((calculatedColumn) => {
-            if (this.getExpressionApi().internalApi.isColumnReferencedInExpression(columnId, this.adaptable.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) {
+            if (this.getExpressionApi().internalApi.isColumnReferencedInExpression(columnId, this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) {
                 calcColumns.push(calculatedColumn);
             }
         });
@@ -39,7 +39,7 @@ export class CalculatedColumnInternalApi extends ApiBase {
      * @param calculatedColumn Calculated Column to check
      */
     getReferencedColumnIdsForCalculatedColumn(calculatedColumn) {
-        const columnIds = this.adaptable.api.expressionApi.getColumnsFromExpression(this.adaptable.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
+        const columnIds = this.getAdaptableApi().expressionApi.getColumnsFromExpression(this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
         return columnIds;
     }
     /**
@@ -47,15 +47,15 @@ export class CalculatedColumnInternalApi extends ApiBase {
      * @param calculatedColumnId CalculatedColumnId to check
      */
     getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId) {
-        const calculatedColumn = this.adaptable.api.calculatedColumnApi
-            .getCalculatedColumns()
+        const calculatedColumn = this.getAdaptableApi()
+            .calculatedColumnApi.getCalculatedColumns()
             .find((cc) => cc.ColumnId == calculatedColumnId);
         if (calculatedColumn) {
             return this.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
         }
     }
     getCalculatedColumnsDependentOnColumn(column) {
-        const calculatedColumns = this.adaptable.api.calculatedColumnApi.getCalculatedColumns();
+        const calculatedColumns = this.getAdaptableApi().calculatedColumnApi.getCalculatedColumns();
         return calculatedColumns
             .filter((calculatedColumn) => {
             const dependentColumns = this.getReferencedColumnIdsForCalculatedColumnId(calculatedColumn.ColumnId);
@@ -81,15 +81,8 @@ export class CalculatedColumnInternalApi extends ApiBase {
     }
     fireCalculatedColumnChangedEvent(trigger, calculatedColumn) {
         const adaptableApi = this.getAdaptableApi();
-        const calculatedColumnChangedInfo = {
-            adaptableApi: adaptableApi,
-            actionName: trigger,
-            calculatedColumn: calculatedColumn,
-            calculatedColumnExpressionAST: adaptableApi.expressionApi.getASTForExpression(this.getExpressionFromCalculatedColumn(calculatedColumn)),
-            userName: adaptableApi.optionsApi.getUserName(),
-            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
+        const calculatedColumnChangedInfo = Object.assign({ actionName: trigger, calculatedColumn: calculatedColumn, calculatedColumnExpressionAST: adaptableApi.expressionApi.getASTForExpression(this.getExpressionFromCalculatedColumn(calculatedColumn)) }, this.getAdaptableApi().internalApi.buildBaseContext());
+        this.getAdaptableApi().eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
     }
     getColDefsForCalculatedColumns() {
         const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();

package/src/Api/Internal/ChartingInternalApi.js

@@ -13,52 +13,52 @@ export class ChartingInternalApi extends ApiBase {
     }
     getContainerElemetnByName(containerName) {
         var _a, _b, _c;
-        const chartContainers = (_c = (_b = (_a = this.adaptable.api.optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers) !== null && _c !== void 0 ? _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 : [];
         const chartContainer = chartContainers.find((container) => container.name === containerName);
         return this.getContainerElement(chartContainer);
     }
     getUniqueChartName() {
-        const charts = this.adaptable.api.chartingApi.getChartDefinitions();
-        const externalCharts = this.adaptable.api.chartingApi.getExternalChartDefinitions();
+        const charts = this.getAdaptableApi().chartingApi.getChartDefinitions();
+        const externalCharts = this.getAdaptableApi().chartingApi.getExternalChartDefinitions();
         return `Chart ${charts.length + externalCharts.length + 1}`;
     }
     // External lib charting service
     isExternalChartOpened(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.isChartOpened)) {
             return false;
         }
         if (!chartDefinition) {
             return false;
         }
-        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
+        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
     onHideExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onHideChart)) {
             return;
         }
-        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
+        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
     onShowExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onShowChart)) {
             return;
         }
-        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.adaptable.api)));
+        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.getAdaptableApi())));
     }
     onPreviewExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onPreviewChart)) {
             return;
         }
-        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.adaptable.api)));
+        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.getAdaptableApi())));
     }
     onDeleteExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onDeleteChart)) {
             return;
         }
-        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
+        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.getAdaptableApi())));
     }
 }

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -43,7 +43,7 @@ export class ColumnFilterInternalApi extends ApiBase {
         const filter = {
             ColumnId: column.columnId,
             Predicate: {
-                PredicateId: this.adaptable.api.predicateApi.internalApi.getEqualityPredicateForDataType(column.dataType),
+                PredicateId: this.getAdaptableApi().predicateApi.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.adaptable.api.columnApi.getFriendlyNameForColumnId(columnFilter.ColumnId);
+        const friendlyName = this.getAdaptableApi().columnApi.getFriendlyNameForColumnId(columnFilter.ColumnId);
         return ('[' +
             friendlyName +
             '] ' +
-            this.adaptable.api.predicateApi.predicateToString(columnFilter.Predicate));
+            this.getAdaptableApi().predicateApi.predicateToString(columnFilter.Predicate));
     }
     /**
      * Retrieves descriptions of given Column Filters
@@ -99,17 +99,9 @@ export class ColumnFilterInternalApi extends ApiBase {
             return true;
         }
         let value = gridCell.normalisedValue;
-        const predicateDefHandlerContext = {
-            value: value,
-            oldValue: null,
-            displayValue: gridCell.displayValue,
-            node,
-            column,
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getAdaptableApi().optionsApi.getUserName(),
-            adaptableId: this.getAdaptableApi().optionsApi.getAdaptableId(),
-        };
-        return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
+        const predicateDefHandlerContext = Object.assign({ value: value, oldValue: null, displayValue: gridCell.displayValue, node,
+            column }, this.getAdaptableApi().internalApi.buildBaseContext());
+        return this.getAdaptableApi().predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
     }
     /**
      * Checks if the filter action should trigger Column Filtering
@@ -128,32 +120,32 @@ export class ColumnFilterInternalApi extends ApiBase {
         // filter -> suspend changes
         var _a, _b;
         const isNewAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_ADD &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
-            this.adaptable.api.columnFilterApi
+            this.getAdaptableApi().columnFilterApi
                 .getColumnFilters()
-                .some((columnFilter) => this.adaptable.api.columnFilterApi.isColumnFilterActive(columnFilter));
+                .some((columnFilter) => this.getAdaptableApi().columnFilterApi.isColumnFilterActive(columnFilter));
         let isEditTrigger = false;
         if (action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {
             const newFilter = action.columnFilter;
-            const previous = this.adaptable.api.columnFilterApi.getColumnFilterForColumn(newFilter.ColumnId);
+            const previous = this.getAdaptableApi().columnFilterApi.getColumnFilterForColumn(newFilter.ColumnId);
             // same filter edit, so always trigger
             if (((_a = previous === null || previous === void 0 ? void 0 : previous.Predicate) === null || _a === void 0 ? void 0 : _a.PredicateId) === ((_b = newFilter === null || newFilter === void 0 ? void 0 : newFilter.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId)) {
                 isEditTrigger = true;
                 // new filter is active
             }
-            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(newFilter)) {
+            else if (this.getAdaptableApi().columnFilterApi.isColumnFilterActive(newFilter)) {
                 isEditTrigger = true;
             }
-            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(previous)) {
+            else if (this.getAdaptableApi().columnFilterApi.isColumnFilterActive(previous)) {
                 // previous filter was active
                 isEditTrigger = true;
             }
         }
         const isSetAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_SET &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isSuspendChanged = [
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND,
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL,
@@ -173,25 +165,15 @@ export class ColumnFilterInternalApi extends ApiBase {
     fireColumnFilterAppliedEvent() {
         if (this.adaptable.isReady) {
             const adaptableApi = this.getAdaptableApi();
-            const columnFilterAppliedInfo = {
-                columnFilters: this.getColumnFilterApi().getColumnFilters(),
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
+            const columnFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableApi().internalApi.buildBaseContext());
+            this.getAdaptableApi().eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
         }
     }
     fireGridFilterAppliedEvent() {
         if (this.adaptable.isReady) {
             const adaptableApi = this.getAdaptableApi();
-            const gridFilterAppliedInfo = {
-                columnFilters: this.getColumnFilterApi().getColumnFilters(),
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
+            const gridFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableApi().internalApi.buildBaseContext());
+            this.getAdaptableApi().eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }
     /**

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

@@ -1,4 +1,4 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class CommentsInternalApi extends ApiBase {
-    areCommentsAvailable(): boolean;
+    areCommentsSupported(): boolean;
 }

package/src/Api/Internal/CommentsInternalApi.js

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export class CommentsInternalApi extends ApiBase {
-    areCommentsAvailable() {
+    areCommentsSupported() {
         var _a;
         const currentLayout = this.getLayoutApi().getCurrentLayout();
         if (currentLayout.EnablePivot) {

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.adaptable.api.scopeApi.isColumnInScope(column, csc.scope));
+        return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.getAdaptableApi().scopeApi.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

@@ -26,18 +26,12 @@ export class DashboardInternalApi extends ApiBase {
             }
             return visibleInOldState && !visibleInNewState;
         };
-        const dashboardChangedInfo = {
-            adaptableApi: this.adaptable.api,
-            actionName: trigger,
-            oldDashboardState,
+        const dashboardChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { actionName: trigger, oldDashboardState,
             newDashboardState,
             isToolbarStateChangedToVisible,
-            isToolbarStateChangedToHidden,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
+            isToolbarStateChangedToHidden });
         if (!isEqual(oldDashboardState, newDashboardState)) {
-            setTimeout(() => this.adaptable.api.eventApi.emit('DashboardChanged', dashboardChangedInfo));
+            setTimeout(() => this.getAdaptableApi().eventApi.emit('DashboardChanged', dashboardChangedInfo));
         }
     }
     isToolbarInActiveTab(toolbarName, dashboardState) {
@@ -57,7 +51,7 @@ export class DashboardInternalApi extends ApiBase {
         return false;
     }
     isToolbarCustom(toolbarName) {
-        return this.adaptable.api.dashboardApi
+        return this.getAdaptableApi().dashboardApi
             .getCustomToolbars()
             .some((tb) => tb.name === toolbarName);
     }

package/src/Api/Internal/DataImportInternalApi.js

@@ -52,16 +52,10 @@ export class DataImportInternalApi extends ApiBase {
      * @param gridDataRows Rows that were imported
      */
     publishDataImportedEvent(importData, addedRows, updatedRows) {
-        const adaptableApi = this.getAdaptableApi();
-        const dataImportedInfo = {
-            adaptableApi: adaptableApi,
-            importData,
+        const dataImportedInfo = Object.assign({ importData,
             addedRows,
-            updatedRows,
-            userName: adaptableApi.optionsApi.getUserName(),
-            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
+            updatedRows }, this.getAdaptableApi().internalApi.buildBaseContext());
+        this.getAdaptableApi().internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
         this.getEventApi().emit('DataImported', dataImportedInfo);
     }
 }

package/src/Api/Internal/DataSetInternalApi.js

@@ -6,13 +6,8 @@ export class DataSetInternalApi extends ApiBase {
      */
     fireDataSetSelectedEvent(dataSet) {
         if (this.adaptable.isReady) {
-            const dataSetSelectedInfo = {
-                adaptableApi: this.adaptable.api,
-                dataSet,
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('DataSetSelected', dataSetSelectedInfo);
+            const dataSetSelectedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { dataSet });
+            this.getAdaptableApi().eventApi.emit('DataSetSelected', dataSetSelectedInfo);
         }
     }
 }

package/src/Api/Internal/ExportInternalApi.js

@@ -21,12 +21,12 @@ export class ExportInternalApi extends ApiBase {
                 break;
             case 'ScopeColumns':
                 // use the Scope object which will tell us if the Column is relevant
-                if (!this.adaptable.api.scopeApi.isColumnInScopeColumns(cellDataChangedInfo.column, report.Scope)) {
+                if (!this.getAdaptableApi().scopeApi.isColumnInScopeColumns(cellDataChangedInfo.column, report.Scope)) {
                     return false;
                 }
                 break;
             case 'SelectedColumns':
-                let selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
+                let selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
                 if (selectedCellInfo) {
                     if (selectedCellInfo.columns.find((c) => c.columnId == cellDataChangedInfo.column.columnId) == null) {
                         return false;
@@ -47,7 +47,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.adaptable.api.gridApi.getSelectedCellInfo();
+                let selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
                 if (selectedCellInfo && selectedCellInfo.gridCells) {
                     if (selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;
@@ -55,7 +55,7 @@ export class ExportInternalApi extends ApiBase {
                 }
                 return false;
             case 'SelectedRows':
-                let selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
+                let selectedRowInfo = this.getAdaptableApi().gridApi.getSelectedRowInfo();
                 if (selectedRowInfo && selectedRowInfo.gridRows) {
                     if (selectedRowInfo.gridRows.find((gr) => gr.primaryKeyValue == cellDataChangedInfo.primaryKeyValue)) {
                         return true;

package/src/Api/Internal/ExpressionInternalApi.js

@@ -15,12 +15,7 @@ export class ExpressionInternalApi extends ApiBase {
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = {
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getOptions().userName,
-            adaptableId: this.getOptions().adaptableId,
-            module,
-        };
+        const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { module });
         if (object) {
             context.object = object;
         }
@@ -38,12 +33,7 @@ export class ExpressionInternalApi extends ApiBase {
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = {
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getAdaptableApi().optionsApi.getUserName(),
-            adaptableId: this.getAdaptableApi().optionsApi.getAdaptableId(),
-            module,
-        };
+        const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { module });
         if (object) {
             context.object = object;
         }

package/src/Api/Internal/Fdc3InternalApi.js

@@ -265,16 +265,7 @@ export class Fdc3InternalApi extends ApiBase {
     }
     mapFdc3ButtonConfigToAdaptableButton(fdc3AdaptableButton, fdcInfo) {
         const buildFdc3Context = (context) => {
-            return {
-                context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode),
-                intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null,
-                rowNode: context.rowNode,
-                rowData: context.data,
-                adaptableId: context.adaptableId,
-                primaryKeyValue: context.primaryKeyValue,
-                userName: context.userName,
-                adaptableApi: context.adaptableApi,
-            };
+            return Object.assign({ context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode), intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null, rowNode: context.rowNode, rowData: context.data, primaryKeyValue: context.primaryKeyValue }, this.getAdaptableApi().internalApi.buildBaseContext());
         };
         return {
             onClick: (_button, context) => {

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -59,7 +59,7 @@ export class FormatColumnInternalApi extends ApiBase {
         return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
     }
     getFormatColumnWithColumnInScope(formatColumns, column) {
-        return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
+        return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.getAdaptableApi().scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
     }
     // TODO is this really needed, I don't think it achieves anything
     getFormatColumnInColumnScope(formatColumns) {
@@ -67,11 +67,11 @@ export class FormatColumnInternalApi extends ApiBase {
         return formatColumns.filter((fc) => {
             return (
                 // this.getFormatColumnsWithColumnScope(formatColumns)
-                (this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope) ||
+                (this.getAdaptableApi().scopeApi.scopeHasColumns(fc.Scope) ||
                     // this.getFormatColumnsWithDataTypeScope(formatColumns)
-                    this.adaptable.api.scopeApi.scopeHasDataType(fc.Scope) ||
+                    this.getAdaptableApi().scopeApi.scopeHasDataType(fc.Scope) ||
                     // this.getFormatColumnsWithAllScope(formatColumns)
-                    this.adaptable.api.scopeApi.scopeIsAll(fc.Scope) || this.adaptable.api.scopeApi.scopeHasColumnType(fc.Scope))
+                    this.getAdaptableApi().scopeApi.scopeIsAll(fc.Scope) || this.getAdaptableApi().scopeApi.scopeHasColumnType(fc.Scope))
             );
         });
     }
@@ -144,7 +144,7 @@ export class FormatColumnInternalApi extends ApiBase {
     getFormatColumnDefsForScope(scope) {
         return this.getAdaptableApi()
             .predicateApi.internalApi.getFormatColumnPredicateDefs(scope)
-            .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
+            .filter((predicateDef) => this.getAdaptableApi().scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
     /**
      * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
@@ -160,7 +160,7 @@ export class FormatColumnInternalApi extends ApiBase {
             return false;
         }
         if (!formatColumn.IncludeGroupedRows &&
-            this.adaptable.api.gridApi.isGroupRowNode(params.node)) {
+            this.getAdaptableApi().gridApi.isGroupRowNode(params.node)) {
             return false;
         }
         if (!formatColumn.Rule) {
@@ -168,16 +168,7 @@ export class FormatColumnInternalApi extends ApiBase {
         }
         // first run the predicate
         if (formatColumn.Rule.Predicates && ((_b = (_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)) {
-            const predicateDefHandlerContext = {
-                value: params.value,
-                oldValue: null,
-                displayValue: params.value,
-                node: params.node,
-                column: column,
-                adaptableApi: this.getAdaptableApi(),
-                userName: this.getAdaptableApi().optionsApi.getUserName(),
-                adaptableId: this.getAdaptableApi().optionsApi.getAdaptableId(),
-            };
+            const predicateDefHandlerContext = Object.assign({ value: params.value, oldValue: null, displayValue: params.value, node: params.node, column: column }, this.getAdaptableApi().internalApi.buildBaseContext());
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
         }
         else if (formatColumn.Rule.BooleanExpression) {
@@ -188,12 +179,12 @@ export class FormatColumnInternalApi extends ApiBase {
     }
     evaluatePredicate(formatColumn, predicateDefHandlerContext) {
         var _a;
-        return this.adaptable.api.predicateApi.handleColumnPredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
+        return this.getAdaptableApi().predicateApi.handleColumnPredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
     }
     evaluateExpression(formatColumn, node) {
-        const isValidExpression = this.adaptable.api.expressionApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
+        const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
         return (isValidExpression &&
-            this.adaptable.api.internalApi
+            this.getAdaptableApi().internalApi
                 .getQueryLanguageService()
                 .evaluateBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, node));
     }
@@ -244,7 +235,7 @@ export class FormatColumnInternalApi extends ApiBase {
         });
         const columnsThatNeedRefresh = new Set();
         this.getFormatColumnsDependentOnColumns(impactedColumnIds).forEach((formatColumn) => {
-            this.adaptable.api.scopeApi.getColumnsForScope(formatColumn.Scope).forEach((col) => {
+            this.getAdaptableApi().scopeApi.getColumnsForScope(formatColumn.Scope).forEach((col) => {
                 columnsThatNeedRefresh.add(col.columnId);
             });
         });

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -20,7 +20,7 @@ export class FreeTextColumnInternalApi extends ApiBase {
             };
             this.getFreeTextColumnApi().setStoredValue(freeTextColumn.ColumnId, freeTextStoredValue);
             var colsToRefresh = [cellDataChangedInfo.column.columnId];
-            const refencedCalcColumns = this.adaptable.api.calculatedColumnApi.internalApi.getCalculatedColumnsReferencingColumnId(cellDataChangedInfo.column.columnId);
+            const refencedCalcColumns = this.getAdaptableApi().calculatedColumnApi.internalApi.getCalculatedColumnsReferencingColumnId(cellDataChangedInfo.column.columnId);
             refencedCalcColumns.forEach((calculatedColumn) => {
                 colsToRefresh.push(calculatedColumn.ColumnId);
             });

package/src/Api/Internal/GridFilterInternalApi.js

@@ -4,15 +4,9 @@ export class GridFilterInternalApi extends ApiBase {
         if (this.adaptable.isReady) {
             const currentGridFilter = this.getGridFilterApi().getCurrentGridFilter();
             const adaptableApi = this.getAdaptableApi();
-            const gridFilterAppliedInfo = {
-                gridFilter: currentGridFilter,
-                gridFilterExpressionAST: currentGridFilter
+            const gridFilterAppliedInfo = Object.assign({ gridFilter: currentGridFilter, gridFilterExpressionAST: currentGridFilter
                     ? adaptableApi.expressionApi.getASTForExpression(currentGridFilter === null || currentGridFilter === void 0 ? void 0 : currentGridFilter.Expression)
-                    : null,
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
+                    : null }, this.getAdaptableApi().internalApi.buildBaseContext());
             adaptableApi.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }