Skip to content

Commit dbf319e

Browse files
bhansell1bhansell1
committed
Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-11343_rtl-disable-proofing
2 parents 1e65907 + f0c99fe commit dbf319e

File tree

12 files changed

+100
-73
lines changed

12 files changed

+100
-73
lines changed

‎frontend/src/__tests__/components/atoms/__snapshots__/Filename.test.tsx.snap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exports[`Filename component renders component correctly 1`] = `
66
class="container"
77
>
88
<svg
9+
aria-hidden="true"
910
class="icon"
1011
fill="none"
1112
height="26"

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

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ exports[`Client-side validation triggers 1`] = `
395395
<p>
396396
<a
397397
data-testid="pdf-guidance-link"
398-
href="/using-nhs-notify/letter-templates"
398+
href="/using-nhs-notify/upload-a-letter"
399399
rel="noopener noreferrer"
400400
target="_blank"
401401
>
@@ -417,8 +417,7 @@ exports[`Client-side validation triggers 1`] = `
417417
</span>
418418
<input
419419
accept="application/pdf"
420-
aria-describedby="letterTemplatePdf"
421-
class="file-upload"
420+
class="file-upload nhsuk-input"
422421
id="letterTemplatePdf"
423422
name="letterTemplatePdf"
424423
type="file"
@@ -454,8 +453,7 @@ exports[`Client-side validation triggers 1`] = `
454453
>
455454
<input
456455
accept="text/csv"
457-
aria-describedby="letterTemplateCsv"
458-
class="file-upload"
456+
class="file-upload nhsuk-input"
459457
id="letterTemplateCsv"
460458
name="letterTemplateCsv"
461459
type="file"
@@ -832,7 +830,7 @@ exports[`hides right-to-left language warning when language changes 1`] = `
832830
<p>
833831
<a
834832
data-testid="pdf-guidance-link"
835-
href="/using-nhs-notify/letter-templates"
833+
href="/using-nhs-notify/upload-a-letter"
836834
rel="noopener noreferrer"
837835
target="_blank"
838836
>
@@ -844,8 +842,7 @@ exports[`hides right-to-left language warning when language changes 1`] = `
844842
>
845843
<input
846844
accept="application/pdf"
847-
aria-describedby="letterTemplatePdf"
848-
class="file-upload"
845+
class="file-upload nhsuk-input"
849846
id="letterTemplatePdf"
850847
name="letterTemplatePdf"
851848
type="file"
@@ -881,8 +878,7 @@ exports[`hides right-to-left language warning when language changes 1`] = `
881878
>
882879
<input
883880
accept="text/csv"
884-
aria-describedby="letterTemplateCsv"
885-
class="file-upload"
881+
class="file-upload nhsuk-input"
886882
id="letterTemplateCsv"
887883
name="letterTemplateCsv"
888884
type="file"
@@ -1316,7 +1312,7 @@ exports[`renders page one error 1`] = `
13161312
<p>
13171313
<a
13181314
data-testid="pdf-guidance-link"
1319-
href="/using-nhs-notify/letter-templates"
1315+
href="/using-nhs-notify/upload-a-letter"
13201316
rel="noopener noreferrer"
13211317
target="_blank"
13221318
>
@@ -1328,8 +1324,7 @@ exports[`renders page one error 1`] = `
13281324
>
13291325
<input
13301326
accept="application/pdf"
1331-
aria-describedby="letterTemplatePdf"
1332-
class="file-upload"
1327+
class="file-upload nhsuk-input"
13331328
id="letterTemplatePdf"
13341329
name="letterTemplatePdf"
13351330
type="file"
@@ -1365,8 +1360,7 @@ exports[`renders page one error 1`] = `
13651360
>
13661361
<input
13671362
accept="text/csv"
1368-
aria-describedby="letterTemplateCsv"
1369-
class="file-upload"
1363+
class="file-upload nhsuk-input"
13701364
id="letterTemplateCsv"
13711365
name="letterTemplateCsv"
13721366
type="file"
@@ -1816,7 +1810,7 @@ exports[`renders page with multiple errors 1`] = `
18161810
<p>
18171811
<a
18181812
data-testid="pdf-guidance-link"
1819-
href="/using-nhs-notify/letter-templates"
1813+
href="/using-nhs-notify/upload-a-letter"
18201814
rel="noopener noreferrer"
18211815
target="_blank"
18221816
>
@@ -1838,8 +1832,7 @@ exports[`renders page with multiple errors 1`] = `
18381832
</span>
18391833
<input
18401834
accept="application/pdf"
1841-
aria-describedby="letterTemplatePdf"
1842-
class="file-upload"
1835+
class="file-upload nhsuk-input"
18431836
id="letterTemplatePdf"
18441837
name="letterTemplatePdf"
18451838
type="file"
@@ -1885,8 +1878,7 @@ exports[`renders page with multiple errors 1`] = `
18851878
</span>
18861879
<input
18871880
accept="text/csv"
1888-
aria-describedby="letterTemplateCsv"
1889-
class="file-upload"
1881+
class="file-upload nhsuk-input"
18901882
id="letterTemplateCsv"
18911883
name="letterTemplateCsv"
18921884
type="file"
@@ -2289,7 +2281,7 @@ exports[`renders page with preloaded field values 1`] = `
22892281
<p>
22902282
<a
22912283
data-testid="pdf-guidance-link"
2292-
href="/using-nhs-notify/letter-templates"
2284+
href="/using-nhs-notify/upload-a-letter"
22932285
rel="noopener noreferrer"
22942286
target="_blank"
22952287
>
@@ -2301,8 +2293,7 @@ exports[`renders page with preloaded field values 1`] = `
23012293
>
23022294
<input
23032295
accept="application/pdf"
2304-
aria-describedby="letterTemplatePdf"
2305-
class="file-upload"
2296+
class="file-upload nhsuk-input"
23062297
id="letterTemplatePdf"
23072298
name="letterTemplatePdf"
23082299
type="file"
@@ -2338,8 +2329,7 @@ exports[`renders page with preloaded field values 1`] = `
23382329
>
23392330
<input
23402331
accept="text/csv"
2341-
aria-describedby="letterTemplateCsv"
2342-
class="file-upload"
2332+
class="file-upload nhsuk-input"
23432333
id="letterTemplateCsv"
23442334
name="letterTemplateCsv"
23452335
type="file"
@@ -2742,7 +2732,7 @@ exports[`shows right-to-left language warning when language changes 1`] = `
27422732
<p>
27432733
<a
27442734
data-testid="pdf-guidance-link"
2745-
href="/using-nhs-notify/letter-templates"
2735+
href="/using-nhs-notify/upload-a-letter"
27462736
rel="noopener noreferrer"
27472737
target="_blank"
27482738
>
@@ -2754,8 +2744,7 @@ exports[`shows right-to-left language warning when language changes 1`] = `
27542744
>
27552745
<input
27562746
accept="application/pdf"
2757-
aria-describedby="letterTemplatePdf"
2758-
class="file-upload"
2747+
class="file-upload nhsuk-input"
27592748
id="letterTemplatePdf"
27602749
name="letterTemplatePdf"
27612750
type="file"
@@ -2791,8 +2780,7 @@ exports[`shows right-to-left language warning when language changes 1`] = `
27912780
>
27922781
<input
27932782
accept="text/csv"
2794-
aria-describedby="letterTemplateCsv"
2795-
class="file-upload"
2783+
class="file-upload nhsuk-input"
27962784
id="letterTemplateCsv"
27972785
name="letterTemplateCsv"
27982786
type="file"

‎frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateDetails.test.tsx.snap‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ exports[`PreviewTemplateDetailsLetter if status is PROOF_AVAILABLE, but no proof
196196
class="container"
197197
>
198198
<svg
199+
aria-hidden="true"
199200
class="icon"
200201
fill="none"
201202
height="26"
@@ -297,6 +298,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
297298
class="container"
298299
>
299300
<svg
301+
aria-hidden="true"
300302
class="icon"
301303
fill="none"
302304
height="26"
@@ -332,6 +334,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
332334
class="container"
333335
>
334336
<svg
337+
aria-hidden="true"
335338
class="icon"
336339
fill="none"
337340
height="26"
@@ -381,6 +384,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
381384
class="container"
382385
>
383386
<svg
387+
aria-hidden="true"
384388
class="icon"
385389
fill="none"
386390
height="26"
@@ -412,6 +416,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
412416
class="container"
413417
>
414418
<svg
419+
aria-hidden="true"
415420
class="icon"
416421
fill="none"
417422
height="26"
@@ -499,6 +504,11 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when test data CSV is abs
499504
>
500505
Checking files
501506
</strong>
507+
<small
508+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
509+
>
510+
Refresh the page to update the status
511+
</small>
502512
</dd>
503513
</div>
504514
<div
@@ -516,6 +526,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when test data CSV is abs
516526
class="container"
517527
>
518528
<svg
529+
aria-hidden="true"
519530
class="icon"
520531
fill="none"
521532
height="26"
@@ -600,6 +611,11 @@ exports[`PreviewTemplateDetailsLetter matches snapshot without proofs 1`] = `
600611
>
601612
Checking files
602613
</strong>
614+
<small
615+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
616+
>
617+
Refresh the page to update the status
618+
</small>
603619
</dd>
604620
</div>
605621
<div
@@ -617,6 +633,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot without proofs 1`] = `
617633
class="container"
618634
>
619635
<svg
636+
aria-hidden="true"
620637
class="icon"
621638
fill="none"
622639
height="26"
@@ -652,6 +669,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot without proofs 1`] = `
652669
class="container"
653670
>
654671
<svg
672+
aria-hidden="true"
655673
class="icon"
656674
fill="none"
657675
height="26"

‎frontend/src/__tests__/components/molecules/__snapshots__/ViewLetterTemplate.test.tsx.snap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ exports[`ViewLetterTemplate component matches submitted snapshot 1`] = `
110110
class="container"
111111
>
112112
<svg
113+
aria-hidden="true"
113114
class="icon"
114115
fill="none"
115116
height="26"
@@ -159,6 +160,7 @@ exports[`ViewLetterTemplate component matches submitted snapshot 1`] = `
159160
class="container"
160161
>
161162
<svg
163+
aria-hidden="true"
162164
class="icon"
163165
fill="none"
164166
height="26"

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template language
106106
class="container"
107107
>
108108
<svg
109+
aria-hidden="true"
109110
class="icon"
110111
fill="none"
111112
height="26"
@@ -295,6 +296,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
295296
class="container"
296297
>
297298
<svg
299+
aria-hidden="true"
298300
class="icon"
299301
fill="none"
300302
height="26"
@@ -447,6 +449,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
447449
class="container"
448450
>
449451
<svg
452+
aria-hidden="true"
450453
class="icon"
451454
fill="none"
452455
height="26"
@@ -582,6 +585,11 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
582585
class="nhsuk-tag"
583586
data-test-id="status-tag-pending-upload"
584587
/>
588+
<small
589+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
590+
>
591+
Refresh the page to update the status
592+
</small>
585593
</dd>
586594
</div>
587595
<div
@@ -599,6 +607,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
599607
class="container"
600608
>
601609
<svg
610+
aria-hidden="true"
602611
class="icon"
603612
fill="none"
604613
height="26"
@@ -723,6 +732,11 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
723732
class="nhsuk-tag"
724733
data-test-id="status-tag-pending-validation"
725734
/>
735+
<small
736+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
737+
>
738+
Refresh the page to update the status
739+
</small>
726740
</dd>
727741
</div>
728742
<div
@@ -740,6 +754,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
740754
class="container"
741755
>
742756
<svg
757+
aria-hidden="true"
743758
class="icon"
744759
fill="none"
745760
height="26"
@@ -881,6 +896,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
881896
class="container"
882897
>
883898
<svg
899+
aria-hidden="true"
884900
class="icon"
885901
fill="none"
886902
height="26"
@@ -930,6 +946,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
930946
class="container"
931947
>
932948
<svg
949+
aria-hidden="true"
933950
class="icon"
934951
fill="none"
935952
height="26"
@@ -1175,6 +1192,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
11751192
class="container"
11761193
>
11771194
<svg
1195+
aria-hidden="true"
11781196
class="icon"
11791197
fill="none"
11801198
height="26"
@@ -1210,6 +1228,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
12101228
class="container"
12111229
>
12121230
<svg
1231+
aria-hidden="true"
12131232
class="icon"
12141233
fill="none"
12151234
height="26"
@@ -1385,6 +1404,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
13851404
class="container"
13861405
>
13871406
<svg
1407+
aria-hidden="true"
13881408
class="icon"
13891409
fill="none"
13901410
height="26"
@@ -1526,6 +1546,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
15261546
class="container"
15271547
>
15281548
<svg
1549+
aria-hidden="true"
15291550
class="icon"
15301551
fill="none"
15311552
height="26"

0 commit comments

Comments
 (0)