CCM-11445: Update letter upload page url

ClareJonesBJSS · ClareJonesBJSS · commit 1b7ddc3e74e2 · 2025-07-31T16:56:28.000+01:00
diff --git a/frontend/src/__tests__/app/upload-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/upload-letter-template/__snapshots__/page.test.tsx.snap
diff --git a/frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/__snapshots__/page.test.tsx.snap
diff --git a/frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/page.test.tsx b/frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/page.test.tsx
@@ -1,4 +1,4 @@
-import ClientIdAndCampaignIdRequiredPage from '@app/create-letter-template/client-id-and-campaign-id-required/page';
+import ClientIdAndCampaignIdRequiredPage from '@app/upload-letter-template/client-id-and-campaign-id-required/page';
 import { render } from '@testing-library/react';
 
 test('ClientIdAndCampaignIdRequiredPage', async () => {
diff --git a/frontend/src/__tests__/app/upload-letter-template/page.test.tsx b/frontend/src/__tests__/app/upload-letter-template/page.test.tsx
@@ -3,7 +3,7 @@
  */
 import CreateLetterTemplatePage, {
   generateMetadata,
-} from '@app/create-letter-template/page';
+} from '@app/upload-letter-template/page';
 import content from '@content/content';
 import { getSessionServer } from '@utils/amplify-utils';
 import { fetchClient } from '@utils/server-features';
@@ -76,7 +76,7 @@ describe('CreateLetterTemplatePage', () => {
     await CreateLetterTemplatePage();
 
     expect(mockRedirect).toHaveBeenCalledWith(
-      '/create-letter-template/client-id-and-campaign-id-required',
+      '/upload-letter-template/client-id-and-campaign-id-required',
       RedirectType.replace
     );
   });
@@ -98,7 +98,7 @@ describe('CreateLetterTemplatePage', () => {
     await CreateLetterTemplatePage();
 
     expect(mockRedirect).toHaveBeenCalledWith(
-      '/create-letter-template/client-id-and-campaign-id-required',
+      '/upload-letter-template/client-id-and-campaign-id-required',
       RedirectType.replace
     );
   });
diff --git a/frontend/src/__tests__/components/forms/ChooseTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/ChooseTemplate/server-action.test.ts
@@ -1,5 +1,5 @@
 import { chooseTemplateAction } from '@forms/ChooseTemplate/server-action';
-import { getMockFormData } from '@testhelpers';
+import { EMAIL_TEMPLATE, getMockFormData } from '@testhelpers';
 import { redirect, RedirectType } from 'next/navigation';
 
 jest.mock('next/navigation');
@@ -25,18 +25,23 @@ test('submit form - validation error', async () => {
   });
 });
 
-test('submit form - no validation error', async () => {
-  const mockRedirect = jest.mocked(redirect);
+test.each([
+  ['NHS_APP', '/create-nhs-app-template'],
+  ['SMS', '/create-sms-template'],
+  ['EMAIL', '/create-email-template'],
+  ['LETTER', '/upload-letter-template'],
+])(
+  'submit form - $templateType redirects to $url',
+  async (templateType, url) => {
+    const mockRedirect = jest.mocked(redirect);
 
-  await chooseTemplateAction(
-    {},
-    getMockFormData({
-      templateType: 'NHS_APP',
-    })
-  );
+    await chooseTemplateAction(
+      {},
+      getMockFormData({
+        templateType,
+      })
+    );
 
-  expect(mockRedirect).toHaveBeenCalledWith(
-    '/create-nhs-app-template',
-    RedirectType.push
-  );
-});
+    expect(mockRedirect).toHaveBeenCalledWith(url, RedirectType.push);
+  }
+);
diff --git a/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/__snapshots__/LetterTemplateForm.test.tsx.snap b/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/__snapshots__/LetterTemplateForm.test.tsx.snap
@@ -75,7 +75,7 @@ exports[`Client-side validation triggers 1`] = `
             name="form-id"
             readonly=""
             type="hidden"
-            value="create-letter-template"
+            value="upload-letter-template"
           />
           <input
             name="csrf_token"
@@ -464,7 +464,7 @@ exports[`Client-side validation triggers 1`] = `
             aria-disabled="false"
             class="nhsuk-button"
             data-testid="submit-button"
-            id="create-letter-template-submit-button"
+            id="upload-letter-template-submit-button"
             type="submit"
           >
             Save and upload
@@ -519,7 +519,7 @@ exports[`hides right-to-left language warning when language changes 1`] = `
             name="form-id"
             readonly=""
             type="hidden"
-            value="create-letter-template"
+            value="upload-letter-template"
           />
           <input
             name="csrf_token"
@@ -889,7 +889,7 @@ exports[`hides right-to-left language warning when language changes 1`] = `
             aria-disabled="false"
             class="nhsuk-button"
             data-testid="submit-button"
-            id="create-letter-template-submit-button"
+            id="upload-letter-template-submit-button"
             type="submit"
           >
             Save and upload
@@ -989,7 +989,7 @@ exports[`renders page one error 1`] = `
             name="form-id"
             readonly=""
             type="hidden"
-            value="create-letter-template"
+            value="upload-letter-template"
           />
           <input
             name="csrf_token"
@@ -1371,7 +1371,7 @@ exports[`renders page one error 1`] = `
             aria-disabled="false"
             class="nhsuk-button"
             data-testid="submit-button"
-            id="create-letter-template-submit-button"
+            id="upload-letter-template-submit-button"
             type="submit"
           >
             Save and upload
@@ -1489,7 +1489,7 @@ exports[`renders page with multiple errors 1`] = `
             name="form-id"
             readonly=""
             type="hidden"
-            value="create-letter-template"
+            value="upload-letter-template"
           />
           <input
             name="csrf_token"
@@ -1889,7 +1889,7 @@ exports[`renders page with multiple errors 1`] = `
             aria-disabled="false"
             class="nhsuk-button"
             data-testid="submit-button"
-            id="create-letter-template-submit-button"
+            id="upload-letter-template-submit-button"
             type="submit"
           >
             Save and upload
@@ -1944,7 +1944,7 @@ exports[`renders page with preloaded field values 1`] = `
             name="form-id"
             readonly=""
             type="hidden"
-            value="create-letter-template"
+            value="upload-letter-template"
           />
           <input
             name="csrf_token"
@@ -2340,7 +2340,7 @@ exports[`renders page with preloaded field values 1`] = `
             aria-disabled="false"
             class="nhsuk-button"
             data-testid="submit-button"
-            id="create-letter-template-submit-button"
+            id="upload-letter-template-submit-button"
             type="submit"
           >
             Save and upload
@@ -2395,7 +2395,7 @@ exports[`shows right-to-left language warning when language changes 1`] = `
             name="form-id"
             readonly=""
             type="hidden"
-            value="create-letter-template"
+            value="upload-letter-template"
           />
           <input
             name="csrf_token"
@@ -2791,7 +2791,7 @@ exports[`shows right-to-left language warning when language changes 1`] = `
             aria-disabled="false"
             class="nhsuk-button"
             data-testid="submit-button"
-            id="create-letter-template-submit-button"
+            id="upload-letter-template-submit-button"
             type="submit"
           >
             Save and upload
diff --git a/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts b/frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts
@@ -21,10 +21,10 @@ const initialState: CreateLetterTemplate = {
 describe('CreateLetterTemplate server actions', () => {
   beforeEach(jest.resetAllMocks);
 
-  it('create-letter-template - should return response when no template name, letter type, language or pdf file', async () => {
+  it('upload-letter-template - should return response when no template name, letter type, language or pdf file', async () => {
     const response = await processFormActions(
       initialState,
-      getMockFormData({ 'form-id': 'create-letter-template' })
+      getMockFormData({ 'form-id': 'upload-letter-template' })
     );
 
     expect(response).toEqual({
diff --git a/frontend/src/app/upload-letter-template/client-id-and-campaign-id-required/page.tsx b/frontend/src/app/upload-letter-template/client-id-and-campaign-id-required/page.tsx
diff --git a/frontend/src/app/upload-letter-template/page.tsx b/frontend/src/app/upload-letter-template/page.tsx
@@ -27,7 +27,7 @@ const CreateLetterTemplatePage = async () => {
 
   if (!accessToken || !clientId) {
     return redirect(
-      '/create-letter-template/client-id-and-campaign-id-required',
+      '/upload-letter-template/client-id-and-campaign-id-required',
       RedirectType.replace
     );
   }
@@ -38,7 +38,7 @@ const CreateLetterTemplatePage = async () => {
 
   if (!campaignId) {
     return redirect(
-      '/create-letter-template/client-id-and-campaign-id-required',
+      '/upload-letter-template/client-id-and-campaign-id-required',
       RedirectType.replace
     );
   }
diff --git a/frontend/src/components/forms/ChooseTemplate/server-action.ts b/frontend/src/components/forms/ChooseTemplate/server-action.ts
@@ -2,6 +2,7 @@ import { redirect, RedirectType } from 'next/navigation';
 import { TEMPLATE_TYPE_LIST } from 'nhs-notify-backend-client';
 import {
   FormState,
+  templateCreationPages,
   templateTypeToUrlTextMappings,
 } from 'nhs-notify-web-template-management-utils';
 import { z } from 'zod';
@@ -28,7 +29,7 @@ export async function chooseTemplateAction(
   }
 
   redirect(
-    `/create-${templateTypeToUrlTextMappings(parsedForm.data.templateType)}-template`,
+    templateCreationPages(parsedForm.data.templateType),
     RedirectType.push
   );
 }
diff --git a/frontend/src/components/forms/LetterTemplateForm/LetterTemplateForm.tsx b/frontend/src/components/forms/LetterTemplateForm/LetterTemplateForm.tsx
@@ -110,7 +110,7 @@ export const LetterTemplateForm: FC<
             />
             <NHSNotifyFormWrapper
               action={action}
-              formId='create-letter-template'
+              formId='upload-letter-template'
               formAttributes={{ onSubmit: validateForm }}
             >
               <h1 className='nhsuk-heading-xl' data-testid='page-heading'>
@@ -244,7 +244,7 @@ export const LetterTemplateForm: FC<
               </div>
               <NHSNotifyButton
                 data-testid='submit-button'
-                id='create-letter-template-submit-button'
+                id='upload-letter-template-submit-button'
               >
                 {buttonText}
               </NHSNotifyButton>
diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts
@@ -8,32 +8,32 @@ const protectedPaths = [
   /^\/create-email-template$/,
   /^\/create-nhs-app-template$/,
   /^\/create-text-message-template$/,
-  /^\/create-letter-template$/,
-  /^\/create-letter-template\/client-id-and-campaign-id-required$/,
   /^\/delete-template\/[^/]+$/,
   /^\/edit-email-template\/[^/]+$/,
   /^\/edit-letter-template\/[^/]+$/,
   /^\/edit-nhs-app-template\/[^/]+$/,
   /^\/edit-text-message-template\/[^/]+$/,
   /^\/email-template-submitted\/[^/]+$/,
   /^\/invalid-template$/,
+  /^\/letter-template-submitted\/[^/]+$/,
   /^\/message-templates$/,
   /^\/nhs-app-template-submitted\/[^/]+$/,
   /^\/preview-email-template\/[^/]+$/,
   /^\/preview-letter-template\/[^/]+$/,
   /^\/preview-nhs-app-template\/[^/]+$/,
+  /^\/preview-submitted-email-template\/[^/]+$/,
+  /^\/preview-submitted-letter-template\/[^/]+$/,
+  /^\/preview-submitted-nhs-app-template\/[^/]+$/,
+  /^\/preview-submitted-text-message-template\/[^/]+$/,
   /^\/preview-text-message-template\/[^/]+$/,
   /^\/request-proof-of-template\/[^/]+$/,
   /^\/submit-email-template\/[^/]+$/,
+  /^\/submit-letter-template\/[^/]+$/,
   /^\/submit-nhs-app-template\/[^/]+$/,
   /^\/submit-text-message-template\/[^/]+$/,
-  /^\/submit-letter-template\/[^/]+$/,
-  /^\/letter-template-submitted\/[^/]+$/,
   /^\/text-message-template-submitted\/[^/]+$/,
-  /^\/preview-submitted-email-template\/[^/]+$/,
-  /^\/preview-submitted-letter-template\/[^/]+$/,
-  /^\/preview-submitted-nhs-app-template\/[^/]+$/,
-  /^\/preview-submitted-text-message-template\/[^/]+$/,
+  /^\/upload-letter-template\/client-id-and-campaign-id-required$/,
+  /^\/upload-letter-template$/,
 ];
 
 const publicPaths = [
diff --git a/tests/accessibility/.pa11y-ci.js b/tests/accessibility/.pa11y-ci.js
@@ -123,7 +123,7 @@ const errors = [
     name: 'invalid-template',
   },
   {
-    url: `${baseUrl}/create-letter-template/client-id-and-campaign-id-required`,
+    url: `${baseUrl}/upload-letter-template/client-id-and-campaign-id-required`,
     actions: [...signInPageActions, 'wait for h1 to be visible'],
     name: 'client-campaign-id-required',
   },
diff --git a/tests/accessibility/actions/index.js b/tests/accessibility/actions/index.js
@@ -2,7 +2,7 @@ module.exports = {
   ...require('./choose-a-template-type.actions'),
   ...require('./copy-template.actions'),
   ...require('./create-email-template.actions'),
-  ...require('./create-letter-template.actions'),
+  ...require('./upload-letter-template.actions'),
   ...require('./create-nhs-app-template.actions'),
   ...require('./create-text-message-template.actions'),
   ...require('./email-template-submitted.actions'),
diff --git a/tests/accessibility/actions/upload-letter-template.actions.js b/tests/accessibility/actions/upload-letter-template.actions.js
@@ -5,21 +5,21 @@ const pageActions = [
   'wait for element #templateType-LETTER to be visible',
   'click element #templateType-LETTER',
   'click element #choose-a-template-type-submit-button',
-  'wait for element #create-letter-template-submit-button to be visible',
+  'wait for element #upload-letter-template-submit-button to be visible',
 ];
 
 const createLetterTemplatePage = (url) => ({
-  name: 'create-letter-template',
+  name: 'upload-letter-template',
   url,
   actions: pageActions,
 });
 
 const createLetterTemplateErrorPage = (url) => ({
-  name: 'create-letter-template-error',
+  name: 'upload-letter-template-error',
   url,
   actions: [
     ...pageActions,
-    'click element #create-letter-template-submit-button',
+    'click element #upload-letter-template-submit-button',
     'wait for element .nhsuk-error-summary__title to be visible',
   ],
   ignore: [
diff --git a/tests/test-team/pages/letter/template-mgmt-create-letter-missing-campaign-client-id-page.ts b/tests/test-team/pages/letter/template-mgmt-create-letter-missing-campaign-client-id-page.ts
@@ -3,7 +3,7 @@ import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-d
 
 export class TemplateMgmtCreateLetterMissingCampaignClientIdPage extends TemplateMgmtBasePageNonDynamic {
   static readonly pageUrlSegment =
-    'create-letter-template/client-id-and-campaign-id-required';
+    'upload-letter-template/client-id-and-campaign-id-required';
 
   public readonly errorDetailsInsetText: Locator;
   public readonly goBackLink: Locator;
diff --git a/tests/test-team/pages/letter/template-mgmt-create-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-create-letter-page.ts
@@ -2,7 +2,7 @@ import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
 
 export class TemplateMgmtCreateLetterPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegment = 'create-letter-template';
+  static readonly pageUrlSegment = 'upload-letter-template';
 
   public readonly nameInput: Locator;
 
@@ -31,7 +31,7 @@ export class TemplateMgmtCreateLetterPage extends TemplateMgmtBasePageNonDynamic
       .and(page.getByText('Back to choose a template type'));
 
     this.saveAndPreviewButton = page.locator(
-      '[id="create-letter-template-submit-button"]'
+      '[id="upload-letter-template-submit-button"]'
     );
 
     this.pdfSelector = page.locator('input[name="letterTemplatePdf"]');
diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
@@ -157,6 +157,24 @@ describe('templateTypeToUrlTextMappings', () => {
   });
 });
 
+describe('templateCreationPages', () => {
+  test('NHS_APP', () => {
+    expect(previewTemplatePages('NHS_APP')).toEqual('create-nhs-app-template');
+  });
+
+  test('SMS', () => {
+    expect(previewTemplatePages('SMS')).toEqual('create-text-message-template');
+  });
+
+  test('EMAIL', () => {
+    expect(previewTemplatePages('EMAIL')).toEqual('create-email-template');
+  });
+
+  test('LETTER', () => {
+    expect(previewTemplatePages('LETTER')).toEqual('upload-letter-template');
+  });
+});
+
 describe('previewTemplatePages', () => {
   test('NHS_APP', () => {
     expect(previewTemplatePages('NHS_APP')).toEqual('preview-nhs-app-template');
diff --git a/utils/utils/src/enum.ts b/utils/utils/src/enum.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import ClientIdAndCampaignIdRequiredPage from '@app/create-letter-template/client-id-and-campaign-id-required/page';`
	`1`	`+import ClientIdAndCampaignIdRequiredPage from '@app/upload-letter-template/client-id-and-campaign-id-required/page';`
`2`	`2`	`import { render } from '@testing-library/react';`
`3`	`3`
`4`	`4`	`test('ClientIdAndCampaignIdRequiredPage', async () => {`