@adaptabletools/adaptable 18.1.14 → 19.0.0-canary.0

package/src/View/Dashboard/CustomToolbar.js

@@ -99,15 +99,8 @@ export const CustomToolbarWrapper = (props) => {
     const { api } = useAdaptable();
     return (React.createElement(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(CustomToolbarCmp, Object.assign({}, props))));
 };

package/src/View/Dashboard/Dashboard.js

@@ -21,9 +21,7 @@ import { PinnedDashboard } from './PinnedDashboard';
 import { ModuleToolbarWrapper } from './ModuleToolbarWrapper';
 const DashboardComponent = (props) => {
     const [searchText, search] = 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();
@@ -60,7 +58,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

@@ -53,9 +53,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

@@ -9,8 +9,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 = AdaptableViewPanelFactory.get(props.toolbarName);
     if (!moduleToolbarView) {

package/src/View/Dashboard/PinnedToolbarsSelector.js

@@ -5,8 +5,7 @@ import { DashboardSetPinnedToolbars } from '../../Redux/ActionsReducers/Dashboar
 import { useAdaptable } from '../AdaptableContext';
 export const PinnedToolbarsSelector = (props) => {
     const { api } = useAdaptable();
-    const dashboardAccessLevel = api.internalApi
-        .getEntitlementService()
+    const dashboardAccessLevel = api.entitlementApi
         .getEntitlementAccessLevelForModule('Dashboard');
     const isDashboardDisabled = dashboardAccessLevel === 'ReadOnly';
     const dashboardState = useSelector((state) => state.Dashboard);

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

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

package/src/View/Export/ExportViewPanel.js

@@ -63,7 +63,7 @@ class ExportViewPanelComponent extends React.Component {
             currentDestination = undefined;
             currentDestinationId = undefined;
         }
-        let accessLevel = AdaptableHelper.getAppropriateAccessLevel(currentReport, this.props.accessLevel);
+        let accessLevel = AdaptableHelper.getAccessLevelForObject(currentReport, this.props.accessLevel);
         let deleteMessage = "Are you sure you want to delete '";
         if (currentReport != null) {
             deleteMessage = deleteMessage + currentReport.Name + "'?";
@@ -82,9 +82,7 @@ class ExportViewPanelComponent extends React.Component {
                 React.createElement(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, { 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, { 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, { 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, { 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

@@ -9,15 +9,11 @@ export 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, { KeyValuePairs: keyValuePairs, header: this.props.moduleInfo.FriendlyName }));

package/src/View/GridFilter/GridFilterExpressionEditor.js

@@ -4,7 +4,7 @@ import { Box, Flex } from 'rebass';
 import { ExpressionEditor } from '../../components/ExpressionEditor';
 import { NamedQueryContext, } from '../../components/ExpressionEditor/NamedQueryContext';
 import SimpleButton from '../../components/SimpleButton';
-import * as QueryRedux from '../../Redux/ActionsReducers/NamedQueryRedux';
+import * as NamedQueryRedux from '../../Redux/ActionsReducers/NamedQueryRedux';
 import { PopupShowForm } from '../../Redux/ActionsReducers/PopupRedux';
 import { GridFilterModuleId } from '../../Utilities/Constants/ModuleConstants';
 import { IsNotNullOrEmpty, IsNullOrEmpty } from '../../Utilities/Extensions/StringExtensions';
@@ -28,7 +28,7 @@ export 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(PopupShowForm({
             Id: 'save_query_form',

package/src/View/GridFilter/useGridFilterExpressionEditor.js

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

package/src/View/Layout/LayoutViewPanel.js

@@ -19,7 +19,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.getAppropriateAccessLevel(layoutEntity, this.props.accessLevel);
+        const accessLevel = AdaptableHelper.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

@@ -20,13 +20,7 @@ export 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

@@ -7,9 +7,7 @@ import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 export const SaveLayoutButton = () => {
     const adaptable = useAdaptable();
-    const accessLevel = adaptable.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(ModuleConstants.LayoutModuleId);
+    const accessLevel = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants.LayoutModuleId);
     const dispatch = useDispatch();
     const currentDraftLayout = useSelector((state) => state.Grid.CurrentLayout);
     const isManualSaveLayout = !adaptable.api.layoutApi.shouldAutoSaveLayouts();

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

@@ -5,11 +5,11 @@ import DropdownButton from '../../../../components/DropdownButton';
 import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
-import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
 import { columnFilter } from './Utilities';
+import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 const WEIGHTED_AVERAGE_AGG_FN_NAME = 'weightedAvg';
 export const isAggregationsSectionValid = (data) => {
     const weightedAvg = data.AggregationColumns
@@ -106,7 +106,7 @@ export const AggregationsSection = (props) => {
     const numberColumns = adaptable.api.columnApi.getNumericColumns();
     const sortedAggregableColumns = React.useMemo(() => {
         var _a, _b;
-        return 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.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

@@ -8,7 +8,6 @@ import SimpleButton from '../../../../components/SimpleButton';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
 import { isValidOrderForColumnGroups, } from '../../../../PredefinedConfig/Common/AdaptableColumn';
-import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
@@ -17,6 +16,7 @@ import { Icon } from '../../../../components/icons';
 import { CheckBox } from '../../../../components/CheckBox';
 import { clamp } from '../../../../Utilities/Helpers/Helper';
 import { ColumnLabels } from '../Components/ColumnLabels';
+import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 const PropertyOrderText = (props) => (React.createElement(Text, { fontWeight: 600, fontSize: 2 }, props.children));
 export const ColumnsSectionSummary = () => {
     const adaptable = useAdaptable();
@@ -187,7 +187,7 @@ export const ColumnsSection = (props) => {
     const { data: layout } = useOnePageAdaptableWizardContext();
     const allColumns = adaptable.api.columnApi.getColumns();
     const sortedColumns = React.useMemo(() => {
-        return sortWithOrderArray(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions.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

@@ -2,11 +2,11 @@ import * as React from 'react';
 import { Box } from 'rebass';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
-import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
 import { columnFilter } from './Utilities';
+import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 export const PivotColumnsSectionSummary = () => {
     var _a;
     const adaptable = useAdaptable();
@@ -20,7 +20,7 @@ export const PivotColumnsSection = (props) => {
     const allPivotColumns = adaptable.api.columnApi.getPivotableColumns();
     const sortedPivotColumns = React.useMemo(() => {
         var _a;
-        return 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.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

@@ -4,10 +4,10 @@ import FormLayout, { FormRow } from '../../../../components/FormLayout';
 import { columnFilter } from './Utilities';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
-import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
+import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 export const RowGroupingSectionSummary = () => {
     var _a;
     const adaptable = useAdaptable();
@@ -37,7 +37,7 @@ export const RowGroupingSection = (props) => {
     const allGroupableColumns = adaptable.api.columnApi.getGroupableColumns();
     const sortedGroupableColumns = React.useMemo(() => {
         var _a;
-        return 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.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

@@ -11,12 +11,12 @@ import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } fro
 import { mapColumnDataTypeToExpressionFunctionType } from '../../../../Utilities/adaptableQlUtils';
 import { LayoutModuleId } from '../../../../Utilities/Constants/ModuleConstants';
 import { aggregatedExpressionFunctions } from '../../../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
-import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
 import { SuspendToggleButton } from '../../../Components/Buttons/SuspendToggleButton';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
 import { columnFilter } from './Utilities';
+import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 export const areSummaryRowsValid = (layout) => {
     var _a;
     if (!layout.RowSummaries)
@@ -94,7 +94,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 sortWithOrderArray(colIds, Object.keys(rowSummary.ColumnsMap), {
+        return ArrayExtensions.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

@@ -4,11 +4,11 @@ import SimpleButton from '../../../../components/SimpleButton';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
 import { getLayoutSortViewItems } from '../../../../Strategy/Utilities/Layout/getLayoutSortViewItems';
-import { sortWithOrderArray } from '../../../../Utilities/sortWithOrder';
 import { useAdaptable } from '../../../AdaptableContext';
 import { ValueSelector } from '../../../Components/ValueSelector';
 import { useOnePageAdaptableWizardContext } from '../../../Wizard/OnePageAdaptableWizard';
 import { columnFilter } from './Utilities';
+import ArrayExtensions from '../../../../Utilities/Extensions/ArrayExtensions';
 export const SortSectionSummary = () => {
     const { data: layout } = useOnePageAdaptableWizardContext();
     const adaptable = useAdaptable();
@@ -30,7 +30,7 @@ export const SortSection = (props) => {
     const allSortableColumns = adaptable.api.columnApi.getSortableColumns();
     const sortedSortColumns = React.useMemo(() => {
         var _a;
-        return 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.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

@@ -7,7 +7,7 @@ import { cloneObject } from '../../../Utilities/Helpers/Helper';
 import { isValidNamedQueryExpression, NamedQueryExpressionWizardSection, renderNamedQueryExpressionSummary, } from './NamedQueryExpressionWizardSection';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { useDispatch } from 'react-redux';
-import * as QueryRedux from '../../../Redux/ActionsReducers/NamedQueryRedux';
+import * as NamedQueryRedux from '../../../Redux/ActionsReducers/NamedQueryRedux';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
 export function NamedQueryWizard(props) {
     const [namedQuery, setNamedQuery] = useState(() => {
@@ -20,10 +20,10 @@ export function NamedQueryWizard(props) {
     const dispatch = 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

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

package/src/View/SystemStatus/SystemStatusPopup.js

@@ -24,7 +24,7 @@ class SystemStatusPopupComponent extends React.Component {
     render() {
         let clearAllButton = (React.createElement(SimpleButton, { onClick: () => this.onSystemStatusMessageInfoDeleteAll(), tooltip: "Clear All", tone: "neutral", variant: "raised", accessLevel: this.props.accessLevel, disabled: ArrayExtensions.IsNullOrEmpty(this.props.SystemStatusMessages) }, "Delete All Messages"));
         const messages = ArrayExtensions.sortArrayWithProperty(SortOrder.Desc, this.props.SystemStatusMessages, 'Timestamp').map((smi, index) => {
-            const accessLevel = AdaptableHelper.getAppropriateAccessLevel(smi, this.props.accessLevel);
+            const accessLevel = AdaptableHelper.getAccessLevelForObject(smi, this.props.accessLevel);
             return (React.createElement(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, { button: clearAllButton, headerText: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() }, ArrayExtensions.IsNotNullOrEmpty(this.props.SystemStatusMessages) && (React.createElement(Box, { className: "ab-SystemStatus-Popup-List", padding: 2 },

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { Box, Text } from 'rebass';
-import * as QueryRedux from '../../Redux/ActionsReducers/NamedQueryRedux';
+import * as NamedQueryRedux from '../../Redux/ActionsReducers/NamedQueryRedux';
 import SimpleButton from '../../components/SimpleButton';
 import { useAdaptable } from '../AdaptableContext';
 import { Tabs } from '../../components/Tabs';
@@ -25,7 +25,7 @@ export function useOnePageAdaptableWizardContext() {
 export const OnePageAdaptableWizard = (props) => {
     const { api } = useAdaptable();
     const dispatch = useDispatch();
-    const saveNamedQuery = React.useCallback((namedQuery) => dispatch(QueryRedux.NamedQueryAdd(namedQuery)), []);
+    const saveNamedQuery = React.useCallback((namedQuery) => dispatch(NamedQueryRedux.NamedQueryAdd(namedQuery)), []);
     const [namedQuery, setNamedQuery] = useState(false);
     const name = props.moduleInfo.FriendlyName
         ? `${kebabCase(props.moduleInfo.FriendlyName)}-wizard`

package/src/agGrid/ActionColumnRenderer.js

@@ -46,13 +46,14 @@ export const ReactActionColumnRenderer = (props) => {
     const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(props.node);
     const isSummaryRow = adaptable.api.gridApi.isSummaryNode(props.node);
     let shouldRender = true;
+    const isActionRowColumn = adaptable.api.columnApi.internalApi.isActionRowButtonColumn(props.colDef.colId);
     if (isGroupedRow) {
-        if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows) {
+        if (isActionRowColumn || ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows)) {
             shouldRender = false;
         }
     }
     else if (isSummaryRow) {
-        if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+        if (isActionRowColumn || ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows)) {
             shouldRender = false;
         }
     }
@@ -65,15 +66,7 @@ export const ReactActionColumnRenderer = (props) => {
         return null;
     }
     const pkValue = adaptable.getPrimaryKeyValueFromRowNode(props.node, props.api);
-    const buttonContext = {
-        actionColumn,
-        primaryKeyValue: pkValue,
-        rowNode: props.node,
-        adaptableApi: adaptable.api,
-        userName: adaptable.adaptableOptions.userName,
-        adaptableId: adaptable.adaptableOptions.adaptableId,
-        data: props.data,
-    };
+    const buttonContext = Object.assign(Object.assign({ actionColumn, primaryKeyValue: pkValue, rowNode: props.node }, adaptable.api.internalApi.buildBaseContext()), { data: props.data });
     return (React.createElement("div", { className: "ab-ActionColumn" },
         React.createElement(ActionButtons, { buttons: actionButtons, adaptableApi: adaptable.api, context: buttonContext, rerender: rerender })));
 };
@@ -96,13 +89,14 @@ export class ActionColumnRenderer {
         const isGroupedRow = adaptable.api.gridApi.isGroupRowNode(params.node);
         const isSummaryRow = adaptable.api.gridApi.isSummaryNode(params.node);
         let shouldRender = true;
+        const isActionRowColumn = adaptable.api.columnApi.internalApi.isActionRowButtonColumn(params.colDef.colId);
         if (isGroupedRow) {
-            if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows) {
+            if (isActionRowColumn || ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows)) {
                 shouldRender = false;
             }
         }
         else if (isSummaryRow) {
-            if ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows) {
+            if (isActionRowColumn || ((_b = actionColumn.rowScope) === null || _b === void 0 ? void 0 : _b.ExcludeSummaryRows)) {
                 shouldRender = false;
             }
         }
@@ -116,15 +110,7 @@ export class ActionColumnRenderer {
             return;
         }
         const pkValue = adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
-        const buttonContext = {
-            actionColumn,
-            primaryKeyValue: pkValue,
-            rowNode: params.node,
-            adaptableApi: adaptable.api,
-            userName: adaptable.adaptableOptions.userName,
-            adaptableId: adaptable.adaptableOptions.adaptableId,
-            data: params.data,
-        };
+        const buttonContext = Object.assign(Object.assign({ actionColumn, primaryKeyValue: pkValue, rowNode: params.node }, adaptable.api.internalApi.buildBaseContext()), { data: params.data });
         const eGui = this.eGui;
         const doRender = () => {
             this.unmountReactRoot = adaptable.renderReactRoot(renderWithAdaptableContext(ActionButtons({

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -3,7 +3,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { ChartRef, Column, GridApi, GridOptions, IRowNode, Module, RowModelType } from '@ag-grid-community/core';
 import { AdaptableLogger } from './AdaptableLogger';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableVariant, DistinctColumnValuesParams, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, DistinctColumnValuesParams, IAdaptable, NormalizeAdaptableStateOptions } from '../AdaptableInterfaces/IAdaptable';
 import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AgGridAdapter } from './AgGridAdapter';
@@ -11,8 +11,6 @@ import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { AdaptableState } from '../PredefinedConfig/AdaptableState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
-import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
-import { IReportService } from '../Utilities/Services/Interface/IReportService';
 import { IModuleService } from '../Utilities/Services/Interface/IModuleService';
 import { IValidationService } from '../Utilities/Services/Interface/IValidationService';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -28,7 +26,7 @@ import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
-export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'available' | 'ready' | 'preDestroyed';
+export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'agGridReady' | 'available' | 'ready' | 'preDestroyed';
 type RenderAgGridFrameworkComponentResult = false | GridApi;
 interface AdaptableInitInternalConfig<TData = any> {
     variant: AdaptableVariant;
@@ -44,6 +42,7 @@ interface AdaptableInitInternalConfig<TData = any> {
 export declare class AdaptableAgGrid implements IAdaptable {
     logger: AdaptableLogger;
     private _id;
+    private _agGridId;
     lifecycleState: AdaptableLifecycleState;
     variant: AdaptableVariant;
     private emitter;
@@ -73,8 +72,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     adaptableModules: IModuleCollection;
     DataService: IDataService;
     CalculatedColumnExpressionService: ICalculatedColumnExpressionService;
-    EntitlementService: IEntitlementService;
-    ReportService: IReportService;
     ModuleService: IModuleService;
     ValidationService: IValidationService;
     QueryLanguageService: IQueryLanguageService;
@@ -128,6 +125,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     static forEachAdaptable(fn: (adaptable: AdaptableAgGrid) => void): void;
     private static collectInstance;
     private static dismissInstance;
+    get isAgGridInitialising(): boolean;
     get isReady(): boolean;
     get isAvailable(): boolean;
     get isDestroyed(): boolean;
@@ -141,7 +139,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
      */
     static _initInternal(config: AdaptableInitInternalConfig): Promise<AdaptableApi>;
     private _initAdaptableAgGrid;
-    normalizeAdaptableState(state: AdaptableState, gridOptions: GridOptions): AdaptableState;
+    normalizeAdaptableState(state: AdaptableState, agGridOptions: NormalizeAdaptableStateOptions): AdaptableState;
     private normaliseLayoutState;
     private normaliseToolPanelState;
     refreshQuickFilter(): void;
@@ -351,5 +349,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private onSortChanged;
     private getColumnSorts;
     private monkeyPatchingGridOptionsUpdates;
+    private DANGER_getPrivateAgGridBeans;
 }
 export {};