Skip to content

Commit 57aa95c

Browse files
alexnuttallalexnuttall
committed
CCM-8585: use accessibility codes
1 parent cd8c5d8 commit 57aa95c

File tree

25 files changed

+324
-90
lines changed

25 files changed

+324
-90
lines changed

‎frontend/src/__tests__/app/copy-template/page.test.tsx‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ import {
99
} from 'nhs-notify-web-template-management-utils';
1010
import { redirect } from 'next/navigation';
1111
import { getTemplate } from '@utils/form-actions';
12-
import { Language, LetterType, TemplateDTO } from 'nhs-notify-backend-client';
12+
import {
13+
Language,
14+
LetterType,
15+
TemplateDTO,
16+
VirusScanStatus,
17+
} from 'nhs-notify-backend-client';
1318

1419
jest.mock('@utils/form-actions');
1520
jest.mock('next/navigation');
@@ -39,10 +44,20 @@ describe('CopyTemplatePage', () => {
3944
name: 'template-name',
4045
createdAt: '2025-01-13T10:19:25.579Z',
4146
updatedAt: '2025-01-13T10:19:25.579Z',
42-
letterType: LetterType.BSL,
47+
letterType: LetterType.Q4,
4348
language: Language.FR,
44-
pdfTemplateInputFile: 'file.pdf',
45-
testPersonalisationInputFile: 'file.csv',
49+
files: {
50+
pdfTemplate: {
51+
fileName: 'file.pdf',
52+
currentVersion: '61C1267A-0F37-4E1D-831E-494DE2BECC8C',
53+
virusScanStatus: VirusScanStatus.PASSED,
54+
},
55+
testDataCsv: {
56+
fileName: 'file.csv',
57+
currentVersion: 'A8A76934-70F4-4735-8314-51CE097130DB',
58+
virusScanStatus: VirusScanStatus.PASSED,
59+
},
60+
},
4661
};
4762

4863
it('should load page', async () => {

‎frontend/src/__tests__/app/preview-email-template/page.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('PreviewEmailTemplatePage', () => {
7878
{
7979
templateType: TemplateType.LETTER,
8080
name: 'template-name',
81-
letterType: LetterType.STANDARD,
81+
letterType: LetterType.X0,
8282
language: Language.EN,
8383
pdfTemplateInputFile: 'template.pdf',
8484
testPersonalisationInputFile: 'test-data.csv',

‎frontend/src/__tests__/app/preview-letter-template/page.test.tsx‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ import {
1010
} from 'nhs-notify-web-template-management-utils';
1111
import { redirect } from 'next/navigation';
1212
import { getTemplate } from '@utils/form-actions';
13-
import { Language, LetterType, TemplateDTO } from 'nhs-notify-backend-client';
13+
import {
14+
Language,
15+
LetterType,
16+
TemplateDTO,
17+
VirusScanStatus,
18+
} from 'nhs-notify-backend-client';
1419

1520
jest.mock('@utils/form-actions');
1621
jest.mock('next/navigation');
@@ -26,10 +31,20 @@ const templateDTO = {
2631
name: 'template-name',
2732
createdAt: '2025-01-13T10:19:25.579Z',
2833
updatedAt: '2025-01-13T10:19:25.579Z',
29-
letterType: LetterType.STANDARD,
34+
letterType: LetterType.X0,
3035
language: Language.EN,
31-
pdfTemplateInputFile: 'template.pdf',
32-
testPersonalisationInputFile: 'test-data.csv',
36+
files: {
37+
pdfTemplate: {
38+
fileName: 'template.pdf',
39+
currentVersion: 'saoj867b789',
40+
virusScanStatus: VirusScanStatus.PASSED,
41+
},
42+
testDataCsv: {
43+
fileName: 'test-data.csv',
44+
currentVersion: '897asiahv87',
45+
virusScanStatus: VirusScanStatus.FAILED,
46+
},
47+
},
3348
} satisfies TemplateDTO;
3449

3550
const letterTemplate: LetterTemplate = {
@@ -99,13 +114,18 @@ describe('PreviewLetterTemplatePage', () => {
99114
letterType: undefined as unknown as LetterType,
100115
},
101116
{
102-
description: 'a letter lacking pdfTemplateInputFile',
103-
pdfTemplateInputFile: undefined as unknown as string,
117+
description: 'a letter lacking pdfTemplate fileName',
118+
files: {
119+
pdfTemplate: {
120+
fileName: undefined as unknown as string,
121+
currentVersion: 'uuid',
122+
virusScanStatus: VirusScanStatus.FAILED,
123+
},
124+
},
104125
},
105126
{
106-
description:
107-
'a letter where testPersonalisationInputFile is the wrong data type',
108-
testPersonalisationInputFile: 9 as unknown as string,
127+
description: 'a letter where files is the wrong data type',
128+
files: [] as unknown as LetterTemplate['files'],
109129
},
110130
])(
111131
'should redirect to invalid-template when template is $description',

‎frontend/src/__tests__/app/preview-nhs-app-template/page.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ describe('PreviewNhsAppTemplatePage', () => {
7676
{
7777
templateType: TemplateType.LETTER,
7878
name: 'template-name',
79-
letterType: LetterType.STANDARD,
79+
letterType: LetterType.X0,
8080
language: Language.EN,
8181
pdfTemplateInputFile: 'template.pdf',
8282
testPersonalisationInputFile: 'test-data.csv',

‎frontend/src/__tests__/app/preview-text-message-template/page.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ describe('PreviewSMSTemplatePage', () => {
7474
{
7575
templateType: TemplateType.LETTER,
7676
name: 'template-name',
77-
letterType: LetterType.STANDARD,
77+
letterType: LetterType.X0,
7878
language: Language.EN,
7979
pdfTemplateInputFile: 'template.pdf',
8080
testPersonalisationInputFile: 'test-data.csv',

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

Lines changed: 52 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import {
88
} from 'nhs-notify-web-template-management-utils';
99
import { mockDeep } from 'jest-mock-extended';
1010
import { useSearchParams } from 'next/navigation';
11-
import { Language, LetterType } from 'nhs-notify-backend-client';
11+
import {
12+
Language,
13+
LetterType,
14+
VirusScanStatus,
15+
} from 'nhs-notify-backend-client';
1216

1317
jest.mock('@forms/ReviewLetterTemplate/server-actions');
1418

@@ -42,9 +46,14 @@ describe('Review letter form renders', () => {
4246
name: 'test-template-letter',
4347
id: 'template-id',
4448
language: Language.EN,
45-
letterType: LetterType.BRAILLE,
46-
pdfTemplateInputFile: 'file.pdf',
47-
testPersonalisationInputFile: 'test-data.csv',
49+
letterType: LetterType.Q1,
50+
files: {
51+
pdfTemplate: {
52+
fileName: 'file.pdf',
53+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
54+
virusScanStatus: VirusScanStatus.PENDING,
55+
},
56+
},
4857
})}
4958
/>
5059
);
@@ -65,9 +74,19 @@ describe('Review letter form renders', () => {
6574
name: 'test-template-letter',
6675
id: 'template-id',
6776
language: Language.EN,
68-
letterType: LetterType.BRAILLE,
69-
pdfTemplateInputFile: 'file.pdf',
70-
testPersonalisationInputFile: 'test-data.csv',
77+
letterType: LetterType.Q1,
78+
files: {
79+
pdfTemplate: {
80+
fileName: 'file.pdf',
81+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
82+
virusScanStatus: VirusScanStatus.PENDING,
83+
},
84+
testDataCsv: {
85+
fileName: 'test-data.csv',
86+
currentVersion: '622AB7FA-29BA-418A-B1B6-1E63FB299269',
87+
virusScanStatus: VirusScanStatus.PENDING,
88+
},
89+
},
7190
})}
7291
/>
7392
);
@@ -88,9 +107,19 @@ describe('Review letter form renders', () => {
88107
name: 'test-template-letter',
89108
id: 'template-id',
90109
language: Language.DE,
91-
letterType: LetterType.AUDIO,
92-
pdfTemplateInputFile: 'file.pdf',
93-
testPersonalisationInputFile: 'test-data.csv',
110+
letterType: LetterType.X3,
111+
files: {
112+
pdfTemplate: {
113+
fileName: 'file.pdf',
114+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
115+
virusScanStatus: VirusScanStatus.PENDING,
116+
},
117+
testDataCsv: {
118+
fileName: 'test-data.csv',
119+
currentVersion: '622AB7FA-29BA-418A-B1B6-1E63FB299269',
120+
virusScanStatus: VirusScanStatus.PENDING,
121+
},
122+
},
94123
})}
95124
/>
96125
);
@@ -106,9 +135,19 @@ describe('Review letter form renders', () => {
106135
name: 'test-template-email',
107136
id: 'template-id',
108137
language: Language.HI,
109-
letterType: LetterType.STANDARD,
110-
pdfTemplateInputFile: 'file.pdf',
111-
testPersonalisationInputFile: 'test-data.csv',
138+
letterType: LetterType.X0,
139+
files: {
140+
pdfTemplate: {
141+
fileName: 'file.pdf',
142+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
143+
virusScanStatus: VirusScanStatus.PENDING,
144+
},
145+
testDataCsv: {
146+
fileName: 'test-data.csv',
147+
currentVersion: '622AB7FA-29BA-418A-B1B6-1E63FB299269',
148+
virusScanStatus: VirusScanStatus.PENDING,
149+
},
150+
},
112151
})}
113152
/>
114153
);

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -789,9 +789,7 @@ exports[`Review letter form renders matches snapshot when navigating from manage
789789
</svg>
790790
<p
791791
class="text"
792-
>
793-
test-data.csv
794-
</p>
792+
/>
795793
</div>
796794
</div>
797795
</div>

‎frontend/src/__tests__/components/forms/ReviewLetterTemplate/server-action.test.ts‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ import {
99
LetterTemplate,
1010
} from 'nhs-notify-web-template-management-utils';
1111
import { getMockFormData } from '@testhelpers';
12-
import { Language, LetterType } from 'nhs-notify-backend-client';
12+
import {
13+
Language,
14+
LetterType,
15+
VirusScanStatus,
16+
} from 'nhs-notify-backend-client';
1317

1418
jest.mock('next/navigation');
1519

@@ -21,9 +25,19 @@ const initialState: LetterTemplate = {
2125
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
2226
name: 'template-name',
2327
language: Language.SQ,
24-
letterType: LetterType.STANDARD,
25-
pdfTemplateInputFile: 'file.pdf',
26-
testPersonalisationInputFile: 'test-data.csv',
28+
letterType: LetterType.X0,
29+
files: {
30+
pdfTemplate: {
31+
fileName: 'file.pdf',
32+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
33+
virusScanStatus: VirusScanStatus.PENDING,
34+
},
35+
testDataCsv: {
36+
fileName: 'test-data.csv',
37+
currentVersion: '622AB7FA-29BA-418A-B1B6-1E63FB299269',
38+
virusScanStatus: VirusScanStatus.PENDING,
39+
},
40+
},
2741
};
2842

2943
describe('reviewLetterTemplateAction server action', () => {

‎frontend/src/__tests__/components/molecules/ManageTemplates.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const manageTemplatesProps = {
3737
templateStatus: TemplateStatus.SUBMITTED,
3838
name: 'Template 3',
3939
createdAt: '2021-02-01T00:00:00.000Z',
40-
letterType: LetterType.STANDARD,
40+
letterType: LetterType.X0,
4141
language: Language.FR,
4242
pdfTemplateInputFile: 'file.pdf',
4343
testPersonalisationInputFile: 'file.csv',

‎frontend/src/__tests__/components/molecules/PreviewTemplate.test.tsx‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import {
44
TemplateStatus,
55
TemplateType,
66
} from 'nhs-notify-web-template-management-utils';
7-
import { Language, LetterType } from 'nhs-notify-backend-client';
7+
import {
8+
Language,
9+
LetterType,
10+
VirusScanStatus,
11+
} from 'nhs-notify-backend-client';
812

913
describe('PreviewTemplate component', () => {
1014
it('matches not yet submitted snapshot', () => {
@@ -63,10 +67,20 @@ describe('PreviewTemplate component', () => {
6367
name: 'Example template',
6468
templateStatus: TemplateStatus.SUBMITTED,
6569
templateType: TemplateType.LETTER,
66-
letterType: LetterType.STANDARD,
70+
letterType: LetterType.X0,
6771
language: Language.FR,
68-
pdfTemplateInputFile: 'file.pdf',
69-
testPersonalisationInputFile: 'file.csv',
72+
files: {
73+
pdfTemplate: {
74+
fileName: 'file.pdf',
75+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
76+
virusScanStatus: VirusScanStatus.PENDING,
77+
},
78+
testDataCsv: {
79+
fileName: 'file.csv',
80+
currentVersion: '622AB7FA-29BA-418A-B1B6-1E63FB299269',
81+
virusScanStatus: VirusScanStatus.PENDING,
82+
},
83+
},
7084
}}
7185
additionalMetaFields={[
7286
{
@@ -90,9 +104,15 @@ describe('PreviewTemplate component', () => {
90104
name: 'Example template',
91105
templateStatus: TemplateStatus.SUBMITTED,
92106
templateType: TemplateType.LETTER,
93-
letterType: LetterType.STANDARD,
107+
letterType: LetterType.X0,
94108
language: Language.FR,
95-
pdfTemplateInputFile: 'file.pdf',
109+
files: {
110+
pdfTemplate: {
111+
fileName: 'file.pdf',
112+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
113+
virusScanStatus: VirusScanStatus.PENDING,
114+
},
115+
},
96116
}}
97117
/>
98118
);

0 commit comments

Comments
 (0)