pr changes

Author: pirupius

src/components/renderer/field/fieldLogic.ts

@@ -3,7 +3,7 @@ import { type FormContextProps } from '../../../provider/form-provider';
 import { type FormFieldValidator, type SessionMode, type ValidationResult, type FormField } from '../../../types';
 import { hasRendering } from '../../../utils/common-utils';
 import { evaluateAsyncExpression, evaluateExpression } from '../../../utils/expression-runner';
-import { evalConditionalRequired, evaluateDisabled, evaluateHide } from '../../../utils/form-helper';
+import { evalConditionalRequired, evaluateDisabled, evaluateHide, findFieldSection } from '../../../utils/form-helper';
 import { isEmpty } from '../../../validators/form-validator';
 import { reportError } from '../../../utils/error-utils';
 
@@ -90,6 +90,9 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
       }
       // evaluate hide
       if (dependent.hide) {
+        const targetSection = findFieldSection(formJson, dependent);
+        // console.log('targetSection', targetSection);
+
         evaluateHide(
           { value: dependent, type: 'field' },
           formFields,
@@ -99,6 +102,15 @@ 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.isHidden = false;
+          shouldUpdateForm = true;
+        }
       }
       // evaluate disabled
       if (typeof dependent.disabled === 'object' && dependent.disabled.disableWhenExpression) {
@@ -189,7 +201,8 @@ function evaluateFieldDependents(field: FormField, values: any, context: FormCon
           },
         );
       }
-      shouldUpdateForm = true;
+      // shouldUpdateForm = true;
+      // console.log('shouldUpdateForm', shouldUpdateForm);
       updateFormField(dependent);
     });
   }
@@ -234,6 +247,7 @@ 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,6 +25,7 @@ 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,6 +51,7 @@ 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

@@ -1,5 +1,5 @@
 import { type LayoutType } from '@openmrs/esm-framework';
-import type { FormField, FormPage, FormSection, SessionMode, FHIRObsResource, RenderType } from '../types';
+import type { FormField, FormPage, FormSection, SessionMode, FHIRObsResource, RenderType, FormSchema } from '../types';
 import { isEmpty } from '../validators/form-validator';
 import { parseToLocalDateTime } from './common-utils';
 import dayjs from 'dayjs';
@@ -102,6 +102,8 @@ 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) => {
@@ -271,3 +273,13 @@ function extractFHIRObsValue(fhirObs: FHIRObsResource, rendering: RenderType) {
       return fhirObs.valueString;
   }
 }
+
+/**
+ * Find formField section
+ * @param formJson FormSchema
+ * @param field FormField
+ */
+export function findFieldSection(formJson: FormSchema, field: FormField) {
+  let page = formJson.pages.find((page) => field.meta.pageId === page.id);
+  return page.sections.find((section) => section.questions.find((question) => question.id === field.id));
+}