@adaptabletools/adaptable 18.0.0-canary.3 → 18.0.0-canary.31

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -2,7 +2,6 @@ import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
-import { cellSummaryWeightedAverage } from '../../agGrid/weightedAverage';
 export class CellSummaryApiImpl extends ApiBase {
     openCellSummaryPopupSettingsPanel() {
         this.showModulePopup(ModuleConstants.CellSummaryModuleId);
@@ -13,12 +12,6 @@ export class CellSummaryApiImpl extends ApiBase {
     getCellSummaryOperationDefinitions() {
         var _a;
         let cellSummaryOperations = (_a = this.getCellSummaryOptions().cellSummaryOperations) !== null && _a !== void 0 ? _a : [];
-        if (this.isWeightedAverageCellSummaryAvailable()) {
-            cellSummaryOperations = [
-                ...cellSummaryOperations,
-                this.getWeightedAverageCellSummaryOperation(),
-            ];
-        }
         return cellSummaryOperations;
     }
     setCurrentCellSummaryOperation(operation) {
@@ -50,6 +43,8 @@ export class CellSummaryApiImpl extends ApiBase {
                 return cellSummary.Std_Deviation;
             case SummaryOperation.Only:
                 return cellSummary.Only;
+            case SummaryOperation.Weighted_Average:
+                return cellSummary.Weighted_Average;
             default:
                 return cellSummary[operation];
         }
@@ -61,20 +56,4 @@ export class CellSummaryApiImpl extends ApiBase {
             : cellSummaryOperation.operationName;
         return this.getCellSummaryOperationValue(summaryOperation);
     }
-    /**
-     * Weighted average is availabe only if the current layout has at leat a Weighted Average aggregation defined.
-     */
-    isWeightedAverageCellSummaryAvailable() {
-        const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
-        if (currentLayout.AggregationColumns == undefined) {
-            return false;
-        }
-        return Object.values(currentLayout.AggregationColumns).some((aggCol) => typeof aggCol === 'object' && aggCol.type === 'weightedAverage');
-    }
-    getWeightedAverageCellSummaryOperation() {
-        return {
-            operationName: 'Weighted Avg',
-            operationFunction: cellSummaryWeightedAverage,
-        };
-    }
 }

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.d.ts

@@ -3,6 +3,8 @@ import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig
 import { ColumnApi } from '../ColumnApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
+export declare function isAutoRowGroupColumn(columnId: string): boolean;
+export declare function isAutoPivotColumn(columnId: string): boolean;
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     internalApi: ColumnInternalApi;
     constructor(adaptable: IAdaptable);
@@ -63,4 +65,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDefaultAggFunc(columnId: string): string;
     isSpecialColumn(columnId: string): boolean;
     openColumnInfoSettingsPanel(): void;
+    getColumnTypes(): string[];
+    getColumnsByColumnType(columnType: string): AdaptableColumn[];
+    getRowGroupedColumns(): AdaptableColumn[];
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -3,6 +3,17 @@ import * as GeneralConstants from '../../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
+import { createBaseContext } from '../../Utilities/ObjectFactory';
+export function isAutoRowGroupColumn(columnId) {
+    // put this here as there might be other indicators we are not aware of
+    // perhaps with non auto groups ?
+    //https://www.ag-grid.com/javascript-grid-grouping/
+    return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_GROUPED_COLUMN);
+}
+export function isAutoPivotColumn(columnId) {
+    // put this here as there might be other indicators we are not aware of?
+    return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_PIVOT_COLUMN);
+}
 export class ColumnApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -10,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;
@@ -51,29 +62,25 @@ export class ColumnApiImpl extends ApiBase {
         this.adaptable.showColumn(columnId);
     }
     isAutoRowGroupColumn(columnId) {
-        // put this here as there might be other indicators we are not aware of
-        // perhaps with non auto groups ?
-        //https://www.ag-grid.com/javascript-grid-grouping/
-        return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_GROUPED_COLUMN);
+        return isAutoRowGroupColumn(columnId);
     }
     isAutoPivotColumn(columnId) {
-        // put this here as there might be other indicators we are not aware of?
-        return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_PIVOT_COLUMN);
+        return isAutoPivotColumn(columnId);
     }
     isCalculatedColumn(columnId) {
-        return (this.adaptable.api.calculatedColumnApi
-            .getCalculatedColumns()
+        return (this.getAdaptableApi()
+            .calculatedColumnApi.getCalculatedColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isFreeTextColumn(columnId) {
-        return (this.adaptable.api.freeTextColumnApi
-            .getFreeTextColumns()
+        return (this.getAdaptableApi()
+            .freeTextColumnApi.getFreeTextColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isActionColumn(columnId) {
         var _a;
-        return (((_a = this.adaptable.api.actionColumnApi
-            .getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
+        return (((_a = this.getAdaptableApi()
+            .actionColumnApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
     }
     getColumnWithColumnId(columnId, logWarning) {
         if (columnId == undefined) {
@@ -152,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(', ')}]`;
             }
@@ -333,4 +340,27 @@ export class ColumnApiImpl extends ApiBase {
     openColumnInfoSettingsPanel() {
         this.showModulePopup(ModuleConstants.ColumnInfoModuleId);
     }
+    getColumnTypes() {
+        const columnTypes = this.getOptions().columnOptions.columnTypes;
+        if (typeof columnTypes === 'function') {
+            return columnTypes(createBaseContext(this.getAdaptableApi()));
+        }
+        else {
+            return columnTypes;
+        }
+    }
+    getColumnsByColumnType(columnType) {
+        const abColumns = this.getColumns();
+        return abColumns.filter((c) => {
+            var _a;
+            return ((_a = c.columnTypes) !== null && _a !== void 0 ? _a : []).includes(columnType);
+        });
+    }
+    getRowGroupedColumns() {
+        var _a;
+        return (_a = this.getLayoutApi()
+            .getCurrentRowGroupsColumnIds()) === null || _a === void 0 ? void 0 : _a.map((n) => {
+            return this.getColumnWithColumnId(n);
+        });
+    }
 }

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.d.ts

@@ -1,15 +1,18 @@
 import { ApiBase } from './ApiBase';
-import { CellAddress } from '../../PredefinedConfig/CellAddress';
-import { CommentThread, AdaptableComment } from '../../types';
+import { CommentThread, AdaptableComment, CellAddress } from '../../types';
 import { CommentApi } from '../CommentApi';
+import { CommentsInternalApi } from '../Internal/CommentsInternalApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class CommentsApiImpl extends ApiBase implements CommentApi {
-    getComments(address: CellAddress): AdaptableComment[];
+    internalApi: CommentsInternalApi;
+    constructor(adaptable: IAdaptable);
     getCommentThread(address: CellAddress): CommentThread | undefined;
-    getCommentThreads(): CommentThread[];
+    getGridComments(): CommentThread[];
     editComment(comment: AdaptableComment, address: CellAddress): void;
     deleteComment(comment: AdaptableComment, address: CellAddress): void;
     addComment(commentText: AdaptableComment['Value'], address: CellAddress): void;
     addCommentThread(commentThread: CommentThread): void;
     deleteCommentThread(cellAddress: CellAddress): void;
-    loadCommentThreads(cellComments: CommentThread[]): void;
+    setGridComments(cellComments: CommentThread[]): void;
+    clearGridComments(): void;
 }

package/src/Api/Implementation/CommentsApiImpl.js

@@ -2,15 +2,18 @@ import * as CommentRedux from '../../Redux/ActionsReducers/CommentsRedux';
 import { ApiBase } from './ApiBase';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
+import { CommentsInternalApi } from '../Internal/CommentsInternalApi';
 export class CommentsApiImpl extends ApiBase {
-    getComments(address) {
-        return CommentRedux.GetCommentsSelector(this.getAdaptableState().Comment, address);
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new CommentsInternalApi(adaptable);
     }
     getCommentThread(address) {
         return CommentRedux.GetCellCommentSelector(this.getAdaptableState().Comment, address);
     }
-    getCommentThreads() {
-        return this.getAdaptableState().Comment.CommentThreads;
+    getGridComments() {
+        var _a;
+        return (_a = this.getAdaptableState().Comment.CommentThreads) !== null && _a !== void 0 ? _a : [];
     }
     editComment(comment, address) {
         this.dispatchAction(CommentRedux.CommentsEdit({ comment, cellAddress: address }));
@@ -21,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,
         }));
@@ -35,7 +38,10 @@ export class CommentsApiImpl extends ApiBase {
     deleteCommentThread(cellAddress) {
         this.dispatchAction(CommentRedux.CommentsCellDelete({ cellAddress }));
     }
-    loadCommentThreads(cellComments) {
+    setGridComments(cellComments) {
         this.dispatchAction(CommentRedux.CommentsSet({ commentThread: cellComments }));
     }
+    clearGridComments() {
+        this.setGridComments([]);
+    }
 }

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

@@ -20,7 +20,7 @@ import { AdaptableModule, AdaptableStateKey } from '../../PredefinedConfig/Commo
 import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, NamedQueryState, ScheduleState } from '../../types';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
 import { ChartingState } from '../../PredefinedConfig/ChartingState';
-import { NotesState } from '../../PredefinedConfig/NotesState';
+import { NoteState } from '../../PredefinedConfig/NoteState';
 export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     configInit(): void;
     copyAllStateToClipboard(): void;
@@ -48,7 +48,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getApplicationState(returnJson?: boolean): ApplicationState;
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
     getChartingState(returnJson?: boolean): ChartingState;
-    getNotesState(returnJson?: boolean): NotesState;
+    getNoteState(returnJson?: boolean): NoteState;
     getCustomSortState(returnJson?: boolean): CustomSortState;
     getDashboardState(returnJson?: boolean): DashboardState;
     getExportState(returnJson?: boolean): ExportState;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -8,7 +8,7 @@ import * as AlertRedux from '../../Redux/ActionsReducers/AlertRedux';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
 import * as CalculatedColumnRedux from '../../Redux/ActionsReducers/CalculatedColumnRedux';
 import * as ChartingRedux from '../../Redux/ActionsReducers/ChartingRedux';
-import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
+import * as NoteRedux from '../../Redux/ActionsReducers/NoteRedux';
 import * as CustomSortRedux from '../../Redux/ActionsReducers/CustomSortRedux';
 import * as ExportRedux from '../../Redux/ActionsReducers/ExportRedux';
 import * as FormatColumnRedux from '../../Redux/ActionsReducers/FormatColumnRedux';
@@ -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,8 +110,7 @@ export class ConfigApiImpl extends ApiBase {
     }
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
-            this.adaptable.api.internalApi.executeWithProgressIndicator(`Initialising...`, () => {
-                this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
+            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
@@ -125,22 +118,33 @@ export class ConfigApiImpl extends ApiBase {
                     ? this.adaptable.adaptableStore.saveStateNow(this.adaptable)
                     : Promise.resolve(true);
                 flushStatePromise.then(() => {
+                    this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
                     let predefinedConfig = config === null || config === void 0 ? void 0 : config.predefinedConfig;
                     if (predefinedConfig) {
                         predefinedConfig = initPredefinedConfigWithUuids(predefinedConfig);
                     }
-                    const promise = this.adaptable.adaptableStore.loadStore(this.adaptable, adaptableStateKey, predefinedConfig);
+                    const promise = this.adaptable.adaptableStore.loadStore({
+                        adaptable: this.adaptable,
+                        adaptableStateKey,
+                        predefinedConfig,
+                        postLoadHook: (state) => {
+                            return this.adaptable.normalizeAdaptableState(state, this.adaptable.agGridAdapter.getLiveGridOptions());
+                        },
+                    });
                     promise
                         .then(() => {
-                        this.adaptable.prepareGrid();
-                        this.adaptable.api.userInterfaceApi.hideLoadingScreen();
+                        this.adaptable.updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
+                        this.adaptable.setLayout();
                     })
                         .then(() => {
                         // resolve main(result) promise
                         resolve();
-                    }, () => {
+                    }, (error) => {
                         // reject main(result) promise
-                        reject();
+                        reject(error);
+                    })
+                        .catch((e) => {
+                        this.logError('Error setting Adaptable State Key', e);
                     });
                 });
             });
@@ -170,10 +174,10 @@ export class ConfigApiImpl extends ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Charting)
                     : this.getAdaptableState().Charting;
-            case 'Notes':
+            case 'Note':
                 return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Notes)
-                    : this.getAdaptableState().Notes;
+                    ? JSON.stringify(this.getAdaptableState().Note)
+                    : this.getAdaptableState().Note;
             case 'CustomSort':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CustomSort)
@@ -250,8 +254,8 @@ export class ConfigApiImpl extends ApiBase {
     getChartingState(returnJson = false) {
         return this.getUserStateByStateKey('Charting', returnJson);
     }
-    getNotesState(returnJson = false) {
-        return this.getUserStateByStateKey('Notes', returnJson);
+    getNoteState(returnJson = false) {
+        return this.getUserStateByStateKey('Note', returnJson);
     }
     getCustomSortState(returnJson = false) {
         return this.getUserStateByStateKey('CustomSort', returnJson);
@@ -306,8 +310,8 @@ export class ConfigApiImpl extends ApiBase {
             case 'Charting':
                 this.dispatchAction(ChartingRedux.ChartingReady(this.getChartingState()));
                 break;
-            case 'Notes':
-                this.dispatchAction(NotesRedux.NotesReady(this.getNotesState()));
+            case 'Note':
+                this.dispatchAction(NoteRedux.NoteReady(this.getNoteState()));
                 break;
             case 'CustomSort':
                 this.dispatchAction(CustomSortRedux.CustomSortReady(this.getCustomSortState()));

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,8 +7,8 @@ export class ExpressionApiImpl extends ApiBase {
         this.internalApi = new ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateBoolean(query, module, { force: true });
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -16,8 +16,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidObservableExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateObservable(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -25,8 +25,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedBooleanExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedBoolean(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -34,8 +34,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedScalarExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -47,11 +47,11 @@ export class ExpressionApiImpl extends ApiBase {
     }
     getColumnsFromExpression(expression) {
         try {
-            const columnIds = this.adaptable.api.internalApi
-                .getQueryLanguageService()
+            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,8 +79,8 @@ 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
-            .getQueryLanguageService()
+        return this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
     useCaseSensitivity() {

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

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

@@ -3,7 +3,7 @@ import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFl
 import { FlashingCellApi } from '../FlashingCellApi';
 import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
 import { FlashingCellInternalApi } from '../Internal/FlashingCellInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableObjectLookupCriteria } from '../../types';
@@ -23,7 +23,7 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     unSuspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     addFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
-    getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     clearAllFlashingCells(): void;
     isAnyFlashingCellActive(): boolean;
     findFlashingCellDefinitions(criteria: AdaptableObjectLookupCriteria): FlashingCellDefinition[];