@openmrs/esm-active-visits-app 8.3.2-pre.5010 → 8.3.2-pre.5021

package/dist/openmrs-esm-active-visits-app.js.buildmanifest.json

@@ -6,9 +6,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: defaultVendors)",
-      "size": 4901276,
+      "size": 4920533,
       "sizes": {
-        "javascript": 4901276
+        "javascript": 4920533
       },
       "names": [],
       "idHints": [
@@ -24,7 +24,7 @@
       "auxiliaryFiles": [
         "130.js.map"
       ],
-      "hash": "7d83e983f149ed14",
+      "hash": "0158ec9da6a1f5b3",
       "childrenByOrder": {}
     },
     {
@@ -52,7 +52,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "a5bbf2f10d8260bc",
+      "hash": "ccf297aebd1f7aec",
       "childrenByOrder": {}
     },
     {
@@ -125,7 +125,7 @@
       "auxiliaryFiles": [
         "460.js.map"
       ],
-      "hash": "f59e40333f51aaa7",
+      "hash": "5b2f109b089fd4a3",
       "childrenByOrder": {}
     },
     {
@@ -267,7 +267,7 @@
       "auxiliaryFiles": [
         "1793.js.map"
       ],
-      "hash": "6f8188af2993f660",
+      "hash": "93fdfec6e0fd98c8",
       "childrenByOrder": {}
     },
     {
@@ -275,9 +275,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 34723,
+      "size": 36006,
       "sizes": {
-        "javascript": 34723
+        "javascript": 36006
       },
       "names": [],
       "idHints": [],
@@ -291,7 +291,7 @@
       "auxiliaryFiles": [
         "1814.js.map"
       ],
-      "hash": "3d556c5c1aa16ce0",
+      "hash": "9ba6f44ba82575ba",
       "childrenByOrder": {}
     },
     {
@@ -518,7 +518,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-active-visits-app.js.map"
       ],
-      "hash": "000046d4c2045794",
+      "hash": "8e3d69e4e8eb3932",
       "childrenByOrder": {}
     },
     {
@@ -526,9 +526,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 36006,
+      "size": 34723,
       "sizes": {
-        "javascript": 36006
+        "javascript": 34723
       },
       "names": [],
       "idHints": [],
@@ -542,7 +542,7 @@
       "auxiliaryFiles": [
         "4233.js.map"
       ],
-      "hash": "d5eca54ba9c9a2b1",
+      "hash": "b6be8170db2217cf",
       "childrenByOrder": {}
     },
     {
@@ -903,9 +903,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 92395,
+      "size": 92439,
       "sizes": {
-        "javascript": 92353,
+        "javascript": 92397,
         "consume-shared": 42
       },
       "names": [],
@@ -920,7 +920,7 @@
       "auxiliaryFiles": [
         "7401.js.map"
       ],
-      "hash": "6aa336cbc7b2fae3",
+      "hash": "fbc10407b6643026",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"active-visits-widget","slot":"homepage-widgets-slot","component":"activeVisits","order":0},{"name":"visit-summary-widget","slot":"visit-summary-slot","component":"visitDetail"},{"name":"active-visits-tile","slot":"home-metrics-tiles-slot","component":"homeActiveVisitsTile"},{"name":"total-visits-tile","slot":"home-metrics-tiles-slot","component":"homeTotalVisitsTile"}],"pages":[],"version":"8.3.2-pre.5010"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"active-visits-widget","slot":"homepage-widgets-slot","component":"activeVisits","order":0},{"name":"visit-summary-widget","slot":"visit-summary-slot","component":"visitDetail"},{"name":"active-visits-tile","slot":"home-metrics-tiles-slot","component":"homeActiveVisitsTile"},{"name":"total-visits-tile","slot":"home-metrics-tiles-slot","component":"homeTotalVisitsTile"}],"pages":[],"version":"8.3.2-pre.5021"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-active-visits-app",
-  "version": "8.3.2-pre.5010",
+  "version": "8.3.2-pre.5021",
   "description": "Active visits widget microfrontend for O3",
   "browser": "dist/openmrs-esm-active-visits-app.js",
   "main": "src/index.ts",

package/src/active-visits-widget/active-visits.resource.tsx

@@ -68,8 +68,9 @@ export function useActiveVisits() {
 
   const mapVisitProperties = (visit: Visit): ActiveVisit => {
     // create base object
+    const age = visit?.patient?.person?.age;
     const activeVisits: ActiveVisit = {
-      age: visit?.patient?.person?.age,
+      age: age ? String(age) : null,
       id: visit.uuid,
       idNumber: null,
       gender: visit?.patient?.person?.gender,

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

@@ -1,13 +1,12 @@
-import React, { useMemo, useState } from 'react';
+import { ContentSwitcher, DataTableSkeleton, Switch } from '@carbon/react';
+import { formatDatetime, formatTime, parseDate } from '@openmrs/esm-framework';
 import classNames from 'classnames';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ContentSwitcher, DataTableSkeleton, Switch } from '@carbon/react';
+import styles from './visit-detail-overview.scss';
 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';
 
 interface VisitDetailComponentProps {
   visitUuid: string;
@@ -22,7 +21,7 @@ const VisitDetailComponent: React.FC<VisitDetailComponentProps> = ({ visitUuid,
   const encounters = useMemo(
     () =>
       visit
-        ? visit?.encounters?.map((encounter: Encounter) => ({
+        ? visit?.encounters?.map((encounter) => ({
             id: encounter.uuid,
             time: formatTime(parseDate(encounter.encounterDateTime)),
             encounterType: encounter.encounterType.display,

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

@@ -1,6 +1,3 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react';
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
 import {
   DataTable,
   Table,
@@ -14,10 +11,12 @@ import {
   TableHeader,
   TableRow,
 } from '@carbon/react';
-import { isDesktop, useLayoutType } from '@openmrs/esm-framework';
-import { type Observation } from '../../types';
-import EncounterObservations from './encounter-observations.component';
+import { isDesktop, type Obs, useLayoutType } from '@openmrs/esm-framework';
+import classNames from 'classnames';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import styles from '../visit-detail-overview.scss';
+import EncounterObservations from './encounter-observations.component';
 
 interface EncounterListProps {
   encounters: Array<{
@@ -25,7 +24,7 @@ interface EncounterListProps {
     time: any;
     encounterType: string;
     provider: string;
-    obs: Array<Observation>;
+    obs: Array<Obs>;
   }>;
   visitUuid: string;
 }

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

@@ -1,12 +1,12 @@
-import React, { useMemo } from 'react';
+import { SkeletonText } from '@carbon/react';
+import { type Obs } from '@openmrs/esm-api/src';
 import classNames from 'classnames';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SkeletonText } from '@carbon/react';
-import { type Observation } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 interface EncounterObservationsProps {
-  observations: Array<Observation>;
+  observations: Array<Obs>;
 }
 
 const EncounterObservations: React.FC<EncounterObservationsProps> = ({ observations }) => {
@@ -15,7 +15,7 @@ const EncounterObservations: React.FC<EncounterObservationsProps> = ({ observati
   const observationsList = useMemo(() => {
     return (
       observations &&
-      observations.map((obs: Observation) => {
+      observations.map((obs) => {
         const [question, answer] = obs.display.split(':');
         return { question, answer };
       })