Skip to content

Commit 9d665d7

Browse files
nicki-nhsnicki-nhs
committed
CCM-10424 Lint fixes
1 parent 2148ecb commit 9d665d7

File tree

6 files changed

+72
-45
lines changed

6 files changed

+72
-45
lines changed

‎frontend/src/__tests__/utils/amplify-utils.test.ts‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,31 @@ describe('amplify-utils', () => {
3737
'mockToken'
3838
),
3939
payload: {},
40-
}
40+
};
4141
fetchAuthSessionMock.mockResolvedValueOnce({
4242
tokens: {
43-
accessToken: mockAccessToken
43+
accessToken: mockAccessToken,
4444
},
4545
userSub: 'sub',
4646
});
4747

4848
const result = await getSessionServer();
4949

50-
expect(result).toEqual({ accessToken: mockAccessToken.toString(), clientId: 'client1', userSub: 'sub' });
50+
expect(result).toEqual({
51+
accessToken: mockAccessToken.toString(),
52+
clientId: 'client1',
53+
userSub: 'sub',
54+
});
5155
});
5256

5357
test('getSessionServer - client ID should be undefined if not present on token', async () => {
5458
const mockAccessToken = {
55-
toString: () =>
56-
sign(
57-
{},
58-
'mockToken'
59-
),
59+
toString: () => sign({}, 'mockToken'),
6060
payload: {},
61-
}
61+
};
6262
fetchAuthSessionMock.mockResolvedValueOnce({
6363
tokens: {
64-
accessToken: mockAccessToken
64+
accessToken: mockAccessToken,
6565
},
6666
userSub: 'sub',
6767
});
@@ -133,10 +133,7 @@ describe('amplify-utils', () => {
133133

134134
describe('getClientId', () => {
135135
test('returns undefined when client ID not found', async () => {
136-
const mockAccessToken = sign(
137-
{},
138-
'key'
139-
);
136+
const mockAccessToken = sign({}, 'key');
140137

141138
const clientId = await getClientId(mockAccessToken);
142139

‎frontend/src/content/content.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ const previewLetterTemplate = {
265265
validationErrorAction:
266266
'Check that the personalisation fields in your template file match the fields in your test personalisation file',
267267
missingClientOrCampaignIdError: 'You cannot proof this letter template.',
268-
missingClientOrCampaignIdErrorAction: 'To get access, contact your onboarding manager and give them this error message: letter template missing client ID and campaign ID.',
268+
missingClientOrCampaignIdErrorAction:
269+
'To get access, contact your onboarding manager and give them this error message: letter template missing client ID and campaign ID.',
269270
preSubmissionText: previewLetterPreSubmissionText,
270271
};
271272

@@ -354,7 +355,7 @@ const invalidConfiguration = {
354355
text: 'To get access, contact your onboarding manager and give them this error message:',
355356
insetText: 'Account needs a client ID and campaign ID',
356357
backLinkText: goBackButtonText,
357-
}
358+
};
358359

359360
const submitTemplate = {
360361
pageTitle: {

‎frontend/src/utils/amplify-utils.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,20 @@ export const { runWithAmplifyServerContext } = createServerRunner({
1616

1717
export async function getSessionServer(
1818
options: FetchAuthSessionOptions = {}
19-
): Promise<{ accessToken: string | undefined; clientId: string | undefined; userSub: string | undefined }> {
19+
): Promise<{
20+
accessToken: string | undefined;
21+
clientId: string | undefined;
22+
userSub: string | undefined;
23+
}> {
2024
const session = await runWithAmplifyServerContext({
2125
nextServerContext: { cookies },
2226
operation: (ctx) => fetchAuthSession(ctx, options),
2327
}).catch(() => {
2428
// no-op
2529
});
2630

27-
const accessToken = session?.tokens?.accessToken?.toString()
28-
const clientId = accessToken && await getClientId(accessToken)
31+
const accessToken = session?.tokens?.accessToken?.toString();
32+
const clientId = accessToken && (await getClientId(accessToken));
2933

3034
return {
3135
accessToken,
@@ -43,15 +47,13 @@ export const getClientId = async (accessToken: string) => {
4347
};
4448

4549
const getAccessTokenParam = async (key: string) => {
46-
4750
const authSession = await getSessionServer();
4851
const accessToken = authSession.accessToken;
4952

5053
if (!accessToken) return;
5154

52-
5355
return getJwtPayload(key, accessToken);
54-
}
56+
};
5557

5658
const getJwtPayload = (key: string, accessToken: string) => {
5759
const jwt = jwtDecode<JWT['payload']>(accessToken);
@@ -63,6 +65,4 @@ const getJwtPayload = (key: string, accessToken: string) => {
6365
}
6466

6567
return value.toString();
66-
}
67-
68-
68+
};

‎tests/test-team/config/component/component.setup.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ setup('component test setup', async ({ page }) => {
2424

2525
const user = await auth.getTestUser(testUsers.User1.userId);
2626

27-
await loginAsUser(user, page)
27+
await loginAsUser(user, page);
2828

2929
await page.waitForURL('/templates/create-and-submit-templates');
3030

‎tests/test-team/helpers/auth/login-as-user.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { Page } from "@playwright/test";
2-
import { TestUser } from "./cognito-auth-helper";
3-
import { TemplateMgmtSignInPage } from "../../pages/templates-mgmt-login-page";
1+
import { Page } from '@playwright/test';
2+
import { TestUser } from './cognito-auth-helper';
3+
import { TemplateMgmtSignInPage } from '../../pages/templates-mgmt-login-page';
44

55
export const loginAsUser = async (user: TestUser, page: Page) => {
66
const loginPage = new TemplateMgmtSignInPage(page);
77

88
await loginPage.loadPage();
99

1010
await loginPage.cognitoSignIn(user);
11-
}
11+
};

‎tests/test-team/template-mgmt-component-tests/letter/template-mgmt-create-letter-template-page.component.spec.ts‎

Lines changed: 44 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ test.describe('Create Letter Template Page', () => {
2525

2626
test.beforeAll(async () => {
2727
user = await createAuthHelper().getTestUser(testUsers.User1.userId);
28-
userWithoutClientId = await createAuthHelper().getTestUser(testUsers.User6.userId);
29-
userWithoutCampaignId = await createAuthHelper().getTestUser(testUsers.User7.userId);
28+
userWithoutClientId = await createAuthHelper().getTestUser(
29+
testUsers.User6.userId
30+
);
31+
userWithoutCampaignId = await createAuthHelper().getTestUser(
32+
testUsers.User7.userId
33+
);
3034
});
3135

3236
test.afterAll(async () => {
@@ -49,30 +53,46 @@ test.describe('Create Letter Template Page', () => {
4953
});
5054
});
5155

52-
test('redirects to error page when campaign ID is missing', async ({ page, baseURL }) => {
56+
test('redirects to error page when campaign ID is missing', async ({
57+
page,
58+
baseURL,
59+
}) => {
5360
await loginAsUser(userWithoutCampaignId, page);
5461

5562
const createTemplatePage = new TemplateMgmtCreateLetterPage(page);
56-
const missingClientOrCampaignIdErrorPage = new TemplateMgmtCreateLetterMissingCampaignClientIdPage(page);
63+
const missingClientOrCampaignIdErrorPage =
64+
new TemplateMgmtCreateLetterMissingCampaignClientIdPage(page);
5765

5866
createTemplatePage.loadPage();
5967

60-
await expect(page).toHaveURL(`${baseURL}/${TemplateMgmtCreateLetterMissingCampaignClientIdPage.pageUrlSegment}`);
68+
await expect(page).toHaveURL(
69+
`${baseURL}/${TemplateMgmtCreateLetterMissingCampaignClientIdPage.pageUrlSegment}`
70+
);
6171

62-
await assertMissingClientOrCampaignIdErrorPage(missingClientOrCampaignIdErrorPage);
72+
await assertMissingClientOrCampaignIdErrorPage(
73+
missingClientOrCampaignIdErrorPage
74+
);
6375
});
6476

65-
test('redirects to error page when client ID is missing', async ({ page, baseURL }) => {
77+
test('redirects to error page when client ID is missing', async ({
78+
page,
79+
baseURL,
80+
}) => {
6681
await loginAsUser(userWithoutClientId, page);
6782

6883
const createTemplatePage = new TemplateMgmtCreateLetterPage(page);
69-
const missingClientOrCampaignIdErrorPage = new TemplateMgmtCreateLetterMissingCampaignClientIdPage(page);
84+
const missingClientOrCampaignIdErrorPage =
85+
new TemplateMgmtCreateLetterMissingCampaignClientIdPage(page);
7086

7187
createTemplatePage.loadPage();
7288

73-
await expect(page).toHaveURL(`${baseURL}/${TemplateMgmtCreateLetterMissingCampaignClientIdPage.pageUrlSegment}`);
89+
await expect(page).toHaveURL(
90+
`${baseURL}/${TemplateMgmtCreateLetterMissingCampaignClientIdPage.pageUrlSegment}`
91+
);
7492

75-
await assertMissingClientOrCampaignIdErrorPage(missingClientOrCampaignIdErrorPage);
93+
await assertMissingClientOrCampaignIdErrorPage(
94+
missingClientOrCampaignIdErrorPage
95+
);
7696
});
7797

7898
test('Validate error messages on the create Letter template page with no template name or pdf', async ({
@@ -191,11 +211,20 @@ test.describe('Create Letter Template Page', () => {
191211
});
192212
}
193213

194-
const assertMissingClientOrCampaignIdErrorPage = async (page: TemplateMgmtCreateLetterMissingCampaignClientIdPage) => {
195-
await expect(page.heading).toHaveText('You cannot create letter templates yet');
196-
await expect(page.errorDetailsInsetText).toHaveText('Account needs a client ID and campaign ID');
214+
const assertMissingClientOrCampaignIdErrorPage = async (
215+
page: TemplateMgmtCreateLetterMissingCampaignClientIdPage
216+
) => {
217+
await expect(page.heading).toHaveText(
218+
'You cannot create letter templates yet'
219+
);
220+
await expect(page.errorDetailsInsetText).toHaveText(
221+
'Account needs a client ID and campaign ID'
222+
);
197223

198224
await expect(page.goBackLink).toHaveText('Go back');
199-
await expect(page.goBackLink).toHaveAttribute('href', '/templates/choose-a-template-type');
200-
}
225+
await expect(page.goBackLink).toHaveAttribute(
226+
'href',
227+
'/templates/choose-a-template-type'
228+
);
229+
};
201230
});

0 commit comments

Comments
 (0)