n8n 2.19.0 → 2.19.2
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.
- package/dist/active-executions.js +1 -0
- package/dist/active-executions.js.map +1 -1
- package/dist/active-workflow-manager.js +23 -2
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/controllers/project.controller.d.ts +1 -0
- package/dist/controllers/project.controller.js +13 -0
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/errors/duplicate-execution.error.d.ts +5 -0
- package/dist/errors/duplicate-execution.error.js +14 -0
- package/dist/errors/duplicate-execution.error.js.map +1 -0
- package/dist/executions/execution-persistence.d.ts +4 -2
- package/dist/executions/execution-persistence.js +44 -15
- package/dist/executions/execution-persistence.js.map +1 -1
- package/dist/modules/favorites/favorites.controller.d.ts +0 -1
- package/dist/modules/favorites/favorites.controller.js +1 -1
- package/dist/modules/favorites/favorites.controller.js.map +1 -1
- package/dist/modules/favorites/favorites.service.d.ts +6 -3
- package/dist/modules/favorites/favorites.service.js +97 -71
- package/dist/modules/favorites/favorites.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +1 -0
- package/dist/services/project.service.ee.js +6 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/workflow-runner.d.ts +1 -0
- package/dist/workflow-runner.js +33 -6
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +1 -1
- package/dist/workflows/workflow-execution.service.js +2 -1
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/package.json +16 -16
|
@@ -16,6 +16,7 @@ export declare class ProjectController {
|
|
|
16
16
|
constructor(projectsService: ProjectService, projectRepository: ProjectRepository, eventService: EventService, userManagementMailer: UserManagementMailer, provisioningService: ProvisioningService);
|
|
17
17
|
getAllProjects(req: AuthenticatedRequest, res: Response, payload: ListProjectsQueryDto): Promise<Response<any, Record<string, any>> | import("@n8n/db").Project[]>;
|
|
18
18
|
getProjectCounts(): Promise<Record<"personal" | "team", number>>;
|
|
19
|
+
getSharingCandidates(req: AuthenticatedRequest, res: Response, payload: ListProjectsQueryDto): Promise<Response<any, Record<string, any>>>;
|
|
19
20
|
createProject(req: AuthenticatedRequest, _res: Response, payload: CreateProjectDto): Promise<{
|
|
20
21
|
role: string;
|
|
21
22
|
scopes: Scope[];
|
|
@@ -44,6 +44,11 @@ let ProjectController = class ProjectController {
|
|
|
44
44
|
async getProjectCounts() {
|
|
45
45
|
return await this.projectsService.getProjectCounts();
|
|
46
46
|
}
|
|
47
|
+
async getSharingCandidates(req, res, payload) {
|
|
48
|
+
const [data, count] = await this.projectsService.getShareableProjectsAndCount(req.user, payload);
|
|
49
|
+
const enriched = await this.projectsService.addUserScopes(req.user, data);
|
|
50
|
+
return res.json({ count, data: enriched });
|
|
51
|
+
}
|
|
47
52
|
async createProject(req, _res, payload) {
|
|
48
53
|
try {
|
|
49
54
|
const project = await this.projectsService.createTeamProject(req.user, payload);
|
|
@@ -245,6 +250,14 @@ __decorate([
|
|
|
245
250
|
__metadata("design:paramtypes", []),
|
|
246
251
|
__metadata("design:returntype", Promise)
|
|
247
252
|
], ProjectController.prototype, "getProjectCounts", null);
|
|
253
|
+
__decorate([
|
|
254
|
+
(0, decorators_1.Get)('/sharing-candidates'),
|
|
255
|
+
(0, decorators_1.GlobalScope)('user:list'),
|
|
256
|
+
__param(2, decorators_1.Query),
|
|
257
|
+
__metadata("design:type", Function),
|
|
258
|
+
__metadata("design:paramtypes", [Object, Object, api_types_1.ListProjectsQueryDto]),
|
|
259
|
+
__metadata("design:returntype", Promise)
|
|
260
|
+
], ProjectController.prototype, "getSharingCandidates", null);
|
|
248
261
|
__decorate([
|
|
249
262
|
(0, decorators_1.Post)('/'),
|
|
250
263
|
(0, decorators_1.GlobalScope)('project:create'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DuplicateExecutionError = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
class DuplicateExecutionError extends n8n_workflow_1.OperationalError {
|
|
6
|
+
constructor(deduplicationKey, cause) {
|
|
7
|
+
super(`Execution with deduplication key "${deduplicationKey}" already exists`, {
|
|
8
|
+
cause,
|
|
9
|
+
});
|
|
10
|
+
this.deduplicationKey = deduplicationKey;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
exports.DuplicateExecutionError = DuplicateExecutionError;
|
|
14
|
+
//# sourceMappingURL=duplicate-execution.error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"duplicate-execution.error.js","sourceRoot":"","sources":["../../src/errors/duplicate-execution.error.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAEhD,MAAa,uBAAwB,SAAQ,+BAAgB;IAC5D,YACU,gBAAwB,EACjC,KAAa;QAEb,KAAK,CAAC,qCAAqC,gBAAgB,kBAAkB,EAAE;YAC9E,KAAK;SACL,CAAC,CAAC;QALM,qBAAgB,GAAhB,gBAAgB,CAAQ;IAMlC,CAAC;CACD;AATD,0DASC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ExecutionsConfig } from '@n8n/config';
|
|
1
|
+
import { DatabaseConfig, ExecutionsConfig } from '@n8n/config';
|
|
2
2
|
import type { CreateExecutionPayload, ExecutionDataStorageLocation, ExecutionDeletionCriteria } from '@n8n/db';
|
|
3
3
|
import { ExecutionRepository } from '@n8n/db';
|
|
4
4
|
import { BinaryDataService, StorageConfig } from 'n8n-core';
|
|
@@ -13,8 +13,10 @@ export declare class ExecutionPersistence {
|
|
|
13
13
|
private readonly fsStore;
|
|
14
14
|
private readonly storageConfig;
|
|
15
15
|
private readonly executionsConfig;
|
|
16
|
-
|
|
16
|
+
private readonly databaseConfig;
|
|
17
|
+
constructor(executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, fsStore: FsStore, storageConfig: StorageConfig, executionsConfig: ExecutionsConfig, databaseConfig: DatabaseConfig);
|
|
17
18
|
create(payload: CreateExecutionPayload): Promise<string>;
|
|
19
|
+
private isDuplicateExecutionError;
|
|
18
20
|
deleteInFlightExecution(target: DeletionTarget): Promise<void>;
|
|
19
21
|
hardDelete(target: DeletionTarget | DeletionTarget[]): Promise<void>;
|
|
20
22
|
hardDeleteBy(criteria: ExecutionDeletionCriteria): Promise<void>;
|
|
@@ -17,13 +17,15 @@ const di_1 = require("@n8n/di");
|
|
|
17
17
|
const flatted_1 = require("flatted");
|
|
18
18
|
const n8n_core_1 = require("n8n-core");
|
|
19
19
|
const fs_store_1 = require("./execution-data/fs-store");
|
|
20
|
+
const duplicate_execution_error_1 = require("../errors/duplicate-execution.error");
|
|
20
21
|
let ExecutionPersistence = class ExecutionPersistence {
|
|
21
|
-
constructor(executionRepository, binaryDataService, fsStore, storageConfig, executionsConfig) {
|
|
22
|
+
constructor(executionRepository, binaryDataService, fsStore, storageConfig, executionsConfig, databaseConfig) {
|
|
22
23
|
this.executionRepository = executionRepository;
|
|
23
24
|
this.binaryDataService = binaryDataService;
|
|
24
25
|
this.fsStore = fsStore;
|
|
25
26
|
this.storageConfig = storageConfig;
|
|
26
27
|
this.executionsConfig = executionsConfig;
|
|
28
|
+
this.databaseConfig = databaseConfig;
|
|
27
29
|
}
|
|
28
30
|
async create(payload) {
|
|
29
31
|
const { data: rawData, workflowData, ...rest } = payload;
|
|
@@ -33,21 +35,47 @@ let ExecutionPersistence = class ExecutionPersistence {
|
|
|
33
35
|
const executionEntity = { ...rest, createdAt: new Date(), storedAt };
|
|
34
36
|
const data = (0, flatted_1.stringify)(rawData);
|
|
35
37
|
const workflowVersionId = workflowData.versionId ?? null;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
38
|
+
try {
|
|
39
|
+
return await this.executionRepository.manager.transaction(async (tx) => {
|
|
40
|
+
const { identifiers } = await tx.insert(db_1.ExecutionEntity, executionEntity);
|
|
41
|
+
const executionId = String(identifiers[0].id);
|
|
42
|
+
if (storedAt === 'db') {
|
|
43
|
+
await tx.insert(db_1.ExecutionData, {
|
|
44
|
+
executionId,
|
|
45
|
+
workflowData: workflowSnapshot,
|
|
46
|
+
data,
|
|
47
|
+
workflowVersionId,
|
|
48
|
+
});
|
|
49
|
+
return executionId;
|
|
50
|
+
}
|
|
51
|
+
await this.fsStore.write({ workflowId: id, executionId }, { data, workflowData: workflowSnapshot, workflowVersionId });
|
|
46
52
|
return executionId;
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
if (executionEntity.deduplicationKey && this.isDuplicateExecutionError(error)) {
|
|
57
|
+
throw new duplicate_execution_error_1.DuplicateExecutionError(executionEntity.deduplicationKey, error);
|
|
47
58
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
59
|
+
throw error;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
isDuplicateExecutionError(error) {
|
|
63
|
+
if (!(error instanceof Error) || !('driverError' in error))
|
|
64
|
+
return false;
|
|
65
|
+
const { driverError } = error;
|
|
66
|
+
if (typeof driverError !== 'object' || driverError === null || !('code' in driverError)) {
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
const { code } = driverError;
|
|
70
|
+
if (typeof code !== 'string')
|
|
71
|
+
return false;
|
|
72
|
+
if (!error.message.includes('deduplicationKey'))
|
|
73
|
+
return false;
|
|
74
|
+
if (this.databaseConfig.type === 'postgresdb') {
|
|
75
|
+
return code === '23505';
|
|
76
|
+
}
|
|
77
|
+
return (code === 'SQLITE_CONSTRAINT_UNIQUE' ||
|
|
78
|
+
(code === 'SQLITE_CONSTRAINT' && error.message.includes('UNIQUE constraint failed')));
|
|
51
79
|
}
|
|
52
80
|
async deleteInFlightExecution(target) {
|
|
53
81
|
if (this.executionsConfig.pruneData) {
|
|
@@ -84,6 +112,7 @@ exports.ExecutionPersistence = ExecutionPersistence = __decorate([
|
|
|
84
112
|
n8n_core_1.BinaryDataService,
|
|
85
113
|
fs_store_1.FsStore,
|
|
86
114
|
n8n_core_1.StorageConfig,
|
|
87
|
-
config_1.ExecutionsConfig
|
|
115
|
+
config_1.ExecutionsConfig,
|
|
116
|
+
config_1.DatabaseConfig])
|
|
88
117
|
], ExecutionPersistence);
|
|
89
118
|
//# sourceMappingURL=execution-persistence.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-persistence.js","sourceRoot":"","sources":["../../src/executions/execution-persistence.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA+
|
|
1
|
+
{"version":3,"file":"execution-persistence.js","sourceRoot":"","sources":["../../src/executions/execution-persistence.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA+D;AAC/D,8CAAsC;AAMtC,gCAA8E;AAC9E,gCAAkC;AAClC,qCAAoC;AACpC,uCAA4D;AAE5D,wDAAoD;AAEpD,mFAA8E;AASvE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,mBAAwC,EACxC,iBAAoC,EACpC,OAAgB,EAChB,aAA4B,EAC5B,gBAAkC,EAClC,cAA8B;QAL9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,YAAO,GAAP,OAAO,CAAS;QAChB,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAOJ,KAAK,CAAC,MAAM,CAAC,OAA+B;QAC3C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACzD,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,YAAY,CAAC;QAChE,MAAM,gBAAgB,GAAqB,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;QAC5C,MAAM,eAAe,GAAG,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC;QACrE,MAAM,IAAI,GAAG,IAAA,mBAAS,EAAC,OAAO,CAAC,CAAC;QAChC,MAAM,iBAAiB,GAAG,YAAY,CAAC,SAAS,IAAI,IAAI,CAAC;QAEzD,IAAI,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACtE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,oBAAe,EAAE,eAAe,CAAC,CAAC;gBAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAE9C,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBACvB,MAAM,EAAE,CAAC,MAAM,CAAC,kBAAa,EAAE;wBAC9B,WAAW;wBACX,YAAY,EAAE,gBAAgB;wBAC9B,IAAI;wBACJ,iBAAiB;qBACjB,CAAC,CAAC;oBACH,OAAO,WAAW,CAAC;gBACpB,CAAC;gBAED,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CACvB,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,EAC/B,EAAE,IAAI,EAAE,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAC3D,CAAC;gBACF,OAAO,WAAW,CAAC;YACpB,CAAC,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,eAAe,CAAC,gBAAgB,IAAI,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/E,MAAM,IAAI,mDAAuB,CAAC,eAAe,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YAC5E,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAQO,yBAAyB,CAAC,KAAc;QAC/C,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,IAAI,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACzE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAC9B,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE,CAAC;YACzF,OAAO,KAAK,CAAC;QACd,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QAC7B,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YAAE,OAAO,KAAK,CAAC;QAE9D,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAC/C,OAAO,IAAI,KAAK,OAAO,CAAC;QACzB,CAAC;QAGD,OAAO,CACN,IAAI,KAAK,0BAA0B;YACnC,CAAC,IAAI,KAAK,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CACpF,CAAC;IACH,CAAC;IAUD,KAAK,CAAC,uBAAuB,CAAC,MAAsB;QACnD,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,GAAG,gBAAI,CAAC,KAAK,CAAC,cAAc,CAAC;YAC7F,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC;YAClD,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;IACF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAyC;QACzD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEjC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QAE7D,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACvE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAoB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7F,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;SACzE,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAmC;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QAE/E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;CACD,CAAA;AArHY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,YAAO,GAAE;qCAG8B,wBAAmB;QACrB,4BAAiB;QAC3B,kBAAO;QACD,wBAAa;QACV,yBAAgB;QAClB,uBAAc;GAPpC,oBAAoB,CAqHhC"}
|
|
@@ -6,7 +6,6 @@ export declare class FavoritesController {
|
|
|
6
6
|
constructor(favoritesService: FavoritesService);
|
|
7
7
|
getFavorites(req: AuthenticatedRequest): Promise<(import("./database/entities/user-favorite.entity").UserFavorite & {
|
|
8
8
|
resourceName: string;
|
|
9
|
-
resourceProjectId?: string;
|
|
10
9
|
})[]>;
|
|
11
10
|
addFavorite(req: AuthenticatedRequest, _res: unknown, body: AddFavoriteDto): Promise<import("./database/entities/user-favorite.entity").UserFavorite>;
|
|
12
11
|
removeFavorite(req: AuthenticatedRequest, _res: unknown, resourceId: string, resourceType: string): Promise<boolean>;
|
|
@@ -26,7 +26,7 @@ let FavoritesController = class FavoritesController {
|
|
|
26
26
|
this.favoritesService = favoritesService;
|
|
27
27
|
}
|
|
28
28
|
async getFavorites(req) {
|
|
29
|
-
return await this.favoritesService.getEnrichedFavorites(req.user
|
|
29
|
+
return await this.favoritesService.getEnrichedFavorites(req.user);
|
|
30
30
|
}
|
|
31
31
|
async addFavorite(req, _res, body) {
|
|
32
32
|
return await this.favoritesService.addFavorite(req.user.id, body.resourceId, body.resourceType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"favorites.controller.js","sourceRoot":"","sources":["../../../src/modules/favorites/favorites.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gDAAiF;AACjF,8CAAoF;AAEpF,kFAA6E;AAE7E,2DAAuD;AACvD,6DAAwD;AAExD,SAAS,sBAAsB,CAAC,KAAa;IAC5C,OAAQ,mCAA6C,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC;AAGM,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAG7D,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"favorites.controller.js","sourceRoot":"","sources":["../../../src/modules/favorites/favorites.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gDAAiF;AACjF,8CAAoF;AAEpF,kFAA6E;AAE7E,2DAAuD;AACvD,6DAAwD;AAExD,SAAS,sBAAsB,CAAC,KAAa;IAC5C,OAAQ,mCAA6C,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC;AAGM,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAG7D,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnE,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAC,GAAyB,EAAE,IAAa,EAAQ,IAAoB;QACrF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACjG,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,IAAa,EACQ,UAAkB,EAChB,YAAoB;QAE3C,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,mCAAe,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AA1BY,kDAAmB;AAIzB;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;uDAGR;AAGK;IADL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACmD,WAAA,iBAAI,CAAA;;qDAAO,iCAAc;;sDAErF;AAGK;IADL,IAAA,mBAAM,EAAC,4BAA4B,CAAC;IAInC,WAAA,IAAA,kBAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,kBAAK,EAAC,cAAc,CAAC,CAAA;;;;yDAOtB;8BAzBW,mBAAmB;IAD/B,IAAA,2BAAc,EAAC,YAAY,CAAC;qCAEmB,oCAAgB;GADnD,mBAAmB,CA0B/B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FolderRepository, ProjectRepository, SharedWorkflowRepository, WorkflowRepository } from '@n8n/db';
|
|
1
|
+
import { FolderRepository, ProjectRepository, SharedWorkflowRepository, WorkflowRepository, type User } from '@n8n/db';
|
|
2
2
|
import { UserFavoriteRepository } from './database/repositories/user-favorite.repository';
|
|
3
3
|
import { DataTableRepository } from '../../modules/data-table/data-table.repository';
|
|
4
4
|
import type { FavoriteResourceType } from '@n8n/api-types';
|
|
@@ -11,10 +11,13 @@ export declare class FavoritesService {
|
|
|
11
11
|
private readonly folderRepository;
|
|
12
12
|
private readonly MAX_FAVORITES;
|
|
13
13
|
constructor(userFavoriteRepository: UserFavoriteRepository, workflowRepository: WorkflowRepository, projectRepository: ProjectRepository, sharedWorkflowRepository: SharedWorkflowRepository, dataTableRepository: DataTableRepository, folderRepository: FolderRepository);
|
|
14
|
-
getEnrichedFavorites(
|
|
14
|
+
getEnrichedFavorites(user: User): Promise<(import("./database/entities/user-favorite.entity").UserFavorite & {
|
|
15
15
|
resourceName: string;
|
|
16
|
-
resourceProjectId?: string;
|
|
17
16
|
})[]>;
|
|
17
|
+
private enrichWorkflowFavorites;
|
|
18
|
+
private enrichProjectFavorites;
|
|
19
|
+
private enrichDataTableFavorites;
|
|
20
|
+
private enrichFolderFavorites;
|
|
18
21
|
addFavorite(userId: string, resourceId: string, resourceType: FavoriteResourceType): Promise<import("./database/entities/user-favorite.entity").UserFavorite>;
|
|
19
22
|
private assertResourceExists;
|
|
20
23
|
removeFavorite(userId: string, resourceId: string, resourceType: FavoriteResourceType): Promise<void>;
|
|
@@ -12,11 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.FavoritesService = void 0;
|
|
13
13
|
const di_1 = require("@n8n/di");
|
|
14
14
|
const db_1 = require("@n8n/db");
|
|
15
|
+
const permissions_1 = require("@n8n/permissions");
|
|
15
16
|
const typeorm_1 = require("@n8n/typeorm");
|
|
16
17
|
const user_favorite_repository_1 = require("./database/repositories/user-favorite.repository");
|
|
17
18
|
const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
|
|
18
19
|
const not_found_error_1 = require("../../errors/response-errors/not-found.error");
|
|
19
20
|
const data_table_repository_1 = require("../../modules/data-table/data-table.repository");
|
|
21
|
+
const idsOfType = (favorites, type) => favorites.filter((f) => f.resourceType === type).map((f) => f.resourceId);
|
|
22
|
+
const enrichWithName = (fav, name) => name === undefined ? [] : [{ ...fav, resourceName: name }];
|
|
23
|
+
const enrichWithMeta = (fav, meta) => meta === undefined
|
|
24
|
+
? []
|
|
25
|
+
: [{ ...fav, resourceName: meta.name, resourceProjectId: meta.projectId }];
|
|
20
26
|
let FavoritesService = class FavoritesService {
|
|
21
27
|
constructor(userFavoriteRepository, workflowRepository, projectRepository, sharedWorkflowRepository, dataTableRepository, folderRepository) {
|
|
22
28
|
this.userFavoriteRepository = userFavoriteRepository;
|
|
@@ -27,91 +33,111 @@ let FavoritesService = class FavoritesService {
|
|
|
27
33
|
this.folderRepository = folderRepository;
|
|
28
34
|
this.MAX_FAVORITES = 200;
|
|
29
35
|
}
|
|
30
|
-
async getEnrichedFavorites(
|
|
31
|
-
const favorites = await this.userFavoriteRepository.findByUser(
|
|
36
|
+
async getEnrichedFavorites(user) {
|
|
37
|
+
const favorites = await this.userFavoriteRepository.findByUser(user.id);
|
|
32
38
|
if (favorites.length === 0)
|
|
33
39
|
return [];
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
const
|
|
41
|
-
const accessibleProjects = await this.projectRepository.getAccessibleProjects(userId);
|
|
40
|
+
const ids = {
|
|
41
|
+
workflow: idsOfType(favorites, 'workflow'),
|
|
42
|
+
project: idsOfType(favorites, 'project'),
|
|
43
|
+
dataTable: idsOfType(favorites, 'dataTable'),
|
|
44
|
+
folder: idsOfType(favorites, 'folder'),
|
|
45
|
+
};
|
|
46
|
+
const accessibleProjects = await this.projectRepository.getAccessibleProjects(user.id);
|
|
42
47
|
const accessibleProjectIds = new Set(accessibleProjects.map((p) => p.id));
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
const [workflowNames, projectNames, dataTableMeta, folderMeta] = await Promise.all([
|
|
49
|
+
this.enrichWorkflowFavorites(user, ids.workflow, accessibleProjectIds),
|
|
50
|
+
this.enrichProjectFavorites(user, ids.project, accessibleProjects),
|
|
51
|
+
this.enrichDataTableFavorites(user, ids.dataTable, accessibleProjectIds),
|
|
52
|
+
this.enrichFolderFavorites(user, ids.folder, accessibleProjectIds),
|
|
53
|
+
]);
|
|
54
|
+
return favorites.flatMap((fav) => {
|
|
55
|
+
switch (fav.resourceType) {
|
|
56
|
+
case 'workflow':
|
|
57
|
+
return enrichWithName(fav, workflowNames.get(fav.resourceId));
|
|
58
|
+
case 'project':
|
|
59
|
+
return enrichWithName(fav, projectNames.get(fav.resourceId));
|
|
60
|
+
case 'dataTable':
|
|
61
|
+
return enrichWithMeta(fav, dataTableMeta.get(fav.resourceId));
|
|
62
|
+
case 'folder':
|
|
63
|
+
return enrichWithMeta(fav, folderMeta.get(fav.resourceId));
|
|
64
|
+
default:
|
|
65
|
+
return [];
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
async enrichWorkflowFavorites(user, workflowIds, accessibleProjectIds) {
|
|
70
|
+
const result = new Map();
|
|
71
|
+
if (workflowIds.length === 0)
|
|
72
|
+
return result;
|
|
73
|
+
const hasGlobalAccess = (0, permissions_1.hasGlobalScope)(user, 'workflow:read');
|
|
74
|
+
if (!hasGlobalAccess && accessibleProjectIds.size === 0)
|
|
75
|
+
return result;
|
|
76
|
+
const [workflows, sharedWorkflows] = await Promise.all([
|
|
77
|
+
this.workflowRepository.findByIds(workflowIds, { fields: ['id', 'name'] }),
|
|
78
|
+
hasGlobalAccess
|
|
79
|
+
? Promise.resolve([])
|
|
80
|
+
: this.sharedWorkflowRepository.find({
|
|
50
81
|
select: { workflowId: true },
|
|
51
82
|
where: { workflowId: (0, typeorm_1.In)(workflowIds), projectId: (0, typeorm_1.In)([...accessibleProjectIds]) },
|
|
52
|
-
})
|
|
53
|
-
: [],
|
|
54
|
-
dataTableIds.length > 0
|
|
55
|
-
? this.dataTableRepository.find({ where: { id: (0, typeorm_1.In)(dataTableIds) } })
|
|
56
|
-
: [],
|
|
57
|
-
folderIds.length > 0
|
|
58
|
-
? this.folderRepository.find({
|
|
59
|
-
where: { id: (0, typeorm_1.In)(folderIds) },
|
|
60
|
-
relations: { homeProject: true },
|
|
61
|
-
})
|
|
62
|
-
: [],
|
|
83
|
+
}),
|
|
63
84
|
]);
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
85
|
+
const accessibleIds = hasGlobalAccess
|
|
86
|
+
? new Set(workflows.map((wf) => wf.id))
|
|
87
|
+
: new Set(sharedWorkflows.map((sw) => sw.workflowId));
|
|
88
|
+
for (const wf of workflows) {
|
|
89
|
+
if (accessibleIds.has(wf.id))
|
|
90
|
+
result.set(wf.id, wf.name);
|
|
91
|
+
}
|
|
92
|
+
return result;
|
|
93
|
+
}
|
|
94
|
+
async enrichProjectFavorites(user, projectFavoriteIds, accessibleProjects) {
|
|
95
|
+
const result = new Map(accessibleProjects.map((p) => [p.id, p.name ?? '']));
|
|
96
|
+
if (projectFavoriteIds.length === 0)
|
|
97
|
+
return result;
|
|
98
|
+
if (!(0, permissions_1.hasGlobalScope)(user, 'project:read'))
|
|
99
|
+
return result;
|
|
100
|
+
const missingIds = projectFavoriteIds.filter((id) => !result.has(id));
|
|
101
|
+
if (missingIds.length === 0)
|
|
102
|
+
return result;
|
|
103
|
+
const additional = await this.projectRepository.find({
|
|
104
|
+
where: { id: (0, typeorm_1.In)(missingIds) },
|
|
105
|
+
select: { id: true, name: true },
|
|
106
|
+
});
|
|
107
|
+
for (const p of additional) {
|
|
108
|
+
result.set(p.id, p.name ?? '');
|
|
74
109
|
}
|
|
75
|
-
|
|
110
|
+
return result;
|
|
111
|
+
}
|
|
112
|
+
async enrichDataTableFavorites(user, dataTableIds, accessibleProjectIds) {
|
|
113
|
+
const result = new Map();
|
|
114
|
+
if (dataTableIds.length === 0)
|
|
115
|
+
return result;
|
|
116
|
+
const hasGlobalAccess = (0, permissions_1.hasGlobalScope)(user, 'dataTable:read');
|
|
117
|
+
const dataTables = await this.dataTableRepository.find({ where: { id: (0, typeorm_1.In)(dataTableIds) } });
|
|
76
118
|
for (const dt of dataTables) {
|
|
77
|
-
if (accessibleProjectIds.has(dt.projectId)) {
|
|
78
|
-
|
|
119
|
+
if (hasGlobalAccess || accessibleProjectIds.has(dt.projectId)) {
|
|
120
|
+
result.set(dt.id, { name: dt.name, projectId: dt.projectId });
|
|
79
121
|
}
|
|
80
122
|
}
|
|
81
|
-
|
|
123
|
+
return result;
|
|
124
|
+
}
|
|
125
|
+
async enrichFolderFavorites(user, folderIds, accessibleProjectIds) {
|
|
126
|
+
const result = new Map();
|
|
127
|
+
if (folderIds.length === 0)
|
|
128
|
+
return result;
|
|
129
|
+
const hasGlobalAccess = (0, permissions_1.hasGlobalScope)(user, 'folder:read');
|
|
130
|
+
const folders = await this.folderRepository.find({
|
|
131
|
+
where: { id: (0, typeorm_1.In)(folderIds) },
|
|
132
|
+
relations: { homeProject: true },
|
|
133
|
+
});
|
|
82
134
|
for (const folder of folders) {
|
|
83
135
|
const projectId = folder.homeProject?.id;
|
|
84
|
-
if (projectId && accessibleProjectIds.has(projectId)) {
|
|
85
|
-
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
const enriched = [];
|
|
89
|
-
for (const fav of favorites) {
|
|
90
|
-
if (fav.resourceType === 'workflow') {
|
|
91
|
-
const name = workflowNameMap.get(fav.resourceId);
|
|
92
|
-
if (name !== undefined)
|
|
93
|
-
enriched.push({ ...fav, resourceName: name });
|
|
94
|
-
}
|
|
95
|
-
else if (fav.resourceType === 'project') {
|
|
96
|
-
const name = projectNameMap.get(fav.resourceId);
|
|
97
|
-
if (name !== undefined) {
|
|
98
|
-
enriched.push({ ...fav, resourceName: name });
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
else if (fav.resourceType === 'dataTable') {
|
|
102
|
-
const meta = dataTableMetaMap.get(fav.resourceId);
|
|
103
|
-
if (meta !== undefined) {
|
|
104
|
-
enriched.push({ ...fav, resourceName: meta.name, resourceProjectId: meta.projectId });
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
else if (fav.resourceType === 'folder') {
|
|
108
|
-
const meta = folderMetaMap.get(fav.resourceId);
|
|
109
|
-
if (meta !== undefined) {
|
|
110
|
-
enriched.push({ ...fav, resourceName: meta.name, resourceProjectId: meta.projectId });
|
|
111
|
-
}
|
|
136
|
+
if (projectId && (hasGlobalAccess || accessibleProjectIds.has(projectId))) {
|
|
137
|
+
result.set(folder.id, { name: folder.name, projectId });
|
|
112
138
|
}
|
|
113
139
|
}
|
|
114
|
-
return
|
|
140
|
+
return result;
|
|
115
141
|
}
|
|
116
142
|
async addFavorite(userId, resourceId, resourceType) {
|
|
117
143
|
const existing = await this.userFavoriteRepository.findOne({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"favorites.service.js","sourceRoot":"","sources":["../../../src/modules/favorites/favorites.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"favorites.service.js","sourceRoot":"","sources":["../../../src/modules/favorites/favorites.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ export declare class ProjectService {
|
|
|
35
35
|
}>>;
|
|
36
36
|
getAccessibleProjects(user: User): Promise<Project[]>;
|
|
37
37
|
getAccessibleProjectsAndCount(user: User, options: ProjectListOptions): Promise<[Project[], number]>;
|
|
38
|
+
getShareableProjectsAndCount(user: User, options: ProjectListOptions): Promise<[Project[], number]>;
|
|
38
39
|
getPersonalProjectOwners(projectIds: string[]): Promise<ProjectRelation[]>;
|
|
39
40
|
private createTeamProjectWithEntityManager;
|
|
40
41
|
createTeamProject(adminUser: User, data: CreateProjectDto): Promise<Project>;
|
|
@@ -207,6 +207,12 @@ let ProjectService = class ProjectService {
|
|
|
207
207
|
}
|
|
208
208
|
return await this.projectRepository.getAccessibleProjectsAndCount(user.id, options);
|
|
209
209
|
}
|
|
210
|
+
async getShareableProjectsAndCount(user, options) {
|
|
211
|
+
if ((0, permissions_1.hasGlobalScope)(user, 'project:read')) {
|
|
212
|
+
return await this.projectRepository.findAllProjectsAndCount(options);
|
|
213
|
+
}
|
|
214
|
+
return await this.projectRepository.getShareableProjectsAndCount(user.id, options);
|
|
215
|
+
}
|
|
210
216
|
async getPersonalProjectOwners(projectIds) {
|
|
211
217
|
return await this.projectRelationRepository.getPersonalProjectOwners(projectIds);
|
|
212
218
|
}
|