@adaptabletools/adaptable-cjs 18.1.13 → 18.1.15-canary.0

package/src/Utilities/Helpers/Helper.d.ts

@@ -12,11 +12,6 @@ export declare function isInputNullOrEmpty(itemToCheck: any): boolean;
 export declare function isInputNotNullOrEmpty(itemToCheck: any): boolean;
 export declare function roundNumber(numberToRound: any, decimalPlaces: number): number;
 export declare function roundNumberTo4dp(numberToRound: any): number;
-export declare function sumNumberArray(numericValues: number[]): number;
-export declare function standardDeviationNumberArray(numericValues: number[]): number;
-export declare function meanNumberArray(numericValues: number[]): number;
-export declare function medianNumberArray(numericValues: number[]): number;
-export declare function modeNumberArray(numbers: number[]): number;
 export declare function clamp(value: any, boundOne: number, boundTwo: number): number;
 export declare function extractColsFromText(text: string): string[];
 export declare function replaceAll(text: string, toReplace: string, replaceWith: string): string;
@@ -35,11 +30,6 @@ export declare const Helper: {
     isInputNotNullOrEmpty: typeof isInputNotNullOrEmpty;
     roundNumber: typeof roundNumber;
     roundNumberTo4dp: typeof roundNumberTo4dp;
-    standardDeviationNumberArray: typeof standardDeviationNumberArray;
-    sumNumberArray: typeof sumNumberArray;
-    meanNumberArray: typeof meanNumberArray;
-    medianNumberArray: typeof medianNumberArray;
-    modeNumberArray: typeof modeNumberArray;
     clamp: typeof clamp;
     extractColsFromText: typeof extractColsFromText;
     replaceAll: typeof replaceAll;

package/src/Utilities/Helpers/Helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Helper = exports.extractContextKeysFromText = exports.replaceAll = exports.extractColsFromText = exports.clamp = exports.modeNumberArray = exports.medianNumberArray = exports.meanNumberArray = exports.standardDeviationNumberArray = exports.sumNumberArray = exports.roundNumberTo4dp = exports.roundNumber = exports.isInputNotNullOrEmpty = exports.isInputNullOrEmpty = exports.returnItemCount = exports.copyToClipboard = exports.createDownloadedFile = exports.convertArrayToCsv = exports.arrayToKeyMap = exports.cloneObject = exports.getStringRepresentionFromKey = exports.objectHasKeys = exports.objectNotExists = exports.objectExists = void 0;
+exports.Helper = exports.extractContextKeysFromText = exports.replaceAll = exports.extractColsFromText = exports.clamp = exports.roundNumberTo4dp = exports.roundNumber = exports.isInputNotNullOrEmpty = exports.isInputNullOrEmpty = exports.returnItemCount = exports.copyToClipboard = exports.createDownloadedFile = exports.convertArrayToCsv = exports.arrayToKeyMap = exports.cloneObject = exports.getStringRepresentionFromKey = exports.objectHasKeys = exports.objectNotExists = exports.objectExists = void 0;
 const StringExtensions_1 = require("../Extensions/StringExtensions");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 function objectExists(item) {
@@ -166,76 +166,6 @@ function roundNumberTo4dp(numberToRound) {
     return roundNumber(numberToRound, 4);
 }
 exports.roundNumberTo4dp = roundNumberTo4dp;
-function sumNumberArray(numericValues) {
-    return numericValues.length
-        ? numericValues.reduce(function (a, b) {
-            return a + b;
-        })
-        : 0;
-}
-exports.sumNumberArray = sumNumberArray;
-function standardDeviationNumberArray(numericValues) {
-    if (numericValues.length) {
-        const count = numericValues.length;
-        const mean = sumNumberArray(numericValues) / count;
-        return Math.sqrt(sumNumberArray(numericValues.map((val) => {
-            return Math.pow(val - mean, 2);
-        })) / count);
-    }
-    else {
-        return 0;
-    }
-}
-exports.standardDeviationNumberArray = standardDeviationNumberArray;
-function meanNumberArray(numericValues) {
-    // dividing by 0 will return Infinity
-    // arr must contain at least 1 element to use reduce
-    if (numericValues.length) {
-        let sum = sumNumberArray(numericValues);
-        return sum / numericValues.length;
-    }
-    else {
-        return 0;
-    }
-}
-exports.meanNumberArray = meanNumberArray;
-function medianNumberArray(numericValues) {
-    numericValues.sort(function (a, b) {
-        return a - b;
-    });
-    const middle = Math.floor((numericValues.length - 1) / 2); // NB: operator precedence
-    if (numericValues.length % 2) {
-        return numericValues[middle];
-    }
-    else {
-        return (numericValues[middle] + numericValues[middle + 1]) / 2.0;
-    }
-}
-exports.medianNumberArray = medianNumberArray;
-function modeNumberArray(numbers) {
-    if (numbers.length === 0) {
-        return 0;
-    }
-    const m = numbers
-        .reduce((items, current) => {
-        const item = items.length === 0 ? null : items.find((x) => x.value === current);
-        item ? item.occurrence++ : items.push({ value: current, occurrence: 1 });
-        return items;
-    }, [])
-        .sort((a, b) => {
-        if (a.occurrence < b.occurrence) {
-            return 1;
-        }
-        else if (a.occurrence > b.occurrence || a.value < b.value) {
-            return -1;
-        }
-        else {
-            return a.value === b.value ? 0 : 1;
-        }
-    });
-    return m[0].value;
-}
-exports.modeNumberArray = modeNumberArray;
 // putting this here to remove lodash clamp which seems to cause an issue
 function clamp(value, boundOne, boundTwo) {
     if (!boundTwo) {
@@ -295,11 +225,6 @@ exports.Helper = {
     isInputNotNullOrEmpty,
     roundNumber,
     roundNumberTo4dp,
-    standardDeviationNumberArray,
-    sumNumberArray,
-    meanNumberArray,
-    medianNumberArray,
-    modeNumberArray,
     clamp,
     extractColsFromText,
     replaceAll,

package/src/Utilities/Services/ChartingService.d.ts

@@ -1,10 +1,10 @@
-import { ChartModel } from '@ag-grid-community/core';
+import { AgEventType, ChartModel } from '@ag-grid-community/core';
 import { AdaptableApi } from '../../types';
 import { IChartingService } from './Interface/IChartingService';
 export declare class ChartingService implements IChartingService {
     private api;
     constructor(api: AdaptableApi);
-    onChartModelChange(models: ChartModel[], eventType: string, params: any): void;
+    onChartModelChange(models: ChartModel[], eventType: AgEventType, params: any): void;
     /**
      * Emit events only for adaptable charting definition changes
      * - an adaptable chart opens

package/src/Utilities/Services/ChartingService.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingService = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("ag-grid-community");
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
 class ChartingService {
@@ -14,7 +13,7 @@ class ChartingService {
         const currentChartModel = models.find((model) => model.chartId === params.chartId);
         const currentChartDefinition = allChartDefinitions.find((chartDefinition) => chartDefinition.Model.chartId === params.chartId);
         switch (eventType) {
-            case core_1.Events.EVENT_CHART_CREATED:
+            case 'chartCreated':
                 const createParams = params;
                 if (allChartDefinitions.some((chartDefinition) => chartDefinition.Model.chartId === createParams.chartId)) {
                     // chart already exists
@@ -24,8 +23,8 @@ class ChartingService {
                     this.saveNewChart(chartModel);
                 }
                 break;
-            case core_1.Events.EVENT_CHART_OPTIONS_CHANGED:
-            case core_1.Events.EVENT_CHART_RANGE_SELECTION_CHANGED:
+            case 'chartOptionsChanged':
+            case 'chartRangeSelectionChanged':
                 if (!currentChartDefinition) {
                     // editing a non-saved chart
                     break;
@@ -46,18 +45,13 @@ class ChartingService {
      */
     emitAdaptableChartDefinitonChange() {
         const chartingOpenState = this.api.chartingApi.getChartingOpenState();
-        const chartChangedInfo = {
-            chartingOpenState: chartingOpenState,
-            adaptableApi: this.api,
-            userName: this.api.optionsApi.getUserName(),
-            adaptableId: this.api.optionsApi.getAdaptableId(),
-        };
+        const chartChangedInfo = Object.assign({ chartingOpenState: chartingOpenState }, this.api.internalApi.buildBaseContext());
         this.api.eventApi.emit('ChartChanged', chartChangedInfo);
     }
     saveNewChart(chartModel) {
         var _a, _b;
         const chartingOptions = (_a = this.api.optionsApi.getChartingOptions()) !== null && _a !== void 0 ? _a : {};
-        const saveStragegy = (_b = chartingOptions.saveStrategy) !== null && _b !== void 0 ? _b : 'manual';
+        const saveStragegy = (_b = chartingOptions.saveChartBehaviour) !== null && _b !== void 0 ? _b : 'manual';
         if (saveStragegy === 'none') {
             return;
         }

package/src/Utilities/Services/ModuleService.js

@@ -11,25 +11,25 @@ class ModuleService {
         this.adaptableApi = adaptableApi;
     }
     createModuleMenus() {
-        const settingsPanelMenuItems = [];
-        const buttonMenuItems = [];
+        const settingsPanelItems = [];
+        const adaptableMenuItems = [];
         this.getModuleCollection().forEach((module) => {
             const settingsPanelMenuItem = module.createModuleMenuItem('ModuleMenu');
             if (Helper_1.default.objectExists(settingsPanelMenuItem)) {
-                if (settingsPanelMenuItems.findIndex((m) => m.module == settingsPanelMenuItem.module) == -1) {
-                    settingsPanelMenuItems.push(settingsPanelMenuItem);
+                if (settingsPanelItems.findIndex((m) => m.module == settingsPanelMenuItem.module) == -1) {
+                    settingsPanelItems.push(settingsPanelMenuItem);
                 }
             }
-            const buttonMenuItem = module.createModuleMenuItem('ModuleButton');
-            if (Helper_1.default.objectExists(buttonMenuItem)) {
-                if (buttonMenuItems.findIndex((m) => m.module == buttonMenuItem.module) == -1) {
-                    buttonMenuItems.push(buttonMenuItem);
+            const adaptableMenuItem = module.createModuleMenuItem('ModuleButton');
+            if (Helper_1.default.objectExists(adaptableMenuItem)) {
+                if (adaptableMenuItems.findIndex((m) => m.module == adaptableMenuItem.module) == -1) {
+                    adaptableMenuItems.push(adaptableMenuItem);
                 }
             }
         });
         // store the main menu as we will re-use (and it never changes)
-        this.adaptableApi.internalApi.setSettingPanelModuleMenuItems(settingsPanelMenuItems);
-        this.adaptableApi.internalApi.setModuleButtonMenuItems(buttonMenuItems);
+        this.adaptableApi.internalApi.setSettingsPanelItems(settingsPanelItems);
+        this.adaptableApi.internalApi.setMenuModuleItems(adaptableMenuItems);
     }
     isModuleAvailable(adaptableModule) {
         let module = this.getModuleCollection().get(adaptableModule);
@@ -91,52 +91,62 @@ class ModuleService {
                 return learnUrl + 'handbook-calculated-column';
             case 'CellSummary':
                 return learnUrl + 'handbook-summarising';
+            case 'Charting':
+                return learnUrl + 'handbook-charts';
+            case 'ColumnFilter':
+                return learnUrl + 'handbook-column-filter';
+            case 'ColumnInfo':
+                return learnUrl + 'dev-guide-tutorial-grid-column-info';
+            case 'Comment':
+                return learnUrl + 'handbook-comments';
             case 'CustomSort':
-                return learnUrl + 'handbook-sorting';
+                return learnUrl + 'handbook-sorting-custom';
             case 'Dashboard':
                 return learnUrl + 'ui-dashboard';
-            case 'DataSet':
-                return learnUrl + 'handbook-data-sets';
-            case 'DataImport':
-                return learnUrl + 'handbook-importing';
             case 'DataChangeHistory':
                 return learnUrl + 'handbook-monitoring-data-change-history';
+            case 'DataImport':
+                return learnUrl + 'handbook-importing';
+            case 'DataSet':
+                return learnUrl + 'handbook-data-sets';
             case 'Export':
                 return learnUrl + 'handbook-exporting';
-            case 'ColumnFilter':
-                return learnUrl + 'handbook-column-filter';
-            case 'Comment':
-                return learnUrl + 'handbook-comments';
-            case 'GridFilter':
-                return learnUrl + 'handbook-grid-filter';
+            case 'Fdc3':
+                return learnUrl + 'handbook-fdc3';
             case 'FlashingCell':
                 return learnUrl + 'handbook-flashing-cell';
             case 'FormatColumn':
                 return learnUrl + 'handbook-column-formatting';
             case 'FreeTextColumn':
                 return learnUrl + 'handbook-freetext-column';
+            case 'GridFilter':
+                return learnUrl + 'handbook-grid-filter';
             case 'GridInfo':
-                return learnUrl + 'handbook-monitoring-grid-info';
+                return learnUrl + 'dev-guide-tutorial-grid-column-info';
             case 'Layout':
                 return learnUrl + 'handbook-layouts';
+            case 'NamedQuery':
+                return learnUrl + 'handbook-named-queries';
             case 'Note':
                 return learnUrl + 'handbook-notes';
             case 'PlusMinus':
                 return learnUrl + 'handbook-editing-plus-minus';
-            case 'NamedQuery':
-                return learnUrl + 'handbook-named-queries';
             case 'QuickSearch':
                 return learnUrl + 'handbook-quick-search';
             case 'Schedule':
                 return learnUrl + 'handbook-scheduling';
+            case 'SettingsPanel':
+                return learnUrl + 'ui-settings-panel';
             case 'Shortcut':
                 return learnUrl + 'handbook-editing-shortcut';
             case 'SmartEdit':
                 return learnUrl + 'handbook-editing-smart-edit';
             case 'StateManagement':
-                return learnUrl + 'dev-guide-adaptable-state';
+                return learnUrl + 'dev-guide-adaptable-state-management';
             case 'StatusBar':
                 return learnUrl + 'ui-status-bar';
+            case 'StyledColumn':
+                return learnUrl + 'handbook-styled-column-overview';
             case 'SystemStatus':
                 return learnUrl + 'handbook-system-status-message';
             case 'TeamSharing':
@@ -149,12 +159,6 @@ class ModuleService {
                 return learnUrl + 'integrations-ipushpull';
             case 'OpenFin':
                 return learnUrl + 'integrations-openfin';
-            case 'StyledColumn':
-                return learnUrl + 'handbook-styled-column-overview';
-            case 'Charting':
-                return learnUrl + 'handbook-charts';
-            case 'DataImport':
-                return learnUrl + 'handbook-data-import';
             default:
                 return 'good';
         }

package/src/Utilities/Services/RowEditService.js

@@ -26,12 +26,7 @@ class RowEditService {
             const setPrimaryKeyValueFunction = adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.actionRowOptions
                 .setPrimaryKeyValue;
             const newRowData = typeof setPrimaryKeyValueFunction === 'function'
-                ? setPrimaryKeyValueFunction({
-                    rowData: formData,
-                    adaptableApi,
-                    userName: this.adaptableApi.optionsApi.getUserName(),
-                    adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
-                })
+                ? setPrimaryKeyValueFunction(Object.assign({ rowData: formData }, adaptableApi.internalApi.buildBaseContext()))
                 : Object.assign({}, formData);
             const config = {
                 addIndex: 0,

package/src/Utilities/Services/RowSummaryService.js

@@ -100,7 +100,7 @@ class RowSummaryService {
         const rowSummaries = (_a = this.api.layoutApi.getCurrentLayout().RowSummaries) !== null && _a !== void 0 ? _a : [];
         const rowSummariesResults = rowSummaries
             .filter((rowSummary) => !rowSummary.IsSuspended)
-            .map((rowSummary) => {
+            .map((rowSummary, index) => {
             const { ColumnsMap, Position, 
             // it defaults to true
             IncludeOnlyFilteredRows = true, } = rowSummary;
@@ -163,7 +163,7 @@ class RowSummaryService {
                     acc = this.api.internalApi.setValueUsingField(acc, fieldName, value);
                     return acc;
                 }, {
-                    [RowSummary_1.ROW_SUMMARY_ROW_ID]: true,
+                    [RowSummary_1.ROW_SUMMARY_ROW_ID]: `row-summary-${index}`,
                 }),
             };
         });

package/src/Utilities/Services/ValidationService.js

@@ -74,25 +74,11 @@ class ValidationService {
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
         var _a;
         const displayValue = this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId);
-        const predicateDefHandlerContext = {
-            value: dataChangedEvent.newValue,
-            oldValue: dataChangedEvent.oldValue,
-            displayValue,
-            node: dataChangedEvent.rowNode,
-            column: dataChangedEvent.column,
-            adaptableApi: this.adaptableApi,
-            userName: this.adaptableApi.optionsApi.getUserName(),
-            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
-        };
+        const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, displayValue, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.adaptableApi.internalApi.buildBaseContext());
         return this.adaptableApi.predicateApi.handlePredicates((_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
-        const serverValidationContext = {
-            cellDataChangedInfo: cellDataChangedInfo,
-            adaptableApi: this.adaptableApi,
-            userName: this.adaptableApi.optionsApi.getUserName(),
-            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
-        };
+        const serverValidationContext = Object.assign({ cellDataChangedInfo: cellDataChangedInfo }, this.adaptableApi.internalApi.buildBaseContext());
         return () => {
             this.adaptableApi.optionsApi
                 .getEditOptions()

package/src/View/Alert/AlertEmptyView.js

@@ -6,8 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const AlertEmptyView = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const accessLevel = adaptable.api.internalApi
-        .getEntitlementService()
+    const accessLevel = adaptable.api.entitlementApi
         .getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
     const text = accessLevel == 'ReadOnly'
         ? 'You have no Alert Definitions.'

package/src/View/Charting/ChartingStatusBarPopover.js

@@ -9,8 +9,7 @@ const useChartingElements_1 = require("./useChartingElements");
 const rebass_1 = require("rebass");
 const ChartingStatusBarPopover = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const accessLevel = adaptable.api.internalApi
-        .getEntitlementService()
+    const accessLevel = adaptable.api.entitlementApi
         .getEntitlementAccessLevelForModule(ModuleConstants.ChartingModuleId);
     const { chartSelector, containerSelector, chartButton, deleteButton, editButton } = (0, useChartingElements_1.useChartingElements)({
         elementType: 'Statusbar',

package/src/View/Charting/useChartingElements.js

@@ -28,7 +28,7 @@ const useChartingElements = ({ elementType, accessLevel, size = 'normal', }) =>
     });
     const selectedChart = allChartDefinitions.find((chart) => chart.Uuid === selectedChartId);
     const isAgChart = (0, ChartingState_1.isAgChartDefinition)(selectedChart);
-    const chartAccessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(selectedChart, accessLevel);
+    const chartAccessLevel = AdaptableHelper_1.default.getAccessLevelForObject(selectedChart, accessLevel);
     const [selectedContainer, setSelectedContainer] = React.useState(null);
     // Need to always call as they the rule for hooks
     const { isOpen: isAgChartOpen, showChart: showAgChart, closeChart: hideAgChart, } = (0, useAgChartState_1.useAgChartState)(isAgChart ? selectedChart : undefined);

package/src/View/Components/AdaptableObjectList/AdaptableObjectCompactList.js

@@ -17,9 +17,7 @@ const AdaptableObjectCompactListItem = (props) => {
     const objectView = props.module.toViewCompact(props.abObject);
     const viewOptions = (_b = (_a = props.module) === null || _a === void 0 ? void 0 : _a.getViewProperties) === null || _b === void 0 ? void 0 : _b.call(_a);
     const deleteAction = (_c = viewOptions === null || viewOptions === void 0 ? void 0 : viewOptions.getCompactDeleteAction) === null || _c === void 0 ? void 0 : _c.call(viewOptions, props.abObject);
-    const moduleAccessLevel = adaptable.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
+    const moduleAccessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
     const suspendAction = (_d = viewOptions === null || viewOptions === void 0 ? void 0 : viewOptions.getCompactSuspendAction) === null || _d === void 0 ? void 0 : _d.call(viewOptions, props.abObject);
     const unSuspendAction = (_e = viewOptions === null || viewOptions === void 0 ? void 0 : viewOptions.getCompactUnSuspendAction) === null || _e === void 0 ? void 0 : _e.call(viewOptions, props.abObject);
     const isSuspended = props.abObject.IsSuspended;
@@ -65,9 +63,7 @@ const AdaptableObjectCompactList = (props) => {
     const suspendAllAction = (_d = viewProperties === null || viewProperties === void 0 ? void 0 : viewProperties.getSuspendAllAction) === null || _d === void 0 ? void 0 : _d.call(viewProperties);
     const unSuspendAllAction = (_e = viewProperties === null || viewProperties === void 0 ? void 0 : viewProperties.getUnSuspendAllAction) === null || _e === void 0 ? void 0 : _e.call(viewProperties);
     const dispatch = (0, react_redux_1.useDispatch)();
-    const accessLevel = adaptable.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
+    const accessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
     const isAtLeastOneAbObjectActive = props.abObjects.some((abObject) => {
         return !abObject.IsSuspended;
     });

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -93,10 +93,8 @@ const AdaptableObjectListItem = (props) => {
         adaptable.api.teamSharingApi.isTeamSharingAvailable() &&
         adaptable.api.teamSharingApi.hasTeamSharingFullRights();
     const entityType = props.module.moduleInfo.FriendlyName;
-    const moduleAccessLevel = adaptable.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
-    const accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(props.data.abObject, moduleAccessLevel);
+    const moduleAccessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
+    const accessLevel = AdaptableHelper_1.default.getAccessLevelForObject(props.data.abObject, moduleAccessLevel);
     const itemClassName = (0, join_1.default)(props.data.className, ITEM_BASE_CLASS_NAME, props.data.abObject.IsSuspended &&
         `${ITEM_BASE_CLASS_NAME}--is-suspended`);
     const handleCloseWizard = React.useCallback(() => {

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -61,23 +61,13 @@ class QuickFilterFormComponent extends React.Component {
         let hideQuickFilterDropdownFunction = this.props.api.optionsApi.getColumnFilterOptions().quickFilterOptions
             .hideQuickFilterDropdown;
         if (hideQuickFilterDropdownFunction) {
-            const columnFilterContext = {
-                column: this.props.currentColumn,
-                adaptableApi: this.props.api,
-                userName: this.props.api.optionsApi.getUserName(),
-                adaptableId: this.props.api.optionsApi.getAdaptableId(),
-            };
+            const columnFilterContext = Object.assign({ column: this.props.currentColumn }, this.props.api.internalApi.buildBaseContext());
             showQuickFilterDropdown = !hideQuickFilterDropdownFunction(columnFilterContext);
         }
         let showQuickFilterInput = true;
         let hideQuickFilterInputFunction = this.props.api.optionsApi.getColumnFilterOptions().quickFilterOptions.hideQuickFilterInput;
         if (hideQuickFilterInputFunction) {
-            const columnFilterContext = {
-                column: this.props.currentColumn,
-                adaptableApi: this.props.api,
-                userName: this.props.api.optionsApi.getUserName(),
-                adaptableId: this.props.api.optionsApi.getAdaptableId(),
-            };
+            const columnFilterContext = Object.assign({ column: this.props.currentColumn }, this.props.api.internalApi.buildBaseContext());
             showQuickFilterInput = !hideQuickFilterInputFunction(columnFilterContext);
         }
         return (React.createElement(React.Fragment, null,

package/src/View/Components/ModuleValueSelector/index.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const ValueSelector_1 = require("../ValueSelector");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const react_1 = require("react");
-const sortWithOrder_1 = require("../../../Utilities/sortWithOrder");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/ArrayExtensions"));
 const ModuleValueSelector = (props) => {
     const { options, value, onChange, selectionBoxPosition = 'top' } = props, valueSelectorProps = tslib_1.__rest(props, ["options", "value", "onChange", "selectionBoxPosition"]);
     const { api } = (0, AdaptableContext_1.useAdaptable)();
@@ -28,7 +28,7 @@ const ModuleValueSelector = (props) => {
         return labelMap;
     }, [options]);
     const sortedOptions = (0, react_1.useMemo)(() => {
-        return (0, sortWithOrder_1.sortWithOrderArray)(options, value, { sortUnorderedItems: true });
+        return ArrayExtensions_1.default.sortArrayWithOrder(options, value, { sortUnorderedItems: true });
     }, [allowReorder, options, value]);
     return (React.createElement(ValueSelector_1.ValueSelector, Object.assign({}, valueSelectorProps, { options: sortedOptions, value: value, onChange: onChange, allowReorder: allowReorder, toIdentifier: (module) => module, toLabel: (module) => moduleLabelMap.get(module), selectionBoxPosition: selectionBoxPosition, isOptionDisabled: props.isOptionDisabled, disabled: props.disabled })));
 };

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopup.js

@@ -10,7 +10,6 @@ const join_1 = tslib_1.__importDefault(require("../../../../components/utils/joi
 const Navigation_1 = require("./Navigation");
 const PopupContext_1 = tslib_1.__importDefault(require("./PopupContext"));
 const AdaptablePopupBody_1 = require("./AdaptablePopupBody");
-const DefaultSettingsPanel_1 = require("../../../../Utilities/Defaults/DefaultSettingsPanel");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const CustomSettingsPanelView_1 = require("./CustomSettingsPanelView");
 const useMenuItems_1 = require("./useMenuItems");
@@ -54,13 +53,11 @@ const AdaptablePopup = (props) => {
     else {
         const module = props.api.internalApi.getModuleService().getModuleById(componentModule);
         const moduleInfo = module === null || module === void 0 ? void 0 : module.moduleInfo;
-        accessLevel = props.api.internalApi
-            .getEntitlementService()
-            .getEntitlementAccessLevelForModule(componentModule);
+        accessLevel = props.api.entitlementApi.getEntitlementAccessLevelForModule(componentModule);
         friendlyName = moduleInfo.FriendlyName;
         isStandalone =
             moduleInfo &&
-                (DefaultSettingsPanel_1.STANDALONE_MODULE_POPUPS.includes(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.ModuleName) ||
+                (GeneralConstants.STANDALONE_MODULE_POPUPS.includes(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.ModuleName) ||
                     (props.componentName && props.componentName !== (moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.Popup)));
         activeItem = moduleInfo.ModuleName;
         moduleViewContent = (React.createElement(AdaptablePopupBody_1.AdaptablePopupBody, { api: props.api, module: module, componentName: props.componentName, moduleParams: props.moduleParams, onClearParams: props.onClearParams, onHide: props.onHide }));

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupBody.js

@@ -10,9 +10,7 @@ const AdaptablePopupBody = (props) => {
     var _a;
     const modalContainer = UIHelper_1.UIHelper.getModalContainer(props.api.optionsApi.getAdaptableOptions(), document);
     const moduleName = props.module.moduleInfo.ModuleName;
-    const accessLevel = props.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(moduleName);
+    const accessLevel = props.api.entitlementApi.getEntitlementAccessLevelForModule(moduleName);
     const moduleInfo = props.api.internalApi.getModuleService().getModuleInfoByModule(moduleName);
     const moduleProps = {
         popupParams: props.moduleParams,

package/src/View/Components/Popups/AdaptablePopup/useMenuItems.js

@@ -7,6 +7,7 @@ const react_redux_1 = require("react-redux");
 const DefaultSettingsPanel_1 = require("../../../../Utilities/Defaults/DefaultSettingsPanel");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const PopupRedux = tslib_1.__importStar(require("../../../../Redux/ActionsReducers/PopupRedux"));
+const GeneralConstants_1 = require("../../../../Utilities/Constants/GeneralConstants");
 const useMenuItems = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const settingsPanelOptions = adaptable.adaptableOptions.settingsPanelOptions;
@@ -23,7 +24,7 @@ const useMenuItems = () => {
         const visibleItems = allMenuItems.filter((item) => item.module !== 'General' &&
             item.module !== 'CustomSettingsPanel' &&
             item.module !== 'Group' &&
-            !DefaultSettingsPanel_1.STANDALONE_MODULE_POPUPS.includes(item.module) &&
+            !GeneralConstants_1.STANDALONE_MODULE_POPUPS.includes(item.module) &&
             item.isVisible);
         let navItems = navigationItems
             .map((moduleName) => {

package/src/View/Components/Popups/AdaptablePopupAlert.js

@@ -28,13 +28,7 @@ const AdaptablePopupAlert = (props) => {
     }, []);
     const [formData, setFormData] = (0, react_1.useState)({});
     const context = React.useMemo(() => {
-        return {
-            alert: props.adaptableAlert,
-            adaptableApi: api,
-            formData: formData,
-            userName: api.optionsApi.getUserName(),
-            adaptableId: api.optionsApi.getAdaptableId(),
-        };
+        return Object.assign(Object.assign({ alert: props.adaptableAlert }, api.internalApi.buildBaseContext()), { formData: formData });
     }, [JSON.stringify(formData), props.adaptableAlert]);
     const adaptableForm = React.useMemo(() => {
         if (api.isDestroyed()) {

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -25,27 +25,26 @@ const preventDefault = (e) => e.preventDefault();
 const AdaptableToolPanelComponent = (props) => {
     var _a;
     const toolPanelsGlyph = React.createElement(icons_1.Icon, { name: 'align-justify' });
-    const entitlementService = props.api.internalApi.getEntitlementService();
     const moduleService = props.api.internalApi.getModuleService();
     const adaptableOptions = props.api.optionsApi.getAdaptableOptions();
     const toolPanelOptions = adaptableOptions.toolPanelOptions;
     const settingsPanelOptions = adaptableOptions.settingsPanelOptions;
-    if (entitlementService.isModuleHiddenEntitlement('ToolPanel')) {
+    if (props.api.entitlementApi.isModuleHiddenEntitlement('ToolPanel')) {
         // do NOT show any toolPanel content if the required entitlements are missing
         return (React.createElement(HelpBlock_1.default, { mt: 2, mb: 2, p: 2, style: { fontSize: 'var(--ab-font-size-3)' } }, "Not enough rights"));
     }
     const availableModuleItems = props.MainMenuItems.filter((menuItem) => menuItem.isVisible);
     const availableModules = availableModuleItems.map((menuItem) => menuItem.module);
     // 'Dashboard' is a special case because it's not available in the dashboard menu items, s we have to add it manually
-    if (!entitlementService.isModuleHiddenEntitlement('Dashboard')) {
+    if (!props.api.entitlementApi.isModuleHiddenEntitlement('Dashboard')) {
         availableModules.push('Dashboard');
     }
     if (props.api.pluginsApi.getipushpullPluginApi() &&
-        !entitlementService.isModuleHiddenEntitlement('IPushPull')) {
+        !props.api.entitlementApi.isModuleHiddenEntitlement('IPushPull')) {
         availableModules.push('IPushPull');
     }
     if (props.api.pluginsApi.getOpenFinPluginApi() &&
-        !entitlementService.isModuleHiddenEntitlement('OpenFin')) {
+        !props.api.entitlementApi.isModuleHiddenEntitlement('OpenFin')) {
         availableModules.push('OpenFin');
     }
     const availableModuleToolPanels = Types_1.ALL_TOOL_PANELS.filter((moduleToolPanel) => ArrayExtensions_1.default.ContainsItem(availableModules, moduleToolPanel));
@@ -129,7 +128,7 @@ const AdaptableToolPanelComponent = (props) => {
         const toolPanelButtons = [];
         let moduleButtons = props.ModuleButtons;
         const shouldAddSettingsPanel = settingsPanelOptions.alwaysShowInToolPanel &&
-            !props.api.internalApi.getEntitlementService().isModuleHiddenEntitlement('SettingsPanel');
+            !props.api.entitlementApi.isModuleHiddenEntitlement('SettingsPanel');
         if (shouldAddSettingsPanel && !moduleButtons.includes('SettingsPanel')) {
             moduleButtons = ['SettingsPanel', ...moduleButtons];
         }
@@ -147,12 +146,7 @@ const AdaptableToolPanelComponent = (props) => {
         return props.api.toolPanelApi.getCustomToolPanelButtons().map((button) => {
             // TODO: variants of this mapping are present in several places (just search for api.internalApi.getStyleForButton() usages)
             // with the next opportunity we should abstract it
-            const toolPanelContext = {
-                adaptableApi: props.api,
-                userName: props.api.optionsApi.getUserName(),
-                adaptableId: props.api.optionsApi.getAdaptableId(),
-                toolPanelState: props.api.toolPanelApi.getToolPanelState(),
-            };
+            const toolPanelContext = Object.assign(Object.assign({}, props.api.internalApi.buildBaseContext()), { toolPanelState: props.api.toolPanelApi.getToolPanelState() });
             const buttonIcon = props.api.internalApi.getIconForButton(button, toolPanelContext);
             let buttonStyle = props.api.internalApi.getStyleForButton(button, toolPanelContext);
             let buttonLabel = props.api.internalApi.getLabelForButton(button, toolPanelContext);