fix: minor issues after conflict solving

Author: jacobo-dominguez-wgu

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { useAllRoleAssignments, useOrgs, useScopes } from '@src/authz-module/data/hooks';
-import { ToastManagerProvider } from '@src/authz-module/libraries-manager/ToastManagerContext';
+import { ToastManagerProvider } from '@src/authz-module/data/context/ToastManagerContext';
 import { renderWithAllProviders } from '@src/setupTest';
 import userEvent from '@testing-library/user-event';
 import AuthzHome from './index';

src/authz-module/data/api.ts

@@ -200,22 +200,22 @@ export const getScopes = async (search?: string, page?: number, pageSize?: numbe
   return camelCaseObject(data);
 };
 
-export const getUserAssignedRoles = async (username: string, querySettings: QuerySettings)
+export const getUserAssignedRoles = async (username?: string, querySettings?: QuerySettings)
 : Promise<GetUserAssignmentsResponse> => {
   const url = new URL(getApiUrl(`/api/authz/v1/users/${username}/assignments/`));
 
-  if (querySettings.roles) {
+  if (querySettings?.roles) {
     url.searchParams.set('roles', querySettings.roles);
   }
-  if (querySettings.search) {
+  if (querySettings?.search) {
     url.searchParams.set('search', querySettings.search);
   }
-  if (querySettings.sortBy && querySettings.order) {
+  if (querySettings?.sortBy && querySettings?.order) {
     url.searchParams.set('sort_by', querySettings.sortBy);
-    url.searchParams.set('order', querySettings.order);
+    url.searchParams.set('order', querySettings?.order || '');
   }
-  url.searchParams.set('page_size', querySettings.pageSize.toString());
-  url.searchParams.set('page', (querySettings.pageIndex + 1).toString());
+  url.searchParams.set('page_size', querySettings?.pageSize?.toString() || '');
+  url.searchParams.set('page', ((querySettings?.pageIndex ?? 0) + 1).toString());
 
   const { data } = await getAuthenticatedHttpClient().get(url);
   return camelCaseObject(data);

src/authz-module/data/hooks.ts

@@ -21,7 +21,7 @@ const authzQueryKeys = {
   allRoleAssignments: (querySettings?: QuerySettings) => [...authzQueryKeys.all, 'allRoleAssignments', querySettings] as const,
   orgs: (search?: string, page?: number, pageSize?: number) => [...authzQueryKeys.all, 'organizations', search, page, pageSize] as const,
   scopes: (search?: string, page?: number, pageSize?: number) => [...authzQueryKeys.all, 'scopes', search, page, pageSize] as const,
-  userRoles: (username: string, querySettings?: QuerySettings) => [...authzQueryKeys.all, 'userRoles', username, querySettings] as const,
+  userRoles: (username?: string, querySettings?: QuerySettings) => [...authzQueryKeys.all, 'userRoles', username, querySettings] as const,
 };
 
 /**
@@ -184,10 +184,12 @@ export const useScopes = (search?: string, page?: number, pageSize?: number) =>
   * ```
 */
 export const useUserAssignedRoles = (
-  username: string,
-  querySettings: QuerySettings,
+  username?: string,
+  querySettings?: QuerySettings,
 ) => useQuery<GetUserAssignmentsResponse, Error>({
   queryKey: authzQueryKeys.userRoles(username, querySettings),
   queryFn: () => getUserAssignedRoles(username, querySettings),
   staleTime: 1000 * 60 * 30, // refetch after 30 minutes
+  enabled: !!username,
+  refetchOnWindowFocus: false,
 });

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

@@ -3,7 +3,7 @@ import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { renderWithAllProviders } from '@src/setupTest';
 import { useAllRoleAssignments, useOrgs, useScopes } from '@src/authz-module/data/hooks';
-import { ToastManagerProvider } from '@src/authz-module/libraries-manager/ToastManagerContext';
+import { ToastManagerProvider } from '@src/authz-module/data/context/ToastManagerContext';
 import TeamMembersTable from './TeamMembersTable';
 
 const mockedAllRoleAssignments = {

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

@@ -6,7 +6,7 @@ import {
   TextFilter,
 } from '@openedx/paragon';
 
-import { useToastManager } from '@src/authz-module/libraries-manager/ToastManagerContext';
+import { useToastManager } from '@src/authz-module/data/context/ToastManagerContext';
 import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
 import OrgFilter from '@src/authz-module/components/TableControlBar/OrgFilter';
 import RolesFilter from '@src/authz-module/components/TableControlBar/RolesFilter';