@openmrs/esm-fast-data-entry-app 1.0.1-pre.99 → 1.1.0

package/src/context/FormWorkflowReducer.ts

@@ -1,17 +1,14 @@
-import { navigate } from "@openmrs/esm-framework";
-import { initialWorkflowState } from "./FormWorkflowContext";
+import { navigate } from '@openmrs/esm-framework';
+import { initialWorkflowState } from './FormWorkflowContext';
 
-export const fdeWorkflowStorageVersion = "1.1.0";
-export const fdeWorkflowStorageName = "openmrs:fastDataEntryWorkflowState";
+export const fdeWorkflowStorageVersion = '1.1.0';
+export const fdeWorkflowStorageName = 'openmrs:fastDataEntryWorkflowState';
 const persistData = (data) => {
-  localStorage.setItem(
-    fdeWorkflowStorageName + ":" + data.userUuid,
-    JSON.stringify(data)
-  );
+  localStorage.setItem(fdeWorkflowStorageName + ':' + data.userUuid, JSON.stringify(data));
 };
 
 const initialFormState = {
-  workflowState: "NEW_PATIENT",
+  workflowState: 'NEW_PATIENT',
   activePatientUuid: null,
   activeEncounterUuid: null,
   patientUuids: [],
@@ -20,23 +17,18 @@ const initialFormState = {
 
 const reducer = (state, action) => {
   switch (action.type) {
-    case "INITIALIZE_WORKFLOW_STATE": {
-      const savedData = localStorage.getItem(
-        fdeWorkflowStorageName + ":" + action.userUuid
-      );
+    case 'INITIALIZE_WORKFLOW_STATE': {
+      const savedData = localStorage.getItem(fdeWorkflowStorageName + ':' + action.userUuid);
       const savedDataObject = savedData ? JSON.parse(savedData) : {};
       let newState: { [key: string]: unknown } = {};
       const newPatient = action.newPatientUuid
         ? {
             activePatientUuid: action.newPatientUuid,
-            workflowState: "EDIT_FORM",
+            workflowState: 'EDIT_FORM',
           }
         : {};
 
-      if (
-        savedData &&
-        savedDataObject["_storageVersion"] === fdeWorkflowStorageVersion
-      ) {
+      if (savedData && savedDataObject['_storageVersion'] === fdeWorkflowStorageVersion) {
         // there is localStorage data and it is still valid
         newState = {
           ...savedDataObject,
@@ -49,21 +41,15 @@ const reducer = (state, action) => {
               ...savedDataObject.forms[action.activeFormUuid],
               // if we receive activePatientUuid from a query parameter use that one
               ...newPatient,
-              patientUuids:
-                savedDataObject.forms[action.activeFormUuid]?.patientUuids ||
-                initialFormState.patientUuids,
+              patientUuids: savedDataObject.forms[action.activeFormUuid]?.patientUuids || initialFormState.patientUuids,
             },
           },
         };
         if (
           action.newPatientUuid &&
-          !newState.forms[action.activeFormUuid].patientUuids.includes(
-            action.newPatientUuid
-          )
+          !newState.forms[action.activeFormUuid].patientUuids.includes(action.newPatientUuid)
         ) {
-          newState.forms[action.activeFormUuid].patientUuids.push(
-            action.newPatientUuid
-          );
+          newState.forms[action.activeFormUuid].patientUuids.push(action.newPatientUuid);
         }
       } else {
         // no localStorage data, or we should void it
@@ -80,27 +66,24 @@ const reducer = (state, action) => {
       persistData(newState);
       return { ...newState };
     }
-    case "ADD_PATIENT": {
+    case 'ADD_PATIENT': {
       const newState = {
         ...state,
         forms: {
           ...state.forms,
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
-            patientUuids: [
-              ...state.forms[state.activeFormUuid].patientUuids,
-              action.patientUuid,
-            ],
+            patientUuids: [...state.forms[state.activeFormUuid].patientUuids, action.patientUuid],
             activePatientUuid: action.patientUuid,
             activeEncounterUuid: null,
-            workflowState: "EDIT_FORM",
+            workflowState: 'EDIT_FORM',
           },
         },
       };
       persistData(newState);
       return newState;
     }
-    case "OPEN_PATIENT_SEARCH": {
+    case 'OPEN_PATIENT_SEARCH': {
       const newState = {
         ...state,
         forms: {
@@ -109,7 +92,7 @@ const reducer = (state, action) => {
             ...state.forms[state.activeFormUuid],
             activePatientUuid: null,
             activeEncounterUuid: null,
-            workflowState: "NEW_PATIENT",
+            workflowState: 'NEW_PATIENT',
           },
         },
       };
@@ -117,11 +100,8 @@ const reducer = (state, action) => {
       persistData(newState);
       return newState;
     }
-    case "SAVE_ENCOUNTER": {
-      if (
-        state.forms[state.activeFormUuid].workflowState ===
-        "SUBMIT_FOR_COMPLETE"
-      ) {
+    case 'SAVE_ENCOUNTER': {
+      if (state.forms[state.activeFormUuid].workflowState === 'SUBMIT_FOR_COMPLETE') {
         const { [state.activeFormUuid]: activeForm, ...formRest } = state.forms;
         const newState = {
           ...state,
@@ -130,7 +110,7 @@ const reducer = (state, action) => {
         };
         persistData(newState);
         // eslint-disable-next-line
-        navigate({ to: "${openmrsSpaBase}/forms" });
+        navigate({ to: '${openmrsSpaBase}/forms' });
         return newState;
       } else {
         const newState = {
@@ -141,18 +121,15 @@ const reducer = (state, action) => {
               ...state.forms[state.activeFormUuid],
               encounters: {
                 ...state.forms[state.activeFormUuid].encounters,
-                [state.forms[state.activeFormUuid].activePatientUuid]:
-                  action.encounterUuid,
+                [state.forms[state.activeFormUuid].activePatientUuid]: action.encounterUuid,
               },
               activePatientUuid: null,
               activeEncounterUuid: null,
               workflowState:
-                state.forms[state.activeFormUuid].workflowState ===
-                "SUBMIT_FOR_NEXT"
-                  ? "NEW_PATIENT"
-                  : state.forms[state.activeFormUuid].workflowState ===
-                    "SUBMIT_FOR_REVIEW"
-                  ? "REVIEW"
+                state.forms[state.activeFormUuid].workflowState === 'SUBMIT_FOR_NEXT'
+                  ? 'NEW_PATIENT'
+                  : state.forms[state.activeFormUuid].workflowState === 'SUBMIT_FOR_REVIEW'
+                  ? 'REVIEW'
                   : state.forms[state.activeFormUuid].workflowState,
             },
           },
@@ -161,33 +138,32 @@ const reducer = (state, action) => {
         return newState;
       }
     }
-    case "EDIT_ENCOUNTER": {
+    case 'EDIT_ENCOUNTER': {
       const newState = {
         ...state,
         forms: {
           ...state.forms,
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
-            activeEncounterUuid:
-              state.forms[state.activeFormUuid].encounters[action.patientUuid],
+            activeEncounterUuid: state.forms[state.activeFormUuid].encounters[action.patientUuid],
             activePatientUuid: action.patientUuid,
-            workflowState: "EDIT_FORM",
+            workflowState: 'EDIT_FORM',
           },
         },
       };
       persistData(newState);
       return newState;
     }
-    case "SUBMIT_FOR_NEXT":
+    case 'SUBMIT_FOR_NEXT':
       // this state should not be persisted
       window.dispatchEvent(
-        new CustomEvent("ampath-form-action", {
+        new CustomEvent('ampath-form-action', {
           detail: {
             formUuid: state.activeFormUuid,
             patientUuid: state.forms[state.activeFormUuid].activePatientUuid,
-            action: "onSubmit",
+            action: 'onSubmit',
           },
-        })
+        }),
       );
       return {
         ...state,
@@ -195,20 +171,20 @@ const reducer = (state, action) => {
           ...state.forms,
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
-            workflowState: "SUBMIT_FOR_NEXT",
+            workflowState: 'SUBMIT_FOR_NEXT',
           },
         },
       };
-    case "SUBMIT_FOR_REVIEW":
+    case 'SUBMIT_FOR_REVIEW':
       // this state should not be persisted
       window.dispatchEvent(
-        new CustomEvent("ampath-form-action", {
+        new CustomEvent('ampath-form-action', {
           detail: {
             formUuid: state.activeFormUuid,
             patientUuid: state.forms[state.activeFormUuid].activePatientUuid,
-            action: "onSubmit",
+            action: 'onSubmit',
           },
-        })
+        }),
       );
       return {
         ...state,
@@ -216,20 +192,20 @@ const reducer = (state, action) => {
           ...state.forms,
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
-            workflowState: "SUBMIT_FOR_REVIEW",
+            workflowState: 'SUBMIT_FOR_REVIEW',
           },
         },
       };
-    case "SUBMIT_FOR_COMPLETE":
+    case 'SUBMIT_FOR_COMPLETE':
       // this state should not be persisted
       window.dispatchEvent(
-        new CustomEvent("ampath-form-action", {
+        new CustomEvent('ampath-form-action', {
           detail: {
             formUuid: state.activeFormUuid,
             patientUuid: state.forms[state.activeFormUuid].activePatientUuid,
-            action: "onSubmit",
+            action: 'onSubmit',
           },
-        })
+        }),
       );
       return {
         ...state,
@@ -237,11 +213,11 @@ const reducer = (state, action) => {
           ...state.forms,
           [state.activeFormUuid]: {
             ...state.forms[state.activeFormUuid],
-            workflowState: "SUBMIT_FOR_COMPLETE",
+            workflowState: 'SUBMIT_FOR_COMPLETE',
           },
         },
       };
-    case "GO_TO_REVIEW": {
+    case 'GO_TO_REVIEW': {
       const newState = {
         ...state,
         forms: {
@@ -250,14 +226,14 @@ const reducer = (state, action) => {
             ...state.forms[state.activeFormUuid],
             activeEncounterUuid: null,
             activePatientUuid: null,
-            workflowState: "REVIEW",
+            workflowState: 'REVIEW',
           },
         },
       };
       persistData(newState);
       return newState;
     }
-    case "DESTROY_SESSION": {
+    case 'DESTROY_SESSION': {
       const { [state.activeFormUuid]: activeForm, ...formRest } = state.forms;
       const newState = {
         ...state,
@@ -266,17 +242,17 @@ const reducer = (state, action) => {
       };
       persistData(newState);
       //eslint-disable-next-line
-      navigate({ to: "${openmrsSpaBase}/forms" });
+      navigate({ to: '${openmrsSpaBase}/forms' });
       return newState;
     }
-    case "CLOSE_SESSION": {
+    case 'CLOSE_SESSION': {
       const newState = {
         ...state,
         activeFormUuid: null,
       };
       persistData(newState);
       //eslint-disable-next-line
-      navigate({ to: "${openmrsSpaBase}/forms" });
+      navigate({ to: '${openmrsSpaBase}/forms' });
       return newState;
     }
     default:

package/src/context/GroupFormWorkflowContext.tsx

@@ -1,8 +1,9 @@
-import React, { useEffect, useMemo, useReducer } from "react";
-import reducer from "./GroupFormWorkflowReducer";
-import { useParams } from "react-router-dom";
-import { Type, useSession } from "@openmrs/esm-framework";
-import useGetSystemSetting from "../hooks/useGetSystemSetting";
+import React, { useEffect, useMemo, useReducer } from 'react';
+import reducer from './GroupFormWorkflowReducer';
+import { useParams } from 'react-router-dom';
+import { type Type, useSession } from '@openmrs/esm-framework';
+import useGetSystemSetting from '../hooks/useGetSystemSetting';
+
 interface ParamTypes {
   formUuid?: string;
 }
@@ -12,6 +13,7 @@ export interface GroupType {
   name: string;
   members: Array<Type.Object>;
 }
+
 export interface MetaType {
   sessionName: string;
   sessionDate: string;
@@ -49,6 +51,7 @@ export const initialWorkflowState = {
   workflowState: null, // pseudo field from state[activeFormUuid].workflowState
   activePatientUuid: null, // pseudo field from state[activeFormUuid].activePatientUuid
   activeEncounterUuid: null, // pseudo field from state[activeFormUuid].activeEncounterUuid
+  activeSessionUuid: null, // pseudo field from state[activeFormUuid].activeSessionUuid
   activeVisitUuid: null, // pseudo field from state[activeFormUuid].activeVisitUuid
   patientUuids: [], // pseudo field from state[activeFormUuid].patientUuids
   encounters: {}, // pseudo field from state[activeFormUuid].encounters
@@ -74,10 +77,8 @@ const GroupFormWorkflowContext = React.createContext({
 const GroupFormWorkflowProvider = ({ children }) => {
   const { user } = useSession();
   const { formUuid } = useParams() as ParamTypes;
-  const activeFormUuid = formUuid.split("&")[0];
-  const systemSetting = useGetSystemSetting(
-    "@openmrs/esm-fast-data-entry-app.groupSessionVisitTypeUuid"
-  );
+  const activeFormUuid = formUuid.split('&')[0];
+  const systemSetting = useGetSystemSetting('@openmrs/esm-fast-data-entry-app.groupSessionVisitTypeUuid');
   const groupVisitTypeUuid = systemSetting?.result?.data?.results?.[0]?.value;
   const [state, dispatch] = useReducer(reducer, {
     ...initialWorkflowState,
@@ -88,37 +89,32 @@ const GroupFormWorkflowProvider = ({ children }) => {
     () => ({
       initializeWorkflowState: ({ activeFormUuid }) =>
         dispatch({
-          type: "INITIALIZE_WORKFLOW_STATE",
+          type: 'INITIALIZE_WORKFLOW_STATE',
           activeFormUuid,
           userUuid: user.uuid,
         }),
-      setGroup: (group) => dispatch({ type: "SET_GROUP", group }),
-      unsetGroup: () => dispatch({ type: "UNSET_GROUP" }),
-      setSessionMeta: (meta) => dispatch({ type: "SET_SESSION_META", meta }),
-      addPatientUuid: (patientUuid) =>
-        dispatch({ type: "ADD_PATIENT_UUID", patientUuid }),
-      removePatientUuid: (patientUuid) =>
-        dispatch({ type: "REMOVE_PATIENT_UUID", patientUuid }),
-      openPatientSearch: () => dispatch({ type: "OPEN_PATIENT_SEARCH" }),
+      setGroup: (group) => dispatch({ type: 'SET_GROUP', group }),
+      unsetGroup: () => dispatch({ type: 'UNSET_GROUP' }),
+      setSessionMeta: (meta) => dispatch({ type: 'SET_SESSION_META', meta }),
+      addPatientUuid: (patientUuid) => dispatch({ type: 'ADD_PATIENT_UUID', patientUuid }),
+      removePatientUuid: (patientUuid) => dispatch({ type: 'REMOVE_PATIENT_UUID', patientUuid }),
+      openPatientSearch: () => dispatch({ type: 'OPEN_PATIENT_SEARCH' }),
       saveEncounter: (encounterUuid) =>
         dispatch({
-          type: "SAVE_ENCOUNTER",
+          type: 'SAVE_ENCOUNTER',
           encounterUuid,
         }),
-      validateForNext: () => dispatch({ type: "VALIDATE_FOR_NEXT" }),
-      validateForComplete: () => dispatch({ type: "VALIDATE_FOR_COMPLETE" }),
-      updateVisitUuid: (visitUuid) =>
-        dispatch({ type: "UPDATE_VISIT_UUID", visitUuid }),
-      submitForNext: (nextPatientUuid) =>
-        dispatch({ type: "SUBMIT_FOR_NEXT", nextPatientUuid }),
-      submitForComplete: () => dispatch({ type: "SUBMIT_FOR_COMPLETE" }),
-      editEncounter: (patientUuid) =>
-        dispatch({ type: "EDIT_ENCOUNTER", patientUuid }),
-      goToReview: () => dispatch({ type: "GO_TO_REVIEW" }),
-      destroySession: () => dispatch({ type: "DESTROY_SESSION" }),
-      closeSession: () => dispatch({ type: "CLOSE_SESSION" }),
+      validateForNext: () => dispatch({ type: 'VALIDATE_FOR_NEXT' }),
+      validateForComplete: () => dispatch({ type: 'VALIDATE_FOR_COMPLETE' }),
+      updateVisitUuid: (visitUuid) => dispatch({ type: 'UPDATE_VISIT_UUID', visitUuid }),
+      submitForNext: (nextPatientUuid) => dispatch({ type: 'SUBMIT_FOR_NEXT', nextPatientUuid }),
+      submitForComplete: () => dispatch({ type: 'SUBMIT_FOR_COMPLETE' }),
+      editEncounter: (patientUuid) => dispatch({ type: 'EDIT_ENCOUNTER', patientUuid }),
+      goToReview: () => dispatch({ type: 'GO_TO_REVIEW' }),
+      destroySession: () => dispatch({ type: 'DESTROY_SESSION' }),
+      closeSession: () => dispatch({ type: 'CLOSE_SESSION' }),
     }),
-    [user]
+    [user],
   );
 
   // if formUuid isn't a part of state yet, grab it from the url params
@@ -135,36 +131,21 @@ const GroupFormWorkflowProvider = ({ children }) => {
         groupVisitTypeUuid,
         ...state,
         ...actions,
-        workflowState:
-          state.forms?.[state.activeFormUuid]?.workflowState ??
-          initialWorkflowState.workflowState,
+        workflowState: state.forms?.[state.activeFormUuid]?.workflowState ?? initialWorkflowState.workflowState,
+        activeSessionUuid:
+          state.forms?.[state.activeFormUuid]?.activeSessionUuid ?? initialWorkflowState.activeSessionUuid,
         activePatientUuid:
-          state.forms?.[state.activeFormUuid]?.activePatientUuid ??
-          initialWorkflowState.activePatientUuid,
+          state.forms?.[state.activeFormUuid]?.activePatientUuid ?? initialWorkflowState.activePatientUuid,
         activeEncounterUuid:
-          state.forms?.[state.activeFormUuid]?.activeEncounterUuid ??
-          initialWorkflowState.activeEncounterUuid,
-        activeVisitUuid:
-          state.forms?.[state.activeFormUuid]?.activeVisitUuid ??
-          initialWorkflowState.activeVisitUuid,
-        patientUuids:
-          state.forms?.[state.activeFormUuid]?.patientUuids ??
-          initialWorkflowState.patientUuids,
-        encounters:
-          state.forms?.[state.activeFormUuid]?.encounters ??
-          initialWorkflowState.encounters,
-        activeGroupUuid:
-          state.forms?.[state.activeFormUuid]?.groupUuid ??
-          initialWorkflowState.activeGroupUuid,
-        activeGroupName:
-          state.forms?.[state.activeFormUuid]?.groupName ??
-          initialWorkflowState.activeGroupName,
+          state.forms?.[state.activeFormUuid]?.activeEncounterUuid ?? initialWorkflowState.activeEncounterUuid,
+        activeVisitUuid: state.forms?.[state.activeFormUuid]?.activeVisitUuid ?? initialWorkflowState.activeVisitUuid,
+        patientUuids: state.forms?.[state.activeFormUuid]?.patientUuids ?? initialWorkflowState.patientUuids,
+        encounters: state.forms?.[state.activeFormUuid]?.encounters ?? initialWorkflowState.encounters,
+        activeGroupUuid: state.forms?.[state.activeFormUuid]?.groupUuid ?? initialWorkflowState.activeGroupUuid,
+        activeGroupName: state.forms?.[state.activeFormUuid]?.groupName ?? initialWorkflowState.activeGroupName,
         activeGroupMembers:
-          state.forms?.[state.activeFormUuid]?.groupMembers ??
-          initialWorkflowState.activeGroupMembers,
-        activeSessionMeta:
-          state.forms?.[state.activeFormUuid]?.sessionMeta ??
-          initialWorkflowState.activeSessionMeta,
+          state.forms?.[state.activeFormUuid]?.groupMembers ?? initialWorkflowState.activeGroupMembers,
+        activeSessionMeta: state.forms?.[state.activeFormUuid]?.sessionMeta ?? initialWorkflowState.activeSessionMeta,
       }}
     >
       {children}