Skip to content

Commit 6e318ad

Browse files
harrim91harrim91
committed
Merge branch 'main' into feature/CCM-11496_get-ready-to-move
2 parents 8b7ee69 + 4a15336 commit 6e318ad

File tree

203 files changed

+3500
-1603
lines changed

Some content is hidden

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

203 files changed

+3500
-1603
lines changed

‎frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
111111
<a
112112
class="nhsuk-link nhsuk-link--no-visited-state"
113113
data-testid="change-template-link-NHSAPP"
114-
href="/message-plans/choose-nhs-app-template/fbb81055-79b9-4759-ac07-d191ae57be34"
114+
href="/message-plans/choose-nhs-app-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
115115
>
116116
Change
117117
<span
@@ -127,14 +127,22 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
127127
<form>
128128
<input
129129
name="channel"
130+
readonly=""
130131
type="hidden"
131132
value="NHSAPP"
132133
/>
133134
<input
134135
name="routingConfigId"
136+
readonly=""
135137
type="hidden"
136138
value="fbb81055-79b9-4759-ac07-d191ae57be34"
137139
/>
140+
<input
141+
name="lockNumber"
142+
readonly=""
143+
type="hidden"
144+
value="0"
145+
/>
138146
<button
139147
class="channel-template-link--remove nhsuk-link"
140148
data-testid="remove-template-link-NHSAPP"
@@ -284,7 +292,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
284292
<a
285293
class="nhsuk-link nhsuk-link--no-visited-state"
286294
data-testid="change-template-link-SMS"
287-
href="/message-plans/choose-text-message-template/fbb81055-79b9-4759-ac07-d191ae57be34"
295+
href="/message-plans/choose-text-message-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
288296
>
289297
Change
290298
<span
@@ -300,14 +308,22 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
300308
<form>
301309
<input
302310
name="channel"
311+
readonly=""
303312
type="hidden"
304313
value="SMS"
305314
/>
306315
<input
307316
name="routingConfigId"
317+
readonly=""
308318
type="hidden"
309319
value="fbb81055-79b9-4759-ac07-d191ae57be34"
310320
/>
321+
<input
322+
name="lockNumber"
323+
readonly=""
324+
type="hidden"
325+
value="0"
326+
/>
311327
<button
312328
class="channel-template-link--remove nhsuk-link"
313329
data-testid="remove-template-link-SMS"
@@ -451,7 +467,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
451467
<a
452468
class="nhsuk-link nhsuk-link--no-visited-state"
453469
data-testid="choose-template-link-EMAIL"
454-
href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34"
470+
href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
455471
>
456472
Choose
457473
<span
@@ -595,7 +611,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
595611
<a
596612
class="nhsuk-link nhsuk-link--no-visited-state"
597613
data-testid="change-template-link-LETTER"
598-
href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
614+
href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
599615
>
600616
Change
601617
<span
@@ -611,14 +627,22 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
611627
<form>
612628
<input
613629
name="channel"
630+
readonly=""
614631
type="hidden"
615632
value="LETTER"
616633
/>
617634
<input
618635
name="routingConfigId"
636+
readonly=""
619637
type="hidden"
620638
value="fbb81055-79b9-4759-ac07-d191ae57be34"
621639
/>
640+
<input
641+
name="lockNumber"
642+
readonly=""
643+
type="hidden"
644+
value="0"
645+
/>
622646
<button
623647
class="channel-template-link--remove nhsuk-link"
624648
data-testid="remove-template-link-LETTER"

‎frontend/src/__tests__/app/choose-templates/page.test.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const routingConfig: RoutingConfig = {
3838
updatedAt: '2025-01-13T10:19:25.579Z',
3939
cascadeGroupOverrides: [],
4040
cascade: [],
41+
lockNumber: 0,
4142
defaultCascadeGroup: 'standard',
4243
};
4344

‎frontend/src/__tests__/app/message-plans/choose-email-template/__snapshots__/page.test.tsx.snap‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ exports[`ChooseEmailTemplate page renders Email template selection 1`] = `
3838
type="hidden"
3939
value="no_token"
4040
/>
41+
<input
42+
name="lockNumber"
43+
readonly=""
44+
type="hidden"
45+
value="42"
46+
/>
4147
<dl
4248
class="nhsuk-summary-list"
4349
data-testid="previous-selection-summary"

‎frontend/src/__tests__/app/message-plans/choose-email-template/page.test.tsx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ describe('ChooseEmailTemplate page', () => {
2323
params: Promise.resolve({
2424
routingConfigId: 'invalid-id',
2525
}),
26+
searchParams: Promise.resolve({
27+
lockNumber: '42',
28+
}),
2629
});
2730

2831
expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -45,6 +48,9 @@ describe('ChooseEmailTemplate page', () => {
4548
params: Promise.resolve({
4649
routingConfigId: ROUTING_CONFIG.id,
4750
}),
51+
searchParams: Promise.resolve({
52+
lockNumber: '42',
53+
}),
4854
});
4955

5056
expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -63,6 +69,9 @@ describe('ChooseEmailTemplate page', () => {
6369
params: Promise.resolve({
6470
routingConfigId: ROUTING_CONFIG.id,
6571
}),
72+
searchParams: Promise.resolve({
73+
lockNumber: '42',
74+
}),
6675
});
6776

6877
const container = render(page);
@@ -77,4 +86,17 @@ describe('ChooseEmailTemplate page', () => {
7786
});
7887
expect(container.asFragment()).toMatchSnapshot();
7988
});
89+
90+
it('redirects to choose templates page if the lockNumber is missing', async () => {
91+
await ChooseEmailTemplate({
92+
params: Promise.resolve({
93+
routingConfigId: ROUTING_CONFIG.id,
94+
}),
95+
});
96+
97+
expect(redirectMock).toHaveBeenCalledWith(
98+
`/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
99+
'replace'
100+
);
101+
});
80102
});

‎frontend/src/__tests__/app/message-plans/choose-nhs-app-template/__snapshots__/page.test.tsx.snap‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ exports[`ChooseNHSAppTemplate page renders NHS App template selection 1`] = `
3838
type="hidden"
3939
value="no_token"
4040
/>
41+
<input
42+
name="lockNumber"
43+
readonly=""
44+
type="hidden"
45+
value="42"
46+
/>
4147
<dl
4248
class="nhsuk-summary-list"
4349
data-testid="previous-selection-summary"

‎frontend/src/__tests__/app/message-plans/choose-nhs-app-template/page.test.tsx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ describe('ChooseNHSAppTemplate page', () => {
2626
params: Promise.resolve({
2727
routingConfigId: 'invalid-id',
2828
}),
29+
searchParams: Promise.resolve({
30+
lockNumber: '42',
31+
}),
2932
});
3033

3134
expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -48,6 +51,9 @@ describe('ChooseNHSAppTemplate page', () => {
4851
params: Promise.resolve({
4952
routingConfigId: ROUTING_CONFIG.id,
5053
}),
54+
searchParams: Promise.resolve({
55+
lockNumber: '42',
56+
}),
5157
});
5258

5359
expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -66,6 +72,9 @@ describe('ChooseNHSAppTemplate page', () => {
6672
params: Promise.resolve({
6773
routingConfigId: ROUTING_CONFIG.id,
6874
}),
75+
searchParams: Promise.resolve({
76+
lockNumber: '42',
77+
}),
6978
});
7079

7180
const container = render(page);
@@ -80,4 +89,17 @@ describe('ChooseNHSAppTemplate page', () => {
8089
});
8190
expect(container.asFragment()).toMatchSnapshot();
8291
});
92+
93+
it('redirects to choose templates page if the lockNumber is missing', async () => {
94+
await ChooseNhsAppTemplate({
95+
params: Promise.resolve({
96+
routingConfigId: ROUTING_CONFIG.id,
97+
}),
98+
});
99+
100+
expect(redirectMock).toHaveBeenCalledWith(
101+
`/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
102+
'replace'
103+
);
104+
});
83105
});

‎frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ exports[`ChooseStandardEnglishLetterTemplate page renders letter template select
3838
type="hidden"
3939
value="no_token"
4040
/>
41+
<input
42+
name="lockNumber"
43+
readonly=""
44+
type="hidden"
45+
value="42"
46+
/>
4147
<dl
4248
class="nhsuk-summary-list"
4349
data-testid="previous-selection-summary"

‎frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
2323
params: Promise.resolve({
2424
routingConfigId: 'invalid-id',
2525
}),
26+
searchParams: Promise.resolve({
27+
lockNumber: '42',
28+
}),
2629
});
2730

2831
expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -45,6 +48,9 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
4548
params: Promise.resolve({
4649
routingConfigId: ROUTING_CONFIG.id,
4750
}),
51+
searchParams: Promise.resolve({
52+
lockNumber: '42',
53+
}),
4854
});
4955

5056
expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -63,6 +69,9 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
6369
params: Promise.resolve({
6470
routingConfigId: ROUTING_CONFIG.id,
6571
}),
72+
searchParams: Promise.resolve({
73+
lockNumber: '42',
74+
}),
6675
});
6776

6877
const container = render(page);
@@ -79,4 +88,17 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
7988
});
8089
expect(container.asFragment()).toMatchSnapshot();
8190
});
91+
92+
it('redirects to choose templates page if the lockNumber is missing', async () => {
93+
await ChooseStandardEnglishLetterTemplate({
94+
params: Promise.resolve({
95+
routingConfigId: ROUTING_CONFIG.id,
96+
}),
97+
});
98+
99+
expect(redirectMock).toHaveBeenCalledWith(
100+
`/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
101+
'replace'
102+
);
103+
});
82104
});

‎frontend/src/__tests__/app/message-plans/choose-text-message-template/__snapshots__/page.test.tsx.snap‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ exports[`ChooseTextMessageTemplate page renders sms template selection 1`] = `
3838
type="hidden"
3939
value="no_token"
4040
/>
41+
<input
42+
name="lockNumber"
43+
readonly=""
44+
type="hidden"
45+
value="42"
46+
/>
4147
<dl
4248
class="nhsuk-summary-list"
4349
data-testid="previous-selection-summary"

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ describe('ChooseTextMessageTemplate page', () => {
2626
params: Promise.resolve({
2727
routingConfigId: 'invalid-id',
2828
}),
29+
searchParams: Promise.resolve({ lockNumber: '42' }),
2930
});
3031

3132
expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -46,6 +47,7 @@ describe('ChooseTextMessageTemplate page', () => {
4647
params: Promise.resolve({
4748
routingConfigId: ROUTING_CONFIG.id,
4849
}),
50+
searchParams: Promise.resolve({ lockNumber: '42' }),
4951
});
5052

5153
expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -64,6 +66,7 @@ describe('ChooseTextMessageTemplate page', () => {
6466
params: Promise.resolve({
6567
routingConfigId: ROUTING_CONFIG.id,
6668
}),
69+
searchParams: Promise.resolve({ lockNumber: '42' }),
6770
});
6871

6972
const container = render(page);
@@ -78,4 +81,17 @@ describe('ChooseTextMessageTemplate page', () => {
7881
});
7982
expect(container.asFragment()).toMatchSnapshot();
8083
});
84+
85+
it('redirects to choose templates page if the lockNumber is missing', async () => {
86+
await ChooseTextMessageTemplate({
87+
params: Promise.resolve({
88+
routingConfigId: ROUTING_CONFIG.id,
89+
}),
90+
});
91+
92+
expect(redirectMock).toHaveBeenCalledWith(
93+
`/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
94+
'replace'
95+
);
96+
});
8197
});

0 commit comments

Comments
 (0)