@adaptabletools/adaptable 12.1.8-canary.0 → 12.2.0-canary.1

package/src/Api/InternalApi.d.ts

@@ -17,7 +17,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableIcon, AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
+import { AdaptableIcon, AdaptableMessageType, AdaptableQuery, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -104,7 +104,11 @@ export interface InternalApi {
     getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
+    /**
+     * @deprecated use `evaluateExpressionInAdaptableQL()` instead
+     */
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
+    evaluateExpressionInAdaptableQL(adaptableQLModule: AdaptableQLModule, expression?: string): boolean;
     forAllRowNodesDo(func: (rowNode: RowNode) => void): void;
     forAllVisibleRowNodesDo(func: (rowNode: RowNode) => void): void;
     buildStandaloneColumnHeader(column: AdaptableColumn): AdaptableMenuItem[];
@@ -139,4 +143,5 @@ export interface InternalApi {
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
+    getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
 }

package/src/Api/QueryLanguageApi.d.ts

@@ -56,4 +56,9 @@ export interface QueryLanguageApi {
      * @param query - the AdaptableQuery
      */
     getAdaptableQueryExpression(query: Partial<AdaptableQuery>): string | undefined;
+    /**
+     * Returns the Expression string of the given AdaptableQuery with the column friendly names (instead of their technical IDs)
+     * @param query - the AdaptableQuery
+     */
+    getAdaptableQueryExpressionWithColumnFriendlyNames(query: Partial<AdaptableQuery>): string | undefined;
 }

package/src/Strategy/BulkUpdateModule.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { IBulkUpdateModule, BulkUpdateValidationResult } from './Interface/IBulkUpdateModule';
+import { BulkUpdateValidationResult, IBulkUpdateModule } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AccessLevel, AdaptableApi } from '../types';

package/src/Strategy/CalculatedColumnModule.js

@@ -81,7 +81,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 label: 'Column Name',
                 values: [calculateColumn.FriendlyName],
             },
-            getExpressionViewItems_1.getExpressionViewItems(calculateColumn.Query),
+            getExpressionViewItems_1.getExpressionViewItems(calculateColumn.Query, this.api),
         ].filter(Boolean);
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(settingsTags)) {
             items.push({

package/src/Strategy/QueryModule.js

@@ -38,7 +38,7 @@ class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Expression',
-                    values: [query.BooleanExpression],
+                    values: [this.api.internalApi.getAdaptableQueryExpressionText(query)],
                 },
                 getObjectTagsViewItems_1.getObjectTagsViewItems(query, this.api),
             ],

package/src/Strategy/Utilities/Export/getExportRowsViewItems.js

@@ -2,19 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExportRowsViewItems = void 0;
 const getExportRowsViewItems = (report, api) => {
-    var _a;
-    const values = [];
-    switch (report.ReportRowScope) {
-        case 'AllRows':
-            values.push('All Rows');
-            break;
-        case 'VisibleRows':
-            values.push('Visible Rows');
-            break;
-        case 'ExpressionRows':
-            values.push((_a = report.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression);
-            break;
-    }
     return {
         name: 'Rows',
         values: [

package/src/Strategy/Utilities/getExpressionViewItems.d.ts

@@ -1,5 +1,4 @@
 import { AdaptableCalculatedColumnQuery } from '../../PredefinedConfig/CalculatedColumnState';
-export declare const getExpressionViewItems: (query: AdaptableCalculatedColumnQuery) => {
-    name: string;
-    values: string[];
-};
+import { AdaptableApi } from '../../Api/AdaptableApi';
+import { AdaptableObjectItemView } from '../Interface/IModule';
+export declare const getExpressionViewItems: (query: AdaptableCalculatedColumnQuery, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Strategy/Utilities/getExpressionViewItems.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpressionViewItems = void 0;
-const getExpressionViewItems = (query) => {
-    var _a;
+const getExpressionViewItems = (query, api) => {
+    const expressionText = api.internalApi.getAdaptableQueryExpressionText(query);
     return {
         name: 'Expression',
-        values: [(_a = query === null || query === void 0 ? void 0 : query.ScalarExpression) !== null && _a !== void 0 ? _a : query === null || query === void 0 ? void 0 : query.AggregatedScalarExpression],
+        values: [expressionText],
     };
 };
 exports.getExpressionViewItems = getExpressionViewItems;

package/src/Strategy/Utilities/getRuleViewItems.js

@@ -7,7 +7,7 @@ const getRuleViewItems = (rule, api) => {
         values: [
             rule.Predicate
                 ? api.predicateApi.predicateToString(rule.Predicate)
-                : api.queryLanguageApi.getAdaptableQueryExpression(rule),
+                : api.internalApi.getAdaptableQueryExpressionText(rule),
         ],
     };
 };

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -62,6 +62,7 @@ exports.DefaultAdaptableOptions = {
         caseSensitiveTextComparisons: false,
         externallyEvaluatedModules: [],
         customPredicateDefs: [],
+        displayColumnFriendlyNamesForExpressions: true,
         expressionOptions: {
             defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
             defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctions,
@@ -150,6 +151,7 @@ exports.DefaultAdaptableOptions = {
         cellSummaryOperations: undefined,
         customSortComparers: undefined,
         englishVariant: 'GB',
+        unbalancedGroupsKey: undefined,
     },
     layoutOptions: {
         includeExpandedRowGroups: false,

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -29,7 +29,7 @@ exports.aggregatedExpressionFunctions = [
 exports.aggregatedScalarExpressionFunctions = {
     CUMUL: {
         handler(args, context) {
-            const aggregationParameter = expressionFunctionUtils_1.extractParameter('CUMUL', 'aggregationScalar', ['SUM', 'MIN', 'MAX', 'PERCENTAGE', 'AVG', 'PERCENTAGE'], args);
+            const aggregationParameter = expressionFunctionUtils_1.extractParameter('CUMUL', 'aggregationScalar', ['SUM', 'PERCENTAGE', 'AVG', 'MIN', 'MAX'], args);
             const overColumnParameter = expressionFunctionUtils_1.extractParameter('CUMUL', 'operand', ['OVER'], args);
             const cumulationExpressionEvaluation = mapAggregationToCumulation(aggregationParameter, overColumnParameter, context);
             const result = {

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -43,6 +43,7 @@ const handleWhereFunction = (args, context) => {
             node: rowNode,
             adaptableApi: context.adaptableApi,
             functions: context.whereClauseFunctions,
+            evaluateCustomQueryVariable: context.adaptableApi.internalApi.getQueryLanguageService().evaluateCustomQueryVariable,
         });
     };
     // observableExpressionResult
@@ -51,6 +52,7 @@ const handleWhereFunction = (args, context) => {
         adaptableApi: context.adaptableApi,
         functions: context.functions,
         filterFn,
+        evaluateCustomQueryVariable: context.adaptableApi.internalApi.getQueryLanguageService().evaluateCustomQueryVariable,
     });
 };
 exports.handleWhereFunction = handleWhereFunction;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts

@@ -2,5 +2,5 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Scalar Functions available in AdaptableQL
  */
-export declare type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'COL';
+export declare type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'COL' | 'VAR';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -18,6 +18,7 @@ const differenceInMonths_1 = tslib_1.__importDefault(require("date-fns/differenc
 const differenceInYears_1 = tslib_1.__importDefault(require("date-fns/differenceInYears"));
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const dateUtils_1 = require("./dateUtils");
+const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const sanitizeArguments = (values, allowNaN) => {
     return values.filter((value) => value != undefined && value != null && value !== '' && (allowNaN || !isNaN(value)));
 };
@@ -341,4 +342,17 @@ exports.scalarExpressionFunctions = {
         signatures: ['CONCAT(value1, value2, value3)'],
         examples: ['CONCAT([col1], [col2], [col3]'],
     },
+    VAR: {
+        handler(args, context) {
+            const [functionName, ...optionalArgs] = args;
+            if (StringExtensions_1.default.IsNullOrEmpty(functionName)) {
+                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('VAR', 'should have a name');
+            }
+            return context.evaluateCustomQueryVariable(functionName, optionalArgs);
+        },
+        isPredicate: true,
+        description: 'Returns the variable evaluation',
+        signatures: ['VAR(varName)', 'VAR(varName, arg1, arg2)'],
+        examples: ['VAR(CURRENT_USER)', 'VAR(IS_VALID_VALUE, IS_BLANK([col1]), [col2] < [col3])'],
+    },
 };

package/src/Utilities/Services/Interface/IQueryLanguageService.d.ts

@@ -35,4 +35,6 @@ export interface IQueryLanguageService extends IAdaptableService {
     getColumnsFromExpression(input: string): string[];
     getNamedQueryNamesFromExpression(input: string): string[];
     isCumulativeAggregate(input: string): boolean;
+    evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
+    getExpressionWithColumnFriendlyNames(expression: string): string;
 }

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

@@ -42,8 +42,9 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     getColumnsFromExpression(input?: string): string[];
     getNamedQueryNamesFromExpression(input?: string): string[];
     isCumulativeAggregate(input: string): boolean;
+    getExpressionWithColumnFriendlyNames(expression?: string): string;
     getModuleExpressionFunctions(module: AdaptableModule): ModuleExpressionFunctions;
-    destroy(): void;
+    evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
     private getBooleanAndScalarFunctions;
     private getExpressionCacheKey;
     private getNodesFromExpression;

package/src/Utilities/Services/QueryLanguageService.js

@@ -22,6 +22,7 @@ class QueryLanguageService {
             node: rowNode,
             adaptableApi: this.adaptableApi,
             functions: booleanAndScalarFunctions,
+            evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
         });
     }
     evaluateScalarExpression(expression, module, rowNode) {
@@ -34,6 +35,7 @@ class QueryLanguageService {
             node: null,
             adaptableApi: this.adaptableApi,
             functions: aggregatedScalarFunctions,
+            evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
         });
     }
     evaluateObservableExpression(reactiveExpression, module) {
@@ -44,6 +46,7 @@ class QueryLanguageService {
             adaptableApi: this.adaptableApi,
             functions: moduleExpressionFunctions.observableFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
+            evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
         });
         return reactiveExpression$;
     }
@@ -55,6 +58,7 @@ class QueryLanguageService {
             adaptableApi: this.adaptableApi,
             functions: moduleExpressionFunctions.aggregatedBooleanFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
+            evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
         });
         return aggregationEvaluation;
     }
@@ -253,6 +257,15 @@ class QueryLanguageService {
         var _a;
         return !!((_a = this.getNodesFromExpression(input, 'CUMUL')) === null || _a === void 0 ? void 0 : _a.length);
     }
+    getExpressionWithColumnFriendlyNames(expression = '') {
+        let result = expression;
+        const columnIds = this.getColumnsFromExpression(expression);
+        columnIds.forEach((columnId) => {
+            const columnFriendlyName = this.adaptableApi.columnApi.getFriendlyNameFromColumnId(columnId);
+            result = result.split(columnId).join(columnFriendlyName);
+        });
+        return result;
+    }
     // Returns the ExpressionFunctions available for the given Module as specified in the `QueryLanguageOptions.moduleExpressionFunctions`
     // if there are no specific functions defined, it falls back to the default values
     getModuleExpressionFunctions(module) {
@@ -293,8 +306,16 @@ class QueryLanguageService {
         this.cacheModuleSpecificExpressionFunctions.set(module, moduleSpecificFunctions);
         return moduleSpecificFunctions;
     }
-    destroy() {
-        // TO DO
+    evaluateCustomQueryVariable(functionName, args) {
+        var _a, _b, _c;
+        const context = {
+            adaptableApi: this.adaptableApi,
+            args,
+        };
+        const customQueryVariableDefinition = (_c = (_b = (_a = this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.customQueryVariable) === null || _c === void 0 ? void 0 : _c[functionName];
+        return typeof customQueryVariableDefinition === 'function'
+            ? customQueryVariableDefinition(context)
+            : customQueryVariableDefinition;
     }
     getBooleanAndScalarFunctions(moduleExpressionFunctions) {
         return Object.assign(Object.assign({}, moduleExpressionFunctions.booleanFunctions), moduleExpressionFunctions.scalarFunctions);
@@ -303,23 +324,28 @@ class QueryLanguageService {
         return `${module}::${expression}`;
     }
     getNodesFromExpression(input, nodeType) {
-        const resultSet = new Set();
-        // @ts-ignore
-        const walk = (node) => {
-            if (typeof node !== 'object') {
-                return false;
-            }
-            if (Array.isArray(node)) {
-                return node.map(walk);
-            }
-            node.args.map(walk);
-            if (node.type === nodeType) {
-                resultSet.add(String(node.args[0]));
-            }
-        };
-        const { ast } = parser.parse(input.trim());
-        walk(ast);
-        return Array.from(resultSet.values());
+        try {
+            const resultSet = new Set();
+            // @ts-ignore
+            const walk = (node) => {
+                if (typeof node !== 'object') {
+                    return false;
+                }
+                if (Array.isArray(node)) {
+                    return node.map(walk);
+                }
+                node.args.map(walk);
+                if (node.type === nodeType) {
+                    resultSet.add(String(node.args[0]));
+                }
+            };
+            const { ast } = parser.parse(input.trim());
+            walk(ast);
+            return Array.from(resultSet.values());
+        }
+        catch (e) {
+            return [];
+        }
     }
 }
 exports.QueryLanguageService = QueryLanguageService;

package/src/Utilities/Services/ReportService.js

@@ -124,7 +124,6 @@ class ReportService {
         }
     }
     GetReportExpressionDescription(report, cols) {
-        var _a;
         if (this.adaptableApi.exportApi.isCustomReport(report)) {
             return '[Custom Data]';
         }
@@ -154,7 +153,7 @@ class ReportService {
                 case 'SelectedRows':
                     return '[Selected Rows]';
                 case 'ExpressionRows':
-                    return (_a = report.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression;
+                    return this.adaptableApi.internalApi.getAdaptableQueryExpressionText(report.Query);
             }
         }
     }

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,7 @@ 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');
     let sections = [
         {
             title: 'Columns',
@@ -68,38 +71,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>;