@n8n/db 1.35.2 → 1.36.0

package/dist/repositories/workflow-review-request-workflow.repository.d.ts

@@ -1,7 +1,7 @@
 import { DataSource } from '@n8n/typeorm';
 import { BaseRepository } from './base-repository';
 import { WorkflowReviewRequestWorkflow } from '../entities/workflow-review-request-workflow.ee';
-import type { OperationContext } from '../services/transaction';
+import { type OperationContext, TransactionRunner } from '../services/transaction';
 export type WorkflowReviewRequestLinkedWorkflow = {
     workflowName: string;
     workflowVersionId: string | null;
@@ -12,7 +12,7 @@ export type WorkflowReviewRequestWorkflowDetailRow = {
     workflowVersionId: string | null;
 };
 export declare class WorkflowReviewRequestWorkflowRepository extends BaseRepository<WorkflowReviewRequestWorkflow> {
-    constructor(dataSource: DataSource);
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
     createWorkflowRow(input: {
         id?: string;
         workflowReviewRequestId: string;

package/dist/repositories/workflow-review-request-workflow.repository.js

@@ -15,9 +15,10 @@ const typeorm_1 = require("@n8n/typeorm");
 const base_repository_1 = require("./base-repository");
 const workflow_entity_1 = require("../entities/workflow-entity");
 const workflow_review_request_workflow_ee_1 = require("../entities/workflow-review-request-workflow.ee");
+const transaction_1 = require("../services/transaction");
 let WorkflowReviewRequestWorkflowRepository = class WorkflowReviewRequestWorkflowRepository extends base_repository_1.BaseRepository {
-    constructor(dataSource) {
-        super(workflow_review_request_workflow_ee_1.WorkflowReviewRequestWorkflow, dataSource.manager);
+    constructor(dataSource, transactionRunner) {
+        super(workflow_review_request_workflow_ee_1.WorkflowReviewRequestWorkflow, dataSource.manager, transactionRunner);
     }
     async createWorkflowRow(input, ctx) {
         const entity = this.create({
@@ -75,6 +76,6 @@ let WorkflowReviewRequestWorkflowRepository = class WorkflowReviewRequestWorkflo
 exports.WorkflowReviewRequestWorkflowRepository = WorkflowReviewRequestWorkflowRepository;
 exports.WorkflowReviewRequestWorkflowRepository = WorkflowReviewRequestWorkflowRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, transaction_1.TransactionRunner])
 ], WorkflowReviewRequestWorkflowRepository);
 //# sourceMappingURL=workflow-review-request-workflow.repository.js.map

package/dist/repositories/workflow-review-request-workflow.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-review-request-workflow.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-review-request-workflow.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-review-request-workflow.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-review-request-workflow.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAA0C;AAE1C,uDAAmD;AACnD,iEAA6D;AAC7D,yGAAgG;AAChG,yDAAmF;AAe5E,IAAM,uCAAuC,GAA7C,MAAM,uCAAwC,SAAQ,gCAA6C;IACzG,YAAY,UAAsB,EAAE,iBAAoC;QACvE,KAAK,CAAC,mEAA6B,EAAE,UAAU,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,KAKC,EACD,GAAqB;QAErB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;YACtD,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,IAAI,IAAI;SAClD,CAAC,CAAC;QAEH,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mEAA6B,EAAE,MAAM,CAAC,CAAC;IAC/E,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAC1B,KAIC,EACD,GAAqB;QAErB,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,CAChC,mEAA6B,EAC7B;YACC,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;YACtD,UAAU,EAAE,KAAK,CAAC,UAAU;SAC5B,EACD,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAC9C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,SAAiB,EACjB,GAAqB;QAErB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mEAA6B,EAAE;YACrE,KAAK,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE;YAC7C,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;SACpB,CAAC,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,+BAA+B,CACpC,UAAoB;QAEpB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,GAAG,EAAE,CAAC;QAClB,CAAC;QAGD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;aAC/C,SAAS,CAAC,gCAAc,EAAE,UAAU,EAAE,8BAA8B,CAAC;aACrE,MAAM,CAAC,6BAA6B,EAAE,WAAW,CAAC;aAClD,SAAS,CAAC,eAAe,EAAE,cAAc,CAAC;aAC1C,SAAS,CAAC,uBAAuB,EAAE,mBAAmB,CAAC;aACvD,KAAK,CAAC,iDAAiD,EAAE,EAAE,UAAU,EAAE,CAAC;aACxE,UAAU,EAIP,CAAC;QAEN,OAAO,IAAI,GAAG,CACb,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;YACjB,GAAG,CAAC,SAAS;YACb,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,IAAI,EAAE;SACpF,CAAC,CACF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oCAAoC,CACzC,SAAiB;QAGjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;aAG/C,SAAS,CAAC,gCAAc,EAAE,UAAU,EAAE,8BAA8B,CAAC;aACrE,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC;aACtC,SAAS,CAAC,eAAe,EAAE,cAAc,CAAC;aAC1C,SAAS,CAAC,uBAAuB,EAAE,mBAAmB,CAAC;aACvD,KAAK,CAAC,0CAA0C,EAAE,EAAE,SAAS,EAAE,CAAC;aAChE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC;aACxB,UAAU,EAIP,CAAC;QAEN,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACzB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,IAAI;SAChD,CAAC,CAAC,CAAC;IACL,CAAC;CACD,CAAA;;kDA3GY,uCAAuC;IADnD,IAAA,YAAO,GAAE;qCAEe,oBAAU,EAAqB,+BAAiB;GAD5D,uCAAuC,CA2GnD"}

package/dist/repositories/workflow-review-request.repository.d.ts

@@ -1,31 +1,48 @@
+import type { WorkflowReviewClosedReason } from '@n8n/api-types';
 import { DataSource } from '@n8n/typeorm';
 import { BaseRepository } from './base-repository';
 import { WorkflowReviewRequest, type WorkflowReviewRequestDecision, type WorkflowReviewRequestState } from '../entities/workflow-review-request.ee';
-import type { OperationContext } from '../services/transaction';
+import { type OperationContext, TransactionRunner } from '../services/transaction';
 export type InboxCursor = {
     createdAt: Date;
     id: string;
 };
+export type InboxCategoryFilter = {
+    userId: string;
+    category: 'waiting' | 'authored';
+};
+export type InboxVisibility = {
+    scope: 'all';
+} | {
+    scope: 'involved';
+    userId: string;
+    adminProjectIds: string[];
+    readableProjectIds: string[] | null;
+    readableWorkflowRoles: string[];
+};
 export type FindManyForInboxOptions = {
-    projectIds: string[] | null;
-    requesterId: string;
+    visibility: InboxVisibility;
     state?: WorkflowReviewRequestState;
+    category?: InboxCategoryFilter;
     limit: number;
     cursor?: InboxCursor;
 };
-export type WorkflowReviewRequestForWorkflowRow = Pick<WorkflowReviewRequest, 'id' | 'state' | 'decision' | 'updatedById' | 'createdAt' | 'updatedAt'> & {
+export type WorkflowReviewRequestForWorkflowRow = Pick<WorkflowReviewRequest, 'id' | 'state' | 'decision' | 'description' | 'updatedById' | 'createdAt' | 'updatedAt'> & {
     workflowVersionId: string | null;
 };
 export type CountByStateForInboxOptions = {
-    projectIds: string[] | null;
-    requesterId: string;
+    visibility: InboxVisibility;
 };
 export type InboxStateCounts = {
     open: number;
     closed: number;
 };
+export type ClosedUnreviewableRequest = {
+    id: string;
+    reason: WorkflowReviewClosedReason;
+};
 export declare class WorkflowReviewRequestRepository extends BaseRepository<WorkflowReviewRequest> {
-    constructor(dataSource: DataSource);
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
     createRequest(input: {
         id?: string;
         projectId: string;
@@ -37,7 +54,7 @@ export declare class WorkflowReviewRequestRepository extends BaseRepository<Work
         updatedById?: string | null;
     }, ctx: OperationContext): Promise<WorkflowReviewRequest>;
     saveRequest(request: WorkflowReviewRequest, ctx: OperationContext): Promise<WorkflowReviewRequest>;
-    closeOrphanedOpenRequests(ctx: OperationContext): Promise<string[]>;
+    closeUnreviewableOpenRequests(ctx: OperationContext): Promise<ClosedUnreviewableRequest[]>;
     findById(id: string, ctx: OperationContext): Promise<WorkflowReviewRequest | null>;
     findRequestsForWorkflow(workflowId: string, options?: {
         state?: WorkflowReviewRequestState;
@@ -52,4 +69,8 @@ export declare class WorkflowReviewRequestRepository extends BaseRepository<Work
     findManyForInbox(options: FindManyForInboxOptions): Promise<WorkflowReviewRequest[]>;
     countByStateForInbox(options: CountByStateForInboxOptions): Promise<InboxStateCounts>;
     private applyInboxVisibility;
+    private linkedWorkflowExistsSubquery;
+    private readableLinkedWorkflowExistsSubquery;
+    private participantExistsSubquery;
+    private applyCategoryFilter;
 }

package/dist/repositories/workflow-review-request.repository.js

@@ -13,11 +13,31 @@ exports.WorkflowReviewRequestRepository = void 0;
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const base_repository_1 = require("./base-repository");
+const shared_workflow_1 = require("../entities/shared-workflow");
+const workflow_entity_1 = require("../entities/workflow-entity");
+const workflow_review_request_author_ee_1 = require("../entities/workflow-review-request-author.ee");
+const workflow_review_request_reviewer_ee_1 = require("../entities/workflow-review-request-reviewer.ee");
 const workflow_review_request_workflow_ee_1 = require("../entities/workflow-review-request-workflow.ee");
 const workflow_review_request_ee_1 = require("../entities/workflow-review-request.ee");
+const transaction_1 = require("../services/transaction");
+const CLOSE_REASON_PRECEDENCE = [
+    'workflow-deleted',
+    'workflow-archived',
+    'workflow-moved',
+];
+function closeReasonFor(row) {
+    if (row.linkedWorkflowId === null)
+        return 'workflow-deleted';
+    if (row.isArchived)
+        return 'workflow-archived';
+    if (row.owningProjectId !== null && row.owningProjectId !== row.requestProjectId) {
+        return 'workflow-moved';
+    }
+    return null;
+}
 let WorkflowReviewRequestRepository = class WorkflowReviewRequestRepository extends base_repository_1.BaseRepository {
-    constructor(dataSource) {
-        super(workflow_review_request_ee_1.WorkflowReviewRequest, dataSource.manager);
+    constructor(dataSource, transactionRunner) {
+        super(workflow_review_request_ee_1.WorkflowReviewRequest, dataSource.manager, transactionRunner);
     }
     async createRequest(input, ctx) {
         const entity = this.create({
@@ -37,32 +57,42 @@ let WorkflowReviewRequestRepository = class WorkflowReviewRequestRepository exte
     async saveRequest(request, ctx) {
         return await this.managerFor(ctx).save(workflow_review_request_ee_1.WorkflowReviewRequest, request);
     }
-    async closeOrphanedOpenRequests(ctx) {
+    async closeUnreviewableOpenRequests(ctx) {
         const openState = 'open';
         const closedState = 'closed';
+        const ownerRole = 'workflow:owner';
         const manager = this.managerFor(ctx);
-        const orphans = await manager
+        const rows = await manager
             .createQueryBuilder(workflow_review_request_ee_1.WorkflowReviewRequest, 'review')
-            .select('review.id', 'id')
+            .select('review.id', 'requestId')
+            .addSelect('review.projectId', 'requestProjectId')
+            .addSelect('workflow.id', 'linkedWorkflowId')
+            .addSelect('workflow.isArchived', 'isArchived')
+            .addSelect('shared.projectId', 'owningProjectId')
+            .leftJoin(workflow_review_request_workflow_ee_1.WorkflowReviewRequestWorkflow, 'link', 'link.workflowReviewRequestId = review.id')
+            .leftJoin(workflow_entity_1.WorkflowEntity, 'workflow', 'workflow.id = link.workflowId')
+            .leftJoin(shared_workflow_1.SharedWorkflow, 'shared', 'shared.workflowId = link.workflowId AND shared.role = :ownerRole', { ownerRole })
             .where('review.state = :openState', { openState })
-            .andWhere((qb) => {
-            const linkedWorkflowExists = qb
-                .subQuery()
-                .select('1')
-                .from(workflow_review_request_workflow_ee_1.WorkflowReviewRequestWorkflow, 'requestWorkflow')
-                .where('requestWorkflow.workflowReviewRequestId = review.id')
-                .getQuery();
-            return `NOT EXISTS ${linkedWorkflowExists}`;
-        })
             .getRawMany();
-        if (orphans.length === 0)
+        const reasonByRequestId = new Map();
+        for (const row of rows) {
+            const reason = closeReasonFor(row);
+            if (reason === null)
+                continue;
+            const current = reasonByRequestId.get(row.requestId);
+            if (current !== undefined &&
+                CLOSE_REASON_PRECEDENCE.indexOf(current) <= CLOSE_REASON_PRECEDENCE.indexOf(reason)) {
+                continue;
+            }
+            reasonByRequestId.set(row.requestId, reason);
+        }
+        if (reasonByRequestId.size === 0)
             return [];
-        const ids = orphans.map(({ id }) => id);
-        await manager.update(workflow_review_request_ee_1.WorkflowReviewRequest, ids, {
+        await manager.update(workflow_review_request_ee_1.WorkflowReviewRequest, [...reasonByRequestId.keys()], {
             state: closedState,
             closedById: null,
         });
-        return ids;
+        return [...reasonByRequestId].map(([id, reason]) => ({ id, reason }));
     }
     async findById(id, ctx) {
         return await this.managerFor(ctx).findOne(workflow_review_request_ee_1.WorkflowReviewRequest, { where: { id } });
@@ -93,6 +123,7 @@ let WorkflowReviewRequestRepository = class WorkflowReviewRequestRepository exte
             id: entity.id,
             state: entity.state,
             decision: entity.decision,
+            description: entity.description,
             updatedById: entity.updatedById,
             createdAt: entity.createdAt,
             updatedAt: entity.updatedAt,
@@ -133,11 +164,14 @@ let WorkflowReviewRequestRepository = class WorkflowReviewRequestRepository exte
         }));
     }
     async findManyForInbox(options) {
-        const { projectIds, requesterId, state, limit, cursor } = options;
+        const { visibility, state, category, limit, cursor } = options;
         const queryBuilder = this.createQueryBuilder('review')
             .orderBy('review.createdAt', 'DESC')
             .addOrderBy('review.id', 'ASC');
-        this.applyInboxVisibility(queryBuilder, projectIds, requesterId);
+        this.applyInboxVisibility(queryBuilder, visibility);
+        if (category) {
+            this.applyCategoryFilter(queryBuilder, category);
+        }
         if (state !== undefined) {
             queryBuilder.andWhere('review.state = :state', { state });
         }
@@ -148,32 +182,90 @@ let WorkflowReviewRequestRepository = class WorkflowReviewRequestRepository exte
         return await queryBuilder.getMany();
     }
     async countByStateForInbox(options) {
-        const { projectIds, requesterId } = options;
         const queryBuilder = this.createQueryBuilder('review')
             .select('review.state', 'state')
             .addSelect('COUNT(*)', 'count')
             .groupBy('review.state');
-        this.applyInboxVisibility(queryBuilder, projectIds, requesterId);
+        this.applyInboxVisibility(queryBuilder, options.visibility);
         const rows = await queryBuilder.getRawMany();
         return {
             open: Number(rows.find((row) => row.state === 'open')?.count ?? 0),
             closed: Number(rows.find((row) => row.state === 'closed')?.count ?? 0),
         };
     }
-    applyInboxVisibility(queryBuilder, projectIds, requesterId) {
-        if (projectIds === null) {
+    applyInboxVisibility(queryBuilder, visibility) {
+        if (visibility.scope === 'all') {
             return;
         }
-        if (projectIds.length === 0) {
-            queryBuilder.andWhere('review.createdById = :requesterId', { requesterId });
+        const { userId, adminProjectIds, readableProjectIds, readableWorkflowRoles } = visibility;
+        const parameters = { involvedUserId: userId };
+        const clauses = [];
+        if (adminProjectIds.length > 0) {
+            clauses.push('review.projectId IN (:...adminProjectIds)');
+            parameters.adminProjectIds = adminProjectIds;
+        }
+        const authorExists = this.participantExistsSubquery(queryBuilder, workflow_review_request_author_ee_1.WorkflowReviewRequestAuthor, 'visibilityAuthor', 'involvedUserId');
+        const reviewerExists = this.participantExistsSubquery(queryBuilder, workflow_review_request_reviewer_ee_1.WorkflowReviewRequestReviewer, 'visibilityReviewer', 'involvedUserId');
+        clauses.push(`(EXISTS ${authorExists} OR EXISTS ${reviewerExists})`);
+        if (readableProjectIds === null) {
+            queryBuilder.andWhere(`(${clauses.join(' OR ')})`, parameters);
             return;
         }
-        queryBuilder.andWhere('(review.projectId IN (:...projectIds) OR review.createdById = :requesterId)', { projectIds, requesterId });
+        if (readableProjectIds.length === 0 || readableWorkflowRoles.length === 0) {
+            queryBuilder.andWhere('1 = 0');
+            return;
+        }
+        parameters.readableProjectIds = readableProjectIds;
+        parameters.readableWorkflowRoles = readableWorkflowRoles;
+        const anyLinkExists = this.linkedWorkflowExistsSubquery(queryBuilder, 'visibilityAnyLink');
+        const readableLinkExists = this.readableLinkedWorkflowExistsSubquery(queryBuilder);
+        queryBuilder.andWhere(`(${clauses.join(' OR ')}) AND (NOT EXISTS ${anyLinkExists} OR EXISTS ${readableLinkExists})`, parameters);
+    }
+    linkedWorkflowExistsSubquery(queryBuilder, alias) {
+        return queryBuilder
+            .subQuery()
+            .select('1')
+            .from(workflow_review_request_workflow_ee_1.WorkflowReviewRequestWorkflow, alias)
+            .where(`${alias}.workflowReviewRequestId = review.id`)
+            .getQuery();
+    }
+    readableLinkedWorkflowExistsSubquery(queryBuilder) {
+        return queryBuilder
+            .subQuery()
+            .select('1')
+            .from(shared_workflow_1.SharedWorkflow, 'visibilityShared')
+            .innerJoin(workflow_review_request_workflow_ee_1.WorkflowReviewRequestWorkflow, 'visibilityLink', 'visibilityLink.workflowId = visibilityShared.workflowId')
+            .where('visibilityLink.workflowReviewRequestId = review.id')
+            .andWhere('visibilityShared.role IN (:...readableWorkflowRoles)')
+            .andWhere('visibilityShared.projectId IN (:...readableProjectIds)')
+            .getQuery();
+    }
+    participantExistsSubquery(queryBuilder, junctionEntity, alias, userParameter) {
+        return queryBuilder
+            .subQuery()
+            .select('1')
+            .from(junctionEntity, alias)
+            .where(`${alias}.workflowReviewRequestId = review.id`)
+            .andWhere(`${alias}.userId = :${userParameter}`)
+            .getQuery();
+    }
+    applyCategoryFilter(queryBuilder, { userId, category }) {
+        const authorExists = this.participantExistsSubquery(queryBuilder, workflow_review_request_author_ee_1.WorkflowReviewRequestAuthor, 'author', 'categoryUserId');
+        const reviewerExists = this.participantExistsSubquery(queryBuilder, workflow_review_request_reviewer_ee_1.WorkflowReviewRequestReviewer, 'reviewer', 'categoryUserId');
+        if (category === 'authored') {
+            queryBuilder.andWhere(`(EXISTS ${authorExists} AND NOT EXISTS ${reviewerExists})`, {
+                categoryUserId: userId,
+            });
+            return;
+        }
+        queryBuilder.andWhere(`(EXISTS ${reviewerExists} OR NOT EXISTS ${authorExists})`, {
+            categoryUserId: userId,
+        });
     }
 };
 exports.WorkflowReviewRequestRepository = WorkflowReviewRequestRepository;
 exports.WorkflowReviewRequestRepository = WorkflowReviewRequestRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, transaction_1.TransactionRunner])
 ], WorkflowReviewRequestRepository);
 //# sourceMappingURL=workflow-review-request.repository.js.map

package/dist/repositories/workflow-review-request.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-review-request.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-review-request.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-review-request.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-review-request.repository.ts"],"names":[],"mappings":"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"}

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

@@ -8,7 +8,7 @@ import { SharedWorkflowRepository } from './shared-workflow.repository';
 import { WorkflowHistoryRepository } from './workflow-history.repository';
 import { WorkflowEntity, User } from '../entities';
 import type { ListQueryDb, FolderWithWorkflowAndSubFolderCount, ListQuery } from '../entities/types-db';
-import type { OperationContext } from '../services/transaction';
+import { type OperationContext, TransactionRunner } from '../services/transaction';
 type ResourceType = 'folder' | 'workflow';
 export type WorkflowFolderUnionFull = (ListQueryDb.Workflow.Plain | ListQueryDb.Workflow.WithSharing | FolderWithWorkflowAndSubFolderCount) & {
     resource: ResourceType;
@@ -22,7 +22,7 @@ export declare class WorkflowRepository extends BaseRepository<WorkflowEntity> {
     private readonly folderRepository;
     private readonly sharedWorkflowRepository;
     private readonly workflowHistoryRepository;
-    constructor(dataSource: DataSource, globalConfig: GlobalConfig, folderRepository: FolderRepository, sharedWorkflowRepository: SharedWorkflowRepository, workflowHistoryRepository: WorkflowHistoryRepository);
+    constructor(dataSource: DataSource, globalConfig: GlobalConfig, folderRepository: FolderRepository, sharedWorkflowRepository: SharedWorkflowRepository, workflowHistoryRepository: WorkflowHistoryRepository, transactionRunner: TransactionRunner);
     get(where: FindOptionsWhere<WorkflowEntity>, options?: {
         relations: string[] | FindOptionsRelations<WorkflowEntity>;
     }): Promise<WorkflowEntity | null>;
@@ -128,7 +128,6 @@ export declare class WorkflowRepository extends BaseRepository<WorkflowEntity> {
     private applyActiveVersionRelation;
     private applyTagsRelation;
     private applySorting;
-    private parseSortingParams;
     private applySortingByColumn;
     private applyPagination;
     findStartingWith(workflowName: string): Promise<Array<{

package/dist/repositories/workflow.repository.js

@@ -20,12 +20,14 @@ const shared_workflow_repository_1 = require("./shared-workflow.repository");
 const workflow_history_repository_1 = require("./workflow-history.repository");
 const entities_1 = require("../entities");
 const shared_workflow_1 = require("../entities/shared-workflow");
+const transaction_1 = require("../services/transaction");
 const apply_workflow_boolean_setting_filter_1 = require("../utils/apply-workflow-boolean-setting-filter");
 const is_string_array_1 = require("../utils/is-string-array");
+const list_query_sort_1 = require("../utils/list-query-sort");
 const timed_query_1 = require("../utils/timed-query");
 let WorkflowRepository = class WorkflowRepository extends base_repository_1.BaseRepository {
-    constructor(dataSource, globalConfig, folderRepository, sharedWorkflowRepository, workflowHistoryRepository) {
-        super(entities_1.WorkflowEntity, dataSource.manager);
+    constructor(dataSource, globalConfig, folderRepository, sharedWorkflowRepository, workflowHistoryRepository, transactionRunner) {
+        super(entities_1.WorkflowEntity, dataSource.manager, transactionRunner);
         this.globalConfig = globalConfig;
         this.folderRepository = folderRepository;
         this.sharedWorkflowRepository = sharedWorkflowRepository;
@@ -246,7 +248,7 @@ let WorkflowRepository = class WorkflowRepository extends base_repository_1.Base
             filter: options.filter,
         };
         const columnNames = [...Object.keys(workflowQueryParameters.select ?? {}), 'resource'];
-        const [sortByColumn, sortByDirection] = this.parseSortingParams(options.sortBy ?? 'updatedAt:asc');
+        const { column: sortByColumn, direction: sortByDirection } = (0, list_query_sort_1.parseListQuerySortBy)(options.sortBy ?? 'updatedAt:asc');
         const foldersQuery = this.folderRepository
             .getManyQuery(folderQueryParameters)
             .addSelect('NULL', 'description')
@@ -424,7 +426,7 @@ let WorkflowRepository = class WorkflowRepository extends base_repository_1.Base
             filter: options.filter,
         };
         const columnNames = [...Object.keys(workflowQueryParameters.select ?? {}), 'resource'];
-        const [sortByColumn, sortByDirection] = this.parseSortingParams(options.sortBy ?? 'updatedAt:asc');
+        const { column: sortByColumn, direction: sortByDirection } = (0, list_query_sort_1.parseListQuerySortBy)(options.sortBy ?? 'updatedAt:asc');
         const foldersQuery = this.folderRepository
             .getManyQuery(folderQueryParameters)
             .addSelect('NULL', 'description')
@@ -832,13 +834,9 @@ let WorkflowRepository = class WorkflowRepository extends base_repository_1.Base
             qb.orderBy('workflow.updatedAt', 'ASC');
             return;
         }
-        const [column, direction] = this.parseSortingParams(sortBy);
+        const { column, direction } = (0, list_query_sort_1.parseListQuerySortBy)(sortBy);
         this.applySortingByColumn(qb, column, direction);
     }
-    parseSortingParams(sortBy) {
-        const [column, order] = sortBy.split(':');
-        return [column, order.toUpperCase()];
-    }
     applySortingByColumn(qb, column, direction) {
         if (column === 'name') {
             qb.addSelect('LOWER(workflow.name)', 'workflow_name_lower').orderBy('workflow_name_lower', direction);
@@ -1008,6 +1006,6 @@ __decorate([
 ], WorkflowRepository.prototype, "getMany", null);
 exports.WorkflowRepository = WorkflowRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource, config_1.GlobalConfig, folder_repository_1.FolderRepository, shared_workflow_repository_1.SharedWorkflowRepository, workflow_history_repository_1.WorkflowHistoryRepository])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, config_1.GlobalConfig, folder_repository_1.FolderRepository, shared_workflow_repository_1.SharedWorkflowRepository, workflow_history_repository_1.WorkflowHistoryRepository, transaction_1.TransactionRunner])
 ], WorkflowRepository);
 //# sourceMappingURL=workflow.repository.js.map