@kenyaemr/esm-active-visits-app 8.1.1-pre.129 → 8.1.2-pre.152

package/src/types/index.ts

@@ -1,4 +1,4 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
+import { type OpenmrsResource, type Visit } from '@openmrs/esm-framework';
 
 export interface SearchedPatient {
   patientId: number;
@@ -28,3 +28,158 @@ export interface Identifier {
   preferred: boolean;
   voided: boolean;
 }
+
+export interface Encounter {
+  uuid: string;
+  encounterDateTime: string;
+  encounterProviders: Array<{
+    uuid: string;
+    display: string;
+    encounterRole: {
+      uuid: string;
+      display: string;
+    };
+    provider: {
+      uuid: string;
+      person: {
+        uuid: string;
+        display: string;
+      };
+    };
+  }>;
+  encounterType: {
+    uuid: string;
+    display: string;
+  };
+  obs: Array<Observation>;
+  orders: Array<Order>;
+}
+
+export interface EncounterProvider {
+  uuid: string;
+  display: string;
+  encounterRole: {
+    uuid: string;
+    display: string;
+  };
+  provider: {
+    uuid: string;
+    person: {
+      uuid: string;
+      display: string;
+    };
+  };
+}
+
+export interface Observation {
+  uuid: string;
+  concept: {
+    uuid: string;
+    display: string;
+    conceptClass: {
+      uuid: string;
+      display: string;
+    };
+  };
+  display: string;
+  groupMembers: null | Array<{
+    uuid: string;
+    concept: {
+      uuid: string;
+      display: string;
+    };
+    value: {
+      uuid: string;
+      display: string;
+    };
+  }>;
+  value: any;
+  obsDatetime: string;
+}
+
+export interface Order {
+  uuid: string;
+  dateActivated: string;
+  dateStopped?: Date | null;
+  dose: number;
+  dosingInstructions: string | null;
+  dosingType?: 'org.openmrs.FreeTextDosingInstructions' | 'org.openmrs.SimpleDosingInstructions';
+  doseUnits: {
+    uuid: string;
+    display: string;
+  };
+  drug: {
+    uuid: string;
+    name: string;
+    strength: string;
+    display: string;
+  };
+  duration: number;
+  durationUnits: {
+    uuid: string;
+    display: string;
+  };
+  frequency: {
+    uuid: string;
+    display: string;
+  };
+  numRefills: number;
+  orderNumber: string;
+  orderReason: string | null;
+  orderReasonNonCoded: string | null;
+  orderer: {
+    uuid: string;
+    person: {
+      uuid: string;
+      display: string;
+    };
+  };
+  orderType: {
+    uuid: string;
+    display: string;
+  };
+  route: {
+    uuid: string;
+    display: string;
+  };
+  quantity: number;
+  quantityUnits: OpenmrsResource;
+}
+
+export interface Note {
+  note: string;
+  provider: {
+    name: string;
+    role: string;
+  };
+  time: string;
+}
+
+export interface OrderItem {
+  order: Order;
+  provider: {
+    name: string;
+    role: string;
+  };
+}
+
+export interface ActiveVisit {
+  age: string;
+  id: string;
+  idNumber: string;
+  gender: string;
+  location: string;
+  name: string;
+  patientUuid: string;
+  visitStartTime: string;
+  visitType: string;
+  visitUuid: string;
+  observations?: Record<string, Observation[]>;
+  [identifier: string]: string | Record<string, Observation[]>;
+}
+
+export interface VisitResponse {
+  results: Array<Visit>;
+  links: Array<{ rel: 'prev' | 'next' }>;
+  totalCount: number;
+}

package/src/visits-summary/visit-detail.component.tsx

@@ -2,8 +2,9 @@ import React, { useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { ContentSwitcher, DataTableSkeleton, Switch } from '@carbon/react';
-import { type Encounter, useVisit } from './visit.resource';
-import { formatTime, formatDatetime, parseDate } from '@openmrs/esm-framework';
+import { useVisit } from './visit.resource';
+import { type Encounter } from '../types';
+import { formatDatetime, formatTime, parseDate } from '@openmrs/esm-framework';
 import EncounterList from './visits-components/encounter-list.component';
 import VisitSummary from './visits-components/visit-summary.component';
 import styles from './visit-detail-overview.scss';

package/src/visits-summary/visit-detail.test.tsx

@@ -1,21 +1,23 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { formatDate } from '@openmrs/esm-framework';
 import { useVisit } from './visit.resource';
 import VisitDetailComponent from './visit-detail.component';
 
+const mockUseVisit = jest.mocked(useVisit);
 const defaultProps = {
   patientUuid: '691eed12-c0f1-11e2-94be-8c13b969e334',
   visitUuid: '497b8b17-54ec-4726-87ec-3c4da8cdcaeb',
 };
-const mockUseVisit = jest.mocked(useVisit);
 
-jest.mock('./visit.resource');
+jest.mock('./visit.resource', () => ({
+  ...jest.requireActual('./visit.resource'),
+  useVisit: jest.fn(),
+}));
 
 describe('VisitDetail', () => {
   it('renders a loading spinner when data is loading', () => {
-    mockUseVisit.mockReturnValueOnce({
+    mockUseVisit.mockReturnValue({
       visit: null,
       error: undefined,
       isLoading: true,
@@ -29,7 +31,8 @@ describe('VisitDetail', () => {
 
   it('renders a visit detail overview when data is available', () => {
     const mockVisitDate = new Date();
-    mockUseVisit.mockReturnValueOnce({
+
+    mockUseVisit.mockReturnValue({
       visit: {
         encounters: [],
         startDatetime: mockVisitDate.toISOString(),
@@ -43,13 +46,14 @@ describe('VisitDetail', () => {
 
     render(<VisitDetailComponent {...defaultProps} />);
 
-    expect(screen.getByText(/Some Visit Type/)).toBeInTheDocument();
-    expect(screen.getByText(formatDate(mockVisitDate), { collapseWhitespace: false })).toBeInTheDocument();
-    expect(screen.getByText('All Encounters')).toBeInTheDocument();
-    expect(screen.getByText('Visit Summary')).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: /some visit type/i })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: /no encounters found/i })).toBeInTheDocument();
+    expect(screen.getByText(/there is no information to display here/i)).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /all encounters/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /visit summary/i })).toBeInTheDocument();
   });
 
-  it('render the Encounter Lists view when the "All Encounters" tab is clicked', async () => {
+  it('renders the Encounter Lists view when the "All Encounters" tab is clicked', async () => {
     const user = userEvent.setup();
 
     mockUseVisit.mockReturnValue({
@@ -74,8 +78,12 @@ describe('VisitDetail', () => {
 
     render(<VisitDetailComponent {...defaultProps} />);
 
-    await user.click(screen.getByText('All Encounters'));
-    expect(screen.getByTestId('encountersTable')).toBeInTheDocument();
+    await user.click(screen.getByRole('tab', { name: /all encounters/i }));
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /time/i })).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /encounter type/i })).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /provider/i })).toBeInTheDocument();
+    expect(screen.getByRole('row', { name: /12:34 pm encounter type/i })).toBeInTheDocument();
   });
 
   it('renders the Visit Summaries view when the "Visit Summary" tab is clicked', async () => {
@@ -112,7 +120,12 @@ describe('VisitDetail', () => {
 
     render(<VisitDetailComponent {...defaultProps} />);
 
-    await user.click(screen.getByText('Visit Summary'));
-    expect(screen.getByRole('tablist', { name: 'Visit summary tabs' })).toBeInTheDocument();
+    await user.click(screen.getByRole('tab', { name: /visit summary/i }));
+    expect(screen.getByRole('tablist', { name: /visit summary tabs/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /notes/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /tests/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /medications/i })).toBeInTheDocument();
+    expect(screen.getByText(/no diagnoses found/i)).toBeInTheDocument();
+    expect(screen.getByText(/there are no notes to display for this patient/i)).toBeInTheDocument();
   });
 });

package/src/visits-summary/visit.resource.ts

@@ -1,139 +1,5 @@
 import useSWR from 'swr';
-import { openmrsFetch, restBaseUrl, type OpenmrsResource, type Visit } from '@openmrs/esm-framework';
-
-export interface Encounter {
-  uuid: string;
-  encounterDateTime: string;
-  encounterProviders: Array<{
-    uuid: string;
-    display: string;
-    encounterRole: {
-      uuid: string;
-      display: string;
-    };
-    provider: {
-      uuid: string;
-      person: {
-        uuid: string;
-        display: string;
-      };
-    };
-  }>;
-  encounterType: {
-    uuid: string;
-    display: string;
-  };
-  obs: Array<Observation>;
-  orders: Array<Order>;
-}
-
-export interface EncounterProvider {
-  uuid: string;
-  display: string;
-  encounterRole: {
-    uuid: string;
-    display: string;
-  };
-  provider: {
-    uuid: string;
-    person: {
-      uuid: string;
-      display: string;
-    };
-  };
-}
-
-export interface Observation {
-  uuid: string;
-  concept: {
-    uuid: string;
-    display: string;
-    conceptClass: {
-      uuid: string;
-      display: string;
-    };
-  };
-  display: string;
-  groupMembers: null | Array<{
-    uuid: string;
-    concept: {
-      uuid: string;
-      display: string;
-    };
-    value: {
-      uuid: string;
-      display: string;
-    };
-  }>;
-  value: any;
-  obsDatetime: string;
-}
-
-export interface Order {
-  uuid: string;
-  dateActivated: string;
-  dateStopped?: Date | null;
-  dose: number;
-  dosingInstructions: string | null;
-  dosingType?: 'org.openmrs.FreeTextDosingInstructions' | 'org.openmrs.SimpleDosingInstructions';
-  doseUnits: {
-    uuid: string;
-    display: string;
-  };
-  drug: {
-    uuid: string;
-    name: string;
-    strength: string;
-    display: string;
-  };
-  duration: number;
-  durationUnits: {
-    uuid: string;
-    display: string;
-  };
-  frequency: {
-    uuid: string;
-    display: string;
-  };
-  numRefills: number;
-  orderNumber: string;
-  orderReason: string | null;
-  orderReasonNonCoded: string | null;
-  orderer: {
-    uuid: string;
-    person: {
-      uuid: string;
-      display: string;
-    };
-  };
-  orderType: {
-    uuid: string;
-    display: string;
-  };
-  route: {
-    uuid: string;
-    display: string;
-  };
-  quantity: number;
-  quantityUnits: OpenmrsResource;
-}
-
-export interface Note {
-  note: string;
-  provider: {
-    name: string;
-    role: string;
-  };
-  time: string;
-}
-
-export interface OrderItem {
-  order: Order;
-  provider: {
-    name: string;
-    role: string;
-  };
-}
+import { openmrsFetch, restBaseUrl, type Visit } from '@openmrs/esm-framework';
 
 export function useVisit(visitUuid: string) {
   const customRepresentation =

package/src/visits-summary/visits-components/encounter-list.component.tsx

@@ -1,21 +1,21 @@
-import React, { useEffect, useState, useMemo, useRef } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import {
   DataTable,
-  TableContainer,
   Table,
-  TableHead,
-  TableExpandHeader,
-  TableRow,
-  TableHeader,
   TableBody,
-  TableExpandRow,
   TableCell,
+  TableContainer,
   TableExpandedRow,
+  TableExpandHeader,
+  TableExpandRow,
+  TableHead,
+  TableHeader,
+  TableRow,
 } from '@carbon/react';
-import { useLayoutType, isDesktop } from '@openmrs/esm-framework';
-import { type Observation } from '../visit.resource';
+import { isDesktop, useLayoutType } from '@openmrs/esm-framework';
+import { type Observation } from '../../types';
 import EncounterObservations from './encounter-observations.component';
 import styles from '../visit-detail-overview.scss';
 

package/src/visits-summary/visits-components/encounter-observations.component.tsx

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { SkeletonText } from '@carbon/react';
-import { type Observation } from '../visit.resource';
+import { type Observation } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 interface EncounterObservationsProps {

package/src/visits-summary/visits-components/encounter-observations.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { type Observation } from '../visit.resource';
+import { type Observation } from '../../types';
 import EncounterObservations from './encounter-observations.component';
 
 describe('EncounterObservations', () => {

package/src/visits-summary/visits-components/medications-summary.component.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import capitalize from 'lodash-es/capitalize';
 import { useTranslation } from 'react-i18next';
 import { formatDate, formatTime, parseDate } from '@openmrs/esm-framework';
-import { type OrderItem, getDosage } from '../visit.resource';
+import { type OrderItem } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 interface MedicationSummaryProps {

package/src/visits-summary/visits-components/notes-summary.component.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Layer, Tile } from '@carbon/react';
 import { isDesktop, useLayoutType } from '@openmrs/esm-framework';
-import type { Note } from '../visit.resource';
+import type { Note } from '../../types';
 import { EmptyDataIllustration } from '../../active-visits-widget/empty-data-illustration.component';
 import styles from '../visit-detail-overview.scss';
 

package/src/visits-summary/visits-components/tests-summary.component.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { ExtensionSlot } from '@openmrs/esm-framework';
-import { type Encounter } from '../visit.resource';
+import { type Encounter } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 const TestsSummary = ({ patientUuid, encounters }: { patientUuid: string; encounters: Array<Encounter> }) => {

package/src/visits-summary/visits-components/visit-summary.component.tsx

@@ -1,12 +1,12 @@
-import React, { useState, useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
-import { Tab, Tabs, TabList, TabPanel, TabPanels, Tag } from '@carbon/react';
-import { type OpenmrsResource, formatTime, parseDate } from '@openmrs/esm-framework';
+import { Tab, TabList, TabPanel, TabPanels, Tabs, Tag } from '@carbon/react';
+import { formatTime, type OpenmrsResource, parseDate } from '@openmrs/esm-framework';
 import NotesSummary from './notes-summary.component';
 import MedicationSummary from './medications-summary.component';
 import TestsSummary from './tests-summary.component';
-import { type Order, type Encounter, type Note, type Observation, type OrderItem } from '../visit.resource';
+import type { Encounter, Note, Observation, Order, OrderItem } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 interface DiagnosisItem {

package/translations/ar.json

@@ -6,31 +6,31 @@
   "diagnoses": "التشخيصات",
   "dose": "الجرعة",
   "encounterType": "نوع اللقاء",
-  "endDate": "End date",
+  "endDate": "تاريخ النهاية",
   "filterTable": "فلتر الجدول",
   "gender": "الجنس",
   "idNumber": "رقم الهوية",
-  "indication": "Indication",
+  "indication": "اشارة",
   "medications": "الأدوية",
   "name": "الاسم",
   "noActiveVisitsForLocation": "لا توجد زيارات نشطة لعرضها لهذا الموقع.",
   "noDiagnosesFound": "لم يتم العثور على تشخيصات",
   "noEncountersFound": "لم يتم العثور على لقاءات",
   "noMedicationsFound": "لم يتم العثور على أدوية",
-  "noNotesToShowForPatient": "There are no notes to display for this patient",
+  "noNotesToShowForPatient": "لايوجد ملاحظات لعرضها لهذا المريض",
   "noObservationsFound": "لم يتم العثور على ملاحظات",
   "notes": "الملاحظات",
   "noVisitsToDisplay": "لا زيارات للعرض",
   "orderDurationAndUnit": "لمدة {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "مدة غير محددة",
-  "patients": "Patients",
+  "patients": "مرضى",
   "provider": "مقدم الخدمة",
-  "quantity": "Quantity",
+  "quantity": "الكمية",
   "refills": "إعادة التعبئة",
   "tests": "الاختبارات",
   "thereIsNoInformationToDisplayHere": "لا توجد معلومات لعرضها هنا",
   "time": "الوقت",
-  "totalVisits": "Total Visits Today",
+  "totalVisits": "عدد الزيارات اليوم",
   "visitStartTime": "وقت الزيارة",
   "visitSummary": "ملخص الزيارة",
   "visitType": "نوع الزيارة"

package/translations/de.json

@@ -0,0 +1,37 @@
+{
+  "activeVisits": "Active Visits",
+  "age": "Age",
+  "allEncounters": "All Encounters",
+  "checkFilters": "Check the filters above",
+  "diagnoses": "Diagnoses",
+  "dose": "Dose",
+  "encounterType": "Encounter Type",
+  "endDate": "End date",
+  "filterTable": "Filter table",
+  "gender": "Gender",
+  "idNumber": "ID Number",
+  "indication": "Indication",
+  "medications": "Medications",
+  "name": "Name",
+  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noMedicationsFound": "No medications found",
+  "noNotesToShowForPatient": "There are no notes to display for this patient",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "noVisitsToDisplay": "No visits to display",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "patients": "Patients",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "refills": "Refills",
+  "tests": "Tests",
+  "thereIsNoInformationToDisplayHere": "There is no information to display here",
+  "time": "Time",
+  "totalVisits": "Total Visits Today",
+  "visitStartTime": "Visit Time",
+  "visitSummary": "Visit Summary",
+  "visitType": "Visit Type"
+}

package/translations/es.json

@@ -1,5 +1,5 @@
 {
-  "activeVisits": "Visitas Activas",
+  "activeVisits": "Consultas Activas",
   "age": "Edad",
   "allEncounters": "Todos Los Encuentros",
   "checkFilters": "Compruebe los filtros anteriores",
@@ -9,29 +9,29 @@
   "endDate": "Fecha de finalización",
   "filterTable": "Filtrar la tabla",
   "gender": "Género",
-  "idNumber": "Número ID",
+  "idNumber": "Número de ID",
   "indication": "Indicación",
-  "medications": "Medicaciones",
+  "medications": "Medicamentos",
   "name": "Nombre",
-  "noActiveVisitsForLocation": "No hay visitas activas para esta ubicación.",
+  "noActiveVisitsForLocation": "No hay visitas activas para mostrar para esta ubicación.",
   "noDiagnosesFound": "No se encontraron diagnósticos",
   "noEncountersFound": "No se encontraron encuentros",
   "noMedicationsFound": "No se encontraron medicamentos",
   "noNotesToShowForPatient": "No hay notas para mostrar para este paciente",
   "noObservationsFound": "No se encontraron observaciones",
   "notes": "Notas",
-  "noVisitsToDisplay": "No hay visitas para mostrar",
+  "noVisitsToDisplay": "No hay consultas para mostrar",
   "orderDurationAndUnit": "por {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Duración indefinida",
   "patients": "Pacientes",
-  "provider": "Proveedor",
+  "provider": "Personal de la Salud",
   "quantity": "Cantidad",
-  "refills": "Reposiciones",
+  "refills": "Reabastecimientos",
   "tests": "Pruebas",
   "thereIsNoInformationToDisplayHere": "No hay información para mostrar aquí",
   "time": "Hora",
-  "totalVisits": "Total de Visitas Hoy",
-  "visitStartTime": "Tiempo de Visita",
-  "visitSummary": "Resumen de Visita",
-  "visitType": "Tipo de Visita"
+  "totalVisits": "Total de Consultas Hoy",
+  "visitStartTime": "Tiempo de la Consulta",
+  "visitSummary": "Resumen de la Consulta",
+  "visitType": "Tipo de Consulta"
 }

package/translations/hi.json

@@ -0,0 +1,37 @@
+{
+  "activeVisits": "Active Visits",
+  "age": "Age",
+  "allEncounters": "All Encounters",
+  "checkFilters": "Check the filters above",
+  "diagnoses": "Diagnoses",
+  "dose": "Dose",
+  "encounterType": "Encounter Type",
+  "endDate": "End date",
+  "filterTable": "Filter table",
+  "gender": "Gender",
+  "idNumber": "ID Number",
+  "indication": "Indication",
+  "medications": "Medications",
+  "name": "Name",
+  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noMedicationsFound": "No medications found",
+  "noNotesToShowForPatient": "There are no notes to display for this patient",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "noVisitsToDisplay": "No visits to display",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "patients": "Patients",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "refills": "Refills",
+  "tests": "Tests",
+  "thereIsNoInformationToDisplayHere": "There is no information to display here",
+  "time": "Time",
+  "totalVisits": "Total Visits Today",
+  "visitStartTime": "Visit Time",
+  "visitSummary": "Visit Summary",
+  "visitType": "Visit Type"
+}