@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2674 → 5.4.2-pre.2676

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"hiv-care-and-treatment-dashboard-link","component":"hivCareAndTreatmentLink","slot":"patient-chart-dashboard-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","path":"hiv-care-and-treatment-dashboard","layoutMode":"anchored"}},{"name":"hiv-care-and-treatment-dashboard","slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","component":"hivCareAndTreatment","order":0,"online":true,"offline":false},{"name":"relationship-dashboard-link","component":"relationshipsLink","order":24,"online":true,"offline":false,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-relationship-slot","path":"relationships","layoutMode":"anchored"}},{"name":"relationship-dashboard","slot":"patient-chart-relationship-slot","component":"relationships","order":0,"online":true,"offline":false},{"name":"clinical-encounter-dashboard-link","component":"clinicalEncounterLink","order":25,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored"}},{"name":"clinical-encounter-dashboard","slot":"patient-chart-clinical-encounter-slot","component":"clinicalEncounter","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-dashboard-link","component":"maternalAndChildHealthDashboardLink","order":26,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-maternal-and-child-health-slot","path":"maternal-and-child-health","layoutMode":"anchored"}},{"name":"maternal-and-child-health-dashboard","slot":"patient-chart-maternal-and-child-health-slot","component":"maternalAndChildHealthDashboard","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-partograph","slot":"maternal-and-child-health-partograph-slot","component":"partograph","order":0,"online":true,"offline":false},{"name":"contact-list-dashboard-link","component":"contactListLink","order":27,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-contact-list-slot","path":"contact-list","layoutMode":"anchored"}},{"name":"contact-list-dashboard","slot":"patient-chart-contact-list-slot","component":"contactList","order":0,"online":true,"offline":false},{"component":"caseManagementDashboardLink","name":"case-management-dashboard-link","meta":{"name":"case-management","title":"Case Management","slot":"case-management-dashboard-slot","path":"/case-management"}},{"name":"in-patient-dashboard-link","component":"inPatientChartLink","order":7,"meta":{"slot":"patient-chart-in-patient-dashboard-slot","path":"in-patient","layoutMode":"anchored","columns":1,"columnSpan":1}},{"name":"in-patient-dashboard","slot":"patient-chart-in-patient-dashboard-slot","component":"inPatientChartDashboard","meta":{"fullWidth":false}},{"name":"wrap-component-view","slot":"case-management-dashboard-slot","component":"wrapComponent","order":2,"online":true,"offline":false},{"name":"case-encounter-link","component":"caseEncounterDashboardLink","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-case-encounter-slot","path":"case-management-encounters","layoutMode":"anchored"}},{"name":"case-encounter-table","slot":"patient-chart-case-encounter-slot","component":"caseEncounterTable","order":0,"online":true,"offline":false},{"component":"peerCalendarDashboardLink","name":"peer-calendar-dashboard-link","meta":{"name":"peer-calendar","title":"Peer Calendar","slot":"peer-calendar-dashboard-slot","path":"peer-management"}},{"name":"peer-calendar","slot":"peer-calendar-dashboard-slot","component":"peerCalendar","order":0,"online":true,"offline":false},{"name":"special-clinics-dashboard-link","component":"specialClinicsDashboardLink","order":15,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-special-clinics-slot","path":"special-clinics","layoutMode":"anchored"}},{"name":"special-clinics-dashboard","slot":"patient-chart-special-clinics-slot","component":"specialClinicsDashboard","order":0,"online":true,"offline":false}],"modals":[{"name":"birth-date-calculator","component":"birthDateCalculator"},{"name":"relationship-delete-confirm-dialog","component":"relationshipDeleteConfirmialog"},{"name":"end-relationship-dialog","component":"endRelationshipModal"}],"workspaces":[{"name":"contact-list-form","component":"contactListForm","title":"Contact List Form","type":"form"},{"name":"case-management-form","component":"caseManagementForm","title":"Case Management Form","type":"form"},{"name":"add-patient-case-form","component":"addPatientCaseForm","title":"Add patient case Form","type":"form"},{"name":"family-relationship-form","component":"familyRelationshipForm","title":"Family Relationship Form","type":"form"},{"name":"peers-form","component":"peersForm","title":"Add New Peer","type":"form"},{"name":"kenyaemr-cusom-form-entry-workspace","component":"peerCalendarFormEntry","title":"KVP Peer Educator Outreach Calendar","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"contact-list-update-form","component":"contactListUpdateForm","title":"Contact List Update Form","type":"form"},{"name":"other-relationship-form","component":"otherRelationshipsForm","title":"Other Relationships Form","type":"form"},{"name":"end-relationship-form","component":"endRelationshipWorkspace","title":"Discontinue relationship form","type":"form"}],"version":"5.4.2-pre.2674"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"hiv-care-and-treatment-dashboard-link","component":"hivCareAndTreatmentLink","slot":"patient-chart-dashboard-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","path":"hiv-care-and-treatment-dashboard","layoutMode":"anchored"}},{"name":"hiv-care-and-treatment-dashboard","slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","component":"hivCareAndTreatment","order":0,"online":true,"offline":false},{"name":"relationship-dashboard-link","component":"relationshipsLink","order":24,"online":true,"offline":false,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-relationship-slot","path":"relationships","layoutMode":"anchored"}},{"name":"relationship-dashboard","slot":"patient-chart-relationship-slot","component":"relationships","order":0,"online":true,"offline":false},{"name":"clinical-encounter-dashboard-link","component":"clinicalEncounterLink","order":25,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored"}},{"name":"clinical-encounter-dashboard","slot":"patient-chart-clinical-encounter-slot","component":"clinicalEncounter","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-dashboard-link","component":"maternalAndChildHealthDashboardLink","order":26,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-maternal-and-child-health-slot","path":"maternal-and-child-health","layoutMode":"anchored"}},{"name":"maternal-and-child-health-dashboard","slot":"patient-chart-maternal-and-child-health-slot","component":"maternalAndChildHealthDashboard","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-partograph","slot":"maternal-and-child-health-partograph-slot","component":"partograph","order":0,"online":true,"offline":false},{"name":"contact-list-dashboard-link","component":"contactListLink","order":27,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-contact-list-slot","path":"contact-list","layoutMode":"anchored"}},{"name":"contact-list-dashboard","slot":"patient-chart-contact-list-slot","component":"contactList","order":0,"online":true,"offline":false},{"component":"caseManagementDashboardLink","name":"case-management-dashboard-link","meta":{"name":"case-management","title":"Case Management","slot":"case-management-dashboard-slot","path":"/case-management"}},{"name":"in-patient-dashboard-link","component":"inPatientChartLink","order":7,"meta":{"slot":"patient-chart-in-patient-dashboard-slot","path":"in-patient","layoutMode":"anchored","columns":1,"columnSpan":1}},{"name":"in-patient-dashboard","slot":"patient-chart-in-patient-dashboard-slot","component":"inPatientChartDashboard","meta":{"fullWidth":false}},{"name":"wrap-component-view","slot":"case-management-dashboard-slot","component":"wrapComponent","order":2,"online":true,"offline":false},{"name":"case-encounter-link","component":"caseEncounterDashboardLink","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-case-encounter-slot","path":"case-management-encounters","layoutMode":"anchored"}},{"name":"case-encounter-table","slot":"patient-chart-case-encounter-slot","component":"caseEncounterTable","order":0,"online":true,"offline":false},{"component":"peerCalendarDashboardLink","name":"peer-calendar-dashboard-link","meta":{"name":"peer-calendar","title":"Peer Calendar","slot":"peer-calendar-dashboard-slot","path":"peer-management"}},{"name":"peer-calendar","slot":"peer-calendar-dashboard-slot","component":"peerCalendar","order":0,"online":true,"offline":false},{"name":"special-clinics-dashboard-link","component":"specialClinicsDashboardLink","order":15,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-special-clinics-slot","path":"special-clinics","layoutMode":"anchored"}},{"name":"special-clinics-dashboard","slot":"patient-chart-special-clinics-slot","component":"specialClinicsDashboard","order":0,"online":true,"offline":false}],"modals":[{"name":"birth-date-calculator","component":"birthDateCalculator"},{"name":"relationship-delete-confirm-dialog","component":"relationshipDeleteConfirmialog"},{"name":"end-relationship-dialog","component":"endRelationshipModal"}],"workspaces":[{"name":"contact-list-form","component":"contactListForm","title":"Contact List Form","type":"form"},{"name":"case-management-form","component":"caseManagementForm","title":"Case Management Form","type":"form"},{"name":"add-patient-case-form","component":"addPatientCaseForm","title":"Add patient case Form","type":"form"},{"name":"family-relationship-form","component":"familyRelationshipForm","title":"Family Relationship Form","type":"form"},{"name":"peers-form","component":"peersForm","title":"Add New Peer","type":"form"},{"name":"kenyaemr-cusom-form-entry-workspace","component":"peerCalendarFormEntry","title":"KVP Peer Educator Outreach Calendar","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"contact-list-update-form","component":"contactListUpdateForm","title":"Contact List Update Form","type":"form"},{"name":"other-relationship-form","component":"otherRelationshipsForm","title":"Other Relationships Form","type":"form"},{"name":"end-relationship-form","component":"endRelationshipWorkspace","title":"Discontinue relationship form","type":"form"}],"version":"5.4.2-pre.2676"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-patient-clinical-view-app",
-  "version": "5.4.2-pre.2674",
+  "version": "5.4.2-pre.2676",
   "description": "Patient clinical view microfrontend for the OpenMRS SPA",
   "keywords": [
     "openmrs"

package/src/config-schema.ts

@@ -52,6 +52,7 @@ export const configSchema = {
       peerCalendarOutreactForm: '7492cffe-5874-4144-a1e6-c9e455472a35',
       autopsyFormUuid: '2b61a73-4971-4fc0-b20b-9a30176317e2',
       htsClientTracingFormUuid: '15ed03d2-c972-11e9-a32f-2a2ae2dbcce4',
+      admissionRequestFormUuid: '0bae7646-b079-4cbb-8130-b24274fc16f7',
     },
   },
   htsClientTracingConceptsUuids: {
@@ -447,6 +448,7 @@ export interface ConfigObject {
     peerCalendarOutreactForm: string;
     autopsyFormUuid: string;
     htsClientTracingFormUuid: string;
+    admissionRequestFormUuid: string;
   };
   defaulterTracingEncounterUuid: string;
   autopsyEncounterFormUuid: string;

package/src/in-patient/admission-request.component.tsx

@@ -0,0 +1,117 @@
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  Button,
+  DataTable,
+  DataTableSkeleton,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@carbon/react';
+import { formatDatetime, isDesktop, launchWorkspace, useConfig, useLayoutType } from '@openmrs/esm-framework';
+import { CardHeader, EmptyState, ErrorState } from '@openmrs/esm-patient-common-lib';
+
+import { useAdmissionRequest } from './in-patient.resource';
+import { ConfigObject } from '../config-schema';
+import { Add } from '@carbon/react/icons';
+
+type AdmissionRequestProps = {
+  patientUuid: string;
+};
+
+const AdmissionRequest: React.FC<AdmissionRequestProps> = ({ patientUuid }) => {
+  const { t } = useTranslation();
+  const layout = useLayoutType();
+  const controlSize = isDesktop(layout) ? 'sm' : 'md';
+  const {
+    formsList: { admissionRequestFormUuid },
+  } = useConfig<ConfigObject>();
+  const { admissionRequest, isLoading, error, mutate } = useAdmissionRequest(patientUuid);
+
+  const rows = useMemo(() => {
+    return admissionRequest.map((admissionRequest) => ({
+      id: admissionRequest.patient.uuid,
+      admissionLocation: admissionRequest.dispositionLocation?.display,
+      admissionType: admissionRequest.dispositionType,
+      disposition: admissionRequest.disposition.display,
+      requestDatetime: formatDatetime(new Date(admissionRequest.dispositionEncounter.encounterDatetime), {
+        mode: 'standard',
+      }),
+    }));
+  }, [admissionRequest]);
+
+  const headers = useMemo(() => {
+    return [
+      { key: 'requestDatetime', header: t('requestDatetime', 'Request Datetime') },
+      { key: 'admissionLocation', header: t('admissionLocation', 'Admission Location') },
+      { key: 'admissionType', header: t('admissionType', 'Admission Type') },
+      { key: 'disposition', header: t('disposition', 'Disposition') },
+    ];
+  }, []);
+
+  const handleLaunchAdmissionRequestForm = () => {
+    launchWorkspace('patient-form-entry-workspace', {
+      workspaceTitle: 'Admission Request',
+      mutateForm: mutate,
+      formInfo: {
+        formUuid: admissionRequestFormUuid,
+        encounterUuid: '',
+      },
+    });
+  };
+
+  if (isLoading) {
+    return <DataTableSkeleton />;
+  }
+
+  if (error) {
+    return <ErrorState error={error} headerTitle={t('admissionRequest', 'Admission Request')} />;
+  }
+
+  if (admissionRequest.length === 0) {
+    return (
+      <EmptyState
+        displayText={t('admissionRequests', 'admission requests')}
+        headerTitle={t('admissionRequest', 'Admission Request')}
+        launchForm={handleLaunchAdmissionRequestForm}
+      />
+    );
+  }
+
+  return (
+    <div>
+      <CardHeader title={t('admissionRequest', 'Admission Request')}>
+        <Button renderIcon={Add} onClick={handleLaunchAdmissionRequestForm} kind="ghost">
+          {t('add', 'Add')}
+        </Button>
+      </CardHeader>
+      <DataTable size={controlSize} rows={rows} headers={headers}>
+        {({ rows, headers, getTableProps, getHeaderProps, getRowProps, getCellProps }) => (
+          <Table {...getTableProps()}>
+            <TableHead>
+              <TableRow>
+                {headers.map((header) => (
+                  <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
+                ))}
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {rows.map((row) => (
+                <TableRow {...getRowProps({ row })}>
+                  {row.cells.map((cell) => (
+                    <TableCell {...getCellProps({ cell })}>{cell.value}</TableCell>
+                  ))}
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        )}
+      </DataTable>
+    </div>
+  );
+};
+
+export default AdmissionRequest;

package/src/in-patient/admission-request.test.tsx

@@ -0,0 +1,450 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { launchWorkspace, formatDatetime, useLayoutType, isDesktop } from '@openmrs/esm-framework';
+
+import AdmissionRequest from './admission-request.component';
+import { useAdmissionRequest } from './in-patient.resource';
+import { type AdmissionRequest as AdmissionRequestType } from '../types';
+
+const mockUseAdmissionRequest = useAdmissionRequest as jest.MockedFunction<typeof useAdmissionRequest>;
+const mockLaunchWorkspace = launchWorkspace as jest.MockedFunction<typeof launchWorkspace>;
+const mockFormatDatetime = formatDatetime as jest.MockedFunction<typeof formatDatetime>;
+const mockUseLayoutType = useLayoutType as jest.MockedFunction<typeof useLayoutType>;
+const mockIsDesktop = isDesktop as jest.MockedFunction<typeof isDesktop>;
+
+jest.mock('./in-patient.resource', () => ({
+  useAdmissionRequest: jest.fn(),
+}));
+
+jest.mock('@openmrs/esm-framework', () => ({
+  ...jest.requireActual('@openmrs/esm-framework'),
+  useConfig: jest.fn().mockReturnValue({
+    formsList: {
+      admissionRequestFormUuid: 'test-admission-form-uuid',
+    },
+  }),
+  formatDatetime: jest.fn().mockReturnValue('2023-10-16 10:30 AM'),
+  useLayoutType: jest.fn().mockReturnValue('desktop'),
+  isDesktop: jest.fn().mockReturnValue(true),
+  launchWorkspace: jest.fn(),
+}));
+
+const mockMutate = jest.fn();
+const patientUuid = 'test-patient-uuid';
+
+const mockAdmissionRequestData: AdmissionRequestType[] = [
+  {
+    patient: {
+      uuid: 'test-patient-uuid',
+      person: {
+        uuid: 'test-person-uuid',
+        age: 35,
+        dead: false,
+        display: 'John Doe',
+        causeOfDeath: '',
+        gender: 'M',
+        deathDate: '',
+        attributes: [],
+      },
+      identifiers: [{ uuid: 'test-identifier-uuid' }],
+    },
+    dispositionLocation: {
+      uuid: 'test-location-uuid',
+      display: 'Ward A',
+    },
+    dispositionType: 'ADMIT',
+    disposition: {
+      uuid: 'test-disposition-uuid',
+      display: 'Admit to hospital',
+      answers: [],
+    },
+    dispositionEncounter: {
+      uuid: 'test-encounter-uuid',
+      encounterDatetime: '2023-10-16T10:30:00.000+0000',
+      patient: { uuid: 'test-patient-uuid' },
+      location: { uuid: 'test-location-uuid' },
+      form: {
+        name: 'Admission Form',
+        uuid: 'test-form-uuid',
+        version: '1.0',
+        published: true,
+        retired: false,
+        resources: [],
+        encounterType: {
+          uuid: 'test-encounter-type-uuid',
+          name: 'Admission',
+          viewPrivilege: null,
+          editPrivilege: null,
+        },
+      },
+      encounterType: { uuid: 'test-encounter-type-uuid', name: 'Admission', display: 'Admission' },
+      obs: [],
+      orders: [],
+      voided: false,
+      auditInfo: {
+        creator: { uuid: 'test-creator-uuid', display: 'Admin' },
+        dateCreated: '2023-10-16T10:30:00.000+0000',
+        changedBy: null,
+        dateChanged: null,
+      },
+      visit: {
+        uuid: 'test-visit-uuid',
+        startDatetime: '2023-10-16T10:00:00.000+0000',
+        encounters: [],
+      },
+      encounterProviders: [],
+      diagnoses: [],
+      resourceVersion: '1.9',
+    },
+    dispositionObsGroup: {
+      uuid: 'test-obs-group-uuid',
+      concept: { uuid: 'test-concept-uuid' },
+      value: null,
+      obsDatetime: '2023-10-16T10:30:00.000+0000',
+    },
+    visit: {
+      uuid: 'test-visit-uuid',
+      startDatetime: '2023-10-16T10:00:00.000+0000',
+      encounters: [],
+    },
+  },
+  {
+    patient: {
+      uuid: 'test-patient-uuid-2',
+      person: {
+        uuid: 'test-person-uuid-2',
+        age: 42,
+        dead: false,
+        display: 'Jane Smith',
+        causeOfDeath: '',
+        gender: 'F',
+        deathDate: '',
+        attributes: [],
+      },
+      identifiers: [{ uuid: 'test-identifier-uuid-2' }],
+    },
+    dispositionLocation: {
+      uuid: 'test-location-uuid-2',
+      display: 'Ward B',
+    },
+    dispositionType: 'ADMIT',
+    disposition: {
+      uuid: 'test-disposition-uuid-2',
+      display: 'Admit to ICU',
+      answers: [],
+    },
+    dispositionEncounter: {
+      uuid: 'test-encounter-uuid-2',
+      encounterDatetime: '2023-10-15T14:30:00.000+0000',
+      patient: { uuid: 'test-patient-uuid-2' },
+      location: { uuid: 'test-location-uuid-2' },
+      form: {
+        name: 'Admission Form',
+        uuid: 'test-form-uuid',
+        version: '1.0',
+        published: true,
+        retired: false,
+        resources: [],
+        encounterType: {
+          uuid: 'test-encounter-type-uuid',
+          name: 'Admission',
+          viewPrivilege: null,
+          editPrivilege: null,
+        },
+      },
+      encounterType: { uuid: 'test-encounter-type-uuid', name: 'Admission', display: 'Admission' },
+      obs: [],
+      orders: [],
+      voided: false,
+      auditInfo: {
+        creator: { uuid: 'test-creator-uuid', display: 'Admin' },
+        dateCreated: '2023-10-15T14:30:00.000+0000',
+        changedBy: null,
+        dateChanged: null,
+      },
+      visit: {
+        uuid: 'test-visit-uuid-2',
+        startDatetime: '2023-10-15T14:00:00.000+0000',
+        encounters: [],
+      },
+      encounterProviders: [],
+      diagnoses: [],
+      resourceVersion: '1.9',
+    },
+    dispositionObsGroup: {
+      uuid: 'test-obs-group-uuid-2',
+      concept: { uuid: 'test-concept-uuid' },
+      value: null,
+      obsDatetime: '2023-10-15T14:30:00.000+0000',
+    },
+    visit: {
+      uuid: 'test-visit-uuid-2',
+      startDatetime: '2023-10-15T14:00:00.000+0000',
+      encounters: [],
+    },
+  },
+];
+
+describe('AdmissionRequest', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('should render loading skeleton when data is loading', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: [],
+      isLoading: true,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    const loadingSkeleton = screen.getByRole('table');
+    expect(loadingSkeleton).toBeInTheDocument();
+    expect(loadingSkeleton).toHaveClass('cds--skeleton cds--data-table');
+  });
+
+  test('should render error state when there is an error', () => {
+    const errorMessage = 'Failed to fetch admission requests';
+    const error = new Error(errorMessage);
+
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: [],
+      isLoading: false,
+      error: error,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    expect(screen.getByText(/Admission Request/i)).toBeInTheDocument();
+  });
+
+  test('should render empty state when there are no admission requests', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: [],
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    // Check for the header title
+    expect(screen.getByText(/Admission Request/i)).toBeInTheDocument();
+    // Check for the empty state button
+    expect(screen.getByRole('button')).toBeInTheDocument();
+  });
+
+  test('should launch admission request form when clicking add button in empty state', async () => {
+    const user = userEvent.setup();
+
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: [],
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    const addButton = screen.getByRole('button');
+    await user.click(addButton);
+
+    expect(mockLaunchWorkspace).toHaveBeenCalledWith('patient-form-entry-workspace', {
+      workspaceTitle: 'Admission Request',
+      mutateForm: mockMutate,
+      formInfo: {
+        formUuid: 'test-admission-form-uuid',
+        encounterUuid: '',
+      },
+    });
+  });
+
+  test('should render admission requests table with data', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    // Check table headers
+    expect(screen.getByText('Request Datetime')).toBeInTheDocument();
+    expect(screen.getByText('Admission Location')).toBeInTheDocument();
+    expect(screen.getByText('Admission Type')).toBeInTheDocument();
+    expect(screen.getByText('Disposition')).toBeInTheDocument();
+
+    // Check table data
+    expect(screen.getByText('Ward A')).toBeInTheDocument();
+    expect(screen.getByText('Ward B')).toBeInTheDocument();
+    expect(screen.getByText('Admit to hospital')).toBeInTheDocument();
+    expect(screen.getByText('Admit to ICU')).toBeInTheDocument();
+    expect(screen.getAllByText('ADMIT')).toHaveLength(2);
+  });
+
+  it('should render Add button in header when data is available', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    const addButton = screen.getByRole('button', { name: /Add/i });
+    expect(addButton).toBeInTheDocument();
+  });
+
+  it('should launch admission request form when clicking Add button', async () => {
+    const user = userEvent.setup();
+
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    const addButton = screen.getByRole('button', { name: /Add/i });
+    await user.click(addButton);
+
+    expect(mockLaunchWorkspace).toHaveBeenCalledWith('patient-form-entry-workspace', {
+      workspaceTitle: 'Admission Request',
+      mutateForm: mockMutate,
+      formInfo: {
+        formUuid: 'test-admission-form-uuid',
+        encounterUuid: '',
+      },
+    });
+  });
+
+  test('should format dates correctly in the table', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    expect(mockFormatDatetime).toHaveBeenCalled();
+    expect(screen.getAllByText('2023-10-16 10:30 AM')).toHaveLength(2);
+  });
+
+  test('should render table with correct number of rows', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    const tableRows = screen.getAllByRole('row');
+    // 1 header row + 2 data rows
+    expect(tableRows).toHaveLength(3);
+  });
+
+  test('should handle missing disposition location gracefully', () => {
+    const dataWithMissingLocation = [
+      {
+        ...mockAdmissionRequestData[0],
+        dispositionLocation: undefined,
+      },
+    ];
+
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: dataWithMissingLocation,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    // Should still render table
+    expect(screen.getByText('Request Datetime')).toBeInTheDocument();
+    expect(screen.getByText('Admission Location')).toBeInTheDocument();
+  });
+
+  test('should transform admission request data correctly', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    // Verify that all expected data is displayed
+    const expectedLocations = ['Ward A', 'Ward B'];
+    const expectedDispositions = ['Admit to hospital', 'Admit to ICU'];
+
+    expectedLocations.forEach((location) => {
+      expect(screen.getByText(location)).toBeInTheDocument();
+    });
+
+    expectedDispositions.forEach((disposition) => {
+      expect(screen.getByText(disposition)).toBeInTheDocument();
+    });
+  });
+
+  test('should call useAdmissionRequest with correct patient UUID', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: [],
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    expect(mockUseAdmissionRequest).toHaveBeenCalledWith(patientUuid);
+  });
+
+  test('should render table headers in correct order', () => {
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    const headers = screen.getAllByRole('columnheader');
+    expect(headers[0]).toHaveTextContent('Request Datetime');
+    expect(headers[1]).toHaveTextContent('Admission Location');
+    expect(headers[2]).toHaveTextContent('Admission Type');
+    expect(headers[3]).toHaveTextContent('Disposition');
+  });
+
+  test('should use tablet size for non-desktop layouts', () => {
+    mockIsDesktop.mockReturnValue(false);
+    mockUseLayoutType.mockReturnValue('tablet' as any);
+
+    mockUseAdmissionRequest.mockReturnValue({
+      admissionRequest: mockAdmissionRequestData,
+      isLoading: false,
+      error: undefined,
+      mutate: mockMutate,
+    });
+
+    render(<AdmissionRequest patientUuid={patientUuid} />);
+
+    // Verify the table is still rendered correctly
+    const table = screen.getByRole('table');
+    expect(table).toBeInTheDocument();
+  });
+});