@adaptabletools/adaptable 10.0.4-canary.2 → 11.0.0-canary.0

package/src/View/{Alert/Wizard/FlashingAlertWizard/FlashingAlertRulesWizardSection.js → FlashingCell/Wizard/FlashingCellRulesWizardSection.js}

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlashingAlertRulesWizardSection = exports.renderFlashingAlertRulesSummary = void 0;
 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 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("../BaseAlertRulesWizardSection");
-const CodeBlock_1 = require("../../../../components/CodeBlock");
-const EntityRulesEditor_1 = require("../../../Components/EntityRulesEditor");
+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) => {
     var _a;
-    const { api: { alertApi, predicateApi }, } = OnePageAdaptableWizard_1.useOnePageWizardContext();
-    const FlashTarget = (_a = flashingAlert.FlashTarget) !== null && _a !== void 0 ? _a : alertApi.getFlashingAlertFlashTarget(flashingAlert);
+    const { api: { flashingCellApi }, } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const FlashTarget = (_a = flashingAlert.FlashTarget) !== null && _a !== void 0 ? _a : flashingCellApi.getFlashingCellFlashTarget(flashingAlert);
     return (React.createElement(EntityRulesEditor_1.EntityRulesSummary, { data: flashingAlert, renderPredicate: (content) => {
             return (React.createElement(React.Fragment, null,
                 "Flash ",
@@ -34,20 +34,20 @@ 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.alertApi.getFlashingAlertFlashTarget(flashingAlert);
-    return (React.createElement(BaseAlertRulesWizardSection_1.BaseAlertRulesWizardSection, { onChange: props.onChange },
+    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 }));
+        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(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(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 ",

package/src/View/{Alert/Wizard/FlashingAlertWizard/FlashingAlertScopeWizardSection.d.ts → FlashingCell/Wizard/FlashingCellScopeWizardSection.d.ts}

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

package/src/View/{Alert/Wizard/FlashingAlertWizard/FlashingAlertScopeWizardSection.js → FlashingCell/Wizard/FlashingCellScopeWizardSection.js}

@@ -3,7 +3,7 @@ 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("../BaseAlertScopeWizardSection");
+const BaseAlertScopeWizardSection_1 = require("../../Alert/Wizard/BaseAlertScopeWizardSection");
 exports.FlashingAlertScopeWizardSection = (props) => {
     return React.createElement(BaseAlertScopeWizardSection_1.BaseAlertScopeWizardSection, Object.assign({}, props));
 };

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

@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { BoxProps } from 'rebass';
+import { AdaptableStyle } from '../../../types';
+import { FlashingCellDefinition } from '../../../../types';
+declare type FlashingAlertStyleWizardSectionProps = {
+    flashingAlert?: FlashingCellDefinition;
+    onStyleChange: (styleName: 'UpChangeStyle' | 'DownChangeStyle' | 'NeutralChangeStyle', style: AdaptableStyle) => void;
+};
+export declare const FlashingAlertStyleWizardSection: (props: FlashingAlertStyleWizardSectionProps) => JSX.Element;
+export interface FlashingCellStyleProps extends Omit<BoxProps, 'data'> {
+    data: FlashingCellDefinition;
+}
+export declare const FlashingCellStyle: React.FunctionComponent<FlashingCellStyleProps>;
+export declare const renderFlashingAlertStyleSummary: (flashingAlert: FlashingCellDefinition) => JSX.Element;
+export {};

package/src/View/{Alert/Wizard/FlashingAlertWizard/FlashingAlertStyleWizardSection.js → FlashingCell/Wizard/FlashingCellStyleWizardSection.js}

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderFlashingAlertStyleSummary = exports.FlashingAlertStyleWizardSection = void 0;
+exports.renderFlashingAlertStyleSummary = exports.FlashingCellStyle = exports.FlashingAlertStyleWizardSection = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
-const Tabs_1 = require("../../../../components/Tabs");
-const StyleComponent_1 = require("../../../Components/StyleComponent");
-const StyleHelper_1 = require("../../../../Utilities/Helpers/StyleHelper");
-const toStyle = (style) => {
-    return Object.assign(Object.assign({}, StyleHelper_1.convertAdaptableStyleToCSS(style !== null && style !== void 0 ? style : {})), { borderWidth: (style === null || style === void 0 ? void 0 : style.BorderColor) ? 2 : 0, borderStyle: 'solid' });
-};
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const Tabs_1 = require("../../../components/Tabs");
+const StyleComponent_1 = require("../../Components/StyleComponent");
+const StylePreview_1 = require("../../../components/StylePreview");
 const changeStyle = (React.createElement(rebass_1.Text, { fontSize: 2, style: { display: 'inline-block' } }, "Change style"));
 exports.FlashingAlertStyleWizardSection = (props) => {
     var _a, _b, _c;
@@ -34,15 +31,19 @@ exports.FlashingAlertStyleWizardSection = (props) => {
             React.createElement(Tabs_1.Tabs.Content, { value: "neutral" },
                 React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_c = flashingAlert.NeutralChangeStyle) !== null && _c !== void 0 ? _c : {}, UpdateStyle: (style) => props.onStyleChange('NeutralChangeStyle', style) })))));
 };
-exports.renderFlashingAlertStyleSummary = (flashingAlert) => {
-    return (React.createElement(React.Fragment, null,
-        React.createElement(rebass_1.Text, { padding: 2, style: toStyle(flashingAlert.UpChangeStyle) },
+exports.FlashingCellStyle = (props) => {
+    const { data } = props, boxProps = tslib_1.__rest(props, ["data"]);
+    return (React.createElement(rebass_1.Box, Object.assign({}, boxProps),
+        React.createElement(StylePreview_1.StylePreview, { styleObject: props.data.UpChangeStyle },
             "Up change style ",
-            !flashingAlert.UpChangeStyle ? ' - no style' : ''),
-        React.createElement(rebass_1.Text, { mt: 2, padding: 2, style: toStyle(flashingAlert.DownChangeStyle) },
+            !props.data.UpChangeStyle ? ' - no style' : ''),
+        React.createElement(StylePreview_1.StylePreview, { mt: 2, styleObject: props.data.DownChangeStyle },
             "Down change style ",
-            !flashingAlert.DownChangeStyle ? ' - no style' : ''),
-        React.createElement(rebass_1.Text, { mt: 2, padding: 2, style: toStyle(flashingAlert.NeutralChangeStyle) },
+            !props.data.DownChangeStyle ? ' - no style' : ''),
+        React.createElement(StylePreview_1.StylePreview, { mt: 2, styleObject: props.data.NeutralChangeStyle },
             "Neutral change style ",
-            !flashingAlert.NeutralChangeStyle ? ' - no style' : '')));
+            !props.data.NeutralChangeStyle ? ' - no style' : '')));
+};
+exports.renderFlashingAlertStyleSummary = (flashingAlert) => {
+    return React.createElement(exports.FlashingCellStyle, { data: flashingAlert });
 };

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

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

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

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlashingCellWizard = 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 OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const FlashingCellDurationWizardSection_1 = require("./FlashingCellDurationWizardSection");
+const Helper_1 = require("../../../Utilities/Helpers/Helper");
+const FlashingCellRulesWizardSection_1 = require("./FlashingCellRulesWizardSection");
+const FlashingCellStyleWizardSection_1 = require("./FlashingCellStyleWizardSection");
+const FlashingCellScopeWizardSection_1 = require("./FlashingCellScopeWizardSection");
+const BaseAlertScopeWizardSection_1 = require("../../Alert/Wizard/BaseAlertScopeWizardSection");
+const AdaptableContext_1 = require("../../AdaptableContext");
+const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
+const react_redux_1 = require("react-redux");
+const isValidFlashingCellRules_1 = require("./isValidFlashingCellRules");
+const FlashingCellRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FlashingCellRedux"));
+exports.FlashingCellWizard = (props) => {
+    const { api } = AdaptableContext_1.useAdaptable();
+    const [flashingCell, setFlashingCell] = react_1.useState(() => {
+        let flashingCell = props.data
+            ? Helper_1.cloneObject(props.data)
+            : ObjectFactory_1.default.CreateEmptyFlashingCellDefinition();
+        flashingCell = api.flashingCellApi.mergeFlashingCellDefinitionWithDefaults(flashingCell);
+        if (!flashingCell.Rule.BooleanExpression && !flashingCell.Rule.Predicate) {
+            flashingCell.Rule.BooleanExpression = '';
+        }
+        return flashingCell;
+    });
+    const updateProperty = (propName) => {
+        return (value) => {
+            setFlashingCell((flashingCell) => {
+                flashingCell = Object.assign(Object.assign({}, flashingCell), { [propName]: value });
+                return flashingCell;
+            });
+        };
+    };
+    const updateStyles = {
+        DownChangeStyle: react_1.useCallback(updateProperty('DownChangeStyle'), []),
+        UpChangeStyle: react_1.useCallback(updateProperty('UpChangeStyle'), []),
+        NeutralChangeStyle: react_1.useCallback(updateProperty('NeutralChangeStyle'), []),
+    };
+    const flashStyleComponent = (React.createElement(FlashingCellStyleWizardSection_1.FlashingAlertStyleWizardSection, { onStyleChange: (styleName, style) => {
+            updateStyles[styleName](style);
+        } }));
+    const dispatch = react_redux_1.useDispatch();
+    const handleFinish = () => {
+        if (props.data) {
+            dispatch(FlashingCellRedux.FlashingCellDefinitionEdit(flashingCell));
+        }
+        else {
+            dispatch(FlashingCellRedux.FlashingCellDefinitionAdd(flashingCell));
+        }
+        props.onFinishWizard(flashingCell);
+    };
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: flashingCell, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                details: 'Specify which data changes should trigger Cell Flashing',
+                isValid: NewScopeComponent_1.isScopeValid,
+                render: () => React.createElement(FlashingCellScopeWizardSection_1.FlashingAlertScopeWizardSection, { onChange: setFlashingCell }),
+                renderSummary: BaseAlertScopeWizardSection_1.renderBaseAlertScopeSummary,
+                title: 'Scope',
+            },
+            {
+                details: 'Build the rules for when Cells should Flash',
+                isValid: isValidFlashingCellRules_1.isValidFlashingCellRules,
+                render: () => React.createElement(FlashingCellRulesWizardSection_1.FlashingAlertRulesWizardSection, { onChange: setFlashingCell }),
+                renderSummary: FlashingCellRulesWizardSection_1.renderFlashingAlertRulesSummary,
+                title: 'Condition',
+            },
+            {
+                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',
+            },
+            {
+                details: 'Choose the Flashing Styles',
+                render: () => React.createElement(rebass_1.Box, { padding: 2 }, flashStyleComponent),
+                renderSummary: FlashingCellStyleWizardSection_1.renderFlashingAlertStyleSummary,
+                title: 'Flash Styles',
+            },
+            '-',
+            {
+                details: 'Review the Flashing Cell Rule',
+                render: () => {
+                    return (React.createElement(rebass_1.Box, { padding: 2 },
+                        React.createElement(OnePageAdaptableWizard_1.OnePageWizardSummary, null)));
+                },
+                title: 'Summary',
+            },
+        ] }));
+};

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

@@ -0,0 +1,3 @@
+import { AdaptableApi, FlashingCellDefinition } from '../../../types';
+import { OnePageAdaptableWizardContextType } from '../../Wizard/OnePageAdaptableWizard';
+export declare const isValidFlashingCellRules: (flashingCell: FlashingCellDefinition, api: AdaptableApi, context: OnePageAdaptableWizardContextType<FlashingCellDefinition>) => true | string;

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidFlashingCellRules = void 0;
+const ModuleConstants_1 = require("../../../Utilities/Constants/ModuleConstants");
+exports.isValidFlashingCellRules = (flashingCell, api, context) => {
+    let valid = true;
+    if (!flashingCell.Rule.Predicate && !flashingCell.Rule.BooleanExpression) {
+        return 'No Rule defined for Flashing Cell';
+    }
+    if (valid && flashingCell.Rule.Predicate) {
+        valid = api.predicateApi.isValidPredicate(flashingCell.Rule.Predicate);
+        if (!valid) {
+            return 'Predicate is not valid';
+        }
+    }
+    if (valid && flashingCell.Rule.BooleanExpression) {
+        valid = api.queryLanguageApi.isValidBooleanExpression(flashingCell.Rule.BooleanExpression, ModuleConstants_1.FlashingCellModuleId);
+        if (!valid) {
+            return 'The query is not a valid boolean query';
+        }
+    }
+    // boolean expressions may also be saved as named queries
+    if (context.namedQuery != false) {
+        const isValidName = api.queryApi.isValidNamedQueryName(context.namedQuery);
+        if (!isValidName.valid) {
+            return isValidName.message;
+        }
+    }
+    return true;
+};

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

@@ -10,6 +10,7 @@ export interface FormatColumnFormatWizardState {
     DisplayFormat: AdaptableFormat;
     NumericFormat?: 'Percent' | 'Thousand' | 'Million' | 'Dollar' | 'Sterling' | undefined;
 }
+export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn) => string;
 export declare const renderFormatColumnFormatSummary: (data: FormatColumn) => JSX.Element;
 export declare const getFormatDisplayTypeForScope: (scope: AdaptableScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
 export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => JSX.Element;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormatColumnFormatWizardSection = exports.getFormatDisplayTypeForScope = exports.renderFormatColumnFormatSummary = void 0;
+exports.FormatColumnFormatWizardSection = exports.getFormatDisplayTypeForScope = exports.renderFormatColumnFormatSummary = exports.getFormatColumnFormatSummaryValue = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
@@ -16,8 +16,8 @@ const AdaptableObjectRow_1 = require("../../Components/AdaptableObjectRow");
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Tabs_1 = require("../../../components/Tabs");
-const CodeBlock_1 = require("../../../components/CodeBlock");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
+const Tag_1 = require("../../../components/Tag");
 const DOLLAR_OPTIONS = {
     FractionDigits: 2,
     FractionSeparator: '.',
@@ -77,22 +77,26 @@ const DateFormatPresets = [
     'yyyyMMdd',
     'HH:mm:ss',
 ];
-exports.renderFormatColumnFormatSummary = (data) => {
+exports.getFormatColumnFormatSummaryValue = (data) => {
     let content = 'N/A';
     if (!data.DisplayFormat) {
-        return React.createElement(rebass_1.Text, { padding: 2 }, "N/A");
-    }
-    if (data.DisplayFormat.Formatter === 'NumberFormatter') {
-        content = FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options);
+        content = 'N/A';
     }
-    if (data.DisplayFormat.Formatter === 'DateFormatter') {
-        content = FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options);
-    }
-    if (data.DisplayFormat.Formatter === 'StringFormatter') {
-        content = FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options);
+    else {
+        if (data.DisplayFormat.Formatter === 'NumberFormatter') {
+            content = FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options);
+        }
+        if (data.DisplayFormat.Formatter === 'DateFormatter') {
+            content = FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options);
+        }
+        if (data.DisplayFormat.Formatter === 'StringFormatter') {
+            content = FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options);
+        }
     }
-    return (React.createElement(rebass_1.Text, { padding: 2 },
-        React.createElement(CodeBlock_1.CodeBlock, null, content)));
+    return content;
+};
+exports.renderFormatColumnFormatSummary = (data) => {
+    return React.createElement(Tag_1.Tag, null, exports.getFormatColumnFormatSummaryValue(data));
 };
 exports.getFormatDisplayTypeForScope = (scope, api) => {
     if (scope == undefined) {

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

@@ -7,9 +7,9 @@ const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 exports.renderFormatColumnScopeSummary = (data) => {
     return NewScopeComponent_1.renderScopeSummary(data.Scope, {
-        scopeWholeRow: 'Matching rows will TODO',
+        scopeWholeRow: 'Matching rows will be formatted',
         scopeColumns: 'Cells in selected columns will be formatted',
-        scopeDataTypes: 'Cells in columns of the selected data-types will TODO',
+        scopeDataTypes: 'Cells in columns of the selected data-types will be formatted',
     });
 };
 exports.FormatColumnScopeWizardSection = (props) => {

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

@@ -10,10 +10,10 @@ const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const CheckBox_1 = require("../../../components/CheckBox");
 const Tabs_1 = require("../../../components/Tabs");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const CodeBlock_1 = require("../../../components/CodeBlock");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const react_1 = require("react");
 const LoggingHelper_1 = require("../../../Utilities/Helpers/LoggingHelper");
+const Tag_1 = require("../../../components/Tag");
 let alignmentOptions = [
     { value: 'Left', label: 'Left' },
     { value: 'Right', label: 'Right' },
@@ -24,13 +24,13 @@ exports.renderFormatColumnSettingsSummary = (data) => {
     return (React.createElement(rebass_1.Box, { padding: 2 },
         React.createElement(rebass_1.Text, null,
             "Cell alignment ",
-            React.createElement(CodeBlock_1.CodeBlock, null, (_a = data.CellAlignment) !== null && _a !== void 0 ? _a : 'default')),
+            React.createElement(Tag_1.Tag, null, (_a = data.CellAlignment) !== null && _a !== void 0 ? _a : 'default')),
         data.HeaderName ? (React.createElement(rebass_1.Text, { mt: 3 },
             "Header name ",
-            React.createElement(CodeBlock_1.CodeBlock, null, data.HeaderName))) : null,
+            React.createElement(Tag_1.Tag, null, data.HeaderName))) : null,
         React.createElement(rebass_1.Text, { mt: 3 },
             "Include grouped rows ",
-            React.createElement(CodeBlock_1.CodeBlock, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
+            React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
 };
 exports.FormatColumnSettingsWizardSection = (props) => {
     const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();

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

@@ -13,6 +13,9 @@ const FormatColumnFormatWizardSection_1 = require("./FormatColumnFormatWizardSec
 const AdaptableContext_1 = require("../../AdaptableContext");
 const FormatColumnSettingsWizardSection_1 = require("./FormatColumnSettingsWizardSection");
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
+const react_redux_1 = require("react-redux");
+const FormatColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FormatColumnRedux"));
 const adjustDisplayFormat = (formatColumn, api) => {
     formatColumn = Object.assign({}, formatColumn);
     const formatDataType = FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope(formatColumn.Scope, api);
@@ -70,7 +73,9 @@ function FormatColumnWizard(props) {
     const { api } = AdaptableContext_1.useAdaptable();
     const [formatColumn, doSetFormatColumn] = react_1.useState(() => {
         var _a;
-        let formatColumn = Helper_1.cloneObject(props.data);
+        let formatColumn = props.data
+            ? Helper_1.cloneObject(props.data)
+            : ObjectFactory_1.default.CreateEmptyFormatColumn();
         formatColumn.Scope = (_a = formatColumn.Scope) !== null && _a !== void 0 ? _a : {
             ColumnIds: [],
         };
@@ -80,7 +85,17 @@ function FormatColumnWizard(props) {
     const setFormatColumn = React.useCallback((formatColumn) => {
         doSetFormatColumn(adjustFormatColumn(formatColumn, api));
     }, []);
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { moduleInfo: props.moduleInfo, data: formatColumn, onHide: props.onCloseWizard, onFinish: props.onFinishWizard, sections: [
+    const dispatch = react_redux_1.useDispatch();
+    const handleFinish = () => {
+        if (props.data) {
+            dispatch(FormatColumnRedux.FormatColumnEdit(formatColumn));
+        }
+        else {
+            dispatch(FormatColumnRedux.FormatColumnAdd(formatColumn));
+        }
+        props.onFinishWizard(formatColumn);
+    };
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: formatColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Scope',
                 details: 'Apply formatting to: one or more Columns or Data Types or the whole row',

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.d.ts

@@ -5,6 +5,7 @@ export declare const renderFreeTextColumnSummary: (data: FreeTextColumn) => JSX.
 export declare const isValidFreeTextColumn: (data: FreeTextColumn, api: AdaptableApi) => true | "Column id cannot be empty" | "No data type specified for column" | "A Column already exists with that id";
 export declare type FreeTextColumnSettingsWizardSectionProps = {
     onChange: (data: FreeTextColumn) => void;
+    isEdit: boolean;
 };
 export interface FreeTextColumnSettingsWizardState {
     ColumnId: string;

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

@@ -14,9 +14,9 @@ const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../Components/AdaptableInput"));
 const CheckBox_1 = require("../../../components/CheckBox");
-const CodeBlock_1 = require("../../../components/CodeBlock");
 const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
 const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
+const Tag_1 = require("../../../components/Tag");
 const options = [
     { value: Enums_1.DataType.Number, label: Enums_1.DataType.Number },
     { value: Enums_1.DataType.String, label: Enums_1.DataType.String },
@@ -28,19 +28,19 @@ exports.renderFreeTextColumnSummary = (data) => {
     return (React.createElement(rebass_1.Box, { fontSize: 2 },
         React.createElement(rebass_1.Box, null,
             "Column Identifier: ",
-            React.createElement(CodeBlock_1.CodeBlock, null, data.ColumnId)),
+            React.createElement(Tag_1.Tag, null, data.ColumnId)),
         data.FriendlyName ? (React.createElement(rebass_1.Box, { mt: 3 },
             "Column Name: ",
-            React.createElement(CodeBlock_1.CodeBlock, null, (_a = data.FriendlyName) !== null && _a !== void 0 ? _a : data.ColumnId))) : null,
+            React.createElement(Tag_1.Tag, null, (_a = data.FriendlyName) !== null && _a !== void 0 ? _a : data.ColumnId))) : null,
         React.createElement(rebass_1.Box, { mt: 3 },
             "Data Type: ",
-            React.createElement(CodeBlock_1.CodeBlock, null, data.DataType)),
+            React.createElement(Tag_1.Tag, null, data.DataType)),
         data.DefaultValue !== undefined ? (React.createElement(rebass_1.Box, { mt: 3 },
             "Default Value: ",
-            React.createElement(CodeBlock_1.CodeBlock, null, `${data.DefaultValue}`))) : null,
+            React.createElement(Tag_1.Tag, null, data.DefaultValue))) : null,
         data.TextEditor !== undefined ? (React.createElement(rebass_1.Box, { mt: 3 },
             "Editor Type: ",
-            React.createElement(CodeBlock_1.CodeBlock, null, data.TextEditor))) : null));
+            React.createElement(Tag_1.Tag, null, data.TextEditor))) : null));
 };
 exports.isValidFreeTextColumn = (data, api) => {
     const columns = api.columnApi.getColumns();
@@ -62,7 +62,7 @@ exports.FreeTextColumnSettingsWizardSection = (props) => {
     const Pattern = api.internalApi.getAdaptableOptions().userInterfaceOptions.dateInputOptions
         .dateFormat;
     const [ColumnNameFocused, setColumnNameFocused] = react_1.useState(false);
-    const inEdit = !!data.Uuid;
+    const inEdit = props.isEdit;
     const validCheck = exports.isValidFreeTextColumn(data, api);
     const ErrorMessage = validCheck === true ? null : validCheck;
     const handleColumnIdChange = (event) => {

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

@@ -5,23 +5,36 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const rebass_1 = require("rebass");
-const AdaptableContext_1 = require("../../AdaptableContext");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const FreeTextColumnSettingsWizardSection_1 = require("./FreeTextColumnSettingsWizardSection");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
+const FreeTextColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FreeTextColumnRedux"));
+const react_redux_1 = require("react-redux");
 exports.FreeTextColumnWizard = (props) => {
-    const { api } = AdaptableContext_1.useAdaptable();
     const [freeTextColumn, setFreeTextColumn] = react_1.useState(() => {
-        const freeTextColumn = Helper_1.cloneObject(props.data);
+        const freeTextColumn = props.data
+            ? Helper_1.cloneObject(props.data)
+            : ObjectFactory_1.default.CreateEmptyFreeTextColumn(false);
         return freeTextColumn;
     });
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { moduleInfo: props.moduleInfo, data: freeTextColumn, onHide: props.onCloseWizard, onFinish: props.onFinishWizard, sections: [
+    const dispatch = react_redux_1.useDispatch();
+    const handleFinish = () => {
+        if (props.data) {
+            dispatch(FreeTextColumnRedux.FreeTextColumnEdit(freeTextColumn));
+        }
+        else {
+            dispatch(FreeTextColumnRedux.FreeTextColumnAdd(freeTextColumn));
+        }
+        props.onFinishWizard(freeTextColumn);
+    };
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: freeTextColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Settings',
                 details: 'Configure the Free Text Column',
                 render: () => {
                     return (React.createElement(rebass_1.Box, { padding: 2 },
-                        React.createElement(FreeTextColumnSettingsWizardSection_1.FreeTextColumnSettingsWizardSection, { onChange: setFreeTextColumn })));
+                        React.createElement(FreeTextColumnSettingsWizardSection_1.FreeTextColumnSettingsWizardSection, { isEdit: Boolean(props.data), onChange: setFreeTextColumn })));
                 },
             },
             '-',

package/src/View/GridInfo/AdaptableOptionsComponent.js

@@ -70,7 +70,7 @@ exports.AdaptableOptionsComponent = (props) => {
         return (React.createElement(AdaptableObjectCollection_1.AdaptableObjectCollection, { colItems: getAdaptableOptionsColItems(), items: gridInfoOptionComponents }));
     };
     const [gridInfoOptions, setGridInfoOptions] = react_1.useState();
-    const [gridInfoContainerComponents, setGridInfoContainerComponents,] = react_1.useState();
+    const [gridInfoContainerComponents, setGridInfoContainerComponents] = react_1.useState();
     react_1.useEffect(() => {
         const gridInfoOptions = api.internalApi.getMetamodelService().getGridInfoOptions();
         const gridInfoContainerComponentMap = new Map();
@@ -81,7 +81,7 @@ exports.AdaptableOptionsComponent = (props) => {
         setGridInfoOptions(gridInfoOptions);
     }, []);
     const [expandedComponentContainer, setExpandedComponentContainer] = react_1.useState('');
-    return (React.createElement(rebass_1.Box, { margin: 2, "data-name": "gridInfo-adaptableOptions-content" }, gridInfoOptions &&
+    return (React.createElement(rebass_1.Box, { className: "ab-AdaptableOptions", padding: 2, "data-name": "gridInfo-adaptableOptions-content" }, gridInfoOptions &&
         Array.from(gridInfoOptions.entries()).map(([containerName, container]) => (React.createElement(OptionContainerComponent, { key: containerName, name: containerName, label: container.containerLabel, viewMode: containerName === expandedComponentContainer ? 'expanded' : 'collapsed', onViewModeChange: (newViewMode) => setExpandedComponentContainer(newViewMode === 'expanded' ? containerName : '') }, gridInfoContainerComponents.get(containerName))))));
 };
 const OptionContainerComponent = (props) => {

package/src/View/GridInfo/GridInfoPopup.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="react" />
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableColumn } from '../../types';
+import { GridInfoSection } from '../../AdaptableOptions/UserInterfaceOptions';
 interface GridInfoPopupProps extends ModuleViewPopupProps<any> {
 }
 export interface AdaptableGridInfoState {
-    ActiveTab: 'GridSummary' | 'GridProperties' | 'AdaptableOptions' | 'Column';
+    ActiveTab: GridInfoSection;
     CurrentColumn: AdaptableColumn | undefined;
     IsBaseOptionsMinimised: boolean;
     IsContainerOptionsMinimised: boolean;