@openmrs/esm-appointments-app 9.1.2-pre.6585 → 9.1.2-pre.6598

package/dist/openmrs-esm-appointments-app.js.buildmanifest.json

@@ -511,9 +511,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 90914,
+      "size": 90995,
       "sizes": {
-        "javascript": 90914
+        "javascript": 90995
       },
       "names": [],
       "idHints": [],
@@ -527,7 +527,7 @@
       "auxiliaryFiles": [
         "3092.js.map"
       ],
-      "hash": "9f0629d3462dabb2",
+      "hash": "10429bb4dd86db7b",
       "childrenByOrder": {}
     },
     {
@@ -635,9 +635,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 17595,
+      "size": 19637,
       "sizes": {
-        "javascript": 17595
+        "javascript": 19637
       },
       "names": [],
       "idHints": [],
@@ -651,7 +651,7 @@
       "auxiliaryFiles": [
         "3431.js.map"
       ],
-      "hash": "73f41321e5ed59c9",
+      "hash": "1a08fbb697e50c61",
       "childrenByOrder": {}
     },
     {
@@ -678,7 +678,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-appointments-app.js.map"
       ],
-      "hash": "c1baf539856e904b",
+      "hash": "b93144a69fda7f4a",
       "childrenByOrder": {}
     },
     {
@@ -857,9 +857,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6294,
+      "size": 6337,
       "sizes": {
-        "javascript": 6294
+        "javascript": 6337
       },
       "names": [],
       "idHints": [],
@@ -871,7 +871,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "37ae6be4b361f414",
+      "hash": "3242cae15b503c1d",
       "childrenByOrder": {}
     },
     {
@@ -1014,9 +1014,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 75140,
+      "size": 75113,
       "sizes": {
-        "javascript": 75140
+        "javascript": 75113
       },
       "names": [],
       "idHints": [],
@@ -1030,7 +1030,7 @@
       "auxiliaryFiles": [
         "4745.js.map"
       ],
-      "hash": "7384f10883e655e2",
+      "hash": "a4c2381e3cc385f1",
       "childrenByOrder": {}
     },
     {
@@ -1632,7 +1632,7 @@
       "auxiliaryFiles": [
         "7698.js.map"
       ],
-      "hash": "1e869d88e604f659",
+      "hash": "6115a6533806f882",
       "childrenByOrder": {}
     },
     {
@@ -1792,7 +1792,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "2355166986d725af",
+      "hash": "833d9e5010661572",
       "childrenByOrder": {}
     },
     {

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"},"order":2},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-dashboard","slot":"appointments-dashboard-slot","component":"appointmentsDashboard"},{"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":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"hideDashboardTitle":true,"path":"Appointments","slot":"patient-chart-appointments-dashboard-slot","title":"Appointments"}},{"name":"appointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"visit-form-top-slot"},{"name":"search-patient","component":"searchPatient"},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"},{"name":"metrics-card-scheduled-appointments","component":"metricsCardScheduledAppointments","slot":"appointments-metrics-slot","order":1},{"name":"metrics-card-highest-volume-service","component":"metricsCardHighestVolumeService","slot":"appointments-metrics-slot","order":2},{"name":"metrics-card-providers-booked","component":"metricsCardProvidersBooked","slot":"appointments-metrics-slot","order":3}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"cancel-appointment-modal","component":"cancelAppointmentModal"}],"workspaces":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","title":"createNewAppointment","type":"form"}],"version":"9.1.2-pre.6585"}
+{"$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"},"order":2},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-dashboard","slot":"appointments-dashboard-slot","component":"appointmentsDashboard"},{"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":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"hideDashboardTitle":true,"path":"Appointments","slot":"patient-chart-appointments-dashboard-slot","title":"Appointments"}},{"name":"appointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"visit-form-top-slot"},{"name":"search-patient","component":"searchPatient"},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"},{"name":"metrics-card-scheduled-appointments","component":"metricsCardScheduledAppointments","slot":"appointments-metrics-slot","order":1},{"name":"metrics-card-highest-volume-service","component":"metricsCardHighestVolumeService","slot":"appointments-metrics-slot","order":2},{"name":"metrics-card-providers-booked","component":"metricsCardProvidersBooked","slot":"appointments-metrics-slot","order":3}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"cancel-appointment-modal","component":"cancelAppointmentModal"}],"workspaces":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","title":"createNewAppointment","type":"form"}],"version":"9.1.2-pre.6598"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-appointments-app",
-  "version": "9.1.2-pre.6585",
+  "version": "9.1.2-pre.6598",
   "description": "Appointments front-end module for O3",
   "browser": "dist/openmrs-esm-appointments-app.js",
   "main": "src/index.ts",

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import { Button, ContentSwitcher, DataTableSkeleton, InlineLoading, Layer, Switch, Tile } from '@carbon/react';
@@ -28,13 +28,17 @@ const PatientAppointmentsBase: React.FC<PatientAppointmentsBaseProps> = ({ patie
   const [switchedView, setSwitchedView] = useState(false);
 
   const [contentSwitcherValue, setContentSwitcherValue] = useState(0);
-  const startDate = dayjs(new Date().toISOString()).subtract(6, 'month').toISOString();
+  const startDate = useMemo(() => dayjs().subtract(6, 'month').toISOString(), []);
   const {
     data: appointmentsData,
     error,
     isLoading,
     isValidating,
-  } = usePatientAppointments(patientUuid, startDate, new AbortController());
+  } = usePatientAppointments(
+    patientUuid,
+    startDate,
+    useMemo(() => new AbortController(), []),
+  );
 
   const handleLaunchAppointmentsForm = () => {
     if (
@@ -114,6 +118,7 @@ const PatientAppointmentsBase: React.FC<PatientAppointmentsBaseProps> = ({ patie
               </Layer>
             );
           }
+
           if (contentSwitcherValue === AppointmentTypes.TODAY) {
             if (appointmentsData.todaysAppointments?.length) {
               return (

package/src/patient-appointments/patient-appointments-cancel.modal.tsx

@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
+import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
 import { showSnackbar } from '@openmrs/esm-framework';
@@ -16,31 +17,46 @@ const CancelAppointmentModal: React.FC<CancelAppointmentModalProps> = ({
   patientUuid,
 }) => {
   const { t } = useTranslation();
-  const { mutate } = usePatientAppointments(patientUuid, new Date().toUTCString(), new AbortController());
+  const startDate = useMemo(() => dayjs().subtract(6, 'month').toISOString(), []);
+  const { mutate } = usePatientAppointments(
+    patientUuid,
+    startDate,
+    useMemo(() => new AbortController(), []),
+  );
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   const handleCancelAppointment = async () => {
     setIsSubmitting(true);
 
-    changeAppointmentStatus('Cancelled', appointmentUuid)
-      .then(() => {
-        mutate();
-        closeCancelModal();
-        showSnackbar({
-          isLowContrast: true,
-          kind: 'success',
-          subtitle: t('appointmentCancelledSuccessfully', 'Appointment cancelled successfully'),
-          title: t('appointmentCancelled', 'Appointment cancelled'),
-        });
-      })
-      .catch((err) => {
-        showSnackbar({
-          title: t('appointmentCancelError', 'Error cancelling appointment'),
-          kind: 'error',
-          isLowContrast: true,
-          subtitle: err?.message,
-        });
+    try {
+      await changeAppointmentStatus('Cancelled', appointmentUuid);
+      mutate();
+      closeCancelModal();
+      showSnackbar({
+        isLowContrast: true,
+        kind: 'success',
+        subtitle: t('appointmentCancelledSuccessfully', 'Appointment cancelled successfully'),
+        title: t('appointmentCancelled', 'Appointment cancelled'),
+      });
+    } catch (err) {
+      const rawErrorMessage =
+        err?.responseBody?.error?.message ||
+        err?.responseBody?.message ||
+        err?.message ||
+        t('unknownError', 'An unknown error occurred');
+
+      // Remove square brackets from the error message
+      const errorMessage = rawErrorMessage.replace(/^\[|\]$/g, '');
+
+      showSnackbar({
+        title: t('appointmentCancelError', 'Error cancelling appointment'),
+        kind: 'error',
+        isLowContrast: false,
+        subtitle: errorMessage,
       });
+    } finally {
+      setIsSubmitting(false);
+    }
   };
 
   return (

package/src/patient-appointments/patient-upcoming-appointments-card.component.tsx

@@ -1,4 +1,5 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
+import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import {
   InlineLoading,
@@ -11,12 +12,11 @@ import {
   StructuredListWrapper,
 } from '@carbon/react';
 import { formatDate, parseDate, showSnackbar, type Visit } from '@openmrs/esm-framework';
-import { changeAppointmentStatus, usePatientAppointments } from './patient-appointments.resource';
 import { ErrorState } from '@openmrs/esm-patient-common-lib';
-import styles from './patient-upcoming-appointments-card.scss';
-import dayjs from 'dayjs';
+import { changeAppointmentStatus, usePatientAppointments } from './patient-appointments.resource';
 import { type Appointment } from '../types';
 import { useMutateAppointments } from '../form/appointments-form.resource';
+import styles from './patient-upcoming-appointments-card.scss';
 
 interface VisitFormCallbacks {
   onVisitCreatedOrUpdated: (visit: Visit) => Promise<any>;
@@ -44,7 +44,7 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
   patientChartConfig,
 }) => {
   const { t } = useTranslation();
-  const startDate = dayjs(new Date().toISOString()).subtract(6, 'month').toISOString();
+  const startDate = useMemo(() => dayjs().subtract(6, 'month').toISOString(), []);
   const headerTitle = t('upcomingAppointments', 'Upcoming appointments');
   const [selectedAppointment, setSelectedAppointment] = useState<Appointment>(null);
   const { mutateAppointments } = useMutateAppointments();
@@ -102,12 +102,13 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
   };
 
   if (!patientChartConfig.showUpcomingAppointments) {
-    return <></>;
+    return null;
   }
 
   if (error) {
     return <ErrorState headerTitle={headerTitle} error={error} />;
   }
+
   if (isLoading) {
     return (
       <span>
@@ -159,11 +160,11 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
 
   return (
     <InlineNotification
-      kind={'info'}
-      lowContrast
       className={styles.inlineNotification}
-      title={t('upcomingAppointments', 'Upcoming appointments')}
+      kind="info"
+      lowContrast
       subtitle={t('noUpcomingAppointments', 'No upcoming appointments found')}
+      title={t('upcomingAppointments', 'Upcoming appointments')}
     />
   );
 };

package/translations/en.json

@@ -149,6 +149,7 @@
   "todays": "Today's",
   "TUE": "TUE",
   "type": "Type",
+  "unknownError": "An unknown error occurred",
   "unscheduled": "Unscheduled",
   "unscheduledAppointments": "Unscheduled appointments",
   "unscheduledAppointments_lower": "unscheduled appointments",