Skip to content

Commit 638c8e2

Browse files
jacobo-dominguez-wgujacobo-dominguez-wgu
committed
fix: addressing pr comments
1 parent 8f18e4e commit 638c8e2

24 files changed

Lines changed: 40 additions & 80 deletions

‎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: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ import {
2222
} from '@src/authz-module/components/TableCells';
2323
import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
2424
import { useRevokeUserRoles, useUserAssignedRoles } from '@src/authz-module/data/hooks';
25-
import { Role } from 'types';
26-
import { useToastManager } from '@src/authz-module/data/context/ToastManagerContext';
25+
import { RoleToDelete } from 'types';
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,
3737
} = useUserAccount(username);
3838
const { querySettings, handleTableFetch } = useQuerySettings();
3939
const { isLoading: isLoadingUserAssignments, data: { results: userAssignments, count } = { results: [], count: 0 } } = useUserAssignedRoles(username ?? '', querySettings);
40-
const [roleToDelete, setRoleToDelete] = useState<Role | null>(null);
40+
const [roleToDelete, setRoleToDelete] = useState<RoleToDelete | null>(null);
4141
const [showConfirmDeletionModal, setShowConfirmDeletionModal] = useState(false);
4242
const {
4343
showToast, showErrorToast, Bold, Br,
@@ -57,7 +57,7 @@ const AuditUserPage = () => {
5757

5858
useEffect(() => () => fetchData.cancel(), [fetchData]);
5959

60-
const handleShowConfirmDeletionModal = useCallback((role: Role) => {
60+
const handleShowConfirmDeletionModal = useCallback((role: RoleToDelete) => {
6161
if (isRevokingUserRolePending) { return; }
6262

6363
setRoleToDelete(role);
@@ -148,7 +148,6 @@ const AuditUserPage = () => {
148148
{ Bold, Br },
149149
),
150150
});
151-
// authzQueryKeys.userRoles(username, querySettings),
152151
return;
153152
}
154153

@@ -157,7 +156,7 @@ const AuditUserPage = () => {
157156
message: formatMessage(
158157
baseMessages['authz.team.remove.user.toast.success.description'],
159158
{
160-
role: roleToDelete.name,
159+
role: roleToDelete.role,
161160
rolesCount: remainingRolesCount,
162161
},
163162
),
@@ -184,7 +183,7 @@ const AuditUserPage = () => {
184183
context={{
185184
userName: user?.username || '',
186185
scope: roleToDelete?.scope || '',
187-
role: roleToDelete?.name || '',
186+
role: roleToDelete?.role || '',
188187
rolesCount: count || 0,
189188
}}
190189
/>

‎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/TableCells.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
Info,
77
} from '@openedx/paragon/icons';
88
import {
9-
TableCellValue, AppContextType, UserRole, Role,
9+
TableCellValue, AppContextType, UserRole, RoleToDelete,
1010
} from '@src/types';
1111
import { useNavigate } from 'react-router-dom';
1212
import { useContext, useMemo } from 'react';
@@ -27,11 +27,14 @@ type ExtendedCellProps = CellPropsWithValue & {
2727
getCellProps: (props?: Record<string, string>) => Record<string, string>;
2828
};
2929
};
30-
type ActionsCellProps = CellProps & {
31-
onClickDeleteButton: (role: Role) => void;
30+
31+
type ActionsCellExtraProps = {
32+
onClickDeleteButton: (role: RoleToDelete) => void;
3233
isUserAuthenticatedPage: boolean;
3334
};
3435

36+
type ActionsCellProps = CellProps & ActionsCellExtraProps;
37+
3538
const NameCell = ({ row }: CellProps) => {
3639
const intl = useIntl();
3740
const { authenticatedUser } = useContext(AppContext) as AppContextType;
@@ -139,7 +142,7 @@ const ActionsCell = ({ row, onClickDeleteButton, isUserAuthenticatedPage }: Acti
139142
const roleToDelete = {
140143
role,
141144
scope: row.original.scope,
142-
} as Role;
145+
} as RoleToDelete;
143146
onClickDeleteButton(roleToDelete);
144147
};
145148

@@ -179,7 +182,7 @@ const ActionsCell = ({ row, onClickDeleteButton, isUserAuthenticatedPage }: Acti
179182
);
180183
};
181184

182-
const createActionsCell = (extraProps) => function customActionsCell(cellProps) {
185+
const createActionsCell = (extraProps: ActionsCellExtraProps) => function customActionsCell(cellProps) {
183186
return <ActionsCell {...cellProps} {...extraProps} />;
184187
};
185188

‎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';

0 commit comments

Comments
 (0)