clean up

Author: pirupius

src/components/renderer/field/fieldLogic.ts

@@ -91,7 +91,7 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
       // evaluate hide
       if (dependent.hide) {
         const targetSection = findFieldSection(formJson, dependent);
-        // console.log('targetSection', targetSection);
+        const isSectionVisible = targetSection?.questions.some((question) => !question.isHidden);
 
         evaluateHide(
           { value: dependent, type: 'field' },
@@ -102,14 +102,24 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
           evaluateExpression,
           updateFormField,
         );
-        // console.log('dependent', dependent);
-        let hasVisibleFields = targetSection?.questions.some((question) => !question.isHidden);
-        // console.log('hasVisibleFields', hasVisibleFields);
-        // console.log('dependent.isHidden', dependent.isHidden);
-        if (!hasVisibleFields && !dependent.isHidden) {
-          // console.log('FORCE RE-RENDER');
+        targetSection.questions = targetSection.questions.map((question) => {
+          if (question.id === dependent.id) {
+            return dependent;
+          }
+          return question;
+        });
+
+        const isDependentFieldHidden = dependent.isHidden;
+        const sectionHasVisibleFieldAfterEvaluation = [...targetSection.questions, dependent].some(
+          (field) => !field.isHidden,
+        );
+
+        if (!isSectionVisible && !isDependentFieldHidden) {
           targetSection.isHidden = false;
           shouldUpdateForm = true;
+        } else if (isSectionVisible && !sectionHasVisibleFieldAfterEvaluation) {
+          targetSection.isHidden = true;
+          shouldUpdateForm = true;
         }
       }
       // evaluate disabled
@@ -201,8 +211,6 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
           },
         );
       }
-      // shouldUpdateForm = true;
-      // console.log('shouldUpdateForm', shouldUpdateForm);
       updateFormField(dependent);
     });
   }
@@ -247,7 +255,6 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
   }
 
   if (shouldUpdateForm) {
-    // console.log('updating form', formJson);
     setForm(formJson);
   }
 }

src/components/renderer/page/page.renderer.component.tsx

@@ -25,7 +25,6 @@ interface CollapsibleSectionContainerProps {
 function PageRenderer({ page, isFormExpanded }: PageRendererProps) {
   const { t } = useTranslation();
   const [isCollapsed, setIsCollapsed] = useState(false);
-  // console.log('page.sections', page.sections);
 
   const visibleSections = useMemo(
     () =>

src/hooks/useFormStateHelpers.ts

@@ -51,7 +51,6 @@ export function useFormStateHelpers(dispatch: Dispatch<Action>, formFields: Form
   }, []);
 
   const setForm = useCallback((formJson: FormSchema) => {
-    // console.log('useFormStateHelpers setForm', formJson);
     dispatch({ type: 'SET_FORM_JSON', value: updateFormSectionReferences(formJson) });
   }, []);
 

src/utils/form-helper.ts

@@ -102,8 +102,6 @@ export function evaluateHide(
     mode: sessionMode,
     patient,
   });
-  // console.log('node', node.value.label);
-  // console.log('isHidden', isHidden);
   node.value.isHidden = isHidden;
   if (type == 'field' && node.value?.questions?.length) {
     node.value?.questions.forEach((question) => {