Skip to content

Commit e5f4249

Browse files
nicki-nhsnicki-nhs
committed
CCM-11492 Rename choose template to template type
1 parent da5a309 commit e5f4249

File tree

12 files changed

+69
-69
lines changed

12 files changed

+69
-69
lines changed

‎frontend/src/__tests__/app/choose-a-template-type/page.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import ChooseATemplateTypePage, {
55
import { TemplateFormState } from 'nhs-notify-web-template-management-utils';
66
import content from '@content/content';
77

8-
const { pageTitle } = content.components.chooseTemplate;
8+
const { pageTitle } = content.components.chooseTemplateType;
99

1010
jest.mock('next/navigation', () => ({
1111
redirect: () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { LetterTemplate } from 'nhs-notify-web-template-management-utils';
1010

1111
jest.mock('@utils/form-actions');
1212
jest.mock('next/navigation');
13-
jest.mock('@forms/ChooseTemplate/ChooseTemplate');
13+
jest.mock('@forms/ChooseTemplateType/ChooseTemplateType');
1414

1515
const redirectMock = jest.mocked(redirect);
1616
const getTemplateMock = jest.mocked(getTemplate);

frontend/src/__tests__/components/forms/ChooseTemplate/ChooseTemplate.test.tsx renamed to frontend/src/__tests__/components/forms/ChooseTemplateType/ChooseTemplateType.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useActionState } from 'react';
22
import { render, screen, fireEvent } from '@testing-library/react';
3-
import { ChooseTemplate } from '@forms/ChooseTemplate/ChooseTemplate';
3+
import { ChooseTemplateType } from '@forms/ChooseTemplateType/ChooseTemplateType';
44
import { TemplateFormState } from 'nhs-notify-web-template-management-utils';
55
import { TEMPLATE_TYPE_LIST } from 'nhs-notify-backend-client';
66

@@ -28,7 +28,7 @@ jest.mock('react', () => {
2828
describe('Choose template page', () => {
2929
it('selects one radio button at a time', () => {
3030
const container = render(
31-
<ChooseTemplate templateTypes={TEMPLATE_TYPE_LIST} />
31+
<ChooseTemplateType templateTypes={TEMPLATE_TYPE_LIST} />
3232
);
3333
expect(container.asFragment()).toMatchSnapshot();
3434

@@ -77,14 +77,14 @@ describe('Choose template page', () => {
7777
jest.mocked(useActionState).mockImplementation(mockUseActionState);
7878

7979
const container = render(
80-
<ChooseTemplate templateTypes={TEMPLATE_TYPE_LIST} />
80+
<ChooseTemplateType templateTypes={TEMPLATE_TYPE_LIST} />
8181
);
8282
expect(container.asFragment()).toMatchSnapshot();
8383
});
8484

8585
test('Client-side validation triggers', () => {
8686
const container = render(
87-
<ChooseTemplate templateTypes={TEMPLATE_TYPE_LIST} />
87+
<ChooseTemplateType templateTypes={TEMPLATE_TYPE_LIST} />
8888
);
8989
const submitButton = screen.getByTestId('submit-button');
9090
fireEvent.click(submitButton);

frontend/src/__tests__/components/forms/ChooseTemplate/__snapshots__/ChooseTemplate.test.tsx.snap renamed to frontend/src/__tests__/components/forms/ChooseTemplateType/__snapshots__/ChooseTemplateType.test.tsx.snap

File renamed without changes.

frontend/src/__tests__/components/forms/ChooseTemplate/server-action.test.ts renamed to frontend/src/__tests__/components/forms/ChooseTemplateType/server-action.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { chooseTemplateAction } from '@forms/ChooseTemplate/server-action';
1+
import { chooseTemplateTypeAction } from '@forms/ChooseTemplateType/server-action';
22
import { getMockFormData } from '@testhelpers/helpers';
33
import { redirect, RedirectType } from 'next/navigation';
44

@@ -7,7 +7,7 @@ jest.mock('next/navigation');
77
jest.mock('@utils/amplify-utils');
88

99
test('submit form - validation error', async () => {
10-
const response = await chooseTemplateAction(
10+
const response = await chooseTemplateTypeAction(
1111
{},
1212
getMockFormData({
1313
'form-id': 'create-nhs-app-template',
@@ -35,7 +35,7 @@ test.each([
3535
async (templateType, url) => {
3636
const mockRedirect = jest.mocked(redirect);
3737

38-
await chooseTemplateAction(
38+
await chooseTemplateTypeAction(
3939
{},
4040
getMockFormData({
4141
templateType,

‎frontend/src/app/choose-a-template-type/page.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use server';
22

3-
import { ChooseTemplate } from '@forms/ChooseTemplate/ChooseTemplate';
3+
import { ChooseTemplateType } from '@forms/ChooseTemplateType/ChooseTemplateType';
44
import { Metadata } from 'next';
55
import { TEMPLATE_TYPE_LIST } from 'nhs-notify-backend-client';
66
import content from '@content/content';
77

8-
const { pageTitle } = content.components.chooseTemplate;
8+
const { pageTitle } = content.components.chooseTemplateType;
99

1010
export async function generateMetadata(): Promise<Metadata> {
1111
return {
@@ -14,7 +14,7 @@ export async function generateMetadata(): Promise<Metadata> {
1414
}
1515

1616
const ChooseATemplateTypePage = async () => {
17-
return <ChooseTemplate templateTypes={TEMPLATE_TYPE_LIST} />;
17+
return <ChooseTemplateType templateTypes={TEMPLATE_TYPE_LIST} />;
1818
};
1919

2020
export default ChooseATemplateTypePage;

frontend/src/components/forms/ChooseTemplate/ChooseTemplate.tsx renamed to frontend/src/components/forms/ChooseTemplateType/ChooseTemplateType.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ import {
99
templateTypeDisplayMappings,
1010
} from 'nhs-notify-web-template-management-utils';
1111
import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
12-
import { $ChooseTemplate, chooseTemplateAction } from './server-action';
12+
import { $ChooseTemplateType, chooseTemplateTypeAction } from './server-action';
1313
import { TemplateType } from 'nhs-notify-backend-client';
1414
import { validate } from '@utils/client-validate-form';
1515
import Link from 'next/link';
1616
import NotifyBackLink from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
1717

18-
export const ChooseTemplate = ({
18+
export const ChooseTemplateType = ({
1919
templateTypes,
2020
}: {
2121
templateTypes: TemplateType[];
2222
}) => {
23-
const [state, action] = useActionState(chooseTemplateAction, {});
23+
const [state, action] = useActionState(chooseTemplateTypeAction, {});
2424
const [errorState, setErrorState] = useState<ErrorState | undefined>(
2525
state.errorState
2626
);
2727

28-
const formValidate = validate($ChooseTemplate, setErrorState);
28+
const formValidate = validate($ChooseTemplateType, setErrorState);
2929

3030
const options = templateTypes.map((templateType) => ({
3131
id: templateType,

frontend/src/components/forms/ChooseTemplate/server-action.ts renamed to frontend/src/components/forms/ChooseTemplateType/server-action.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import {
77
import { z } from 'zod';
88
import content from '@content/content';
99

10-
export const $ChooseTemplate = z.object({
10+
export const $ChooseTemplateType = z.object({
1111
templateType: z.enum(TEMPLATE_TYPE_LIST, {
12-
message: content.components.chooseTemplate.form.templateType.error,
12+
message: content.components.chooseTemplateType.form.templateType.error,
1313
}),
1414
});
1515

16-
export async function chooseTemplateAction(
16+
export async function chooseTemplateTypeAction(
1717
_: FormState,
1818
formData: FormData
1919
): Promise<FormState> {
20-
const parsedForm = $ChooseTemplate.safeParse(
20+
const parsedForm = $ChooseTemplateType.safeParse(
2121
Object.fromEntries(formData.entries())
2222
);
2323

‎frontend/src/content/content.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ const copyTemplate = {
694694
},
695695
};
696696

697-
const chooseTemplate = {
697+
const chooseTemplateType = {
698698
pageTitle: generatePageTitle('Choose a template type'),
699699
pageHeading: 'Choose a template type to create',
700700
buttonText: 'Continue',
@@ -1233,7 +1233,7 @@ const content = {
12331233
components: {
12341234
channelGuidance,
12351235
chooseMessageOrder,
1236-
chooseTemplate,
1236+
chooseTemplateType,
12371237
copyTemplate,
12381238
createEditMessagePlan,
12391239
deleteTemplate,

‎tests/accessibility/.pa11y-ci.js‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const {
4343
} = require('./actions');
4444

4545
const baseUrl = 'http://localhost:3000/templates';
46-
const chooseTemplateUrl = `${baseUrl}/choose-a-template-type`;
46+
const chooseTemplateTypeUrl = `${baseUrl}/choose-a-template-type`;
4747
const startUrl = 'http://localhost:3000/templates/create-and-submit-templates';
4848
const messageTemplatesUrl = `${baseUrl}/message-templates`;
4949

@@ -57,49 +57,49 @@ function previewLetterTemplateUrl(status) {
5757

5858
const allTemplates = [
5959
messageTemplatesPage(messageTemplatesUrl),
60-
copyTemplatePage(chooseTemplateUrl),
60+
copyTemplatePage(chooseTemplateTypeUrl),
6161
];
6262

63-
const chooseTemplate = [
64-
chooseATemplatePage(chooseTemplateUrl),
65-
chooseATemplatePageError(chooseTemplateUrl),
63+
const chooseTemplateType = [
64+
chooseATemplatePage(chooseTemplateTypeUrl),
65+
chooseATemplatePageError(chooseTemplateTypeUrl),
6666
];
6767

6868
const nhsApp = [
69-
createNHSAppTemplatePage(chooseTemplateUrl),
70-
createNHSAppTemplateErrorPage(chooseTemplateUrl),
71-
previewNHSAppTemplatePage(chooseTemplateUrl),
72-
previewNHSAppTemplateErrorPage(chooseTemplateUrl),
69+
createNHSAppTemplatePage(chooseTemplateTypeUrl),
70+
createNHSAppTemplateErrorPage(chooseTemplateTypeUrl),
71+
previewNHSAppTemplatePage(chooseTemplateTypeUrl),
72+
previewNHSAppTemplateErrorPage(chooseTemplateTypeUrl),
7373
viewNotYetSubmittedNHSAppTemplatePage(messageTemplatesUrl),
74-
submitNHSAppTemplatePage(chooseTemplateUrl),
75-
nhsAppTemplateSubmittedPage(chooseTemplateUrl),
74+
submitNHSAppTemplatePage(chooseTemplateTypeUrl),
75+
nhsAppTemplateSubmittedPage(chooseTemplateTypeUrl),
7676
previewSubmittedNHSAppTemplatePage(messageTemplatesUrl),
7777
];
7878

7979
const sms = [
80-
createTextMessageTemplatePage(chooseTemplateUrl),
81-
createTextMessageTemplateErrorPage(chooseTemplateUrl),
82-
previewTextMessageTemplatePage(chooseTemplateUrl),
83-
previewTextMessageTemplateErrorPage(chooseTemplateUrl),
80+
createTextMessageTemplatePage(chooseTemplateTypeUrl),
81+
createTextMessageTemplateErrorPage(chooseTemplateTypeUrl),
82+
previewTextMessageTemplatePage(chooseTemplateTypeUrl),
83+
previewTextMessageTemplateErrorPage(chooseTemplateTypeUrl),
8484
viewNotYetSubmittedTextMessageTemplatePage(messageTemplatesUrl),
85-
submitTextMessageTemplatePage(chooseTemplateUrl),
86-
textMessageTemplateSubmittedPage(chooseTemplateUrl),
85+
submitTextMessageTemplatePage(chooseTemplateTypeUrl),
86+
textMessageTemplateSubmittedPage(chooseTemplateTypeUrl),
8787
previewSubmittedTextMessageTemplatePage(messageTemplatesUrl),
8888
];
8989

9090
const email = [
91-
createEmailTemplatePage(chooseTemplateUrl),
92-
createEmailTemplateErrorPage(chooseTemplateUrl),
93-
previewEmailTemplatePage(chooseTemplateUrl),
94-
previewEmailTemplateErrorPage(chooseTemplateUrl),
91+
createEmailTemplatePage(chooseTemplateTypeUrl),
92+
createEmailTemplateErrorPage(chooseTemplateTypeUrl),
93+
previewEmailTemplatePage(chooseTemplateTypeUrl),
94+
previewEmailTemplateErrorPage(chooseTemplateTypeUrl),
9595
viewNotYetSubmittedEmailTemplatePage(messageTemplatesUrl),
96-
submitEmailTemplatePage(chooseTemplateUrl),
97-
emailTemplateSubmittedPage(chooseTemplateUrl),
96+
submitEmailTemplatePage(chooseTemplateTypeUrl),
97+
emailTemplateSubmittedPage(chooseTemplateTypeUrl),
9898
previewSubmittedEmailTemplatePage(messageTemplatesUrl),
9999
];
100100

101101
const letters = [
102-
uploadLetterTemplatePage(chooseTemplateUrl),
102+
uploadLetterTemplatePage(chooseTemplateTypeUrl),
103103
previewLetterTemplatePage(previewLetterTemplateUrl('PENDING_UPLOAD')),
104104
previewLetterTemplatePageWithError(previewLetterTemplateUrl('VIRUS_SCAN_FAILED')),
105105
previewLetterTemplatePage(previewLetterTemplateUrl('PENDING_VALIDATION')),
@@ -142,7 +142,7 @@ const userEmails = [
142142
const allJourneys = {
143143
landingPage,
144144
allTemplates,
145-
chooseTemplate,
145+
chooseTemplateType,
146146
nhsApp,
147147
sms,
148148
email,

0 commit comments

Comments
 (0)