From 701105edcf5284f276fe146d8267e1a5560ab186 Mon Sep 17 00:00:00 2001 From: Omar Ajoue Date: Fri, 28 Apr 2023 17:18:16 +0200 Subject: [PATCH] fix: Prevent displaying an endless timer in the execution list for finished executions (#6137) --- packages/editor-ui/src/components/ExecutionsList.vue | 12 ++++++------ packages/editor-ui/src/plugins/i18n/locales/en.json | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue index a26d349a4..64fac1659 100644 --- a/packages/editor-ui/src/components/ExecutionsList.vue +++ b/packages/editor-ui/src/components/ExecutionsList.vue @@ -800,16 +800,16 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, showMessa path = 'executionsList.statusWaiting'; } else if (status === 'canceled') { path = 'executionsList.statusCanceled'; - } else if (status === 'crashed') { - path = 'executionsList.statusText'; + } else if (['crashed', 'failed', 'success'].includes(status)) { + if (!entry.stoppedAt) { + path = 'executionsList.statusTextWithoutTime'; + } else { + path = 'executionsList.statusText'; + } } else if (status === 'new') { path = 'executionsList.statusRunning'; } else if (status === 'running') { path = 'executionsList.statusRunning'; - } else if (status === 'success') { - path = 'executionsList.statusText'; - } else if (status === 'failed') { - path = 'executionsList.statusText'; } else { path = 'executionsList.statusUnknown'; } diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index c75690cc1..fa89ec4ca 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -510,6 +510,7 @@ "executionsList.status": "Status", "executionsList.statusCanceled": "Canceled", "executionsList.statusText": "{status} in {time}", + "executionsList.statusTextWithoutTime": "{status}", "executionsList.statusRunning": "{status} for {time}", "executionsList.statusWaiting": "{status} until {time}", "executionsList.statusUnknown": "Could not complete",