@adaptabletools/adaptable 16.0.0-canary.0 → 16.0.0-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "16.0.0-canary.0",
+  "version": "16.0.0-canary.1",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1689690453149;
+declare const _default: 1689771442961;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1689690453149;
+exports.default = 1689771442961;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -1,4 +1,4 @@
-import { ChartModel, ChartRef, Column, GridOptions, IRowNode, ModuleNames, RowModelType, StatusPanelDef } from '@ag-grid-community/core';
+import { ChartModel, ChartRef, Column, GridOptions, IRowNode, Module, ModuleNames, RowModelType, StatusPanelDef } from '@ag-grid-community/core';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
@@ -28,6 +28,10 @@ import { ColumnValuesComparer } from '../AdaptableOptions/CustomSortOptions';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AdaptableLogger } from '../agGrid/AdaptableLogger';
+export interface AgGridConfig {
+    gridOptions: GridOptions;
+    modules: Module[];
+}
 export declare type AdaptableVariant = 'vanilla' | 'react' | 'angular';
 /**
  *  The only interface for Adaptable
@@ -281,4 +285,5 @@ export interface IAdaptable {
     getAgGridColumnForColumnId(columnId: string): Column;
     isAgGridModulePresent(moduleName: ModuleNames): boolean;
     getMinMaxCachedValueForColumn(column: AdaptableColumn, minMax: 'min' | 'max'): number | undefined;
+    getAgGridRegisteredModules(): Module[];
 }

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -16,7 +16,6 @@ import { ToolPanelOptions } from './ToolPanelOptions';
 import { FilterOptions } from './FilterOptions';
 import { DataChangeHistoryOptions } from './DataChangeHistoryOptions';
 import { SettingsPanelOptions } from './SettingsPanelOptions';
-import { GridOptions } from '@ag-grid-community/core';
 import { FlashingCellOptions } from './FlashingCellOptions';
 import { AlertOptions } from './AlertOptions';
 import { AdaptableQLOptions } from './AdaptableQLOptions';
@@ -55,10 +54,6 @@ export interface AdaptableOptions<TData = any> {
      * @gridInfoItem
      */
     autogeneratePrimaryKey?: boolean;
-    /**
-     * The AG Grid object which AdapTable interacts with.  Note: if using AdapTable React or AdapTable Angular, no need to populate this property as AdapTable wires it up differently
-     */
-    gridOptions?: GridOptions<TData>;
     /**
      * Commercial license key. If the license is not provided or is expired, various visual information notes will be displayed and some functionality may be limited.
      */

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -50,6 +50,8 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
                 return cellSummary.Distinct;
             case Enums_1.SummaryOperation.Count:
                 return cellSummary.Count;
+            case Enums_1.SummaryOperation.Only:
+                return cellSummary.Only;
             default:
                 return cellSummary[operation];
         }

package/src/PredefinedConfig/Common/CellSummary.d.ts

@@ -12,6 +12,7 @@ export interface CellSummmary {
     Max: number | undefined;
     Min: number | undefined;
     Count: number | undefined;
+    Only: string | undefined;
     [key: string]: any;
 }
 /**

package/src/PredefinedConfig/Common/Enums.d.ts

@@ -59,7 +59,8 @@ export declare enum SummaryOperation {
     Distinct = "Distinct",
     Max = "Max",
     Min = "Min",
-    Count = "Count"
+    Count = "Count",
+    Only = "Only"
 }
 export declare enum FilterOnDataChangeOptions {
     Always = "Always",

package/src/PredefinedConfig/Common/Enums.js

@@ -77,6 +77,7 @@ var SummaryOperation;
     SummaryOperation["Max"] = "Max";
     SummaryOperation["Min"] = "Min";
     SummaryOperation["Count"] = "Count";
+    SummaryOperation["Only"] = "Only";
 })(SummaryOperation = exports.SummaryOperation || (exports.SummaryOperation = {}));
 var FilterOnDataChangeOptions;
 (function (FilterOnDataChangeOptions) {

package/src/Strategy/CellSummaryModule.js

@@ -92,6 +92,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 Max: hasNumericColumns ? Helper_1.Helper.RoundNumberTo4dp(Math.max(...numericValues)) : undefined,
                 Min: hasNumericColumns ? Helper_1.Helper.RoundNumberTo4dp(Math.min(...numericValues)) : undefined,
                 Count: allValues.length,
+                Only: distinctCount == 1 ? JSON.stringify(allValues[0]) : ''
             };
             numericValues = [...newNumericValues];
             const operationDefinitions = this.api.cellSummaryApi.getCellSummaryOperationDefinitions();

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -12,7 +12,7 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 exports.DefaultAdaptableOptions = {
     adaptableId: GeneralConstants.ADAPTABLE_ID,
     adaptableStateKey: undefined,
-    gridOptions: null,
+    _gridOptions: null,
     primaryKey: '',
     autogeneratePrimaryKey: false,
     userName: GeneralConstants.USER_NAME,

package/src/Utilities/ObjectFactory.js

@@ -347,6 +347,7 @@ function CreateEmptyCellSummmary() {
         Max: undefined,
         Min: undefined,
         Count: undefined,
+        Only: undefined
     };
 }
 exports.CreateEmptyCellSummmary = CreateEmptyCellSummmary;

package/src/Utilities/Services/MetamodelService.js

@@ -49,6 +49,10 @@ class MetamodelService {
     validateOptionsObject(validationErrors, optionsObjectName, optionsObject, optionsObjectMetamodel, optionsObjectDefaultValues) {
         Object.entries(optionsObject).forEach(([optionKey, optionValue]) => {
             var _a;
+            if (optionKey === 'gridOptions') {
+                // gridOptions is aspecial case as it's NOT a public property, but we set and use it internally
+                return;
+            }
             const optionMetamodel = (_a = optionsObjectMetamodel === null || optionsObjectMetamodel === void 0 ? void 0 : optionsObjectMetamodel.props) === null || _a === void 0 ? void 0 : _a.find((metamodelProperty) => metamodelProperty.name === optionKey);
             if (!optionMetamodel) {
                 validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: unknown/unsupported property, will be ignored`);

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -23,11 +23,11 @@ const ConfigurationWizard = (props) => {
                 toolPanels: ['columns', 'filters', 'adaptable'],
             },
         };
-        const preparedAdaptableOptions = Object.assign(Object.assign({}, props.adaptableOptions), { gridOptions: Object.assign(Object.assign({}, gridOptionDefaults), (_a = props === null || props === void 0 ? void 0 : props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions) });
+        const preparedAdaptableOptions = Object.assign(Object.assign({}, props.adaptableOptions), { gridOptions: Object.assign(Object.assign({}, gridOptionDefaults), (_a = props === null || props === void 0 ? void 0 : props.adaptableOptions) === null || _a === void 0 ? void 0 : _a._gridOptions) });
         return AdaptableHelper_1.default.assignAdaptableOptions(preparedAdaptableOptions);
     });
     const [selectedColumns, setSelectedColumns] = (0, react_1.useState)(() => {
-        return props.adaptableOptions.gridOptions.columnDefs.reduce((acc, col) => {
+        return props.adaptableOptions._gridOptions.columnDefs.reduce((acc, col) => {
             acc[col.field] = true;
             return acc;
         }, {});
@@ -35,9 +35,9 @@ const ConfigurationWizard = (props) => {
     const columnsHandle = React.useRef();
     const handleFinish = () => {
         const newAdaptableOptions = Object.assign({}, adaptableOptions);
-        newAdaptableOptions.gridOptions = Object.assign({}, adaptableOptions.gridOptions);
+        newAdaptableOptions._gridOptions = Object.assign({}, adaptableOptions._gridOptions);
         if (columnsHandle.current) {
-            newAdaptableOptions.gridOptions.columnDefs = columnsHandle
+            newAdaptableOptions._gridOptions.columnDefs = columnsHandle
                 .current.getColumns()
                 .map((column) => {
                 const newColumn = Object.assign(Object.assign({}, column), { headerName: column.caption || StringExtensions_1.default.Humanize(column.field) });
@@ -53,7 +53,7 @@ const ConfigurationWizard = (props) => {
         setIsValid(newIsValid);
     }, []);
     const handleColumnsChange = React.useCallback((columns) => {
-        setAdaptableOptions((adaptableOptions) => (Object.assign(Object.assign({}, adaptableOptions), { gridOptions: Object.assign(Object.assign({}, adaptableOptions.gridOptions), { columnDefs: columns }) })));
+        setAdaptableOptions((adaptableOptions) => (Object.assign(Object.assign({}, adaptableOptions), { _gridOptions: Object.assign(Object.assign({}, adaptableOptions._gridOptions), { columnDefs: columns }) })));
     }, []);
     const handleColumnSelectionChange = React.useCallback((col, flag) => {
         setSelectedColumns((selectedColumns) => {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizardColumnsStep.js

@@ -13,6 +13,6 @@ const ConfigurationWizardColumnsStep = (props) => {
     }
     return (React.createElement(ColumnsList_1.default, { theme: theme, handle: props.columnsHandle, onValidityChange: (valid) => {
             props.setPrimaryKeyIsNotSelected(valid);
-        }, selectedColumns: props.selectedColumns, onChange: props.onColumnChange, onSelectionChange: props.onSelectionChange, columns: (_c = (_b = props.adaptableOptions) === null || _b === void 0 ? void 0 : _b.gridOptions) === null || _c === void 0 ? void 0 : _c.columnDefs }));
+        }, selectedColumns: props.selectedColumns, onChange: props.onColumnChange, onSelectionChange: props.onSelectionChange, columns: (_c = (_b = props.adaptableOptions) === null || _b === void 0 ? void 0 : _b._gridOptions) === null || _c === void 0 ? void 0 : _c.columnDefs }));
 };
 exports.ConfigurationWizardColumnsStep = ConfigurationWizardColumnsStep;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/FinanceForm/FinanceForm.js

@@ -217,7 +217,7 @@ const FinanceFormSectionTitle = (props) => (React.createElement(rebass_1.Box, Ob
     React.createElement(HelpBlock_1.default, null, props.children)));
 const FinanceForm = (props) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    const columnOptions = (_d = (_c = (_b = (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions) === null || _b === void 0 ? void 0 : _b.columnDefs) === null || _c === void 0 ? void 0 : _c.map) === null || _d === void 0 ? void 0 : _d.call(_c, (item) => {
+    const columnOptions = (_d = (_c = (_b = (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a._gridOptions) === null || _b === void 0 ? void 0 : _b.columnDefs) === null || _c === void 0 ? void 0 : _c.map) === null || _d === void 0 ? void 0 : _d.call(_c, (item) => {
         var _a;
         return ({
             label: StringExtensions_1.default.Humanize((_a = item.headerName) !== null && _a !== void 0 ? _a : item.field),

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/GridOptionsForm.js

@@ -10,22 +10,22 @@ const rebass_1 = require("rebass");
 const GridOptionsForm = (props) => {
     var _a;
     let abOptions = props.adaptableOptions;
-    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.gridOptions), abOptions.gridOptions);
+    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions._gridOptions), abOptions._gridOptions);
     return (React.createElement(rebass_1.Box, { p: 2 },
         React.createElement(HelpBlock_1.default, null, "Grid Options"),
         React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
             React.createElement(FormLayout_1.FormRow, { label: "Enable Range Selection" },
                 React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.enableRangeSelection, onChange: (enableRangeSelection) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.enableRangeSelection = enableRangeSelection;
+                        abOptions._gridOptions = Object.assign({}, abOptions._gridOptions);
+                        abOptions._gridOptions.enableRangeSelection = enableRangeSelection;
                         props.onChangeadAptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Show Quick Filter" },
                 React.createElement(CheckBox_1.CheckBox, { checked: (_a = gridOptions.defaultColDef) === null || _a === void 0 ? void 0 : _a.floatingFilter, onChange: (floatingFilter) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.defaultColDef = {
+                        abOptions._gridOptions = Object.assign({}, abOptions._gridOptions);
+                        abOptions._gridOptions.defaultColDef = {
                             floatingFilter,
                         };
                         props.onChangeadAptableOptions(abOptions);
@@ -33,15 +33,15 @@ const GridOptionsForm = (props) => {
             React.createElement(FormLayout_1.FormRow, { label: "Suppress Column Virtualisation" },
                 React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressColumnVirtualisation, onChange: (suppressColumnVirtualisation) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.suppressColumnVirtualisation = suppressColumnVirtualisation;
+                        abOptions._gridOptions = Object.assign({}, abOptions._gridOptions);
+                        abOptions._gridOptions.suppressColumnVirtualisation = suppressColumnVirtualisation;
                         props.onChangeadAptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Show Column Menu Button" },
                 React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressMenuHide, onChange: (suppressMenuHide) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.suppressMenuHide = suppressMenuHide;
+                        abOptions._gridOptions = Object.assign({}, abOptions._gridOptions);
+                        abOptions._gridOptions.suppressMenuHide = suppressMenuHide;
                         props.onChangeadAptableOptions(abOptions);
                     } })))));
 };

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.js

@@ -39,8 +39,8 @@ const isSidebarChecked = (sideBar, panelName) => {
 const UIOptionsSidebarForm = (props) => {
     var _a;
     const { abOptions, onChange } = props;
-    const { gridOptions } = props.abOptions;
-    const sideBar = prepareSidebarDef(gridOptions.sideBar);
+    const { _gridOptions } = props.abOptions;
+    const sideBar = prepareSidebarDef(_gridOptions.sideBar);
     const renderSidebarCheckbox = (sidebarName) => {
         return (React.createElement(CheckBox_1.CheckBox, { mr: 3, key: sidebarName, checked: isSidebarChecked(sideBar, sidebarName), onChange: (check) => handleToolpanelsChange(sidebarName, check) }, StringExtensions_1.default.Humanize(sidebarName)));
     };
@@ -60,12 +60,12 @@ const UIOptionsSidebarForm = (props) => {
         if (newPanels.length === 0) {
             hiddenByDefault = true;
         }
-        const newAbOptions = Object.assign(Object.assign({}, abOptions), { gridOptions: Object.assign(Object.assign({}, abOptions.gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { toolPanels: newPanels, hiddenByDefault }) }) });
+        const newAbOptions = Object.assign(Object.assign({}, abOptions), { _gridOptions: Object.assign(Object.assign({}, abOptions._gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { toolPanels: newPanels, hiddenByDefault }) }) });
         props.onChange(newAbOptions);
     };
     let sidebarPosition = (_a = sideBar === null || sideBar === void 0 ? void 0 : sideBar.position) !== null && _a !== void 0 ? _a : 'right';
     const handleSidebarPositionChange = (position) => {
-        const newAbOptions = Object.assign(Object.assign({}, abOptions), { gridOptions: Object.assign(Object.assign({}, abOptions.gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { position }) }) });
+        const newAbOptions = Object.assign(Object.assign({}, abOptions), { gridOptions: Object.assign(Object.assign({}, abOptions._gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { position }) }) });
         props.onChange(newAbOptions);
     };
     return (React.createElement(rebass_1.Box, null,

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js

@@ -13,7 +13,7 @@ const DropdownButton_1 = tslib_1.__importDefault(require("../../../../components
 const FormBox_1 = require("../Components/FormBox");
 const UIOptionsStatusbarForm = (props) => {
     var _a, _b, _c, _d;
-    const allPanels = (_c = (_b = (_a = props.abOptions.gridOptions) === null || _a === void 0 ? void 0 : _a.statusBar) === null || _b === void 0 ? void 0 : _b.statusPanels) !== null && _c !== void 0 ? _c : [];
+    const allPanels = (_c = (_b = (_a = props.abOptions._gridOptions) === null || _a === void 0 ? void 0 : _a.statusBar) === null || _b === void 0 ? void 0 : _b.statusPanels) !== null && _c !== void 0 ? _c : [];
     const panelIdtoPanel = (panelsIds, align) => panelsIds.map((panelId) => {
         const previousItem = allPanels.find((panel) => panel.key === panelId || panel.statusPanel === panelId);
         if (previousItem) {
@@ -35,7 +35,7 @@ const UIOptionsStatusbarForm = (props) => {
         const centerPanels = panelIdtoPanel(tabs[1].Items, 'center');
         const rightPanels = panelIdtoPanel(tabs[2].Items, 'right');
         const newStatusbarPanels = [...leftPanels, ...centerPanels, ...rightPanels];
-        props.onChange(Object.assign(Object.assign({}, props.abOptions), { gridOptions: Object.assign(Object.assign({}, props.abOptions.gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions.gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
+        props.onChange(Object.assign(Object.assign({}, props.abOptions), { _gridOptions: Object.assign(Object.assign({}, props.abOptions._gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions._gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
     };
     const disabled = false;
     const panelToTabItemId = (panel) => { var _a; return (_a = panel.key) !== null && _a !== void 0 ? _a : panel.statusPanel; };
@@ -78,7 +78,7 @@ const UIOptionsStatusbarForm = (props) => {
         const newStatusbarPanels = [...allPanels, newAdaptablePanel];
         setAdaptablePanelTitle('');
         setAdaptablePanelAlign('left');
-        props.onChange(Object.assign(Object.assign({}, props.abOptions), { gridOptions: Object.assign(Object.assign({}, props.abOptions.gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions.gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
+        props.onChange(Object.assign(Object.assign({}, props.abOptions), { _gridOptions: Object.assign(Object.assign({}, props.abOptions._gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions._gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
     };
     return (React.createElement(rebass_1.Box, null,
         React.createElement(HelpBlock_1.default, null, "Status Bar"),

package/src/View/AdaptableWizardView/Wizard.js

@@ -52,10 +52,10 @@ const Wizard = (props) => {
                 payload: `Invalid adaptable configuration - ${err}`,
             });
         }
-        const gridOptions = (0, helper_1.prepareGridOptions)(dataSourceInfo, (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions);
+        const gridOptions = (0, helper_1.prepareGridOptions)(dataSourceInfo, (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a._gridOptions);
         const adaptableOptions = Object.assign({}, props.adaptableOptions);
         adaptableOptions.adaptableId = adaptableOptions.adaptableId || (file ? file.name : '');
-        adaptableOptions.gridOptions = gridOptions;
+        adaptableOptions._gridOptions = gridOptions;
         if (dataSourceInfo.primaryKey) {
             adaptableOptions.primaryKey = dataSourceInfo.primaryKey;
         }

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -23,9 +23,13 @@ const DataChangeHistoryGrid = (props) => {
         const initializeAdaptableGrid = async () => {
             const gridOptions = buildGridOptions(mainAdaptableInstance, changeHistoryLog);
             const adaptableOptions = buildAdaptableOptions(mainAdaptableInstance, gridOptions, adaptableContainerId, agGridContainerId, undoChangeEnabled, onUndoChange);
+            const agGridOptions = {
+                gridOptions,
+                modules: mainAdaptableInstance.getAgGridRegisteredModules(),
+            };
             // to avoid direct dependency to Adaptable.ts and thus creating a circular dependency;
             const adaptableInitFn = Object.getPrototypeOf(mainAdaptableInstance).constructor.init;
-            const dataChangeHistoryAdaptableApi = await adaptableInitFn(adaptableOptions);
+            const dataChangeHistoryAdaptableApi = await adaptableInitFn(adaptableOptions, agGridOptions);
             setAdaptableApi(dataChangeHistoryAdaptableApi);
         };
         initializeAdaptableGrid();
@@ -97,7 +101,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
         };
     }
     const options = {
-        gridOptions: gridOptions,
+        _gridOptions: gridOptions,
         primaryKey: 'primaryKey',
         licenseKey: mainAdaptableOptions.licenseKey,
         userName: `${mainAdaptableOptions.userName}`,

package/src/View/Export/ExportViewPanel.d.ts

@@ -25,5 +25,5 @@ declare class ExportViewPanelComponent extends React.Component<ExportViewPanelCo
     private isCustomDestination;
     private onNewReportSchedule;
 }
-export declare let ExportViewPanelControl: import("react-redux").ConnectedComponent<typeof ExportViewPanelComponent, import("react-redux").Omit<React.ClassAttributes<ExportViewPanelComponent> & ExportViewPanelComponentProps, "api" | "accessLevel" | "moduleInfo" | "CurrentReport" | "CurrentDestination" | "Columns" | "viewType" | "onApplyExport" | "onSelectReport" | "onSelectDestination" | "onNewReport" | "onEditReport" | "onNewReportSchedule" | "UserReports">>;
+export declare let ExportViewPanelControl: import("react-redux").ConnectedComponent<typeof ExportViewPanelComponent, import("react-redux").Omit<React.ClassAttributes<ExportViewPanelComponent> & ExportViewPanelComponentProps, "api" | "accessLevel" | "moduleInfo" | "Columns" | "CurrentReport" | "CurrentDestination" | "viewType" | "onApplyExport" | "onSelectReport" | "onSelectDestination" | "onNewReport" | "onEditReport" | "onNewReportSchedule" | "UserReports">>;
 export {};

package/src/agGrid/Adaptable.d.ts

@@ -1,6 +1,6 @@
 import { ChartRef, ColDef, ColGroupDef, Column, ColumnRowGroupChangedEvent, ExcelStyle, GridOptions, IRowNode, Module, ModuleNames } from '@ag-grid-community/core';
 import { AdaptableNoCodeWizardOptions, IAdaptableNoCodeWizard } from '../AdaptableInterfaces/AdaptableNoCodeWizard';
-import { AdaptableVariant, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, AgGridConfig, IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AdaptableApi } from '../Api/AdaptableApi';
@@ -39,6 +39,7 @@ import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AdaptableLogger } from './AdaptableLogger';
 declare type RuntimeConfig = {
+    gridOptions: GridOptions;
     waitForAgGrid?: boolean;
     supressReact18RenderWarning?: boolean;
     renderReactRoot?: RenderReactRootFn;
@@ -118,21 +119,19 @@ export declare class Adaptable implements IAdaptable {
      * @param runtimeConfig the list of all the provided AG Grid modules (which will be passed to the underlying AG Grid instance)
      * @returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
      */
-    static init(adaptableOptions: AdaptableOptions, runtimeConfig: {
-        agGridModules: Module[];
-    }): Promise<AdaptableApi>;
+    static init(adaptableOptions: AdaptableOptions, agGridConfig: AgGridConfig): Promise<AdaptableApi>;
     /**
      * Lazy static constructor for Adaptable
      * Receives an AdaptableOptions object
      * Returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
      * @param adaptableOptions an instance of AdaptableOptions
      */
-    static initInternal(adaptableOptions: AdaptableOptions, runtimeConfig?: RuntimeConfig): Promise<AdaptableApi>;
+    static initInternal(adaptableOptions: AdaptableOptions, runtimeConfig: RuntimeConfig): Promise<AdaptableApi>;
     private static collectInstance;
     static forEachAdaptable(fn: (adaptable: Adaptable) => void): void;
     private static dismissInstance;
     constructor();
-    init(adaptableOptions: AdaptableOptions, runtimeConfig?: RuntimeConfig, _staticInit?: boolean): Promise<AdaptableApi>;
+    init(adaptableOptions: AdaptableOptions, runtimeConfig: RuntimeConfig, _staticInit?: boolean): Promise<AdaptableApi>;
     forPlugins(callback: (plugin: AdaptablePlugin) => any): void;
     getPlugin(pluginId: string): AdaptablePlugin;
     getPluginProperty(pluginId: string, propertyName: string, ...args: any): any;
@@ -328,7 +327,8 @@ export declare class Adaptable implements IAdaptable {
     private applyCurrentTheme;
     private applyFinalRendering;
     isAgGridModulePresent(moduleName: ModuleNames): boolean;
-    private getAgGridRegisteredModules;
+    getAgGridRegisteredModules(): Module[];
+    private getAgGridRegisteredModuleNames;
     private onRowDataChanged;
     private onCellDataChanged;
     private isUndoChange;

package/src/agGrid/Adaptable.js

@@ -282,14 +282,15 @@ class Adaptable {
      * @param runtimeConfig the list of all the provided AG Grid modules (which will be passed to the underlying AG Grid instance)
      * @returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
      */
-    static init(adaptableOptions, runtimeConfig) {
+    static init(adaptableOptions, agGridConfig) {
         var _a;
-        if (!((_a = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.agGridModules) === null || _a === void 0 ? void 0 : _a.length)) {
+        if (!((_a = agGridConfig === null || agGridConfig === void 0 ? void 0 : agGridConfig.modules) === null || _a === void 0 ? void 0 : _a.length)) {
             AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`No AG Grid modules were provided, thus limiting AdapTables features significantly!\n\nRead further info here:${DocumentationLinkConstants_1.AgGridModulesDocsLink}`);
         }
         return Adaptable.initInternal(adaptableOptions, {
+            gridOptions: agGridConfig.gridOptions,
             supressReact18RenderWarning: true,
-            agGridModules: runtimeConfig.agGridModules,
+            agGridModules: agGridConfig.modules,
         });
     }
     /**
@@ -354,29 +355,27 @@ class Adaptable {
     async init(adaptableOptions, runtimeConfig, _staticInit) {
         this.logger = new AdaptableLogger_1.AdaptableLogger(adaptableOptions.adaptableId || String(Date.now()));
         const perfAdaptableInit = this.logger.beginPerf(`Adaptable init()`);
-        if (runtimeConfig) {
-            this.supressReact18RenderWarning = !!runtimeConfig.supressReact18RenderWarning;
-            if (runtimeConfig.renderReactRoot) {
-                this.renderReactRoot = (el, container) => {
-                    const unmount = runtimeConfig.renderReactRoot(el, container);
-                    return () => {
-                        // we used to capture here because of FloatingFilters/Filters - see FloatingFilterWrapper and FilterWrapper
-                        // as we didn't have a native React implementation for our React wrapper
-                        // but we might need to do this again in the future for some other components that are not native React
-                        // captureReactWarnings();
-                        if (typeof unmount === 'function') {
-                            // rAF is required, otherwise the unmount would be performed during the rendering phase and React doesn't like that
-                            requestAnimationFrame(() => {
-                                unmount();
-                            });
-                        }
-                        // releaseReactWarnings();
-                    };
+        this.supressReact18RenderWarning = !!runtimeConfig.supressReact18RenderWarning;
+        if (runtimeConfig.renderReactRoot) {
+            this.renderReactRoot = (el, container) => {
+                const unmount = runtimeConfig.renderReactRoot(el, container);
+                return () => {
+                    // we used to capture here because of FloatingFilters/Filters - see FloatingFilterWrapper and FilterWrapper
+                    // as we didn't have a native React implementation for our React wrapper
+                    // but we might need to do this again in the future for some other components that are not native React
+                    // captureReactWarnings();
+                    if (typeof unmount === 'function') {
+                        // rAF is required, otherwise the unmount would be performed during the rendering phase and React doesn't like that
+                        requestAnimationFrame(() => {
+                            unmount();
+                        });
+                    }
+                    // releaseReactWarnings();
                 };
-            }
-            if (runtimeConfig.variant) {
-                this.variant = runtimeConfig.variant;
-            }
+            };
+        }
+        if (runtimeConfig.variant) {
+            this.variant = runtimeConfig.variant;
         }
         if (!_staticInit) {
             this.logger.warn(`
@@ -387,8 +386,11 @@ class Adaptable {
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!`);
         }
         this.emitter = new Emitter_1.default();
+        this.runtimeConfig = runtimeConfig;
+        this.gridOptions = this.runtimeConfig.gridOptions;
         // we create AdaptableOptions by merging the values provided by the user with the defaults (where no value has been set)
         this.adaptableOptions = AdaptableHelper_1.default.assignAdaptableOptions(adaptableOptions);
+        this.adaptableOptions._gridOptions = this.gridOptions;
         if (this.hasAutogeneratedPrimaryKey()) {
             this.logger
                 .warn(`Autogenerated primary key (adaptableOptions.autogeneratedPrimaryKey = TRUE) should be used only as a last resort,
@@ -398,8 +400,6 @@ class Adaptable {
             this.adaptableOptions.primaryKey = GeneralConstants_1.AUTOGENERATED_PK_COLUMN;
         }
         Adaptable.collectInstance(this);
-        this.runtimeConfig = runtimeConfig || {};
-        this.gridOptions = this.adaptableOptions.gridOptions;
         if (this.gridOptions.allowContextMenuWithControlKey === undefined) {
             this.gridOptions.allowContextMenuWithControlKey = true;
         }
@@ -444,6 +444,8 @@ class Adaptable {
         // @ts-ignore
         this.RowEditService = new RowEditService_1.RowEditService(this.api);
         this.MetamodelService = new MetamodelService_1.MetamodelService(() => this.api.optionsApi.getAdaptableOptions());
+        // validate the provided AdaptableOptions
+        this.MetamodelService.validateAdaptableOptionsValues();
         this.forPlugins((plugin) => plugin.afterInitServices(this));
         // Set up Modules - we set up all the Modules suitable for AG Grid
         // But users can make some hidden or readonly in their entitlements
@@ -463,15 +465,13 @@ class Adaptable {
             this.gridOptions.columnTypes.abColDefDate.cellEditor =
                 this.variant === 'react' ? AdaptableDateEditor_1.ReactAdaptableDateEditor : AdaptableDateEditor_1.AdaptableDateEditor;
         }
-        // validate the provided AdaptableOptions
-        this.MetamodelService.validateAdaptableOptionsValues();
         return this.initializeAgGrid().then((initialized) => {
             if (!initialized) {
                 // we have no grid, we can't do anything
                 this.logger.error('Unable to set up AG Grid');
                 return this.api;
             }
-            this.logger.info(`Registered AG Grid modules: `, this.getAgGridRegisteredModules().sort());
+            this.logger.info(`Registered AG Grid modules: `, this.getAgGridRegisteredModuleNames().sort());
             let self = this;
             // add our adaptable object to the grid options api object
             // this is VERY useful for when we need to access Adaptable inside of agGrid only functions
@@ -584,7 +584,7 @@ class Adaptable {
                 this.logger.info('emit AdaptableReady');
                 this.api.eventApi.emit('AdaptableReady', {
                     adaptableApi: this.api,
-                    gridOptions: this.adaptableOptions.gridOptions,
+                    gridOptions: this.gridOptions,
                 });
                 // }, 0);
                 perfInitState.end();
@@ -3781,6 +3781,9 @@ class Adaptable {
         return !!allGridModulesMap[moduleName];
     }
     getAgGridRegisteredModules() {
+        return core_1.ModuleRegistry.__getRegisteredModules(this.gridOptions.gridId);
+    }
+    getAgGridRegisteredModuleNames() {
         return core_1.ModuleRegistry.__getRegisteredModules(this.gridOptions.gridId).map((module) => module.moduleName);
     }
     onRowDataChanged({ rowNode, oldData, newData, }) {
@@ -5133,13 +5136,12 @@ class AdaptableNoCodeWizard {
     constructor(adaptableOptions, extraOptions = {}) {
         var _a;
         const defaultInit = async ({ gridOptions, adaptableOptions, agGridModules, }) => {
-            adaptableOptions.gridOptions = gridOptions;
-            return await Adaptable.init(adaptableOptions, { agGridModules: agGridModules });
+            return await Adaptable.init(adaptableOptions, { gridOptions, modules: agGridModules });
         };
         this.adaptableOptions = adaptableOptions;
         this.init = extraOptions.onInit || defaultInit;
         this.extraOptions = extraOptions;
-        this.agGridModules = core_1.ModuleRegistry.__getRegisteredModules((_a = this.adaptableOptions.gridOptions) === null || _a === void 0 ? void 0 : _a.gridId);
+        this.agGridModules = core_1.ModuleRegistry.__getRegisteredModules((_a = this.adaptableOptions._gridOptions) === null || _a === void 0 ? void 0 : _a.gridId);
         this.render();
     }
     render(container) {
@@ -5168,7 +5170,7 @@ class AdaptableNoCodeWizard {
                 unmount();
                 this.init({
                     adaptableOptions,
-                    gridOptions: adaptableOptions.gridOptions,
+                    gridOptions: adaptableOptions._gridOptions,
                     agGridModules: [...this.agGridModules],
                 });
             } })), container, true);