github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-13 14:54:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Last eslint tweak (#18198)

Browse Source 
* Should be there now

* Format
This commit is contained in:
Rijk van Zanten
2023-04-14 17:40:50 -04:00
committed by GitHub
parent 37658802b7
commit c48309ab68
293 changed files with 1627 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/utils/apply-query.ts
View File

@@ -165,6 +165,7 @@ function addJoin({ path, collection, aliasMap, rootQuery, schema, relations, kne
`${aliasedParentCollection}.${relation.field}`,
`${alias}.${schema.collections[relation.related_collection!]!.primary}`
);
aliasMap[aliasKey]!.collection = relation.related_collection!;
} else if (relationType === 'a2o') {
const pathScope = pathParts[0]!.split(':')[1];
@@ -187,6 +188,7 @@ function addJoin({ path, collection, aliasMap, rootQuery, schema, relations, kne
)
);
});
aliasMap[aliasKey]!.collection = pathScope;
} else if (relationType === 'o2a') {
rootQuery.leftJoin({ [alias]: relation.collection }, (joinClause) => {
@@ -201,6 +203,7 @@ function addJoin({ path, collection, aliasMap, rootQuery, schema, relations, kne
)
);
});
aliasMap[aliasKey]!.collection = relation.collection;
hasMultiRelational = true;
@@ -210,6 +213,7 @@ function addJoin({ path, collection, aliasMap, rootQuery, schema, relations, kne
`${aliasedParentCollection}.${schema.collections[relation.related_collection!]!.primary}`,
`${alias}.${relation.field}`
);
aliasMap[aliasKey]!.collection = relation.collection;
hasMultiRelational = true;
@@ -295,6 +299,7 @@ export function applySort(
relations,
schema,
});
const [alias, field] = columnPath.split('.');
if (!hasMultiRelationalSort) {