From 982397f3153da38d1e67753fa64efc7daf600ae5 Mon Sep 17 00:00:00 2001 From: Jaakko Husso Date: Fri, 19 Sep 2025 17:05:18 +0300 Subject: [PATCH] fix(Evaluation Trigger Node): Await for getDataTableFilter which is now async (no-changelog) (#19775) --- .../EvaluationTrigger/EvaluationTrigger.node.ee.ts | 4 ++-- .../nodes/Evaluation/test/EvaluationTrigger.node.test.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts b/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts index 424042acc9c..2ae257b49d4 100644 --- a/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts +++ b/packages/nodes-base/nodes/Evaluation/EvaluationTrigger/EvaluationTrigger.node.ee.ts @@ -207,7 +207,7 @@ export class EvaluationTrigger implements INodeType { }) as string; const dataTableProxy = await this.helpers.getDataStoreProxy(dataTableId); - const filter = getDataTableFilter(this, 0); + const filter = await getDataTableFilter(this, 0); const { data, count } = await dataTableProxy.getManyRowsAndCount({ skip: currentIndex, @@ -330,7 +330,7 @@ export class EvaluationTrigger implements INodeType { }) as string; const dataTableProxy = await this.helpers.getDataStoreProxy(dataTableId); - const filter = getDataTableFilter(this, 0); + const filter = await getDataTableFilter(this, 0); const { data } = await dataTableProxy.getManyRowsAndCount({ skip: 0, take: maxRows, diff --git a/packages/nodes-base/nodes/Evaluation/test/EvaluationTrigger.node.test.ts b/packages/nodes-base/nodes/Evaluation/test/EvaluationTrigger.node.test.ts index d7ca6ac1447..1833ccd8b3e 100644 --- a/packages/nodes-base/nodes/Evaluation/test/EvaluationTrigger.node.test.ts +++ b/packages/nodes-base/nodes/Evaluation/test/EvaluationTrigger.node.test.ts @@ -14,7 +14,7 @@ describe('Evaluation Trigger Node', () => { getNode: jest.fn().mockReturnValue({ typeVersion: 4.6 }), }); - let mockDataTable: { getManyRowsAndCount: jest.Mock }; + let mockDataTable: { getManyRowsAndCount: jest.Mock; getColumns: jest.Mock }; describe('execute', () => { describe('without filters', () => { @@ -329,6 +329,10 @@ describe('Evaluation Trigger Node', () => { { id: 2, field1: 'value3', field2: 'value4' }, ], }), + getColumns: jest.fn().mockResolvedValue([ + { name: 'field1', type: 'string' }, + { name: 'field2', type: 'string' }, + ]), }; mockExecuteFunctions = mockDeep({