Merge pull request #1330 from chhsiao1981/query-and-retrieve-pacs

able to create public feed after successfully waiting for the PACS.

Author: chhsiao1981

src/api/api.ts

@@ -71,7 +71,7 @@ const collectionJsonItemToJson = (item: any) =>
 const collectionJsonToJson = (theData: any) =>
   theData.collection.items.map(collectionJsonItemToJson);
 
-const callApi = <T>(
+const callApi = async <T>(
   endpoint: string,
   {
     query,
@@ -103,7 +103,7 @@ const callApi = <T>(
 
   if (filename) {
     const filetext = paramsFiletext || "";
-    return postFile(theEndpoint, filename, filetext);
+    return await postFile(theEndpoint, filename, filetext);
   }
 
   const token = getToken();
@@ -130,10 +130,10 @@ const callApi = <T>(
     body,
   };
 
-  return fetchCore<T>(theEndpoint, options);
+  return await fetchCore<T>(theEndpoint, options);
 };
 
-const postFile = <T>(
+const postFile = async <T>(
   theEndpoint: string,
   filename: string,
   filetext: string,
@@ -149,19 +149,19 @@ const postFile = <T>(
     Accept: "application/json",
   };
 
-  return fetchCore<T>(
+  return await fetchCore<T>(
     theEndpoint,
     { method: "POST", headers, body: formData },
     true,
   );
 };
 
-const fetchCore = <T>(
+const fetchCore = async <T>(
   endpoint: string,
   options: RequestInit,
   isJson = false,
 ): Promise<ApiResult<T>> => {
-  return fetch(endpoint, options)
+  return await fetch(endpoint, options)
     .then((res) => {
       const status = res.status;
       return res

src/api/serverApi.ts

@@ -1,10 +1,12 @@
-import api from "./api";
+import { dir } from "console";
+import api, { type ApiResult } from "./api";
 import type {
   Feed,
   PluginInstance,
   Plugin,
   NodeInfo,
   UploadPipeline,
+  PACSSeries,
 } from "./types";
 
 import YAML from "yaml";
@@ -15,7 +17,7 @@ export const GetFeedPluginInstances = (feedID: number) =>
     method: "get",
   });
 
-export const GetFeed = (feedID: number) =>
+export const getFeed = (feedID: number) =>
   api<Feed>({
     endpoint: `/${feedID}/`,
     method: "get",
@@ -30,6 +32,15 @@ export const updateFeedName = (feedID: number, feedName: string) =>
     },
   });
 
+export const updateFeedPublic = (feedID: number, isPublic = true) =>
+  api<Feed>({
+    endpoint: `/${feedID}/`,
+    method: "put",
+    json: {
+      public: isPublic,
+    },
+  });
+
 export const searchPluginsByName = (pluginName: string) =>
   api<Plugin[]>({
     endpoint: "/plugins/search/",
@@ -44,6 +55,7 @@ export const createPluginInstance = (pluginID: number, theDirs: string[]) =>
     endpoint: `/plugins/${pluginID}/instances/`,
     method: "post",
     json: {
+      previous_id: null,
       dir: theDirs.join(","),
     },
   });
@@ -72,10 +84,69 @@ export const createWorkflow = (
     },
   });
 
+type createFeedWithFilepathProp = {
+  filepath: string;
+  theName: string;
+  tags: string[];
+  patientID?: string;
+  modality?: string;
+  studyDate?: string;
+  isPublic?: boolean;
+};
+export const createFeedWithFilepath = async ({
+  filepath,
+  theName,
+  tags,
+  patientID,
+  modality,
+  studyDate,
+  isPublic,
+}: createFeedWithFilepathProp): Promise<ApiResult<Feed>> => {
+  const pluginInstanceResult = await createPluginInstance(1, [filepath]);
+  if (!pluginInstanceResult.data) {
+    return {
+      errmsg: pluginInstanceResult.errmsg,
+      status: pluginInstanceResult.status,
+    };
+  }
+
+  const {
+    data: { feed_id: feedID },
+  } = pluginInstanceResult;
+
+  await updateFeedName(feedID, theName);
+
+  if (isPublic) {
+    await updateFeedPublic(feedID, true);
+  }
+
+  const feedResult = await getFeed(feedID);
+
+  return feedResult;
+};
+
 export const createPipeline = (pipeline: UploadPipeline) =>
   api({
     endpoint: "/pipelines/sourcefiles/",
     method: "post",
     filename: "fname",
     filetext: YAML.stringify(pipeline),
   });
+
+export const getPACSSeriesListByStudyUID = (studyUID: string) =>
+  api<PACSSeries[]>({
+    endpoint: "/pacs/series/search/",
+    method: "get",
+    query: {
+      StudyInstanceUID: studyUID,
+    },
+  });
+
+export const getPACSSeriesListBySeriesUID = (seriesUID: string) =>
+  api<PACSSeries[]>({
+    endpoint: "/pacs/series/search/",
+    method: "get",
+    query: {
+      SeriesInstanceUID: seriesUID,
+    },
+  });

src/api/types.ts

@@ -99,3 +99,23 @@ export interface UploadPipeline {
   locked: false;
   plugin_tree: UploadPluginInfo[];
 }
+
+export interface PACSSeries {
+  id: number;
+  creation_date: string; // yyyy-mm-ddTHH:MM:SS.ffffffTZ
+  folder_path: string;
+  PatientID: string;
+  PatientName: string;
+  PatientBirthDate: string;
+  PatientAge: string;
+  PatientSex: string;
+  StudyDate: string;
+  AccessionNumber: string;
+  Modality: string;
+  ProtocolName: string;
+  StudyInstanceUID: string;
+  StudyDescription: string;
+  SeriesInstanceUID: string;
+  SeriesDescription: string;
+  pacs_identifier: string;
+}

src/components/CreateFeed/createFeedHelper.ts

@@ -14,7 +14,7 @@ import { computeWorkflowNodesInfo, getFullFeedName } from "./utils";
 
 import {
   createWorkflow,
-  GetFeed,
+  getFeed,
   searchPluginsByName,
   createPluginInstance as serverCreatePluginInstance,
   updateFeedName,
@@ -111,7 +111,7 @@ const createFeedCore = async (
   }
 
   const feedID = createdInstance.data?.feed_id || 0;
-  const feed = GetFeed(feedID);
+  const feed = getFeed(feedID);
 
   await updateFeedName(feedID, fullFeedName);
 

src/components/NewLibrary/components/operations/CreateAnalysis.tsx

@@ -27,7 +27,7 @@ import { MainRouterContext } from "../../../../routes";
 import Review from "../../../CreateFeed/Review";
 import { useQueryClient } from "@tanstack/react-query";
 import type { SelectionPayload } from "../../../../store/cart/types";
-import { GetFeed, GetFeedPluginInstances } from "../../../../api/serverApi";
+import { getFeed, GetFeedPluginInstances } from "../../../../api/serverApi";
 import type { Feed, PluginInstance } from "../../../../api/types";
 import { catchError } from "../../../../api/common";
 
@@ -199,7 +199,7 @@ export default (props: Props) => {
       return { name: "", filename: "", theID: -1, createDateTime: "" };
     }
 
-    const feed = await GetFeed(feedID);
+    const feed = await getFeed(feedID);
     if (!feed.data) {
       return { name: "", filename: "", theID: -1, createDateTime: "" };
     }

src/components/NewLibrary/utils/useOperations.tsx

@@ -400,8 +400,8 @@ export const useFolderOperations = (
       createFeed: () => {
         const defaultFeedName =
           selectedPaths.length > 1
-            ? "Feed created from your Library"
-            : `Feed created for ${getFeedNameForSinglePath(selectedPaths[0])}`;
+            ? "Data created"
+            : `Data created for ${getFeedNameForSinglePath(selectedPaths[0])}`;
         setModalState({
           type: "createFeed",
           isOpen: true,

src/components/NewStore/index.tsx

@@ -253,7 +253,7 @@ const Store: React.FC = () => {
     <>
       <Wrapper
         titleComponent={
-          <InfoSection title="Import Packages" content="Work in Progress" />
+          <InfoSection title="Import Package" content="Work in Progress" />
         }
       >
         <Toolbar isSticky id="store-toolbar" clearAllFilters={() => {}}>