diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts index a8bfb44843..ce4bedac2a 100644 --- a/packages/cli/src/databases/repositories/execution.repository.ts +++ b/packages/cli/src/databases/repositories/execution.repository.ts @@ -402,11 +402,6 @@ export class ExecutionRepository extends Repository { ids?: string[]; }, ) { - this.logger.error('deleteExecutionsByFilter called', { - filters, - accessibleWorkflowIds, - deleteConditions, - }); if (!deleteConditions?.deleteBefore && !deleteConditions?.ids) { throw new ApplicationError( 'Either "deleteBefore" or "ids" must be present in the request body', diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts index e7b124109e..c21f9f2344 100644 --- a/packages/cli/src/webhooks/waiting-webhooks.ts +++ b/packages/cli/src/webhooks/waiting-webhooks.ts @@ -183,30 +183,25 @@ export class WaitingWebhooks implements IWebhookManager { // Return 404 because we do not want to give any data if the execution exists or not. const errorMessage = `The workflow for execution "${executionId}" does not contain a waiting webhook with a matching path/method.`; - try { - if (this.isSendAndWaitRequest(workflow.nodes, suffix)) { - res.render('send-and-wait-no-action-required', { isTestWebhook: false }); + if (this.isSendAndWaitRequest(workflow.nodes, suffix)) { + res.render('send-and-wait-no-action-required', { isTestWebhook: false }); + return { noWebhookResponse: true }; + } + + if (!execution.data.resultData.error && execution.status === 'waiting') { + const childNodes = workflow.getChildNodes( + execution.data.resultData.lastNodeExecuted as string, + ); + + const hasChildForms = childNodes.some( + (node) => + workflow.nodes[node].type === FORM_NODE_TYPE || + workflow.nodes[node].type === WAIT_NODE_TYPE, + ); + + if (hasChildForms) { return { noWebhookResponse: true }; } - - if (!execution.data.resultData.error && execution.status === 'waiting') { - const childNodes = workflow.getChildNodes( - execution.data.resultData.lastNodeExecuted as string, - ); - - const hasChildForms = childNodes.some( - (node) => - workflow.nodes[node].type === FORM_NODE_TYPE || - workflow.nodes[node].type === WAIT_NODE_TYPE, - ); - - if (hasChildForms) { - return { noWebhookResponse: true }; - } - } - } catch (error) { - this.logger.debug('WAITING isSendAndWaitRequest check error'); - this.logger.debug(JSON.stringify(error)); } throw new NotFoundError(errorMessage); diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts index baca51695b..658e35b3c6 100644 --- a/packages/editor-ui/src/composables/useRunWorkflow.ts +++ b/packages/editor-ui/src/composables/useRunWorkflow.ts @@ -373,10 +373,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType { return node.name === lastNodeExecuted; }); diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/editor-ui/src/stores/executions.store.ts index 7d562fa683..f80f0f5e4d 100644 --- a/packages/editor-ui/src/stores/executions.store.ts +++ b/packages/editor-ui/src/stores/executions.store.ts @@ -228,7 +228,6 @@ export const useExecutionsStore = defineStore('executions', () => { } async function deleteExecutions(sendData: IExecutionDeleteFilter): Promise { - console.log('executions.store - deleteExecutions', sendData); await makeRestApiRequest( rootStore.restApiContext, 'POST', diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts index b4ddddd772..08bee0d448 100644 --- a/packages/editor-ui/src/stores/workflows.store.ts +++ b/packages/editor-ui/src/stores/workflows.store.ts @@ -1519,7 +1519,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => { } function deleteExecution(execution: ExecutionSummary): void { - console.log('workflow.store - deleteExecution', execution); currentWorkflowExecutions.value.splice(currentWorkflowExecutions.value.indexOf(execution), 1); } diff --git a/packages/editor-ui/src/views/WorkflowExecutionsView.vue b/packages/editor-ui/src/views/WorkflowExecutionsView.vue index f7e9ed18fa..d5ff4dcb6b 100644 --- a/packages/editor-ui/src/views/WorkflowExecutionsView.vue +++ b/packages/editor-ui/src/views/WorkflowExecutionsView.vue @@ -204,7 +204,6 @@ async function onExecutionStop(id?: string) { } async function onExecutionDelete(id?: string) { - console.log('On execution delete', id); if (!id) { return; }