(fix) Fix restBaseUrl (#25)

METS-Programme · Feb 29, 2024 · 6823de3 · 6823de3
1 parent 1ff7221
commit 6823de3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/facility-metrics/data-entry-statistics/data-entry-statistics.resource.ts b/src/facility-metrics/data-entry-statistics/data-entry-statistics.resource.ts
@@ -9,7 +9,7 @@ type encounterRequest = {
 };
 
 export function useGetDataEntryStatistics(params: encounterRequest) {
-  const apiUrl = `${restBaseUrl}dataentrystatistics?fromDate=${params.fromDate}&toDate=${params.toDate}&encUserColumn=${params.encUserColumn}&groupBy=${params.groupBy}`;
+  const apiUrl = `${restBaseUrl}/dataentrystatistics?fromDate=${params.fromDate}&toDate=${params.toDate}&encUserColumn=${params.encUserColumn}&groupBy=${params.groupBy}`;
   const abortController = new AbortController();
 
   const { mutate } = useSWRConfig();
@@ -35,7 +35,7 @@ export function useGetDataEntryStatistics(params: encounterRequest) {
 }
 
 export async function getDataEntryStatistics(params: encounterRequest) {
-  const apiUrl = `${restBaseUrl}dataentrystatistics?fromDate=${params.fromDate}&toDate=${params.toDate}&encUserColumn=${params.encUserColumn}&groupBy=${params.groupBy}`;
+  const apiUrl = `${restBaseUrl}/dataentrystatistics?fromDate=${params.fromDate}&toDate=${params.toDate}&encUserColumn=${params.encUserColumn}&groupBy=${params.groupBy}`;
   const abortController = new AbortController();
 
   return openmrsFetch(apiUrl, {

diff --git a/src/facility-metrics/facility-metrics.resource.tsx b/src/facility-metrics/facility-metrics.resource.tsx
@@ -58,8 +58,8 @@ export async function fetchTransactionCount(
   const abortController = new AbortController();
   const apiURL =
     type === "fhirProfile"
-      ? `${restBaseUrl}syncfhirresourcestats?profile`
-      : `${restBaseUrl}synctaskstats?type`;
+      ? `${restBaseUrl}/syncfhirresourcestats?profile`
+      : `${restBaseUrl}/synctaskstats?type`;
 
   const response = await openmrsFetch(
     `${apiURL}=${uuid}&startDate=${startDate}&endDate=${endDate}`,
@@ -79,8 +79,8 @@ export async function fetchTransactions(
   const abortController = new AbortController();
   const apiURL =
     type === "fhirProfile"
-      ? `${restBaseUrl}syncfhirresourcedetails?profile`
-      : `${restBaseUrl}synctaskdetails?synctasktype`;
+      ? `${restBaseUrl}/syncfhirresourcedetails?profile`
+      : `${restBaseUrl}/synctaskdetails?synctasktype`;
 
   return await openmrsFetch(
     `${apiURL}=${uuid}&startDate=${startDate}&endDate=${endDate}`,

diff --git a/src/facility-metrics/performance/performance.resource.ts b/src/facility-metrics/performance/performance.resource.ts
@@ -2,7 +2,7 @@ import useSWR from "swr";
 import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 
 export function useGetFacilityMetrics() {
-  const apiURL = `${restBaseUrl}ugandaemrreports/genderMetrics`;
+  const apiURL = `${restBaseUrl}/ugandaemrreports/genderMetrics`;
 
   const { data, error, isLoading } = useSWR<{ data: { results: any } }, Error>(
     apiURL,

diff --git a/src/fhir/fhir.resource.ts b/src/fhir/fhir.resource.ts
@@ -3,7 +3,7 @@ import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 import { EditAction } from "./fhir.component";
 
 export function useGetFhirProfiles() {
-  const apiUrl = `${restBaseUrl}syncfhirprofile`;
+  const apiUrl = `${restBaseUrl}/syncfhirprofile`;
   const { data, error, isLoading } = useSWR<{ data: { results: any } }, Error>(
     apiUrl,
     openmrsFetch