@adaptabletools/adaptable 11.0.0-canary.1 → 11.0.0-canary.5

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

@@ -13,14 +13,26 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const CustomSortRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/CustomSortRedux"));
 exports.CustomSortWizard = (props) => {
+    var _a, _b;
+    let data = props.data;
+    const allCustomSorts = react_redux_1.useSelector((state) => { var _a; return (_a = state.CustomSort) === null || _a === void 0 ? void 0 : _a.CustomSorts; });
+    if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit' && ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column)) {
+        data = allCustomSorts.find((x) => { var _a; return x.ColumnId == ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column.columnId); });
+    }
     const [customSort, setCustomSort] = react_1.useState(() => {
-        return props.data
-            ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyCustomSort();
+        var _a, _b;
+        if (data) {
+            return Helper_1.cloneObject(data);
+        }
+        const newData = ObjectFactory_1.default.CreateEmptyCustomSort();
+        if ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) {
+            newData.ColumnId = (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column.columnId;
+        }
+        return newData;
     });
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {
-        if (props.data) {
+        if (data) {
             dispatch(CustomSortRedux.CustomSortEdit(customSort));
         }
         else {

package/src/View/Dashboard/CustomToolbarWrapper.js

@@ -17,7 +17,11 @@ exports.CustomToolbarWrapper = (props) => {
         const node = contentsDivRef.current;
         const adaptableApi = api;
         if (props.customToolbar.render) {
-            const html = props.customToolbar.render({ visible: true, node, adaptableApi });
+            const html = props.customToolbar.render({
+                visible: true,
+                node,
+                adaptableApi,
+            });
             setContentsHTML(html);
         }
         else if (props.customToolbar.frameworkComponent) {

package/src/View/Dashboard/Dashboard.js

@@ -13,7 +13,7 @@ const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const rebass_1 = require("rebass");
 const Dashboard_1 = require("../../components/Dashboard");
-const kebabCase_1 = tslib_1.__importDefault(require("lodash-es/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
 const AdaptableFormControlTextClear_1 = require("../Components/Forms/AdaptableFormControlTextClear");
 const useQuickSearchDebounced_1 = require("../QuickSearch/useQuickSearchDebounced");
 const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
@@ -69,8 +69,7 @@ const DashboardComponent = (props) => {
     const renderModuleButtons = () => {
         let shortcutsArray = props.DashboardState.ModuleButtons;
         let shortcuts = null;
-        const alwaysShowInDashboard = props.api.internalApi.getAdaptableOptions().settingsPanelOptions
-            .alwaysShowInDashboard;
+        const alwaysShowInDashboard = props.api.internalApi.getAdaptableOptions().settingsPanelOptions.alwaysShowInDashboard;
         const shouldAddSettingsPanel = alwaysShowInDashboard &&
             !props.api.internalApi.getEntitlementService().isModuleHiddenEntitlement('SettingsPanel');
         if (shouldAddSettingsPanel && !shortcutsArray.includes('SettingsPanel')) {
@@ -90,7 +89,8 @@ const DashboardComponent = (props) => {
     };
     const renderDashboardButtons = () => {
         var _a;
-        let dashboardButtonsArray = (_a = props.api.dashboardApi.getCustomDashboardButtons()) === null || _a === void 0 ? void 0 : _a.filter((c) => c);
+        let dashboardButtonsArray = (_a = props.api.dashboardApi
+            .getCustomDashboardButtons()) === null || _a === void 0 ? void 0 : _a.filter((c) => c);
         let customDashboardButtons = null;
         if (dashboardButtonsArray) {
             customDashboardButtons = dashboardButtonsArray.map((button) => {
@@ -150,7 +150,7 @@ const DashboardComponent = (props) => {
                 props.onSetFloatingPosition(FloatingPositionCallback);
             }
         }, left: React.createElement(React.Fragment, null,
-            React.createElement(ApplicationIcon_1.ApplicationIcon, { icon: props.api.internalApi.getAdaptableOptions().userInterfaceOptions.applicationIcon }),
+            React.createElement(ApplicationIcon_1.ApplicationIcon, { className: "ab-Dashboard__application-icon", icon: props.api.internalApi.getAdaptableOptions().userInterfaceOptions.applicationIcon }),
             dashboardOptions.buttonsLocation === 'left' && renderModuleButtons()), right: React.createElement(React.Fragment, null,
             renderDashboardButtons(),
             dashboardOptions.buttonsLocation === 'right' && renderModuleButtons(),

package/src/View/Dashboard/DashboardPopup.js

@@ -58,11 +58,11 @@ class DashboardPopupComponent extends React.Component {
         });
         const allModuleButtons = this.props.GridState.ModuleDropdownMenuItems.map((x) => x.module);
         const baseClassName = 'ab-Dashboard-Popup';
-        // const isDisabled = this.props.Entitlements
         const dashboardAccessLevel = this.props.api.internalApi
             .getEntitlementService()
             .getEntitlementAccessLevelForModule('Dashboard');
-        const areDashboardSettingsEnabled = dashboardAccessLevel == 'Full' || dashboardAccessLevel == 'ReadOnly';
+        const areDashboardSettingsVisible = dashboardAccessLevel == 'Full' || dashboardAccessLevel == 'ReadOnly';
+        const isDashboardDisabled = dashboardAccessLevel === 'ReadOnly';
         const isModuleCheckboxDisabled = (module) => {
             if (module === 'SettingsPanel') {
                 return this.props.api.internalApi.getAdaptableOptions().settingsPanelOptions
@@ -72,7 +72,7 @@ class DashboardPopupComponent extends React.Component {
         };
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph },
             React.createElement(rebass_1.Flex, { flex: 1, height: "100%", flexDirection: "column" },
-                areDashboardSettingsEnabled && (React.createElement(Panel_1.default, { header: 'Dashboard Settings', style: { height: 'auto', overflow: 'visible' }, variant: "default", borderRadius: "none", marginLeft: 2, marginRight: 2 },
+                areDashboardSettingsVisible && (React.createElement(Panel_1.default, { header: 'Dashboard Settings', style: { height: 'auto', overflow: 'visible' }, variant: "default", borderRadius: "none", marginLeft: 2, marginRight: 2 },
                     React.createElement(rebass_1.Flex, null,
                         React.createElement(CheckBox_1.CheckBox, { mr: 3, className: `${baseClassName}__Checkbox__collapsed-check`, checked: this.props.IsCollapsed, onChange: (checked) => this.props.onSetDashboardCollapsed(checked) }, "Collapse"),
                         ' ',
@@ -84,13 +84,15 @@ class DashboardPopupComponent extends React.Component {
                         React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.Toolbars, checked: this.state.DashboardConfigView == DashboardConfigView.Toolbars, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Toolbars"),
                         React.createElement(Radio_1.default, { marginLeft: 3, value: DashboardConfigView.Buttons, checked: this.state.DashboardConfigView == DashboardConfigView.Buttons, onChange: (_, e) => this.onDashboardConfigViewChanged(e) }, "Buttons")),
                     React.createElement(rebass_1.Box, { className: `${baseClassName}__Module-Selector`, style: { minHeight: 0, flex: '1 1 0' }, padding: 2 },
-                        this.state.DashboardConfigView == DashboardConfigView.Toolbars && (React.createElement(DashboardManager_1.default, { availableToolbars: [...systemToolbars, ...customToolbars], tabs: tabs, onTabsChange: this.props.onDashboardSetTabs, api: this.props.api })),
-                        this.state.DashboardConfigView == DashboardConfigView.Buttons && (React.createElement(ModuleValueSelector_1.ModuleValueSelector, { options: allModuleButtons, value: selectedModuleButtons, noSelectionLabel: 'No selected Module Button', isDisabled: isModuleCheckboxDisabled, xSelectedLabel: () => `Visible Module Buttons:`, onChange: (selectedValues) => this.props.onDashboardSetModuleButtons(selectedValues) })))))));
+                        this.state.DashboardConfigView == DashboardConfigView.Toolbars && (React.createElement(DashboardManager_1.default, { disabled: isDashboardDisabled, availableToolbars: [...systemToolbars, ...customToolbars], tabs: tabs, onTabsChange: this.props.onDashboardSetTabs, api: this.props.api })),
+                        this.state.DashboardConfigView == DashboardConfigView.Buttons && (React.createElement(ModuleValueSelector_1.ModuleValueSelector, { disabled: isDashboardDisabled, options: allModuleButtons, value: selectedModuleButtons, noSelectionLabel: 'No selected Module Button', isOptionDisabled: isModuleCheckboxDisabled, xSelectedLabel: () => `Visible Module Buttons:`, onChange: (selectedValues) => this.props.onDashboardSetModuleButtons(selectedValues) })))))));
     }
     onDashboardConfigViewChanged(event) {
         let e = event.target;
         let dashboardConfigView = e.value;
-        this.setState({ DashboardConfigView: dashboardConfigView });
+        this.setState({
+            DashboardConfigView: dashboardConfigView,
+        });
     }
 }
 function mapStateToProps(state, ownProps) {

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -189,7 +189,8 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
         const layoutColumns = options.predefinedConfig.Layout.Layouts[0].Columns;
         if (layoutColumns.includes('undoActionColumn')) {
             // remove action column from layout
-            options.predefinedConfig.Layout.Layouts[0].Columns = layoutColumns.filter((columnId) => columnId !== 'undoActionColumn');
+            options.predefinedConfig.Layout.Layouts[0].Columns =
+                layoutColumns.filter((columnId) => columnId !== 'undoActionColumn');
         }
     }
     return options;

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

@@ -14,13 +14,23 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const ExportRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ExportRedux"));
 exports.NewReportWizard = (props) => {
+    var _a, _b;
+    const isEdit = ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) ? props.popupParams.action === 'Edit'
+        : Boolean(props.data);
+    const currentReport = react_redux_1.useSelector((state) => {
+        if (!isEdit) {
+            return;
+        }
+        return state.Export.Reports.find((report) => report.Name === state.Export.CurrentReport);
+    });
+    const data = (_b = props.data) !== null && _b !== void 0 ? _b : currentReport;
     const [report, setReport] = react_1.useState(() => {
-        return props.data ? Helper_1.cloneObject(props.data) : ObjectFactory_1.default.CreateEmptyReport();
+        return data ? Helper_1.cloneObject(data) : ObjectFactory_1.default.CreateEmptyReport();
     });
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {
-        if (props.data) {
-            dispatch(ExportRedux.ReportDelete(report));
+        if (isEdit) {
+            dispatch(ExportRedux.ReportEdit(report));
         }
         else {
             dispatch(ExportRedux.ReportAdd(report));

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

@@ -44,7 +44,9 @@ class ReportColumnTypeWizard extends React.Component {
             }, () => this.props.updateGoBackState());
         }
         else {
-            this.setState({ ReportColumnScope: Enums_1.ReportColumnScope.ScopeColumns }, () => this.props.updateGoBackState());
+            this.setState({
+                ReportColumnScope: Enums_1.ReportColumnScope.ScopeColumns,
+            }, () => this.props.updateGoBackState());
         }
     }
     canNext() {

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

@@ -44,7 +44,9 @@ class ReportRowTypeWizard extends React.Component {
             }, () => this.props.updateGoBackState());
         }
         else {
-            this.setState({ ReportRowScope: Enums_1.ReportRowScope.ExpressionRows }, () => this.props.updateGoBackState());
+            this.setState({
+                ReportRowScope: Enums_1.ReportRowScope.ExpressionRows,
+            }, () => this.props.updateGoBackState());
         }
     }
     canNext() {

package/src/View/Filter/FilterViewPanel.d.ts

@@ -1,13 +1,10 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-import { UIPrompt } from '../../Utilities/Interface/MessagePopups';
-import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 import * as FilterRedux from '../../Redux/ActionsReducers/FilterRedux';
 import { ColumnFilter } from '../../PredefinedConfig/FilterState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { Entitlement } from '../../PredefinedConfig/Common/Entitlement';
 import * as React from 'react';
 export interface FilterViewPanelComponentProps extends ViewPanelProps {
-    onShowPrompt: (prompt: UIPrompt) => PopupRedux.PopupShowPromptAction;
     onHideQuickFilterBar: () => FilterRedux.QuickFilterBarHideAction;
     onShowQuickFilterBar: () => FilterRedux.QuickFilterBarShowAction;
     ColumnFilters: ColumnFilter[];
@@ -21,5 +18,5 @@ declare class FilterViewPanelComponent extends React.Component<FilterViewPanelCo
     private onClearFilters;
     private onClearColumnFilter;
 }
-export declare const FilterViewPanelControl: import("react-redux").ConnectedComponent<typeof FilterViewPanelComponent, any>;
+export declare const FilterViewPanelControl: import("react-redux").ConnectedComponent<typeof FilterViewPanelComponent, Pick<React.ClassAttributes<FilterViewPanelComponent> & FilterViewPanelComponentProps, "ref" | "key">>;
 export {};

package/src/View/Filter/FilterViewPanel.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterViewPanelControl = void 0;
 const tslib_1 = require("tslib");
-const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const FilterRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FilterRedux"));
 const React = tslib_1.__importStar(require("react"));
 const ActiveFiltersPanel_1 = require("./ActiveFiltersPanel");
@@ -37,7 +36,7 @@ class FilterViewPanelComponent extends React.Component {
         this.props.api.filterApi.clearColumnFilterByColumn(columnFilter.ColumnId);
     }
 }
-function mapStateToProps(state, ownProps) {
+function mapStateToProps(state) {
     return {
         ColumnFilters: state.Filter.ColumnFilters,
         IsQuickFilterVisible: state.Filter.IsQuickFilterVisible,
@@ -45,7 +44,6 @@ function mapStateToProps(state, ownProps) {
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onShowPrompt: (prompt) => dispatch(PopupRedux.PopupShowPrompt(prompt)),
         onHideQuickFilterBar: () => dispatch(FilterRedux.QuickFilterBarHide()),
         onShowQuickFilterBar: () => dispatch(FilterRedux.QuickFilterBarShow()),
     };

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

@@ -4,10 +4,6 @@ exports.FlashingAlertRulesWizardSection = exports.renderFlashingAlertRulesSummar
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const Tabs_1 = require("../../../components/Tabs");
-const rebass_1 = require("rebass");
-const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
-const BaseAlertRulesWizardSection_1 = require("../../Alert/Wizard/BaseAlertRulesWizardSection");
 const CodeBlock_1 = require("../../../components/CodeBlock");
 const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 exports.renderFlashingAlertRulesSummary = (flashingAlert) => {
@@ -32,26 +28,21 @@ exports.renderFlashingAlertRulesSummary = (flashingAlert) => {
         } }));
 };
 exports.FlashingAlertRulesWizardSection = (props) => {
-    var _a;
-    const { data: flashingAlert, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
-    const flashTarget = (_a = flashingAlert.FlashTarget) !== null && _a !== void 0 ? _a : api.flashingCellApi.getFlashingCellFlashTarget(flashingAlert);
-    return (React.createElement(BaseAlertRulesWizardSection_1.BaseAlertRulesWizardSection, { onChange: props.onChange, wholeRowScope: false, module: "flashingCell" },
-        React.createElement(rebass_1.Text, { fontSize: 2, mb: 2, pl: 2, pt: 2 }, "Flash target"),
-        React.createElement(Tabs_1.Tabs, { value: flashTarget !== null && flashTarget !== void 0 ? flashTarget : 'row', pl: 2, onValueChange: (flashTarget) => {
-                props.onChange(Object.assign(Object.assign({}, flashingAlert), { FlashTarget: flashTarget }));
-            } },
-            React.createElement(Tabs_1.Tabs.Tab, { value: "row" },
-                React.createElement(Radio_1.default, { margin: 0, tabIndex: -1, checked: flashTarget === 'row' }, "Row")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "row" },
-                React.createElement(rebass_1.Text, { fontSize: 2 },
-                    "Flash the whole ",
-                    React.createElement("b", null, "row"))),
-            React.createElement(Tabs_1.Tabs.Tab, { value: "cell" },
-                React.createElement(Radio_1.default, { margin: 0, tabIndex: -1, checked: flashTarget === 'cell' }, "Cell")),
-            React.createElement(Tabs_1.Tabs.Content, { value: "cell" },
-                React.createElement(rebass_1.Text, { fontSize: 2 },
-                    "Flash the updated ",
-                    React.createElement("b", null, "cell"),
-                    " only"))),
-        React.createElement(rebass_1.Text, { mt: 3, fontSize: 2, pl: 2 }, "Flash rules")));
+    const { data, api, moduleInfo } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    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',
+            useBooleanQuery: (React.createElement(React.Fragment, null,
+                "Use an BooleanQuery if ",
+                React.createElement("i", null, "Scope"),
+                " is 'Whole Row' - so any data change may be evaluated in a complex BooleanExpression")),
+            useObservableQuery: (React.createElement(React.Fragment, null,
+                "Use an ObservableQuery if ",
+                React.createElement("i", null, "Scope"),
+                " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
+            useAggregationQuery: (React.createElement(React.Fragment, null,
+                "Use an AggregationQuery if ",
+                React.createElement("i", null, "Scope"),
+                " is 'Whole Row' - so any data change may be evaluated in a complex AggregationExpression")),
+        } }));
 };

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

@@ -3,7 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlashingAlertScopeWizardSection = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const BaseAlertScopeWizardSection_1 = require("../../Alert/Wizard/BaseAlertScopeWizardSection");
+const rebass_1 = require("rebass");
+const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 exports.FlashingAlertScopeWizardSection = (props) => {
-    return React.createElement(BaseAlertScopeWizardSection_1.BaseAlertScopeWizardSection, Object.assign({}, props));
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    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',
+                columnScope: 'Changes in selected columns will trigger an Flashing Cell',
+            }, scope: data.Scope, updateScope: (Scope) => {
+                const newData = Object.assign(Object.assign({}, data), { Scope });
+                if (newData.Rule.Predicate) {
+                    // when scope is changed, reset the rule to predicate of any
+                    // if it was set to a predicate before
+                    newData.Rule = {
+                        Predicate: { PredicateId: 'Any' },
+                    };
+                }
+                props.onChange(newData);
+            } })));
 };

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

@@ -12,6 +12,7 @@ const Tabs_1 = require("../../../components/Tabs");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const CodeBlock_1 = require("../../../components/CodeBlock");
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
+const CheckBox_1 = require("../../../components/CheckBox");
 exports.renderFlashingAlertSettingsSummary = (flashingAlert) => {
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Text, { fontSize: 2 }, flashingAlert.FlashDuration === 'always' ? (React.createElement(React.Fragment, null, "Flashing is never removed")) : (React.createElement(React.Fragment, null,
@@ -21,7 +22,7 @@ exports.renderFlashingAlertSettingsSummary = (flashingAlert) => {
             "milliseconds")))));
 };
 exports.FlashingAlertSettingsWizardSection = (props) => {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g;
     let { data: flashingCell } = OnePageAdaptableWizard_1.useOnePageWizardContext();
     flashingCell = flashingCell !== null && flashingCell !== void 0 ? flashingCell : props.flashingCell;
     const setDuration = (FlashDuration) => {
@@ -40,8 +41,21 @@ exports.FlashingAlertSettingsWizardSection = (props) => {
     const handleTypeChange = (type) => {
         setDuration(type === 'number' ? numberDuration.current : 'always');
     };
-    const handleTargetChange = (type) => {
-        props.onChange(Object.assign(Object.assign({}, flashingCell), { FlashTarget: type }));
+    const handleTargetChange = (type, checked) => {
+        var _a;
+        let FlashTarget = (_a = flashingCell.FlashTarget) !== null && _a !== void 0 ? _a : [];
+        if (typeof FlashTarget === 'string') {
+            FlashTarget = [FlashTarget];
+        }
+        if (Array.isArray(FlashTarget)) {
+            if (checked) {
+                FlashTarget = [...FlashTarget, type];
+            }
+            else {
+                FlashTarget = FlashTarget.filter((target) => type != target);
+            }
+        }
+        props.onChange(Object.assign(Object.assign({}, 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 },
@@ -61,6 +75,7 @@ exports.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(Radio_1.default, { onChange: () => handleTargetChange('cell'), mr: 3, checked: (flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) == 'cell', tabIndex: -1 }, "Cell"),
-                        React.createElement(Radio_1.default, { onChange: () => handleTargetChange('row'), checked: (flashingCell === null || flashingCell === void 0 ? void 0 : flashingCell.FlashTarget) == 'row', tabIndex: -1 }, "Row")))))));
+                        React.createElement(CheckBox_1.CheckBox, { 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, { 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, { 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")))))));
 };

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

@@ -69,7 +69,7 @@ exports.FlashingCellWizard = (props) => {
                 isValid: isValidFlashingCellRules_1.isValidFlashingCellRules,
                 render: () => React.createElement(FlashingCellRulesWizardSection_1.FlashingAlertRulesWizardSection, { onChange: setFlashingCell }),
                 renderSummary: FlashingCellRulesWizardSection_1.renderFlashingAlertRulesSummary,
-                title: 'Condition',
+                title: 'Rule',
             },
             {
                 details: 'Select the Duration of the Flash',

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

@@ -4,8 +4,8 @@ exports.FormatColumnFormatWizardSection = exports.getFormatDisplayTypeForScope =
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const uniq_1 = tslib_1.__importDefault(require("lodash-es/uniq"));
-const clamp_1 = tslib_1.__importDefault(require("lodash-es/clamp"));
+const uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));
+const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));

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

@@ -70,15 +70,20 @@ const adjustFormatColumn = (formatColumn, api) => {
     return formatColumn;
 };
 function FormatColumnWizard(props) {
+    var _a;
     const { api } = AdaptableContext_1.useAdaptable();
+    const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
     const [formatColumn, doSetFormatColumn] = react_1.useState(() => {
-        var _a;
-        let formatColumn = props.data
-            ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyFormatColumn();
+        var _a, _b, _c, _d;
+        let formatColumn = data ? Helper_1.cloneObject(data) : ObjectFactory_1.default.CreateEmptyFormatColumn();
         formatColumn.Scope = (_a = formatColumn.Scope) !== null && _a !== void 0 ? _a : {
             ColumnIds: [],
         };
+        if (((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.action) === 'New' && ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.column)) {
+            formatColumn.Scope = {
+                ColumnIds: [(_d = props.popupParams) === null || _d === void 0 ? void 0 : _d.column.columnId],
+            };
+        }
         formatColumn = adjustFormatColumn(formatColumn, api);
         return formatColumn;
     });
@@ -87,7 +92,7 @@ function FormatColumnWizard(props) {
     }, []);
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {
-        if (props.data) {
+        if (data) {
             dispatch(FormatColumnRedux.FormatColumnEdit(formatColumn));
         }
         else {

package/src/View/FreeTextColumn/FreeTextColumnSummary.js

@@ -49,8 +49,7 @@ class FreeTextColumnSummaryComponent extends React.Component {
             this.state.editedAdaptableObject && (React.createElement(FreeTextColumnWizard_1.FreeTextColumnWizard, { moduleInfo: this.props.moduleInfo, data: this.state.editedAdaptableObject, configEntities: this.props.FreeTextColumns, onCloseWizard: () => this.onCloseWizard(), onFinishWizard: this.onFinishWizard }))));
     }
     onNew() {
-        const specialColumnsAreFilterable = this.props.api.internalApi.getAdaptableOptions()
-            .filterOptions.enableFilterOnSpecialColumns;
+        const specialColumnsAreFilterable = this.props.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns;
         let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn(specialColumnsAreFilterable);
         configEntity.ColumnId = this.props.summarisedColumn.columnId;
         this.setState({

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

@@ -12,15 +12,22 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const FreeTextColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FreeTextColumnRedux"));
 const react_redux_1 = require("react-redux");
 exports.FreeTextColumnWizard = (props) => {
+    var _a;
+    const allFreeTextColumns = react_redux_1.useSelector((state) => state.FreeTextColumn.FreeTextColumns);
     const [freeTextColumn, setFreeTextColumn] = react_1.useState(() => {
-        const freeTextColumn = props.data
-            ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyFreeTextColumn(false);
-        return freeTextColumn;
+        var _a, _b;
+        if (props.data) {
+            return Helper_1.cloneObject(props.data);
+        }
+        if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit' && ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column)) {
+            return allFreeTextColumns.find((column) => column.ColumnId === props.popupParams.column.columnId);
+        }
+        return ObjectFactory_1.default.CreateEmptyFreeTextColumn(false);
     });
     const dispatch = react_redux_1.useDispatch();
+    const isEdit = props.data || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
     const handleFinish = () => {
-        if (props.data) {
+        if (isEdit) {
             dispatch(FreeTextColumnRedux.FreeTextColumnEdit(freeTextColumn));
         }
         else {

package/src/View/GridInfo/AdaptableOptionsComponent.js

@@ -92,7 +92,10 @@ const OptionContainerComponent = (props) => {
     const panelButton = viewMode === 'expanded' ? (React.createElement(ButtonMinimise_1.ButtonMinimise, { onClick: () => requestViewModeChange(), tooltip: `Hide ${label}` })) : (React.createElement(ButtonMaximise_1.ButtonMaximise, { onClick: () => requestViewModeChange(), tooltip: `Show ${label}` }));
     return (React.createElement(PanelWithButton_1.PanelWithButton, { className: `options-container-${name}`, variant: "default", headerText: label, headerProps: {
             fontSize: 3,
-            style: { fontWeight: viewMode === 'expanded' ? 800 : 400, cursor: 'pointer' },
+            style: {
+                fontWeight: viewMode === 'expanded' ? 800 : 400,
+                cursor: 'pointer',
+            },
             'data-name': `options-container-header-${name}`,
             onClick: () => requestViewModeChange(),
         }, button: panelButton, style: { marginBottom: 3 } }, viewMode === 'expanded' && children));

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

@@ -21,7 +21,11 @@ const PivotList_1 = require("./PivotList");
 const ButtonInfo_1 = require("../../../Components/Buttons/ButtonInfo");
 const Input_1 = tslib_1.__importDefault(require("../../../../components/Input"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/StringExtensions"));
-const verticalPanelStyle = { minHeight: 150, flex: '1 0 auto', overflow: 'auto' };
+const verticalPanelStyle = {
+    minHeight: 150,
+    flex: '1 0 auto',
+    overflow: 'auto',
+};
 const ListPanel = (props) => (React.createElement(Panel_1.default, Object.assign({ variant: "modern", bodyProps: { padding: 0 }, style: Object.assign(Object.assign({}, verticalPanelStyle), props.style) }, props)));
 const ColumnLabels = (props) => {
     const { children, showBoth, showTitle, flexDirection = 'row', labels: labelsProp } = props, columnProperties = tslib_1.__rest(props, ["children", "showBoth", "showTitle", "flexDirection", "labels"]);

package/src/View/Layout/Wizard/LayoutEditorWizard.js

@@ -44,7 +44,13 @@ class LayoutEditorWizard extends React.Component {
         this.onLayoutChange = (layout) => {
             layout = Object.assign(Object.assign({}, layout), { Name: this.state.layoutName });
             this.updateLayout(layout);
-            this.setState({ layout, errorMessage: this.getErrorMessage({ layout, layoutName: this.state.layoutName }) }, () => {
+            this.setState({
+                layout,
+                errorMessage: this.getErrorMessage({
+                    layout,
+                    layoutName: this.state.layoutName,
+                }),
+            }, () => {
                 this.props.updateGoBackState();
             });
         };

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

@@ -13,8 +13,14 @@ const react_redux_1 = require("react-redux");
 const PlusMinusRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/PlusMinusRedux"));
 exports.PlusMinusWizard = (props) => {
     const [plusMinus, setPlusMinus] = React.useState(() => {
-        var _a, _b, _c, _d;
-        return Object.assign(Object.assign({}, (props.data ? props.data : ObjectFactory_1.default.CreateEmptyPlusMinusNudge())), { Scope: (_b = (_a = props === null || props === void 0 ? void 0 : props.data) === null || _a === void 0 ? void 0 : _a.Scope) !== null && _b !== void 0 ? _b : { All: true }, NudgeValue: (_d = (_c = props === null || props === void 0 ? void 0 : props.data) === null || _c === void 0 ? void 0 : _c.NudgeValue) !== null && _d !== void 0 ? _d : 20 });
+        var _a, _b, _c, _d, _e;
+        const newPlusMinus = Object.assign(Object.assign({}, (props.data ? props.data : ObjectFactory_1.default.CreateEmptyPlusMinusNudge())), { Scope: (_b = (_a = props === null || props === void 0 ? void 0 : props.data) === null || _a === void 0 ? void 0 : _a.Scope) !== null && _b !== void 0 ? _b : { All: true }, NudgeValue: (_d = (_c = props === null || props === void 0 ? void 0 : props.data) === null || _c === void 0 ? void 0 : _c.NudgeValue) !== null && _d !== void 0 ? _d : 20 });
+        if ((_e = props === null || props === void 0 ? void 0 : props.popupParams) === null || _e === void 0 ? void 0 : _e.column) {
+            newPlusMinus.Scope = {
+                ColumnIds: [props.popupParams.column.columnId],
+            };
+        }
+        return newPlusMinus;
     });
     const [hasCondition, setHasCondition] = React.useState(() => {
         var _a;

package/src/View/Query/ExpandedQueryPopup.js

@@ -33,13 +33,20 @@ class ExpandedQueryPopupComponent extends React.Component {
                 namedQuery: this.state.namedQuery,
                 setNamedQuery: (namedQuery) => this.setState({ namedQuery }),
             } },
-            React.createElement(PanelWithButton_1.PanelWithButton, { headerText: "Current Query", bodyProps: { padding: 0, style: { display: 'flex', flexDirection: 'column' } }, glyphicon: this.props.moduleInfo.Glyph },
+            React.createElement(PanelWithButton_1.PanelWithButton, { headerText: "Current Query", bodyProps: {
+                    padding: 0,
+                    style: { display: 'flex', flexDirection: 'column' },
+                }, glyphicon: this.props.moduleInfo.Glyph },
                 React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: ModuleConstants_1.QueryModuleId, value: this.state.expression, onChange: (expression) => this.setState({ expression }), initialData: initialData, columns: this.props.api.columnApi.getQueryableColumns(), namedQueries: this.props.api.queryApi.getAllNamedQuery(), api: this.props.api }),
                 React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 1, backgroundColor: "primary", alignItems: "center" },
                     React.createElement(SimpleButton_1.default, { margin: 1, variant: "text", "data-name": "action-close", onClick: () => {
                             this.props.onClosePopup();
                         } }, "CLOSE"),
-                    React.createElement(rebass_1.Text, { fontSize: 2, mr: 3, style: { flex: 1, color: 'var(--ab-color-error)', textAlign: 'end' } }, namedQueryValidationError),
+                    React.createElement(rebass_1.Text, { fontSize: 2, mr: 3, style: {
+                            flex: 1,
+                            color: 'var(--ab-color-error)',
+                            textAlign: 'end',
+                        } }, namedQueryValidationError),
                     React.createElement(SimpleButton_1.default, { variant: "raised", tone: "accent", "data-name": "action-run", margin: 1, onClick: () => {
                             if (this.state.namedQuery) {
                                 this.props.onAddNamedQuery(this.state.namedQuery);