Skip to content

Commit 0676b3c

Browse files
nicki-nhsnicki-nhs
committed
CCM-10893 Lint fix
1 parent 297c855 commit 0676b3c

File tree

7 files changed

+68
-66
lines changed

7 files changed

+68
-66
lines changed

‎frontend/src/components/molecules/Footer/Footer.tsx‎

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,71 @@ const footerContent = content.components.footer;
44

55
export function NHSNotifyFooter() {
66
return (
7-
<footer role='contentinfo' data-testid='page-footer' className='nhsuk-footer'>
7+
<footer
8+
role='contentinfo'
9+
data-testid='page-footer'
10+
className='nhsuk-footer'
11+
>
812
<div className='nhsuk-width-container'>
913
<div className='nhsuk-footer__meta'>
1014
<h2 className='nhsuk-u-visually-hidden' data-testid='support-links'>
1115
{footerContent.supportLinks}
1216
</h2>
1317
<ul className='nhsuk-footer__list' data-testid='footer-links'>
1418
<li className='nhsuk-footer__list-item'>
15-
<a
16-
className='nhsuk-footer__list-item-link'
17-
href={footerContent.links.acceptableUsePolicy.url}
18-
data-testid='acceptable-use-policy-statement-link'
19-
target='_blank'
20-
rel='noopener noreferrer'
21-
>
22-
{footerContent.links.acceptableUsePolicy.text}
23-
</a>
19+
<a
20+
className='nhsuk-footer__list-item-link'
21+
href={footerContent.links.acceptableUsePolicy.url}
22+
data-testid='acceptable-use-policy-statement-link'
23+
target='_blank'
24+
rel='noopener noreferrer'
25+
>
26+
{footerContent.links.acceptableUsePolicy.text}
27+
</a>
2428
</li>
2529
<li className='nhsuk-footer__list-item'>
26-
<a
27-
className='nhsuk-footer__list-item-link'
28-
href={footerContent.links.accessibilityStatement.url}
29-
data-testid='accessibility-statement-link'
30-
target='_blank'
31-
rel='noopener noreferrer'
32-
>
33-
{footerContent.links.accessibilityStatement.text}
34-
</a>
30+
<a
31+
className='nhsuk-footer__list-item-link'
32+
href={footerContent.links.accessibilityStatement.url}
33+
data-testid='accessibility-statement-link'
34+
target='_blank'
35+
rel='noopener noreferrer'
36+
>
37+
{footerContent.links.accessibilityStatement.text}
38+
</a>
3539
</li>
3640
<li className='nhsuk-footer__list-item'>
37-
<a
38-
className='nhsuk-footer__list-item-link'
39-
href={footerContent.links.cookies.url}
40-
data-testid='cookies-statement-link'
41-
target='_blank'
42-
rel='noopener noreferrer'
43-
>
44-
{footerContent.links.cookies.text}
45-
</a>
41+
<a
42+
className='nhsuk-footer__list-item-link'
43+
href={footerContent.links.cookies.url}
44+
data-testid='cookies-statement-link'
45+
target='_blank'
46+
rel='noopener noreferrer'
47+
>
48+
{footerContent.links.cookies.text}
49+
</a>
4650
</li>
4751
<li className='nhsuk-footer__list-item'>
48-
<a
49-
className='nhsuk-footer__list-item-link'
50-
href={footerContent.links.privacy.url}
51-
data-testid='privacy-statement-link'
52-
target='_blank'
53-
rel='noopener noreferrer'
54-
>
55-
{footerContent.links.privacy.text}
56-
</a>
52+
<a
53+
className='nhsuk-footer__list-item-link'
54+
href={footerContent.links.privacy.url}
55+
data-testid='privacy-statement-link'
56+
target='_blank'
57+
rel='noopener noreferrer'
58+
>
59+
{footerContent.links.privacy.text}
60+
</a>
5761
</li>
5862
<li className='nhsuk-footer__list-item'>
59-
<a
60-
className='nhsuk-footer__list-item-link'
61-
href={footerContent.links.termsAndConditions.url}
62-
data-testid='terms-and-conditions-statement-link'
63-
target='_blank'
64-
rel='noopener noreferrer'
65-
>
66-
{footerContent.links.termsAndConditions.text}
67-
</a>
63+
<a
64+
className='nhsuk-footer__list-item-link'
65+
href={footerContent.links.termsAndConditions.url}
66+
data-testid='terms-and-conditions-statement-link'
67+
target='_blank'
68+
rel='noopener noreferrer'
69+
>
70+
{footerContent.links.termsAndConditions.text}
71+
</a>
6872
</li>
6973
</ul>
7074

‎lambdas/cognito-triggers/src/pre-token-generation.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export type PreTokenGenerationV2Event = Omit<
1313
'claimsAndScopeOverrideDetails'
1414
> & {
1515
claimsAndScopeOverrideDetails:
16-
| PreTokenGenerationV2TriggerEvent['response']['claimsAndScopeOverrideDetails']
17-
| null;
16+
| PreTokenGenerationV2TriggerEvent['response']['claimsAndScopeOverrideDetails']
17+
| null;
1818
};
1919
};
2020

‎tests/accessibility/pa11y-setup.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const setup = async () => {
8181

8282
const clientId = 'accessibility-test-client';
8383

84-
const clientName = 'NHS Accessibility'
84+
const clientName = 'NHS Accessibility';
8585

8686
const testUserClient = new TestUserClient(
8787
backendConfig.userPoolId,
@@ -170,7 +170,7 @@ const setup = async () => {
170170
userId,
171171
clientId,
172172
clientName,
173-
userName
173+
userName,
174174
};
175175

176176
writeFileSync('./pa11y-fixtures.json', JSON.stringify(fixtureData, null, 2));

‎tests/accessibility/test-user-client.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class TestUserClient {
2121
constructor(
2222
private readonly userPoolId: string,
2323
private readonly clientSsmPathPrefix: string
24-
) { }
24+
) {}
2525

2626
async createTestUser(
2727
email: string,
@@ -55,8 +55,8 @@ export class TestUserClient {
5555
{ Name: 'email_verified', Value: 'true' },
5656
{ Name: 'custom:sbx_client_id', Value: clientId },
5757
{ Name: 'custom:sbx_client_name', Value: clientName },
58-
{ Name: 'given_name', Value: userName[userName.length - 2] },
59-
{ Name: 'family_name', Value: userName[userName.length - 1] },
58+
{ Name: 'given_name', Value: userName.at(-2) },
59+
{ Name: 'family_name', Value: userName.at(-1) },
6060
{ Name: 'preferred_username', Value: userName.join(' ') },
6161
],
6262
MessageAction: 'SUPPRESS',

‎tests/test-team/helpers/auth/cognito-auth-helper.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ export class CognitoAuthHelper {
230230
const tempPassword = CognitoAuthHelper.generatePassword();
231231

232232
const clientName = (clientKey: string): string =>
233-
`NHS Test ${clientKey.replace(/([a-z])([A-Z])/g, '$1 $2')}`;
233+
`NHS Test ${clientKey.replaceAll(/([a-z])([A-Z])/g, '$1 $2')}`;
234234

235235
const clientId =
236236
userDetails.clientKey === 'NONE'
@@ -239,12 +239,12 @@ export class CognitoAuthHelper {
239239

240240
const clientAttribute = clientId
241241
? [
242-
{ Name: 'custom:sbx_client_id', Value: clientId },
243-
{
244-
Name: 'custom:sbx_client_name',
245-
Value: clientName(userDetails.clientKey),
246-
},
247-
]
242+
{ Name: 'custom:sbx_client_id', Value: clientId },
243+
{
244+
Name: 'custom:sbx_client_name',
245+
Value: clientName(userDetails.clientKey),
246+
},
247+
]
248248
: [];
249249

250250
const {

‎tests/test-team/helpers/client/client-helper.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export class ClientConfigurationHelper {
6262
constructor(
6363
private readonly clientSSMKeyPrefix: string,
6464
private readonly runId: string
65-
) { }
65+
) {}
6666

6767
async setup() {
6868
return Promise.all(

‎tests/test-team/template-mgmt-component-tests/template-mgmt-common.steps.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,9 @@ export function assertHeaderNavigationLinks({
159159

160160
const messagePlansLink = nav.getByRole('link', { name: 'Message plans' });
161161

162-
if (routingEnabled) {
163-
await expect(messagePlansLink).toBeVisible();
164-
} else {
165-
await expect(messagePlansLink).toHaveCount(0);
166-
}
162+
await (routingEnabled
163+
? await expect(messagePlansLink).toBeVisible()
164+
: await expect(messagePlansLink).toHaveCount(0));
167165
});
168166
}
169167

0 commit comments

Comments
 (0)