@openmrs/esm-fast-data-entry-app 1.0.1-pre.8 → 1.0.1-pre.82

package/src/context/GroupFormWorkflowReducer.ts

@@ -5,23 +5,31 @@ export const fdeGroupWorkflowStorageVersion = "1.0.5";
 export const fdeGroupWorkflowStorageName =
   "openmrs:fastDataEntryGroupWorkflowState";
 const persistData = (data) => {
-  localStorage.setItem(fdeGroupWorkflowStorageName, JSON.stringify(data));
+  localStorage.setItem(
+    fdeGroupWorkflowStorageName + ":" + data.userUuid,
+    JSON.stringify(data)
+  );
 };
 
 const initialFormState = {
   workflowState: "NEW_GROUP_SESSION",
   groupUuid: null,
   groupName: null,
+  groupMembers: [],
   activePatientUuid: null,
   activeEncounterUuid: null,
+  activeVisitUuid: null,
   patientUuids: [],
   encounters: {},
+  visits: {},
 };
 
 const reducer = (state, action) => {
   switch (action.type) {
     case "INITIALIZE_WORKFLOW_STATE": {
-      const savedData = localStorage.getItem(fdeGroupWorkflowStorageName);
+      const savedData = localStorage.getItem(
+        fdeGroupWorkflowStorageName + ":" + action.userUuid
+      );
       const savedDataObject = savedData ? JSON.parse(savedData) : {};
       let newState: { [key: string]: unknown } = {};
       if (
@@ -50,6 +58,8 @@ const reducer = (state, action) => {
               activePatientUuid: activePatientUuid,
               activeEncounterUuid:
                 thisSavedForm?.encounters?.[activePatientUuid] || null,
+              activeVisitUuid:
+                thisSavedForm?.visits?.[activePatientUuid] || null,
             },
           },
         };
@@ -62,6 +72,7 @@ const reducer = (state, action) => {
             [action.activeFormUuid]: initialFormState,
           },
           activeFormUuid: action.activeFormUuid,
+          userUuid: action.userUuid,
         };
       }
       persistData(newState);
@@ -75,11 +86,42 @@ 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
+              ) ?? [],
+            groupMembers:
+              action.group.cohortMembers?.map(
+                (member) => member?.patient?.uuid
+              ) ?? [],
+            activePatientUuid: null,
+            activeEncounterUuid: null,
+            activeVisitUuid: 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: [],
+            groupMembers: [],
             activePatientUuid: null,
             activeEncounterUuid: null,
+            activeVisitUuid: null,
           },
         },
       };
@@ -101,6 +143,10 @@ const reducer = (state, action) => {
               state.forms[state.activeFormUuid].encounters[
                 state.forms[state.activeFormUuid].patientUuids?.[0]
               ] || null,
+            activeVisitUuid:
+              state.forms[state.activeFormUuid].visits[
+                state.forms[state.activeFormUuid].patientUuids?.[0]
+              ] || null,
             workflowState: "EDIT_FORM",
           },
         },
@@ -108,7 +154,47 @@ const reducer = (state, action) => {
       persistData(newState);
       return newState;
     }
+    case "ADD_PATIENT_UUID": {
+      if (
+        state.forms[state.activeFormUuid].patientUuids.includes(
+          action.patientUuid
+        )
+      ) {
+        return state;
+      }
 
+      const newState = {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            patientUuids: [
+              ...state.forms[state.activeFormUuid].patientUuids,
+              action.patientUuid,
+            ],
+          },
+        },
+      };
+      persistData(newState);
+      return newState;
+    }
+    case "REMOVE_PATIENT_UUID": {
+      const newState = {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            patientUuids: state.forms[
+              state.activeFormUuid
+            ].patientUuids?.filter((uuid) => action.patientUuid !== uuid),
+          },
+        },
+      };
+      persistData(newState);
+      return newState;
+    }
     case "SAVE_ENCOUNTER": {
       const thisForm = state.forms[state.activeFormUuid];
       if (thisForm.workflowState === "SUBMIT_FOR_COMPLETE") {
@@ -123,13 +209,14 @@ const reducer = (state, action) => {
         navigate({ to: "${openmrsSpaBase}/forms" });
         return newState;
       } else if (thisForm.workflowState === "SUBMIT_FOR_NEXT") {
-        const nextPatientUuid =
-          thisForm.patientUuids[
-            Math.min(
-              thisForm.patientUuids.indexOf(thisForm.activePatientUuid) + 1,
-              thisForm.patientUuids.length - 1
-            )
-          ];
+        const nextPatientUuid = state.nextPatientUuid
+          ? state.nextPatientUuid
+          : thisForm.patientUuids[
+              Math.min(
+                thisForm.patientUuids.indexOf(thisForm.activePatientUuid) + 1,
+                thisForm.patientUuids.length - 1
+              )
+            ];
         const newState = {
           ...state,
           forms: {
@@ -142,6 +229,7 @@ const reducer = (state, action) => {
               },
               activePatientUuid: nextPatientUuid,
               activeEncounterUuid: thisForm.encounters[nextPatientUuid] || null,
+              activeVisitUuid: thisForm.visits[nextPatientUuid] || null,
               workflowState: "EDIT_FORM",
             },
           },
@@ -159,6 +247,8 @@ const reducer = (state, action) => {
             ...state.forms[state.activeFormUuid],
             activeEncounterUuid:
               state.forms[state.activeFormUuid].encounters[action.patientUuid],
+            activeVisitUuid:
+              state.forms[state.activeFormUuid].visits[action.patientUuid],
             activePatientUuid: action.patientUuid,
             workflowState: "EDIT_FORM",
           },
@@ -167,6 +257,46 @@ const reducer = (state, action) => {
       persistData(newState);
       return newState;
     }
+    case "VALIDATE_FOR_NEXT":
+      // this state should not be persisted
+      window.dispatchEvent(
+        new CustomEvent("ampath-form-action", {
+          detail: {
+            formUuid: state.activeFormUuid,
+            patientUuid: state.forms[state.activeFormUuid].activePatientUuid,
+            action: "validateForm",
+          },
+        })
+      );
+      return {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            workflowState: "VALIDATE_FOR_NEXT",
+          },
+        },
+      };
+    case "UPDATE_VISIT_UUID":
+      // this state should not be persisted
+      // we don't pers
+      return {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            visits: {
+              ...state.forms[state.activeFormUuid].visits,
+              [state.forms[state.activeFormUuid].activePatientUuid]:
+                action.visitUuid,
+            },
+            activeVisitUuid: action.visitUuid,
+          },
+        },
+      };
+
     case "SUBMIT_FOR_NEXT":
       // this state should not be persisted
       window.dispatchEvent(
@@ -187,6 +317,7 @@ const reducer = (state, action) => {
             workflowState: "SUBMIT_FOR_NEXT",
           },
         },
+        nextPatientUuid: action.nextPatientUuid,
       };
     case "SUBMIT_FOR_REVIEW":
       // this state should not be persisted
@@ -209,6 +340,28 @@ const reducer = (state, action) => {
           },
         },
       };
+
+    case "VALIDATE_FOR_COMPLETE":
+      // this state should not be persisted
+      window.dispatchEvent(
+        new CustomEvent("ampath-form-action", {
+          detail: {
+            formUuid: state.activeFormUuid,
+            patientUuid: state.forms[state.activeFormUuid].activePatientUuid,
+            action: "validateForm",
+          },
+        })
+      );
+      return {
+        ...state,
+        forms: {
+          ...state.forms,
+          [state.activeFormUuid]: {
+            ...state.forms[state.activeFormUuid],
+            workflowState: "VALIDATE_FOR_COMPLETE",
+          },
+        },
+      };
     case "SUBMIT_FOR_COMPLETE":
       // this state should not be persisted
       window.dispatchEvent(
@@ -238,6 +391,7 @@ const reducer = (state, action) => {
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
             activeEncounterUuid: null,
+            activVisitUuid: null,
             activePatientUuid: null,
             workflowState: "REVIEW",
           },
@@ -254,7 +408,9 @@ const reducer = (state, action) => {
         activeFormUuid: null,
       };
       persistData(newState);
-      return newState;
+      //eslint-disable-next-line
+      navigate({ to: "${openmrsSpaBase}/forms" });
+      return { ...newState, formDestroyed: true };
     }
     case "CLOSE_SESSION": {
       const newState = {
@@ -262,6 +418,8 @@ const reducer = (state, action) => {
         activeFormUuid: null,
       };
       persistData(newState);
+      //eslint-disable-next-line
+      navigate({ to: "${openmrsSpaBase}/forms" });
       return newState;
     }
     default:

package/src/form-entry-workflow/FormEntryWorkflow.tsx

@@ -1,17 +1,6 @@
-import {
-  ExtensionSlot,
-  getGlobalStore,
-  useStore,
-} from "@openmrs/esm-framework";
-import {
-  Button,
-  ComposedModal,
-  ModalBody,
-  ModalFooter,
-  ModalHeader,
-} from "@carbon/react";
-import React, { useContext, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { ExtensionSlot, useSession } from "@openmrs/esm-framework";
+import { Button } from "@carbon/react";
+import React, { useCallback, useContext, useEffect, useState } from "react";
 import FormBootstrap from "../FormBootstrap";
 import PatientCard from "../patient-card/PatientCard";
 import styles from "./styles.scss";
@@ -22,86 +11,13 @@ import FormWorkflowContext, {
 } from "../context/FormWorkflowContext";
 import WorkflowReview from "./workflow-review";
 import PatientBanner from "./patient-banner";
-
-const formStore = getGlobalStore("ampath-form-state");
-
-const CancelModal = ({ open, setOpen }) => {
-  const { destroySession, closeSession } = useContext(FormWorkflowContext);
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-
-  const discard = async () => {
-    await destroySession();
-    setOpen(false);
-    navigate("../");
-  };
-
-  const saveAndClose = async () => {
-    await closeSession();
-    setOpen(false);
-    navigate("../");
-  };
-
-  return (
-    <ComposedModal open={open}>
-      <ModalHeader>{t("areYouSure", "Are you sure?")}</ModalHeader>
-      <ModalBody>
-        {t(
-          "cancelExplanation",
-          "You will lose any unsaved changes on the current form. Do you want to discard the current session?"
-        )}
-      </ModalBody>
-      <ModalFooter>
-        <Button kind="secondary" onClick={() => setOpen(false)}>
-          {t("cancel", "Cancel")}
-        </Button>
-        <Button kind="danger" onClick={discard}>
-          {t("discard", "Discard")}
-        </Button>
-        <Button kind="primary" onClick={saveAndClose}>
-          {t("saveSession", "Save Session")}
-        </Button>
-      </ModalFooter>
-    </ComposedModal>
-  );
-};
-
-const CompleteModal = ({ open, setOpen }) => {
-  const { submitForComplete } = useContext(FormWorkflowContext);
-  const { t } = useTranslation();
-
-  const completeSession = () => {
-    submitForComplete();
-    setOpen(false);
-  };
-
-  return (
-    <ComposedModal open={open}>
-      <ModalHeader>{t("areYouSure", "Are you sure?")}</ModalHeader>
-      <ModalBody>
-        {t(
-          "saveExplanation",
-          "Do you want to save the current form and exit the workflow?"
-        )}
-      </ModalBody>
-      <ModalFooter>
-        <Button kind="secondary" onClick={() => setOpen(false)}>
-          {t("cancel", "Cancel")}
-        </Button>
-        <Button kind="primary" onClick={completeSession}>
-          {t("complete", "Complete")}
-        </Button>
-      </ModalFooter>
-    </ComposedModal>
-  );
-};
+import CompleteModal from "../CompleteModal";
+import CancelModal from "../CancelModal";
+import useStartVisit from "../hooks/useStartVisit";
 
 const WorkflowNavigationButtons = () => {
-  const { activeFormUuid, submitForNext, workflowState, destroySession } =
-    useContext(FormWorkflowContext);
-  const store = useStore(formStore);
-  const formState = store[activeFormUuid];
-  const navigationDisabled = formState !== "ready";
+  const context = useContext(FormWorkflowContext);
+  const { workflowState, destroySession } = context;
   const [cancelModalOpen, setCancelModalOpen] = useState(false);
   const [completeModalOpen, setCompleteModalOpen] = useState(false);
   const { t } = useTranslation();
@@ -111,13 +27,6 @@ const WorkflowNavigationButtons = () => {
   return (
     <>
       <div className={styles.rightPanelActionButtons}>
-        <Button
-          kind="primary"
-          onClick={() => submitForNext()}
-          disabled={navigationDisabled || workflowState === "NEW_PATIENT"}
-        >
-          {t("nextPatient", "Next Patient")}
-        </Button>
         <Button
           kind="secondary"
           onClick={
@@ -132,8 +41,16 @@ const WorkflowNavigationButtons = () => {
           {t("cancel", "Cancel")}
         </Button>
       </div>
-      <CancelModal open={cancelModalOpen} setOpen={setCancelModalOpen} />
-      <CompleteModal open={completeModalOpen} setOpen={setCompleteModalOpen} />
+      <CancelModal
+        open={cancelModalOpen}
+        setOpen={setCancelModalOpen}
+        context={context}
+      />
+      <CompleteModal
+        open={completeModalOpen}
+        setOpen={setCompleteModalOpen}
+        context={context}
+      />
     </>
   );
 };
@@ -147,15 +64,63 @@ const FormWorkspace = () => {
     activeFormUuid,
     editEncounter,
     encounters,
+    singleSessionVisitTypeUuid,
   } = useContext(FormWorkflowContext);
   const { t } = useTranslation();
 
+  const [encounter, setEncounter] = useState(null);
+  const [visit, setVisit] = useState(null);
+  const { sessionLocation } = useSession();
+
+  const {
+    saveVisit,
+    updateEncounter,
+    success: visitSaveSuccess,
+  } = useStartVisit({
+    showSuccessNotification: false,
+    showErrorNotification: true,
+  });
+
   const handlePostResponse = (encounter) => {
     if (encounter && encounter.uuid) {
       saveEncounter(encounter.uuid);
+      setEncounter(encounter);
     }
   };
 
+  useEffect(() => {
+    if (encounter && visit) {
+      // Update encounter so that it belongs to the created visit
+      updateEncounter({ uuid: encounter.uuid, visit: visit.uuid });
+    }
+  }, [encounter, visit, updateEncounter]);
+
+  useEffect(() => {
+    if (visitSaveSuccess) {
+      setVisit(visitSaveSuccess.data);
+    }
+  }, [visitSaveSuccess]);
+
+  const handleEncounterCreate = useCallback(
+    (payload) => {
+      payload.location = sessionLocation?.uuid;
+      payload.encounterDatetime = payload.encounterDatetime
+        ? payload.encounterDatetime
+        : new Date().toISOString();
+      // Create a visit with the same date as the encounter being saved
+      const visitStartDatetime = new Date(payload.encounterDatetime);
+      const visitStopDatetime = new Date(payload.encounterDatetime);
+      saveVisit({
+        patientUuid: activePatientUuid,
+        startDatetime: visitStartDatetime.toISOString(),
+        stopDatetime: visitStopDatetime.toISOString(),
+        visitType: singleSessionVisitTypeUuid,
+        location: sessionLocation?.uuid,
+      });
+    },
+    [activePatientUuid, singleSessionVisitTypeUuid, saveVisit, sessionLocation]
+  );
+
   return (
     <div className={styles.workspace}>
       {!patientUuids.length && (
@@ -172,6 +137,7 @@ const FormWorkspace = () => {
               {...{
                 formUuid: activeFormUuid,
                 handlePostResponse,
+                handleEncounterCreate,
               }}
             />
           </div>

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

@@ -36,6 +36,7 @@
   flex-grow: 1;
   max-height: calc(100vh - 14rem);
   overflow-y: scroll;
+  text-align: left;
 }
 
 .formContainer :global(.cds--form-item) :global(.question-area) {
@@ -43,7 +44,7 @@
 }
 
 .rightPanel {
-  width: 13rem;
+  min-width: 13rem;
   text-align: left;
   overflow-y: scroll;
 }

package/src/forms-page/FormsPage.tsx

@@ -1,4 +1,4 @@
-import { useConfig } from "@openmrs/esm-framework";
+import { useConfig, useSession } from "@openmrs/esm-framework";
 import { Tab, Tabs, TabList, TabPanels, TabPanel } from "@carbon/react";
 import React from "react";
 import { Config } from "../config-schema";
@@ -49,8 +49,13 @@ const FormsPage = () => {
   const { formCategories, formCategoriesToShow } = config;
   const { forms, isLoading, error } = useGetAllForms();
   const cleanRows = prepareRowsForTable(forms);
-  const savedFormsData = localStorage.getItem(fdeWorkflowStorageName);
-  const savedGroupFormsData = localStorage.getItem(fdeGroupWorkflowStorageName);
+  const { user } = useSession();
+  const savedFormsData = localStorage.getItem(
+    fdeWorkflowStorageName + ":" + user?.uuid
+  );
+  const savedGroupFormsData = localStorage.getItem(
+    fdeGroupWorkflowStorageName + ":" + user?.uuid
+  );
   const activeForms = [];
   const activeGroupForms = [];
 

package/src/forms-page/forms-table/FormsTable.tsx

@@ -28,10 +28,11 @@ const FormsTable = ({
 }) => {
   const { t } = useTranslation();
 
-  const formsHeader = [
+  const tableHeaders = [
     {
       key: "display",
       header: t("formName", "Form Name"),
+      isSortable: true,
     },
     {
       key: "actions",
@@ -43,7 +44,7 @@ const FormsTable = ({
     },
   ];
 
-  const augmenteRows = rows?.map((row) => ({
+  const augmentedRows = rows?.map((row) => ({
     ...row,
     actions: (
       <Link to={`form/${row.uuid}`}>
@@ -70,7 +71,7 @@ const FormsTable = ({
       />
     );
   }
-  if (augmenteRows.length === 0) {
+  if (augmentedRows.length === 0) {
     return (
       <EmptyState
         headerTitle={t("noFormsFound", "No Forms To Show")}
@@ -82,7 +83,7 @@ const FormsTable = ({
     );
   }
   return (
-    <DataTable rows={augmenteRows} headers={formsHeader} isSortable>
+    <DataTable rows={augmentedRows} headers={tableHeaders}>
       {({
         rows,
         headers,
@@ -104,7 +105,12 @@ const FormsTable = ({
               <TableHead>
                 <TableRow>
                   {headers.map((header) => (
-                    <TableHeader {...getHeaderProps({ header })}>
+                    <TableHeader
+                      {...getHeaderProps({
+                        header,
+                        isSortable: header.isSortable,
+                      })}
+                    >
                       {header.header}
                     </TableHeader>
                   ))}