From 6eb995eb7b9ade5af5e3d0c2fc66e283ad42ae75 Mon Sep 17 00:00:00 2001 From: Siyasanga Date: Tue, 6 Aug 2024 15:12:35 +0200 Subject: [PATCH 1/5] Remove extra divider on Birth form's mother section * Also update the precedingFieldId of the defaultAddressConfiguration (#7404)[https://github.com/opencrvs/opencrvs-core/issues/7404] --- src/form/addresses/index.ts | 3 ++- src/form/birth/index.ts | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/form/addresses/index.ts b/src/form/addresses/index.ts index 97bee6497..9cf67a073 100644 --- a/src/form/addresses/index.ts +++ b/src/form/addresses/index.ts @@ -93,7 +93,8 @@ export const defaultAddressConfiguration: IAddressConfiguration[] = [ }, { // MOTHER ADDRESS FIELDS - precedingFieldId: 'birth.mother.mother-view-group.mother-nid-seperator', + precedingFieldId: + 'birth.mother.mother-view-group.motherBirthRegistrationNumber', configurations: [ { config: AddressSubsections.PRIMARY_ADDRESS_SUBSECTION, diff --git a/src/form/birth/index.ts b/src/form/birth/index.ts index 8fd20b3ae..adb5c009a 100644 --- a/src/form/birth/index.ts +++ b/src/form/birth/index.ts @@ -353,8 +353,6 @@ export const birthForm: ISerializedForm = { hideIfNidIntegrationEnabled.concat(detailsExist), true ), - // preceding field of address fields - divider('mother-nid-seperator', detailsExist), // ADDRESS FIELDS WILL RENDER HERE divider('mother-address-seperator', detailsExist), getMaritalStatus(certificateHandlebars.motherMaritalStatus, [ From ecfd0aa43d6687f2df049dac9586cf61c94a2b99 Mon Sep 17 00:00:00 2001 From: Siyasanga Date: Wed, 7 Aug 2024 10:30:46 +0200 Subject: [PATCH 2/5] Remove extra divider on Birth form's father section * Also update the precedingFieldId of the defaultAddressConfiguration (#7404)[https://github.com/opencrvs/opencrvs-core/issues/7404] --- src/form/addresses/index.ts | 3 ++- src/form/birth/index.ts | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/form/addresses/index.ts b/src/form/addresses/index.ts index 9cf67a073..36fb0bcdf 100644 --- a/src/form/addresses/index.ts +++ b/src/form/addresses/index.ts @@ -118,7 +118,8 @@ export const defaultAddressConfiguration: IAddressConfiguration[] = [ }, { // FATHER ADDRESS FIELDS - precedingFieldId: 'birth.father.father-view-group.father-nid-seperator', + precedingFieldId: + 'birth.father.father-view-group.fatherBirthRegistrationNumber', configurations: [ { config: AddressSubsections.PRIMARY_ADDRESS_SUBSECTION, diff --git a/src/form/birth/index.ts b/src/form/birth/index.ts index adb5c009a..2123080cc 100644 --- a/src/form/birth/index.ts +++ b/src/form/birth/index.ts @@ -440,8 +440,6 @@ export const birthForm: ISerializedForm = { hideIfNidIntegrationEnabled.concat(detailsExist), true ), - // preceding field of address fields - divider('father-nid-seperator', detailsExist), // ADDRESS FIELDS WILL RENDER HERE divider('father-address-seperator', detailsExist), getMaritalStatus(certificateHandlebars.fatherMaritalStatus, [ From 44addef5f447c40a6a5b682b60fa49479a05efc9 Mon Sep 17 00:00:00 2001 From: Siyasanga Date: Wed, 7 Aug 2024 10:46:32 +0200 Subject: [PATCH 3/5] Remove extra divider on Death form's Spouse section * Also update the precedingFieldId of the defaultAddressConfiguration (#7404)[https://github.com/opencrvs/opencrvs-core/issues/7404] --- src/form/addresses/index.ts | 3 ++- src/form/death/index.ts | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/form/addresses/index.ts b/src/form/addresses/index.ts index 36fb0bcdf..b569e6bc1 100644 --- a/src/form/addresses/index.ts +++ b/src/form/addresses/index.ts @@ -268,7 +268,8 @@ export const defaultAddressConfiguration: IAddressConfiguration[] = [ },*/ { // SPOUSE ADDRESS FIELDS - precedingFieldId: 'death.spouse.spouse-view-group.spouse-nid-seperator', + precedingFieldId: + 'death.spouse.spouse-view-group.spouseBirthRegistrationNumber', configurations: [ { config: AddressSubsections.PRIMARY_ADDRESS_SUBSECTION, diff --git a/src/form/death/index.ts b/src/form/death/index.ts index 66181d0b2..9883423cf 100644 --- a/src/form/death/index.ts +++ b/src/form/death/index.ts @@ -364,8 +364,6 @@ export const deathForm = { ), getIDType('death', 'spouse', detailsExist, true), ...getIDNumberFields('spouse', detailsExist, true), - // preceding field of address fields - divider('spouse-nid-seperator', detailsExist), // ADDRESS FIELDS WILL RENDER HERE divider('spouse-address-separator') ], From 7a5ec48787697563d6fdc76994cb240d322857cd Mon Sep 17 00:00:00 2001 From: Siyasanga Date: Wed, 7 Aug 2024 11:02:47 +0200 Subject: [PATCH 4/5] Rm extra divider on Marriage form's placeOfMarriageTitle * Also update the precedingFieldId of the defaultAddressConfiguration (#7404)[https://github.com/opencrvs/opencrvs-core/issues/7404] --- src/form/addresses/index.ts | 2 +- src/form/marriage/index.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/form/addresses/index.ts b/src/form/addresses/index.ts index b569e6bc1..a28396f9d 100644 --- a/src/form/addresses/index.ts +++ b/src/form/addresses/index.ts @@ -304,7 +304,7 @@ export const defaultAddressConfiguration: IAddressConfiguration[] = [ { // PLACE OF MARRIAGE ADDRESS FIELDS precedingFieldId: - 'marriage.marriageEvent.marriage-event-details.place-of-marriage-seperator', + 'marriage.marriageEvent.marriage-event-details.placeOfMarriageTitle', configurations: [{ config: EventLocationAddressCases.PLACE_OF_MARRIAGE }] }, { diff --git a/src/form/marriage/index.ts b/src/form/marriage/index.ts index 3b77628e5..1892e2dff 100644 --- a/src/form/marriage/index.ts +++ b/src/form/marriage/index.ts @@ -264,8 +264,7 @@ export const marriageForm: ISerializedForm = { fields: [ getMarriageDate, // Required field getTypeOfMarriage, - placeOfMarriageSubsection, - divider('place-of-marriage-seperator') + placeOfMarriageSubsection // PLACE OF MARRIAGE FIELDS WILL RENDER HERE ] } From b3e694b73c27eecf3c6931374fa11575be745d06 Mon Sep 17 00:00:00 2001 From: Siyasanga Date: Mon, 19 Aug 2024 13:55:02 +0200 Subject: [PATCH 5/5] Record the removing of dividers in CHANGELOG.md We missed adding an entry into the CHANGELOG.md to document the changes we made and why we had to make changes https://github.com/opencrvs/opencrvs-core/issues/7404 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaead0ec5..6a13fdee1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,7 +94,7 @@ INSERT CSV ROWS IN ENGLISH ONLY ## Bug fixes -- TBC +- Remove unnecessary UI dividers that add in various sections of the declaration forms(e.g the Death, Birth and Marriage forms) [#244](https://github.com/opencrvs/opencrvs-countryconfig/pull/244) ## 1.5.0 (https://github.com/opencrvs/opencrvs-countryconfig/compare/v1.4.1...v1.5.0)