feat: create address input

src/form/tennis-club-membership.ts

@@ -21,6 +21,7 @@ import {
   field,
   deduplication
 } from '@opencrvs/toolkit/conditionals'
+import { getAddressFields } from './v2/person/address'
 
 const TENNIS_CLUB_FORM = defineForm({
   label: {
@@ -112,7 +113,21 @@ const TENNIS_CLUB_FORM = defineForm({
             description: 'This is the label for the field',
             id: 'event.tennis-club-membership.action.declare.form.section.who.field.image.label'
           }
-        }
+        },
+        {
+          id: 'applicant.address.helper',
+          type: 'PARAGRAPH',
+          required: false,
+          label: {
+            defaultMessage: "Applicant's address",
+            description: 'This is the label for the field',
+            id: 'event.tennis-club-membership.action.declare.form.section.who.field.address.helper.label'
+          },
+          options: {
+            fontVariant: 'h3'
+          }
+        },
+        ...getAddressFields('applicant')
       ]
     },
     {

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

@@ -12,7 +12,7 @@
 import { defineFormPage, TranslationConfig } from '@opencrvs/toolkit/events'
 import { field } from '@opencrvs/toolkit/conditionals'
 import { appendConditionalsToFields, createSelectOptions } from '../../utils'
-import { getAddressFields } from '../../person/address'
+import { AddressType, getAddressFields } from '../../person/address'
 
 const GenderTypes = {
   MALE: 'male',
@@ -235,13 +235,16 @@
     },
     {
       id: 'child.birthLocation',
-      type: 'TEXT', // @ToDo: select
+      type: 'LOCATION',
       required: true,
       label: {
         defaultMessage: 'Health Institution',
         description: 'This is the label for the field',
         id: 'event.birth.action.declare.form.section.child.field.birthLocation.label'
       },
+      options: {
+        type: 'HEALTH_FACILITY'
+      },
       conditionals: [
         {
           type: 'HIDE',
@@ -252,7 +255,7 @@
       ]
     },
     ...appendConditionalsToFields({
-      inputFields: getAddressFields('child.privateHome'),
+      inputFields: getAddressFields(AddressType.childResidentialAddress),
       newConditionals: [
         {
           type: 'HIDE',
@@ -263,7 +266,7 @@
       ]
     }),
     ...appendConditionalsToFields({
-      inputFields: getAddressFields('child.other'),
+      inputFields: getAddressFields(AddressType.childOther),
       newConditionals: [
         {
           type: 'HIDE',

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

@@ -14,7 +14,7 @@ import { field, and } from '@opencrvs/toolkit/conditionals'
 import { childPage } from './child'
 import { informantPage, InformantTypes } from './informant'
 import { appendConditionalsToFields } from '../../utils'
-import { getPersonInputFields } from '../../person'
+import { getPersonInputFields, PersonType } from '../../person'
 
 export const BIRTH_DECLARE_FORM = defineForm({
   label: {
@@ -134,7 +134,7 @@ export const BIRTH_DECLARE_FORM = defineForm({
         },
         ...appendConditionalsToFields({
           inputFields: [
-            ...getPersonInputFields('mother'),
+            ...getPersonInputFields(PersonType.mother),
             {
               id: 'mother.previousBirths',
               type: 'TEXT',
@@ -206,7 +206,7 @@ export const BIRTH_DECLARE_FORM = defineForm({
           ]
         },
         ...appendConditionalsToFields({
-          inputFields: getPersonInputFields('father'),
+          inputFields: getPersonInputFields(PersonType.father),
           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, PersonType } from '../../person'
+import { getAddressFields } from '../../person/address'
 
 export const InformantTypes = {
   MOTHER: 'MOTHER',
@@ -92,8 +93,29 @@ export const informantPage = defineFormPage({
       },
       options: birthInformantTypeOptions
     },
+    {
+      id: 'informant.other.relation',
+      type: 'TEXT',
+      required: true,
+      label: {
+        defaultMessage: 'Relationship to child',
+        description: 'This is the label for the field',
+        id: 'event.birth.action.declare.form.section.informant.field.other.relation.label'
+      },
+      conditionals: [
+        {
+          type: 'HIDE',
+          conditional: field('informant.relation').isUndefinedOrNotInArray([
+            InformantTypes.OTHER
+          ])
+        }
+      ]
+    },
     ...appendConditionalsToFields({
-      inputFields: getInformantFields('informant'),
+      inputFields: [
+        ...getPersonInputCommonFields(PersonType.informant),
+        ...getAddressFields(PersonType.informant)
+      ],
       newConditionals: [
         {
           type: 'HIDE',

src/form/v2/person/address.ts

@@ -9,12 +9,42 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
-import { FieldConfig } from '@opencrvs/toolkit/events'
+import { FieldConfig, TranslationConfig } from '@opencrvs/toolkit/events'
 import { field } from '@opencrvs/toolkit/conditionals'
-import { appendConditionalsToFields } from '../utils'
+import { appendConditionalsToFields, createSelectOptions } from '../utils'
+import { PersonType } from './index'
 
-export const getAddressFields = (person: string): FieldConfig[] => {
-  // @Todo: Same as mother or deseased
+export const AddressType = {
+  childResidentialAddress: 'childResidentialAddress',
+  childOther: 'childOther'
+} as const
+
+export type AddressType = keyof typeof AddressType | PersonType
+
+const UrbanRuralTypes = {
+  URBAN: 'URBAN',
+  RURAL: 'RURAL'
+} as const
+
+const urbanRuralMessageDescriptors = {
+  URBAN: {
+    defaultMessage: 'Urban',
+    id: 'form.field.label.urban',
+    description: 'Label for form field checkbox option Urban'
+  },
+  RURAL: {
+    defaultMessage: 'Rural',
+    id: 'form.field.label.rural',
+    description: 'Label for form field checkbox option Rural'
+  }
+} satisfies Record<keyof typeof UrbanRuralTypes, TranslationConfig>
+
+const urbanRuralRadioOptions = createSelectOptions(
+  UrbanRuralTypes,
+  urbanRuralMessageDescriptors
+)
+
+export const getAddressFields = (person: AddressType): FieldConfig[] => {
   const prefix = `${person}.address`
 
   const genericAddressFields: FieldConfig[] = [
@@ -90,27 +120,7 @@
     }
   ]
 
-  const farajalandAddressFields: FieldConfig[] = [
-    {
-      id: `${prefix}.province`,
-      type: 'TEXT',
-      required: true,
-      label: {
-        defaultMessage: 'Province',
-        description: 'This is the label for the field',
-        id: `event.action.declare.form.section.person.field.address.province.label`
-      }
-    },
-    {
-      id: `${prefix}.district`,
-      type: 'TEXT',
-      required: true,
-      label: {
-        defaultMessage: 'District',
-        description: 'This is the label for the field',
-        id: `event.action.declare.form.section.person.field.address.district.label`
-      }
-    },
+  const urbanAddressFields: FieldConfig[] = [
     {
       id: `${prefix}.town`,
       type: 'TEXT',
@@ -162,6 +172,78 @@
       }
     }
   ]
+  const farajalandAddressFields: FieldConfig[] = [
+    {
+      id: `${prefix}.province`,
+      type: 'LOCATION',
+      required: true,
+      label: {
+        defaultMessage: 'Province',
+        description: 'This is the label for the field',
+        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',
+        description: 'This is the label for the field',
+        id: `event.birth.action.declare.form.section.${person}.field.address.district.label`
+      },
+      options: {
+        partOf: {
+          $data: `${prefix}.province`
+        },
+        type: 'ADMIN_STRUCTURE'
+      }
+    },
+    {
+      id: `${prefix}.urbanOrRural`,
+      type: 'RADIO_GROUP',
+      options: urbanRuralRadioOptions,
+      flexDirection: 'row',
+      required: false,
+      label: {
+        defaultMessage: 'Urban or Rural',
+        description: 'This is the label for the field',
+        id: `event.birth.action.declare.form.section.${person}.field.address.urbanOrRural.label`
+      }
+    },
+    ...appendConditionalsToFields({
+      inputFields: urbanAddressFields,
+      newConditionals: [
+        {
+          type: 'HIDE',
+          conditional: field(`${prefix}.urbanOrRural`).isUndefinedOrInArray([
+            'RURAL'
+          ])
+        }
+      ]
+    }),
+    {
+      id: `${prefix}.village`,
+      type: 'TEXT',
+      required: false,
+      label: {
+        defaultMessage: 'Village',
+        description: 'This is the label for the field',
+        id: `event.birth.action.declare.form.section.${person}.field.address.village.label`
+      },
+      conditionals: [
+        {
+          type: 'HIDE',
+          conditional: field(`${prefix}.urbanOrRural`).isUndefinedOrInArray([
+            'URBAN'
+          ])
+        }
+      ]
+    }
+  ]
 
   return [
     {