Merge pull request #1347 from chhsiao1981/clinician-default-view

clinician default view

Author: chhsiao1981

src/api/api.ts

@@ -70,8 +70,10 @@ const collectionJsonItemToJson = (item: any) =>
     return r;
   }, {});
 
-const collectionJsonToJson = (theData: any) =>
-  theData.collection.items.map(collectionJsonItemToJson);
+export const collectionJsonToJson = (theData: any) => {
+  const ret = theData.collection.items.map(collectionJsonItemToJson);
+  return typeof theData.collection.total === "undefined" ? ret[0] : ret;
+};
 
 const callApi = async <T>(
   endpoint: string,
@@ -186,11 +188,7 @@ const fetchCore = async <T>(
             collectionJsonData,
           );
 
-          const data =
-            !isJson &&
-            typeof collectionJsonData.collection.total === "undefined"
-              ? jsonData[0]
-              : jsonData;
+          const data = jsonData;
 
           return { status: res.status, data: data };
         })

src/api/types.ts

@@ -16,6 +16,10 @@ export interface Feed {
   cancelled_jobs: number;
 }
 
+export enum PluginInstanceStatus {
+  SUCCESS = "finishedSuccessfully",
+}
+
 export interface PluginInstance {
   id: number;
   title: string;
@@ -29,7 +33,7 @@ export interface PluginInstance {
   start_date: string; // yyyy-mm-ddTHH:MM:SS.ffffffTZ
   end_date: string; // yyyy-mm-ddTHH:MM:SS.ffffffTZ
   output_path: string;
-  status: string;
+  status: PluginInstanceStatus;
   pipeline_id: number;
 }
 
@@ -70,6 +74,16 @@ export interface NodeInfo {
   title: string;
 }
 
+export interface Piping {
+  id: number;
+  pipeline_id: number;
+  plugin_id: number;
+  plugin_name: string;
+  plugin_version: string;
+  title: string;
+  previous_id: number;
+}
+
 export interface PipelineDefaultParameters {
   id: number;
   param_id: number;

src/components/CreateFeed/createFeedHelper.ts

@@ -19,6 +19,7 @@ import {
   createPluginInstance as serverCreatePluginInstance,
   updateFeedName,
 } from "../../api/serverApi";
+import { collectionJsonToJson } from "../../api/api";
 
 const createFeedCore = async (
   dirpath: ChRISFeed[],
@@ -55,19 +56,34 @@ const createFeedCore = async (
     pipelineState;
 
   const pipelineID = pipelineToAdd?.data.id;
-  const resources = selectedPipeline?.[pipelineID];
+  const pipeline = selectedPipeline?.[pipelineID];
 
   console.info(
     "createFeedCore: pipelineID:",
     pipelineID,
-    "resources:",
-    resources,
+    "pipeline:",
+    pipeline,
+    "pipelineToAdd:",
+    pipelineToAdd,
+    "pipelineState:",
+    pipelineState,
   );
 
-  if (resources) {
-    const { parameters } = resources;
+  if (pipeline) {
+    const { pluginPipings: propsPluginPipings, parameters } = pipeline;
 
-    const nodes_info = computeWorkflowNodesInfo(parameters.data);
+    const pluginPipings = propsPluginPipings.map((eachPluginPiping) =>
+      collectionJsonToJson(eachPluginPiping),
+    );
+
+    console.info(
+      "createFeedCore: pluginPipings:",
+      pluginPipings,
+      "params:",
+      parameters.data,
+    );
+
+    const nodes_info = computeWorkflowNodesInfo(pluginPipings, parameters.data);
 
     for (const node of nodes_info) {
       // Set compute info

src/components/CreateFeed/utils.ts

@@ -12,40 +12,34 @@ import type { ChRISFeed, DataBreadcrumb } from "./types/feed";
 
 import constants from "../../datasets/constants";
 
-import type { NodeInfo, PipelineDefaultParameters } from "../../api/types";
-import { info } from "console";
+import type {
+  NodeInfo,
+  PipelineDefaultParameters,
+  Piping,
+} from "../../api/types";
 
 export const computeWorkflowNodesInfo = (
+  pipings: Piping[],
   params: PipelineDefaultParameters[],
 ): NodeInfo[] => {
-  const pipingSet = new Set();
-  const dedupParams = params.filter((each) => {
-    if (pipingSet.has(each.plugin_piping_id)) {
-      return false;
-    }
-
-    pipingSet.add(each.plugin_piping_id);
-
-    return true;
-  });
-
-  const theRet = dedupParams.map((each): NodeInfo => {
+  const theRet = pipings.map((each): NodeInfo => {
     return {
-      piping_id: each.plugin_piping_id,
-      previous_piping_id: each.previous_plugin_piping_id,
+      piping_id: each.id,
+      previous_piping_id: each.previous_id,
       compute_resource_name: "host",
-      title: each.plugin_piping_title,
+      title: each.title,
     };
   });
 
   console.info(
-    "utils.computeWorkflowNodesInfo: params:",
-    params,
+    "utils.computeWorkflowNodesInfo: pipings:",
+    pipings,
     "theRet:",
     theRet,
   );
   return theRet;
 };
+
 export const getFullFeedName = (
   analysisPrefix: string,
   chrisFeed: ChRISFeed,

src/components/FeedOutputBrowser/FeedOutputBrowser.tsx

@@ -33,6 +33,16 @@ const FeedOutputBrowser: React.FC<FeedOutputBrowserProps> = (props) => {
     handlePagination,
     finished,
   } = useFeedBrowser(props.statuses);
+
+  console.info(
+    "FeedOutputBrowser: pluginFilesPayload:",
+    pluginFilesPayload,
+    "selected:",
+    selected,
+    "statuses:",
+    props.statuses,
+  );
+
   return (
     <div style={{ height: "100%" }} className="feed-output-browser">
       {!finished ? (

src/components/FeedTree/FeedGraph.tsx

@@ -32,6 +32,8 @@ const FeedGraph: React.FC<IFeedProps> = ({
   const selectedPlugin = useAppSelector(
     (state) => state.instance.selectedPlugin,
   );
+
+  console.info("FeedGraph: selectedPlugin:", selectedPlugin);
   //const { data: instances, loading } = pluginInstances;
   const graphRef = React.useRef<HTMLDivElement | null>(null);
   const fgRef = React.useRef<ForceGraphMethods>();

src/components/FeedTree/ParentComponent.tsx

@@ -7,7 +7,9 @@ import { SpinContainer } from "../Common";
 import FeedTree from "./FeedTree";
 import type { TreeNodeDatum } from "./data";
 import type { PaginatedTreeQueryReturn } from "../Feeds/usePaginatedTreeQuery";
-import type { Feed } from "@fnndsc/chrisapi";
+import type { Feed, PluginInstance } from "@fnndsc/chrisapi";
+import { collectionJsonToJson } from "../../api/api";
+import type { PluginInstance as PluginInstanceType } from "../../api/types";
 
 interface ParentComponentProps {
   changeLayout: () => void;
@@ -44,14 +46,43 @@ const ParentComponent: React.FC<ParentComponentProps> = ({
 
   const stableRootNode = useMemo(() => rootNode, [rootNode]);
 
+  const lastPluginInstance = pluginInstances.reduce(
+    (r: PluginInstance | null, x, i) => {
+      if (r === null) {
+        return x;
+      }
+      const rJson = collectionJsonToJson(r);
+      const xJson = collectionJsonToJson(x);
+
+      return rJson.id <= xJson.id ? x : r;
+    },
+    null,
+  );
+
+  console.info(
+    "ParentComponent: pluginInstances:",
+    pluginInstances,
+    "lastPluginInstance:",
+    lastPluginInstance,
+  );
+
   useEffect(() => {
-    if (stableRootNode?.item && !selectedPlugin) {
-      dispatch(getSelectedPlugin(stableRootNode.item));
+    if (!stableRootNode?.item || selectedPlugin || !lastPluginInstance) {
+      return;
     }
-  }, [stableRootNode, dispatch, selectedPlugin]);
+
+    console.info(
+      "ParentComponent: stableRootNode:",
+      stableRootNode,
+      "lastPluginInstance:",
+      lastPluginInstance,
+    );
+    dispatch(getSelectedPlugin(lastPluginInstance));
+  }, [stableRootNode, dispatch, selectedPlugin, lastPluginInstance]);
 
   const onNodeClick = useCallback(
     (node: TreeNodeDatum) => {
+      console.info("ParentComponent: onNodeClick: node:", node.item);
       node.item && dispatch(getSelectedPlugin(node.item));
     },
     [dispatch],