@adaptabletools/adaptable 12.0.0-canary.0 → 12.0.0-canary.3

package/src/View/Components/PreviewResultsPanel.js

@@ -9,9 +9,9 @@ const check_1 = tslib_1.__importDefault(require("../../components/icons/check"))
 const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const columnsMap = new Map([
-    ['InitialValue', { field: 'InitialValue', flex: 1, header: 'Current', align: 'center' }],
-    ['ComputedValue', { field: 'ComputedValue', flex: 1, header: 'New', align: 'center' }],
-    ['ValidInfo', { field: 'ValidInfo', width: 80, header: 'Valid', align: 'center' }],
+    ['InitialValue', { field: 'InitialValue', defaultFlex: 1, header: 'Current', align: 'center' }],
+    ['ComputedValue', { field: 'ComputedValue', defaultFlex: 1, header: 'New', align: 'center' }],
+    ['ValidInfo', { field: 'ValidInfo', defaultWidth: 80, header: 'Valid', align: 'center' }],
 ]);
 const tableDOMProps = {
     style: { flex: 1 },

package/src/View/Components/WizardSummaryPage.js

@@ -6,8 +6,8 @@ const React = tslib_1.__importStar(require("react"));
 const WizardPanel_1 = tslib_1.__importDefault(require("../../components/WizardPanel"));
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const columnsMap = new Map([
-    ['Key', { field: 'Key', header: 'Property', flex: 1 }],
-    ['Value', { field: 'Value', header: 'Value', flex: 3 }],
+    ['Key', { field: 'Key', header: 'Property', defaultFlex: 1 }],
+    ['Value', { field: 'Value', header: 'Value', defaultFlex: 3 }],
 ]);
 const tableDOMProps = {
     className: 'ab-WizardSummary__list',

package/src/View/ConditionalStyle/Wizard/ConditionalStyleRuleWizardSection.js

@@ -21,7 +21,7 @@ function renderConditionalStyleRuleSummary(data) {
 }
 exports.renderConditionalStyleRuleSummary = renderConditionalStyleRuleSummary;
 function ConditionalStyleRuleWizardSection(props) {
-    const { data, api, moduleInfo } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api, moduleInfo } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
         React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: props.defaultPredicateId, predicateDefs: api.conditionalStyleApi.getCondStylePredicateDefsForScope(data.Scope), showAggregation: false, showObservable: false, showPredicate: !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: props.onChange, descriptions: {
                 selectPredicate: 'Select a Conditional Style Rule - to be applied when data changes',

package/src/View/ConditionalStyle/Wizard/ConditionalStyleScopeWizardSection.js

@@ -14,7 +14,7 @@ exports.renderConditionalStyleScopeSummary = (data) => {
     });
 };
 function ConditionalStyleScopeWizardSection(props) {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
         React.createElement(NewScopeComponent_1.NewScopeComponent, { scope: data.Scope, descriptions: {
                 rowScope: 'Matching Rows will have the Conditional Style applied',

package/src/View/ConditionalStyle/Wizard/ConditionalStyleSettingsWizardSettings.js

@@ -12,7 +12,7 @@ exports.renderConditionalStyleSettingsSummary = (data) => (React.createElement(r
     React.createElement(rebass_1.Text, null, "Include grouped rows"),
     React.createElement(rebass_1.Text, { mt: 3 }, data.IncludeGroupedRows ? 'Yes' : 'No')));
 exports.ConditionalStyleSettingsWizardSettings = (props) => {
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const onIncludeGroupedRowsChanged = (checked) => {
         props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows: checked }));
     };

package/src/View/ConditionalStyle/Wizard/ConditionalStyleStyleWizardSection.js

@@ -14,7 +14,7 @@ exports.renderConditionalStyleStyleSummary = (data) => {
     return (React.createElement(rebass_1.Text, { padding: 2, style: toStyle(data.Style) }, "Preview result"));
 };
 function ConditionalStyleStyleWizardSection(props) {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: data.Style, UpdateStyle: (Style) => {
             props.onChange(Object.assign(Object.assign({}, data), { Style }));
         } }));

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.js

@@ -9,7 +9,7 @@ const Tag_1 = require("../../../components/Tag");
 const ColumnSelector_1 = require("../../Components/ColumnSelector");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 exports.renderCustomSortColumn = (data) => {
-    const { api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(rebass_1.Text, { pr: 2, py: 2, fontSize: 2 },
         "Custom sort column: ",
         React.createElement(Tag_1.Tag, null, api.columnApi.getFriendlyNameFromColumnId(data.ColumnId))));
@@ -21,7 +21,7 @@ exports.isValidCustomSortColumn = (data) => {
     return true;
 };
 exports.CustomSortColumnWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const sortableCols = React.useMemo(() => {
         var _a, _b;
         const sortableColumns = api.columnApi.getSortableColumns();

package/src/View/CustomSort/Wizard/CustomSortValuesWizardSection.js

@@ -23,7 +23,7 @@ exports.renderCustomSortValuesSummary = (data) => {
         React.createElement(ValueSelector_1.ValueOptionsTags, { options: data.SortedValues, value: data.SortedValues, toIdentifier: (x) => `${x}`, toLabel: (x) => `${x}`, allowWrap: true, readOnly: true }))) : null;
 };
 exports.CustomSortValuesWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const [distinctValues, setDistinctValues] = react_1.useState([]);
     const [isDistinctValuesLoading, setIsDistinctValuesLoading] = react_1.useState(false);
     react_1.useEffect(() => {

package/src/View/DataChangeHistory/buildActionColumnButton.d.ts

@@ -1,3 +1,3 @@
 import { RowNode } from '@ag-grid-community/all-modules';
-import { ActionColumnButtonContext, AdaptableButton, DataChangeHistoryOptions } from '../../types';
-export declare const buildActionColumnButton: (options: DataChangeHistoryOptions, undoRowNode: (rowNode: RowNode) => void) => AdaptableButton<ActionColumnButtonContext>[];
+import { ActionColumnContext, AdaptableButton, DataChangeHistoryOptions } from '../../types';
+export declare const buildActionColumnButton: (options: DataChangeHistoryOptions, undoRowNode: (rowNode: RowNode) => void) => AdaptableButton<ActionColumnContext>[];

package/src/View/Export/Wizard/ReportColumnsWizardSection.js

@@ -31,7 +31,7 @@ exports.renderReportColumnsSummary = (report) => {
         }))) : null));
 };
 exports.ReportColumnsWizardSection = (props) => {
-    const { api, data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { api, data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(rebass_1.Flex, { flexDirection: "column", style: { height: '100%' }, padding: 2 },
         React.createElement(Tabs_1.Tabs, { m: 2, value: data.ReportColumnScope, onValueChange: (ReportColumnScope) => {
                 const report = Object.assign(Object.assign({}, data), { ReportColumnScope });

package/src/View/Export/Wizard/ReportNameWizardSection.js

@@ -28,7 +28,7 @@ exports.isValidReportName = (report, api) => {
     return hasAlreadyExistingName ? 'A Report already exists with that name' : true;
 };
 exports.ReportNameWizardSection = (props) => {
-    const { api, data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { api, data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const validCheck = exports.isValidReportName(data, api);
     const ErrorMessage = validCheck === true ? null : validCheck;
     return (React.createElement(React.Fragment, null,

package/src/View/Export/Wizard/ReportRowsWizardSection.js

@@ -34,7 +34,7 @@ exports.renderReportRowsSummary = (report) => {
 };
 exports.ReportRowsWizardSection = (props) => {
     var _a, _b;
-    const { api, data, moduleInfo } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { api, data, moduleInfo } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const initialData = react_1.useMemo(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs_1.Tabs, { m: 2, value: data.ReportRowScope, onValueChange: (ReportRowScope) => {

package/src/View/Filter/ActiveFiltersPanel.js

@@ -9,6 +9,6 @@ const AdaptableObjectCompactList_1 = require("../Components/AdaptableObjectList/
 exports.ActiveFiltersPanel = () => {
     const adaptable = AdaptableContext_1.useAdaptable();
     const filterModule = adaptable.ModuleService.getModuleById(ModuleConstants.FilterModuleId);
-    const columnFilters = adaptable.api.layoutApi.getAllColumnFilter();
+    const columnFilters = adaptable.api.filterApi.getColumnFilters();
     return React.createElement(AdaptableObjectCompactList_1.AdaptableObjectCompactList, { abObjects: columnFilters, module: filterModule });
 };

package/src/View/Filter/FilterSummary.js

@@ -34,7 +34,7 @@ class FilterSummaryComponent extends React.Component {
         if (columnFilter == null) {
             return 'No Column Filter Active';
         }
-        return this.props.api.layoutApi.columnFilterToString(columnFilter);
+        return this.props.api.filterApi.columnFilterToString(columnFilter);
     }
 }
 exports.FilterSummaryComponent = FilterSummaryComponent;

package/src/View/Filter/FilterViewPanel.js

@@ -27,10 +27,10 @@ class FilterViewPanelComponent extends React.Component {
                 } }, "Show Quick Filter")))));
     }
     onClearFilters() {
-        this.props.api.layoutApi.clearAllColumnFilter();
+        this.props.api.filterApi.clearColumnFilters();
     }
     onClearColumnFilter(columnFilter) {
-        this.props.api.layoutApi.clearColumnFilterByColumn(columnFilter.ColumnId);
+        this.props.api.filterApi.clearColumnFilterByColumn(columnFilter.ColumnId);
     }
 }
 function mapStateToProps(state) {

package/src/View/FlashingCell/Wizard/FlashingCellRulesWizardSection.js

@@ -8,7 +8,7 @@ const CodeBlock_1 = require("../../../components/CodeBlock");
 const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 exports.renderFlashingAlertRulesSummary = (flashingAlert) => {
     var _a;
-    const { api: { flashingCellApi }, } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { api: { flashingCellApi }, } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const FlashTarget = (_a = flashingAlert.FlashTarget) !== null && _a !== void 0 ? _a : flashingCellApi.getFlashingCellFlashTarget(flashingAlert);
     return (React.createElement(EntityRulesEditor_1.EntityRulesSummary, { data: flashingAlert, renderPredicate: (content) => {
             return (React.createElement(React.Fragment, null,
@@ -28,7 +28,7 @@ exports.renderFlashingAlertRulesSummary = (flashingAlert) => {
         } }));
 };
 exports.FlashingAlertRulesWizardSection = (props) => {
-    const { data, api, moduleInfo } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api, moduleInfo } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const predicateDefs = api.flashingCellApi.getFlashingCellPredicateDefsForScope(data.Scope);
     return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "Any", data: data, predicateDefs: predicateDefs, onChange: props.onChange, showAggregation: false, showObservable: false, showBoolean: true, showPredicate: true, descriptions: {
             selectPredicate: 'Select an Flashing Cell Rule - to be applied when data changes',

package/src/View/FlashingCell/Wizard/FlashingCellScopeWizardSection.js

@@ -7,7 +7,7 @@ const rebass_1 = require("rebass");
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 exports.FlashingAlertScopeWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(rebass_1.Flex, { flexDirection: "column", style: { height: '100%' }, padding: 2 },
         React.createElement(NewScopeComponent_1.NewScopeComponent, { descriptions: {
                 rowScope: 'Changes anywhere in the row will trigger an Flashing Cell',

package/src/View/FlashingCell/Wizard/FlashingCellSettingsWizardSection.js

@@ -23,7 +23,7 @@ exports.renderFlashingAlertSettingsSummary = (flashingAlert) => {
 };
 exports.FlashingAlertSettingsWizardSection = (props) => {
     var _a, _b, _c, _d, _e, _f, _g;
-    let { data: flashingCell } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    let { data: flashingCell } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     flashingCell = flashingCell !== null && flashingCell !== void 0 ? flashingCell : props.flashingCell;
     const setDuration = (FlashDuration) => {
         props.onChange(Object.assign(Object.assign({}, flashingCell), { FlashDuration: FlashDuration }));

package/src/View/FlashingCell/Wizard/FlashingCellStyleWizardSection.js

@@ -11,7 +11,7 @@ const StylePreview_1 = require("../../../components/StylePreview");
 const changeStyle = (React.createElement(rebass_1.Text, { fontSize: 2, style: { display: 'inline-block' } }, "Change style"));
 exports.FlashingAlertStyleWizardSection = (props) => {
     var _a, _b, _c;
-    let { data: flashingAlert, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    let { data: flashingAlert, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     flashingAlert = flashingAlert !== null && flashingAlert !== void 0 ? flashingAlert : props.flashingAlert;
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs_1.Tabs, { defaultValue: "up" },

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -355,7 +355,7 @@ const renderStringFormat = (data, _onChange, setFormatOption, customFormatters,
 };
 exports.FormatColumnFormatWizardSection = (props) => {
     var _a, _b, _c;
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const adaptable = AdaptableContext_1.useAdaptable();
     const formatColumnApi = adaptable.api.formatColumnApi;
     const customDisplayFormatters = (_c = (_b = (_a = adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.userInterfaceOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];

package/src/View/FormatColumn/Wizard/FormatColumnScopeWizardSection.js

@@ -13,7 +13,7 @@ exports.renderFormatColumnScopeSummary = (data) => {
     });
 };
 exports.FormatColumnScopeWizardSection = (props) => {
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(NewScopeComponent_1.NewScopeComponent, { descriptions: {
             rowScope: 'Apply a style to an entire row',
             columnScope: 'Select columns to format',

package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.js

@@ -33,7 +33,7 @@ exports.renderFormatColumnSettingsSummary = (data) => {
             React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
 };
 exports.FormatColumnSettingsWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const onCellAlignmentSelectChanged = (CellAlignment) => {
         props.onChange(Object.assign(Object.assign({}, data), { CellAlignment }));
     };

package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.js

@@ -105,7 +105,7 @@ exports.renderFormatColumnStyleSummary = (data, api) => {
 };
 function FormatColumnStyleWizardSection(props) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const singleNumericColumn = api.scopeApi.isSingleNumericColumnScope(data.Scope);
     const onlyBooleanColumnsInScope = api.scopeApi.areAllBooleanColumnsInScope(data.Scope) ||
         api.scopeApi.scopeHasOnlyBooleanDataType(data.Scope);

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -8,7 +8,6 @@ const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
-const Enums_1 = require("../../../PredefinedConfig/Common/Enums");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
@@ -19,10 +18,10 @@ const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
 const Tag_1 = require("../../../components/Tag");
 const SpecialColumnSettingsWizardStep_1 = require("../../SpecialColumnSettingsWizardStep");
 const options = [
-    { value: Enums_1.DataType.Number, label: Enums_1.DataType.Number },
-    { value: Enums_1.DataType.String, label: Enums_1.DataType.String },
-    { value: Enums_1.DataType.Date, label: Enums_1.DataType.Date },
-    { value: Enums_1.DataType.Boolean, label: Enums_1.DataType.Boolean },
+    { value: 'Number', label: 'Number' },
+    { value: 'String', label: 'String' },
+    { value: 'Date', label: 'Date' },
+    { value: 'Boolean', label: 'Boolean' },
 ];
 exports.renderFreeTextColumnSummary = (data) => {
     var _a;
@@ -59,7 +58,7 @@ exports.isValidFreeTextColumn = (data, api) => {
     return true;
 };
 exports.FreeTextColumnSettingsWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const Pattern = api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions.dateFormat;
     const [ColumnNameFocused, setColumnNameFocused] = react_1.useState(false);
     const inEdit = props.isEdit;

package/src/View/GridInfo/ColumnInfoComponent.js

@@ -125,7 +125,7 @@ class ColumnInfoComponent extends React.Component {
                     React.createElement(FreeTextColumnSummary_1.FreeTextColumnSummary, { key: ModuleConstants.FreeTextColumnModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.FreeTextColumnModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.FreeTextColumnModuleId) })));
             }
             if (this.isModuleAvailable(ModuleConstants.PlusMinusModuleId) &&
-                this.state.SelectedColumn.dataType == Enums_1.DataType.Number) {
+                this.state.SelectedColumn.dataType == 'Number') {
                 summaries.push(React.createElement("div", { key: ModuleConstants.PlusMinusModuleId, className: this.isModuleReadOnly(ModuleConstants.PlusMinusModuleId)
                         ? GeneralConstants.READ_ONLY_STYLE
                         : '' },

package/src/View/GridInfo/GridInfoPopup.js

@@ -57,7 +57,7 @@ exports.GridInfoPopup = (props) => {
         const freeTextColumns = props.api.freeTextColumnApi
             .getAllFreeTextColumn()
             .map((c) => c.ColumnId);
-        const columnFilterDescription = props.api.layoutApi.columnFiltersToString(props.api.layoutApi.getAllColumnFilter());
+        const columnFilterDescription = props.api.filterApi.columnFiltersToString(props.api.filterApi.getColumnFilters());
         const sorts = ArrayExtensions_1.default.IsNotNullOrEmpty(props.api.gridApi.getColumnSorts())
             ? props.api.gridApi.getColumnSorts().map((gs) => {
                 return props.api.columnApi.getFriendlyNameFromColumnId(gs.ColumnId) + ': ' + gs.SortOrder;

package/src/View/PlusMinus/Wizard/PlusMinusRuleWizardSection.js

@@ -7,7 +7,7 @@ const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 const CodeBlock_1 = require("../../../components/CodeBlock");
 function PlusMinusRuleSummary() {
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(EntityRulesEditor_1.EntityRulesSummary, { data: data, renderPredicate: (contents) => {
             return (React.createElement(React.Fragment, null,
                 "Apply Plus Minus on ",
@@ -23,7 +23,7 @@ function PlusMinusRuleSummary() {
 exports.PlusMinusRuleSummary = PlusMinusRuleSummary;
 function PlusMinusRuleWizardSection(props) {
     var _a;
-    const { data, moduleInfo } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, moduleInfo } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const plusMinusNudge = Object.assign(Object.assign({}, data), { Rule: (_a = data === null || data === void 0 ? void 0 : data.Rule) !== null && _a !== void 0 ? _a : { BooleanExpression: '' } });
     return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, 
         // min-height 0 so the container does not min-size from it's children

package/src/View/PlusMinus/Wizard/PlusMinusScopeWizardSection.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 exports.PlusMinusScopeWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const availableColumns = React.useMemo(() => api.columnApi.getNumericColumns(), []);
     return (React.createElement(NewScopeComponent_1.NewScopeComponent, { availableDataTypes: ['Number'], scopeColumns: availableColumns, scope: data.Scope, descriptions: {
             rowScope: 'Matching rows will have the plus/minus applied',

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.js

@@ -15,7 +15,7 @@ const OnePageAdaptableWizard_2 = require("../../../View/Wizard/OnePageAdaptableW
 const Tag_1 = require("../../../components/Tag");
 exports.PlusMinusSettingsSummary = (props) => {
     var _a;
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
         React.createElement(OnePageAdaptableWizard_2.SummaryText, null,
             "Nudge Value ",
@@ -37,7 +37,7 @@ exports.isSettingsValid = (hasCondition) => (data, api, context) => {
 };
 exports.PlusMinusSettingsWizardSection = (props) => {
     var _a;
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const handleNudgeValueChange = (event) => {
         const newValue = parseFloat(event.target.value);
         props.onChange(Object.assign(Object.assign({}, data), { NudgeValue: isNaN(newValue) ? '' : newValue }));

package/src/View/Query/Wizard/NamedQueryExpressionWizardSection.js

@@ -27,7 +27,7 @@ exports.renderNamedQueryExpressionSummary = (data) => {
 };
 exports.NamedQueryExpressionWizardSection = (props) => {
     const { api } = AdaptableContext_1.useAdaptable();
-    const { data, moduleInfo } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, moduleInfo } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const initialData = react_1.useMemo(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(ExpressionEditor_1.ExpressionEditor, { allowSaveNamedQuery: false, type: 'boolean', module: moduleInfo.ModuleName, value: data.BooleanExpression, onChange: (BooleanExpression) => {
             props.onChange(Object.assign(Object.assign({}, data), { BooleanExpression }));

package/src/View/Query/Wizard/NamedQuerySettingsWizardSection.js

@@ -24,7 +24,7 @@ exports.renderNamedQuerySettingsSummary = (data) => {
         React.createElement(Tag_1.Tag, null, data.Name)));
 };
 exports.NamedQuerySettingsWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const valid = exports.isValidNamedQuerySettings(data, api);
     const errorMessage = valid === true ? null : valid;
     const handleColumnNameChange = (event) => {

package/src/View/Schedule/Wizard/ScheduleScheduleSummary.js

@@ -7,7 +7,7 @@ const Tag_1 = require("../../../components/Tag");
 const UIHelper_1 = require("../../UIHelper");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 exports.ScheduleScheduleSummary = () => {
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(OnePageAdaptableWizard_1.SummaryText, null,
         "Schedule: ",
         React.createElement(Tag_1.Tag, null, UIHelper_1.UIHelper.getScheduleDescription(data.Schedule))));

package/src/View/Schedule/Wizard/ScheduleScheduleWizard.js

@@ -59,7 +59,7 @@ const daysMap = [
 ];
 exports.ScheduleScheduleWizard = (props) => {
     var _a, _b, _c, _d, _e;
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const handleIsOneOfChange = (isOneOffNew) => {
         var _a, _b;
         props.onSetIsOneOff(isOneOffNew);

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary.js

@@ -83,7 +83,7 @@ exports.getScheduleSettingsValues = (data) => {
     return [];
 };
 exports.ScheduleSettingsSummary = () => {
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null, exports.getScheduleSettingsValues(data).map((description, index) => (React.createElement(OnePageAdaptableWizard_1.SummaryText, { key: index },
         description.label,
         ": ",

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsWizard.js

@@ -11,7 +11,7 @@ const ScheduleSettingsIPushPull_1 = require("./ScheduleSettingsIPushPull");
 const ScheduleSettingsOpenFin_1 = require("./ScheduleSettingsOpenFin");
 const ScheduleSettingsGlue42_1 = require("./ScheduleSettingsGlue42");
 exports.ScheduleSettingsWizard = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const allReports = api.exportApi.getAllReports();
     if ((data === null || data === void 0 ? void 0 : data.ScheduleType) === Enums_1.ScheduleType.Reminder) {
         return (React.createElement(ScheduleSettingsReminder_1.ScheduleSettingsReminder, { reminderSchedule: data, onChange: props.onChange }));

package/src/View/Shortcut/Wizard/ShortcutScopeWizardSection.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 exports.ShortcutScopeWizardSection = (props) => {
-    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const availableColumns = React.useMemo(() => api.columnApi.getNumericColumns(), []);
     return (React.createElement(NewScopeComponent_1.NewScopeComponent, { availableDataTypes: ['Number'], scopeColumns: availableColumns, scope: data.Scope, descriptions: {
             rowScope: 'Matching rows will have the shortcut applied',

package/src/View/Shortcut/Wizard/ShortcutSettingsWizard.js

@@ -24,7 +24,7 @@ exports.isSettingsValid = (data) => {
 };
 exports.ShortcutSettingsSummary = () => {
     var _a, _b;
-    const { data: shortcut } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data: shortcut } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
         React.createElement(OnePageAdaptableWizard_2.SummaryText, null,
             "Shortcut Key ",
@@ -38,7 +38,7 @@ exports.ShortcutSettingsSummary = () => {
 };
 exports.ShortcutSettingsWizard = (props) => {
     var _a;
-    const { data: shortcut } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data: shortcut } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const handleKeyChange = React.useCallback((ShortcutKey) => {
         props.onChange(Object.assign(Object.assign({}, shortcut), { ShortcutKey }));
     }, [shortcut]);

package/src/View/UIHelper.js

@@ -109,22 +109,22 @@ function getEmptyConfigState() {
 exports.getEmptyConfigState = getEmptyConfigState;
 function getDescriptionForDataType(dataType) {
     switch (dataType) {
-        case Enums_1.DataType.String:
+        case 'String':
             return 'string';
-        case Enums_1.DataType.Number:
+        case 'Number':
             return 'number';
-        case Enums_1.DataType.Date:
+        case 'Date':
             return 'date';
     }
 }
 exports.getDescriptionForDataType = getDescriptionForDataType;
 function getPlaceholderForDataType(dataType) {
     switch (dataType) {
-        case Enums_1.DataType.String:
+        case 'String':
             return 'Enter Value';
-        case Enums_1.DataType.Number:
+        case 'Number':
             return 'Enter Number';
-        case Enums_1.DataType.Date:
+        case 'Date':
             return 'Enter Date';
     }
 }

package/src/View/Wizard/Interface/IAdaptableWizard.d.ts

@@ -34,9 +34,9 @@ export interface AdaptableObjectAdaptableWizardProps<View> extends AdaptableWiza
     api: AdaptableApi;
 }
 export interface AdaptableOnePageWizardProps<T extends AdaptableObject> {
-    moduleInfo: ModuleInfo;
+    moduleInfo?: ModuleInfo;
     data: T;
-    configEntities: T[];
+    configEntities?: T[];
     wizardStartIndex?: number;
     onCloseWizard: VoidFunction;
     onFinishWizard: (data: T) => void;

package/src/View/Wizard/ObjectTagsWizardSection.js

@@ -9,7 +9,7 @@ const OnePageAdaptableWizard_1 = require("./OnePageAdaptableWizard");
 const rebass_1 = require("rebass");
 exports.ObjectTagsWizardSection = (props) => {
     const { onChange } = props;
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' } },
         React.createElement(Tabs_1.Tabs.Tab, null, "Tags"),
         React.createElement(Tabs_1.Tabs.Content, null,

package/src/View/Wizard/OnePageAdaptableWizard.d.ts

@@ -6,29 +6,28 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { ExpressionEditorNamedQuery } from '../../components/ExpressionEditor/NamedQueryContext';
 export declare type OnePageAdaptableWizardContextType<T> = {
     data: T;
-    sections: (OnePageWizardSection<T> | '-')[];
+    sections: (OnePageAdaptableWizardSection<T> | '-')[];
     moduleInfo: ModuleInfo;
     api: AdaptableApi;
-    setCurrentSection: (index: number) => void;
     namedQuery: ExpressionEditorNamedQuery;
 };
 export declare const SummaryTag: React.FunctionComponent<TextProps>;
 export declare const SummaryText: React.FunctionComponent<TextProps>;
 export declare const FormDescriptionText: React.FunctionComponent<TextProps>;
 export declare const OnePageAdaptableWizardContext: React.Context<OnePageAdaptableWizardContextType<any>>;
-export declare function useOnePageWizardContext<ENTITY>(): OnePageAdaptableWizardContextType<ENTITY>;
-export declare type OnePageWizardSection<ENTITY> = {
+export declare function useOnePageAdaptableWizardContext<ENTITY>(): OnePageAdaptableWizardContextType<ENTITY>;
+export interface OnePageAdaptableWizardSection<ENTITY> {
     title: string;
     details?: React.ReactNode;
     isValid?: (data: ENTITY, api: AdaptableApi, context: OnePageAdaptableWizardContextType<ENTITY>) => true | string;
     isVisible?: (data: ENTITY, api: AdaptableApi, context: OnePageAdaptableWizardContextType<ENTITY>) => boolean;
     render: (data: ENTITY, index: number) => React.ReactNode;
     renderSummary?: (data: ENTITY, api: AdaptableApi) => React.ReactNode;
-};
+}
 export interface OnePageAdaptableWizardProps<ENTITY> {
     moduleInfo: ModuleInfo;
     data: ENTITY;
-    sections: (OnePageWizardSection<ENTITY> | '-')[];
+    sections: (OnePageAdaptableWizardSection<ENTITY> | '-')[];
     currentIndex?: number;
     defaultCurrentIndex?: number;
     defaultCurrentSectionName?: string;