github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-01 16:24:59 -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

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!];