diff --git a/web/client/components/manager/rulesmanager/AttributeAccessSelect.jsx b/web/client/components/manager/rulesmanager/AttributeAccessSelect.jsx index cfdf962521..bbca017f74 100644 --- a/web/client/components/manager/rulesmanager/AttributeAccessSelect.jsx +++ b/web/client/components/manager/rulesmanager/AttributeAccessSelect.jsx @@ -14,8 +14,9 @@ const defaultOptions = [ {value: 'READWRITE', label: 'READ WRITE'} ]; -export default ({options = defaultOptions, attribute, value, onChange = () => {}}) => ( +export default ({options = defaultOptions, attribute, value, onChange = () => {}, className = ""}) => ( { expect(rows).toExist(); expect(rows.length).toBe(3); }); + it('render attributes with highlighted DD', () => { + ReactDOM.render(, document.getElementById("container")); + const container = document.getElementById('container'); + const rows = container.querySelectorAll('.row'); + const highlights = container.querySelectorAll('.highlighted-dd'); + expect(rows).toExist(); + expect(highlights).toExist(); + expect(rows.length).toBe(3); + expect(highlights.length).toBe(1); + }); }); diff --git a/web/client/components/misc/combobox/PagedCombobox.jsx b/web/client/components/misc/combobox/PagedCombobox.jsx index f16f3e2978..f8eb02dc52 100644 --- a/web/client/components/misc/combobox/PagedCombobox.jsx +++ b/web/client/components/misc/combobox/PagedCombobox.jsx @@ -230,7 +230,7 @@ class PagedCombobox extends React.Component { { this.props.anyFilterRuleMode ? <>   -
+
{ this.renderTooltipCheckbox() } diff --git a/web/client/plugins/manager/RulesEditor.jsx b/web/client/plugins/manager/RulesEditor.jsx index 8995e351c6..7e14ab2c82 100644 --- a/web/client/plugins/manager/RulesEditor.jsx +++ b/web/client/plugins/manager/RulesEditor.jsx @@ -47,6 +47,12 @@ class RuleEditor extends React.Component { onDelete: () => {}, type: "" } + constructor(props) { + super(props); + this.state = { + editedAttributes: [] + }; + } render() { const { loading, activeRule, layer, activeEditor, onNavChange, initRule, styles = [], setConstraintsOption, type, properties, disableDetails} = this.props; const {modalProps} = this.state || {}; @@ -68,10 +74,16 @@ class RuleEditor extends React.Component { - + ); } + clearHighlighedEditsInAttributes() { + this.setState({ editedAttributes: [] }); + } + handleSetEditedAttrbiutes(attr) { + this.setState({ editedAttributes: [...this.state.editedAttributes, attr] }); + } cancelEditing = () => { const {activeRule, initRule, onExit} = this.props; if (!isRulePristine(activeRule, initRule)) { @@ -84,7 +96,11 @@ class RuleEditor extends React.Component { { text: , bsStyle: 'primary', - onClick: onExit + onClick: () => { + // check if there is edits in attributes clear highlight + this.state.editedAttributes.length && this.clearHighlighedEditsInAttributes(); + onExit(); + } } ], closeAction: this.cancel, msg: "map.details.sureToClose"}})); } else { @@ -97,6 +113,8 @@ class RuleEditor extends React.Component { save = () => { const {activeRule, onSave} = this.props; if (isRuleValid(activeRule)) { + // check if there is edits in attributes clear highlight + this.state.editedAttributes.length && this.clearHighlighedEditsInAttributes(); onSave(activeRule); } else { this.setState( () => ({modalProps: {title: "featuregrid.toolbar.saveChanges", diff --git a/web/client/themes/default/less/react-data-grid.less b/web/client/themes/default/less/react-data-grid.less index ab8eafb870..ab0a446559 100644 --- a/web/client/themes/default/less/react-data-grid.less +++ b/web/client/themes/default/less/react-data-grid.less @@ -305,7 +305,7 @@ .ms2-border-layout-body{ .rules-data-gird { .react-grid-HeaderCell{ - .autocompleteField input { + .autocompleteField.d-flex div.checkbox-any-field { position: relative; top: 15%; } diff --git a/web/client/themes/default/less/rulesmanager.less b/web/client/themes/default/less/rulesmanager.less index 27ad40668b..b830060cf5 100644 --- a/web/client/themes/default/less/rulesmanager.less +++ b/web/client/themes/default/less/rulesmanager.less @@ -176,6 +176,9 @@ .ms-rule-editor .m-label.m-caption .glyphicon-info-sign{ margin-right: 2px; } + .ms-rule-editor.container-fluid .highlighted-dd{ + outline: 1px solid var(--ms-warning, @ms-warning); + } position: absolute;