From 0ac365e406a56fd3fe1dd4d364fed9f805be18c0 Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 11 May 2024 12:23:51 +0300 Subject: [PATCH 01/15] Consolidate workflow run error messages, require editing the workflow first --- .../components/Workflow/Run/WorkflowRun.vue | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/client/src/components/Workflow/Run/WorkflowRun.vue b/client/src/components/Workflow/Run/WorkflowRun.vue index 8ab28c028b09..70f82cc704ee 100644 --- a/client/src/components/Workflow/Run/WorkflowRun.vue +++ b/client/src/components/Workflow/Run/WorkflowRun.vue @@ -10,35 +10,30 @@
-
- - Some tools in this workflow may have changed since it was last saved or some errors were found. - The workflow may still run, but any new options will have default values. Please review the - messages below to make a decision about whether the changes will affect your analysis. - - - Some tools are being executed with different versions compared to those available when this - workflow was last saved because the other versions are not or no longer available on this Galaxy - instance. To upgrade your workflow and dismiss this message simply edit the workflow and re-save - it. - - + + The `{{ model.name }}` workflow may contain tools which have changed since it was last saved + or some error have been detected. Please + click here to edit and review the issues before running + this workflow. + +
+ Workflow submission failed: {{ submissionError }} + +
- -
@@ -99,6 +94,9 @@ export default { computed: { ...mapState(useHistoryStore, ["currentHistoryId", "getHistoryById"]), ...mapState(useHistoryItemsStore, ["lastUpdateTime"]), + editorLink() { + return `/workflows/edit?id=${this.model.workflowId}`; + }, historyStatusKey() { return `${this.currentHistoryId}_${this.lastUpdateTime}`; }, From 8ddb0004ebeeddba85e4e3b5b2385d0f9ed2bdb2 Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 11 May 2024 12:33:55 +0300 Subject: [PATCH 02/15] Add owners user id to workflow run form response --- lib/galaxy/managers/workflows.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py index 563314260d00..b2f17de32871 100644 --- a/lib/galaxy/managers/workflows.py +++ b/lib/galaxy/managers/workflows.py @@ -1048,6 +1048,7 @@ def _workflow_to_dict_run(self, trans, stored, workflow, history=None): "name": stored.name, "steps": step_models, "step_version_changes": step_version_changes, + "user_id": trans.app.security.encode_id(stored.user_id), "has_upgrade_messages": has_upgrade_messages, "workflow_resource_parameters": self._workflow_resource_parameters(trans, stored, workflow), } From 43d918fa8cb1dabd9d7d95ed33d65a945a3b11c4 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 12 May 2024 00:14:38 +0300 Subject: [PATCH 03/15] Convert Workflow Run form to composition api --- .../components/Workflow/Run/WorkflowRun.vue | 269 +++++++++--------- 1 file changed, 128 insertions(+), 141 deletions(-) diff --git a/client/src/components/Workflow/Run/WorkflowRun.vue b/client/src/components/Workflow/Run/WorkflowRun.vue index 70f82cc704ee..bd544b6af209 100644 --- a/client/src/components/Workflow/Run/WorkflowRun.vue +++ b/client/src/components/Workflow/Run/WorkflowRun.vue @@ -1,18 +1,139 @@ + + - - From 20cd463fd56e351953f8370e7c8da2aa7c98b457 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 12 May 2024 00:17:03 +0300 Subject: [PATCH 04/15] Directly import bootstrap vue components into workflow run wrapper --- .../src/components/Workflow/Run/WorkflowRun.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/client/src/components/Workflow/Run/WorkflowRun.vue b/client/src/components/Workflow/Run/WorkflowRun.vue index bd544b6af209..14aaf0eae05e 100644 --- a/client/src/components/Workflow/Run/WorkflowRun.vue +++ b/client/src/components/Workflow/Run/WorkflowRun.vue @@ -1,4 +1,5 @@