Improve graphql dataProviders

examples/demo/src/dataProvider/graphql.ts

@@ -2,7 +2,8 @@ import { ApolloQueryResult } from '@apollo/client';
 import buildApolloClient, {
     buildQuery as buildQueryFactory,
 } from 'ra-data-graphql-simple';
-import { DELETE, LegacyDataProvider } from 'react-admin';
+import { BuildQuery } from 'ra-data-graphql';
+import { DataProvider, DELETE } from 'react-admin';
 import gql from 'graphql-tag';
 import {
     IntrospectionField,
@@ -48,7 +49,7 @@ interface IntrospectionResults {
 
 const customBuildQuery = (
     introspectionResults: IntrospectionResults
-): LegacyDataProvider => {
+): BuildQuery => {
     const buildQuery = buildQueryFactory(introspectionResults);
 
     return (type, resource, params) => {
@@ -88,7 +89,26 @@ export default async () => {
         buildQuery: customBuildQuery,
     });
 
-    return (type: string, resource: string, params: any) => {
-        return dataProvider(type, getGqlResource(resource), params);
-    };
+    return new Proxy<DataProvider>(defaultDataProvider, {
+        get: (target, name) => {
+            if (typeof name === 'symbol' || name === 'then') {
+                return;
+            }
+            return async (resource: string, params: any) => {
+                return dataProvider[name](getGqlResource(resource), params);
+            };
+        },
+    });
+};
+// Only used to initialize proxy
+const defaultDataProvider: DataProvider = {
+    create: () => Promise.reject({ data: null }), // avoids adding a context in tests
+    delete: () => Promise.reject({ data: null }), // avoids adding a context in tests
+    deleteMany: () => Promise.resolve({ data: [] }), // avoids adding a context in tests
+    getList: () => Promise.resolve({ data: [], total: 0 }), // avoids adding a context in tests
+    getMany: () => Promise.resolve({ data: [] }), // avoids adding a context in tests
+    getManyReference: () => Promise.resolve({ data: [], total: 0 }), // avoids adding a context in tests
+    getOne: () => Promise.reject({ data: null }), // avoids adding a context in tests
+    update: () => Promise.reject({ data: null }), // avoids adding a context in tests
+    updateMany: () => Promise.resolve({ data: [] }), // avoids adding a context in tests
 };

examples/demo/src/dataProvider/index.ts

@@ -1,8 +1,4 @@
-import {
-    convertLegacyDataProvider,
-    DataProvider,
-    LegacyDataProvider,
-} from 'react-admin';
+import { DataProvider } from 'react-admin';
 import fakeServerFactory from '../fakeServer';
 
 export default (type: string) => {
@@ -20,12 +16,6 @@ export default (type: string) => {
         get(_, name) {
             return (resource: string, params: any) => {
                 return dataProviderPromise.then(dataProvider => {
-                    // We have to convert the dataProvider here otherwise the proxy would try to intercept the promise resolution
-                    if (typeof dataProvider === 'function') {
-                        return convertLegacyDataProvider(dataProvider)[
-                            name.toString()
-                        ](resource, params);
-                    }
                     return dataProvider[name.toString()](resource, params);
                 });
             };
@@ -35,9 +25,7 @@ export default (type: string) => {
     return dataProviderWithGeneratedData;
 };
 
-const getDataProvider = async (
-    type: string
-): Promise<DataProvider | LegacyDataProvider> => {
+const getDataProvider = async (type: string): Promise<DataProvider> => {
     await fakeServerFactory(process.env.REACT_APP_DATA_PROVIDER || '');
     /**
      * This demo can work with either a fake REST server, or a fake GraphQL server.

packages/ra-core/src/dataProvider/useDataProvider.ts

@@ -120,7 +120,7 @@ const useDataProvider = <
     const dataProviderProxy = useMemo<DataProviderProxy<TDataProvider>>(() => {
         return new Proxy(dataProvider, {
             get: (target, name) => {
-                if (typeof name === 'symbol') {
+                if (typeof name === 'symbol' || name === 'then') {
                     return;
                 }
                 return (...args) => {

packages/ra-data-graphql-simple/README.md

@@ -3,6 +3,8 @@
 A GraphQL data provider for [react-admin](https://github.com/marmelab/react-admin/)
 built with [Apollo](https://www.apollodata.com/) and tailored to target a simple GraphQL implementation.
 
+**This is an example implementation to show how to build a graphql adapter using `ra-data-graphql`.**
+
 - [Installation](#installation)
 - [Usage](#installation)
 - [Options](#options)

packages/ra-data-graphql-simple/src/buildGqlQuery.test.js → packages/ra-data-graphql-simple/src/buildGqlQuery.test.ts

@@ -67,7 +67,7 @@ describe('getArgType', () => {
 
 describe('buildArgs', () => {
     it('returns an empty array when query does not have any arguments', () => {
-        expect(buildArgs({ args: [] })).toEqual([]);
+        expect(buildArgs({ args: [] }, {})).toEqual([]);
     });
 
     it('returns an array of args correctly filtered when query has arguments', () => {
@@ -84,7 +84,7 @@ describe('buildArgs', () => {
 
 describe('buildApolloArgs', () => {
     it('returns an empty array when query does not have any arguments', () => {
-        expect(print(buildApolloArgs({ args: [] }))).toEqual([]);
+        expect(print(buildApolloArgs({ args: [] }, {}))).toEqual([]);
     });
 
     it('returns an array of args correctly filtered when query has arguments', () => {