O3-2495 Add required attributes to address hierarchy fields (#846)

* O3-2495 Add required attributes to address hierarchy fields * (fix) fix broken unit test --------- Co-authored-by: Donald Kibet <[email protected]>
openmrs · Oct 14, 2023 · af7f7b6 · af7f7b6
1 parent b4e5b07
commit af7f7b6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/...tient-registration-app/src/patient-registration/field/address/address-field.component.tsx b/...tient-registration-app/src/patient-registration/field/address/address-field.component.tsx
@@ -22,14 +22,18 @@ export const AddressComponent: React.FC = () => {
     if (!addressTemplate?.lines) {
       return [];
     }
+
     const allFields = addressTemplate?.lines?.flat();
     const fields = allFields?.filter(({ isToken }) => isToken === 'IS_ADDR_TOKEN');
-
-    return fields.map(({ displayText, codeName }) => ({
-      id: codeName,
-      name: codeName,
-      label: displayText,
-    }));
+    const allRequiredFields = Object.fromEntries(addressTemplate?.requiredElements?.map((curr) => [curr, curr]) || []);
+    return fields.map(({ displayText, codeName }) => {
+      return {
+        id: codeName,
+        name: codeName,
+        label: displayText,
+        required: Boolean(allRequiredFields[codeName]),
+      };
+    });
   }, [addressTemplate]);
 
   const { t } = useTranslation();
@@ -83,6 +87,7 @@ export const AddressComponent: React.FC = () => {
             labelText={t(attributes.label)}
             id={attributes.name}
             selected={selected}
+            required={attributes.required}
           />
         ))}
       </AddressComponentContainer>
@@ -123,6 +128,7 @@ export const AddressComponent: React.FC = () => {
             labelText={t(attributes.label)}
             id={attributes.name}
             selected={selected}
+            required={attributes.required}
           />
         ))
       )}

diff --git a/...tration-app/src/patient-registration/field/address/address-hierarchy-levels.component.tsx b/...tration-app/src/patient-registration/field/address/address-hierarchy-levels.component.tsx
@@ -28,6 +28,7 @@ interface AddressComboBoxProps {
     name: string;
     value: string;
     label: string;
+    required?: boolean;
   };
 }
 
@@ -36,6 +37,7 @@ const AddressComboBox: React.FC<AddressComboBoxProps> = ({ attribute }) => {
   const [field, meta, { setValue }] = useField(`address.${attribute.name}`);
   const { fetchEntriesForField, searchString, updateChildElements } = useAddressEntryFetchConfig(attribute.name);
   const { entries } = useAddressEntries(fetchEntriesForField, searchString);
+  const label = t(attribute.label) + (attribute?.required ? '' : ` (${t('optional', 'optional')})`);
 
   const handleInputChange = useCallback(
     (newValue) => {
@@ -62,7 +64,8 @@ const AddressComboBox: React.FC<AddressComboBoxProps> = ({ attribute }) => {
       fieldProps={{
         ...field,
         id: attribute.name,
-        labelText: `${t(attribute.label)} (${t('optional', 'optional')})`,
+        labelText: label,
+        required: attribute?.required,
       }}
       handleInputChange={handleInputChange}
     />