@openmrs/esm-appointments-app 5.2.2-pre.2441 → 5.2.2-pre.2445

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

@@ -80,10 +80,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4539072,
+      "size": 4539075,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4518150,
+        "javascript": 4518153,
         "share-init": 252,
         "runtime": 20418
       },
@@ -100,7 +100,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a7e8f660b86ec22e",
+      "hash": "dec2b68504957b7c",
       "childrenByOrder": {}
     },
     {
@@ -422,9 +422,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 480625,
+      "size": 480628,
       "sizes": {
-        "javascript": 480457,
+        "javascript": 480460,
         "consume-shared": 168
       },
       "names": [],
@@ -438,7 +438,7 @@
       "auxiliaryFiles": [
         "755.js.map"
       ],
-      "hash": "ec0e13a531b07fa9",
+      "hash": "d3b687a28836d475",
       "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.2441"}
+{"$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.2445"}

package/package.json

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

package/src/appointments/appointment-tabs.component.tsx

@@ -2,12 +2,12 @@ import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Tab, TabList, Tabs, TabPanel, TabPanels } from '@carbon/react';
 
+import { type ConfigObject } from '../config-schema';
+import { useConfig } from '@openmrs/esm-framework';
 import { useVisits } from '../hooks/useVisits';
 import ScheduledAppointments from './scheduled/scheduled-appointments.component';
 import UnscheduledAppointments from './unscheduled/unscheduled-appointments.component';
 import styles from './appointment-tabs.scss';
-import { ConfigObject } from '../config-schema';
-import { useConfig } from '@openmrs/esm-framework';
 
 interface AppointmentTabsProps {
   appointmentServiceType: string;

package/src/appointments/appointment-tabs.test.tsx

@@ -2,13 +2,13 @@ import React from 'react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { renderWithSwr, waitForLoadingToFinish } from '../../../../tools/test-helpers';
+import { renderWithSwr, waitForLoadingToFinish } from 'tools';
+import { mockAppointmentsData } from '__mocks__';
 import AppointmentTabs from './appointment-tabs.component';
-import { mockAppointmentsData } from '../../../../__mocks__/appointments.mock';
 
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
 
-jest.setTimeout(15000);
+jest.setTimeout(10000);
 
 describe('AppointmentTabs', () => {
   xit(`renders tabs showing different appointment lists`, async () => {
@@ -53,5 +53,5 @@ describe('AppointmentTabs', () => {
 });
 
 function renderAppointmentTabs() {
-  renderWithSwr(<AppointmentTabs />);
+  renderWithSwr(<AppointmentTabs appointmentServiceType="" />);
 }

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

@@ -1,9 +1,9 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { screen, render } from '@testing-library/react';
-import { mockMappedAppointmentsData } from '../../../../../../__mocks__/appointments.mock';
 import { showNotification, showToast } from '@openmrs/esm-framework';
 import { cancelAppointment } from '../forms.resource';
+import { mockMappedAppointmentsData } from '__mocks__';
 import CancelAppointment from './cancel-appointment.component';
 
 const testProps = {

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

@@ -185,7 +185,7 @@ const AppointmentForm: React.FC<AppointmentFormProps> = ({ appointment, patientU
                 id="location"
                 invalidText="Required"
                 value={selectedLocation}
-                defaultSelected={selectedLocation}
+                defaultValue={selectedLocation}
                 onChange={(event) => setSelectedLocation(event.target.value)}>
                 <LocationSelectOption
                   selectedLocation={selectedLocation}

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

@@ -1,9 +1,7 @@
 import React from 'react';
 import { render, screen, within } from '@testing-library/react';
 import { useConfig, usePatient } from '@openmrs/esm-framework';
-import { mockPatient, mockServices, mockProviders } from '../../../../../../__mocks__/appointments.mock';
-import { mockLocations } from '../../../../../../__mocks__/locations.mock';
-import { mockSession } from '../../../../../../__mocks__/session.mock';
+import { mockLocations, mockSession, mockPatient, mockServices, mockProviders } from '__mocks__';
 import { MappedAppointment } from '../../../types';
 import AppointmentForm from './appointments-form.component';
 
@@ -43,6 +41,7 @@ const mockedConfig = {
 
 describe('AppointmentForm', () => {
   const patient = mockPatient;
+
   beforeEach(() => {
     mockedUseConfig.mockReturnValue(mockedConfig);
     mockedUsePatient.mockReturnValue({
@@ -53,23 +52,29 @@ describe('AppointmentForm', () => {
     });
   });
 
-  it('renders details of the correct patient in the patient banner', () => {
+  it('renders details of the correct patient in the patient banner', async () => {
     renderAppointmentsForm('creating', mockPatient.uuid);
 
+    await screen.findByText(/date and time/i);
     expect(screen.getByText(/Date and time/i)).toBeInTheDocument();
   });
 
-  it('renders the form with all expected inputs in create mode', () => {
+  it('renders the form with all expected inputs in create mode', async () => {
     renderAppointmentsForm('creating', mockPatient.uuid);
 
+    await screen.findByLabelText(/select a location/i);
+
     expect(screen.getByRole('combobox', { name: /select a location/i })).toBeInTheDocument();
     expect(screen.getByRole('combobox', { name: /select a service/i })).toBeInTheDocument();
     expect(screen.getByRole('combobox', { name: /select an appointment type/i })).toBeInTheDocument();
     expect(screen.getByRole('combobox', { name: /select a provider/i })).toBeInTheDocument();
   });
 
-  it('renders the expected appointment types', () => {
+  it('renders the expected appointment types', async () => {
     renderAppointmentsForm('creating', mockPatient.uuid);
+
+    await screen.findByLabelText(/select an appointment type/i);
+
     const appointmentTypeSelect = screen.getByLabelText('Select an appointment type');
 
     expect(within(appointmentTypeSelect).getAllByRole('option')).toHaveLength(3);

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

@@ -1,7 +1,7 @@
 import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { mockAppointmentMetrics, mockProvidersCount, mockStartTime } from '../../../../__mocks__/appointments.mock';
+import { mockAppointmentMetrics, mockProvidersCount, mockStartTime } from '__mocks__';
 import AppointmentsMetrics from './appointments-metrics.component';
 
 const mockedOpenmrsFetch = openmrsFetch as jest.Mock;
@@ -36,13 +36,11 @@ describe('Appointment metrics', () => {
 
     renderAppointmentMetrics();
 
-    await act(() => {
-      expect(screen.getByText(/appointment metrics/i)).toBeInTheDocument();
-      expect(screen.getByText(/scheduled appointments/i)).toBeInTheDocument();
-      expect(screen.getByText(/patients/i)).toBeInTheDocument();
-      expect(screen.getByText(/16/i)).toBeInTheDocument();
-      expect(screen.getByText(/4/i)).toBeInTheDocument();
-    });
+    await screen.findByText(/appointment metrics/i);
+    expect(screen.getByText(/scheduled appointments/i)).toBeInTheDocument();
+    expect(screen.getByText(/patients/i)).toBeInTheDocument();
+    expect(screen.getByText(/16/i)).toBeInTheDocument();
+    expect(screen.getByText(/4/i)).toBeInTheDocument();
   });
 });
 

package/src/appointments.test.tsx

@@ -2,12 +2,14 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import ClinicalAppointments from './appointments.component';
 
-describe('ClinicalAppointments Component', () => {
+describe('Clinical Appointments', () => {
   it('should render correctly', () => {
     render(<ClinicalAppointments />);
 
-    expect(screen.getByTestId('appointments-header')).toBeInTheDocument();
-    expect(screen.getByTestId('clinic-metrics')).toBeInTheDocument();
-    expect(screen.getByTestId('appointment-list')).toBeInTheDocument();
+    expect(screen.getByTitle(/patient queue illustration/i)).toBeInTheDocument();
+    expect(screen.getByText(/^appointments$/i)).toBeInTheDocument();
+    expect(screen.getByText(/home/i)).toBeInTheDocument();
+    expect(screen.getByPlaceholderText(/DD-MMM-YYYY/i)).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /appointments calendar/i })).toBeInTheDocument();
   });
 });

package/src/home-appointments/appointments-list.test.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import AppointmentsBaseTable from './appointments-list.component';
-import { mockSession } from '../../../../__mocks__/session.mock';
-import { useTodaysAppointments } from './appointments-table.resource';
+import { mockSession } from '__mocks__';
 import { usePagination } from '@openmrs/esm-framework';
+import { useTodaysAppointments } from './appointments-table.resource';
+import AppointmentsBaseTable from './appointments-list.component';
 
 const useTodaysAppointmentsMock = useTodaysAppointments as jest.Mock;
 const usePaginationMock = usePagination as jest.Mock;

package/src/overlay.component.tsx

@@ -11,7 +11,7 @@ const Overlay: React.FC = () => {
   const overlayClass = layout !== 'tablet' ? styles.desktopOverlay : styles.tabletOverlay;
   return (
     <>
-      {isOverlayOpen && (
+      {isOverlayOpen ? (
         <div className={overlayClass}>
           {layout === 'tablet' && (
             <Header onClick={() => closeOverlay()} aria-label="Tablet overlay" className={styles.tabletOverlayHeader}>
@@ -32,7 +32,7 @@ const Overlay: React.FC = () => {
           )}
           {component}
         </div>
-      )}
+      ) : null}
     </>
   );
 };

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.json",
   "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx", "src/**/*.outdated.tsx"]
+  "exclude": ["src/**/*.test.tsx"]
 }