@adaptabletools/adaptable-cjs 18.0.0-canary.24 → 18.0.0-canary.26

package/src/Api/Internal/ChartingInternalApi.js

@@ -16,53 +16,53 @@ class ChartingInternalApi extends ApiBase_1.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 }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.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 }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.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 }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.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 }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.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 }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
     }
 }
 exports.ChartingInternalApi = ChartingInternalApi;

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -47,7 +47,7 @@ class ColumnFilterInternalApi extends ApiBase_1.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])],
             },
         };
@@ -59,11 +59,11 @@ class ColumnFilterInternalApi extends ApiBase_1.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
@@ -103,17 +103,9 @@ class ColumnFilterInternalApi extends ApiBase_1.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
@@ -132,32 +124,32 @@ class ColumnFilterInternalApi extends ApiBase_1.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,
@@ -177,25 +169,15 @@ class ColumnFilterInternalApi extends ApiBase_1.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/CustomSortInternalApi.js

@@ -6,7 +6,7 @@ class CustomSortInternalApi extends ApiBase_1.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

@@ -30,18 +30,12 @@ class DashboardInternalApi extends ApiBase_1.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 (!(0, isEqual_1.default)(oldDashboardState, newDashboardState)) {
-            setTimeout(() => this.adaptable.api.eventApi.emit('DashboardChanged', dashboardChangedInfo));
+            setTimeout(() => this.getAdaptableApi().eventApi.emit('DashboardChanged', dashboardChangedInfo));
         }
     }
     isToolbarInActiveTab(toolbarName, dashboardState) {
@@ -61,7 +55,7 @@ class DashboardInternalApi extends ApiBase_1.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

@@ -56,16 +56,10 @@ class DataImportInternalApi extends ApiBase_1.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

@@ -9,13 +9,8 @@ class DataSetInternalApi extends ApiBase_1.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

@@ -24,12 +24,12 @@ class ExportInternalApi extends ApiBase_1.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;
@@ -50,7 +50,7 @@ class ExportInternalApi extends ApiBase_1.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;
@@ -58,7 +58,7 @@ class ExportInternalApi extends ApiBase_1.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

@@ -18,12 +18,7 @@ class ExpressionInternalApi extends ApiBase_1.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;
         }
@@ -41,12 +36,7 @@ class ExpressionInternalApi extends ApiBase_1.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

@@ -268,16 +268,7 @@ class Fdc3InternalApi extends ApiBase_1.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

@@ -63,7 +63,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions_1.default.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) {
@@ -71,11 +71,11 @@ class FormatColumnInternalApi extends ApiBase_1.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))
             );
         });
     }
@@ -148,7 +148,7 @@ class FormatColumnInternalApi extends ApiBase_1.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)
@@ -164,7 +164,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             return false;
         }
         if (!formatColumn.IncludeGroupedRows &&
-            this.adaptable.api.gridApi.isGroupRowNode(params.node)) {
+            this.getAdaptableApi().gridApi.isGroupRowNode(params.node)) {
             return false;
         }
         if (!formatColumn.Rule) {
@@ -172,16 +172,7 @@ class FormatColumnInternalApi extends ApiBase_1.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) {
@@ -192,12 +183,12 @@ class FormatColumnInternalApi extends ApiBase_1.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));
     }
@@ -248,7 +239,7 @@ class FormatColumnInternalApi extends ApiBase_1.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

@@ -24,7 +24,7 @@ class FreeTextColumnInternalApi extends ApiBase_1.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

@@ -7,15 +7,9 @@ class GridFilterInternalApi extends ApiBase_1.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);
         }
     }

package/src/Api/Internal/GridInternalApi.js

@@ -16,14 +16,9 @@ class GridInternalApi extends ApiBase_1.ApiBase {
      */
     fireGridSortedEvent() {
         if (this.adaptable.isReady) {
-            const adaptableSortState = this.adaptable.api.configApi.getAdaptableSortState();
+            const adaptableSortState = this.getAdaptableApi().configApi.getAdaptableSortState();
             const adaptableApi = this.getAdaptableApi();
-            const gridSortedInfo = {
-                adaptableSortState: adaptableSortState,
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
+            const gridSortedInfo = Object.assign({ adaptableSortState: adaptableSortState }, this.getAdaptableApi().internalApi.buildBaseContext());
             adaptableApi.eventApi.emit('GridSorted', gridSortedInfo);
         }
     }
@@ -32,13 +27,8 @@ class GridInternalApi extends ApiBase_1.ApiBase {
      */
     fireCellChangedEvent(cellDataChangedInfo) {
         if (this.adaptable.isReady) {
-            const cellChangedInfo = {
-                adaptableApi: this.adaptable.api,
-                cellChange: cellDataChangedInfo,
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('CellChanged', cellChangedInfo);
+            const cellChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { cellChange: cellDataChangedInfo });
+            this.getAdaptableApi().eventApi.emit('CellChanged', cellChangedInfo);
         }
     }
     /**
@@ -46,16 +36,10 @@ class GridInternalApi extends ApiBase_1.ApiBase {
      */
     fireGridDataChangedEvent(dataRows, rowNodes, rowTrigger) {
         if (this.adaptable.isReady) {
-            const gridDataChangedInfo = {
-                changedAt: Date.now(),
-                adaptableApi: this.adaptable.api,
-                rowTrigger,
+            const gridDataChangedInfo = Object.assign({ changedAt: Date.now(), rowTrigger,
                 dataRows,
-                rowNodes,
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('GridDataChanged', gridDataChangedInfo);
+                rowNodes }, this.getAdaptableApi().internalApi.buildBaseContext());
+            this.getAdaptableApi().eventApi.emit('GridDataChanged', gridDataChangedInfo);
             this.adaptable.DataService.CreateGridChangedEvent(gridDataChangedInfo);
         }
     }
@@ -100,12 +84,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         let shouldShowValuesCount = false;
         const showValuesCountFunction = this.getColumnFilterOptions().valuesFilterOptions.showValuesCount;
         if (showValuesCountFunction) {
-            const columnFilterContext = {
-                column: abColumn,
-                adaptableApi: this.adaptable.api,
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-            };
+            const columnFilterContext = Object.assign({ column: abColumn }, this.getAdaptableApi().internalApi.buildBaseContext());
             shouldShowValuesCount = showValuesCountFunction(columnFilterContext);
         }
         if (shouldShowValuesCount) {
@@ -143,7 +122,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         };
         let preparedPermittedValues = undefined;
         try {
-            const filterPermittedValuesParams = Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)), { column: column, searchFilter: filter });
+            const filterPermittedValuesParams = Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())), { column: column, searchFilter: filter });
             preparedPermittedValues = await (filterPermittedValues === null || filterPermittedValues === void 0 ? void 0 : filterPermittedValues.values(filterPermittedValuesParams));
         }
         catch (error) {
@@ -176,7 +155,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         const customSortPermittedValues = await this.getUserInterfaceApi().getCustomSortPermittedValuesForColumn(column);
         let preparedPermittedValues = undefined;
         try {
-            const permittedValuesParams = Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)), { column: column });
+            const permittedValuesParams = Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())), { column: column });
             preparedPermittedValues = await (customSortPermittedValues === null || customSortPermittedValues === void 0 ? void 0 : customSortPermittedValues.values(permittedValuesParams));
         }
         catch (error) {
@@ -207,7 +186,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         const bulkUpdatePermittedValues = await this.getUserInterfaceApi().getBulkUpdatePermittedValuesForColumn(column);
         let preparedPermittedValues = undefined;
         try {
-            const bulkUpdatePermittedValuesParams = Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)), { column: column, gridCells: selectedGridCells });
+            const bulkUpdatePermittedValuesParams = Object.assign(Object.assign({}, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())), { column: column, gridCells: selectedGridCells });
             preparedPermittedValues = await (bulkUpdatePermittedValues === null || bulkUpdatePermittedValues === void 0 ? void 0 : bulkUpdatePermittedValues.values(bulkUpdatePermittedValuesParams));
         }
         catch (error) {
@@ -284,7 +263,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         // this does NOT into account Custom Sort - far too hard for now...
         let sortOrder = Enums_1.SortOrder.Asc;
         if (this.getColumnFilterOptions().valuesFilterOptions.sortValuesFilter) {
-            let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.columnId);
+            let columnSort = this.getAdaptableApi().gridApi.getColumnSortForColumn(column.columnId);
             if (columnSort && columnSort.SortOrder == 'Desc') {
                 sortOrder = Enums_1.SortOrder.Desc;
             }
@@ -319,13 +298,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         let editLookUpValues = editLookUpItem.values;
         // first do the function then get hardcoded items
         if (editLookUpValues != null && typeof editLookUpValues === 'function') {
-            const editLookUpContext = {
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-                column: column,
-                gridCell,
-            };
+            const editLookUpContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column, gridCell });
             return editLookUpValues(editLookUpContext);
         }
         else {

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

@@ -41,6 +41,7 @@ export declare class LayoutInternalApi extends ApiBase {
         ColumnFilters: boolean;
         GridFilter: boolean;
         ColumnSorts: boolean;
+        RowSummaries: boolean;
     };
     updateCurrentDraftLayout(layout: Layout): void;
     hasLayoutSpecificObjects(): boolean;