Fix bug that fails starting a visit

package.json

@@ -36,7 +36,7 @@
     },
     "devDependencies": {
         "@carbon/react": "^1.64.1",
-        "@openmrs/esm-framework": "next",
+        "@openmrs/esm-framework": "5.8.2-pre.2417",
         "@openmrs/esm-patient-common-lib": "next",
         "@openmrs/esm-styleguide": "next",
         "@swc/cli": "^0.1.57",

packages/esm-care-panel-app/package.json

@@ -38,7 +38,7 @@
     "react-to-print": "^2.14.13"
   },
   "peerDependencies": {
-    "@openmrs/esm-framework": "5.x",
+    "@openmrs/esm-framework": "5.8.2-pre.2417",
     "@openmrs/esm-patient-common-lib": "5.x",
     "react": "^18.1.0",
     "react-i18next": "11.x",

packages/esm-care-panel-app/src/care-programs/care-programs.component.tsx

@@ -57,7 +57,7 @@ const CarePrograms: React.FC<CareProgramsProps> = ({ patientUuid }) => {
             formInfo: {
               encounterUuid: '',
               formUuid,
-              additionalProps: { enrollmenrDetails: careProgram.enrollmentDetails } ?? {},
+              additionalProps: { enrollmentDetails: careProgram.enrollmentDetails },
             },
           })
         : launchStartVisitPrompt();

packages/esm-patient-queues-app/package.json

@@ -45,7 +45,7 @@
     "swr": "^2.1.1"
   },
   "peerDependencies": {
-    "@openmrs/esm-framework": "5.x",
+    "@openmrs/esm-framework": "5.8.2-pre.2417",
     "react": "18.x",
     "react-i18next": "11.x",
     "react-router-dom": "6.x"

packages/esm-patient-queues-app/src/active-visits/change-status-move-to-next-dialog.component.tsx

@@ -27,9 +27,9 @@ import {
 import { addQueueEntry, getCareProvider, updateQueueEntry } from './active-visits-table.resource';
 import { useQueueRoomLocations } from '../hooks/useQueueRooms';
 import styles from './change-status-dialog.scss';
-import { first } from 'rxjs/operators';
 import { QueueStatus, extractErrorMessagesFromResponse } from '../utils/utils';
 import { getCurrentPatientQueueByPatientUuid, useProviders } from './visit-form/queue.resource';
+import { first } from 'rxjs/operators';
 
 interface ChangeStatusDialogProps {
   patientUuid: string;

packages/esm-patient-queues-app/src/active-visits/visit-form/queue.resource.ts

@@ -1,11 +1,11 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import useSWR from 'swr';
 import { Appointment, ProviderResponse } from '../../types';
 
 export async function saveAppointment(appointment: Appointment) {
   const abortController = new AbortController();
 
-  await openmrsFetch(`/ws/rest/v1/appointment`, {
+  await openmrsFetch(`${restBaseUrl}/appointment`, {
     method: 'POST',
     signal: abortController.signal,
     headers: {
@@ -29,7 +29,7 @@ export async function saveAppointment(appointment: Appointment) {
 
 // fetch providers of a service point
 export function useProviders() {
-  const apiUrl = `/ws/rest/v1/provider?q=&v=full`;
+  const apiUrl = `${restBaseUrl}/provider?q=&v=full`;
   const { data, error, isLoading, isValidating } = useSWR<{ data: { results: Array<ProviderResponse> } }, Error>(
     apiUrl,
     openmrsFetch,
@@ -44,7 +44,7 @@ export function useProviders() {
 }
 
 export async function getCurrentPatientQueueByPatientUuid(patientUuid: string, currentLocation: string) {
-  const apiUrl = `/ws/rest/v1/incompletequeue?queueRoom=${currentLocation}&patient=${patientUuid}&v=full`;
+  const apiUrl = `${restBaseUrl}/incompletequeue?queueRoom=${currentLocation}&patient=${patientUuid}&v=full`;
 
   const abortController = new AbortController();
 

packages/esm-patient-queues-app/src/active-visits/visit-form/visit-form.component.tsx

@@ -29,13 +29,13 @@ import {
 import dayjs from 'dayjs';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { first } from 'rxjs/operators';
 import styles from './visit-form.scss';
 import { useProviders } from './queue.resource';
 import { NewVisitPayload, SearchTypes } from '../../types';
 import { amPm, convertTime12to24 } from '../../helpers/time-helpers';
 import { useQueueRoomLocations } from '../../hooks/useQueueRooms';
 import { addQueueEntry } from '../active-visits-table.resource';
+import { first } from 'rxjs/operators';
 
 interface VisitFormProps {
   toggleSearchType: (searchMode: SearchTypes, patientUuid) => void;
@@ -142,7 +142,6 @@ const StartVisitForm: React.FC<VisitFormProps> = ({ patientUuid, toggleSearchTyp
       };
 
       const abortController = new AbortController();
-
       saveVisit(payload, abortController)
         .pipe(first())
         .subscribe(

packages/esm-ugandaemr-app/package.json

@@ -42,7 +42,7 @@
         "lodash-es": "^4.17.15"
     },
     "peerDependencies": {
-        "@openmrs/esm-framework": "5.x",
+        "@openmrs/esm-framework": "5.8.2-pre.2417",
         "react": "18.x",
         "react-i18next": "11.x"
     },