@adaptabletools/adaptable 13.0.0-canary.20 → 13.0.0-canary.22

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -38,9 +38,8 @@ const HighlightStyle = (props) => {
                     props.onChange(checked);
                 } }, props.label),
             Boolean(props.highlight) && (React.createElement(DropdownButton_1.default, { items: options, columns: ['label'] }, typeof props.highlight === 'boolean' ? (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 },
-                "Use Message Type's",
-                ' ',
-                (0, AdaptableContext_1.useAdaptable)().api.internalApi.getCorrectEnglishVariant('Colour'))) : (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Create a Custom Style"))))),
+                "Use Message Type's ",
+                adaptable.api.internalApi.getCorrectEnglishVariant('Colour'))) : (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Create a Custom Style"))))),
         typeof props.highlight === 'object' && (React.createElement(Panel_1.default, { margin: 2 },
             React.createElement(rebass_1.Box, { paddingLeft: 3 },
                 React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: adaptable.api, Style: props.highlight, UpdateStyle: (style) => {
@@ -93,32 +92,34 @@ const AlertBehaviourWizardSection = (props) => {
     const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(data);
     const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(data);
     const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
+    const hasPreventCellEdit = cellChangedAlert;
+    const hasHighlightCell = cellChangedAlert;
+    const hasHighlightRow = cellChangedAlert || rowAddedAlert;
+    const hasJumpToCell = cellChangedAlert;
+    const hasJumpToRow = cellChangedAlert || rowAddedAlert;
     const onChange = (AlertProperties) => {
         props.onChange(Object.assign(Object.assign({}, data), { AlertProperties: Object.assign(Object.assign({}, data.AlertProperties), AlertProperties) }));
     };
     return (React.createElement(Tabs_1.Tabs, null,
         React.createElement(Tabs_1.Tabs.Tab, null, api.internalApi.getCorrectEnglishVariant('Behaviour')),
         React.createElement(Tabs_1.Tabs.Content, null,
-            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { "data-name": "prevet-cell-edit", style: { alignItems: 'flex-start' }, checked: AlertProperties.PreventEdit, onChange: (PreventEdit) => {
+            hasPreventCellEdit && (React.createElement(CheckBox_1.CheckBox, { "data-name": "prevent-cell-edit", style: { alignItems: 'flex-start' }, checked: AlertProperties.PreventEdit, onChange: (PreventEdit) => {
                     onChange({
                         PreventEdit,
                     });
                 } },
                 "Prevent Cell Edit",
                 React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(automatically undo data change which triggered Alert)"))),
-            cellChangedAlert && (React.createElement(HighlightStyle, { dataName: "highlight-cell", highlight: AlertProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
+            hasHighlightCell && (React.createElement(HighlightStyle, { dataName: "highlight-cell", highlight: AlertProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
                     onChange({ HighlightCell });
                 } })),
-            cellChangedAlert && (React.createElement(HighlightStyle, { dataName: "highlight-row", highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
+            hasHighlightRow && (React.createElement(HighlightStyle, { dataName: "highlight-row", highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
                     onChange({ HighlightRow });
                 } })),
-            rowAddedAlert && (React.createElement(HighlightStyle, { dataName: "highlight-row", highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
-                    onChange({ HighlightRow });
-                } })),
-            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-cell", checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
+            hasJumpToCell && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-cell", checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
                     onChange({ JumpToCell });
                 } }, "Jump To Cell")),
-            rowAddedAlert && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-row", checked: AlertProperties.JumpToRow, onChange: (JumpToRow) => {
+            hasJumpToRow && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-row", checked: AlertProperties.JumpToRow, onChange: (JumpToRow) => {
                     onChange({ JumpToRow });
                 } }, "Jump To Row")),
             React.createElement(CheckBox_1.CheckBox, { "data-name": "show-in-div", checked: AlertProperties.ShowInDiv, onChange: (ShowInDiv) => {

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -17,9 +17,32 @@ const AlertButtonsEditor = (props) => {
     const onChange = (newButtons) => {
         props.onChange(newButtons);
     };
+    const alertDefinition = adaptableAlert.alertDefinition;
+    const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
+    const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
+    const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
+    const hasHighlightCell = cellChangedAlert;
+    const hasHighlightRow = cellChangedAlert || rowAddedAlert;
+    const hasJumpToCell = cellChangedAlert;
+    const hasJumpToRow = cellChangedAlert || rowAddedAlert;
+    const hasUndo = cellChangedAlert;
     const AlertButtons = (0, Helper_1.cloneObject)(props.AlertButtons || []) || [];
     const buttonActions = [];
-    buttonActions.push('highlight-row', 'jump-to-row', 'highlight-cell', 'jump-to-cell', 'undo');
+    if (hasHighlightRow) {
+        buttonActions.push('highlight-row');
+    }
+    if (hasJumpToRow) {
+        buttonActions.push('jump-to-row');
+    }
+    if (hasHighlightCell) {
+        buttonActions.push('highlight-cell');
+    }
+    if (hasJumpToCell) {
+        buttonActions.push('jump-to-cell');
+    }
+    if (hasUndo) {
+        buttonActions.push('undo');
+    }
     buttonActions.push('suspend');
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between" },

package/src/View/Alert/Wizard/isValidAlertRules.js

@@ -38,7 +38,7 @@ const isValidAlertRules = (alert, api, context) => {
     if (valid && alert.Rule.AggregatedBooleanExpression) {
         valid = api.queryLanguageApi.isValidAggregatedBooleanExpression(alert.Rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
         if (!valid) {
-            return 'The Expression is not a valid Aggregation Expression';
+            return 'The Expression is not a valid AggregatedBoolean Expression';
         }
     }
     return true;

package/src/View/GridInfo/ColumnInfoComponent.js

@@ -6,7 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const CustomSortSummary_1 = require("../CustomSort/CustomSortSummary");
-const ConditionalStyleSummary_1 = require("../ConditionalStyle/ConditionalStyleSummary");
 const FilterSummary_1 = require("../Filter/FilterSummary");
 const PlusMinusSummary_1 = require("../PlusMinus/PlusMinusSummary");
 const FormatColumnSummary_1 = require("../FormatColumn/FormatColumnSummary");
@@ -100,12 +99,6 @@ class ColumnInfoComponent extends React.Component {
                         : '' },
                     React.createElement(CustomSortSummary_1.CustomSortSummary, { key: ModuleConstants.CustomSortModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.CustomSortModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.CustomSortModuleId) })));
             }
-            if (this.isModuleAvailable(ModuleConstants.ConditionalStyleModuleId)) {
-                summaries.push(React.createElement("div", { key: ModuleConstants.ConditionalStyleModuleId, className: this.isModuleReadOnly(ModuleConstants.ConditionalStyleModuleId)
-                        ? GeneralConstants.READ_ONLY_STYLE
-                        : '' },
-                    React.createElement(ConditionalStyleSummary_1.ConditionalStyleSummary, { key: ModuleConstants.ConditionalStyleModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.ConditionalStyleModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.ConditionalStyleModuleId) })));
-            }
             if (this.isModuleAvailable(ModuleConstants.FilterModuleId)) {
                 summaries.push(React.createElement("div", { key: ModuleConstants.FilterModuleId, className: this.isModuleReadOnly(ModuleConstants.FilterModuleId)
                         ? GeneralConstants.READ_ONLY_STYLE

package/src/agGrid/agGridHelper.js

@@ -7,7 +7,6 @@ const AlertModule_1 = require("../Strategy/AlertModule");
 const BulkUpdateModule_1 = require("../Strategy/BulkUpdateModule");
 const CalculatedColumnModule_1 = require("../Strategy/CalculatedColumnModule");
 const CellSummaryModule_1 = require("../Strategy/CellSummaryModule");
-const ConditionalStyleModule_1 = require("../Strategy/ConditionalStyleModule");
 const CustomSortModule_1 = require("../Strategy/CustomSortModule");
 const DashboardModule_1 = require("../Strategy/DashboardModule");
 const DataSetModule_1 = require("../Strategy/DataSetModule");
@@ -81,7 +80,7 @@ class agGridHelper {
         modules.set(ModuleConstants.BulkUpdateModuleId, new BulkUpdateModule_1.BulkUpdateModule(api));
         modules.set(ModuleConstants.CalculatedColumnModuleId, new CalculatedColumnModule_1.CalculatedColumnModule(api));
         modules.set(ModuleConstants.CellSummaryModuleId, new CellSummaryModule_1.CellSummaryModule(api));
-        modules.set(ModuleConstants.ConditionalStyleModuleId, new ConditionalStyleModule_1.ConditionalStyleModule(api));
+        //  modules.set(ModuleConstants.ConditionalStyleModuleId, new ConditionalStyleModule(api));
         modules.set(ModuleConstants.CustomSortModuleId, new CustomSortModule_1.CustomSortModule(api));
         modules.set(ModuleConstants.DataChangeHistoryModuleId, new DataChangeHistoryModule_1.DataChangeHistoryModule(api));
         modules.set(ModuleConstants.DataSetModuleId, new DataSetModule_1.DataSetModule(api));

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1610,32 +1610,6 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         }[];
     };
-    ConditionalStyle: {
-        name: string;
-        kind: string;
-        description: string;
-    };
-    ConditionalStyleApi: {
-        name: string;
-        kind: string;
-        description: string;
-        properties: {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-        }[];
-    };
-    ConditionalStyleRule: {
-        name: string;
-        kind: string;
-        description: string;
-    };
-    ConditionalStyleState: {
-        name: string;
-        kind: string;
-        description: string;
-    };
     ConfigApi: {
         name: string;
         kind: string;
@@ -1874,6 +1848,28 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional?: undefined;
+            reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+            isOptional?: undefined;
+        })[];
     };
     CustomDisplayFormatterContext: {
         name: string;