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

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -107,10 +107,10 @@ exports.DefaultAdaptableOptions = {
         actionRowButtons: undefined,
         autoHandle: true,
         disableInlineEditing: false,
+        setPrimaryKeyValue: undefined,
         actionRowButtonOptions: {
             customConfiguration: undefined,
             position: 'pinnedLeft',
-            setPrimaryKeyValue: undefined,
         },
         actionRowFormOptions: {
             formTitle: undefined,
@@ -158,6 +158,9 @@ exports.DefaultAdaptableOptions = {
         unbalancedGroupsKey: undefined,
         restoreUngroupedColumns: false,
     },
+    formatColumnOptions: {
+        customDisplayFormatters: undefined,
+    },
     layoutOptions: {
         displayRowGroups: 'closed',
         autoSaveLayouts: true,
@@ -209,6 +212,7 @@ exports.DefaultAdaptableOptions = {
         defaultDateColumnFilter: 'On',
         defaultFilterFormTab: 'Values',
         enableFilterOnSpecialColumns: true,
+        filterUsingTime: false,
         maxFilterValuesToDisplay: 2000,
         showQuickFilter: true,
         showDistinctFilteredValuesOnly: false,
@@ -218,7 +222,7 @@ exports.DefaultAdaptableOptions = {
         showValuesCount: undefined,
         quickFilterValuesWidth: 180,
     },
-    searchOptions: {
+    quickSearchOptions: {
         excludeColumnFromQuickSearch: undefined,
         runQuickSearchOnRowGroups: false,
         clearSearchesOnStartUp: false,
@@ -242,6 +246,7 @@ exports.DefaultAdaptableOptions = {
         updateInterval: 0,
         updateNotification: undefined,
         suppressOverrideConfigWarning: false,
+        showUpdateNotificationOncePerUpdate: false,
     },
     userInterfaceOptions: {
         alternativeModuleNames: undefined,
@@ -263,7 +268,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/Utilities/MenuItem.d.ts

@@ -2,9 +2,9 @@ import * as Redux from 'redux';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { AdaptableIcon, AdaptableInternalIconName } from '../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableIcon, AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
 export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableInternalIconName, isVisible: boolean);
+    constructor(label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;
@@ -12,7 +12,7 @@ export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
     icon: AdaptableIcon;
 }
 export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableInternalIconName, isVisible: boolean);
+    constructor(label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
     onClick: () => void;
     label: string;
     module: AdaptableModule;
@@ -20,7 +20,7 @@ export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
     icon: AdaptableIcon;
 }
 export declare class MenuItemShowPopup implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, componentName: string, icon: AdaptableInternalIconName, isVisible: boolean, popupParams?: ModuleParams);
+    constructor(label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;

package/src/Utilities/Services/MetamodelService.js

@@ -50,7 +50,11 @@ class MetamodelService {
         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
+                validationErrors.push('gridOptions was removed from AdapTable Options in Version 16 and is no longer used');
+                return;
+            }
+            if (optionKey === '_gridOptions') {
+                // gridOptions is a special 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);

package/src/Utilities/Services/ModuleService.js

@@ -140,7 +140,7 @@ class ModuleService {
             case 'OpenFin':
                 return learnUrl + 'integrations-openfin';
             case 'StyledColumn':
-                return learnUrl + 'handbook-styled-column-overview';
+                return learnUrl + 'handbook-column-formatting#styled-columns';
             case 'Charting':
                 return learnUrl + 'handbook-charts';
             default:

package/src/Utilities/Services/QueryLanguageService.js

@@ -92,7 +92,7 @@ class QueryLanguageService {
                 return result;
             }
             const force = (_a = config === null || config === void 0 ? void 0 : config.force) !== null && _a !== void 0 ? _a : false;
-            // get searchOptions to see if validation should be performed
+            // see if validation should be performed
             if (!this.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions
                 .performExpressionValidation &&
                 !force) {

package/src/Utilities/Services/RowEditService.js

@@ -25,7 +25,7 @@ class RowEditService {
         if (actionRowSubmittedInfo.type === 'rowCreated') {
             const { formData } = actionRowSubmittedInfo;
             const setPrimaryKeyValueFunction = adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.actionRowOptions
-                .actionRowButtonOptions.setPrimaryKeyValue;
+                .setPrimaryKeyValue;
             const newRowData = typeof setPrimaryKeyValueFunction === 'function'
                 ? setPrimaryKeyValueFunction({
                     rowData: formData,

package/src/Utilities/Services/TeamSharingService.d.ts

@@ -6,6 +6,7 @@ import { TypeUuid } from '../../PredefinedConfig/Uuid';
 import { AdaptableApi } from '../../../types';
 export declare class TeamSharingService implements ITeamSharingService {
     private adaptableApi;
+    private dismissedNotifications;
     private updateCheckTimerId;
     constructor(adaptableApi: AdaptableApi);
     buildCustomSharedEntity(Entity: any, Configuration: CustomSharedEntityConfig): CustomSharedEntity;
@@ -16,6 +17,7 @@ export declare class TeamSharingService implements ITeamSharingService {
     getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId: TypeUuid, remoteSharedEntities: AdaptableSharedEntity[]): [number, number];
     getStaleActiveSharedEntities(): SharedEntityActiveStatus;
     showUpdateNotifications(): void;
+    private showUpdateNotificationAlert;
     destroy(): void;
     private createSharedEntity;
     private getSharedEntityDependencyTree;

package/src/Utilities/Services/TeamSharingService.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamSharingService = void 0;
+const tslib_1 = require("tslib");
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
 class TeamSharingService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
+        this.dismissedNotifications = [];
         const teamSharingOptions = adaptableApi.optionsApi.getTeamSharingOptions();
         if (teamSharingOptions.updateInterval > 0) {
             // convert minutes to millis
@@ -132,9 +135,7 @@ class TeamSharingService {
         Object.values(this.getStaleActiveSharedEntities()).forEach((sharedEntityActiveInfo) => {
             const notificationMessage = `Active share ${sharedEntityActiveInfo.sharedEntity.Module} has a new Revision: ${sharedEntityActiveInfo.sharedEntity.Revision}`;
             if (updateNotification === 'Alert' || updateNotification === 'AlertWithNotification') {
-                this.adaptableApi.alertApi.showAlert('TeamSharing', notificationMessage, 'Info', {
-                    DisplayNotification: updateNotification === 'AlertWithNotification',
-                });
+                this.showUpdateNotificationAlert(sharedEntityActiveInfo, notificationMessage);
             }
             if (updateNotification === 'SystemStatus') {
                 this.adaptableApi.systemStatusApi.setInfoSystemStatus(`TeamSharing: ${notificationMessage}`);
@@ -142,6 +143,62 @@ class TeamSharingService {
             this.adaptableApi.teamSharingApi.internalApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
         });
     }
+    showUpdateNotificationAlert(sharedEntityActiveInfo, message) {
+        const { updateNotification, showUpdateNotificationOncePerUpdate } = this.adaptableApi.optionsApi.getTeamSharingOptions();
+        if (this.dismissedNotifications.some((notification) => notification.entityUuid === sharedEntityActiveInfo.sharedEntity.Uuid)) {
+            return;
+        }
+        const buttons = [
+            {
+                Label: 'Ok',
+                ButtonStyle: {
+                    tone: 'neutral',
+                    variant: 'raised',
+                },
+            },
+            {
+                Label: 'Import',
+                Action: (context) => {
+                    this.adaptableApi.teamSharingApi.importSharedEntry(sharedEntityActiveInfo.sharedEntity);
+                },
+                ButtonStyle: {
+                    tone: 'info',
+                    variant: 'raised',
+                },
+            },
+        ];
+        if (!showUpdateNotificationOncePerUpdate) {
+            buttons.push({
+                Label: 'Dismiss',
+                ButtonStyle: {
+                    tone: 'error',
+                    variant: 'raised',
+                },
+                Action: () => {
+                    this.dismissedNotifications.push({
+                        entityUuid: sharedEntityActiveInfo.sharedEntity.Uuid,
+                    });
+                },
+            });
+        }
+        const alert = {
+            alertType: 'generic',
+            header: 'Team Sharing Update',
+            message: message,
+            alertDefinition: Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyAlertDefinition()), { MessageType: 'Info', AlertProperties: {
+                    DisplayNotification: updateNotification === 'AlertWithNotification',
+                    NotificationDuration: 'always',
+                }, AlertForm: {
+                    Buttons: buttons,
+                } }),
+        };
+        this.adaptableApi.alertApi.showAdaptableAlert(alert);
+        if (showUpdateNotificationOncePerUpdate) {
+            this.dismissedNotifications.push({
+                entityUuid: sharedEntityActiveInfo.sharedEntity.Uuid,
+            });
+        }
+    }
     destroy() {
         clearTimeout(this.updateCheckTimerId);
     }

package/src/Utilities/Services/ValidationService.js

@@ -64,13 +64,17 @@ class ValidationService {
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
         var _a;
         const displayValue = this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId);
-        return this.adaptableApi.predicateApi.handlePredicates((_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
+        const predicateDefHandlerContext = {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
             displayValue,
             node: dataChangedEvent.rowNode,
             column: dataChangedEvent.column,
-        }, false);
+            adaptableApi: this.adaptableApi,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
+        };
+        return this.adaptableApi.predicateApi.handlePredicates((_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
         const serverValidationContext = {

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:" },

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { AdaptableOptions } from '../../../../types';
+import { AdaptableConfig } from '../../../../types';
 export interface FinanceFormProps {
-    adaptableOptions: AdaptableOptions;
-    onChangeadAptableOptions: (adaptableOptions: AdaptableOptions) => void;
+    adaptableConfig: AdaptableConfig;
+    onChangedAdaptableConfig: (adaptableConfig: AdaptableConfig) => void;
 }
 export declare const FinanceForm: React.FunctionComponent<React.PropsWithChildren<FinanceFormProps>>;

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

@@ -216,17 +216,17 @@ const FDC3ColumnCreator = (props) => {
 const FinanceFormSectionTitle = (props) => (React.createElement(rebass_1.Box, Object.assign({}, props, { mb: 2 }),
     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) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    const columnOptions = (_c = (_b = (_a = props.adaptableConfig.gridOptions) === null || _a === void 0 ? void 0 : _a.columnDefs) === null || _b === void 0 ? void 0 : _b.map) === null || _c === void 0 ? void 0 : _c.call(_b, (item) => {
         var _a;
         return ({
             label: StringExtensions_1.default.Humanize((_a = item.headerName) !== null && _a !== void 0 ? _a : item.field),
             value: item.field,
         });
     });
-    const financePlugin = (_f = (_e = props.adaptableOptions) === null || _e === void 0 ? void 0 : _e.plugins) === null || _f === void 0 ? void 0 : _f.find((item) => item.pluginId === 'finance');
-    const financePluginOptions = ((_g = financePlugin === null || financePlugin === void 0 ? void 0 : financePlugin.options) !== null && _g !== void 0 ? _g : {});
-    const fdc3Columns = (_h = financePluginOptions === null || financePluginOptions === void 0 ? void 0 : financePluginOptions.fdc3Columns) !== null && _h !== void 0 ? _h : {};
+    const financePlugin = (_e = (_d = props.adaptableConfig.adaptableOptions) === null || _d === void 0 ? void 0 : _d.plugins) === null || _e === void 0 ? void 0 : _e.find((item) => item.pluginId === 'finance');
+    const financePluginOptions = ((_f = financePlugin === null || financePlugin === void 0 ? void 0 : financePlugin.options) !== null && _f !== void 0 ? _f : {});
+    const fdc3Columns = (_g = financePluginOptions === null || financePluginOptions === void 0 ? void 0 : financePluginOptions.fdc3Columns) !== null && _g !== void 0 ? _g : {};
     const handleSetFdc3Columns = (key, newFDC3Columns) => {
         var _a;
         // Unfurtunatly finance plugin options need to be mutated.
@@ -235,7 +235,7 @@ const FinanceForm = (props) => {
         financePluginOptions.fdc3Columns = (_a = financePluginOptions.fdc3Columns) !== null && _a !== void 0 ? _a : {};
         financePluginOptions.fdc3Columns[key] = newFDC3Columns;
         // on change is called with a new array of plugins so the component refreshes.
-        props.onChangeadAptableOptions(Object.assign(Object.assign({}, props.adaptableOptions), { plugins: [...props.adaptableOptions.plugins] }));
+        props.onChangedAdaptableConfig(Object.assign(Object.assign({}, props.adaptableConfig), { adaptableOptions: Object.assign(Object.assign({}, props.adaptableConfig.adaptableOptions), { plugins: [...props.adaptableConfig.adaptableOptions.plugins] }) }));
     };
     const renderEditor = (fdc3ColumnType, fdc3ColumnsItems) => {
         return fdc3ColumnsItems.map((fdc3Column, currentFDCColumnId) => (React.createElement(rebass_1.Box, { key: currentFDCColumnId, mb: 3 },
@@ -261,19 +261,19 @@ const FinanceForm = (props) => {
                     var _a;
                     handleSetFdc3Columns(type, [...((_a = fdc3Columns[type]) !== null && _a !== void 0 ? _a : []), fdc3Column]);
                 } })),
-        Boolean((_j = fdc3Columns.instrumentColumns) === null || _j === void 0 ? void 0 : _j.length) && (React.createElement(rebass_1.Box, null,
+        Boolean((_h = fdc3Columns.instrumentColumns) === null || _h === void 0 ? void 0 : _h.length) && (React.createElement(rebass_1.Box, null,
             React.createElement(FinanceFormSectionTitle, null, "Instrument Columns"),
             renderEditor('instrumentColumns', fdc3Columns.instrumentColumns))),
-        Boolean((_k = fdc3Columns.positionColumns) === null || _k === void 0 ? void 0 : _k.length) && (React.createElement(rebass_1.Box, null,
+        Boolean((_j = fdc3Columns.positionColumns) === null || _j === void 0 ? void 0 : _j.length) && (React.createElement(rebass_1.Box, null,
             React.createElement(FinanceFormSectionTitle, null, "Position Columns"),
             renderEditor('positionColumns', fdc3Columns.positionColumns))),
-        Boolean((_l = fdc3Columns.contactColumns) === null || _l === void 0 ? void 0 : _l.length) && (React.createElement(rebass_1.Box, null,
+        Boolean((_k = fdc3Columns.contactColumns) === null || _k === void 0 ? void 0 : _k.length) && (React.createElement(rebass_1.Box, null,
             React.createElement(FinanceFormSectionTitle, null, "Contact Columns"),
             renderEditor('contactColumns', fdc3Columns.contactColumns))),
-        Boolean((_m = fdc3Columns.countryColumns) === null || _m === void 0 ? void 0 : _m.length) && (React.createElement(rebass_1.Box, null,
+        Boolean((_l = fdc3Columns.countryColumns) === null || _l === void 0 ? void 0 : _l.length) && (React.createElement(rebass_1.Box, null,
             React.createElement(FinanceFormSectionTitle, null, "Country Columns"),
             renderEditor('countryColumns', fdc3Columns.countryColumns))),
-        Boolean((_o = fdc3Columns.organizationColumns) === null || _o === void 0 ? void 0 : _o.length) && (React.createElement(rebass_1.Box, null,
+        Boolean((_m = fdc3Columns.organizationColumns) === null || _m === void 0 ? void 0 : _m.length) && (React.createElement(rebass_1.Box, null,
             React.createElement(FinanceFormSectionTitle, null, "Organization Columns"),
             renderEditor('organizationColumns', fdc3Columns.organizationColumns)))));
 };

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

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import { AdaptableOptions } from '../../../types';
+import { GridOptions } from '@ag-grid-community/core';
 interface GridOptionsFormOptions {
-    adaptableOptions: AdaptableOptions;
-    onChangeadAptableOptions: (adaptableOptions: AdaptableOptions) => void;
+    gridOptions: GridOptions;
+    onChangedGridOptions: (gridOptions: GridOptions) => void;
 }
 declare const GridOptionsForm: (props: GridOptionsFormOptions) => JSX.Element;
 export default GridOptionsForm;