changed data source for supporting document types on name of SIN and review screens

Author: faiza-jahanzeb

frontend/app/.server/locales/protected-en.json

@@ -58,17 +58,7 @@
     "current-status-in-canada": {
       "title": "Current status in Canada",
       "required": "Current status in Canada is required.",
-      "invalid": "Please select Canadian Citizen born outside Canada.",
-      "options": {
-        "select-option": "Select option",
-        "canadian-citizen-born-in-canada": "Canadian citizen born in Canada",
-        "canadian-citizen-born-outside-canada": "Canadian citizen born outside Canada",
-        "registered-indian-born-in-canada": "Registered Indian born in Canada",
-        "registered-indian-born-outside-canada": "Registered Indian born outside Canada",
-        "permanent-resident": "Permanent Resident",
-        "temporary-resident": "Temporary Resident",
-        "no-legal-status-in-canada": "No Legal Status in Canada"
-      }
+      "invalid": "Please select Canadian Citizen born outside Canada."
     },
     "document-type": {
       "title": "Document type",
@@ -208,17 +198,6 @@
       "description": "A supporting document containing the applicant's preferred name(s) is required if the primary identity document does not contain the applicant's preferred name(s), and the change does not comply with naming rules.",
       "docs-required": "Supporting document(s) required?",
       "doc-type": "Supporting document type"
-    },
-    "doc-types": {
-      "marriage-document": "Marriage Certificate or Marriage Registration",
-      "divorce-decree": "Divorce Decree",
-      "name-change": "Certificate of legal change of name or Court Order",
-      "adoption-order": "Adoption Order",
-      "notarial-certificate": "Notarial Certificate (also called Notarial Adoption Certificate)",
-      "resident-record": "Request to Amend Record of Landing or Confirmation of Permanent Resident",
-      "replace-imm1442": "Replacement IMM1442 (WP, SP, or VR) with modification to name indicated in \"Remarks\"",
-      "birth-certificate": "Birth certificate contains family name to be registered",
-      "citizenship-certificate": "Certificate of Canadian Citizenship contains family name to be registered"
     }
   },
   "personal-information": {

frontend/app/.server/locales/protected-fr.json

@@ -58,17 +58,7 @@
     "current-status-in-canada": {
       "title": "Statut actuel au Canadaa",
       "required": "Statut actuel au Canada est requis.",
-      "invalid": "Veuillez sélectionner un citoyen canadien né en dehors du Canada.",
-      "options": {
-        "select-option": "Sélectionner une option",
-        "canadian-citizen-born-in-canada": "Citoyen canadien né au Canada",
-        "canadian-citizen-born-outside-canada": "Citoyen canadien né à l'extérieur du Canada",
-        "registered-indian-born-in-canada": "Indien enregistré né au Canada",
-        "registered-indian-born-outside-canada": "Indien enregistré né en dehors du Canada",
-        "permanent-resident": "Résident permanent",
-        "temporary-resident": "Résident temporaire",
-        "no-legal-status-in-canada": "Aucun statut légal au Canada"
-      }
+      "invalid": "Veuillez sélectionner un citoyen canadien né en dehors du Canada."
     },
     "document-type": {
       "title": "Type de document",
@@ -209,17 +199,6 @@
       "description": "Un document justificatif contenant le(s) nom(s) préféré(s) du demandeur est requis si le document d'identité principal ne contient pas le(s) nom(s) préféré(s) du demandeur et que le changement n'est pas conforme aux règles de dénomination.",
       "docs-required": "Document(s) de support requis?",
       "doc-type": "Type de document de support"
-    },
-    "doc-types": {
-      "marriage-document": "Certificat de mariage ou enregistrement de mariage",
-      "divorce-decree": "Décret de divorce",
-      "name-change": "Certificat de changement légal de nom ou ordonnance du tribunal",
-      "adoption-order": "Ordonnance d'adoption",
-      "notarial-certificate": "Certificat notarié (également appelé certificat notarié d'adoption)",
-      "resident-record": "Demande de modification du dossier d'atterrissage ou confirmation de résident permanent",
-      "replace-imm1442": "IMM1442 de remplacement (WP, SP, ou VR) avec modification du nom indiqué dans les «\u00a0Remarques\u00a0»",
-      "birth-certificate": "Acte de naissance contenant le nom de famille à enregistrer",
-      "citizenship-certificate": "Certificat de citoyenneté canadienne contenant le nom de famille à enregistrer"
     }
   },
   "personal-information": {

frontend/app/.server/resources/fsir_applicantsupportingdocumenttypes.json

@@ -7,12 +7,12 @@
     {
       "value": 9900000000,
       "labelEn": "Marriage Certificate or Marriage Registration",
-      "labelFr": "Jugement de divorce"
+      "labelFr": "Certificat de mariage ou enregistrement de mariage"
     },
     {
       "value": 9900000001,
       "labelEn": "Divorce Decree",
-      "labelFr": "Citoyen canadien né à l'extérieur du Canada"
+      "labelFr": "Jugement de divorce"
     },
     {
       "value": 9900000002,

frontend/app/routes/protected/person-case/current-name.tsx

@@ -3,12 +3,12 @@ import { useId, useState } from 'react';
 import type { RouteHandle } from 'react-router';
 import { data, redirect, useFetcher } from 'react-router';
 
-import type { ResourceKey } from 'i18next';
 import { useTranslation } from 'react-i18next';
 import * as v from 'valibot';
 
 import type { Info, Route } from './+types/current-name';
 
+import { applicantSupportingDocumentService } from '~/.server/domain/person-case/services';
 import { LogFactory } from '~/.server/logging';
 import { requireAuth } from '~/.server/utils/auth-utils';
 import { i18nRedirect } from '~/.server/utils/route-utils';
@@ -25,7 +25,7 @@ import { HttpStatusCodes } from '~/errors/http-status-codes';
 import { getTranslation } from '~/i18n-config.server';
 import { handle as parentHandle } from '~/routes/protected/person-case/layout';
 import { getStateRoute, loadMachineActor } from '~/routes/protected/person-case/state-machine.server';
-import { currentNameSchema, validCurrentNameDocTypes } from '~/routes/protected/person-case/validation.server';
+import { currentNameSchema } from '~/routes/protected/person-case/validation.server';
 import { getSingleKey } from '~/utils/i18n-utils';
 import { trimToUndefined } from '~/utils/string-utils';
 
@@ -101,13 +101,13 @@ export async function action({ context, params, request }: Route.ActionArgs) {
 export async function loader({ context, request }: Route.LoaderArgs) {
   requireAuth(context.session, new URL(request.url), ['user']);
 
-  const { t } = await getTranslation(request, handle.i18nNamespace);
+  const { lang, t } = await getTranslation(request, handle.i18nNamespace);
   const machineActor = loadMachineActor(context.session, request, 'name-info');
 
   return {
     documentTitle: t('protected:primary-identity-document.page-title'),
     defaultFormValues: machineActor?.getSnapshot().context.currentNameInfo,
-    validCurrentNameDocTypes: validCurrentNameDocTypes,
+    localizedSupportingDocTypes: applicantSupportingDocumentService.getLocalizedApplicantSupportingDocumentType(lang),
     primaryDocName: {
       firstName: machineActor?.getSnapshot().context.primaryDocuments?.givenName,
       lastName: machineActor?.getSnapshot().context.primaryDocuments?.lastName,
@@ -162,14 +162,14 @@ export default function CurrentName({ loaderData, actionData, params }: Route.Co
     },
   ];
 
-  const docTypes = loaderData.validCurrentNameDocTypes.map((value) => ({
-    value: value,
-    children: t(`protected:current-name.doc-types.${value}` as ResourceKey),
+  const docTypes = loaderData.localizedSupportingDocTypes.map((doc) => ({
+    value: doc.id,
+    children: doc.name,
     defaultChecked:
       loaderData.defaultFormValues &&
       loaderData.defaultFormValues.preferredSameAsDocumentName === false &&
       loaderData.defaultFormValues.supportingDocuments.required === true
-        ? loaderData.defaultFormValues.supportingDocuments.documentTypes.includes(value)
+        ? loaderData.defaultFormValues.supportingDocuments.documentTypes.includes(doc.id)
         : false,
   }));
 

frontend/app/routes/protected/person-case/review.tsx

@@ -14,6 +14,7 @@ import {
   languageCorrespondenceService,
   sinApplicationService,
   applicantStatusInCanadaService,
+  applicantSupportingDocumentService,
 } from '~/.server/domain/person-case/services';
 import { serverEnvironment } from '~/.server/environment';
 import { LogFactory } from '~/.server/logging';
@@ -187,6 +188,13 @@ export async function loader({ context, request }: Route.LoaderArgs) {
           inPersonSinApplication.currentNameInfo.preferredSameAsDocumentName === true
             ? inPersonSinApplication.primaryDocuments.lastName
             : inPersonSinApplication.currentNameInfo.lastName,
+        supportingDocumentsNames:
+          inPersonSinApplication.currentNameInfo.preferredSameAsDocumentName === false &&
+          inPersonSinApplication.currentNameInfo.supportingDocuments.required === true
+            ? inPersonSinApplication.currentNameInfo.supportingDocuments.documentTypes.map(
+                (doc) => applicantSupportingDocumentService.getLocalizedApplicantSupportingDocumentTypeById(doc, lang).name,
+              )
+            : undefined,
       },
     },
   };

frontend/app/routes/protected/person-case/validation.server.ts

@@ -4,6 +4,7 @@ import * as v from 'valibot';
 import { applicantGenderService, languageCorrespondenceService } from '~/.server/domain/person-case/services';
 import { getApplicantSecondaryDocumentChoices } from '~/.server/domain/person-case/services/applicant-secondary-document-service';
 import { getApplicantHadSinOptions } from '~/.server/domain/person-case/services/applicant-sin-service';
+import { getApplicantSupportingDocumentTypes } from '~/.server/domain/person-case/services/applicant-supporting-document-service';
 import { getApplicationSubmissionScenarios } from '~/.server/domain/person-case/services/application-submission-scenario';
 import { getTypesOfApplicationToSubmit } from '~/.server/domain/person-case/services/application-type-service';
 import { serverEnvironment } from '~/.server/environment';
@@ -130,18 +131,6 @@ export const contactInformationSchema = v.intersect([
   ),
 ]);
 
-export const validCurrentNameDocTypes = [
-  'marriage-document',
-  'divorce-decree',
-  'name-change',
-  'adoption-order',
-  'notarial-certificate',
-  'resident-record',
-  'replace-imm1442',
-  'birth-certificate',
-  'citizenship-certificate',
-] as const;
-
 export const currentNameSchema = v.variant(
   'preferredSameAsDocumentName',
   [
@@ -182,7 +171,9 @@ export const currentNameSchema = v.variant(
               v.checkItems(
                 (item, index, array) =>
                   array.indexOf(item) === index &&
-                  validCurrentNameDocTypes.includes(item as (typeof validCurrentNameDocTypes)[number]),
+                  getApplicantSupportingDocumentTypes()
+                    .map((doc) => doc.id)
+                    .includes(item),
                 'protected:current-name.supporting-error.invalid-error',
               ),
             ),

frontend/app/routes/protected/sin-application.tsx

@@ -131,6 +131,7 @@ interface PreferredNameDataProps {
     middleName?: string;
     lastName: string;
     supportingDocuments?: { required: boolean; documentTypes?: string[] };
+    supportingDocumentsNames?: string[];
   };
   tabId?: string;
 }
@@ -163,15 +164,13 @@ function PreferredNameData({ data, tabId }: PreferredNameDataProps) {
                 : t('protected:review.no')}
             </p>
           </DescriptionListItem>
-          {data.preferredSameAsDocumentName === false && data.supportingDocuments?.required && (
+          {data.supportingDocumentsNames && data.supportingDocumentsNames.length > 0 && (
             <DescriptionListItem className="py-3" term={t('protected:current-name.supporting-docs.title')}>
-              {data.supportingDocuments.documentTypes && data.supportingDocuments.documentTypes.length > 0 && (
-                <ul className="ml-6 list-disc">
-                  {data.supportingDocuments.documentTypes.map((value) => (
-                    <li key={value}>{t(`protected:current-name.doc-types.${value}` as ResourceKey)}</li>
-                  ))}
-                </ul>
-              )}
+              <ul className="ml-6 list-disc">
+                {data.supportingDocumentsNames.map((name) => (
+                  <li key={name}>{name}</li>
+                ))}
+              </ul>
             </DescriptionListItem>
           )}
         </div>