@adaptabletools/adaptable-cjs 19.2.3 → 20.0.0-canary.0

package/src/View/Filter/FilterViewPanel.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterViewPanelControl = void 0;
 const tslib_1 = require("tslib");
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const React = tslib_1.__importStar(require("react"));
 const ActiveFiltersPanel_1 = require("./ActiveFiltersPanel");
 const rebass_1 = require("rebass");
@@ -19,47 +19,41 @@ class FilterViewPanelComponent extends React.Component {
         super(props);
     }
     render() {
-        var _a, _b;
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-        const showClearButton = (_a = this.props.api.optionsApi.getColumnFilterOptions()) === null || _a === void 0 ? void 0 : _a.showClearFilterButton;
-        const showSuspendFilterButton = (_b = this.props.api.optionsApi.getColumnFilterOptions()) === null || _b === void 0 ? void 0 : _b.showSuspendFilterButton;
-        const isAtLeastOneFilterActive = this.props.api.columnFilterApi.getActiveColumnFilters().length > 0;
-        const isAtLeastOneFilter = this.props.api.columnFilterApi.getColumnFilters().length > 0;
+        const isAtLeastOneFilterActive = this.props.api.filterApi.columnFilterApi.getActiveColumnFilters().length > 0;
+        const isAtLeastOneFilter = this.props.api.filterApi.columnFilterApi.getColumnFilters().length > 0;
         const handleSuspendUnsuspendAll = () => {
             if (isAtLeastOneFilterActive) {
-                this.props.api.columnFilterApi.suspendAllColumnFilters();
+                this.props.api.filterApi.columnFilterApi.suspendAllColumnFilters();
             }
             else {
-                this.props.api.columnFilterApi.unSuspendAllColumnFilters();
+                this.props.api.filterApi.columnFilterApi.unSuspendAllColumnFilters();
             }
         };
         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(AdaptablePopover_1.AdaptablePopover, { popupPadding: 0, className: `ab-${elementType}__Filter__info`, headerText: "", bodyText: [React.createElement(ActiveFiltersPanel_1.ActiveFiltersPanel, null)], useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 })),
-                showClearButton && (React.createElement(ButtonClear_1.ButtonClear, { className: `ab-${elementType}__Filter__clear`, marginLeft: 1, marginBottom: 0, marginRight: 1, onClick: () => this.onClearFilters(), tooltip: "Clear Filters", disabled: this.props.ColumnFilters.length == 0, showText: this.props.viewType === 'ToolPanel' }, this.props.viewType === 'ToolPanel' && 'Clear')),
-                showSuspendFilterButton && (React.createElement(SimpleButton_1.default, { className: (0, join_1.default)(`ab-${elementType}__Filter__suspend-button`, isAtLeastOneFilterActive && `ab-${elementType}__Filter__suspend-all`, !isAtLeastOneFilterActive && `ab-${elementType}__Filter__un-suspend-all`), disabled: !isAtLeastOneFilter, onClick: handleSuspendUnsuspendAll, tone: isAtLeastOneFilterActive ? 'neutral' : 'success', variant: "text", icon: isAtLeastOneFilterActive ? 'pause' : 'play', accessLevel: this.props.accessLevel }))),
-            React.createElement(rebass_1.Flex, { alignItems: "center" }, this.props.api.columnFilterApi.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) => {
+                React.createElement(ButtonClear_1.ButtonClear, { className: `ab-${elementType}__Filter__clear`, marginLeft: 1, marginBottom: 0, marginRight: 1, onClick: () => this.onClearFilters(), tooltip: "Clear Filters", disabled: this.props.ColumnFilters.length == 0, showText: this.props.viewType === 'ToolPanel' }, this.props.viewType === 'ToolPanel' && 'Clear'),
+                React.createElement(SimpleButton_1.default, { className: (0, join_1.default)(`ab-${elementType}__Filter__suspend-button`, isAtLeastOneFilterActive && `ab-${elementType}__Filter__suspend-all`, !isAtLeastOneFilterActive && `ab-${elementType}__Filter__un-suspend-all`), disabled: !isAtLeastOneFilter, onClick: handleSuspendUnsuspendAll, tone: isAtLeastOneFilterActive ? 'neutral' : 'success', variant: "text", icon: isAtLeastOneFilterActive ? 'pause' : 'play', accessLevel: this.props.accessLevel })),
+            React.createElement(rebass_1.Flex, { alignItems: "center" }, this.props.api.filterApi.columnFilterApi.isQuickFilterAvailable() && (React.createElement(CheckBox_1.CheckBox, { className: `ab-${elementType}__Filter__active-check`, disabled: this.props.accessLevel === 'ReadOnly' ||
+                    this.props.api.layoutApi.isCurrentLayoutPivot(), marginTop: 0, marginBottom: 0, fontSize: 2, padding: 1, checked: this.props.IsQuickFilterVisible, onChange: (checked) => {
                     checked ? this.props.onShowQuickFilterBar() : this.props.onHideQuickFilterBar();
                 } }, "Filter Bar")))));
     }
     onClearFilters() {
-        this.props.api.columnFilterApi.clearColumnFilters();
-    }
-    onClearColumnFilter(columnFilter) {
-        this.props.api.columnFilterApi.clearColumnFilterForColumn(columnFilter.ColumnId);
+        this.props.api.filterApi.columnFilterApi.clearColumnFilters();
     }
 }
 function mapStateToProps(state) {
     return {
-        ColumnFilters: (0, LayoutRedux_1.getColumnFilterSelector)(state),
-        IsQuickFilterVisible: state.System.IsQuickFilterVisible,
+        ColumnFilters: (0, LayoutRedux_1.getColumnFiltersSelector)(state),
+        IsQuickFilterVisible: state.Internal.IsQuickFilterVisible,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onHideQuickFilterBar: () => dispatch(SystemRedux.SystemQuickFilterBarHide()),
-        onShowQuickFilterBar: () => dispatch(SystemRedux.SystemQuickFilterBarShow()),
+        onHideQuickFilterBar: () => dispatch(InternalRedux.QuickFilterBarHide()),
+        onShowQuickFilterBar: () => dispatch(InternalRedux.QuickFilterBarShow()),
     };
 }
 exports.FilterViewPanelControl = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(FilterViewPanelComponent);

package/src/View/FlashingCell/FlashingCellStyle.js

@@ -6,8 +6,8 @@ const react_1 = tslib_1.__importDefault(require("react"));
 const rebass_1 = require("rebass");
 const StylePreview_1 = require("../../components/StylePreview");
 const FlashingCellStyle = (props) => {
-    const { data } = props, boxProps = tslib_1.__rest(props, ["data"]);
-    return (react_1.default.createElement(rebass_1.Flex, Object.assign({ flexDirection: "row" }, boxProps),
+    const { data, ...boxProps } = props;
+    return (react_1.default.createElement(rebass_1.Flex, { flexDirection: "row", ...boxProps },
         react_1.default.createElement(StylePreview_1.StylePreview, { "data-value": "up-style", mr: 1, flex: 1, styleObject: props.data.UpChangeStyle },
             "Up ",
             !props.data.UpChangeStyle ? ' - no style' : ''),

package/src/View/FlashingCell/Wizard/FlashingCellRulesWizardSection.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { FlashingCellDefinition } from '../../../PredefinedConfig/FlashingCellState';
 export interface FlashingAlertRulesWizardSectionProps {
     onChange: (data: FlashingCellDefinition) => void;
 }
-export declare const renderFlashingAlertRulesSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
-export declare const FlashingAlertRulesWizardSection: (props: FlashingAlertRulesWizardSectionProps) => JSX.Element;
+export declare const renderFlashingAlertRulesSummary: (flashingAlert: FlashingCellDefinition) => React.JSX.Element;
+export declare const FlashingAlertRulesWizardSection: (props: FlashingAlertRulesWizardSectionProps) => React.JSX.Element;

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

@@ -7,9 +7,8 @@ const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const CodeBlock_1 = require("../../../components/CodeBlock");
 const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 const renderFlashingAlertRulesSummary = (flashingAlert) => {
-    var _a;
     const { api: { flashingCellApi }, } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const FlashTarget = (_a = flashingAlert.FlashTarget) !== null && _a !== void 0 ? _a : flashingCellApi.getFlashingCellFlashTarget(flashingAlert);
+    const FlashTarget = flashingAlert.FlashTarget ?? flashingCellApi.getFlashingCellFlashTarget(flashingAlert);
     return (React.createElement(EntityRulesEditor_1.EntityRulesSummary, { data: flashingAlert, renderPredicate: (content) => {
             return (React.createElement(React.Fragment, null,
                 "Flash ",

package/src/View/FlashingCell/Wizard/FlashingCellScopeWizardSection.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 type FlashingAlertScopeWizardSectionProps = {
     onChange: (data: any) => void;
 };
-export declare const FlashingAlertScopeWizardSection: (props: FlashingAlertScopeWizardSectionProps) => JSX.Element;
+export declare const FlashingAlertScopeWizardSection: (props: FlashingAlertScopeWizardSectionProps) => React.JSX.Element;
 export {};

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

@@ -14,7 +14,7 @@ const FlashingAlertScopeWizardSection = (props) => {
                 rowScope: 'Changes anywhere in the row will trigger an Flashing Cell',
                 columnScope: 'Changes in selected columns will trigger an Flashing Cell',
             }, scopeColumns: availableColumns, scope: data.Scope, updateScope: (Scope) => {
-                const newData = Object.assign(Object.assign({}, data), { Scope });
+                const newData = { ...data, Scope };
                 if (newData.Rule.Predicates) {
                     // when scope is changed, reset the rule to predicate of AnyChange
                     // if it was set to a predicate before

package/src/View/FlashingCell/Wizard/FlashingCellSettingsWizardSection.d.ts

@@ -1,10 +1,10 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { FlashingCellDefinition } from '../../../types';
 type FlashingAlertDurationWizardSectionProps = {
     readOnly?: boolean;
     flashingCell?: FlashingCellDefinition;
     onChange: (data: FlashingCellDefinition) => void;
 };
-export declare const renderFlashingAlertSettingsSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
-export declare const FlashingAlertSettingsWizardSection: (props: FlashingAlertDurationWizardSectionProps) => JSX.Element;
+export declare const renderFlashingAlertSettingsSummary: (flashingAlert: FlashingCellDefinition) => React.JSX.Element;
+export declare const FlashingAlertSettingsWizardSection: (props: FlashingAlertDurationWizardSectionProps) => React.JSX.Element;
 export {};

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

@@ -23,28 +23,25 @@ const renderFlashingAlertSettingsSummary = (flashingAlert) => {
 };
 exports.renderFlashingAlertSettingsSummary = renderFlashingAlertSettingsSummary;
 const FlashingAlertSettingsWizardSection = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g;
     let { data: flashingCell } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    flashingCell = flashingCell !== null && flashingCell !== void 0 ? flashingCell : props.flashingCell;
+    flashingCell = flashingCell ?? props.flashingCell;
     const setDuration = (FlashDuration) => {
-        props.onChange(Object.assign(Object.assign({}, flashingCell), { FlashDuration: FlashDuration }));
+        props.onChange({ ...flashingCell, FlashDuration: FlashDuration });
     };
-    const duration = (_a = flashingCell.FlashDuration) !== null && _a !== void 0 ? _a : 500;
+    const duration = flashingCell.FlashDuration ?? 500;
     const numberDuration = React.useRef(typeof duration === 'number' ? duration : 500);
     const inputRef = (0, react_1.useRef)(null);
     const oldDuration = (0, usePrevious_1.default)(duration, duration);
     React.useEffect(() => {
-        var _a;
         if (oldDuration === 'always' && duration != oldDuration) {
-            (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+            inputRef.current?.focus();
         }
     }, [duration, oldDuration]);
     const handleTypeChange = (type) => {
         setDuration(type === 'number' ? numberDuration.current : 'always');
     };
     const handleTargetChange = (type, checked) => {
-        var _a;
-        let FlashTarget = (_a = flashingCell.FlashTarget) !== null && _a !== void 0 ? _a : [];
+        let FlashTarget = flashingCell.FlashTarget ?? [];
         if (typeof FlashTarget === 'string') {
             FlashTarget = [FlashTarget];
         }
@@ -56,7 +53,10 @@ const FlashingAlertSettingsWizardSection = (props) => {
                 FlashTarget = FlashTarget.filter((target) => type != target);
             }
         }
-        props.onChange(Object.assign(Object.assign({}, flashingCell), { FlashTarget }));
+        props.onChange({
+            ...flashingCell,
+            FlashTarget,
+        });
     };
     return (React.createElement(rebass_1.Flex, { height: "100%", flexDirection: "column", "data-name": "plus-minus-column-settings" },
         React.createElement(Tabs_1.Tabs, { autoFocus: false, padding: 2 },
@@ -76,11 +76,11 @@ const FlashingAlertSettingsWizardSection = (props) => {
                             React.createElement(rebass_1.Text, { fontSize: 2 }, "milliseconds"))),
                         duration === 'always' && (React.createElement(rebass_1.Text, { height: 43, fontSize: 3 }, "Persists the flashing style indeterminately - can be removed manually"))),
                     React.createElement(FormLayout_1.FormRow, { label: "Flash Target" },
-                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target", onChange: (checked) => handleTargetChange('cell', checked), mr: 3, checked: (flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) === 'cell' ||
-                                ((_c = (_b = flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, 'cell')), tabIndex: -1 }, "Cell"),
-                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-row", mr: 3, onChange: (checked) => handleTargetChange('row', checked), checked: (flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) === 'row' ||
-                                ((_e = (_d = flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) === null || _d === void 0 ? void 0 : _d.includes) === null || _e === void 0 ? void 0 : _e.call(_d, 'row')), tabIndex: -1 }, "Row"),
-                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-aggFuncCell", onChange: (checked) => handleTargetChange('aggFuncCell', checked), checked: (flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) === 'aggFuncCell' ||
-                                ((_g = (_f = flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) === null || _f === void 0 ? void 0 : _f.includes) === null || _g === void 0 ? void 0 : _g.call(_f, 'aggFuncCell')), tabIndex: -1 }, "Aggregated Function Cell")))))));
+                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target", onChange: (checked) => handleTargetChange('cell', checked), mr: 3, checked: flashingCell?.FlashTarget === 'cell' ||
+                                flashingCell?.FlashTarget?.includes?.('cell'), tabIndex: -1 }, "Cell"),
+                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-row", mr: 3, onChange: (checked) => handleTargetChange('row', checked), checked: flashingCell?.FlashTarget === 'row' ||
+                                flashingCell?.FlashTarget?.includes?.('row'), tabIndex: -1 }, "Row"),
+                        React.createElement(CheckBox_1.CheckBox, { "data-name": "flashing-target-aggFuncCell", onChange: (checked) => handleTargetChange('aggFuncCell', checked), checked: flashingCell?.FlashTarget === 'aggFuncCell' ||
+                                flashingCell?.FlashTarget?.includes?.('aggFuncCell'), tabIndex: -1 }, "Aggregated Function Cell")))))));
 };
 exports.FlashingAlertSettingsWizardSection = FlashingAlertSettingsWizardSection;

package/src/View/FlashingCell/Wizard/FlashingCellStyleWizardSection.d.ts

@@ -6,10 +6,10 @@ type FlashingAlertStyleWizardSectionProps = {
     flashingAlert?: FlashingCellDefinition;
     onStyleChange: (styleName: 'UpChangeStyle' | 'DownChangeStyle' | 'NeutralChangeStyle', style: AdaptableStyle) => void;
 };
-export declare const FlashingAlertStyleWizardSection: (props: FlashingAlertStyleWizardSectionProps) => JSX.Element;
+export declare const FlashingAlertStyleWizardSection: (props: FlashingAlertStyleWizardSectionProps) => React.JSX.Element;
 export interface FlashingCellStyleProps extends Omit<BoxProps, 'data'> {
     data: FlashingCellDefinition;
 }
 export declare const FlashingCellStyle: React.FunctionComponent<FlashingCellStyleProps>;
-export declare const renderFlashingAlertStyleSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
+export declare const renderFlashingAlertStyleSummary: (flashingAlert: FlashingCellDefinition) => React.JSX.Element;
 export {};

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

@@ -10,31 +10,30 @@ const StyleComponent_1 = require("../../Components/StyleComponent");
 const StylePreview_1 = require("../../../components/StylePreview");
 const changeStyle = (React.createElement(rebass_1.Text, { fontSize: 2, style: { display: 'inline-block' } }, "Change style"));
 const FlashingAlertStyleWizardSection = (props) => {
-    var _a, _b, _c;
     let { data: flashingAlert, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    flashingAlert = flashingAlert !== null && flashingAlert !== void 0 ? flashingAlert : props.flashingAlert;
+    flashingAlert = flashingAlert ?? props.flashingAlert;
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs_1.Tabs, { defaultValue: "up" },
             React.createElement(Tabs_1.Tabs.Tab, { value: "up" },
                 "Up ",
                 changeStyle),
             React.createElement(Tabs_1.Tabs.Content, { value: "up" },
-                React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_a = flashingAlert.UpChangeStyle) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (style) => props.onStyleChange('UpChangeStyle', style) })),
+                React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: flashingAlert.UpChangeStyle ?? {}, UpdateStyle: (style) => props.onStyleChange('UpChangeStyle', style) })),
             React.createElement(Tabs_1.Tabs.Tab, { value: "down" },
                 "Down ",
                 changeStyle),
             React.createElement(Tabs_1.Tabs.Content, { value: "down" },
-                React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_b = flashingAlert.DownChangeStyle) !== null && _b !== void 0 ? _b : {}, UpdateStyle: (style) => props.onStyleChange('DownChangeStyle', style) })),
+                React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: flashingAlert.DownChangeStyle ?? {}, UpdateStyle: (style) => props.onStyleChange('DownChangeStyle', style) })),
             React.createElement(Tabs_1.Tabs.Tab, { value: "neutral" },
                 "Neutral ",
                 changeStyle),
             React.createElement(Tabs_1.Tabs.Content, { value: "neutral" },
-                React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_c = flashingAlert.NeutralChangeStyle) !== null && _c !== void 0 ? _c : {}, UpdateStyle: (style) => props.onStyleChange('NeutralChangeStyle', style) })))));
+                React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: flashingAlert.NeutralChangeStyle ?? {}, UpdateStyle: (style) => props.onStyleChange('NeutralChangeStyle', style) })))));
 };
 exports.FlashingAlertStyleWizardSection = FlashingAlertStyleWizardSection;
 const FlashingCellStyle = (props) => {
-    const { data } = props, boxProps = tslib_1.__rest(props, ["data"]);
-    return (React.createElement(rebass_1.Box, Object.assign({}, boxProps),
+    const { data, ...boxProps } = props;
+    return (React.createElement(rebass_1.Box, { ...boxProps },
         React.createElement(StylePreview_1.StylePreview, { styleObject: props.data.UpChangeStyle },
             "Up change style ",
             !props.data.UpChangeStyle ? ' - no style' : ''),

package/src/View/FlashingCell/Wizard/FlashingCellWizard.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
 import { FlashingCellDefinition } from '../../../types';
 export interface FlashingCellWizardProps extends AdaptableOnePageWizardProps<FlashingCellDefinition> {
 }
-export declare const FlashingCellWizard: (props: FlashingCellWizardProps) => JSX.Element;
+export declare const FlashingCellWizard: (props: FlashingCellWizardProps) => React.JSX.Element;

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

@@ -22,16 +22,15 @@ const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection"
 const FlashingCellWizard = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const [flashingCell, setFlashingCell] = (0, react_1.useState)(() => {
-        var _a, _b, _c, _d;
         let flashingCell = props.data
             ? (0, Helper_1.cloneObject)(props.data)
             : ObjectFactory_1.default.CreateEmptyFlashingCellDefinition();
         flashingCell =
             api.flashingCellApi.internalApi.mergeFlashingCellDefinitionWithDefaults(flashingCell);
-        if (!flashingCell.Rule.BooleanExpression && !((_b = (_a = flashingCell.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (!flashingCell.Rule.BooleanExpression && !flashingCell.Rule?.Predicates?.length) {
             flashingCell.Rule.BooleanExpression = '';
         }
-        if (((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.column) && ((_d = props.popupParams) === null || _d === void 0 ? void 0 : _d.action) === 'New') {
+        if (props.popupParams?.column && props.popupParams?.action === 'New') {
             flashingCell.Scope = {
                 ColumnIds: [props.popupParams.column.columnId],
             };
@@ -41,7 +40,7 @@ const FlashingCellWizard = (props) => {
     const updateProperty = (propName) => {
         return (value) => {
             setFlashingCell((flashingCell) => {
-                flashingCell = Object.assign(Object.assign({}, flashingCell), { [propName]: value });
+                flashingCell = { ...flashingCell, [propName]: value };
                 return flashingCell;
             });
         };

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

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidFlashingCellRules = void 0;
 const Utilities_1 = require("../../Components/EntityRulesEditor/Utilities");
 const isValidFlashingCellRules = (flashingCell, api, context) => {
-    var _a, _b;
-    if (!((_b = (_a = flashingCell.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) && !flashingCell.Rule.BooleanExpression) {
+    if (!flashingCell.Rule?.Predicates?.length && !flashingCell.Rule.BooleanExpression) {
         return 'No Rule defined for Flashing Cell';
     }
     const isRuleValid = (0, Utilities_1.isAdaptableRuleValid)(flashingCell, api, context);

package/src/View/FormatColumn/FormatColumnSummary.d.ts

@@ -17,4 +17,6 @@ export declare class FormatColumnSummaryComponent extends React.Component<Format
     onFinishWizard: (formatColumn: FormatColumn) => void;
     canFinishWizard(): boolean;
 }
-export declare let FormatColumnSummary: import("react-redux").ConnectedComponent<typeof FormatColumnSummaryComponent, any>;
+export declare let FormatColumnSummary: import("react-redux").ConnectedComponent<typeof FormatColumnSummaryComponent, {
+    [x: string]: any;
+}>;

package/src/View/FormatColumn/FormatColumnSummary.js

@@ -68,8 +68,7 @@ class FormatColumnSummaryComponent extends React.Component {
         });
     }
     onCloseWizard() {
-        var _a;
-        (_a = this === null || this === void 0 ? void 0 : this.setState) === null || _a === void 0 ? void 0 : _a.call(this, {
+        this?.setState?.({
             editedAdaptableObject: null,
             wizardStartIndex: 0,
             wizardStatus: EditableConfigEntityState_1.WizardStatus.None,

package/src/View/FormatColumn/MoveFormatColumn.js

@@ -17,7 +17,7 @@ const MoveFormatColumn = (props) => {
     const handleMoveDown = React.useCallback(() => {
         dispatch(FormatColumnRedux.FormatColumnMoveDown(props.data));
     }, []);
-    if ((formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.length) <= 1) {
+    if (formatColumn?.length <= 1) {
         return React.createElement(React.Fragment, null);
     }
     return (React.createElement(React.Fragment, null,

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 import { AdaptableFormat } from '../../../PredefinedConfig/Common/AdaptableFormat';
 import { ColumnScope } from '../../../PredefinedConfig/Common/ColumnScope';
@@ -11,6 +11,6 @@ export interface FormatColumnFormatWizardState {
     NumericFormat?: 'Percent' | 'Thousand' | 'Million' | 'Dollar' | 'Sterling' | undefined;
 }
 export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn) => string;
-export declare const renderFormatColumnFormatSummary: (data: FormatColumn) => JSX.Element;
-export declare const getFormatDisplayTypeForScope: (scope: ColumnScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
-export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => JSX.Element;
+export declare const renderFormatColumnFormatSummary: (data: FormatColumn) => React.JSX.Element;
+export declare const getFormatDisplayTypeForScope: (scope: ColumnScope, api: AdaptableApi) => 'number' | 'date' | 'text' | undefined;
+export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => React.JSX.Element;

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

@@ -102,21 +102,17 @@ const getFormatColumnFormatSummaryValue = (data) => {
     return content;
 };
 exports.getFormatColumnFormatSummaryValue = getFormatColumnFormatSummaryValue;
-const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
-    var _a, _b, _c;
-    return (React.createElement(FormLayout_1.FormRow, { key: customFormatter.id, label: (_a = customFormatter.label) !== null && _a !== void 0 ? _a : customFormatter.id },
-        React.createElement(CheckBox_1.CheckBox, { "data-name": customFormatter.id, checked: (_c = (_b = data.DisplayFormat.Options.CustomDisplayFormats) === null || _b === void 0 ? void 0 : _b.some) === null || _c === void 0 ? void 0 : _c.call(_b, (item) => item === customFormatter.id), onChange: (checked) => {
-                var _a, _b, _c;
-                let newCustomFormats = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.DisplayFormat) === null || _a === void 0 ? void 0 : _a.Options) === null || _b === void 0 ? void 0 : _b.CustomDisplayFormats) !== null && _c !== void 0 ? _c : [];
-                if (checked) {
-                    newCustomFormats = [...newCustomFormats, customFormatter.id];
-                }
-                else {
-                    newCustomFormats = newCustomFormats.filter((item) => item !== customFormatter.id);
-                }
-                setFormatOption('CustomDisplayFormats', newCustomFormats);
-            } })));
-};
+const renderCustomFormatter = (data, customFormatter, setFormatOption) => (React.createElement(FormLayout_1.FormRow, { key: customFormatter.id, label: customFormatter.label ?? customFormatter.id },
+    React.createElement(CheckBox_1.CheckBox, { "data-name": customFormatter.id, checked: data.DisplayFormat.Options.CustomDisplayFormats?.some?.((item) => item === customFormatter.id), onChange: (checked) => {
+            let newCustomFormats = data?.DisplayFormat?.Options?.CustomDisplayFormats ?? [];
+            if (checked) {
+                newCustomFormats = [...newCustomFormats, customFormatter.id];
+            }
+            else {
+                newCustomFormats = newCustomFormats.filter((item) => item !== customFormatter.id);
+            }
+            setFormatOption('CustomDisplayFormats', newCustomFormats);
+        } })));
 const renderFormatColumnFormatSummary = (data) => {
     return React.createElement(Tag_1.Tag, null, (0, exports.getFormatColumnFormatSummaryValue)(data));
 };
@@ -132,25 +128,25 @@ const getFormatDisplayTypeForScope = (scope, api) => {
     if ('ColumnIds' in scope) {
         const columns = scope.ColumnIds.map((c) => api.columnApi.getColumnWithColumnId(c)).filter(Boolean);
         const columnDataTypes = (0, uniq_1.default)(columns.map((c) => c.dataType));
-        if (columnDataTypes.length == 1 && columnDataTypes[0] == 'Number') {
-            return 'Number';
+        if (columnDataTypes.length == 1 && columnDataTypes[0] == 'number') {
+            return 'number';
         }
-        if (columnDataTypes.length == 1 && columnDataTypes[0] == 'Date') {
-            return 'Date';
+        if (columnDataTypes.length == 1 && columnDataTypes[0] == 'date') {
+            return 'date';
         }
-        if (columnDataTypes.length == 1 && columnDataTypes[0] == 'String') {
-            return 'String';
+        if (columnDataTypes.length == 1 && columnDataTypes[0] == 'text') {
+            return 'text';
         }
         return undefined;
     }
-    if ('DataTypes' in scope && scope.DataTypes.length == 1 && scope.DataTypes[0] == 'Number') {
-        return 'Number';
+    if ('DataTypes' in scope && scope.DataTypes.length == 1 && scope.DataTypes[0] == 'number') {
+        return 'number';
     }
-    if ('DataTypes' in scope && scope.DataTypes.length == 1 && scope.DataTypes[0] == 'Date') {
-        return 'Date';
+    if ('DataTypes' in scope && scope.DataTypes.length == 1 && scope.DataTypes[0] == 'date') {
+        return 'date';
     }
-    if ('DataTypes' in scope && scope.DataTypes.length == 1 && scope.DataTypes[0] == 'String') {
-        return 'String';
+    if ('DataTypes' in scope && scope.DataTypes.length == 1 && scope.DataTypes[0] == 'text') {
+        return 'text';
     }
     if ('ColumnTypes' in scope && scope.ColumnTypes.length) {
         // need to check if all column with this column type has the same data type and return that particular one
@@ -161,7 +157,7 @@ const getFormatDisplayTypeForScope = (scope, api) => {
         if (columns.length &&
             columns.every((column) => column.dataType === columns[0].dataType) &&
             // supported data types
-            ['Number', 'Date', 'String'].includes(columns[0].dataType)) {
+            ['number', 'date', 'text'].includes(columns[0].dataType)) {
             return columns[0].dataType;
         }
     }
@@ -169,7 +165,6 @@ const getFormatDisplayTypeForScope = (scope, api) => {
 };
 exports.getFormatDisplayTypeForScope = getFormatDisplayTypeForScope;
 const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatters) => {
-    var _a;
     if (data.DisplayFormat.Formatter !== 'DateFormatter') {
         return null;
     }
@@ -184,7 +179,7 @@ const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatte
                     ")."),
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Pattern" },
-                        React.createElement(Input_1.default, { "data-name": "pattern", value: (_a = data.DisplayFormat.Options.Pattern) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('Pattern', e.currentTarget.value), mr: 2 }),
+                        React.createElement(Input_1.default, { "data-name": "pattern", value: data.DisplayFormat.Options.Pattern ?? '', onChange: (e) => setFormatOption('Pattern', e.currentTarget.value), mr: 2 }),
                         React.createElement("span", null, data.DisplayFormat.Options.Pattern &&
                             FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options, true)))))),
         scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
@@ -212,7 +207,6 @@ const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatte
                     ] })))))));
 };
 const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatters, api) => {
-    var _a, _b, _c, _d, _e, _f;
     if (data.DisplayFormat.Formatter !== 'NumberFormatter') {
         return null;
     }
@@ -272,14 +266,14 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                 React.createElement(rebass_1.Flex, { flexDirection: "row" },
                     React.createElement(FormLayout_1.default, { mr: 3 },
                         React.createElement(FormLayout_1.FormRow, { label: "Fraction Separator" },
-                            React.createElement(Input_1.default, { "data-name": "fraction-separator", value: (_a = data.DisplayFormat.Options.FractionSeparator) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('FractionSeparator', e.currentTarget.value) }),
+                            React.createElement(Input_1.default, { "data-name": "fraction-separator", value: data.DisplayFormat.Options.FractionSeparator ?? '', onChange: (e) => setFormatOption('FractionSeparator', e.currentTarget.value) }),
                             ' '),
                         React.createElement(FormLayout_1.FormRow, { label: "Integer Separator" },
-                            React.createElement(Input_1.default, { "data-name": "integer-separator", value: (_b = data.DisplayFormat.Options.IntegerSeparator) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('IntegerSeparator', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "integer-separator", value: data.DisplayFormat.Options.IntegerSeparator ?? '', onChange: (e) => setFormatOption('IntegerSeparator', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
-                            React.createElement(Input_1.default, { "data-name": "prefix", value: (_c = data.DisplayFormat.Options.Prefix) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "prefix", value: data.DisplayFormat.Options.Prefix ?? '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
-                            React.createElement(Input_1.default, { "data-name": "suffix", value: (_d = data.DisplayFormat.Options.Suffix) !== null && _d !== void 0 ? _d : '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "suffix", value: data.DisplayFormat.Options.Suffix ?? '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Truncate" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "truncate-checkbox", checked: data.DisplayFormat.Options.Truncate, onChange: (checked) => setFormatOption('Truncate', checked) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Ceiling" },
@@ -332,7 +326,7 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                 React.createElement(rebass_1.Text, { padding: 2, fontSize: 2 }, "Provide dynamic content through the use of Placeholders"),
                 React.createElement(FormLayout_1.default, { margin: 2 },
                     React.createElement(FormLayout_1.FormRow, { label: "" },
-                        React.createElement(Textarea_1.default, { minWidth: 300, rows: 3, placeholder: "", marginTop: 2, type: 'text', autoFocus: false, value: (_f = (_e = data.DisplayFormat.Options.Content) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }),
+                        React.createElement(Textarea_1.default, { minWidth: 300, rows: 3, placeholder: "", marginTop: 2, type: 'text', autoFocus: false, value: data.DisplayFormat.Options.Content?.toString() ?? '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }),
                         showDocumentationLinks && (React.createElement(HelpBlock_1.default, { "data-name": "query-documentation", mt: 3, mb: 2, style: {
                                 fontSize: 'var(--ab-font-size-3)',
                                 padding: 0,
@@ -370,7 +364,6 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                     ] })))));
 };
 const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormatters, api) => {
-    var _a, _b, _c;
     if (data.DisplayFormat.Formatter !== 'StringFormatter') {
         return null;
     }
@@ -389,11 +382,11 @@ const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormat
                                     React.createElement(Toggle_1.Toggle, { pressed: data.DisplayFormat.Options.Case === 'Sentence', onPressedChange: (pressed) => setFormatOption('Case', pressed ? 'Sentence' : undefined), icon: "case-sentence" })),
                                 React.createElement(CheckBox_1.CheckBox, { "data-name": "trim-checkbox", marginLeft: 5, checked: data.DisplayFormat.Options.Trim, onChange: (checked) => setFormatOption('Trim', checked) }, "Trim"))),
                         React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
-                            React.createElement(Input_1.default, { "data-name": "prefix", value: (_a = data.DisplayFormat.Options.Prefix) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "prefix", value: data.DisplayFormat.Options.Prefix ?? '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
-                            React.createElement(Input_1.default, { "data-name": "suffix", value: (_b = data.DisplayFormat.Options.Suffix) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "suffix", value: data.DisplayFormat.Options.Suffix ?? '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Content" },
-                            React.createElement(Textarea_1.default, { minWidth: 300, rows: 3, placeholder: "", marginTop: 2, type: 'text', autoFocus: false, value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }),
+                            React.createElement(Textarea_1.default, { minWidth: 300, rows: 3, placeholder: "", marginTop: 2, type: 'text', autoFocus: false, value: data.DisplayFormat.Options.Content ?? '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }),
                             showDocumentationLinks && (React.createElement(HelpBlock_1.default, { "data-name": "query-documentation", mt: 3, mb: 2, style: {
                                     fontSize: 'var(--ab-font-size-3)',
                                     padding: 0,
@@ -425,18 +418,17 @@ const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormat
                     ] })))));
 };
 const FormatColumnFormatWizardSection = (props) => {
-    var _a;
     const { data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const formatColumnApi = adaptable.api.formatColumnApi;
-    const customDisplayFormatters = (_a = adaptable.api.optionsApi.getFormatColumnOptions().customDisplayFormatters) !== null && _a !== void 0 ? _a : [];
+    const customDisplayFormatters = adaptable.api.optionsApi.getFormatColumnOptions().customDisplayFormatters ?? [];
     const update = (updated) => {
-        props.onChange(Object.assign(Object.assign({}, data), updated));
+        props.onChange({ ...data, ...updated });
     };
     const setFormatOption = (key, value) => {
-        const DisplayFormat = Object.assign({}, data.DisplayFormat);
+        const DisplayFormat = { ...data.DisplayFormat };
         // @ts-ignore
-        DisplayFormat.Options = Object.assign(Object.assign({}, DisplayFormat.Options), { [key]: value });
+        DisplayFormat.Options = { ...DisplayFormat.Options, [key]: value };
         update({ DisplayFormat });
     };
     const Type = data.DisplayFormat && data.DisplayFormat.Formatter;

package/src/View/FormatColumn/Wizard/FormatColumnRuleWizardSection.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { FormatColumn } from '../../../../types';
 type FormatColumnRuleWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
     defaultPredicateId: string;
 };
-export declare function FormatColumnRuleWizardSection(props: FormatColumnRuleWizardSectionProps): JSX.Element;
+export declare function FormatColumnRuleWizardSection(props: FormatColumnRuleWizardSectionProps): React.JSX.Element;
 export {};

package/src/View/FormatColumn/Wizard/FormatColumnScopeWizardSection.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 type FormatColumnScopeWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };
-export declare const renderFormatColumnScopeSummary: (data: FormatColumn) => JSX.Element;
-export declare const FormatColumnScopeWizardSection: (props: FormatColumnScopeWizardSectionProps) => JSX.Element;
+export declare const renderFormatColumnScopeSummary: (data: FormatColumn) => React.JSX.Element;
+export declare const FormatColumnScopeWizardSection: (props: FormatColumnScopeWizardSectionProps) => React.JSX.Element;
 export {};

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

@@ -20,10 +20,9 @@ const FormatColumnScopeWizardSection = (props) => {
             rowScope: 'Format all columns in the row',
             columnScope: 'Select columns to format',
         }, scope: data.Scope, updateScope: (Scope) => {
-            var _a, _b;
-            const newData = Object.assign(Object.assign({}, data), { Scope });
+            const newData = { ...data, Scope };
             const wholeRow = api.columnScopeApi.scopeIsAll(Scope);
-            if ((_b = (_a = newData.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) {
+            if (newData.Rule?.Predicates?.length) {
                 if (wholeRow) {
                     // if scope is whole row, a predicate cannot be present, so we set the rule
                     // to be a boolean expression

package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 type FormatColumnOptionsWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };
-export declare const renderFormatColumnSettingsSummary: (data: FormatColumn) => JSX.Element;
-export declare const FormatColumnSettingsWizardSection: (props: FormatColumnOptionsWizardSectionProps) => JSX.Element;
+export declare const renderFormatColumnSettingsSummary: (data: FormatColumn) => React.JSX.Element;
+export declare const FormatColumnSettingsWizardSection: (props: FormatColumnOptionsWizardSectionProps) => React.JSX.Element;
 export {};