Merge pull request #1352 from chhsiao1981/PACS-refactoring

refactoring the whole PACS UI.

Author: chhsiao1981

biome.json

@@ -1,7 +1,7 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.1.2/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
   "files": {
-    "include": [
+    "includes": [
       "src/**",
       "tests/**",
       "package.json",
@@ -11,10 +11,14 @@
       "tsconfig*.json",
       "testing/*.mjs"
     ],
-    "ignore": ["package-lock.json", "pfdcm/generated"]
+    "experimentalScannerIgnores": ["package-lock.json", "pfdcm/generated"]
   },
-  "organizeImports": {
-    "enabled": true
+  "assist": {
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
   },
   "formatter": {
     "indentWidth": 2,

package.json

@@ -87,12 +87,13 @@
     "react-dropzone": "^14.2.3",
     "react-error-boundary": "^4.0.13",
     "react-force-graph-2d": "^1.25.5",
+    "react-reducer-utils": "^5.1.2",
     "react-redux": "^9.1.2",
     "react-resizable-panels": "^2.1.4",
     "react-responsive": "^10.0.0",
     "react-router": "^6.26.2",
     "react-router-dom": "^6.26.2",
-    "react-use-websocket": "^4.8.1",
+    "react-use-websocket": "^4.13.0",
     "redux-saga": "^1.3.0",
     "rusha": "^0.8.14",
     "sanitize-html": "^2.13.0",
@@ -105,7 +106,7 @@
     "yaml": "^2.8.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
+    "@biomejs/biome": "^2.1.4",
     "@faker-js/faker": "^9.0.1",
     "@playwright/test": "^1.46.1",
     "@redux-devtools/extension": "^3.3.0",

pnpm-lock.yaml

@@ -17,6 +17,7 @@ export interface CallAPI<T> {
   filename?: string;
   filetext?: string;
   apiroot?: string;
+  isJson?: boolean;
 }
 
 interface ApiParams {
@@ -28,6 +29,7 @@ interface ApiParams {
   filename?: string;
   filetext?: string;
   apiroot?: string;
+  isJson?: boolean;
 }
 
 export interface ApiResult<T> {
@@ -86,6 +88,7 @@ const callApi = async <T>(
     filename,
     filetext: paramsFiletext,
     apiroot: paramsAPIRoot,
+    isJson,
   }: ApiParams,
 ): Promise<ApiResult<T>> => {
   const { API_ROOT: CONFIG_API_ROOT } = config;
@@ -97,6 +100,8 @@ const callApi = async <T>(
     API_ROOT = API_ROOT.slice(0, API_ROOT.length - 1);
   }
 
+  console.info("api.api: API_ROOT:", API_ROOT, "paramsAPIRoot:", paramsAPIRoot);
+
   let theEndpoint = endpoint;
   if (!theEndpoint.includes(API_ROOT)) {
     theEndpoint = `${API_ROOT}${endpoint}`;
@@ -117,7 +122,7 @@ const callApi = async <T>(
     Authorization: `Token ${token}`,
   };
 
-  let body: string | undefined = undefined;
+  let body: string | undefined;
   if (params) {
     const paramsStr = queryToString(params);
     headers["Content-Type"] = "application/x-www-form-urlencoded";
@@ -135,7 +140,7 @@ const callApi = async <T>(
     body,
   };
 
-  return await fetchCore<T>(theEndpoint, options);
+  return await fetchCore<T>(theEndpoint, options, isJson);
 };
 
 const postFile = async <T>(
@@ -204,8 +209,18 @@ const fetchCore = async <T>(
 };
 
 export default <T>(callAPI: CallAPI<T>): Promise<ApiResult<T>> => {
-  const { endpoint, method, query, params, filename, filetext, json, headers } =
-    callAPI;
+  const {
+    endpoint,
+    method,
+    query,
+    params,
+    filename,
+    filetext,
+    json,
+    headers,
+    apiroot,
+    isJson,
+  } = callAPI;
 
   return callApi<T>(endpoint, {
     method,
@@ -215,5 +230,7 @@ export default <T>(callAPI: CallAPI<T>): Promise<ApiResult<T>> => {
     filetext,
     json,
     headers,
+    apiroot,
+    isJson,
   });
 };

src/api/api.ts

@@ -0,0 +1,3 @@
+export const STATUS_OK = 200;
+export const STATUS_OK_CREATE = 201;
+export const STATUS_OK_EMPTY = 204;