From 8824a261105e604d3b71af48789ad1b008c658cc Mon Sep 17 00:00:00 2001 From: Muhsin Shah C P Date: Mon, 7 Jul 2025 18:41:28 +0530 Subject: [PATCH] [pre-release] Webhook trigger isn't working & changed the workflow-node(query) creation API endpoint [dependency PR] (#13237) * fix: update workflow query endpoint to use correct URL * chore: update subproject commits for frontend and server * fix: add request parameter to triggerWorkflow method in controller and interface --- frontend/ee | 2 +- frontend/src/_services/dataquery.service.js | 4 +--- server/ee | 2 +- .../workflows/controllers/workflow-webhooks.controller.ts | 8 +++++--- .../workflows/interfaces/IWorkflowWebhooksController.ts | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/ee b/frontend/ee index 2eeda8ae9a..c2266d92a3 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 2eeda8ae9a78ad82cd996ce4307f257268036cb7 +Subproject commit c2266d92a3e5732234874fd99b28396ae9f6f44e diff --git a/frontend/src/_services/dataquery.service.js b/frontend/src/_services/dataquery.service.js index 7a0114d85e..cbdccc2092 100644 --- a/frontend/src/_services/dataquery.service.js +++ b/frontend/src/_services/dataquery.service.js @@ -49,9 +49,7 @@ function createWorkflowQuery(app_id, app_version_id, name, kind, options, data_s }; const requestOptions = { method: 'POST', headers: authHeader(), credentials: 'include', body: JSON.stringify(body) }; - return fetch(`${config.apiUrl}/data-queries/workflow-node/versions/${app_version_id}`, requestOptions).then( - handleResponse - ); + return fetch(`${config.apiUrl}/data-queries/workflow-node`, requestOptions).then(handleResponse); } function update(id, versionId, name, options, dataSourceId) { diff --git a/server/ee b/server/ee index 5edf1e4b08..466223bc00 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 5edf1e4b0851cec1d06a14f9984c681e53ebbe77 +Subproject commit 466223bc007f5b0b5e90222e7992cfa154aa2d05 diff --git a/server/src/modules/workflows/controllers/workflow-webhooks.controller.ts b/server/src/modules/workflows/controllers/workflow-webhooks.controller.ts index 982448aaf2..727788cb12 100644 --- a/server/src/modules/workflows/controllers/workflow-webhooks.controller.ts +++ b/server/src/modules/workflows/controllers/workflow-webhooks.controller.ts @@ -1,4 +1,4 @@ -import { Controller, Post, Param, Body, Patch, Query, Res, Get, Sse } from '@nestjs/common'; +import { Controller, Post, Param, Body, Patch, Query, Res, Get, Sse, Req } from '@nestjs/common'; import { Response } from 'express'; import { IWorkflowWebhooksController } from '../interfaces/IWorkflowWebhooksController'; import { InitModule } from '@modules/app/decorators/init-module'; @@ -20,7 +20,8 @@ export class WorkflowWebhooksController implements IWorkflowWebhooksController { @Param('id') id: any, @Body() workflowParams, @Query('environment') environment: string, - @Res({ passthrough: true }) response: Response + @Res({ passthrough: true }) response: Response, + @Req() req: Request ): Promise { throw new Error('Method not implemented.'); } @@ -31,7 +32,8 @@ export class WorkflowWebhooksController implements IWorkflowWebhooksController { @Param('app') app: any, @Param('idOrName') idOrName: string, @Body() workflowParams: Record, - @Query('environment') environment: string + @Query('environment') environment: string, + @Req() req: Request ): Promise { throw new Error('Method not implemented.'); } diff --git a/server/src/modules/workflows/interfaces/IWorkflowWebhooksController.ts b/server/src/modules/workflows/interfaces/IWorkflowWebhooksController.ts index 5b896e6fb7..1cab4642b9 100644 --- a/server/src/modules/workflows/interfaces/IWorkflowWebhooksController.ts +++ b/server/src/modules/workflows/interfaces/IWorkflowWebhooksController.ts @@ -1,7 +1,7 @@ import { Response } from 'express'; export interface IWorkflowWebhooksController { - triggerWorkflow(id: any, workflowParams: any, environment: string, response: Response): Promise; + triggerWorkflow(id: any, workflowParams: any, environment: string, response: Response, req: Request): Promise; updateWorkflow(id: any, workflowValuesToUpdate: any): Promise; }