Skip to content

Commit e22ceb5

Browse files
committed
style: update linter validation and fix lint issues
1 parent c5064f8 commit e22ceb5

20 files changed

Lines changed: 94 additions & 109 deletions

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"scripts": {
1313
"build": "fedx-scripts webpack",
1414
"i18n_extract": "fedx-scripts formatjs extract",
15-
"lint": "fedx-scripts eslint --ext .js --ext .jsx .",
16-
"lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
15+
"lint": "fedx-scripts eslint --ext .js --ext .jsx --ext .ts --ext .tsx .",
16+
"lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx --ext .ts --ext .tsx .",
1717
"snapshot": "fedx-scripts jest --updateSnapshot",
1818
"start": "fedx-scripts webpack-dev-server --progress",
1919
"start:with-theme": "paragon install-theme && npm start && npm install",

src/authz-module/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export const ROUTES = {
22
LIBRARIES_TEAM_PATH: '/libraries/:libraryId',
3-
LIBRARIES_USER_PATH: '/libraries/user/:username'
4-
};
3+
LIBRARIES_USER_PATH: '/libraries/user/:username',
4+
};

src/authz-module/data/api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export const getTeamMembers = async (object: string): Promise<TeamMember[]> => {
1414
return camelCaseObject(data.results);
1515
};
1616

17-
1817
// TODO: this should be replaced in the future with Console API
1918
export const getLibrary = async (libraryId: string): Promise<LibraryMetadata> => {
2019
const { data } = await getAuthenticatedHttpClient().get(getStudioApiUrl(`/api/libraries/v2/${libraryId}/`));

src/authz-module/data/hooks.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ describe('useLibrary', () => {
113113

114114
const wrapper = createWrapper();
115115
try {
116-
act(()=>{
116+
act(() => {
117117
renderHook(() => useLibrary('lib123'), { wrapper });
118-
})
118+
});
119119
} catch (e) {
120120
expect(e).toEqual(new Error('Not found'));
121121
}

src/authz-module/data/hooks.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { appId } from '@src/constants';
33
import { LibraryMetadata, TeamMember } from '@src/types';
44
import { getLibrary, getTeamMembers } from './api';
55

6-
76
const authzQueryKeys = {
87
all: [appId, 'authz'] as const,
98
teamMembers: (object: string) => [...authzQueryKeys.all, 'teamMembers', object] as const,
@@ -36,10 +35,8 @@ export const useTeamMembers = (object: string) => useQuery<TeamMember[], Error>(
3635
* const { data } = useLibrary('lib:123',);
3736
*
3837
*/
39-
export const useLibrary = (libraryId: string) => {
40-
return useSuspenseQuery<LibraryMetadata, Error>({
41-
queryKey: authzQueryKeys.library(libraryId),
42-
queryFn: () => getLibrary(libraryId),
43-
retry: false,
44-
});
45-
}
38+
export const useLibrary = (libraryId: string) => useSuspenseQuery<LibraryMetadata, Error>({
39+
queryKey: authzQueryKeys.library(libraryId),
40+
queryFn: () => getLibrary(libraryId),
41+
retry: false,
42+
});

src/authz-module/index.test.tsx

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,16 @@ import { MemoryRouter } from 'react-router-dom';
44
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
55
import AuthZModule from './index';
66

7-
jest.mock('./libraries-manager/LibrariesTeamManager', () => {
8-
return lazy(() =>
9-
new Promise<{ default: ComponentType<any> }>(resolve =>
10-
setTimeout(() => resolve({ default: () => <div data-testid="libraries-manager">Loaded</div> }), 100)
11-
)
12-
);
13-
});
7+
// eslint-disable-next-line no-promise-executor-return
8+
jest.mock('./libraries-manager/LibrariesTeamManager', () => lazy(() => new Promise<{ default: ComponentType<any> }>(resolve => setTimeout(() => resolve({ default: () => <div data-testid="libraries-manager">Loaded</div> }), 100))));
149

15-
const createTestQueryClient = () =>
16-
new QueryClient({
17-
defaultOptions: {
18-
queries: {
19-
retry: false,
20-
},
10+
const createTestQueryClient = () => new QueryClient({
11+
defaultOptions: {
12+
queries: {
13+
retry: false,
2114
},
22-
});
15+
},
16+
});
2317

2418
describe('AuthZModule', () => {
2519
it('renders LoadingPage then LibrariesTeamManager when route matches', async () => {
@@ -31,7 +25,7 @@ describe('AuthZModule', () => {
3125
<MemoryRouter initialEntries={[path]}>
3226
<AuthZModule />
3327
</MemoryRouter>
34-
</QueryClientProvider>
28+
</QueryClientProvider>,
3529
);
3630

3731
expect(screen.getByTestId('loading-page')).toBeInTheDocument();

src/authz-module/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Suspense } from 'react';
22
import { Routes, Route } from 'react-router-dom';
33
import { ErrorBoundary } from '@edx/frontend-platform/react';
44
import LoadingPage from '@src/components/LoadingPage';
5-
import { LibrariesTeamManager } from './libraries-manager/';
5+
import { LibrariesTeamManager } from './libraries-manager';
66
import { ROUTES } from './constants';
77

88
import './index.scss';

src/authz-module/libraries-manager/LibrariesTeamManager.test.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { screen } from '@testing-library/react';
2-
import LibrariesTeamManager from './LibrariesTeamManager';
3-
import { useLibraryAuthZ } from './context';
42
import { renderWrapper } from '@src/setupTest';
53
import { initializeMockApp } from '@edx/frontend-platform/testing';
64
import { useLibrary } from '@src/authz-module/data/hooks';
5+
import { useLibraryAuthZ } from './context';
6+
import LibrariesTeamManager from './LibrariesTeamManager';
77

88
jest.mock('./context', () => {
99
const actual = jest.requireActual('./context');
@@ -28,9 +28,9 @@ describe('LibrariesTeamManager', () => {
2828
beforeEach(() => {
2929
initializeMockApp({
3030
authenticatedUser: {
31-
username: 'admin'
32-
}
33-
})
31+
username: 'admin',
32+
},
33+
});
3434
mockedUseLibraryAuthZ.mockReturnValue({
3535
libraryId: 'lib-001',
3636
libraryName: 'Mock Library',

src/authz-module/libraries-manager/LibrariesTeamManager.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { useIntl } from '@edx/frontend-platform/i18n';
22
import { Tab, Tabs } from '@openedx/paragon';
3+
import { useLibrary } from '@src/authz-module/data/hooks';
34
import TeamTable from './components/TeamTable';
45
import AuthZLayout from '../components/AuthZLayout';
5-
import { useLibrary } from '@src/authz-module/data/hooks';
66
import { LibraryAuthZProvider, useLibraryAuthZ } from './context';
77

88
import messages from './messages';
99

1010
const LibrariesAuthZTeamView = () => {
1111
const intl = useIntl();
1212
const { libraryId } = useLibraryAuthZ();
13-
const { data: library } = useLibrary(libraryId)
13+
const { data: library } = useLibrary(libraryId);
1414
const rootBradecrumb = intl.formatMessage(messages['library.authz.breadcrumb.root']) || '';
1515
const pageTitle = intl.formatMessage(messages['library.authz.manage.page.title']);
1616
return (

src/authz-module/libraries-manager/components/TeamTable.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { screen } from '@testing-library/react';
22
import userEvent from '@testing-library/user-event';
33
import { ROUTES } from '@src/authz-module/constants';
44
import { renderWrapper } from '@src/setupTest';
5-
import TeamTable from './TeamTable';
65
import { useTeamMembers } from '@src/authz-module/data/hooks';
6+
import TeamTable from './TeamTable';
77
import { useLibraryAuthZ } from '../context';
88

99
const mockNavigate = jest.fn();
10-
jest.mock('react-router', () => ({
11-
...jest.requireActual('react-router'),
10+
jest.mock('react-router-dom', () => ({
11+
...jest.requireActual('react-router-dom'),
1212
useNavigate: () => mockNavigate,
1313
}));
1414

@@ -93,7 +93,7 @@ describe('TeamTable', () => {
9393

9494
await userEvent.click(editButtons[0]);
9595
expect(mockNavigate).toHaveBeenCalledWith(
96-
`/authz/${ROUTES.LIBRARIES_USER_PATH.replace(':username', 'alice')}`,
96+
`/authz/${ROUTES.LIBRARIES_USER_PATH.replace(':username', 'bob')}`,
9797
);
9898
});
9999

0 commit comments

Comments
 (0)