Merge branch 'release_24.1' into usegalaxy

galaxyproject · Jun 20, 2024 · 8bff735 · 8bff735
2 parents 2ef6fa6 + 4239fe1
commit 8bff735
Show file tree

Hide file tree

Showing 28 changed files with 1,819 additions and 33 deletions.
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
@@ -801,12 +801,9 @@ export default {
             this.report.markdown = markdown;
         },
         onRun() {
-            const runUrl = `/workflows/run?id=${this.id}${
-                this.version !== undefined ? `&version=${this.version}` : ""
-            }`;
-            this.onNavigate(runUrl);
+            this.onNavigate(`/workflows/run?id=${this.id}`, false, false, true);
         },
-        async onNavigate(url, forceSave = false, ignoreChanges = false) {
+        async onNavigate(url, forceSave = false, ignoreChanges = false, appendVersion = false) {
             if (this.isNewTempWorkflow) {
                 await this.onCreate();
             } else if (this.hasChanges && !forceSave && !ignoreChanges) {
@@ -819,6 +816,9 @@ export default {
                 await this.onSave();
             }
 
+            if (appendVersion && this.version !== undefined) {
+                url += `&version=${this.version}`;
+            }
             this.hasChanges = false;
             await nextTick();
             this.$router.push(url);

diff --git a/client/src/components/Workflow/Editor/SaveChangesModal.vue b/client/src/components/Workflow/Editor/SaveChangesModal.vue
@@ -24,7 +24,7 @@ const busy = ref(false);
 
 const emit = defineEmits<{
     /** Proceed with or without saving the changes */
-    (e: "on-proceed", url: string, forceSave: boolean, ignoreChanges: boolean): void;
+    (e: "on-proceed", url: string, forceSave: boolean, ignoreChanges: boolean, appendVersion: boolean): void;
     /** Update the nav URL prop */
     (e: "update:nav-url", url: string): void;
     /** Update the show modal boolean prop */
@@ -49,13 +49,13 @@ function closeModal() {
 
 function dontSave() {
     busy.value = true;
-    emit("on-proceed", props.navUrl, false, true);
+    emit("on-proceed", props.navUrl, false, true, true);
 }
 
 function saveChanges() {
     busy.value = true;
     closeModal();
-    emit("on-proceed", props.navUrl, true, false);
+    emit("on-proceed", props.navUrl, true, false, true);
 }
 </script>
 

diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
@@ -74,7 +74,7 @@
                                 </details>
                                 <ParameterStep
                                     v-else-if="workflowStepType == 'parameter_input'"
-                                    :parameters="[invocation.input_step_parameters[stepDetails.workflow_step_label]]" />
+                                    :parameters="[getParamInput(stepDetails)]" />
                                 <GenericHistoryItem
                                     v-else-if="
                                         isDataStep &&
@@ -209,6 +209,11 @@ export default {
                 this.fetchWorkflowForInstanceId(this.workflowStep.workflow_id);
             }
         },
+        getParamInput(stepDetails) {
+            return Object.values(this.invocation.input_step_parameters).find(
+                (param) => param.workflow_step_id === stepDetails.workflow_step_id
+            );
+        },
         showJob(id) {
             this.$emit("show-job", id);
         },

diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
@@ -628,7 +628,7 @@ export function getRouter(Galaxy) {
                         props: (route) => ({
                             invocationId: route.params.invocationId,
                             isFullPage: true,
-                            fromPanel: route.query.from_panel,
+                            fromPanel: Boolean(route.query.from_panel),
                         }),
                     },
                     {