github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-24 11:37:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove temp fields from m2a

Browse Source
This commit is contained in:
rijkvanzanten
2020-10-09 19:35:41 -04:00
parent 676d78f6ee
commit 58dfa5d717
3 changed files with 85 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,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, originalAST);
items = removeTemporaryFields(items, originalAST, primaryKeyField);
}
return items;
@@ -124,10 +124,15 @@ async function parseCurrentLevel(
if (!child.relation) continue;
if (child.type === 'm2o' || child.type === 'm2a') {
if (child.type === 'm2o') {
columnsToSelect.push(child.relation.many_field);
}
if (child.type === 'm2a') {
columnsToSelect.push(child.relation.many_field);
columnsToSelect.push(child.relation.one_collection_field!);
}
nestedCollectionNodes.push(child);
}
@@ -298,12 +303,55 @@ function mergeWithParentItems(
function removeTemporaryFields(
rawItem: Item | Item[],
ast: AST | NestedCollectionNode
ast: AST | NestedCollectionNode,
primaryKeyField: string,
parentItem?: Item
): null | Item | Item[] {
const rawItems = cloneDeep(Array.isArray(rawItem) ? rawItem : [rawItem]);
const items: Item[] = [];
if (ast.type === 'm2a') {
const fields: Record<string, string[]> = {};
const nestedCollectionNodes: Record<string, NestedCollectionNode[]> = {};
for (const relatedCollection of ast.names) {
if (!fields[relatedCollection]) fields[relatedCollection] = [];
if (!nestedCollectionNodes[relatedCollection])
nestedCollectionNodes[relatedCollection] = [];
for (const child of ast.children[relatedCollection]) {
if (child.type === 'field') {
fields[relatedCollection].push(child.name);
} else {
fields[relatedCollection].push(child.fieldKey);
nestedCollectionNodes[relatedCollection].push(child);
}
}
}
for (const rawItem of rawItems) {
const relatedCollection: string = parentItem?.[ast.relation.one_collection_field!];
if (rawItem === null || rawItem === undefined) return rawItem;
let item = rawItem;
for (const nestedNode of nestedCollectionNodes[relatedCollection]) {
item[nestedNode.fieldKey] = removeTemporaryFields(
item[nestedNode.fieldKey],
nestedNode,
nestedNode.relation.many_primary,
item
);
}
item =
fields[relatedCollection].length > 0
? pick(rawItem, fields[relatedCollection])
: rawItem[primaryKeyField];
items.push(item);
}
} else {
const fields: string[] = [];
const nestedCollectionNodes: NestedCollectionNode[] = [];
@@ -312,56 +360,32 @@ function removeTemporaryFields(
if (child.type === 'field') {
fields.push(child.name);
} else {
fields.push(child.fieldKey);
nestedCollectionNodes.push(child);
}
}
for (const rawItem of rawItems) {
const item = fields.length > 0 ? pick(rawItem, fields) : rawItem.id; /** @TODO */
if (rawItem === null || rawItem === undefined) return rawItem;
let item = rawItem;
for (const nestedNode of nestedCollectionNodes) {
rawItem[nestedNode.fieldKey] = removeTemporaryFields(
rawItem[nestedNode.fieldKey],
nestedNode
item[nestedNode.fieldKey] = removeTemporaryFields(
item[nestedNode.fieldKey],
nestedNode,
nestedNode.type === 'm2o'
? nestedNode.relation.many_primary
: nestedNode.relation.one_primary!,
item
);
}
item = fields.length > 0 ? pick(rawItem, fields) : rawItem[primaryKeyField];
items.push(item);
}
}
return Array.isArray(rawItem) ? items : items[0];
// const rawItems: Item[] = Array.isArray(rawItem) ? rawItem : [rawItem];
// let items: Item[] = [];
// if (ast.type === 'm2a') {
// return rawItems
// } else {
// const fields = ast.children
// .filter((child) => child.type === 'field')
// .map((child) => (child as FieldNode).name);
// const nestedNodes = ast.children.filter(
// (child) => child.type !== 'field'
// ) as NestedCollectionNode[];
// items = rawItems.map((item) => parseItem(item, fields, nestedNodes));
// return Array.isArray(rawItem) ? items : items[0];
// }
// function parseItem(rawItem: Item, fields: string[], nestedNodes: NestedCollectionNode[]): Item {
// if (rawItem === null) return rawItem;
// const item = fields.length > 0 ? pick(rawItem, fields) : rawItem.id; /** @TODO */
// for (const nestedNode of nestedNodes) {
// if (item[nestedNode.fieldKey] !== null) {
// item[nestedNode.fieldKey] = removeTemporaryFields(
// rawItem[nestedNode.fieldKey],
// nestedNode,
// );
// }
// }
// return item;
// }
}

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

@@ -126,11 +126,11 @@ export class GraphQLService {
});
if (relationForField) {
const relationType = getRelationType(
relationForField,
collection.collection,
field.field
);
const relationType = getRelationType({
relation: relationForField,
collection: collection.collection,
field: field.field,
});
if (relationType === 'm2o') {
const relatedIsSystem = relationForField.one_collection!.startsWith(
@@ -147,6 +147,7 @@ export class GraphQLService {
const relatedIsSystem = relationForField.many_collection.startsWith(
'directus_'
);
const relatedType = relatedIsSystem
? schema[relationForField.many_collection.substring(9)].type
: schema.items[relationForField.many_collection].type;
@@ -160,8 +161,12 @@ export class GraphQLService {
},
},
};
} else if (relationType === 'm2a') {
fieldsObject[field.field] = {
type: GraphQLString,
};
/** @TODO M2A — Handle m2a case here */
}
/** @TODO M2A — Handle m2a case here */
} else {
fieldsObject[field.field] = {
type: field.schema?.is_primary_key
@@ -259,11 +264,11 @@ export class GraphQLService {
});
if (relationForField) {
const relationType = getRelationType(
relationForField,
collection.collection,
field.field
);
const relationType = getRelationType({
relation: relationForField,
collection: collection.collection,
field: field.field,
});
if (relationType === 'm2o') {
const relatedType = filterTypes[relationForField.one_collection!];

2
api/src/utils/get-relation-type.ts
View File

@@ -7,6 +7,8 @@ export function getRelationType(getRelationOptions: {
}): 'm2o' | 'o2m' | 'm2a' | null {
const { relation, collection, field } = getRelationOptions;
if (!relation) return null;
if (
relation.many_collection === collection &&
relation.many_field === field &&