From 3ca04e0da933ad8aca2ade6e5b00b7ca48e65d0b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 23 Jun 2021 10:34:59 -0700
Subject: [PATCH] Fixed script validation

---
 ui/src/app/form/component/fields/FilterTargetField.js      | 6 +++---
 .../domain/filter/EntityAttributesFilterDefinition.js      | 7 +++++++
 .../app/metadata/domain/filter/NameIdFilterDefinition.js   | 7 +++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
index 2bfd8484d..c273f3462 100644
--- 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
index 727df9f8f..036557706 100644
--- 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
index ff16383e9..f092b5813 100644
--- 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;
         }
     },