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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "18.1.13",
+  "version": "18.1.15-canary.0",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",
@@ -64,7 +64,7 @@
     "react-toastify": "9.1.3"
   },
   "peerDependencies": {
-    "ag-grid-community": ">=31.3.1"
+    "ag-grid-community": ">=32.1.0"
   },
   "publishTimestamp": 0
 }

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -15,11 +15,9 @@ import { AdaptableMenuItem, AdaptableOptions, AdaptablePlugin, AdaptableState, C
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { CellPopupService } from '../Utilities/Services/CellPopupService';
-import { IReportService } from '../Utilities/Services/Interface/IReportService';
 import { IValidationService } from '../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../Utilities/Services/Interface/IModuleService';
 import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
 import { ITeamSharingService } from '../Utilities/Services/Interface/ITeamSharingService';
@@ -63,6 +61,7 @@ export interface IAdaptable {
     variant: AdaptableVariant;
     isReady: boolean;
     isDestroyed: boolean;
+    isAgGridInitialising: boolean;
     api: AdaptableApi;
     adaptableOptions: AdaptableOptions;
     adaptableStore: IAdaptableStore;
@@ -81,9 +80,7 @@ export interface IAdaptable {
     DataService: IDataService;
     ValidationService: IValidationService;
     CalculatedColumnExpressionService: ICalculatedColumnExpressionService;
-    ReportService: IReportService;
     ModuleService: IModuleService;
-    EntitlementService: IEntitlementService;
     QueryLanguageService: IQueryLanguageService;
     AlertService: IAlertService;
     TeamSharingService: ITeamSharingService;
@@ -270,5 +267,6 @@ export interface IAdaptable {
     canExportToExcel(): boolean;
     exportToExcel(reportData: ReportData, fileName: string): void;
     exportVisualDataToExcel(): void;
-    normalizeAdaptableState(state: AdaptableState, gridOptions: GridOptions): AdaptableState;
+    normalizeAdaptableState(state: AdaptableState, options: NormalizeAdaptableStateOptions): AdaptableState;
 }
+export type NormalizeAdaptableStateOptions = Pick<GridOptions, 'rowModelType' | 'treeData' | 'columnDefs' | 'autoGroupColumnDef'>;

package/src/AdaptableOptions/AlertOptions.d.ts

@@ -49,7 +49,7 @@ export interface AlertOptions<TData = any> {
      * @defaultValue 'rawValue'
      * @gridInfoItem
      */
-    dataChangeDetectionPolicy?: 'rawValue' | 'formattedValue';
+    dataChangeDetectionPolicy?: DataChangeDetectionPolicy;
     /**
      * Function providing Header to display in Alert; if empty, AdapTable provides dynamically
      */
@@ -68,6 +68,7 @@ export interface AlertOptions<TData = any> {
      */
     showMissingPrimaryKeyAlert?: boolean;
 }
+export type DataChangeDetectionPolicy = 'rawValue' | 'formattedValue';
 /**
  * Handles a Form Button Action
  */

package/src/AdaptableOptions/ChartingOptions.d.ts

@@ -9,7 +9,7 @@ export interface ChartingOptions {
      * @defaultValue 'none'
      * @noCodeItem
      */
-    saveStrategy?: 'auto' | 'manual' | 'none';
+    saveChartBehaviour?: SaveChartBehaviour;
     /**
      * Locations to display saved Charts
      */
@@ -81,3 +81,7 @@ export interface ExternalChartingContext<T = unknown> extends BaseContext {
      */
     container?: ChartContainer;
 }
+/**
+ * How Charts are saved
+ */
+export type SaveChartBehaviour = 'auto' | 'manual' | 'none';

package/src/AdaptableOptions/ColumnFilterOptions.d.ts

@@ -142,7 +142,7 @@ export interface QuickFilterOptions<TData = any> {
      * @gridInfoItem
      * @noCodeItem
      */
-    quickFilterTrigger?: 'mouseenter' | 'click';
+    quickFilterTrigger?: FilterTrigger;
     /**
      * Sets a height for Quick Filter Bar (if not provided AG Grid's default is used)
      *
@@ -305,3 +305,7 @@ export interface ValuesFilterPredicateContext<TData = any> extends BaseContext {
  * Predicate used in Column Values Filter
  */
 export type ColumnValuesFilterPredicate = TypeHint<string, SystemFilterPredicateIds>;
+/**
+ * What triggers the dropdown
+ */
+export type FilterTrigger = 'mouseenter' | 'click';

package/src/AdaptableOptions/DashboardOptions.d.ts

@@ -36,7 +36,7 @@ export interface DashboardOptions {
      * @defaultValue 'right'
      * @noCodeItem
      */
-    buttonsLocation?: 'left' | 'right';
+    buttonsLocation?: DashboardButtonsLocation;
 }
 /**
  * Custom Toolbar (which AdapTable will manage) enabling devs to populate Dashboard with bepoke content
@@ -89,3 +89,7 @@ export interface CustomToolbarButtonContext extends DashboardButtonContext {
      */
     customToolbar: CustomToolbar;
 }
+/**
+ * Where Dashboard Buttons are displayed
+ */
+export type DashboardButtonsLocation = 'left' | 'right';

package/src/AdaptableOptions/FlashingCellOptions.d.ts

@@ -7,7 +7,7 @@ export interface FlashingCellOptions {
      * Should a cell or whole row flash
      * @defaultValue  'cell'
      */
-    defaultFlashTarget?: 'row' | 'cell';
+    defaultFlashTarget?: FlashTarget;
     /**
      * Style for 'Down' value changes
      *  @defaultValue  Red BackColour
@@ -29,3 +29,7 @@ export interface FlashingCellOptions {
      */
     defaultFlashDuration?: number | 'always';
 }
+/**
+ * Where a Flash can happen
+ */
+export type FlashTarget = 'row' | 'cell';

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -20,7 +20,7 @@ export interface LayoutOptions {
      * @defaultValue 'closed'
      * @gridInfoItem
      */
-    displayRowGroups?: 'dynamic' | 'expanded' | 'closed';
+    displayRowGroups?: DisplayRowGroups;
     /**
      * Layouts save whenever Grid's column / sort info changes; if false, a Save button will display
      *
@@ -146,3 +146,7 @@ export interface PivotPreviewColumnsContext extends BaseContext {
      */
     columnId: string;
 }
+/**
+* How Row Groups are displayed
+*/
+export type DisplayRowGroups = 'dynamic' | 'expanded' | 'closed';

package/src/AdaptableOptions/NotificationsOptions.d.ts

@@ -16,7 +16,7 @@ export interface NotificationsOptions {
      * @defaultValue 'BottomRight'
      * @gridInfoItem
      */
-    position?: TOAST_POSITIONS;
+    position?: ToastPositions;
     /**
      * How long (in ms) Notifications display for
      *
@@ -83,4 +83,8 @@ export interface NotificationsOptions {
 /**
  * Different positions offered by Notifications
  */
-export type TOAST_POSITIONS = 'TopRight' | 'TopCenter' | 'TopLeft' | 'BottomRight' | 'BottomCenter' | 'BottomLeft';
+export type ToastPositions = 'TopRight' | 'TopCenter' | 'TopLeft' | 'BottomRight' | 'BottomCenter' | 'BottomLeft';
+/**
+ * Different transitions offered by Notifications
+ */
+export type ToastTransitions = 'Bounce' | 'Slide' | 'Zoom' | 'Flip';

package/src/AdaptableOptions/SettingsPanelOptions.d.ts

@@ -62,7 +62,7 @@ export interface SettingsPanelOptions {
      *
      * @defaultValue 'window'
      */
-    popupType?: 'modal' | 'window';
+    popupType?: PopupType;
     /**
      * Custom Settings Panels provided by developers at design-time
      */
@@ -89,3 +89,7 @@ export interface CustomSettingsPanel {
      */
     frameworkComponent?: AdaptableFrameworkComponent;
 }
+/**
+ * Type of Popup
+ */
+export type PopupType = 'modal' | 'window';

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -100,7 +100,7 @@ export interface UserInterfaceOptions<TData = any> {
      */
     disableDeleteConfirmation?: boolean;
     /**
-     * Alternative names to use for Adaptable Modules in toolbars and menus
+     * Alternative names to use for Adaptable Modules in the UI
      *
      * @defaultValue null
      */

package/src/Api/ChartingApi.d.ts

@@ -100,10 +100,10 @@ export interface ChartingApi {
      *
      * @param chartDef external chart definition
      * @param options
-     * @param options.saveStrategy whether to ask the user to provide a name for the chart
+     * @param options.saveChartBehaviour whether to ask the user to provide a name for the chart
      */
     addExternalChartDefinition(chartDef: ExternalChartDefinition, options?: {
-        saveStrategy: 'auto' | 'manual';
+        saveChartBehaviour: 'auto' | 'manual';
     }): void;
     /**
      * Edit existing external chart definition

package/src/Api/ColumnApi.d.ts

@@ -295,6 +295,12 @@ export interface ColumnApi {
      * @param columnId Column to Check
      */
     getDistinctDisplayValuesForColumn(columnId: string): any[];
+    /**
+     * Sets a new Caption / Header for a Column (only for current Layout)
+     * @param columnId Column to Update
+     * @param caption New Caption to display
+     */
+    setColumnCaption(columnId: string, caption: string): void;
 }
 /**
  * Configuration of an AG Grid Column, used for runtime updating of ColDefs

package/src/Api/ConfigApi.d.ts

@@ -15,7 +15,7 @@ import { AdaptablePersistentState, AdaptableState } from '../PredefinedConfig/Ad
 import { FreeTextColumnState } from '../PredefinedConfig/FreeTextColumnState';
 import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
 import { AdaptableStateKey, AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedConfig, ScheduleState, NoteState } from '../types';
+import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedConfig, ScheduleState, NoteState, ChartingState, FlashingCellState, StatusBarState, StyledColumnState } from '../types';
 /**
  * Range of functions to access Predefined Config and Adaptable State
  */
@@ -38,7 +38,7 @@ export interface ConfigApi {
      */
     getPredefinedConfig(): PredefinedConfig | any;
     /**
-     * Reloads either existing or supplied Predefined Config; clears persistent state by calling `StateOptions.clearState()` function for remote storage removal
+     * Reloads existing or supplied Predefined Config; clears persistent state by calling `StateOptions.clearState` function for remote storage removal
      * @param newPredefinedConfig optional Config to load
      */
     reloadPredefinedConfig(newPredefinedConfig?: PredefinedConfig): void;
@@ -109,6 +109,11 @@ export interface ConfigApi {
      * @param returnJson return as JSON rather than object
      */
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
+    /**
+     * Returns Charting section of Adaptable State
+     * @param returnJson return as JSON rather than object
+     */
+    getChartingState(returnJson?: boolean): ChartingState;
     /**
      * Returns Note section of Adaptable State
      * @param returnJson return as JSON rather than object
@@ -129,6 +134,11 @@ export interface ConfigApi {
      * @param returnJson return as JSON rather than object
      */
     getExportState(returnJson?: boolean): ExportState;
+    /**
+     * Returns Flashing Cell section of Adaptable State
+     * @param returnJson return as JSON rather than object
+     */
+    getFlashingCellState(returnJson?: boolean): FlashingCellState;
     /**
      * Returns Format Column section of Adaptable State
      * @param returnJson return as JSON rather than object
@@ -169,6 +179,16 @@ export interface ConfigApi {
      * @param returnJson return as JSON rather than object
      */
     getShortcutState(returnJson?: boolean): ShortcutState;
+    /**
+     * Returns StatusBar section of Adaptable State
+     * @param returnJson return as JSON rather than object
+     */
+    getStatusBarState(returnJson?: boolean): StatusBarState;
+    /**
+     * Returns StyledColumn section of Adaptable State
+     * @param returnJson return as JSON rather than object
+     */
+    getStyledColumnState(returnJson?: boolean): StyledColumnState;
     /**
      * Returns Theme section of Adaptable State
      * @param returnJson return as JSON rather than object

package/src/Api/Events/LiveDataChanged.d.ts

@@ -11,7 +11,7 @@ export interface LiveDataChangedInfo extends BaseEventInfo {
     /**
      * What triggered the event to fire
      */
-    liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated';
+    liveDataTrigger: 'Connected' | 'Disconnected' | 'SnapshotSent' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated';
     /**
      * The Report which is currently live - only used if the Trigger is LiveData related
      */

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

@@ -100,7 +100,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     commentApi: CommentApi;
     private destroyed;
     constructor(adaptable: IAdaptable);
-    get agGridApi(): import("@ag-grid-community/core/dist/types/src/gridApi").GridApi<any>;
+    get agGridApi(): import("@ag-grid-community/core/dist/types/src/api/gridApi").GridApi<any>;
     /**
      * This is only meant to be called by the Adaptable instance.
      */

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

@@ -32,7 +32,7 @@ export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
     setChartReadOnly(chartDefinition: ChartDefinition): void;
     setChartEditable(chartDefinition: ChartDefinition): void;
     addExternalChartDefinition(chartDefinition: ExternalChartDefinition, options: {
-        saveStrategy: 'auto' | 'manual';
+        saveChartBehaviour: 'auto' | 'manual';
     }): void;
     editExternalChartDefinition(chartDefinition: ExternalChartDefinition): void;
     deleteExternalChartDefinition(chartDefinition: ExternalChartDefinition): void;

package/src/Api/Implementation/ChartingApiImpl.js

@@ -117,8 +117,8 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
     }
     addExternalChartDefinition(chartDefinition, options) {
         var _a, _b, _c;
-        const saveStrategy = (_a = options === null || options === void 0 ? void 0 : options.saveStrategy) !== null && _a !== void 0 ? _a : 'manual';
-        if (saveStrategy === 'auto') {
+        const saveChartBehaviour = (_a = options === null || options === void 0 ? void 0 : options.saveChartBehaviour) !== null && _a !== void 0 ? _a : 'manual';
+        if (saveChartBehaviour === 'auto') {
             this.dispatchAction(ChartingRedux.ChartingAddExternalChart(Object.assign(Object.assign({}, chartDefinition), { Name: (_b = chartDefinition.Name) !== null && _b !== void 0 ? _b : this.internalApi.getUniqueChartName() })));
         }
         else {

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

@@ -73,4 +73,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     updateColumnConfigurations(columnConfigs: ColumnConfig[]): void;
     setColumnDefinitions(columnDefinitions: (ColDef | ColGroupDef)[]): void;
     getDistinctDisplayValuesForColumn(columnId: string): any[];
+    setColumnCaption(columnId: string, caption: string): void;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -402,5 +402,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getDistinctDisplayValuesForColumn(columnId) {
         return this.getAdaptableApi().gridApi.internalApi.getDistinctDisplayValuesForColumn(columnId);
     }
+    setColumnCaption(columnId, caption) {
+        return this.getAdaptableApi().layoutApi.setColumnCaption(columnId, caption);
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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

@@ -17,7 +17,7 @@ import { FreeTextColumnState } from '../../PredefinedConfig/FreeTextColumnState'
 import { ToolPanelState } from '../../PredefinedConfig/ToolPanelState';
 import { ConfigApi } from '../ConfigApi';
 import { AdaptableModule, AdaptableStateKey } from '../../PredefinedConfig/Common/Types';
-import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, NamedQueryState, ScheduleState } from '../../types';
+import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, FlashingCellState, NamedQueryState, ScheduleState, StatusBarState, StyledColumnState } from '../../types';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
 import { ChartingState } from '../../PredefinedConfig/ChartingState';
 import { NoteState } from '../../PredefinedConfig/NoteState';
@@ -55,12 +55,15 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getExportState(returnJson?: boolean): ExportState;
     getFreeTextColumnState(returnJson?: boolean): FreeTextColumnState;
     getFormatColumnState(returnJson?: boolean): FormatColumnState;
+    getFlashingCellState(returnJson?: boolean): FlashingCellState;
     getLayoutState(returnJson?: boolean): LayoutState;
     getPlusMinusState(returnJson?: boolean): PlusMinusState;
     getNamedQueryState(returnJson?: boolean): NamedQueryState;
     getQuickSearchState(returnJson?: boolean): QuickSearchState;
     getScheduleState(returnJson?: boolean): ScheduleState;
     getShortcutState(returnJson?: boolean): ShortcutState;
+    getStatusBarState(returnJson?: boolean): StatusBarState;
+    getStyledColumnState(returnJson?: boolean): StyledColumnState;
     getThemeState(returnJson?: boolean): ThemeState;
     getToolPanelState(returnJson?: boolean): ToolPanelState;
     dispatchStateReadyAction(module: AdaptableModule): void;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -136,7 +136,13 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                         adaptableStateKey,
                         predefinedConfig,
                         postLoadHook: (state) => {
-                            return this.adaptable.normalizeAdaptableState(state, this.adaptable.agGridAdapter.getLiveGridOptions());
+                            const agGridOptions = {
+                                columnDefs: this.adaptable.agGridAdapter.getGridOption('columnDefs'),
+                                autoGroupColumnDef: this.adaptable.agGridAdapter.getGridOption('autoGroupColumnDef'),
+                                rowModelType: this.adaptable.agGridAdapter.getGridOption('rowModelType'),
+                                treeData: this.adaptable.agGridAdapter.getGridOption('treeData'),
+                            };
+                            return this.adaptable.normalizeAdaptableState(state, agGridOptions);
                         },
                     });
                     promise
@@ -285,6 +291,9 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnState(returnJson = false) {
         return this.getUserStateByStateKey('FormatColumn', returnJson);
     }
+    getFlashingCellState(returnJson = false) {
+        return this.getUserStateByStateKey('FlashingCell', returnJson);
+    }
     getLayoutState(returnJson = false) {
         return this.getUserStateByStateKey('Layout', returnJson);
     }
@@ -303,6 +312,12 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getShortcutState(returnJson = false) {
         return this.getUserStateByStateKey('Shortcut', returnJson);
     }
+    getStatusBarState(returnJson = false) {
+        return this.getUserStateByStateKey('StatusBar', returnJson);
+    }
+    getStyledColumnState(returnJson = false) {
+        return this.getUserStateByStateKey('StyledColumn', returnJson);
+    }
     getThemeState(returnJson = false) {
         return this.getUserStateByStateKey('Theme', returnJson);
     }

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

@@ -1,8 +1,11 @@
 import { ApiBase } from './ApiBase';
 import { EntitlementApi } from '../EntitlementApi';
 import { AccessLevel, AdaptableModule, AdaptableObject } from '../../types';
+import { EntitlementInternalApi } from '../Internal/EntitlementInternalApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class EntitlementApiImpl extends ApiBase implements EntitlementApi {
-    private getEntitlementService;
+    internalApi: EntitlementInternalApi;
+    constructor(adaptable: IAdaptable);
     getEntitlementAccessLevelForModule(adaptableModule: AdaptableModule): AccessLevel;
     isObjectReadonly(object: AdaptableObject): boolean;
     isModuleHiddenEntitlement(adaptableModule: AdaptableModule): boolean;

package/src/Api/Implementation/EntitlementApiImpl.js

@@ -2,24 +2,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntitlementApiImpl = void 0;
 const ApiBase_1 = require("./ApiBase");
+const EntitlementInternalApi_1 = require("../Internal/EntitlementInternalApi");
 class EntitlementApiImpl extends ApiBase_1.ApiBase {
-    getEntitlementService() {
-        return this.getAdaptableApi().internalApi.getEntitlementService();
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new EntitlementInternalApi_1.EntitlementInternalApi(adaptable);
     }
     getEntitlementAccessLevelForModule(adaptableModule) {
-        return this.getEntitlementService().getEntitlementAccessLevelForModule(adaptableModule);
+        let entitlementOptions = this.getEntitlementOptions();
+        if (entitlementOptions) {
+            const defaultAccessLevelContext = this.getAdaptableApi().internalApi.buildBaseContext();
+            const defaultAccessLevel = typeof entitlementOptions.defaultAccessLevel === 'function'
+                ? entitlementOptions.defaultAccessLevel(defaultAccessLevelContext)
+                : entitlementOptions.defaultAccessLevel;
+            const moduleEntitlements = entitlementOptions.moduleEntitlements;
+            if (moduleEntitlements) {
+                if (typeof moduleEntitlements === 'function') {
+                    const entitlementContext = Object.assign(Object.assign({ adaptableModule }, this.getAdaptableApi().internalApi.buildBaseContext()), { defaultAccessLevel });
+                    const dynamicModuleEntitlement = moduleEntitlements(entitlementContext);
+                    return dynamicModuleEntitlement !== null && dynamicModuleEntitlement !== void 0 ? dynamicModuleEntitlement : defaultAccessLevel;
+                }
+                else {
+                    const entitlement = moduleEntitlements.find((f) => f.adaptableModule === adaptableModule);
+                    if (entitlement) {
+                        return entitlement.accessLevel;
+                    }
+                }
+            }
+            // if still here then return their default Access Level
+            return defaultAccessLevel;
+        }
+        return 'Full';
     }
     isObjectReadonly(object) {
         return object.IsReadOnly;
     }
     isModuleHiddenEntitlement(adaptableModule) {
-        return this.getEntitlementService().isModuleHiddenEntitlement(adaptableModule);
+        return this.getEntitlementAccessLevelForModule(adaptableModule) == 'Hidden';
     }
     isModuleFullEntitlement(adaptableModule) {
-        return this.getEntitlementService().isModuleFullEntitlement(adaptableModule);
+        return this.getEntitlementAccessLevelForModule(adaptableModule) == 'Full';
     }
     isModuleReadOnlyEntitlement(adaptableModule) {
-        return this.getEntitlementService().isModuleReadOnlyEntitlement(adaptableModule);
+        return this.getEntitlementAccessLevelForModule(adaptableModule) == 'ReadOnly';
     }
 }
 exports.EntitlementApiImpl = EntitlementApiImpl;

package/src/Api/Implementation/ExportApiImpl.js

@@ -26,8 +26,8 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     }
     getReportByName(reportName) {
         // if system report then create
-        if (this.adaptable.ReportService.IsSystemReport(reportName)) {
-            return this.adaptable.ReportService.CreateSystemReport(reportName);
+        if (this.internalApi.isSystemReport(reportName)) {
+            return this.internalApi.createSystemReport(reportName);
         }
         else {
             return this.getReports().find((r) => r.Name == reportName);
@@ -48,14 +48,12 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         return currentDestination && this.getDestinationByName(currentDestination);
     }
     getAvailableSystemReports() {
-        return this.getExportOptions().systemReportNames.filter((s) => this.getAdaptableApi().internalApi.getReportService().IsSystemReportActive(s));
+        return this.getExportOptions().systemReportNames.filter((s) => this.internalApi.isSystemReportActive(s));
     }
     getAvailableExportDestinations() {
         let systemDestinations = [];
         this.getExportOptions().systemExportDestinations.forEach((exportDestination) => {
-            if (this.getAdaptableApi()
-                .internalApi.getReportService()
-                .IsSystemExportDestinationActive(exportDestination)) {
+            if (this.internalApi.isSystemExportDestinationActive(exportDestination)) {
                 systemDestinations.push(exportDestination);
             }
         });
@@ -147,7 +145,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             this.logWarn(`Report '${reportName}' not found!`);
             return undefined;
         }
-        return this.getAdaptableApi().internalApi.getReportService().getReportData(report);
+        return this.internalApi.getReportData(report);
     }
     isColumnExportable(adaptableColumn) {
         const isExportableFn = this.getExportOptions().isColumnExportable;

package/src/Api/Implementation/GridApiImpl.js

@@ -384,7 +384,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     isSummaryNode(rowNode) {
         var _a;
-        return (_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data) === null || _a === void 0 ? void 0 : _a[RowSummary_1.ROW_SUMMARY_ROW_ID];
+        return !!((_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data) === null || _a === void 0 ? void 0 : _a[RowSummary_1.ROW_SUMMARY_ROW_ID]);
     }
     isQuickFilterAvailable() {
         return this.adaptable.isQuickFilterAvailable();

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -47,17 +47,13 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     }
     isTeamSharingAvailable() {
         var _a, _b, _c;
-        return (!this.getAdaptableApi()
-            .internalApi.getEntitlementService()
-            .isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
+        return (!this.getAdaptableApi().entitlementApi.isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
             ((_a = this.adaptable.adaptableOptions.teamSharingOptions) === null || _a === void 0 ? void 0 : _a.enableTeamSharing) &&
             !!((_b = this.adaptable.adaptableOptions.teamSharingOptions) === null || _b === void 0 ? void 0 : _b.loadSharedEntities) &&
             !!((_c = this.adaptable.adaptableOptions.teamSharingOptions) === null || _c === void 0 ? void 0 : _c.persistSharedEntities));
     }
     hasTeamSharingFullRights() {
-        return this.getAdaptableApi()
-            .internalApi.getEntitlementService()
-            .isModuleFullEntitlement(ModuleConstants.TeamSharingModuleId);
+        return this.getAdaptableApi().entitlementApi.isModuleFullEntitlement(ModuleConstants.TeamSharingModuleId);
     }
     checkForUpdates() {
         this.dispatchAction((0, TeamSharingRedux_1.TeamSharingCheckForUpdates)());

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -10,11 +10,9 @@ import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChang
 import { ActionColumn, ActionColumnContext, AdaptableIcon, AdaptableObjectLookupCriteria, AdaptableQuery, AdaptableState, BaseContext } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
-import { IReportService } from '../../Utilities/Services/Interface/IReportService';
 import { ICalculatedColumnExpressionService } from '../../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { IDataService } from '../../Utilities/Services/Interface/IDataService';
-import { IEntitlementService } from '../../Utilities/Services/Interface/IEntitlementService';
 import { IQueryLanguageService } from '../../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../../Utilities/Services/Interface/IAlertService';
 import { ColDef, IRowNode } from '@ag-grid-community/core';
@@ -43,8 +41,8 @@ export declare class AdaptableInternalApi extends ApiBase {
         factoryId: string;
     }): void;
     hidePopupScreen(): void;
-    setSettingPanelModuleMenuItems(menuItems: AdaptableMenuItem[]): void;
-    setModuleButtonMenuItems(menuItems: AdaptableMenuItem[]): void;
+    setSettingsPanelItems(menuItems: AdaptableMenuItem[]): void;
+    setMenuModuleItems(menuItems: AdaptableMenuItem[]): void;
     setPivotModeOn(): void;
     setPivotModeOff(): void;
     isGridInPivotMode(): boolean;
@@ -59,9 +57,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     getModuleService(): IModuleService;
     getDataService(): IDataService;
     getCellPopupService(): CellPopupService;
-    getReportService(): IReportService;
     getCalculatedColumnExpressionService(): ICalculatedColumnExpressionService;
-    getEntitlementService(): IEntitlementService;
     getQueryLanguageService(): IQueryLanguageService;
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -39,11 +39,11 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     hidePopupScreen() {
         this.dispatchAction(PopupRedux.PopupHideScreen());
     }
-    setSettingPanelModuleMenuItems(menuItems) {
-        this.dispatchAction(GridRedux.SetSettingPanelModuleMenuItems(menuItems));
+    setSettingsPanelItems(menuItems) {
+        this.dispatchAction(GridRedux.setSettingsPanelItems(menuItems));
     }
-    setModuleButtonMenuItems(menuItems) {
-        this.dispatchAction(GridRedux.SetModuleButtonMenuItems(menuItems));
+    setMenuModuleItems(menuItems) {
+        this.dispatchAction(GridRedux.SetMenuModuleItems(menuItems));
     }
     setPivotModeOn() {
         this.dispatchAction(GridRedux.SetPivotModeOn());
@@ -100,15 +100,9 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     getCellPopupService() {
         return this.adaptable.CellPopupService;
     }
-    getReportService() {
-        return this.adaptable.ReportService;
-    }
     getCalculatedColumnExpressionService() {
         return this.adaptable.CalculatedColumnExpressionService;
     }
-    getEntitlementService() {
-        return this.adaptable.EntitlementService;
-    }
     getQueryLanguageService() {
         return this.adaptable.QueryLanguageService;
     }
@@ -455,7 +449,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     getActionButtonsAndActionColumn(colDef) {
         var _a;
         let actionColumn;
-        if (colDef.colId == GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS) {
+        if (this.getAdaptableApi().columnApi.internalApi.isActionRowButtonColumn(colDef.colId)) {
             const actionButtons = this.getActionRowApi().internalApi.getActionRowButtonDefs();
             actionColumn = {
                 columnId: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,

package/src/Api/Internal/EntitlementInternalApi.d.ts

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class EntitlementInternalApi extends ApiBase {
+    setModulesEntitlements(): void;
+}