redirect to run page if version is specified

client/src/components/Workflow/TrsImport.vue

@@ -90,7 +90,7 @@ export default {
                     this.errorMessage = null;
                     const version = this.trsTool.versions.find((version) => version.id === this.queryTrsVersionId);
                     if (version) {
-                        this.importVersion(this.trsTool.id, version);
+                        this.importVersion(this.trsTool.id, version, true);
                     }
                 })
                 .catch((errorMessage) => {

client/src/components/Workflow/WorkflowImport.vue

@@ -31,6 +31,7 @@ import { getGalaxyInstance } from "app";
 import axios from "axios";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
+import {redirectOnImport} from "./utils"
 
 Vue.use(BootstrapVue);
 
@@ -67,9 +68,7 @@ export default {
                 axios
                     .post(`${getAppRoot()}api/workflows`, formData)
                     .then((response) => {
-                        window.location = `${getAppRoot()}workflows/list?message=${
-                            response.data.message
-                        }&status=success`;
+                        redirectOnImport(getAppRoot(), response.data)
                     })
                     .catch((error) => {
                         const message = error.response.data && error.response.data.err_msg;

client/src/components/Workflow/trsMixin.js

@@ -1,6 +1,7 @@
 import { getAppRoot } from "onload/loadConfig";
 import TrsServerSelection from "./TrsServerSelection";
 import TrsTool from "./TrsTool";
+import { redirectOnImport } from "./utils";
 
 export default {
     components: {
@@ -8,12 +9,19 @@ export default {
         TrsTool,
     },
     methods: {
-        importVersion(toolId, version) {
+        importVersion(toolId, version, isRunFormRedirect = false) {
             this.services
                 .importTrsTool(this.trsSelection.id, toolId, version.name)
                 .then((response_data) => {
-                    // copied from the WorkflowImport, de-duplicate somehow
-                    window.location = `${getAppRoot()}workflows/list?message=${response_data.message}&status=success`;
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    console.log("isRunFormRedirect", isRunFormRedirect);
+                    redirectOnImport(getAppRoot(), response_data, isRunFormRedirect);
                 })
                 .catch((errorMessage) => {
                     this.errorMessage = errorMessage || "Import failed for an unknown reason.";

client/src/components/Workflow/utils.js

@@ -0,0 +1,5 @@
+export function redirectOnImport(appRoot, response, isRunFormRedirect = false) {
+    isRunFormRedirect
+        ? (window.location = `${appRoot}workflows/run?id=${response.id}`)
+        : (window.location = `${appRoot}workflows/list?message=${response.message}&status=success`);
+}