@openmrs/esm-fast-data-entry-app 1.0.1-pre.10 → 1.0.1-pre.17

package/src/hooks/index.ts

@@ -4,3 +4,4 @@ import useFormState from "./useFormState";
 import useGetEncounter from "./useGetEncounter";
 
 export { useGetAllForms, useGetPatient, useFormState, useGetEncounter };
+export * from "./usePostEndpoint";

package/src/hooks/usePostEndpoint.ts

@@ -0,0 +1,70 @@
+import { openmrsFetch } from "@openmrs/esm-framework";
+import { useCallback, useState } from "react";
+
+const usePostEndpoint = ({ endpointUrl }) => {
+  const [submissionInProgress, setSubmissionInProgress] = useState(null);
+  const [result, setResult] = useState(null);
+  const [error, setError] = useState(null);
+
+  const onFormPosted = useCallback(
+    (result) => {
+      setSubmissionInProgress(false);
+      if (error) {
+        setError(null);
+      }
+      setResult(result.data);
+    },
+    [error]
+  );
+
+  const onError = useCallback(
+    (error) => {
+      setSubmissionInProgress(false);
+      if (result) {
+        setResult(null);
+      }
+      setError(error?.responseBody?.error ?? error?.responseBody ?? error);
+    },
+    [result]
+  );
+
+  const post = useCallback(
+    async (data) => {
+      setSubmissionInProgress(true);
+      return openmrsFetch(endpointUrl, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: data,
+      })
+        .then(onFormPosted)
+        .catch(onError);
+    },
+    [endpointUrl, onError, onFormPosted]
+  );
+
+  const reset = () => {
+    setSubmissionInProgress(null);
+    setResult(null);
+    setError(null);
+  };
+
+  return {
+    post,
+    isPosting: submissionInProgress,
+    result,
+    error,
+    reset,
+  };
+};
+
+const usePostVisit = () => {
+  return usePostEndpoint({ endpointUrl: "/ws/rest/v1/visit" });
+};
+
+const usePostCohort = () => {
+  return usePostEndpoint({ endpointUrl: "/ws/rest/v1/cohortm/cohort" });
+};
+
+export { usePostEndpoint, usePostVisit, usePostCohort };

package/src/hooks/useSearchEndpoint.ts

@@ -0,0 +1,120 @@
+import { openmrsFetch, FetchResponse } from "@openmrs/esm-framework";
+import { useCallback, useMemo } from "react";
+import useSWRInfinite from "swr/infinite";
+
+export interface SearchResponse {
+  data: Array<Record<string, unknown>> | null;
+  isLoading: boolean;
+  error: Error;
+  loadingNewData: boolean;
+  hasMore: boolean;
+  currentPage: number;
+  totalResults: number;
+  setPage: (size: number | ((_size: number) => number)) => Promise<
+    FetchResponse<{
+      results: Array<Record<string, unknown>>;
+      links: Array<{
+        rel: "prev" | "next";
+      }>;
+    }>[]
+  >;
+}
+
+interface SearchInfiniteProps {
+  baseUrl?: string;
+  searchTerm: string;
+  parameters?: Record<string, unknown> | undefined;
+  searching: boolean;
+  resultsToFetch?: number;
+}
+
+const useSearchEndpointInfinite = (
+  arg0: SearchInfiniteProps
+): SearchResponse => {
+  const {
+    baseUrl,
+    searchTerm,
+    parameters,
+    searching = true,
+    resultsToFetch = 10,
+  } = arg0;
+
+  const getUrl = useCallback(
+    (
+      page: number,
+      prevPageData: FetchResponse<{
+        results: Array<Record<string, unknown>>;
+        links: Array<{ rel: "prev" | "next" }>;
+      }>
+    ) => {
+      if (
+        prevPageData &&
+        !prevPageData?.data?.links.some((link) => link.rel === "next")
+      ) {
+        return null;
+      }
+      let url = `${baseUrl}?q=${searchTerm}`;
+      const params = {
+        // merge passed parameters and default parameters
+        // this way the defaults can be overriden if needed
+        totalCount: true,
+        limit: resultsToFetch,
+        ...parameters,
+      };
+      Object.entries(params).forEach(([key, value]) => {
+        // don't send null parmeters
+        if (value !== null && value !== undefined) {
+          url += `&${key}=${value}`;
+        }
+      });
+      if (page) {
+        url += `&startIndex=${page * resultsToFetch}`;
+      }
+      return url;
+    },
+    [baseUrl, searchTerm, parameters, resultsToFetch]
+  );
+
+  const { data, isValidating, setSize, error, size } = useSWRInfinite<
+    FetchResponse<{
+      results: Array<Record<string, unknown>>;
+      links: Array<{ rel: "prev" | "next" }>;
+      totalCount: number;
+    }>,
+    Error
+  >(searching ? getUrl : null, openmrsFetch);
+
+  const results = useMemo(
+    () => ({
+      data: data
+        ? [].concat(...(data?.map((resp) => resp?.data?.results) ?? []))
+        : null,
+      isLoading: !data && !error,
+      error,
+      hasMore: data?.length
+        ? !!data[data.length - 1].data?.links?.some(
+            (link) => link.rel === "next"
+          )
+        : false,
+      loadingNewData: isValidating,
+      setPage: setSize,
+      currentPage: size,
+      totalResults: data?.[0]?.data?.totalCount,
+    }),
+    [data, isValidating, error, setSize, size]
+  );
+
+  return results;
+};
+
+const useSearchCohortInfinite = ({
+  ...props
+}: SearchInfiniteProps): SearchResponse => {
+  return useSearchEndpointInfinite({
+    baseUrl: "/ws/rest/v1/cohortm/cohort",
+    resultsToFetch: 10,
+    ...props,
+  });
+};
+
+export { useSearchEndpointInfinite, useSearchCohortInfinite };

package/translations/en.json

@@ -4,6 +4,7 @@
   "areYouSure": "Are you sure?",
   "cancel": "Cancel",
   "cancelExplanation": "You will lose any unsaved changes on the current form. Do you want to discard the current session?",
+  "changeGroup": "Choose a different group",
   "chooseGroupError": "Please choose a group.",
   "createNewPatient": "Create new patient",
   "createGroup": "Create Group",
@@ -27,10 +28,13 @@
   "nextPatient": "Next Patient",
   "noFormsFound": "No Forms To Show",
   "noFormsFoundMessage": "No forms could be found for this category. Please double check the form concept uuids and access permissions.",
+  "noMoreResults": "End of search results",
   "noGroupsFoundMessage": "Sorry, no groups have been found",
   "noPatientError": "Please enter at least one patient.",
   "or": "or",
   "orLabelName": "OR label name",
+  "patientsInGroup": "Patients in group",
+  "postError": "POST Error",
   "practitionerName": "Practitioner Name",
   "remove": "Remove",
   "resumeSession": "Resume Session",
@@ -45,5 +49,6 @@
   "sessionName": "Session Name",
   "sessionNotes": "Session Notes",
   "startGroupSession": "Start Group Session",
-  "trySearchWithPatientUniqueID": "Try searching with the cohort's description"
+  "trySearchWithPatientUniqueID": "Try searching with the cohort's description",
+  "unknownPostError": "An unknown error occured while saving data"
 }

package/.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-end_of_line = lf
-
-[*.md]
-trim_trailing_whitespace = false

package/.eslintignore

@@ -1,2 +0,0 @@
-src/**/*.test.tsx
-**/*.d.tsx

package/.eslintrc.js

@@ -1,10 +0,0 @@
-module.exports = {
-  "extends": [
-    "eslint:recommended",
-    "ts-react-important-stuff",
-    "plugin:prettier/recommended",
-    'react-app',
-    'plugin:@typescript-eslint/recommended',
-  ],
-  "parser": "@typescript-eslint/parser",
-}

package/.husky/pre-push

@@ -1 +0,0 @@
-yarn verify

package/.prettierignore

@@ -1,14 +0,0 @@
-# directories
-.husky/
-dist/
-node_modules/
-
-# dotfiles and generated
-.*
-yarn.lock
-
-# by file type
-**/*.css
-**/*.scss
-**/*.md
-**/*.json

package/.tx/config

@@ -1,9 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[openmrs-esm-fast-data-entry-app.esm-fast-data-entry-app]
-file_filter = translations/<lang>.json
-minimum_perc = 0
-source_file = translations/en.json
-source_lang = en
-type = KEYVALUEJSON