Skip to content

Commit b5f07c3

Browse files
fix: addressing pr comments
1 parent 8f18e4e commit b5f07c3

20 files changed

Lines changed: 22 additions & 20 deletions

File tree

src/authz-module/audit-user/index.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { MemoryRouter, Route, Routes } from 'react-router-dom';
55
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
66
import { IntlProvider } from '@edx/frontend-platform/i18n';
77
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
8-
import { ToastManagerProvider } from '@src/authz-module/data/context/ToastManagerContext';
8+
import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
99
import AuditUserPage from './index';
1010

1111
jest.mock('@edx/frontend-platform/auth', () => ({

src/authz-module/audit-user/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ import {
2323
import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
2424
import { useRevokeUserRoles, useUserAssignedRoles } from '@src/authz-module/data/hooks';
2525
import { Role } from 'types';
26-
import { useToastManager } from '@src/authz-module/data/context/ToastManagerContext';
26+
import { useToastManager } from '@src/components/ToastManager/ToastManagerContext';
2727
import messages from './messages';
2828
import ConfirmDeletionModal from '../components/ConfirmDeletionModal';
2929

3030
const AuditUserPage = () => {
3131
const { formatMessage } = useIntl();
3232
const { username } = useParams();
33-
const { authenticatedUser } = useContext(AppContext) as AppContextType;
33+
const { authenticatedUser } = useContext(AppContext as React.Context<AppContextType>);
3434
const navigate = useNavigate();
3535
const {
3636
isLoading: isLoadingUser, data: user, isError: isErrorUser, error: errorUser,
@@ -148,7 +148,6 @@ const AuditUserPage = () => {
148148
{ Bold, Br },
149149
),
150150
});
151-
// authzQueryKeys.userRoles(username, querySettings),
152151
return;
153152
}
154153

src/authz-module/authz-home/index.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { screen } from '@testing-library/react';
33
import { useAllRoleAssignments, useOrgs, useScopes } from '@src/authz-module/data/hooks';
4-
import { ToastManagerProvider } from '@src/authz-module/data/context/ToastManagerContext';
4+
import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
55
import { renderWithAllProviders } from '@src/setupTest';
66
import userEvent from '@testing-library/user-event';
77
import AuthzHome from './index';

src/authz-module/components/messages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ const messages = defineMessages({
134134
},
135135
'authz.manage.removing.button': {
136136
id: 'authz.manage.removing.button',
137-
defaultMessage: 'Removing...',
137+
defaultMessage: 'Removing',
138138
description: 'AuthZ removing button title',
139139
},
140140
'authz.team.remove.user.modal.body.1': {

src/authz-module/data/hooks.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
} from '@tanstack/react-query';
44
import { appId } from '@src/constants';
55
import { LibraryMetadata } from '@src/types';
6+
import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
67
import {
78
assignTeamMembersRole, AssignTeamMembersRoleRequest, getAllRoleAssignments,
89
GetAllRoleAssignmentsResponse, getLibrary, getOrgs, GetOrgsResponse,
@@ -107,6 +108,7 @@ export const useAssignTeamMembersRole = () => {
107108
*/
108109
export const useRevokeUserRoles = () => {
109110
const queryClient = useQueryClient();
111+
const { querySettings: defaultQuerySettings } = useQuerySettings();
110112
return useMutation({
111113
mutationFn: async ({ data }: {
112114
data: RevokeUserRolesRequest
@@ -117,6 +119,7 @@ export const useRevokeUserRoles = () => {
117119
queryClient.invalidateQueries({
118120
queryKey: authzQueryKeys.userRoles(users, querySettings),
119121
});
122+
queryClient.invalidateQueries({ queryKey: authzQueryKeys.allRoleAssignments(defaultQuerySettings) });
120123
},
121124
});
122125
};

src/authz-module/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { QueryErrorResetBoundary } from '@tanstack/react-query';
55
import LoadingPage from '@src/components/LoadingPage';
66
import LibrariesErrorFallback from '@src/authz-module/libraries-manager/ErrorPage';
77
import { CustomErrors } from '@src/constants';
8-
import { ToastManagerProvider } from './data/context/ToastManagerContext';
8+
import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
99
import { LibrariesUserManager, LibrariesLayout, LibrariesTeamManager } from './libraries-manager';
1010
import AuthzHome from './authz-home';
1111
import AuditUserPage from './audit-user';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import userEvent from '@testing-library/user-event';
33
import { renderWrapper } from '@src/setupTest';
44
import { initializeMockApp } from '@edx/frontend-platform/testing';
55
import { useLibrary } from '@src/authz-module/data/hooks';
6+
import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
67
import { useLibraryAuthZ } from './context';
78
import LibrariesTeamManager from './LibrariesTeamManager';
8-
import { ToastManagerProvider } from '../data/context/ToastManagerContext';
99
import { CONTENT_LIBRARY_PERMISSIONS } from '../constants';
1010

1111
jest.mock('./context', () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { useParams } from 'react-router-dom';
22
import { screen, waitFor, within } from '@testing-library/react';
33
import userEvent from '@testing-library/user-event';
44
import { renderWrapper } from '@src/setupTest';
5+
import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
56
import LibrariesUserManager from './LibrariesUserManager';
67
import { useLibraryAuthZ } from './context';
78
import { useLibrary, useTeamMembers, useRevokeUserRoles } from '../data/hooks';
8-
import { ToastManagerProvider } from '../data/context/ToastManagerContext';
99

1010
jest.mock('@edx/frontend-platform/logging', () => ({
1111
logError: jest.fn(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useIntl } from '@edx/frontend-platform/i18n';
44
import { Container, Skeleton } from '@openedx/paragon';
55
import { ROUTES } from '@src/authz-module/constants';
66
import { Role } from 'types';
7-
import { useToastManager } from '@src/authz-module/data/context/ToastManagerContext';
7+
import { useToastManager } from '@src/components/ToastManager/ToastManagerContext';
88
import AuthZLayout from '../components/AuthZLayout';
99
import { useLibraryAuthZ } from './context';
1010
import RoleCard from '../components/RoleCard';

src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { screen, waitFor } from '@testing-library/react';
33
import userEvent from '@testing-library/user-event';
44
import { renderWrapper } from '@src/setupTest';
55
import { useAssignTeamMembersRole } from '@src/authz-module/data/hooks';
6-
import { ToastManagerProvider } from '@src/authz-module/data/context/ToastManagerContext';
6+
import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
77
import AddNewTeamMemberTrigger from './AddNewTeamMemberTrigger';
88

99
jest.mock('@edx/frontend-platform/logging');

0 commit comments

Comments
 (0)