@openmrs/esm-appointments-app 9.2.1-pre.7279 → 9.2.1-pre.7288

package/src/metrics/metrics-header.component.tsx

@@ -4,7 +4,7 @@ import isToday from 'dayjs/plugin/isToday';
 import { useTranslation } from 'react-i18next';
 import { Calendar, Hospital } from '@carbon/react/icons';
 import { Button } from '@carbon/react';
-import { ExtensionSlot, isDesktop, launchWorkspace, navigate, useLayoutType } from '@openmrs/esm-framework';
+import { ExtensionSlot, isDesktop, launchWorkspace2, navigate, useLayoutType } from '@openmrs/esm-framework';
 import { spaHomePage } from '../constants';
 import { useAppointmentsStore } from '../store';
 import styles from './metrics-header.scss';
@@ -24,7 +24,7 @@ const MetricsHeader: React.FC = () => {
       mutate: () => {}, // TODO get this to mutate properly
     };
 
-    launchWorkspace('appointments-form-workspace', { ...props });
+    launchWorkspace2('appointments-form-workspace', { ...props });
   };
 
   return (

package/src/patient-appointments/patient-appointments-action-menu.component.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Layer, OverflowMenu, OverflowMenuItem } from '@carbon/react';
-import { launchWorkspace, showModal, useLayoutType } from '@openmrs/esm-framework';
+import { launchWorkspace2, showModal, useLayoutType } from '@openmrs/esm-framework';
 import type { Appointment } from '../types';
 import styles from './patient-appointments-action-menu.scss';
 
@@ -15,10 +15,10 @@ export const PatientAppointmentsActionMenu = ({ appointment, patientUuid }: appo
   const isTablet = useLayoutType() === 'tablet';
 
   const handleLaunchEditAppointmentForm = () => {
-    launchWorkspace('appointments-form-workspace', {
+    launchWorkspace2('appointments-form-workspace', {
       appointment,
       context: 'editing',
-      workspaceTitle: t('editAppointment', 'Edit appointment'),
+      patientUuid,
     });
   };
 

package/src/patient-appointments/patient-appointments-base.component.tsx

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import { Button, ContentSwitcher, DataTableSkeleton, InlineLoading, Layer, Switch, Tile } from '@carbon/react';
 import { Add } from '@carbon/react/icons';
-import { launchWorkspace, useLayoutType } from '@openmrs/esm-framework';
+import { launchWorkspace2, useLayoutType } from '@openmrs/esm-framework';
 import { CardHeader, EmptyDataIllustration, ErrorState } from '@openmrs/esm-patient-common-lib';
 import { usePatientAppointments } from './patient-appointments.resource';
 import { PatientAppointmentContextTypes, usePatientAppointmentContext } from '../hooks/patient-appointment-context';
@@ -44,14 +44,14 @@ const PatientAppointmentsBase: React.FC<PatientAppointmentsBaseProps> = ({ patie
     if (
       (patientAppointmentContext as PatientAppointmentContextTypes) === PatientAppointmentContextTypes.PATIENT_CHART
     ) {
-      launchWorkspace('appointments-form-workspace', {
+      launchWorkspace2('appointments-form-workspace', {
         context: 'creating',
+        patientUuid,
       });
     } else {
-      launchWorkspace('appointments-form-workspace', {
+      launchWorkspace2('appointments-form-workspace', {
         context: 'creating',
         patientUuid,
-        workspaceTitle: t('createNewAppointment', 'Create new appointment'),
       });
     }
   };

package/src/patient-search/patient-search.component.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ExtensionSlot, launchWorkspace } from '@openmrs/esm-framework';
+import { ExtensionSlot, launchWorkspace2 } from '@openmrs/esm-framework';
 import styles from './patient-search.scss';
 
 const PatientSearch: React.FC = () => {
@@ -10,7 +10,7 @@ const PatientSearch: React.FC = () => {
       mutate: () => {}, // TODO get this to mutate properly
     };
 
-    launchWorkspace('appointments-form-workspace', { ...props });
+    launchWorkspace2('appointments-form-workspace', { ...props });
   };
 
   return (

package/src/routes.json

@@ -135,12 +135,23 @@
       "component": "cancelAppointmentModal"
     }
   ],
-  "workspaces": [
+  "workspaces2": [
     {
       "name": "appointments-form-workspace",
       "component": "appointmentsFormWorkspace",
-      "title": "createNewAppointment",
-      "type": "form"
+      "window": "appointments-form-window"
+    }
+  ],
+  "workspaceWindows2": [
+    {
+      "name": "appointments-form-window",
+      "group": "appointmentsFormWorkspaceGroup"
+    }
+  ],
+  "workspaceGroups2": [
+    {
+      "name": "appointmentsFormWorkspaceGroup",
+      "overlay": false
     }
   ]
 }