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

package/src/Api/Implementation/GridApiImpl.js

@@ -67,7 +67,7 @@ export class GridApiImpl extends ApiBase {
     }
     undoCellEdit(cellDataChangedInfo) {
         // for the reason of this hacky solution see the comments in DataService
-        this.adaptable.api.internalApi.getDataService().logUndoChange(cellDataChangedInfo);
+        this.getAdaptableApi().internalApi.getDataService().logUndoChange(cellDataChangedInfo);
         const cellUpdateRequest = {
             columnId: cellDataChangedInfo.column.columnId,
             newValue: cellDataChangedInfo.oldValue,
@@ -87,7 +87,7 @@ export class GridApiImpl extends ApiBase {
     }
     setCellValue(cellUpdateRequest) {
         var _a;
-        const abColumn = this.adaptable.api.columnApi.getColumnWithColumnId(cellUpdateRequest.columnId);
+        const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(cellUpdateRequest.columnId);
         if (!abColumn) {
             this.logWarn(`setCellValue() - column not found for columnId: ${cellUpdateRequest.columnId}`);
             return;
@@ -128,7 +128,7 @@ export class GridApiImpl extends ApiBase {
     }
     clearGridFiltering() {
         // slightly round the houses but we have to call ColumnFilterAPI as it does it properly
-        this.adaptable.api.columnFilterApi.clearColumnFilters();
+        this.getAdaptableApi().columnFilterApi.clearColumnFilters();
     }
     getColumnSorts() {
         return this.getAdaptableState().Grid.ColumnSorts;
@@ -215,7 +215,7 @@ export class GridApiImpl extends ApiBase {
     }
     selectCellRangeByQuery(query, gridCellRange, clearSelection) {
         const filteredRowNodes = [];
-        const isRowNodeInQuery = (rowNode) => this.adaptable.api.internalApi
+        const isRowNodeInQuery = (rowNode) => this.getAdaptableApi().internalApi
             .getQueryLanguageService()
             .evaluateBooleanExpression(query, 'GridInfo', rowNode);
         if (gridCellRange) {
@@ -239,7 +239,7 @@ export class GridApiImpl extends ApiBase {
             /**
              * Select all rows and all columns
              */
-            const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+            const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
             preapredGridCellRange = {
                 columnIds: currentLayout.Columns,
             };
@@ -275,7 +275,7 @@ export class GridApiImpl extends ApiBase {
         this.selectColumns([columnId]);
     }
     selectColumns(columnIds) {
-        this.adaptable.api.columnApi.selectColumns(columnIds);
+        this.getAdaptableApi().columnApi.selectColumns(columnIds);
     }
     getFirstRowNode() {
         return this.adaptable.getFirstRowNode();
@@ -308,7 +308,7 @@ export class GridApiImpl extends ApiBase {
     }
     getNormalisedValueFromRowNode(rowNode, columnId) {
         const rawValue = this.adaptable.getRawValueFromRowNode(rowNode, columnId);
-        const abColumn = this.adaptable.api.columnApi.getColumnWithColumnId(columnId);
+        const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
         return this.adaptable.getNormalisedValueFromRawValue(rawValue, abColumn);
     }
     getRowNodesForPrimaryKeys(primaryKeyValues) {
@@ -535,7 +535,7 @@ export class GridApiImpl extends ApiBase {
         const visibleColumns = (_c = transposeConfig.visibleColumns) !== null && _c !== void 0 ? _c : false;
         const visibleRows = (_d = transposeConfig.visibleRows) !== null && _d !== void 0 ? _d : false;
         const autosize = (_e = transposeConfig.autosize) !== null && _e !== void 0 ? _e : true;
-        this.adaptable.api.internalApi.showPopupWindow({
+        this.getAdaptableApi().internalApi.showPopupWindow({
             id: WINDOW_SHOW_TRANSPOSED_VIEW,
             factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
             title: 'Transposed View',
@@ -549,4 +549,7 @@ export class GridApiImpl extends ApiBase {
             },
         });
     }
+    getAllGridColumns() {
+        return this.adaptable.getAllGridColumns();
+    }
 }

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

@@ -50,6 +50,8 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
         AggregationColumns: boolean;
         PivotColumns: boolean;
         ColumnFilters: boolean;
+        GridFilter: boolean;
         ColumnSorts: boolean;
+        RowSummaries: boolean;
     };
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -243,18 +243,7 @@ export class LayoutApiImpl extends ApiBase {
         this.addColumnToLayout(columnId, this.getCurrentLayoutName());
     }
     getLayoutSupportedFeatures() {
-        const layoutSupportedFeatures = {
-            RowGroupedColumns: true,
-            AggregationColumns: true,
-            PivotColumns: true,
-            ColumnFilters: true,
-            ColumnSorts: true,
-        };
-        if (this.getGridApi().getAgGridRowModelType() === 'viewport') {
-            layoutSupportedFeatures.RowGroupedColumns = false;
-            layoutSupportedFeatures.AggregationColumns = false;
-            layoutSupportedFeatures.PivotColumns = false;
-        }
-        return layoutSupportedFeatures;
+        // TODO: is this deprecated?
+        return this.internalApi.getLayoutSupportedFeatures();
     }
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -71,9 +71,9 @@ export class PredicateApiImpl extends ApiBase {
         if (!predicate.ColumnId) {
             return this.handlePredicate(predicate, context, defaultReturn);
         }
-        const paramsForColumn = Object.assign(Object.assign({}, context), { column: this.adaptable.api.columnApi.getColumnWithColumnId(predicate.ColumnId), 
+        const paramsForColumn = Object.assign(Object.assign({}, context), { column: this.getAdaptableApi().columnApi.getColumnWithColumnId(predicate.ColumnId), 
             // value: params?.node?.data?.[predicate.ColumnId],
-            value: this.adaptable.api.gridApi.getRawValueFromRowNode(context.node, predicate.ColumnId) });
+            value: this.getAdaptableApi().gridApi.getRawValueFromRowNode(context.node, predicate.ColumnId) });
         if ('oldValue' in paramsForColumn) {
             delete paramsForColumn.oldValue;
         }

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -52,7 +52,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getReportSchedules(config) {
         var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.adaptable.api.exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
+        return ((_a = this.handleLayoutAssociatedObjects(this.getAdaptableApi().exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getActiveReportSchedules() {
         return this.getReportSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -81,7 +81,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getIPushPullSchedules(config) {
         var _a;
-        const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
+        const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();
         return ((_a = this.handleLayoutAssociatedObjects(ippApi === null || ippApi === void 0 ? void 0 : ippApi.getIPushPullSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getActiveIPushPullSchedules() {
@@ -111,7 +111,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getOpenFinSchedules(config) {
         var _a;
-        const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
+        const openFinApi = this.getAdaptableApi().pluginsApi.getOpenFinPluginApi();
         return ((_a = this.handleLayoutAssociatedObjects(openFinApi === null || openFinApi === void 0 ? void 0 : openFinApi.getOpenFinSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getActiveOpenFinSchedules() {
@@ -163,10 +163,10 @@ export class ScheduleApiImpl extends ApiBase {
         }
         else if (scheduleType == 'Report') {
             const reportSchedule = schedule;
-            this.adaptable.api.exportApi.runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
+            this.getAdaptableApi().exportApi.runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
         }
         else if (scheduleType == 'ipushpull') {
-            const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
+            const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();
             const iPushPullSchedule = schedule;
             if (iPushPullSchedule.Transmission == 'Snapshot') {
                 ippApi.sendSnapshot(iPushPullSchedule.IPushPullReport);
@@ -176,7 +176,7 @@ export class ScheduleApiImpl extends ApiBase {
             }
         }
         else if (scheduleType == 'OpenFin') {
-            const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
+            const openFinApi = this.getAdaptableApi().pluginsApi.getOpenFinPluginApi();
             const openFinSchedule = schedule;
             openFinApi.startLiveData(openFinSchedule.OpenFinReport);
         }

package/src/Api/Implementation/ScopeApiImpl.js

@@ -26,7 +26,7 @@ export class ScopeApiImpl extends ApiBase {
         if (scope == undefined) {
             return [];
         }
-        const columns = this.adaptable.api.columnApi.getColumns();
+        const columns = this.getAdaptableApi().columnApi.getColumns();
         if ('All' in scope) {
             return columns;
         }
@@ -53,7 +53,7 @@ export class ScopeApiImpl extends ApiBase {
         if ('ColumnIds' in scope) {
             return ((scope.ColumnIds.length > 1 ? 'Columns' : 'Column') +
                 ': ' +
-                this.adaptable.api.columnApi
+                this.getAdaptableApi().columnApi
                     .getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
@@ -96,7 +96,7 @@ export class ScopeApiImpl extends ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            this.adaptable.api.columnApi.hasNumberDataType(scope.ColumnIds[0]));
+            this.getAdaptableApi().columnApi.hasNumberDataType(scope.ColumnIds[0]));
     }
     isSingleBooleanColumnScope(scope) {
         return (this.scopeHasColumns(scope) &&
@@ -104,7 +104,7 @@ export class ScopeApiImpl extends ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            this.adaptable.api.columnApi.hasBooleanDataType(scope.ColumnIds[0]));
+            this.getAdaptableApi().columnApi.hasBooleanDataType(scope.ColumnIds[0]));
     }
     areAllBooleanColumnsInScope(scope) {
         return (this.scopeHasColumns(scope) &&
@@ -112,7 +112,7 @@ export class ScopeApiImpl extends ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length &&
-            scope.ColumnIds.every((columnId) => this.adaptable.api.columnApi.hasBooleanDataType(columnId)));
+            scope.ColumnIds.every((columnId) => this.getAdaptableApi().columnApi.hasBooleanDataType(columnId)));
     }
     isColumnInScopeColumns(column, scope) {
         return this.scopeHasColumns(scope) && this.isColumnInScope(column, scope);
@@ -120,7 +120,7 @@ export class ScopeApiImpl extends ApiBase {
     isPrimaryKeyColumnInScopeColumns(scope) {
         return ('ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            scope.ColumnIds.find((c) => c == this.adaptable.api.optionsApi.getPrimaryKey()) != null);
+            scope.ColumnIds.find((c) => c == this.getAdaptableApi().optionsApi.getPrimaryKey()) != null);
     }
     getScopeToString(scope) {
         if ('All' in scope) {
@@ -135,7 +135,7 @@ export class ScopeApiImpl extends ApiBase {
         if ('ColumnIds' in scope) {
             let text = scope.ColumnIds.length == 1 ? 'Column: ' : 'Columns: ';
             return (text +
-                this.adaptable.api.columnApi
+                this.getAdaptableApi().columnApi
                     .getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
@@ -253,7 +253,7 @@ export class ScopeApiImpl extends ApiBase {
             'DataTypes' in b &&
             a.ColumnIds.every((columnId) => {
                 var _a;
-                return b.DataTypes.includes((_a = this.adaptable.api.columnApi.getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
+                return b.DataTypes.includes((_a = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
             })) {
             return true;
         }
@@ -265,7 +265,7 @@ export class ScopeApiImpl extends ApiBase {
         // check if each colum in a has column types in b
         if ('ColumnIds' in a && 'ColumnTypes' in b) {
             const inScope = a.ColumnIds.every((columnId) => {
-                const column = this.adaptable.api.columnApi.getColumnWithColumnId(columnId);
+                const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
                 // check if at least one column-type is in scope
                 return column.columnTypes.some((columnColumnType) => b.ColumnTypes.includes(columnColumnType));
             });
@@ -276,7 +276,7 @@ export class ScopeApiImpl extends ApiBase {
         return false;
     }
     createCellColorRangesForScope(scope) {
-        let distinctColumnsValues = this.adaptable.api.gridApi.internalApi.getDistinctRawValuesForColumn(this.adaptable.api.scopeApi.getSingleColumnInScope(scope));
+        let distinctColumnsValues = this.getAdaptableApi().gridApi.internalApi.getDistinctRawValuesForColumn(this.getAdaptableApi().scopeApi.getSingleColumnInScope(scope));
         let minValue = Math.min(...distinctColumnsValues);
         let maxValue = Math.max(...distinctColumnsValues);
         const ranges = [];

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -15,11 +15,7 @@ export class TeamSharingApiImpl extends ApiBase {
             return [];
         }
         const teamSharingOptions = this.adaptable.adaptableOptions.teamSharingOptions;
-        const sharedEntitiesContext = {
-            adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            userName: this.adaptable.adaptableOptions.userName,
-            adaptableApi: this.getAdaptableApi(),
-        };
+        const sharedEntitiesContext = this.getAdaptableApi().internalApi.buildBaseContext();
         let loadedSharedEntities = await teamSharingOptions.loadSharedEntities(sharedEntitiesContext);
         // with v15 we introduced 2 types of SharedEntity: AdaptableSharedEntity (basically the old one) and the new CustomSharedEntity
         // for backwards compatibility, we add default the 'EntityType' property to 'adaptableEntity'
@@ -40,11 +36,7 @@ export class TeamSharingApiImpl extends ApiBase {
             return false;
         }
         const teamSharingOptions = this.adaptable.adaptableOptions.teamSharingOptions;
-        const sharedEntitiesContext = {
-            adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            userName: this.adaptable.adaptableOptions.userName,
-            adaptableApi: this.getAdaptableApi(),
-        };
+        const sharedEntitiesContext = this.getAdaptableApi().internalApi.buildBaseContext();
         const sharedEntitiesAfterCustomisation = teamSharingOptions.saveSharedEntities(sharedEntities, sharedEntitiesContext);
         await teamSharingOptions.persistSharedEntities(sharedEntitiesAfterCustomisation, sharedEntitiesContext);
         return true;
@@ -100,11 +92,7 @@ export class TeamSharingApiImpl extends ApiBase {
                 this.logError(`Could NOT import custom shared entity because 'TeamSharingOptions.handleCustomSharedEntityImport(...)' is NOT defined!`, sharedEntity);
                 return;
             }
-            customSharedEntityImportHandler(sharedEntity, {
-                adaptableApi: this.getAdaptableApi(),
-                adaptableId: this.adaptable.adaptableOptions.adaptableId,
-                userName: this.adaptable.adaptableOptions.userName,
-            });
+            customSharedEntityImportHandler(sharedEntity, this.getAdaptableApi().internalApi.buildBaseContext());
         }
     }
     getTeamSharingState() {

package/src/Api/Implementation/ThemeApiImpl.js

@@ -57,13 +57,8 @@ export class ThemeApiImpl extends ApiBase {
             return;
         }
         this.adaptable.applyAdaptableTheme(currentTheme);
-        let themeChangedInfo = {
-            adaptableApi: this.getAdaptableApi(),
-            theme: currentTheme,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.eventApi.emit('ThemeChanged', themeChangedInfo);
+        let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { theme: currentTheme });
+        this.getAdaptableApi().eventApi.emit('ThemeChanged', themeChangedInfo);
     }
     getUserThemes() {
         var _a;

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -53,7 +53,7 @@ export class UserInterfaceApiImpl extends ApiBase {
         }
         permittedValuesItem = permittedValues.find((permittedValue) => {
             return ('All' in permittedValue.scope &&
-                this.adaptable.api.scopeApi.isColumnInScope(column, permittedValue.scope));
+                this.getAdaptableApi().scopeApi.isColumnInScope(column, permittedValue.scope));
         });
         if (permittedValuesItem) {
             return permittedValuesItem;
@@ -73,12 +73,7 @@ export class UserInterfaceApiImpl extends ApiBase {
         // first do the function then get hardcoded items
         if (permittedValues != null && typeof permittedValues === 'function') {
             if (column) {
-                const permittedValuesParams = {
-                    adaptableApi: this.getAdaptableApi(),
-                    userName: this.getOptions().userName,
-                    adaptableId: this.getOptions().adaptableId,
-                    column: column,
-                };
+                const permittedValuesParams = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
                 return permittedValues(permittedValuesParams);
             }
         }
@@ -140,7 +135,7 @@ export class UserInterfaceApiImpl extends ApiBase {
         if (!editLookUpItem || !gridCell || !gridCell.column) {
             return undefined;
         }
-        return this.adaptable.api.gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
+        return this.getAdaptableApi().gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
     }
     getEditableCellStyle() {
         return this.getUserInterfaceOptions().editableCellStyle;
@@ -151,11 +146,7 @@ export class UserInterfaceApiImpl extends ApiBase {
     getAdaptableObjectTags() {
         const objectTags = this.getUserInterfaceOptions().objectTags;
         if (objectTags != null && typeof objectTags === 'function') {
-            return objectTags({
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            });
+            return objectTags(this.getAdaptableApi().internalApi.buildBaseContext());
         }
         else {
             let arr = objectTags;

package/src/Api/Internal/ActionRowInternalApi.js

@@ -42,13 +42,7 @@ export class ActionRowInternalApi extends ApiBase {
             : this.actionRowFormOptions.formDescription;
     }
     buildFormParamContext(type, rowNode) {
-        return {
-            rowNode,
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getOptions().userName,
-            adaptableId: this.getOptions().adaptableId,
-            type: type,
-        };
+        return Object.assign(Object.assign({ rowNode }, this.getAdaptableApi().internalApi.buildBaseContext()), { type: type });
     }
     buildActionRowFields(actionRowType, rowNode) {
         const relevantColumns = this.getAdaptableApi()
@@ -64,13 +58,8 @@ export class ActionRowInternalApi extends ApiBase {
     showColumnInActionRowForm(adaptableColumn, actionRowType) {
         const showColumnFn = this.getActionRowOptions().actionRowFormOptions.showColumninActionRowForm;
         if (typeof showColumnFn === 'function') {
-            return showColumnFn({
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-                adaptableColumn,
-                actionRowType,
-            });
+            return showColumnFn(Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { adaptableColumn,
+                actionRowType }));
         }
         return true;
     }
@@ -98,22 +87,7 @@ export class ActionRowInternalApi extends ApiBase {
                 // textOutput should not be saved, their values are set to display values
                 // we need to filter out the textOutput fields and add the primaryKey
                 const eventInfo = type === 'rowCreated'
-                    ? {
-                        type: 'rowCreated',
-                        formData: this.prepareCreateData(formFields, context),
-                        adaptableApi: context.adaptableApi,
-                        userName: this.getOptions().userName,
-                        adaptableId: this.getOptions().adaptableId,
-                        clonedRowNode: rowNode,
-                    }
-                    : {
-                        type: 'rowEdited',
-                        formData: this.prepareEditData(formFields, context),
-                        rowNode: rowNode,
-                        adaptableApi: context.adaptableApi,
-                        userName: this.getOptions().userName,
-                        adaptableId: this.getOptions().adaptableId,
-                    };
+                    ? Object.assign(Object.assign({ type: 'rowCreated', formData: this.prepareCreateData(formFields, context) }, this.getAdaptableApi().internalApi.buildBaseContext()), { clonedRowNode: rowNode }) : Object.assign({ type: 'rowEdited', formData: this.prepareEditData(formFields, context), rowNode: rowNode }, this.getAdaptableApi().internalApi.buildBaseContext());
                 this.getAdaptableApi().eventApi.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);
             },
@@ -175,14 +149,8 @@ export class ActionRowInternalApi extends ApiBase {
         return customFieldLabel !== null && customFieldLabel !== void 0 ? customFieldLabel : column.friendlyName;
     }
     buildFormFieldLabelContext(type, column, rowNode) {
-        return {
-            rowNode,
-            column,
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getOptions().userName,
-            adaptableId: this.getOptions().adaptableId,
-            type: type,
-        };
+        return Object.assign(Object.assign({ rowNode,
+            column }, this.getAdaptableApi().internalApi.buildBaseContext()), { type: type });
     }
     getFieldTypeFromColumnType(column) {
         switch (column.dataType) {
@@ -285,13 +253,7 @@ export class ActionRowInternalApi extends ApiBase {
                 tooltip: 'Delete',
                 onClick: (button, context) => {
                     var _a, _b;
-                    const eventInfo = {
-                        type: 'rowDeleted',
-                        rowNode: context.rowNode,
-                        adaptableApi: context.adaptableApi,
-                        userName: context.userName,
-                        adaptableId: context.adaptableId,
-                    };
+                    const eventInfo = Object.assign({ type: 'rowDeleted', rowNode: context.rowNode }, this.getAdaptableApi().internalApi.buildBaseContext());
                     this.getEventApi().emit('ActionRowSubmitted', eventInfo);
                     (_b = (_a = this.getActionRowOptions().actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
                 },

package/src/Api/Internal/AdaptableInternalApi.js

@@ -294,11 +294,7 @@ export class AdaptableInternalApi extends ApiBase {
         if (typeof this.adaptable.adaptableOptions.userInterfaceOptions.objectTags === 'function') {
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
             return this.adaptable.adaptableOptions.userInterfaceOptions
-                .objectTags({
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            })
+                .objectTags(this.buildBaseContext())
                 .filter((tag) => typeof tag === 'string');
         }
     }
@@ -315,13 +311,7 @@ export class AdaptableInternalApi extends ApiBase {
         }
         if (typeof this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions
             .autoGenerateTagsForLayouts === 'function') {
-            const autoGenerateTagsForLayoutsContext = {
-                layouts: this.adaptable.api.layoutApi.getLayouts(),
-                objectTags: this.getAdaptableApi().userInterfaceApi.getAdaptableObjectTags(),
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            };
+            const autoGenerateTagsForLayoutsContext = Object.assign({ layouts: this.adaptable.api.layoutApi.getLayouts(), objectTags: this.getAdaptableApi().userInterfaceApi.getAdaptableObjectTags() }, this.buildBaseContext());
             const customGeneratedTags = this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts(autoGenerateTagsForLayoutsContext);
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
             return customGeneratedTags.filter((tag) => typeof tag === 'string');

package/src/Api/Internal/AlertInternalApi.js

@@ -80,12 +80,7 @@ export class AlertInternalApi extends ApiBase {
      */
     publishAlertFiredEvent(alertToFire) {
         const adaptableApi = this.getAdaptableApi();
-        const alertFiredInfo = {
-            adaptableApi: adaptableApi,
-            alert: alertToFire,
-            userName: adaptableApi.optionsApi.getUserName(),
-            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-        };
+        const alertFiredInfo = Object.assign({ alert: alertToFire }, this.getAdaptableApi().internalApi.buildBaseContext());
         this.getEventApi().emit('AlertFired', alertFiredInfo);
     }
     /**
@@ -295,7 +290,7 @@ export class AlertInternalApi extends ApiBase {
         var _a, _b, _c, _d;
         let ruleDescription = ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)
             ? (_d = (_c = alertDefinition.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.map((predicate) => this.getPredicateApi().predicateToString(predicate)).join(' AND ')
-            : this.adaptable.api.internalApi.getAdaptableQueryExpressionText(alertDefinition.Rule);
+            : this.getAdaptableApi().internalApi.getAdaptableQueryExpressionText(alertDefinition.Rule);
         return ruleDescription;
     }
     /**
@@ -472,17 +467,9 @@ export class AlertInternalApi extends ApiBase {
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         var _a;
         const adapatableApi = this.getAdaptableApi();
-        const predicateDefHandlerContext = {
-            value: dataChangedEvent.newValue,
-            oldValue: dataChangedEvent.oldValue,
+        const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
             // TODO send real display value
-            displayValue: null,
-            node: dataChangedEvent.rowNode,
-            column: dataChangedEvent.column,
-            adaptableApi: adapatableApi,
-            userName: adapatableApi.optionsApi.getUserName(),
-            adaptableId: adapatableApi.optionsApi.getAdaptableId(),
-        };
+            displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.getAdaptableApi().internalApi.buildBaseContext());
         return this.getAdaptableApi().predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
     }
     isAlertDefinitionForRowChangeEvent(alertDefinition) {

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())));
     }
 }