@openmrs/esm-appointments-app 9.2.1-pre.7303 → 9.2.1-pre.7318

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

@@ -18,13 +18,47 @@ import { useProviders } from '../hooks/useProviders';
 import type { AppointmentKind, AppointmentStatus } from '../types';
 import AppointmentForm from './appointments-form.workspace';
 
+const existingAppointment = {
+  uuid: 'appointment-uuid',
+  appointmentNumber: 'APT-001',
+  startDateTime: '2024-01-04T09:30:00.000Z',
+  endDateTime: '2024-01-04T10:00:00.000Z',
+  appointmentKind: 'Scheduled' as AppointmentKind.SCHEDULED,
+  status: 'Scheduled' as AppointmentStatus.SCHEDULED,
+  comments: 'Existing appointment note',
+  location: { uuid: 'b1a8b05e-3542-4037-bbd3-998ee9c40574', display: 'Inpatient Ward', name: 'Inpatient Ward' },
+  service: {
+    uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
+    name: 'Outpatient',
+    appointmentServiceId: 1,
+    creatorName: 'Test Creator',
+    description: 'Outpatient service',
+    endTime: '17:00',
+    initialAppointmentStatus: 'Scheduled' as AppointmentStatus.SCHEDULED,
+    maxAppointmentsLimit: null,
+    startTime: '08:00',
+  },
+  patient: { uuid: mockPatient.id, name: 'Test Patient', identifier: '12345', identifiers: [] },
+  provider: { uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66', display: 'Dr. Cook' },
+  providers: [{ uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66', response: 'ACCEPTED' }],
+  recurring: false,
+  voided: false,
+  extensions: {},
+  teleconsultationLink: null,
+  dateAppointmentScheduled: '2024-01-04T00:00:00.000Z',
+};
+
 const defaultProps = {
-  context: 'creating',
   closeWorkspace: jest.fn(),
-  patientUuid: mockPatient.id,
-  promptBeforeClosing: jest.fn(),
-  closeWorkspaceWithSavedChanges: jest.fn(),
-  setTitle: jest.fn(),
+  workspaceProps: {
+    patientUuid: mockPatient.id,
+  },
+  windowProps: null,
+  groupProps: null,
+  workspaceName: 'appointments-form',
+  windowName: 'test-window',
+  isRootWorkspace: true,
+  launchChildWorkspace: jest.fn(),
 };
 
 const mockOpenmrsFetch = jest.mocked(openmrsFetch);
@@ -694,7 +728,7 @@ describe('AppointmentForm', () => {
       expect(mockSaveAppointment).not.toHaveBeenCalled();
     });
 
-    it('should detect patient double-booking conflicts', async () => {
+    it('should detect patient double-booking conflicts when creating new appointment', async () => {
       const user = userEvent.setup();
 
       mockOpenmrsFetch.mockResolvedValue({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
@@ -703,6 +737,7 @@ describe('AppointmentForm', () => {
         data: { PATIENT_DOUBLE_BOOKING: true },
       } as FetchResponse);
 
+      // Render WITHOUT existing appointment (creating mode)
       renderWithSwr(<AppointmentForm {...defaultProps} />);
 
       await waitForLoadingToFinish();
@@ -740,6 +775,7 @@ describe('AppointmentForm', () => {
       await user.click(saveButton);
 
       expect(mockCheckAppointmentConflict).toHaveBeenCalledTimes(1);
+      // Should show double-booking error when creating new appointment
       expect(mockShowSnackbar).toHaveBeenCalledWith({
         isLowContrast: true,
         kind: 'error',
@@ -747,43 +783,72 @@ describe('AppointmentForm', () => {
       });
       expect(mockSaveAppointment).not.toHaveBeenCalled();
     });
+
+    it('should not show double-booking error when editing same appointment', async () => {
+      const user = userEvent.setup();
+
+      mockOpenmrsFetch.mockResolvedValue({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
+      // Backend should exclude the current appointment from conflict check when UUID is sent
+      mockCheckAppointmentConflict.mockResolvedValue({
+        status: 204,
+        data: {},
+      } as FetchResponse);
+      mockSaveAppointment.mockResolvedValue({ status: 200, statusText: 'Ok' } as FetchResponse);
+
+      // Render WITH existing appointment (editing mode)
+      renderWithSwr(
+        <AppointmentForm
+          {...defaultProps}
+          workspaceProps={{
+            ...defaultProps.workspaceProps,
+            appointment: existingAppointment,
+          }}
+        />,
+      );
+
+      await waitForLoadingToFinish();
+
+      const appointmentNoteTextarea = screen.getByRole('textbox', { name: /write an additional note/i });
+      const saveButton = screen.getByRole('button', { name: /save and close/i });
+
+      // Make a small change
+      await user.clear(appointmentNoteTextarea);
+      await user.type(appointmentNoteTextarea, 'Updated note');
+
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      await user.click(saveButton);
+
+      expect(mockCheckAppointmentConflict).toHaveBeenCalledTimes(1);
+      // Verify UUID is sent to backend so it can exclude current appointment from conflict check
+      expect(mockCheckAppointmentConflict).toHaveBeenCalledWith(
+        expect.objectContaining({
+          uuid: existingAppointment.uuid,
+        }),
+      );
+      // Should NOT show double-booking error when editing (same appointment)
+      expect(mockShowSnackbar).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          title: 'Patient already booked for an appointment at this time',
+        }),
+      );
+      // Should proceed with save
+      expect(mockSaveAppointment).toHaveBeenCalled();
+    });
   });
 
   describe('Edit Mode', () => {
     it('should pre-populate form with existing appointment data', async () => {
-      const existingAppointment = {
-        uuid: 'appointment-uuid',
-        appointmentNumber: 'APT-001',
-        startDateTime: '2024-01-04T09:30:00.000Z',
-        endDateTime: '2024-01-04T10:00:00.000Z',
-        appointmentKind: 'Scheduled' as AppointmentKind.SCHEDULED,
-        status: 'Scheduled' as AppointmentStatus.SCHEDULED,
-        comments: 'Existing appointment note',
-        location: { uuid: 'b1a8b05e-3542-4037-bbd3-998ee9c40574', display: 'Inpatient Ward', name: 'Inpatient Ward' },
-        service: {
-          uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-          name: 'Outpatient',
-          appointmentServiceId: 1,
-          creatorName: 'Test Creator',
-          description: 'Outpatient service',
-          endTime: '17:00',
-          initialAppointmentStatus: 'Scheduled' as AppointmentStatus.SCHEDULED,
-          maxAppointmentsLimit: null,
-          startTime: '08:00',
-        },
-        patient: { uuid: mockPatient.id, name: 'Test Patient', identifier: '12345', identifiers: [] },
-        provider: { uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66', display: 'Dr. Cook' },
-        providers: [{ uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66', response: 'ACCEPTED' }],
-        recurring: false,
-        voided: false,
-        extensions: {},
-        teleconsultationLink: null,
-        dateAppointmentScheduled: '2024-01-04T00:00:00.000Z',
-      };
-
       mockOpenmrsFetch.mockResolvedValue({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
 
-      renderWithSwr(<AppointmentForm {...defaultProps} appointment={existingAppointment} context="editing" />);
+      renderWithSwr(
+        <AppointmentForm
+          {...defaultProps}
+          workspaceProps={{
+            ...defaultProps.workspaceProps,
+            appointment: existingAppointment,
+          }}
+        />,
+      );
 
       await waitForLoadingToFinish();
 
@@ -795,41 +860,19 @@ describe('AppointmentForm', () => {
 
     it('should update appointment successfully', async () => {
       const user = userEvent.setup();
-      const existingAppointment = {
-        uuid: 'appointment-uuid',
-        appointmentNumber: 'APT-001',
-        startDateTime: '2024-01-04T09:30:00.000Z',
-        endDateTime: '2024-01-04T10:00:00.000Z',
-        appointmentKind: 'Scheduled' as AppointmentKind.SCHEDULED,
-        status: 'Scheduled' as AppointmentStatus.SCHEDULED,
-        comments: 'Original note',
-        location: { uuid: 'b1a8b05e-3542-4037-bbd3-998ee9c40574', display: 'Inpatient Ward', name: 'Inpatient Ward' },
-        service: {
-          uuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-          name: 'Outpatient',
-          appointmentServiceId: 1,
-          creatorName: 'Test Creator',
-          description: 'Outpatient service',
-          endTime: '17:00',
-          initialAppointmentStatus: 'Scheduled',
-          maxAppointmentsLimit: null,
-          startTime: '08:00',
-        },
-        patient: { uuid: mockPatient.id, name: 'Test Patient', identifier: '12345', identifiers: [] },
-        provider: { uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66', display: 'Dr. Cook' },
-        providers: [{ uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66', response: 'ACCEPTED' }],
-        recurring: false,
-        voided: false,
-        extensions: {},
-        teleconsultationLink: null,
-        dateAppointmentScheduled: '2024-01-04T00:00:00.000Z',
-      };
 
       mockOpenmrsFetch.mockResolvedValue({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
       mockCheckAppointmentConflict.mockResolvedValue({ status: 204, data: {} } as FetchResponse);
       mockSaveAppointment.mockResolvedValue({ status: 200, statusText: 'Ok' } as FetchResponse);
-
-      renderWithSwr(<AppointmentForm {...defaultProps} appointment={existingAppointment} context="editing" />);
+      renderWithSwr(
+        <AppointmentForm
+          {...defaultProps}
+          workspaceProps={{
+            ...defaultProps.workspaceProps,
+            appointment: existingAppointment,
+          }}
+        />,
+      );
 
       await waitForLoadingToFinish();
 
@@ -897,9 +940,6 @@ describe('AppointmentForm', () => {
 
       // Try to cancel
       await user.click(cancelButton);
-
-      // Should call promptBeforeClosing if there are unsaved changes
-      expect(defaultProps.promptBeforeClosing).toHaveBeenCalled();
     });
   });
 });