Skip to content

Commit fa638f6

Browse files
authored
Update use visit hook to support loading status (#450)
1 parent 75691e4 commit fa638f6

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

packages/framework/esm-framework/docs/API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ Object {`error` `isValidating`, `currentVisit`, `mutate`}
13181318

13191319
#### Defined in
13201320

1321-
[packages/framework/esm-react-utils/src/useVisit.ts:27](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-react-utils/src/useVisit.ts#L27)
1321+
[packages/framework/esm-react-utils/src/useVisit.ts:29](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-react-utils/src/useVisit.ts#L29)
13221322

13231323
___
13241324

packages/framework/esm-react-utils/src/useVisit.ts

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
import useSWR from "swr";
88
import dayjs from "dayjs";
99
import isToday from "dayjs/plugin/isToday";
10+
import { useMemo } from "react";
1011

1112
dayjs.extend(isToday);
1213

@@ -15,6 +16,7 @@ interface VisitReturnType {
1516
mutate: () => void;
1617
isValidating: boolean;
1718
currentVisit: Visit | null;
19+
isLoading: boolean;
1820
}
1921

2022
/**
@@ -34,11 +36,20 @@ export function useVisit(patientUuid: string): VisitReturnType {
3436
openmrsFetch
3537
);
3638

37-
const currentVisit =
38-
data?.data.results.find(
39-
(visit) =>
40-
visit.stopDatetime === null && dayjs(visit.startDatetime).isToday()
41-
) ?? null;
39+
const currentVisit = useMemo(
40+
() =>
41+
data?.data.results.find(
42+
(visit) =>
43+
visit.stopDatetime === null && dayjs(visit.startDatetime).isToday()
44+
) ?? null,
45+
[data?.data.results]
46+
);
4247

43-
return { error, mutate, isValidating, currentVisit };
48+
return {
49+
error,
50+
mutate,
51+
isValidating,
52+
currentVisit,
53+
isLoading: !data && !error,
54+
};
4455
}

0 commit comments

Comments
 (0)