Merge pull request #9970 from opencrvs/merge-1_7_3-to-1_8_0

Merge 1.7.3 to 1.8.0

Author: adskyiproger

.github/workflows/lint-and-test.yml

@@ -430,12 +430,20 @@ jobs:
           ref: ${{ github.head_ref }}
           path: pr
 
-      - uses: actions/setup-node@v4
+      - name: Use Node.js from .nvmrc from base branch
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: base/.nvmrc
 
       - name: Install base dependencies
         run: yarn install --ignore-scripts
         working-directory: base
 
+      - name: Use Node.js from .nvmrc from PR branch
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: pr/.nvmrc
+
       - name: Install PR dependencies
         run: yarn install --ignore-scripts
         working-directory: pr

CHANGELOG.md

@@ -20,7 +20,18 @@
   - Secret `GITHUB_GHCR_PUBLISH_TOKEN` is classic token with permissions `repo, write:packages`. Required to build and push OpenCRVS Core images.
   - Secret `E2E_WORKFLOWS_TOKEN` is fine-grained token scoped to your fork of country config template repository with permissions `Contents: Read and Write`.
 
-## 1.7.2
+## [1.7.3](https://github.com/opencrvs/opencrvs-core/compare/v1.7.2...v1.7.3)
+
+### New features
+
+### Bug fixes
+
+- Allow booleanTransformer to be used as a certificate handlebar template transformer [#9631](https://github.com/opencrvs/opencrvs-core/issues/9631)
+- Fix international to local number conversion from failing if the number was already local [#9634](https://github.com/opencrvs/opencrvs-core/issues/9634)
+- Pre-select default certificate option in print certificate collector form [#9935](https://github.com/opencrvs/opencrvs-core/issues/9935)
+
+
+## [1.7.2](https://github.com/opencrvs/opencrvs-core/compare/v1.7.1...v1.7.2)
 
 ### New features
 
@@ -102,14 +113,14 @@
 
 ## [1.6.5](https://github.com/opencrvs/opencrvs-core/compare/v1.6.4...v1.6.5)
 
-- Fix migration issue discovered when restoring an OpenCRVS instance with a large number of records. `$push used too much memory and cannot spill to disk. Memory limit: 104857600 bytes` [#9116](https://github.com/opencrvs/opencrvs-core/issues/9116)
-
 ### Breaking changes
 
 - Limit year past record `LIMIT_YEAR_PAST_RECORDS` forcing date of birth to start from the year 1900 has been addressed [#9326](https://github.com/opencrvs/opencrvs-core/pull/9326)
 
 ## [1.6.4](https://github.com/opencrvs/opencrvs-core/compare/v1.6.3...v1.6.4)
 
+### Bug fixes
+
 - Fix migration issue discovered when restoring an OpenCRVS instance with a large number of records. `$push used too much memory and cannot spill to disk. Memory limit: 104857600 bytes` [#9116](https://github.com/opencrvs/opencrvs-core/issues/9116)
 
 ## [1.6.3](https://github.com/opencrvs/opencrvs-core/compare/v1.6.2...v1.6.3)
@@ -138,7 +149,6 @@
 - Fix health facilities missing from dropdown after correcting a record address [#7528](https://github.com/opencrvs/opencrvs-core/issues/7528)
 - Fix stale validations showing for document uploader with options form field
 - Fix a bug in the POST `{{gateway}}/locations` endpoint used to create new locations, the check to verify if a `statisticalId` was already used was broken so we've fixed that. This was picked when we were trying to seed a location for a country via the endpoint [#8606](https://github.com/opencrvs/opencrvs-core/issues/8606)
-- Fix task history getting corrupted if a user views a record while it's in external validation [#8278](https://github.com/opencrvs/opencrvs-core/issues/8278)
 
 ### Improvements
 

development-environment/setup-countryconfig.sh

@@ -34,7 +34,7 @@ echo
 
 cd ../
 
-BRANCH=develop
+BRANCH=master
 
 
 git clone --branch $BRANCH --depth 1 https://github.com/opencrvs/opencrvs-countryconfig.git

packages/client/src/components/form/FormFieldGenerator.tsx

@@ -805,6 +805,10 @@ export const mapFieldsToValues = (
       ...evalParams
     )
 
+    if (field.type === SELECT_WITH_OPTIONS && !field.initialValue) {
+      fieldInitialValue = field.options.find((x) => x.isDefault)?.value ?? ''
+    }
+
     if (field.type === RADIO_GROUP_WITH_NESTED_FIELDS && !field.initialValue) {
       const nestedFieldsFlatted = flatten(Object.values(field.nestedFields))
 
@@ -1194,29 +1198,7 @@ export class FormSectionComponent extends React.Component<Props> {
                             setValues(updatedValues)
                           }
                         } as ILoaderButton)
-                      : field.type === LOCATION_SEARCH_INPUT
-                        ? {
-                            ...field,
-                            locationList: generateLocations(
-                              field.searchableResource.reduce(
-                                (locations, resource) => {
-                                  return {
-                                    ...locations,
-                                    ...getListOfLocations(
-                                      offlineCountryConfig,
-                                      resource
-                                    )
-                                  }
-                                },
-                                {}
-                              ),
-                              intl,
-                              (location) =>
-                                field.searchableType.includes(location.type),
-                              field.userOfficeId
-                            )
-                          }
-                        : field
+                      : field
 
           if (
             field.type === FETCH_BUTTON ||

packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts

@@ -1066,7 +1066,8 @@ function getCertCollectorGroupForEvent(
   const certificateTemplateOptions =
     certificates
       .filter((x) => x.event === declaration.event)
-      .map((x) => ({ label: x.label, value: x.id })) || []
+      .map((x) => ({ label: x.label, value: x.id, isDefault: x.isDefault })) ||
+    []
   return {
     id: 'certCollector',
     title: certificateMessages.whoToCollect,

packages/client/src/forms/index.ts

@@ -112,6 +112,7 @@ export type Action = SubmissionAction | DownloadAction
 export interface ISelectOption {
   value: SelectComponentOption['value']
   label: MessageDescriptor
+  isDefault?: boolean
 }
 export interface IRadioOption {
   value: RadioComponentOption['value']

packages/client/src/forms/register/mappings/query/field-mappings.ts

@@ -603,6 +603,9 @@ export const booleanTransformer = (
   sectionId: SectionId,
   field: IFormField
 ) => {
+  if (!transformedData[sectionId]) {
+    transformedData[sectionId] = {}
+  }
   // graphql boolean ignored unless forced like this
   if (queryData && queryData[sectionId] && field && field.name) {
     transformedData[sectionId][field.name] = queryData[sectionId][field.name]

packages/client/src/forms/register/mappings/query/registration-mappings.test.ts

@@ -10,16 +10,25 @@
  */
 
 import { convertToLocal } from './registration-mappings'
+describe('convertToLocal', () => {
+  describe('given number in international format', () => {
+    it('replaces country code and returns local format', async () => {
+      expect(convertToLocal('+260211000000', 'ZMB')).toBe('0211000000')
+      expect(convertToLocal('+358504700715', 'FIN')).toBe('0504700715')
+      expect(convertToLocal('+237666666666', 'CMR')).toBe('666666666')
+      expect(convertToLocal('+8801700000000', 'BGD')).toBe('01700000000')
+      expect(convertToLocal('+260211000000')).toBe('0211000000')
+      expect(convertToLocal('+358504700715')).toBe('0504700715')
+      expect(convertToLocal('+237666666666')).toBe('666666666')
+      expect(convertToLocal('+8801700000000')).toBe('01700000000')
+    })
+  })
 
-describe('phone number conversion from international format back to local format', () => {
-  it('replaces country code', async () => {
-    expect(convertToLocal('+260211000000', 'ZMB')).toBe('0211000000')
-    expect(convertToLocal('+358504700715', 'FIN')).toBe('0504700715')
-    expect(convertToLocal('+237666666666', 'CMR')).toBe('666666666')
-    expect(convertToLocal('+8801700000000', 'BGD')).toBe('01700000000')
-    expect(convertToLocal('+260211000000')).toBe('0211000000')
-    expect(convertToLocal('+358504700715')).toBe('0504700715')
-    expect(convertToLocal('+237666666666')).toBe('666666666')
-    expect(convertToLocal('+8801700000000')).toBe('01700000000')
+  describe('given number in local format with country code', () => {
+    it('returns the local number', async () => {
+      expect(convertToLocal('0835114899', 'ZAF')).toBe('0835114899')
+      expect(convertToLocal('0650310707', 'SOM')).toBe('0650310707')
+      expect(convertToLocal('650310707', 'SOM')).toBe('0650310707')
+    })
   })
 })

packages/client/src/forms/register/mappings/query/registration-mappings.ts

@@ -32,7 +32,11 @@ import { get } from 'lodash'
 import { MessageDescriptor } from 'react-intl'
 import QRCode from 'qrcode'
 import { getAddressName } from '@client/views/SysAdmin/Team/utils'
-import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber'
+import {
+  PhoneNumber,
+  PhoneNumberFormat,
+  PhoneNumberUtil
+} from 'google-libphonenumber'
 import {
   countryAlpha3toAlpha2,
   getLocationHierarchy
@@ -94,28 +98,34 @@ export const certificateDateTransformer =
     window.__localeId__ = prevLocale
   }
 
+const getParseableCountryCode = (alpha3CountryCode?: string): string => {
+  if (!alpha3CountryCode) {
+    return ''
+  }
+  alpha3CountryCode = alpha3CountryCode === 'FAR' ? 'ZMB' : alpha3CountryCode
+
+  return countryAlpha3toAlpha2(alpha3CountryCode) || ''
+}
+
 export const convertToLocal = (
   mobileWithCountryCode: string,
   alpha3CountryCode?: string
 ) => {
   /*
    *  If country is the fictional demo country (Farajaland), use Zambian number format
    */
-  alpha3CountryCode = alpha3CountryCode === 'FAR' ? 'ZMB' : alpha3CountryCode
-
   const phoneUtil = PhoneNumberUtil.getInstance()
-  const number = phoneUtil.parse(mobileWithCountryCode)
-  const countryCode = alpha3CountryCode
-    ? countryAlpha3toAlpha2(alpha3CountryCode)
-    : phoneUtil.getRegionCodeForNumber(number)
 
-  if (!countryCode) {
-    return
-  }
+  const alpha2Code = getParseableCountryCode(alpha3CountryCode)
 
-  if (!phoneUtil.isPossibleNumberString(mobileWithCountryCode, countryCode)) {
+  if (!phoneUtil.isPossibleNumberString(mobileWithCountryCode, alpha2Code)) {
     return
   }
+
+  const number = phoneUtil.parse(mobileWithCountryCode, alpha2Code)
+
+  const countryCode = alpha2Code || phoneUtil.getRegionCodeForNumber(number)
+
   let nationalFormat = phoneUtil
     .format(number, PhoneNumberFormat.NATIONAL)
     .replace(/[^A-Z0-9]+/gi, '')

packages/client/src/views/PrintCertificate/collectorForm/CollectorForm.test.tsx

@@ -209,10 +209,7 @@ describe('Certificate collector test for a birth registration without father det
 
     it('prompt error when no option is selected', async () => {
       component.find('#confirm_form').hostNodes().simulate('click')
-      await waitForElement(component, '#certificateTemplateId_error')
-      expect(
-        component.find('#certificateTemplateId_error').hostNodes().text()
-      ).toBe('Please select certificate type')
+      await waitForElement(component, '#type_error')
       expect(component.find('#type_error').hostNodes().text()).toBe(
         'Please select who is collecting the certificate'
       )