Skip to content

Commit d95a1c8

Browse files
nicki-nhsnicki-nhs
committed
CCM-9118 Merge in main
2 parents 56607c4 + 4050370 commit d95a1c8

File tree

57 files changed

+10330
-9920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+10330
-9920
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test('renders page with preloaded field values', () => {
2929
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
3030
validationError: undefined,
3131
name: 'template-name',
32-
letterType: 'q1',
32+
letterType: 'x1',
3333
language: 'ar',
3434
})}
3535
/>

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

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,6 @@ exports[`Client-side validation triggers 1`] = `
190190
id="letterTemplateLetterType"
191191
name="letterTemplateLetterType"
192192
>
193-
<option
194-
value="x3"
195-
>
196-
Audio CD
197-
</option>
198-
<option
199-
value="q1"
200-
>
201-
Braille
202-
</option>
203193
<option
204194
value="q4"
205195
>
@@ -690,16 +680,6 @@ exports[`renders page one error 1`] = `
690680
id="letterTemplateLetterType"
691681
name="letterTemplateLetterType"
692682
>
693-
<option
694-
value="x3"
695-
>
696-
Audio CD
697-
</option>
698-
<option
699-
value="q1"
700-
>
701-
Braille
702-
</option>
703683
<option
704684
value="q4"
705685
>
@@ -1200,16 +1180,6 @@ exports[`renders page with multiple errors 1`] = `
12001180
id="letterTemplateLetterType"
12011181
name="letterTemplateLetterType"
12021182
>
1203-
<option
1204-
value="x3"
1205-
>
1206-
Audio CD
1207-
</option>
1208-
<option
1209-
value="q1"
1210-
>
1211-
Braille
1212-
</option>
12131183
<option
12141184
value="q4"
12151185
>
@@ -1653,23 +1623,13 @@ exports[`renders page with preloaded field values 1`] = `
16531623
id="letterTemplateLetterType"
16541624
name="letterTemplateLetterType"
16551625
>
1656-
<option
1657-
value="x3"
1658-
>
1659-
Audio CD
1660-
</option>
1661-
<option
1662-
selected=""
1663-
value="q1"
1664-
>
1665-
Braille
1666-
</option>
16671626
<option
16681627
value="q4"
16691628
>
16701629
British Sign Language
16711630
</option>
16721631
<option
1632+
selected=""
16731633
value="x1"
16741634
>
16751635
Large print

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('CreateLetterTemplate server actions', () => {
4848
id: 'new-template-id',
4949
templateStatus: 'NOT_YET_SUBMITTED',
5050
name: 'template-name',
51-
letterType: 'q1',
51+
letterType: 'x1',
5252
language: 'ar',
5353
files: {
5454
pdfTemplate: {
@@ -77,7 +77,7 @@ describe('CreateLetterTemplate server actions', () => {
7777
initialState,
7878
getMockFormData({
7979
letterTemplateName: 'template-name',
80-
letterTemplateLetterType: 'q1',
80+
letterTemplateLetterType: 'x1',
8181
letterTemplateLanguage: 'ar',
8282
letterTemplatePdf,
8383
letterTemplateCsv,
@@ -88,7 +88,7 @@ describe('CreateLetterTemplate server actions', () => {
8888
{
8989
...initialState,
9090
name: 'template-name',
91-
letterType: 'q1',
91+
letterType: 'x1',
9292
language: 'ar',
9393
},
9494
letterTemplatePdf,
@@ -107,7 +107,7 @@ describe('CreateLetterTemplate server actions', () => {
107107
id: 'new-template-id',
108108
templateStatus: 'NOT_YET_SUBMITTED',
109109
name: 'template-name',
110-
letterType: 'q1',
110+
letterType: 'x1',
111111
language: 'ar',
112112
files: {
113113
pdfTemplate: {
@@ -137,7 +137,7 @@ describe('CreateLetterTemplate server actions', () => {
137137
{ ...initialState, id: 'existing-id' },
138138
getMockFormData({
139139
letterTemplateName: 'template-name',
140-
letterTemplateLetterType: 'q1',
140+
letterTemplateLetterType: 'x1',
141141
letterTemplateLanguage: 'ar',
142142
letterTemplatePdf,
143143
letterTemplateCsv,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('PreviewLetterTemplate component', () => {
1111
id: 'template-id',
1212
templateStatus: 'VIRUS_SCAN_FAILED',
1313
language: 'en',
14-
letterType: 'q1',
14+
letterType: 'x1',
1515
files: {
1616
pdfTemplate: {
1717
fileName: 'file.pdf',
@@ -116,7 +116,7 @@ describe('PreviewLetterTemplate component', () => {
116116
id: 'template-id',
117117
templateStatus: 'VALIDATION_FAILED',
118118
language: 'en',
119-
letterType: 'q1',
119+
letterType: 'x1',
120120
files: {
121121
pdfTemplate: {
122122
fileName: 'file.pdf',
@@ -147,7 +147,7 @@ describe('PreviewLetterTemplate component', () => {
147147
id: 'template-id',
148148
templateStatus: 'PENDING_UPLOAD',
149149
language: 'en',
150-
letterType: 'q1',
150+
letterType: 'x1',
151151
files: {
152152
pdfTemplate: {
153153
fileName: 'file.pdf',
@@ -173,7 +173,7 @@ describe('PreviewLetterTemplate component', () => {
173173
id: 'template-id',
174174
templateStatus: 'PENDING_VALIDATION',
175175
language: 'en',
176-
letterType: 'q1',
176+
letterType: 'x1',
177177
files: {
178178
pdfTemplate: {
179179
fileName: 'file.pdf',

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
383383
<dd
384384
class="nhsuk-summary-list__value"
385385
>
386-
Braille letter
386+
Large print letter
387387
</dd>
388388
</div>
389389
<div
@@ -527,7 +527,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
527527
<dd
528528
class="nhsuk-summary-list__value"
529529
>
530-
Braille letter
530+
Large print letter
531531
</dd>
532532
</div>
533533
<div
@@ -705,7 +705,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
705705
<dd
706706
class="nhsuk-summary-list__value"
707707
>
708-
Braille letter
708+
Large print letter
709709
</dd>
710710
</div>
711711
<div
@@ -918,7 +918,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
918918
<dd
919919
class="nhsuk-summary-list__value"
920920
>
921-
Braille letter
921+
Large print letter
922922
</dd>
923923
</div>
924924
<div

‎frontend/src/__tests__/utils/form-actions.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ describe('form-actions', () => {
108108
id: 'new-template-id',
109109
templateStatus: 'NOT_YET_SUBMITTED',
110110
name: 'template-name',
111-
letterType: 'q1',
111+
letterType: 'x1',
112112
language: 'ar',
113113
files: {
114114
pdfTemplate: {
@@ -166,7 +166,7 @@ describe('form-actions', () => {
166166
id: 'new-template-id',
167167
templateStatus: 'NOT_YET_SUBMITTED',
168168
name: 'template-name',
169-
letterType: 'q1',
169+
letterType: 'x1',
170170
language: 'ar',
171171
files: {
172172
pdfTemplate: {
@@ -592,7 +592,7 @@ describe('form-actions', () => {
592592
id: 'new-template-id',
593593
templateStatus: 'NOT_YET_SUBMITTED',
594594
name: 'template-name',
595-
letterType: 'q1',
595+
letterType: 'x1',
596596
language: 'ar',
597597
files: {
598598
pdfTemplate: {

‎infrastructure/terraform/components/acct/module_sandbox_kms.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ module "kms_sandbox" {
1414
alias = "alias/${local.csi}-sandbox"
1515
iam_delegation = true
1616
}
17-

‎infrastructure/terraform/components/acct/outputs.tf‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,11 @@ output "github_pat_ssm_param_name" {
1212

1313
output "s3_buckets" {
1414
value = {
15-
access_logs = {
16-
arn = module.s3bucket_access_logs.arn
17-
bucket = module.s3bucket_access_logs.bucket
18-
id = module.s3bucket_access_logs.id
19-
}
2015
backup_reports = {
2116
arn = module.s3bucket_backup_reports.arn
2217
bucket = module.s3bucket_backup_reports.bucket
2318
id = module.s3bucket_backup_reports.id
24-
},
19+
}
2520
}
2621
}
2722

‎infrastructure/terraform/components/app/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
| <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/eventpub | v1.0.13 |
5555
| <a name="module_kms"></a> [kms](#module\_kms) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/kms | v1.0.8 |
5656
| <a name="module_nhse_backup_vault"></a> [nhse\_backup\_vault](#module\_nhse\_backup\_vault) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/aws-backup-source | v1.0.8 |
57+
| <a name="module_s3bucket_cf_logs"></a> [s3bucket\_cf\_logs](#module\_s3bucket\_cf\_logs) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.2 |
5758
## Outputs
5859

5960
| Name | Description |

‎infrastructure/terraform/components/app/acm_certificate_files.tf‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
resource "aws_acm_certificate" "files" {
2+
provider = aws.us-east-1
3+
4+
domain_name = local.cloudfront_files_domain_name
5+
validation_method = "DNS"
6+
7+
lifecycle {
8+
create_before_destroy = true
9+
}
10+
}
11+
12+
resource "aws_acm_certificate_validation" "files" {
13+
provider = aws.us-east-1
14+
15+
certificate_arn = aws_acm_certificate.files.arn
16+
17+
validation_record_fqdns = [for record in aws_route53_record.acm_validation_files : record.fqdn]
18+
}

0 commit comments

Comments
 (0)