Skip to content

Commit 5702e87

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
Fix back links
1 parent a657a19 commit 5702e87

File tree

28 files changed

+421
-1012
lines changed

28 files changed

+421
-1012
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ jest.mock('next/navigation', () => ({
66
redirect: () => {
77
throw new Error('Simulated redirect');
88
},
9-
useRouter: () => {},
109

1110
RedirectType: {
1211
push: 'push',

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jest.mock('next/navigation', () => ({
2323
redirect: () => {
2424
throw new Error('Simulated redirect');
2525
},
26-
useRouter: () => {},
2726

2827
RedirectType: {
2928
push: 'push',

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jest.mock('next/navigation', () => ({
2222
redirect: () => {
2323
throw new Error('Simulated redirect');
2424
},
25-
useRouter: () => {},
2625

2726
RedirectType: {
2827
push: 'push',

‎src/__tests__/components/forms/ChooseTemplate/ChooseTemplate.test.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ import { render, screen, fireEvent } from '@testing-library/react';
55
import { ChooseTemplate } from '@forms/ChooseTemplate/ChooseTemplate';
66
import { TemplateFormState } from '@utils/types';
77

8-
jest.mock('next/navigation', () => ({
9-
useRouter: () => ({
10-
push: jest.fn(),
11-
}),
12-
}));
13-
148
jest.mock('@utils/amplify-utils', () => ({
159
getAmplifyBackendClient: () => {},
1610
}));

‎src/__tests__/components/forms/CreateEmailTemplate/__snapshots__/CreateEmailTemplate.test.tsx.snap‎

Lines changed: 51 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -6,51 +6,26 @@ exports[`renders page one error 1`] = `
66
class="nhsuk-grid-row"
77
>
88
<div
9-
class="nhsuk-back-link nhsuk-u-margin-bottom-7 nhsuk-u-margin-left-3"
9+
class="nhsuk-back-link nhsuk-u-margin-bottom-6 nhsuk-u-margin-left-3"
1010
>
11-
<form
12-
action="/action"
11+
<a
12+
class="nhsuk-back-link__link"
13+
href="/choose-a-template-type"
1314
>
14-
<input
15-
name="form-id"
16-
readonly=""
17-
type="hidden"
18-
value="create-email-template-back"
19-
/>
20-
<input
21-
name="emailTemplateName"
22-
type="hidden"
23-
value=""
24-
/>
25-
<input
26-
name="emailTemplateSubjectLine"
27-
type="hidden"
28-
value=""
29-
/>
30-
<input
31-
name="emailTemplateMessage"
32-
type="hidden"
33-
value=""
34-
/>
35-
<button
36-
class="nhsuk-back-link__link"
37-
type="submit"
15+
<svg
16+
aria-hidden="true"
17+
class="nhsuk-icon nhsuk-icon__chevron-left"
18+
height="34"
19+
viewBox="0 0 24 24"
20+
width="34"
21+
xmlns="http://www.w3.org/2000/svg"
3822
>
39-
<svg
40-
aria-hidden="true"
41-
class="nhsuk-icon nhsuk-icon__chevron-left"
42-
height="34"
43-
viewBox="0 0 24 24"
44-
width="34"
45-
xmlns="http://www.w3.org/2000/svg"
46-
>
47-
<path
48-
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
49-
/>
50-
</svg>
51-
Go back
52-
</button>
53-
</form>
23+
<path
24+
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
25+
/>
26+
</svg>
27+
Go back
28+
</a>
5429
</div>
5530
<div
5631
class="nhsuk-grid-column-two-thirds"
@@ -593,51 +568,26 @@ exports[`renders page with multiple errors 1`] = `
593568
class="nhsuk-grid-row"
594569
>
595570
<div
596-
class="nhsuk-back-link nhsuk-u-margin-bottom-7 nhsuk-u-margin-left-3"
571+
class="nhsuk-back-link nhsuk-u-margin-bottom-6 nhsuk-u-margin-left-3"
597572
>
598-
<form
599-
action="/action"
573+
<a
574+
class="nhsuk-back-link__link"
575+
href="/choose-a-template-type"
600576
>
601-
<input
602-
name="form-id"
603-
readonly=""
604-
type="hidden"
605-
value="create-email-template-back"
606-
/>
607-
<input
608-
name="emailTemplateName"
609-
type="hidden"
610-
value=""
611-
/>
612-
<input
613-
name="emailTemplateSubjectLine"
614-
type="hidden"
615-
value=""
616-
/>
617-
<input
618-
name="emailTemplateMessage"
619-
type="hidden"
620-
value=""
621-
/>
622-
<button
623-
class="nhsuk-back-link__link"
624-
type="submit"
577+
<svg
578+
aria-hidden="true"
579+
class="nhsuk-icon nhsuk-icon__chevron-left"
580+
height="34"
581+
viewBox="0 0 24 24"
582+
width="34"
583+
xmlns="http://www.w3.org/2000/svg"
625584
>
626-
<svg
627-
aria-hidden="true"
628-
class="nhsuk-icon nhsuk-icon__chevron-left"
629-
height="34"
630-
viewBox="0 0 24 24"
631-
width="34"
632-
xmlns="http://www.w3.org/2000/svg"
633-
>
634-
<path
635-
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
636-
/>
637-
</svg>
638-
Go back
639-
</button>
640-
</form>
585+
<path
586+
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
587+
/>
588+
</svg>
589+
Go back
590+
</a>
641591
</div>
642592
<div
643593
class="nhsuk-grid-column-two-thirds"
@@ -1210,51 +1160,26 @@ exports[`renders page with preloaded field values 1`] = `
12101160
class="nhsuk-grid-row"
12111161
>
12121162
<div
1213-
class="nhsuk-back-link nhsuk-u-margin-bottom-7 nhsuk-u-margin-left-3"
1163+
class="nhsuk-back-link nhsuk-u-margin-bottom-6 nhsuk-u-margin-left-3"
12141164
>
1215-
<form
1216-
action="/action"
1165+
<a
1166+
class="nhsuk-back-link__link"
1167+
href="/choose-a-template-type"
12171168
>
1218-
<input
1219-
name="form-id"
1220-
readonly=""
1221-
type="hidden"
1222-
value="create-email-template-back"
1223-
/>
1224-
<input
1225-
name="emailTemplateName"
1226-
type="hidden"
1227-
value="template-name"
1228-
/>
1229-
<input
1230-
name="emailTemplateSubjectLine"
1231-
type="hidden"
1232-
value="template-subject-line"
1233-
/>
1234-
<input
1235-
name="emailTemplateMessage"
1236-
type="hidden"
1237-
value="template-message"
1238-
/>
1239-
<button
1240-
class="nhsuk-back-link__link"
1241-
type="submit"
1169+
<svg
1170+
aria-hidden="true"
1171+
class="nhsuk-icon nhsuk-icon__chevron-left"
1172+
height="34"
1173+
viewBox="0 0 24 24"
1174+
width="34"
1175+
xmlns="http://www.w3.org/2000/svg"
12421176
>
1243-
<svg
1244-
aria-hidden="true"
1245-
class="nhsuk-icon nhsuk-icon__chevron-left"
1246-
height="34"
1247-
viewBox="0 0 24 24"
1248-
width="34"
1249-
xmlns="http://www.w3.org/2000/svg"
1250-
>
1251-
<path
1252-
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
1253-
/>
1254-
</svg>
1255-
Go back
1256-
</button>
1257-
</form>
1177+
<path
1178+
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
1179+
/>
1180+
</svg>
1181+
Go back
1182+
</a>
12581183
</div>
12591184
<div
12601185
class="nhsuk-grid-column-two-thirds"

0 commit comments

Comments
 (0)