Feature/update by pk (#169)

* chore: update package-lock with correct version * chore: update graphql-engine docker-compose hasura/graphql-engine:v2.15.1.cli-migrations-v3 is no longer present in dockerhub * chore: add @apollo/client to the example app Was required in order to link the local ra-data-hasura without runtime issues * feat: use update_resource_by_pk when updating a single resource
hasura · Apr 16, 2024 · 446461d · 446461d
1 parent ad8c5c2
commit 446461d
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 48 deletions.
diff --git a/example/docker-compose.yaml b/example/docker-compose.yaml
@@ -11,7 +11,7 @@ services:
       POSTGRES_PASSWORD: postgrespassword
 
   graphql-engine:
-    image: hasura/graphql-engine:v2.15.1.cli-migrations-v3
+    image: hasura/graphql-engine:v2.15.2.cli-migrations-v3
     volumes:
       - ./hasura/migrations:/hasura-migrations
       - ./hasura/metadata:/hasura-metadata

diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@apollo/client": "^3.9.5",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/buildGqlQuery/index.ts b/src/buildGqlQuery/index.ts
@@ -99,9 +99,27 @@ export const buildGqlQuery: BuildGqlQuery =
       ]);
     }
 
+    if (aorFetchType === UPDATE) {
+      return gqlTypes.document([
+        gqlTypes.operationDefinition(
+          OperationTypeNode.MUTATION,
+          gqlTypes.selectionSet([
+            gqlTypes.field(
+              gqlTypes.name(queryType.name),
+              null,
+              args,
+              null,
+              gqlTypes.selectionSet(fields)
+            ),
+          ]),
+          gqlTypes.name(queryType.name),
+          apolloArgs
+        ),
+      ]);
+    }
+
     if (
       aorFetchType === CREATE ||
-      aorFetchType === UPDATE ||
       aorFetchType === UPDATE_MANY ||
       aorFetchType === DELETE ||
       aorFetchType === DELETE_MANY

diff --git a/src/buildVariables/index.ts b/src/buildVariables/index.ts
@@ -89,7 +89,7 @@ export const buildVariables: BuildVariables =
             params,
             queryType
           ),
-          where: { id: { _eq: params.id } },
+          pk_columns: { id: params.id },
         };
 
       case UPDATE_MANY:

diff --git a/src/customDataProvider/index.ts b/src/customDataProvider/index.ts
@@ -40,7 +40,7 @@ const defaultOptions: Partial<Options> = {
       [GET_MANY]: (resource) => `${resource.name}`,
       [GET_MANY_REFERENCE]: (resource) => `${resource.name}`,
       [CREATE]: (resource) => `insert_${resource.name}`,
-      [UPDATE]: (resource) => `update_${resource.name}`,
+      [UPDATE]: (resource) => `update_${resource.name}_by_pk`,
       [UPDATE_MANY]: (resource) => `update_${resource.name}`,
       [DELETE]: (resource) => `delete_${resource.name}`,
       [DELETE_MANY]: (resource) => `delete_${resource.name}`,

diff --git a/src/getResponseParser/index.ts b/src/getResponseParser/index.ts
@@ -21,7 +21,7 @@ export type GetResponseParser = (
 ) => (res: { data: any }) => QueryResponse;
 
 export const getResponseParser: GetResponseParser =
-  () => (aorFetchType) => (res) => {
+  () => (aorFetchType, resource) => (res) => {
     const response = res.data;
 
     switch (aorFetchType) {
@@ -48,10 +48,11 @@ export const getResponseParser: GetResponseParser =
         return { data: sanitizeResource(response.returning[0]) };
 
       case CREATE:
-      case UPDATE:
       case DELETE:
         return { data: sanitizeResource(response.data.returning[0]) };
 
+      case UPDATE:
+        return { data: sanitizeResource(response[resource!.UPDATE.name]) };
       case UPDATE_MANY:
       case DELETE_MANY:
         return { data: response.data.returning.map((x: { id: any }) => x.id) };