@openmrs/esm-appointments-app 5.2.2-pre.2544 → 5.2.2-pre.2549

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

@@ -80,10 +80,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4540859,
+      "size": 4540693,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4519937,
+        "javascript": 4519771,
         "share-init": 252,
         "runtime": 20418
       },
@@ -100,7 +100,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "10a10d83a9e69f3d",
+      "hash": "d34c9a4e6044489a",
       "childrenByOrder": {}
     },
     {
@@ -490,9 +490,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 482412,
+      "size": 482246,
       "sizes": {
-        "javascript": 482244,
+        "javascript": 482078,
         "consume-shared": 168
       },
       "names": [],
@@ -506,7 +506,7 @@
       "auxiliaryFiles": [
         "799.js.map"
       ],
-      "hash": "d45aa494f7825f6d",
+      "hash": "affd1fc4ba01bbb0",
       "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"}},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"check-in-appointment-modal","slot":"todays-appointment-slot","component":"checkInModal"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"early-appointments-panel","component":"earlyAppointments"}],"version":"5.2.2-pre.2544"}
+{"$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":"check-in-appointment-modal","slot":"todays-appointment-slot","component":"checkInModal"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"early-appointments-panel","component":"earlyAppointments"}],"version":"5.2.2-pre.2549"}

package/package.json

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

package/src/admin/appointment-services/appointment-services.component.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { Form, Formik, type FormikHelpers } from 'formik';
 import { validationSchema } from './appointment-services-validation';
 import { useAppointmentServices } from './appointment-services-hook';
-import { showNotification, showToast, useLocations } from '@openmrs/esm-framework';
+import { showSnackbar, useLocations } from '@openmrs/esm-framework';
 import type { AppointmentService } from '../../types';
 import { closeOverlay } from '../../hooks/useOverlay';
 import styles from './appointment-services.scss';
@@ -29,21 +29,20 @@ const AppointmentServices: React.FC<AppointmentServicesProps> = () => {
     addNewAppointmentService(payload).then(
       ({ status }) => {
         if (status === 200) {
-          showToast({
-            critical: true,
+          showSnackbar({
+            isLowContrast: true,
             kind: 'success',
-            description: t('appointmentServiceCreate', 'Appointment service created successfully'),
+            subtitle: t('appointmentServiceCreate', 'Appointment service created successfully'),
             title: t('appointmentService', 'Appointment service'),
           });
           closeOverlay();
         }
       },
       (error) => {
-        showNotification({
+        showSnackbar({
           title: t('errorCreatingAppointmentService', 'Error creating appointment service'),
           kind: 'error',
-          critical: true,
-          description: error?.message,
+          subtitle: error?.message,
         });
       },
     );

package/src/appointments/forms/cancel-form/cancel-appointment.component.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, Layer, TextArea } from '@carbon/react';
-import { useSession, showToast, showNotification, ExtensionSlot, usePatient } from '@openmrs/esm-framework';
+import { useSession, showSnackbar, ExtensionSlot, usePatient } from '@openmrs/esm-framework';
 import { cancelAppointment } from '../forms.resource';
 import { useSWRConfig } from 'swr';
 import { useAppointmentDate } from '../../../helpers';
@@ -32,21 +32,20 @@ const CancelAppointment: React.FC<CancelAppointmentProps> = ({ appointment }) =>
     setIsSubmitting(true);
     const { status } = await cancelAppointment('Cancelled', appointment.id);
     if (status === 200) {
-      showToast({
-        critical: true,
+      showSnackbar({
+        isLowContrast: true,
         kind: 'success',
-        description: t('cancelledSuccessfully', 'It has been cancelled successfully'),
+        subtitle: t('cancelledSuccessfully', 'It has been cancelled successfully'),
         title: t('appointmentCancelled', 'Appointment cancelled'),
       });
       mutate(`/ws/rest/v1/appointment/appointmentStatus?forDate=${currentAppointmentDate}&status=Scheduled`);
       mutate(`/ws/rest/v1/appointment/appointmentStatus?forDate=${currentAppointmentDate}&status=Cancelled`);
       closeOverlay();
     } else {
-      showNotification({
+      showSnackbar({
         title: t('appointmentCancelError', 'Error cancelling appointment'),
         kind: 'error',
-        critical: true,
-        description: t('errorCancellingAppointment', 'Error cancelling the appointment'),
+        subtitle: t('errorCancellingAppointment', 'Error cancelling the appointment'),
       });
       setIsSubmitting(false);
     }

package/src/appointments/forms/cancel-form/cancel-appointment.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { screen, render } from '@testing-library/react';
-import { showNotification, showToast } from '@openmrs/esm-framework';
+import { showSnackbar } from '@openmrs/esm-framework';
 import { cancelAppointment } from '../forms.resource';
 import { mockMappedAppointmentsData } from '__mocks__';
 import CancelAppointment from './cancel-appointment.component';
@@ -10,9 +10,8 @@ const testProps = {
   appointment: mockMappedAppointmentsData.data[0],
 };
 
-const mockShowToast = showToast as jest.Mock;
+const mockShowSnackbar = showSnackbar as jest.Mock;
 const mockCancelAppointment = cancelAppointment as jest.Mock;
-const mockShowNotification = showNotification as jest.Mock;
 
 jest.mock('../forms.resource', () => {
   const originalModule = jest.requireActual('../forms.resource');
@@ -32,7 +31,7 @@ jest.mock('@openmrs/esm-framework', () => {
 });
 
 describe('Cancel appointment form', () => {
-  it('should update appointment status to cancelled and show toast with success message', async () => {
+  it('should update appointment status to cancelled and show snackbar with success message', async () => {
     const user = userEvent.setup();
 
     mockCancelAppointment.mockReturnValueOnce({ status: 200, statusText: 'Appointment cancelled' });
@@ -42,12 +41,12 @@ describe('Cancel appointment form', () => {
     await user.click(screen.getByRole('textbox', { name: /reason for changes/i }));
     await user.click(screen.getByRole('button', { name: /cancel appointment/i }));
 
-    expect(mockShowToast).toHaveBeenCalledTimes(1);
-    expect(mockShowToast).toHaveBeenCalledWith({
-      critical: true,
+    expect(mockShowSnackbar).toHaveBeenCalledTimes(1);
+    expect(mockShowSnackbar).toHaveBeenCalledWith({
+      isLowContrast: true,
       kind: 'success',
       title: 'Appointment cancelled',
-      description: 'It has been cancelled successfully',
+      subtitle: 'It has been cancelled successfully',
     });
   });
 
@@ -62,12 +61,11 @@ describe('Cancel appointment form', () => {
 
     await user.click(screen.getByRole('textbox', { name: /reason for changes/i }));
     await user.click(screen.getByRole('button', { name: /cancel appointment/i }));
-    expect(mockShowNotification).toHaveBeenCalledTimes(1);
-    expect(mockShowNotification).toHaveBeenCalledWith({
-      critical: true,
+    expect(mockShowSnackbar).toHaveBeenCalledTimes(2);
+    expect(mockShowSnackbar).toHaveBeenCalledWith({
       kind: 'error',
       title: 'Error cancelling appointment',
-      description: 'Error cancelling the appointment',
+      subtitle: 'Error cancelling the appointment',
     });
   });
 });

package/src/appointments/forms/create-edit-form/appointments-form.component.tsx

@@ -29,8 +29,7 @@ import {
 } from '@carbon/react';
 import {
   ExtensionSlot,
-  showNotification,
-  showToast,
+  showSnackbar,
   useConfig,
   useLayoutType,
   useLocations,
@@ -128,10 +127,10 @@ const AppointmentForm: React.FC<AppointmentFormProps> = ({ appointment, patientU
     saveAppointment(appointmentPayload).then(
       ({ status }) => {
         if (status === 200) {
-          showToast({
-            critical: true,
+          showSnackbar({
+            isLowContrast: true,
             kind: 'success',
-            description: t('appointmentNowVisible', 'It is now visible on the appointments page'),
+            subtitle: t('appointmentNowVisible', 'It is now visible on the appointments page'),
             title: t('appointmentScheduled', 'Appointment scheduled'),
           });
           setIsSubmitting(false);
@@ -145,11 +144,10 @@ const AppointmentForm: React.FC<AppointmentFormProps> = ({ appointment, patientU
         }
       },
       (error) => {
-        showNotification({
+        showSnackbar({
           title: t('appointmentFormError', 'Error scheduling appointment'),
           kind: 'error',
-          critical: true,
-          description: error?.message,
+          subtitle: error?.message,
         });
         setIsSubmitting(false);
       },

package/src/patient-queue/visit-form/visit-form.component.tsx

@@ -27,10 +27,7 @@ import {
   useVisitTypes,
   type NewVisitPayload,
   saveVisit,
-  toOmrsIsoString,
-  toDateObjectStrict,
-  showNotification,
-  showToast,
+  showSnackbar,
   usePatient,
   useConfig,
   useLocations,
@@ -138,10 +135,11 @@ const VisitForm: React.FC<VisitFormProps> = ({ patientUuid, appointment }) => {
                   ({ status }) => {
                     if (status === 201) {
                       mutate();
-                      showToast({
+                      showSnackbar({
                         kind: 'success',
+                        isLowContrast: true,
                         title: t('visitStarted', 'Visit started'),
-                        description: t(
+                        subtitle: t(
                           'queueAddedSuccessfully',
                           `Patient has been added to the queue successfully.`,
                           `${hours} : ${minutes}`,
@@ -150,11 +148,10 @@ const VisitForm: React.FC<VisitFormProps> = ({ patientUuid, appointment }) => {
                     }
                   },
                   (error) => {
-                    showNotification({
+                    showSnackbar({
                       title: t('queueEntryError', 'Error adding patient to the queue'),
                       kind: 'error',
-                      critical: true,
-                      description: error?.message,
+                      subtitle: error?.message,
                     });
                   },
                 );
@@ -165,11 +162,10 @@ const VisitForm: React.FC<VisitFormProps> = ({ patientUuid, appointment }) => {
             }
           },
           (error) => {
-            showNotification({
+            showSnackbar({
               title: t('startVisitError', 'Error starting visit'),
               kind: 'error',
-              critical: true,
-              description: error?.message,
+              subtitle: error?.message,
             });
           },
         );