@n8n/db 1.3.3 → 1.4.1
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.
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DataSource, Repository } from '@n8n/typeorm';
|
|
2
|
+
import { DiffRule } from 'n8n-workflow';
|
|
2
3
|
import { WorkflowHistory } from '../entities';
|
|
3
4
|
import { WorkflowPublishHistoryRepository } from './workflow-publish-history.repository';
|
|
4
5
|
export declare class WorkflowHistoryRepository extends Repository<WorkflowHistory> {
|
|
@@ -8,7 +9,7 @@ export declare class WorkflowHistoryRepository extends Repository<WorkflowHistor
|
|
|
8
9
|
deleteEarlierThanExceptCurrentAndActive(date: Date): Promise<import("@n8n/typeorm").DeleteResult>;
|
|
9
10
|
private makeSkipActiveAndNamedVersionsRule;
|
|
10
11
|
getWorkflowIdsInRange(startDate: Date, endDate: Date): Promise<string[]>;
|
|
11
|
-
pruneHistory(workflowId: string, startDate: Date, endDate: Date,
|
|
12
|
+
pruneHistory(workflowId: string, startDate: Date, endDate: Date, rules?: DiffRule[], skipRules?: DiffRule[]): Promise<{
|
|
12
13
|
seen: number;
|
|
13
14
|
deleted: number;
|
|
14
15
|
}>;
|
|
@@ -47,9 +47,7 @@ let WorkflowHistoryRepository = class WorkflowHistoryRepository extends typeorm_
|
|
|
47
47
|
.execute();
|
|
48
48
|
}
|
|
49
49
|
makeSkipActiveAndNamedVersionsRule(activeVersions) {
|
|
50
|
-
return (prev, _next) => prev.
|
|
51
|
-
prev.to.description !== null ||
|
|
52
|
-
activeVersions.includes(prev.to.versionId);
|
|
50
|
+
return (prev, _next) => prev.name !== null || prev.description !== null || activeVersions.has(prev.versionId);
|
|
53
51
|
}
|
|
54
52
|
async getWorkflowIdsInRange(startDate, endDate) {
|
|
55
53
|
const result = await this.manager
|
|
@@ -66,7 +64,7 @@ let WorkflowHistoryRepository = class WorkflowHistoryRepository extends typeorm_
|
|
|
66
64
|
.getRawMany();
|
|
67
65
|
return result.map((x) => x.workflowId);
|
|
68
66
|
}
|
|
69
|
-
async pruneHistory(workflowId, startDate, endDate,
|
|
67
|
+
async pruneHistory(workflowId, startDate, endDate, rules = [], skipRules = []) {
|
|
70
68
|
const workflows = await this.manager
|
|
71
69
|
.createQueryBuilder(entities_1.WorkflowHistory, 'wh')
|
|
72
70
|
.where('wh.workflowId = :workflowId', { workflowId })
|
|
@@ -78,19 +76,14 @@ let WorkflowHistoryRepository = class WorkflowHistoryRepository extends typeorm_
|
|
|
78
76
|
})
|
|
79
77
|
.orderBy('wh.createdAt', 'ASC')
|
|
80
78
|
.getMany();
|
|
81
|
-
const versionsToDelete = [];
|
|
82
79
|
const publishedVersions = await this.workflowPublishHistoryRepository.getPublishedVersions(workflowId);
|
|
83
|
-
const grouped = (0, n8n_workflow_1.groupWorkflows)(workflows,
|
|
84
|
-
|
|
85
|
-
|
|
80
|
+
const grouped = (0, n8n_workflow_1.groupWorkflows)(workflows, rules, [
|
|
81
|
+
this.makeSkipActiveAndNamedVersionsRule(new Set(publishedVersions.map((x) => x.versionId))),
|
|
82
|
+
n8n_workflow_1.SKIP_RULES.skipDifferentUsers,
|
|
83
|
+
...skipRules,
|
|
86
84
|
]);
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
versionsToDelete.push(wf.versionId);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
await this.delete({ versionId: (0, typeorm_1.In)(versionsToDelete) });
|
|
93
|
-
return { seen: workflows.length, deleted: versionsToDelete.length };
|
|
85
|
+
await this.delete({ versionId: (0, typeorm_1.In)(grouped.removed.map((x) => x.versionId)) });
|
|
86
|
+
return { seen: workflows.length, deleted: grouped.removed.length };
|
|
94
87
|
}
|
|
95
88
|
};
|
|
96
89
|
exports.WorkflowHistoryRepository = WorkflowHistoryRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-history.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-history.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAoE;AACpE,+
|
|
1
|
+
{"version":3,"file":"workflow-history.repository.js","sourceRoot":"","sources":["../../src/repositories/workflow-history.repository.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@n8n/db",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "src/index.ts",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"files": [
|
|
8
8
|
"dist/**/*",
|
|
9
|
-
"
|
|
10
|
-
"
|
|
9
|
+
"LICENSE.md",
|
|
10
|
+
"LICENSE_EE.md"
|
|
11
11
|
],
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@n8n/typeorm": "0.3.20-15",
|
|
@@ -20,15 +20,15 @@
|
|
|
20
20
|
"uuid": "10.0.0",
|
|
21
21
|
"xss": "1.0.15",
|
|
22
22
|
"zod": "3.25.67",
|
|
23
|
-
"@n8n/
|
|
24
|
-
"@n8n/
|
|
23
|
+
"@n8n/backend-common": "1.4.1",
|
|
24
|
+
"@n8n/config": "2.3.0",
|
|
25
25
|
"@n8n/constants": "0.16.0",
|
|
26
|
-
"@n8n/
|
|
27
|
-
"@n8n/decorators": "1.
|
|
26
|
+
"@n8n/api-types": "1.4.1",
|
|
27
|
+
"@n8n/decorators": "1.4.1",
|
|
28
28
|
"@n8n/di": "0.10.0",
|
|
29
|
-
"
|
|
30
|
-
"n8n
|
|
31
|
-
"n8n-
|
|
29
|
+
"n8n-core": "2.4.1",
|
|
30
|
+
"@n8n/permissions": "0.47.0",
|
|
31
|
+
"n8n-workflow": "2.4.1"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/lodash": "4.17.17",
|