Merge branch 'release_23.0' into release_23.1

bgruening · Jul 9, 2023 · 8d9e5dc · 8d9e5dc
2 parents de40c46 + c93a718
commit 8d9e5dc
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 24 deletions.
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
@@ -637,27 +637,25 @@ export default {
                 this.isCanvas = true;
                 return;
             }
-            const stepData = {
-                name: name,
-                content_id: contentId,
-                input_connections: {},
-                type: type,
-                outputs: [],
-                position: defaultPosition(this.graphOffset, this.transform),
-                post_job_actions: {},
-            };
-            const { id } = this.stepStore.addStep(stepData);
-            getModule(stepData, id, this.stateStore.setLoadingState).then((response) => {
-                this.stepStore.updateStep({
-                    ...stepData,
-                    id: id,
-                    tool_state: response.tool_state,
-                    inputs: response.inputs,
-                    outputs: response.outputs,
-                    config_form: response.config_form,
-                });
-                this.stateStore.setActiveNode(id);
-            });
+            const stepData = this.stepStore.insertNewStep(
+                contentId,
+                name,
+                type,
+                defaultPosition(this.graphOffset, this.transform)
+            );
+
+            getModule({ name, type, content_id: contentId }, stepData.id, this.stateStore.setLoadingState).then(
+                (response) => {
+                    this.stepStore.updateStep({
+                        ...stepData,
+                        tool_state: response.tool_state,
+                        inputs: response.inputs,
+                        outputs: response.outputs,
+                        config_form: response.config_form,
+                    });
+                    this.stateStore.setActiveNode(stepData.id);
+                }
+            );
         },
         async _loadEditorData(data) {
             if (data.name !== undefined) {

diff --git a/client/src/components/Workflow/Editor/composables/useStepProps.ts b/client/src/components/Workflow/Editor/composables/useStepProps.ts
@@ -11,12 +11,12 @@ export function useStepProps(step: Ref<Step>) {
         type,
         inputs: stepInputs,
         outputs: stepOutputs,
-        config_form: configForm,
         post_job_actions: postJobActions,
     } = toRefs(step);
 
     const label = computed(() => step.value.label ?? undefined);
     const annotation = computed(() => step.value.annotation ?? null);
+    const configForm = computed(() => step.value.config_form);
 
     return {
         stepId,

diff --git a/client/src/stores/workflowStepStore.ts b/client/src/stores/workflowStepStore.ts
@@ -191,6 +191,25 @@ export const useWorkflowStepStore = defineStore("workflowStepStore", {
             this.stepExtraInputs[step.id] = getStepExtraInputs(step);
             return step;
         },
+        insertNewStep(
+            contentId: NewStep["content_id"],
+            name: NewStep["name"],
+            type: NewStep["type"],
+            position: NewStep["position"]
+        ) {
+            const stepData: NewStep = {
+                name: name,
+                content_id: contentId,
+                input_connections: {},
+                type: type,
+                inputs: [],
+                outputs: [],
+                position: position,
+                post_job_actions: {},
+                tool_state: {},
+            };
+            return this.addStep(stepData);
+        },
         updateStep(this: State, step: Step) {
             const workflow_outputs = step.workflow_outputs?.filter((workflowOutput) =>
                 step.outputs.find((output) => workflowOutput.output_name == output.name)

diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -7764,6 +7764,7 @@ def copy_to(self, copied_step, step_mapping, user=None):
         copied_step.position = self.position
         copied_step.config = self.config
         copied_step.label = self.label
+        copied_step.when_expression = self.when_expression
         copied_step.inputs = copy_list(self.inputs, copied_step)
 
         subworkflow_step_mapping = {}

diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -577,6 +577,7 @@ def build_module(self, trans: GalaxyWebTransaction, payload=None):
         POST /api/workflows/build_module
         Builds module models for the workflow editor.
         """
+        # payload is tool state
         if payload is None:
             payload = {}
         inputs = payload.get("inputs", {})
@@ -587,8 +588,6 @@ def build_module(self, trans: GalaxyWebTransaction, payload=None):
             populate_state(trans, module.get_inputs(), inputs, module_state, check=False)
             module.recover_state(module_state, from_tool_form=True)
         return {
-            "label": inputs.get("__label", ""),
-            "annotation": inputs.get("__annotation", ""),
             "name": module.get_name(),
             "tool_state": module.get_state(),
             "content_id": module.get_content_id(),