@adaptabletools/adaptable 11.0.0-canary.0 → 11.0.0-canary.4

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

@@ -18,14 +18,14 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const ConditionalStyleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ConditionalStyleRedux"));
 exports.ConditionalStyleWizard = (props) => {
+    var _a;
+    const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
     const [conditionalStyle, setConditionalStyle] = react_1.useState(() => {
-        var _a;
+        var _a, _b, _c;
         const DEFAULT_RULE = {
             BooleanExpression: '',
         };
-        const conditionalStyle = props.data
-            ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyConditionalStyle();
+        const conditionalStyle = data ? Helper_1.cloneObject(data) : ObjectFactory_1.default.CreateEmptyConditionalStyle();
         conditionalStyle.Scope = (_a = conditionalStyle.Scope) !== null && _a !== void 0 ? _a : { All: true };
         if (!conditionalStyle.Rule) {
             conditionalStyle.Rule = DEFAULT_RULE;
@@ -33,11 +33,16 @@ exports.ConditionalStyleWizard = (props) => {
         if (!conditionalStyle.Rule.Predicate && conditionalStyle.Rule.BooleanExpression == undefined) {
             conditionalStyle.Rule.BooleanExpression = '';
         }
+        if (((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.action) === 'New' && ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.column)) {
+            conditionalStyle.Scope = {
+                ColumnIds: [props.popupParams.column.columnId],
+            };
+        }
         return conditionalStyle;
     });
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {
-        if (props.data) {
+        if (data) {
             dispatch(ConditionalStyleRedux.ConditionalStyleEdit(conditionalStyle));
         }
         else {

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/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) => {

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,8 +84,8 @@ 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;

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/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/{FlashingCellDurationWizardSection.d.ts → FlashingCellSettingsWizardSection.d.ts}

@@ -2,9 +2,9 @@
 import { FlashingCellDefinition } from '../../../types';
 declare type FlashingAlertDurationWizardSectionProps = {
     readOnly?: boolean;
-    flashingAlert?: FlashingCellDefinition;
+    flashingCell?: FlashingCellDefinition;
     onChange: (data: FlashingCellDefinition) => void;
 };
-export declare const renderFlashingAlertDurationSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
-export declare const FlashingAlertDurationWizardSection: (props: FlashingAlertDurationWizardSectionProps) => JSX.Element;
+export declare const renderFlashingAlertSettingsSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
+export declare const FlashingAlertSettingsWizardSection: (props: FlashingAlertDurationWizardSectionProps) => JSX.Element;
 export {};

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

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlashingAlertSettingsWizardSection = exports.renderFlashingAlertSettingsSummary = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
+const rebass_1 = require("rebass");
+const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
+const usePrevious_1 = tslib_1.__importDefault(require("../../../components/utils/usePrevious"));
+const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
+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,
+            "Flashing is removed after ",
+            React.createElement(CodeBlock_1.CodeBlock, null, flashingAlert.FlashDuration),
+            ' ',
+            "milliseconds")))));
+};
+exports.FlashingAlertSettingsWizardSection = (props) => {
+    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) => {
+        props.onChange(Object.assign(Object.assign({}, flashingCell), { FlashDuration: FlashDuration }));
+    };
+    const duration = (_a = flashingCell.FlashDuration) !== null && _a !== void 0 ? _a : 500;
+    const numberDuration = React.useRef(typeof duration === 'number' ? duration : 500);
+    const inputRef = react_1.useRef(null);
+    const oldDuration = 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();
+        }
+    }, [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 : [];
+        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 },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Flashing Cell Settings"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(FormLayout_1.default, null,
+                    React.createElement(FormLayout_1.FormRow, { label: "Duration Type" },
+                        React.createElement(Radio_1.default, { mr: 3, checked: duration == 'always', tabIndex: -1, onChange: () => handleTypeChange('always') }, "Always"),
+                        React.createElement(Radio_1.default, { checked: duration !== 'always', tabIndex: -1, onChange: () => handleTypeChange('number') }, "Limited (ms)")),
+                    React.createElement(FormLayout_1.FormRow, { label: "" },
+                        duration !== 'always' && (React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "baseline" },
+                            React.createElement(rebass_1.Text, { fontSize: 2, mr: 2 }, "After"),
+                            React.createElement(Input_1.default, { readOnly: props.readOnly, type: "text", name: "value", ref: inputRef, mt: 2, mr: 1, value: duration, onChange: (event) => {
+                                    const value = event.target.value;
+                                    setDuration(isNaN(Number(value)) ? 500 : Number(value));
+                                } }),
+                            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, { 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

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const rebass_1 = require("rebass");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const FlashingCellDurationWizardSection_1 = require("./FlashingCellDurationWizardSection");
+const FlashingCellSettingsWizardSection_1 = require("./FlashingCellSettingsWizardSection");
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const FlashingCellRulesWizardSection_1 = require("./FlashingCellRulesWizardSection");
 const FlashingCellStyleWizardSection_1 = require("./FlashingCellStyleWizardSection");
@@ -69,14 +69,14 @@ 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',
                 render: () => (React.createElement(rebass_1.Box, { padding: 2 },
-                    React.createElement(FlashingCellDurationWizardSection_1.FlashingAlertDurationWizardSection, { onChange: setFlashingCell }))),
-                renderSummary: FlashingCellDurationWizardSection_1.renderFlashingAlertDurationSummary,
-                title: 'Duration',
+                    React.createElement(FlashingCellSettingsWizardSection_1.FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }))),
+                renderSummary: FlashingCellSettingsWizardSection_1.renderFlashingAlertSettingsSummary,
+                title: 'Settings',
             },
             {
                 details: 'Choose the Flashing Styles',

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/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -17,6 +17,7 @@ const CheckBox_1 = require("../../../components/CheckBox");
 const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
 const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
 const Tag_1 = require("../../../components/Tag");
+const SpecialColumnSettingsWizardStep_1 = require("../../SpecialColumnSettingsWizardStep");
 const options = [
     { value: Enums_1.DataType.Number, label: Enums_1.DataType.Number },
     { value: Enums_1.DataType.String, label: Enums_1.DataType.String },
@@ -59,8 +60,7 @@ exports.isValidFreeTextColumn = (data, api) => {
 };
 exports.FreeTextColumnSettingsWizardSection = (props) => {
     const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
-    const Pattern = api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions
-        .dateFormat;
+    const Pattern = api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions.dateFormat;
     const [ColumnNameFocused, setColumnNameFocused] = react_1.useState(false);
     const inEdit = props.isEdit;
     const validCheck = exports.isValidFreeTextColumn(data, api);
@@ -98,6 +98,9 @@ exports.FreeTextColumnSettingsWizardSection = (props) => {
         }
         props.onChange(Object.assign(Object.assign({}, data), { DefaultValue }));
     };
+    const handleSpecialColumnSettingsChange = (settings) => {
+        props.onChange(Object.assign(Object.assign({}, data), { FreeTextColumnSettings: Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.FreeTextColumnSettings), settings) }));
+    };
     return (React.createElement(React.Fragment, null,
         React.createElement(FormLayout_1.default, null,
             React.createElement(FormLayout_1.FormRow, { label: "ColumnId" },
@@ -127,5 +130,7 @@ exports.FreeTextColumnSettingsWizardSection = (props) => {
             data.DataType == 'String' && (React.createElement(FormLayout_1.FormRow, { label: "Editor Type" },
                 React.createElement(Radio_1.default, { value: "Inline", checked: data.TextEditor == 'Inline', onChange: (_, e) => onDynamicSelectChanged(e), marginRight: 2 }, "Inline Editor"),
                 React.createElement(Radio_1.default, { value: "Large", checked: data.TextEditor == 'Large', onChange: (_, e) => onDynamicSelectChanged(e) }, "Large Editor")))),
-        ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null));
+        ErrorMessage ? (React.createElement(ErrorBox_1.default, { mt: 2, mb: 2 }, ErrorMessage)) : null,
+        React.createElement(rebass_1.Box, { mt: 2 },
+            React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: true, settings: data.FreeTextColumnSettings, onChange: handleSpecialColumnSettingsChange }))));
 };

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 {
@@ -32,6 +39,7 @@ exports.FreeTextColumnWizard = (props) => {
             {
                 title: 'Settings',
                 details: 'Configure the Free Text Column',
+                isValid: FreeTextColumnSettingsWizardSection_1.isValidFreeTextColumn,
                 render: () => {
                     return (React.createElement(rebass_1.Box, { padding: 2 },
                         React.createElement(FreeTextColumnSettingsWizardSection_1.FreeTextColumnSettingsWizardSection, { isEdit: Boolean(props.data), onChange: setFreeTextColumn })));

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/QueryViewPanel.js

@@ -78,28 +78,31 @@ class QueryViewPanelComponent extends React.Component {
             };
         });
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
+        const handleEnter = (e) => {
+            if (e.key === 'Enter') {
+                this.runQuery();
+            }
+        };
         const renderTextInput = () => {
             return this.props.viewType === 'Toolbar' ? (React.createElement(FieldWrap_1.default, { marginRight: 1, width: 600 },
                 React.createElement(ButtonExpand_1.ButtonExpand, { variant: "text", tone: "neutral", onClick: () => this.props.onExpand(this.state.expression), tooltip: "Expand", marginLeft: 1 }),
-                React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 }, onKeyDown: (e) => {
-                        if (e.key === 'Enter') {
-                            this.runQuery();
-                        }
-                    } }),
+                React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 } }),
                 isExpressionValid ? (React.createElement(ButtonPlay_1.ButtonPlay, { onClick: () => this.runQuery(), tooltip: '', accessLevel: 'Full', variant: "text", tone: "neutral", disabled: this.state.expression == '' || this.state.expression == this.props.CurrentQuery, marginRight: 1 })) : (React.createElement(ButtonInvalid_1.ButtonInvalid, { variant: "text", tone: "neutral", tooltip: "Invalid Query", marginRight: 1 })),
                 ' ',
-                this.props.CurrentQuery !== '' && (React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.props.onRunQuery(''), tooltip: "Clear Query", accessLevel: 'Full' })))) : (React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { width: '100%' } }));
+                this.props.CurrentQuery !== '' && (React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.clearQuery(), tooltip: "Clear Query", accessLevel: 'Full' })))) : (React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { width: '100%' } }));
         };
         const queryModuleAccessLevel = this.props.api.internalApi
             .getEntitlementService()
             .getEntitlementAccessLevelForModule(ModuleConstants_1.QueryModuleId);
+        const saveButton = (React.createElement(ButtonSave_1.ButtonSave, { onClick: () => this.saveQuery(), tooltip: "Save as New Query", accessLevel: queryModuleAccessLevel, disabled: !isExpressionValid || isExpressionNamedQuery || this.state.expression == '', variant: "text", tone: "neutral", marginRight: 1 }));
         const renderButtons = () => {
             return this.props.viewType === 'Toolbar' ? (React.createElement(React.Fragment, null,
-                React.createElement(ButtonSave_1.ButtonSave, { onClick: () => this.saveQuery(), tooltip: "Save as New Query", accessLevel: queryModuleAccessLevel, disabled: !isExpressionValid || isExpressionNamedQuery || this.state.expression == '', variant: "text", tone: "neutral", marginRight: 1 }),
+                saveButton,
                 React.createElement(DropdownButton_1.default, { variant: "text", items: availableColumns, marginRight: 1, tooltip: "Pick Columns" },
                     React.createElement(icons_1.Icon, { name: 'list' })),
                 React.createElement(DropdownButton_1.default, { disabled: ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(availableSearches), variant: "text", items: availableSearches, marginRight: 1, tooltip: "Load Query", icon: "folder-open" }),
                 ' ')) : (React.createElement(React.Fragment, null,
+                saveButton,
                 React.createElement(ButtonExpand_1.ButtonExpand, { variant: "text", tone: "neutral", onClick: () => this.props.onExpand(this.state.expression), tooltip: "Expand", marginLeft: 1 }),
                 React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.clearQuery(), tooltip: "Clear Query", accessLevel: 'Full', disabled: this.state.expression == '' }),
                 React.createElement(ButtonPlay_1.ButtonPlay, { onClick: () => this.runQuery(), tooltip: "Run Query", accessLevel: 'Full', variant: "text", tone: "neutral", disabled: !isExpressionValid ||
@@ -107,12 +110,12 @@ class QueryViewPanelComponent extends React.Component {
                         this.state.expression == this.props.CurrentQuery, marginRight: 1 }),
                 React.createElement(DropdownButton_1.default, { variant: "text", disabled: ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(availableSearches), items: availableSearches, marginRight: 1, tooltip: "Load Query", icon: "folder-open" })));
         };
-        return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__Query__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+        return (React.createElement(rebass_1.Flex, { onKeyDown: handleEnter, flexDirection: "row", className: `ab-${elementType}__Query__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null, renderTextInput()),
             React.createElement(rebass_1.Flex, null, renderButtons())));
     }
     clearQuery() {
-        this.setState({ expression: '' });
+        this.props.onRunQuery('');
     }
     saveQuery() {
         this.props.onShowNamedQueries(this.state.expression, this.props.moduleInfo.Popup);

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

@@ -14,9 +14,11 @@ const react_redux_1 = require("react-redux");
 const QueryRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/QueryRedux"));
 function NamedQueryWizard(props) {
     const [namedQuery, setNamedQuery] = react_1.useState(() => {
+        var _a, _b;
+        const value = (_b = (_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : '';
         return props.data
             ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyNamedQuery();
+            : ObjectFactory_1.default.CreateEmptyNamedQuery(value);
     });
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {

package/src/View/QuickSearch/useQuickSearchDebounced.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useQuickSearchDebounced = void 0;
 const tslib_1 = require("tslib");
 const react_1 = require("react");
-const debounce_1 = tslib_1.__importDefault(require("lodash-es/debounce"));
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 exports.useQuickSearchDebounced = (props) => {
     var _a;