refactored collector form as per design

opencrvs · Oct 31, 2024 · 04a5535 · 04a5535
1 parent 3193159
commit 04a5535
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts b/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts
@@ -1014,7 +1014,7 @@ const marriageIssueCollectorFormOptions = [
 
 function getCertCollectorGroupForEvent(
   declaration: IDeclaration,
-  certificates?: ICertificateConfigData[]
+  certificates: ICertificateConfigData[]
 ): IFormSectionGroup {
   const informant = (declaration.data.informant.otherInformantType ||
     declaration.data.informant.informantType) as string
@@ -1043,14 +1043,23 @@ function getCertCollectorGroupForEvent(
   )
   const certificateTemplateOptions =
     certificates
-      ?.filter((x) => x.event === declaration.event)
+      .filter((x) => x.event === declaration.event)
       .map((x) => ({ label: x.label, value: x.id })) || []
-  const certTemplateDefaultValue = certificates?.find((x) => x.isDefault)?.id
+  const certTemplateDefaultValue = certificates.find((x) => x.isDefault)?.id
   return {
     id: 'certCollector',
     title: certificateMessages.whoToCollect,
     error: certificateMessages.certificateCollectorError,
     fields: [
+      {
+        name: 'certificateTemplateId',
+        type: 'SELECT_WITH_OPTIONS',
+        label: certificateMessages.certificateTemplateSelectLabel,
+        required: true,
+        initialValue: certTemplateDefaultValue,
+        validator: [],
+        options: certificateTemplateOptions
+      },
       {
         name: 'type',
         type: RADIO_GROUP,
@@ -1061,23 +1070,14 @@ function getCertCollectorGroupForEvent(
         initialValue: '',
         validator: [],
         options: finalOptions
-      },
-      {
-        name: 'certificateTemplateId',
-        type: 'SELECT_WITH_OPTIONS',
-        label: certificateMessages.certificateTemplateSelectLabel,
-        required: true,
-        initialValue: certTemplateDefaultValue,
-        validator: [],
-        options: certificateTemplateOptions
       }
     ]
   }
 }
 
 export function getCertificateCollectorFormSection(
   declaration: IDeclaration,
-  certificates?: ICertificateConfigData[]
+  certificates: ICertificateConfigData[]
 ): IFormSection {
   return {
     id: CertificateSection.Collector,

diff --git a/packages/client/src/i18n/messages/views/certificate.ts b/packages/client/src/i18n/messages/views/certificate.ts
@@ -98,7 +98,7 @@ const messagesToDefine: ICertificateMessages = {
     id: 'print.certificate.section.title'
   },
   certificateTemplateSelectLabel: {
-    defaultMessage: 'Select certificate template',
+    defaultMessage: 'Type',
     description: 'The title of select certificate template action',
     id: 'certificate.selectTemplate'
   },

diff --git a/packages/client/src/views/PrintCertificate/collectorForm/CollectorForm.tsx b/packages/client/src/views/PrintCertificate/collectorForm/CollectorForm.tsx
@@ -509,7 +509,7 @@ const mapStateToProps = (
   const registeringOfficeId = getRegisteringOfficeId(declaration)
   const certFormSection = getCertificateCollectorFormSection(
     declaration,
-    state.offline.offlineData.templates?.certificates
+    state.offline.offlineData.templates?.certificates || []
   )
 
   const isAllowPrintInAdvance =