diff --git a/src/patient-chart/laboratory-item/view-laboratory-item.resource.ts b/src/patient-chart/laboratory-item/view-laboratory-item.resource.ts index d43161a..6a07d96 100644 --- a/src/patient-chart/laboratory-item/view-laboratory-item.resource.ts +++ b/src/patient-chart/laboratory-item/view-laboratory-item.resource.ts @@ -1,4 +1,4 @@ -import { openmrsFetch } from "@openmrs/esm-framework"; +import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework"; import useSWR from "swr"; export interface EncounterResponse { @@ -276,7 +276,7 @@ export interface Encounter { } export function useGetEncounterById(encounterUuid: string) { - const apiUrl = `/ws/rest/v1/encounter/${encounterUuid}?v=full`; + const apiUrl = `${restBaseUrl}/encounter/${encounterUuid}?v=full`; const { data, error, isLoading } = useSWR<{ data: EncounterResponse }, Error>( apiUrl, openmrsFetch diff --git a/src/patient-chart/patient-laboratory-order-results.resource.ts b/src/patient-chart/patient-laboratory-order-results.resource.ts index 0293630..ce25e6b 100644 --- a/src/patient-chart/patient-laboratory-order-results.resource.ts +++ b/src/patient-chart/patient-laboratory-order-results.resource.ts @@ -1,4 +1,4 @@ -import { formatDate, openmrsFetch, useConfig } from "@openmrs/esm-framework"; +import { formatDate, openmrsFetch, restBaseUrl, useConfig } from "@openmrs/esm-framework"; import useSWR from "swr"; export interface LaboratoryResponse { @@ -461,7 +461,7 @@ export function usePatientLaboratoryOrders(filter: LaboratoryOrderFilter) { const config = useConfig(); const { laboratoryEncounterTypeUuid } = config; - const apiUrl = `/ws/rest/v1/encounter?patient=${filter.patientUuid}&encounterType=${laboratoryEncounterTypeUuid}&v=${filter.v}&totalCount=true`; + const apiUrl = `${restBaseUrl}/encounter?patient=${filter.patientUuid}&encounterType=${laboratoryEncounterTypeUuid}&v=${filter.v}&totalCount=true`; const { data, error, isLoading } = useSWR< { data: LaboratoryResponse }, Error diff --git a/src/patient-chart/results-summary/results-summary.resource.tsx b/src/patient-chart/results-summary/results-summary.resource.tsx index 9c68517..a04ab1f 100644 --- a/src/patient-chart/results-summary/results-summary.resource.tsx +++ b/src/patient-chart/results-summary/results-summary.resource.tsx @@ -1,4 +1,4 @@ -import { openmrsFetch } from "@openmrs/esm-framework"; +import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework"; import { ObsMetaInfo } from "@openmrs/esm-patient-common-lib"; import useSWR from "swr"; @@ -161,7 +161,7 @@ export function assessValue( } export function useGetConceptById(conceptUuid: string) { - const apiUrl = `/ws/rest/v1/concept/${conceptUuid}?v=full`; + const apiUrl = `${restBaseUrl}/concept/${conceptUuid}?v=full`; const { data, error, isLoading } = useSWR<{ data: ConceptResponse }, Error>( apiUrl, openmrsFetch @@ -176,7 +176,7 @@ export function useGetConceptById(conceptUuid: string) { export async function GetPatientByUuid(uuid: string) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/patient/${uuid}`, { + return openmrsFetch(`${restBaseUrl}/patient/${uuid}`, { headers: { "Content-Type": "application/json", }, diff --git a/src/patient-chart/results-summary/results/results.resource.ts b/src/patient-chart/results-summary/results/results.resource.ts index 136ef14..01b38d6 100644 --- a/src/patient-chart/results-summary/results/results.resource.ts +++ b/src/patient-chart/results-summary/results/results.resource.ts @@ -1,4 +1,4 @@ -import { FetchResponse, openmrsFetch, useConfig } from "@openmrs/esm-framework"; +import { FetchResponse, openmrsFetch, restBaseUrl, useConfig } from "@openmrs/esm-framework"; import useSWR from "swr"; export interface LabTestResultResponse { @@ -36,7 +36,7 @@ export interface Link { } export function useGetLabEncounterTests(encounterUuid: string) { - const apiUrl = `/ws/rest/v1/encountertestresults?encounterUuid=${encounterUuid}`; + const apiUrl = `${restBaseUrl}/encountertestresults?encounterUuid=${encounterUuid}`; const { data, error, isLoading } = useSWR< { data: LabTestResultResponse }, diff --git a/src/queue-list/lab-dialogs/add-to-worklist-dialog.resource.ts b/src/queue-list/lab-dialogs/add-to-worklist-dialog.resource.ts index 9963302..89c4fc7 100644 --- a/src/queue-list/lab-dialogs/add-to-worklist-dialog.resource.ts +++ b/src/queue-list/lab-dialogs/add-to-worklist-dialog.resource.ts @@ -1,4 +1,4 @@ -import { FetchResponse, openmrsFetch, useConfig } from "@openmrs/esm-framework"; +import { FetchResponse, openmrsFetch, restBaseUrl, useConfig } from "@openmrs/esm-framework"; import { useMemo } from "react"; import useSWR from "swr"; import useSWRImmutable from "swr/immutable"; @@ -83,7 +83,7 @@ export interface ParentLocation { // get queue rooms export function useQueueRoomLocations(currentQueueLocation: string) { - const apiUrl = `/ws/rest/v1/location/${currentQueueLocation}?v=full`; + const apiUrl = `${restBaseUrl}/location/${currentQueueLocation}?v=full`; const { data, error, isLoading } = useSWR<{ data: QueueRoomsResponse }>( apiUrl, openmrsFetch @@ -106,7 +106,7 @@ export function useQueueRoomLocations(currentQueueLocation: string) { export function useReferralLocations() { const config = useConfig(); const { laboratoryReferalDestinationUuid } = config; - const apiUrl = `/ws/rest/v1/concept/${laboratoryReferalDestinationUuid}`; + const apiUrl = `${restBaseUrl}/concept/${laboratoryReferalDestinationUuid}`; const { data, error, isLoading } = useSWRImmutable( apiUrl, openmrsFetch @@ -123,7 +123,7 @@ export function useSpecimenTypes() { const config = useConfig(); const { laboratorySpecimenTypeConcept } = config; - const apiUrl = `/ws/rest/v1/concept/${laboratorySpecimenTypeConcept}`; + const apiUrl = `${restBaseUrl}/concept/${laboratorySpecimenTypeConcept}`; const { data, error, isLoading } = useSWRImmutable( apiUrl, openmrsFetch @@ -147,7 +147,7 @@ export function useSpecimenTypes() { // generate specimen id export async function GenerateSpecimenId(uuid: string) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/generatesampleId?uuid=${uuid}`, { + return openmrsFetch(`${restBaseUrl}/generatesampleId?uuid=${uuid}`, { method: "GET", headers: { "Content-Type": "application/json", @@ -159,7 +159,7 @@ export async function GenerateSpecimenId(uuid: string) { // update Order export async function UpdateOrder(uuid: string, body: any) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/accessionorder/${uuid}`, { + return openmrsFetch(`${restBaseUrl}/accessionorder/${uuid}`, { method: "POST", headers: { "Content-Type": "application/json", @@ -171,7 +171,7 @@ export async function UpdateOrder(uuid: string, body: any) { export async function GetOrderByUuid(uuid: string) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/order/${uuid}`, { + return openmrsFetch(`${restBaseUrl}/order/${uuid}`, { headers: { "Content-Type": "application/json", }, diff --git a/src/queue-list/lab-tests/lab-tests.resource.ts b/src/queue-list/lab-tests/lab-tests.resource.ts index f119b9d..5d234b8 100644 --- a/src/queue-list/lab-tests/lab-tests.resource.ts +++ b/src/queue-list/lab-tests/lab-tests.resource.ts @@ -1,8 +1,8 @@ -import { FetchResponse, openmrsFetch, useConfig } from "@openmrs/esm-framework"; +import { FetchResponse, openmrsFetch, restBaseUrl, useConfig } from "@openmrs/esm-framework"; import useSWR from "swr"; import { EncounterResponse } from "../../patient-chart/laboratory-item/view-laboratory-item.resource"; export function useGetLabOrders(encounterUuid: string) { - const apiUrl = `/ws/rest/v1/encounter/${encounterUuid}?v=full`; + const apiUrl = `${restBaseUrl}/encounter/${encounterUuid}?v=full`; const { data, error, isLoading } = useSWR<{ data: EncounterResponse }, Error>( apiUrl, diff --git a/src/queue-list/laboratory-patient-list.resource.ts b/src/queue-list/laboratory-patient-list.resource.ts index 3c2cc26..d5fd6d1 100644 --- a/src/queue-list/laboratory-patient-list.resource.ts +++ b/src/queue-list/laboratory-patient-list.resource.ts @@ -2,7 +2,7 @@ import { PatientQueue, UuidDisplay } from "../types/patient-queues"; import dayjs from "dayjs"; import useSWR from "swr"; -import { formatDate, openmrsFetch, parseDate } from "@openmrs/esm-framework"; +import { formatDate, openmrsFetch, parseDate, restBaseUrl } from "@openmrs/esm-framework"; export interface MappedPatientQueueEntry { id: string; @@ -29,7 +29,7 @@ export function usePatientQueuesList( currentQueueRoomLocationUuid: string, status: string ) { - const apiUrl = `/ws/rest/v1/patientqueue?v=full&room=${currentQueueRoomLocationUuid}&status=${status}`; + const apiUrl = `${restBaseUrl}/patientqueue?v=full&room=${currentQueueRoomLocationUuid}&status=${status}`; return usePatientQueueRequest(apiUrl); } diff --git a/src/reject-order/reject-order-dialog.resource.ts b/src/reject-order/reject-order-dialog.resource.ts index 50bf72f..1a649ae 100644 --- a/src/reject-order/reject-order-dialog.resource.ts +++ b/src/reject-order/reject-order-dialog.resource.ts @@ -1,9 +1,9 @@ -import { FetchResponse, openmrsFetch, useConfig } from "@openmrs/esm-framework"; +import { FetchResponse, openmrsFetch, restBaseUrl, useConfig } from "@openmrs/esm-framework"; export async function RejectOrder(uuid: string, body: any) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/order/${uuid}/fulfillerdetails/`, { + return openmrsFetch(`${restBaseUrl}/order/${uuid}/fulfillerdetails/`, { method: "POST", headers: { "Content-Type": "application/json", diff --git a/src/results/result-form.resource.ts b/src/results/result-form.resource.ts index f2dbf55..1174085 100644 --- a/src/results/result-form.resource.ts +++ b/src/results/result-form.resource.ts @@ -1,4 +1,4 @@ -import { openmrsFetch } from "@openmrs/esm-framework"; +import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework"; import useSWR from "swr"; export interface ConceptResponse { @@ -305,7 +305,7 @@ export interface ObPayload { // get order concept export async function GetOrderConceptByUuid(uuid: string) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/concept/${uuid}?v=full`, { + return openmrsFetch(`${restBaseUrl}/concept/${uuid}?v=full`, { headers: { "Content-Type": "application/json", }, @@ -314,7 +314,7 @@ export async function GetOrderConceptByUuid(uuid: string) { } export function useGetOrderConceptByUuid(uuid: string) { - const apiUrl = `/ws/rest/v1/concept/${uuid}?v=custom:(uuid,display,name,datatype,set,answers,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units,setMembers:(uuid,display,answers,datatype,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units))`; + const apiUrl = `${restBaseUrl}/concept/${uuid}?v=custom:(uuid,display,name,datatype,set,answers,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units,setMembers:(uuid,display,answers,datatype,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units))`; const { data, error, isLoading, isValidating, mutate } = useSWR< { data: ConceptResponse }, @@ -331,7 +331,7 @@ export function useGetOrderConceptByUuid(uuid: string) { export async function UpdateEncounter(uuid: string, payload: any) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/encounter/${uuid}`, { + return openmrsFetch(`${restBaseUrl}/encounter/${uuid}`, { method: "POST", headers: { "Content-Type": "application/json", @@ -348,7 +348,7 @@ export async function UpdateOrderResult( orderPayload: any ) { const abortController = new AbortController(); - const updateOrderCall = await openmrsFetch(`/ws/rest/v1/order`, { + const updateOrderCall = await openmrsFetch(`${restBaseUrl}/order`, { method: "POST", headers: { "Content-Type": "application/json", @@ -358,7 +358,7 @@ export async function UpdateOrderResult( }); if (updateOrderCall.status === 201) { - return await openmrsFetch(`/ws/rest/v1/encounter/${encounterUuid}`, { + return await openmrsFetch(`${restBaseUrl}/encounter/${encounterUuid}`, { method: "POST", headers: { "Content-Type": "application/json", diff --git a/src/review-list/dialog/review-item.resource.ts b/src/review-list/dialog/review-item.resource.ts index 6e44609..10f3d07 100644 --- a/src/review-list/dialog/review-item.resource.ts +++ b/src/review-list/dialog/review-item.resource.ts @@ -1,9 +1,9 @@ -import { FetchResponse, openmrsFetch, useConfig } from "@openmrs/esm-framework"; +import { FetchResponse, openmrsFetch, restBaseUrl, useConfig } from "@openmrs/esm-framework"; export async function ApproverOrder(body: any) { const abortController = new AbortController(); - return openmrsFetch(`/ws/rest/v1/approveorder`, { + return openmrsFetch(`${restBaseUrl}/approveorder`, { method: "POST", headers: { "Content-Type": "application/json", diff --git a/src/summary-tiles/laboratory-summary.resource.tsx b/src/summary-tiles/laboratory-summary.resource.tsx index e52657b..6176fe9 100644 --- a/src/summary-tiles/laboratory-summary.resource.tsx +++ b/src/summary-tiles/laboratory-summary.resource.tsx @@ -1,6 +1,6 @@ import useSWR from "swr"; import useSWRImmutable from "swr/immutable"; -import { FetchResponse, openmrsFetch } from "@openmrs/esm-framework"; +import { FetchResponse, openmrsFetch, restBaseUrl } from "@openmrs/esm-framework"; import { Result } from "../work-list/work-list.resource"; export function useMetrics() { @@ -11,7 +11,7 @@ export function useMetrics() { completed: 6, }; const { data, error } = useSWR<{ data: { results: {} } }, Error>( - `/ws/rest/v1/queue?`, + `${restBaseUrl}/queue?`, openmrsFetch ); @@ -24,7 +24,7 @@ export function useMetrics() { export function useServices() { const serviceConceptSetUuid = "330c0ec6-0ac7-4b86-9c70-29d76f0ae20a"; - const apiUrl = `/ws/rest/v1/concept/${serviceConceptSetUuid}`; + const apiUrl = `${restBaseUrl}/concept/${serviceConceptSetUuid}`; const { data } = useSWRImmutable(apiUrl, openmrsFetch); return { @@ -36,7 +36,7 @@ export function useServices() { // worklist export function useLabTestsStats(fulfillerStatus: string) { - const apiUrl = `/ws/rest/v1/order?orderTypes=52a447d3-a64a-11e3-9aeb-50e549534c5e&isStopped=false&fulfillerStatus=${fulfillerStatus}&v=full + const apiUrl = `${restBaseUrl}/order?orderTypes=52a447d3-a64a-11e3-9aeb-50e549534c5e&isStopped=false&fulfillerStatus=${fulfillerStatus}&v=full `; const { data, error, isLoading } = useSWR< { data: { results: Array } }, diff --git a/src/utils/functions.ts b/src/utils/functions.ts index 2c63a10..ef82d04 100644 --- a/src/utils/functions.ts +++ b/src/utils/functions.ts @@ -1,4 +1,4 @@ -import { openmrsFetch } from "@openmrs/esm-framework"; +import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework"; import useSWR from "swr"; export const trimVisitNumber = (visitNumber: string) => { @@ -233,7 +233,7 @@ export interface Creator { } export function useGetPatientByUuid(uuid: string) { - const apiUrl = `/ws/rest/v1/patient/${uuid}?v=full`; + const apiUrl = `${restBaseUrl}/patient/${uuid}?v=full`; const { data, error, isLoading } = useSWR<{ data: PatientResource }, Error>( apiUrl, openmrsFetch diff --git a/src/work-list/work-list.resource.ts b/src/work-list/work-list.resource.ts index 6b60de8..3a84a2c 100644 --- a/src/work-list/work-list.resource.ts +++ b/src/work-list/work-list.resource.ts @@ -1,4 +1,4 @@ -import { openmrsFetch } from "@openmrs/esm-framework"; +import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework"; import useSWR from "swr"; export interface Result { @@ -120,7 +120,7 @@ export function useGetOrdersWorklist( activatedOnOrAfterDate: string, fulfillerStatus: string ) { - const apiUrl = `/ws/rest/v1/order?orderTypes=52a447d3-a64a-11e3-9aeb-50e549534c5e&activatedOnOrAfterDate=${activatedOnOrAfterDate}&isStopped=false&fulfillerStatus=${fulfillerStatus}&v=full + const apiUrl = `${restBaseUrl}/order?orderTypes=52a447d3-a64a-11e3-9aeb-50e549534c5e&activatedOnOrAfterDate=${activatedOnOrAfterDate}&isStopped=false&fulfillerStatus=${fulfillerStatus}&v=full `; const { data, error, isLoading } = useSWR<