@kenyaemr/esm-ward-app 8.1.1-pre.114 → 8.1.1-pre.116

package/dist/routes.json

@@ -1 +1 @@
-{"$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."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"component":"admissionRequestNoteRowExtension","name":"admission-request-note-card-row","slot":"ward-patient-card-slot"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward Patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient"}],"version":"8.1.1-pre.114"}
+{"$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."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"component":"admissionRequestNoteRowExtension","name":"admission-request-note-card-row","slot":"ward-patient-card-slot"},{"component":"motherChildRowExtension","name":"mother-child-card-row","slot":"ward-patient-card-slot"},{"component":"pendingItemsCardRowExtension","name":"ward-patient-pending-items-card-row","slot":"ward-patient-card-pending-items-slot"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward Patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","hasOwnSidebar":true,"sidebarFamily":"ward-patient","width":"wider"}],"version":"8.1.1-pre.116"}

package/mock.tsx

@@ -0,0 +1,54 @@
+import { mockAdmissionLocation, mockInpatientAdmissions, mockInpatientRequest } from '__mocks__';
+import { useAdmissionLocation } from './src/hooks/useAdmissionLocation';
+import { useInpatientAdmission } from './src/hooks/useInpatientAdmission';
+import { createAndGetWardPatientGrouping } from './src/ward-view/ward-view.resource';
+import { useInpatientRequest } from './src/hooks/useInpatientRequest';
+import { useWardPatientGrouping } from './src/hooks/useWardPatientGrouping';
+
+jest.mock('./src/hooks/useAdmissionLocation', () => ({
+  useAdmissionLocation: jest.fn(),
+}));
+jest.mock('./src/hooks/useInpatientAdmission', () => ({
+  useInpatientAdmission: jest.fn(),
+}));
+jest.mock('./src/hooks/useInpatientRequest', () => ({
+  useInpatientRequest: jest.fn(),
+}));
+jest.mock('./src/hooks/useWardPatientGrouping', () => ({
+  useWardPatientGrouping: jest.fn(),
+}));
+const mockAdmissionLocationResponse = jest.mocked(useAdmissionLocation).mockReturnValue({
+  error: undefined,
+  mutate: jest.fn(),
+  isValidating: false,
+  isLoading: false,
+  admissionLocation: mockAdmissionLocation,
+});
+const mockInpatientAdmissionResponse = jest.mocked(useInpatientAdmission).mockReturnValue({
+  data: mockInpatientAdmissions,
+  hasMore: false,
+  loadMore: jest.fn(),
+  isValidating: false,
+  isLoading: false,
+  error: undefined,
+  mutate: jest.fn(),
+  totalCount: mockInpatientAdmissions.length,
+});
+
+const mockInpatientRequestResponse = jest.mocked(useInpatientRequest).mockReturnValue({
+  inpatientRequests: mockInpatientRequest,
+  hasMore: false,
+  loadMore: jest.fn(),
+  isValidating: false,
+  isLoading: false,
+  error: undefined,
+  mutate: jest.fn(),
+  totalCount: mockInpatientRequest.length,
+});
+
+export const mockWardPatientGroupDetails = jest.mocked(useWardPatientGrouping).mockReturnValue({
+  admissionLocationResponse: mockAdmissionLocationResponse(),
+  inpatientAdmissionResponse: mockInpatientAdmissionResponse(),
+  inpatientRequestResponse: mockInpatientRequestResponse(),
+  ...createAndGetWardPatientGrouping(mockInpatientAdmissions, mockAdmissionLocation, mockInpatientRequest),
+});

package/package.json

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

package/src/action-menu-buttons/clinical-forms-workspace-siderail.component.tsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import { Document } from '@carbon/react/icons';
+import { useTranslation } from 'react-i18next';
+import { ActionMenuButton, launchWorkspace, useWorkspaces } from '@openmrs/esm-framework';
+import type { WardPatientWorkspaceProps } from '../types';
+
+const ClinicalFormsWorkspaceSideRailIcon: React.FC = () => {
+  const { t } = useTranslation();
+  const { workspaces } = useWorkspaces();
+
+  const formEntryWorkspaces = workspaces.filter((w) => w.name === 'ward-patient-form-entry-workspace');
+  const recentlyOpenedForm = formEntryWorkspaces[0];
+
+  const isClinicalFormOpen = formEntryWorkspaces?.length >= 1;
+
+  const launchPatientWorkspaceCb = () => {
+    if (isClinicalFormOpen) {
+      launchWorkspace('ward-patient-form-entry-workspace', {
+        workspaceTitle: recentlyOpenedForm?.additionalProps?.['workspaceTitle'],
+      });
+    } else {
+      launchWorkspace<WardPatientWorkspaceProps>('ward-patient-clinical-forms-workspace');
+    }
+  };
+
+  return (
+    <ActionMenuButton
+      getIcon={(props) => <Document {...props} />}
+      label={t('clinicalForms', 'Clinical forms')}
+      iconDescription={t('clinicalForms', 'Clinical forms')}
+      handler={launchPatientWorkspaceCb}
+      type="ward-patient-clinical-form"
+    />
+  );
+};
+
+export default ClinicalFormsWorkspaceSideRailIcon;

package/src/action-menu-buttons/discharge-workspace-siderail.component.tsx

@@ -0,0 +1,20 @@
+import { ActionMenuButton, launchWorkspace } from '@openmrs/esm-framework';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Exit } from '@carbon/react/icons';
+
+export default function PatientDischargeSideRailIcon() {
+  const { t } = useTranslation();
+  const handler = () => {
+    launchWorkspace('patient-discharge-workspace');
+  };
+  return (
+    <ActionMenuButton
+      getIcon={(props) => <Exit {...props} />}
+      label={t('discharge', 'Discharge')}
+      iconDescription={t('discharge', 'Discharge')}
+      handler={handler}
+      type="patient-discharge-workspace"
+    />
+  );
+}

package/src/beds/empty-bed-skeleton.tsx

@@ -1,12 +1,13 @@
 import { SkeletonIcon } from '@carbon/react';
 import React from 'react';
 import styles from './empty-bed.scss';
+import WardPatientSkeletonText from '../ward-patient-card/row-elements/ward-pateint-skeleton-text';
 
 const EmptyBedSkeleton = () => {
   return (
     <div className={styles.container + ' ' + styles.skeleton}>
       <SkeletonIcon />
-      <SkeletonIcon className={styles.skeletonText} />
+      <WardPatientSkeletonText />
     </div>
   );
 };

package/src/beds/empty-bed.scss

@@ -22,7 +22,3 @@
   @include type.type-style('heading-compact-01');
   color: $text-02;
 }
-
-.skeletonText {
-  width: 6.25rem;
-}

package/src/beds/occupied-bed.scss

@@ -5,6 +5,7 @@
   display: flex;
   flex-direction: column;
   background-color: vars.$ui-02;
+  height: fit-content;
 }
 
 .bedDivider {

package/src/config-schema-mother-child-row.ts

@@ -0,0 +1,26 @@
+import { Type } from '@openmrs/esm-framework';
+
+export const motherChildRowConfigSchema = {
+  maternalLocations: {
+    _type: Type.Array,
+    _description: 'Defines obs display elements that can be included in the card header or footer.',
+    _default: [],
+    _elements: {
+      id: {
+        _type: Type.UUID,
+        _description: 'The unique identifier for this ward location',
+      },
+    }
+  },
+  childLocations: {
+    _type: Type.Array,
+    _description: 'Defines obs display elements that can be included in the card header or footer.',
+    _default: [],
+    _elements: {
+      id: {
+        _type: Type.UUID,
+        _description: 'The unique identifier for this ward location',
+      },
+    }
+  }
+};

package/src/config-schema-pending-items-extension.ts

@@ -0,0 +1,29 @@
+import { Type } from '@openmrs/esm-framework';
+
+export const pendingItemsExtensionConfigSchema = {
+  orders: {
+    orderTypes: {
+      _type: Type.Array,
+      _description: 'Defines order types displayed on the ward patient card pending items section.',
+      _default: [{ label: 'Labs', uuid: '52a447d3-a64a-11e3-9aeb-50e549534c5e' }],
+      _elements: {
+        uuid: {
+          _type: Type.UUID,
+          _description: 'Identifies the order type.',
+        },
+        label: {
+          _type: Type.String,
+          _description:
+            "The label or i18n key to the translated label to display. If not provided, defaults to 'Orders'",
+          _default: null,
+        },
+      },
+    },
+  },
+  showPendingItems: {
+    _type: Type.Boolean,
+    _description:
+      'Optional. If true, pending items (e.g., number of pending orders) will be displayed on the patient card.',
+    _default: true,
+  },
+};

package/src/config-schema.ts

@@ -7,7 +7,7 @@ export const defaultWardPatientCard: WardPatientCardDefinition = {
   appliedTo: null,
 };
 
-export const builtInPatientCardElements = ['patient-age', 'time-on-ward', 'time-since-admission'];
+export const builtInPatientCardElements = ['patient-age', 'time-on-ward', 'time-since-admission', 'patient-location'];
 
 export const addressFields = [
   'cityVillage',
@@ -58,12 +58,6 @@ export const configSchema: ConfigSchema = {
             "Optional. The custom label or i18n key to the translated label to display. If not provided, defaults to the concept's name. (Note that this can be set to an empty string to not show a label)",
           _default: null,
         },
-        labelI18nModule: {
-          _type: Type.String,
-          _description:
-            'Optional. The custom module to use for translation of the label. If not provided, the label will not be translated.',
-          _default: null,
-        },
         orderBy: {
           _type: Type.String,
           _description:
@@ -110,11 +104,6 @@ export const configSchema: ConfigSchema = {
             'the custom label or i18n key to the translated label to display for patient identifier. If not provided, defaults to the patient-identifier name.',
           _default: null,
         },
-        labelI18nModule: {
-          _type: Type.String,
-          _description: 'Optional. The custom module to use for translation of the label',
-          _default: null,
-        },
       },
     },
     addressElementDefinitions: {
@@ -196,11 +185,22 @@ export interface WardConfigObject {
 
 export interface WardPatientCardsConfig {
   obsElementDefinitions: Array<ObsElementDefinition>;
+  pendingItemsDefinitions: Array<PendingItemsDefinition>;
   identifierElementDefinitions: Array<IdentifierElementDefinition>;
   addressElementDefinitions: Array<AddressElementDefinition>;
   cardDefinitions: Array<WardPatientCardDefinition>;
 }
 
+export interface PendingItemsDefinition {
+  showPendingItems: boolean;
+  orders: {
+    orderTypes: Array<{
+      label?: string;
+      uuid: string;
+    }>;
+  };
+}
+
 export interface ObsElementDefinition {
   id: string;
   conceptUuid: string;
@@ -208,14 +208,12 @@ export interface ObsElementDefinition {
   orderBy: 'ascending' | 'descending';
   limit: number;
   label?: string;
-  labelI18nModule?: string;
 }
 
 export interface IdentifierElementDefinition {
   id: string;
   identifierTypeUuid: string;
   label?: string;
-  labelI18nModule?: string;
 }
 
 export interface AddressElementDefinition {

package/src/hooks/useAdmissionLocation.ts

@@ -1,16 +1,34 @@
-import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, restBaseUrl, useFeatureFlag } from '@openmrs/esm-framework';
+import useSWR from 'swr';
 import { type AdmissionLocationFetchResponse } from '../types/index';
-import useSWRImmutable from 'swr/immutable';
 import useWardLocation from './useWardLocation';
 
 const requestRep =
   'custom:(ward,totalBeds,occupiedBeds,bedLayouts:(rowNumber,columnNumber,bedNumber,bedId,bedUuid,status,location,patients:(person:full,identifiers,uuid)))';
 
-// note "admissionLocation" sn't the clearest name, but it matches the endpoint; endpoint fetches bed information (including info about patients in those beds) for a location (as provided by the bed management module)
+/**
+ *
+ * Fetches bed information (including info about patients in those beds) for a location,
+ * as provided by the bed management module. If the bed management module is not installed,
+ * then no request will be made, the return object's
+ * `isLoading` field will be false, and the `admissionLocation` field will be undefined.
+ *
+ * Note that "admissionLocation" isn't the clearest name, but it matches the endpoint name
+ *
+ * @param rep the "v=" representation parameter
+ * @returns
+ */
 export function useAdmissionLocation(rep: string = requestRep) {
   const { location } = useWardLocation();
+
+  const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
+
   const apiUrl = location?.uuid ? `${restBaseUrl}/admissionLocation/${location?.uuid}?v=${rep}` : null;
-  const { data, ...rest } = useSWRImmutable<FetchResponse<AdmissionLocationFetchResponse>, Error>(apiUrl, openmrsFetch);
+  const { data, ...rest } = useSWR<FetchResponse<AdmissionLocationFetchResponse>, Error>(
+    isBedManagementModuleInstalled ? apiUrl : null,
+    openmrsFetch,
+  );
+
   return {
     admissionLocation: data?.data,
     ...rest,

package/src/hooks/useBeds.ts

@@ -1,5 +1,4 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import useSWR from 'swr';
+import { restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
 import { type Bed, type BedStatus } from '../types/index';
 
 interface BedSearchCriteria {
@@ -17,10 +16,10 @@ export function useBeds(searchCriteria?: BedSearchCriteria) {
   }
 
   const apiUrl = `${restBaseUrl}/bed?${searchParam}`;
-  const { data, ...rest } = useSWR<{ data: { results: Array<Bed> } }, Error>(apiUrl, openmrsFetch);
+  const { data, ...rest } = useOpenmrsFetchAll<Bed>(apiUrl);
 
   return {
-    beds: data?.data?.results ?? [],
+    beds: data,
     ...rest,
   };
 }

package/src/hooks/useConcept.ts

@@ -1,11 +1,10 @@
-import { type Concept, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import useSWRImmutable from 'swr/immutable';
+import { type Concept, restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
 
 export function useConcepts(uuids: string[], rep = 'default') {
   const apiUrl = `${restBaseUrl}/concept?references=${uuids.join()}&v=${rep}`;
-  const { data, ...rest } = useSWRImmutable<{ data: { results: Array<Concept> } }, Error>(apiUrl, openmrsFetch);
+  const { data, ...rest } = useOpenmrsFetchAll<Concept>(apiUrl, { immutable: true });
   return {
-    concepts: data?.data?.results,
+    concepts: data,
     ...rest,
   };
 }

package/src/hooks/useEmrConfiguration.ts

@@ -12,7 +12,10 @@ interface EmrApiConfigurationResponse {
   clinicianEncounterRole: OpenmrsResource;
   consultFreeTextCommentsConcept: OpenmrsResource;
   visitNoteEncounterType: OpenmrsResource;
+  inpatientNoteEncounterType: OpenmrsResource;
+  transferRequestEncounterType: OpenmrsResource;
   transferWithinHospitalEncounterType: OpenmrsResource;
+  exitFromInpatientEncounterType: OpenmrsResource;
   supportsTransferLocationTag: LocationTag;
   supportsAdmissionLocationTag: LocationTag;
   supportsLoginLocationTag: LocationTag;
@@ -64,6 +67,8 @@ const customRepProps = [
   ['diagnosisSets', 'ref'],
   ['personImageDirectory', 'ref'],
   ['visitNoteEncounterType', 'ref'],
+  ['inpatientNoteEncounterType', 'ref'],
+  ['transferRequestEncounterType', 'ref'],
   ['consultEncounterType', 'ref'],
   ['diagnosisMetadata', 'ref'],
   ['narrowerThanConceptMapType', 'ref'],

package/src/hooks/useInpatientAdmission.ts

@@ -1,6 +1,5 @@
-import useSWR from 'swr';
-import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type InpatientAdmissionFetchResponse } from '../types';
+import { restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
+import { type InpatientAdmission } from '../types';
 import useWardLocation from './useWardLocation';
 
 export function useInpatientAdmission() {
@@ -9,20 +8,16 @@ export function useInpatientAdmission() {
   // prettier-ignore
   const customRepresentation =
     'custom:(visit,' +
-      'patient:(uuid,identifiers,voided,' +
-        'person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),' + 
-      'encounterAssigningToCurrentInpatientLocation:(encounterDatetime),' +
-      'firstAdmissionOrTransferEncounter:(encounterDatetime),' +
+    'patient:(uuid,identifiers,voided,' +
+    'person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),' +
+    'encounterAssigningToCurrentInpatientLocation:(encounterDatetime),' +
+    'currentInpatientRequest:(dispositionLocation,dispositionType,disposition:(uuid,display),dispositionEncounter:(uuid,display),dispositionObsGroup:(uuid,display),visit:(uuid),patient:(uuid)),' +
+    'firstAdmissionOrTransferEncounter:(encounterDatetime),' +
     ')';
-  const { data, ...rest } = useSWR<FetchResponse<InpatientAdmissionFetchResponse>, Error>(
+
+  return useOpenmrsFetchAll<InpatientAdmission>(
     location
       ? `${restBaseUrl}/emrapi/inpatient/admission?currentInpatientLocation=${location.uuid}&v=${customRepresentation}`
       : null,
-    openmrsFetch,
   );
-
-  return {
-    inpatientAdmissions: data?.data?.results,
-    ...rest,
-  };
 }

package/src/hooks/useInpatientRequest.ts

@@ -1,8 +1,6 @@
-import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import type { DispositionType, InpatientRequestFetchResponse } from '../types';
-import useSWR from 'swr';
+import { restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
+import type { DispositionType, InpatientRequest } from '../types';
 import useWardLocation from './useWardLocation';
-import { useMemo } from 'react';
 
 // prettier-ignore
 const defaultRep =
@@ -26,18 +24,9 @@ export function useInpatientRequest(
   searchParams.set('dispositionLocation', location?.uuid);
   searchParams.set('v', rep);
 
-  const { data, ...rest } = useSWR<FetchResponse<InpatientRequestFetchResponse>, Error>(
+  const { data, ...rest } = useOpenmrsFetchAll<InpatientRequest>(
     location?.uuid ? `${restBaseUrl}/emrapi/inpatient/request?${searchParams.toString()}` : null,
-    openmrsFetch,
   );
 
-  const results = useMemo(
-    () => ({
-      inpatientRequests: data?.data?.results,
-      ...rest,
-    }),
-    [data, rest],
-  );
-
-  return results;
+  return { inpatientRequests: data, ...rest };
 }

package/src/hooks/useLocations.ts

@@ -1,54 +1,11 @@
-import { type FetchResponse, fhirBaseUrl, openmrsFetch } from '@openmrs/esm-framework';
-import { useEffect, useMemo, useState } from 'react';
-import useSWRImmutable from 'swr/immutable';
+import { fhirBaseUrl, useFhirPagination } from '@openmrs/esm-framework';
 
-interface FhirLocation {
-  fullUrl: string;
-  resource: {
-    resourceType: 'Location';
-    id: string;
-    name: string;
-    description: string;
-  };
-}
-
-interface FhirResponse {
-  resourceType: 'Bundle';
-  id: '6a107c31-d760-4df0-bb70-89ad742225ca';
-  meta: {
-    lastUpdated: '2024-08-08T06:28:01.495+00:00';
-  };
-  type: 'searchset';
-  total: number;
-  link: Array<{
-    relation: 'self' | 'prev' | 'next';
-    url: string;
-  }>;
-  entry: Array<FhirLocation>;
-}
-
-export default function useLocations(filterCriteria: Array<Array<string>> = [], skip: boolean = false) {
-  const [totalLocations, setTotalLocations] = useState(0);
-  const [url, setUrl] = useState(`${fhirBaseUrl}/Location`);
+export default function useLocations(
+  filterCriteria: Array<Array<string>> = [],
+  pageSize: number,
+  skip: boolean = false,
+) {
   const searchParams = new URLSearchParams(filterCriteria);
-  const urlWithSearchParams = `${url}?${searchParams.toString()}`;
-  const { data, ...rest } = useSWRImmutable<FetchResponse<FhirResponse>>(
-    !skip ? urlWithSearchParams : null,
-    openmrsFetch,
-  );
-
-  useEffect(() => {
-    if (data?.data) {
-      setTotalLocations(data.data.total);
-    }
-  }, [data]);
-
-  const results = useMemo(() => {
-    return {
-      locations: data?.data?.entry?.map((entry) => entry.resource),
-      totalLocations,
-      ...rest,
-    };
-  }, [data, rest, totalLocations]);
-  return results;
+  const urlWithSearchParams = `${fhirBaseUrl}/Location?${searchParams.toString()}`;
+  return useFhirPagination<fhir.Location>(skip ? null : urlWithSearchParams, pageSize, { immutable: true });
 }

package/src/hooks/useMotherAndChildren.ts

@@ -0,0 +1,46 @@
+import { makeUrl, restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
+import { type MotherAndChildren } from '../types';
+
+export interface MothersAndChildrenSearchCriteria {
+  mothers?: Array<string>;
+  children?: Array<string>;
+  requireMotherHasActiveVisit?: boolean;
+  requireChildHasActiveVisit?: boolean;
+  requireChildBornDuringMothersActiveVisit?: boolean;
+}
+
+export function useMotherAndChildren(
+  criteria: MothersAndChildrenSearchCriteria,
+  fetch: boolean = true,
+  rep: string = null,
+) {
+  const url = makeUrlUrl(`${restBaseUrl}/emrapi/maternal/mothersAndChildren`);
+  const {
+    mothers,
+    children,
+    requireChildBornDuringMothersActiveVisit,
+    requireChildHasActiveVisit,
+    requireMotherHasActiveVisit,
+  } = criteria;
+
+  for (const m of mothers ?? []) {
+    url.searchParams.append('mother', m);
+  }
+
+  for (const c of children ?? []) {
+    url.searchParams.append('child', c);
+  }
+
+  url.searchParams.append('requireMotherHasActiveVisit', requireMotherHasActiveVisit?.toString() ?? 'false');
+  url.searchParams.append('requireChildHasActiveVisit', requireChildHasActiveVisit?.toString() ?? 'false');
+  url.searchParams.append(
+    'requireChildBornDuringMothersActiveVisit',
+    requireChildBornDuringMothersActiveVisit?.toString() ?? 'false',
+  );
+  rep && url.searchParams.append('v', rep);
+  return useOpenmrsFetchAll<MotherAndChildren>(fetch ? url : null);
+}
+
+function makeUrlUrl(path: string) {
+  return new URL(makeUrl(path), window.location.toString());
+}

package/src/hooks/useObs.ts

@@ -1,6 +1,5 @@
-import useSWR from 'swr';
+import { restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
 import { type Observation } from '../types';
-import { type Link, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 
 interface ObsSearchCriteria {
   patient: string;
@@ -14,8 +13,5 @@ export function useObs(criteria?: ObsSearchCriteria, representation = 'default')
   });
 
   const apiUrl = `${restBaseUrl}/obs?${params}`;
-  return useSWR<{ data: { results: Array<Observation>; totalCount: number; links: Array<Link> } }, Error>(
-    apiUrl,
-    openmrsFetch,
-  );
+  return useOpenmrsFetchAll<Observation>(apiUrl);
 }

package/src/hooks/usePatientPendingOrders.ts

@@ -0,0 +1,16 @@
+import { type FetchResponse, openmrsFetch, type OpenmrsResource, restBaseUrl } from '@openmrs/esm-framework';
+import useSWR from 'swr';
+
+export function usePatientPendingOrders(patientUuid: string, orderTypeUUid: string, visitStartDate: string) {
+  const apiUrl =
+    patientUuid && orderTypeUUid && visitStartDate
+      ? `${restBaseUrl}/order?includeNullFulfillerStatus=true&patient=${patientUuid}&orderTypes=${orderTypeUUid}&activatedOnOrAfterDate=${visitStartDate}`
+      : null;
+  const { data, ...rest } = useSWR<FetchResponse<{ results: Array<OpenmrsResource> }>, Error>(apiUrl, openmrsFetch);
+
+  return {
+    orders: data?.data.results,
+    count: data?.data.results.length,
+    ...rest,
+  };
+}

package/src/hooks/useWardPatientGrouping.ts

@@ -0,0 +1,25 @@
+import { useMemo } from 'react';
+import { createAndGetWardPatientGrouping } from '../ward-view/ward-view.resource';
+import { useAdmissionLocation } from './useAdmissionLocation';
+import { useInpatientAdmission } from './useInpatientAdmission';
+import { useInpatientRequest } from './useInpatientRequest';
+
+export function useWardPatientGrouping() {
+  const admissionLocationResponse = useAdmissionLocation();
+  const inpatientAdmissionResponse = useInpatientAdmission();
+  const inpatientRequestResponse = useInpatientRequest();
+
+  const { data: inpatientAdmissions } = inpatientAdmissionResponse;
+  const { admissionLocation } = admissionLocationResponse;
+  const { inpatientRequests } = inpatientRequestResponse;
+
+  const groupings = useMemo(() => {
+    return { ...createAndGetWardPatientGrouping(inpatientAdmissions, admissionLocation, inpatientRequests) };
+  }, [admissionLocation, inpatientAdmissions, inpatientRequests]) as ReturnType<typeof createAndGetWardPatientGrouping>;
+  return {
+    ...groupings,
+    admissionLocationResponse,
+    inpatientAdmissionResponse,
+    inpatientRequestResponse,
+  };
+}