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

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

@@ -19,14 +19,7 @@ const CustomToolPanelContent = (props) => {
     (0, react_1.useLayoutEffect)(() => {
         const element = contentsDivDomRef.current;
         if (hasCustomRenderFn(customToolPanel)) {
-            const customRenderContext = {
-                visible: true,
-                phase: 'onMount',
-                element,
-                adaptableApi: api,
-                userName: api.optionsApi.getUserName(),
-                adaptableId: api.optionsApi.getAdaptableId(),
-            };
+            const customRenderContext = Object.assign({ visible: true, phase: 'onMount', element }, api.internalApi.buildBaseContext());
             const html = customToolPanel.render(customRenderContext);
             setContentsHTML(html);
         }
@@ -35,14 +28,7 @@ const CustomToolPanelContent = (props) => {
         }
         return () => {
             if (hasCustomRenderFn(customToolPanel)) {
-                customToolPanel.render({
-                    visible: false,
-                    phase: 'onDestroy',
-                    element,
-                    adaptableApi: api,
-                    userName: api.optionsApi.getUserName(),
-                    adaptableId: api.optionsApi.getAdaptableId(),
-                });
+                customToolPanel.render(Object.assign({ visible: false, phase: 'onDestroy', element }, api.internalApi.buildBaseContext()));
             }
             else if (hasCustomFrameworkComponent(customToolPanel) && !api.isDestroyed()) {
                 api.internalApi.destroyFrameworkComponent(element, customToolPanel.frameworkComponent, 'toolPanel');
@@ -54,13 +40,7 @@ const CustomToolPanelContent = (props) => {
         ((_a = customToolPanel.buttons) === null || _a === void 0 ? void 0 : _a.length) && (React.createElement("div", { id: buttonsDivId, className: `ab-ToolPanel__custom-content__buttons ${buttonsDivId}` }, customToolPanel.buttons.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: api,
-                userName: api.optionsApi.getUserName(),
-                adaptableId: api.optionsApi.getAdaptableId(),
-                toolPanelState: api.toolPanelApi.getToolPanelState(),
-                customToolPanel: customToolPanel,
-            };
+            const toolPanelContext = Object.assign(Object.assign({}, api.internalApi.buildBaseContext()), { toolPanelState: api.toolPanelApi.getToolPanelState(), customToolPanel: customToolPanel });
             const buttonIcon = api.internalApi.getIconForButton(button, toolPanelContext);
             let buttonStyle = api.internalApi.getStyleForButton(button, toolPanelContext);
             let buttonLabel = api.internalApi.getLabelForButton(button, toolPanelContext);

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

@@ -26,7 +26,6 @@ class ToolPanelPopupComponent extends React.Component {
         };
     }
     render() {
-        const entitlementService = this.props.api.internalApi.getEntitlementService();
         // 1. process module buttons
         const selectedModuleButtons = [];
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(this.props.ToolPanelState.ModuleButtons)) {
@@ -41,15 +40,15 @@ class ToolPanelPopupComponent extends React.Component {
         // 2. process tool panels
         const availableModules = this.props.GridState.SettingPanelModuleMenuItems.filter((menuItem) => menuItem.isVisible).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 (!this.props.api.entitlementApi.isModuleHiddenEntitlement('Dashboard')) {
             availableModules.push('Dashboard');
         }
         if (this.props.api.pluginsApi.getipushpullPluginApi() &&
-            !entitlementService.isModuleHiddenEntitlement('IPushPull')) {
+            !this.props.api.entitlementApi.isModuleHiddenEntitlement('IPushPull')) {
             availableModules.push('IPushPull');
         }
         if (this.props.api.pluginsApi.getOpenFinPluginApi() &&
-            !entitlementService.isModuleHiddenEntitlement('OpenFin')) {
+            !this.props.api.entitlementApi.isModuleHiddenEntitlement('OpenFin')) {
             availableModules.push('OpenFin');
         }
         const availableModuleToolPanels = Types_1.ALL_TOOL_PANELS.filter((moduleToolPanel) => ArrayExtensions_1.default.ContainsItem(availableModules, moduleToolPanel));
@@ -63,7 +62,7 @@ class ToolPanelPopupComponent extends React.Component {
         const selectedToolPanels = this.props.ToolPanelState.ToolPanels.map((toolPanelDefinition) => toolPanelDefinition.Name)
             // ensure that the visible state has only valid tool panels
             .filter((visibleToolPanel) => availableToolPanels.includes(visibleToolPanel));
-        const isToolPanelReadOnly = entitlementService.isModuleReadOnlyEntitlement('ToolPanel');
+        const isToolPanelReadOnly = this.props.api.entitlementApi.isModuleReadOnlyEntitlement('ToolPanel');
         const isModuleCheckboxDisabled = (module) => {
             if (module === 'SettingsPanel') {
                 return this.props.api.optionsApi.getSettingsPanelOptions().alwaysShowInDashboard;

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

@@ -17,9 +17,7 @@ const ToolPanelWrapper = (props) => {
     const getToolPanelConfiguration = () => {
         var _a;
         if (adaptableToolPanel) {
-            const accessLevel = api.internalApi
-                .getEntitlementService()
-                .getEntitlementAccessLevelForModule(adaptableToolPanel);
+            const accessLevel = api.entitlementApi.getEntitlementAccessLevelForModule(adaptableToolPanel);
             const moduleInfo = api.internalApi
                 .getModuleService()
                 .getModuleInfoByModule(adaptableToolPanel);

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

@@ -11,9 +11,9 @@ const icons_1 = require("../../../components/icons");
 const EllipsisContainer_1 = require("../../../components/EllipsisContainer");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
-const reorder_1 = require("../../../Utilities/reorder");
 const Tag_1 = require("../../../components/Tag");
 const AdaptableFormControlTextClear_1 = require("../Forms/AdaptableFormControlTextClear");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/ArrayExtensions"));
 function useValuesMap({ options, value, toIdentifier, selectedMap, }) {
     const optionsMap = (0, react_1.useMemo)(() => {
         if (selectedMap) {
@@ -134,7 +134,7 @@ function ValueSelector(props) {
                     }
                 }
                 const clone = new Map(selectedMap);
-                const newSelection = (0, reorder_1.reorder)(selection, source.index, destination.index);
+                const newSelection = ArrayExtensions_1.default.reorderArray(selection, source.index, destination.index);
                 // and then pushed back in the new order, at the end
                 newSelection.push(...extraKeys);
                 selectedMap.clear();

package/src/View/CustomSort/Wizard/CustomSortValuesWizardSection.js

@@ -9,9 +9,9 @@ const Loader_1 = require("../../../components/Loader");
 const Tabs_1 = require("../../../components/Tabs");
 const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
 const runIfNotResolvedIn_1 = require("../../../Utilities/runIfNotResolvedIn");
-const sortWithOrder_1 = require("../../../Utilities/sortWithOrder");
 const ValueSelector_1 = require("../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../.././Utilities/Extensions/ArrayExtensions"));
 const isValidCustomSortOrder = (data) => {
     if (!data.SortedValues || !data.SortedValues.length) {
         return 'You have to specify at least one value for Custom Sort order';
@@ -57,7 +57,7 @@ const CustomSortValuesWizardSection = (props) => {
         return sortedValuesMap.has(option);
     }, [sortedValuesMap]);
     const options = (0, react_1.useMemo)(() => {
-        return (0, sortWithOrder_1.sortWithOrderArray)(distinctValues, data.SortedValues, {
+        return ArrayExtensions_1.default.sortArrayWithOrder(distinctValues, data.SortedValues, {
             sortUnorderedItems: false,
         });
     }, [allowReorder, distinctValues, data.SortedValues]);

package/src/View/Dashboard/CustomDashboardButton.js

@@ -11,12 +11,7 @@ const CustomDashboardButton = (props) => {
     const [componentRevision, setComponentRevision] = (0, react_1.useState)(1);
     // 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 dashboardContext = {
-        adaptableApi: props.api,
-        userName: props.api.optionsApi.getUserName(),
-        adaptableId: props.api.optionsApi.getAdaptableId(),
-        dashboardState: props.api.dashboardApi.getDashboardState(),
-    };
+    const dashboardContext = Object.assign(Object.assign({}, props.api.internalApi.buildBaseContext()), { dashboardState: props.api.dashboardApi.getDashboardState() });
     const buttonIcon = props.api.internalApi.getIconForButton(button, dashboardContext);
     let buttonStyle = props.api.internalApi.getStyleForButton(button, dashboardContext);
     let buttonLabel = props.api.internalApi.getLabelForButton(button, dashboardContext);

package/src/View/Dashboard/CustomToolbar.js

@@ -104,16 +104,9 @@ const CustomToolbarWrapper = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     return (React.createElement(PanelDashboard_1.PanelDashboard, { headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureButton: props.customToolbar.showConfigureButton != null &&
             props.customToolbar.showConfigureButton == true, showCloseButton: props.customToolbar.showCloseButton != null && props.customToolbar.showCloseButton == true, onConfigure: () => {
-            const customToolbarConfiguredInfo = {
-                adaptableApi: api,
-                customToolbar: props.customToolbar,
-                userName: api.optionsApi.getUserName(),
-                adaptableId: api.optionsApi.getAdaptableId(),
-            };
+            const customToolbarConfiguredInfo = Object.assign(Object.assign({}, api.internalApi.buildBaseContext()), { customToolbar: props.customToolbar });
             api.eventApi.emit('CustomToolbarConfigured', customToolbarConfiguredInfo);
-        }, accessLevel: api.internalApi
-            .getEntitlementService()
-            .getEntitlementAccessLevelForModule('Dashboard') },
+        }, accessLevel: api.entitlementApi.getEntitlementAccessLevelForModule('Dashboard') },
         React.createElement(exports.CustomToolbarCmp, Object.assign({}, props))));
 };
 exports.CustomToolbarWrapper = CustomToolbarWrapper;

package/src/View/Dashboard/Dashboard.js

@@ -25,9 +25,7 @@ const PinnedDashboard_1 = require("./PinnedDashboard");
 const ModuleToolbarWrapper_1 = require("./ModuleToolbarWrapper");
 const DashboardComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
-    const dashboardAccessLevel = props.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule('Dashboard');
+    const dashboardAccessLevel = props.api.entitlementApi.getEntitlementAccessLevelForModule('Dashboard');
     const renderTab = (tab) => {
         const visibleToolbarNames = tab.Toolbars.filter((vt) => vt);
         const customToolbars = props.api.dashboardApi.getCustomToolbars();
@@ -64,7 +62,7 @@ const DashboardComponent = (props) => {
         let shortcuts = null;
         const alwaysShowInDashboard = props.api.optionsApi.getSettingsPanelOptions().alwaysShowInDashboard;
         const shouldAddSettingsPanel = alwaysShowInDashboard &&
-            !props.api.internalApi.getEntitlementService().isModuleHiddenEntitlement('SettingsPanel');
+            !props.api.entitlementApi.isModuleHiddenEntitlement('SettingsPanel');
         if (shouldAddSettingsPanel && !shortcutsArray.includes('SettingsPanel')) {
             shortcutsArray.push('SettingsPanel');
         }

package/src/View/Dashboard/DashboardPopup.js

@@ -57,9 +57,7 @@ class DashboardPopupComponent extends React.Component {
         });
         const allModuleButtons = this.props.GridState.SettingPanelModuleMenuItems.map((x) => x.module);
         const baseClassName = 'ab-Dashboard-Popup';
-        const dashboardAccessLevel = this.props.api.internalApi
-            .getEntitlementService()
-            .getEntitlementAccessLevelForModule('Dashboard');
+        const dashboardAccessLevel = this.props.api.entitlementApi.getEntitlementAccessLevelForModule('Dashboard');
         const areDashboardSettingsVisible = dashboardAccessLevel == 'Full' || dashboardAccessLevel == 'ReadOnly';
         const isDashboardDisabled = dashboardAccessLevel === 'ReadOnly';
         const isModuleCheckboxDisabled = (module) => {

package/src/View/Dashboard/DashboardToolbarFactory.js

@@ -13,8 +13,7 @@ const SystemDashboardToolbarFactory = (props) => {
     const moduleInfo = adaptable.api.internalApi
         .getModuleService()
         .getModuleInfoByModule(props.toolbarName);
-    const accessLevel = adaptable.api.internalApi
-        .getEntitlementService()
+    const accessLevel = adaptable.api.entitlementApi
         .getEntitlementAccessLevelForModule(props.toolbarName);
     const moduleToolbarView = AdaptableViewFactory_1.AdaptableViewPanelFactory.get(props.toolbarName);
     if (!moduleToolbarView) {

package/src/View/Dashboard/PinnedToolbarsSelector.js

@@ -9,8 +9,7 @@ const DashboardRedux_1 = require("../../Redux/ActionsReducers/DashboardRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const PinnedToolbarsSelector = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
-    const dashboardAccessLevel = api.internalApi
-        .getEntitlementService()
+    const dashboardAccessLevel = api.entitlementApi
         .getEntitlementAccessLevelForModule('Dashboard');
     const isDashboardDisabled = dashboardAccessLevel === 'ReadOnly';
     const dashboardState = (0, react_redux_1.useSelector)((state) => state.Dashboard);

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -15,9 +15,7 @@ const DataChangeHistoryGrid = (props) => {
     const [_adaptableApi, setAdaptableApi] = (0, react_1.useState)(null);
     const adaptableApiRef = (0, react_1.useRef)(null);
     adaptableApiRef.current = _adaptableApi;
-    const undoChangeEnabled = mainAdaptableInstance.api.internalApi
-        .getEntitlementService()
-        .isModuleFullEntitlement(ModuleConstants_1.DataChangeHistoryModuleId);
+    const undoChangeEnabled = mainAdaptableInstance.api.entitlementApi.isModuleFullEntitlement(ModuleConstants_1.DataChangeHistoryModuleId);
     const previousChangeHistoryLog = (0, usePrevious_1.default)(changeHistoryLog, changeHistoryLog);
     // initialize Adaptable grid
     (0, react_1.useEffect)(() => {

package/src/View/Export/ExportViewPanel.js

@@ -67,7 +67,7 @@ class ExportViewPanelComponent extends React.Component {
             currentDestination = undefined;
             currentDestinationId = undefined;
         }
-        let accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(currentReport, this.props.accessLevel);
+        let accessLevel = AdaptableHelper_1.default.getAccessLevelForObject(currentReport, this.props.accessLevel);
         let deleteMessage = "Are you sure you want to delete '";
         if (currentReport != null) {
             deleteMessage = deleteMessage + currentReport.Name + "'?";
@@ -86,9 +86,7 @@ class ExportViewPanelComponent extends React.Component {
                 React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => this.props.onEditReport(this.props.moduleInfo.Popup), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null || this.props.api.exportApi.isExternalReport(currentReport), accessLevel: accessLevel }),
                 React.createElement(ButtonNew_1.ButtonNew, { variant: "text", className: `ab-${elementType}__Export__new`, tone: "neutral", children: null, onClick: () => this.props.onNewReport(this.props.moduleInfo.Popup), tooltip: "Create New Report", accessLevel: accessLevel }),
                 React.createElement(ButtonDelete_1.ButtonDelete, { tooltip: "Delete Report", className: `ab-${elementType}__Export__delete`, disabled: currentReport == null, ConfirmAction: ExportRedux.ReportDelete(currentReport), ConfirmationMsg: deleteMessage, ConfirmationTitle: 'Delete Report', accessLevel: accessLevel }),
-                this.props.api.internalApi
-                    .getEntitlementService()
-                    .isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { marginLeft: 1, className: `ab-${elementType}__Export__schedule`, onClick: () => this.onNewReportSchedule(), tooltip: "Schedule", disabled: currentReport == null, accessLevel: this.props.accessLevel })))));
+                this.props.api.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { marginLeft: 1, className: `ab-${elementType}__Export__schedule`, onClick: () => this.onNewReportSchedule(), tooltip: "Schedule", disabled: currentReport == null, accessLevel: this.props.accessLevel })))));
     }
     onSelectedReportChanged(reportName) {
         this.props.onSelectReport(reportName);

package/src/View/Export/Wizard/ReportSummaryWizard.js

@@ -13,15 +13,11 @@ class ReportSummaryWizard extends React.Component {
             { Key: 'Name', Value: this.props.data.Name },
             {
                 Key: 'Column Scope',
-                Value: this.props.api.internalApi
-                    .getReportService()
-                    .GetReportColumnScopeLongDescription(this.props.data),
+                Value: this.props.api.exportApi.internalApi.getReportColumnScopeLongDescription(this.props.data),
             },
             {
                 Key: 'Row Scope',
-                Value: this.props.api.internalApi
-                    .getReportService()
-                    .GetReportExpressionDescription(this.props.data, this.props.api.columnApi.getColumns()),
+                Value: this.props.api.exportApi.internalApi.getReportExpressionDescription(this.props.data, this.props.api.columnApi.getColumns()),
             },
         ];
         return (React.createElement(WizardSummaryPage_1.WizardSummaryPage, { KeyValuePairs: keyValuePairs, header: this.props.moduleInfo.FriendlyName }));

package/src/View/GridFilter/GridFilterExpressionEditor.js

@@ -8,7 +8,7 @@ const rebass_1 = require("rebass");
 const ExpressionEditor_1 = require("../../components/ExpressionEditor");
 const NamedQueryContext_1 = require("../../components/ExpressionEditor/NamedQueryContext");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
-const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NamedQueryRedux"));
+const NamedQueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NamedQueryRedux"));
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
@@ -32,7 +32,7 @@ const GridFilterExpressionEditor = (props) => {
     const onRunQuery = (expression) => {
         api.gridFilterApi.setGridFilterExpression(expression);
     };
-    const onAddNamedQuery = (namedQuery) => dispatch(QueryRedux.NamedQueryAdd(namedQuery));
+    const onAddNamedQuery = (namedQuery) => dispatch(NamedQueryRedux.NamedQueryAdd(namedQuery));
     const handleSaveQuery = () => {
         dispatch((0, PopupRedux_1.PopupShowForm)({
             Id: 'save_query_form',

package/src/View/GridFilter/useGridFilterExpressionEditor.js

@@ -84,13 +84,9 @@ const useGridFilterExpressionEditor = () => {
         adaptable.api.gridFilterApi.setGridFilterExpression(newExpression);
     };
     const gridFilterAccessLevel = React.useMemo(() => {
-        return adaptable.api.internalApi
-            .getEntitlementService()
-            .getEntitlementAccessLevelForModule(ModuleConstants_1.GridFilterModuleId);
+        return adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants_1.GridFilterModuleId);
     }, []);
-    const namedQueryModuleAccessLevel = adaptable.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(ModuleConstants_1.NamedQueryModuleId);
+    const namedQueryModuleAccessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants_1.NamedQueryModuleId);
     const onShowNamedQueries = (value, popup) => dispatch(PopupRedux.PopupShowScreen(ModuleConstants_1.NamedQueryModuleId, popup, {
         action: 'New',
         source: 'Other',

package/src/View/Layout/LayoutViewPanel.js

@@ -23,7 +23,7 @@ class LayoutViewPanelComponent extends React.Component {
         // the global access level (Layout Entitlement)
         const cloneAccessLevel = this.props.accessLevel;
         const newAccessLevel = this.props.accessLevel;
-        const accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(layoutEntity, this.props.accessLevel);
+        const accessLevel = AdaptableHelper_1.default.getAccessLevelForObject(layoutEntity, this.props.accessLevel);
         const isManualSaveLayout = !this.props.api.layoutApi.shouldAutoSaveLayouts();
         const availableLayoutOptions = this.props.Layouts.map((layout, index) => {
             return Object.assign(Object.assign({}, layout), { label: layout.Name, value: layout.Name, onClick: () => this.props.onSelectLayout(layout.Name) });

package/src/View/Layout/PivotDetailsPopoup.js

@@ -24,13 +24,7 @@ const PivotDetailsPopoup = (props) => {
         const pivotPreviewOptionColumn = (_a = adaptableApi.optionsApi.getLayoutOptions()) === null || _a === void 0 ? void 0 : _a.pivotPreviewColumns;
         let pivotPreviewExtraColumns = [];
         if (typeof pivotPreviewOptionColumn === 'function') {
-            const pivotPreviewColumnsContext = {
-                layout: layout,
-                columnId: columnId,
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
+            const pivotPreviewColumnsContext = Object.assign({ layout: layout, columnId: columnId }, adaptableApi.internalApi.buildBaseContext());
             pivotPreviewExtraColumns = pivotPreviewOptionColumn(pivotPreviewColumnsContext);
         }
         else if (Array.isArray(pivotPreviewOptionColumn)) {

package/src/View/Layout/SaveLayoutButton.js

@@ -11,9 +11,7 @@ const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/La
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const SaveLayoutButton = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const accessLevel = adaptable.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(ModuleConstants.LayoutModuleId);
+    const accessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants.LayoutModuleId);
     const dispatch = (0, react_redux_1.useDispatch)();
     const currentDraftLayout = (0, react_redux_1.useSelector)((state) => state.Grid.CurrentLayout);
     const isManualSaveLayout = !adaptable.api.layoutApi.shouldAutoSaveLayouts();

package/src/View/Layout/Wizard/sections/AggregationsSection.js

@@ -9,11 +9,11 @@ const DropdownButton_1 = tslib_1.__importDefault(require("../../../../components
 const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
-const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const WEIGHTED_AVERAGE_AGG_FN_NAME = 'weightedAvg';
 const isAggregationsSectionValid = (data) => {
     const weightedAvg = data.AggregationColumns
@@ -112,7 +112,7 @@ const AggregationsSection = (props) => {
     const numberColumns = adaptable.api.columnApi.getNumericColumns();
     const sortedAggregableColumns = React.useMemo(() => {
         var _a, _b;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allAggregableColumns.map((col) => col.columnId), (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions_1.default.sortArrayWithOrder(allAggregableColumns.map((col) => col.columnId), (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allAggregableColumns]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { AggregationColumns: columnIds.reduce((acc, colId) => {

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -12,7 +12,6 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/S
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
 const AdaptableColumn_1 = require("../../../../PredefinedConfig/Common/AdaptableColumn");
-const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
@@ -21,6 +20,7 @@ const icons_1 = require("../../../../components/icons");
 const CheckBox_1 = require("../../../../components/CheckBox");
 const Helper_1 = require("../../../../Utilities/Helpers/Helper");
 const ColumnLabels_1 = require("../Components/ColumnLabels");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const PropertyOrderText = (props) => (React.createElement(rebass_1.Text, { fontWeight: 600, fontSize: 2 }, props.children));
 const ColumnsSectionSummary = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -192,7 +192,7 @@ const ColumnsSection = (props) => {
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const allColumns = adaptable.api.columnApi.getColumns();
     const sortedColumns = React.useMemo(() => {
-        return (0, sortWithOrder_1.sortWithOrderArray)(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions_1.default.sortArrayWithOrder(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allColumns]);
     const handlePinChange = (columnId, pinning) => {
         props.onChange(Object.assign(Object.assign({}, layout), { PinnedColumnsMap: Object.assign(Object.assign({}, layout.PinnedColumnsMap), { [columnId]: pinning }) }));

package/src/View/Layout/Wizard/sections/PivotColumnsSection.js

@@ -6,11 +6,11 @@ const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
-const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const PivotColumnsSectionSummary = () => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -25,7 +25,7 @@ const PivotColumnsSection = (props) => {
     const allPivotColumns = adaptable.api.columnApi.getPivotableColumns();
     const sortedPivotColumns = React.useMemo(() => {
         var _a;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allPivotColumns.map((col) => col.columnId), (_a = layout.PivotColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions_1.default.sortArrayWithOrder(allPivotColumns.map((col) => col.columnId), (_a = layout.PivotColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allPivotColumns]);
     const handleColumnsChange = (columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { PivotColumns: columnIds }));

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -8,10 +8,10 @@ const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLa
 const Utilities_1 = require("./Utilities");
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
-const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const RowGroupingSectionSummary = () => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -42,7 +42,7 @@ const RowGroupingSection = (props) => {
     const allGroupableColumns = adaptable.api.columnApi.getGroupableColumns();
     const sortedGroupableColumns = React.useMemo(() => {
         var _a;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allGroupableColumns.map((col) => col.columnId), (_a = layout.RowGroupedColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions_1.default.sortArrayWithOrder(allGroupableColumns.map((col) => col.columnId), (_a = layout.RowGroupedColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allGroupableColumns]);
     const handleColumnsChange = (columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { RowGroupedColumns: columnIds }));

package/src/View/Layout/Wizard/sections/RowSummarySection.js

@@ -15,12 +15,12 @@ const RowSummary_1 = require("../../../../PredefinedConfig/Common/RowSummary");
 const adaptableQlUtils_1 = require("../../../../Utilities/adaptableQlUtils");
 const ModuleConstants_1 = require("../../../../Utilities/Constants/ModuleConstants");
 const aggregatedScalarExpressionFunctions_1 = require("../../../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions");
-const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const SuspendToggleButton_1 = require("../../../Components/Buttons/SuspendToggleButton");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const areSummaryRowsValid = (layout) => {
     var _a;
     if (!layout.RowSummaries)
@@ -100,7 +100,7 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
             return (_b = (_a = layout.Columns) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, column.columnId);
         })
             .map((c) => c.columnId);
-        return (0, sortWithOrder_1.sortWithOrderArray)(colIds, Object.keys(rowSummary.ColumnsMap), {
+        return ArrayExtensions_1.default.sortArrayWithOrder(colIds, Object.keys(rowSummary.ColumnsMap), {
             sortUnorderedItems: false,
         }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [rowSummary.ColumnsMap]);

package/src/View/Layout/Wizard/sections/SortSection.js

@@ -8,11 +8,11 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/S
 const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
 const getLayoutSortViewItems_1 = require("../../../../Strategy/Utilities/Layout/getLayoutSortViewItems");
-const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const SortSectionSummary = () => {
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -35,7 +35,7 @@ const SortSection = (props) => {
     const allSortableColumns = adaptable.api.columnApi.getSortableColumns();
     const sortedSortColumns = React.useMemo(() => {
         var _a;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allSortableColumns.map((col) => col.columnId), ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions_1.default.sortArrayWithOrder(allSortableColumns.map((col) => col.columnId), ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allSortableColumns]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { ColumnSorts: (columnIds || []).map((columnId) => {

package/src/View/NamedQuery/Wizard/NamedQueryWizard.js

@@ -11,7 +11,7 @@ const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const NamedQueryExpressionWizardSection_1 = require("./NamedQueryExpressionWizardSection");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
-const QueryRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/NamedQueryRedux"));
+const NamedQueryRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/NamedQueryRedux"));
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 function NamedQueryWizard(props) {
     const [namedQuery, setNamedQuery] = (0, react_1.useState)(() => {
@@ -24,10 +24,10 @@ function NamedQueryWizard(props) {
     const dispatch = (0, react_redux_1.useDispatch)();
     const handleFinish = () => {
         if (props.data) {
-            dispatch(QueryRedux.NamedQueryEdit(namedQuery));
+            dispatch(NamedQueryRedux.NamedQueryEdit(namedQuery));
         }
         else {
-            dispatch(QueryRedux.NamedQueryAdd(namedQuery));
+            dispatch(NamedQueryRedux.NamedQueryAdd(namedQuery));
         }
         props.onFinishWizard(namedQuery);
     };

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -41,7 +41,7 @@ const SpecialColumnSettingsWizardStep = (props) => {
                         React.createElement(FormLayout_1.FormRow, null,
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "filterable", checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !adaptable.api.optionsApi.getColumnFilterOptions()
                                     .enableFilterOnSpecialColumns ||
-                                    adaptable.EntitlementService.getEntitlementAccessLevelForModule(ModuleConstants_1.ColumnFilterModuleId) == 'Hidden' }, "Filterable"),
+                                    adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants_1.ColumnFilterModuleId) == 'Hidden' }, "Filterable"),
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "resizable", checked: Resizable, onChange: (Resizable) => onSettingsChange({ Resizable }) }, "Resizable"),
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "groupable", checked: Groupable, onChange: (Groupable) => onSettingsChange({ Groupable }) }, "Groupable")),
                         React.createElement(FormLayout_1.FormRow, null,

package/src/View/SystemStatus/SystemStatusPopup.js

@@ -28,7 +28,7 @@ class SystemStatusPopupComponent extends React.Component {
     render() {
         let clearAllButton = (React.createElement(SimpleButton_1.default, { onClick: () => this.onSystemStatusMessageInfoDeleteAll(), tooltip: "Clear All", tone: "neutral", variant: "raised", accessLevel: this.props.accessLevel, disabled: ArrayExtensions_1.default.IsNullOrEmpty(this.props.SystemStatusMessages) }, "Delete All Messages"));
         const messages = ArrayExtensions_1.default.sortArrayWithProperty(Enums_1.SortOrder.Desc, this.props.SystemStatusMessages, 'Timestamp').map((smi, index) => {
-            const accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(smi, this.props.accessLevel);
+            const accessLevel = AdaptableHelper_1.default.getAccessLevelForObject(smi, this.props.accessLevel);
             return (React.createElement(SystemStatusEntityRow_1.SystemStatusEntityRow, { adaptableObject: smi, key: 'smi' + index, onEdit: null, moduleInfo: this.props.moduleInfo, colItems: colItems, api: this.props.api, accessLevel: accessLevel, teamSharingActivated: this.props.teamSharingActivated, onDeleteConfirm: null, onShare: null }));
         });
         return (React.createElement(PopupPanel_1.PopupPanel, { button: clearAllButton, headerText: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() }, ArrayExtensions_1.default.IsNotNullOrEmpty(this.props.SystemStatusMessages) && (React.createElement(rebass_1.Box, { className: "ab-SystemStatus-Popup-List", padding: 2 },

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
-const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NamedQueryRedux"));
+const NamedQueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NamedQueryRedux"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const Tabs_1 = require("../../components/Tabs");
@@ -33,7 +33,7 @@ exports.useOnePageAdaptableWizardContext = useOnePageAdaptableWizardContext;
 const OnePageAdaptableWizard = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const dispatch = (0, react_redux_1.useDispatch)();
-    const saveNamedQuery = React.useCallback((namedQuery) => dispatch(QueryRedux.NamedQueryAdd(namedQuery)), []);
+    const saveNamedQuery = React.useCallback((namedQuery) => dispatch(NamedQueryRedux.NamedQueryAdd(namedQuery)), []);
     const [namedQuery, setNamedQuery] = (0, react_1.useState)(false);
     const name = props.moduleInfo.FriendlyName
         ? `${(0, kebabCase_1.default)(props.moduleInfo.FriendlyName)}-wizard`