Fixes after bad rebase

Author: chris-elliott-nhsd

frontend/src/__tests__/components/forms/CopyTemplate/CopyTemplate.test.tsx

@@ -41,7 +41,6 @@ describe('Choose template page', () => {
       screen.getByTestId('EMAIL-radio'),
       screen.getByTestId('NHS_APP-radio'),
       screen.getByTestId('SMS-radio'),
-      screen.getByTestId('LETTER-radio'),
     ];
     const submitButton = screen.getByTestId('submit-button');
 

frontend/src/__tests__/components/forms/CopyTemplate/__snapshots__/CopyTemplate.test.tsx.snap

@@ -153,25 +153,6 @@ exports[`Choose template page renders error component 1`] = `
                     Text message (SMS)
                   </label>
                 </div>
-                <div
-                  class="nhsuk-radios__item"
-                >
-                  <input
-                    class="nhsuk-radios__input"
-                    data-testid="LETTER-radio"
-                    id="templateType-LETTER"
-                    name="templateType"
-                    type="radio"
-                    value="LETTER"
-                  />
-                  <label
-                    class="nhsuk-label nhsuk-radios__label"
-                    for="templateType-LETTER"
-                    id="templateType-LETTER--label"
-                  >
-                    Letter
-                  </label>
-                </div>
               </div>
             </div>
           </fieldset>
@@ -319,25 +300,6 @@ exports[`Choose template page selects one radio button at a time 1`] = `
                     Text message (SMS)
                   </label>
                 </div>
-                <div
-                  class="nhsuk-radios__item"
-                >
-                  <input
-                    class="nhsuk-radios__input"
-                    data-testid="LETTER-radio"
-                    id="templateType-LETTER"
-                    name="templateType"
-                    type="radio"
-                    value="LETTER"
-                  />
-                  <label
-                    class="nhsuk-label nhsuk-radios__label"
-                    for="templateType-LETTER"
-                    id="templateType-LETTER--label"
-                  >
-                    Letter
-                  </label>
-                </div>
               </div>
             </div>
           </fieldset>

frontend/src/components/forms/ChooseTemplate/ChooseTemplate.tsx

@@ -9,7 +9,7 @@ import { chooseTemplatePageContent } from '@content/content';
 import {
   TemplateType,
   templateTypeDisplayMappings,
-} from 'nhs-notify-web-template-management-utils/src/enum';
+} from 'nhs-notify-web-template-management-utils';
 import { chooseTemplateAction } from './server-action';
 
 export const ChooseTemplate = () => {

frontend/src/components/forms/CopyTemplate/CopyTemplate.tsx

@@ -7,11 +7,11 @@ import { BackLink } from 'nhsuk-react-components';
 import { NHSNotifyRadioButtonForm } from '@molecules/NHSNotifyRadioButtonForm/NHSNotifyRadioButtonForm';
 import { ZodErrorSummary } from '@molecules/ZodErrorSummary/ZodErrorSummary';
 import { copyTemplatePageContent } from '@content/content';
-import { Template } from 'nhs-notify-web-template-management-utils/src/types';
 import {
+  Template,
   TemplateType,
   templateTypeDisplayMappings,
-} from 'nhs-notify-web-template-management-utils/src/enum';
+} from 'nhs-notify-web-template-management-utils';
 import { getBasePath } from '@utils/get-base-path';
 import { copyTemplateAction } from './server-action';
 

frontend/src/components/forms/CopyTemplate/server-action.ts

@@ -4,11 +4,9 @@ import { redirect, RedirectType } from 'next/navigation';
 import {
   FormState,
   Template,
-} from 'nhs-notify-web-template-management-utils/src/types';
-import {
   TemplateStatus,
   TemplateType,
-} from 'nhs-notify-web-template-management-utils/src/enum';
+} from 'nhs-notify-web-template-management-utils';
 import { z } from 'zod';
 import { createTemplate } from '@utils/form-actions';
 import { format } from 'date-fns/format';

tests/test-team/helpers/types.ts

@@ -9,15 +9,13 @@ export const templateTypeDisplayMappings = (type: TemplateType) =>
     [TemplateType.NHS_APP]: 'NHS App message',
     [TemplateType.SMS]: 'Text message (SMS)',
     [TemplateType.EMAIL]: 'Email',
-    [TemplateType.LETTER]: 'Letter',
   })[type];
 
 export const templateTypeToUrlTextMappings = (type: TemplateType) =>
   ({
     [TemplateType.NHS_APP]: 'nhs-app',
     [TemplateType.SMS]: 'text-message',
     [TemplateType.EMAIL]: 'email',
-    [TemplateType.LETTER]: 'letter',
   })[type];
 
 export enum TemplateStatus {

tests/test-team/template-mgmt-component-tests/template-mgmt-copy-page.component.ts

@@ -87,7 +87,7 @@ test.describe('Copy Template Page', () => {
 
     await copyTemplatePage.loadPage(templates.email.id);
 
-    await expect(copyTemplatePage.radioButtons).toHaveCount(4);
+    await expect(copyTemplatePage.radioButtons).toHaveCount(3);
   });
 
   test('should display error if no template type option selected and continue button clicked', async ({

utils/src/enum.ts

@@ -2,7 +2,6 @@ export enum TemplateType {
   NHS_APP = 'NHS_APP',
   EMAIL = 'EMAIL',
   SMS = 'SMS',
-  LETTER = 'LETTER',
 }
 
 export enum TemplateStatus {
@@ -15,7 +14,6 @@ export const templateTypeDisplayMappings = (type: TemplateType) =>
     [TemplateType.NHS_APP]: 'NHS App message',
     [TemplateType.SMS]: 'Text message (SMS)',
     [TemplateType.EMAIL]: 'Email',
-    [TemplateType.LETTER]: 'Letter',
   })[type];
 
 export const templateStatustoDisplayMappings = (status: TemplateStatus) =>
@@ -29,5 +27,9 @@ export const templateTypeToUrlTextMappings = (type: TemplateType) =>
     [TemplateType.NHS_APP]: 'nhs-app',
     [TemplateType.SMS]: 'text-message',
     [TemplateType.EMAIL]: 'email',
-    [TemplateType.LETTER]: 'letter',
   })[type];
+
+export const previewTemplatePages = (type: TemplateType) =>
+  `preview-${templateTypeToUrlTextMappings(type)}-template`;
+export const viewSubmittedTemplatePages = (type: TemplateType) =>
+  `view-submitted-${templateTypeToUrlTextMappings(type)}-template`;