n8n 1.80.4 → 1.81.1

package/dist/databases/repositories/folder.repository.js

@@ -13,10 +13,164 @@ exports.FolderRepository = void 0;
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const folder_1 = require("../entities/folder");
+const folder_tag_mapping_1 = require("../entities/folder-tag-mapping");
+const tag_entity_1 = require("../entities/tag-entity");
 let FolderRepository = class FolderRepository extends typeorm_1.Repository {
     constructor(dataSource) {
         super(folder_1.Folder, dataSource.manager);
     }
+    async getManyAndCount(options = {}) {
+        const query = this.getManyQuery(options);
+        return await query.getManyAndCount();
+    }
+    async getMany(options = {}) {
+        const query = this.getManyQuery(options);
+        return await query.getMany();
+    }
+    getManyQuery(options = {}) {
+        const query = this.createQueryBuilder('folder');
+        this.applySelections(query, options.select);
+        this.applyFilters(query, options.filter);
+        this.applySorting(query, options.sortBy);
+        this.applyPagination(query, options);
+        return query;
+    }
+    applySelections(query, select) {
+        if (select) {
+            this.applyCustomSelect(query, select);
+        }
+        else {
+            this.applyDefaultSelect(query);
+        }
+    }
+    applyDefaultSelect(query) {
+        query
+            .leftJoinAndSelect('folder.homeProject', 'homeProject')
+            .leftJoinAndSelect('folder.parentFolder', 'parentFolder')
+            .leftJoinAndSelect('folder.tags', 'tags')
+            .loadRelationCountAndMap('folder.workflowsCount', 'folder.workflows')
+            .select([
+            'folder',
+            ...this.getProjectFields('homeProject'),
+            ...this.getTagFields(),
+            ...this.getParentFolderFields('parentFolder'),
+        ]);
+    }
+    applyCustomSelect(query, select) {
+        const selections = ['folder.id'];
+        this.addBasicFields(selections, select);
+        this.addRelationFields(query, selections, select);
+        query.select(selections);
+    }
+    addBasicFields(selections, select) {
+        if (select?.name)
+            selections.push('folder.name');
+        if (select?.createdAt)
+            selections.push('folder.createdAt');
+        if (select?.updatedAt)
+            selections.push('folder.updatedAt');
+    }
+    addRelationFields(query, selections, select) {
+        if (select?.project) {
+            query.leftJoin('folder.homeProject', 'homeProject');
+            selections.push(...this.getProjectFields('homeProject'));
+        }
+        if (select?.tags) {
+            query.leftJoin('folder.tags', 'tags').addOrderBy('tags.createdAt', 'ASC');
+            selections.push(...this.getTagFields());
+        }
+        if (select?.parentFolder) {
+            query.leftJoin('folder.parentFolder', 'parentFolder');
+            selections.push(...this.getParentFolderFields('parentFolder'));
+        }
+        if (select?.workflowsCount) {
+            query.loadRelationCountAndMap('folder.workflowsCount', 'folder.workflows');
+        }
+    }
+    getProjectFields(alias) {
+        return [`${alias}.id`, `${alias}.name`, `${alias}.type`, `${alias}.icon`];
+    }
+    getTagFields() {
+        return ['tags.id', 'tags.name'];
+    }
+    getParentFolderFields(alias) {
+        return [`${alias}.id`, `${alias}.name`];
+    }
+    applyFilters(query, filter) {
+        if (!filter)
+            return;
+        this.applyBasicFilters(query, filter);
+        this.applyTagsFilter(query, Array.isArray(filter?.tags) ? filter.tags : undefined);
+    }
+    applyBasicFilters(query, filter) {
+        if (filter?.folderIds && Array.isArray(filter.folderIds)) {
+            query.andWhere('folder.id IN (:...folderIds)', {
+                folderIds: !filter?.folderIds.length ? [''] : filter?.folderIds,
+            });
+        }
+        if (filter?.projectId) {
+            query.andWhere('folder.projectId = :projectId', { projectId: filter.projectId });
+        }
+        if (filter?.name && typeof filter.name === 'string') {
+            query.andWhere('LOWER(folder.name) LIKE LOWER(:name)', {
+                name: `%${filter.name}%`,
+            });
+        }
+        if (filter?.parentFolderId === '0') {
+            query.andWhere('folder.parentFolderId IS NULL');
+        }
+        else if (filter?.parentFolderId) {
+            query.andWhere('folder.parentFolderId = :parentFolderId', {
+                parentFolderId: filter.parentFolderId,
+            });
+        }
+    }
+    applyTagsFilter(query, tags) {
+        if (!Array.isArray(tags) || tags.length === 0)
+            return;
+        const subQuery = this.createTagsSubQuery(query, tags);
+        query.andWhere(`folder.id IN (${subQuery.getQuery()})`).setParameters({
+            tagNames: tags,
+            tagCount: tags.length,
+        });
+    }
+    createTagsSubQuery(query, tags) {
+        return query
+            .subQuery()
+            .select('ft.folderId')
+            .from(folder_tag_mapping_1.FolderTagMapping, 'ft')
+            .innerJoin(tag_entity_1.TagEntity, 'filter_tags', 'filter_tags.id = ft.tagId')
+            .where('filter_tags.name IN (:...tagNames)', { tagNames: tags })
+            .groupBy('ft.folderId')
+            .having('COUNT(DISTINCT filter_tags.name) = :tagCount', {
+            tagCount: tags.length,
+        });
+    }
+    applySorting(query, sortBy) {
+        if (!sortBy) {
+            query.orderBy('folder.updatedAt', 'DESC');
+            return;
+        }
+        const [field, order] = this.parseSortingParams(sortBy);
+        this.applySortingByField(query, field, order);
+    }
+    parseSortingParams(sortBy) {
+        const [field, order] = sortBy.split(':');
+        return [field, order?.toLowerCase() === 'desc' ? 'DESC' : 'ASC'];
+    }
+    applySortingByField(query, field, direction) {
+        if (field === 'name') {
+            query.orderBy('LOWER(folder.name)', direction);
+        }
+        else if (['createdAt', 'updatedAt'].includes(field)) {
+            query.orderBy(`folder.${field}`, direction);
+        }
+    }
+    applyPagination(query, options) {
+        if (options?.take) {
+            query.skip(options.skip ?? 0).take(options.take);
+        }
+    }
 };
 exports.FolderRepository = FolderRepository;
 exports.FolderRepository = FolderRepository = __decorate([

package/dist/databases/repositories/folder.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"folder.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/folder.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,+CAA4C;AAGrC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,oBAAkB;IACvD,YAAY,UAAsB;QACjC,KAAK,CAAC,eAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CACD,CAAA;AAJY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,gBAAgB,CAI5B"}
+{"version":3,"file":"folder.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/folder.repository.ts"],"names":[],"mappings":"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"}

package/dist/databases/repositories/shared-credentials.repository.d.ts

@@ -10,6 +10,17 @@ export declare class SharedCredentialsRepository extends Repository<SharedCreden
     private readonly roleService;
     constructor(dataSource: DataSource, roleService: RoleService);
     findCredentialForUser(credentialsId: string, user: User, scopes: Scope[], _relations?: FindOptionsRelations<SharedCredentials>): Promise<import("../entities/credentials-entity").CredentialsEntity | null>;
+    findAllCredentialsForUser(user: User, scopes: Scope[], trx?: EntityManager): Promise<{
+        projectId: string;
+        name: string;
+        data: string;
+        type: string;
+        shared: SharedCredentials[];
+        isManaged: boolean;
+        id: string;
+        createdAt: Date;
+        updatedAt: Date;
+    }[]>;
     findByCredentialIds(credentialIds: string[], role: CredentialSharingRole): Promise<SharedCredentials[]>;
     makeOwnerOfAllCredentials(project: Project): Promise<import("@n8n/typeorm").UpdateResult>;
     makeOwner(credentialIds: string[], projectId: string, trx?: EntityManager): Promise<import("@n8n/typeorm").InsertResult>;
@@ -18,7 +29,7 @@ export declare class SharedCredentialsRepository extends Repository<SharedCreden
     } | {
         projectRoles: ProjectRole[];
         credentialRoles: CredentialSharingRole[];
-    }): Promise<string[]>;
+    }, trx?: EntityManager): Promise<string[]>;
     deleteByIds(sharedCredentialsIds: string[], projectId: string, trx?: EntityManager): Promise<import("@n8n/typeorm").DeleteResult>;
     getFilteredAccessibleCredentials(projectIds: string[], credentialsIds: string[]): Promise<string[]>;
     findCredentialOwningProject(credentialsId: string): Promise<Project | undefined>;

package/dist/databases/repositories/shared-credentials.repository.js

@@ -47,6 +47,32 @@ let SharedCredentialsRepository = class SharedCredentialsRepository extends type
             return null;
         return sharedCredential.credentials;
     }
+    async findAllCredentialsForUser(user, scopes, trx) {
+        trx = trx ?? this.manager;
+        let where = {};
+        if (!user.hasGlobalScope(scopes, { mode: 'allOf' })) {
+            const projectRoles = this.roleService.rolesWithScope('project', scopes);
+            const credentialRoles = this.roleService.rolesWithScope('credential', scopes);
+            where = {
+                role: (0, typeorm_1.In)(credentialRoles),
+                project: {
+                    projectRelations: {
+                        role: (0, typeorm_1.In)(projectRoles),
+                        userId: user.id,
+                    },
+                },
+            };
+        }
+        const sharedCredential = await trx.find(shared_credentials_1.SharedCredentials, {
+            where,
+            relations: {
+                credentials: {
+                    shared: { project: { projectRelations: { user: true } } },
+                },
+            },
+        });
+        return sharedCredential.map((sc) => ({ ...sc.credentials, projectId: sc.projectId }));
+    }
     async findByCredentialIds(credentialIds, role) {
         return await this.find({
             relations: { credentials: true, project: { projectRelations: { user: true } } },
@@ -70,14 +96,15 @@ let SharedCredentialsRepository = class SharedCredentialsRepository extends type
             role: 'credential:owner',
         })), ['projectId', 'credentialsId']);
     }
-    async getCredentialIdsByUserAndRole(userIds, options) {
+    async getCredentialIdsByUserAndRole(userIds, options, trx) {
+        trx = trx ?? this.manager;
         const projectRoles = 'scopes' in options
             ? this.roleService.rolesWithScope('project', options.scopes)
             : options.projectRoles;
         const credentialRoles = 'scopes' in options
             ? this.roleService.rolesWithScope('credential', options.scopes)
             : options.credentialRoles;
-        const sharings = await this.find({
+        const sharings = await trx.find(shared_credentials_1.SharedCredentials, {
             where: {
                 role: (0, typeorm_1.In)(credentialRoles),
                 project: {

package/dist/databases/repositories/shared-credentials.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared-credentials.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/shared-credentials.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared-credentials.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/shared-credentials.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAGlC,0CAA+D;AAE/D,0DAAsD;AAGtD,uEAA+F;AAIxF,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,oBAA6B;IAC7E,YACC,UAAsB,EACL,WAAwB;QAEzC,KAAK,CAAC,sCAAiB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAF5B,gBAAW,GAAX,WAAW,CAAa;IAG1C,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAC1B,aAAqB,EACrB,IAAU,EACV,MAAe,EACf,UAAoD;QAEpD,IAAI,KAAK,GAAwC,EAAE,aAAa,EAAE,CAAC;QAEnE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;YACrD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxE,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC9E,KAAK,GAAG;gBACP,GAAG,KAAK;gBACR,IAAI,EAAE,IAAA,YAAE,EAAC,eAAe,CAAC;gBACzB,OAAO,EAAE;oBACR,gBAAgB,EAAE;wBACjB,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;wBACtB,MAAM,EAAE,IAAI,CAAC,EAAE;qBACf;iBACD;aACD,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YAC3C,KAAK;YAEL,SAAS,EAAE;gBACV,WAAW,EAAE;oBACZ,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;iBACzD;aACD;SACD,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB;YAAE,OAAO,IAAI,CAAC;QACnC,OAAO,gBAAgB,CAAC,WAAW,CAAC;IACrC,CAAC;IAGD,KAAK,CAAC,yBAAyB,CAAC,IAAU,EAAE,MAAe,EAAE,GAAmB;QAC/E,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,IAAI,KAAK,GAAwC,EAAE,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;YACrD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxE,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC9E,KAAK,GAAG;gBACP,IAAI,EAAE,IAAA,YAAE,EAAC,eAAe,CAAC;gBACzB,OAAO,EAAE;oBACR,gBAAgB,EAAE;wBACjB,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;wBACtB,MAAM,EAAE,IAAI,CAAC,EAAE;qBACf;iBACD;aACD,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,sCAAiB,EAAE;YAC1D,KAAK;YAEL,SAAS,EAAE;gBACV,WAAW,EAAE;oBACZ,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;iBACzD;aACD;SACD,CAAC,CAAC;QAEH,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,aAAuB,EAAE,IAA2B;QAC7E,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YAC/E,KAAK,EAAE;gBACN,aAAa,EAAE,IAAA,YAAE,EAAC,aAAa,CAAC;gBAChC,IAAI;aACJ;SACD,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,OAAgB;QAC/C,OAAO,MAAM,IAAI,CAAC,MAAM,CACvB;YACC,SAAS,EAAE,IAAA,aAAG,EAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,IAAI,EAAE,kBAAkB;SACxB,EACD,EAAE,OAAO,EAAE,CACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,aAAuB,EAAE,SAAiB,EAAE,GAAmB;QAC9E,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAC1B,OAAO,MAAM,GAAG,CAAC,MAAM,CACtB,sCAAiB,EACjB,aAAa,CAAC,GAAG,CAChB,CAAC,aAAa,EAAE,EAAE,CACjB,CAAC;YACA,SAAS;YACT,aAAa;YACb,IAAI,EAAE,kBAAkB;SACxB,CAAU,CACZ,EACD,CAAC,WAAW,EAAE,eAAe,CAAC,CAC9B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,6BAA6B,CAClC,OAAiB,EACjB,OAE4E,EAC5E,GAAmB;QAEnB,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,MAAM,YAAY,GACjB,QAAQ,IAAI,OAAO;YAClB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC;YAC5D,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;QACzB,MAAM,eAAe,GACpB,QAAQ,IAAI,OAAO;YAClB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC;YAC/D,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;QAE5B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,sCAAiB,EAAE;YAClD,KAAK,EAAE;gBACN,IAAI,EAAE,IAAA,YAAE,EAAC,eAAe,CAAC;gBACzB,OAAO,EAAE;oBACR,gBAAgB,EAAE;wBACjB,MAAM,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC;wBACnB,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;qBACtB;iBACD;aACD;SACD,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,oBAA8B,EAAE,SAAiB,EAAE,GAAmB;QACvF,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,sCAAiB,EAAE;YAC1C,SAAS;YACT,aAAa,EAAE,IAAA,YAAE,EAAC,oBAAoB,CAAC;SACvC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gCAAgC,CACrC,UAAoB,EACpB,cAAwB;QAExB,OAAO,CACN,MAAM,IAAI,CAAC,IAAI,CAAC;YACf,KAAK,EAAE;gBACN,SAAS,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC;gBACzB,aAAa,EAAE,IAAA,YAAE,EAAC,cAAc,CAAC;aACjC;YACD,MAAM,EAAE,CAAC,eAAe,CAAC;SACzB,CAAC,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,aAAqB;QACtD,OAAO,CACN,MAAM,IAAI,CAAC,OAAO,CAAC;YAClB,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,EAAE;YAClD,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;SAC5B,CAAC,CACF,EAAE,OAAO,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,aAAuB;QAC1D,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,KAAK,EAAE;gBACN,aAAa,EAAE,IAAA,YAAE,EAAC,aAAa,CAAC;aAChC;YACD,SAAS,EAAE,CAAC,SAAS,CAAC;SACtB,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA5LY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,YAAO,GAAE;qCAGI,oBAAU;QACQ,0BAAW;GAH9B,2BAA2B,CA4LvC"}

package/dist/databases/repositories/workflow.repository.d.ts

@@ -1,11 +1,18 @@
 import { GlobalConfig } from '@n8n/config';
 import { DataSource, Repository } from '@n8n/typeorm';
-import type { UpdateResult, FindOptionsWhere, FindOptionsRelations } from '@n8n/typeorm';
+import type { SelectQueryBuilder, UpdateResult, FindOptionsWhere, FindOptionsRelations } from '@n8n/typeorm';
 import type { ListQuery } from '../../requests';
+import { FolderRepository } from './folder.repository';
+import type { FolderWithWorkflowsCount } from '../entities/folder';
 import { WorkflowEntity } from '../entities/workflow-entity';
+type ResourceType = 'folder' | 'workflow';
+export type WorkflowFolderUnionFull = (ListQuery.Workflow.Plain | ListQuery.Workflow.WithSharing | FolderWithWorkflowsCount) & {
+    resource: ResourceType;
+};
 export declare class WorkflowRepository extends Repository<WorkflowEntity> {
     private readonly globalConfig;
-    constructor(dataSource: DataSource, globalConfig: GlobalConfig);
+    private readonly folderRepository;
+    constructor(dataSource: DataSource, globalConfig: GlobalConfig, folderRepository: FolderRepository);
     get(where: FindOptionsWhere<WorkflowEntity>, options?: {
         relations: string[] | FindOptionsRelations<WorkflowEntity>;
     }): Promise<WorkflowEntity | null>;
@@ -19,13 +26,34 @@ export declare class WorkflowRepository extends Repository<WorkflowEntity> {
     }): Promise<WorkflowEntity[]>;
     getActiveTriggerCount(): Promise<number>;
     updateWorkflowTriggerCount(id: string, triggerCount: number): Promise<UpdateResult>;
-    getMany(sharedWorkflowIds: string[], options?: ListQuery.Options): Promise<{
-        workflows: (Pick<WorkflowEntity, "id"> & Partial<Pick<WorkflowEntity, "tags" | "createdAt" | "updatedAt" | "name" | "versionId" | "active">>)[] | ListQuery.Workflow.WithSharing[];
+    private buildBaseUnionQuery;
+    getWorkflowsAndFoldersUnion(workflowIds: string[], options?: ListQuery.Options): Promise<{
+        id: string;
+        name: string;
+        resource: ResourceType;
+        createdAt: Date;
+        updatedAt: Date;
+    }[]>;
+    private buildUnionQuery;
+    private applySortingToUnionQuery;
+    private applyPaginationToUnionQuery;
+    private removeNameLowerFromResults;
+    getWorkflowsAndFoldersCount(workflowIds: string[], options?: ListQuery.Options): Promise<number>;
+    getWorkflowsAndFoldersWithCount(workflowIds: string[], options?: ListQuery.Options): Promise<readonly [WorkflowFolderUnionFull[], number]>;
+    private getFolderIds;
+    private getWorkflowsIds;
+    private fetchExtraData;
+    private enrichDataWithExtras;
+    getMany(workflowIds: string[], options?: ListQuery.Options): Promise<(Pick<WorkflowEntity, "id"> & Partial<Pick<WorkflowEntity, "createdAt" | "updatedAt" | "name" | "versionId" | "tags" | "active">>)[]>;
+    getManyAndCount(sharedWorkflowIds: string[], options?: ListQuery.Options): Promise<{
+        workflows: (Pick<WorkflowEntity, "id"> & Partial<Pick<WorkflowEntity, "createdAt" | "updatedAt" | "name" | "versionId" | "tags" | "active">>)[] | ListQuery.Workflow.WithSharing[];
         count: number;
     }>;
+    getManyQuery(workflowIds: string[], options?: ListQuery.Options): SelectQueryBuilder<WorkflowEntity>;
     private createBaseQuery;
     private applyFilters;
     private applyNameFilter;
+    private applyParentFolderFilter;
     private applyActiveFilter;
     private applyTagsFilter;
     private applyProjectFilter;
@@ -35,7 +63,6 @@ export declare class WorkflowRepository extends Repository<WorkflowEntity> {
     private applyTagsRelation;
     private applySorting;
     private parseSortingParams;
-    private applyDefaultSorting;
     private applySortingByColumn;
     private applyPagination;
     findStartingWith(workflowName: string): Promise<Array<{
@@ -51,3 +78,4 @@ export declare class WorkflowRepository extends Repository<WorkflowEntity> {
     activateAll(): Promise<UpdateResult>;
     findByActiveState(activeState: boolean): Promise<WorkflowEntity[]>;
 }
+export {};

package/dist/databases/repositories/workflow.repository.js

@@ -14,14 +14,16 @@ const config_1 = require("@n8n/config");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const utils_1 = require("../../utils");
+const folder_repository_1 = require("./folder.repository");
 const tag_entity_1 = require("../entities/tag-entity");
 const webhook_entity_1 = require("../entities/webhook-entity");
 const workflow_entity_1 = require("../entities/workflow-entity");
 const workflow_tag_mapping_1 = require("../entities/workflow-tag-mapping");
 let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
-    constructor(dataSource, globalConfig) {
+    constructor(dataSource, globalConfig, folderRepository) {
         super(workflow_entity_1.WorkflowEntity, dataSource.manager);
         this.globalConfig = globalConfig;
+        this.folderRepository = folderRepository;
     }
     async get(where, options) {
         return await this.findOne({
@@ -82,31 +84,163 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
             .where('id = :id', { id })
             .execute();
     }
-    async getMany(sharedWorkflowIds, options = {}) {
+    buildBaseUnionQuery(workflowIds, options = {}) {
+        const subQueryParameters = {
+            select: {
+                createdAt: true,
+                updatedAt: true,
+                id: true,
+                name: true,
+            },
+            filter: options.filter,
+        };
+        const columnNames = [...Object.keys(subQueryParameters.select ?? {}), 'resource'];
+        const [sortByColumn, sortByDirection] = this.parseSortingParams(options.sortBy ?? 'updatedAt:asc');
+        const foldersQuery = this.folderRepository
+            .getManyQuery(subQueryParameters)
+            .addSelect("'folder'", 'resource');
+        const workflowsQuery = this.getManyQuery(workflowIds, subQueryParameters).addSelect("'workflow'", 'resource');
+        const qb = this.manager.createQueryBuilder();
+        return {
+            baseQuery: qb
+                .createQueryBuilder()
+                .addCommonTableExpression(foldersQuery, 'FOLDERS_QUERY', { columnNames })
+                .addCommonTableExpression(workflowsQuery, 'WORKFLOWS_QUERY', { columnNames })
+                .addCommonTableExpression(`SELECT * FROM ${qb.escape('FOLDERS_QUERY')} UNION ALL SELECT * FROM ${qb.escape('WORKFLOWS_QUERY')}`, 'RESULT_QUERY'),
+            sortByColumn,
+            sortByDirection,
+        };
+    }
+    async getWorkflowsAndFoldersUnion(workflowIds, options = {}) {
+        const { baseQuery, sortByColumn, sortByDirection } = this.buildBaseUnionQuery(workflowIds, options);
+        const query = this.buildUnionQuery(baseQuery, {
+            sortByColumn,
+            sortByDirection,
+            pagination: {
+                take: options.take,
+                skip: options.skip ?? 0,
+            },
+        });
+        const workflowsAndFolders = await query.getRawMany();
+        return this.removeNameLowerFromResults(workflowsAndFolders);
+    }
+    buildUnionQuery(baseQuery, options) {
+        const query = baseQuery
+            .select(`${baseQuery.escape('RESULT')}.*`)
+            .from('RESULT_QUERY', 'RESULT');
+        this.applySortingToUnionQuery(query, baseQuery, options);
+        this.applyPaginationToUnionQuery(query, options.pagination);
+        return query;
+    }
+    applySortingToUnionQuery(query, baseQuery, options) {
+        const { sortByColumn, sortByDirection } = options;
+        const resultTableEscaped = baseQuery.escape('RESULT');
+        const nameColumnEscaped = baseQuery.escape('name');
+        const resourceColumnEscaped = baseQuery.escape('resource');
+        const sortByColumnEscaped = baseQuery.escape(sortByColumn);
+        query.orderBy(`${resultTableEscaped}.${resourceColumnEscaped}`, 'ASC');
+        if (sortByColumn === 'name') {
+            query
+                .addSelect(`LOWER(${resultTableEscaped}.${nameColumnEscaped})`, 'name_lower')
+                .addOrderBy('name_lower', sortByDirection);
+        }
+        else {
+            query.addOrderBy(`${resultTableEscaped}.${sortByColumnEscaped}`, sortByDirection);
+        }
+    }
+    applyPaginationToUnionQuery(query, pagination) {
+        if (pagination.take) {
+            query.take(pagination.take);
+        }
+        query.skip(pagination.skip);
+    }
+    removeNameLowerFromResults(results) {
+        return results.map(({ name_lower, ...rest }) => rest);
+    }
+    async getWorkflowsAndFoldersCount(workflowIds, options = {}) {
+        const { skip, take, ...baseQueryParameters } = options;
+        const { baseQuery } = this.buildBaseUnionQuery(workflowIds, baseQueryParameters);
+        const response = await baseQuery
+            .select(`COUNT(DISTINCT ${baseQuery.escape('RESULT')}.${baseQuery.escape('id')})`, 'count')
+            .from('RESULT_QUERY', 'RESULT')
+            .select('COUNT(*)', 'count')
+            .getRawOne();
+        return Number(response?.count) || 0;
+    }
+    async getWorkflowsAndFoldersWithCount(workflowIds, options = {}) {
+        const [workflowsAndFolders, count] = await Promise.all([
+            this.getWorkflowsAndFoldersUnion(workflowIds, options),
+            this.getWorkflowsAndFoldersCount(workflowIds, options),
+        ]);
+        const { workflows, folders } = await this.fetchExtraData(workflowsAndFolders);
+        const enrichedWorkflowsAndFolders = this.enrichDataWithExtras(workflowsAndFolders, {
+            workflows,
+            folders,
+        });
+        return [enrichedWorkflowsAndFolders, count];
+    }
+    getFolderIds(workflowsAndFolders) {
+        return workflowsAndFolders.filter((item) => item.resource === 'folder').map((item) => item.id);
+    }
+    getWorkflowsIds(workflowsAndFolders) {
+        return workflowsAndFolders
+            .filter((item) => item.resource === 'workflow')
+            .map((item) => item.id);
+    }
+    async fetchExtraData(workflowsAndFolders) {
+        const workflowIds = this.getWorkflowsIds(workflowsAndFolders);
+        const folderIds = this.getFolderIds(workflowsAndFolders);
+        const [workflows, folders] = await Promise.all([
+            this.getMany(workflowIds),
+            this.folderRepository.getMany({ filter: { folderIds } }),
+        ]);
+        return { workflows, folders };
+    }
+    enrichDataWithExtras(baseData, extraData) {
+        const workflowsMap = new Map(extraData.workflows.map((workflow) => [workflow.id, workflow]));
+        const foldersMap = new Map(extraData.folders.map((folder) => [folder.id, folder]));
+        return baseData.map((item) => {
+            const lookupMap = item.resource === 'folder' ? foldersMap : workflowsMap;
+            const extraItem = lookupMap.get(item.id);
+            return extraItem ? { ...item, ...extraItem } : item;
+        });
+    }
+    async getMany(workflowIds, options = {}) {
+        if (workflowIds.length === 0) {
+            return [];
+        }
+        const query = this.getManyQuery(workflowIds, options);
+        const workflows = (await query.getMany());
+        return workflows;
+    }
+    async getManyAndCount(sharedWorkflowIds, options = {}) {
         if (sharedWorkflowIds.length === 0) {
             return { workflows: [], count: 0 };
         }
-        const qb = this.createBaseQuery(sharedWorkflowIds);
+        const query = this.getManyQuery(sharedWorkflowIds, options);
+        const [workflows, count] = (await query.getManyAndCount());
+        return { workflows, count };
+    }
+    getManyQuery(workflowIds, options = {}) {
+        const qb = this.createBaseQuery(workflowIds);
         this.applyFilters(qb, options.filter);
         this.applySelect(qb, options.select);
         this.applyRelations(qb, options.select);
         this.applySorting(qb, options.sortBy);
         this.applyPagination(qb, options);
-        const [workflows, count] = (await qb.getManyAndCount());
-        return { workflows, count };
+        return qb;
     }
-    createBaseQuery(sharedWorkflowIds) {
-        return this.createQueryBuilder('workflow').where('workflow.id IN (:...sharedWorkflowIds)', {
-            sharedWorkflowIds,
+    createBaseQuery(workflowIds) {
+        return this.createQueryBuilder('workflow').where('workflow.id IN (:...workflowIds)', {
+            workflowIds: !workflowIds.length ? [''] : workflowIds,
         });
     }
     applyFilters(qb, filter) {
-        if (!filter)
-            return;
         this.applyNameFilter(qb, filter);
         this.applyActiveFilter(qb, filter);
         this.applyTagsFilter(qb, filter);
         this.applyProjectFilter(qb, filter);
+        this.applyParentFolderFilter(qb, filter);
     }
     applyNameFilter(qb, filter) {
         if (typeof filter?.name === 'string' && filter.name !== '') {
@@ -115,6 +249,16 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
             });
         }
     }
+    applyParentFolderFilter(qb, filter) {
+        if (filter?.parentFolderId === '0') {
+            qb.andWhere('workflow.parentFolderId IS NULL');
+        }
+        else if (filter?.parentFolderId) {
+            qb.andWhere('workflow.parentFolderId = :parentFolderId', {
+                parentFolderId: filter.parentFolderId,
+            });
+        }
+    }
     applyActiveFilter(qb, filter) {
         if (typeof filter?.active === 'boolean') {
             qb.andWhere('workflow.active = :active', { active: filter.active });
@@ -165,9 +309,9 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
         ]);
     }
     applySelect(qb, select) {
-        qb.select(['workflow.id']);
         if (!select) {
-            qb.addSelect([
+            qb.select([
+                'workflow.id',
                 'workflow.name',
                 'workflow.active',
                 'workflow.createdAt',
@@ -176,18 +320,24 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
             ]);
             return;
         }
-        const regularFields = Object.entries(select).filter(([field]) => !['ownedBy', 'tags'].includes(field));
+        const fieldsToSelect = ['workflow.id'];
+        const regularFields = Object.entries(select).filter(([field]) => !['ownedBy', 'tags', 'parentFolder'].includes(field));
         regularFields.forEach(([field, include]) => {
-            if (include) {
-                qb.addSelect(`workflow.${field}`);
+            if (include && field !== 'id') {
+                fieldsToSelect.push(`workflow.${field}`);
             }
         });
+        qb.select(fieldsToSelect);
     }
     applyRelations(qb, select) {
         const areTagsEnabled = !this.globalConfig.tags.disabled;
         const isDefaultSelect = select === undefined;
         const areTagsRequested = isDefaultSelect || select?.tags;
         const isOwnedByIncluded = isDefaultSelect || select?.ownedBy;
+        const isParentFolderIncluded = isDefaultSelect || select?.parentFolder;
+        if (isParentFolderIncluded) {
+            qb.leftJoinAndSelect('workflow.parentFolder', 'parentFolder');
+        }
         if (areTagsEnabled && areTagsRequested) {
             this.applyTagsRelation(qb);
         }
@@ -202,7 +352,7 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
     }
     applySorting(qb, sortBy) {
         if (!sortBy) {
-            this.applyDefaultSorting(qb);
+            qb.orderBy('workflow.updatedAt', 'ASC');
             return;
         }
         const [column, direction] = this.parseSortingParams(sortBy);
@@ -212,9 +362,6 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
         const [column, order] = sortBy.split(':');
         return [column, order.toUpperCase()];
     }
-    applyDefaultSorting(qb) {
-        qb.orderBy('workflow.updatedAt', 'ASC');
-    }
     applySortingByColumn(qb, column, direction) {
         if (column === 'name') {
             qb.addSelect('LOWER(workflow.name)', 'workflow_name_lower').orderBy('workflow_name_lower', direction);
@@ -262,6 +409,7 @@ exports.WorkflowRepository = WorkflowRepository;
 exports.WorkflowRepository = WorkflowRepository = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [typeorm_1.DataSource,
-        config_1.GlobalConfig])
+        config_1.GlobalConfig,
+        folder_repository_1.FolderRepository])
 ], WorkflowRepository);
 //# sourceMappingURL=workflow.repository.js.map