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

package/src/appointments-calendar/weekly/weekly-view-workload.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import dayjs from 'dayjs';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { CalendarType } from '../../types';
+import { type CalendarType } from '../../types';
 import { spaBasePath } from '../../constants';
 import { navigate } from '@openmrs/esm-framework';
 import WeeklyWorkloadView from './weekly-view-workload.component';

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

@@ -1,13 +1,13 @@
 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;
 
 jest.mock('../hooks/useClinicalMetrics', () => {
-  const originalModule = jest.requireActual('../hooks/useClinicalMetrics.tsx');
+  const originalModule = jest.requireActual('../hooks/useClinicalMetrics');
 
   return {
     ...originalModule,
@@ -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/createDashboardLink.component.tsx

@@ -32,9 +32,8 @@ function DashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: Dash
   );
 }
 
-export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () =>
-  (
-    <BrowserRouter>
-      <DashboardExtension dashboardLinkConfig={dashboardLinkConfig} />
-    </BrowserRouter>
-  );
+export const createDashboardLink = (dashboardLinkConfig: DashboardLinkConfig) => () => (
+  <BrowserRouter>
+    <DashboardExtension dashboardLinkConfig={dashboardLinkConfig} />
+  </BrowserRouter>
+);

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

@@ -31,10 +31,10 @@ import { ActionsMenu } from './appointment-actions.component';
 import { EmptyDataIllustration } from './empty-data-illustration.component';
 import { launchCheckInAppointmentModal, handleComplete } from './common';
 import { SeeAllAppointmentsLink, AddAppointmentLink, ViewCalendarLink } from './links.component';
-import { Appointment, MappedHomeAppointment } from '../types';
+import { type Appointment, type MappedHomeAppointment } from '../types';
 import { useTodaysAppointments } from './appointments-table.resource';
 import styles from './appointments-list.scss';
-import { ConfigObject } from '../config-schema';
+import { type ConfigObject } from '../config-schema';
 
 interface PaginationData {
   goTo: (page: number) => void;

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/hooks/{useAppointmentList.tsx → useAppointmentList.ts}

@@ -1,6 +1,6 @@
 import useSWR from 'swr';
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { AppointmentService, Identifier, Provider } from '../types';
+import { type AppointmentService, type Identifier, type Provider } from '../types';
 import { useAppointmentDate } from '../helpers';
 import dayjs from 'dayjs';
 import { configSchema } from '../config-schema';

package/src/hooks/{useAppointmentService.tsx → useAppointmentService.ts}

@@ -1,6 +1,6 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { AppointmentService } from '../types';
+import { type AppointmentService } from '../types';
 
 export function useAppointmentServices() {
   const { data, error, isLoading } = useSWR<{ data: Array<AppointmentService> }>(

package/src/hooks/{useAppointments.tsx → useAppointments.ts}

@@ -2,7 +2,7 @@ import { openmrsFetch } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
 import useSWR from 'swr';
 import { omrsDateFormat } from '../constants';
-import { Appointment, DurationPeriod } from '../types';
+import { type Appointment, DurationPeriod } from '../types';
 
 interface AppointmentsReturnType {
   isLoading: boolean;

package/src/hooks/{useAppointmentsCalendar.tsx → useAppointmentsCalendar.ts}

@@ -1,4 +1,4 @@
-import { openmrsFetch, OpenmrsResource } from '@openmrs/esm-framework';
+import { openmrsFetch, type OpenmrsResource } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
 import useSWR from 'swr';
 import { omrsDateFormat } from '../constants';

package/src/hooks/{useClinicalMetrics.tsx → useClinicalMetrics.ts}

@@ -2,7 +2,7 @@ import useSWR from 'swr';
 import dayjs from 'dayjs';
 import uniqBy from 'lodash-es/uniqBy';
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { Appointment, AppointmentSummary } from '../types';
+import { type Appointment, type AppointmentSummary } from '../types';
 import { omrsDateFormat } from '../constants';
 import {
   getHighestAppointmentServiceLoad,

package/src/hooks/{useDefaultLocation.tsx → useDefaultLocation.ts}

@@ -1,4 +1,4 @@
-import { FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework';
 import useSWRImmutable from 'swr/immutable';
 
 export const useDefaultLoginLocation = () => {

package/src/hooks/{usePatientAppointmentHistory.tsx → usePatientAppointmentHistory.ts}

@@ -1,5 +1,5 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { AppointmentsFetchResponse } from '../types';
+import { type AppointmentsFetchResponse } from '../types';
 import useSWR from 'swr';
 import dayjs from 'dayjs';
 import { useAppointmentDate } from '../helpers';

package/src/hooks/{useProviders.tsx → useProviders.ts}

@@ -1,6 +1,6 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { Provider } from '../types';
+import { type Provider } from '../types';
 
 export function useProviders() {
   const apiUrl = `/ws/rest/v1/provider`;

package/src/hooks/{useUnscheduledAppointments.tsx → useUnscheduledAppointments.ts}

@@ -1,7 +1,7 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { mapAppointmentProperties, useAppointmentDate } from '../helpers';
-import { Identifier } from '../types';
+import { useAppointmentDate } from '../helpers';
+import { type Identifier } from '../types';
 import { configSchema } from '../config-schema';
 
 export interface Response {

package/src/hooks/{useVisits.tsx → useVisits.ts}

@@ -1,5 +1,5 @@
 import useSWR from 'swr';
-import { useSession, Visit, openmrsFetch } from '@openmrs/esm-framework';
+import { useSession, type Visit, openmrsFetch } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
 import { useAppointmentDate } from '../helpers';
 

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/src/past-visit/encounter-list.component.tsx

@@ -9,7 +9,7 @@ import {
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { formatDatetime, parseDate } from '@openmrs/esm-framework';
-import { FormattedEncounter } from './past-visit.component';
+import { type FormattedEncounter } from './past-visit.component';
 import styles from './past-visit.scss';
 
 interface EncounterListProps {

package/src/past-visit/past-visit.component.tsx

@@ -2,8 +2,8 @@ import React, { useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { StructuredListSkeleton, Tab, Tabs } from '@carbon/react';
-import { formatDate, OpenmrsResource, parseDate, useLayoutType } from '@openmrs/esm-framework';
-import { Observation } from '../types';
+import { formatDate, type OpenmrsResource, parseDate, useLayoutType } from '@openmrs/esm-framework';
+import { type Observation } from '../types';
 import { usePastVisits } from './past-visit.resource';
 import EncounterList from './encounter-list.component';
 import styles from './past-visit.scss';

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

@@ -25,7 +25,7 @@ import {
   ExtensionSlot,
   useLayoutType,
   useVisitTypes,
-  NewVisitPayload,
+  type NewVisitPayload,
   saveVisit,
   toOmrsIsoString,
   toDateObjectStrict,
@@ -37,10 +37,10 @@ import {
 } from '@openmrs/esm-framework';
 import isEmpty from 'lodash-es/isEmpty';
 import BaseVisitType from './base-visit-type.component';
-import { amPm, convertTime12to24, useAppointmentDate } from '../../helpers';
+import { type amPm, convertTime12to24, useAppointmentDate } from '../../helpers';
 import { closeOverlay } from '../../hooks/useOverlay';
 import { saveQueueEntry } from './queue.resource';
-import { MappedAppointment } from '../../types';
+import { type MappedAppointment } from '../../types';
 import { useAppointments } from '../../appointments/appointments-table.resource';
 import { useDefaultLoginLocation } from '../../hooks/useDefaultLocation';
 import { useVisits } from '../../hooks/useVisits';

package/tsconfig.json

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