@kenyaemr/esm-appointments-app 8.1.1-pre.121 → 8.1.1-pre.124

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"home-appointments","slot":"homepage-widgets-slot","component":"homeAppointments","order":1},{"name":"clinical-appointments-dashboard-link","slot":"homepage-dashboard-slot","component":"appointmentsDashboardLink","meta":{"name":"appointments","slot":"clinical-appointments-dashboard-slot","title":"Appointments"}},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"early-appointments-panel","component":"earlyAppointments"},{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","meta":{"title":{"key":"createNewAppointment","default":"Create new appointment"}}},{"name":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-appointments-dashboard-slot","title":"Appointments","path":"Appointments"}},{"name":"patientAppointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"upcoming-appointment-slot"},{"name":"edit-appointments-form","component":"appointmentsForm","meta":{"title":{"key":"editAppointment","default":"Edit Appointment"}}},{"name":"search-patient","component":"searchPatient"},{"name":"create-appointment","component":"appointmentsForm","meta":{"title":{"key":"appointmentForm","default":"Appointment Form"}}},{"name":"add-appointment","component":"appointmentsForm","meta":{"title":{"key":"createNewAppointment","default":"Create new appointment"}}},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"patient-appointment-cancel-confirmation-dialog","component":"patientAppointmentsCancelConfirmationDialog"}],"version":"8.1.1-pre.121"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"home-appointments","slot":"homepage-widgets-slot","component":"homeAppointments","order":1},{"name":"clinical-appointments-dashboard-link","slot":"homepage-dashboard-slot","component":"appointmentsDashboardLink","meta":{"name":"appointments","slot":"clinical-appointments-dashboard-slot","title":"Appointments"}},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"early-appointments-panel","component":"earlyAppointments"},{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","meta":{"title":{"key":"createNewAppointment","default":"Create new appointment"}}},{"name":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-appointments-dashboard-slot","title":"Appointments","path":"Appointments"}},{"name":"patientAppointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"upcoming-appointment-slot"},{"name":"edit-appointments-form","component":"appointmentsForm","meta":{"title":{"key":"editAppointment","default":"Edit Appointment"}}},{"name":"search-patient","component":"searchPatient"},{"name":"create-appointment","component":"appointmentsForm","meta":{"title":{"key":"appointmentForm","default":"Appointment Form"}}},{"name":"add-appointment","component":"appointmentsForm","meta":{"title":{"key":"createNewAppointment","default":"Create new appointment"}}},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"patient-appointment-cancel-confirmation-dialog","component":"patientAppointmentsCancelConfirmationDialog"}],"version":"8.1.1-pre.124"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-appointments-app",
-  "version": "8.1.1-pre.121",
+  "version": "8.1.1-pre.124",
   "description": "Appointments front-end module for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-appointments-app.js",
   "main": "src/index.ts",

package/src/appointments/common-components/end-appointment.modal.tsx

@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useVisit, updateVisit, parseDate, showSnackbar } from '@openmrs/esm-framework';
+import { showSnackbar, updateVisit, useVisit } from '@openmrs/esm-framework';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
 import { changeAppointmentStatus } from '../../patient-appointments/patient-appointments.resource';
 import { useMutateAppointments } from '../../form/appointments-form.resource';
@@ -12,48 +12,43 @@ interface EndAppointmentModalProps {
 }
 
 const EndAppointmentModal: React.FC<EndAppointmentModalProps> = ({ patientUuid, appointmentUuid, closeModal }) => {
-  const { activeVisit, mutate } = useVisit(patientUuid);
   const { t } = useTranslation();
+  const { activeVisit, mutate } = useVisit(patientUuid);
   const { mutateAppointments } = useMutateAppointments();
 
-  const endAppointment = () => {
-    return changeAppointmentStatus('Completed', appointmentUuid)
+  const handleEndAppointment = useCallback(() => {
+    changeAppointmentStatus('Completed', appointmentUuid)
       .then(() => {
         mutateAppointments();
         if (activeVisit) {
           const abortController = new AbortController();
-          const endVisitPayload = {
-            location: activeVisit.location.uuid,
-            startDatetime: parseDate(activeVisit.startDatetime),
-            visitType: activeVisit.visitType.uuid,
-            stopDatetime: new Date(),
-          };
-          updateVisit(activeVisit.uuid, endVisitPayload, abortController)
-            .toPromise()
+          const endVisitPayload = { stopDatetime: new Date() };
+
+          return updateVisit(activeVisit.uuid, endVisitPayload, abortController)
             .then(() => {
-              mutate();
               showSnackbar({
                 title: t('appointmentEnded', 'Appointment ended'),
                 subtitle: t(
                   'appointmentEndedAndVisitClosedSuccessfully',
-                  'Appointment successfully ended and visit successfully closed.',
+                  'Appointment successfully ended and visit successfully closed',
                 ),
                 isLowContrast: true,
                 kind: 'success',
               });
-              closeModal();
+              mutate();
             })
-            .catch((err) => {
-              closeModal();
+            .catch((error) => {
               showSnackbar({
-                title: t('appointmentEndedButVisitNotClosedError', 'Appointment ended, but error closing visit'),
-                subtitle: err?.message,
+                title: t(
+                  'appointmentEndedButVisitNotClosedError',
+                  'Appointment ended successfully, but there was an error closing the visit.',
+                ),
+                subtitle: error?.message,
                 kind: 'error',
                 isLowContrast: true,
               });
             });
         } else {
-          closeModal();
           showSnackbar({
             title: t('appointmentEnded', 'Appointment ended'),
             subtitle: t('appointmentEndedSuccessfully', 'Appointment successfully ended.'),
@@ -62,16 +57,18 @@ const EndAppointmentModal: React.FC<EndAppointmentModalProps> = ({ patientUuid,
           });
         }
       })
-      .catch((err) => {
-        closeModal();
+      .catch((error) => {
         showSnackbar({
           title: t('appointmentEndError', 'Error ending appointment'),
-          subtitle: err?.message,
+          subtitle: error?.message,
           kind: 'error',
           isLowContrast: true,
         });
+      })
+      .finally(() => {
+        closeModal();
       });
-  };
+  }, [activeVisit, mutate, mutateAppointments, closeModal, patientUuid, appointmentUuid]);
 
   return (
     <div>
@@ -84,7 +81,7 @@ const EndAppointmentModal: React.FC<EndAppointmentModalProps> = ({ patientUuid,
           {activeVisit
             ? t(
                 'endAppointmentAndVisitConfirmationMessage',
-                'Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.',
+                'Checking the patient out will mark the appointment as complete and close out the active visit for this patient.',
               )
             : t('endAppointmentConfirmationMessage', 'Checking the patient out will mark the appointment as complete.')}
         </p>
@@ -93,7 +90,7 @@ const EndAppointmentModal: React.FC<EndAppointmentModalProps> = ({ patientUuid,
         <Button kind="secondary" onClick={closeModal}>
           {t('cancel', 'Cancel')}
         </Button>
-        <Button kind="danger" onClick={endAppointment}>
+        <Button kind="danger" onClick={handleEndAppointment}>
           {t('checkOut', 'Check out')}
         </Button>
       </ModalFooter>

package/src/appointments/common-components/end-appointment.test.tsx

@@ -1,8 +1,14 @@
 import React from 'react';
-import { of } from 'rxjs';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { updateVisit, showSnackbar, useVisit, type VisitReturnType } from '@openmrs/esm-framework';
+import {
+  updateVisit,
+  showSnackbar,
+  useVisit,
+  type VisitReturnType,
+  type FetchResponse,
+  type Visit,
+} from '@openmrs/esm-framework';
 import { changeAppointmentStatus } from '../../patient-appointments/patient-appointments.resource';
 import EndAppointmentModal from './end-appointment.modal';
 
@@ -20,7 +26,7 @@ jest.mock('../../form/appointments-form.resource', () => ({
 
 describe('EndAppointmentModal', () => {
   beforeEach(() => {
-    mockUpdateVisit.mockImplementation(() => of({}));
+    mockUpdateVisit.mockResolvedValue({} as FetchResponse<Visit>);
   });
 
   it('has a cancel button that closes the modal', async () => {
@@ -73,7 +79,7 @@ describe('EndAppointmentModal', () => {
     expect(closeModal).toHaveBeenCalled();
     expect(showSnackbar).toHaveBeenCalledWith({
       title: 'Appointment ended',
-      subtitle: 'Appointment successfully ended and visit successfully closed.',
+      subtitle: 'Appointment successfully ended and visit successfully closed',
       isLowContrast: true,
       kind: 'success',
     });

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

@@ -832,7 +832,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
                     datePickerType="single"
                     dateFormat={datePickerFormat}
                     value={value}
-                    maxDate={new Date()}
+                    maxDate={new Date().toISOString()}
                     onChange={([date]) => onChange(date)}
                     invalid={!!fieldState?.error?.message}
                     invalidText={fieldState?.error?.message}>

package/translations/en.json

@@ -12,7 +12,7 @@
   "appointmentEdited": "Appointment edited",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "Appointment ended",
-  "appointmentEndedAndVisitClosedSuccessfully": "Appointment successfully ended and visit successfully closed.",
+  "appointmentEndedAndVisitClosedSuccessfully": "Appointment successfully ended and visit successfully closed",
   "appointmentEndedButVisitNotClosedError": "Appointment ended, but error closing visit",
   "appointmentEndedSuccessfully": "Appointment successfully ended.",
   "appointmentEndError": "Error ending appointment",