@forestadmin/agent 1.111.5 → 1.111.6
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.
|
@@ -4,5 +4,6 @@ import { Filter, PaginatedFilter } from '@forestadmin/datasource-toolkit';
|
|
|
4
4
|
export default class ContextFilterFactory {
|
|
5
5
|
static buildPaginated(collection: Collection, context: Context, scope: ConditionTree, partialFilter?: Partial<PaginatedFilter>): PaginatedFilter;
|
|
6
6
|
static build(collection: Collection, context: Context, scope: ConditionTree, partialFilter?: Partial<Filter>): PaginatedFilter;
|
|
7
|
+
private static withPrimaryKeyTiebreaker;
|
|
7
8
|
}
|
|
8
9
|
//# sourceMappingURL=context-filter-factory.d.ts.map
|
|
@@ -8,7 +8,7 @@ const query_string_1 = __importDefault(require("./query-string"));
|
|
|
8
8
|
class ContextFilterFactory {
|
|
9
9
|
static buildPaginated(collection, context, scope, partialFilter) {
|
|
10
10
|
return new datasource_toolkit_1.PaginatedFilter({
|
|
11
|
-
sort: query_string_1.default.parseSort(collection, context),
|
|
11
|
+
sort: ContextFilterFactory.withPrimaryKeyTiebreaker(collection, query_string_1.default.parseSort(collection, context)),
|
|
12
12
|
page: query_string_1.default.parsePagination(context),
|
|
13
13
|
...ContextFilterFactory.build(collection, context, scope),
|
|
14
14
|
...partialFilter,
|
|
@@ -24,6 +24,15 @@ class ContextFilterFactory {
|
|
|
24
24
|
...partialFilter,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
|
+
static withPrimaryKeyTiebreaker(collection, sort) {
|
|
28
|
+
if (sort.length === 0)
|
|
29
|
+
return sort;
|
|
30
|
+
const { ascending } = sort[sort.length - 1];
|
|
31
|
+
const missingPrimaryKeys = datasource_toolkit_1.SortFactory.byPrimaryKeys(collection)
|
|
32
|
+
.filter(({ field }) => !sort.some(clause => clause.field === field))
|
|
33
|
+
.map(({ field }) => ({ field, ascending }));
|
|
34
|
+
return new datasource_toolkit_1.Sort(...sort, ...missingPrimaryKeys);
|
|
35
|
+
}
|
|
27
36
|
}
|
|
28
37
|
exports.default = ContextFilterFactory;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC1maWx0ZXItZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb250ZXh0LWZpbHRlci1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBR0Esd0VBTXlDO0FBRXpDLGtFQUErQztBQUUvQyxNQUFxQixvQkFBb0I7SUFDdkMsTUFBTSxDQUFDLGNBQWMsQ0FDbkIsVUFBc0IsRUFDdEIsT0FBZ0IsRUFDaEIsS0FBb0IsRUFDcEIsYUFBd0M7UUFFeEMsT0FBTyxJQUFJLG9DQUFlLENBQUM7WUFDekIsSUFBSSxFQUFFLG9CQUFvQixDQUFDLHdCQUF3QixDQUNqRCxVQUFVLEVBQ1Ysc0JBQWlCLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FDakQ7WUFDRCxJQUFJLEVBQUUsc0JBQWlCLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQztZQUNoRCxHQUFHLG9CQUFvQixDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQztZQUN6RCxHQUFHLGFBQWE7U0FDakIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQ1YsVUFBc0IsRUFDdEIsT0FBZ0IsRUFDaEIsS0FBb0IsRUFDcEIsYUFBK0I7UUFFL0IsT0FBTyxJQUFJLDJCQUFNLENBQUM7WUFDaEIsTUFBTSxFQUFFLHNCQUFpQixDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDO1lBQzFELE9BQU8sRUFBRSxzQkFBaUIsQ0FBQyxZQUFZLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQztZQUM1RCxnQkFBZ0IsRUFBRSxzQkFBaUIsQ0FBQyxxQkFBcUIsQ0FBQyxPQUFPLENBQUM7WUFDbEUsY0FBYyxFQUFFLHNCQUFpQixDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQztZQUM5RCxhQUFhLEVBQUUseUNBQW9CLENBQUMsU0FBUyxDQUMzQyxzQkFBaUIsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLEVBQ3pELEtBQUssQ0FDTjtZQUNELEdBQUcsYUFBYTtTQUNqQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sTUFBTSxDQUFDLHdCQUF3QixDQUFDLFVBQXNCLEVBQUUsSUFBVTtRQUN4RSxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQztZQUFFLE9BQU8sSUFBSSxDQUFDO1FBRW5DLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztRQUM1QyxNQUFNLGtCQUFrQixHQUFHLGdDQUFXLENBQUMsYUFBYSxDQUFDLFVBQVUsQ0FBQzthQUM3RCxNQUFNLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsS0FBSyxLQUFLLEtBQUssQ0FBQyxDQUFDO2FBQ25FLEdBQUcsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBRTlDLE9BQU8sSUFBSSx5QkFBSSxDQUFDLEdBQUcsSUFBSSxFQUFFLEdBQUcsa0JBQWtCLENBQUMsQ0FBQztJQUNsRCxDQUFDO0NBQ0Y7QUEvQ0QsdUNBK0NDIn0=
|