mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⚡ Do only send manual executions to starting session & cleanup

Browse Source
This commit is contained in:
Jan Oberhauser
2021-02-13 20:40:27 +01:00
parent 53693886df
commit deaa015e61
9 changed files with 61 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/editor-ui/src/components/ExecutionsList.vue
View File

@@ -57,7 +57,6 @@
<template slot-scope="scope">
{{convertToDisplayDate(scope.row.startedAt)}}<br />
<small v-if="scope.row.id">ID: {{scope.row.id}}</small>
<small v-if="scope.row.idActive && scope.row.id === undefined && scope.row.stoppedAt === undefined">Active-ID: {{scope.row.idActive}}</small>
</template>
</el-table-column>
<el-table-column property="workflowName" label="Name">
@@ -126,8 +125,8 @@
</el-table-column>
<el-table-column label="" width="100" align="center">
<template slot-scope="scope">
<span v-if="scope.row.stoppedAt === undefined && scope.row.idActive">
<el-button circle title="Stop Execution" @click.stop="stopExecution(scope.row.idActive)" :loading="stoppingExecutions.includes(scope.row.idActive)" size="mini">
<span v-if="scope.row.stoppedAt === undefined">
<el-button circle title="Stop Execution" @click.stop="stopExecution(scope.row.id)" :loading="stoppingExecutions.includes(scope.row.id)" size="mini">
<font-awesome-icon icon="stop" />
</el-button>
</span>

4
packages/editor-ui/src/components/mixins/pushConnection.ts
View File

@@ -191,7 +191,7 @@ export const pushConnection = mixins(
return false;
}
if (this.$store.getters.activeExecutionId !== pushData.executionIdActive) {
if (this.$store.getters.activeExecutionId !== pushData.executionId) {
// The workflow which did finish execution did either not get started
// by this session or we do not have the execution id yet.
if (isRetry !== true) {
@@ -242,7 +242,7 @@ export const pushConnection = mixins(
const pushData = receivedData.data as IPushDataExecutionStarted;
const executionData: IExecutionsCurrentSummaryExtended = {
idActive: pushData.executionId,
id: pushData.executionId,
finished: false,
mode: pushData.mode,
startedAt: pushData.startedAt,