Skip to content

Commit 38b0469

Browse files
committed
CCM-12744: lock number on digital template pages
1 parent 58fdaf0 commit 38b0469

File tree

9 files changed

+27
-19
lines changed

9 files changed

+27
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe('previewEmailTemplateAction server action', () => {
6565
);
6666

6767
expect(redirectMock).toHaveBeenCalledWith(
68-
'/submit-email-template/template-id',
68+
'/submit-email-template/template-id?lockNumber=1',
6969
'push'
7070
);
7171
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('previewNhsAppTemplateAction', () => {
4949
previewNhsAppTemplateAction(currentState, formData);
5050

5151
expect(redirectMock).toHaveBeenCalledWith(
52-
'/submit-nhs-app-template/template-id',
52+
'/submit-nhs-app-template/template-id?lockNumber=1',
5353
'push'
5454
);
5555
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('previewSmsTemplateAction server action', () => {
6464
);
6565

6666
expect(redirectMock).toHaveBeenCalledWith(
67-
'/submit-text-message-template/template-id',
67+
'/submit-text-message-template/template-id?lockNumber=0',
6868
'push'
6969
);
7070
});

frontend/src/components/forms/PreviewEmailTemplate/server-actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export async function previewEmailTemplateAction(
3939

4040
if (data.previewEmailTemplateAction === 'email-submit') {
4141
return redirect(
42-
`/submit-email-template/${formState.id}`,
42+
`/submit-email-template/${formState.id}?lockNumber=${formState.lockNumber}`,
4343
RedirectType.push
4444
);
4545
}

frontend/src/components/forms/PreviewNHSAppTemplate/server-action.ts

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,17 @@ const {
1212
},
1313
} = content;
1414

15-
const radioSelectionToPageMap: Record<'nhsapp-edit' | 'nhsapp-submit', string> =
16-
{
17-
'nhsapp-edit': 'edit-nhs-app-template',
18-
'nhsapp-submit': 'submit-nhs-app-template',
19-
};
15+
function radioSelectionToRedirectUrl(
16+
selection: 'nhsapp-edit' | 'nhsapp-submit',
17+
id: string,
18+
lockNumber: number
19+
) {
20+
if (selection === 'nhsapp-edit') {
21+
return `/edit-nhs-app-template/${id}`;
22+
}
23+
24+
return `/submit-nhs-app-template/${id}?lockNumber=${lockNumber}`;
25+
}
2026

2127
export const schema = z.object({
2228
previewNHSAppTemplateAction: z.enum(['nhsapp-edit', 'nhsapp-submit'], {
@@ -38,10 +44,12 @@ export function previewNhsAppTemplateAction(
3844
};
3945
}
4046

41-
const page =
42-
radioSelectionToPageMap[
43-
validationResponse.data.previewNHSAppTemplateAction
44-
];
45-
46-
return redirect(`/${page}/${formState.id}`, RedirectType.push);
47+
return redirect(
48+
radioSelectionToRedirectUrl(
49+
validationResponse.data.previewNHSAppTemplateAction,
50+
formState.id,
51+
formState.lockNumber
52+
),
53+
RedirectType.push
54+
);
4755
}

frontend/src/components/forms/PreviewSMSTemplate/server-actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export async function previewSmsTemplateAction(
4242

4343
if (data.previewSMSTemplateAction === 'sms-submit') {
4444
return redirect(
45-
`/submit-text-message-template/${formState.id}`,
45+
`/submit-text-message-template/${formState.id}?lockNumber=${formState.lockNumber}`,
4646
RedirectType.push
4747
);
4848
}

tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-email-page.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ test.describe('Preview Email message template Page', () => {
236236
await previewPage.clickContinueButton();
237237

238238
await expect(page).toHaveURL(
239-
`${baseURL}/templates/submit-email-template/${templates.routingDisabled.id}`
239+
`${baseURL}/templates/submit-email-template/${templates.routingDisabled.id}?lockNumber=${templates.routingDisabled.lockNumber}`
240240
);
241241
});
242242
});

tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-nhs-app-page.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ test.describe('Preview NHS App template Page', () => {
237237
await previewPage.clickContinueButton();
238238

239239
await expect(page).toHaveURL(
240-
`${baseURL}/templates/submit-nhs-app-template/${templates.routingDisabled.id}`
240+
`${baseURL}/templates/submit-nhs-app-template/${templates.routingDisabled.id}?lockNumber=${templates.routingDisabled.lockNumber}`
241241
);
242242
});
243243
});

tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-sms-page.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ test.describe('Preview SMS message template Page', () => {
235235
await previewPage.clickContinueButton();
236236

237237
await expect(page).toHaveURL(
238-
`${baseURL}/templates/submit-text-message-template/${templates.routingDisabled.id}`
238+
`${baseURL}/templates/submit-text-message-template/${templates.routingDisabled.id}?lockNumber=${templates.routingDisabled.lockNumber}`
239239
);
240240
});
241241
});

0 commit comments

Comments
 (0)