Skip to content

Commit 608fb94

Browse files
nicki-nhsnicki-nhs
committed
CCM-11544 Lint and type fixes
1 parent 070a0f6 commit 608fb94

11 files changed

+133
-121
lines changed

‎frontend/src/components/organisms/CreateEditMessagePlan/CreateEditMessagePlan.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ import {
1111
messagePlanStatusToTagColour,
1212
} from 'nhs-notify-web-template-management-utils';
1313
import { MessagePlanTemplates } from '@utils/routing-utils';
14-
15-
import styles from '@organisms/CreateEditMessagePlan/CreateEditMessagePlan.module.scss';
14+
import { interpolate } from '@utils/interpolate';
1615

1716
import copy from '@content/content';
18-
import { interpolate } from '@utils/interpolate';
1917
const { createEditMessagePlan: content } = copy.components;
2018

2119
export function CreateEditMessagePlan({

‎tests/test-team/pages/routing/letter/choose-large-print-letter-template-page.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import { type Page } from '@playwright/test';
22
import { TemplateMgmtChooseTemplateForMessagePlanBasePage } from 'pages/template-mgmt-choose-template-base-page';
33

44
export class RoutingChooseLargePrintLetterTemplatePage extends TemplateMgmtChooseTemplateForMessagePlanBasePage {
5-
static readonly pageUrlSegments = [
6-
'message-plans/choose-large-print-letter-template',
7-
];
5+
static readonly pathTemplate =
6+
'/message-plans/choose-large-print-letter-template/:messagePlanId';
87

98
constructor(page: Page) {
109
super(page);

‎tests/test-team/pages/routing/letter/choose-other-language-letter-template-page.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import { Locator, type Page } from '@playwright/test';
22
import { TemplateMgmtChooseTemplateForMessagePlanBasePage } from 'pages/template-mgmt-choose-template-base-page';
33

44
export class RoutingChooseOtherLanguageLetterTemplatePage extends TemplateMgmtChooseTemplateForMessagePlanBasePage {
5-
static readonly pageUrlSegments = [
6-
'message-plans/choose-other-language-letter-template',
7-
];
5+
static readonly pathTemplate =
6+
'/message-plans/choose-other-language-letter-template/:messagePlanId';
87

98
public readonly tableRows: Locator;
109

‎tests/test-team/pages/routing/letter/preview-large-print-letter-template-page.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import { type Page } from '@playwright/test';
22
import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
33

44
export class RoutingPreviewLargePrintLetterTemplatePage extends TemplateMgmtPreviewBasePage {
5-
static readonly pageUrlSegments = [
6-
'message-plans/choose-large-print-letter-template',
7-
'preview-template',
8-
];
5+
static readonly pathTemplate =
6+
'/message-plans/choose-large-print-letter-template/:messagePlanId/preview-template/:templateId';
97

108
constructor(page: Page) {
119
super(page);

‎tests/test-team/pages/routing/letter/preview-other-language-letter-template-page.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import { type Page } from '@playwright/test';
22
import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
33

44
export class RoutingPreviewOtherLanguageLetterTemplatePage extends TemplateMgmtPreviewBasePage {
5-
static readonly pageUrlSegments = [
6-
'message-plans/choose-other-language-letter-template',
7-
'preview-template',
8-
];
5+
static readonly pathTemplate =
6+
'/message-plans/choose-other-language-letter-template/:messagePlanId/preview-template/:templateId';
97

108
constructor(page: Page) {
119
super(page);

‎tests/test-team/pages/template-mgmt-choose-template-base-page.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Locator, Page } from '@playwright/test';
2-
import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
2+
import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
33

4-
export abstract class TemplateMgmtChooseTemplateForMessagePlanBasePage extends TemplateMgmtBasePageDynamic {
4+
export abstract class TemplateMgmtChooseTemplateForMessagePlanBasePage extends TemplateMgmtBasePage {
55
readonly messagePlanName: Locator;
66

77
readonly tableHintText: Locator;

‎tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Locator, Page } from '@playwright/test';
22
import { TemplateMgmtBasePage } from './template-mgmt-base-page';
33

4-
export abstract class TemplateMgmtPreviewSubmitedBasePage extends TemplateMgmtBasePage {
4+
export abstract class TemplateMgmtPreviewSubmittedBasePage extends TemplateMgmtBasePage {
55
readonly campaignId: Locator;
66

77
constructor(page: Page) {

‎tests/test-team/template-mgmt-routing-component-tests/letter/choose-large-print-letter-template.routing-component.spec.ts‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ test.describe('Routing - Choose large print letter template page', () => {
172172
}) => {
173173
const chooseLargePrintLetterTemplatePage =
174174
new RoutingChooseLargePrintLetterTemplatePage(page);
175-
await chooseLargePrintLetterTemplatePage.loadPage(routingConfigs.valid.id);
175+
await chooseLargePrintLetterTemplatePage
176+
.setPathParam('messagePlanId', routingConfigs.valid.id)
177+
.loadPage();
176178

177179
await assertChooseTemplatePageWithTemplatesAvailable({
178180
page: chooseLargePrintLetterTemplatePage,
@@ -229,7 +231,9 @@ test.describe('Routing - Choose large print letter template page', () => {
229231
}) => {
230232
const chooseLargePrintLetterTemplatePage =
231233
new RoutingChooseLargePrintLetterTemplatePage(page);
232-
await chooseLargePrintLetterTemplatePage.loadPage(routingConfigs.valid.id);
234+
await chooseLargePrintLetterTemplatePage
235+
.setPathParam('messagePlanId', routingConfigs.valid.id)
236+
.loadPage();
233237

234238
await chooseLargePrintLetterTemplatePage
235239
.getRadioButton(templates.LARGE_PRINT_LETTER1.id)
@@ -241,7 +245,9 @@ test.describe('Routing - Choose large print letter template page', () => {
241245
);
242246

243247
const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
244-
await chooseTemplatesPage.loadPage(routingConfigs.valid.id);
248+
await chooseTemplatesPage
249+
.setPathParam('messagePlanId', routingConfigs.valid.id)
250+
.loadPage();
245251

246252
await expect(
247253
chooseTemplatesPage.alternativeLetterFormats().largePrint.templateName
@@ -254,7 +260,9 @@ test.describe('Routing - Choose large print letter template page', () => {
254260
}) => {
255261
const chooseLargePrintLetterTemplatePage =
256262
new RoutingChooseLargePrintLetterTemplatePage(page);
257-
await chooseLargePrintLetterTemplatePage.loadPage(routingConfigs.valid.id);
263+
await chooseLargePrintLetterTemplatePage
264+
.setPathParam('messagePlanId', routingConfigs.valid.id)
265+
.loadPage();
258266

259267
await chooseLargePrintLetterTemplatePage.saveAndContinueButton.click();
260268

@@ -293,9 +301,9 @@ test.describe('Routing - Choose large print letter template page', () => {
293301
}) => {
294302
const chooseLargePrintLetterTemplatePage =
295303
new RoutingChooseLargePrintLetterTemplatePage(page);
296-
await chooseLargePrintLetterTemplatePage.loadPage(
297-
routingConfigs.withLargePrintSelected.id
298-
);
304+
await chooseLargePrintLetterTemplatePage
305+
.setPathParam('messagePlanId', routingConfigs.withLargePrintSelected.id)
306+
.loadPage();
299307

300308
await assertChooseTemplatePageWithPreviousSelection({
301309
page: chooseLargePrintLetterTemplatePage,
@@ -346,9 +354,9 @@ test.describe('Routing - Choose large print letter template page', () => {
346354
const chooseLargePrintLetterTemplatePage =
347355
new RoutingChooseLargePrintLetterTemplatePage(page);
348356

349-
await chooseLargePrintLetterTemplatePage.loadPage(
350-
routingConfigIds.notFound
351-
);
357+
await chooseLargePrintLetterTemplatePage
358+
.setPathParam('messagePlanId', routingConfigIds.notFound)
359+
.loadPage();
352360

353361
await expect(page).toHaveURL(
354362
`${baseURL}/templates/message-plans/invalid`
@@ -359,25 +367,25 @@ test.describe('Routing - Choose large print letter template page', () => {
359367
const chooseLargePrintLetterTemplatePage =
360368
new RoutingChooseLargePrintLetterTemplatePage(page);
361369

362-
await chooseLargePrintLetterTemplatePage.loadPage(
363-
routingConfigIds.invalid
364-
);
370+
await chooseLargePrintLetterTemplatePage
371+
.setPathParam('messagePlanId', routingConfigIds.invalid)
372+
.loadPage();
365373

366374
await expect(page).toHaveURL(
367375
`${baseURL}/templates/message-plans/invalid`
368376
);
369377
});
370378

371-
test('when routing config does not have a letter channel', async ({
379+
test('when routing config is not for a LETTER channel', async ({
372380
page,
373381
baseURL,
374382
}) => {
375383
const chooseLargePrintLetterTemplatePage =
376384
new RoutingChooseLargePrintLetterTemplatePage(page);
377385

378-
await chooseLargePrintLetterTemplatePage.loadPage(
379-
routingConfigs.nonLetter.id
380-
);
386+
await chooseLargePrintLetterTemplatePage
387+
.setPathParam('messagePlanId', routingConfigs.nonLetter.id)
388+
.loadPage();
381389

382390
await expect(page).toHaveURL(
383391
`${baseURL}/templates/message-plans/invalid`

‎tests/test-team/template-mgmt-routing-component-tests/letter/choose-other-language-letter-template.routing-component.spec.ts‎

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
229229
}) => {
230230
const chooseOtherLanguageLetterTemplatePage =
231231
new RoutingChooseOtherLanguageLetterTemplatePage(page);
232-
await chooseOtherLanguageLetterTemplatePage.loadPage(
233-
routingConfigs.valid.id
234-
);
232+
await chooseOtherLanguageLetterTemplatePage
233+
.setPathParam('messagePlanId', routingConfigs.valid.id)
234+
.loadPage();
235235

236236
await assertChooseTemplatePageWithTemplatesAvailable({
237237
page: chooseOtherLanguageLetterTemplatePage,
@@ -317,9 +317,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
317317

318318
const chooseOtherLanguageLetterTemplatePage =
319319
new RoutingChooseOtherLanguageLetterTemplatePage(page);
320-
await chooseOtherLanguageLetterTemplatePage.loadPage(
321-
routingConfigForUserWithNoTemplates.id
322-
);
320+
await chooseOtherLanguageLetterTemplatePage
321+
.setPathParam('messagePlanId', routingConfigForUserWithNoTemplates.id)
322+
.loadPage();
323323

324324
await assertChooseTemplatePageWithNoTemplates({
325325
page: chooseOtherLanguageLetterTemplatePage,
@@ -345,9 +345,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
345345
const chooseOtherLanguageLetterTemplatePage =
346346
new RoutingChooseOtherLanguageLetterTemplatePage(page);
347347

348-
await chooseOtherLanguageLetterTemplatePage.loadPage(
349-
routingConfigs.valid.id
350-
);
348+
await chooseOtherLanguageLetterTemplatePage
349+
.setPathParam('messagePlanId', routingConfigs.valid.id)
350+
.loadPage();
351351

352352
await chooseOtherLanguageLetterTemplatePage
353353
.getCheckbox(templates.FRENCH_LETTER.id)
@@ -380,9 +380,12 @@ test.describe('Routing - Choose other language letter templates page', () => {
380380
}) => {
381381
const chooseOtherLanguageLetterTemplatePage =
382382
new RoutingChooseOtherLanguageLetterTemplatePage(page);
383-
await chooseOtherLanguageLetterTemplatePage.loadPage(
384-
routingConfigs.withAccessibleTemplateSelected.id
385-
);
383+
await chooseOtherLanguageLetterTemplatePage
384+
.setPathParam(
385+
'messagePlanId',
386+
routingConfigs.withAccessibleTemplateSelected.id
387+
)
388+
.loadPage();
386389

387390
await expect(page).toHaveURL(
388391
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.withAccessibleTemplateSelected.id}`
@@ -406,9 +409,12 @@ test.describe('Routing - Choose other language letter templates page', () => {
406409
);
407410

408411
const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
409-
await chooseTemplatesPage.loadPage(
410-
routingConfigs.withAccessibleTemplateSelected.id
411-
);
412+
await chooseTemplatesPage
413+
.setPathParam(
414+
'messagePlanId',
415+
routingConfigs.withAccessibleTemplateSelected.id
416+
)
417+
.loadPage();
412418

413419
const languageTemplateSection =
414420
chooseTemplatesPage.alternativeLetterFormats().otherLanguages
@@ -433,9 +439,12 @@ test.describe('Routing - Choose other language letter templates page', () => {
433439
}) => {
434440
const chooseOtherLanguageLetterTemplatePage =
435441
new RoutingChooseOtherLanguageLetterTemplatePage(page);
436-
await chooseOtherLanguageLetterTemplatePage.loadPage(
437-
routingConfigs.withLanguageTemplatesSelected.id
438-
);
442+
await chooseOtherLanguageLetterTemplatePage
443+
.setPathParam(
444+
'messagePlanId',
445+
routingConfigs.withLanguageTemplatesSelected.id
446+
)
447+
.loadPage();
439448

440449
await expect(page).toHaveURL(
441450
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.withLanguageTemplatesSelected.id}`
@@ -477,9 +486,12 @@ test.describe('Routing - Choose other language letter templates page', () => {
477486
);
478487

479488
const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
480-
await chooseTemplatesPage.loadPage(
481-
routingConfigs.withLanguageTemplatesSelected.id
482-
);
489+
await chooseTemplatesPage
490+
.setPathParam(
491+
'messagePlanId',
492+
routingConfigs.withLanguageTemplatesSelected.id
493+
)
494+
.loadPage();
483495

484496
const languageTemplateSection =
485497
chooseTemplatesPage.alternativeLetterFormats().otherLanguages
@@ -501,9 +513,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
501513
}) => {
502514
const chooseOtherLanguageLetterTemplatePage =
503515
new RoutingChooseOtherLanguageLetterTemplatePage(page);
504-
await chooseOtherLanguageLetterTemplatePage.loadPage(
505-
routingConfigs.valid.id
506-
);
516+
await chooseOtherLanguageLetterTemplatePage
517+
.setPathParam('messagePlanId', routingConfigs.valid.id)
518+
.loadPage();
507519

508520
await chooseOtherLanguageLetterTemplatePage.saveAndContinueButton.click();
509521

@@ -540,9 +552,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
540552
test('user cannot select duplicate languages', async ({ page, baseURL }) => {
541553
const chooseOtherLanguageLetterTemplatePage =
542554
new RoutingChooseOtherLanguageLetterTemplatePage(page);
543-
await chooseOtherLanguageLetterTemplatePage.loadPage(
544-
routingConfigs.valid.id
545-
);
555+
await chooseOtherLanguageLetterTemplatePage
556+
.setPathParam('messagePlanId', routingConfigs.valid.id)
557+
.loadPage();
546558

547559
await chooseOtherLanguageLetterTemplatePage
548560
.getCheckbox(templates.FRENCH_LETTER.id)
@@ -594,9 +606,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
594606
const chooseOtherLanguageLetterTemplatePage =
595607
new RoutingChooseOtherLanguageLetterTemplatePage(page);
596608

597-
await chooseOtherLanguageLetterTemplatePage.loadPage(
598-
routingConfigIds.notFound
599-
);
609+
await chooseOtherLanguageLetterTemplatePage
610+
.setPathParam('messagePlanId', routingConfigIds.notFound)
611+
.loadPage();
600612

601613
await expect(page).toHaveURL(
602614
`${baseURL}/templates/message-plans/invalid`
@@ -607,9 +619,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
607619
const chooseOtherLanguageLetterTemplatePage =
608620
new RoutingChooseOtherLanguageLetterTemplatePage(page);
609621

610-
await chooseOtherLanguageLetterTemplatePage.loadPage(
611-
routingConfigIds.invalid
612-
);
622+
await chooseOtherLanguageLetterTemplatePage
623+
.setPathParam('messagePlanId', routingConfigIds.invalid)
624+
.loadPage();
613625

614626
await expect(page).toHaveURL(
615627
`${baseURL}/templates/message-plans/invalid`
@@ -623,9 +635,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
623635
const chooseOtherLanguageLetterTemplatePage =
624636
new RoutingChooseOtherLanguageLetterTemplatePage(page);
625637

626-
await chooseOtherLanguageLetterTemplatePage.loadPage(
627-
routingConfigs.nonLetter.id
628-
);
638+
await chooseOtherLanguageLetterTemplatePage
639+
.setPathParam('messagePlanId', routingConfigs.nonLetter.id)
640+
.loadPage();
629641

630642
await expect(page).toHaveURL(
631643
`${baseURL}/templates/message-plans/invalid`

0 commit comments

Comments
 (0)