Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat) O3-2571: Using the new snackbar in programs app #1503

Merged
merged 1 commit into from
Nov 24, 2023
Merged

(feat) O3-2571: Using the new snackbar in programs app #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ const MedicationsDetailsTable: React.FC<ActiveMedicationsProps> = ({
>
{({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
<TableContainer>
<Table {...getTableProps()}>
<Table aria-role="medications" {...getTableProps()}>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
27 changes: 13 additions & 14 deletions packages/esm-patient-programs-app/src/programs/programs-form.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import { useForm, Controller } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import {
createErrorHandler,
showNotification,
showToast,
showSnackbar,
useSession,
useLocations,
useLayoutType,
Expand Down Expand Up @@ -109,10 +108,10 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({ closeWorkspace, patientUuid
mutateEnrollments();
closeWorkspace();

showToast({
critical: true,
showSnackbar({
isLowContrast: true,
kind: 'success',
description: t(
subtitle: t(
'enrollmentUpdatesNowVisible',
'Changes to the program are now visible in the Programs table',
),
Expand All @@ -123,11 +122,11 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({ closeWorkspace, patientUuid
(err) => {
createErrorHandler();

showNotification({
showSnackbar({
title: t('programEnrollmentSaveError', 'Error saving program enrollment'),
kind: 'error',
critical: true,
description: err?.message,
isLowContrast: false,
subtitle: err?.message,
});
},
)
Expand All @@ -137,22 +136,22 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({ closeWorkspace, patientUuid
mutateEnrollments();
closeWorkspace();

showToast({
critical: true,
showSnackbar({
isLowContrast: true,
kind: 'success',
description: t('enrollmentNowVisible', 'It is now visible in the Programs table'),
subtitle: t('enrollmentNowVisible', 'It is now visible in the Programs table'),
title: t('enrollmentSaved', 'Program enrollment saved'),
});
}
},
(err) => {
createErrorHandler();

showNotification({
showSnackbar({
title: t('programEnrollmentSaveError', 'Error saving program enrollment'),
kind: 'error',
critical: true,
description: err?.message,
isLowContrast: false,
subtitle: err?.message,
});
},
);
Expand Down
15 changes: 7 additions & 8 deletions packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { throwError } from 'rxjs';
import { of } from 'rxjs/internal/observable/of';
import { render, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { createErrorHandler, openmrsFetch, showNotification, showToast } from '@openmrs/esm-framework';
import { createErrorHandler, openmrsFetch, showSnackbar } from '@openmrs/esm-framework';
import {
mockCareProgramsResponse,
mockEnrolledProgramsResponse,
Expand All @@ -25,8 +25,7 @@ const mockCreateErrorHandler = createErrorHandler as jest.Mock;
const mockCreateProgramEnrollment = createProgramEnrollment as jest.Mock;
const mockUpdateProgramEnrollment = updateProgramEnrollment as jest.Mock;
const mockOpenmrsFetch = openmrsFetch as jest.Mock;
const mockShowNotification = showNotification as jest.Mock;
const mockShowToast = showToast as jest.Mock;
const mockShowSnackbar = showSnackbar as jest.Mock;

jest.mock('@openmrs/esm-framework', () => {
const originalModule = jest.requireActual('@openmrs/esm-framework');
Expand All @@ -35,7 +34,7 @@ jest.mock('@openmrs/esm-framework', () => {
...originalModule,
createErrorHandler: jest.fn(),
showNotification: jest.fn(),
showToast: jest.fn(),
showSnackbar: jest.fn(),
useLocations: jest.fn().mockImplementation(() => mockLocationsResponse),
};
});
Expand Down Expand Up @@ -87,8 +86,8 @@ describe('ProgramsForm', () => {
new AbortController(),
);

expect(mockShowToast).toHaveBeenCalledTimes(1);
expect(mockShowToast).toHaveBeenCalledWith({
expect(mockShowSnackbar).toHaveBeenCalledTimes(1);
expect(mockShowSnackbar).toHaveBeenCalledWith({
critical: true,
description: 'It is now visible in the Programs table',
kind: 'success',
Expand Down Expand Up @@ -130,7 +129,7 @@ describe('ProgramsForm', () => {
new AbortController(),
);

expect(mockShowToast).toHaveBeenCalledWith(
expect(mockShowSnackbar).toHaveBeenCalledWith(
expect.objectContaining({
critical: true,
description: 'Changes to the program are now visible in the Programs table',
Expand Down Expand Up @@ -174,7 +173,7 @@ describe('ProgramsForm', () => {
await waitFor(() => user.click(enrollButton));

expect(mockCreateErrorHandler).toHaveBeenCalledTimes(1);
expect(mockShowNotification).toHaveBeenCalledWith({
expect(mockShowSnackbar).toHaveBeenCalledWith({
critical: true,
description: 'Internal Server Error',
kind: 'error',
Expand Down
Loading