Fixed script validation

TIER · Jun 23, 2021 · 3ca04e0 · 3ca04e0
1 parent 8ed495a
commit 3ca04e0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -193,13 +193,13 @@ const FilterTargetField = ({
                                         className="codearea form-control"
                                         rows="8"
                                         onChange={({ target: { value } }) => handleTextChange(value)}
-                                        html={ selectedTarget[0] }
+                                        html={ selectedTarget[0] ? selectedTarget[0] : '' }
                                         innerRef={ref}
                                         dangerouslySetInnerHTML={true}>
                                     </ContentEditable>
-                                    <small id="script-help" className="text-danger">
+                                    {!selectedTarget[0] && <small id="script-help" className="text-danger">
                                         <Translate value="message.required-for-scripts">Required for Scripts</Translate>
-                                    </small>
+                                    </small>}
                                 </> }
                                 {targetType === 'REGEX' &&
                                     <>

diff --git a/ui/src/app/metadata/domain/filter/EntityAttributesFilterDefinition.js b/ui/src/app/metadata/domain/filter/EntityAttributesFilterDefinition.js
@@ -53,6 +53,13 @@ export const EntityAttributesFilterWizard = {
                     errors.entityAttributesFilterTarget.value.addError('message.invalid-regex-pattern');
                 }
             }
+
+            if (formData?.entityAttributesFilterTarget?.entityAttributesFilterTargetType === 'CONDITION_SCRIPT') {
+                const { entityAttributesFilterTarget: { value } } = formData;
+                if (!value[0]) {
+                    errors.entityAttributesFilterTarget.value.addError('message.required-for-scripts');
+                }
+            }
             return errors;
         }
     },

diff --git a/ui/src/app/metadata/domain/filter/NameIdFilterDefinition.js b/ui/src/app/metadata/domain/filter/NameIdFilterDefinition.js
@@ -41,6 +41,13 @@ export const NameIDFilterWizard = {
                     errors.nameIdFormatFilterTarget.value.addError('message.invalid-regex-pattern');
                 }
             }
+
+            if (formData?.nameIdFormatFilterTarget?.nameIdFormatFilterTargetType === 'CONDITION_SCRIPT') {
+                const { nameIdFormatFilterTarget: { value } } = formData;
+                if (!value[0]) {
+                    errors.nameIdFormatFilterTarget.value.addError('message.required-for-scripts');
+                }
+            }
             return errors;
         }
     },