@forestadmin/datasource-customizer 1.56.0 → 1.57.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.
|
@@ -5,5 +5,7 @@ export default class SegmentCollectionDecorator extends CollectionDecorator {
|
|
|
5
5
|
addSegment(segmentName: string, definition: SegmentDefinition): void;
|
|
6
6
|
protected refineSchema(subSchema: CollectionSchema): CollectionSchema;
|
|
7
7
|
refineFilter(caller: Caller, filter?: PaginatedFilter): Promise<PaginatedFilter>;
|
|
8
|
+
private refineFilterSegment;
|
|
9
|
+
private refineFilterLiveQuerySegment;
|
|
8
10
|
}
|
|
9
11
|
//# sourceMappingURL=collection.d.ts.map
|
|
@@ -24,19 +24,43 @@ class SegmentCollectionDecorator extends datasource_toolkit_1.CollectionDecorato
|
|
|
24
24
|
if (!filter) {
|
|
25
25
|
return null;
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
const trees = await Promise.all([
|
|
28
|
+
this.refineFilterSegment(caller, filter),
|
|
29
|
+
this.refineFilterLiveQuerySegment(filter),
|
|
30
|
+
]);
|
|
31
|
+
const conditionTree = datasource_toolkit_1.ConditionTreeFactory.intersect(filter.conditionTree, ...trees);
|
|
32
|
+
return filter.override({ conditionTree, segment: null, liveQuerySegment: null });
|
|
33
|
+
}
|
|
34
|
+
async refineFilterSegment(caller, filter) {
|
|
35
|
+
const { segment } = filter;
|
|
28
36
|
if (segment && this.segments[segment]) {
|
|
29
37
|
const definition = this.segments[segment];
|
|
30
38
|
const result = typeof definition === 'function'
|
|
31
39
|
? await definition(new collection_context_1.default(this, caller))
|
|
32
40
|
: await definition;
|
|
33
|
-
const
|
|
34
|
-
datasource_toolkit_1.ConditionTreeValidator.validate(
|
|
35
|
-
|
|
36
|
-
|
|
41
|
+
const conditionTree = result instanceof datasource_toolkit_1.ConditionTree ? result : datasource_toolkit_1.ConditionTreeFactory.fromPlainObject(result);
|
|
42
|
+
datasource_toolkit_1.ConditionTreeValidator.validate(conditionTree, this);
|
|
43
|
+
return conditionTree;
|
|
44
|
+
}
|
|
45
|
+
return null;
|
|
46
|
+
}
|
|
47
|
+
async refineFilterLiveQuerySegment(filter) {
|
|
48
|
+
const { liveQuerySegment } = filter;
|
|
49
|
+
if (liveQuerySegment) {
|
|
50
|
+
const { query, connectionName } = liveQuerySegment;
|
|
51
|
+
try {
|
|
52
|
+
const result = (await this.dataSource.executeNativeQuery(connectionName, query, {}));
|
|
53
|
+
const [primaryKey] = datasource_toolkit_1.SchemaUtils.getPrimaryKeys(this.childCollection.schema);
|
|
54
|
+
const conditionTree = new datasource_toolkit_1.ConditionTreeLeaf(primaryKey, 'In', result.map(row => row[primaryKey]));
|
|
55
|
+
datasource_toolkit_1.ConditionTreeValidator.validate(conditionTree, this);
|
|
56
|
+
return conditionTree;
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
throw new datasource_toolkit_1.BusinessError(`An error occurred during the execution of the segment query - ${error.message}`, error);
|
|
60
|
+
}
|
|
37
61
|
}
|
|
38
|
-
return
|
|
62
|
+
return null;
|
|
39
63
|
}
|
|
40
64
|
}
|
|
41
65
|
exports.default = SegmentCollectionDecorator;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3NlZ21lbnQvY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQVd5QztBQUd6QywwRkFBOEU7QUFFOUUsTUFBcUIsMEJBQTJCLFNBQVEsd0NBQW1CO0lBQTNFOztRQUNVLGFBQVEsR0FBMEMsRUFBRSxDQUFDO0lBdUYvRCxDQUFDO0lBckZDLFVBQVUsQ0FBQyxXQUFtQixFQUFFLFVBQTZCO1FBQzNELElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEdBQUcsVUFBVSxDQUFDO1FBQ3hDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFa0IsWUFBWSxDQUFDLFNBQTJCO1FBQ3pELE9BQU87WUFDTCxHQUFHLFNBQVM7WUFDWixRQUFRLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxRQUFRLEVBQUUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUNqRSxDQUFDO0lBQ0osQ0FBQztJQUVlLEtBQUssQ0FBQyxZQUFZLENBQ2hDLE1BQWMsRUFDZCxNQUF3QjtRQUV4QixJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1gsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELE1BQU0sS0FBSyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUM5QixJQUFJLENBQUMsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQztZQUN4QyxJQUFJLENBQUMsNEJBQTRCLENBQUMsTUFBTSxDQUFDO1NBQzFDLENBQUMsQ0FBQztRQUVILE1BQU0sYUFBYSxHQUFHLHlDQUFvQixDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLEdBQUcsS0FBSyxDQUFDLENBQUM7UUFFckYsT0FBTyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUUsYUFBYSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNuRixDQUFDO0lBRU8sS0FBSyxDQUFDLG1CQUFtQixDQUFDLE1BQWMsRUFBRSxNQUF1QjtRQUN2RSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxDQUFDO1FBRTNCLElBQUksT0FBTyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDckMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUMxQyxNQUFNLE1BQU0sR0FDVixPQUFPLFVBQVUsS0FBSyxVQUFVO2dCQUM5QixDQUFDLENBQUMsTUFBTSxVQUFVLENBQUMsSUFBSSw0QkFBOEIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7Z0JBQ3BFLENBQUMsQ0FBQyxNQUFNLFVBQVUsQ0FBQztZQUV2QixNQUFNLGFBQWEsR0FDakIsTUFBTSxZQUFZLGtDQUFhLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMseUNBQW9CLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBRTFGLDJDQUFzQixDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFFckQsT0FBTyxhQUFhLENBQUM7U0FDdEI7UUFFRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsNEJBQTRCLENBQUMsTUFBdUI7UUFDaEUsTUFBTSxFQUFFLGdCQUFnQixFQUFFLEdBQUcsTUFBTSxDQUFDO1FBRXBDLElBQUksZ0JBQWdCLEVBQUU7WUFDcEIsTUFBTSxFQUFFLEtBQUssRUFBRSxjQUFjLEVBQUUsR0FBRyxnQkFBZ0IsQ0FBQztZQUVuRCxJQUFJO2dCQUNGLE1BQU0sTUFBTSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLGtCQUFrQixDQUN0RCxjQUFjLEVBQ2QsS0FBSyxFQUNMLEVBQUUsQ0FDSCxDQUE4QixDQUFDO2dCQUVoQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsZ0NBQVcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQztnQkFFN0UsTUFBTSxhQUFhLEdBQUcsSUFBSSxzQ0FBaUIsQ0FDekMsVUFBVSxFQUNWLElBQUksRUFDSixNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQ25DLENBQUM7Z0JBRUYsMkNBQXNCLENBQUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsQ0FBQztnQkFFckQsT0FBTyxhQUFhLENBQUM7YUFDdEI7WUFBQyxPQUFPLEtBQUssRUFBRTtnQkFDZCxNQUFNLElBQUksa0NBQWEsQ0FDckIsaUVBQWlFLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFDaEYsS0FBSyxDQUNOLENBQUM7YUFDSDtTQUNGO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0NBQ0Y7QUF4RkQsNkNBd0ZDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/datasource-customizer",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.57.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@types/uuid": "^9.0.0"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@forestadmin/datasource-toolkit": "1.
|
|
32
|
+
"@forestadmin/datasource-toolkit": "1.45.1",
|
|
33
33
|
"antlr4": "^4.13.1-patch-1",
|
|
34
34
|
"file-type": "^16.5.4",
|
|
35
35
|
"luxon": "^3.2.1",
|