@adaptabletools/adaptable 12.1.7 → 12.2.0-canary.0

package/src/Utilities/Services/ReportService.js

@@ -21,8 +21,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.VISUAL_DATA_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.VisibleColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.VisibleRows,
+                    ReportColumnScope: 'VisibleColumns',
+                    ReportRowScope: 'VisibleRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -30,8 +30,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.ALL_DATA_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.AllColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.AllRows,
+                    ReportColumnScope: 'AllColumns',
+                    ReportRowScope: 'AllRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -39,8 +39,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.CURRENT_DATA_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.VisibleColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.VisibleRows,
+                    ReportColumnScope: 'VisibleColumns',
+                    ReportRowScope: 'VisibleRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -48,8 +48,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.SELECTED_CELLS_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.SelectedColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.SelectedCellRows,
+                    ReportColumnScope: 'SelectedColumns',
+                    ReportRowScope: 'SelectedCellRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -57,8 +57,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.SELECTED_ROWS_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.VisibleColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.SelectedRows,
+                    ReportColumnScope: 'VisibleColumns',
+                    ReportRowScope: 'SelectedRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -91,38 +91,42 @@ class ReportService {
     }
     GetReportColumnScopeShortDescription(report) {
         var _a, _b;
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return ['[Custom Columns]'];
+        }
         switch (report.ReportColumnScope) {
-            case Enums_1.ReportColumnScope.AllColumns:
+            case 'AllColumns':
                 return ['[All Columns]'];
-            case Enums_1.ReportColumnScope.VisibleColumns:
+            case 'VisibleColumns':
                 return ['[Visible Columns]'];
-            case Enums_1.ReportColumnScope.SelectedColumns:
+            case 'SelectedColumns':
                 return ['[Selected Columns]'];
-            case Enums_1.ReportColumnScope.ScopeColumns:
+            case 'ScopeColumns':
                 if ('ColumnIds' in (report === null || report === void 0 ? void 0 : report.Scope)) {
                     return (_b = (_a = report.Scope.ColumnIds).map) === null || _b === void 0 ? void 0 : _b.call(_a, (columnId) => { var _a; return (_a = this.adaptableApi.columnApi.getFriendlyNameFromColumnId(columnId)) !== null && _a !== void 0 ? _a : columnId; });
                 }
                 return ['[Bespoke Columns]'];
-            case Enums_1.ReportColumnScope.CustomColumns:
-                return ['[Custom Columns]'];
         }
     }
     GetReportColumnScopeLongDescription(report) {
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return '[Custom Columns]';
+        }
         switch (report.ReportColumnScope) {
-            case Enums_1.ReportColumnScope.AllColumns:
+            case 'AllColumns':
                 return '[All Columns]';
-            case Enums_1.ReportColumnScope.VisibleColumns:
+            case 'VisibleColumns':
                 return '[Visible Columns]';
-            case Enums_1.ReportColumnScope.SelectedColumns:
+            case 'SelectedColumns':
                 return '[Selected Columns]';
-            case Enums_1.ReportColumnScope.ScopeColumns:
+            case 'ScopeColumns':
                 return this.adaptableApi.scopeApi.getScopeDescription(report.Scope);
-            case Enums_1.ReportColumnScope.CustomColumns:
-                return '[Custom Columns]';
         }
     }
     GetReportExpressionDescription(report, cols) {
-        var _a;
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return '[Custom Data]';
+        }
         if (this.IsSystemReport(report.Name)) {
             if (report.Name == GeneralConstants_1.ALL_DATA_REPORT) {
                 return '[All Data]';
@@ -142,38 +146,39 @@ class ReportService {
         }
         else {
             switch (report.ReportRowScope) {
-                case Enums_1.ReportRowScope.AllRows:
+                case 'AllRows':
                     return '[All Rows]';
-                case Enums_1.ReportRowScope.VisibleRows:
+                case 'VisibleRows':
                     return '[Visible Rows]';
-                case Enums_1.ReportRowScope.SelectedRows:
+                case 'SelectedRows':
                     return '[Selected Rows]';
-                case Enums_1.ReportRowScope.ExpressionRows:
-                    return (_a = report.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression;
-                case Enums_1.ReportRowScope.CustomRows:
-                    return '[Custom Rows]';
+                case 'ExpressionRows':
+                    return this.adaptableApi.internalApi.getAdaptableQueryExpressionText(report.Query);
             }
         }
     }
     GetReportColumnsForReport(report, includePrimaryKey = false) {
         let reportColumns = [];
         let gridColumns = this.adaptableApi.columnApi.getColumns();
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return reportColumns;
+        }
         // first get the cols depending on the Column Scope
         switch (report.ReportColumnScope) {
-            case Enums_1.ReportColumnScope.AllColumns:
+            case 'AllColumns':
                 reportColumns = gridColumns;
                 break;
-            case Enums_1.ReportColumnScope.VisibleColumns:
+            case 'VisibleColumns':
                 reportColumns = gridColumns.filter((c) => c.visible);
                 break;
-            case Enums_1.ReportColumnScope.SelectedColumns:
+            case 'SelectedColumns':
                 // we extract the selected columns from the grid columns to preserve the grid column order
                 const selectedColumnIds = this.adaptableApi.gridApi
                     .getSelectedCellInfo()
                     .columns.map((column) => column.columnId);
                 reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.columnId));
                 break;
-            case Enums_1.ReportColumnScope.ScopeColumns:
+            case 'ScopeColumns':
                 if ('ColumnIds' in report.Scope) {
                     reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptableApi.columnApi.getColumnFromId(columnId)).filter((c) => c);
                 }
@@ -181,9 +186,6 @@ class ReportService {
                     reportColumns = this.adaptableApi.scopeApi.getColumnsForScope(report.Scope);
                 }
                 break;
-            case Enums_1.ReportColumnScope.CustomColumns:
-                // nothing required if custom coluns
-                break;
         }
         if (includePrimaryKey) {
             const pkColumn = reportColumns.find((column) => column.columnId === this.adaptableApi.internalApi.getAdaptableOptions().primaryKey);
@@ -202,14 +204,16 @@ class ReportService {
             friendlyName: column.friendlyName,
             dataType: column.dataType,
         }));
-        if (ArrayExtensions_1.default.IsNullOrEmpty(columns) &&
-            report.ReportRowScope !== Enums_1.ReportRowScope.CustomRows) {
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return this.adaptableApi.exportApi.runCustomReport(report.Name);
+        }
+        if (ArrayExtensions_1.default.IsNullOrEmpty(columns)) {
             return { columns: [], rows: [] };
         }
         const data = { columns, rows: [] };
         const columnIds = columns.map((column) => column.columnId);
         switch (report.ReportRowScope) {
-            case Enums_1.ReportRowScope.AllRows:
+            case 'AllRows':
                 this.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
                     // skip row groups
                     if (!rowNode.group) {
@@ -217,7 +221,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.VisibleRows:
+            case 'VisibleRows':
                 this.adaptableApi.internalApi.forAllVisibleRowNodesDo((rowNode) => {
                     // skip row groups
                     if (!rowNode.group) {
@@ -225,7 +229,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.ExpressionRows:
+            case 'ExpressionRows':
                 this.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
                     var _a;
                     if (this.adaptableApi.internalApi
@@ -235,7 +239,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.SelectedCellRows:
+            case 'SelectedCellRows':
                 const selectedCellInfo = this.adaptableApi.gridApi.getSelectedCellInfo();
                 const { gridCells: GridCells } = selectedCellInfo;
                 let selectedCellsByPrimaryKey = groupBy_1.default(GridCells, 'primaryKeyValue');
@@ -255,7 +259,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.SelectedRows:
+            case 'SelectedRows':
                 const selectedRowInfo = this.adaptableApi.gridApi.getSelectedRowInfo();
                 const selectedGridRowPrimaryKeys = (_b = (_a = selectedRowInfo === null || selectedRowInfo === void 0 ? void 0 : selectedRowInfo.gridRows) === null || _a === void 0 ? void 0 : _a.filter((gr) => gr.rowInfo.isGroup == false).map((gridRow) => gridRow.primaryKeyValue)) !== null && _b !== void 0 ? _b : [];
                 if (selectedGridRowPrimaryKeys.length) {
@@ -267,10 +271,6 @@ class ReportService {
                     });
                 }
                 break;
-            case Enums_1.ReportRowScope.CustomRows:
-                const reportData = this.adaptableApi.exportApi.runCustomReport(report.Name);
-                return reportData;
-            //  break;
         }
         return data;
     }

package/src/View/AdaptableView.js

@@ -25,7 +25,7 @@ class AdaptableView extends React.Component {
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
             React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup }),
             this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
-            React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi }),
+            Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && (React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })),
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
             React.createElement(Toastify_1.ToastContainer
             // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
@@ -50,7 +50,6 @@ function mapStateToProps(state, ownProps) {
 function mapDispatchToProps(dispatch) {
     return {
         onCloseScreenPopup: () => dispatch(PopupRedux.PopupHideScreen()),
-        onCloseAlertPopup: () => dispatch(PopupRedux.PopupHideAlert()),
         onClosePromptPopup: () => dispatch(PopupRedux.PopupHidePrompt()),
         onConfirmPromptPopup: (inputText) => dispatch(PopupRedux.PopupConfirmPrompt(inputText)),
         onConfirmConfirmationPopup: (comment) => dispatch(PopupRedux.PopupConfirmConfirmation(comment)),

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

@@ -2,7 +2,7 @@
 import { AdaptableOptions } from '../../../types';
 interface AdaptableOptionsFormOptions {
     adaptableOptions: AdaptableOptions;
-    onChangeadaptableOptions: (adaptableOptions: AdaptableOptions) => void;
+    onChangeadAptableOptions: (adaptableOptions: AdaptableOptions) => void;
 }
 declare const AdaptableOptionsForm: (props: AdaptableOptionsFormOptions) => JSX.Element;
 export default AdaptableOptionsForm;

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

@@ -21,7 +21,7 @@ const AdaptableOptionsForm = (props) => {
             React.createElement(FormLayout_1.FormRow, { label: "Adaptable ID" },
                 React.createElement(Input_1.default, { value: (_b = (_a = props === null || props === void 0 ? void 0 : props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.adaptableId) !== null && _b !== void 0 ? _b : null, onChange: (event) => {
                         var _a;
-                        props.onChangeadaptableOptions(Object.assign(Object.assign({}, abOptions), { adaptableId: (_a = event.target.value) !== null && _a !== void 0 ? _a : '' }));
+                        props.onChangeadAptableOptions(Object.assign(Object.assign({}, abOptions), { adaptableId: (_a = event.target.value) !== null && _a !== void 0 ? _a : '' }));
                     }, style: { minWidth: '20rem' } }))),
         React.createElement(HelpBlock_1.default, null, "General Options"),
         React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
@@ -30,7 +30,7 @@ const AdaptableOptionsForm = (props) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.generalOptions = Object.assign({}, abOptions.generalOptions);
                         abOptions.generalOptions.showMissingPrimaryKeyAlert = showMissingPrimaryKeyWarning;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } }))),
         React.createElement(HelpBlock_1.default, null, "Layout Options"),
         React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
@@ -39,7 +39,7 @@ const AdaptableOptionsForm = (props) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.layoutOptions = Object.assign({}, abOptions.layoutOptions);
                         abOptions.layoutOptions.autoSaveLayouts = autoSaveLayouts;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } }))),
         React.createElement(HelpBlock_1.default, null, "Search Options"),
         React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
@@ -49,42 +49,42 @@ const AdaptableOptionsForm = (props) => {
                         abOptions.adaptableQLOptions = Object.assign({}, abOptions.adaptableQLOptions);
                         abOptions.adaptableQLOptions.caseSensitiveTextComparisons =
                             caseSensitiveTextComparisons;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Use AG Grid Filter Form Style" },
                 React.createElement(CheckBox_1.CheckBox, { checked: filterOptions.useAgGridFilterFormStyle, onChange: (useAgGridFilterFormStyle) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.filterOptions = Object.assign({}, abOptions.filterOptions);
                         abOptions.filterOptions.useAgGridFilterFormStyle = useAgGridFilterFormStyle;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Use Adaptable Quick Filter" },
                 React.createElement(CheckBox_1.CheckBox, { checked: filterOptions.useAdaptableQuickFilter == true, onChange: (useAdaptableQuickFilter) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.filterOptions = Object.assign({}, abOptions.filterOptions);
                         abOptions.filterOptions.useAdaptableQuickFilter = useAdaptableQuickFilter;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Use Adaptable Filter Form" },
                 React.createElement(CheckBox_1.CheckBox, { checked: filterOptions.useAdaptableFilterForm == true, onChange: (useAdaptableFilterForm) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.filterOptions = Object.assign({}, abOptions.filterOptions);
                         abOptions.filterOptions.useAdaptableFilterForm = useAdaptableFilterForm;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Indicate Filtered Columns" },
                 React.createElement(CheckBox_1.CheckBox, { checked: filterOptions.indicateFilteredColumns, onChange: (indicateFilteredColumns) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.filterOptions = Object.assign({}, abOptions.filterOptions);
                         abOptions.filterOptions.indicateFilteredColumns = indicateFilteredColumns;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } })),
             React.createElement(FormLayout_1.FormRow, { label: "Auto Apply Filter" },
                 React.createElement(CheckBox_1.CheckBox, { checked: filterOptions.autoApplyFilter, onChange: (autoApplyFilter) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.filterOptions = Object.assign({}, abOptions.filterOptions);
                         abOptions.filterOptions.autoApplyFilter = autoApplyFilter;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     } }))),
         React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", margin: 2 },
             React.createElement(rebass_1.Text, { style: { flex: 3 }, marginRight: 2 }, "Max Column Value Items To Display"),
@@ -95,7 +95,7 @@ const AdaptableOptionsForm = (props) => {
                         abOptions = Object.assign({}, abOptions);
                         abOptions.filterOptions = Object.assign({}, abOptions.filterOptions);
                         abOptions.filterOptions.maxFilterValuesToDisplay = maxColumnValueItemsDisplayed;
-                        props.onChangeadaptableOptions(abOptions);
+                        props.onChangeadAptableOptions(abOptions);
                     }, value: filterOptions.maxFilterValuesToDisplay, marginRight: 3 })))));
 };
 exports.default = AdaptableOptionsForm;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/Components/FormBox.d.ts

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { BoxProps } from 'rebass';
+export declare const NocodeWizardFormBox: React.FunctionComponent<BoxProps>;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/Components/FormBox.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NocodeWizardFormBox = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const join_1 = tslib_1.__importDefault(require("../../../../components/utils/join"));
+const NocodeWizardFormBox = (props) => (React.createElement(rebass_1.Box, Object.assign({}, props, { padding: 2, mb: 2, className: join_1.default('ab-NocodeWizardFormBox', props.className) })));
+exports.NocodeWizardFormBox = NocodeWizardFormBox;

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

@@ -11,7 +11,9 @@ const GridOptionsForm_1 = tslib_1.__importDefault(require("./GridOptionsForm"));
 const AdaptableOptionsForm_1 = tslib_1.__importDefault(require("./AdaptableOptionsForm"));
 const EntitlementsForm_1 = tslib_1.__importDefault(require("./EntitlementsForm"));
 const UiOptionsForm_1 = require("./UIOptions/UiOptionsForm");
+const FinanceForm_1 = require("./FinanceForm");
 const ConfigurationWizard = (props) => {
+    var _a, _b;
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableOptions, setAdaptableOptions] = react_1.useState(() => {
         var _a;
@@ -58,6 +60,8 @@ 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');
+    console.log({ adaptableOptions });
     let sections = [
         {
             title: 'Columns',
@@ -68,38 +72,33 @@ const ConfigurationWizard = (props) => {
                 }
                 return true;
             },
-            render: () => (React.createElement(ConfigurationWizardColumnsStep_1.ConfigurationWizardColumnsStep, { adaptableOptions: adaptableOptions, setPrimaryKeyIsNotSelected: handlePrimaryKeyColumnIsNotSelected, onChange: (newAdaptableOptions) => {
-                    setAdaptableOptions(newAdaptableOptions);
-                }, selectedColumns: selectedColumns, onSelectionChange: handleColumnSelectionChange, onColumnChange: handleColumnsChange, columnsHandle: columnsHandle })),
+            render: () => (React.createElement(ConfigurationWizardColumnsStep_1.ConfigurationWizardColumnsStep, { adaptableOptions: adaptableOptions, setPrimaryKeyIsNotSelected: handlePrimaryKeyColumnIsNotSelected, onChange: setAdaptableOptions, 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.default, { adaptableOptions: adaptableOptions, onChangeadaptableOptions: (abOptions) => {
-                    setAdaptableOptions(abOptions);
-                } })),
+            render: () => (React.createElement(AdaptableOptionsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
         },
         {
             title: 'Grid Options',
             details: 'Configure AG Grid Options',
-            render: () => (React.createElement(GridOptionsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadaptableOptions: (abOptions) => {
-                    setAdaptableOptions(abOptions);
-                } })),
+            render: () => (React.createElement(GridOptionsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
         },
         {
             title: 'UI Elements',
             details: 'Configure UI Elements',
-            render: () => (React.createElement(UiOptionsForm_1.UIElementsForm, { adaptableOptions: adaptableOptions, onChangeadaptableOptions: (abOptions) => {
-                    setAdaptableOptions(abOptions);
-                } })),
+            render: () => (React.createElement(UiOptionsForm_1.UIElementsForm, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
         },
         {
             title: 'Entitlements',
             details: 'Configure Entitlements',
-            render: () => (React.createElement(EntitlementsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadaptableOptions: (abOptions) => {
-                    setAdaptableOptions(abOptions);
-                } })),
+            render: () => (React.createElement(EntitlementsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
+        },
+        financePlugin && {
+            title: 'Finance',
+            details: 'Finance Options',
+            render: () => (React.createElement(FinanceForm_1.FinanceForm, { adaptableOptions: adaptableOptions, onChangeadAptableOptions: setAdaptableOptions })),
         },
     ];
     if (props.startSections) {

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;
+    onChangeadAptableOptions: (adaptableOptions: AdaptableOptions) => void;
 }
 declare const EntitlementsForm: React.FunctionComponent<EntitlementsFormOptions>;
 export default EntitlementsForm;

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

@@ -71,7 +71,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.onChangeadAptableOptions(Object.assign(Object.assign({}, abOptions), { entitlementOptions: Object.assign(Object.assign({}, abOptions.entitlementOptions), { moduleEntitlements: newEntitlements }) }));
     }, [abOptions === null || abOptions === void 0 ? void 0 : abOptions.entitlementOptions]);
     const items = ALL_ENTITLEMENTS_MODULES.map((module) => {
         const cItems = colItems.map((item) => (Object.assign({}, item)));
@@ -140,7 +140,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.onChangeadAptableOptions(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

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