n8n 1.83.2 → 1.84.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.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.js +3 -1
- package/dist/commands/base-command.js.map +1 -1
- package/dist/controllers/folder.controller.d.ts +13 -1
- package/dist/controllers/folder.controller.js +45 -1
- package/dist/controllers/folder.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +3 -1
- package/dist/controllers/users.controller.js +6 -2
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/databases/entities/folder.d.ts +3 -1
- package/dist/databases/entities/folder.js +4 -0
- package/dist/databases/entities/folder.js.map +1 -1
- package/dist/databases/repositories/folder.repository.d.ts +7 -5
- package/dist/databases/repositories/folder.repository.js +40 -1
- package/dist/databases/repositories/folder.repository.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +2 -2
- package/dist/executions/execution-data.service.d.ts +4 -0
- package/dist/executions/execution-data.service.js +67 -0
- package/dist/executions/execution-data.service.js.map +1 -0
- package/dist/{user-management/permission-checker.d.ts → executions/pre-execution-checks/credentials-permission-checker.d.ts} +4 -4
- package/dist/{user-management/permission-checker.js → executions/pre-execution-checks/credentials-permission-checker.js} +29 -16
- package/dist/executions/pre-execution-checks/credentials-permission-checker.js.map +1 -0
- package/dist/executions/pre-execution-checks/index.d.ts +2 -0
- package/dist/executions/pre-execution-checks/index.js +8 -0
- package/dist/executions/pre-execution-checks/index.js.map +1 -0
- package/dist/{subworkflows/subworkflow-policy-checker.service.d.ts → executions/pre-execution-checks/subworkflow-policy-checker.d.ts} +3 -3
- package/dist/{subworkflows/subworkflow-policy-checker.service.js → executions/pre-execution-checks/subworkflow-policy-checker.js} +5 -5
- package/dist/executions/pre-execution-checks/subworkflow-policy-checker.js.map +1 -0
- package/dist/license.js +6 -1
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +2 -2
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/permissions.ee/project-roles.js +4 -0
- package/dist/permissions.ee/project-roles.js.map +1 -1
- package/dist/scaling/scaling.service.d.ts +1 -0
- package/dist/scaling/scaling.service.js +7 -4
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/services/folder.service.d.ts +10 -1
- package/dist/services/folder.service.js +62 -1
- package/dist/services/folder.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +1 -0
- package/dist/services/project.service.ee.js +7 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +8 -19
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-helpers.d.ts +1 -2
- package/dist/workflow-helpers.js +0 -43
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.d.ts +5 -3
- package/dist/workflow-runner.js +11 -9
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +4 -2
- package/dist/workflows/workflow-execution.service.js +7 -5
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +1 -0
- package/package.json +12 -12
- package/templates/form-trigger.handlebars +4 -1
- package/dist/subworkflows/subworkflow-policy-checker.service.js.map +0 -1
- package/dist/user-management/permission-checker.js.map +0 -1
|
@@ -78,7 +78,7 @@ class BaseCommand extends core_1.Command {
|
|
|
78
78
|
serverType: this.instanceSettings.instanceType,
|
|
79
79
|
dsn: backendDsn,
|
|
80
80
|
environment,
|
|
81
|
-
release: constants_1.N8N_VERSION
|
|
81
|
+
release: `n8n@${constants_1.N8N_VERSION}`,
|
|
82
82
|
serverName: deploymentName,
|
|
83
83
|
releaseDate: constants_1.N8N_RELEASE_DATE,
|
|
84
84
|
});
|
|
@@ -199,6 +199,8 @@ class BaseCommand extends core_1.Command {
|
|
|
199
199
|
await di_1.Container.get(test_runner_service_ee_1.TestRunnerService).cleanupIncompleteRuns();
|
|
200
200
|
}
|
|
201
201
|
async finally(error) {
|
|
202
|
+
if (error?.message)
|
|
203
|
+
this.logger.error(error.message);
|
|
202
204
|
if (constants_1.inTest || this.id === 'start')
|
|
203
205
|
return;
|
|
204
206
|
if (Db.connectionState.connected) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAC1B,wCAA2C;AAC3C,gCAAoC;AACpC,sCAA8C;AAC9C,uCAOkB;AAClB,+CAA6D;AAG7D,sDAA8B;AAC9B,2CAMqB;AACrB,8DAAgD;AAChD,yCAA2B;AAC3B,mDAA8D;AAC9D,2EAAuE;AACvE,+FAAuF;AACvF,sFAAiF;AACjF,iFAA4E;AAC5E,iEAAiE;AACjE,qDAAiD;AACjD,mGAA2F;AAC3F,uCAAoC;AACpC,6EAAuE;AACvE,6CAAyC;AACzC,uCAA0C;AAC1C,kEAA8D;AAC9D,6GAAqG;AAErG,MAAsB,WAAY,SAAQ,cAAO;IAAjD;;QACW,WAAM,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC;QAQ/B,qBAAgB,GAAqB,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;QAIrE,oBAAe,GAAoB,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC;QAIzD,iBAAY,GAAG,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;QAKpD,+BAA0B,GACnC,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC;QAGnD,2BAAsB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CreateFolderDto, DeleteFolderDto, UpdateFolderDto } from '@n8n/api-types';
|
|
1
|
+
import { CreateFolderDto, DeleteFolderDto, ListFolderQueryDto, UpdateFolderDto } from '@n8n/api-types';
|
|
2
2
|
import { Response } from 'express';
|
|
3
3
|
import { AuthenticatedRequest } from '../requests';
|
|
4
4
|
import { FolderService } from '../services/folder.service';
|
|
@@ -10,12 +10,14 @@ export declare class ProjectController {
|
|
|
10
10
|
}>, _res: Response, payload: CreateFolderDto): Promise<{
|
|
11
11
|
name: string;
|
|
12
12
|
parentFolder: import("../databases/entities/folder").Folder | null;
|
|
13
|
+
subFolders: import("../databases/entities/folder").Folder[];
|
|
13
14
|
workflows: import("../databases/entities/workflow-entity").WorkflowEntity[];
|
|
14
15
|
tags: import("../databases/entities/tag-entity").TagEntity[];
|
|
15
16
|
id: string;
|
|
16
17
|
createdAt: Date;
|
|
17
18
|
updatedAt: Date;
|
|
18
19
|
workflowCount: boolean;
|
|
20
|
+
subFolderCount: number;
|
|
19
21
|
}>;
|
|
20
22
|
getFolderTree(req: AuthenticatedRequest<{
|
|
21
23
|
projectId: string;
|
|
@@ -29,4 +31,14 @@ export declare class ProjectController {
|
|
|
29
31
|
projectId: string;
|
|
30
32
|
folderId: string;
|
|
31
33
|
}>, _res: Response, payload: DeleteFolderDto): Promise<void>;
|
|
34
|
+
listFolders(req: AuthenticatedRequest<{
|
|
35
|
+
projectId: string;
|
|
36
|
+
}>, res: Response, payload: ListFolderQueryDto): Promise<void>;
|
|
37
|
+
getFolderContent(req: AuthenticatedRequest<{
|
|
38
|
+
projectId: string;
|
|
39
|
+
folderId: string;
|
|
40
|
+
}>): Promise<{
|
|
41
|
+
totalSubFolders: number;
|
|
42
|
+
totalWorkflows: number;
|
|
43
|
+
}>;
|
|
32
44
|
}
|
|
@@ -14,8 +14,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ProjectController = void 0;
|
|
16
16
|
const api_types_1 = require("@n8n/api-types");
|
|
17
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
18
|
const decorators_1 = require("../decorators");
|
|
18
19
|
const folder_not_found_error_1 = require("../errors/folder-not-found.error");
|
|
20
|
+
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
19
21
|
const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
|
|
20
22
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
21
23
|
const folder_service_1 = require("../services/folder.service");
|
|
@@ -57,6 +59,9 @@ let ProjectController = class ProjectController {
|
|
|
57
59
|
if (e instanceof folder_not_found_error_1.FolderNotFoundError) {
|
|
58
60
|
throw new not_found_error_1.NotFoundError(e.message);
|
|
59
61
|
}
|
|
62
|
+
else if (e instanceof n8n_workflow_1.UserError) {
|
|
63
|
+
throw new bad_request_error_1.BadRequestError(e.message);
|
|
64
|
+
}
|
|
60
65
|
throw new internal_server_error_1.InternalServerError(undefined, e);
|
|
61
66
|
}
|
|
62
67
|
}
|
|
@@ -65,6 +70,30 @@ let ProjectController = class ProjectController {
|
|
|
65
70
|
try {
|
|
66
71
|
await this.folderService.deleteFolder(folderId, projectId, payload);
|
|
67
72
|
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
if (e instanceof folder_not_found_error_1.FolderNotFoundError) {
|
|
75
|
+
throw new not_found_error_1.NotFoundError(e.message);
|
|
76
|
+
}
|
|
77
|
+
else if (e instanceof n8n_workflow_1.UserError) {
|
|
78
|
+
throw new bad_request_error_1.BadRequestError(e.message);
|
|
79
|
+
}
|
|
80
|
+
throw new internal_server_error_1.InternalServerError(undefined, e);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
async listFolders(req, res, payload) {
|
|
84
|
+
const { projectId } = req.params;
|
|
85
|
+
const [data, count] = await this.folderService.getManyAndCount(projectId, payload);
|
|
86
|
+
res.json({ count, data });
|
|
87
|
+
}
|
|
88
|
+
async getFolderContent(req) {
|
|
89
|
+
const { projectId, folderId } = req.params;
|
|
90
|
+
try {
|
|
91
|
+
const { totalSubFolders, totalWorkflows } = await this.folderService.getFolderAndWorkflowCount(folderId, projectId);
|
|
92
|
+
return {
|
|
93
|
+
totalSubFolders,
|
|
94
|
+
totalWorkflows,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
68
97
|
catch (e) {
|
|
69
98
|
if (e instanceof folder_not_found_error_1.FolderNotFoundError) {
|
|
70
99
|
throw new not_found_error_1.NotFoundError(e.message);
|
|
@@ -100,11 +129,26 @@ __decorate([
|
|
|
100
129
|
__decorate([
|
|
101
130
|
(0, decorators_1.Delete)('/:folderId'),
|
|
102
131
|
(0, decorators_1.ProjectScope)('folder:delete'),
|
|
103
|
-
__param(2, decorators_1.
|
|
132
|
+
__param(2, decorators_1.Query),
|
|
104
133
|
__metadata("design:type", Function),
|
|
105
134
|
__metadata("design:paramtypes", [Object, Object, api_types_1.DeleteFolderDto]),
|
|
106
135
|
__metadata("design:returntype", Promise)
|
|
107
136
|
], ProjectController.prototype, "deleteFolder", null);
|
|
137
|
+
__decorate([
|
|
138
|
+
(0, decorators_1.Get)('/'),
|
|
139
|
+
(0, decorators_1.ProjectScope)('folder:list'),
|
|
140
|
+
__param(2, decorators_1.Query),
|
|
141
|
+
__metadata("design:type", Function),
|
|
142
|
+
__metadata("design:paramtypes", [Object, Object, api_types_1.ListFolderQueryDto]),
|
|
143
|
+
__metadata("design:returntype", Promise)
|
|
144
|
+
], ProjectController.prototype, "listFolders", null);
|
|
145
|
+
__decorate([
|
|
146
|
+
(0, decorators_1.Get)('/:folderId/content'),
|
|
147
|
+
(0, decorators_1.ProjectScope)('folder:read'),
|
|
148
|
+
__metadata("design:type", Function),
|
|
149
|
+
__metadata("design:paramtypes", [Object]),
|
|
150
|
+
__metadata("design:returntype", Promise)
|
|
151
|
+
], ProjectController.prototype, "getFolderContent", null);
|
|
108
152
|
exports.ProjectController = ProjectController = __decorate([
|
|
109
153
|
(0, decorators_1.RestController)('/projects/:projectId/folders'),
|
|
110
154
|
__metadata("design:paramtypes", [folder_service_1.FolderService])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.controller.js","sourceRoot":"","sources":["../../src/controllers/folder.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"folder.controller.js","sourceRoot":"","sources":["../../src/controllers/folder.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { EventService } from '../events/event.service';
|
|
|
11
11
|
import { ExternalHooks } from '../external-hooks';
|
|
12
12
|
import type { PublicUser } from '../interfaces';
|
|
13
13
|
import { AuthenticatedRequest, ListQuery, UserRequest } from '../requests';
|
|
14
|
+
import { FolderService } from '../services/folder.service';
|
|
14
15
|
import { ProjectService } from '../services/project.service.ee';
|
|
15
16
|
import { UserService } from '../services/user.service';
|
|
16
17
|
import { WorkflowService } from '../workflows/workflow.service';
|
|
@@ -27,7 +28,8 @@ export declare class UsersController {
|
|
|
27
28
|
private readonly credentialsService;
|
|
28
29
|
private readonly projectService;
|
|
29
30
|
private readonly eventService;
|
|
30
|
-
|
|
31
|
+
private readonly folderService;
|
|
32
|
+
constructor(logger: Logger, externalHooks: ExternalHooks, sharedCredentialsRepository: SharedCredentialsRepository, sharedWorkflowRepository: SharedWorkflowRepository, userRepository: UserRepository, authService: AuthService, userService: UserService, projectRepository: ProjectRepository, workflowService: WorkflowService, credentialsService: CredentialsService, projectService: ProjectService, eventService: EventService, folderService: FolderService);
|
|
31
33
|
static ERROR_MESSAGES: {
|
|
32
34
|
readonly CHANGE_ROLE: {
|
|
33
35
|
readonly NO_USER: "Target user not found";
|
|
@@ -32,11 +32,12 @@ const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
|
32
32
|
const event_service_1 = require("../events/event.service");
|
|
33
33
|
const external_hooks_1 = require("../external-hooks");
|
|
34
34
|
const middlewares_1 = require("../middlewares");
|
|
35
|
+
const folder_service_1 = require("../services/folder.service");
|
|
35
36
|
const project_service_ee_1 = require("../services/project.service.ee");
|
|
36
37
|
const user_service_1 = require("../services/user.service");
|
|
37
38
|
const workflow_service_1 = require("../workflows/workflow.service");
|
|
38
39
|
let UsersController = UsersController_1 = class UsersController {
|
|
39
|
-
constructor(logger, externalHooks, sharedCredentialsRepository, sharedWorkflowRepository, userRepository, authService, userService, projectRepository, workflowService, credentialsService, projectService, eventService) {
|
|
40
|
+
constructor(logger, externalHooks, sharedCredentialsRepository, sharedWorkflowRepository, userRepository, authService, userService, projectRepository, workflowService, credentialsService, projectService, eventService, folderService) {
|
|
40
41
|
this.logger = logger;
|
|
41
42
|
this.externalHooks = externalHooks;
|
|
42
43
|
this.sharedCredentialsRepository = sharedCredentialsRepository;
|
|
@@ -49,6 +50,7 @@ let UsersController = UsersController_1 = class UsersController {
|
|
|
49
50
|
this.credentialsService = credentialsService;
|
|
50
51
|
this.projectService = projectService;
|
|
51
52
|
this.eventService = eventService;
|
|
53
|
+
this.folderService = folderService;
|
|
52
54
|
}
|
|
53
55
|
removeSupplementaryFields(publicUsers, listQueryOptions) {
|
|
54
56
|
const { take, select, filter } = listQueryOptions;
|
|
@@ -133,6 +135,7 @@ let UsersController = UsersController_1 = class UsersController {
|
|
|
133
135
|
await this.userService.getManager().transaction(async (trx) => {
|
|
134
136
|
await this.workflowService.transferAll(personalProjectToDelete.id, transfereePersonalProject.id, trx);
|
|
135
137
|
await this.credentialsService.transferAll(personalProjectToDelete.id, transfereePersonalProject.id, trx);
|
|
138
|
+
await this.folderService.transferAllFoldersToProject(personalProjectToDelete.id, transfereePersonalProject.id, trx);
|
|
136
139
|
});
|
|
137
140
|
await this.projectService.clearCredentialCanUseExternalSecretsCache(transfereePersonalProject.id);
|
|
138
141
|
}
|
|
@@ -254,6 +257,7 @@ exports.UsersController = UsersController = UsersController_1 = __decorate([
|
|
|
254
257
|
workflow_service_1.WorkflowService,
|
|
255
258
|
credentials_service_1.CredentialsService,
|
|
256
259
|
project_service_ee_1.ProjectService,
|
|
257
|
-
event_service_1.EventService
|
|
260
|
+
event_service_1.EventService,
|
|
261
|
+
folder_service_1.FolderService])
|
|
258
262
|
], UsersController);
|
|
259
263
|
//# sourceMappingURL=users.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/controllers/users.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAAgF;AAEhF,uCAAkC;AAElC,sDAAkD;AAClD,2EAAuE;AACvE,sEAAkE;AAClE,0DAAuD;AACvD,oDAAiD;AACjD,oFAAgF;AAChF,0GAAqG;AACrG,oGAA+F;AAC/F,8EAA0E;AAC1E,6CASsB;AACtB,kFAA6E;AAC7E,8EAA0E;AAC1E,8EAAyE;AACzE,0DAAsD;AACtD,qDAAiD;AAEjD,+CAAoD;AAEpD,sEAA+D;AAC/D,0DAAsD;AACtD,mEAA+D;AAGxD,IAAM,eAAe,uBAArB,MAAM,eAAe;IAC3B,YACkB,MAAc,EACd,aAA4B,EAC5B,2BAAwD,EACxD,wBAAkD,EAClD,cAA8B,EAC9B,WAAwB,EACxB,WAAwB,EACxB,iBAAoC,EACpC,eAAgC,EAChC,kBAAsC,EACtC,cAA8B,EAC9B,YAA0B;
|
|
1
|
+
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/controllers/users.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,14 @@ import { WithTimestampsAndStringId } from './abstract-entity';
|
|
|
2
2
|
import { Project } from './project';
|
|
3
3
|
import { TagEntity } from './tag-entity';
|
|
4
4
|
import { type WorkflowEntity } from './workflow-entity';
|
|
5
|
-
export type
|
|
5
|
+
export type FolderWithWorkflowAndSubFolderCount = Folder & {
|
|
6
6
|
workflowCount: boolean;
|
|
7
|
+
subFolderCount: number;
|
|
7
8
|
};
|
|
8
9
|
export declare class Folder extends WithTimestampsAndStringId {
|
|
9
10
|
name: string;
|
|
10
11
|
parentFolder: Folder | null;
|
|
12
|
+
subFolders: Folder[];
|
|
11
13
|
homeProject: Project;
|
|
12
14
|
workflows: WorkflowEntity[];
|
|
13
15
|
tags: TagEntity[];
|
|
@@ -26,6 +26,10 @@ __decorate([
|
|
|
26
26
|
(0, typeorm_1.JoinColumn)({ name: 'parentFolderId' }),
|
|
27
27
|
__metadata("design:type", Object)
|
|
28
28
|
], Folder.prototype, "parentFolder", void 0);
|
|
29
|
+
__decorate([
|
|
30
|
+
(0, typeorm_1.OneToMany)(() => Folder, (folder) => folder.parentFolder),
|
|
31
|
+
__metadata("design:type", Array)
|
|
32
|
+
], Folder.prototype, "subFolders", void 0);
|
|
29
33
|
__decorate([
|
|
30
34
|
(0, typeorm_1.ManyToOne)(() => project_1.Project),
|
|
31
35
|
(0, typeorm_1.JoinColumn)({ name: 'projectId' }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../../src/databases/entities/folder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAQsB;AAEtB,uDAA8D;AAC9D,uCAAoC;AACpC,6CAAyC;
|
|
1
|
+
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../../src/databases/entities/folder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAQsB;AAEtB,uDAA8D;AAC9D,uCAAoC;AACpC,6CAAyC;AASlC,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,2CAAyB;CAkCpD,CAAA;AAlCY,wBAAM;AAElB;IADC,IAAA,gBAAM,GAAE;;oCACI;AAIb;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAChE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;;4CACX;AAM5B;IAJC,IAAA,mBAAS,EACT,GAAG,EAAE,CAAC,MAAM,EACZ,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAC/B;;0CACoB;AAIrB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,iBAAO,CAAC;IACxB,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;8BACrB,iBAAO;2CAAC;AAGrB;IADC,IAAA,mBAAS,EAAC,gBAAgB,EAAE,cAAc,CAAC;;yCAChB;AAc5B;IAZC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,sBAAS,CAAC;IAC3B,IAAA,mBAAS,EAAC;QACV,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE;YACX,IAAI,EAAE,UAAU;YAChB,oBAAoB,EAAE,IAAI;SAC1B;QACD,iBAAiB,EAAE;YAClB,IAAI,EAAE,OAAO;YACb,oBAAoB,EAAE,IAAI;SAC1B;KACD,CAAC;;oCACgB;iBAjCN,MAAM;IADlB,IAAA,gBAAM,GAAE;GACI,MAAM,CAkClB"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { EntityManager, SelectQueryBuilder } from '@n8n/typeorm';
|
|
2
2
|
import { DataSource, Repository } from '@n8n/typeorm';
|
|
3
3
|
import type { ListQuery } from '../../requests';
|
|
4
|
-
import type {
|
|
4
|
+
import type { FolderWithWorkflowAndSubFolderCount } from '../entities/folder';
|
|
5
5
|
import { Folder } from '../entities/folder';
|
|
6
|
-
export declare class FolderRepository extends Repository<
|
|
6
|
+
export declare class FolderRepository extends Repository<FolderWithWorkflowAndSubFolderCount> {
|
|
7
7
|
constructor(dataSource: DataSource);
|
|
8
|
-
getManyAndCount(options?: ListQuery.Options): Promise<[
|
|
9
|
-
getMany(options?: ListQuery.Options): Promise<
|
|
10
|
-
getManyQuery(options?: ListQuery.Options): SelectQueryBuilder<
|
|
8
|
+
getManyAndCount(options?: ListQuery.Options): Promise<[FolderWithWorkflowAndSubFolderCount[], number]>;
|
|
9
|
+
getMany(options?: ListQuery.Options): Promise<FolderWithWorkflowAndSubFolderCount[]>;
|
|
10
|
+
getManyQuery(options?: ListQuery.Options): SelectQueryBuilder<FolderWithWorkflowAndSubFolderCount>;
|
|
11
11
|
private applySelections;
|
|
12
12
|
private applyDefaultSelect;
|
|
13
13
|
private applyCustomSelect;
|
|
@@ -26,4 +26,6 @@ export declare class FolderRepository extends Repository<FolderWithWorkflowCount
|
|
|
26
26
|
private applyPagination;
|
|
27
27
|
findOneOrFailFolderInProject(folderId: string, projectId: string, em?: EntityManager): Promise<Folder>;
|
|
28
28
|
moveAllToFolder(fromFolderId: string, toFolderId: string, tx: EntityManager): Promise<void>;
|
|
29
|
+
transferAllFoldersToProject(fromProjectId: string, toProjectId: string, tx?: EntityManager): Promise<import("@n8n/typeorm").UpdateResult>;
|
|
30
|
+
private applyExcludeFolderFilter;
|
|
29
31
|
}
|
|
@@ -50,6 +50,7 @@ let FolderRepository = class FolderRepository extends typeorm_1.Repository {
|
|
|
50
50
|
.leftJoinAndSelect('folder.parentFolder', 'parentFolder')
|
|
51
51
|
.leftJoinAndSelect('folder.tags', 'tags')
|
|
52
52
|
.loadRelationCountAndMap('folder.workflowCount', 'folder.workflows')
|
|
53
|
+
.loadRelationCountAndMap('folder.subFolderCount', 'folder.subFolders')
|
|
53
54
|
.select([
|
|
54
55
|
'folder',
|
|
55
56
|
...this.getProjectFields('homeProject'),
|
|
@@ -87,6 +88,11 @@ let FolderRepository = class FolderRepository extends typeorm_1.Repository {
|
|
|
87
88
|
if (select?.workflowCount) {
|
|
88
89
|
query.loadRelationCountAndMap('folder.workflowCount', 'folder.workflows');
|
|
89
90
|
}
|
|
91
|
+
if (select?.subFolderCount) {
|
|
92
|
+
if (!query.hasRelation(folder_1.Folder, 'folder.parentFolder')) {
|
|
93
|
+
query.loadRelationCountAndMap('folder.subFolderCount', 'folder.subFolders');
|
|
94
|
+
}
|
|
95
|
+
}
|
|
90
96
|
}
|
|
91
97
|
getProjectFields(alias) {
|
|
92
98
|
return [`${alias}.id`, `${alias}.name`, `${alias}.type`, `${alias}.icon`];
|
|
@@ -102,6 +108,10 @@ let FolderRepository = class FolderRepository extends typeorm_1.Repository {
|
|
|
102
108
|
return;
|
|
103
109
|
this.applyBasicFilters(query, filter);
|
|
104
110
|
this.applyTagsFilter(query, Array.isArray(filter?.tags) ? filter.tags : undefined);
|
|
111
|
+
if (filter?.excludeFolderIdAndDescendants &&
|
|
112
|
+
typeof filter.excludeFolderIdAndDescendants === 'string') {
|
|
113
|
+
this.applyExcludeFolderFilter(query, filter.excludeFolderIdAndDescendants);
|
|
114
|
+
}
|
|
105
115
|
}
|
|
106
116
|
applyBasicFilters(query, filter) {
|
|
107
117
|
if (filter?.folderIds && Array.isArray(filter.folderIds)) {
|
|
@@ -161,7 +171,9 @@ let FolderRepository = class FolderRepository extends typeorm_1.Repository {
|
|
|
161
171
|
}
|
|
162
172
|
applySortingByField(query, field, direction) {
|
|
163
173
|
if (field === 'name') {
|
|
164
|
-
query
|
|
174
|
+
query
|
|
175
|
+
.addSelect('LOWER(folder.name)', 'folder_name_lower')
|
|
176
|
+
.orderBy('folder_name_lower', direction);
|
|
165
177
|
}
|
|
166
178
|
else if (['createdAt', 'updatedAt'].includes(field)) {
|
|
167
179
|
query.orderBy(`folder.${field}`, direction);
|
|
@@ -192,6 +204,33 @@ let FolderRepository = class FolderRepository extends typeorm_1.Repository {
|
|
|
192
204
|
},
|
|
193
205
|
});
|
|
194
206
|
}
|
|
207
|
+
async transferAllFoldersToProject(fromProjectId, toProjectId, tx) {
|
|
208
|
+
const manager = tx ?? this.manager;
|
|
209
|
+
return await manager.update(folder_1.Folder, {
|
|
210
|
+
homeProject: { id: fromProjectId },
|
|
211
|
+
}, {
|
|
212
|
+
homeProject: { id: toProjectId },
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
applyExcludeFolderFilter(query, excludeFolderIdAndDescendants) {
|
|
216
|
+
query.andWhere('folder.id != :excludeFolderIdAndDescendants', {
|
|
217
|
+
excludeFolderIdAndDescendants,
|
|
218
|
+
});
|
|
219
|
+
const baseQuery = this.createQueryBuilder('f')
|
|
220
|
+
.select('f.id', 'id')
|
|
221
|
+
.addSelect('f.parentFolderId', 'parentFolderId')
|
|
222
|
+
.where('f.id = :excludeFolderIdAndDescendants', { excludeFolderIdAndDescendants });
|
|
223
|
+
const recursiveQuery = this.createQueryBuilder('child')
|
|
224
|
+
.select('child.id', 'id')
|
|
225
|
+
.addSelect('child.parentFolderId', 'parentFolderId')
|
|
226
|
+
.innerJoin('folder_tree', 'parent', 'child.parentFolderId = parent.id');
|
|
227
|
+
const subQuery = this.createQueryBuilder()
|
|
228
|
+
.select('tree.id')
|
|
229
|
+
.addCommonTableExpression(`${baseQuery.getQuery()} UNION ALL ${recursiveQuery.getQuery()}`, 'folder_tree', { recursive: true })
|
|
230
|
+
.from('folder_tree', 'tree')
|
|
231
|
+
.setParameters({ excludeFolderIdAndDescendants });
|
|
232
|
+
query.andWhere(`folder.id NOT IN (${subQuery.getQuery()})`);
|
|
233
|
+
}
|
|
195
234
|
};
|
|
196
235
|
exports.FolderRepository = FolderRepository;
|
|
197
236
|
exports.FolderRepository = FolderRepository = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/folder.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,0CAAsD;AACtD,+CAA4C;AAK5C,+CAA4C;AAC5C,uEAAkE;AAClE,uDAAmD;AAG5C,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,
|
|
1
|
+
{"version":3,"file":"folder.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/folder.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,10 @@ import { DataSource, Repository } from '@n8n/typeorm';
|
|
|
3
3
|
import type { SelectQueryBuilder, UpdateResult, FindOptionsWhere, FindOptionsRelations, EntityManager } from '@n8n/typeorm';
|
|
4
4
|
import type { ListQuery } from '../../requests';
|
|
5
5
|
import { FolderRepository } from './folder.repository';
|
|
6
|
-
import type {
|
|
6
|
+
import type { FolderWithWorkflowAndSubFolderCount } from '../entities/folder';
|
|
7
7
|
import { WorkflowEntity } from '../entities/workflow-entity';
|
|
8
8
|
type ResourceType = 'folder' | 'workflow';
|
|
9
|
-
export type WorkflowFolderUnionFull = (ListQuery.Workflow.Plain | ListQuery.Workflow.WithSharing |
|
|
9
|
+
export type WorkflowFolderUnionFull = (ListQuery.Workflow.Plain | ListQuery.Workflow.WithSharing | FolderWithWorkflowAndSubFolderCount) & {
|
|
10
10
|
resource: ResourceType;
|
|
11
11
|
};
|
|
12
12
|
export declare class WorkflowRepository extends Repository<WorkflowEntity> {
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.ExecutionDataService = void 0;
|
|
10
|
+
const di_1 = require("@n8n/di");
|
|
11
|
+
let ExecutionDataService = class ExecutionDataService {
|
|
12
|
+
generateFailedExecutionFromError(mode, error, node, startTime = Date.now()) {
|
|
13
|
+
const executionError = {
|
|
14
|
+
...error,
|
|
15
|
+
message: error.message,
|
|
16
|
+
stack: error.stack,
|
|
17
|
+
};
|
|
18
|
+
const returnData = {
|
|
19
|
+
data: {
|
|
20
|
+
resultData: {
|
|
21
|
+
error: executionError,
|
|
22
|
+
runData: {},
|
|
23
|
+
},
|
|
24
|
+
},
|
|
25
|
+
finished: false,
|
|
26
|
+
mode,
|
|
27
|
+
startedAt: new Date(),
|
|
28
|
+
stoppedAt: new Date(),
|
|
29
|
+
status: 'error',
|
|
30
|
+
};
|
|
31
|
+
if (node) {
|
|
32
|
+
returnData.data.startData = {
|
|
33
|
+
destinationNode: node.name,
|
|
34
|
+
runNodeFilter: [node.name],
|
|
35
|
+
};
|
|
36
|
+
returnData.data.resultData.lastNodeExecuted = node.name;
|
|
37
|
+
returnData.data.resultData.runData[node.name] = [
|
|
38
|
+
{
|
|
39
|
+
startTime,
|
|
40
|
+
executionTime: 0,
|
|
41
|
+
executionStatus: 'error',
|
|
42
|
+
error: executionError,
|
|
43
|
+
source: [],
|
|
44
|
+
},
|
|
45
|
+
];
|
|
46
|
+
returnData.data.executionData = {
|
|
47
|
+
contextData: {},
|
|
48
|
+
metadata: {},
|
|
49
|
+
waitingExecution: {},
|
|
50
|
+
waitingExecutionSource: {},
|
|
51
|
+
nodeExecutionStack: [
|
|
52
|
+
{
|
|
53
|
+
node,
|
|
54
|
+
data: {},
|
|
55
|
+
source: null,
|
|
56
|
+
},
|
|
57
|
+
],
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
return returnData;
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
exports.ExecutionDataService = ExecutionDataService;
|
|
64
|
+
exports.ExecutionDataService = ExecutionDataService = __decorate([
|
|
65
|
+
(0, di_1.Service)()
|
|
66
|
+
], ExecutionDataService);
|
|
67
|
+
//# sourceMappingURL=execution-data.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execution-data.service.js","sourceRoot":"","sources":["../../src/executions/execution-data.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;AAI3B,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,gCAAgC,CAC/B,IAAyB,EACzB,KAAqB,EACrB,IAAuB,EACvB,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE;QAEtB,MAAM,cAAc,GAAG;YACtB,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,KAAK,EAAE,KAAK,CAAC,KAAK;SAClB,CAAC;QACF,MAAM,UAAU,GAAS;YACxB,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX,KAAK,EAAE,cAAc;oBACrB,OAAO,EAAE,EAAE;iBACX;aACD;YACD,QAAQ,EAAE,KAAK;YACf,IAAI;YACJ,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,MAAM,EAAE,OAAO;SACf,CAAC;QAEF,IAAI,IAAI,EAAE,CAAC;YACV,UAAU,CAAC,IAAI,CAAC,SAAS,GAAG;gBAC3B,eAAe,EAAE,IAAI,CAAC,IAAI;gBAC1B,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;aAC1B,CAAC;YACF,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC;YACxD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBAC/C;oBACC,SAAS;oBACT,aAAa,EAAE,CAAC;oBAChB,eAAe,EAAE,OAAO;oBACxB,KAAK,EAAE,cAAc;oBACrB,MAAM,EAAE,EAAE;iBACV;aACD,CAAC;YACF,UAAU,CAAC,IAAI,CAAC,aAAa,GAAG;gBAC/B,WAAW,EAAE,EAAE;gBACf,QAAQ,EAAE,EAAE;gBACZ,gBAAgB,EAAE,EAAE;gBACpB,sBAAsB,EAAE,EAAE;gBAC1B,kBAAkB,EAAE;oBACnB;wBACC,IAAI;wBACJ,IAAI,EAAE,EAAE;wBACR,MAAM,EAAE,IAAI;qBACZ;iBACD;aACD,CAAC;QACH,CAAC;QACD,OAAO,UAAU,CAAC;IACnB,CAAC;CACD,CAAA;AAzDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,YAAO,GAAE;GACG,oBAAoB,CAyDhC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { INode } from 'n8n-workflow';
|
|
2
|
-
import { SharedCredentialsRepository } from '
|
|
3
|
-
import { OwnershipService } from '
|
|
4
|
-
import { ProjectService } from '
|
|
5
|
-
export declare class
|
|
2
|
+
import { SharedCredentialsRepository } from '../../databases/repositories/shared-credentials.repository';
|
|
3
|
+
import { OwnershipService } from '../../services/ownership.service';
|
|
4
|
+
import { ProjectService } from '../../services/project.service.ee';
|
|
5
|
+
export declare class CredentialsPermissionChecker {
|
|
6
6
|
private readonly sharedCredentialsRepository;
|
|
7
7
|
private readonly ownershipService;
|
|
8
8
|
private readonly projectService;
|