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 deep querying in nested o2m in m2a structure

Browse Source
This commit is contained in:
rijkvanzanten
2021-04-22 10:10:41 -04:00
parent ce6e36cdc9
commit f873f184f5
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/services/graphql.ts
View File

@@ -1,15 +1,6 @@
import { Knex } from 'knex';
import database from '../database';
import {
AbstractServiceOptions,
Accountability,
Query,
SchemaOverview,
GraphQLParams,
PrimaryKey,
Action,
Item,
} from '../types';
import { AbstractServiceOptions, Accountability, Query, SchemaOverview, GraphQLParams, Action } from '../types';
import argon2 from 'argon2';
import {
GraphQLString,

6
api/src/utils/get-ast-from-query.ts
View File

@@ -162,10 +162,12 @@ export default async function getASTFromQuery(
for (const relatedCollection of allowedCollections) {
child.children[relatedCollection] = await parseFields(
relatedCollection,
Array.isArray(nestedFields) ? nestedFields : (nestedFields as anyNested)[relatedCollection] || ['*']
Array.isArray(nestedFields) ? nestedFields : (nestedFields as anyNested)[relatedCollection] || ['*'],
deep?.[`${relationalField}:${relatedCollection}`]
);
child.query[relatedCollection] = {};
child.query[relatedCollection] = getDeepQuery(deep?.[`${relationalField}:${relatedCollection}`] || {});
child.relatedKey[relatedCollection] = schema.collections[relatedCollection].primary;
}
} else if (relatedCollection) {