@openmrs/esm-react-utils 4.3.2-pre.660 → 4.3.2-pre.662

package/jest.config.js

@@ -10,6 +10,7 @@ module.exports = {
     "@openmrs/esm-state": "<rootDir>/__mocks__/openmrs-esm-state.mock.ts",
     "@openmrs/esm-styleguide":
       "<rootDir>/__mocks__/openmrs-esm-styleguide.mock.tsx",
+    dexie: require.resolve("dexie"),
   },
   testEnvironment: "jsdom",
   testEnvironmentOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-react-utils",
-  "version": "4.3.2-pre.660",
+  "version": "4.3.2-pre.662",
   "license": "MPL-2.0",
   "description": "React utilities for OpenMRS.",
   "browser": "dist/openmrs-esm-react-utils.js",
@@ -55,11 +55,11 @@
     "react-i18next": "11.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "^4.3.2-pre.660",
-    "@openmrs/esm-config": "^4.3.2-pre.660",
-    "@openmrs/esm-error-handling": "^4.3.2-pre.660",
-    "@openmrs/esm-extensions": "^4.3.2-pre.660",
-    "@openmrs/esm-globals": "^4.3.2-pre.660",
+    "@openmrs/esm-api": "^4.3.2-pre.662",
+    "@openmrs/esm-config": "^4.3.2-pre.662",
+    "@openmrs/esm-error-handling": "^4.3.2-pre.662",
+    "@openmrs/esm-extensions": "^4.3.2-pre.662",
+    "@openmrs/esm-globals": "^4.3.2-pre.662",
     "dayjs": "^1.10.8",
     "i18next": "^19.6.0",
     "react": "^18.1.0",
@@ -68,5 +68,5 @@
     "rxjs": "^6.5.3",
     "unistore": "^3.5.2"
   },
-  "gitHead": "7b4eed59da0624b69ea0b86baada3dc111f6407a"
+  "gitHead": "1e1ab6761ff3726c7e0eee55373b1bf4a0d97b99"
 }

package/src/index.ts

@@ -12,7 +12,6 @@ export * from "./useConfig";
 export * from "./useConnectedExtensions";
 export * from "./useConnectivity";
 export * from "./usePatient";
-export * from "./useCurrentPatient";
 export * from "./useExtensionInternalStore";
 export * from "./useExtensionSlot";
 export * from "./useExtensionSlotMeta";

package/src/public.ts

@@ -11,7 +11,6 @@ export * from "./useConfig";
 export * from "./useConnectedExtensions";
 export * from "./useConnectivity";
 export * from "./usePatient";
-export * from "./useCurrentPatient";
 export * from "./useExtensionSlotMeta";
 export * from "./useExtensionStore";
 export * from "./useLayoutType";

package/src/usePagination.ts

@@ -9,9 +9,13 @@ export function usePagination<T>(
 ) {
   const [page, setPage] = useState(1);
   const totalPages = useMemo(
-    () => Math.max(1, Math.ceil(data.length / resultsPerPage)),
+    () =>
+      typeof resultsPerPage === "number" && resultsPerPage > 0
+        ? Math.max(1, Math.ceil(data.length / resultsPerPage))
+        : 1,
     [data.length, resultsPerPage]
   );
+
   const results = useMemo(() => {
     const lowerBound = (page - 1) * resultsPerPage;
     const upperBound = (page + 0) * resultsPerPage;

package/src/usePatient.ts

@@ -116,7 +116,7 @@ export function usePatient(patientUuid?: string) {
         (patient) =>
           active &&
           dispatch({
-            patient: patient.data,
+            patient: patient,
             type: ActionTypes.newPatient,
           }),
         (err) =>

package/src/useCurrentPatient.ts

@@ -1,117 +0,0 @@
-/** @module @category API */
-import { useEffect, useReducer } from "react";
-import { fetchCurrentPatient, PatientUuid } from "@openmrs/esm-api";
-
-type NullablePatient = fhir.Patient | null;
-
-interface CurrentPatientState {
-  patient: NullablePatient;
-  isLoadingPatient: boolean;
-  err: Error | null;
-}
-
-interface LoadPatient {
-  type: ActionTypes.loadPatient;
-}
-
-interface NewPatient {
-  type: ActionTypes.newPatient;
-  patient: NullablePatient;
-}
-
-interface PatientLoadError {
-  type: ActionTypes.loadError;
-  err: Error | null;
-}
-
-type Action = LoadPatient | NewPatient | PatientLoadError;
-
-enum ActionTypes {
-  loadPatient = "loadPatient",
-  newPatient = "newPatient",
-  loadError = "patientLloadErroroadError",
-}
-
-const initialState: CurrentPatientState = {
-  patient: null,
-  isLoadingPatient: true,
-  err: null,
-};
-
-function getPatientUuidFromUrl(): PatientUuid {
-  const match = /\/patient\/([a-zA-Z0-9\-]+)\/?/.exec(location.pathname);
-  return match && match[1];
-}
-
-function reducer(
-  state: CurrentPatientState,
-  action: Action
-): CurrentPatientState {
-  switch (action.type) {
-    case ActionTypes.loadPatient:
-      return {
-        ...state,
-        patient: null,
-        isLoadingPatient: true,
-        err: null,
-      };
-    case ActionTypes.newPatient:
-      return {
-        ...state,
-        patient: action.patient,
-        isLoadingPatient: false,
-        err: null,
-      };
-    case ActionTypes.loadError:
-      return {
-        ...state,
-        patient: null,
-        isLoadingPatient: false,
-        err: action.err,
-      };
-    default:
-      return state;
-  }
-}
-
-/**
- * This React hook returns the current patient, as specified by the current route. It returns
- * all the information needed to render a loading state, error state, and normal/success state.
- *
- * @deprecated Use {@link usePatient} instead.
- */
-export function useCurrentPatient(
-  patientUuid = getPatientUuidFromUrl()
-): [boolean, NullablePatient, PatientUuid, Error | null] {
-  const [state, dispatch] = useReducer(reducer, initialState);
-
-  useEffect(() => {
-    let active = true;
-
-    if (patientUuid) {
-      fetchCurrentPatient(patientUuid).then(
-        (patient) =>
-          active &&
-          dispatch({
-            patient: patient.data,
-            type: ActionTypes.newPatient,
-          }),
-        (err) =>
-          active &&
-          dispatch({
-            err,
-            type: ActionTypes.loadError,
-          })
-      );
-      dispatch({ type: ActionTypes.loadPatient });
-    } else {
-      dispatch({ type: ActionTypes.newPatient, patient: null });
-    }
-
-    return () => {
-      active = false;
-    };
-  }, [patientUuid]);
-
-  return [state.isLoadingPatient, state.patient, patientUuid, state.err];
-}