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

Merge main

Browse Source
This commit is contained in:
rijkvanzanten
2020-10-09 15:46:04 -04:00
parent 847157506a b486cefc3a
commit b0ba488395
2 changed files with 104 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ export default async function runAST(
// and nesting is done, we parse through the output structure, and filter out all non-requested
// fields
if (options?.child !== true) {
items = removeTemporaryFields(items, ast);
items = removeTemporaryFields(items, ast, primaryKeyField);
}
return items;
@@ -241,7 +241,8 @@ function mergeWithParentItems(
function removeTemporaryFields(
rawItem: Item | Item[],
ast: AST | O2MNode | M2ONode
ast: AST | O2MNode | M2ONode,
primaryKeyField: string
): Item | Item[] {
const rawItems: Item[] = Array.isArray(rawItem) ? rawItem : [rawItem];
@@ -257,14 +258,16 @@ function removeTemporaryFields(
for (const rawItem of rawItems) {
if (rawItem === null) return rawItem;
const item = fields.includes('*') ? rawItem : pick(rawItem, fields);
const item = fields.length > 0 ? pick(rawItem, fields) : rawItem[primaryKeyField];
for (const nestedCollection of nestedCollections) {
if (item[nestedCollection.fieldKey] !== null && nestedCollection.type !== 'm2a') {
/** @TODO REMOVE M2A CHECK HERE */
item[nestedCollection.fieldKey] = removeTemporaryFields(
rawItem[nestedCollection.fieldKey],
nestedCollection
nestedCollection,
nestedCollection.parentKey
);
}
}