@adaptabletools/adaptable 10.0.4-canary.5 → 11.0.0-canary.3

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");
@@ -21,12 +21,10 @@ const FlashingCellRedux = tslib_1.__importStar(require("../../../Redux/ActionsRe
 exports.FlashingCellWizard = (props) => {
     const { api } = AdaptableContext_1.useAdaptable();
     const [flashingCell, setFlashingCell] = react_1.useState(() => {
-        var _a;
-        const defaults = (_a = api.internalApi.getAdaptableOptions().notificationsOptions.flashingCellDefaultProperties) !== null && _a !== void 0 ? _a : {};
         let flashingCell = props.data
             ? Helper_1.cloneObject(props.data)
             : ObjectFactory_1.default.CreateEmptyFlashingCellDefinition();
-        flashingCell = Object.assign(Object.assign({ FlashDuration: 500 }, defaults), flashingCell);
+        flashingCell = api.flashingCellApi.mergeFlashingCellDefinitionWithDefaults(flashingCell);
         if (!flashingCell.Rule.BooleanExpression && !flashingCell.Rule.Predicate) {
             flashingCell.Rule.BooleanExpression = '';
         }
@@ -71,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/FlashingCell/Wizard/isValidFlashingCellRules.js

@@ -5,7 +5,7 @@ const ModuleConstants_1 = require("../../../Utilities/Constants/ModuleConstants"
 exports.isValidFlashingCellRules = (flashingCell, api, context) => {
     let valid = true;
     if (!flashingCell.Rule.Predicate && !flashingCell.Rule.BooleanExpression) {
-        return 'No condition defined for flashing cell';
+        return 'No Rule defined for Flashing Cell';
     }
     if (valid && flashingCell.Rule.Predicate) {
         valid = api.predicateApi.isValidPredicate(flashingCell.Rule.Predicate);

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/GridInfo/GridInfoPopup.js

@@ -91,11 +91,12 @@ exports.GridInfoPopup = (props) => {
     let gridSummaries = CreateGridSummaries(propValueColItems).map((x, index) => {
         return React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: index, colItems: x });
     });
+    const showRadioButtons = [showGridSummary, showAdaptableOptions, showColumnInfo].filter((item) => item).length > 1;
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Grid Info', glyphicon: 'info-sign' },
-        React.createElement(rebass_1.Flex, { marginBottom: 2, padding: 3 },
+        React.createElement(rebass_1.Flex, { marginBottom: 2, padding: 3 }, showRadioButtons && (React.createElement(React.Fragment, null,
             showGridSummary && (React.createElement(Radio_1.default, { "data-name": "radioButton-GridSummary", marginRight: 3, value: "GridSummary", checked: state.ActiveTab == 'GridSummary', onChange: (_, e) => onShowGridSummaryChanged('GridSummary') }, "Grid Summary")),
             showAdaptableOptions && (React.createElement(Radio_1.default, { "data-name": "radioButton-AdaptableOptions", marginRight: 3, value: "AdaptableOptions", checked: state.ActiveTab == 'AdaptableOptions', onChange: (_, e) => onShowGridSummaryChanged('AdaptableOptions') }, "Adaptable Options")),
-            showColumnInfo && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", value: "Column", checked: state.ActiveTab == 'ColumnInfo', onChange: (_, e) => onShowGridSummaryChanged('ColumnInfo') }, "Column Info"))),
+            showColumnInfo && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", value: "Column", checked: state.ActiveTab == 'ColumnInfo', onChange: (_, e) => onShowGridSummaryChanged('ColumnInfo') }, "Column Info"))))),
         state.ActiveTab == 'GridSummary' && (React.createElement(rebass_1.Box, { margin: 2 },
             React.createElement(AdaptableObjectCollection_1.AdaptableObjectCollection, { colItems: propValueColItems, items: gridSummaries }))),
         state.ActiveTab == 'AdaptableOptions' && React.createElement(AdaptableOptionsComponent_1.AdaptableOptionsComponent, { api: props.api }),

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,18 +14,23 @@ 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();
-    if (props.data) {
-        dispatch(QueryRedux.NamedQueryEdit);
-    }
-    else {
-        dispatch(QueryRedux.NamedQueryAdd);
-    }
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, onFinish: props.onFinishWizard, sections: [
+    const handleFinish = () => {
+        if (props.data) {
+            dispatch(QueryRedux.NamedQueryEdit(namedQuery));
+        }
+        else {
+            dispatch(QueryRedux.NamedQueryAdd(namedQuery));
+        }
+        props.onFinishWizard(namedQuery);
+    };
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, onFinish: handleFinish, sections: [
             {
                 title: 'Expression',
                 details: 'Specify the query expression',

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -40,7 +40,7 @@ const QuickSearchPopupComponent = (props) => {
             React.createElement(rebass_1.Flex, { flexDirection: "column" },
                 React.createElement(FormLayout_1.default, { columns: [1, 2] },
                     React.createElement(FormLayout_1.FormRow, null,
-                        React.createElement(CheckBox_1.CheckBox, { value: "existing", marginLeft: 1, marginRight: 3, checked: state.RunQueryAfterQuickSearch, disabled: StringExtensions_1.default.IsNotNullOrEmpty(searchText), onChange: onQuickSearchBehaviourChange }, "Run simultaneous Query"))))),
+                        React.createElement(CheckBox_1.CheckBox, { value: "existing", marginLeft: 1, marginRight: 3, checked: state.RunQueryAfterQuickSearch, disabled: StringExtensions_1.default.IsNotNullOrEmpty(searchText), onChange: onQuickSearchBehaviourChange }, "Run Simultaneous Query"))))),
         React.createElement(StyleComponent_1.StyleComponent, { style: { height: '100%' }, api: props.api, Style: props.QuickSearchStyle, UpdateStyle: onUpdateStyle })));
 };
 function mapStateToProps(state, ownProps) {

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;

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

@@ -13,39 +13,39 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const ScheduleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ScheduleRedux"));
 exports.ScheduleWizard = (props) => {
-    var _a;
-    const scheduleType = props.data
-        ? props.data.ScheduleType
-        : (_a = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _a === void 0 ? void 0 : _a.name;
+    var _a, _b;
+    const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
+    const isNew = props.popupParams.action ? props.popupParams.action === 'New' : !props.data;
+    const scheduleType = data ? data.ScheduleType : (_b = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _b === void 0 ? void 0 : _b.name;
     const [schedule, setSchedule] = React.useState(() => {
-        if (props.data) {
-            return props.data;
+        if (data) {
+            return data;
         }
-        let data = null;
+        let scheduleState = null;
         switch (scheduleType) {
             case Enums_1.ScheduleType.Reminder:
-                data = ObjectFactory_1.default.CreateEmptyReminderSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyReminderSchedule();
                 break;
             case Enums_1.ScheduleType.Report:
-                data = ObjectFactory_1.default.CreateEmptyReportSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyReportSchedule();
                 break;
             case Enums_1.ScheduleType.ipushpull:
-                data = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
                 break;
             case Enums_1.ScheduleType.Glue42:
-                data = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
                 break;
             case Enums_1.ScheduleType.OpenFin:
-                data = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
                 break;
         }
-        return data;
+        return scheduleState;
     });
     const [isOneOff, setIsOneOff] = React.useState(false);
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {
         let action = null;
-        if (props.data) {
+        if (!isNew) {
             switch (scheduleType) {
                 case Enums_1.ScheduleType.Reminder:
                     action = ScheduleRedux.ReminderScheduleEdit(schedule);

package/src/View/Shortcut/shortcutKeys.js

@@ -6,7 +6,6 @@ exports.shortcutKeys = [
     'B',
     'C',
     'D',
-    'E',
     'F',
     'G',
     'H',

package/src/View/SpecialColumnSettingsWizardStep.d.ts

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { SpecialColumnSettings } from '../../types';
+interface SpecialColumnTypeSettingsProps {
+    settings: SpecialColumnSettings;
+    onChange: (settings: SpecialColumnSettings) => void;
+    isEditable?: boolean;
+}
+export declare const SpecialColumnSettingsWizardStep: React.FunctionComponent<SpecialColumnTypeSettingsProps>;
+export {};

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SpecialColumnSettingsWizardStep = void 0;
+const tslib_1 = require("tslib");
+const chunk_1 = tslib_1.__importDefault(require("lodash/chunk"));
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const CheckBox_1 = require("../components/CheckBox");
+const FormLayout_1 = tslib_1.__importStar(require("../components/FormLayout"));
+const Tabs_1 = require("../components/Tabs");
+const AdaptableContext_1 = require("./AdaptableContext");
+exports.SpecialColumnSettingsWizardStep = (props) => {
+    var _a, _b;
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const possibleColumnTypes = adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions
+        .columnTypes;
+    const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
+    const handleColumnTypeChange = (columnType, checked) => {
+        var _a, _b, _c;
+        const columnTypes = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) !== null && _b !== void 0 ? _b : [];
+        if (checked) {
+            props.onChange(Object.assign(Object.assign({}, props.settings), { ColumnTypes: [...columnTypes, columnType] }));
+        }
+        else {
+            props.onChange(Object.assign(Object.assign({}, props.settings), { ColumnTypes: (_c = columnTypes === null || columnTypes === void 0 ? void 0 : columnTypes.filter) === null || _c === void 0 ? void 0 : _c.call(columnTypes, (item) => item !== columnType) }));
+        }
+    };
+    const onSettingsChange = (values) => {
+        props.onChange(Object.assign(Object.assign({}, props.settings), values));
+    };
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Column Properties"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Flex, { flexDirection: "row" },
+                    React.createElement(FormLayout_1.default, { style: { width: '100%' }, columns: [
+                            { name: 'first', size: '30%' },
+                            { size: '30%', name: 'second' },
+                            { size: '30%', name: 'third' },
+                        ] },
+                        React.createElement(FormLayout_1.FormRow, null,
+                            React.createElement(CheckBox_1.CheckBox, { checked: Filterable, onChange: (Filterable) => onSettingsChange({ Filterable }), disabled: !adaptable.api.internalApi.getAdaptableOptions().filterOptions
+                                    .enableFilterOnSpecialColumns }, "Filterable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Resizable, onChange: (Resizable) => onSettingsChange({ Resizable }) }, "Resizable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Groupable, onChange: (Groupable) => onSettingsChange({ Groupable }) }, "Groupable")),
+                        React.createElement(FormLayout_1.FormRow, null,
+                            React.createElement(CheckBox_1.CheckBox, { checked: Sortable, onChange: (Sortable) => onSettingsChange({ Sortable }) }, "Sortable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Pivotable, onChange: (Pivotable) => onSettingsChange({ Pivotable }) }, "Pivotable"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: Aggregatable, onChange: (Aggregatable) => onSettingsChange({ Aggregatable }) }, "Aggregatable")),
+                        React.createElement(FormLayout_1.FormRow, null,
+                            React.createElement(CheckBox_1.CheckBox, { checked: SuppressMenu, onChange: (SuppressMenu) => onSettingsChange({ SuppressMenu }) }, "Suppress Menu"),
+                            React.createElement(CheckBox_1.CheckBox, { checked: SuppressMovable, onChange: (SuppressMovable) => onSettingsChange({ SuppressMovable }) }, "Suppress Movable"),
+                            React.createElement(CheckBox_1.CheckBox, { disabled: true, checked: props.isEditable }, "Editable")))))),
+        Boolean(possibleColumnTypes === null || possibleColumnTypes === void 0 ? void 0 : possibleColumnTypes.length) && (React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Column Types"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(FormLayout_1.default, { columns: [{ name: 'first', size: '30%' }, { name: 'second' }] }, (_b = chunk_1.default(possibleColumnTypes !== null && possibleColumnTypes !== void 0 ? possibleColumnTypes : [], 2)) === null || _b === void 0 ? void 0 : _b.map(([first, second]) => {
+                    var _a, _b, _c, _d, _e, _f;
+                    return (React.createElement(FormLayout_1.FormRow, { key: first },
+                        first && (React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => handleColumnTypeChange(first, checked), checked: (_c = (_b = (_a = props.settings) === null || _a === void 0 ? void 0 : _a.ColumnTypes) === null || _b === void 0 ? void 0 : _b.includes) === null || _c === void 0 ? void 0 : _c.call(_b, first) }, first)),
+                        second && (React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => handleColumnTypeChange(second, checked), checked: (_f = (_e = (_d = props.settings) === null || _d === void 0 ? void 0 : _d.ColumnTypes) === null || _e === void 0 ? void 0 : _e.includes) === null || _f === void 0 ? void 0 : _f.call(_e, second) }, second))));
+                })))))));
+};

package/src/View/UIHelper.d.ts

@@ -32,8 +32,6 @@ export declare function getEmptyConfigState(): EditableConfigEntityState;
 export declare function getDescriptionForDataType(dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown'): "string" | "number" | "date";
 export declare function getPlaceHolderforDataType(dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown'): "Enter Value" | "Enter Number" | "Enter Date";
 export declare function getModalContainer(adaptableOptions: AdaptableOptions, document: Document): HTMLElement;
-export declare function getChartContainer(adaptableOptions: AdaptableOptions, document: Document, showModal: boolean): HTMLElement;
-export declare function isValidUserChartContainer(adaptableOptions: AdaptableOptions, document: Document): boolean;
 export declare function IsEmptyStyle(style: AdaptableStyle): boolean;
 export declare function IsNotEmptyStyle(style: AdaptableStyle): boolean;
 export declare function getMessageTypeByStatusColour(statusColour: StatusColour): AdaptableMessageType;
@@ -62,8 +60,6 @@ export declare const UIHelper: {
     getDescriptionForDataType: typeof getDescriptionForDataType;
     getPlaceHolderforDataType: typeof getPlaceHolderforDataType;
     getModalContainer: typeof getModalContainer;
-    getChartContainer: typeof getChartContainer;
-    isValidUserChartContainer: typeof isValidUserChartContainer;
     IsEmptyStyle: typeof IsEmptyStyle;
     IsNotEmptyStyle: typeof IsNotEmptyStyle;
     getMessageTypeByStatusColour: typeof getMessageTypeByStatusColour;