github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix alias (#12826)

Browse Source 
* fix alias

* minor clean up

* fix graphql nested junction aliases
This commit is contained in:
Azri Kahar
2022-04-19 22:19:49 +08:00
committed by GitHub
parent 5cce44fa05
commit 460f0ba003
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/database/run-ast.ts
View File

@@ -168,7 +168,7 @@ async function parseCurrentLevel(
if (!child.relation) continue;
if (child.type === 'm2o') {
columnsToSelectInternal.push(child.fieldKey);
columnsToSelectInternal.push(child.relation.field);
}
if (child.type === 'a2o') {
@@ -193,7 +193,9 @@ async function parseCurrentLevel(
const fieldNodes = columnsToSelect.map(
(column: string) =>
children.find((childNode) => childNode.type === 'field' && childNode.fieldKey === column) ?? {
children.find(
(childNode) => childNode.type === 'field' && (childNode.fieldKey === column || childNode.name === column)
) ?? {
type: 'field',
name: column,
fieldKey: column,
@@ -322,7 +324,7 @@ function mergeWithParentItems(
const itemChild = nestedItems.find((nestedItem) => {
return (
nestedItem[schema.collections[nestedNode.relation.related_collection!].primary] ==
parentItem[nestedNode.fieldKey]
parentItem[nestedNode.relation.field]
);
});