fix(editor): Show correct status on canceled executions (#5813)

Co-authored-by: Milorad Filipovic <milorad@n8n.io>
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-03-30 16:27:40 +02:00
committed by GitHub
parent 41cdee7bc7
commit d0788ee8e1
5 changed files with 23 additions and 26 deletions

View File

@@ -74,6 +74,7 @@ const vModel = reactive(
const statuses = computed(() => [
{ id: 'all', name: locale.baseText('executionsList.anyStatus') },
{ id: 'error', name: locale.baseText('executionsList.error') },
{ id: 'canceled', name: locale.baseText('executionsList.canceled') },
{ id: 'running', name: locale.baseText('executionsList.running') },
{ id: 'success', name: locale.baseText('executionsList.success') },
{ id: 'waiting', name: locale.baseText('executionsList.waiting') },

View File

@@ -779,6 +779,8 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
if (status === 'waiting') {
text = this.$locale.baseText('executionsList.waiting');
} else if (status === 'canceled') {
text = this.$locale.baseText('executionsList.canceled');
} else if (status === 'crashed') {
text = this.$locale.baseText('executionsList.error');
} else if (status === 'new') {
@@ -801,6 +803,8 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
if (status === 'waiting') {
path = 'executionsList.statusWaiting';
} else if (status === 'canceled') {
path = 'executionsList.statusCanceled';
} else if (status === 'crashed') {
path = 'executionsList.statusText';
} else if (status === 'new') {

View File

@@ -38,9 +38,7 @@
<execution-time :start-time="execution.startedAt" />
</n8n-text>
<n8n-text
v-else-if="
executionUIDetails.name !== 'waiting' && executionUIDetails.name !== 'unknown'
"
v-else-if="executionUIDetails.runningTime !== ''"
:color="isActive ? 'text-dark' : 'text-base'"
size="small"
>