Skip to content

Commit b5cee87

Browse files
bhansell1bhansell1
committed
CCM-11459: review
1 parent 92e01ee commit b5cee87

File tree

9 files changed

+114
-116
lines changed

9 files changed

+114
-116
lines changed

‎frontend/src/__tests__/components/forms/PreviewEmailTemplate/PreviewEmailTemplate.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ describe('Preview email form renders', () => {
149149
'matches snapshot when navigating from edit screen when routing is %p',
150150
(routing) => {
151151
const mockSearchParams = new Map([['from', 'edit']]);
152-
(useSearchParams as jest.Mock).mockImplementation(() => ({
152+
(useSearchParams as jest.Mock).mockImplementationOnce(() => ({
153153
get: (key: string) => mockSearchParams.get(key),
154154
}));
155155

‎frontend/src/__tests__/components/forms/PreviewEmailTemplate/__snapshots__/PreviewEmailTemplate.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ exports[`Preview email form renders matches snapshot when navigating from edit s
953953
class="nhsuk-button nhsuk-button--secondary"
954954
data-testid="edit-template-button"
955955
draggable="false"
956-
href="/templates/edit-email-template/template-id"
956+
href="/edit-email-template/template-id"
957957
role="button"
958958
>
959959
Edit template
@@ -1359,7 +1359,7 @@ exports[`Preview email form renders matches snapshot when navigating from manage
13591359
class="nhsuk-button nhsuk-button--secondary"
13601360
data-testid="edit-template-button"
13611361
draggable="false"
1362-
href="/templates/edit-email-template/template-id"
1362+
href="/edit-email-template/template-id"
13631363
role="button"
13641364
>
13651365
Edit template

‎frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/PreviewNHSAppTemplate.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ describe('Preview nhs app form renders', () => {
120120
});
121121

122122
it.each([true, false])(
123-
'matches snapshot when navigating from manage templates screen when routing is $p',
123+
'matches snapshot when navigating from manage templates screen when routing is %p',
124124
(routing) => {
125125
const container = render(
126126
<PreviewNHSAppTemplate
@@ -143,7 +143,7 @@ describe('Preview nhs app form renders', () => {
143143
'matches snapshot when navigating from edit screen when routing is %p',
144144
(routing) => {
145145
const mockSearchParams = new Map([['from', 'edit']]);
146-
(useSearchParams as jest.Mock).mockImplementation(() => ({
146+
(useSearchParams as jest.Mock).mockImplementationOnce(() => ({
147147
get: (key: string) => mockSearchParams.get(key),
148148
}));
149149

‎frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/__snapshots__/PreviewNHSAppTemplate.test.tsx.snap‎

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
856856
class="nhsuk-button nhsuk-button--secondary"
857857
data-testid="edit-template-button"
858858
draggable="false"
859-
href="/templates/edit-nhs-app-template/template-id"
859+
href="/edit-nhs-app-template/template-id"
860860
role="button"
861861
>
862862
Edit template
@@ -876,7 +876,7 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
876876
</DocumentFragment>
877877
`;
878878

879-
exports[`Preview nhs app form renders matches snapshot when navigating from manage templates screen when routing is $p 1`] = `
879+
exports[`Preview nhs app form renders matches snapshot when navigating from manage templates screen when routing is false 1`] = `
880880
<DocumentFragment>
881881
<a
882882
class="nhsuk-back-link"
@@ -992,16 +992,92 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
992992
</div>
993993
</dl>
994994
</div>
995-
<a
996-
aria-disabled="false"
997-
class="nhsuk-button nhsuk-button--secondary"
998-
data-testid="edit-template-button"
999-
draggable="false"
1000-
href="/templates/edit-nhs-app-template/template-id"
1001-
role="button"
995+
<form
996+
action="/action"
1002997
>
1003-
Edit template
1004-
</a>
998+
<input
999+
name="form-id"
1000+
readonly=""
1001+
type="hidden"
1002+
value="preview-nhs-app-template"
1003+
/>
1004+
<input
1005+
name="csrf_token"
1006+
readonly=""
1007+
type="hidden"
1008+
value="no_token"
1009+
/>
1010+
<div
1011+
class="nhsuk-form-group"
1012+
>
1013+
<fieldset
1014+
class="nhsuk-fieldset"
1015+
>
1016+
<legend
1017+
class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m"
1018+
data-testid="previewNHSAppTemplateAction-form__legend"
1019+
>
1020+
What would you like to do next?
1021+
</legend>
1022+
<div
1023+
class="nhsuk-form-group"
1024+
>
1025+
<div
1026+
class="nhsuk-radios"
1027+
id="previewNHSAppTemplateAction"
1028+
>
1029+
<div
1030+
class="nhsuk-radios__item"
1031+
>
1032+
<input
1033+
class="nhsuk-radios__input"
1034+
data-testid="nhsapp-edit-radio"
1035+
id="previewNHSAppTemplateAction-nhsapp-edit"
1036+
name="previewNHSAppTemplateAction"
1037+
type="radio"
1038+
value="nhsapp-edit"
1039+
/>
1040+
<label
1041+
class="nhsuk-label nhsuk-radios__label"
1042+
for="previewNHSAppTemplateAction-nhsapp-edit"
1043+
id="previewNHSAppTemplateAction-nhsapp-edit--label"
1044+
>
1045+
Edit template
1046+
</label>
1047+
</div>
1048+
<div
1049+
class="nhsuk-radios__item"
1050+
>
1051+
<input
1052+
class="nhsuk-radios__input"
1053+
data-testid="nhsapp-submit-radio"
1054+
id="previewNHSAppTemplateAction-nhsapp-submit"
1055+
name="previewNHSAppTemplateAction"
1056+
type="radio"
1057+
value="nhsapp-submit"
1058+
/>
1059+
<label
1060+
class="nhsuk-label nhsuk-radios__label"
1061+
for="previewNHSAppTemplateAction-nhsapp-submit"
1062+
id="previewNHSAppTemplateAction-nhsapp-submit--label"
1063+
>
1064+
Submit template
1065+
</label>
1066+
</div>
1067+
</div>
1068+
</div>
1069+
</fieldset>
1070+
</div>
1071+
<button
1072+
aria-disabled="false"
1073+
class="nhsuk-button"
1074+
data-testid="submit-button"
1075+
id="preview-nhs-app-template-submit-button"
1076+
type="submit"
1077+
>
1078+
Continue
1079+
</button>
1080+
</form>
10051081
10061082
<p>
10071083
<a
@@ -1017,7 +1093,7 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
10171093
</DocumentFragment>
10181094
`;
10191095

1020-
exports[`Preview nhs app form renders matches snapshot when navigating from manage templates screen when routing is $p 2`] = `
1096+
exports[`Preview nhs app form renders matches snapshot when navigating from manage templates screen when routing is true 1`] = `
10211097
<DocumentFragment>
10221098
<a
10231099
class="nhsuk-back-link"
@@ -1133,92 +1209,16 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
11331209
</div>
11341210
</dl>
11351211
</div>
1136-
<form
1137-
action="/action"
1212+
<a
1213+
aria-disabled="false"
1214+
class="nhsuk-button nhsuk-button--secondary"
1215+
data-testid="edit-template-button"
1216+
draggable="false"
1217+
href="/edit-nhs-app-template/template-id"
1218+
role="button"
11381219
>
1139-
<input
1140-
name="form-id"
1141-
readonly=""
1142-
type="hidden"
1143-
value="preview-nhs-app-template"
1144-
/>
1145-
<input
1146-
name="csrf_token"
1147-
readonly=""
1148-
type="hidden"
1149-
value="no_token"
1150-
/>
1151-
<div
1152-
class="nhsuk-form-group"
1153-
>
1154-
<fieldset
1155-
class="nhsuk-fieldset"
1156-
>
1157-
<legend
1158-
class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m"
1159-
data-testid="previewNHSAppTemplateAction-form__legend"
1160-
>
1161-
What would you like to do next?
1162-
</legend>
1163-
<div
1164-
class="nhsuk-form-group"
1165-
>
1166-
<div
1167-
class="nhsuk-radios"
1168-
id="previewNHSAppTemplateAction"
1169-
>
1170-
<div
1171-
class="nhsuk-radios__item"
1172-
>
1173-
<input
1174-
class="nhsuk-radios__input"
1175-
data-testid="nhsapp-edit-radio"
1176-
id="previewNHSAppTemplateAction-nhsapp-edit"
1177-
name="previewNHSAppTemplateAction"
1178-
type="radio"
1179-
value="nhsapp-edit"
1180-
/>
1181-
<label
1182-
class="nhsuk-label nhsuk-radios__label"
1183-
for="previewNHSAppTemplateAction-nhsapp-edit"
1184-
id="previewNHSAppTemplateAction-nhsapp-edit--label"
1185-
>
1186-
Edit template
1187-
</label>
1188-
</div>
1189-
<div
1190-
class="nhsuk-radios__item"
1191-
>
1192-
<input
1193-
class="nhsuk-radios__input"
1194-
data-testid="nhsapp-submit-radio"
1195-
id="previewNHSAppTemplateAction-nhsapp-submit"
1196-
name="previewNHSAppTemplateAction"
1197-
type="radio"
1198-
value="nhsapp-submit"
1199-
/>
1200-
<label
1201-
class="nhsuk-label nhsuk-radios__label"
1202-
for="previewNHSAppTemplateAction-nhsapp-submit"
1203-
id="previewNHSAppTemplateAction-nhsapp-submit--label"
1204-
>
1205-
Submit template
1206-
</label>
1207-
</div>
1208-
</div>
1209-
</div>
1210-
</fieldset>
1211-
</div>
1212-
<button
1213-
aria-disabled="false"
1214-
class="nhsuk-button"
1215-
data-testid="submit-button"
1216-
id="preview-nhs-app-template-submit-button"
1217-
type="submit"
1218-
>
1219-
Continue
1220-
</button>
1221-
</form>
1220+
Edit template
1221+
</a>
12221222
12231223
<p>
12241224
<a

‎frontend/src/__tests__/components/forms/PreviewSMSTemplate/PreviewSMSTemplate.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('Review sms form renders', () => {
143143
'matches snapshot when navigating from edit screen when routing is %p',
144144
(routing) => {
145145
const mockSearchParams = new Map([['from', 'edit']]);
146-
(useSearchParams as jest.Mock).mockImplementation(() => ({
146+
(useSearchParams as jest.Mock).mockImplementationOnce(() => ({
147147
get: (key: string) => mockSearchParams.get(key),
148148
}));
149149

‎frontend/src/__tests__/components/forms/PreviewSMSTemplate/__snapshots__/PreviewSMSTemplate.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ exports[`Review sms form renders matches snapshot when navigating from edit scre
853853
class="nhsuk-button nhsuk-button--secondary"
854854
data-testid="edit-template-button"
855855
draggable="false"
856-
href="/templates/edit-text-message-template/template-id"
856+
href="/edit-text-message-template/template-id"
857857
role="button"
858858
>
859859
Edit template
@@ -1209,7 +1209,7 @@ exports[`Review sms form renders matches snapshot when navigating from manage te
12091209
class="nhsuk-button nhsuk-button--secondary"
12101210
data-testid="edit-template-button"
12111211
draggable="false"
1212-
href="/templates/edit-text-message-template/template-id"
1212+
href="/edit-text-message-template/template-id"
12131213
role="button"
12141214
>
12151215
Edit template

‎frontend/src/__tests__/components/organisms/__snapshots__/PreviewDigitalTemplate.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ exports[`PreviewDigitalTemplate Routing enabled matches snapshot 1`] = `
227227
class="nhsuk-button nhsuk-button--secondary"
228228
data-testid="edit-template-button"
229229
draggable="false"
230-
href="/templates/edit-nhs-app-template/template-id"
230+
href="/edit-nhs-app-template/template-id"
231231
role="button"
232232
>
233233
Edit template

‎frontend/src/app/preview-email-template/[templateId]/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ const PreviewEmailTemplatePage = async (props: PageProps) => {
3030
redirect('/invalid-template', RedirectType.replace);
3131
}
3232

33-
const routing = await serverIsFeatureEnabled('routing');
33+
const routingEnabled = await serverIsFeatureEnabled('routing');
3434

3535
return (
3636
<PreviewEmailTemplate
3737
initialState={validatedTemplate}
38-
routingEnabled={routing}
38+
routingEnabled={routingEnabled}
3939
/>
4040
);
4141
};

‎frontend/src/components/organisms/PreviewDigitalTemplate/PreviewDigitalTemplate.tsx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { NhsNotifyErrorSummary } from '@molecules/NhsNotifyErrorSummary/NhsNotif
44
import { NHSNotifyRadioButtonForm } from '@molecules/NHSNotifyRadioButtonForm/NHSNotifyRadioButtonForm';
55
import { PreviewTemplateProps } from './preview-digitial-template.types';
66
import { Button } from 'nhsuk-react-components';
7-
import { getBasePath } from '@utils/get-base-path';
87
import content from '@content/content';
8+
import Link from 'next/link';
99

1010
const { editButton } = content.components.previewDigitalTemplate;
1111

@@ -20,13 +20,11 @@ export function PreviewDigitalTemplate(props: PreviewTemplateProps) {
2020
{props.routingEnabled ? (
2121
<>
2222
{props.previewDetailsComponent}
23-
<Button
24-
secondary
25-
href={`${getBasePath()}${props.editPath}`}
26-
data-testid='edit-template-button'
27-
>
28-
{editButton}
29-
</Button>
23+
<Link href={props.editPath} passHref legacyBehavior>
24+
<Button secondary data-testid='edit-template-button'>
25+
{editButton}
26+
</Button>
27+
</Link>
3028
</>
3129
) : (
3230
<>

0 commit comments

Comments
 (0)