fix: workflow submission

bento-platform · Sep 1, 2023 · bc4e1c6 · bc4e1c6
1 parent eb1b3e2
commit bc4e1c6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/src/components/manager/ManagerAnalysisContent.js b/src/components/manager/ManagerAnalysisContent.js
@@ -72,7 +72,6 @@ AnalysisConfirmDisplay.propTypes = {
 const ManagerAnalysisContent = () => {
     const dispatch = useDispatch();
     const history = useHistory();
-    const servicesByID = useSelector(state => state.services.itemsByID);
 
     return <RunSetupWizard
         workflowSelection={({handleWorkflowClick}) => (
@@ -84,9 +83,8 @@ const ManagerAnalysisContent = () => {
                 // TODO: GUI error message
                 return;
             }
-            const serviceInfo = servicesByID[selectedWorkflow.serviceID];
             dispatch(submitAnalysisWorkflowRun(
-                serviceInfo,
+                selectedWorkflow.service_base_url,
                 selectedWorkflow,
                 inputs,
                 "/admin/data/manager/runs",

diff --git a/src/components/manager/ManagerIngestionContent.js b/src/components/manager/ManagerIngestionContent.js
@@ -139,7 +139,6 @@ IngestConfirmDisplay.propTypes = {
 const ManagerIngestionContent = () => {
     const dispatch = useDispatch();
     const history = useHistory();
-    const servicesByID = useSelector(state => state.services.itemsByID);
 
     return <RunSetupWizard
         workflowSelection={({workflowSelectionValues, setWorkflowSelectionValues, handleWorkflowClick}) => (
@@ -169,10 +168,8 @@ const ManagerIngestionContent = () => {
                 return;
             }
 
-            const serviceInfo = servicesByID[selectedWorkflow.serviceID];
-
             dispatch(submitIngestionWorkflowRun(
-                serviceInfo,
+                selectedWorkflow.service_base_url,
                 selectedProject,
                 selectedDataset,
                 selectedDataType,

diff --git a/src/modules/wes/actions.js b/src/modules/wes/actions.js
@@ -99,14 +99,16 @@ export const fetchRunLogStreamsIfPossibleAndNeeded = runID => (dispatch, getStat
 
 
 export const submitWorkflowRun = networkAction(
-    (types, serviceInfo, workflow, params, inputs, tags, onSuccess, errorMessage) => (dispatch, getState) => {
+    (types, serviceBaseUrl, workflow, params, inputs, tags, onSuccess, errorMessage) => (dispatch, getState) => {
+        const serviceUrlRStrip = serviceBaseUrl.replace(/\/$/, "");
+
         const runRequest = {
             workflow_params: Object.fromEntries(Object.entries(inputs)
                 .map(([k, v]) => [`${workflow.id}.${k}`, v])),
             workflow_type: "WDL",  // TODO: Should eventually not be hard-coded
             workflow_type_version: "1.0",  // TODO: "
             workflow_engine_parameters: {},  // TODO: Currently unused
-            workflow_url: `${serviceInfo.url}/workflows/${workflow.id}.wdl`,
+            workflow_url: `${serviceUrlRStrip}/workflows/${workflow.id}.wdl`,
             tags: {
                 workflow_id: workflow.id,
                 workflow_metadata: workflow,
@@ -116,7 +118,7 @@ export const submitWorkflowRun = networkAction(
 
         return {
             types,
-            params: {serviceInfo, request: runRequest, ...params},
+            params: {request: runRequest, ...params},
             url: `${getState().services.wesService.url}/runs`,
             req: {
                 method: "POST",
@@ -129,11 +131,11 @@ export const submitWorkflowRun = networkAction(
 
 
 export const submitIngestionWorkflowRun =
-    (serviceInfo, projectID, datasetID, dataType, workflow, inputs, redirect, hist) =>
+    (serviceBaseUrl, projectID, datasetID, dataType, workflow, inputs, redirect, hist) =>
         (dispatch) =>
             dispatch(submitWorkflowRun(
                 SUBMIT_INGESTION_RUN,
-                serviceInfo,
+                serviceBaseUrl,
                 workflow,
                 {projectID, datasetID, dataType},  // params
                 inputs,
@@ -150,10 +152,10 @@ export const submitIngestionWorkflowRun =
             ));
 
 
-export const submitAnalysisWorkflowRun = (serviceInfo, workflow, inputs, redirect, hist) => (dispatch) =>
+export const submitAnalysisWorkflowRun = (serviceBaseUrl, workflow, inputs, redirect, hist) => (dispatch) =>
     dispatch(submitWorkflowRun(
         SUBMIT_ANALYSIS_RUN,
-        serviceInfo,
+        serviceBaseUrl,
         workflow,
         {},  // params
         inputs,

diff --git a/src/propTypes.js b/src/propTypes.js
@@ -182,7 +182,7 @@ export const workflowsStateToPropsMixin = state => {
 // Prop types object shape for a single workflow object.
 export const workflowPropTypesShape = PropTypes.shape({
     id: PropTypes.string,
-    serviceID: PropTypes.string,
+    service_base_url: PropTypes.string,
 
     // "Real" properties
     name: PropTypes.string,