Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-10893-header-with-account-info

Author: nicki-nhs

.eslintrc.json

@@ -53,6 +53,7 @@
     ],
     "security/detect-object-injection": "off",
     "sonarjs/no-duplicate-string": "off",
+    "sonarjs/todo-tag": "off",
     "no-param-reassign": "off",
     "no-useless-constructor": "off",
     "sonarjs/no-small-switch": "off",
@@ -73,7 +74,8 @@
       }
     ],
     "no-empty-function": "off",
-    "unicorn/prefer-module": "off"
+    "unicorn/prefer-module": "off",
+    "sonarjs/todo-tag": "off"
   },
   "overrides": [
     {

frontend/src/__tests__/app/request-proof-of-template/page.test.tsx

@@ -42,6 +42,7 @@ describe('RequestProofPage', () => {
       name: 'template-name',
       letterType: 'x0',
       language: 'en',
+      proofingEnabled: true,
       files: {
         pdfTemplate: {
           virusScanStatus: 'PASSED',
@@ -123,4 +124,41 @@ describe('RequestProofPage', () => {
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
+
+  test('should forbid user from requesting a proof when proofingEnabled is false', async () => {
+    const state = {
+      id: 'template-id',
+      templateType: 'LETTER',
+      templateStatus: 'NOT_YET_SUBMITTED',
+      name: 'template-name',
+      letterType: 'x0',
+      language: 'ar',
+      proofingEnabled: false,
+      files: {
+        pdfTemplate: {
+          virusScanStatus: 'PASSED',
+          currentVersion: 'a',
+          fileName: 'a.pdf',
+        },
+      },
+    } satisfies Partial<TemplateDto>;
+
+    getTemplateMock.mockResolvedValue({
+      ...state,
+      createdAt: 'today',
+      updatedAt: 'today',
+    });
+
+    await RequestProofPage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+    });
+
+    expect(await generateMetadata()).toEqual({
+      title: pageTitle,
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+  });
 });

…emplate/__snapshots__/page.test.tsx.snap …emplate/__snapshots__/page.test.tsx.snapfrontend/src/__tests__/app/create-letter-template/__snapshots__/page.test.tsx.snap renamed to frontend/src/__tests__/app/upload-letter-template/__snapshots__/page.test.tsx.snap frontend/src/__tests__/app/create-letter-template/__snapshots__/page.test.tsx.snap renamed to frontend/src/__tests__/app/upload-letter-template/__snapshots__/page.test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`CreateLetterTemplatePage should render CreateLetterTemplatePage 1`] = `
+exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage 1`] = `
 <LetterTemplateForm
   initialState={
     {

…equired/__snapshots__/page.test.tsx.snap …equired/__snapshots__/page.test.tsx.snapfrontend/src/__tests__/app/create-letter-template/client-id-and-campaign-id-required/__snapshots__/page.test.tsx.snap renamed to frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/__snapshots__/page.test.tsx.snap frontend/src/__tests__/app/create-letter-template/client-id-and-campaign-id-required/__snapshots__/page.test.tsx.snap renamed to frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/__snapshots__/page.test.tsx.snap

@@ -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 () => {

…d-and-campaign-id-required/page.test.tsx …d-and-campaign-id-required/page.test.tsxfrontend/src/__tests__/app/create-letter-template/client-id-and-campaign-id-required/page.test.tsx renamed to frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/page.test.tsx frontend/src/__tests__/app/create-letter-template/client-id-and-campaign-id-required/page.test.tsx renamed to frontend/src/__tests__/app/upload-letter-template/client-id-and-campaign-id-required/page.test.tsx

@@ -1,24 +1,29 @@
 /**
  * @jest-environment node
  */
-import CreateLetterTemplatePage from '@app/create-letter-template/page';
+import UploadLetterTemplatePage, {
+  generateMetadata,
+} from '@app/upload-letter-template/page';
+import content from '@content/content';
 import { getSessionServer } from '@utils/amplify-utils';
 import { fetchClient } from '@utils/server-features';
 import { redirect, RedirectType } from 'next/navigation';
 
+const { pageTitle } = content.components.templateFormLetter;
+
 jest.mock('next/navigation');
 jest.mock('@utils/amplify-utils');
 jest.mock('@utils/server-features');
 
 const mockGetSessionServer = jest.mocked(getSessionServer);
 const mockFetchClient = jest.mocked(fetchClient);
 
-describe('CreateLetterTemplatePage', () => {
+describe('UploadLetterTemplatePage', () => {
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
-  it('should render CreateLetterTemplatePage', async () => {
+  it('should render UploadLetterTemplatePage', async () => {
     mockGetSessionServer.mockResolvedValueOnce({
       accessToken: 'mocktoken',
       clientId: 'client1',
@@ -30,8 +35,9 @@ describe('CreateLetterTemplatePage', () => {
       },
     });
 
-    const page = await CreateLetterTemplatePage();
+    const page = await UploadLetterTemplatePage();
 
+    expect(await generateMetadata()).toEqual({ title: pageTitle });
     expect(page).toMatchSnapshot();
   });
 
@@ -47,7 +53,7 @@ describe('CreateLetterTemplatePage', () => {
       },
     });
 
-    await CreateLetterTemplatePage();
+    await UploadLetterTemplatePage();
 
     expect(mockGetSessionServer).toHaveBeenCalled();
     expect(mockFetchClient).toHaveBeenCalled();
@@ -67,10 +73,10 @@ describe('CreateLetterTemplatePage', () => {
       },
     });
 
-    await CreateLetterTemplatePage();
+    await UploadLetterTemplatePage();
 
     expect(mockRedirect).toHaveBeenCalledWith(
-      '/create-letter-template/client-id-and-campaign-id-required',
+      '/upload-letter-template/client-id-and-campaign-id-required',
       RedirectType.replace
     );
   });
@@ -89,10 +95,10 @@ describe('CreateLetterTemplatePage', () => {
       },
     });
 
-    await CreateLetterTemplatePage();
+    await UploadLetterTemplatePage();
 
     expect(mockRedirect).toHaveBeenCalledWith(
-      '/create-letter-template/client-id-and-campaign-id-required',
+      '/upload-letter-template/client-id-and-campaign-id-required',
       RedirectType.replace
     );
   });

…app/create-letter-template/page.test.tsx …app/upload-letter-template/page.test.tsxfrontend/src/__tests__/app/create-letter-template/page.test.tsx renamed to frontend/src/__tests__/app/upload-letter-template/page.test.tsx frontend/src/__tests__/app/create-letter-template/page.test.tsx renamed to frontend/src/__tests__/app/upload-letter-template/page.test.tsx

@@ -8,11 +8,15 @@ exports[`CodeExample component renders component correctly 1`] = `
   >
     This is an example of markdown:
   </span>
-  <code
-    aria-describedby="test-id"
+  <pre
+    class="nhsuk-code-block"
   >
-    # A test example
-  </code>
+    <code
+      aria-describedby="test-id"
+    >
+      # A test example
+    </code>
+  </pre>
 </DocumentFragment>
 `;
 
@@ -24,11 +28,15 @@ exports[`CodeExample component renders component correctly when optional class i
   >
     This is an example of markdown:
   </span>
-  <code
-    aria-describedby="test-id"
-    class="test-class"
+  <pre
+    class="nhsuk-code-block"
   >
-    # A test example
-  </code>
+    <code
+      aria-describedby="test-id"
+      class="test-class"
+    >
+      # A test example
+    </code>
+  </pre>
 </DocumentFragment>
 `;

frontend/src/__tests__/components/atoms/__snapshots__/CodeExample.test.tsx.snap

@@ -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-text-message-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);
+  }
+);