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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "16.0.0-canary.1",
+  "version": "16.0.0-canary.2",
   "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: 1689771442961;
+declare const _default: 1689857991354;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -28,8 +28,17 @@ import { ColumnValuesComparer } from '../AdaptableOptions/CustomSortOptions';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AdaptableLogger } from '../agGrid/AdaptableLogger';
+/**
+ * Contains AG Grid Options and Modules - used when instantiating AdapTable vanilla
+ */
 export interface AgGridConfig {
+    /**
+     * AG Grid GridOptions object
+     */
     gridOptions: GridOptions;
+    /**
+     * AG Grid Modules
+     */
     modules: Module[];
 }
 export declare type AdaptableVariant = 'vanilla' | 'react' | 'angular';

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -5,7 +5,6 @@ import { EditOptions } from './EditOptions';
 import { StateOptions } from './StateOptions';
 import { UserInterfaceOptions } from './UserInterfaceOptions';
 import { AdaptablePlugin } from './AdaptablePlugin';
-import { SearchOptions } from './SearchOptions';
 import { ExportOptions } from './ExportOptions';
 import { TeamSharingOptions } from './TeamSharingOptions';
 import { MenuOptions } from './MenuOptions';
@@ -28,6 +27,8 @@ import { CustomSortOptions } from './CustomSortOptions';
 import { DataSetOptions } from './DataSetOptions';
 import { CellSummaryOptions } from './CellSummaryOptions';
 import { CalendarOptions } from './CalendarOptions';
+import { QuickSearchOptions } from './QuickSearchOptions';
+import { FormatColumnOptions } from './FormatColumnOptions';
 /**
  * Large group of options enabling developers to set up AdapTable at design time to fit precise requirements
  */
@@ -174,6 +175,10 @@ export interface AdaptableOptions<TData = any> {
      * @gridInfoContainer
      */
     flashingCellOptions?: FlashingCellOptions;
+    /**
+     * Options for providing Custom Display Formats
+     */
+    formatColumnOptions?: FormatColumnOptions;
     /**
      * Options related to Row Grouping
      *
@@ -207,7 +212,7 @@ export interface AdaptableOptions<TData = any> {
      * @gridInfoContainer
      * @noCodeContainer
      */
-    searchOptions?: SearchOptions<TData>;
+    quickSearchOptions?: QuickSearchOptions<TData>;
     /**
      * Setting panel options
      *

package/src/AdaptableOptions/FormatColumnOptions.d.ts

@@ -0,0 +1,51 @@
+import { AdaptableScope } from '../PredefinedConfig/Common/AdaptableScope';
+import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { BaseContext } from '../../types';
+import { IRowNode } from '@ag-grid-community/core';
+/**
+ * Options for managing the Format Column Module
+ */
+export interface FormatColumnOptions {
+    /**
+     * Custom Formatters to use in the Format Column Module
+     */
+    customDisplayFormatters?: CustomDisplayFormatter[];
+}
+/**
+ * Provides Custom Display Formats
+ */
+export interface CustomDisplayFormatter {
+    /**
+     * Id of the Formatted
+     */
+    id: string;
+    /**
+     * Description
+     */
+    label?: string;
+    /**
+     * Function used to perform the Custom Display Format
+     */
+    handler: (customDisplayFormatterContext: CustomDisplayFormatterContext) => any;
+    /**
+     * Where the Custom Display Format can be applied
+     */
+    scope: AdaptableScope;
+}
+/**
+ * Context used in handler of CustomDisplayFormatter
+ */
+export interface CustomDisplayFormatterContext extends BaseContext {
+    /**
+     * Column where Custom Display Format will apply
+     */
+    adaptableColumn: AdaptableColumn;
+    /**
+     * Non-formatted Cell Value
+     */
+    cellValue: any;
+    /**
+     * Node where Custom Display Format will apply
+     */
+    rowNode: IRowNode;
+}

package/src/AdaptableOptions/{SearchOptions.d.ts → QuickSearchOptions.d.ts}

@@ -1,8 +1,8 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 /**
- * Search options section of Adaptable Options; includes options for running some (or all) search functions on the server
+ * Options for configuring Quick Search
  */
-export interface SearchOptions<TData = any> {
+export interface QuickSearchOptions<TData = any> {
     /**
      * Function enabling specific Columns to be excluded from Quick Search
      *

package/src/AdaptableOptions/QuickSearchOptions.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -5,7 +5,6 @@ import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { AlternativeModuleName, BaseContext, GridCell } from '../../types';
-import { IRowNode } from '@ag-grid-community/core';
 /**
  * Options for managing the User Interface of AdapTable
  */
@@ -95,10 +94,6 @@ export interface UserInterfaceOptions<TData = any> {
      * @gridInfoItem
      */
     showAdapTableVersion?: boolean;
-    /**
-     * Custom Formatters to use in the Format Column Module
-     */
-    customDisplayFormatters?: CustomDisplayFormatter[];
     /**
      * English variant to use in UI labels
      *
@@ -227,41 +222,3 @@ export declare type GridInfoSection = 'GridSummary' | 'AdaptableOptions' | 'Colu
  */
 export interface ObjectTagsContext extends BaseContext {
 }
-/**
- * Provides Custom Display Formats
- */
-export interface CustomDisplayFormatter {
-    /**
-     * Id of the Formatted
-     */
-    id: string;
-    /**
-     * Description
-     */
-    label?: string;
-    /**
-     * Function used to perform the Custom Display Format
-     */
-    handler: (customDisplayFormatterContext: CustomDisplayFormatterContext) => any;
-    /**
-     * Where the Custom Display Format can be applied
-     */
-    scope: AdaptableScope;
-}
-/**
- * Context used in handler of CustomDisplayFormatter
- */
-export interface CustomDisplayFormatterContext extends BaseContext {
-    /**
-     * Column where Custom Display Format will apply
-     */
-    adaptableColumn: AdaptableColumn;
-    /**
-     * Non-formatted Cell Value
-     */
-    cellValue: any;
-    /**
-     * Node where Custom Display Format will apply
-     */
-    rowNode: IRowNode;
-}

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

@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ConfigApi, ContainerOptions, CustomSortApi, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, FilterApi, FilterOptions, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FreeTextColumnApi, GridApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, PluginsApi, PlusMinusApi, PredicateApi, QueryApi, QuickSearchApi, ScheduleApi, ScopeApi, SearchOptions, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, UserInterfaceApi, UserInterfaceOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ConfigApi, ContainerOptions, CustomSortApi, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, FilterApi, FilterOptions, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, PluginsApi, PlusMinusApi, PredicateApi, QueryApi, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
 import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
@@ -77,7 +77,8 @@ export declare abstract class ApiBase {
     protected getMenuOptions(): MenuOptions;
     protected getFilterOptions(): FilterOptions;
     protected getAdaptableQLOptions(): AdaptableQLOptions;
-    protected getSearchOptions(): SearchOptions;
+    protected getQuickSearchOptions(): QuickSearchOptions;
+    protected getFormatColumnOptions(): FormatColumnOptions;
     protected getStateOptions(): StateOptions;
     protected getTeamSharingOptions(): TeamSharingOptions;
     protected getUserInterfaceOptions(): UserInterfaceOptions;

package/src/Api/Implementation/ApiBase.js

@@ -147,8 +147,11 @@ class ApiBase {
     getAdaptableQLOptions() {
         return this.getOptions().adaptableQLOptions;
     }
-    getSearchOptions() {
-        return this.getOptions().searchOptions;
+    getQuickSearchOptions() {
+        return this.getOptions().quickSearchOptions;
+    }
+    getFormatColumnOptions() {
+        return this.getOptions().formatColumnOptions;
     }
     getStateOptions() {
         return this.getOptions().stateOptions;

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

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, SearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../../types';
 import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
 import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
@@ -28,7 +28,8 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getMenuOptions(): MenuOptions;
     getFilterOptions(): FilterOptions;
     getAdaptableQLOptions(): AdaptableQLOptions;
-    getSearchOptions(): SearchOptions;
+    getQuickSearchOptions(): QuickSearchOptions;
+    getFormatColumnOptions(): FormatColumnOptions;
     getStateOptions(): StateOptions;
     getTeamSharingOptions(): TeamSharingOptions;
     getUserInterfaceOptions(): UserInterfaceOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -78,8 +78,11 @@ class OptionsApiImpl extends ApiBase_1.ApiBase {
     getAdaptableQLOptions() {
         return this.getOptions().adaptableQLOptions;
     }
-    getSearchOptions() {
-        return this.getOptions().searchOptions;
+    getQuickSearchOptions() {
+        return this.getOptions().quickSearchOptions;
+    }
+    getFormatColumnOptions() {
+        return this.getOptions().formatColumnOptions;
     }
     getStateOptions() {
         return this.getOptions().stateOptions;

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -129,7 +129,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             return value;
         }
         const adaptableOptions = this.adaptable.adaptableOptions;
-        const customFormattersFromOptions = (_c = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.userInterfaceOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
+        const customFormattersFromOptions = (_c = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
         // formatters are applied in the order they are defined in the options
         const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
         const customDisplayFormatterContext = ObjectFactory_1.default.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());

package/src/Api/OptionsApi.d.ts

@@ -1,7 +1,7 @@
 import { CustomSortOptions } from '../AdaptableOptions/CustomSortOptions';
 import { DataSetOptions } from '../AdaptableOptions/DataSetOptions';
 import { GroupingOptions } from '../AdaptableOptions/GroupingOptions';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, LayoutOptions, MenuOptions, NotificationsOptions, SearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 /**
  * Range of functions to access Adaptable Options
  */
@@ -125,7 +125,11 @@ export interface OptionsApi {
     /**
      * Returns `AdaptableOptions.searchOptions`
      */
-    getSearchOptions(): Readonly<SearchOptions>;
+    getQuickSearchOptions(): Readonly<QuickSearchOptions>;
+    /**
+     * Returns `AdaptableOptions.formatColumnOptions`
+     */
+    getFormatColumnOptions(): Readonly<FormatColumnOptions>;
     /**
      * Returns `AdaptableOptions.settingsPanelOptions`
      */

package/src/Redux/Store/AdaptableStore.js

@@ -708,7 +708,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let returnAction = next(action);
                     adaptable.redrawBody();
                     // if set then return a query on the text
-                    if (adaptable.adaptableOptions.searchOptions.filterResultsAfterQuickSearch) {
+                    if (adaptable.adaptableOptions.quickSearchOptions.filterResultsAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -158,6 +158,9 @@ exports.DefaultAdaptableOptions = {
         unbalancedGroupsKey: undefined,
         restoreUngroupedColumns: false,
     },
+    formatColumnOptions: {
+        customDisplayFormatters: undefined
+    },
     layoutOptions: {
         displayRowGroups: 'closed',
         autoSaveLayouts: true,
@@ -218,7 +221,7 @@ exports.DefaultAdaptableOptions = {
         showValuesCount: undefined,
         quickFilterValuesWidth: 180,
     },
-    searchOptions: {
+    quickSearchOptions: {
         excludeColumnFromQuickSearch: undefined,
         runQuickSearchOnRowGroups: false,
         clearSearchesOnStartUp: false,
@@ -263,7 +266,6 @@ exports.DefaultAdaptableOptions = {
         styleClassNames: GeneralConstants_1.EMPTY_ARRAY,
         permittedValues: undefined,
         editLookUpItems: undefined,
-        customDisplayFormatters: undefined,
         showDocumentationLinks: true,
         gridInfoSections: ['GridSummary', 'AdaptableOptions', 'ColumnInfo', 'AdaptableObjects'],
         showAdapTableVersion: true,

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -34,7 +34,7 @@ function assignAdaptableOptions(adaptableOptions) {
         Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionRowOptions.actionRowFormOptions, returnedAdaptableOptions.actionRowOptions.actionRowFormOptions);
     returnedAdaptableOptions.containerOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
     returnedAdaptableOptions.groupingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.groupingOptions, adaptableOptions.groupingOptions);
-    returnedAdaptableOptions.searchOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.searchOptions, adaptableOptions.searchOptions);
+    returnedAdaptableOptions.quickSearchOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.quickSearchOptions, adaptableOptions.quickSearchOptions);
     returnedAdaptableOptions.filterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.filterOptions, adaptableOptions.filterOptions);
     returnedAdaptableOptions.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
     returnedAdaptableOptions.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, returnedAdaptableOptions.userInterfaceOptions.dateInputOptions);

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableConfig.d.ts

@@ -0,0 +1,6 @@
+import { AdaptableOptions } from '../../../AdaptableOptions/AdaptableOptions';
+import { GridOptions } from '@ag-grid-community/core';
+export interface AdaptableConfig {
+    adaptableOptions: AdaptableOptions;
+    gridOptions: GridOptions;
+}

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableOptionsForm.d.ts

@@ -2,5 +2,5 @@ import * as React from 'react';
 import { AdaptableOptions } from '../../../types';
 export declare const AdaptableOptionsForm: React.FunctionComponent<{
     adaptableOptions: AdaptableOptions;
-    onChangeadAptableOptions: (adaptableOptions: AdaptableOptions) => void;
+    onChangedAdaptableOptions: (adaptableOptions: AdaptableOptions) => void;
 }>;

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

@@ -103,7 +103,7 @@ const AdaptableOptionsForm = (props) => {
             // @ts-ignore
             adaptableOptions[sectionName] = Object.assign(Object.assign({}, adaptableOptions[sectionName]), { [option.name]: option.value });
         }
-        props.onChangeadAptableOptions(adaptableOptions);
+        props.onChangedAdaptableOptions(adaptableOptions);
     };
     return (React.createElement(rebass_1.Box, { p: 2 }, nocodeOptions.map(([sectionName, { containerLabel, items }]) => {
         return (React.createElement(OptionsSection, { onChange: handleOptionChange(sectionName), key: sectionName, id: sectionName, name: containerLabel, options: items }));

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { AdaptableOptions } from '../../../types';
 import { OnePageWizardSection } from '../../Wizard/OnePageWizards';
 import { AdaptableFrameworkComponent } from '../../../../types';
+import { AdaptableConfig } from './AdaptableConfig';
 export interface CustomSection<T> {
     title: OnePageWizardSection<T>['title'];
     details?: AdaptableFrameworkComponent;
@@ -11,20 +11,20 @@ export interface CustomSection<T> {
     /**
      * Internal state of adaptableOptions.
      */
-    adaptableOptions: AdaptableOptions, 
+    adaptableConfig: AdaptableConfig, 
     /**
      * With this callback adaptableOptions can be changed.
      */
-    onChange: (newAdaptableOptions: AdaptableOptions) => void, 
+    onChange: (newAdaptableConfig: AdaptableConfig) => void, 
     /**
      * Set the selected columns.
      */
     setSelectedColumns: (selectedColumn: Record<string, boolean>) => void) => React.ReactNode;
 }
 export interface ConfigurationWizardProps {
-    adaptableOptions: AdaptableOptions;
-    onFinish: (adaptableOptions: AdaptableOptions) => void;
+    adaptableConfig: AdaptableConfig;
+    onFinish: (adaptableConfig: AdaptableConfig) => void;
     onCancel: () => void;
-    startSections?: CustomSection<AdaptableOptions>[];
+    startSections?: CustomSection<AdaptableConfig>[];
 }
 export declare const ConfigurationWizard: React.FunctionComponent<ConfigurationWizardProps>;

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

@@ -16,44 +16,47 @@ const AdaptableHelper_1 = tslib_1.__importDefault(require("../../../Utilities/He
 const ConfigurationWizard = (props) => {
     var _a, _b;
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
-    const [adaptableOptions, setAdaptableOptions] = (0, react_1.useState)(() => {
-        var _a;
+    const [adaptableConfig, setAdaptableConfig] = (0, react_1.useState)(() => {
         const gridOptionDefaults = {
             sideBar: {
                 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) });
-        return AdaptableHelper_1.default.assignAdaptableOptions(preparedAdaptableOptions);
+        const gridOptions = Object.assign(Object.assign({}, gridOptionDefaults), props.adaptableConfig.gridOptions);
+        const adaptableOptions = AdaptableHelper_1.default.assignAdaptableOptions(props.adaptableConfig.adaptableOptions);
+        return { gridOptions, adaptableOptions };
     });
     const [selectedColumns, setSelectedColumns] = (0, react_1.useState)(() => {
-        return props.adaptableOptions._gridOptions.columnDefs.reduce((acc, col) => {
+        var _a, _b;
+        return (_b = (_a = props.adaptableConfig.gridOptions) === null || _a === void 0 ? void 0 : _a.columnDefs) === null || _b === void 0 ? void 0 : _b.reduce((acc, col) => {
             acc[col.field] = true;
             return acc;
         }, {});
     });
     const columnsHandle = React.useRef();
     const handleFinish = () => {
-        const newAdaptableOptions = Object.assign({}, adaptableOptions);
-        newAdaptableOptions._gridOptions = Object.assign({}, adaptableOptions._gridOptions);
+        const newAdaptableOptions = Object.assign({}, adaptableConfig.adaptableOptions);
+        const newGridOptions = Object.assign({}, adaptableConfig.gridOptions);
         if (columnsHandle.current) {
-            newAdaptableOptions._gridOptions.columnDefs = columnsHandle
-                .current.getColumns()
-                .map((column) => {
+            adaptableConfig.gridOptions.columnDefs = columnsHandle.current.getColumns().map((column) => {
                 const newColumn = Object.assign(Object.assign({}, column), { headerName: column.caption || StringExtensions_1.default.Humanize(column.field) });
                 delete newColumn.caption;
                 return newColumn;
             });
             newAdaptableOptions.primaryKey = columnsHandle.current.getPrimaryKey();
         }
-        setAdaptableOptions(newAdaptableOptions);
-        props.onFinish(newAdaptableOptions);
+        const newAdaptableConfig = {
+            adaptableOptions: newAdaptableOptions,
+            gridOptions: newGridOptions,
+        };
+        setAdaptableConfig(newAdaptableConfig);
+        props.onFinish(newAdaptableConfig);
     };
     const handlePrimaryKeyColumnIsNotSelected = React.useCallback((newIsValid) => {
         setIsValid(newIsValid);
     }, []);
     const handleColumnsChange = React.useCallback((columns) => {
-        setAdaptableOptions((adaptableOptions) => (Object.assign(Object.assign({}, adaptableOptions), { _gridOptions: Object.assign(Object.assign({}, adaptableOptions._gridOptions), { columnDefs: columns }) })));
+        setAdaptableConfig((adaptableConfig) => (Object.assign(Object.assign({}, adaptableConfig), { gridOptions: Object.assign(Object.assign({}, adaptableConfig.gridOptions), { columnDefs: columns }) })));
     }, []);
     const handleColumnSelectionChange = React.useCallback((col, flag) => {
         setSelectedColumns((selectedColumns) => {
@@ -62,7 +65,13 @@ const ConfigurationWizard = (props) => {
             return newSelectedColumns;
         });
     }, []);
-    const financePlugin = (_b = (_a = adaptableOptions.plugins) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (plugin) => plugin.pluginId === 'finance');
+    const handleAdaptableOptionsChange = React.useCallback((adaptableOptions) => {
+        setAdaptableConfig((adaptableConfig) => (Object.assign(Object.assign({}, adaptableConfig), { adaptableOptions: adaptableOptions })));
+    }, []);
+    const handleGridOptionsChange = React.useCallback((gridOptions) => {
+        setAdaptableConfig((adaptableConfig) => (Object.assign(Object.assign({}, adaptableConfig), { gridOptions: gridOptions })));
+    }, []);
+    const financePlugin = (_b = (_a = adaptableConfig.adaptableOptions.plugins) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (plugin) => plugin.pluginId === 'finance');
     let sections = [
         {
             title: 'Columns',
@@ -73,33 +82,33 @@ const ConfigurationWizard = (props) => {
                 }
                 return true;
             },
-            render: () => (React.createElement(ConfigurationWizardColumnsStep_1.ConfigurationWizardColumnsStep, { adaptableOptions: adaptableOptions, setPrimaryKeyIsNotSelected: handlePrimaryKeyColumnIsNotSelected, onChange: setAdaptableOptions, selectedColumns: selectedColumns, onSelectionChange: handleColumnSelectionChange, onColumnChange: handleColumnsChange, columnsHandle: columnsHandle })),
+            render: () => (React.createElement(ConfigurationWizardColumnsStep_1.ConfigurationWizardColumnsStep, { adaptableConfig: adaptableConfig, setPrimaryKeyIsNotSelected: handlePrimaryKeyColumnIsNotSelected, onChange: setAdaptableConfig, selectedColumns: selectedColumns, onSelectionChange: handleColumnSelectionChange, onColumnChange: handleColumnsChange, columnsHandle: columnsHandle })),
         },
         {
             title: 'AdapTable Options',
             details: 'Configure Adaptable Options',
-            isValid: () => (adaptableOptions.adaptableId ? true : 'Adaptable ID is required'),
-            render: () => (React.createElement(AdaptableOptionsForm_1.AdaptableOptionsForm, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
+            isValid: () => adaptableConfig.adaptableOptions.adaptableId ? true : 'Adaptable ID is required',
+            render: () => (React.createElement(AdaptableOptionsForm_1.AdaptableOptionsForm, { adaptableOptions: adaptableConfig.adaptableOptions, onChangedAdaptableOptions: handleAdaptableOptionsChange })),
         },
         {
             title: 'AG Grid Options',
             details: 'Configure AG Grid Options',
-            render: () => (React.createElement(GridOptionsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
+            render: () => (React.createElement(GridOptionsForm_1.default, { gridOptions: adaptableConfig.gridOptions, onChangedGridOptions: handleGridOptionsChange })),
         },
         {
             title: 'UI Elements',
             details: 'Configure UI Elements',
-            render: () => (React.createElement(UiOptionsForm_1.UIElementsForm, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
+            render: () => (React.createElement(UiOptionsForm_1.UIElementsForm, { adaptableOptions: adaptableConfig.adaptableOptions, gridOptions: adaptableConfig.gridOptions, onChangedAdaptableOptions: handleAdaptableOptionsChange, onChangedGridOptions: handleGridOptionsChange })),
         },
         {
             title: 'Entitlements',
             details: 'Configure Entitlements',
-            render: () => (React.createElement(EntitlementsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
+            render: () => (React.createElement(EntitlementsForm_1.default, { adaptableOptions: adaptableConfig.adaptableOptions, onChangedAptableOptions: handleAdaptableOptionsChange })),
         },
         financePlugin && {
             title: 'Finance',
             details: 'Finance Options',
-            render: () => (React.createElement(FinanceForm_1.FinanceForm, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
+            render: () => (React.createElement(FinanceForm_1.FinanceForm, { adaptableConfig: adaptableConfig, onChangedAdaptableConfig: setAdaptableConfig })),
         },
     ].filter(Boolean);
     if (props.startSections) {
@@ -110,13 +119,13 @@ const ConfigurationWizard = (props) => {
                     isValid: section.isValid,
                     isVisible: section.isVisible,
                     render: () => {
-                        return section.render(adaptableOptions, setAdaptableOptions, setSelectedColumns);
+                        return section.render(adaptableConfig, setAdaptableConfig, setSelectedColumns);
                     },
                 };
             }),
             ...sections,
         ];
     }
-    return (React.createElement(OnePageWizards_1.OnePageWizard, { data: adaptableOptions, name: "Configure", defaultCurrentSectionName: 'default section name', onHide: () => null, onFinish: handleFinish, sections: sections }));
+    return (React.createElement(OnePageWizards_1.OnePageWizard, { data: adaptableConfig, name: "Configure", defaultCurrentSectionName: 'default section name', onHide: () => null, onFinish: handleFinish, sections: sections }));
 };
 exports.ConfigurationWizard = ConfigurationWizard;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizardColumnsStep.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { NocodeColumn } from './ColumnsList';
-import { AdaptableOptions } from '../../../types';
+import { AdaptableConfig } from './AdaptableConfig';
 export interface ConfigurationWizardColumnsStepProps {
-    adaptableOptions: AdaptableOptions;
-    onChange: (newOptions: AdaptableOptions) => void;
+    adaptableConfig: AdaptableConfig;
+    onChange: (newConfig: AdaptableConfig) => void;
     columnsHandle: React.MutableRefObject<{
         getColumns: () => any[];
         getPrimaryKey: () => string;

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

@@ -5,14 +5,14 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const ColumnsList_1 = tslib_1.__importDefault(require("./ColumnsList"));
 const ConfigurationWizardColumnsStep = (props) => {
-    var _a, _b, _c;
+    var _a, _b;
     let theme = 'light';
-    if (typeof props.adaptableOptions.predefinedConfig === 'object' &&
-        ((_a = props.adaptableOptions.predefinedConfig.Theme) === null || _a === void 0 ? void 0 : _a.CurrentTheme)) {
-        theme = props.adaptableOptions.predefinedConfig.Theme.CurrentTheme;
+    if (typeof props.adaptableConfig.adaptableOptions.predefinedConfig === 'object' &&
+        ((_a = props.adaptableConfig.adaptableOptions.predefinedConfig.Theme) === null || _a === void 0 ? void 0 : _a.CurrentTheme)) {
+        theme = props.adaptableConfig.adaptableOptions.predefinedConfig.Theme.CurrentTheme;
     }
     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: (_b = props.adaptableConfig.gridOptions) === null || _b === void 0 ? void 0 : _b.columnDefs }));
 };
 exports.ConfigurationWizardColumnsStep = ConfigurationWizardColumnsStep;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/EntitlementsForm.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { AdaptableOptions } from '../../../types';
 interface EntitlementsFormOptions {
     adaptableOptions: AdaptableOptions;
-    onChangeadAptableOptions: (adaptableOptions: AdaptableOptions) => void;
+    onChangedAptableOptions: (adaptableOptions: AdaptableOptions) => void;
 }
 declare const EntitlementsForm: React.FunctionComponent<EntitlementsFormOptions>;
 export default EntitlementsForm;

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

@@ -48,7 +48,7 @@ const EntitlementsListForm = (props) => {
                 { adaptableModule: module, accessLevel: accessLevel },
             ];
         }
-        props.onChangeadAptableOptions(Object.assign(Object.assign({}, abOptions), { entitlementOptions: Object.assign(Object.assign({}, abOptions.entitlementOptions), { moduleEntitlements: newEntitlements }) }));
+        props.onChangedAptableOptions(Object.assign(Object.assign({}, abOptions), { entitlementOptions: Object.assign(Object.assign({}, abOptions.entitlementOptions), { moduleEntitlements: newEntitlements }) }));
     }, [abOptions === null || abOptions === void 0 ? void 0 : abOptions.entitlementOptions]);
     if (typeof entitlements === 'function') {
         return (React.createElement(HelpBlock_1.default, { mb: 2 }, "Entitlements cannot be customized, they are handled by a custom function."));
@@ -113,7 +113,7 @@ const DefaultEntitlementForm = (props) => {
         return React.createElement(HelpBlock_1.default, { mb: 2 }, "Default Entitlement is controlled by a custom function");
     }
     const handleDefaultEntitlementChange = React.useCallback((accessLevel) => {
-        props.onChangeadAptableOptions(Object.assign(Object.assign({}, abOptions), { entitlementOptions: Object.assign(Object.assign({}, abOptions.entitlementOptions), { defaultAccessLevel: accessLevel }) }));
+        props.onChangedAptableOptions(Object.assign(Object.assign({}, abOptions), { entitlementOptions: Object.assign(Object.assign({}, abOptions.entitlementOptions), { defaultAccessLevel: accessLevel }) }));
     }, [(_b = abOptions === null || abOptions === void 0 ? void 0 : abOptions.entitlementOptions) === null || _b === void 0 ? void 0 : _b.defaultAccessLevel]);
     return (React.createElement(FormLayout_1.default, { mb: 2 },
         React.createElement(FormLayout_1.FormRow, { label: "Default Entitlement:" },