HBW-366 Don't highlight multi nullable select_table

hydra-billing · Oct 14, 2021 · a3603f2 · a3603f2
1 parent 8623825
commit a3603f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,6 +49,7 @@ v2.6.14 [unreleased]
 -------------------
 ### Bugfixes
 - [#601](https://github.com/latera/homs/pull/601) Move fontawesome to public/assets.
+- [#603](https://github.com/latera/homs/pull/603) Don't highlight multi nullable select_table.
 
 v2.6.13 [2021-09-03]
 -------------------

diff --git a/hbw/app/javascript/packs/hbw/components/form/select_table.js.jsx b/hbw/app/javascript/packs/hbw/components/form/select_table.js.jsx
@@ -20,7 +20,7 @@ modulejs.define('HBWFormSelectTable',
         this.state = {
           value:   Array.isArray(value) ? value.map(el => String(el)) : String(value),
           choices: this.getChoices(),
-          error:   (!props.hasValueInChoices(value) && value) || props.missFieldInVariables(),
+          error:   props.missFieldInVariables(),
           valid:   true
         };
       }
@@ -145,6 +145,12 @@ modulejs.define('HBWFormSelectTable',
         this.setState({ valid: this.props.isValid(this.state.value) });
       };
 
+      setErrorState = () => {
+        this.setState({
+          error: (this.state.value.length === 0 && !this.props.params.nullable) || this.props.missFieldInVariables()
+        });
+      };
+
       controlValidationTooltip = (toHide) => {
         if (toHide) {
           this.tooltip.hide();
@@ -184,6 +190,7 @@ modulejs.define('HBWFormSelectTable',
 
       onValueUpdate = () => {
         this.setValidationState();
+        this.setErrorState();
         this.props.fireFieldValueUpdate(this.props.name, this.state.value);
       }