Skip to content

Commit 2f35b74

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
Bug fixes
1 parent f07b211 commit 2f35b74

File tree

11 files changed

+37
-16
lines changed

11 files changed

+37
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exports[`Preview email form renders matches error snapshot 1`] = `
2828
</a>
2929
</div>
3030
<div
31-
class="notify-confirmation-panel"
31+
class="notify-confirmation-panel nhsuk-heading-l"
3232
>
3333
Template saved
3434
</div>
@@ -307,7 +307,7 @@ exports[`Preview email form renders matches snapshot 1`] = `
307307
</a>
308308
</div>
309309
<div
310-
class="notify-confirmation-panel"
310+
class="notify-confirmation-panel nhsuk-heading-l"
311311
>
312312
Template saved
313313
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`Preview letter form renders matches snapshot 1`] = `
44
<DocumentFragment>
55
<div
6-
class="notify-confirmation-panel"
6+
class="notify-confirmation-panel nhsuk-heading-l"
77
>
88
Letter template
99
</div>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ describe('Preview nhs app form renders', () => {
3131
<ReviewNHSAppTemplate
3232
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
3333
validationError: undefined,
34+
id: 'template-id',
3435
name: 'test-template-nhs app',
3536
message: 'message',
3637
})}
@@ -50,6 +51,7 @@ describe('Preview nhs app form renders', () => {
5051
reviewNHSAppTemplateAction: ['Select an option'],
5152
},
5253
},
54+
id: 'template-id',
5355
name: 'test-template-nhs app',
5456
message: 'message',
5557
})}
@@ -64,6 +66,7 @@ describe('Preview nhs app form renders', () => {
6466
<ReviewNHSAppTemplate
6567
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
6668
validationError: undefined,
69+
id: 'template-id',
6770
name: 'test-template-nhs app',
6871
message: 'message',
6972
})}
@@ -92,6 +95,7 @@ describe('Preview nhs app form renders', () => {
9295
<ReviewNHSAppTemplate
9396
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
9497
validationError: undefined,
98+
id: 'template-id',
9599
name: 'test-template-nhs app',
96100
message,
97101
})}

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exports[`Preview nhs app form renders matches error snapshot 1`] = `
1010
>
1111
<a
1212
class="nhsuk-back-link__link nhsuk-u-margin-bottom-5 nhsuk-u-margin-left-3"
13-
href="/templates/edit-nhs-app-template/undefined"
13+
href="/templates/edit-nhs-app-template/template-id"
1414
>
1515
<svg
1616
aria-hidden="true"
@@ -28,7 +28,7 @@ exports[`Preview nhs app form renders matches error snapshot 1`] = `
2828
</a>
2929
</div>
3030
<div
31-
class="notify-confirmation-panel"
31+
class="notify-confirmation-panel nhsuk-heading-l"
3232
>
3333
Template saved
3434
</div>
@@ -83,7 +83,9 @@ exports[`Preview nhs app form renders matches error snapshot 1`] = `
8383
</div>
8484
<div
8585
class="nhsuk-grid-column-two-thirds col"
86-
/>
86+
>
87+
template-id
88+
</div>
8789
</div>
8890
<div
8991
class="nhsuk-grid-row preview__row"
@@ -261,7 +263,7 @@ exports[`Preview nhs app form renders matches snapshot 1`] = `
261263
>
262264
<a
263265
class="nhsuk-back-link__link nhsuk-u-margin-bottom-5 nhsuk-u-margin-left-3"
264-
href="/templates/edit-nhs-app-template/undefined"
266+
href="/templates/edit-nhs-app-template/template-id"
265267
>
266268
<svg
267269
aria-hidden="true"
@@ -279,7 +281,7 @@ exports[`Preview nhs app form renders matches snapshot 1`] = `
279281
</a>
280282
</div>
281283
<div
282-
class="notify-confirmation-panel"
284+
class="notify-confirmation-panel nhsuk-heading-l"
283285
>
284286
Template saved
285287
</div>
@@ -309,7 +311,9 @@ exports[`Preview nhs app form renders matches snapshot 1`] = `
309311
</div>
310312
<div
311313
class="nhsuk-grid-column-two-thirds col"
312-
/>
314+
>
315+
template-id
316+
</div>
313317
</div>
314318
<div
315319
class="nhsuk-grid-row preview__row"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exports[`Preview sms form renders matches error snapshot 1`] = `
2828
</a>
2929
</div>
3030
<div
31-
class="notify-confirmation-panel"
31+
class="notify-confirmation-panel nhsuk-heading-l"
3232
>
3333
Template saved
3434
</div>
@@ -281,7 +281,7 @@ exports[`Preview sms form renders matches snapshot 1`] = `
281281
</a>
282282
</div>
283283
<div
284-
class="notify-confirmation-panel"
284+
class="notify-confirmation-panel nhsuk-heading-l"
285285
>
286286
Template saved
287287
</div>

‎src/__tests__/components/organisms/ReviewTemplate.test.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ describe('ReviewTemplate component', () => {
1111
<ReviewTemplate
1212
sectionHeading='NHS app message template'
1313
template={mockDeep<NHSAppTemplate>({
14+
id: 'template-id',
1415
name: 'Example NHS APP template',
1516
})}
1617
form={{
@@ -46,6 +47,7 @@ describe('ReviewTemplate component', () => {
4647
<ReviewTemplate
4748
sectionHeading='NHS app message template'
4849
template={mockDeep<NHSAppTemplate>({
50+
id: 'template-id',
4951
name: 'Example NHS APP template',
5052
})}
5153
form={{
@@ -73,6 +75,7 @@ describe('ReviewTemplate component', () => {
7375
<ReviewTemplate
7476
sectionHeading='Email template'
7577
template={mockDeep<EmailTemplate>({
78+
id: 'template-id',
7679
name: 'Example template',
7780
})}
7881
form={{

‎src/__tests__/components/organisms/__snapshots__/ReviewTemplate.test.tsx.snap‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`ReviewTemplate component matches error snapshot 1`] = `
44
<DocumentFragment>
55
<div
6-
class="notify-confirmation-panel"
6+
class="notify-confirmation-panel nhsuk-heading-l"
77
>
88
NHS app message template
99
</div>
@@ -56,7 +56,9 @@ exports[`ReviewTemplate component matches error snapshot 1`] = `
5656
</div>
5757
<div
5858
class="nhsuk-grid-column-two-thirds col"
59-
/>
59+
>
60+
template-id
61+
</div>
6062
</div>
6163
<div
6264
class="nhsuk-grid-row preview__row"
@@ -183,7 +185,7 @@ exports[`ReviewTemplate component matches error snapshot 1`] = `
183185
exports[`ReviewTemplate component matches snapshot 1`] = `
184186
<DocumentFragment>
185187
<div
186-
class="notify-confirmation-panel"
188+
class="notify-confirmation-panel nhsuk-heading-l"
187189
>
188190
NHS app message template
189191
</div>
@@ -213,7 +215,9 @@ exports[`ReviewTemplate component matches snapshot 1`] = `
213215
</div>
214216
<div
215217
class="nhsuk-grid-column-two-thirds col"
216-
/>
218+
>
219+
template-id
220+
</div>
217221
</div>
218222
<div
219223
class="nhsuk-grid-row preview__row"

‎src/components/forms/EmailTemplateForm/server-action.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ export async function processFormActions(
3434
};
3535
}
3636

37+
delete formState.validationError;
38+
3739
const { emailTemplateName, emailTemplateSubjectLine, emailTemplateMessage } =
3840
parsedForm.data;
3941

‎src/components/forms/NhsAppTemplateForm/server-action.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ export async function processFormActions(
2828
};
2929
}
3030

31+
delete formState.validationError;
32+
3133
const { nhsAppTemplateName, nhsAppTemplateMessage } = parsedForm.data;
3234

3335
const updatedTemplate = {

‎src/components/forms/SmsTemplateForm/server-action.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export async function processFormActions(
2929
};
3030
}
3131

32+
delete formState.validationError;
33+
3234
const { smsTemplateName, smsTemplateMessage } = parsedForm.data;
3335

3436
const updatedTemplate = {

0 commit comments

Comments
 (0)