Skip to content

Commit 92b2d97

Browse files
alibombayealibombaye
authored
Merge pull request #180 from NHSDigital/fix/CCM-5756_create-page-snags
CCM-5756: create template page snags
2 parents a9c5183 + fc7e6a7 commit 92b2d97

File tree

15 files changed

+98
-78
lines changed

15 files changed

+98
-78
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ exports[`renders page one error 1`] = `
8787
class="nhsuk-form-group--error"
8888
>
8989
<label
90-
class="nhsuk-label"
90+
class="nhsuk-label nhsuk-label--s"
9191
for="emailTemplateName"
9292
>
9393
Template name
@@ -171,7 +171,7 @@ exports[`renders page one error 1`] = `
171171
>
172172
<div>
173173
<label
174-
class="nhsuk-label"
174+
class="nhsuk-label nhsuk-label--s"
175175
for="emailTemplateSubjectLine"
176176
>
177177
Subject line
@@ -193,7 +193,7 @@ exports[`renders page one error 1`] = `
193193
class="nhsuk-form-group"
194194
>
195195
<label
196-
class="nhsuk-label"
196+
class="nhsuk-label nhsuk-label--s"
197197
for="emailTemplateMessage"
198198
id="emailTemplateMessage--label"
199199
>
@@ -214,7 +214,7 @@ exports[`renders page one error 1`] = `
214214
id="create-email-template-submit-button"
215215
type="submit"
216216
>
217-
Continue
217+
Save and preview
218218
</button>
219219
</form>
220220
</div>
@@ -653,7 +653,7 @@ exports[`renders page with multiple errors 1`] = `
653653
class="nhsuk-form-group--error"
654654
>
655655
<label
656-
class="nhsuk-label"
656+
class="nhsuk-label nhsuk-label--s"
657657
for="emailTemplateName"
658658
>
659659
Template name
@@ -739,7 +739,7 @@ exports[`renders page with multiple errors 1`] = `
739739
class="nhsuk-form-group--error"
740740
>
741741
<label
742-
class="nhsuk-label"
742+
class="nhsuk-label nhsuk-label--s"
743743
for="emailTemplateSubjectLine"
744744
>
745745
Subject line
@@ -773,7 +773,7 @@ exports[`renders page with multiple errors 1`] = `
773773
class="nhsuk-form-group nhsuk-form-group--error"
774774
>
775775
<label
776-
class="nhsuk-label"
776+
class="nhsuk-label nhsuk-label--s"
777777
for="emailTemplateMessage"
778778
id="emailTemplateMessage--label"
779779
>
@@ -806,7 +806,7 @@ exports[`renders page with multiple errors 1`] = `
806806
id="create-email-template-submit-button"
807807
type="submit"
808808
>
809-
Continue
809+
Save and preview
810810
</button>
811811
</form>
812812
</div>
@@ -1204,7 +1204,7 @@ exports[`renders page with preloaded field values 1`] = `
12041204
>
12051205
<div>
12061206
<label
1207-
class="nhsuk-label"
1207+
class="nhsuk-label nhsuk-label--s"
12081208
for="emailTemplateName"
12091209
>
12101210
Template name
@@ -1276,7 +1276,7 @@ exports[`renders page with preloaded field values 1`] = `
12761276
>
12771277
<div>
12781278
<label
1279-
class="nhsuk-label"
1279+
class="nhsuk-label nhsuk-label--s"
12801280
for="emailTemplateSubjectLine"
12811281
>
12821282
Subject line
@@ -1298,7 +1298,7 @@ exports[`renders page with preloaded field values 1`] = `
12981298
class="nhsuk-form-group"
12991299
>
13001300
<label
1301-
class="nhsuk-label"
1301+
class="nhsuk-label nhsuk-label--s"
13021302
for="emailTemplateMessage"
13031303
id="emailTemplateMessage--label"
13041304
>
@@ -1321,7 +1321,7 @@ exports[`renders page with preloaded field values 1`] = `
13211321
id="create-email-template-submit-button"
13221322
type="submit"
13231323
>
1324-
Continue
1324+
Save and preview
13251325
</button>
13261326
</form>
13271327
</div>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ exports[`renders page 1`] = `
4747
</h1>
4848
<div>
4949
<label
50-
class="nhsuk-label"
50+
class="nhsuk-label nhsuk-label--s"
5151
for="nhsAppTemplateName"
5252
>
5353
Template name
@@ -116,7 +116,7 @@ exports[`renders page 1`] = `
116116
class="nhsuk-form-group"
117117
>
118118
<label
119-
class="nhsuk-label"
119+
class="nhsuk-label nhsuk-label--s"
120120
for="nhsAppTemplateMessage"
121121
id="nhsAppTemplateMessage--label"
122122
>
@@ -144,7 +144,7 @@ exports[`renders page 1`] = `
144144
id="create-nhs-app-template-submit-button"
145145
type="submit"
146146
>
147-
Continue
147+
Save and preview
148148
</button>
149149
</form>
150150
</div>
@@ -481,7 +481,7 @@ exports[`renders page one error 1`] = `
481481
class="nhsuk-form-group--error"
482482
>
483483
<label
484-
class="nhsuk-label"
484+
class="nhsuk-label nhsuk-label--s"
485485
for="nhsAppTemplateName"
486486
>
487487
Template name
@@ -562,7 +562,7 @@ exports[`renders page one error 1`] = `
562562
class="nhsuk-form-group"
563563
>
564564
<label
565-
class="nhsuk-label"
565+
class="nhsuk-label nhsuk-label--s"
566566
for="nhsAppTemplateMessage"
567567
id="nhsAppTemplateMessage--label"
568568
>
@@ -588,7 +588,7 @@ exports[`renders page one error 1`] = `
588588
id="create-nhs-app-template-submit-button"
589589
type="submit"
590590
>
591-
Continue
591+
Save and preview
592592
</button>
593593
</form>
594594
</div>
@@ -927,7 +927,7 @@ exports[`renders page with multiple errors 1`] = `
927927
class="nhsuk-form-group--error"
928928
>
929929
<label
930-
class="nhsuk-label"
930+
class="nhsuk-label nhsuk-label--s"
931931
for="nhsAppTemplateName"
932932
>
933933
Template name
@@ -1008,7 +1008,7 @@ exports[`renders page with multiple errors 1`] = `
10081008
class="nhsuk-form-group nhsuk-form-group--error"
10091009
>
10101010
<label
1011-
class="nhsuk-label"
1011+
class="nhsuk-label nhsuk-label--s"
10121012
for="nhsAppTemplateMessage"
10131013
id="nhsAppTemplateMessage--label"
10141014
>
@@ -1046,7 +1046,7 @@ exports[`renders page with multiple errors 1`] = `
10461046
id="create-nhs-app-template-submit-button"
10471047
type="submit"
10481048
>
1049-
Continue
1049+
Save and preview
10501050
</button>
10511051
</form>
10521052
</div>
@@ -1351,7 +1351,7 @@ exports[`renders page with preloaded field values 1`] = `
13511351
</h1>
13521352
<div>
13531353
<label
1354-
class="nhsuk-label"
1354+
class="nhsuk-label nhsuk-label--s"
13551355
for="nhsAppTemplateName"
13561356
>
13571357
Template name
@@ -1420,7 +1420,7 @@ exports[`renders page with preloaded field values 1`] = `
14201420
class="nhsuk-form-group"
14211421
>
14221422
<label
1423-
class="nhsuk-label"
1423+
class="nhsuk-label nhsuk-label--s"
14241424
for="nhsAppTemplateMessage"
14251425
id="nhsAppTemplateMessage--label"
14261426
>
@@ -1448,7 +1448,7 @@ exports[`renders page with preloaded field values 1`] = `
14481448
id="create-nhs-app-template-submit-button"
14491449
type="submit"
14501450
>
1451-
Continue
1451+
Save and preview
14521452
</button>
14531453
</form>
14541454
</div>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ exports[`CreateSmsTemplate component renders page 1`] = `
4646
/>
4747
<div>
4848
<label
49-
class="nhsuk-label"
49+
class="nhsuk-label nhsuk-label--s"
5050
for="smsTemplateName"
5151
>
5252
Template name
@@ -115,7 +115,7 @@ exports[`CreateSmsTemplate component renders page 1`] = `
115115
class="nhsuk-form-group"
116116
>
117117
<label
118-
class="nhsuk-label"
118+
class="nhsuk-label nhsuk-label--s"
119119
for="smsTemplateMessage"
120120
id="smsTemplateMessage--label"
121121
>
@@ -161,7 +161,7 @@ exports[`CreateSmsTemplate component renders page 1`] = `
161161
id="create-sms-template-submit-button"
162162
type="submit"
163163
>
164-
Continue
164+
Save and preview
165165
</button>
166166
</form>
167167
</div>
@@ -370,7 +370,7 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
370370
class="nhsuk-form-group--error"
371371
>
372372
<label
373-
class="nhsuk-label"
373+
class="nhsuk-label nhsuk-label--s"
374374
for="smsTemplateName"
375375
>
376376
Template name
@@ -451,7 +451,7 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
451451
class="nhsuk-form-group"
452452
>
453453
<label
454-
class="nhsuk-label"
454+
class="nhsuk-label nhsuk-label--s"
455455
for="smsTemplateMessage"
456456
id="smsTemplateMessage--label"
457457
>
@@ -497,7 +497,7 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
497497
id="create-sms-template-submit-button"
498498
type="submit"
499499
>
500-
Continue
500+
Save and preview
501501
</button>
502502
</form>
503503
</div>
@@ -708,7 +708,7 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
708708
class="nhsuk-form-group--error"
709709
>
710710
<label
711-
class="nhsuk-label"
711+
class="nhsuk-label nhsuk-label--s"
712712
for="smsTemplateName"
713713
>
714714
Template name
@@ -789,7 +789,7 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
789789
class="nhsuk-form-group nhsuk-form-group--error"
790790
>
791791
<label
792-
class="nhsuk-label"
792+
class="nhsuk-label nhsuk-label--s"
793793
for="smsTemplateMessage"
794794
id="smsTemplateMessage--label"
795795
>
@@ -847,7 +847,7 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
847847
id="create-sms-template-submit-button"
848848
type="submit"
849849
>
850-
Continue
850+
Save and preview
851851
</button>
852852
</form>
853853
</div>
@@ -1024,7 +1024,7 @@ exports[`CreateSmsTemplate component renders page with preloaded field values 1`
10241024
/>
10251025
<div>
10261026
<label
1027-
class="nhsuk-label"
1027+
class="nhsuk-label nhsuk-label--s"
10281028
for="smsTemplateName"
10291029
>
10301030
Template name
@@ -1093,7 +1093,7 @@ exports[`CreateSmsTemplate component renders page with preloaded field values 1`
10931093
class="nhsuk-form-group"
10941094
>
10951095
<label
1096-
class="nhsuk-label"
1096+
class="nhsuk-label nhsuk-label--s"
10971097
for="smsTemplateMessage"
10981098
id="smsTemplateMessage--label"
10991099
>
@@ -1139,7 +1139,7 @@ exports[`CreateSmsTemplate component renders page with preloaded field values 1`
11391139
id="create-sms-template-submit-button"
11401140
type="submit"
11411141
>
1142-
Continue
1142+
Save and preview
11431143
</button>
11441144
</form>
11451145
</div>

‎src/components/forms/EmailTemplateForm/EmailTemplateForm.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ export const EmailTemplateForm: FC<
7575

7676
<FormSection>
7777
<div className={templateNameError && 'nhsuk-form-group--error'}>
78-
<Label htmlFor='emailTemplateName'>{templateNameLabelText}</Label>
78+
<Label htmlFor='emailTemplateName' size='s'>
79+
{templateNameLabelText}
80+
</Label>
7981
<HintText>{templateNameHintText}</HintText>
8082
<TemplateNameGuidance template={TemplateType.EMAIL} />
8183
<TextInput
@@ -93,7 +95,7 @@ export const EmailTemplateForm: FC<
9395
<div
9496
className={templateSubjectLineError && 'nhsuk-form-group--error'}
9597
>
96-
<Label htmlFor='emailTemplateSubjectLine'>
98+
<Label htmlFor='emailTemplateSubjectLine' size='s'>
9799
{templateSubjectLineLabelText}
98100
</Label>
99101
<TextInput
@@ -108,6 +110,7 @@ export const EmailTemplateForm: FC<
108110

109111
<Textarea
110112
label={templateMessageLabelText}
113+
labelProps={{ size: 's' }}
111114
id='emailTemplateMessage'
112115
rows={10}
113116
onChange={emailTemplateMessageHandler}

‎src/components/forms/NhsAppTemplateForm/NhsAppTemplateForm.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ export const NhsAppTemplateForm: FC<
6464
{pageHeading}
6565
</h1>
6666
<div className={templateNameError && 'nhsuk-form-group--error'}>
67-
<Label htmlFor='nhsAppTemplateName'>{templateNameLabelText}</Label>
67+
<Label htmlFor='nhsAppTemplateName' size='s'>
68+
{templateNameLabelText}
69+
</Label>
6870
<HintText>{templateNameHintText}</HintText>
6971
<TemplateNameGuidance template={TemplateType.NHS_APP} />
7072
<TextInput
@@ -77,6 +79,7 @@ export const NhsAppTemplateForm: FC<
7779
</div>
7880
<Textarea
7981
label={templateMessageLabelText}
82+
labelProps={{ size: 's' }}
8083
id='nhsAppTemplateMessage'
8184
maxLength={5000}
8285
rows={10}

‎src/components/forms/SmsTemplateForm/SmsTemplateForm.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const SmsTemplateForm: FC<
5555
<h1 data-testid='page-heading'>{content.pageHeading}</h1>
5656
<NHSNotifyFormWrapper action={action} formId='create-sms-template'>
5757
<div className={templateNameError && 'nhsuk-form-group--error'}>
58-
<Label htmlFor='smsTemplateName'>
58+
<Label htmlFor='smsTemplateName' size='s'>
5959
{content.templateNameLabelText}
6060
</Label>
6161
<HintText>{content.templateNameHintText}</HintText>
@@ -71,6 +71,7 @@ export const SmsTemplateForm: FC<
7171
<Textarea
7272
id='smsTemplateMessage'
7373
label={content.templateMessageLabelText}
74+
labelProps={{ size: 's' }}
7475
defaultValue={smsTemplateMessage}
7576
onChange={smsTemplateMessageHandler}
7677
maxLength={MAX_SMS_CHARACTER_LENGTH}

0 commit comments

Comments
 (0)