n8n 2.2.3 → 2.3.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/import/workflow.js +21 -14
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/start.js +4 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +2 -1
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +2 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/controllers/e2e.controller.d.ts +1 -0
- package/dist/controllers/e2e.controller.js +10 -2
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +1 -1
- package/dist/credentials/credentials.service.js +2 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +1 -0
- package/dist/executions/execution.service.js +18 -1
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.types.d.ts +4 -0
- package/dist/executions/executions.controller.d.ts +3 -0
- package/dist/executions/executions.controller.js +13 -0
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.repository.js +16 -21
- package/dist/modules/chat-hub/chat-hub-agent.repository.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js +3 -3
- package/dist/modules/chat-hub/chat-hub-agent.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-credentials.service.d.ts +11 -15
- package/dist/modules/chat-hub/chat-hub-credentials.service.js +26 -27
- package/dist/modules/chat-hub/chat-hub-credentials.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.js +64 -36
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.types.d.ts +2 -0
- package/dist/modules/chat-hub/chat-hub.types.js.map +1 -1
- package/dist/modules/chat-hub/chat-message.repository.js +14 -18
- package/dist/modules/chat-hub/chat-message.repository.js.map +1 -1
- package/dist/modules/chat-hub/chat-session.repository.js +26 -33
- package/dist/modules/chat-hub/chat-session.repository.js.map +1 -1
- package/dist/modules/data-table/data-table-column.repository.js +7 -8
- package/dist/modules/data-table/data-table-column.repository.js.map +1 -1
- package/dist/modules/data-table/data-table-rows.repository.js +21 -25
- package/dist/modules/data-table/data-table-rows.repository.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js +9 -2
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js.map +1 -1
- package/dist/modules/insights/insights-compaction.service.js +2 -1
- package/dist/modules/insights/insights-compaction.service.js.map +1 -1
- package/dist/public-api/types.d.ts +10 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts +3 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js +36 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.middleware.d.ts +2 -0
- package/dist/public-api/v1/handlers/credentials/credentials.middleware.js +60 -10
- package/dist/public-api/v1/handlers/credentials/credentials.middleware.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.service.d.ts +11 -1
- package/dist/public-api/v1/handlers/credentials/credentials.service.js +62 -0
- package/dist/public-api/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +65 -0
- package/dist/scaling/pubsub/publisher.service.d.ts +5 -2
- package/dist/scaling/pubsub/publisher.service.js +10 -5
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/subscriber.service.d.ts +8 -4
- package/dist/scaling/pubsub/subscriber.service.js +14 -2
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/services/ai-workflow-builder.service.js +1 -0
- package/dist/services/ai-workflow-builder.service.js.map +1 -1
- package/dist/services/ai.service.d.ts +3 -1
- package/dist/services/ai.service.js +6 -2
- package/dist/services/ai.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +1 -0
- package/dist/services/frontend.service.js +2 -3
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/pruning/executions-pruning.service.js +3 -3
- package/dist/services/pruning/executions-pruning.service.js.map +1 -1
- package/dist/services/pruning/workflow-history-compaction.service.d.ts +21 -0
- package/dist/services/pruning/workflow-history-compaction.service.js +144 -0
- package/dist/services/pruning/workflow-history-compaction.service.js.map +1 -0
- package/dist/task-runners/task-runner-module.js +13 -15
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/workflows/workflow.service.ee.js +6 -5
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +1 -1
- package/dist/workflows/workflows.controller.js +1 -4
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +17 -17
|
@@ -21,16 +21,21 @@ const n8n_core_1 = require("n8n-core");
|
|
|
21
21
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
22
22
|
const redis_client_service_1 = require("../../services/redis-client.service");
|
|
23
23
|
const pubsub_eventbus_1 = require("./pubsub.eventbus");
|
|
24
|
+
const constants_1 = require("../constants");
|
|
24
25
|
let Subscriber = class Subscriber {
|
|
25
|
-
constructor(logger, instanceSettings, pubsubEventBus, redisClientService, executionsConfig) {
|
|
26
|
+
constructor(logger, instanceSettings, pubsubEventBus, redisClientService, executionsConfig, globalConfig) {
|
|
26
27
|
this.logger = logger;
|
|
27
28
|
this.instanceSettings = instanceSettings;
|
|
28
29
|
this.pubsubEventBus = pubsubEventBus;
|
|
29
30
|
this.redisClientService = redisClientService;
|
|
30
31
|
this.executionsConfig = executionsConfig;
|
|
32
|
+
this.globalConfig = globalConfig;
|
|
31
33
|
if (this.executionsConfig.mode !== 'queue')
|
|
32
34
|
return;
|
|
33
35
|
this.logger = this.logger.scoped(['scaling', 'pubsub']);
|
|
36
|
+
const prefix = this.globalConfig.redis.prefix;
|
|
37
|
+
this.commandChannel = `${prefix}:${constants_1.COMMAND_PUBSUB_CHANNEL}`;
|
|
38
|
+
this.workerResponseChannel = `${prefix}:${constants_1.WORKER_RESPONSE_PUBSUB_CHANNEL}`;
|
|
34
39
|
this.client = this.redisClientService.createClient({ type: 'subscriber(n8n)' });
|
|
35
40
|
const handlerFn = (msg) => {
|
|
36
41
|
const eventName = 'command' in msg ? msg.command : msg.response;
|
|
@@ -50,6 +55,12 @@ let Subscriber = class Subscriber {
|
|
|
50
55
|
getClient() {
|
|
51
56
|
return this.client;
|
|
52
57
|
}
|
|
58
|
+
getCommandChannel() {
|
|
59
|
+
return this.commandChannel;
|
|
60
|
+
}
|
|
61
|
+
getWorkerResponseChannel() {
|
|
62
|
+
return this.workerResponseChannel;
|
|
63
|
+
}
|
|
53
64
|
shutdown() {
|
|
54
65
|
this.client.disconnect();
|
|
55
66
|
}
|
|
@@ -99,6 +110,7 @@ exports.Subscriber = Subscriber = __decorate([
|
|
|
99
110
|
n8n_core_1.InstanceSettings,
|
|
100
111
|
pubsub_eventbus_1.PubSubEventBus,
|
|
101
112
|
redis_client_service_1.RedisClientService,
|
|
102
|
-
config_1.ExecutionsConfig
|
|
113
|
+
config_1.ExecutionsConfig,
|
|
114
|
+
config_1.GlobalConfig])
|
|
103
115
|
], Subscriber);
|
|
104
116
|
//# sourceMappingURL=subscriber.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriber.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/subscriber.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"subscriber.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/subscriber.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA6D;AAC7D,gCAAkC;AAElC,+DAAuC;AACvC,uCAA4C;AAC5C,+CAAyC;AAGzC,0EAAqE;AAErE,uDAAmD;AAEnD,4CAAsF;AAM/E,IAAM,UAAU,GAAhB,MAAM,UAAU;IAOtB,YACkB,MAAc,EACd,gBAAkC,EAClC,cAA8B,EAC9B,kBAAsC,EACtC,gBAAkC,EAClC,YAA0B;QAL1B,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAG3C,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QAEnD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAGxD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;QAC9C,IAAI,CAAC,cAAc,GAAG,GAAG,MAAM,IAAI,kCAAsB,EAAE,CAAC;QAC5D,IAAI,CAAC,qBAAqB,GAAG,GAAG,MAAM,IAAI,0CAA8B,EAAE,CAAC;QAE3E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAEhF,MAAM,SAAS,GAAG,CAAC,GAA2C,EAAE,EAAE;YACjE,MAAM,SAAS,GAAG,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;YAChE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAA,kBAAQ,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAEpD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAe,EAAE,GAAW,EAAE,EAAE;YAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,GAAG;gBAAE,OAAO;YACjB,IAAI,GAAG,CAAC,QAAQ;gBAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;;gBACrC,SAAS,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,wBAAwB;QACvB,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAe;QAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9C,IAAI,KAAK,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1E,OAAO;YACR,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,GAAW,EAAE,OAAe;QAChD,MAAM,GAAG,GAAG,IAAA,wBAAS,EAAgD,GAAG,EAAE;YACzE,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBACtD,GAAG,EAAE,GAAG;gBACR,OAAO;aACP,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAEzC,IACC,SAAS,IAAI,GAAG;YAChB,CAAC,GAAG,CAAC,QAAQ;YACb,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAC1E,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QAED,IAAI,OAAO,GAAG,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;QAE5D,MAAM,QAAQ,GAAgB,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAExD,IAAI,SAAS,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,KAAK,iCAAiC,EAAE,CAAC;YAC3E,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YACnC,OAAO,IAAI,KAAK,IAAI,GAAG,CAAC;YACxB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,IAAI,aAAa,IAAI,IAAI;gBAAE,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;QAE/D,OAAO,GAAG,CAAC;IACZ,CAAC;CACD,CAAA;AA5GY,gCAAU;qBAAV,UAAU;IADtB,IAAA,YAAO,GAAE;qCASiB,uBAAM;QACI,2BAAgB;QAClB,gCAAc;QACV,yCAAkB;QACpB,yBAAgB;QACpB,qBAAY;GAbhC,UAAU,CA4GtB"}
|
|
@@ -44,6 +44,7 @@ let WorkflowBuilderService = class WorkflowBuilderService {
|
|
|
44
44
|
consumerId,
|
|
45
45
|
baseUrl,
|
|
46
46
|
n8nVersion: constants_1.N8N_VERSION,
|
|
47
|
+
instanceId: this.instanceSettings.instanceId,
|
|
47
48
|
});
|
|
48
49
|
this.license.onCertRefresh((cert) => {
|
|
49
50
|
this.client?.updateLicenseCert(cert);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-workflow-builder.service.js","sourceRoot":"","sources":["../../src/services/ai-workflow-builder.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kEAAoE;AAEpE,wDAA6C;AAC7C,wCAA2C;AAC3C,gCAAkC;AAClC,+DAA6D;AAC7D,uCAA4C;AAI5C,2CAA0C;AAC1C,uCAAoC;AACpC,6EAAuE;AACvE,iCAA8B;AAC9B,wDAAoD;AACpD,2CAAwC;AAOjC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAKlC,YACkB,uBAAgD,EAChD,OAAgB,EAChB,MAAoB,EACpB,MAAc,EACd,UAAsB,EACtB,IAAU,EACV,SAAoB,EACpB,gBAAkC;QAPlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,YAAO,GAAP,OAAO,CAAS;QAChB,WAAM,GAAN,MAAM,CAAc;QACpB,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAY;QACtB,SAAI,GAAJ,IAAI,CAAM;QACV,cAAS,GAAT,SAAS,CAAW;QACpB,qBAAgB,GAAhB,gBAAgB,CAAkB;IACjD,CAAC;IAEI,KAAK,CAAC,UAAU;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;YAChD,IAAI,OAAO,EAAE,CAAC;gBACb,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBACrD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;gBAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,oCAAiB,CAAC;oBACnC,WAAW;oBACX,UAAU;oBACV,OAAO;oBACP,UAAU,EAAE,uBAAW;
|
|
1
|
+
{"version":3,"file":"ai-workflow-builder.service.js","sourceRoot":"","sources":["../../src/services/ai-workflow-builder.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import type { AiApplySuggestionRequestDto, AiAskRequestDto, AiChatRequestDto } from '@n8n/api-types';
|
|
2
2
|
import { GlobalConfig } from '@n8n/config';
|
|
3
|
+
import { InstanceSettings } from 'n8n-core';
|
|
3
4
|
import { type IUser } from 'n8n-workflow';
|
|
4
5
|
import { License } from '../license';
|
|
5
6
|
export declare class AiService {
|
|
6
7
|
private readonly licenseService;
|
|
7
8
|
private readonly globalConfig;
|
|
9
|
+
private readonly instanceSettings;
|
|
8
10
|
private client;
|
|
9
|
-
constructor(licenseService: License, globalConfig: GlobalConfig);
|
|
11
|
+
constructor(licenseService: License, globalConfig: GlobalConfig, instanceSettings: InstanceSettings);
|
|
10
12
|
init(): Promise<void>;
|
|
11
13
|
chat(payload: AiChatRequestDto, user: IUser): Promise<Response>;
|
|
12
14
|
applySuggestion(payload: AiApplySuggestionRequestDto, user: IUser): Promise<import("@n8n_io/ai-assistant-sdk").AiAssistantSDK.ApplySuggestionResponse>;
|
|
@@ -13,13 +13,15 @@ exports.AiService = void 0;
|
|
|
13
13
|
const config_1 = require("@n8n/config");
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
15
|
const ai_assistant_sdk_1 = require("@n8n_io/ai-assistant-sdk");
|
|
16
|
+
const n8n_core_1 = require("n8n-core");
|
|
16
17
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
18
|
const constants_1 = require("../constants");
|
|
18
19
|
const license_1 = require("../license");
|
|
19
20
|
let AiService = class AiService {
|
|
20
|
-
constructor(licenseService, globalConfig) {
|
|
21
|
+
constructor(licenseService, globalConfig, instanceSettings) {
|
|
21
22
|
this.licenseService = licenseService;
|
|
22
23
|
this.globalConfig = globalConfig;
|
|
24
|
+
this.instanceSettings = instanceSettings;
|
|
23
25
|
}
|
|
24
26
|
async init() {
|
|
25
27
|
const aiAssistantEnabled = this.licenseService.isAiAssistantEnabled();
|
|
@@ -36,6 +38,7 @@ let AiService = class AiService {
|
|
|
36
38
|
n8nVersion: constants_1.N8N_VERSION,
|
|
37
39
|
baseUrl,
|
|
38
40
|
logLevel,
|
|
41
|
+
instanceId: this.instanceSettings.instanceId,
|
|
39
42
|
});
|
|
40
43
|
this.licenseService.onCertRefresh((cert) => {
|
|
41
44
|
this.client?.updateLicenseCert(cert);
|
|
@@ -74,6 +77,7 @@ exports.AiService = AiService;
|
|
|
74
77
|
exports.AiService = AiService = __decorate([
|
|
75
78
|
(0, di_1.Service)(),
|
|
76
79
|
__metadata("design:paramtypes", [license_1.License,
|
|
77
|
-
config_1.GlobalConfig
|
|
80
|
+
config_1.GlobalConfig,
|
|
81
|
+
n8n_core_1.InstanceSettings])
|
|
78
82
|
], AiService);
|
|
79
83
|
//# sourceMappingURL=ai.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai.service.js","sourceRoot":"","sources":["../../src/services/ai.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,wCAA2C;AAC3C,gCAAkC;AAClC,+DAA6D;AAC7D,+CAAkD;AAElD,4CAA2C;AAC3C,wCAAqC;AAG9B,IAAM,SAAS,GAAf,MAAM,SAAS;IAGrB,YACkB,cAAuB,EACvB,YAA0B;
|
|
1
|
+
{"version":3,"file":"ai.service.js","sourceRoot":"","sources":["../../src/services/ai.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ import { PushConfig } from '../push/push.config';
|
|
|
13
13
|
import { UserManagementMailer } from '../user-management/email';
|
|
14
14
|
export type PublicFrontendSettings = {
|
|
15
15
|
settingsMode: FrontendSettings['settingsMode'];
|
|
16
|
+
defaultLocale: FrontendSettings['defaultLocale'];
|
|
16
17
|
previewMode: FrontendSettings['previewMode'];
|
|
17
18
|
authCookie: {
|
|
18
19
|
secure: FrontendSettings['authCookie']['secure'];
|
|
@@ -153,8 +153,6 @@ let FrontendService = class FrontendService {
|
|
|
153
153
|
nodeEnv: process.env.NODE_ENV,
|
|
154
154
|
versionCli: constants_2.N8N_VERSION,
|
|
155
155
|
concurrency: this.globalConfig.executions.concurrency.productionLimit,
|
|
156
|
-
isNativePythonRunnerEnabled: this.globalConfig.taskRunners.enabled &&
|
|
157
|
-
this.globalConfig.taskRunners.isNativePythonRunnerEnabled,
|
|
158
156
|
authCookie: {
|
|
159
157
|
secure: this.globalConfig.auth.cookie.secure,
|
|
160
158
|
},
|
|
@@ -437,9 +435,10 @@ let FrontendService = class FrontendService {
|
|
|
437
435
|
return this.settings;
|
|
438
436
|
}
|
|
439
437
|
async getPublicSettings() {
|
|
440
|
-
const { userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup }, sso: { saml: ssoSaml, ldap: ssoLdap, oidc: ssoOidc }, authCookie, previewMode, enterprise: { saml, ldap, oidc }, } = await this.getSettings();
|
|
438
|
+
const { defaultLocale, userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup }, sso: { saml: ssoSaml, ldap: ssoLdap, oidc: ssoOidc }, authCookie, previewMode, enterprise: { saml, ldap, oidc }, } = await this.getSettings();
|
|
441
439
|
const publicSettings = {
|
|
442
440
|
settingsMode: 'public',
|
|
441
|
+
defaultLocale,
|
|
443
442
|
userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup },
|
|
444
443
|
sso: {
|
|
445
444
|
saml: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,11 +54,11 @@ let ExecutionsPruningService = class ExecutionsPruningService {
|
|
|
54
54
|
this.logger.debug('Started pruning timers');
|
|
55
55
|
}
|
|
56
56
|
stopPruning() {
|
|
57
|
-
|
|
58
|
-
return;
|
|
57
|
+
const hadTimers = this.softDeletionInterval ?? this.hardDeletionTimeout;
|
|
59
58
|
clearInterval(this.softDeletionInterval);
|
|
60
59
|
clearTimeout(this.hardDeletionTimeout);
|
|
61
|
-
|
|
60
|
+
if (hadTimers)
|
|
61
|
+
this.logger.debug('Stopped pruning timers');
|
|
62
62
|
}
|
|
63
63
|
scheduleRollingSoftDeletions(rateMs = this.rates.softDeletion) {
|
|
64
64
|
this.softDeletionInterval = setInterval(async () => await this.softDelete(), this.rates.softDeletion);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executions-pruning.service.js","sourceRoot":"","sources":["../../../src/services/pruning/executions-pruning.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA+C;AAC/C,8CAAsC;AACtC,gCAA4D;AAC5D,gDAAiF;AACjF,gCAAkC;AAClC,uCAA+D;AAC/D,+CAA2C;AAC3C,6CAAqC;AAgB9B,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAiBpC,YACkB,MAAc,EACd,gBAAkC,EAClC,YAA0B,EAC1B,mBAAwC,EACxC,iBAAoC,EACpC,gBAAkC;QALlC,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAhBnC,UAAK,GAAG;YACxB,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,UAAU,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc;YAC/F,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,UAAU,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc;SAC/F,CAAC;QAGe,cAAS,GAAG,GAAG,CAAC;QAEzB,mBAAc,GAAG,KAAK,CAAC;QAU9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI;QACH,IAAA,oBAAM,EAAC,IAAI,CAAC,gBAAgB,CAAC,YAAY,KAAK,OAAO,EAAE,0BAA0B,CAAC,CAAC;QAEnF,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YAAE,IAAI,CAAC,YAAY,EAAE,CAAC;IACzD,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,CACN,IAAI,CAAC,gBAAgB,CAAC,SAAS;YAC/B,IAAI,CAAC,gBAAgB,CAAC,YAAY,KAAK,MAAM;YAC7C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAC9B,CAAC;IACH,CAAC;IAGD,YAAY;QACX,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,eAAe,CAAC,QAAQ,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO;QAEhF,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACpC,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC7C,CAAC;IAGD,WAAW;QACV,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"executions-pruning.service.js","sourceRoot":"","sources":["../../../src/services/pruning/executions-pruning.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Logger } from '@n8n/backend-common';
|
|
2
|
+
import { WorkflowHistoryCompactionConfig } from '@n8n/config';
|
|
3
|
+
import { DbConnection, WorkflowHistoryRepository } from '@n8n/db';
|
|
4
|
+
import { InstanceSettings } from 'n8n-core';
|
|
5
|
+
export declare class WorkflowHistoryCompactionService {
|
|
6
|
+
private readonly config;
|
|
7
|
+
private readonly logger;
|
|
8
|
+
private readonly instanceSettings;
|
|
9
|
+
private readonly dbConnection;
|
|
10
|
+
private readonly workflowHistoryRepository;
|
|
11
|
+
private compactingInterval;
|
|
12
|
+
private isShuttingDown;
|
|
13
|
+
constructor(config: WorkflowHistoryCompactionConfig, logger: Logger, instanceSettings: InstanceSettings, dbConnection: DbConnection, workflowHistoryRepository: WorkflowHistoryRepository);
|
|
14
|
+
init(): void;
|
|
15
|
+
get isEnabled(): boolean;
|
|
16
|
+
startCompacting(): void;
|
|
17
|
+
stopCompacting(): void;
|
|
18
|
+
private scheduleRollingCompacting;
|
|
19
|
+
shutdown(): void;
|
|
20
|
+
private compactHistories;
|
|
21
|
+
}
|
|
@@ -0,0 +1,144 @@
|
|
|
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
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.WorkflowHistoryCompactionService = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
14
|
+
const config_1 = require("@n8n/config");
|
|
15
|
+
const constants_1 = require("@n8n/constants");
|
|
16
|
+
const db_1 = require("@n8n/db");
|
|
17
|
+
const decorators_1 = require("@n8n/decorators");
|
|
18
|
+
const di_1 = require("@n8n/di");
|
|
19
|
+
const n8n_core_1 = require("n8n-core");
|
|
20
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
21
|
+
const node_assert_1 = require("node:assert");
|
|
22
|
+
let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
|
|
23
|
+
constructor(config, logger, instanceSettings, dbConnection, workflowHistoryRepository) {
|
|
24
|
+
this.config = config;
|
|
25
|
+
this.logger = logger;
|
|
26
|
+
this.instanceSettings = instanceSettings;
|
|
27
|
+
this.dbConnection = dbConnection;
|
|
28
|
+
this.workflowHistoryRepository = workflowHistoryRepository;
|
|
29
|
+
this.isShuttingDown = false;
|
|
30
|
+
this.logger = this.logger.scoped('workflow-history-compaction');
|
|
31
|
+
}
|
|
32
|
+
init() {
|
|
33
|
+
(0, node_assert_1.strict)(this.instanceSettings.instanceRole !== 'unset', 'Instance role is not set');
|
|
34
|
+
if (this.instanceSettings.isLeader)
|
|
35
|
+
this.startCompacting();
|
|
36
|
+
}
|
|
37
|
+
get isEnabled() {
|
|
38
|
+
return this.instanceSettings.instanceType === 'main' && this.instanceSettings.isLeader;
|
|
39
|
+
}
|
|
40
|
+
startCompacting() {
|
|
41
|
+
const { connectionState } = this.dbConnection;
|
|
42
|
+
if (!this.isEnabled || !connectionState.migrated || this.isShuttingDown)
|
|
43
|
+
return;
|
|
44
|
+
this.logger.debug('Started workflow histories compaction', { ...this.config });
|
|
45
|
+
this.scheduleRollingCompacting();
|
|
46
|
+
if (this.config.compactOnStartUp) {
|
|
47
|
+
this.logger.debug('Compacting on start up');
|
|
48
|
+
void this.compactHistories();
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
stopCompacting() {
|
|
52
|
+
if (!this.compactingInterval)
|
|
53
|
+
return;
|
|
54
|
+
clearInterval(this.compactingInterval);
|
|
55
|
+
this.logger.debug('Stopped workflow histories compaction');
|
|
56
|
+
}
|
|
57
|
+
scheduleRollingCompacting() {
|
|
58
|
+
const rateMs = (this.config.compactingTimeWindowHours / 2) * constants_1.Time.hours.toMilliseconds;
|
|
59
|
+
this.compactingInterval = setInterval(async () => await this.compactHistories(), rateMs);
|
|
60
|
+
this.logger.debug(`Compacting histories every ${this.config.compactingTimeWindowHours / 2.0} hour(s)`);
|
|
61
|
+
}
|
|
62
|
+
shutdown() {
|
|
63
|
+
this.isShuttingDown = true;
|
|
64
|
+
this.stopCompacting();
|
|
65
|
+
}
|
|
66
|
+
async compactHistories() {
|
|
67
|
+
const compactionStartTime = Date.now();
|
|
68
|
+
const startDate = new Date(compactionStartTime -
|
|
69
|
+
(this.config.compactingMinimumAgeHours + this.config.compactingTimeWindowHours) *
|
|
70
|
+
constants_1.Time.hours.toMilliseconds);
|
|
71
|
+
const endDate = new Date(compactionStartTime - this.config.compactingMinimumAgeHours * constants_1.Time.hours.toMilliseconds);
|
|
72
|
+
const startIso = startDate.toISOString();
|
|
73
|
+
const endIso = endDate.toISOString();
|
|
74
|
+
this.logger.info('Starting workflow history compaction', {
|
|
75
|
+
dateRange: { start: startIso, end: endIso },
|
|
76
|
+
config: this.config,
|
|
77
|
+
});
|
|
78
|
+
const workflowIds = await this.workflowHistoryRepository.getWorkflowIdsInRange(startDate, endDate);
|
|
79
|
+
this.logger.debug(`Found ${workflowIds.length} workflows with versions between ${startIso} and ${endIso}`);
|
|
80
|
+
let batchSum = 0;
|
|
81
|
+
let totalVersionsSeen = 0;
|
|
82
|
+
let totalVersionsDeleted = 0;
|
|
83
|
+
let errorCount = 0;
|
|
84
|
+
for (const [index, workflowId] of workflowIds.entries()) {
|
|
85
|
+
try {
|
|
86
|
+
const { seen, deleted } = await this.workflowHistoryRepository.pruneHistory(workflowId, startDate, endDate, this.config.minimumTimeBetweenSessionsMs);
|
|
87
|
+
batchSum += seen;
|
|
88
|
+
totalVersionsSeen += seen;
|
|
89
|
+
totalVersionsDeleted += deleted;
|
|
90
|
+
this.logger.debug(`Deleted ${deleted} of ${seen} versions of workflow ${workflowId} between ${startIso} and ${endIso}`);
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
errorCount += 1;
|
|
94
|
+
this.logger.error(`Failed to prune version history of workflow ${workflowId}`, {
|
|
95
|
+
error: (0, n8n_workflow_1.ensureError)(error),
|
|
96
|
+
});
|
|
97
|
+
await (0, n8n_workflow_1.sleep)(this.config.batchDelayMs);
|
|
98
|
+
}
|
|
99
|
+
if (batchSum > this.config.batchSize) {
|
|
100
|
+
this.logger.warn(`Encountered more than ${this.config.batchSize} workflow versions, waiting ${this.config.batchDelayMs * constants_1.Time.milliseconds.toSeconds} second(s) before continuing.`);
|
|
101
|
+
this.logger.warn(`Compacted ${index} of ${workflowIds.length} workflows with versions between ${startIso} and ${endIso}`);
|
|
102
|
+
await (0, n8n_workflow_1.sleep)(this.config.batchDelayMs);
|
|
103
|
+
batchSum = 0;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
const durationMs = Date.now() - compactionStartTime;
|
|
107
|
+
this.logger.info('Workflow history compaction complete', {
|
|
108
|
+
workflowsProcessed: workflowIds.length,
|
|
109
|
+
totalVersionsSeen,
|
|
110
|
+
totalVersionsDeleted,
|
|
111
|
+
errorCount,
|
|
112
|
+
durationMs,
|
|
113
|
+
dateRange: { start: startIso, end: endIso },
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
};
|
|
117
|
+
exports.WorkflowHistoryCompactionService = WorkflowHistoryCompactionService;
|
|
118
|
+
__decorate([
|
|
119
|
+
(0, decorators_1.OnLeaderTakeover)(),
|
|
120
|
+
__metadata("design:type", Function),
|
|
121
|
+
__metadata("design:paramtypes", []),
|
|
122
|
+
__metadata("design:returntype", void 0)
|
|
123
|
+
], WorkflowHistoryCompactionService.prototype, "startCompacting", null);
|
|
124
|
+
__decorate([
|
|
125
|
+
(0, decorators_1.OnLeaderStepdown)(),
|
|
126
|
+
__metadata("design:type", Function),
|
|
127
|
+
__metadata("design:paramtypes", []),
|
|
128
|
+
__metadata("design:returntype", void 0)
|
|
129
|
+
], WorkflowHistoryCompactionService.prototype, "stopCompacting", null);
|
|
130
|
+
__decorate([
|
|
131
|
+
(0, decorators_1.OnShutdown)(),
|
|
132
|
+
__metadata("design:type", Function),
|
|
133
|
+
__metadata("design:paramtypes", []),
|
|
134
|
+
__metadata("design:returntype", void 0)
|
|
135
|
+
], WorkflowHistoryCompactionService.prototype, "shutdown", null);
|
|
136
|
+
exports.WorkflowHistoryCompactionService = WorkflowHistoryCompactionService = __decorate([
|
|
137
|
+
(0, di_1.Service)(),
|
|
138
|
+
__metadata("design:paramtypes", [config_1.WorkflowHistoryCompactionConfig,
|
|
139
|
+
backend_common_1.Logger,
|
|
140
|
+
n8n_core_1.InstanceSettings,
|
|
141
|
+
db_1.DbConnection,
|
|
142
|
+
db_1.WorkflowHistoryRepository])
|
|
143
|
+
], WorkflowHistoryCompactionService);
|
|
144
|
+
//# sourceMappingURL=workflow-history-compaction.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workflow-history-compaction.service.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,27 +118,25 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
118
118
|
}
|
|
119
119
|
async startInternalTaskRunners() {
|
|
120
120
|
a.ok(this.taskBrokerWsServer, 'Task Runner WS Server not loaded');
|
|
121
|
+
const { InternalTaskRunnerDisconnectAnalyzer } = await Promise.resolve().then(() => __importStar(require('../task-runners/internal-task-runner-disconnect-analyzer')));
|
|
122
|
+
this.taskBrokerWsServer.setDisconnectAnalyzer(di_1.Container.get(InternalTaskRunnerDisconnectAnalyzer));
|
|
121
123
|
const { JsTaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-runner-process-js')));
|
|
122
124
|
this.jsRunnerProcess = di_1.Container.get(JsTaskRunnerProcess);
|
|
123
125
|
this.jsRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.jsRunnerProcess);
|
|
124
126
|
this.jsRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
|
|
125
127
|
await this.jsRunnerProcess.start();
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
return;
|
|
134
|
-
}
|
|
135
|
-
this.pyRunnerProcess = di_1.Container.get(PyTaskRunnerProcess);
|
|
136
|
-
this.pyRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.pyRunnerProcess);
|
|
137
|
-
this.pyRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
|
|
138
|
-
await this.pyRunnerProcess.start();
|
|
128
|
+
const { PyTaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-runner-process-py')));
|
|
129
|
+
const failureReason = await PyTaskRunnerProcess.checkRequirements();
|
|
130
|
+
if (failureReason) {
|
|
131
|
+
di_1.Container.get(task_requester_1.TaskRequester).setRunnerUnavailable('python', failureReason);
|
|
132
|
+
const error = new missing_requirements_error_1.MissingRequirementsError(failureReason);
|
|
133
|
+
this.logger.warn(error.message);
|
|
134
|
+
return;
|
|
139
135
|
}
|
|
140
|
-
|
|
141
|
-
this.
|
|
136
|
+
this.pyRunnerProcess = di_1.Container.get(PyTaskRunnerProcess);
|
|
137
|
+
this.pyRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.pyRunnerProcess);
|
|
138
|
+
this.pyRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
|
|
139
|
+
await this.pyRunnerProcess.start();
|
|
142
140
|
}
|
|
143
141
|
};
|
|
144
142
|
exports.TaskRunnerModule = TaskRunnerModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,gDAA6C;AAC7C,gCAA6C;AAC7C,uCAAyC;AACzC,+CAAqC;AACrC,sDAAwC;AAExC,0DAAsD;AAEtD,4FAAsF;AAGtF,wHAAgH;AAEhH,gFAA0E;AAC1E,oFAA+E;AAG/E,mEAA+D;AAQxD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAe5B,YACkB,MAAc,EACd,aAA4B,EAC5B,YAA+B,EAC/B,YAA0B;QAH1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,iBAAY,GAAZ,YAAY,CAAc;
|
|
1
|
+
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -175,17 +175,18 @@ let EnterpriseWorkflowService = class EnterpriseWorkflowService {
|
|
|
175
175
|
});
|
|
176
176
|
}
|
|
177
177
|
async transferWorkflow(user, workflowId, destinationProjectId, shareCredentials = [], destinationParentFolderId) {
|
|
178
|
-
const workflow = await this.workflowFinderService.findWorkflowForUser(workflowId, user, [
|
|
179
|
-
|
|
180
|
-
|
|
178
|
+
const workflow = await this.workflowFinderService.findWorkflowForUser(workflowId, user, ['workflow:move'], {
|
|
179
|
+
includeParentFolder: true,
|
|
180
|
+
});
|
|
181
181
|
not_found_error_1.NotFoundError.isDefinedAndNotNull(workflow, `Could not find workflow with the id "${workflowId}". Make sure you have the permission to move it.`);
|
|
182
182
|
const ownerSharing = workflow.shared.find((s) => s.role === 'workflow:owner');
|
|
183
183
|
not_found_error_1.NotFoundError.isDefinedAndNotNull(ownerSharing, `Could not find owner for workflow "${workflow.id}"`);
|
|
184
184
|
const sourceProject = ownerSharing.project;
|
|
185
185
|
const destinationProject = await this.projectService.getProjectWithScope(user, destinationProjectId, ['workflow:create']);
|
|
186
186
|
not_found_error_1.NotFoundError.isDefinedAndNotNull(destinationProject, `Could not find project with the id "${destinationProjectId}". Make sure you have the permission to create workflows in it.`);
|
|
187
|
-
if (sourceProject.id === destinationProject.id
|
|
188
|
-
|
|
187
|
+
if (sourceProject.id === destinationProject.id &&
|
|
188
|
+
destinationParentFolderId === workflow.parentFolder?.id) {
|
|
189
|
+
throw new transfer_workflow_error_1.TransferWorkflowError("You can't transfer a workflow into the same destination it already belongs to.");
|
|
189
190
|
}
|
|
190
191
|
let parentFolder = null;
|
|
191
192
|
if (destinationParentFolderId) {
|