From 2920429d50860b99d36733658871c6f3b21fde52 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Fri, 29 Sep 2023 16:29:18 +0200 Subject: [PATCH 1/2] Accomodate new version scheme in doc/source/conf.versioning.py --- doc/source/conf.versioning.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.versioning.py b/doc/source/conf.versioning.py index 9445246d4167..6aef635aa0c6 100644 --- a/doc/source/conf.versioning.py +++ b/doc/source/conf.versioning.py @@ -47,7 +47,7 @@ if Version(_ver) >= MIN_DOC_VERSION: simpleversioning_versions.append({"id": f"release_{_ver}", "name": _ver}) -if re.fullmatch(r"release_\d{2}\.\d{2}", TARGET_GIT_BRANCH): +if re.fullmatch(r"release_\d{2}\.\d{1,2}", TARGET_GIT_BRANCH): if _stable: # The current stable release will go here but fail the next conditional, avoiding either banner. if TARGET_GIT_BRANCH != f"release_{_stable}": From bce7bddcf67d6d37f5029ca7c3281fc523ed4a51 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sat, 30 Sep 2023 11:59:55 +0200 Subject: [PATCH 2/2] Show MessageException in invocation UI --- .../components/WorkflowInvocationState/InvocationMessage.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/src/components/WorkflowInvocationState/InvocationMessage.vue b/client/src/components/WorkflowInvocationState/InvocationMessage.vue index 3d3efe121ca9..a21fbd910f83 100644 --- a/client/src/components/WorkflowInvocationState/InvocationMessage.vue +++ b/client/src/components/WorkflowInvocationState/InvocationMessage.vue @@ -146,6 +146,9 @@ const infoString = computed(() => { invocationMessage.workflow_step_id + 1 } is a conditional step and the result of the when expression is not a boolean type.`; } else if (reason === "unexpected_failure") { + if (invocationMessage.details) { + return `${failFragment} an unexpected failure occurred: '${invocationMessage.details}'`; + } return `${failFragment} an unexpected failure occurred.`; } else if (reason === "workflow_output_not_found") { return `Defined workflow output '${invocationMessage.output_name}' was not found in step ${