@adaptabletools/adaptable 11.1.4 → 11.1.5

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

@@ -9,6 +9,39 @@ const CheckBox_1 = require("../../../components/CheckBox");
 const CodeBlock_1 = require("../../../components/CodeBlock");
 const rebass_1 = require("rebass");
 const ValueSelector_1 = require("../../Components/ValueSelector");
+const StyleComponent_1 = require("../../Components/StyleComponent");
+const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
+const AdaptableContext_1 = require("../../AdaptableContext");
+const StylePreview_1 = require("../../../components/StylePreview");
+const HighlightStyle = (props) => {
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const options = [
+        {
+            label: 'Use Message Type',
+            onClick: () => {
+                props.onChange(true);
+            },
+        },
+        {
+            label: 'Custom Style',
+            onClick: () => {
+                const initialStyle = ObjectFactory_1.default.CreateEmptyStyle();
+                props.onChange(initialStyle);
+            },
+        },
+    ];
+    return (React.createElement(React.Fragment, null,
+        React.createElement(rebass_1.Flex, null,
+            React.createElement(CheckBox_1.CheckBox, { mr: 2, style: { alignItems: 'flex-start' }, checked: Boolean(props.highlight), onChange: (checked) => {
+                    props.onChange(checked);
+                } }, props.label),
+            Boolean(props.highlight) && (React.createElement(DropdownButton_1.default, { items: options }, typeof props.highlight === 'boolean' ? (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Use Message Type")) : (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Custom Style"))))),
+        typeof props.highlight === 'object' && (React.createElement(rebass_1.Box, { paddingLeft: 3 },
+            React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: adaptable.api, Style: props.highlight, UpdateStyle: (style) => {
+                    props.onChange(style);
+                } })))));
+};
 // both used in wizard and list view
 exports.renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     const { AlertProperties = {} } = alert;
@@ -31,7 +64,15 @@ exports.renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     if (!values.length) {
         values.push({ label: 'No behaviour selected', id: 'none' });
     }
-    return (React.createElement(ValueSelector_1.ValueOptionsTags, { allowWrap: allowWrap, options: values, value: values.map((v) => v.id), readOnly: true, toIdentifier: (x) => x.id, toLabel: (x) => React.createElement(React.Fragment, null, x.label) }));
+    return (React.createElement(ValueSelector_1.ValueOptionsTags, { allowWrap: allowWrap, options: values, value: values.map((v) => v.id), readOnly: true, toIdentifier: (x) => x.id, toLabel: (x) => {
+            if (x.id === 'highlightCell' && typeof AlertProperties.HighlightCell === 'object') {
+                return (React.createElement(StylePreview_1.StylePreview, { padding: 0, mt: 0, styleObject: AlertProperties.HighlightCell }, "Highlight Cell"));
+            }
+            if (x.id === 'highlightRow' && typeof AlertProperties.HighlightRow === 'object') {
+                return (React.createElement(StylePreview_1.StylePreview, { padding: 0, mt: 0, styleObject: AlertProperties.HighlightRow }, "Highlight Row"));
+            }
+            return React.createElement(React.Fragment, null, x.label);
+        } }));
 };
 exports.AlertBehaviourWizardSection = (props) => {
     const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
@@ -52,16 +93,12 @@ exports.AlertBehaviourWizardSection = (props) => {
                 } },
                 "Prevent Cell Edit",
                 React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(automatically undo data change which triggered Alert)"))),
-            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightCell), onChange: (HighlightCell) => {
+            cellChangedAlert && (React.createElement(HighlightStyle, { highlight: AlertProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
                     onChange({ HighlightCell });
-                } },
-                "Highlight Cell",
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)"))),
-            rowAddedAlert && (React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightRow), onChange: (HighlightRow) => {
+                } })),
+            rowAddedAlert && (React.createElement(HighlightStyle, { highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
                     onChange({ HighlightRow });
-                } },
-                "Highlight Row",
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)"))),
+                } })),
             cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
                     onChange({ JumpToCell });
                 } }, "Jump To Cell")),

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

@@ -78,7 +78,7 @@ exports.AlertWizard = (props) => {
         };
         if (alertDefinition.AlertForm && typeof alertDefinition.AlertForm !== 'string') {
             const alertButtons = (_a = alertDefinition.AlertForm) === null || _a === void 0 ? void 0 : _a.Buttons;
-            alertButtons.forEach((alertButton) => {
+            alertButtons === null || alertButtons === void 0 ? void 0 : alertButtons.forEach((alertButton) => {
                 const alertAction = alertButton.Action;
                 if (Array.isArray(alertAction)) {
                     alertButton.Action = alertAction
@@ -89,29 +89,27 @@ exports.AlertWizard = (props) => {
                     alertButton.Action = mapValidButtonActions(alertAction);
                 }
             });
-            // map Alert Properties(Behaviour)
-            if (isCellChangeAlert) {
-                alertDefinition.AlertProperties.HighlightCell =
-                    alertDefinition.AlertProperties.HighlightRow;
-                delete alertDefinition.AlertProperties.HighlightRow;
-                alertDefinition.AlertProperties.JumpToCell = alertDefinition.AlertProperties.JumpToRow;
-                delete alertDefinition.AlertProperties.JumpToRow;
-            }
-            if (isAddedRowChangeAlert) {
-                alertDefinition.AlertProperties.HighlightRow =
-                    alertDefinition.AlertProperties.HighlightCell;
-                delete alertDefinition.AlertProperties.HighlightCell;
-                alertDefinition.AlertProperties.JumpToRow = alertDefinition.AlertProperties.JumpToCell;
-                delete alertDefinition.AlertProperties.JumpToCell;
-                delete alertDefinition.AlertProperties.PreventEdit;
-            }
-            if (isRemovedRowChangeAlert) {
-                delete alertDefinition.AlertProperties.PreventEdit;
-                delete alertDefinition.AlertProperties.HighlightRow;
-                delete alertDefinition.AlertProperties.JumpToRow;
-                delete alertDefinition.AlertProperties.HighlightCell;
-                delete alertDefinition.AlertProperties.JumpToCell;
-            }
+        }
+        // map Alert Properties(Behaviour)
+        if (isCellChangeAlert) {
+            alertDefinition.AlertProperties.HighlightCell = alertDefinition.AlertProperties.HighlightRow;
+            delete alertDefinition.AlertProperties.HighlightRow;
+            alertDefinition.AlertProperties.JumpToCell = alertDefinition.AlertProperties.JumpToRow;
+            delete alertDefinition.AlertProperties.JumpToRow;
+        }
+        if (isAddedRowChangeAlert) {
+            alertDefinition.AlertProperties.HighlightRow = alertDefinition.AlertProperties.HighlightCell;
+            delete alertDefinition.AlertProperties.HighlightCell;
+            alertDefinition.AlertProperties.JumpToRow = alertDefinition.AlertProperties.JumpToCell;
+            delete alertDefinition.AlertProperties.JumpToCell;
+            delete alertDefinition.AlertProperties.PreventEdit;
+        }
+        if (isRemovedRowChangeAlert) {
+            delete alertDefinition.AlertProperties.PreventEdit;
+            delete alertDefinition.AlertProperties.HighlightRow;
+            delete alertDefinition.AlertProperties.JumpToRow;
+            delete alertDefinition.AlertProperties.HighlightCell;
+            delete alertDefinition.AlertProperties.JumpToCell;
         }
         setAlertDefinition(alertDefinition);
     };

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -90,15 +90,15 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
                 React.createElement(rebass_1.Flex, { flexDirection: "row" },
                     React.createElement(FormLayout_1.default, null,
                         React.createElement(FormLayout_1.FormRow, { label: "Id" },
-                            React.createElement(Input_1.default, { value: data.ColumnId || '', width: 300, autoFocus: !inEdit, disabled: inEdit, type: "text", placeholder: "Enter an Id for the column", onChange: handleColumnIdChange })),
+                            React.createElement(Input_1.default, { "data-name": "column-id", value: data.ColumnId || '', width: 300, autoFocus: !inEdit, disabled: inEdit, type: "text", placeholder: "Enter an Id for the column", onChange: handleColumnIdChange })),
                         React.createElement(FormLayout_1.FormRow, { label: "Name" },
-                            React.createElement(Input_1.default, { autoFocus: inEdit, onFocus: () => {
+                            React.createElement(Input_1.default, { "data-name": "column-name", autoFocus: inEdit, onFocus: () => {
                                     setColumnNameFocused(true);
                                 }, onBlur: () => {
                                     setColumnNameFocused(false);
                                 }, value: ColumnNameFocused ? ColumnName || '' : ColumnName || ColumnId || '', width: 300, type: "text", placeholder: "Enter column name", onChange: handleColumnNameChange })),
                         React.createElement(FormLayout_1.FormRow, { label: "Type" },
-                            React.createElement(DropdownButton_1.default, { style: {
+                            React.createElement(DropdownButton_1.default, { "data-name": "column-type", style: {
                                     width: '300px',
                                     whiteSpace: 'normal',
                                     overflow: 'hidden',
@@ -109,11 +109,11 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
                                     onClick: () => handleDataTypeChange(item.value),
                                 })) }, dataType ? dataType : 'Select Data Type')),
                         React.createElement(FormLayout_1.FormRow, { label: "Width" },
-                            React.createElement(Input_1.default, { type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
+                            React.createElement(Input_1.default, { "data-name": "column-width", type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
                                     Width: Number(e.target.value),
                                 }) })),
                         React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
         React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -17,7 +17,7 @@ const SuspendToggleButton_1 = require("../Buttons/SuspendToggleButton/SuspendTog
 const ValueSelector_1 = require("../ValueSelector");
 const ICON_SIZE = 26;
 exports.AdaptableObjectListItem = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const adaptable = AdaptableContext_1.useAdaptable();
     const dispatch = react_redux_1.useDispatch();
     const [isEditWizardVisible, setIsEditWizardVisible] = React.useState(false);
@@ -56,8 +56,8 @@ exports.AdaptableObjectListItem = (props) => {
         });
     });
     const isEditDisabled = !Boolean(EditWizard || viewOptions.onOpenEditPopup);
-    return (React.createElement(rebass_1.Flex, { as: "li", mb: 3, className: itemClassName },
-        React.createElement(rebass_1.Box, { flex: 1, className: `${baseClassName}__rows` }, (_g = props.data.items) === null || _g === void 0 ? void 0 : _g.map((tag, index) => {
+    return (React.createElement(rebass_1.Flex, { "data-name": "adaptable-object-list-item", "data-value": props.data.abObject.Uuid, as: "li", mb: 3, className: itemClassName },
+        React.createElement(rebass_1.Box, { flex: 1, className: `${baseClassName}__rows` }, (_j = (_h = (_g = props.data.items).filter) === null || _h === void 0 ? void 0 : _h.call(_g, Boolean)) === null || _j === void 0 ? void 0 : _j.map((tag, index) => {
             var _a;
             return (React.createElement(rebass_1.Flex, { "data-name": tag.name, key: index, mb: 2, className: `${baseClassName}__row` },
                 React.createElement(rebass_1.Box, { className: `${baseClassName}__label`, mr: 3 },

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -53,9 +53,7 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.undoDataChangeHistoryEntry(changeToBeUndone);
             }
         };
-        const currentAgGridTheme = this.props.api.internalApi
-            .getAdaptableInstance()
-            .getAgGridCurrentThemeName();
+        const currentAgGridTheme = this.props.api.themeApi.getAgGridCurrentThemeName();
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
                 React.createElement(rebass_1.Flex, { style: {

package/src/View/GridInfo/AdaptableObjectsSummary.js

@@ -19,7 +19,7 @@ exports.AdaptableObjectsSummary = () => {
         if (!(items === null || items === void 0 ? void 0 : items.length)) {
             return null;
         }
-        return (React.createElement("div", null,
+        return (React.createElement("div", { key: module.moduleInfo.ModuleName },
             React.createElement("b", null, module.moduleInfo.FriendlyName),
             (items === null || items === void 0 ? void 0 : items.length) && React.createElement(AdaptableObjectList_1.AdaptableObjectList, { items: items, module: module })));
     })));

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -162,7 +162,7 @@ exports.OnePageAdaptableWizard = (props) => {
                                 navIndexMap.set(navIndex, index);
                                 const active = index === currentSection;
                                 const disabled = false; //!active && !currentSectionValid;
-                                return (React.createElement(rebass_1.Flex, { className: "ab-OnePageWizard__section-title", flexDirection: "row", style: {
+                                return (React.createElement(rebass_1.Flex, { className: "ab-OnePageWizard__section-title", "data-name": section.title, flexDirection: "row", style: {
                                         cursor: disabled ? 'auto' : 'pointer',
                                         zIndex: 10,
                                         transition: 'color 0.2s',

package/src/agGrid/Adaptable.js

@@ -344,15 +344,15 @@ class Adaptable {
         this.initStore();
         // create the services
         this.LicenseService = this.initLicenseService();
-        this.ValidationService = new ValidationService_1.ValidationService(this);
-        this.ReportService = new ReportService_1.ReportService(this);
-        this.ModuleService = new ModuleService_1.ModuleService(this);
-        this.CalculatedColumnExpressionService = new CalculatedColumnExpressionService_1.CalculatedColumnExpressionService(this);
-        this.EntitlementService = new EntitlementService_1.EntitlementService(this);
-        this.QueryLanguageService = new QueryLanguageService_1.QueryLanguageService(this);
-        this.AlertService = new AlertService_1.AlertService(this);
-        this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this);
-        this.MetamodelService = new MetamodelService_1.MetamodelService(this);
+        this.ValidationService = new ValidationService_1.ValidationService(this.api);
+        this.ReportService = new ReportService_1.ReportService(this.api);
+        this.ModuleService = new ModuleService_1.ModuleService(this.api);
+        this.CalculatedColumnExpressionService = new CalculatedColumnExpressionService_1.CalculatedColumnExpressionService(this.api);
+        this.EntitlementService = new EntitlementService_1.EntitlementService(this.api);
+        this.QueryLanguageService = new QueryLanguageService_1.QueryLanguageService(this.api);
+        this.AlertService = new AlertService_1.AlertService(this.api);
+        this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
+        this.MetamodelService = new MetamodelService_1.MetamodelService(this.api);
         this.forPlugins((plugin) => plugin.afterInitServices(this));
         // Set up Modules - we set up all the Modules suitable for AG Grid
         // But users can make some hidden or readonly in their entitlements

package/src/components/StylePreview.js

@@ -6,6 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 exports.StylePreview = (props) => {
-    var _a;
-    return (React.createElement(rebass_1.Box, Object.assign({}, props, { padding: 2, mt: 2, style: Object.assign(Object.assign({}, StyleHelper_1.toStyle(props.styleObject)), props.style) }), (_a = props.children) !== null && _a !== void 0 ? _a : 'Preview result'));
+    var _a, _b, _c;
+    return (React.createElement(rebass_1.Box, Object.assign({}, props, { padding: (_a = props.padding) !== null && _a !== void 0 ? _a : 2, mt: (_b = props.mt) !== null && _b !== void 0 ? _b : 2, style: Object.assign(Object.assign({}, StyleHelper_1.toStyle(props.styleObject)), props.style) }), (_c = props.children) !== null && _c !== void 0 ? _c : 'Preview result'));
 };

package/src/metamodel/adaptable.metamodel.js

@@ -11070,6 +11070,12 @@ exports.ADAPTABLE_METAMODEL = {
                 "description": "Applies the Current Theme",
                 "uiLabel": "Apply Current Theme"
             },
+            {
+                "name": "getAgGridCurrentThemeName",
+                "kind": "function",
+                "description": "Get the name of the current AG Grid theme",
+                "uiLabel": "Get Ag Grid Current Theme Name"
+            },
             {
                 "name": "getAllSystemTheme",
                 "kind": "function",

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.1.4";
+declare const _default: "11.1.5";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '11.1.4'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '11.1.5'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version