Skip to content

Commit 84b25cb

Browse files
refactor: for toast manager context and some messages ids and descriptions
1 parent 4588bfb commit 84b25cb

16 files changed

Lines changed: 74 additions & 49 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
2121
import { useRevokeUserRoles, useUserAssignedRoles } from '@src/authz-module/data/hooks';
2222
import { Role } from 'types';
23-
import { useToastManager } from 'authz-module/libraries-manager/ToastManagerContext';
23+
import { useToastManager } from '@src/authz-module/data/context/ToastManagerContext';
2424
import messages from './messages';
2525
import ConfirmDeletionModal from '../components/ConfirmDeletionModal';
2626

src/authz-module/libraries-manager/ToastManagerContext.test.tsx renamed to src/authz-module/data/context/ToastManagerContext.test.tsx

File renamed without changes.

src/authz-module/libraries-manager/ToastManagerContext.tsx renamed to src/authz-module/data/context/ToastManagerContext.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import {
44
import { logError } from '@edx/frontend-platform/logging';
55
import { useIntl } from '@edx/frontend-platform/i18n';
66
import { Toast } from '@openedx/paragon';
7-
import messages from './messages';
8-
import { DEFAULT_TOAST_DELAY, RETRY_TOAST_DELAY } from '../constants';
7+
import messages from '@src/authz-module/messages';
8+
import { DEFAULT_TOAST_DELAY, RETRY_TOAST_DELAY } from '../../constants';
99

1010
type ToastType = 'success' | 'error' | 'error-retry';
1111

1212
export const ERROR_TOAST_MAP: Record<number | string, { type: ToastType; messageId: string }> = {
1313
// Transient (retryable) server errors
14-
500: { type: 'error-retry', messageId: 'library.authz.team.toast.500.error.message' },
15-
502: { type: 'error-retry', messageId: 'library.authz.team.toast.502.error.message' },
16-
503: { type: 'error-retry', messageId: 'library.authz.team.toast.503.error.message' },
17-
408: { type: 'error-retry', messageId: 'library.authz.team.toast.408.error.message' },
14+
500: { type: 'error-retry', messageId: 'authz.team.toast.500.error.message' },
15+
502: { type: 'error-retry', messageId: 'authz.team.toast.502.error.message' },
16+
503: { type: 'error-retry', messageId: 'authz.team.toast.503.error.message' },
17+
408: { type: 'error-retry', messageId: 'authz.team.toast.408.error.message' },
1818

1919
// Generic fallback error
20-
DEFAULT: { type: 'error-retry', messageId: 'library.authz.team.toast.default.error.message' },
20+
DEFAULT: { type: 'error-retry', messageId: 'authz.team.toast.default.error.message' },
2121
};
2222

2323
export interface AppToast {
@@ -108,7 +108,7 @@ export const ToastManagerProvider = ({ children }: ToastManagerProviderProps) =>
108108
discardToast(toast.id);
109109
toast.onRetry?.();
110110
},
111-
label: intl.formatMessage(messages['library.authz.team.toast.retry.label']),
111+
label: intl.formatMessage(messages['authz.team.toast.retry.label']),
112112
} : undefined}
113113
>
114114
{toast.message}

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 './libraries-manager/ToastManagerContext';
8+
import { ToastManagerProvider } from './data/context/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
@@ -5,7 +5,7 @@ import { initializeMockApp } from '@edx/frontend-platform/testing';
55
import { useLibrary } from '@src/authz-module/data/hooks';
66
import { useLibraryAuthZ } from './context';
77
import LibrariesTeamManager from './LibrariesTeamManager';
8-
import { ToastManagerProvider } from './ToastManagerContext';
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
@@ -5,7 +5,7 @@ import { renderWrapper } from '@src/setupTest';
55
import LibrariesUserManager from './LibrariesUserManager';
66
import { useLibraryAuthZ } from './context';
77
import { useLibrary, useTeamMembers, useRevokeUserRoles } from '../data/hooks';
8-
import { ToastManagerProvider } from './ToastManagerContext';
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/libraries-manager/ToastManagerContext';
7+
import { useToastManager } from '@src/authz-module/data/context/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/libraries-manager/ToastManagerContext';
6+
import { ToastManagerProvider } from 'authz-module/data/context/ToastManagerContext';
77
import AddNewTeamMemberTrigger from './AddNewTeamMemberTrigger';
88

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Plus } from '@openedx/paragon/icons';
66
import { PutAssignTeamMembersRoleResponse } from '@src/authz-module/data/api';
77
import { useAssignTeamMembersRole } from '@src/authz-module/data/hooks';
88
import { RoleOperationErrorStatus, DEFAULT_TOAST_DELAY } from '@src/authz-module/constants';
9-
import { AppToast, useToastManager } from '@src/authz-module/libraries-manager/ToastManagerContext';
9+
import { AppToast, useToastManager } from '@src/authz-module/data/context/ToastManagerContext';
1010
import baseMessages from '@src/authz-module/messages';
1111
import AddNewTeamMemberModal from './AddNewTeamMemberModal';
1212
import messages from './messages';

src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleTrigger.test.tsx

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

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

0 commit comments

Comments
 (0)