fix(core): remove id from patch when using server actions (#6751)

sanity-io · May 23, 2024 · 7b90cad · 7b90cad
1 parent cca14f3
commit 7b90cad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/dev/test-studio/sanity.config.ts b/dev/test-studio/sanity.config.ts
@@ -149,7 +149,9 @@ export default defineConfig([
     basePath: '/test',
     icon: SanityMonogram,
     // eslint-disable-next-line camelcase
-    __internal_serverDocumentActions: {},
+    __internal_serverDocumentActions: {
+      enabled: true,
+    },
     scheduledPublishing: {
       enabled: true,
       inputDateTimeFormat: 'MM/dd/yy h:mm a',

diff --git a/packages/sanity/src/core/store/_legacy/document/document-pair/actionTypes.ts b/packages/sanity/src/core/store/_legacy/document/document-pair/actionTypes.ts
@@ -20,7 +20,7 @@ export interface HttpEditAction {
   actionType: 'sanity.action.document.edit'
   draftId: string
   publishedId: string
-  patch: PatchMutation['patch']
+  patch: Omit<PatchMutation['patch'], 'id'>
 }
 
 export type HttpAction = HttpCreateAction | HttpDeleteAction | HttpEditAction
diff --git a/packages/sanity/src/core/store/_legacy/document/document-pair/checkoutPair.test.ts b/packages/sanity/src/core/store/_legacy/document/document-pair/checkoutPair.test.ts
@@ -247,7 +247,6 @@ describe('checkoutPair -- server actions', () => {
             draftId: 'draftId',
             publishedId: 'publishedId',
             patch: {
-              id: 'draftId',
               set: {
                 title: 'new title',
               },

diff --git a/packages/sanity/src/core/store/_legacy/document/document-pair/checkoutPair.ts b/packages/sanity/src/core/store/_legacy/document/document-pair/checkoutPair.ts
@@ -1,6 +1,7 @@
 import {type SanityClient} from '@sanity/client'
 import {type Mutation} from '@sanity/mutator'
 import {type SanityDocument} from '@sanity/types'
+import {omit} from 'lodash'
 import {EMPTY, from, merge, type Observable, Subject} from 'rxjs'
 import {filter, map, mergeMap, share, take, tap} from 'rxjs/operators'
 
@@ -121,7 +122,7 @@ function toActions(idPair: IdPair, mutationParams: Mutation['params']) {
         actionType: 'sanity.action.document.edit',
         draftId: idPair.draftId,
         publishedId: idPair.publishedId,
-        patch: mutations.patch,
+        patch: omit(mutations.patch, 'id'),
       }
     }
     throw new Error('Todo: implement')