From 24f63edfad0b736824ac4a853d6fd586e189cd2d Mon Sep 17 00:00:00 2001 From: Milorad Filipovic Date: Fri, 28 Oct 2022 15:50:21 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=20Removed=20filter=20that=20stopped?= =?UTF-8?q?=20showing=20running=20executions=20if=20workflow=20is=20not=20?= =?UTF-8?q?saving=20manual=20executions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExecutionsView/ExecutionsView.vue | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsView.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsView.vue index bf19c41bb172b..e484271b41cb0 100644 --- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsView.vue +++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsView.vue @@ -74,11 +74,6 @@ export default mixins(restApi, showMessage, executionHelpers, debounceHelper, wo totalFinishedExecutionsCount(): number { return this.$store.getters['workflows/getTotalFinishedExecutionsCount']; }, - isWorkflowSavingManualExecutions(): boolean { - const workflowSettings: IWorkflowSettings = this.$store.getters.workflowSettings; - const saveManualExecutionsDefault = this.$store.getters.saveManualExecutions; - return workflowSettings.saveManualExecutions === undefined ? saveManualExecutionsDefault: workflowSettings.saveManualExecutions as boolean; - }, }, watch:{ $route (to: Route, from: Route) { @@ -292,6 +287,14 @@ export default mixins(restApi, showMessage, executionHelpers, debounceHelper, wo this.$store.commit('workflows/setCurrentWorkflowExecutions', existingExecutions); if (updatedActiveExecution !== null) { this.$store.commit('workflows/setActiveWorkflowExecution', updatedActiveExecution); + } else { + const activeNotInTheList = existingExecutions.find(ex => ex.id === this.activeExecution.id) === undefined; + if (activeNotInTheList) { + this.$router.push({ + name: VIEWS.EXECUTION_PREVIEW, + params: { name: this.currentWorkflow, executionId: this.executions[0].id }, + }).catch(()=>{});; + } } }, async loadExecutions(): Promise { @@ -301,11 +304,6 @@ export default mixins(restApi, showMessage, executionHelpers, debounceHelper, wo try { const executions: IExecutionsSummary[] = await this.$store.dispatch('workflows/loadCurrentWorkflowExecutions', this.filter); - - // Don't show running manual executions if workflow is set up not to save them - if (!this.isWorkflowSavingManualExecutions) { - return executions.filter(ex => ex.finished === true || ex.mode !== 'manual'); - } return executions; } catch (error) { this.$showError(