Merge pull request #1153 from opencrvs/sync-far-14-11

fix: farajaland name config

Author: jamil314

package.json

@@ -69,7 +69,7 @@
     "@hapi/boom": "^9.1.1",
     "@hapi/hapi": "^20.0.1",
     "@hapi/inert": "^6.0.3",
-    "@opencrvs/toolkit": "1.9.0-rc.a9cc5f2",
+    "@opencrvs/toolkit": "1.9.0-rc.79b0f42",
     "@types/chalk": "^2.2.0",
     "@types/csv2json": "^1.4.0",
     "@types/fhir": "^0.0.30",

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

@@ -27,8 +27,8 @@ import { applicationConfig } from '@countryconfig/api/application/application-co
 
 import { createSelectOptions, emptyMessage } from '@countryconfig/form/v2/utils'
 import {
-  invalidNameValidator,
-  MAX_NAME_LENGTH
+  farajalandNameConfig,
+  invalidNameValidator
 } from '@countryconfig/form/v2/birth/validators'
 import {
   defaultStreetAddressConfiguration,
@@ -197,7 +197,7 @@ export const child = defineFormPage({
       id: 'child.name',
       type: FieldType.NAME,
       required: true,
-      configuration: { maxLength: MAX_NAME_LENGTH },
+      configuration: farajalandNameConfig,
       hideLabel: true,
       label: {
         defaultMessage: "Child's name",

src/form/v2/birth/forms/pages/father.ts

@@ -22,8 +22,8 @@ import {
 import { or, not } from '@opencrvs/toolkit/conditionals'
 import { emptyMessage } from '@countryconfig/form/v2/utils'
 import {
+  farajalandNameConfig,
   invalidNameValidator,
-  MAX_NAME_LENGTH,
   nationalIdValidator
 } from '@countryconfig/form/v2/birth/validators'
 import { InformantType } from './informant'
@@ -111,7 +111,7 @@ export const father = defineFormPage({
       id: 'father.name',
       type: FieldType.NAME,
       required: true,
-      configuration: { maxLength: MAX_NAME_LENGTH },
+      configuration: farajalandNameConfig,
       hideLabel: true,
       label: {
         defaultMessage: "Father's name",

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

@@ -24,8 +24,8 @@ import {
 import { not } from '@opencrvs/toolkit/conditionals'
 import { createSelectOptions, emptyMessage } from '../../../utils'
 import {
+  farajalandNameConfig,
   invalidNameValidator,
-  MAX_NAME_LENGTH,
   nationalIdValidator
 } from '@countryconfig/form/v2/birth/validators'
 import { IdType, idTypeOptions } from '../../../person'
@@ -148,7 +148,7 @@ export const informant = defineFormPage({
       id: 'informant.name',
       type: FieldType.NAME,
       required: true,
-      configuration: { maxLength: MAX_NAME_LENGTH },
+      configuration: farajalandNameConfig,
       hideLabel: true,
       label: {
         defaultMessage: "Informant's name",

src/form/v2/birth/forms/pages/mother.ts

@@ -24,7 +24,7 @@ import { emptyMessage } from '@countryconfig/form/v2/utils'
 import {
   invalidNameValidator,
   nationalIdValidator,
-  MAX_NAME_LENGTH
+  farajalandNameConfig
 } from '@countryconfig/form/v2/birth/validators'
 import { InformantType } from './informant'
 import { IdType, idTypeOptions } from '../../../person'
@@ -108,7 +108,7 @@ export const mother = defineFormPage({
       id: 'mother.name',
       type: FieldType.NAME,
       required: true,
-      configuration: { maxLength: MAX_NAME_LENGTH },
+      configuration: farajalandNameConfig,
       hideLabel: true,
       label: {
         defaultMessage: "Mother's name",

src/form/v2/birth/forms/printForm/collector-other.ts

@@ -16,8 +16,8 @@ import {
   FieldType
 } from '@opencrvs/toolkit/events'
 import {
+  farajalandNameConfig,
   invalidNameValidator,
-  MAX_NAME_LENGTH,
   nationalIdValidator
 } from '../../validators'
 
@@ -275,7 +275,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
     id: 'collector.OTHER.name',
     type: FieldType.NAME,
     required: true,
-    configuration: { maxLength: MAX_NAME_LENGTH },
+    configuration: farajalandNameConfig,
     hideLabel: true,
     label: {
       defaultMessage: "Collector's name",

src/form/v2/birth/validators.ts

@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { defineFormConditional } from '@opencrvs/toolkit/conditionals'
-import { field } from '@opencrvs/toolkit/events'
+import { and, field } from '@opencrvs/toolkit/events'
 
 export const MAX_NAME_LENGTH = 32
 
@@ -20,11 +20,11 @@ export const invalidNameValidator = (fieldName: string) => ({
     description: 'This is the error message for invalid name',
     id: 'error.invalidName'
   },
-  validator: field(fieldName).object({
-    firstname: field('firstname').isValidEnglishName(),
-    middlename: field('middlename').isValidEnglishName(),
-    surname: field('surname').isValidEnglishName()
-  })
+  validator: and(
+    field(fieldName).get('firstname').isValidEnglishName(),
+    field(fieldName).get('middlename').isValidEnglishName(),
+    field(fieldName).get('surname').isValidEnglishName()
+  )
 })
 
 export const nationalIdValidator = (fieldId: string) => ({
@@ -45,3 +45,11 @@ export const nationalIdValidator = (fieldId: string) => ({
     }
   })
 })
+
+export const farajalandNameConfig = {
+  name: {
+    firstname: { required: true },
+    surname: { required: true }
+  },
+  maxLength: MAX_NAME_LENGTH
+}

src/form/v2/death/forms/pages/deceased.ts

@@ -24,8 +24,8 @@ import { not, never } from '@opencrvs/toolkit/conditionals'
 
 import { createSelectOptions, emptyMessage } from '@countryconfig/form/v2/utils'
 import {
+  farajalandNameConfig,
   invalidNameValidator,
-  MAX_NAME_LENGTH,
   nationalIdValidator
 } from '@countryconfig/form/v2/birth/validators'
 import {
@@ -76,7 +76,7 @@ export const deceased = defineFormPage({
     {
       id: 'deceased.name',
       type: FieldType.NAME,
-      configuration: { maxLength: MAX_NAME_LENGTH },
+      configuration: farajalandNameConfig,
       required: true,
       hideLabel: true,
       label: {

src/form/v2/death/forms/pages/informant.ts

@@ -24,8 +24,8 @@ import {
 import { not } from '@opencrvs/toolkit/conditionals'
 import { createSelectOptions, emptyMessage } from '../../../utils'
 import {
+  farajalandNameConfig,
   invalidNameValidator,
-  MAX_NAME_LENGTH,
   nationalIdValidator
 } from '@countryconfig/form/v2/birth/validators'
 import {
@@ -157,7 +157,7 @@ export const informant = defineFormPage({
     },
     {
       id: 'informant.name',
-      configuration: { maxLength: MAX_NAME_LENGTH },
+      configuration: farajalandNameConfig,
       type: FieldType.NAME,
       required: true,
       hideLabel: true,

src/form/v2/death/forms/pages/spouse.ts

@@ -23,8 +23,8 @@ import {
 import { not } from '@opencrvs/toolkit/conditionals'
 import { emptyMessage } from '../../../utils'
 import {
+  farajalandNameConfig,
   invalidNameValidator,
-  MAX_NAME_LENGTH,
   nationalIdValidator
 } from '@countryconfig/form/v2/birth/validators'
 import {
@@ -107,7 +107,7 @@ export const spouse = defineFormPage({
     },
     {
       id: 'spouse.name',
-      configuration: { maxLength: MAX_NAME_LENGTH },
+      configuration: farajalandNameConfig,
       type: FieldType.NAME,
       required: true,
       hideLabel: true,