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

package/src/add-group-modal/AddGroupModal.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useState } from "react";
+import React, { useCallback, useContext, useEffect, useState } from "react";
 import {
   ComposedModal,
   Button,
@@ -7,12 +7,14 @@ import {
   ModalBody,
   TextInput,
   FormLabel,
+  Loading,
 } from "@carbon/react";
-import { Add, Close } from "@carbon/react/icons";
+import { Add, TrashCan } from "@carbon/react/icons";
 import { useTranslation } from "react-i18next";
-import { ExtensionSlot } from "@openmrs/esm-framework";
+import { ExtensionSlot, showToast } from "@openmrs/esm-framework";
 import styles from "./styles.scss";
 import GroupFormWorkflowContext from "../context/GroupFormWorkflowContext";
+import { usePostCohort } from "../hooks";
 
 const MemExtension = React.memo(ExtensionSlot);
 
@@ -20,18 +22,19 @@ const PatientRow = ({ patient, removePatient }) => {
   const { t } = useTranslation();
   return (
     <li key={patient.uuid} className={styles.patientRow}>
-      <span className={styles.patientName}>{patient?.display}</span>
       <span>
         <Button
           kind="tertiary"
           size="sm"
+          hasIconOnly
           onClick={() => removePatient(patient.uuid)}
-          renderIcon={Close}
-          tooltipPosition="right"
-        >
-          {t("remove", "Remove")}
-        </Button>
+          renderIcon={TrashCan}
+          tooltipAlignment="start"
+          tooltipPosition="top"
+          iconDescription={t("remove", "Remove")}
+        />
       </span>
+      <span className={styles.patientName}>{patient?.display}</span>
     </li>
   );
 };
@@ -64,17 +67,21 @@ const NewGroupForm = (props) => {
       />
       {errors?.name && (
         <p className={styles.formError}>
-          {t("groupNameError", "Please enter a group name.")}
+          {errors.name === "required"
+            ? t("groupNameError", "Please enter a group name.")
+            : errors.name}
         </p>
       )}
-      <FormLabel>Patients in group</FormLabel>
+      <FormLabel>
+        {patientList.length} {t("patientsInGroup", "Patients in group")}
+      </FormLabel>
       {errors?.patientList && (
         <p className={styles.formError}>
           {t("noPatientError", "Please enter at least one patient.")}
         </p>
       )}
       {!errors?.patientList && (
-        <ul>
+        <ul className={styles.patientList}>
           {patientList?.map((patient, index) => (
             <PatientRow
               patient={patient}
@@ -92,7 +99,7 @@ const NewGroupForm = (props) => {
           state={{
             selectPatientAction: updatePatientList,
             buttonProps: {
-              kind: "primary",
+              kind: "secondary",
             },
           }}
         />
@@ -108,6 +115,7 @@ const AddGroupModal = () => {
   const [errors, setErrors] = useState({});
   const [name, setName] = useState("");
   const [patientList, setPatientList] = useState([]);
+  const { post, result, isPosting, error } = usePostCohort();
 
   const handleCancel = () => {
     setOpen(false);
@@ -165,10 +173,46 @@ const AddGroupModal = () => {
 
   const handleSubmit = () => {
     if (validate()) {
-      setGroup({ id: "1234", name: name, members: patientList });
+      post({
+        name: name,
+        cohortMembers: patientList.map((p) => ({ patient: p.uuid })),
+      });
     }
   };
 
+  useEffect(() => {
+    if (result) {
+      setGroup({
+        ...result,
+        // the result doesn't come with cohortMembers.
+        // need to add it in based on our local state
+        cohortMembers: patientList.map((p) => ({ patient: { uuid: p.uuid } })),
+      });
+    }
+  }, [result, setGroup, patientList]);
+
+  useEffect(() => {
+    if (error) {
+      showToast({
+        kind: "error",
+        title: t("postError", "POST Error"),
+        description:
+          error.message ??
+          t("unknownPostError", "An unknown error occured while saving data"),
+      });
+      if (error.fieldErrors) {
+        setErrors(
+          Object.fromEntries(
+            Object.entries(error.fieldErrors).map(([key, value]) => [
+              key,
+              value?.[0]?.message,
+            ])
+          )
+        );
+      }
+    }
+  }, [error, t]);
+
   return (
     <div className={styles.modal}>
       <Button
@@ -181,23 +225,32 @@ const AddGroupModal = () => {
       <ComposedModal open={open} onClose={() => setOpen(false)}>
         <ModalHeader>{t("createNewGroup", "Create New Group")}</ModalHeader>
         <ModalBody>
-          <NewGroupForm
-            {...{
-              name,
-              setName,
-              patientList,
-              updatePatientList,
-              errors,
-              validate,
-              removePatient,
-            }}
-          />
+          {result ? (
+            <p>Group saved succesfully</p>
+          ) : isPosting ? (
+            <div className={styles.loading}>
+              <Loading withOverlay={false} />
+              <span>Saving new group...</span>
+            </div>
+          ) : (
+            <NewGroupForm
+              {...{
+                name,
+                setName,
+                patientList,
+                updatePatientList,
+                errors,
+                validate,
+                removePatient,
+              }}
+            />
+          )}
         </ModalBody>
         <ModalFooter>
-          <Button kind="secondary" onClick={handleCancel}>
+          <Button kind="secondary" onClick={handleCancel} disabled={isPosting}>
             {t("cancel", "Cancel")}
           </Button>
-          <Button kind="primary" onClick={handleSubmit}>
+          <Button kind="primary" onClick={handleSubmit} disabled={isPosting}>
             {t("createGroup", "Create Group")}
           </Button>
         </ModalFooter>

package/src/add-group-modal/styles.scss

@@ -23,13 +23,23 @@
 
 .patientRow {
    display: flex;
+   align-items: center;
    width: "100%";
+   &:nth-child(odd) {
+    background-color: colors.$gray-20;
+  }
 }
 
 .patientName {
   flex-grow: 1;
-  padding: spacing.$spacing-02;
-  &:hover {
-    background-color: colors.$gray-20;
-  }
+  padding-left: spacing.$spacing-05;
+}
+
+.loading {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  row-gap: spacing.$spacing-05;
 }

package/src/context/GroupFormWorkflowContext.tsx

@@ -20,6 +20,7 @@ export interface MetaType {
 
 const initialActions = {
   setGroup: (group: GroupType) => undefined,
+  unsetGroup: () => undefined,
   setSessionMeta: (meta: MetaType) => undefined,
   openPatientSearch: () => undefined,
   saveEncounter: (encounterUuid: string | number) => undefined,
@@ -75,6 +76,7 @@ const GroupFormWorkflowProvider = ({ children }) => {
           activeFormUuid,
         }),
       setGroup: (group) => dispatch({ type: "SET_GROUP", group }),
+      unsetGroup: () => dispatch({ type: "UNSET_GROUP" }),
       setSessionMeta: (meta) => dispatch({ type: "SET_SESSION_META", meta }),
       openPatientSearch: () => dispatch({ type: "OPEN_PATIENT_SEARCH" }),
       saveEncounter: (encounterUuid) =>

package/src/context/GroupFormWorkflowReducer.ts

@@ -75,9 +75,33 @@ const reducer = (state, action) => {
           ...state.forms,
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
-            groupUuid: action.group.id,
+            groupUuid: action.group.uuid,
             groupName: action.group.name,
-            patientUuids: action.group.members.map((member) => member.uuid),
+            patientUuids:
+              // this translation is not preferred
+              // the only reason we tollerate it here is beause it should be the only time
+              // we add cohort information to state
+              action.group.cohortMembers?.map(
+                (member) => member?.patient?.uuid
+              ) ?? [],
+            activePatientUuid: null,
+            activeEncounterUuid: null,
+          },
+        },
+      };
+      persistData(newState);
+      return newState;
+    }
+    case "UNSET_GROUP": {
+      const newState = {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            groupUuid: null,
+            groupName: null,
+            patientUuids: [],
             activePatientUuid: null,
             activeEncounterUuid: null,
           },

package/src/group-form-entry-workflow/GroupFormEntryWorkflow.tsx

@@ -19,7 +19,7 @@ import {
 import React, { useContext, useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import PatientCard from "../patient-card/PatientCard";
-import GroupBanner from "./group-banner";
+import GroupDisplayHeader from "./group-display-header";
 import styles from "./styles.scss";
 import { useTranslation } from "react-i18next";
 import GroupFormWorkflowContext, {
@@ -387,7 +387,7 @@ const GroupFormEntryWorkflow = () => {
         <ExtensionSlot extensionSlotName="breadcrumbs-slot" />
       </div>
       <GroupSearchHeader />
-      <GroupBanner />
+      <GroupDisplayHeader />
       {workflowState === "NEW_GROUP_SESSION" && (
         <div className={styles.workspaceWrapper}>
           <SessionMetaWorkspace />

package/src/group-form-entry-workflow/{group-banner/GroupBanner.test.tsx → group-display-header/GroupDisplayHeader.test.tsx}

@@ -1,9 +1,9 @@
 import React from "react";
 import { render } from "@testing-library/react";
-import GroupBanner from "./GroupBanner";
+import GroupDisplayHeader from "./GroupDisplayHeader";
 
 describe("PatientBanner", () => {
   it("renders placeholder information when no data is present", () => {
-    render(<GroupBanner />);
+    render(<GroupDisplayHeader />);
   });
 });

package/src/group-form-entry-workflow/{group-banner/GroupBanner.tsx → group-display-header/GroupDisplayHeader.tsx}

@@ -1,12 +1,20 @@
 import React, { useContext } from "react";
-import { Events } from "@carbon/react/icons";
+import { Button } from "@carbon/react";
+import { Events, Close } from "@carbon/react/icons";
 import styles from "./styles.scss";
 import { useTranslation } from "react-i18next";
 import GroupFormWorkflowContext from "../../context/GroupFormWorkflowContext";
+import { navigate } from "@openmrs/esm-framework";
 
-const GroupBanner = () => {
-  const { activeGroupName, activeGroupUuid, patientUuids, activeSessionMeta } =
-    useContext(GroupFormWorkflowContext);
+const GroupDisplayHeader = () => {
+  const {
+    activeGroupName,
+    activeGroupUuid,
+    patientUuids,
+    activeSessionMeta,
+    unsetGroup,
+    destroySession,
+  } = useContext(GroupFormWorkflowContext);
   const { t } = useTranslation();
 
   if (!activeGroupUuid) {
@@ -38,8 +46,26 @@ const GroupBanner = () => {
           </div>
         </div>
       )}
+      <span style={{ flexGrow: 1 }} />
+      <span>
+        <Button kind="ghost" onClick={() => unsetGroup()}>
+          {t("changeGroup", "Choose a different group")} <Close size={20} />
+        </Button>
+      </span>
+      <span>
+        <Button
+          kind="ghost"
+          onClick={() => {
+            destroySession();
+            // eslint-disable-next-line
+            navigate({ to: "${openmrsSpaBase}/forms" });
+          }}
+        >
+          {t("cancel", "Cancel")} <Close size={20} />
+        </Button>
+      </span>
     </div>
   );
 };
 
-export default GroupBanner;
+export default GroupDisplayHeader;

package/src/group-form-entry-workflow/group-display-header/index.ts

@@ -0,0 +1,3 @@
+import GroupDisplayHeader from "./GroupDisplayHeader";
+
+export default GroupDisplayHeader;

package/src/group-form-entry-workflow/group-search/CompactGroupResults.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useReducer } from "react";
+import React, { useEffect, useReducer, useRef } from "react";
 import { SkeletonIcon, SkeletonText } from "@carbon/react";
 import { Events } from "@carbon/react/icons";
 import styles from "./compact-group-result.scss";
@@ -20,11 +20,64 @@ const reducer = (state, action) => {
   }
 };
 
-const CompactGroupResults = ({ groups, selectGroupAction }) => {
+const scrollingOptions = {
+  behavior: "smooth",
+  block: "nearest",
+};
+
+const ResultItem = ({
+  index,
+  selectGroupAction,
+  group,
+  dispatch,
+  state,
+  totalGroups,
+  lastRef,
+}) => {
+  const ref = useRef(null);
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (state.selectedIndex === totalGroups - 1) {
+      lastRef.current.scrollIntoView(scrollingOptions);
+    } else if (state.selectedIndex === index) {
+      ref.current.scrollIntoView(scrollingOptions);
+    }
+  }, [state, index, totalGroups, lastRef]);
+
+  return (
+    <div
+      onClick={() => {
+        dispatch({ type: "select", payload: index });
+        selectGroupAction(group);
+      }}
+      className={`${styles.patientSearchResult} ${
+        index === state.selectedIndex && styles.patientSearchResultSelected
+      }`}
+      role="button"
+      aria-pressed={index === state.selectedIndex}
+      tabIndex={0}
+      ref={ref}
+    >
+      <div className={styles.patientAvatar} role="img">
+        <Events size={24} />
+      </div>
+      <div>
+        <h2 className={styles.patientName}>{group.name}</h2>
+        <p className={styles.demographics}>
+          {group.cohortMembers?.length ?? 0} {t("members", "members")}
+          <span className={styles.middot}>&middot;</span> {group.description}
+        </p>
+      </div>
+    </div>
+  );
+};
+
+const CompactGroupResults = ({ groups, selectGroupAction, lastRef }) => {
   const arrowUpPressed = useKeyPress("ArrowUp");
   const arrowDownPressed = useKeyPress("ArrowDown");
   const enterPressed = useKeyPress("Enter");
-  const { t } = useTranslation();
+
   const [state, dispatch] = useReducer(reducer, { selectedIndex: 0 });
 
   useEffect(() => {
@@ -48,31 +101,11 @@ const CompactGroupResults = ({ groups, selectGroupAction }) => {
   return (
     <>
       {groups.map((group, index) => (
-        <div
-          onClick={() => {
-            dispatch({ type: "select", payload: index });
-            selectGroupAction(group);
-          }}
-          key={group.id}
-          className={`${styles.patientSearchResult} ${
-            index === state.selectedIndex && styles.patientSearchResultSelected
-          }`}
-          role="button"
-          aria-pressed={index === state.selectedIndex}
-          tabIndex={0}
-        >
-          <div className={styles.patientAvatar} role="img">
-            <Events size={24} />
-          </div>
-          <div>
-            <h2 className={styles.patientName}>{group.name}</h2>
-            <p className={styles.demographics}>
-              {group.members.length} {t("members", "members")}
-              <span className={styles.middot}>&middot;</span>{" "}
-              {group.description}
-            </p>
-          </div>
-        </div>
+        <ResultItem
+          key={index}
+          totalGroups={groups.length}
+          {...{ lastRef, index, selectGroupAction, group, dispatch, state }}
+        />
       ))}
     </>
   );

package/src/group-form-entry-workflow/group-search/CompactGroupSearch.tsx

@@ -4,6 +4,7 @@ import styles from "./compact-group-search.scss";
 import GroupSearch from "./GroupSearch";
 import { Button, Search } from "@carbon/react";
 import { useTranslation } from "react-i18next";
+import debounce from "lodash-es/debounce";
 
 interface CompactGroupSearchProps {
   selectGroupAction?: (group: GroupType) => void;
@@ -23,6 +24,10 @@ const CompactGroupSearch: React.FC<CompactGroupSearchProps> = ({
   };
 
   const handleSearchChange = (e) => {
+    debounce((q) => {
+      setDropdownShown(!!e.length);
+      setQuery(q);
+    }, 300);
     setQuery(e);
     if (e.length) {
       setDropdownShown(true);

package/src/group-form-entry-workflow/group-search/GroupSearch.tsx

@@ -1,13 +1,13 @@
-import React from "react";
+import React, { useCallback, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { Layer, Tile } from "@carbon/react";
+import { Layer, Tile, Loading } from "@carbon/react";
 import styles from "./group-search.scss";
 import { EmptyDataIllustration } from "../../empty-state/EmptyDataIllustration";
-import { useGroupSearch } from "./useGroupSearch";
 import CompactGroupResults, {
   SearchResultSkeleton,
 } from "./CompactGroupResults";
 import { GroupType } from "../../context/GroupFormWorkflowContext";
+import { useSearchCohortInfinite } from "../../hooks/useSearchEndpoint";
 
 interface GroupSearchProps {
   query: string;
@@ -19,8 +19,48 @@ const GroupSearch: React.FC<GroupSearchProps> = ({
   selectGroupAction,
 }) => {
   const { t } = useTranslation();
-  const results = useGroupSearch(query);
-  const error = false;
+  const {
+    isLoading,
+    data: results,
+    error,
+    loadingNewData,
+    setPage,
+    hasMore,
+    totalResults,
+  } = useSearchCohortInfinite({
+    searchTerm: query,
+    searching: !!query,
+    parameters: {
+      v: "full",
+    },
+  });
+
+  const lastItem = useRef(null);
+  const observer = useRef(null);
+  const loadingRef = useCallback(
+    (node) => {
+      if (loadingNewData) {
+        return;
+      }
+      if (observer.current) {
+        observer.current.disconnect();
+      }
+      observer.current = new IntersectionObserver(
+        (entries) => {
+          if (entries[0].isIntersecting && hasMore) {
+            setPage((page) => page + 1);
+          }
+        },
+        {
+          threshold: 0.75,
+        }
+      );
+      if (node) {
+        observer.current.observe(node);
+      }
+    },
+    [loadingNewData, hasMore, setPage]
+  );
 
   if (error) {
     return (
@@ -43,9 +83,19 @@ const GroupSearch: React.FC<GroupSearchProps> = ({
     );
   }
 
-  if (query.length <= 2) return <SearchResultSkeleton />;
+  if (isLoading) {
+    return (
+      <div className={styles.searchResultsContainer}>
+        <SearchResultSkeleton />
+        <SearchResultSkeleton />
+        <SearchResultSkeleton />
+        <SearchResultSkeleton />
+        <SearchResultSkeleton />
+      </div>
+    );
+  }
 
-  if (results.length === 0) {
+  if (results?.length === 0) {
     return (
       <div className={styles.searchResults}>
         <Layer>
@@ -79,12 +129,19 @@ const GroupSearch: React.FC<GroupSearchProps> = ({
         }}
       >
         <p className={styles.resultsText}>
-          {results.length} {t("searchResultsText", "search result(s)")}
+          {totalResults} {t("searchResultsText", "search result(s)")}
         </p>
         <CompactGroupResults
           groups={results}
           selectGroupAction={selectGroupAction}
+          lastRef={lastItem}
         />
+        <div ref={lastItem}>
+          <div className={styles.lastItem} ref={loadingRef}>
+            {hasMore && <Loading withOverlay={false} small />}
+            {!hasMore && <p>{t("noMoreResults", "End of search results")}</p>}
+          </div>
+        </div>
       </div>
     </div>
   );

package/src/group-form-entry-workflow/group-search/group-search.scss

@@ -29,12 +29,7 @@
   width: 100%;
 }
 
-.loadingIcon {
-  padding: spacing.$spacing-05 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
+
 
 .searchTerm {
   @include type.type-style('heading-03');
@@ -92,3 +87,10 @@
   @include type.type-style('body-01');
   color: $text-02;
 }
+
+.lastItem {
+  padding: spacing.$spacing-05;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}

package/src/group-form-entry-workflow/group-search-header/GroupSearchHeader.tsx

@@ -1,16 +1,18 @@
 import { Close } from "@carbon/react/icons";
 import { Button } from "@carbon/react";
 import React, { useContext } from "react";
-import { Link } from "react-router-dom";
 import GroupFormWorkflowContext from "../../context/GroupFormWorkflowContext";
 import styles from "./styles.scss";
 import { useTranslation } from "react-i18next";
 import CompactGroupSearch from "../group-search/CompactGroupSearch";
 import AddGroupModal from "../../add-group-modal/AddGroupModal";
+import { navigate } from "@openmrs/esm-framework";
 
 const GroupSearchHeader = () => {
   const { t } = useTranslation();
-  const { activeGroupUuid, setGroup } = useContext(GroupFormWorkflowContext);
+  const { activeGroupUuid, setGroup, destroySession } = useContext(
+    GroupFormWorkflowContext
+  );
   const handleSelectGroup = (group) => {
     setGroup(group);
   };
@@ -29,11 +31,16 @@ const GroupSearchHeader = () => {
       </span>
       <span style={{ flexGrow: 1 }} />
       <span>
-        <Link to="..">
-          <Button kind="ghost">
-            {t("cancel", "Cancel")} <Close size={20} />
-          </Button>
-        </Link>
+        <Button
+          kind="ghost"
+          onClick={() => {
+            destroySession();
+            // eslint-disable-next-line
+            navigate({ to: "${openmrsSpaBase}/forms" });
+          }}
+        >
+          {t("cancel", "Cancel")} <Close size={20} />
+        </Button>
       </span>
     </div>
   );

package/src/group-form-entry-workflow/styles.scss

@@ -19,6 +19,16 @@
   width: 1100px;
 }
 
+:global(.omrs-breakpoint-lt-large-desktop) .workspace {
+  width: 1000px;
+}
+
+:global(.omrs-breakpoint-lt-small-desktop) .workspace {
+  // there's only so much we can do here. Currenlty the design does not support tablet
+  width: 100vw;
+  padding: 0 spacing.$spacing-04;
+}
+
 .selectPatientMessage {
   @include type.type-style('productive-heading-03');
   margin: spacing.$spacing-07;