refactor: implement feedback

Author: dcoa

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

@@ -2,10 +2,9 @@ import {
   render, screen, waitFor, act,
 } from '@testing-library/react';
 import { AppContext } from '@edx/frontend-platform/react';
-import type { ConfigDocument } from '@edx/frontend-platform/config';
 import userEvent from '@testing-library/user-event';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
-import { mockHttpClient } from '@src/setupTest';
+import { mockHttpClient, mockAppContext } from '@src/setupTest';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
@@ -77,26 +76,6 @@ const renderWithRouter = (route = '/audit/johndoe') => {
     },
   });
 
-  const mockAppContext = {
-    authenticatedUser: {
-      userId: 1,
-      username: 'testuser',
-      email: 'testuser@example.com',
-      roles: [],
-      administrator: false,
-    },
-    config: {
-      LMS_BASE_URL: 'http://localhost:18000',
-      STUDIO_BASE_URL: 'http://localhost:18010',
-      AUTHZ_MICROFRONTEND_URL: 'http://localhost:18012',
-      ACCESS_TOKEN_COOKIE_NAME: 'edx-jwt-cookie-header-payload',
-      BASE_URL: 'http://localhost:18012',
-      ENVIRONMENT: 'test',
-      LANGUAGE_PREFERENCE_COOKIE_NAME: 'openedx-language-preference',
-      ...process.env,
-    } as unknown as ConfigDocument,
-  };
-
   return render(
     <AppContext.Provider value={mockAppContext}>
       <QueryClientProvider client={queryClient}>

src/authz-module/components/RenderPermissionColumn.tsx

@@ -1,11 +1,7 @@
 import { Icon } from '@openedx/paragon';
-import { PermissionMetadata, ResourceMetadata } from '@src/types';
+import { PermissionItem } from '@src/types';
 import ResourceTooltip from './ResourceTooltip';
 
-export type PermissionItem = ResourceMetadata & {
-  perms: PermissionMetadata[];
-};
-
 interface RenderPermissionColumnProps {
   items: PermissionItem[];
 }

src/authz-module/components/RenderPermissionInLine.tsx

@@ -1,6 +1,6 @@
 import { Icon } from '@openedx/paragon';
+import { PermissionItem } from '@src/types';
 import ResourceTooltip from './ResourceTooltip';
-import type { PermissionItem } from './RenderPermissionColumn';
 
 interface RenderPermissionInLineProps {
   items: PermissionItem[];

src/authz-module/components/UserPermissions.tsx

@@ -7,7 +7,8 @@ import {
   libraryPermissions,
   rolesLibraryObject,
 } from '@src/authz-module/roles-permissions';
-import RenderPermissionColumn, { type PermissionItem } from './RenderPermissionColumn';
+import { PermissionItem } from '@src/types';
+import RenderPermissionColumn from './RenderPermissionColumn';
 import RenderPermissionInLine from './RenderPermissionInLine';
 import RenderAdminRole from './RenderAdminRole';
 

src/authz-module/roles-permissions/library/utils.test.ts

@@ -1,7 +1,7 @@
-import type { IntlShape } from '@edx/frontend-platform/i18n';
+import { createIntl } from '@edx/frontend-platform/i18n';
 import { buildPermissionMatrixByResource } from './utils';
 
-const intl = { formatMessage: jest.fn((msg: any) => msg) } as unknown as IntlShape;
+const intl = createIntl({ locale: 'en', messages: {} });
 
 const permissions = [
   {

src/setupTest.tsx

@@ -11,13 +11,9 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 // Lazy so each test file's own `jest.mock('@edx/frontend-platform/auth', ...)`
 // (which is hoisted above this setup file's imports) is in effect by the time
 // callers do `mockHttpClient().mockReturnValue(...)`.
-export const mockHttpClient = (): jest.Mock => {
-  // eslint-disable-next-line global-require
-  const { getAuthenticatedHttpClient } = require('@edx/frontend-platform/auth');
-  return getAuthenticatedHttpClient as jest.Mock;
-};
+export const mockHttpClient = (): jest.Mock => jest.requireMock('@edx/frontend-platform/auth').getAuthenticatedHttpClient;
 
-const mockAppContext = {
+export const mockAppContext = {
   authenticatedUser: {
     userId: 1,
     username: 'testuser',

src/types.ts

@@ -56,6 +56,10 @@ export type PermissionMetadata = {
   icon?: React.ComponentType<React.SVGProps<SVGSVGElement>>;
 };
 
+export type PermissionItem = ResourceMetadata & {
+  perms: PermissionMetadata[];
+};
+
 export type Org = {
   id: string;
   name: string;