(fix) Mutate visit banner after starting new visit (#1434)

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
openmrs · Oct 31, 2023 · 79ef809 · 79ef809
1 parent 386fffa
commit 79ef809
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/esm-patient-chart-app/src/visit/queue-entry/queue.resource.tsx b/packages/esm-patient-chart-app/src/visit/queue-entry/queue.resource.tsx
@@ -67,11 +67,12 @@ interface UseVisitQueueEntries {
   isLoading: boolean;
   isError: Error;
   isValidating?: boolean;
+  mutate: () => void;
 }
 
 export function useVisitQueueEntry(patientUuid, visitUuid): UseVisitQueueEntries {
   const apiUrl = `/ws/rest/v1/visit-queue-entry?patient=${patientUuid}`;
-  const { data, error, isLoading, isValidating } = useSWR<{ data: { results: Array<VisitQueueEntry> } }, Error>(
+  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: { results: Array<VisitQueueEntry> } }, Error>(
     apiUrl,
     openmrsFetch,
   );
@@ -105,6 +106,7 @@ export function useVisitQueueEntry(patientUuid, visitUuid): UseVisitQueueEntries
     isLoading,
     isError: error,
     isValidating,
+    mutate,
   };
 }
 

diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.component.tsx
@@ -53,6 +53,7 @@ import BaseVisitType from './base-visit-type.component';
 import LocationSelector from './location-selection.component';
 import VisitAttributeTypeFields from './visit-attribute-type.component';
 import styles from './visit-form.scss';
+import { useVisitQueueEntry } from '../queue-entry/queue.resource';
 
 export type VisitFormData = {
   visitDate: Date;
@@ -81,14 +82,16 @@ const StartVisitForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWor
   const visitHeaderSlotState = useMemo(() => ({ patientUuid }), [patientUuid]);
   const { activePatientEnrollment, isLoading } = useActivePatientEnrollment(patientUuid);
   const allVisitTypes = useVisitTypes();
-  const { mutate } = useVisit(patientUuid);
+  const { mutate: mutateVisit } = useVisit(patientUuid);
   const [ignoreChanges, setIgnoreChanges] = useState(true);
   const [errorFetchingResources, setErrorFetchingResources] = useState<{
     blockSavingForm: boolean;
   }>(null);
   const [upcomingAppointment, setUpcomingAppointment] = useState(null);
   const upcomingAppointmentState = useMemo(() => ({ patientUuid, setUpcomingAppointment }), [patientUuid]);
   const visitQueueNumberAttributeUuid = config.visitQueueNumberAttributeUuid;
+  const [visitUuid, setVisitUuid] = useState('');
+  const { mutate: mutateQueueEntry } = useVisitQueueEntry(patientUuid, visitUuid);
 
   const visitFormSchema = useMemo(() => {
     const visitAttributes = (config.visitAttributeTypes ?? [])?.reduce(
@@ -173,7 +176,7 @@ const StartVisitForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWor
             if (response.status === 201) {
               if (config.showServiceQueueFields) {
                 // retrieve values from queue extension
-
+                setVisitUuid(response.data.uuid);
                 const queueLocation = event?.target['queueLocation']?.value;
                 const serviceUuid = event?.target['service']?.value;
                 const priority = event?.target['priority']?.value;
@@ -193,7 +196,8 @@ const StartVisitForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWor
                 ).then(
                   ({ status }) => {
                     if (status === 201) {
-                      mutate();
+                      mutateVisit();
+                      mutateQueueEntry();
                       showToast({
                         kind: 'success',
                         title: t('visitStarted', 'Visit started'),
@@ -225,7 +229,7 @@ const StartVisitForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWor
                 saveAppointment(appointmentPayload, abortController).then(
                   ({ status }) => {
                     if (status === 201) {
-                      mutate();
+                      mutateVisit();
                       showToast({
                         critical: true,
                         kind: 'success',
@@ -244,7 +248,7 @@ const StartVisitForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWor
                   },
                 );
               }
-              mutate();
+              mutateVisit();
               closeWorkspace();
 
               showToast({
@@ -272,7 +276,7 @@ const StartVisitForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeWor
       config.showServiceQueueFields,
       config.showUpcomingAppointments,
       visitQueueNumberAttributeUuid,
-      mutate,
+      mutateVisit,
       patientUuid,
       upcomingAppointment,
       t,