fix(validate): do not validate hidden fields (#2149)

* fix(validate): do not validate hidden fields * fix(program-rule-variable): default to valueType text
dhis2 · Mar 9, 2022 · 308258f · 308258f
1 parent 93e97bc
commit 308258f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/EditModel/form-helpers/validateFields.js b/src/EditModel/form-helpers/validateFields.js
@@ -10,7 +10,7 @@ const isRequiredField = field => get('isRequired', field.fieldOptions) === true;
 
 const isDirtyField = field => field.value;
 
-const isRequiredOrDirtyField = field => isRequiredField(field) || isDirtyField(field);
+const isRequiredOrDirtyField = field => !field.hiddenComponent && (isRequiredField(field) || isDirtyField(field));
 
 const validateField = (field, formRef, formRefStateClone) => {
     const validateResult = formRef.validateField(formRefStateClone, field.name, field.value);

diff --git a/src/config/field-rules.js b/src/config/field-rules.js
@@ -509,6 +509,7 @@ export default new Map([
                 type: 'HIDE_FIELD',
             }],
         },
+        createDefaultRuleForField('valueType', 'TEXT')
     ]],
     ['programStage', [
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -509,6 +509,7 @@ export default new Map([ @@
                     type: 'HIDE_FIELD',
                 }],
             },
+            createDefaultRuleForField('valueType', 'TEXT')
         ]],
         ['programStage', [
             {
@@ Expand Down @@