From 94f1dfef52ba643d83135be8550e0b51da0a449d Mon Sep 17 00:00:00 2001
From: Dan Ribbens <DanRibbens@users.noreply.github.com>
Date: Wed, 24 Apr 2024 15:05:02 -0400
Subject: [PATCH] fix: bulk publish (#6007)

---
 .../src/collections/operations/update.ts      |  2 +-
 .../src/collections/operations/updateByID.ts  |  2 +-
 test/versions/int.spec.ts                     | 20 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/payload/src/collections/operations/update.ts b/packages/payload/src/collections/operations/update.ts
index 83da92765..c73d0c673 100644
--- a/packages/payload/src/collections/operations/update.ts
+++ b/packages/payload/src/collections/operations/update.ts
@@ -275,7 +275,7 @@ export const updateOperation = async <TSlug extends keyof GeneratedTypes['collec
         // Update
         // /////////////////////////////////////
 
-        if (!shouldSaveDraft) {
+        if (!shouldSaveDraft || data._status === 'published') {
           result = await req.payload.db.updateOne({
             id,
             collection: collectionConfig.slug,
diff --git a/packages/payload/src/collections/operations/updateByID.ts b/packages/payload/src/collections/operations/updateByID.ts
index 171c16452..c57bd47ac 100644
--- a/packages/payload/src/collections/operations/updateByID.ts
+++ b/packages/payload/src/collections/operations/updateByID.ts
@@ -261,7 +261,7 @@ export const updateByIDOperation = async <TSlug extends keyof GeneratedTypes['co
     // Update
     // /////////////////////////////////////
 
-    if (!shouldSaveDraft) {
+    if (!shouldSaveDraft || data._status === 'published') {
       result = await req.payload.db.updateOne({
         id,
         collection: collectionConfig.slug,
diff --git a/test/versions/int.spec.ts b/test/versions/int.spec.ts
index 921ca12a2..9c2132cfa 100644
--- a/test/versions/int.spec.ts
+++ b/test/versions/int.spec.ts
@@ -440,6 +440,7 @@ describe('Versions', () => {
           collection,
           data: {
             title: patchedTitle,
+            _status: 'draft',
           },
           draft: true,
           locale: 'en',
@@ -453,6 +454,7 @@ describe('Versions', () => {
           collection,
           data: {
             title: spanishTitle,
+            _status: 'draft',
           },
           draft: true,
           locale: 'es',
@@ -532,9 +534,11 @@ describe('Versions', () => {
           },
         })
 
+        // bulk publish
         const updated = await payload.update({
           collection: draftCollectionSlug,
           data: {
+            _status: 'published',
             description: 'updated description',
           },
           draft: true,
@@ -547,8 +551,20 @@ describe('Versions', () => {
 
         const updatedDoc = updated.docs?.[0]
 
+        // get the published doc
+        const findResult = await payload.find({
+          collection: draftCollectionSlug,
+          where: {
+            id: { equals: doc.id },
+          },
+        })
+
+        const findDoc = findResult.docs?.[0]
+
         expect(updatedDoc.description).toStrictEqual('updated description')
-        expect(updatedDoc.title).toStrictEqual('updated title') // probably will fail
+        expect(updatedDoc.title).toStrictEqual('updated title')
+        expect(findDoc.title).toStrictEqual('updated title')
+        expect(findDoc.description).toStrictEqual('updated description')
       })
     })
 
@@ -1302,6 +1318,7 @@ describe('Versions', () => {
         await payload.updateGlobal({
           slug: globalSlug,
           data: {
+            _status: 'draft',
             title: updatedTitle2,
           },
           draft: true,
@@ -1311,6 +1328,7 @@ describe('Versions', () => {
         await payload.updateGlobal({
           slug: globalSlug,
           data: {
+            _status: 'draft',
             title: updatedTitle2,
           },
           draft: true,