@openmrs/esm-react-utils 3.2.1-pre.972 → 3.3.1-pre.1173

package/src/useVisit.ts

@@ -1,49 +1,42 @@
-import { useState, useEffect } from "react";
-import dayjs from "dayjs";
+/** @module @category API */
 import {
-  getVisitsForPatient,
-  getStartedVisit,
-  VisitMode,
-  VisitStatus,
+  defaultVisitCustomRepresentation,
+  openmrsFetch,
   Visit,
 } from "@openmrs/esm-api";
+import useSWR from "swr";
+import dayjs from "dayjs";
+import isToday from "dayjs/plugin/isToday";
 
-export function useVisit(patientUuid: string) {
-  const [currentVisit, setCurrentVisit] = useState<Visit | null>(null);
-  const [error, setError] = useState(null);
-
-  useEffect(() => {
-    const sub = getStartedVisit.subscribe((visit) => {
-      if (visit) {
-        setCurrentVisit(visit?.visitData ?? null);
-      } else {
-        setCurrentVisit(null);
-      }
-    });
+dayjs.extend(isToday);
 
-    return () => sub.unsubscribe();
-  }, [patientUuid]);
+interface VisitReturnType {
+  error: Error;
+  mutate: () => void;
+  isValidating: boolean;
+  currentVisit: Visit | null;
+}
 
-  useEffect(() => {
-    const abortController = new AbortController();
-    const sub = getVisitsForPatient(patientUuid, abortController).subscribe(
-      ({ data }) => {
-        const currentVisit = data.results.find(
-          (visit) => visit.stopDatetime === null
-        );
+/**
+ * This React hook returns a visit object. If the `patientUuid` is provided
+ * as a parameter, then the currentVisit, error and mutate function
+ * for that patient visit is returned.
+ * @param patientUuid Unique patient identifier `string`
+ * @returns Object {`error` `isValidating`, `currentVisit`, `mutate`}
+ */
+export function useVisit(patientUuid: string): VisitReturnType {
+  const { data, error, mutate, isValidating } = useSWR<{
+    data: { results: Array<Visit> };
+  }>(
+    `/ws/rest/v1/visit?patient=${patientUuid}&v=${defaultVisitCustomRepresentation}&includeInactive=false`,
+    openmrsFetch
+  );
 
-        if (currentVisit) {
-          getStartedVisit.next({
-            mode: VisitMode.LOADING,
-            visitData: currentVisit,
-            status: VisitStatus.ONGOING,
-          });
-        }
-      },
-      setError
-    );
-    return () => sub && sub.unsubscribe();
-  }, [patientUuid]);
+  const currentVisit =
+    data?.data.results.find(
+      (visit) =>
+        visit.stopDatetime === null && dayjs(visit.startDatetime).isToday()
+    ) ?? null;
 
-  return { currentVisit, error };
+  return { error, mutate, isValidating, currentVisit };
 }

package/src/useVisitTypes.ts

@@ -1,3 +1,4 @@
+/** @module @category API */
 import { getVisitTypes, VisitType } from "@openmrs/esm-api";
 import { useEffect, useState } from "react";
 

package/webpack.config.js

@@ -19,7 +19,7 @@ module.exports = (env) => ({
       {
         test: /\.m?(js|ts|tsx)$/,
         exclude: /(node_modules|bower_components)/,
-        use: "babel-loader",
+        use: "swc-loader",
       },
     ],
   },

package/.babelrc

@@ -1,8 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-typescript",
-    "@babel/preset-react"
-  ],
-  "plugins": ["@babel/plugin-proposal-class-properties"]
-}

package/babel.config.js

@@ -1,3 +0,0 @@
-const { readFileSync } = require("fs");
-
-module.exports = JSON.parse(readFileSync("./.babelrc", "utf8"));

package/src/useExtensionSlotConfig.ts

@@ -1,24 +0,0 @@
-import { useCallback } from "react";
-import {
-  ExtensionSlotConfigObject,
-  ExtensionSlotConfigStore,
-  getExtensionSlotConfigStore,
-} from "@openmrs/esm-config";
-import { useStoreState } from "./useStoreState";
-
-const defaultConfig: ExtensionSlotConfigObject = {
-  add: [],
-  order: [],
-  remove: [],
-};
-
-/** @internal */
-export function useExtensionSlotConfig(slotName: string) {
-  const store = getExtensionSlotConfigStore(slotName);
-  const select = useCallback(
-    (s: ExtensionSlotConfigStore) => s.config,
-    [slotName]
-  );
-  const config = useStoreState(store, select);
-  return config || defaultConfig;
-}

package/src/useNavigationContext.ts

@@ -1,12 +0,0 @@
-import { useEffect } from "react";
-import {
-  NavigationContext,
-  pushNavigationContext,
-} from "@openmrs/esm-extensions";
-
-/**
- * @deprecated Don't use this anymore.
- */
-export function useNavigationContext(context: NavigationContext) {
-  useEffect(() => pushNavigationContext(context), []);
-}

package/src/useStoreState.ts

@@ -1,11 +0,0 @@
-import { subscribeTo } from "@openmrs/esm-state";
-import { useEffect, useState } from "react";
-import { Store } from "unistore";
-
-export function useStoreState<T, U>(store: Store<T>, select: (state: T) => U) {
-  const [state, setState] = useState<U>(() => select(store.getState()));
-
-  useEffect(() => subscribeTo(store, select, setState), [store, select]);
-
-  return state;
-}