Merge pull request #8 from panter/fix/fields-with-mandatory-args

fix: don't try to fetch fields with mandatory args
panter · May 1, 2020 · be9d54a · be9d54a
2 parents fe49bff + 2acb2e9
commit be9d54a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/packages/dataprovider/generated/nexus.ts b/packages/dataprovider/generated/nexus.ts
@@ -201,6 +201,7 @@ export interface NexusGenRootTypes {
     gender?: NexusGenEnums['Gender'] | null; // Gender
     id: string; // String!
     lastName?: string | null; // String
+    logs: string[]; // [String!]!
     yearOfBirth?: number | null; // Int
   }
   UserRole: { // root type
@@ -265,6 +266,7 @@ export interface NexusGenFieldTypes {
     gender: NexusGenEnums['Gender'] | null; // Gender
     id: string; // String!
     lastName: string | null; // String
+    logs: string[]; // [String!]!
     roles: NexusGenRootTypes['UserRole'][]; // [UserRole!]!
     yearOfBirth: number | null; // Int
   }
@@ -313,6 +315,10 @@ export interface NexusGenArgTypes {
     }
   }
   User: {
+    logs: { // args
+      from: string; // String!
+      to: string; // String!
+    }
     roles: { // args
       after?: NexusGenInputs['UserRoleWhereUniqueInput'] | null; // UserRoleWhereUniqueInput
       before?: NexusGenInputs['UserRoleWhereUniqueInput'] | null; // UserRoleWhereUniqueInput

diff --git a/packages/dataprovider/generated/schema.graphql b/packages/dataprovider/generated/schema.graphql
@@ -77,6 +77,7 @@ type User {
   gender: Gender
   id: String!
   lastName: String
+  logs(from: String!, to: String!): [String!]!
   roles(after: UserRoleWhereUniqueInput, before: UserRoleWhereUniqueInput, first: Int, last: Int, skip: Int, where: UserRoleWhereInput): [UserRole!]!
   yearOfBirth: Int
 }

diff --git a/packages/dataprovider/src/buildGqlQuery.ts b/packages/dataprovider/src/buildGqlQuery.ts
@@ -33,6 +33,10 @@ export const buildFields = (introspectionResults: IntrospectionResult) => (
     if (type.name.startsWith("_")) {
       return acc;
     }
+    // skip if the field has mandatory args
+    if (field.args.some((arg) => arg.type.kind === "NON_NULL")) {
+      return acc;
+    }
 
     if (type.kind !== TypeKind.OBJECT) {
       return [...acc, gqlTypes.field(gqlTypes.name(field.name))];

diff --git a/packages/dataprovider/test-data/testSchema.ts b/packages/dataprovider/test-data/testSchema.ts
@@ -1,4 +1,4 @@
-import { makeSchema, objectType } from "@nexus/schema";
+import { makeSchema, objectType, stringArg } from "@nexus/schema";
 import { nexusPrismaPlugin } from "nexus-prisma";
 import { join } from "path";
 import { addCrudResolvers } from "../../backend/src";
@@ -17,6 +17,14 @@ const User = objectType({
     t.model.yearOfBirth();
     t.model.roles({ filtering: true });
     t.model.gender();
+    // add one field that needs arguments and therefore can't be used by react-admin
+    t.list.field("logs", {
+      type: "String",
+      args: {
+        from: stringArg({ required: true }),
+        to: stringArg({ required: true }),
+      },
+    });
   },
 });
 const UserRole = objectType({