fix(core): Fix Filtering of Workflow by Tags (#5570)

n8n-io · Feb 27, 2023 · ea2035b · ea2035b
1 parent 1942fd8
commit ea2035b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
@@ -164,7 +164,7 @@ export class WorkflowsService {
 
 		if (!config.getEnv('workflowTagsDisabled')) {
 			relations.push('tags');
-			select.tags = { name: true };
+			select.tags = { id: true, name: true };
 		}
 
 		if (isSharingEnabled()) {

diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
@@ -401,6 +401,7 @@ export async function createManyWorkflows(
 
 /**
  * Store a workflow in the DB (without a trigger) and optionally assign it to a user.
+ * @param attributes workflow attributes
  * @param user user to assign the workflow to
  */
 export async function createWorkflow(attributes: Partial<WorkflowEntity> = {}, user?: User) {

diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
@@ -154,6 +154,7 @@ describe('GET /workflows', () => {
 	test('should return workflows without nodes, sharing and credential usage details', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
+		const tag = await testDb.createTag({ name: 'test' });
 
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
@@ -175,6 +176,7 @@ describe('GET /workflows', () => {
 						},
 					},
 				],
+				tags: [tag],
 			},
 			owner,
 		);
@@ -193,6 +195,14 @@ describe('GET /workflows', () => {
 		expect(fetchedWorkflow.sharedWith).not.toBeDefined()
 		expect(fetchedWorkflow.usedCredentials).not.toBeDefined()
 		expect(fetchedWorkflow.nodes).not.toBeDefined()
+		expect(fetchedWorkflow.tags).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					id: expect.any(String),
+					name: expect.any(String)
+				})
+			])
+		)
 	});
 });