CCM-13012: Fix CI

Author: chris-elliott-nhsd

frontend/src/__tests__/components/forms/ChooseChannelTemplate/server-action.test.ts

@@ -5,6 +5,7 @@ import {
   NHS_APP_TEMPLATE,
   ROUTING_CONFIG,
   SMS_TEMPLATE,
+  LETTER_TEMPLATE,
 } from '@testhelpers/helpers';
 import { updateRoutingConfig } from '@utils/message-plans';
 import { redirect, RedirectType } from 'next/navigation';
@@ -102,3 +103,55 @@ test('submit form - success updates config and redirects to choose templates', a
     RedirectType.push
   );
 });
+
+
+
+test('submit form - success updates config and redirects to choose templates for letter template with supplier references', async () => {
+  const mockRedirect = jest.mocked(redirect);
+  const mockUpdateRoutingConfig = jest.mocked(updateRoutingConfig);
+
+  await chooseChannelTemplateAction(
+    {
+      messagePlan: {
+        ...ROUTING_CONFIG,
+        cascade: [
+          {
+            cascadeGroups: ['standard'],
+            channel: 'LETTER',
+            channelType: 'primary',
+            defaultTemplateId: 'letter-template-id',
+          },
+        ],
+      },
+      pageHeading: 'Choose an email template',
+      templateList: [{
+        ...LETTER_TEMPLATE,
+        supplierReferences: {
+          MBA: 'mba-supplier-reference'
+        }
+      }],
+      cascadeIndex: 0,
+    },
+    getMockFormData({
+      channelTemplate: LETTER_TEMPLATE.id,
+    })
+  );
+
+  expect(mockUpdateRoutingConfig).toHaveBeenCalledWith(ROUTING_CONFIG.id, {
+    cascade: [
+      {
+        cascadeGroups: ['standard'],
+        channel: 'LETTER',
+        channelType: 'primary',
+        defaultTemplateId: LETTER_TEMPLATE.id,
+        supplierReferences: { MBA: 'mba-supplier-reference' }
+      },
+    ],
+    cascadeGroupOverrides: [],
+  });
+
+  expect(mockRedirect).toHaveBeenCalledWith(
+    `/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
+    RedirectType.push
+  );
+});

frontend/src/__tests__/helpers/helpers.ts

@@ -1,5 +1,6 @@
 import { mockDeep } from 'jest-mock-extended';
 import { RoutingConfig, TemplateDto } from 'nhs-notify-backend-client';
+import { LetterTemplate } from 'nhs-notify-web-template-management-utils';
 
 function* iteratorFromList<T>(list: T[]): IterableIterator<T> {
   for (const item of list) {
@@ -51,7 +52,7 @@ export const SMS_TEMPLATE: TemplateDto = {
   lockNumber: 1,
 } as const;
 
-export const LETTER_TEMPLATE: TemplateDto = {
+export const LETTER_TEMPLATE: LetterTemplate = {
   id: 'letter-template-id',
   templateType: 'LETTER',
   templateStatus: 'NOT_YET_SUBMITTED',

lambdas/backend-client/src/types/generated/types.gen.ts

@@ -94,18 +94,18 @@ export type ClientFeatures = {
 
 export type ConditionalTemplateAccessible = {
   accessibleFormat: LetterType;
-  templateId: string | null;
   supplierReferences?: {
     [key: string]: string;
   };
+  templateId: string | null;
 };
 
 export type ConditionalTemplateLanguage = {
   language: Language;
-  templateId: string | null;
   supplierReferences?: {
     [key: string]: string;
   };
+  templateId: string | null;
 };
 
 export type CountSuccess = {
@@ -202,9 +202,9 @@ export type RoutingConfig = {
   campaignId: string;
   cascade: Array<CascadeItem>;
   cascadeGroupOverrides: Array<CascadeGroup>;
-  defaultCascadeGroup: string;
   clientId: string;
   createdAt: string;
+  defaultCascadeGroup: string;
   id: string;
   name: string;
   status: RoutingConfigStatus;
@@ -233,6 +233,8 @@ export type SmsProperties = {
 export type TemplateDto = BaseCreatedTemplate &
   (SmsProperties | EmailProperties | NhsAppProperties | LetterProperties);
 
+export type TemplateStatus = TemplateStatusActive | 'DELETED';
+
 export type TemplateStatusActive =
   | 'NOT_YET_SUBMITTED'
   | 'PENDING_PROOF_REQUEST'
@@ -244,8 +246,6 @@ export type TemplateStatusActive =
   | 'WAITING_FOR_PROOF'
   | 'PROOF_AVAILABLE';
 
-export type TemplateStatus = TemplateStatusActive | 'DELETED';
-
 export type TemplateSuccess = {
   data: TemplateDto;
   statusCode: number;