Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8c32b93
CCM-12685: Validate routing config submit
ClareJonesBJSS Feb 4, 2026
2e1c34f
Review comments
ClareJonesBJSS Feb 4, 2026
acca8d5
Code review
ClareJonesBJSS Feb 4, 2026
d055d74
Update templates to SUBMITTED
ClareJonesBJSS Feb 4, 2026
afb7968
Submit plan page
ClareJonesBJSS Feb 3, 2026
ad7bf1d
terraform and test fixes
ClareJonesBJSS Feb 4, 2026
0ec14c4
trivvy
ClareJonesBJSS Feb 4, 2026
114d174
Merge branch 'feature/CCM-12685_validate-submitted-config' into featu…
ClareJonesBJSS Feb 4, 2026
894c067
init
alexnuttall Feb 5, 2026
91b9735
event test
alexnuttall Feb 5, 2026
a75e2b0
use event sub
alexnuttall Feb 5, 2026
bebf353
convert all event tests
alexnuttall Feb 5, 2026
96b130f
rm sleep fn
alexnuttall Feb 5, 2026
52b9061
renaming
alexnuttall Feb 6, 2026
acdf2d1
reviw page object
alexnuttall Feb 6, 2026
42a398e
reviw page object
alexnuttall Feb 6, 2026
65028a4
wait for seeded
alexnuttall Feb 6, 2026
baad7a6
fmt
alexnuttall Feb 6, 2026
1d2afeb
revert page object change
alexnuttall Feb 6, 2026
523a9c7
restore custom timeouts
alexnuttall Feb 6, 2026
866265b
disable broken tests
alexnuttall Feb 6, 2026
343875d
disable broken tests
alexnuttall Feb 6, 2026
acb179f
reorder helpers
alexnuttall Feb 6, 2026
eb2367b
fix authoring letter template factory
alexnuttall Feb 6, 2026
932cea5
add type to matcher helpers
alexnuttall Feb 6, 2026
fe77d0b
hardcode group and component
alexnuttall Feb 6, 2026
32a87f1
fix zod extend
alexnuttall Feb 6, 2026
6992146
Merge remote-tracking branch 'origin/feature/CCM-11970_submit-plan-pa…
alexnuttall Feb 9, 2026
d7f1466
merge cleanup
alexnuttall Feb 9, 2026
4c45f4d
cleanup post merge
alexnuttall Feb 9, 2026
36b2947
delete disabled test file
alexnuttall Feb 9, 2026
c8487e6
testid fix
alexnuttall Feb 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,9 @@ exports[`full cascade plan matches snapshot 1`] = `
>
Large print letter (optional)
</h3>
<p>
<p
data-testid="template-name"
>
<a
href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
>
Expand Down Expand Up @@ -741,6 +743,7 @@ exports[`full cascade plan matches snapshot 1`] = `
</h3>
<p
class="nhsuk-u-margin-bottom-0"
data-testid="template-name"
>
<a
href="/preview-submitted-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
Expand All @@ -750,6 +753,7 @@ exports[`full cascade plan matches snapshot 1`] = `
</p>
<p
class="nhsuk-u-margin-bottom-0"
data-testid="template-name"
>
<a
href="/preview-submitted-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,9 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
>
Large print letter (optional)
</h3>
<p>
<p
data-testid="template-name"
>
<a
href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
>
Expand Down Expand Up @@ -692,6 +694,7 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
</h3>
<p
class="nhsuk-u-margin-bottom-0"
data-testid="template-name"
>
<a
href="/preview-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
Expand All @@ -701,6 +704,7 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
</p>
<p
class="nhsuk-u-margin-bottom-0"
data-testid="template-name"
>
<a
href="/preview-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export function MessagePlanCascadePreview({
)}
data-testid='channel-card'
>
<p>
<p data-testid='template-name'>
<Link href={getLetterTemplatePreviewHref(template)}>
{template.name}
</Link>
Expand All @@ -179,6 +179,7 @@ export function MessagePlanCascadePreview({
<p
key={template.id}
className='nhsuk-u-margin-bottom-0'
data-testid='template-name'
>
<Link
href={getLetterTemplatePreviewHref(template)}
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/terraform/components/sandbox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
| <a name="output_cognito_user_pool_id"></a> [cognito\_user\_pool\_id](#output\_cognito\_user\_pool\_id) | n/a |
| <a name="output_deployment"></a> [deployment](#output\_deployment) | Deployment details used for post-deployment scripts |
| <a name="output_download_bucket_name"></a> [download\_bucket\_name](#output\_download\_bucket\_name) | n/a |
| <a name="output_event_cache_bucket_name"></a> [event\_cache\_bucket\_name](#output\_event\_cache\_bucket\_name) | n/a |
| <a name="output_events_sns_topic_arn"></a> [events\_sns\_topic\_arn](#output\_events\_sns\_topic\_arn) | n/a |
| <a name="output_internal_bucket_name"></a> [internal\_bucket\_name](#output\_internal\_bucket\_name) | n/a |
| <a name="output_quarantine_bucket_name"></a> [quarantine\_bucket\_name](#output\_quarantine\_bucket\_name) | n/a |
| <a name="output_request_proof_queue_url"></a> [request\_proof\_queue\_url](#output\_request\_proof\_queue\_url) | n/a |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module "eventpub" {
enable_event_cache = true
enable_sns_delivery_logging = false
enable_firehose_raw_message_delivery = true
event_cache_buffer_interval = 0
sns_success_logging_sample_percent = 0
force_destroy = true

Expand Down
8 changes: 4 additions & 4 deletions infrastructure/terraform/components/sandbox/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ output "test_email_bucket_prefix" {
value = "emails-${var.environment}"
}

output "event_cache_bucket_name" {
value = module.eventpub.s3_bucket_event_cache.bucket
}

output "routing_config_table_name" {
value = module.backend_api.routing_config_table_name
}

output "events_sns_topic_arn" {
value = module.eventpub.sns_topic.arn
}
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions tests/test-team/config/event/event.setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import path from 'node:path';
import { test as setup } from '@playwright/test';
import { BackendConfigHelper } from 'nhs-notify-web-template-management-util-backend-config';
import { createAuthHelper } from '../../helpers/auth/cognito-auth-helper';
import { EventSubscriber } from '../../helpers/events/event-subscriber';

setup('event test setup', async () => {
const backendConfig = BackendConfigHelper.fromTerraformOutputsFile(
Expand All @@ -11,4 +12,10 @@ setup('event test setup', async () => {
BackendConfigHelper.toEnv(backendConfig);

await createAuthHelper().setup();

await EventSubscriber.cleanup(
'event',
backendConfig.environment,
backendConfig.eventsSnsTopicArn
);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { test as base } from '@playwright/test';
import { EventSubscriber } from '../helpers/events/event-subscriber';

type EventSubscriberFixture = {
eventSubscriber: EventSubscriber;
};

export const templateManagementEventSubscriber = base.extend<
object,
EventSubscriberFixture
>({
eventSubscriber: [
// eslint-disable-next-line no-empty-pattern
async ({}, use, workerInfo) => {
const eventSource = `//notify.nhs.uk/sbx/nhs-notify-template-management-dev/${process.env.ENVIRONMENT}`;

const subscriber = new EventSubscriber(
process.env.EVENTS_SNS_TOPIC_ARN,
process.env.AWS_ACCOUNT_ID,
process.env.ENVIRONMENT,
'event',
'config-publishing',
eventSource,
workerInfo.workerIndex
);

await subscriber.initialise();

await use(subscriber).finally(() => subscriber.teardown());
},
{ scope: 'worker' },
],
});

export const { expect } = templateManagementEventSubscriber;
4 changes: 3 additions & 1 deletion tests/test-team/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ declare global {
namespace NodeJS {
interface ProcessEnv {
API_BASE_URL: string;
AWS_ACCOUNT_ID: string;
CLIENT_SSM_PATH_PREFIX: string;
COGNITO_USER_POOL_CLIENT_ID: string;
COGNITO_USER_POOL_ID: string;
EVENT_CACHE_BUCKET_NAME: string;
ENVIRONMENT: string;
EVENTS_SNS_TOPIC_ARN: string;
PLAYWRIGHT_RUN_ID: string;
REQUEST_PROOF_QUEUE_URL: string;
ROUTING_CONFIG_TABLE_NAME: string;
Expand Down
141 changes: 0 additions & 141 deletions tests/test-team/helpers/events/event-cache-helper.ts

This file was deleted.

Loading
Loading