@openmrs/esm-active-visits-app 3.0.2-pre.316 → 3.0.2-pre.339

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

@@ -225,9 +225,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 92092,
+      "size": 92115,
       "sizes": {
-        "javascript": 92092
+        "javascript": 92115
       },
       "names": [],
       "idHints": [],
@@ -240,7 +240,7 @@
       "auxiliaryFiles": [
         "415.js.map"
       ],
-      "hash": "8e03203385757861d126",
+      "hash": "e621859cbec0364fb02c",
       "childrenByOrder": {}
     },
     {
@@ -392,10 +392,10 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 95854,
+      "size": 95886,
       "sizes": {
         "consume-shared": 42,
-        "javascript": 95812
+        "javascript": 95844
       },
       "names": [],
       "idHints": [],
@@ -408,7 +408,7 @@
       "auxiliaryFiles": [
         "897.js.map"
       ],
-      "hash": "fc2544f3f294147fa10a",
+      "hash": "ccc49cdb974163fd1890",
       "childrenByOrder": {}
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-active-visits-app",
-  "version": "3.0.2-pre.316",
+  "version": "3.0.2-pre.339",
   "description": "Active visits widget microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-active-visits-app.js",
   "main": "src/index.ts",
@@ -51,5 +51,5 @@
     "react-router-dom": "5.x",
     "rxjs": "6.x"
   },
-  "gitHead": "7aee30564f89d38d684348575a23d31af5650c1f"
+  "gitHead": "aed64eca1589e28b4f53a49475dfce8d047fac31"
 }

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

@@ -28,9 +28,9 @@ import {
   parseDate,
 } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
+import { EmptyDataIllustration } from './empty-data-illustration.component';
 import { ActiveVisit, useActiveVisits } from './active-visits.resource';
 import styles from './active-visits.scss';
-import { EmptyDataIllustration } from './empty-data-illustration.component';
 
 interface PaginationData {
   goTo: (page: number) => void;
@@ -42,11 +42,9 @@ const ActiveVisitsTable = () => {
   const { t } = useTranslation();
   const config = useConfig();
   const layout = useLayoutType();
-
   const { data: activeVisits, isError, isLoading, isValidating } = useActiveVisits();
-
   const desktopView = layout === 'desktop';
-  const pageSizes = config?.activeVisits?.pageSizes ?? [10, 20, 50];
+  const pageSizes = config?.activeVisits?.pageSizes ?? [10, 20, 30, 40, 50];
   const [currentPageSize, setPageSize] = useState(config?.activeVisits?.pageSize ?? 10);
   const [searchString, setSearchString] = useState('');
 

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

@@ -1,6 +1,6 @@
 import useSWR from 'swr';
-import { openmrsFetch, Visit, SessionUser } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
+import { openmrsFetch, Visit, SessionUser } from '@openmrs/esm-framework';
 
 export interface ActiveVisit {
   age: string;
@@ -17,8 +17,8 @@ export interface ActiveVisit {
 
 export function useActiveVisits() {
   const { data: currentUserSession } = useCurrentSession();
-  const sessionLocation = currentUserSession?.data?.sessionLocation?.uuid;
   const startDate = dayjs().format('YYYY-MM-DD');
+  const sessionLocation = currentUserSession?.data?.sessionLocation?.uuid;
 
   const customRepresentation =
     'custom:(uuid,patient:(uuid,identifiers:(identifier,uuid),person:(age,display,gender,uuid)),' +
@@ -27,11 +27,8 @@ export function useActiveVisits() {
     startDate +
     '&location=' +
     sessionLocation;
-
-  const { data, error, isValidating } = useSWR<{ data: { results: Array<Visit> } }, Error>(
-    `/ws/rest/v1/visit?includeInactive=false&v=${customRepresentation}`,
-    openmrsFetch,
-  );
+  const url = `/ws/rest/v1/visit?includeInactive=false&v=${customRepresentation}`;
+  const { data, error, isValidating } = useSWR<{ data: { results: Array<Visit> } }, Error>(url, openmrsFetch);
 
   const mapVisitProperties = (visit: Visit): ActiveVisit => ({
     age: visit?.patient?.person?.age,
@@ -41,7 +38,7 @@ export function useActiveVisits() {
     location: visit?.location?.uuid,
     name: visit?.patient?.person?.display,
     patientUuid: visit?.patient?.uuid,
-    visitStartTime: visit.startDate,
+    visitStartTime: visit?.startDatetime,
     visitType: visit?.visitType?.display,
     visitUuid: visit.uuid,
   });

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

@@ -15,8 +15,7 @@ interface VisitDetailComponentProps {
 const VisitDetailComponent: React.FC<VisitDetailComponentProps> = ({ visitUuid, patientUuid }) => {
   const { t } = useTranslation();
   const [listView, setView] = useState(true);
-
-  const { data: visit, isError, isLoading, isValidating } = useVisit(visitUuid);
+  const { visit, isError, isLoading, isValidating } = useVisit(visitUuid);
 
   const encounters = useMemo(
     () =>
@@ -65,6 +64,8 @@ const VisitDetailComponent: React.FC<VisitDetailComponentProps> = ({ visitUuid,
         {!listView && <VisitSummary encounters={visit.encounters} patientUuid={patientUuid} />}
       </div>
     );
+  } else {
+    return null;
   }
 };
 

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

@@ -146,7 +146,7 @@ export function useVisit(visitUuid: string) {
   );
 
   return {
-    data: data ? data.data : null,
+    visit: data ? data.data : null,
     isError: error,
     isLoading: !data && !error,
     isValidating,