CCM-8579: Copy, tests, misc

Author: ClareJonesBJSS

.tool-versions

@@ -6,6 +6,7 @@ terraform-docs 0.19.0
 vale 3.6.0
 tfsec 1.28.10
 nodejs 20.18.2
+jq 1.6
 
 # ==============================================================================
 # The section below is reserved for Docker image versions.

frontend/src/__tests__/app/copy-template/page.test.tsx

@@ -3,18 +3,17 @@
  */
 import CopyTemplatePage from '@app/copy-template/[templateId]/page';
 import { CopyTemplate } from '@forms/CopyTemplate/CopyTemplate';
-import {
-  TemplateType,
-  TemplateStatus,
-} from 'nhs-notify-web-template-management-utils';
 import { redirect } from 'next/navigation';
 import { getTemplate } from '@utils/form-actions';
 import {
   Language,
   LetterType,
   TemplateDTO,
+  TemplateStatus,
+  TemplateType,
   VirusScanStatus,
 } from 'nhs-notify-backend-client';
+import { LetterTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock('@utils/form-actions');
 jest.mock('next/navigation');
@@ -37,7 +36,7 @@ describe('CopyTemplatePage', () => {
     updatedAt: '2025-01-13T10:19:25.579Z',
   } satisfies TemplateDTO;
 
-  const letterTemplate: TemplateDTO = {
+  const letterTemplate: LetterTemplate = {
     id: 'template-id',
     templateType: TemplateType.LETTER,
     templateStatus: TemplateStatus.NOT_YET_SUBMITTED,

frontend/src/__tests__/app/create-email-template/__snapshots__/page.test.tsx.snap

@@ -7,7 +7,6 @@ exports[`CreateEmailTemplatePage should render CreateEmailTemplatePage 1`] = `
       "message": "",
       "name": "",
       "subject": "",
-      "templateStatus": "NOT_YET_SUBMITTED",
       "templateType": "EMAIL",
     }
   }

frontend/src/__tests__/app/create-nhs-app-template/__snapshots__/page.test.tsx.snap

@@ -6,7 +6,6 @@ exports[`CreateNHSAppTemplatePage should render CreateNHSAppTemplatePage 1`] = `
     {
       "message": "",
       "name": "",
-      "templateStatus": "NOT_YET_SUBMITTED",
       "templateType": "NHS_APP",
     }
   }

frontend/src/__tests__/app/create-text-message-template/__snapshots__/page.test.tsx.snap

@@ -6,7 +6,6 @@ exports[`CreateSMSTemplatePage should render CreateSMSTemplatePage 1`] = `
     {
       "message": "",
       "name": "",
-      "templateStatus": "NOT_YET_SUBMITTED",
       "templateType": "SMS",
     }
   }

frontend/src/__tests__/app/delete-template/page.test.tsx

@@ -4,7 +4,6 @@
 import DeleteTemplatePage from '@app/delete-template/[templateId]/page';
 import { DeleteTemplate } from '@forms/DeleteTemplate/DeleteTemplate';
 import {
-  EmailTemplate,
   TemplateType,
   TemplateStatus,
 } from 'nhs-notify-web-template-management-utils';
@@ -34,7 +33,7 @@ describe('PreviewEmailTemplatePage', () => {
       updatedAt: '2025-01-13T10:19:25.579Z',
     } satisfies TemplateDTO;
 
-    const emailTemplate: EmailTemplate = {
+    const emailTemplate: TemplateDTO = {
       ...templateDTO,
       subject: 'template-subject-line',
       templateType: TemplateType.EMAIL,

frontend/src/__tests__/app/edit-email-template/page.test.tsx

@@ -3,14 +3,10 @@
  */
 import EditEmailTemplatePage from '@app/edit-email-template/[templateId]/page';
 import { getTemplate } from '@utils/form-actions';
-import {
-  EmailTemplate,
-  TemplateStatus,
-  TemplateType,
-} from 'nhs-notify-web-template-management-utils';
 import { redirect } from 'next/navigation';
 import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
-import { TemplateDTO } from 'nhs-notify-backend-client';
+import { TemplateStatus, TemplateType } from 'nhs-notify-backend-client';
+import { EmailTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock('@utils/form-actions');
 jest.mock('next/navigation');
@@ -19,7 +15,7 @@ jest.mock('@forms/EmailTemplateForm/EmailTemplateForm');
 const getTemplateMock = jest.mocked(getTemplate);
 const redirectMock = jest.mocked(redirect);
 
-const templateDTO = {
+const template: EmailTemplate = {
   id: 'template-id',
   templateType: TemplateType.EMAIL,
   templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
@@ -28,7 +24,7 @@ const templateDTO = {
   message: 'message',
   createdAt: '2025-01-13T10:19:25.579Z',
   updatedAt: '2025-01-13T10:19:25.579Z',
-} satisfies TemplateDTO;
+};
 
 describe('EditEmailTemplatePage', () => {
   beforeEach(jest.resetAllMocks);
@@ -49,7 +45,7 @@ describe('EditEmailTemplatePage', () => {
 
   it('should redirect to invalid-template when template type is not EMAIL', async () => {
     getTemplateMock.mockResolvedValueOnce({
-      ...templateDTO,
+      ...template,
       templateType: TemplateType.NHS_APP,
     });
 
@@ -65,10 +61,10 @@ describe('EditEmailTemplatePage', () => {
   });
 
   it('should render CreateEmailTemplatePage component when template is found', async () => {
-    getTemplateMock.mockResolvedValueOnce(templateDTO);
+    getTemplateMock.mockResolvedValueOnce(template);
 
-    const emailTemplate: EmailTemplate = {
-      ...templateDTO,
+    const emailTemplate = {
+      ...template,
       subject: 'subject',
       templateType: TemplateType.EMAIL,
       templateStatus: TemplateStatus.NOT_YET_SUBMITTED,

frontend/src/__tests__/app/edit-nhs-app-template/page.test.tsx

@@ -2,15 +2,16 @@
  * @jest-environment node
  */
 import { redirect } from 'next/navigation';
-import {
-  TemplateType,
-  TemplateStatus,
-  NHSAppTemplate,
-} from 'nhs-notify-web-template-management-utils';
+import { NHSAppTemplate } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
 import { NhsAppTemplateForm } from '@forms/NhsAppTemplateForm/NhsAppTemplateForm';
 import EditNhsAppTemplatePage from '@app/edit-nhs-app-template/[templateId]/page';
-import { TemplateDTO } from 'nhs-notify-backend-client';
+import {
+  TemplateDTO,
+  TemplateStatus,
+  TemplateType,
+} from 'nhs-notify-backend-client';
+import { EMAIL_TEMPLATE, LETTER_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
 
 jest.mock('@forms/NhsAppTemplateForm/NhsAppTemplateForm');
 jest.mock('@utils/form-actions');
@@ -23,7 +24,7 @@ describe('EditNhsAppTemplatePage', () => {
   beforeEach(jest.resetAllMocks);
 
   test('page loads', async () => {
-    const templateDTO = {
+    const template = {
       id: 'template-id',
       templateType: TemplateType.NHS_APP,
       templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
@@ -34,12 +35,12 @@ describe('EditNhsAppTemplatePage', () => {
     } satisfies TemplateDTO;
 
     const nhsAppTemplate: NHSAppTemplate = {
-      ...templateDTO,
+      ...template,
       templateType: TemplateType.NHS_APP,
       templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
     };
 
-    getTemplateMock.mockResolvedValueOnce(templateDTO);
+    getTemplateMock.mockResolvedValueOnce(template);
 
     const page = await EditNhsAppTemplatePage({
       params: Promise.resolve({
@@ -62,23 +63,10 @@ describe('EditNhsAppTemplatePage', () => {
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
 
-  const invalidTemplateTypes: TemplateType[] = [
-    TemplateType.EMAIL,
-    TemplateType.SMS,
-  ];
-
-  test.each(invalidTemplateTypes)(
-    'should render invalid template, when template type is %p',
-    async (templateType) => {
-      getTemplateMock.mockResolvedValueOnce({
-        id: 'template-id',
-        templateType,
-        templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
-        name: 'name',
-        message: 'message',
-        createdAt: 'today',
-        updatedAt: 'today',
-      });
+  test.each([EMAIL_TEMPLATE, SMS_TEMPLATE, LETTER_TEMPLATE])(
+    'should render invalid template, when template type is $templateType',
+    async (template) => {
+      getTemplateMock.mockResolvedValueOnce(template);
 
       await EditNhsAppTemplatePage({
         params: Promise.resolve({

frontend/src/__tests__/app/edit-text-message-template/page.test.tsx

@@ -3,14 +3,14 @@
  */
 import EditSmsTemplatePage from '@app/edit-text-message-template/[templateId]/page';
 import { getTemplate } from '@utils/form-actions';
-import {
-  SMSTemplate,
-  TemplateType,
-  TemplateStatus,
-} from 'nhs-notify-web-template-management-utils';
 import { redirect } from 'next/navigation';
 import { SmsTemplateForm } from '@forms/SmsTemplateForm/SmsTemplateForm';
-import { TemplateDTO } from 'nhs-notify-backend-client';
+import {
+  TemplateDTO,
+  TemplateStatus,
+  TemplateType,
+} from 'nhs-notify-backend-client';
+import { SMSTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock('@utils/form-actions');
 jest.mock('next/navigation');

frontend/src/__tests__/app/email-template-submitted/page.test.tsx

@@ -9,6 +9,7 @@ import {
 import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
 import { getTemplate } from '@utils/form-actions';
 import { redirect } from 'next/navigation';
+import { TemplateDTO } from 'nhs-notify-backend-client';
 
 jest.mock('@molecules/TemplateSubmitted/TemplateSubmitted');
 jest.mock('@utils/form-actions');
@@ -30,7 +31,7 @@ describe('EmailTemplateSubmittedPage', () => {
       subject: 'subject',
       createdAt: 'today',
       updatedAt: 'today',
-    };
+    } satisfies TemplateDTO;
 
     getTemplateMock.mockResolvedValueOnce(template);