sanitizeAPIRootURL for both api.ts and PacsApp

Author: chhsiao1981

src/api/api.ts

@@ -78,6 +78,14 @@ export const collectionJsonToJson = (theData: any) => {
   return typeof theData.collection.total === "undefined" ? ret[0] : ret;
 };
 
+export const sanitizeAPIRootURL = (API_ROOT: string) => {
+  if (API_ROOT.length >= 1 && API_ROOT[API_ROOT.length - 1] === "/") {
+    return API_ROOT.slice(0, API_ROOT.length - 1);
+  }
+
+  return API_ROOT;
+};
+
 const callApi = async <T>(
   endpoint: string,
   {
@@ -96,10 +104,8 @@ const callApi = async <T>(
 
   const default_api_root = window.location.origin;
 
-  let API_ROOT = paramsAPIRoot || CONFIG_API_ROOT || default_api_root;
-  if (API_ROOT.length >= 1 && API_ROOT[API_ROOT.length - 1] === "/") {
-    API_ROOT = API_ROOT.slice(0, API_ROOT.length - 1);
-  }
+  const theAPIRootURL = paramsAPIRoot || CONFIG_API_ROOT || default_api_root;
+  const API_ROOT = sanitizeAPIRootURL(theAPIRootURL);
 
   let theEndpoint = endpoint;
   if (!theEndpoint.includes(API_ROOT)) {

src/components/Pacs/PacsApp.tsx

@@ -15,6 +15,7 @@ import {
   useReducer,
 } from "react-reducer-utils";
 import { useLocation, useSearchParams } from "react-router-dom";
+import { sanitizeAPIRootURL } from "../../api/api.ts";
 import type { Lonk, LonkMessageData } from "../../api/lonk/types.ts";
 import type { PACSqueryCore } from "../../api/pfdcm/index.ts";
 import * as DoPacs from "../../reducers/pacs";
@@ -203,7 +204,8 @@ export default () => {
       .map((each) => each.SeriesInstanceUID)
       .join(",");
 
-    const url = `${config.API_ROOT}/pacs/sse/?pacs_name=${service}&series_uids=${series_uids}`;
+    const apiRootURL = sanitizeAPIRootURL(config.API_ROOT);
+    const url = `${apiRootURL}/pacs/sse/?pacs_name=${service}&series_uids=${series_uids}`;
     const eventSource = new EventSource(url);
     console.info("PacsApp.eventSource: new eventSource");