@adaptabletools/adaptable 19.2.3 → 20.0.0-canary.0

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

@@ -10,10 +10,9 @@ import { useDispatch } from 'react-redux';
 import * as ScheduleRedux from '../../../Redux/ActionsReducers/ScheduleRedux';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
 export const ScheduleWizard = (props) => {
-    var _a, _b, _c, _d;
-    const data = (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
-    const isNew = ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.action) ? props.popupParams.action === 'New' : !props.data;
-    const scheduleType = data ? data.ScheduleType : (_d = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _d === void 0 ? void 0 : _d.name;
+    const data = props.data ?? props.popupParams?.value;
+    const isNew = props.popupParams?.action ? props.popupParams.action === 'New' : !props.data;
+    const scheduleType = data ? data.ScheduleType : props?.abObjectType?.name;
     const [schedule, setSchedule] = React.useState(() => {
         if (data) {
             return data;

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

@@ -4,15 +4,21 @@ import { NewScopeComponent } from '../../Components/NewScopeComponent';
 export const ShortcutScopeWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
     const availableColumns = React.useMemo(() => api.columnApi.getNumericColumns(), []);
-    return (React.createElement(NewScopeComponent, { availableDataTypes: ['Number'], scopeColumns: availableColumns, scope: data.Scope, descriptions: {
+    return (React.createElement(NewScopeComponent, { availableDataTypes: ['number'], scopeColumns: availableColumns, scope: data.Scope, descriptions: {
             rowScope: 'All Numeric Columns will have the Shortcut applied',
             columnScope: 'Selected Columns will have the Shortcut applied',
         }, updateScope: (Scope) => {
             let preparedScope = Scope;
             if (Scope && 'DataTypes' in Scope && Scope.DataTypes.length === 0) {
                 // default to checked
-                preparedScope = Object.assign(Object.assign({}, Scope), { DataTypes: ['Number'] });
+                preparedScope = {
+                    ...Scope,
+                    DataTypes: ['number'],
+                };
             }
-            props.onChange(Object.assign(Object.assign({}, data), { Scope: preparedScope }));
+            props.onChange({
+                ...data,
+                Scope: preparedScope,
+            });
         } }));
 };

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

@@ -19,7 +19,6 @@ export const isSettingsValid = (data) => {
     return result.length ? result.join(', ') : true;
 };
 export const ShortcutSettingsSummary = () => {
-    var _a, _b;
     const { data: shortcut } = useOnePageAdaptableWizardContext();
     return (React.createElement(React.Fragment, null,
         React.createElement(SummaryText, null,
@@ -27,20 +26,28 @@ export const ShortcutSettingsSummary = () => {
             React.createElement(Tag, null, shortcut.ShortcutKey || 'Not selected')),
         React.createElement(SummaryText, null,
             "Value ",
-            React.createElement(Tag, null, (_a = shortcut.ShortcutValue) !== null && _a !== void 0 ? _a : 'Not specified')),
+            React.createElement(Tag, null, shortcut.ShortcutValue ?? 'Not specified')),
         React.createElement(SummaryText, null,
             "Operation ",
-            React.createElement(Tag, null, (_b = shortcut.ShortcutOperation) !== null && _b !== void 0 ? _b : 'Not Specified'))));
+            React.createElement(Tag, null, shortcut.ShortcutOperation ?? 'Not Specified'))));
 };
 export const ShortcutSettingsWizard = (props) => {
-    var _a;
     const { data: shortcut } = useOnePageAdaptableWizardContext();
     const handleKeyChange = React.useCallback((ShortcutKey) => {
-        props.onChange(Object.assign(Object.assign({}, shortcut), { ShortcutKey }));
+        props.onChange({
+            ...shortcut,
+            ShortcutKey,
+        });
     }, [shortcut]);
-    const handleOperationChange = React.useCallback((ShortcutOperation) => props.onChange(Object.assign(Object.assign({}, shortcut), { ShortcutOperation })), [shortcut]);
+    const handleOperationChange = React.useCallback((ShortcutOperation) => props.onChange({
+        ...shortcut,
+        ShortcutOperation,
+    }), [shortcut]);
     const handleOperationValueChange = React.useCallback((event) => {
-        props.onChange(Object.assign(Object.assign({}, shortcut), { ShortcutValue: event.target.value ? parseFloat(event.target.value) : event.target.value }));
+        props.onChange({
+            ...shortcut,
+            ShortcutValue: event.target.value ? parseFloat(event.target.value) : event.target.value,
+        });
     }, [shortcut]);
     const optionActions = shortcutOperationList.map((operation) => ({
         value: operation,
@@ -73,5 +80,5 @@ export const ShortcutSettingsWizard = (props) => {
                         React.createElement(HelpBlock, { fontSize: 2, mb: 0 }, "Number that is used - together with the 'Operation' and the current cell value - to calculate the new total for the cell")),
                     React.createElement(FormRow, { label: "Value" },
                         React.createElement(Flex, { flexDirection: "row" },
-                            React.createElement(Input, { "data-name": "shortcut-value", style: { maxWidth: 100 }, flex: 1, marginRight: 3, onChange: handleOperationValueChange, placeholder: "Enter Number", type: "number", value: (_a = shortcut.ShortcutValue) !== null && _a !== void 0 ? _a : '' }))))))));
+                            React.createElement(Input, { "data-name": "shortcut-value", style: { maxWidth: 100 }, flex: 1, marginRight: 3, onChange: handleOperationValueChange, placeholder: "Enter Number", type: "number", value: shortcut.ShortcutValue ?? '' }))))))));
 };

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

@@ -13,10 +13,9 @@ import { useAdaptable } from '../../AdaptableContext';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
 export const ShortcutWizard = (props) => {
     const [shortcut, setShortcut] = React.useState(() => {
-        var _a, _b, _c;
         const shortcut = props.data ? cloneObject(props.data) : ObjectFactory.CreateEmptyShortcut();
-        shortcut.Scope = (_a = shortcut.Scope) !== null && _a !== void 0 ? _a : { All: true };
-        if (((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column) && ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.action) === 'New') {
+        shortcut.Scope = shortcut.Scope ?? { All: true };
+        if (props.popupParams?.column && props.popupParams?.action === 'New') {
             shortcut.Scope = {
                 ColumnIds: [props.popupParams.column.columnId],
             };
@@ -67,11 +66,8 @@ export const ShortcutWizard = (props) => {
                     React.createElement("b", null, "Key"),
                     " is pressed.")),
                 renderSummary: () => React.createElement(ShortcutSettingsSummary, null),
-                render: () => {
-                    var _a;
-                    return (React.createElement(Box, { padding: 2 },
-                        React.createElement(ShortcutSettingsWizard, { availableKeys: (_a = props.availableKeys) !== null && _a !== void 0 ? _a : availableKeys, onChange: setShortcut })));
-                },
+                render: () => (React.createElement(Box, { padding: 2 },
+                    React.createElement(ShortcutSettingsWizard, { availableKeys: props.availableKeys ?? availableKeys, onChange: setShortcut }))),
             },
             {
                 details: 'Select Shortcut Tags',

package/src/View/SmartEdit/SmartEditPopup.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
@@ -8,18 +8,21 @@ interface SmartEditPopupProps extends ModuleViewPopupProps<SmartEditPopupCompone
     SmartEditValue: number;
     SmartEditOperation: SmartEditOperation;
     PreviewInfo: PreviewInfo;
-    onSmartEditValueChange: (value: number) => SystemRedux.SmartEditChangeValueAction;
-    onSmartEditOperationChange: (SmartEditOperation: SmartEditOperation) => SystemRedux.SmartEditChangeOperationAction;
-    onSmartEditCheckSelectedCells: () => SystemRedux.SmartEditCheckCellSelectionAction;
+    onSmartEditValueChange: (value: number) => InternalRedux.SmartEditChangeValueAction;
+    onSmartEditOperationChange: (SmartEditOperation: SmartEditOperation) => InternalRedux.SmartEditChangeOperationAction;
+    onSmartEditCheckSelectedCells: () => InternalRedux.SmartEditCheckCellSelectionAction;
     onApplySmartEdit: () => SmartEditRedux.SmartEditApplyAction;
 }
 declare class SmartEditPopupComponent extends React.Component<SmartEditPopupProps, {}> {
     constructor(props: SmartEditPopupProps);
     componentDidMount(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private submit;
     private onSmartEditValueChange;
     private getButtonStyle;
 }
-export declare let SmartEditPopup: import("react-redux").ConnectedComponent<typeof SmartEditPopupComponent, any>;
+export declare const SmartEditPopup: import("react-redux").ConnectedComponent<typeof SmartEditPopupComponent, {
+    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
+    store?: import("redux").Store<any, import("redux").UnknownAction, unknown>;
+}>;
 export {};

package/src/View/SmartEdit/SmartEditPopup.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { MathOperation } from '../../PredefinedConfig/Common/Enums';
 import { PanelWithImage } from '../Components/Panels/PanelWithImage';
 import { AdaptablePopover } from '../AdaptablePopover';
@@ -39,7 +39,7 @@ class SmartEditPopupComponent extends React.Component {
             };
         });
         const customOperations = this.props.api.smartEditApi.getSmartEditCustomOperations();
-        if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
+        if (customOperations?.length) {
             operationMenuItems.push(...customOperations.map((operation) => {
                 return {
                     onClick: () => this.props.onSmartEditOperationChange(operation),
@@ -90,17 +90,17 @@ class SmartEditPopupComponent extends React.Component {
 }
 function mapStateToProps(state, ownProps) {
     return {
-        SmartEditValue: state.System.SmartEditValue,
-        SmartEditOperation: state.System.SmartEditOperation,
-        PreviewInfo: state.System.SmartEditPreviewInfo,
+        SmartEditValue: state.Internal.SmartEdit.SmartEditValue,
+        SmartEditOperation: state.Internal.SmartEdit.SmartEditOperation,
+        PreviewInfo: state.Internal.SmartEdit.SmartEditPreviewInfo,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onSmartEditValueChange: (value) => dispatch(SystemRedux.SmartEditChangeValue(value)),
-        onSmartEditOperationChange: (SmartEditOperation) => dispatch(SystemRedux.SmartEditChangeOperation(SmartEditOperation)),
-        onSmartEditCheckSelectedCells: () => dispatch(SystemRedux.SmartEditCheckCellSelection()),
+        onSmartEditValueChange: (value) => dispatch(InternalRedux.SmartEditChangeValue(value)),
+        onSmartEditOperationChange: (SmartEditOperation) => dispatch(InternalRedux.SmartEditChangeOperation(SmartEditOperation)),
+        onSmartEditCheckSelectedCells: () => dispatch(InternalRedux.SmartEditCheckCellSelection()),
         onApplySmartEdit: () => dispatch(SmartEditRedux.SmartEditApply(false)),
     };
 }
-export let SmartEditPopup = connect(mapStateToProps, mapDispatchToProps)(SmartEditPopupComponent);
+export const SmartEditPopup = connect(mapStateToProps, mapDispatchToProps)(SmartEditPopupComponent);

package/src/View/SmartEdit/SmartEditViewPanel.d.ts

@@ -1,5 +1,5 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import * as React from 'react';
@@ -9,10 +9,9 @@ export interface SmartEditViewPanelComponentProps extends ViewPanelProps {
     SmartEditOperation: SmartEditOperation | undefined;
     IsValidSelection: boolean;
     PreviewInfo: PreviewInfo;
-    InPivotMode: Boolean;
-    onSmartEditValueChange: (value: number) => SystemRedux.SmartEditChangeValueAction;
-    onSmartEditOperationChange: (MathOperation: SmartEditOperation) => SystemRedux.SmartEditChangeOperationAction;
-    onSmartEditCheckSelectedCells: () => SystemRedux.SmartEditCheckCellSelectionAction;
+    onSmartEditValueChange: (value: number) => InternalRedux.SmartEditChangeValueAction;
+    onSmartEditOperationChange: (MathOperation: SmartEditOperation) => InternalRedux.SmartEditChangeOperationAction;
+    onSmartEditCheckSelectedCells: () => InternalRedux.SmartEditCheckCellSelectionAction;
     onApplySmartEdit: () => SmartEditRedux.SmartEditApplyAction;
 }
 interface SmartEditViewPanelComponentState {
@@ -23,12 +22,14 @@ declare class SmartEditViewPanelComponent extends React.Component<SmartEditViewP
     constructor(props: SmartEditViewPanelComponentProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private checkSelectedCells;
     private onSmartEditValueChange;
     private getStatusColour;
     private onApplyClick;
     onApplySmartEdit(): any;
 }
-export declare let SmartEditViewPanelControl: import("react-redux").ConnectedComponent<typeof SmartEditViewPanelComponent, any>;
+export declare let SmartEditViewPanelControl: import("react-redux").ConnectedComponent<typeof SmartEditViewPanelComponent, {
+    [x: string]: any;
+}>;
 export {};

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -1,4 +1,4 @@
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import { MathOperation, StatusColour } from '../../PredefinedConfig/Common/Enums';
 import * as React from 'react';
@@ -31,8 +31,7 @@ class SmartEditViewPanelComponent extends React.Component {
         this.checkSelectedCells();
     }
     componentWillUnmount() {
-        var _a;
-        (_a = this.cleanupEvent) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.cleanupEvent?.();
     }
     render() {
         let statusColour = this.getStatusColour();
@@ -48,7 +47,7 @@ class SmartEditViewPanelComponent extends React.Component {
             };
         });
         const customOperations = this.props.api.smartEditApi.getSmartEditCustomOperations();
-        if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
+        if (customOperations?.length) {
             operationMenuItems.push(...customOperations.map((operation) => {
                 return {
                     onClick: () => this.props.onSmartEditOperationChange(operation),
@@ -63,7 +62,7 @@ class SmartEditViewPanelComponent extends React.Component {
         };
         let shouldDisable = this.props.accessLevel == 'ReadOnly' ||
             !this.props.IsValidSelection ||
-            this.props.InPivotMode == true;
+            this.props.api.layoutApi.isCurrentLayoutPivot() == true;
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(Flex, { flexDirection: "row", className: `ab-${elementType}__SmartEdit__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(Flex, null,
@@ -109,18 +108,17 @@ class SmartEditViewPanelComponent extends React.Component {
 }
 function mapStateToProps(state, ownProps) {
     return {
-        SmartEditValue: state.System.SmartEditValue,
-        SmartEditOperation: state.System.SmartEditOperation,
-        IsValidSelection: state.System.IsValidSmartEditSelection,
-        PreviewInfo: state.System.SmartEditPreviewInfo,
-        InPivotMode: state.Grid.IsGridInPivotMode,
+        SmartEditValue: state.Internal.SmartEdit.SmartEditValue,
+        SmartEditOperation: state.Internal.SmartEdit.SmartEditOperation,
+        IsValidSelection: state.Internal.SmartEdit.IsValidSmartEditSelection,
+        PreviewInfo: state.Internal.SmartEdit.SmartEditPreviewInfo,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onSmartEditValueChange: (value) => dispatch(SystemRedux.SmartEditChangeValue(value)),
-        onSmartEditOperationChange: (SmartEditOperation) => dispatch(SystemRedux.SmartEditChangeOperation(SmartEditOperation)),
-        onSmartEditCheckSelectedCells: () => dispatch(SystemRedux.SmartEditCheckCellSelection()),
+        onSmartEditValueChange: (value) => dispatch(InternalRedux.SmartEditChangeValue(value)),
+        onSmartEditOperationChange: (SmartEditOperation) => dispatch(InternalRedux.SmartEditChangeOperation(SmartEditOperation)),
+        onSmartEditCheckSelectedCells: () => dispatch(InternalRedux.SmartEditCheckCellSelection()),
         onApplySmartEdit: () => dispatch(SmartEditRedux.SmartEditApply(false)),
     };
 }

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -4,25 +4,31 @@ import { Flex } from 'rebass';
 import { CheckBox } from '../components/CheckBox';
 import FormLayout, { FormRow } from '../components/FormLayout';
 import { Tabs } from '../components/Tabs';
-import { ColumnFilterModuleId } from '../Utilities/Constants/ModuleConstants';
 import { useAdaptable } from './AdaptableContext';
 export const SpecialColumnSettingsWizardStep = (props) => {
-    var _a, _b, _c;
     const adaptable = useAdaptable();
-    const possibleColumnTypes = (_a = adaptable.api.columnApi.getColumnTypes()) !== null && _a !== void 0 ? _a : [];
-    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_b = props.settings) !== null && _b !== void 0 ? _b : {};
+    const possibleColumnTypes = adaptable.api.columnApi.getColumnTypes() ?? [];
+    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = props.settings ?? {};
     const handleColumnTypeChange = (columnType, checked) => {
-        var _a, _b, _c;
-        const columnTypes = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) !== null && _b !== void 0 ? _b : [];
+        const columnTypes = props.settings?.ColumnTypes ?? [];
         if (checked) {
-            props.onChange(Object.assign(Object.assign({}, props.settings), { ColumnTypes: [...columnTypes, columnType] }));
+            props.onChange({
+                ...props.settings,
+                ColumnTypes: [...columnTypes, columnType],
+            });
         }
         else {
-            props.onChange(Object.assign(Object.assign({}, props.settings), { ColumnTypes: (_c = columnTypes === null || columnTypes === void 0 ? void 0 : columnTypes.filter) === null || _c === void 0 ? void 0 : _c.call(columnTypes, (item) => item !== columnType) }));
+            props.onChange({
+                ...props.settings,
+                ColumnTypes: columnTypes?.filter?.((item) => item !== columnType),
+            });
         }
     };
     const onSettingsChange = (values) => {
-        props.onChange(Object.assign(Object.assign({}, props.settings), values));
+        props.onChange({
+            ...props.settings,
+            ...values,
+        });
     };
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs, { marginTop: 2, autoFocus: false },
@@ -35,9 +41,7 @@ export const SpecialColumnSettingsWizardStep = (props) => {
                             { size: '30%', name: 'third' },
                         ] },
                         React.createElement(FormRow, null,
-                            React.createElement(CheckBox, { "data-name": "filterable", checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !adaptable.api.optionsApi.getColumnFilterOptions()
-                                    .enableFilterOnSpecialColumns ||
-                                    adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(ColumnFilterModuleId) == 'Hidden' }, "Filterable"),
+                            React.createElement(CheckBox, { "data-name": "filterable", checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !adaptable.api.optionsApi.getFilterOptions().enableFilterOnSpecialColumns }, "Filterable"),
                             React.createElement(CheckBox, { "data-name": "resizable", checked: Resizable, onChange: (Resizable) => onSettingsChange({ Resizable }) }, "Resizable"),
                             React.createElement(CheckBox, { "data-name": "groupable", checked: Groupable, onChange: (Groupable) => onSettingsChange({ Groupable }) }, "Groupable")),
                         React.createElement(FormRow, null,
@@ -48,13 +52,10 @@ export const SpecialColumnSettingsWizardStep = (props) => {
                             React.createElement(CheckBox, { "data-name": "suppres-smenu", checked: SuppressMenu, onChange: (SuppressMenu) => onSettingsChange({ SuppressMenu }) }, "Suppress Menu"),
                             React.createElement(CheckBox, { "data-name": "suppres-movable", checked: SuppressMovable, onChange: (SuppressMovable) => onSettingsChange({ SuppressMovable }) }, "Suppress Movable"),
                             React.createElement(CheckBox, { disabled: true, checked: props.isEditable }, "Editable")))))),
-        Boolean(possibleColumnTypes === null || possibleColumnTypes === void 0 ? void 0 : possibleColumnTypes.length) && (React.createElement(Tabs, { marginTop: 2, autoFocus: false },
+        Boolean(possibleColumnTypes?.length) && (React.createElement(Tabs, { marginTop: 2, autoFocus: false },
             React.createElement(Tabs.Tab, null, "Column Types"),
             React.createElement(Tabs.Content, null,
-                React.createElement(FormLayout, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_c = chunk(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _c === void 0 ? void 0 : _c.map(([first, second]) => {
-                    var _a, _b, _c, _d, _e, _f;
-                    return (React.createElement(FormRow, { key: first },
-                        first && (React.createElement(CheckBox, { "data-name": first, onChange: (checked) => handleColumnTypeChange(first, checked), checked: (_c = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, first) }, first)),
-                        second && (React.createElement(CheckBox, { "data-name": second, onChange: (checked) => handleColumnTypeChange(second, checked), checked: (_f = (_e = (_d = props.settings) === null || _d === void 0 ? void 0 : _d.ColumnTypes) === null || _e === void 0 ? void 0 : _e.includes) === null || _f === void 0 ? void 0 : _f.call(_e, second) }, second))));
-                })))))));
+                React.createElement(FormLayout, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, chunk(possibleColumnTypes ?? [], 2)?.map(([first, second]) => (React.createElement(FormRow, { key: first },
+                    first && (React.createElement(CheckBox, { "data-name": first, onChange: (checked) => handleColumnTypeChange(first, checked), checked: props.settings?.ColumnTypes?.includes?.(first) }, first)),
+                    second && (React.createElement(CheckBox, { "data-name": second, onChange: (checked) => handleColumnTypeChange(second, checked), checked: props.settings?.ColumnTypes?.includes?.(second) }, second)))))))))));
 };

package/src/View/StateManagement/components/ClearButton.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
 import SimpleButton from '../../../components/SimpleButton';
 export const ClearButton = (props) => {
-    return (React.createElement(SimpleButton, Object.assign({}, props, { className: "ab-StateManagement__Clear-Button", tooltip: "Clear User State" }), props.children));
+    return (React.createElement(SimpleButton, { ...props, className: "ab-StateManagement__Clear-Button", tooltip: "Clear User State" }, props.children));
 };

package/src/View/StateManagement/components/ExportDropdown.js

@@ -31,5 +31,5 @@ export const ExportDropdown = (props) => {
             onClick: () => handleChange('JSON'),
         },
     ];
-    return (React.createElement(DropdownButton, Object.assign({ className: "ab-StateManagement__Export-Dropdown" }, props, { items: destinationOptions, value: undefined })));
+    return (React.createElement(DropdownButton, { className: "ab-StateManagement__Export-Dropdown", ...props, items: destinationOptions, value: undefined }));
 };

package/src/View/StateManagement/components/LoadButton.js

@@ -16,7 +16,7 @@ export const LoadButton = (props) => {
             props.onLoad(json);
         });
     };
-    return (React.createElement(SimpleButton, Object.assign({}, props, { className: "ab-StateManagement__Load-Button" }),
+    return (React.createElement(SimpleButton, { ...props, className: "ab-StateManagement__Load-Button" },
         React.createElement("input", { type: "file", onChange: (json) => onLoadPredefinedConfig(json), accept: '.json', style: {
                 opacity: 0,
                 position: 'absolute',

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

@@ -1,3 +1,3 @@
 import * as React from 'react';
-import { StatusPanelProps } from '../../agGrid/createAgStatusPanelComponent';
+import { StatusPanelProps } from '../../Utilities/createAgStatusPanelComponent';
 export declare const AdaptableStatusBar: React.FunctionComponent<StatusPanelProps>;

package/src/View/StatusBar/AdaptableStatusBar.js

@@ -5,7 +5,6 @@ import { getStatusPanelsSelector } from '../../Redux/ActionsReducers/StatusBarRe
 import { useAdaptable } from '../AdaptableContext';
 import { StatusBarPanel } from './StatusBarPanel';
 export const AdaptableStatusBar = (props) => {
-    var _a;
     /**
      * All state is selected so the Status Bar is re-rendered for all adaptable state changes
      */
@@ -14,9 +13,8 @@ export const AdaptableStatusBar = (props) => {
     const adaptable = useAdaptable();
     const dispatch = useDispatch();
     const statusSubPanels = statusPanels.find((statusPanel) => statusPanel.Key === props.context.Key);
-    const allMenuItems = useSelector((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.Grid) === null || _a === void 0 ? void 0 : _a.SettingPanelModuleMenuItems; });
-    return (React.createElement(Flex, { className: "ab-StatusBar-Panel", "data-id": props.context.Key }, (_a = statusSubPanels === null || statusSubPanels === void 0 ? void 0 : statusSubPanels.StatusBarPanels) === null || _a === void 0 ? void 0 : _a.map((subPanel) => {
-        var _a, _b, _c, _d, _e, _f;
+    const allMenuItems = useSelector((state) => state?.Internal?.SettingsPanelModuleEntries);
+    return (React.createElement(Flex, { className: "ab-StatusBar-Panel", "data-id": props.context.Key }, statusSubPanels?.StatusBarPanels?.map((subPanel) => {
         const module = adaptable.ModuleService.getModuleById(subPanel);
         if (!module) {
             return React.createElement(React.Fragment, { key: subPanel });
@@ -27,14 +25,16 @@ export const AdaptableStatusBar = (props) => {
         /**
          * Both view properties and status panel are optional.
          */
-        const statusBarPanelProps = (_d = (_c = (_b = (_a = module.getViewProperties) === null || _a === void 0 ? void 0 : _a.call(module)) === null || _b === void 0 ? void 0 : _b.getStatusBarPanelProps) === null || _c === void 0 ? void 0 : _c.call(_b)) !== null && _d !== void 0 ? _d : {};
+        const statusBarPanelProps = module.getViewProperties?.()?.getStatusBarPanelProps?.() ?? {};
         const moduleInfo = module.moduleInfo;
-        const onAction = (_e = statusBarPanelProps.onAction) !== null && _e !== void 0 ? _e : (() => {
-            const menuItem = allMenuItems.find((menuItem) => menuItem.module === subPanel);
-            if (menuItem === null || menuItem === void 0 ? void 0 : menuItem.reduxAction) {
-                dispatch(menuItem.reduxAction);
-            }
-        });
-        return (React.createElement(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 })));
+        const onAction = statusBarPanelProps.onAction ??
+            (() => {
+                // #by-default-open-settings-panel-for-module
+                const menuItem = allMenuItems.find((menuItem) => menuItem.category === subPanel);
+                if (menuItem?.reduxAction) {
+                    dispatch(menuItem.reduxAction);
+                }
+            });
+        return (React.createElement(StatusBarPanel, { "data-name": subPanel, ...statusBarPanelProps, tooltip: moduleInfo.FriendlyName, onAction: onAction, icon: statusBarPanelProps.icon ?? moduleInfo.Glyph, key: subPanel }));
     })));
 };

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

@@ -13,7 +13,7 @@ import { FlexProps } from 'rebass';
  *
  * Extra actions are components so the components can call inside hooks.
  */
-export interface StatusBarPanelProps extends Omit<FlexProps, 'content'> {
+export interface StatusBarPanelProps extends Omit<FlexProps, 'content' | 'popover'> {
     icon?: string;
     content?: React.ReactNode | React.FunctionComponent<React.PropsWithChildren<unknown>>;
     /**

package/src/View/StatusBar/StatusBarPanel.js

@@ -1,4 +1,3 @@
-import { __rest } from "tslib";
 import * as React from 'react';
 import { Box, Flex } from 'rebass';
 import SimpleButton from '../../components/SimpleButton';
@@ -11,8 +10,7 @@ import { AdaptablePopover } from '../AdaptablePopover';
  * - icon
  */
 export const StatusBarPanel = (props) => {
-    var _a;
-    const { icon, content, popover, popoverMinWidth, view, onAction, extraActions, triggerActionOnWrapperClick = true, tooltip } = props, flexProps = __rest(props, ["icon", "content", "popover", "popoverMinWidth", "view", "onAction", "extraActions", "triggerActionOnWrapperClick", "tooltip"]);
+    const { icon, content, popover, popoverMinWidth, view, onAction, extraActions, triggerActionOnWrapperClick = true, tooltip, ...flexProps } = props;
     const handleAction = () => onAction();
     if (view) {
         const View = view;
@@ -36,8 +34,8 @@ export const StatusBarPanel = (props) => {
     const preparedContent = typeof content === 'function'
         ? React.createElement(content)
         : content;
-    return (React.createElement(Flex, Object.assign({}, flexProps, { alignItems: "center", justifyContent: "center", className: baseClassName, onClick: handleWrapperClick, style: { cursor: shouldTriggerActionOnWrapperClick ? 'pointer' : 'default' } }),
+    return (React.createElement(Flex, { ...flexProps, alignItems: "center", justifyContent: "center", className: baseClassName, onClick: handleWrapperClick, style: { cursor: shouldTriggerActionOnWrapperClick ? 'pointer' : 'default' } },
         props.icon && (React.createElement(SimpleButton, { tooltip: tooltip, color: props.color, icon: props.icon, iconSize: 15, variant: "text", onClick: handleIconClick, mr: preparedContent ? 1 : 0 })),
         popover ? (React.createElement(AdaptablePopover, { alignPosition: [['BottomCenter', 'TopCenter']], tooltipText: tooltip, showIcon: false, bodyText: [popoverContent], MessageType: 'Info', showEvent: 'focus', hideEvent: "blur", popoverMinWidth: popoverMinWidth }, preparedContent)) : (preparedContent),
-        ArrayExtensions.IsNotNullOrEmpty(extraActions) && (React.createElement(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 }))))));
+        ArrayExtensions.IsNotNullOrEmpty(extraActions) && (React.createElement(Box, { ml: 1 }, extraActions?.map?.((action, index) => React.createElement(action, { key: index }))))));
 };

package/src/View/StatusBar/StatusBarPopup.js

@@ -18,7 +18,10 @@ export const StatusBarPopup = (props) => {
     const handleTabChange = React.useCallback((tabs) => {
         const newStatusPanels = tabs.map((tab) => {
             const statusPanel = statusPanels.find((sp) => sp.Key === tab.Name);
-            return Object.assign(Object.assign({}, statusPanel), { StatusBarPanels: tab.Items });
+            return {
+                ...statusPanel,
+                StatusBarPanels: tab.Items,
+            };
         });
         adaptable.api.statusBarApi.setStatusBarPanels(newStatusPanels);
     }, [statusPanels]);

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { StyledColumn } from '../../../types';
-export declare const renderBadgeSummary: (styledColumn: StyledColumn) => JSX.Element;
+export declare const renderBadgeSummary: (styledColumn: StyledColumn) => React.JSX.Element;
 export interface StyledColumnBadgeSectionProps {
     onChange: (data: StyledColumn) => void;
 }