CCM-8601: unit tests pass

alexnuttall · alexnuttall · commit 20a41c8b833a · 2025-03-03T14:15:13.000Z
diff --git a/frontend/src/__tests__/app/delete-template/page.test.tsx b/frontend/src/__tests__/app/delete-template/page.test.tsx
@@ -22,7 +22,7 @@ const getTemplateMock = jest.mocked(getTemplate);
 describe('PreviewEmailTemplatePage', () => {
   beforeEach(jest.resetAllMocks);
 
-  it.only('should load page', async () => {
+  it('should load page', async () => {
     const templateDTO = {
       id: 'template-id',
       templateType: TemplateType.EMAIL,
diff --git a/frontend/src/__tests__/app/view-submitted-email-template/page.test.tsx b/frontend/src/__tests__/app/view-submitted-email-template/page.test.tsx
@@ -4,7 +4,7 @@
 import ViewSubmittedEmailTemplatePage from '@app/view-submitted-email-template/[templateId]/page';
 import { ViewEmailTemplate } from '@molecules/ViewEmailTemplate/ViewEmailTemplate';
 import {
-  SubmittedEmailTemplate,
+  EmailTemplate,
   TemplateType,
   TemplateStatus,
 } from 'nhs-notify-web-template-management-utils';
@@ -33,7 +33,7 @@ describe('ViewSubmittedEmailTemplatePage', () => {
       updatedAt: '2025-01-13T10:19:25.579Z',
     } satisfies TemplateDTO;
 
-    const submittedEmailTemplate: SubmittedEmailTemplate = {
+    const submittedEmailTemplate: EmailTemplate = {
       ...templateDTO,
       subject: 'template-subject-line',
       templateType: TemplateType.EMAIL,
diff --git a/frontend/src/__tests__/app/view-submitted-nhs-app-template/page.test.tsx b/frontend/src/__tests__/app/view-submitted-nhs-app-template/page.test.tsx
@@ -4,7 +4,7 @@
 import ViewSubmittedNHSAppTemplatePage from '@app/view-submitted-nhs-app-template/[templateId]/page';
 import { ViewNHSAppTemplate } from '@molecules/ViewNHSAppTemplate/ViewNHSAppTemplate';
 import {
-  SubmittedNHSAppTemplate,
+  NHSAppTemplate,
   TemplateType,
   TemplateStatus,
 } from 'nhs-notify-web-template-management-utils';
@@ -32,7 +32,7 @@ describe('ViewSubmittedNHSAppTemplatePage', () => {
       updatedAt: '2025-01-13T10:19:25.579Z',
     } satisfies TemplateDTO;
 
-    const submittedNHSAppTemplate: SubmittedNHSAppTemplate = {
+    const submittedNHSAppTemplate: NHSAppTemplate = {
       ...templateDTO,
       templateType: TemplateType.NHS_APP,
       templateStatus: TemplateStatus.SUBMITTED,
diff --git a/frontend/src/__tests__/app/view-submitted-text-message-template/page.test.tsx b/frontend/src/__tests__/app/view-submitted-text-message-template/page.test.tsx
@@ -4,7 +4,7 @@
 import ViewSubmittedSMSTemplatePage from '@app/view-submitted-text-message-template/[templateId]/page';
 import { ViewSMSTemplate } from '@molecules/ViewSMSTemplate/ViewSMSTemplate';
 import {
-  SubmittedSMSTemplate,
+  SMSTemplate,
   TemplateType,
   TemplateStatus,
 } from 'nhs-notify-web-template-management-utils';
@@ -32,7 +32,7 @@ describe('ViewSubmittedSMSTemplatePage', () => {
       updatedAt: '2025-01-13T10:19:25.579Z',
     } satisfies TemplateDTO;
 
-    const submittedSMSTemplate: SubmittedSMSTemplate = {
+    const submittedSMSTemplate: SMSTemplate = {
       ...templateDTO,
       templateType: TemplateType.SMS,
       templateStatus: TemplateStatus.SUBMITTED,
diff --git a/frontend/src/__tests__/components/molecules/ViewEmailTemplate.test.tsx b/frontend/src/__tests__/components/molecules/ViewEmailTemplate.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react';
 import { ViewEmailTemplate } from '@molecules/ViewEmailTemplate/ViewEmailTemplate';
 import {
-  SubmittedEmailTemplate,
+  EmailTemplate,
   TemplateStatus,
 } from 'nhs-notify-web-template-management-utils';
 
@@ -16,7 +16,7 @@ describe('ViewEmailTemplate component', () => {
             templateStatus: TemplateStatus.SUBMITTED,
             subject: 'Example subject',
             message: 'Example message',
-          } as SubmittedEmailTemplate
+          } as EmailTemplate
         }
       />
     );
diff --git a/frontend/src/__tests__/components/molecules/ViewNHSAppTemplate.test.tsx b/frontend/src/__tests__/components/molecules/ViewNHSAppTemplate.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react';
 import { ViewNHSAppTemplate } from '@molecules/ViewNHSAppTemplate/ViewNHSAppTemplate';
 import {
-  SubmittedNHSAppTemplate,
+  NHSAppTemplate,
   TemplateStatus,
 } from 'nhs-notify-web-template-management-utils';
 
@@ -15,7 +15,7 @@ describe('ViewNHSAppTemplate component', () => {
             name: 'Example template',
             templateStatus: TemplateStatus.SUBMITTED,
             message: 'Example message',
-          } as SubmittedNHSAppTemplate
+          } as NHSAppTemplate
         }
       />
     );
diff --git a/frontend/src/__tests__/components/molecules/ViewSMSTemplate.test.tsx b/frontend/src/__tests__/components/molecules/ViewSMSTemplate.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react';
 import { ViewSMSTemplate } from '@molecules/ViewSMSTemplate/ViewSMSTemplate';
 import {
-  SubmittedSMSTemplate,
+  SMSTemplate,
   TemplateStatus,
 } from 'nhs-notify-web-template-management-utils';
 
@@ -15,7 +15,7 @@ describe('ViewNHSAppTemplate component', () => {
             name: 'Example template',
             templateStatus: TemplateStatus.SUBMITTED,
             message: 'Example message',
-          } as SubmittedSMSTemplate
+          } as SMSTemplate
         }
       />
     );
diff --git a/frontend/src/components/forms/CopyTemplate/server-action.ts b/frontend/src/components/forms/CopyTemplate/server-action.ts
@@ -52,7 +52,7 @@ export const copyTemplateAction: CopyTemplateAction = async (
     name: `COPY (${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}): ${name}`,
     templateType: newTemplateType,
     ...(formState.template.templateType === TemplateType.EMAIL && {
-      subject: formState.template.subject ?? 'Enter a subject line',
+      subject: formState.template.subject,
     }),
   });
 
diff --git a/frontend/src/components/molecules/PreviewTemplate/PreviewTemplate.tsx b/frontend/src/components/molecules/PreviewTemplate/PreviewTemplate.tsx
@@ -6,9 +6,6 @@ import {
   type LetterTemplate,
   type SMSTemplate,
   NHSAppTemplate,
-  SubmittedEmailTemplate,
-  SubmittedNHSAppTemplate,
-  SubmittedSMSTemplate,
   TemplateStatus,
   templateStatusToDisplayMappings,
   templateTypeDisplayMappings,
@@ -116,7 +113,7 @@ PreviewTemplate.Email = ({
   subject,
   message,
 }: {
-  template: EmailTemplate | SubmittedEmailTemplate;
+  template: EmailTemplate;
   subject: string;
   message: string;
 }) => (
@@ -135,7 +132,7 @@ PreviewTemplate.NHSApp = ({
   template,
   message,
 }: {
-  template: NHSAppTemplate | SubmittedNHSAppTemplate;
+  template: NHSAppTemplate;
   message: string;
 }) => (
   <PreviewTemplate
@@ -149,7 +146,7 @@ PreviewTemplate.Sms = ({
   template,
   message,
 }: {
-  template: SMSTemplate | SubmittedSMSTemplate;
+  template: SMSTemplate;
   message: string;
 }) => (
   <PreviewTemplate
diff --git a/frontend/src/components/molecules/ViewEmailTemplate/ViewEmailTemplate.tsx b/frontend/src/components/molecules/ViewEmailTemplate/ViewEmailTemplate.tsx
@@ -2,8 +2,8 @@
 
 import { PreviewTemplate } from '@molecules/PreviewTemplate';
 import {
+  EmailTemplate,
   PageComponentProps,
-  SubmittedEmailTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getBasePath } from '@utils/get-base-path';
 import { renderEmailMarkdown } from '@utils/markdownit';
@@ -14,7 +14,7 @@ import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 
 export function ViewEmailTemplate({
   initialState,
-}: Readonly<PageComponentProps<SubmittedEmailTemplate>>) {
+}: Readonly<PageComponentProps<EmailTemplate>>) {
   const templateSubjectLine = initialState.subject;
   const templateMessage = initialState.message;
 
diff --git a/frontend/src/components/molecules/ViewNHSAppTemplate/ViewNHSAppTemplate.tsx b/frontend/src/components/molecules/ViewNHSAppTemplate/ViewNHSAppTemplate.tsx
@@ -2,8 +2,8 @@
 
 import { PreviewTemplate } from '@molecules/PreviewTemplate';
 import {
+  NHSAppTemplate,
   PageComponentProps,
-  SubmittedNHSAppTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getBasePath } from '@utils/get-base-path';
 import { renderNHSAppMarkdown } from '@utils/markdownit';
@@ -14,7 +14,7 @@ import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 
 export function ViewNHSAppTemplate({
   initialState,
-}: Readonly<PageComponentProps<SubmittedNHSAppTemplate>>) {
+}: Readonly<PageComponentProps<NHSAppTemplate>>) {
   const templateMessage = initialState.message;
 
   const html = renderNHSAppMarkdown(templateMessage);
diff --git a/frontend/src/components/molecules/ViewSMSTemplate/ViewSMSTemplate.tsx b/frontend/src/components/molecules/ViewSMSTemplate/ViewSMSTemplate.tsx
@@ -3,7 +3,7 @@
 import { PreviewTemplate } from '@molecules/PreviewTemplate';
 import {
   PageComponentProps,
-  SubmittedSMSTemplate,
+  SMSTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getBasePath } from '@utils/get-base-path';
 import { renderSMSMarkdown } from '@utils/markdownit';
@@ -14,7 +14,7 @@ import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 
 export function ViewSMSTemplate({
   initialState,
-}: Readonly<PageComponentProps<SubmittedSMSTemplate>>) {
+}: Readonly<PageComponentProps<SMSTemplate>>) {
   const templateMessage = initialState.message;
 
   const html = renderSMSMarkdown(templateMessage);
diff --git a/frontend/src/utils/validate-template.ts b/frontend/src/utils/validate-template.ts
@@ -5,11 +5,11 @@ import {
   $EmailTemplate,
   $LetterTemplate,
   $Template,
-  $SubmittedEmailTemplate,
-  $SubmittedSMSTemplate,
-  $SubmittedNHSAppTemplate,
   $SubmittedTemplate,
   $NonSubmittedTemplate,
+  $SubmittedEmailTemplate,
+  $SubmittedNHSAppTemplate,
+  $SubmittedSMSTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { TemplateDTO } from 'nhs-notify-backend-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
@@ -50,8 +50,5 @@ export const validateSubmittedNHSAppTemplate = (template?: TemplateDTO) =>
 export const validateTemplate = (template?: TemplateDTO) =>
   zodValidate($Template, template);
 
-export const validateSubmittedTemplate = (template?: TemplateDTO) =>
-  zodValidate($SubmittedTemplate, template);
-
 export const validateNonSubmittedTemplate = (template?: TemplateDTO) =>
   zodValidate($NonSubmittedTemplate, template);
diff --git a/utils/utils/src/types.ts b/utils/utils/src/types.ts
@@ -3,13 +3,9 @@ import {
   $EmailTemplate,
   $SMSTemplate,
   $NHSAppTemplate,
-  $ChannelTemplate,
-  $SubmittedChannelTemplate,
-  $SubmittedEmailTemplate,
-  $SubmittedSMSTemplate,
-  $SubmittedNHSAppTemplate,
+  $Template,
+  $SubmittedTemplate,
   $LetterTemplate,
-  $SubmittedLetterTemplate,
 } from './zod-validators';
 
 export type FormId =
@@ -29,33 +25,23 @@ export type FormErrorState = {
 
 export type EmailTemplate = z.infer<typeof $EmailTemplate>;
 
-export type SubmittedEmailTemplate = z.infer<typeof $SubmittedEmailTemplate>;
-
 export type SMSTemplate = z.infer<typeof $SMSTemplate>;
 
-export type SubmittedSMSTemplate = z.infer<typeof $SubmittedSMSTemplate>;
-
 export type NHSAppTemplate = z.infer<typeof $NHSAppTemplate>;
 
-export type SubmittedNHSAppTemplate = z.infer<typeof $SubmittedNHSAppTemplate>;
-
 export type LetterTemplate = z.infer<typeof $LetterTemplate>;
 
-export type SubmittedLetterTemplate = z.infer<typeof $SubmittedLetterTemplate>;
-
-export type ChannelTemplate = z.infer<typeof $ChannelTemplate>;
+export type Template = z.infer<typeof $Template>;
 
-export type SubmittedChannelTemplate = z.infer<
-  typeof $SubmittedChannelTemplate
->;
+export type SubmittedTemplate = z.infer<typeof $SubmittedTemplate>;
 
 export type Draft<T> = Omit<T, 'id'>;
 
 export type FormState = {
   validationError?: FormErrorState;
 };
 
-export type TemplateFormState<T = ChannelTemplate> = FormState & T;
+export type TemplateFormState<T = Template> = FormState & T;
 
 export type PageProps = {
   params: Promise<{
diff --git a/utils/utils/src/zod-validators.ts b/utils/utils/src/zod-validators.ts
@@ -24,6 +24,9 @@ export const $EmailTemplate = $TemplateBase.extend({
 export const $SubmittedEmailTemplate = $EmailTemplate.extend({
   templateStatus: z.literal(TemplateStatus.SUBMITTED),
 });
+export const $NonSubmittedEmailTemplate = $EmailTemplate.extend({
+  templateStatus: z.literal(TemplateStatus.NOT_YET_SUBMITTED),
+});
 
 export const $NHSAppTemplate = $TemplateBase.extend({
   templateType: z.literal(TemplateType.NHS_APP),
@@ -32,6 +35,9 @@ export const $NHSAppTemplate = $TemplateBase.extend({
 export const $SubmittedNHSAppTemplate = $NHSAppTemplate.extend({
   templateStatus: z.literal(TemplateStatus.SUBMITTED),
 });
+export const $NonSubmittedNHSAppTemplate = $NHSAppTemplate.extend({
+  templateStatus: z.literal(TemplateStatus.NOT_YET_SUBMITTED),
+});
 
 export const $SMSTemplate = $TemplateBase.extend({
   templateType: z.literal(TemplateType.SMS),
@@ -40,6 +46,9 @@ export const $SMSTemplate = $TemplateBase.extend({
 export const $SubmittedSMSTemplate = $SMSTemplate.extend({
   templateStatus: z.literal(TemplateStatus.SUBMITTED),
 });
+const $NonSubmittedSMSTemplate = $SMSTemplate.extend({
+  templateStatus: z.literal(TemplateStatus.NOT_YET_SUBMITTED),
+});
 
 export const $LetterTemplate = $TemplateBase.extend({
   templateType: z.literal(TemplateType.LETTER),
@@ -48,23 +57,33 @@ export const $LetterTemplate = $TemplateBase.extend({
   pdfTemplateInputFile: z.string(),
   testPersonalisationInputFile: z.string(),
 });
-export const $SubmittedLetterTemplate = $LetterTemplate.extend({
+const $SubmittedLetterTemplate = $LetterTemplate.extend({
   templateStatus: z.literal(TemplateStatus.SUBMITTED),
 });
+const $NonSubmittedLetterTemplate = $LetterTemplate.extend({
+  templateStatus: z.literal(TemplateStatus.NOT_YET_SUBMITTED),
+});
 
-export const $ChannelTemplate = z.discriminatedUnion('templateType', [
+export const $Template = z.discriminatedUnion('templateType', [
   $NHSAppTemplate,
   $EmailTemplate,
   $SMSTemplate,
   $LetterTemplate,
 ]);
 
-export const $SubmittedChannelTemplate = z.discriminatedUnion('templateType', [
+export const $SubmittedTemplate = z.discriminatedUnion('templateType', [
   $SubmittedNHSAppTemplate,
   $SubmittedEmailTemplate,
   $SubmittedSMSTemplate,
   $SubmittedLetterTemplate,
 ]);
 
+export const $NonSubmittedTemplate = z.discriminatedUnion('templateType', [
+  $NonSubmittedNHSAppTemplate,
+  $NonSubmittedEmailTemplate,
+  $NonSubmittedSMSTemplate,
+  $NonSubmittedLetterTemplate,
+]);
+
 export const isTemplateValid = (input: unknown): TemplateDTO | undefined =>
   $TemplateDTOSchema.safeParse(input).data;
