(refactor)Replace usages of '/ws/rest/v1/' with restBaseUrl

package.json

@@ -120,4 +120,4 @@
         "@carbon/react": "1.14.0"
     },
     "packageManager": "[email protected]"
-}
+}

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

src/patient-chart/patient-laboratory-order-results.resource.ts

@@ -1,4 +1,9 @@
-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 +466,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

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",
     },

src/patient-chart/results-summary/results/results.resource.ts

@@ -1,4 +1,9 @@
-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 +41,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 },

src/queue-list/lab-dialogs/add-to-worklist-dialog.resource.ts

@@ -1,4 +1,9 @@
-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 +88,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 +111,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<FetchResponse>(
     apiUrl,
     openmrsFetch
@@ -123,7 +128,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<FetchResponse>(
     apiUrl,
     openmrsFetch
@@ -147,7 +152,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 +164,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 +176,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",
     },

src/queue-list/lab-tests/lab-tests.resource.ts

@@ -1,8 +1,13 @@
-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,

src/queue-list/laboratory-patient-list.resource.ts

@@ -2,7 +2,12 @@ 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 +34,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);
 }
 

src/reject-order/reject-order-dialog.resource.ts

@@ -1,9 +1,14 @@
-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",

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",

src/review-list/dialog/review-item.resource.ts

@@ -1,9 +1,14 @@
-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",

src/summary-tiles/laboratory-summary.resource.tsx

@@ -1,6 +1,11 @@
 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 +16,7 @@ export function useMetrics() {
     completed: 6,
   };
   const { data, error } = useSWR<{ data: { results: {} } }, Error>(
-    `/ws/rest/v1/queue?`,
+    `${restBaseUrl}/queue?`,
     openmrsFetch
   );
 
@@ -24,7 +29,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<FetchResponse>(apiUrl, openmrsFetch);
 
   return {
@@ -36,7 +41,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<Result> } },

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

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<