@openmrs/esm-ward-app 7.0.1-pre.3621 → 7.0.1-pre.3630

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

@@ -56,10 +56,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 1034901,
+      "size": 1041847,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 1014003,
+        "javascript": 1020949,
         "share-init": 252,
         "runtime": 20394
       },
@@ -76,7 +76,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "506d6ceb46021d05",
+      "hash": "580650bdf73f4a29",
       "childrenByOrder": {}
     },
     {
@@ -177,23 +177,26 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 88977,
+      "reason": "reused as split chunk (cache group: defaultVendors)",
+      "size": 40067,
       "sizes": {
-        "javascript": 88809,
-        "consume-shared": 168
+        "javascript": 40067
       },
       "names": [],
-      "idHints": [],
+      "idHints": [
+        "vendors"
+      ],
       "runtime": [
-        "@openmrs/esm-ward-app"
+        "@openmrs/esm-ward-app",
+        "main"
       ],
       "files": [
-        "369.js"
+        "443.js"
       ],
       "auxiliaryFiles": [
-        "369.js.map"
+        "443.js.map"
       ],
-      "hash": "8b8407f66678398d",
+      "hash": "e4f298771af8e454",
       "childrenByOrder": {}
     },
     {
@@ -201,26 +204,21 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "reason": "reused as split chunk (cache group: defaultVendors)",
-      "size": 40067,
+      "size": 441,
       "sizes": {
-        "javascript": 40067
+        "javascript": 441
       },
       "names": [],
-      "idHints": [
-        "vendors"
-      ],
+      "idHints": [],
       "runtime": [
         "@openmrs/esm-ward-app",
         "main"
       ],
       "files": [
-        "443.js"
-      ],
-      "auxiliaryFiles": [
-        "443.js.map"
+        "574.js"
       ],
-      "hash": "e4f298771af8e454",
+      "auxiliaryFiles": [],
+      "hash": "a45ce40d9929be20",
       "childrenByOrder": {}
     },
     {
@@ -228,21 +226,23 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 482,
+      "size": 95923,
       "sizes": {
-        "javascript": 482
+        "javascript": 95755,
+        "consume-shared": 168
       },
       "names": [],
       "idHints": [],
       "runtime": [
-        "@openmrs/esm-ward-app",
-        "main"
+        "@openmrs/esm-ward-app"
       ],
       "files": [
-        "574.js"
+        "589.js"
       ],
-      "auxiliaryFiles": [],
-      "hash": "c6f120b8a1128a03",
+      "auxiliaryFiles": [
+        "589.js.map"
+      ],
+      "hash": "d1b0eb82ce9819e5",
       "childrenByOrder": {}
     },
     {
@@ -373,7 +373,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-ward-app.js.map"
       ],
-      "hash": "7aec9a5253c2f6d1",
+      "hash": "41c3842415804b54",
       "childrenByOrder": {}
     }
   ]

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"workspaces":[{"name":"admission-requests-cards","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"}],"pages":[{"component":"root","route":"ward"}],"version":"7.0.1-pre.3621"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"workspaces":[{"name":"admission-requests-cards","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"}],"pages":[{"component":"root","route":"ward"}],"version":"7.0.1-pre.3630"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-ward-app",
-  "version": "7.0.1-pre.3621",
+  "version": "7.0.1-pre.3630",
   "description": "Ward and bed management module for O3",
   "browser": "dist/openmrs-esm-ward-app.js",
   "main": "src/index.ts",

package/src/beds/occupied-bed.component.tsx

@@ -5,11 +5,11 @@ import WardPatientCard from '../ward-patient-card/ward-patient-card';
 import { type WardBedProps } from '../ward-view/ward-bed.component';
 import styles from './occupied-bed.scss';
 
-const OccupiedBed: React.FC<WardBedProps> = ({ patientInfos, bed }) => {
+const OccupiedBed: React.FC<WardBedProps> = ({ wardPatients, bed }) => {
   return (
     <div className={styles.occupiedBed}>
-      {patientInfos.map(({ patient, visit }, index: number) => {
-        const last = index === patientInfos.length - 1;
+      {wardPatients.map(({ patient, visit }, index: number) => {
+        const last = index === wardPatients.length - 1;
         return (
           <div key={'occupied-bed-pt-' + patient.uuid}>
             <WardPatientCard patient={patient} visit={visit} bed={bed} />

package/src/beds/occupied-bed.test.tsx

@@ -5,6 +5,7 @@ import { mockAdmissionLocation } from '../../../../__mocks__/wards.mock';
 import { bedLayoutToBed, filterBeds } from '../ward-view/ward-view.resource';
 import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
 import { configSchema, defaultPatientCardElementConfig } from '../config-schema';
+import { mockAdmittedPatient } from '../../../../__mocks__/ward-patient';
 
 const defaultConfig = getDefaultsFromConfigSchema(configSchema);
 
@@ -18,12 +19,12 @@ jest.replaceProperty(mockBedToUse.patients[0].person, 'preferredName', {
   givenName: 'Alice',
   familyName: 'Johnson',
 });
-const mockPatient = mockBedToUse.patients[0];
 const mockBed = bedLayoutToBed(mockBedToUse);
 
 describe('Occupied bed: ', () => {
   it('renders a single bed with patient details', () => {
-    render(<OccupiedBed patientInfos={[{ patient: mockPatient, visit: null }]} bed={mockBed} />);
+    const mockPatient = mockAdmittedPatient.patient;
+    render(<OccupiedBed wardPatients={[{ ...mockAdmittedPatient, admitted: true }]} bed={mockBed} />);
     const patientName = screen.getByText('Alice Johnson');
     expect(patientName).toBeInTheDocument();
     const patientAge = `${mockPatient.person.age} yrs`;
@@ -38,9 +39,9 @@ describe('Occupied bed: ', () => {
   it('renders a divider for shared patients', () => {
     render(
       <OccupiedBed
-        patientInfos={[
-          { patient: mockPatient, visit: null },
-          { patient: mockPatient, visit: null },
+        wardPatients={[
+          { ...mockAdmittedPatient, admitted: true },
+          { ...mockAdmittedPatient, admitted: true },
         ]}
         bed={mockBed}
       />,

package/src/hooks/useAdmittedPatients.ts

@@ -0,0 +1,13 @@
+import useSWR from 'swr';
+import { type AdmittedPatient } from '../types';
+import { openmrsFetch } from '@openmrs/esm-framework';
+
+export function useAdmittedPatients(locationUuid: string) {
+  const apiUrl = `/ws/rest/emrapi/inpatient/visits?currentLocation=${locationUuid}`;
+  const { data, ...rest } = useSWR<{ data: AdmittedPatient[] }, Error>(apiUrl, openmrsFetch);
+
+  return {
+    admittedPatients: data?.data ?? null,
+    ...rest,
+  };
+}

package/src/hooks/useInpatientRequest.ts

@@ -1,10 +1,9 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { openmrsFetch } from '@openmrs/esm-framework';
 import useSWR from 'swr';
 import type { InpatientRequest } from '../types';
 
-//TODO:The api is still in implementation stage and this is just a placeholder for the api
 export function useInpatientRequest(locationUuid: string) {
-  const apiUrl = `${restBaseUrl}/emrapi/inpatient/admissionRequests?admissionLocation=${locationUuid}`;
+  const apiUrl = `/ws/rest/emrapi/inpatient/admissionRequests?admissionLocation=${locationUuid}`;
   const { data, ...rest } = useSWR<{ data: Array<InpatientRequest> }, Error>(apiUrl, openmrsFetch);
 
   return {

package/src/routes.json

@@ -1,7 +1,8 @@
 {
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
-    "webservices.rest": "^2.2.0"
+    "webservices.rest": "^2.2.0",
+    "emrapi": "^2.0.0 || 2.0.0-SNAPSHOT"
   },
   "optionalBackendDependencies":{
      "bedmanagement":{

package/src/types/index.ts

@@ -28,6 +28,10 @@ export const patientCardElementTypes = [
 ] as const;
 export type PatientCardElementType = (typeof patientCardElementTypes)[number];
 
+// a Ward Patient can either be a patient that is already admitted or a
+// patient that is awaiting admission
+export type WardPatient = (AdmittedPatient & { admitted: true }) | (InpatientRequest & { admitted: false });
+
 // server-side types defined in openmrs-module-bedmanagement:
 
 export interface AdmissionLocation {
@@ -79,17 +83,36 @@ interface BedTagMap {
 
 export type BedStatus = 'AVAILABLE' | 'OCCUPIED';
 
+// server-side types defined in openmrs-module-emrapi:
+
 export type DispositionType = 'ADMISSION' | 'TRANSFER' | 'DISCHARGE';
 
+// InpatientRequest[] returned by:
+// GET /rest/emrapi/inpatient/admissionRequests
+// GET /rest/emrapi/inpatient/transferRequests
+// GET /rest/emrapi/inpatient/admissionAndTransferRequests
 export interface InpatientRequest {
   patient: Patient;
   visit: Visit;
   type: DispositionType;
+
+  // as of now, these fields are not included in the backend
   encounter?: Encounter;
   dispositionObs?: Observation;
   dispositionLocation?: Location;
   dispositionDate?: Date;
 }
+
+// AdmittedPatient[] returned by:
+// GET /rest/emrapi/inpatient/visits
+export interface AdmittedPatient {
+  patient: Patient;
+  visit: Visit;
+  currentLocation: Location;
+  timeSinceAdmissionInMinutes: number;
+  timeAtInpatientLocationInMinutes: number;
+}
+
 // TODO: Move these types to esm-core
 export interface Observation extends OpenmrsResourceStrict {
   concept: OpenmrsResource;

package/src/ward-view/ward-bed.component.tsx

@@ -1,15 +1,15 @@
 import { type Visit, type Patient } from '@openmrs/esm-framework';
 import React from 'react';
 import EmptyBed from '../beds/empty-bed.component';
-import { type Bed } from '../types';
+import { type WardPatient, type Bed } from '../types';
 import OccupiedBed from '../beds/occupied-bed.component';
 export interface WardBedProps {
-  patientInfos: Array<{ patient: Patient; visit: Visit }>;
+  wardPatients: Array<WardPatient>;
   bed: Bed;
 }
 
-const WardBed: React.FC<WardBedProps> = ({ bed, patientInfos }) => {
-  return patientInfos?.length > 0 ? <OccupiedBed bed={bed} patientInfos={patientInfos} /> : <EmptyBed bed={bed} />;
+const WardBed: React.FC<WardBedProps> = ({ bed, wardPatients }) => {
+  return wardPatients?.length > 0 ? <OccupiedBed bed={bed} wardPatients={wardPatients} /> : <EmptyBed bed={bed} />;
 };
 
 export default WardBed;

package/src/ward-view/ward-view.component.tsx

@@ -1,6 +1,6 @@
 import { InlineNotification } from '@carbon/react';
 import { WorkspaceContainer, useFeatureFlag, useLocations, useSession, type Location } from '@openmrs/esm-framework';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
@@ -9,6 +9,8 @@ import WardBed from './ward-bed.component';
 import { bedLayoutToBed, filterBeds } from './ward-view.resource';
 import styles from './ward-view.scss';
 import WardViewHeader from '../ward-view-header/ward-view-header.component';
+import { type AdmittedPatient, type WardPatient } from '../types';
+import { useAdmittedPatients } from '../hooks/useAdmittedPatients';
 
 const WardView = () => {
   const { locationUuid: locationUuidFromUrl } = useParams();
@@ -35,7 +37,7 @@ const WardView = () => {
     />
   ) : (
     <div className={styles.wardView}>
-      <WardViewHeader location={location.display} />
+      <WardViewHeader location={location} />
       <div className={styles.wardViewMain}>
         <WardViewByLocation location={location} />
       </div>
@@ -45,22 +47,59 @@ const WardView = () => {
 };
 
 const WardViewByLocation = ({ location }: { location: Location }) => {
-  const { admissionLocation, isLoading, error } = useAdmissionLocation(location.uuid);
+  const {
+    admissionLocation,
+    isLoading: isLoadingLocation,
+    error: errorLoadingLocation,
+  } = useAdmissionLocation(location.uuid);
+  const {
+    admittedPatients,
+    isLoading: isLoadingPatients,
+    error: errorLoadingPatients,
+  } = useAdmittedPatients(location.uuid);
   const { t } = useTranslation();
+  const admittedPatientsByUuid = useMemo(() => {
+    const map = new Map<string, AdmittedPatient>();
+    for (const admittedPatient of admittedPatients ?? []) {
+      map.set(admittedPatient.patient.uuid, admittedPatient);
+    }
+    return map;
+  }, [admittedPatients]);
 
-  if (admissionLocation) {
+  if (admissionLocation != null && admittedPatients != null) {
     const bedLayouts = filterBeds(admissionLocation);
 
+    const wardBeds = bedLayouts.map((bedLayout, i) => {
+      const { patients } = bedLayout;
+      const bed = bedLayoutToBed(bedLayout);
+      const wardPatients: WardPatient[] = patients.map((patient) => {
+        const admittedPatient = admittedPatientsByUuid.get(patient.uuid);
+
+        if (admittedPatient) {
+          // ideally, we can just use the patient object within admittedPatient
+          // and not need the one from bedLayouts, however, the emr api
+          // does not respect custom representation right now and does not return
+          // all required fields for the patient object
+          return { ...admittedPatient, admitted: true };
+        }
+
+        // patient assigned a bed but *not* admitted
+        // TODO: get the patient's visit and current location
+        return {
+          patient,
+          visit: null,
+          admitted: true,
+          currentLocation: null,
+          timeSinceAdmissionInMinutes: null,
+          timeAtInpatientLocationInMinutes: null,
+        };
+      });
+      return <WardBed key={bed.uuid} bed={bed} wardPatients={wardPatients} />;
+    });
+
     return (
       <>
-        {bedLayouts.map((bedLayout, i) => {
-          const { patients } = bedLayout;
-          const bed = bedLayoutToBed(bedLayout);
-
-          // TODO: replace visit field with real value fetched from useAdmissionLocation (or replacement API)
-          const patientInfos = patients.map((patient) => ({ patient, visit: null }));
-          return <WardBed key={bed.uuid} bed={bed} patientInfos={patientInfos} />;
-        })}
+        {wardBeds}
         {bedLayouts.length == 0 && (
           <InlineNotification
             kind="warning"
@@ -70,7 +109,7 @@ const WardViewByLocation = ({ location }: { location: Location }) => {
         )}
       </>
     );
-  } else if (isLoading) {
+  } else if (isLoadingLocation || isLoadingPatients) {
     return (
       <>
         {Array(20)
@@ -80,18 +119,27 @@ const WardViewByLocation = ({ location }: { location: Location }) => {
           ))}
       </>
     );
-  } else {
+  } else if (errorLoadingLocation) {
     return (
       <InlineNotification
         kind="error"
         lowContrast={true}
         title={t('errorLoadingWardLocation', 'Error loading ward location')}
         subtitle={
-          error?.message ??
+          errorLoadingLocation?.message ??
           t('invalidWardLocation', 'Invalid ward location: {{location}}', { location: location.display })
         }
       />
     );
+  } else {
+    return (
+      <InlineNotification
+        kind="error"
+        lowContrast={true}
+        title={t('errorLoadingPatients', 'Error loading admitted patients')}
+        subtitle={errorLoadingPatients?.message}
+      />
+    );
   }
 };
 

package/src/ward-view/ward-view.test.tsx

@@ -16,6 +16,7 @@ import { configSchema } from '../config-schema';
 import { useAdmissionLocation } from '../hooks/useAdmissionLocation';
 import WardView from './ward-view.component';
 import { mockPatientAlice } from '../../../../__mocks__/patient.mock';
+import { useAdmittedPatients } from '../hooks/useAdmittedPatients';
 
 jest.replaceProperty(mockPatientAlice.person as Person, 'preferredName', {
   uuid: '',
@@ -52,6 +53,10 @@ const mockedUseParams = useParams as jest.Mock;
 jest.mock('../hooks/useAdmissionLocation', () => ({
   useAdmissionLocation: jest.fn(),
 }));
+jest.mock('../hooks/useAdmittedPatients', () => ({
+  useAdmittedPatients: jest.fn(),
+}));
+
 jest.mocked(useAdmissionLocation).mockReturnValue({
   error: undefined,
   mutate: jest.fn(),
@@ -59,6 +64,13 @@ jest.mocked(useAdmissionLocation).mockReturnValue({
   isLoading: false,
   admissionLocation: mockAdmissionLocation,
 });
+jest.mocked(useAdmittedPatients).mockReturnValue({
+  error: undefined,
+  mutate: jest.fn(),
+  isValidating: false,
+  isLoading: false,
+  admittedPatients: [],
+});
 
 describe('WardView:', () => {
   it('renders the session location when no location provided in URL', () => {

package/src/ward-view-header/admission-requests-bar.component.tsx

@@ -1,15 +1,17 @@
-import React from 'react';
-import { Movement } from '@carbon/react/icons';
-import styles from './admission-requests.scss';
-import { launchWorkspace, showNotification } from '@openmrs/esm-framework';
-import { useInpatientRequest } from '../hooks/useInpatientRequest';
-import { useParams } from 'react-router-dom';
 import { SkeletonIcon } from '@carbon/react';
+import { Movement } from '@carbon/react/icons';
+import { launchWorkspace, showNotification, type Location } from '@openmrs/esm-framework';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { useInpatientRequest } from '../hooks/useInpatientRequest';
+import styles from './admission-requests.scss';
+
+interface AdmissionRequestsBarProps {
+  location: Location;
+}
 
-const AdmissionRequestsBar = () => {
-  const { locationUuid } = useParams();
-  const { inpatientRequests, isLoading, error } = useInpatientRequest(locationUuid);
+const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ location }) => {
+  const { inpatientRequests, isLoading, error } = useInpatientRequest(location.uuid);
   const admissionRequests = inpatientRequests?.filter((request) => request.type == 'ADMISSION');
   const { t } = useTranslation();
 

package/src/ward-view-header/admission-requests-bar.test.tsx

@@ -4,8 +4,9 @@ import { screen } from '@testing-library/react';
 import { launchWorkspace } from '@openmrs/esm-framework';
 import React from 'react';
 import AdmissionRequestsBar from './admission-requests-bar.component';
-import { mockInpatientRequest } from '../../../../__mocks__/inpatientRequest.mock';
+import { mockInpatientRequest } from '../../../../__mocks__/ward-patient';
 import { useInpatientRequest } from '../hooks/useInpatientRequest';
+import { mockLocationInpatientWard } from '../../../../__mocks__/locations.mock';
 
 jest.mock('@openmrs/esm-framework', () => {
   return {
@@ -29,13 +30,13 @@ jest.mocked(useInpatientRequest).mockReturnValue(mockInpatientRequestResponse);
 describe('Admission Requests Button', () => {
   it('call launch workspace when clicked on manage button', async () => {
     const user = userEvent.setup();
-    renderWithSwr(<AdmissionRequestsBar />);
+    renderWithSwr(<AdmissionRequestsBar location={mockLocationInpatientWard} />);
     await user.click(screen.getByRole('button', { name: /manage/i }));
     expect(launchWorkspace).toHaveBeenCalled();
   });
 
   it('there should be one admission request', () => {
-    const { getByText } = renderWithSwr(<AdmissionRequestsBar />);
+    const { getByText } = renderWithSwr(<AdmissionRequestsBar location={mockLocationInpatientWard} />);
     expect(getByText('1 admission requests')).toBeInTheDocument();
   });
 });

package/src/ward-view-header/ward-view-header.component.tsx

@@ -1,15 +1,16 @@
 import React from 'react';
 import styles from './ward-view-header.scss';
 import AdmissionRequestsBar from './admission-requests-bar.component';
+import { type Location } from '@openmrs/esm-framework';
 
 interface WardViewHeaderProps {
-  location: string;
+  location: Location;
 }
 const WardViewHeader: React.FC<WardViewHeaderProps> = ({ location }) => {
   return (
     <div className={styles.wardViewHeader}>
-      <h4>{location}</h4>
-      <AdmissionRequestsBar />
+      <h4>{location.display}</h4>
+      <AdmissionRequestsBar location={location} />
     </div>
   );
 };

package/src/ward-workspace/admission-request-workspace.test.tsx

@@ -10,7 +10,7 @@ import {
 } from '@openmrs/esm-framework';
 import { configSchema } from '../config-schema';
 import { useInpatientRequest } from '../hooks/useInpatientRequest';
-import { mockInpatientRequest } from '../../../../__mocks__/inpatientRequest.mock';
+import { mockInpatientRequest } from '../../../../__mocks__/ward-patient';
 
 jest.replaceProperty(mockInpatientRequest.patient.person as Person, 'preferredName', {
   uuid: '',

package/translations/en.json

@@ -1,11 +1,10 @@
 {
   "bedShare": "Bed share",
   "emptyBed": "Empty bed",
+  "errorLoadingPatientAdmissionRequests": "Error Loading Patient Admission Requests",
   "errorLoadingWardLocation": "Error loading ward location",
   "invalidLocationSpecified": "Invalid location specified",
   "invalidWardLocation": "Invalid ward location: {{location}}",
   "noBedsConfigured": "No beds configured for this location",
-  "unknownLocationUuid": "Unknown location uuid: {{locationUuidFromUrl}}",
-  "admissionRequests":"Admission Requests",
-  "errorLoadingPatientAdmissionRequests":"Error Loading Patient Admission Requests"
+  "unknownLocationUuid": "Unknown location uuid: {{locationUuidFromUrl}}"
 }