Skip to content

Commit 318ccc1

Browse files
alexnuttallalexnuttall
authored
Merge branch 'main' into feature/CCM-9648-sandbox-resource-naming-use-module
2 parents cdcbfe7 + 30099ff commit 318ccc1

File tree

17 files changed

+900
-1073
lines changed

17 files changed

+900
-1073
lines changed

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

Lines changed: 135 additions & 177 deletions
Large diffs are not rendered by default.

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

Lines changed: 111 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -75,92 +75,79 @@ exports[`Review sms form renders matches error snapshot 1`] = `
7575
<div
7676
class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
7777
>
78-
<div
79-
class="preview"
78+
<dl
79+
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
8080
>
8181
<div
82-
class="nhsuk-grid-row preview__row"
82+
class="nhsuk-summary-list__row"
8383
>
84-
<div
85-
class="nhsuk-grid-column-one-third preview__col"
84+
<dt
85+
class="nhsuk-summary-list__key"
8686
>
87-
<div
88-
class="preview__col_heading"
89-
>
90-
Template ID
91-
</div>
92-
</div>
93-
<div
94-
class="nhsuk-grid-column-two-thirds col"
87+
Template ID
88+
</dt>
89+
<dd
90+
class="nhsuk-summary-list__value"
9591
>
9692
template-id
97-
</div>
93+
</dd>
9894
</div>
9995
<div
100-
class="nhsuk-grid-row preview__row"
96+
class="nhsuk-summary-list__row"
10197
>
102-
<div
103-
class="nhsuk-grid-column-one-third preview__col"
98+
<dt
99+
class="nhsuk-summary-list__key"
104100
>
105-
<div
106-
class="preview__col_heading"
107-
>
108-
Type
109-
</div>
110-
</div>
111-
<div
112-
class="nhsuk-grid-column-two-thirds col"
101+
Type
102+
</dt>
103+
<dd
104+
class="nhsuk-summary-list__value"
113105
/>
114106
</div>
115107
<div
116-
class="nhsuk-grid-row preview__row"
108+
class="nhsuk-summary-list__row"
117109
>
118-
<div
119-
class="nhsuk-grid-column-one-third preview__col"
110+
<dt
111+
class="nhsuk-summary-list__key"
120112
>
121-
<div
122-
class="preview__col_heading"
123-
>
124-
Status
125-
</div>
126-
</div>
127-
<div
128-
class="nhsuk-grid-column-two-thirds col"
113+
Status
114+
</dt>
115+
<dd
116+
class="nhsuk-summary-list__value"
129117
>
130118
<strong
131119
class="nhsuk-tag"
132120
/>
133-
</div>
121+
</dd>
134122
</div>
135-
</div>
136-
<div
137-
class="nhsuk-u-margin-top-4 preview"
123+
</dl>
124+
<dl
125+
class="nhsuk-summary-list preview"
138126
>
139127
<div
140-
class="nhsuk-grid-row preview__row"
128+
class="nhsuk-summary-list__row"
141129
>
142-
<div
143-
class="nhsuk-grid-column-one-third preview__col"
130+
<dt
131+
class="nhsuk-summary-list__key"
144132
>
145133
<div
146-
class="preview__col_heading"
147134
data-testid="preview__heading-0"
148135
id="preview-heading-message"
149136
>
150137
Message
151138
</div>
152-
</div>
153-
<div
154-
class="nhsuk-grid-column-two-thirds col"
139+
</dt>
140+
<dd
141+
class="nhsuk-summary-list__value"
155142
>
156143
<div
157-
class="preview__col_content"
144+
class="preview__content"
158145
data-testid="preview__content-0"
159146
id="preview-content-message"
160147
/>
161-
</div>
148+
</dd>
162149
</div>
163-
</div>
150+
</dl>
164151
</div>
165152
<form
166153
action="/action"
@@ -323,92 +310,79 @@ exports[`Review sms form renders matches snapshot when navigating from edit scre
323310
<div
324311
class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
325312
>
326-
<div
327-
class="preview"
313+
<dl
314+
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
328315
>
329316
<div
330-
class="nhsuk-grid-row preview__row"
317+
class="nhsuk-summary-list__row"
331318
>
332-
<div
333-
class="nhsuk-grid-column-one-third preview__col"
319+
<dt
320+
class="nhsuk-summary-list__key"
334321
>
335-
<div
336-
class="preview__col_heading"
337-
>
338-
Template ID
339-
</div>
340-
</div>
341-
<div
342-
class="nhsuk-grid-column-two-thirds col"
322+
Template ID
323+
</dt>
324+
<dd
325+
class="nhsuk-summary-list__value"
343326
>
344327
template-id
345-
</div>
328+
</dd>
346329
</div>
347330
<div
348-
class="nhsuk-grid-row preview__row"
331+
class="nhsuk-summary-list__row"
349332
>
350-
<div
351-
class="nhsuk-grid-column-one-third preview__col"
333+
<dt
334+
class="nhsuk-summary-list__key"
352335
>
353-
<div
354-
class="preview__col_heading"
355-
>
356-
Type
357-
</div>
358-
</div>
359-
<div
360-
class="nhsuk-grid-column-two-thirds col"
336+
Type
337+
</dt>
338+
<dd
339+
class="nhsuk-summary-list__value"
361340
/>
362341
</div>
363342
<div
364-
class="nhsuk-grid-row preview__row"
343+
class="nhsuk-summary-list__row"
365344
>
366-
<div
367-
class="nhsuk-grid-column-one-third preview__col"
345+
<dt
346+
class="nhsuk-summary-list__key"
368347
>
369-
<div
370-
class="preview__col_heading"
371-
>
372-
Status
373-
</div>
374-
</div>
375-
<div
376-
class="nhsuk-grid-column-two-thirds col"
348+
Status
349+
</dt>
350+
<dd
351+
class="nhsuk-summary-list__value"
377352
>
378353
<strong
379354
class="nhsuk-tag"
380355
/>
381-
</div>
356+
</dd>
382357
</div>
383-
</div>
384-
<div
385-
class="nhsuk-u-margin-top-4 preview"
358+
</dl>
359+
<dl
360+
class="nhsuk-summary-list preview"
386361
>
387362
<div
388-
class="nhsuk-grid-row preview__row"
363+
class="nhsuk-summary-list__row"
389364
>
390-
<div
391-
class="nhsuk-grid-column-one-third preview__col"
365+
<dt
366+
class="nhsuk-summary-list__key"
392367
>
393368
<div
394-
class="preview__col_heading"
395369
data-testid="preview__heading-0"
396370
id="preview-heading-message"
397371
>
398372
Message
399373
</div>
400-
</div>
401-
<div
402-
class="nhsuk-grid-column-two-thirds col"
374+
</dt>
375+
<dd
376+
class="nhsuk-summary-list__value"
403377
>
404378
<div
405-
class="preview__col_content"
379+
class="preview__content"
406380
data-testid="preview__content-0"
407381
id="preview-content-message"
408382
/>
409-
</div>
383+
</dd>
410384
</div>
411-
</div>
385+
</dl>
412386
</div>
413387
<form
414388
action="/action"
@@ -554,92 +528,79 @@ exports[`Review sms form renders matches snapshot when navigating from manage te
554528
<div
555529
class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
556530
>
557-
<div
558-
class="preview"
531+
<dl
532+
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
559533
>
560534
<div
561-
class="nhsuk-grid-row preview__row"
535+
class="nhsuk-summary-list__row"
562536
>
563-
<div
564-
class="nhsuk-grid-column-one-third preview__col"
537+
<dt
538+
class="nhsuk-summary-list__key"
565539
>
566-
<div
567-
class="preview__col_heading"
568-
>
569-
Template ID
570-
</div>
571-
</div>
572-
<div
573-
class="nhsuk-grid-column-two-thirds col"
540+
Template ID
541+
</dt>
542+
<dd
543+
class="nhsuk-summary-list__value"
574544
>
575545
template-id
576-
</div>
546+
</dd>
577547
</div>
578548
<div
579-
class="nhsuk-grid-row preview__row"
549+
class="nhsuk-summary-list__row"
580550
>
581-
<div
582-
class="nhsuk-grid-column-one-third preview__col"
551+
<dt
552+
class="nhsuk-summary-list__key"
583553
>
584-
<div
585-
class="preview__col_heading"
586-
>
587-
Type
588-
</div>
589-
</div>
590-
<div
591-
class="nhsuk-grid-column-two-thirds col"
554+
Type
555+
</dt>
556+
<dd
557+
class="nhsuk-summary-list__value"
592558
/>
593559
</div>
594560
<div
595-
class="nhsuk-grid-row preview__row"
561+
class="nhsuk-summary-list__row"
596562
>
597-
<div
598-
class="nhsuk-grid-column-one-third preview__col"
563+
<dt
564+
class="nhsuk-summary-list__key"
599565
>
600-
<div
601-
class="preview__col_heading"
602-
>
603-
Status
604-
</div>
605-
</div>
606-
<div
607-
class="nhsuk-grid-column-two-thirds col"
566+
Status
567+
</dt>
568+
<dd
569+
class="nhsuk-summary-list__value"
608570
>
609571
<strong
610572
class="nhsuk-tag"
611573
/>
612-
</div>
574+
</dd>
613575
</div>
614-
</div>
615-
<div
616-
class="nhsuk-u-margin-top-4 preview"
576+
</dl>
577+
<dl
578+
class="nhsuk-summary-list preview"
617579
>
618580
<div
619-
class="nhsuk-grid-row preview__row"
581+
class="nhsuk-summary-list__row"
620582
>
621-
<div
622-
class="nhsuk-grid-column-one-third preview__col"
583+
<dt
584+
class="nhsuk-summary-list__key"
623585
>
624586
<div
625-
class="preview__col_heading"
626587
data-testid="preview__heading-0"
627588
id="preview-heading-message"
628589
>
629590
Message
630591
</div>
631-
</div>
632-
<div
633-
class="nhsuk-grid-column-two-thirds col"
592+
</dt>
593+
<dd
594+
class="nhsuk-summary-list__value"
634595
>
635596
<div
636-
class="preview__col_content"
597+
class="preview__content"
637598
data-testid="preview__content-0"
638599
id="preview-content-message"
639600
/>
640-
</div>
601+
</dd>
641602
</div>
642-
</div>
603+
</dl>
643604
</div>
644605
<form
645606
action="/action"

0 commit comments

Comments
 (0)