fix(core): Make push work for waiting webhooks (#11678)

netroy · web-flow · commit 600479bf36ba · 2024-11-11T17:15:27.000+01:00
diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts
@@ -215,7 +215,7 @@ export class WaitingWebhooks implements IWebhookManager {
 				workflowData as IWorkflowDb,
 				workflowStartNode,
 				executionMode,
-				undefined,
+				runExecutionData.pushRef,
 				runExecutionData,
 				execution.id,
 				req,
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
@@ -495,6 +495,11 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						retryOf: this.retryOf,
 					});
 
+					// When going into the waiting state, store the pushRef in the execution-data
+					if (fullRunData.waitTill && isManualMode) {
+						fullExecutionData.data.pushRef = this.pushRef;
+					}
+
 					await updateExistingExecution({
 						executionId: this.executionId,
 						workflowId: this.workflowData.id,
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
@@ -2114,6 +2114,7 @@ export interface IRunExecutionData {
 		waitingExecutionSource: IWaitingForExecutionSource | null;
 	};
 	waitTill?: Date;
+	pushRef?: string;
 }
 
 export interface IRunData {

Original file line number	Diff line number	Diff line change
`@@ -2114,6 +2114,7 @@ export interface IRunExecutionData {`
`2114`	`2114`	`waitingExecutionSource: IWaitingForExecutionSource \| null;`
`2115`	`2115`	`};`
`2116`	`2116`	`waitTill?: Date;`
	`2117`	`+ pushRef?: string;`
`2117`	`2118`	`}`
`2118`	`2119`
`2119`	`2120`	`export interface IRunData {`