Skip to content

Commit 892438a

Browse files
m-salaudeenm-salaudeen
committed
CCM-8868: Refactor page titles
1 parent 59c4bb8 commit 892438a

File tree

32 files changed

+237
-139
lines changed

32 files changed

+237
-139
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ describe('EmailTemplateSubmittedPage', () => {
4343
<TemplateSubmitted
4444
templateId={template.id}
4545
templateName={template.name}
46-
templateType={template.templateType}
4746
/>
4847
);
4948
});

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ describe('NhsAppTemplateSubmittedPage', () => {
4444
<TemplateSubmitted
4545
templateId={template.id}
4646
templateName={template.name}
47-
templateType={template.templateType}
4847
/>
4948
);
5049
});

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ describe('SubmitEmailTemplatePage', () => {
4444
<SubmitTemplate
4545
templateName={state.name}
4646
templateId={state.id}
47-
templateType={state.templateType}
4847
goBackPath='preview-email-template'
4948
submitPath='email-template-submitted'
5049
/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ describe('SubmitNhsAppTemplatePage', () => {
4747
<SubmitTemplate
4848
templateName={state.name}
4949
templateId={state.id}
50-
templateType={state.templateType}
5150
goBackPath='preview-nhs-app-template'
5251
submitPath='nhs-app-template-submitted'
5352
/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ describe('SubmitSmsTemplatePage', () => {
4848
<SubmitTemplate
4949
templateName={state.name}
5050
templateId={state.id}
51-
templateType={state.templateType}
5251
goBackPath='preview-text-message-template'
5352
submitPath='text-message-template-submitted'
5453
/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ describe('TextMessageTemplateSubmittedPage', () => {
4444
<TemplateSubmitted
4545
templateId={template.id}
4646
templateName={template.name}
47-
templateType={template.templateType}
4847
/>
4948
);
5049
});

‎frontend/src/__tests__/components/molecules/__snapshots__/ManageTemplates.test.tsx.snap‎

Lines changed: 82 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -136,35 +136,39 @@ exports[`ManageTemplates component matches snapshot with not submitted status 1`
136136
>
137137
Action
138138
</span>
139-
<p
140-
class="nhsuk-u-margin-bottom-2"
139+
<div
140+
class="actionLinksWrapper"
141141
>
142-
<a
143-
href="/copy-template/1"
144-
id="copy-template-link-0"
142+
<p
143+
class="nhsuk-u-margin-bottom-2"
145144
>
146-
<span
147-
class="nhsuk-u-visually-hidden"
145+
<a
146+
href="/copy-template/1"
147+
id="copy-template-link-0"
148148
>
149-
Template 1
150-
</span>
151-
Copy
152-
</a>
153-
</p>
154-
<p
155-
class="nhsuk-u-margin-bottom-2"
156-
>
157-
<a
158-
href="/delete-template/1"
149+
<span
150+
class="nhsuk-u-visually-hidden"
151+
>
152+
Template 1
153+
</span>
154+
Copy
155+
</a>
156+
</p>
157+
<p
158+
class="nhsuk-u-margin-bottom-2"
159159
>
160-
<span
161-
class="nhsuk-u-visually-hidden"
160+
<a
161+
href="/delete-template/1"
162162
>
163-
Template 1
164-
</span>
165-
Delete
166-
</a>
167-
</p>
163+
<span
164+
class="nhsuk-u-visually-hidden"
165+
>
166+
Template 1
167+
</span>
168+
Delete
169+
</a>
170+
</p>
171+
</div>
168172
</td>
169173
</tr>
170174
<tr
@@ -238,21 +242,25 @@ exports[`ManageTemplates component matches snapshot with not submitted status 1`
238242
>
239243
Action
240244
</span>
241-
<p
242-
class="nhsuk-u-margin-bottom-2"
245+
<div
246+
class="actionLinksWrapper"
243247
>
244-
<a
245-
href="/copy-template/2"
246-
id="copy-template-link-1"
248+
<p
249+
class="nhsuk-u-margin-bottom-2"
247250
>
248-
<span
249-
class="nhsuk-u-visually-hidden"
251+
<a
252+
href="/copy-template/2"
253+
id="copy-template-link-1"
250254
>
251-
Template 2
252-
</span>
253-
Copy
254-
</a>
255-
</p>
255+
<span
256+
class="nhsuk-u-visually-hidden"
257+
>
258+
Template 2
259+
</span>
260+
Copy
261+
</a>
262+
</p>
263+
</div>
256264
</td>
257265
</tr>
258266
<tr
@@ -326,6 +334,9 @@ exports[`ManageTemplates component matches snapshot with not submitted status 1`
326334
>
327335
Action
328336
</span>
337+
<div
338+
class="actionLinksWrapper"
339+
/>
329340
</td>
330341
</tr>
331342
</tbody>
@@ -471,21 +482,25 @@ exports[`ManageTemplates component matches snapshot with submitted status 1`] =
471482
>
472483
Action
473484
</span>
474-
<p
475-
class="nhsuk-u-margin-bottom-2"
485+
<div
486+
class="actionLinksWrapper"
476487
>
477-
<a
478-
href="/copy-template/1"
479-
id="copy-template-link-0"
488+
<p
489+
class="nhsuk-u-margin-bottom-2"
480490
>
481-
<span
482-
class="nhsuk-u-visually-hidden"
491+
<a
492+
href="/copy-template/1"
493+
id="copy-template-link-0"
483494
>
484-
Template 1
485-
</span>
486-
Copy
487-
</a>
488-
</p>
495+
<span
496+
class="nhsuk-u-visually-hidden"
497+
>
498+
Template 1
499+
</span>
500+
Copy
501+
</a>
502+
</p>
503+
</div>
489504
</td>
490505
</tr>
491506
<tr
@@ -559,21 +574,25 @@ exports[`ManageTemplates component matches snapshot with submitted status 1`] =
559574
>
560575
Action
561576
</span>
562-
<p
563-
class="nhsuk-u-margin-bottom-2"
577+
<div
578+
class="actionLinksWrapper"
564579
>
565-
<a
566-
href="/copy-template/2"
567-
id="copy-template-link-1"
580+
<p
581+
class="nhsuk-u-margin-bottom-2"
568582
>
569-
<span
570-
class="nhsuk-u-visually-hidden"
583+
<a
584+
href="/copy-template/2"
585+
id="copy-template-link-1"
571586
>
572-
Template 2
573-
</span>
574-
Copy
575-
</a>
576-
</p>
587+
<span
588+
class="nhsuk-u-visually-hidden"
589+
>
590+
Template 2
591+
</span>
592+
Copy
593+
</a>
594+
</p>
595+
</div>
577596
</td>
578597
</tr>
579598
<tr
@@ -647,6 +666,9 @@ exports[`ManageTemplates component matches snapshot with submitted status 1`] =
647666
>
648667
Action
649668
</span>
669+
<div
670+
class="actionLinksWrapper"
671+
/>
650672
</td>
651673
</tr>
652674
</tbody>

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

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

33
import { ChooseTemplate } from '@forms/ChooseTemplate/ChooseTemplate';
4+
import { Metadata } from 'next';
45
import { TEMPLATE_TYPE_LIST } from 'nhs-notify-backend-client';
6+
import content from '@content/content';
7+
8+
const { pageTitle } = content.components.chooseTemplate;
9+
10+
export async function generateMetadata(): Promise<Metadata> {
11+
return {
12+
title: pageTitle,
13+
};
14+
}
515

616
const ChooseATemplateTypePage = async () => {
717
const templateTypes = TEMPLATE_TYPE_LIST.filter(

‎frontend/src/app/create-and-submit-templates/page.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
'use client';
2-
31
import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
42
import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
53
import content from '@content/content';
6-
import PageTitle from '@hooks/page-title.hook';
4+
import { Metadata } from 'next';
75

86
const homePageContent = content.pages.homePage;
97

8+
export const metadata: Metadata = {
9+
title: homePageContent.pageTitle,
10+
};
11+
1012
export default function HomePage() {
11-
PageTitle(homePageContent.pageTitle);
1213
return (
1314
<NHSNotifyMain>
1415
<div className='nhsuk-grid-row' data-testid='page-content-wrapper'>

‎frontend/src/app/create-email-template/page.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
import { Metadata } from 'next';
12
import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
23
import { CreateEmailTemplate } from 'nhs-notify-web-template-management-utils';
4+
import content from '@content/content';
5+
6+
const { pageTitle } = content.components.templateFormEmail;
7+
8+
export async function generateMetadata(): Promise<Metadata> {
9+
return {
10+
title: pageTitle,
11+
};
12+
}
313

414
const CreateEmailTemplatePage = async () => {
515
const initialState: CreateEmailTemplate = {

0 commit comments

Comments
 (0)