npm - @n8n/db - Versions diffs - 1.45.2 → 1.46.0 - Mend

@n8n/db 1.45.2 → 1.46.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (146) hide show

package/dist/repositories/test-case-execution.repository.ee.d.ts CHANGED Viewed

@@ -1,9 +1,12 @@
 import type { EntityManager } from '@n8n/typeorm';
-import { DataSource, Repository } from '@n8n/typeorm';
+import { DataSource } from '@n8n/typeorm';
 import type { DeepPartial } from '@n8n/typeorm/common/DeepPartial';
 import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { TestCaseExecution } from '../entities';
 import type { TestCaseExecutionErrorCode } from '../entities/types-db';
+import type { OperationContext } from '../services/transaction';
+import { TransactionRunner } from '../services/transaction';
+import { BaseRepository } from './base-repository';
 type StatusUpdateOptions = {
     testRunId: string;
     pastExecutionId: string;
@@ -19,8 +22,8 @@ type MarkAsRunningOptions = StatusUpdateOptions & {
 type MarkAsCompletedOptions = StatusUpdateOptions & {
     metrics: Record<string, number>;
 };
-export declare class TestCaseExecutionRepository extends Repository<TestCaseExecution> {
-    constructor(dataSource: DataSource);
+export declare class TestCaseExecutionRepository extends BaseRepository<TestCaseExecution> {
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
     createTestCaseExecution(testCaseExecutionProps: DeepPartial<TestCaseExecution>): Promise<TestCaseExecution>;
     getManyByTestRunId(testRunId: string, { offset, limit }: {
         offset: number;
@@ -36,7 +39,7 @@ export declare class TestCaseExecutionRepository extends Repository<TestCaseExec
     cancelIfNew(testRunId: string, id: string): Promise<boolean>;
     markAsRunning({ testRunId, pastExecutionId, executionId, trx }: MarkAsRunningOptions): Promise<import("@n8n/typeorm").UpdateResult>;
     markAsCompleted({ testRunId, pastExecutionId, metrics, trx }: MarkAsCompletedOptions): Promise<import("@n8n/typeorm").UpdateResult>;
-    markAllPendingAsCancelled(testRunId: string, trx?: EntityManager): Promise<import("@n8n/typeorm").UpdateResult>;
+    markAllPendingAsCancelled(testRunId: string, ctx?: OperationContext): Promise<import("@n8n/typeorm").UpdateResult>;
     markAsFailed({ testRunId, pastExecutionId, errorCode, errorDetails, trx, }: MarkAsFailedOptions): Promise<import("@n8n/typeorm").UpdateResult>;
 }
 export {};

package/dist/repositories/test-case-execution.repository.ee.js CHANGED Viewed

@@ -13,9 +13,11 @@ exports.TestCaseExecutionRepository = void 0;
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const entities_1 = require("../entities");
-let TestCaseExecutionRepository = class TestCaseExecutionRepository extends typeorm_1.Repository {
-    constructor(dataSource) {
-        super(entities_1.TestCaseExecution, dataSource.manager);
+const transaction_1 = require("../services/transaction");
+const base_repository_1 = require("./base-repository");
+let TestCaseExecutionRepository = class TestCaseExecutionRepository extends base_repository_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(entities_1.TestCaseExecution, dataSource.manager, transactionRunner);
     }
     async createTestCaseExecution(testCaseExecutionProps) {
         const testCaseExecution = this.create(testCaseExecutionProps);
@@ -74,9 +76,8 @@ let TestCaseExecutionRepository = class TestCaseExecutionRepository extends type
             metrics,
         });
     }
-    async markAllPendingAsCancelled(testRunId, trx) {
-        trx = trx ?? this.manager;
-        return await trx.update(entities_1.TestCaseExecution, { testRun: { id: testRunId }, status: (0, typeorm_1.Not)((0, typeorm_1.In)(['success', 'error', 'cancelled'])) }, {
+    async markAllPendingAsCancelled(testRunId, ctx = {}) {
+        return await this.managerFor(ctx).update(entities_1.TestCaseExecution, { testRun: { id: testRunId }, status: (0, typeorm_1.Not)((0, typeorm_1.In)(['success', 'error', 'cancelled'])) }, {
             status: 'cancelled',
             completedAt: new Date(),
         });
@@ -94,6 +95,6 @@ let TestCaseExecutionRepository = class TestCaseExecutionRepository extends type
 exports.TestCaseExecutionRepository = TestCaseExecutionRepository;
 exports.TestCaseExecutionRepository = TestCaseExecutionRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, transaction_1.TransactionRunner])
 ], TestCaseExecutionRepository);
 //# sourceMappingURL=test-case-execution.repository.ee.js.map

package/dist/repositories/test-case-execution.repository.ee.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"test-case-execution.repository.ee.js","sourceRoot":"","sources":["../../src/repositories/test-case-execution.repository.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,~~0CAA+D~~;~~AAI/D~~,0CAAgD;~~AAuBzC~~,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,~~oBAA6B~~;~~IAC7E~~,YAAY,UAAsB;~~QACjC~~,KAAK,CAAC,4BAAiB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;~~IAC9C~~,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,sBAAsD;QACnF,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAE9D,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3C,CAAC;IAQD,KAAK,CAAC,kBAAkB,CACvB,SAAiB,EACjB,EAAE,MAAM,EAAE,KAAK,EAAqC;QAEpD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACtB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;YACrC,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE;YACrC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;SACX,CAAC,CAAC;IACJ,CAAC;IAMD,KAAK,CAAC,gBAAgB,CAAC,SAAiB;QACvC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,SAAmB;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAC3B,SAAS,CAAC,GAAG,CAAiC,GAAG,EAAE,CAAC,CAAC;YACpD,OAAO,EAAE;gBACR,EAAE,EAAE,SAAS;aACb;YACD,MAAM,EAAE,KAAK;SACb,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAUD,KAAK,CAAC,kBAAkB,CACvB,SAAiB,EACjB,KAAuD;QAEvD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAC/C,IAAI,CAAC,MAAM,CAAC;YACX,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;YAC1B,MAAM,EAAE,KAAK;YACb,QAAQ;YAER,MAAM,EAAE,MAAM,IAAI,IAAI;SACtB,CAAC,CACF,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAQD,KAAK,CAAC,oBAAoB,CAAC,EAAU;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAC/B,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EACrB,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,EAAE,CACxC,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IASD,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,EAAU;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAC/B,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EACjD,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CAChD,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,EAAwB;QACzF,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,OAAO,MAAM,GAAG,CAAC,MAAM,CACtB,4BAAiB,EACjB,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAC/C;YACC,MAAM,EAAE,SAAS;YACjB,WAAW;YACX,KAAK,EAAE,IAAI,IAAI,EAAE;SACjB,CACD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,EAA0B;QACzF,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,OAAO,MAAM,GAAG,CAAC,MAAM,CACtB,4BAAiB,EACjB,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAC/C;YACC,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,IAAI,IAAI,EAAE;YACvB,OAAO;SACP,CACD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,SAAiB,EAAE,~~GAAmB;QACrE,~~GAAG,~~GAAG~~,~~GAAG~~,~~IAAI~~,IAAI,CAAC,~~OAAO~~,CAAC~~;QAE1B~~,~~OAAO,MAAM,~~GAAG,CAAC,MAAM,~~CACtB~~,4BAAiB,EACjB,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,IAAA,aAAG,EAAC,IAAA,YAAE,EAAC,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EAClF;YACC,MAAM,EAAE,WAAW;YACnB,WAAW,EAAE,IAAI,IAAI,EAAE;SACvB,CACD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAClB,SAAS,EACT,eAAe,EACf,SAAS,EACT,YAAY,EACZ,GAAG,GACkB;QACrB,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAE1B,OAAO,MAAM,GAAG,CAAC,MAAM,CACtB,4BAAiB,EACjB,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAC/C;YACC,MAAM,EAAE,OAAO;YACf,WAAW,EAAE,IAAI,IAAI,EAAE;YACvB,SAAS;YACT,YAAY;SACZ,CACD,CAAC;IACH,CAAC;CACD,CAAA;;~~sCApKY~~,2BAA2B;IADvC,IAAA,YAAO,GAAE;qCAEe,oBAAU;~~GADtB~~,2BAA2B,~~CAoKvC~~"}
1	+ {"version":3,"file":"test-case-execution.repository.ee.js","sourceRoot":"","sources":["../../src/repositories/test-case-execution.repository.ee.ts"],"names":[],"mappings":"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"}

package/dist/repositories/test-run.repository.ee.d.ts CHANGED Viewed

@@ -1,15 +1,17 @@
-import type { EntityManager } from '@n8n/typeorm';
-import { DataSource, Repository } from '@n8n/typeorm';
+import { DataSource } from '@n8n/typeorm';
 import { type IDataObject } from 'n8n-workflow';
 import { TestRun } from '../entities';
 import type { TestRunStatus } from '../entities/test-run.ee';
 import { TestRunErrorCode } from '../entities/types-db';
 import type { AggregatedTestRunMetrics, TestRunFinalResult } from '../entities/types-db';
+import type { OperationContext } from '../services/transaction';
+import { TransactionRunner } from '../services/transaction';
+import { BaseRepository } from './base-repository';
 export type TestRunSummary = TestRun & {
     finalResult: TestRunFinalResult | null;
 };
-export declare class TestRunRepository extends Repository<TestRun> {
-    constructor(dataSource: DataSource);
+export declare class TestRunRepository extends BaseRepository<TestRun> {
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
     createTestRun(workflowId: string, attrs?: {
         collectionId?: string | null;
         workflowVersionId?: string | null;
@@ -18,7 +20,8 @@ export declare class TestRunRepository extends Repository<TestRun> {
     }): Promise<TestRun>;
     markAsRunning(id: string, instanceId?: string): Promise<import("@n8n/typeorm").UpdateResult>;
     markAsCompleted(id: string, metrics: AggregatedTestRunMetrics): Promise<import("@n8n/typeorm").UpdateResult>;
-    markAsCancelled(id: string, trx?: EntityManager): Promise<import("@n8n/typeorm").UpdateResult>;
+    markAsCancelled(id: string, ctx?: OperationContext): Promise<import("@n8n/typeorm").UpdateResult>;
+    markAsCancelledIfActive(id: string, ctx?: OperationContext): Promise<boolean>;
     markAsError(id: string, errorCode: TestRunErrorCode, errorDetails?: IDataObject): Promise<import("@n8n/typeorm").UpdateResult>;
     markAllIncompleteAsFailed(): Promise<import("@n8n/typeorm").UpdateResult>;
     requestCancellation(id: string): Promise<import("@n8n/typeorm").UpdateResult>;

package/dist/repositories/test-run.repository.ee.js CHANGED Viewed

@@ -15,10 +15,12 @@ const typeorm_1 = require("@n8n/typeorm");
 const n8n_workflow_1 = require("n8n-workflow");
 const entities_1 = require("../entities");
 const types_db_1 = require("../entities/types-db");
+const transaction_1 = require("../services/transaction");
 const get_final_test_result_1 = require("../utils/get-final-test-result");
-let TestRunRepository = class TestRunRepository extends typeorm_1.Repository {
-    constructor(dataSource) {
-        super(entities_1.TestRun, dataSource.manager);
+const base_repository_1 = require("./base-repository");
+let TestRunRepository = class TestRunRepository extends base_repository_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(entities_1.TestRun, dataSource.manager, transactionRunner);
     }
     async createTestRun(workflowId, attrs) {
         const testRun = this.create({
@@ -43,9 +45,15 @@ let TestRunRepository = class TestRunRepository extends typeorm_1.Repository {
     async markAsCompleted(id, metrics) {
         return await this.update(id, { status: 'completed', completedAt: new Date(), metrics });
     }
-    async markAsCancelled(id, trx) {
-        trx = trx ?? this.manager;
-        return await trx.update(entities_1.TestRun, id, { status: 'cancelled', completedAt: new Date() });
+    async markAsCancelled(id, ctx = {}) {
+        return await this.managerFor(ctx).update(entities_1.TestRun, id, {
+            status: 'cancelled',
+            completedAt: new Date(),
+        });
+    }
+    async markAsCancelledIfActive(id, ctx = {}) {
+        const result = await this.managerFor(ctx).update(entities_1.TestRun, { id, status: (0, typeorm_1.In)(['new', 'running']) }, { status: 'cancelled', completedAt: new Date() });
+        return (result.affected ?? 0) > 0;
     }
     async markAsError(id, errorCode, errorDetails) {
         return await this.update(id, {
@@ -133,6 +141,6 @@ let TestRunRepository = class TestRunRepository extends typeorm_1.Repository {
 exports.TestRunRepository = TestRunRepository;
 exports.TestRunRepository = TestRunRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, transaction_1.TransactionRunner])
 ], TestRunRepository);
 //# sourceMappingURL=test-run.repository.ee.js.map

package/dist/repositories/test-run.repository.ee.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"test-run.repository.ee.js","sourceRoot":"","sources":["../../src/repositories/test-run.repository.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,~~0CAA0D~~;~~AAC1D~~,+CAAiE;AAEjE,0CAAsC;AAEtC,mDAAwD;~~AAExD~~,0EAAuE;~~AAOhE~~,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,~~oBAAmB~~;~~IACzD~~,YAAY,UAAsB;~~QACjC~~,KAAK,CAAC,kBAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;~~IACpC~~,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,UAAkB,EAClB,KAKC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE;gBACT,EAAE,EAAE,UAAU;aACd;YACD,YAAY,EAAE,KAAK,EAAE,YAAY,IAAI,IAAI;YACzC,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,IAAI,IAAI;YACnD,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,IAAI,IAAI;YACrD,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,IAAI,IAAI;SACjE,CAAC,CAAC;QAEH,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,UAAmB;QAClD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YAC5B,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,IAAI,IAAI,EAAE;YACjB,iBAAiB,EAAE,UAAU,IAAI,IAAI;SACrC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAU,EAAE,OAAiC;QAClE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAU,EAAE,~~GAAmB~~;~~QACpD~~,~~GAAG~~,~~GAAG~~,GAAG,IAAI,IAAI,CAAC,~~OAAO~~,CAAC;~~QAC1B~~,~~OAAO~~,MAAM,GAAG,CAAC,~~MAAM~~,CAAC,kBAAO,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;~~IACxF~~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~~4BApNY~~,iBAAiB;IAD7B,IAAA,YAAO,GAAE;qCAEe,oBAAU;~~GADtB~~,iBAAiB,~~CAoN7B~~"}
1	+ {"version":3,"file":"test-run.repository.ee.js","sourceRoot":"","sources":["../../src/repositories/test-run.repository.ee.ts"],"names":[],"mappings":"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"}

package/dist/repositories/user.repository.d.ts CHANGED Viewed

@@ -36,10 +36,11 @@ export declare class UserRepository extends BaseRepository<User> {
         user: User;
         project: Project;
     }>;
-    findEligibleByProjectOrGlobalRoles({ projectId, projectRoleSlugs, globalRoleSlugs, }: {
+    findEligibleByProjectOrGlobalRoles({ projectId, projectRoleSlugs, globalRoleSlugs, userIds, }: {
         projectId: string;
         projectRoleSlugs: string[];
         globalRoleSlugs: string[];
+        userIds?: string[];
     }): Promise<User[]>;
     findIdsWithGlobalOrProjectRoles({ projectIds, projectRoleSlugs, globalRoleSlugs, }: {
         projectIds: string[];
@@ -53,5 +54,5 @@ export declare class UserRepository extends BaseRepository<User> {
     private applyUserListExpand;
     private applyUserListSort;
     private applyUserListPagination;
-    buildUserQuery(listQueryOptions?: UsersListFilterDto): SelectQueryBuilder<User>;
+    buildUserQuery(listQueryOptions?: UsersListFilterDto, roleSlugs?: string[]): SelectQueryBuilder<User>;
 }

package/dist/repositories/user.repository.js CHANGED Viewed

@@ -179,13 +179,17 @@ let UserRepository = class UserRepository extends base_repository_1.BaseReposito
         }
         return await createInner(this.manager);
     }
-    async findEligibleByProjectOrGlobalRoles({ projectId, projectRoleSlugs, globalRoleSlugs, }) {
+    async findEligibleByProjectOrGlobalRoles({ projectId, projectRoleSlugs, globalRoleSlugs, userIds, }) {
+        if (userIds?.length === 0)
+            return [];
+        const requestedUsers = userIds ? { id: (0, typeorm_1.In)(userIds) } : {};
         const where = [];
         if (globalRoleSlugs.length > 0) {
-            where.push({ disabled: false, role: { slug: (0, typeorm_1.In)(globalRoleSlugs) } });
+            where.push({ ...requestedUsers, disabled: false, role: { slug: (0, typeorm_1.In)(globalRoleSlugs) } });
         }
         if (projectRoleSlugs.length > 0) {
             where.push({
+                ...requestedUsers,
                 disabled: false,
                 projectRelations: { projectId, role: { slug: (0, typeorm_1.In)(projectRoleSlugs) } },
             });
@@ -250,7 +254,15 @@ let UserRepository = class UserRepository extends base_repository_1.BaseReposito
         }
         return queryBuilder;
     }
-    applyUserListFilter(queryBuilder, filter) {
+    applyUserListFilter(queryBuilder, filter, roleSlugs) {
+        if (roleSlugs !== undefined) {
+            if (roleSlugs.length === 0) {
+                queryBuilder.andWhere('1 = 0');
+            }
+            else {
+                queryBuilder.andWhere('user.role IN (:...roleSlugs)', { roleSlugs });
+            }
+        }
         if (filter?.email !== undefined) {
             queryBuilder.andWhere('user.email = :email', {
                 email: filter.email,
@@ -348,7 +360,7 @@ let UserRepository = class UserRepository extends base_repository_1.BaseReposito
             queryBuilder.skip(skip);
         return queryBuilder;
     }
-    buildUserQuery(listQueryOptions) {
+    buildUserQuery(listQueryOptions, roleSlugs) {
         const queryBuilder = this.createQueryBuilder('user');
         queryBuilder.leftJoinAndSelect('user.authIdentities', 'authIdentities');
         if (listQueryOptions === undefined) {
@@ -356,7 +368,7 @@ let UserRepository = class UserRepository extends base_repository_1.BaseReposito
         }
         const { filter, select, take, skip, expand, sortBy } = listQueryOptions;
         this.applyUserListSelect(queryBuilder, select);
-        this.applyUserListFilter(queryBuilder, filter);
+        this.applyUserListFilter(queryBuilder, filter, roleSlugs);
         this.applyUserListExpand(queryBuilder, expand);
         this.applyUserListPagination(queryBuilder, take, skip);
         this.applyUserListSort(queryBuilder, sortBy);

package/dist/repositories/user.repository.js.map CHANGED Viewed

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

package/dist/repositories/workflow-dependency.repository.js CHANGED Viewed

@@ -109,9 +109,16 @@ let WorkflowDependencyRepository = class WorkflowDependencyRepository extends ty
             workflowVersionId: (0, typeorm_1.LessThan)(dependencies.workflowVersionId),
             publishedVersionId: publishedVersionCondition,
         });
+        const workflow = await tx.findOne(entities_1.WorkflowEntity, {
+            select: { id: true, versionCounter: true },
+            where: { id: workflowId },
+        });
+        const isCurrentVersion = workflow?.versionCounter === dependencies.workflowVersionId;
         const outdatedIndexResult = await tx.delete(entities_1.WorkflowDependency, {
             workflowId,
-            workflowVersionId: (0, typeorm_1.LessThanOrEqual)(dependencies.workflowVersionId),
+            ...(isCurrentVersion
+                ? {}
+                : { workflowVersionId: (0, typeorm_1.LessThanOrEqual)(dependencies.workflowVersionId) }),
             indexVersionId: (0, typeorm_1.LessThan)(entities_1.WORKFLOW_DEPENDENCY_INDEX_VERSION),
             publishedVersionId: publishedVersionCondition,
         });

package/dist/repositories/workflow-dependency.repository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"workflow-dependency.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-dependency.repository.ts"],"names":[],"mappings":"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~~YAClE~~,cAAc,EAAE,IAAA,kBAAQ,EAAC,4CAAiC,CAAC;YAC3D,kBAAkB,EAAE,yBAAyB;SAC7C,CAAC,CAAC;QACH,MAAM,YAAY,GACjB,CAAC,qBAAqB,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;QAG7E,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YAGtB,MAAM,EAAE,CAAC,MAAM,CAAC,6BAAkB,EAAE,YAAY,CAAC,YAAqB,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC;QACb,CAAC;QAKD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kCAAkC,CAC5D,UAAU,EACV,YAAY,CAAC,kBAAkB,EAC/B,EAAE,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YAEd,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAG1E,MAAM,EAAE,CAAC,MAAM,CAAC,6BAAkB,EAAE,QAAiB,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACb,CAAC;QAGD,OAAO,KAAK,CAAC;IACd,CAAC;IAgBD,KAAK,CAAC,6BAA6B,CAAC,UAAkB;QACrD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAClD,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,6BAAkB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAEzE,OAAO,CACN,YAAY,CAAC,QAAQ,KAAK,SAAS;gBACnC,YAAY,CAAC,QAAQ,KAAK,IAAI;gBAC9B,YAAY,CAAC,QAAQ,GAAG,CAAC,CACzB,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kCAAkC,CAC/C,UAAkB,EAClB,kBAAiC,EACjC,EAAiB;QAGjB,MAAM,eAAe,GAA4B;YAChD,UAAU;YACV,kBAAkB,EAAE,kBAAkB,IAAI,IAAA,gBAAM,GAAE;SAClD,CAAC;QAEF,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAG3C,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,6BAAkB,EAAE,eAAe,CAAC,CAAC;QAC/D,CAAC;QAGD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3E,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;QACvD,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,SAAS,eAAe,WAAW,aAAa,EAAE;YAClF,UAAU;SACV,CAAC,CAAC;QACH,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,6BAAkB,EAAE,eAAe,CAAC,CAAC;IAC/D,CAAC;IAEO,YAAY,CAAC,IAAY;QAChC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC;QAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;CACD,CAAA;;~~uCApQY~~,4BAA4B;IADxC,IAAA,YAAO,GAAE;qCAGI,oBAAU,EACW,uBAAc,EACJ,qDAAwB;GAJxD,4BAA4B,~~CAoQxC~~"}
1	+ {"version":3,"file":"workflow-dependency.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-dependency.repository.ts"],"names":[],"mappings":"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"}

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

@@ -3,6 +3,7 @@ import type { Scope } from '@n8n/permissions';
 import { DataSource } from '@n8n/typeorm';
 import type { SelectQueryBuilder, UpdateResult, FindOptionsWhere, FindOptionsRelations, EntityManager } from '@n8n/typeorm';
 import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
+import { type IWorkflowSettings } from 'n8n-workflow';
 import type { ActivityProjectScope } from './activity-event.repository';
 import { BaseRepository } from './base-repository';
 import { FolderRepository } from './folder.repository';
@@ -53,6 +54,7 @@ export declare class WorkflowRepository extends BaseRepository<WorkflowEntity> {
     findArchivedState(workflowId: string, ctx?: OperationContext): Promise<{
         isArchived: boolean;
     } | null>;
+    findSettings(workflowId: string): Promise<IWorkflowSettings | undefined>;
     getAllActiveIds(): Promise<string[]>;
     getActiveIds({ maxResults }?: {
         maxResults?: number;
@@ -90,6 +92,9 @@ export declare class WorkflowRepository extends BaseRepository<WorkflowEntity> {
         fields?: string[];
     }): Promise<WorkflowEntity[]>;
     findManyByAgentToolReferences(projectId: string, workflowIds: string[], legacyWorkflowNames: string[]): Promise<WorkflowEntity[]>;
+    findInFoldersForTransfer(folderIds: string[], { withNodes }: {
+        withNodes: boolean;
+    }): Promise<WorkflowEntity[]>;
     findOneByAgentToolReference(projectId: string, reference: {
         workflowId?: string;
         workflowName: string;

package/dist/repositories/workflow.repository.js CHANGED Viewed

@@ -113,6 +113,10 @@ let WorkflowRepository = class WorkflowRepository extends base_repository_1.Base
             where: { id: workflowId },
         });
     }
+    async findSettings(workflowId) {
+        const workflow = await this.findOne({ select: ['settings'], where: { id: workflowId } });
+        return workflow?.settings;
+    }
     async getAllActiveIds() {
         const result = await this.find({
             select: { id: true },
@@ -375,6 +379,23 @@ let WorkflowRepository = class WorkflowRepository extends base_repository_1.Base
             select: ['id', 'name', 'nodes', 'connections', 'activeVersionId'],
         });
     }
+    async findInFoldersForTransfer(folderIds, { withNodes }) {
+        const workflows = [];
+        for (const chunk of (0, chunk_ids_1.chunkIds)(folderIds)) {
+            workflows.push(...(await this.find({
+                select: [
+                    'id',
+                    'name',
+                    'activeVersionId',
+                    'shared',
+                    ...(withNodes ? ['nodes', 'activeVersion'] : []),
+                ],
+                relations: ['shared', 'shared.project', ...(withNodes ? ['activeVersion'] : [])],
+                where: { parentFolder: { id: (0, typeorm_1.In)(chunk) } },
+            })));
+        }
+        return workflows;
+    }
     async findOneByAgentToolReference(projectId, reference, options = {}) {
         const workflowWhere = reference.workflowId !== undefined
             ? { id: reference.workflowId }