Skip to content

Commit 92351b0

Browse files
committed
refactor: address feedback
1 parent b049a37 commit 92351b0

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

src/authz-module/components/TableControlBar/ScopesFilter.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ describe('ScopesFilter', () => {
101101
);
102102
});
103103

104-
it('defaults to showing all scopes while permissions are loading', () => {
105-
mockUsePermissions.mockReturnValue({ data: undefined });
104+
it('defaults to showing only library scopes while permissions are loading', () => {
105+
mockUsePermissions.mockReturnValue({ data: undefined, isLoading: true });
106106
renderWrapper(<ScopesFilter {...defaultProps} />);
107107
expect(mockUseScopes).toHaveBeenCalledWith(
108-
expect.not.objectContaining({ scopeType: 'library' }),
108+
expect.objectContaining({ scopeType: 'library' }),
109109
);
110110
});
111111
});

src/authz-module/hooks/useViewTeamPermissions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ export const useViewTeamPermissions = () => {
88

99
const isCourseViewAllowed = permissions
1010
? permissions.some((p) => p.action === CONTENT_COURSE_PERMISSIONS.VIEW_COURSE_TEAM && p.allowed)
11-
: true;
11+
: false;
1212

1313
const isLibraryViewAllowed = permissions
1414
? permissions.some((p) => p.action === CONTENT_LIBRARY_PERMISSIONS.VIEW_LIBRARY_TEAM && p.allowed)
15-
: true;
15+
: false;
1616

1717
return { isCourseViewAllowed, isLibraryViewAllowed, isLoading };
1818
};

src/authz-module/team-members/TeamMembersTable.test.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { screen, waitFor } from '@testing-library/react';
22
import userEvent from '@testing-library/user-event';
33
import { renderWithAllProviders } from '@src/setupTest';
44
import { useAllRoleAssignments, useOrgs, useScopes } from '@src/authz-module/data/hooks';
5+
import type { GetAllRoleAssignmentsResponse } from '@src/authz-module/data/api';
56
import { useViewTeamPermissions } from '@src/authz-module/hooks/useViewTeamPermissions';
67
import { LIBRARY_ROLE_KEYS } from '@src/authz-module/roles-permissions';
78
import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
@@ -13,7 +14,12 @@ jest.mock('@src/authz-module/hooks/useViewTeamPermissions', () => ({
1314

1415
const mockUseViewTeamPermissions = useViewTeamPermissions as jest.Mock;
1516

16-
const mockedAllRoleAssignments = {
17+
const mockedAllRoleAssignments: {
18+
data: GetAllRoleAssignmentsResponse | undefined;
19+
error: Error | null;
20+
isLoading: boolean;
21+
refetch: jest.Mock;
22+
} = {
1723
data: {
1824
results: [
1925
{
@@ -208,7 +214,6 @@ describe('TeamMembersTable', () => {
208214
});
209215

210216
it('renders safely when role assignments data is undefined', () => {
211-
// @ts-ignore
212217
mockApiResponses({ ...mockedAllRoleAssignments, data: undefined });
213218
renderWithAllProviders(<ToastManagerProvider><TeamMembersTable /></ToastManagerProvider>);
214219
expect(screen.queryByText('John Doe')).not.toBeInTheDocument();

src/authz-module/team-members/TeamMembersTable.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
} from '@src/authz-module/components/TableCells';
2121
import { useAllRoleAssignments } from '@src/authz-module/data/hooks';
2222
import { TABLE_DEFAULT_PAGE_SIZE } from '@src/authz-module/constants';
23-
import { UserRole } from '@src/types';
2423
import messages from './messages';
2524
import TableFooter from '../components/TableFooter/TableFooter';
2625

@@ -54,7 +53,7 @@ const TeamMembersTable = ({ presetScope }: TeamMembersTableProps) => {
5453
}, [isCourseViewAllowed, querySettings]);
5554

5655
const {
57-
data: { results: roleAssignments, count } = { results: [] as UserRole[], count: 0 },
56+
data: { results: roleAssignments, count } = { results: [], count: 0 },
5857
isLoading: isLoadingAllRoleAssignments,
5958
error,
6059
refetch,

0 commit comments

Comments
 (0)