mirror of
https://github.com/n8n-io/n8n.git
synced 2025-02-21 02:56:40 -08:00
parent
2894c273c9
commit
7427eb4dc2
|
@ -402,11 +402,6 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
|
|||
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',
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -373,10 +373,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
|
|||
});
|
||||
const execution = await workflowsStore.getExecution((executionId as string) || '');
|
||||
|
||||
console.log('isFormShown', isFormShown);
|
||||
console.log('processExecution', execution);
|
||||
console.log('local-storage form url', localStorage.getItem(FORM_RELOAD));
|
||||
|
||||
localStorage.removeItem(FORM_RELOAD);
|
||||
|
||||
if (!execution || workflowsStore.workflowExecutionData === null) {
|
||||
|
@ -387,7 +383,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
|
|||
}
|
||||
|
||||
const { lastNodeExecuted } = execution.data?.resultData || {};
|
||||
console.log('lastNodeExecuted', lastNodeExecuted);
|
||||
const lastNode = execution.workflowData.nodes.find((node) => {
|
||||
return node.name === lastNodeExecuted;
|
||||
});
|
||||
|
|
|
@ -228,7 +228,6 @@ export const useExecutionsStore = defineStore('executions', () => {
|
|||
}
|
||||
|
||||
async function deleteExecutions(sendData: IExecutionDeleteFilter): Promise<void> {
|
||||
console.log('executions.store - deleteExecutions', sendData);
|
||||
await makeRestApiRequest(
|
||||
rootStore.restApiContext,
|
||||
'POST',
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -204,7 +204,6 @@ async function onExecutionStop(id?: string) {
|
|||
}
|
||||
|
||||
async function onExecutionDelete(id?: string) {
|
||||
console.log('On execution delete', id);
|
||||
if (!id) {
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue