refactor(core): Bring active executions into executions controller (no-changelog) (#8371)
This commit is contained in:
@@ -553,7 +553,7 @@ export default defineComponent({
|
||||
},
|
||||
async loadActiveExecutions(): Promise<void> {
|
||||
const activeExecutions = isEmpty(this.workflowFilterCurrent.metadata)
|
||||
? await this.workflowsStore.getCurrentExecutions(this.workflowFilterCurrent)
|
||||
? await this.workflowsStore.getActiveExecutions(this.workflowFilterCurrent)
|
||||
: [];
|
||||
for (const activeExecution of activeExecutions) {
|
||||
if (activeExecution.workflowId && !activeExecution.workflowName) {
|
||||
@@ -573,7 +573,7 @@ export default defineComponent({
|
||||
// ever get ids 500, 501, 502 and 503 when they finish
|
||||
const promises = [this.workflowsStore.getPastExecutions(filter, this.requestItemsPerRequest)];
|
||||
if (isEmpty(filter.metadata)) {
|
||||
promises.push(this.workflowsStore.getCurrentExecutions({}));
|
||||
promises.push(this.workflowsStore.getActiveExecutions({}));
|
||||
}
|
||||
|
||||
const results = await Promise.all(promises);
|
||||
|
||||
@@ -111,7 +111,7 @@ describe('ExecutionsList.vue', () => {
|
||||
workflowsStore = useWorkflowsStore();
|
||||
|
||||
vi.spyOn(workflowsStore, 'fetchAllWorkflows').mockResolvedValue(workflowsData);
|
||||
vi.spyOn(workflowsStore, 'getCurrentExecutions').mockResolvedValue([]);
|
||||
vi.spyOn(workflowsStore, 'getActiveExecutions').mockResolvedValue([]);
|
||||
});
|
||||
|
||||
it('should render empty list', async () => {
|
||||
|
||||
Reference in New Issue
Block a user