feat: create address input

src/form/v2/birth/forms/child.ts

@@ -235,7 +235,7 @@
     },
     {
       id: 'child.birthLocation',
       type: 'LOCATION',
       required: true,
       label: {
         defaultMessage: 'Health Institution',
@@ -243,7 +243,7 @@
         id: 'event.birth.action.declare.form.section.child.field.birthLocation.label'
       },
       options: {
         type: 'HEALTH_FACILITY'
       },
       conditionals: [
         {
@@ -255,7 +255,7 @@
       ]
     },
     ...appendConditionalsToFields({
-      inputFields: getAddressFields('child.privateHome'),
+      inputFields: getAddressFields('child.residentialAddress'),
       newConditionals: [
         {
           type: 'HIDE',

src/form/v2/birth/forms/informant.ts

@@ -12,7 +12,8 @@
 import { defineFormPage, TranslationConfig } from '@opencrvs/toolkit/events'
 import { field } from '@opencrvs/toolkit/conditionals'
 import { appendConditionalsToFields, createSelectOptions } from '../../utils'
-import { getInformantFields } from '../../person'
+import { getPersonInputCommonFields } from '../../person'
+import { getAddressFields } from '../../person/address'
 
 export const InformantTypes = {
   MOTHER: 'MOTHER',
@@ -111,7 +112,10 @@ export const informantPage = defineFormPage({
       ]
     },
     ...appendConditionalsToFields({
-      inputFields: getInformantFields('informant'),
+      inputFields: [
+        ...getPersonInputCommonFields('informant'),
+        ...getAddressFields('informant')
+      ],
       newConditionals: [
         {
           type: 'HIDE',

src/form/v2/person/address.ts

@@ -12,6 +12,12 @@
 import { FieldConfig, TranslationConfig } from '@opencrvs/toolkit/events'
 import { field } from '@opencrvs/toolkit/conditionals'
 import { appendConditionalsToFields, createSelectOptions } from '../utils'
+import { PersonTypes } from '.'
+
+export type AddressTypes =
+  | 'child.residentialAddress'
+  | 'child.other'
+  | PersonTypes
 
 const UrbanRuralTypes = {
   URBAN: 'URBAN',
@@ -36,7 +42,7 @@
   urbanRuralMessageDescriptors
 )
 
-export const getAddressFields = (person: string): FieldConfig[] => {
+export const getAddressFields = (person: AddressTypes): FieldConfig[] => {
   const prefix = `${person}.address`
 
   const genericAddressFields: FieldConfig[] = [
@@ -167,7 +173,7 @@
   const farajalandAddressFields: FieldConfig[] = [
     {
       id: `${prefix}.province`,
       type: 'LOCATION',
       required: true,
       label: {
         defaultMessage: 'Province',
@@ -175,12 +181,12 @@
         id: `event.birth.action.declare.form.section.${person}.field.address.province.label`
       },
       options: {
         type: 'ADMIN_STRUCTURE'
       }
     },
     {
       id: `${prefix}.district`,
       type: 'LOCATION',
       required: true,
       label: {
         defaultMessage: 'District',
@@ -188,7 +194,7 @@
         id: `event.birth.action.declare.form.section.${person}.field.address.district.label`
       },
       options: {
         partOf: {
           $data: `${prefix}.province`
         },
         type: 'ADMIN_STRUCTURE'
@@ -197,7 +203,7 @@
     {
       id: `${prefix}.urbanOrRural`,
       type: 'RADIO_GROUP',
       options: urbanRuralRadioOptions,
       flexDirection: 'row',
       required: false,
       label: {

src/form/v2/person/index.ts

@@ -14,6 +14,8 @@
 import { getAddressFields } from './address'
 import { appendConditionalsToFields, createSelectOptions } from '../utils'
 
+export type PersonTypes = 'father' | 'mother' | 'informant' | 'applicant'
+
 const IDTypes = {
   NATIONAL_ID: 'NATIONAL_ID',
   PASSPORT: 'PASSPORT',
@@ -150,7 +152,7 @@
   yesNoMessageDescriptors
 )
 
-const getIdFields = (person: string): FieldConfig[] => [
+const getIdFields = (person: PersonTypes): FieldConfig[] => [
   {
     id: `${person}.idType`,
     type: 'SELECT',
@@ -218,56 +220,9 @@
   }
 ]
 
-const getAddressOrSameAsMotherFields = (person: string): FieldConfig[] => {
-  if (person === 'father')
-    return [
-      ...appendConditionalsToFields({
-        inputFields: [
-          {
-            id: `${person}.addressSameAsHelper`,
-            type: 'PARAGRAPH',
-            label: {
-              defaultMessage: "Same as mother's usual place of residence?",
-              description: 'This is the label for the field',
-              id: `event.birth.action.declare.form.section.${person}.field.addressSameAsHelper.label`
-            },
-            options: { fontVariant: 'reg16' }
-          },
-          {
-            id: `${person}.addressSameAs`,
-            type: 'RADIO_GROUP',
-            options: yesNoRadioOptions,
-            required: true,
-            label: {
-              defaultMessage: "Same as mother's usual place of residence?",
-              description: 'This is the label for the field',
-              id: `event.birth.action.declare.form.section.${person}.field.address.addressSameAs.label`
-            }
-          }
-        ],
-        newConditionals: [
-          {
-            type: 'HIDE',
-            conditional: field('mother.detailsNotAvailable').isInArray(['true'])
-          }
-        ]
-      }),
-      ...appendConditionalsToFields({
-        inputFields: getAddressFields(person),
-        newConditionals: [
-          {
-            type: 'HIDE',
-            conditional: field(`${person}.addressSameAs`).isInArray([
-              YesNoTypes.YES
-            ])
-          }
-        ]
-      })
-    ]
-  return getAddressFields(person)
-}
-
-export const getInformantFields = (person: string): FieldConfig[] => [
+export const getPersonInputCommonFields = (
+  person: PersonTypes
+): FieldConfig[] => [
   {
     id: `${person}.firstname`,
     type: 'TEXT',
@@ -362,42 +317,95 @@
       id: `event.birth.action.declare.form.section.${person}.field.addressHelper.label`
     },
     options: { fontVariant: 'h2' }
-  },
-  ...getAddressOrSameAsMotherFields(person)
+  }
 ]
 
-export const getPersonInputFields = (person: string): FieldConfig[] => [
-  ...getInformantFields(person),
-  {
-    id: `${person}.maritalStatus`,
-    type: 'SELECT',
-    required: false,
-    label: {
-      defaultMessage: 'Marital Status',
-      description: 'This is the label for the field',
-      id: `event.birth.action.declare.form.section.${person}.field.maritalStatus.label`
+const fatherAddressFields = [
+  ...appendConditionalsToFields({
+    inputFields: [
+      {
+        id: `${'father' satisfies PersonTypes}.addressSameAsHelper`,
+        type: 'PARAGRAPH',
+        label: {
+          defaultMessage: "Same as mother's usual place of residence?",
+          description: 'This is the label for the field',
+          id: `event.birth.action.declare.form.section.${
+            'father' satisfies PersonTypes
+          }.field.addressSameAsHelper.label`
+        },
+        options: { fontVariant: 'reg16' }
+      },
+      {
+        id: `${'father' satisfies PersonTypes}.addressSameAs`,
+        type: 'RADIO_GROUP',
+        options: yesNoRadioOptions,
+        required: true,
+        label: {
+          defaultMessage: "Same as mother's usual place of residence?",
+          description: 'This is the label for the field',
+          id: `event.birth.action.declare.form.section.${
+            'father' satisfies PersonTypes
+          }.field.address.addressSameAs.label`
+        }
+      }
+    ],
+    newConditionals: [
+      {
+        type: 'HIDE',
+        conditional: field(
+          `${'mother' satisfies PersonTypes}.detailsNotAvailable`
+        ).isInArray(['true'])
+      }
+    ]
+  }),
+  ...appendConditionalsToFields({
+    inputFields: getAddressFields('father' satisfies PersonTypes),
+    newConditionals: [
+      {
+        type: 'HIDE',
+        conditional: field(
+          `${'father' satisfies PersonTypes}.addressSameAs`
+        ).isInArray([YesNoTypes.YES])
+      }
+    ]
+  })
+]
+export const getPersonInputFields = (person: PersonTypes): FieldConfig[] => {
+  const isFather = person === 'father'
+  return [
+    ...getPersonInputCommonFields(person),
+    ...(isFather ? fatherAddressFields : getAddressFields(person)),
+    {
+      id: `${person}.maritalStatus`,
+      type: 'SELECT',
+      required: false,
+      label: {
+        defaultMessage: 'Marital Status',
+        description: 'This is the label for the field',
+        id: `event.birth.action.declare.form.section.${person}.field.maritalStatus.label`
+      },
+      options: maritalStatusOptions
     },
-    options: maritalStatusOptions
-  },
-  {
-    id: `${person}.educationalAttainment`,
-    type: 'SELECT',
-    required: false,
-    label: {
-      defaultMessage: 'Level of education',
-      description: 'This is the label for the field',
-      id: `event.birth.action.declare.form.section.${person}.field.educationalAttainment.label`
+    {
+      id: `${person}.educationalAttainment`,
+      type: 'SELECT',
+      required: false,
+      label: {
+        defaultMessage: 'Level of education',
+        description: 'This is the label for the field',
+        id: `event.birth.action.declare.form.section.${person}.field.educationalAttainment.label`
+      },
+      options: educationalAttainmentOptions
     },
-    options: educationalAttainmentOptions
-  },
-  {
-    id: `${person}.occupation`,
-    type: 'TEXT',
-    required: false,
-    label: {
-      defaultMessage: 'Occupation',
-      description: 'This is the label for the field',
-      id: `event.birth.action.declare.form.section.${person}.field.occupation.label`
+    {
+      id: `${person}.occupation`,
+      type: 'TEXT',
+      required: false,
+      label: {
+        defaultMessage: 'Occupation',
+        description: 'This is the label for the field',
+        id: `event.birth.action.declare.form.section.${person}.field.occupation.label`
+      }
     }
-  }
-]
+  ]
+}