CCM-11544 More test fixes

Author: nicki-nhs

frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/__snapshots__/page.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`PreviewOtherLanguageLetterTemplateFromMessagePlan page renders foreign
   <a
     class="nhsuk-back-link"
     data-testid="back-link-top"
-    href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
+    href="/message-plans/choose-other-language-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
   >
     Go back
   </a>
@@ -111,7 +111,7 @@ exports[`PreviewOtherLanguageLetterTemplateFromMessagePlan page renders foreign
         <a
           class="nhsuk-body-m nhsuk-u-display-inline-block"
           data-testid="back-link-bottom"
-          href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
+          href="/message-plans/choose-other-language-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
         >
           Go back
         </a>

frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx

@@ -4,7 +4,7 @@ import baseContent from '@content/content';
 import Link from 'next/link';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import NotifyBackLink from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
-import { TemplateDto } from 'nhs-notify-backend-client';
+import { LetterType, TemplateDto } from 'nhs-notify-backend-client';
 import {
   cascadeTemplateTypeToUrlTextMappings,
   PageComponentProps,
@@ -25,10 +25,12 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
 }: Readonly<MessagePlanPreviewTemplateProps<T>>) {
   const content = baseContent.components.previewTemplateFromMessagePlan;
 
-  const conditionalType =
-    template.templateType === 'LETTER' && 'letterType' in template
-      ? template.letterType
-      : undefined;
+  let conditionalType: LetterType | 'language' | undefined;
+  if (template.templateType === 'LETTER' && 'letterType' in template) {
+    const isForeignLanguage =
+      'language' in template && template.language && template.language !== 'en';
+    conditionalType = isForeignLanguage ? 'language' : template.letterType;
+  }
 
   const backLinkHref = interpolate(content.backLink.href, {
     templateType: cascadeTemplateTypeToUrlTextMappings(

tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts

@@ -498,7 +498,7 @@ test.describe('Routing - Choose Templates page', () => {
     await expect(largePrintItem.chooseTemplateLink).toBeVisible();
     await expect(largePrintItem.chooseTemplateLink).toHaveAttribute(
       'href',
-      `/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.valid}`
+      `/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.valid}?lockNumber=${messagePlans.valid.lockNumber}`
     );
     await expect(largePrintItem.changeTemplateLink).toBeHidden();
     await expect(largePrintItem.removeTemplateLink).toBeHidden();
@@ -510,15 +510,15 @@ test.describe('Routing - Choose Templates page', () => {
     await expect(otherLanguagesItem.chooseTemplateLink).toBeVisible();
     await expect(otherLanguagesItem.chooseTemplateLink).toHaveAttribute(
       'href',
-      `/templates/message-plans/choose-other-language-letter-template/${routingConfigIds.valid}`
+      `/templates/message-plans/choose-other-language-letter-template/${routingConfigIds.valid}?lockNumber=${messagePlans.valid.lockNumber}`
     );
     await expect(otherLanguagesItem.changeTemplateLink).toBeHidden();
     await expect(otherLanguagesItem.removeTemplateLink).toBeHidden();
 
     await largePrintItem.clickChooseTemplateLink();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.valid}`
+      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.valid}?lockNumber=${messagePlans.valid.lockNumber}`
     );
   });
 
@@ -541,7 +541,7 @@ test.describe('Routing - Choose Templates page', () => {
         chooseTemplatesPage.letter.changeTemplateLink
       ).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-standard-english-letter-template/${routingConfigIds.validWithLetterTemplates}`
+        `/templates/message-plans/choose-standard-english-letter-template/${routingConfigIds.validWithLetterTemplates}?lockNumber=${messagePlans.validWithLetterTemplates.lockNumber}`
       );
       await expect(chooseTemplatesPage.letter.removeTemplateLink).toBeVisible();
       await expect(chooseTemplatesPage.letter.chooseTemplateLink).toBeHidden();
@@ -584,7 +584,7 @@ test.describe('Routing - Choose Templates page', () => {
       await expect(otherLanguagesItem.changeTemplateLink).toBeVisible();
       await expect(otherLanguagesItem.changeTemplateLink).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-other-language-letter-template/${routingConfigIds.validWithLetterTemplates}`
+        `/templates/message-plans/choose-other-language-letter-template/${routingConfigIds.validWithLetterTemplates}?lockNumber=${messagePlans.validWithLetterTemplates.lockNumber}`
       );
       await expect(otherLanguagesItem.removeTemplateLink).toBeVisible();
       await expect(otherLanguagesItem.chooseTemplateLink).toBeHidden();

tests/test-team/template-mgmt-routing-component-tests/letter/choose-large-print-letter-template.routing-component.spec.ts

@@ -271,7 +271,7 @@ test.describe('Routing - Choose large print letter template page', () => {
     await chooseLargePrintLetterTemplatePage.saveAndContinueButton.click();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigs.valid.id}`
+      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigs.valid.id}?lockNumber=${routingConfigs.valid.lockNumber}`
     );
 
     await expect(chooseLargePrintLetterTemplatePage.errorSummary).toBeVisible();
@@ -318,7 +318,7 @@ test.describe('Routing - Choose large print letter template page', () => {
     });
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigs.withLargePrintSelected.id}`
+      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigs.withLargePrintSelected.id}?lockNumber=${routingConfigs.withLargePrintSelected.lockNumber}`
     );
 
     await expect(chooseLargePrintLetterTemplatePage.messagePlanName).toHaveText(

tests/test-team/template-mgmt-routing-component-tests/nhs-app/choose-nhs-app-template.routing-component.spec.ts

@@ -103,7 +103,7 @@ test.describe('Routing - Choose NHS app template page', () => {
     await assertSignOutLink(props);
     await assertBackLinkBottom({
       ...props,
-      expectedUrl: `/templates/message-plans/choose-templates/${messagePlans.APP_ROUTING_CONFIG.id}`,
+      expectedUrl: `templates/message-plans/choose-templates/${messagePlans.APP_ROUTING_CONFIG.id}`,
     });
     await assertBackLinkTopNotPresent(props);
   });