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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.0-canary.25",
+  "version": "18.0.0-canary.27",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -243,7 +243,7 @@ export interface IAdaptable {
     getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
-    getAgGridAllGridColumns(): Column<any>[];
+    getAllGridColumns(): Column<any>[];
     clearRowGroupColumns(): void;
     expandAllRowGroups(): void;
     closeAllRowGroups(): void;

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -4,7 +4,7 @@ import { CommentThread, BaseContext, GridCell } from '../types';
  */
 export interface CommentOptions<TData = any> {
     /**
-     * Whether a cell can contain Comments
+     * Function to configure if a cell can contain Comments
      */
     isCellCommentable?: (commentableCellContext: CommentableCellContext) => boolean;
     /**
@@ -17,7 +17,7 @@ export interface CommentOptions<TData = any> {
      */
     persistCommentThreads?(commentThreads: CommentThread[]): Promise<void>;
     /**
-     * Format string for formatting in the Comments Popup
+     * Format string for dates in Comments Popup
      *
      * @defaultValue 'dd-MM-yyyy HH:mm:ss'
      */

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -1,17 +1,17 @@
 import { AdaptableMenuItem, ColumnMenuContext, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { AdaptableColumn, AdaptableIcon, AdaptableModule, BaseContext } from '../types';
+import { AdaptableColumn, AdaptableIcon, BaseContext } from '../types';
 /**
  * Options for managing menus in AdapTable – provided using 2 collections
  */
 export interface MenuOptions<TData = any> {
-    /**
-     * Customises Context Menu (default context menu items are available in provided context)
-     */
-    customContextMenu?: (menuContext: CustomContextMenuContext<TData>) => CustomContextMenuItem[];
     /**
      * Customises Column Menu (default column menu items are available in the provided context)
      */
     customColumnMenu?: (menuContext: CustomColumnMenuContext<TData>) => CustomColumnMenuItem[];
+    /**
+     * Customises Context Menu (default context menu items are available in provided context)
+     */
+    customContextMenu?: (menuContext: CustomContextMenuContext<TData>) => CustomContextMenuItem[];
 }
 /**
  * Context info provided when building Custom Context Menus
@@ -22,13 +22,13 @@ export interface CustomContextMenuContext<TData = any> extends ContextMenuContex
      */
     defaultAgGridMenuItems: AgGridMenuItem<AgGridContextMenuItemType>[];
     /**
-     * Default AdapTable Menu Items
+     * Flat list of all available AdapTable Menu Items
      */
     defaultAdaptableMenuItems: AdaptableSystemMenuItem[];
     /**
-     * All Adaptable Menu Items sorted and grouped
+     * Default structure of Adaptable Menu Items
      */
-    structuredAdaptableMenuItems: AdaptableSystemMenuItem[];
+    defaultAdaptableMenuStructure: AdaptableSystemMenuItem[];
 }
 /**
  * Context info provided when building Custom Column Menus
@@ -39,13 +39,13 @@ export interface CustomColumnMenuContext<TData = any> extends ColumnMenuContext<
      */
     defaultAgGridMenuItems: AgGridMenuItem<AgGridColumnMenuItemType>[];
     /**
-     * Default AdapTable Menu Items
+     * Flat list of all available AdapTable Menu Items
      */
     defaultAdaptableMenuItems: AdaptableSystemMenuItem[];
     /**
-     * All Adaptable Menu Items sorted and grouped
+     * Default structure of Adaptable Menu Items
      */
-    structuredAdaptableMenuItems: AdaptableSystemMenuItem[];
+    defaultAdaptableMenuStructure: AdaptableSystemMenuItem[];
 }
 /**
  * Custom Context Menu Item
@@ -172,15 +172,3 @@ export type AgGridContextMenuItemType = 'autoSizeAll' | 'expandAll' | 'contractA
  * Defines AG Grid Column Menu Items
  */
 export type AgGridColumnMenuItemType = 'pinSubMenu' | 'valueAggSubMenu' | 'autoSizeThis' | 'autoSizeAll' | 'rowGroup' | 'rowUnGroup' | 'resetColumns' | 'expandAll' | 'contractAll';
-type ModuleGroup = {
-    modules: AdaptableModule[];
-    icon?: AdaptableIcon;
-    title: string;
-};
-export declare const DEFAULT_ADAPTABLE_COLUMN_MENU_STRUCTURE: (AdaptableModule | ModuleGroup)[];
-/**
- * Defines the order of Menu Items in the CONTEXT Menu
- * The items commented out do not have a Context Menu Option
- */
-export declare const DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE: (AdaptableModule | ModuleGroup)[];
-export {};

package/src/AdaptableOptions/MenuOptions.js

@@ -1,96 +1 @@
-import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-export const DEFAULT_ADAPTABLE_COLUMN_MENU_STRUCTURE = [
-    ModuleConstants.CalculatedColumnModuleId,
-    ModuleConstants.CellSummaryModuleId,
-    ModuleConstants.ColumnFilterModuleId,
-    ModuleConstants.ColumnInfoModuleId,
-    ModuleConstants.CustomSortModuleId,
-    ModuleConstants.DashboardModuleId,
-    ModuleConstants.DataImportModuleId,
-    ModuleConstants.FlashingCellModuleId,
-    ModuleConstants.FormatColumnModuleId,
-    ModuleConstants.FreeTextColumnModuleId,
-    ModuleConstants.GridInfoModuleId,
-    ModuleConstants.LayoutModuleId,
-    ModuleConstants.PlusMinusModuleId,
-    ModuleConstants.SettingsPanelModuleId,
-    ModuleConstants.StyledColumnModuleId,
-    ModuleConstants.SystemStatusModuleId, // Single Item - Always present
-    /*
-    // Modules that dont provide a Column Menu
-    ModuleConstants.AlertModuleId,
-    ModuleConstants.BulkUpdateModuleId,
-    ModuleConstants.ChartingModuleId,
-    ModuleConstants.CommentModuleId,
-    ModuleConstants.DataChangeHistoryModuleId,
-    ModuleConstants.DataSetModuleId,
-    ModuleConstants.ExportModuleId,
-    ModuleConstants.Fdc3ModuleId,
-    ModuleConstants.GridFilterModuleId,
-    ModuleConstants.NamedQueryModuleId,
-    ModuleConstants.NoteModuleId,
-    ModuleConstants.QuickSearchModuleId,
-    ModuleConstants.ScheduleModuleId,
-    ModuleConstants.ShortcutModuleId,
-    ModuleConstants.SmartEditModuleId,
-    ModuleConstants.StateManagementModuleId,
-    ModuleConstants.StatusBarModuleId,
-    ModuleConstants.TeamSharingModuleId,
-    ModuleConstants.ThemeModuleId,
-    ModuleConstants.ToolPanelModuleId,
-    */
-];
-/**
- * Defines the order of Menu Items in the CONTEXT Menu
- * The items commented out do not have a Context Menu Option
- */
-export const DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE = [
-    ModuleConstants.AlertModuleId,
-    ModuleConstants.BulkUpdateModuleId,
-    ModuleConstants.CalculatedColumnModuleId,
-    ModuleConstants.CellSummaryModuleId,
-    ModuleConstants.ColumnFilterModuleId,
-    ModuleConstants.ColumnInfoModuleId,
-    ModuleConstants.CommentModuleId,
-    ModuleConstants.DashboardModuleId,
-    ModuleConstants.DataImportModuleId,
-    ModuleConstants.ExportModuleId,
-    ModuleConstants.Fdc3ModuleId,
-    ModuleConstants.FlashingCellModuleId,
-    ModuleConstants.GridInfoModuleId,
-    ModuleConstants.LayoutModuleId,
-    ModuleConstants.NoteModuleId,
-    ModuleConstants.SettingsPanelModuleId,
-    ModuleConstants.SmartEditModuleId,
-    ModuleConstants.SystemStatusModuleId, // Single Item - Always present
-    // this currently doesnt work
-    //  {
-    //    title: 'Edit',
-    //    icon: {
-    //      name: 'edit',
-    //    },
-    //    modules: [ModuleConstants.SmartEditModuleId, ModuleConstants.BulkUpdateModuleId],
-    //   },
-    /*
-    // Modules that dont provide a Context Menu
-    ModuleConstants.ChartingModuleId,
-    ModuleConstants.CustomSortModuleId,
-    ModuleConstants.DataChangeHistoryModuleId,
-    ModuleConstants.DataSetModuleId,
-    ModuleConstants.FormatColumnModuleId,
-    ModuleConstants.FreeTextColumnModuleId,
-    ModuleConstants.GridFilterModuleId,
-    ModuleConstants.NamedQueryModuleId,
-    ModuleConstants.PlusMinusModuleId,
-    ModuleConstants.QuickSearchModuleId,
-    ModuleConstants.ScheduleModuleId,
-    ModuleConstants.ShortcutModuleId,
-    ModuleConstants.StateManagementModuleId,
-    ModuleConstants.StatusBarModuleId,
-    ModuleConstants.StyledColumnModuleId,
-    ModuleConstants.TeamSharingModuleId,
-    ModuleConstants.ThemeModuleId,
-    ModuleConstants.ToolPanelModuleId,
-  
-    */
-];
+export {};

package/src/Api/GridApi.d.ts

@@ -7,7 +7,7 @@ import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { CellHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo';
 import { RowHighlightInfo } from '../PredefinedConfig/Common/RowHighlightInfo';
-import { IRowNode, RowModelType } from '@ag-grid-community/core';
+import { Column, IRowNode, RowModelType } from '@ag-grid-community/core';
 import { GridCellRange } from '../PredefinedConfig/Selection/GridCellRange';
 import { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo';
 import { TransposeConfig } from '../PredefinedConfig/Common/TransposeConfig';
@@ -529,4 +529,5 @@ export interface GridApi {
      * Opens a window with a transposed view of Grid
      */
     showTransposedView(transposeConfig?: TransposeConfig): void;
+    getAllGridColumns(): Column<any>[];
 }

package/src/Api/Implementation/ActionRowApiImpl.js

@@ -9,17 +9,13 @@ export class ActionRowApiImpl extends ApiBase {
     getActionRowButtons() {
         var actionRowButtons = this.getActionRowOptions().actionRowButtons;
         if (typeof actionRowButtons === 'function') {
-            const context = {
-                adaptableApi: this.getAdaptableApi(),
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            };
+            const context = this.getAdaptableApi().internalApi.buildBaseContext();
             actionRowButtons = actionRowButtons(context);
         }
         return actionRowButtons !== null && actionRowButtons !== void 0 ? actionRowButtons : [];
     }
     displayEditActionRow(primaryKey) {
-        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
+        const rowNode = this.getAdaptableApi().gridApi.getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
             this.logWarn(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
         }
@@ -41,7 +37,7 @@ export class ActionRowApiImpl extends ApiBase {
         }));
     }
     displayCloneActionRow(primaryKey) {
-        const rowNode = this.adaptable.api.gridApi.getRowNodeForPrimaryKey(primaryKey);
+        const rowNode = this.getAdaptableApi().gridApi.getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
             this.logWarn(`Can NOT clone row: rowNode not found for primaryKey ${primaryKey}`);
         }

package/src/Api/Implementation/AlertApiImpl.js

@@ -43,13 +43,8 @@ export class AlertApiImpl extends ApiBase {
         this.addUidToAdaptableObject(alertToShow);
         this.dispatchAction(SystemRedux.SystemAlertAdd(alertToShow, this.getAlertOptions().maxAlertsInStore));
         // 2. Publish the Alert Fired Event
-        const alertFiredInfo = {
-            adaptableApi: this.adaptable.api,
-            alert: alertToShow,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
-        const results = await this.adaptable.api.eventApi.emit('AlertFired', alertFiredInfo);
+        const alertFiredInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { alert: alertToShow });
+        const results = await this.getAdaptableApi().eventApi.emit('AlertFired', alertFiredInfo);
         const showPopup = results.reduce((endResult, aResult) => {
             return endResult && aResult !== false;
         }, true);
@@ -106,13 +101,13 @@ export class AlertApiImpl extends ApiBase {
                 }
                 if (alertNode) {
                     if (alertProperties.HighlightRow) {
-                        this.adaptable.api.gridApi.refreshRowNodes([alertNode]);
+                        this.getAdaptableApi().gridApi.refreshRowNodes([alertNode]);
                         setTimeout(() => {
                             this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
                         }, this.adaptable.adaptableOptions.alertOptions.rowHighlightDuration);
                     }
                     if (alertProperties.HighlightCell) {
-                        this.adaptable.api.gridApi.refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
+                        this.getAdaptableApi().gridApi.refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
                         setTimeout(() => {
                             this.dispatchAction(SystemRedux.SystemAlertRemoveCellHighlight(alertToShow));
                         }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
@@ -123,7 +118,7 @@ export class AlertApiImpl extends ApiBase {
             else if (alertProperties.HighlightRow &&
                 isAdaptableRowChangedAlert(alertToShow) &&
                 ((_b = alertToShow.gridDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowTrigger) === 'Add') {
-                this.adaptable.api.gridApi.refreshRowNodes(alertToShow.gridDataChangedInfo.rowNodes);
+                this.getAdaptableApi().gridApi.refreshRowNodes(alertToShow.gridDataChangedInfo.rowNodes);
                 setTimeout(() => {
                     this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
                 }, this.adaptable.adaptableOptions.alertOptions.rowHighlightDuration);

package/src/Api/Implementation/CalendarApiImpl.js

@@ -42,12 +42,7 @@ export class CalendarApiImpl extends ApiBase {
         const holidays = this.getCalendarOptions().holidays;
         if (holidays) {
             if (typeof holidays === 'function') {
-                const baseContext = {
-                    userName: this.getOptions().userName,
-                    adaptableId: this.getOptions().adaptableId,
-                    adaptableApi: this.getAdaptableApi(),
-                };
-                return holidays(baseContext);
+                return holidays(this.getAdaptableApi().internalApi.buildBaseContext());
             }
             else {
                 return holidays;

package/src/Api/Implementation/ChartingApiImpl.js

@@ -56,7 +56,7 @@ export class ChartingApiImpl extends ApiBase {
     }
     showChartDefinitionOnce(chartDefinition, container) {
         var _a;
-        const chartRef = this.adaptable.api.chartingApi.getChartRef((_a = chartDefinition === null || chartDefinition === void 0 ? void 0 : chartDefinition.Model) === null || _a === void 0 ? void 0 : _a.chartId);
+        const chartRef = this.getAdaptableApi().chartingApi.getChartRef((_a = chartDefinition === null || chartDefinition === void 0 ? void 0 : chartDefinition.Model) === null || _a === void 0 ? void 0 : _a.chartId);
         if (chartRef) {
             return;
         }
@@ -92,7 +92,7 @@ export class ChartingApiImpl extends ApiBase {
     }
     getOpenChartContainer(chartDefinition) {
         var _a, _b, _c;
-        const containerOptions = (_b = (_a = this.adaptable.api.optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers;
+        const containerOptions = (_b = (_a = this.getAdaptableApi().optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers;
         if (!containerOptions || !containerOptions.length) {
             return null;
         }
@@ -155,7 +155,7 @@ export class ChartingApiImpl extends ApiBase {
                         ],
                     } }),
             };
-            this.adaptable.api.alertApi.showAdaptableAlert(alert);
+            this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
         }
     }
     editExternalChartDefinition(chartDefinition) {

package/src/Api/Implementation/ColumnApiImpl.js

@@ -21,10 +21,10 @@ export class ColumnApiImpl extends ApiBase {
     }
     getColumns() {
         var _a;
-        return (_a = this.adaptable.api.gridApi.getGridState().Columns) !== null && _a !== void 0 ? _a : [];
+        return (_a = this.getAdaptableApi().gridApi.getGridState().Columns) !== null && _a !== void 0 ? _a : [];
     }
     getVisibleColumns() {
-        const layout = this.adaptable.api.layoutApi.getCurrentLayout();
+        const layout = this.getAdaptableApi().layoutApi.getCurrentLayout();
         const visibleCols = layout.Columns.reduce((acc, colId) => {
             acc[colId] = true;
             return acc;
@@ -68,18 +68,18 @@ export class ColumnApiImpl extends ApiBase {
         return isAutoPivotColumn(columnId);
     }
     isCalculatedColumn(columnId) {
-        return (this.adaptable.api.calculatedColumnApi
+        return (this.getAdaptableApi().calculatedColumnApi
             .getCalculatedColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isFreeTextColumn(columnId) {
-        return (this.adaptable.api.freeTextColumnApi
+        return (this.getAdaptableApi().freeTextColumnApi
             .getFreeTextColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isActionColumn(columnId) {
         var _a;
-        return (((_a = this.adaptable.api.actionColumnApi
+        return (((_a = this.getAdaptableApi().actionColumnApi
             .getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
     }
     getColumnWithColumnId(columnId, logWarning) {
@@ -159,7 +159,7 @@ export class ColumnApiImpl extends ApiBase {
         }
         let result = columnId + GeneralConstants.MISSING_COLUMN;
         if (this.isAutoRowGroupColumn(columnId)) {
-            const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+            const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
             if (currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowGroupedColumns) {
                 result = `[Grouped column: ${currentLayout.RowGroupedColumns.join(', ')}]`;
             }

package/src/Api/Implementation/ColumnFilterApiImpl.js

@@ -14,7 +14,7 @@ export class ColumnFilterApiImpl extends ApiBase {
         };
         return this.getAdaptableApi()
             .predicateApi.internalApi.getFilterPredicateDefs(scope)
-            .filter((predicate) => this.adaptable.api.scopeApi.isColumnInScope(column, predicate.columnScope));
+            .filter((predicate) => this.getAdaptableApi().scopeApi.isColumnInScope(column, predicate.columnScope));
     }
     getFilterPredicateDefsForColumnId(columnId) {
         const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
@@ -31,11 +31,11 @@ export class ColumnFilterApiImpl extends ApiBase {
     }
     isQuickFilterVisible() {
         return (this.isQuickFilterAvailable() &&
-            this.adaptable.api.internalApi.getSystemState().IsQuickFilterVisible);
+            this.getAdaptableApi().internalApi.getSystemState().IsQuickFilterVisible);
     }
     getColumnFilters() {
         var _a;
-        const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+        const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
         return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
     getActiveColumnFilters() {
@@ -55,7 +55,7 @@ export class ColumnFilterApiImpl extends ApiBase {
     }
     getColumnFiltersForLayout(layoutName) {
         var _a;
-        const layout = this.adaptable.api.layoutApi.getLayoutByName(layoutName);
+        const layout = this.getAdaptableApi().layoutApi.getLayoutByName(layoutName);
         return (_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
     setColumnFilters(columnFilters) {
@@ -64,7 +64,7 @@ export class ColumnFilterApiImpl extends ApiBase {
                 this.logWarn('Column Filter has no Predicate', columnFilter);
             }
             else {
-                const isValidPredicate = this.adaptable.api.predicateApi.isValidPredicate(columnFilter.Predicate);
+                const isValidPredicate = this.getAdaptableApi().predicateApi.isValidPredicate(columnFilter.Predicate);
                 if (!isValidPredicate) {
                     this.logWarn('Column Filter Predicate is not valid', columnFilter);
                 }
@@ -118,10 +118,10 @@ export class ColumnFilterApiImpl extends ApiBase {
         if (!filter || !filter.Predicate || !filter.Predicate.PredicateId) {
             return false;
         }
-        const predicateDef = this.adaptable.api.predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
+        const predicateDef = this.getAdaptableApi().predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
         if (ArrayExtensions.IsNull(predicateDef.inputs) &&
             // values predicates have no inputs in the definition
-            !this.adaptable.api.predicateApi.internalApi.hasPredicateValues(filter.Predicate)) {
+            !this.getAdaptableApi().predicateApi.internalApi.hasPredicateValues(filter.Predicate)) {
             return true;
         }
         const inputs = filter.Predicate.Inputs;

package/src/Api/Implementation/CommentsApiImpl.js

@@ -24,7 +24,7 @@ export class CommentsApiImpl extends ApiBase {
     addComment(commentText, address) {
         this.dispatchAction(CommentRedux.CommentsAdd({
             comment: commentText
-                ? ObjectFactory.CreateAdaptableComment(commentText, this.adaptable.api)
+                ? ObjectFactory.CreateAdaptableComment(commentText, this.getAdaptableApi())
                 : null,
             cellAddress: address,
         }));

package/src/Api/Implementation/ConfigApiImpl.js

@@ -62,15 +62,9 @@ export class ConfigApiImpl extends ApiBase {
                     flushCurrentState: false,
                 }).then(() => {
                     const newState = this.getPersistedState();
-                    const stateReloadedInfo = {
-                        oldState,
-                        newState,
-                        adaptableStateKey: adaptableOptions.adaptableStateKey,
-                        adaptableId: adaptableOptions.adaptableId,
-                        adaptableApi: this.adaptable.api,
-                        userName: this.adaptable.api.optionsApi.getUserName(),
-                    };
-                    this.adaptable.api.eventApi.emit('AdaptableStateReloaded', stateReloadedInfo);
+                    const stateReloadedInfo = Object.assign({ oldState,
+                        newState, adaptableStateKey: adaptableOptions.adaptableStateKey }, this.getAdaptableApi().internalApi.buildBaseContext());
+                    this.getAdaptableApi().eventApi.emit('AdaptableStateReloaded', stateReloadedInfo);
                 });
             });
         });
@@ -93,21 +87,21 @@ export class ConfigApiImpl extends ApiBase {
         });
     }
     getAdaptableSearchState() {
-        const gridFilter = this.adaptable.api.gridFilterApi.getCurrentGridFilterExpression();
+        const gridFilter = this.getAdaptableApi().gridFilterApi.getCurrentGridFilterExpression();
         const adaptableSearchState = {
-            dataSet: this.adaptable.api.dataSetApi.getCurrentDataSet(),
+            dataSet: this.getAdaptableApi().dataSetApi.getCurrentDataSet(),
             gridFilter: gridFilter,
             gridFilterAST: gridFilter
-                ? this.adaptable.api.expressionApi.getASTForExpression(gridFilter)
+                ? this.getAdaptableApi().expressionApi.getASTForExpression(gridFilter)
                 : null,
-            columnFilters: this.adaptable.api.columnFilterApi.getColumnFilters(),
+            columnFilters: this.getAdaptableApi().columnFilterApi.getColumnFilters(),
         };
         return adaptableSearchState;
     }
     getAdaptableSortState() {
         const adaptableSortState = {
-            columnSorts: this.adaptable.api.gridApi.getColumnSorts(),
-            customSorts: this.adaptable.api.customSortApi.getCustomSorts(),
+            columnSorts: this.getAdaptableApi().gridApi.getColumnSorts(),
+            customSorts: this.getAdaptableApi().customSortApi.getCustomSorts(),
         };
         return adaptableSortState;
     }
@@ -116,7 +110,7 @@ export class ConfigApiImpl extends ApiBase {
     }
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
-            this.adaptable.api.internalApi.executeWithProgressIndicator(`Initialising...`, () => {
+            this.getAdaptableApi().internalApi.executeWithProgressIndicator(`Initialising...`, () => {
                 const flushCurrentState = !config || config.flushCurrentState !== false;
                 // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
                 // the state to be persisted with a delay, which we dont want in this case
@@ -141,7 +135,7 @@ export class ConfigApiImpl extends ApiBase {
                         .then(() => {
                         this.adaptable.updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
                         this.adaptable.setLayout();
-                        this.adaptable.api.userInterfaceApi.hideLoadingScreen();
+                        this.getAdaptableApi().userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {
                         // resolve main(result) promise

package/src/Api/Implementation/DashboardApiImpl.js

@@ -20,12 +20,7 @@ export class DashboardApiImpl extends ApiBase {
     }
     getCustomDashboardButtonByLabel(buttonLabel) {
         const api = this.getAdaptableApi();
-        const dashboardContext = {
-            adaptableApi: api,
-            userName: this.getOptions().userName,
-            adaptableId: this.getOptions().adaptableId,
-            dashboardState: api.dashboardApi.getDashboardState(),
-        };
+        const dashboardContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { dashboardState: api.dashboardApi.getDashboardState() });
         return this.getDashboardOptions().customDashboardButtons.find((cb) => {
             api.internalApi.getLabelForButton(cb, dashboardContext) == buttonLabel;
         });

package/src/Api/Implementation/ExportApiImpl.js

@@ -44,13 +44,13 @@ export class ExportApiImpl extends ApiBase {
         return currentDestination && this.getDestinationByName(currentDestination);
     }
     getAvailableSystemReports() {
-        return this.getExportOptions().systemReportNames.filter((s) => this.adaptable.api.internalApi.getReportService().IsSystemReportActive(s));
+        return this.getExportOptions().systemReportNames.filter((s) => this.getAdaptableApi().internalApi.getReportService().IsSystemReportActive(s));
     }
     getAvailableExportDestinations() {
         let systemDestinations = [];
         this.getExportOptions().systemExportDestinations.forEach((exportDestination) => {
-            if (this.adaptable.api.internalApi
-                .getReportService()
+            if (this.getAdaptableApi()
+                .internalApi.getReportService()
                 .IsSystemExportDestinationActive(exportDestination)) {
                 systemDestinations.push(exportDestination);
             }
@@ -143,17 +143,12 @@ export class ExportApiImpl extends ApiBase {
             this.logWarn(`Report '${reportName}' not found!`);
             return undefined;
         }
-        return this.adaptable.api.internalApi.getReportService().getReportData(report);
+        return this.getAdaptableApi().internalApi.getReportService().getReportData(report);
     }
     isColumnExportable(adaptableColumn) {
         const isExportableFn = this.getExportOptions().isColumnExportable;
         if (typeof isExportableFn === 'function') {
-            return isExportableFn({
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-                adaptableColumn,
-            });
+            return isExportableFn(Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { adaptableColumn }));
         }
         return true;
     }

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -7,7 +7,7 @@ export class ExpressionApiImpl extends ApiBase {
         this.internalApi = new ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
+        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
             .getQueryLanguageService()
             .validateBoolean(query, module, { force: true });
         if (!isValid && validationErrorMessage) {
@@ -16,7 +16,7 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidObservableExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
+        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
             .getQueryLanguageService()
             .validateObservable(expression, module);
         if (!isValid && validationErrorMessage) {
@@ -25,7 +25,7 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedBooleanExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
+        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
             .getQueryLanguageService()
             .validateAggregatedBoolean(expression, module);
         if (!isValid && validationErrorMessage) {
@@ -34,7 +34,7 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedScalarExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
+        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
             .getQueryLanguageService()
             .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
@@ -47,11 +47,11 @@ export class ExpressionApiImpl extends ApiBase {
     }
     getColumnsFromExpression(expression) {
         try {
-            const columnIds = this.adaptable.api.internalApi
+            const columnIds = this.getAdaptableApi().internalApi
                 .getQueryLanguageService()
                 .getColumnsFromExpression(expression);
             columnIds.forEach((columnId) => {
-                const calculatedColumn = this.adaptable.api.calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
+                const calculatedColumn = this.getAdaptableApi().calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
                 if (calculatedColumn) {
                     const transitiveColumnIds = this.getColumnsFromExpression(this.getAdaptableQueryExpression(calculatedColumn.Query));
                     columnIds.push(...transitiveColumnIds);
@@ -69,12 +69,7 @@ export class ExpressionApiImpl extends ApiBase {
     isColumnQueryable(adaptableColumnBase) {
         let queryableColumnFn = this.getExpressionOptions().isColumnQueryable;
         if (queryableColumnFn) {
-            const queryableColumnContext = {
-                adaptableColumn: adaptableColumnBase,
-                adaptableApi: this.getAdaptableApi(),
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            };
+            const queryableColumnContext = Object.assign({ adaptableColumn: adaptableColumnBase }, this.getAdaptableApi().internalApi.buildBaseContext());
             return queryableColumnFn(queryableColumnContext);
         }
         return true;
@@ -84,7 +79,7 @@ export class ExpressionApiImpl extends ApiBase {
         return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
     }
     getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
-        return this.adaptable.api.internalApi
+        return this.getAdaptableApi().internalApi
             .getQueryLanguageService()
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }

package/src/Api/Implementation/Fdc3ApiImpl.js

@@ -76,6 +76,6 @@ export class Fdc3ApiImpl extends ApiBase {
         return this.internalApi.isStandardIntentType(intentType);
     }
     getFdc3Service() {
-        return this.adaptable.api.internalApi.getFdc3Service();
+        return this.getAdaptableApi().internalApi.getFdc3Service();
     }
 }