avoid dynamic redirects

alexnuttall · alexnuttall · commit 6e01b167db6c · 2025-04-28T12:51:12.000+01:00
diff --git a/frontend/src/__tests__/app/request-proof-of-template/page.test.tsx b/frontend/src/__tests__/app/request-proof-of-template/page.test.tsx
@@ -65,8 +65,7 @@ describe('RequestProofPage', () => {
       <RequestProof
         templateName={state.name}
         templateId={state.id}
-        goBackPath='preview-letter-template'
-        confirmPath='preview-letter-template'
+        channel='LETTER'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/submit-email-template/page.test.tsx b/frontend/src/__tests__/app/submit-email-template/page.test.tsx
@@ -52,8 +52,7 @@ describe('SubmitEmailTemplatePage', () => {
       <SubmitDigitalTemplate
         templateName={state.name}
         templateId={state.id}
-        goBackPath='preview-email-template'
-        confirmPath='email-template-submitted'
+        channel='EMAIL'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/submit-letter-template/page.test.tsx b/frontend/src/__tests__/app/submit-letter-template/page.test.tsx
@@ -43,8 +43,6 @@ describe('SubmitLetterTemplatePage', () => {
       <SubmitLetterTemplate
         templateName={LETTER_TEMPLATE.name}
         templateId={LETTER_TEMPLATE.id}
-        goBackPath='preview-letter-template'
-        confirmPath='letter-template-submitted'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/submit-nhs-app-template/page.test.tsx b/frontend/src/__tests__/app/submit-nhs-app-template/page.test.tsx
@@ -56,8 +56,7 @@ describe('SubmitNhsAppTemplatePage', () => {
       <SubmitDigitalTemplate
         templateName={state.name}
         templateId={state.id}
-        goBackPath='preview-nhs-app-template'
-        confirmPath='nhs-app-template-submitted'
+        channel='NHS_APP'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/submit-text-message-template/page.test.tsx b/frontend/src/__tests__/app/submit-text-message-template/page.test.tsx
@@ -56,8 +56,7 @@ describe('SubmitSmsTemplatePage', () => {
       <SubmitDigitalTemplate
         templateName={state.name}
         templateId={state.id}
-        goBackPath='preview-text-message-template'
-        confirmPath='text-message-template-submitted'
+        channel='SMS'
       />
     );
   });
diff --git a/frontend/src/__tests__/components/forms/RequestProof/RequestProof.test.tsx b/frontend/src/__tests__/components/forms/RequestProof/RequestProof.test.tsx
@@ -24,8 +24,7 @@ describe('RequestProof component', () => {
       <RequestProof
         templateId='template-id'
         templateName='template-name'
-        goBackPath='preview-letter'
-        confirmPath='preview-letter'
+        channel='LETTER'
       />
     );
 
diff --git a/frontend/src/__tests__/components/forms/RequestProof/__snapshots__/RequestProof.test.tsx.snap b/frontend/src/__tests__/components/forms/RequestProof/__snapshots__/RequestProof.test.tsx.snap
@@ -68,7 +68,7 @@ exports[`RequestProof component should render 1`] = `
             aria-disabled="false"
             class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-right-3"
             draggable="false"
-            href="/templates/preview-letter/template-id"
+            href="/templates/preview-letter-template/template-id"
             id="go-back-button"
             role="button"
           >
diff --git a/frontend/src/__tests__/components/forms/RequestProof/server-action.test.ts b/frontend/src/__tests__/components/forms/RequestProof/server-action.test.ts
@@ -39,7 +39,7 @@ describe('requestProof', () => {
   it('should redirect when templateId from form is invalid', async () => {
     const formData = getMockFormData({});
 
-    await requestProof('preview-letter-template', formData);
+    await requestProof('LETTER', formData);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
 
@@ -51,7 +51,7 @@ describe('requestProof', () => {
 
     const formData = getMockFormData({ templateId: '1' });
 
-    await requestProof('preview-letter-template', formData);
+    await requestProof('LETTER', formData);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
@@ -63,7 +63,7 @@ describe('requestProof', () => {
 
     const formData = getMockFormData({ templateId: '1' });
 
-    await requestProof('preview-letter-template', formData);
+    await requestProof('LETTER', formData);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
@@ -79,9 +79,9 @@ describe('requestProof', () => {
       templateId: '1',
     });
 
-    await expect(
-      requestProof('preview-letter-template', formData)
-    ).rejects.toThrow('failed to save template');
+    await expect(requestProof('LETTER', formData)).rejects.toThrow(
+      'failed to save template'
+    );
   });
 
   it('should redirect when successfully submitted', async () => {
@@ -91,7 +91,7 @@ describe('requestProof', () => {
       templateId: '1',
     });
 
-    await requestProof('preview-letter-template', formData);
+    await requestProof('LETTER', formData);
 
     expect(requestTemplateProofMock).toHaveBeenCalledWith('1');
 
diff --git a/frontend/src/__tests__/components/forms/SubmitTemplate/SubmitDigitalTemplate.test.tsx b/frontend/src/__tests__/components/forms/SubmitTemplate/SubmitDigitalTemplate.test.tsx
@@ -24,8 +24,7 @@ describe('SubmitDigitalTemplate component', () => {
       <SubmitDigitalTemplate
         templateId='template-id'
         templateName='template-name'
-        goBackPath='example'
-        confirmPath='example-submit'
+        channel='SMS'
       />
     );
 
diff --git a/frontend/src/__tests__/components/forms/SubmitTemplate/SubmitLetterTemplate.test.tsx b/frontend/src/__tests__/components/forms/SubmitTemplate/SubmitLetterTemplate.test.tsx
@@ -24,8 +24,6 @@ describe('SubmitLetterTemplate component', () => {
       <SubmitLetterTemplate
         templateId='template-id'
         templateName='template-name'
-        goBackPath='example'
-        confirmPath='example-submit'
       />
     );
 
diff --git a/frontend/src/__tests__/components/forms/SubmitTemplate/__snapshots__/SubmitDigitalTemplate.test.tsx.snap b/frontend/src/__tests__/components/forms/SubmitTemplate/__snapshots__/SubmitDigitalTemplate.test.tsx.snap
@@ -87,7 +87,7 @@ exports[`SubmitDigitalTemplate component should render 1`] = `
             aria-disabled="false"
             class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-right-3"
             draggable="false"
-            href="/templates/example/template-id"
+            href="/templates/preview-text-message-template/template-id"
             id="go-back-button"
             role="button"
           >
diff --git a/frontend/src/__tests__/components/forms/SubmitTemplate/__snapshots__/SubmitLetterTemplate.test.tsx.snap b/frontend/src/__tests__/components/forms/SubmitTemplate/__snapshots__/SubmitLetterTemplate.test.tsx.snap
@@ -100,7 +100,7 @@ exports[`SubmitLetterTemplate component should render 1`] = `
             aria-disabled="false"
             class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-right-3"
             draggable="false"
-            href="/templates/example/template-id"
+            href="/templates/preview-letter-template/template-id"
             id="go-back-button"
             role="button"
           >
diff --git a/frontend/src/__tests__/components/forms/SubmitTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/SubmitTemplate/server-action.test.ts
@@ -33,7 +33,7 @@ describe('submitTemplate', () => {
   it('should redirect when templateId from form is invalid', async () => {
     const formData = getMockFormData({});
 
-    await submitTemplate('submit-route', formData);
+    await submitTemplate('NHS_APP', formData);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
 
@@ -45,7 +45,7 @@ describe('submitTemplate', () => {
 
     const formData = getMockFormData({ templateId: '1' });
 
-    await submitTemplate('submit-route', formData);
+    await submitTemplate('EMAIL', formData);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
@@ -57,7 +57,7 @@ describe('submitTemplate', () => {
 
     const formData = getMockFormData({ templateId: '1' });
 
-    await submitTemplate('submit-route', formData);
+    await submitTemplate('EMAIL', formData);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
@@ -73,7 +73,7 @@ describe('submitTemplate', () => {
       templateId: '1',
     });
 
-    await expect(submitTemplate('submit-route', formData)).rejects.toThrow(
+    await expect(submitTemplate('SMS', formData)).rejects.toThrow(
       'failed to save template'
     );
   });
@@ -85,10 +85,13 @@ describe('submitTemplate', () => {
       templateId: '1',
     });
 
-    await submitTemplate('submit-route', formData);
+    await submitTemplate('SMS', formData);
 
     expect(setTemplateToSubmittedMock).toHaveBeenCalledWith('1');
 
-    expect(redirectMock).toHaveBeenCalledWith('/submit-route/1', 'push');
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/text-message-template-submitted/1',
+      'push'
+    );
   });
 });
diff --git a/frontend/src/app/request-proof-of-template/[templateId]/page.tsx b/frontend/src/app/request-proof-of-template/[templateId]/page.tsx
@@ -32,8 +32,7 @@ const RequestProofPage = async (props: PageProps) => {
     <RequestProof
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
-      goBackPath='preview-letter-template'
-      confirmPath='preview-letter-template'
+      channel={validatedTemplate.templateType}
     />
   );
 };
diff --git a/frontend/src/app/submit-email-template/[templateId]/page.tsx b/frontend/src/app/submit-email-template/[templateId]/page.tsx
@@ -33,8 +33,7 @@ const SubmitEmailTemplatePage = async (props: PageProps) => {
     <SubmitDigitalTemplate
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
-      goBackPath='preview-email-template'
-      confirmPath='email-template-submitted'
+      channel='EMAIL'
     />
   );
 };
diff --git a/frontend/src/app/submit-letter-template/[templateId]/page.tsx b/frontend/src/app/submit-letter-template/[templateId]/page.tsx
@@ -30,8 +30,6 @@ const SubmitLetterTemplatePage = async (props: PageProps) => {
     <SubmitLetterTemplate
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
-      goBackPath='preview-letter-template'
-      confirmPath='letter-template-submitted'
     />
   );
 };
diff --git a/frontend/src/app/submit-nhs-app-template/[templateId]/page.tsx b/frontend/src/app/submit-nhs-app-template/[templateId]/page.tsx
@@ -33,8 +33,7 @@ const SubmitNhsAppTemplatePage = async (props: PageProps) => {
     <SubmitDigitalTemplate
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
-      goBackPath='preview-nhs-app-template'
-      confirmPath='nhs-app-template-submitted'
+      channel='NHS_APP'
     />
   );
 };
diff --git a/frontend/src/app/submit-text-message-template/[templateId]/page.tsx b/frontend/src/app/submit-text-message-template/[templateId]/page.tsx
@@ -33,8 +33,7 @@ const SubmitSmsTemplatePage = async (props: PageProps) => {
     <SubmitDigitalTemplate
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
-      goBackPath='preview-text-message-template'
-      confirmPath='text-message-template-submitted'
+      channel='SMS'
     />
   );
 };
diff --git a/frontend/src/components/forms/RequestProof/RequestProof.tsx b/frontend/src/components/forms/RequestProof/RequestProof.tsx
@@ -1,20 +1,19 @@
 'use client';
 
-import { ConfirmCancelProps } from 'nhs-notify-web-template-management-utils';
 import content from '@content/content';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import { NHSNotifyFormWrapper } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
 import { getBasePath } from '@utils/get-base-path';
 import { useActionState } from 'react';
 import { requestProof } from './server-action';
+import { ActionPageProps } from 'nhs-notify-web-template-management-utils';
 
 export function RequestProof({
   templateName,
   templateId,
-  goBackPath,
-  confirmPath,
-}: ConfirmCancelProps) {
+  channel,
+}: ActionPageProps) {
   const {
     buttons,
     checkTestData,
@@ -25,9 +24,9 @@ export function RequestProof({
     waitTime,
   } = content.components.requestProof;
 
-  const goBackHref = `${getBasePath()}/${goBackPath}/${templateId}`;
+  const goBackHref = `${getBasePath()}/preview-letter-template/${templateId}`;
 
-  const [_, action] = useActionState(requestProof, confirmPath);
+  const [_, action] = useActionState(requestProof, channel);
 
   return (
     <NHSNotifyMain>
diff --git a/frontend/src/components/forms/RequestProof/server-action.ts b/frontend/src/components/forms/RequestProof/server-action.ts
@@ -3,10 +3,14 @@
 import { redirect, RedirectType } from 'next/navigation';
 import { getTemplate, requestTemplateProof } from '@utils/form-actions';
 import { z } from 'zod';
-import { validateLetterTemplate } from 'nhs-notify-web-template-management-utils';
+import {
+  templateTypeToUrlTextMappings,
+  validateLetterTemplate,
+} from 'nhs-notify-web-template-management-utils';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
+import { TemplateType } from 'nhs-notify-backend-client';
 
-export async function requestProof(route: string, formData: FormData) {
+export async function requestProof(channel: TemplateType, formData: FormData) {
   const { success, data: templateId } = z
     .string()
     .safeParse(formData.get('templateId'));
@@ -34,5 +38,10 @@ export async function requestProof(route: string, formData: FormData) {
     throw error;
   }
 
-  return redirect(`/${route}/${templateId}`, RedirectType.push);
+  const channelRedirectSegment = templateTypeToUrlTextMappings(channel);
+
+  return redirect(
+    `/preview-${channelRedirectSegment}-template/${templateId}`,
+    RedirectType.push
+  );
 }
diff --git a/frontend/src/components/forms/SubmitTemplate/SubmitDigitalTemplate.tsx b/frontend/src/components/forms/SubmitTemplate/SubmitDigitalTemplate.tsx
@@ -2,20 +2,22 @@
 
 import { FC, useActionState } from 'react';
 import { WarningCallout } from 'nhsuk-react-components';
-import { ConfirmCancelProps } from 'nhs-notify-web-template-management-utils';
+import {
+  ActionPageProps,
+  templateTypeToUrlTextMappings,
+} from 'nhs-notify-web-template-management-utils';
 import content from '@content/content';
 import { NHSNotifyFormWrapper } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
 import { getBasePath } from '@utils/get-base-path';
 import { submitTemplate } from '@forms/SubmitTemplate/server-action';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
 
-export const SubmitDigitalTemplate: FC<ConfirmCancelProps> = ({
+export const SubmitDigitalTemplate: FC<ActionPageProps> = ({
   templateName,
   templateId,
-  goBackPath,
-  confirmPath,
-}: ConfirmCancelProps) => {
+  channel,
+}: ActionPageProps) => {
   const {
     pageHeading,
     warningCalloutLabel,
@@ -28,7 +30,9 @@ export const SubmitDigitalTemplate: FC<ConfirmCancelProps> = ({
     buttonText,
   } = content.components.submitTemplate;
 
-  const [_, action] = useActionState(submitTemplate, confirmPath);
+  const [_, action] = useActionState(submitTemplate, channel);
+
+  const goBackPath = `preview-${templateTypeToUrlTextMappings(channel)}-template`;
 
   return (
     <NHSNotifyMain>
diff --git a/frontend/src/components/forms/SubmitTemplate/SubmitLetterTemplate.tsx b/frontend/src/components/forms/SubmitTemplate/SubmitLetterTemplate.tsx
@@ -2,20 +2,17 @@
 
 import { FC, useActionState } from 'react';
 import { WarningCallout } from 'nhsuk-react-components';
-import { ConfirmCancelProps } from 'nhs-notify-web-template-management-utils';
 import content from '@content/content';
 import { NHSNotifyFormWrapper } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
 import { getBasePath } from '@utils/get-base-path';
 import { submitTemplate } from '@forms/SubmitTemplate/server-action';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
 
-export const SubmitLetterTemplate: FC<ConfirmCancelProps> = ({
-  templateName,
-  templateId,
-  goBackPath,
-  confirmPath,
-}) => {
+export const SubmitLetterTemplate: FC<{
+  templateName: string;
+  templateId: string;
+}> = ({ templateName, templateId }) => {
   const {
     pageHeading,
     warningCalloutLabel,
@@ -25,12 +22,13 @@ export const SubmitLetterTemplate: FC<ConfirmCancelProps> = ({
     submitChecklistIntroduction,
     submitChecklistItems,
     goBackButtonText,
+    goBackPath,
     buttonText,
     afterSubmissionHeading,
     afterSubmissionText,
   } = content.components.submitLetterTemplate;
 
-  const [_, action] = useActionState(submitTemplate, confirmPath);
+  const [_, action] = useActionState(submitTemplate, 'LETTER');
 
   return (
     <NHSNotifyMain>
diff --git a/frontend/src/components/forms/SubmitTemplate/server-action.ts b/frontend/src/components/forms/SubmitTemplate/server-action.ts
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
diff --git a/frontend/src/utils/redirect-action.ts b/frontend/src/utils/redirect-action.ts
diff --git a/utils/utils/src/types.ts b/utils/utils/src/types.ts

Original file line number	Diff line number	Diff line change
@@ -68,7 +68,7 @@ exports[`RequestProof component should render 1`] = `
`68`	`68`	`aria-disabled="false"`
`69`	`69`	`class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-right-3"`
`70`	`70`	`draggable="false"`
`71`		`- href="/templates/preview-letter/template-id"`
	`71`	`+ href="/templates/preview-letter-template/template-id"`
`72`	`72`	`id="go-back-button"`
`73`	`73`	`role="button"`
`74`	`74`	`>`