Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(editor): removed filter that prevented showing running executions #4470

Merged
merged 1 commit into from
Oct 28, 2022
Merged

fix(editor): removed filter that prevented showing running executions #4470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions packages/editor-ui/src/components/ExecutionsView/ExecutionsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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<IExecutionsSummary[]> {
Expand All @@ -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(
Expand Down