@adaptabletools/adaptable 11.3.0 → 12.0.0-canary.2

package/src/View/Filter/FilterViewPanel.js

@@ -2,35 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterViewPanelControl = void 0;
 const tslib_1 = require("tslib");
-const FilterRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FilterRedux"));
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const React = tslib_1.__importStar(require("react"));
 const ActiveFiltersPanel_1 = require("./ActiveFiltersPanel");
 const rebass_1 = require("rebass");
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const AdaptablePopover_1 = require("../AdaptablePopover");
-const ButtonClear_1 = require("../Components/Buttons/ButtonClear");
 const CheckBox_1 = require("../../components/CheckBox");
 const react_redux_1 = require("react-redux");
+const LayoutRedux_1 = require("../../Redux/ActionsReducers/LayoutRedux");
 class FilterViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
     }
     render() {
-        const activeFiltersPanel = React.createElement(ActiveFiltersPanel_1.ActiveFiltersPanel, null);
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__Filter__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
-            React.createElement(rebass_1.Flex, null, ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.props.ColumnFilters) && (React.createElement(React.Fragment, null,
-                React.createElement(AdaptablePopover_1.AdaptablePopover, { popupPadding: 0, className: `ab-${elementType}__Filter__info`, headerText: "", bodyText: [activeFiltersPanel], 
-                    //  tooltipText={'Show Filter Details'}
-                    useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 }),
-                React.createElement(ButtonClear_1.ButtonClear, { marginLeft: 1, marginBottom: 0, marginRight: 1, className: `ab-${elementType}__Filter__clear`, onClick: () => this.onClearFilters(), tooltip: "Clear Filters", disabled: this.props.ColumnFilters.length == 0, showText: this.props.viewType === 'ToolPanel' }, this.props.viewType === 'ToolPanel' && 'Clear')))),
+            React.createElement(rebass_1.Flex, null, ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.props.ColumnFilters) && (React.createElement(AdaptablePopover_1.AdaptablePopover, { popupPadding: 0, className: `ab-${elementType}__Filter__info`, headerText: "", bodyText: [React.createElement(ActiveFiltersPanel_1.ActiveFiltersPanel, null)], 
+                //  tooltipText={'Show Filter Details'}
+                useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 }))),
             React.createElement(rebass_1.Flex, { alignItems: "center" }, this.props.api.filterApi.isQuickFilterAvailable() && (React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Filter__active-check`, disabled: this.props.accessLevel === 'ReadOnly' ||
                     this.props.api.internalApi.isGridInPivotMode(), marginTop: 0, marginBottom: 0, fontSize: 2, padding: 1, checked: this.props.IsQuickFilterVisible, onChange: (checked) => {
                     checked ? this.props.onShowQuickFilterBar() : this.props.onHideQuickFilterBar();
                 } }, "Show Quick Filter")))));
     }
     onClearFilters() {
-        this.props.api.filterApi.clearAllColumnFilter();
+        this.props.api.filterApi.clearColumnFilters();
     }
     onClearColumnFilter(columnFilter) {
         this.props.api.filterApi.clearColumnFilterByColumn(columnFilter.ColumnId);
@@ -38,14 +35,14 @@ class FilterViewPanelComponent extends React.Component {
 }
 function mapStateToProps(state) {
     return {
-        ColumnFilters: state.Filter.ColumnFilters,
-        IsQuickFilterVisible: state.Filter.IsQuickFilterVisible,
+        ColumnFilters: LayoutRedux_1.getColumnFilterSelector(state),
+        IsQuickFilterVisible: state.System.IsQuickFilterVisible,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onHideQuickFilterBar: () => dispatch(FilterRedux.QuickFilterBarHide()),
-        onShowQuickFilterBar: () => dispatch(FilterRedux.QuickFilterBarShow()),
+        onHideQuickFilterBar: () => dispatch(SystemRedux.SystemQuickFilterBarHide()),
+        onShowQuickFilterBar: () => dispatch(SystemRedux.SystemQuickFilterBarShow()),
     };
 }
 exports.FilterViewPanelControl = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(FilterViewPanelComponent);

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,10 +355,10 @@ 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.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
+    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 : [];
     const update = (updated) => {
         props.onChange(Object.assign(Object.assign({}, data), updated));
     };

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.filterApi.columnFiltersToString(props.api.filterApi.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/Layout/LayoutStatusBarSubPanelPopover.js

@@ -3,32 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutStatusBarSubPanelPopover = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const SelectList_1 = require("../../components/SelectList");
 const AdaptableContext_1 = require("../AdaptableContext");
-const AdaptableObjectRow_1 = require("../Components/AdaptableObjectRow");
-const PanelWithRow_1 = require("../Components/Panels/PanelWithRow");
-const LayoutRadioSelector_1 = require("./LayoutRadioSelector");
-const colItems = [
-    { Content: 'Current', Size: 2 },
-    { Content: 'Layout Name', Size: 4 },
-];
 exports.LayoutStatusBarSubPanelPopover = () => {
     const adaptable = AdaptableContext_1.useAdaptable();
-    const accessLevel = adaptable.EntitlementService.getEntitlementAccessLevelForModule(ModuleConstants.LayoutModuleId);
     const layouts = adaptable.api.layoutApi.getAllLayout();
-    return (React.createElement(rebass_1.Flex, { flexDirection: "column" },
-        React.createElement(PanelWithRow_1.PanelWithRow, { colItems: colItems }),
-        layouts.map((layout) => {
-            return (React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: layout.Name, colItems: [
-                    {
-                        Content: (React.createElement(LayoutRadioSelector_1.LayoutRadioSelector, { accessLevel: accessLevel, id: layout.Name, data: layout })),
-                        Size: 1,
-                    },
-                    {
-                        Content: (React.createElement("label", { style: { cursor: 'pointer' }, htmlFor: layout.Name }, layout.Name)),
-                        Size: 4,
-                    },
-                ] }));
-        })));
+    const options = layouts.map((layout) => ({ label: layout.Name, value: layout.Uuid }));
+    const handleChange = (option) => {
+        adaptable.api.layoutApi.setLayout(option.label);
+    };
+    return React.createElement(SelectList_1.SelectList, { options: options, onChange: handleChange });
 };

package/src/View/Layout/Wizard/LayoutEditor/index.js

@@ -223,7 +223,7 @@ exports.LayoutEditor = React.memo((props) => {
                         // JW: Not sure we do - why not just make it always visible as we ignore if if not required.
                         const aggregateEnabled = true;
                         const customHeader = headerColumnsMap[c.columnId];
-                        const initialHeader = api.internalApi.getUserDefinedHeaderName(c.columnId);
+                        const initialHeader = api.columnApi.getFriendlyNameFromColumnId(c.columnId);
                         return (React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "stretch", "data-name": "drag-item", "data-col-id": c.columnId },
                             React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", backgroundColor: "secondary", color: "text-on-secondary" },
                                 React.createElement(rebass_1.Flex, { flex: 1, alignItems: "center" },

package/src/View/Layout/Wizard/LayoutEditorWizard.d.ts

@@ -27,6 +27,7 @@ export declare class LayoutEditorWizard extends React.Component<LayoutEditorWiza
             [columnId: string]: number;
         };
         ColumnSorts?: import("../../../types").ColumnSort[];
+        ColumnFilters?: import("../../../types").ColumnFilter[];
         RowGroupedColumns?: string[];
         ExpandedRowGroupValues?: any[];
         AggregationColumns?: Record<string, string | true>;

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/SmartEdit/SmartEditPopup.js

@@ -47,7 +47,7 @@ class SmartEditPopupComponent extends React.Component {
             operationMenuItems.push(...customOperations.map((operation) => {
                 return {
                     onClick: () => this.props.onSmartEditOperationChange(operation),
-                    label: operation.Name,
+                    label: operation.name,
                 };
             }));
         }
@@ -60,7 +60,7 @@ class SmartEditPopupComponent extends React.Component {
             } },
             React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 2, "data-name": "smart-edit-operation" },
                 React.createElement(DropdownButton_1.default, { items: operationMenuItems, columns: ['label'], onMouseDown: preventDefault }, typeof this.props.SmartEditOperation === 'object'
-                    ? this.props.SmartEditOperation.Name
+                    ? this.props.SmartEditOperation.name
                     : this.props.SmartEditOperation),
                 React.createElement(Input_1.default, { value: this.props.SmartEditValue.toString(), marginLeft: 2, marginRight: 2, type: "number", placeholder: "Enter a Number", onChange: (e) => this.onSmartEditValueChange(e) }),
                 React.createElement(SimpleButton_1.default, { tone: this.getButtonStyle(), variant: "raised", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(`${this.props.SmartEditValue}`) ||

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -55,7 +55,7 @@ class SmartEditViewPanelComponent extends React.Component {
             operationMenuItems.push(...customOperations.map((operation) => {
                 return {
                     onClick: () => this.props.onSmartEditOperationChange(operation),
-                    label: operation.Name,
+                    label: operation.name,
                 };
             }));
         }
@@ -70,7 +70,7 @@ class SmartEditViewPanelComponent extends React.Component {
         return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__SmartEdit__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null,
                 React.createElement(DropdownButton_1.default, { className: `ab-${elementType}__SmartEdit__select`, marginRight: 2, items: operationMenuItems, style: { fontSize: 'small' }, columns: ['label'], disabled: shouldDisable, variant: "outlined" }, typeof this.props.SmartEditOperation === 'object'
-                    ? this.props.SmartEditOperation.Name
+                    ? this.props.SmartEditOperation.name
                     : this.props.SmartEditOperation),
                 React.createElement(Input_1.default, { style: {
                         width: '5rem',

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -12,7 +12,7 @@ const AdaptableContext_1 = require("./AdaptableContext");
 exports.SpecialColumnSettingsWizardStep = (props) => {
     var _a, _b;
     const adaptable = AdaptableContext_1.useAdaptable();
-    const possibleColumnTypes = adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions.columnTypes;
+    const possibleColumnTypes = adaptable.api.internalApi.getAdaptableOptions().columnOptions.columnTypes;
     const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
     const handleColumnTypeChange = (columnType, checked) => {
         var _a, _b, _c;

package/src/View/StatusBar/AdaptableStatusBar.js

@@ -39,6 +39,6 @@ exports.AdaptableStatusBar = (props) => {
                 dispatch(menuItem.reduxAction);
             }
         });
-        return (React.createElement(StatusBarPanel_1.StatusBarPanel, Object.assign({ "data-name": subPanel }, statusBarPanelProps, { onAction: onAction, icon: (_f = statusBarPanelProps.icon) !== null && _f !== void 0 ? _f : moduleInfo.Glyph, key: subPanel })));
+        return (React.createElement(StatusBarPanel_1.StatusBarPanel, Object.assign({ "data-name": subPanel }, statusBarPanelProps, { tooltip: moduleInfo.FriendlyName, onAction: onAction, icon: (_f = statusBarPanelProps.icon) !== null && _f !== void 0 ? _f : moduleInfo.Glyph, key: subPanel })));
     })));
 };

package/src/View/StatusBar/StatusBarPanel.d.ts

@@ -32,6 +32,7 @@ export interface StatusBarPanelProps extends Omit<FlexProps, 'content'> {
     view?: React.FunctionComponent;
     onAction?: () => void;
     extraActions?: React.FunctionComponent[];
+    tooltip?: string;
 }
 /**
  * Statusbar sub panel are similar to vs code:

package/src/View/StatusBar/StatusBarPanel.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const AdaptablePopover_1 = require("../AdaptablePopover");
 /**
  * Statusbar sub panel are similar to vs code:
@@ -14,7 +15,7 @@ const AdaptablePopover_1 = require("../AdaptablePopover");
  */
 exports.StatusBarPanel = (props) => {
     var _a;
-    const { icon, content, popover, popoverMinWidth, view, onAction, extraActions, triggerActionOnWrapperClick = true } = props, flexProps = tslib_1.__rest(props, ["icon", "content", "popover", "popoverMinWidth", "view", "onAction", "extraActions", "triggerActionOnWrapperClick"]);
+    const { icon, content, popover, popoverMinWidth, view, onAction, extraActions, triggerActionOnWrapperClick = true, tooltip } = props, flexProps = tslib_1.__rest(props, ["icon", "content", "popover", "popoverMinWidth", "view", "onAction", "extraActions", "triggerActionOnWrapperClick", "tooltip"]);
     const handleAction = () => onAction();
     if (view) {
         const View = view;
@@ -39,7 +40,7 @@ exports.StatusBarPanel = (props) => {
         ? React.createElement(content)
         : content;
     return (React.createElement(rebass_1.Flex, Object.assign({}, flexProps, { alignItems: "center", justifyContent: "center", as: shouldTriggerActionOnWrapperClick ? 'button' : 'div', className: baseClassName, onClick: handleWrapperClick }),
-        props.icon && (React.createElement(SimpleButton_1.default, { color: props.color, icon: props.icon, iconSize: 15, variant: "text", onClick: handleIconClick, mr: preparedContent ? 1 : 0 })),
-        popover ? (React.createElement(AdaptablePopover_1.AdaptablePopover, { showIcon: false, bodyText: [popoverContent], MessageType: 'Info', showEvent: 'focus', hideEvent: "blur", popoverMinWidth: popoverMinWidth }, preparedContent)) : (preparedContent), (_a = extraActions === null || extraActions === void 0 ? void 0 : extraActions.map) === null || _a === void 0 ? void 0 :
-        _a.call(extraActions, (action, index) => React.createElement(action, { key: index }))));
+        props.icon && (React.createElement(SimpleButton_1.default, { tooltip: tooltip, color: props.color, icon: props.icon, iconSize: 15, variant: "text", onClick: handleIconClick, mr: preparedContent ? 1 : 0 })),
+        popover ? (React.createElement(AdaptablePopover_1.AdaptablePopover, { tooltipText: tooltip, showIcon: false, bodyText: [popoverContent], MessageType: 'Info', showEvent: 'focus', hideEvent: "blur", popoverMinWidth: popoverMinWidth }, preparedContent)) : (preparedContent),
+        ArrayExtensions_1.default.IsNotNullOrEmpty(extraActions) && (React.createElement(rebass_1.Box, { ml: 1 }, (_a = extraActions === null || extraActions === void 0 ? void 0 : extraActions.map) === null || _a === void 0 ? void 0 : _a.call(extraActions, (action, index) => React.createElement(action, { key: index }))))));
 };

package/src/View/Theme/ThemeStatusPanelPopover.js

@@ -3,34 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThemeStatusPanelPopover = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const Radio_1 = tslib_1.__importDefault(require("../../components/Radio"));
+const SelectList_1 = require("../../components/SelectList");
 const AdaptableContext_1 = require("../AdaptableContext");
-const AdaptableObjectRow_1 = require("../Components/AdaptableObjectRow");
-const PanelWithRow_1 = require("../Components/Panels/PanelWithRow");
-const colItems = [
-    { Content: 'Current', Size: 2 },
-    { Content: 'Theme Name', Size: 4 },
-];
 exports.ThemeStatusPanelPopover = () => {
     const adaptable = AdaptableContext_1.useAdaptable();
     const themes = adaptable.api.themeApi.getAllTheme();
-    const currentTheme = adaptable.api.themeApi.getCurrentTheme();
-    const handleThemeChange = React.useCallback((theme) => {
-        adaptable.api.themeApi.loadTheme(theme.Name);
+    const handleThemeChange = React.useCallback((option) => {
+        adaptable.api.themeApi.loadTheme(option.label);
     }, []);
-    return (React.createElement(rebass_1.Flex, { flexDirection: "column" },
-        React.createElement(PanelWithRow_1.PanelWithRow, { colItems: colItems }),
-        themes.map((theme) => {
-            return (React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: theme.Name, colItems: [
-                    {
-                        Content: (React.createElement(Radio_1.default, { onClick: () => handleThemeChange(theme), id: theme.Name, checked: currentTheme === theme.Name })),
-                        Size: 1,
-                    },
-                    {
-                        Content: (React.createElement("label", { style: { cursor: 'pointer' }, htmlFor: theme.Name }, theme.Name)),
-                        Size: 4,
-                    },
-                ] }));
-        })));
+    const options = themes.map((theme) => ({ label: theme.Name, value: theme.Uuid }));
+    return React.createElement(SelectList_1.SelectList, { options: options, onChange: handleThemeChange });
 };

package/src/View/UIHelper.d.ts

@@ -3,7 +3,7 @@ import { EditableConfigEntityState } from './Components/SharedProps/EditableConf
 import { StatusColour } from '../PredefinedConfig/Common/Enums';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { Schedule, Weekday } from '../PredefinedConfig/Common/Schedule';
-import { AdaptableOptions } from '../types';
+import { AdaptableColumnDataType, AdaptableOptions } from '../types';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 export declare const BLACK: string;
@@ -29,8 +29,8 @@ export declare const ORANGE: string;
 export declare function getHexForName(name: string): string;
 export declare function getDefaultColors(): string[];
 export declare function getEmptyConfigState(): EditableConfigEntityState;
-export declare function getDescriptionForDataType(dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown'): "string" | "number" | "date";
-export declare function getPlaceHolderforDataType(dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown'): "Enter Value" | "Enter Number" | "Enter Date";
+export declare function getDescriptionForDataType(dataType: AdaptableColumnDataType): "string" | "number" | "date";
+export declare function getPlaceholderForDataType(dataType: AdaptableColumnDataType): "Enter Value" | "Enter Number" | "Enter Date";
 export declare function getModalContainer(adaptableOptions: AdaptableOptions, document: Document): HTMLElement;
 export declare function IsEmptyStyle(style: AdaptableStyle): boolean;
 export declare function IsNotEmptyStyle(style: AdaptableStyle): boolean;
@@ -58,7 +58,7 @@ export declare const UIHelper: {
     getDefaultColors: typeof getDefaultColors;
     getEmptyConfigState: typeof getEmptyConfigState;
     getDescriptionForDataType: typeof getDescriptionForDataType;
-    getPlaceHolderforDataType: typeof getPlaceHolderforDataType;
+    getPlaceHolderforDataType: typeof getPlaceholderForDataType;
     getModalContainer: typeof getModalContainer;
     IsEmptyStyle: typeof IsEmptyStyle;
     IsNotEmptyStyle: typeof IsNotEmptyStyle;