@openmrs/esm-patient-programs-app 3.1.0 → 3.1.1-pre.1097

package/src/programs/programs-form.component.tsx

@@ -6,14 +6,7 @@ import includes from 'lodash-es/includes';
 import map from 'lodash-es/map';
 import styles from './programs-form.scss';
 import { useTranslation } from 'react-i18next';
-import {
-  createErrorHandler,
-  detach,
-  showNotification,
-  showToast,
-  useSessionUser,
-  useLocations,
-} from '@openmrs/esm-framework';
+import { createErrorHandler, showNotification, showToast, useSessionUser, useLocations } from '@openmrs/esm-framework';
 import {
   Button,
   DatePicker,
@@ -25,13 +18,9 @@ import {
   ButtonSet,
 } from 'carbon-components-react';
 import { createProgramEnrollment, useAvailablePrograms, useEnrollments } from './programs.resource';
+import { DefaultWorkspaceProps } from '@openmrs/esm-patient-common-lib';
 
-interface ProgramsFormProps {
-  patientUuid: string;
-  isTablet: boolean;
-}
-
-const ProgramsForm: React.FC<ProgramsFormProps> = ({ patientUuid, isTablet }) => {
+const ProgramsForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace, patientUuid, isTablet }) => {
   const { t } = useTranslation();
   const session = useSessionUser();
   const availableLocations = useLocations();
@@ -53,8 +42,6 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({ patientUuid, isTablet }) =>
     setUserLocation(session?.sessionLocation?.uuid);
   }
 
-  const closeWorkspace = React.useCallback(() => detach('patient-chart-workspace-slot', 'programs-form-workspace'), []);
-
   const handleSubmit = React.useCallback(
     (event: SyntheticEvent<HTMLFormElement>) => {
       event.preventDefault();

package/src/programs/programs-form.test.tsx

@@ -4,14 +4,7 @@ import * as SWR from 'swr';
 import { throwError } from 'rxjs';
 import { of } from 'rxjs/internal/observable/of';
 import { fireEvent, render, screen } from '@testing-library/react';
-import {
-  createErrorHandler,
-  detach,
-  openmrsFetch,
-  showNotification,
-  showToast,
-  useLocations,
-} from '@openmrs/esm-framework';
+import { createErrorHandler, openmrsFetch, showNotification, showToast, useLocations } from '@openmrs/esm-framework';
 import { mockPatient } from '../../../../__mocks__/patient.mock';
 import {
   mockCareProgramsResponse,
@@ -24,15 +17,14 @@ import ProgramsForm from './programs-form.component';
 const testProps = {
   patientUuid: mockPatient.id,
   isTablet: false,
+  closeWorkspace: jest.fn(),
 };
 
 const mockCreateErrorHandler = createErrorHandler as jest.Mock;
 const mockCreateProgramEnrollment = createProgramEnrollment as jest.Mock;
-const mockDetach = detach as jest.Mock;
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
 const mockShowNotification = showNotification as jest.Mock;
 const mockShowToast = showToast as jest.Mock;
-const mockUseLocations = useLocations as jest.Mock;
 
 jest.mock('@openmrs/esm-framework', () => {
   const originalModule = jest.requireActual('@openmrs/esm-framework');
@@ -40,7 +32,6 @@ jest.mock('@openmrs/esm-framework', () => {
   return {
     ...originalModule,
     createErrorHandler: jest.fn(),
-    detach: jest.fn(),
     showNotification: jest.fn(),
     showToast: jest.fn(),
     useLocations: jest.fn().mockImplementation(() => mockLocationsResponse),
@@ -90,8 +81,7 @@ describe('ProgramsForm: ', () => {
     const cancelButton = screen.getByRole('button', { name: /Cancel/i });
     fireEvent.click(cancelButton);
 
-    expect(mockDetach).toHaveBeenCalledTimes(1);
-    expect(mockDetach).toHaveBeenCalledWith('patient-chart-workspace-slot', 'programs-form-workspace');
+    expect(testProps.closeWorkspace).toHaveBeenCalledTimes(1);
   });
 
   it('renders a light background for date inputs in the tablet viewport ', () => {