[5.x] Prevent published toast when save failed (#10263)

Co-authored-by: Duncan McClean <duncan@duncanmcclean.com>
statamic · Aug 12, 2024 · 302c69d · 302c69d
1 parent b681fd9
commit 302c69d
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 2 deletions.
diff --git a/resources/js/components/entries/PublishActions.vue b/resources/js/components/entries/PublishActions.vue
@@ -156,6 +156,11 @@ export default {
             this.$axios.post(this.actions.publish, payload)
                 .then(response => {
                     this.saving = false;
+
+                    if (! response.data.saved) {
+                        this.$emit('failed');
+                        return this.$toast.error(__(`Couldn't publish entry`));
+                    }
                     this.$toast.success(__('Published'));
                     this.runAfterPublishHook(response);
                 }).catch(error => this.handleAxiosError(error));
@@ -187,6 +192,13 @@ export default {
             const payload = { message: this.revisionMessage };
 
             this.$axios.post(this.actions.unpublish, { data: payload }).then(response => {
+                this.saving = false;
+
+                if (! response.data.saved) {
+                    this.$emit('failed');
+                    return this.$toast.error(__(`Couldn't unpublish entry`));
+                }
+
                 this.$toast.success(__('Unpublished'));
                 this.revisionMessage = null;
                 this.$emit('saved', { published: false, isWorkingCopy: false, response });

diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
@@ -280,6 +280,7 @@
             @closed="confirmingPublish = false"
             @saving="saving = true"
             @saved="publishActionCompleted"
+            @failed="publishActionFailed"
         />
 
         <confirmation-modal
@@ -810,6 +811,11 @@ export default {
             }
         },
 
+        publishActionFailed() {
+            this.confirmPublish = false;
+            this.saving = false;
+        },
+
         setFieldValue(handle, value) {
             if (this.hasOrigin) this.desyncField(handle);
 

diff --git a/resources/lang/de.json b/resources/lang/de.json
@@ -239,8 +239,10 @@
     "Copy Password Reset Link": "Passwort Zurücksetzen Link kopieren",
     "Copy URL": "URL kopieren",
     "Core": "Core",
+    "Couldn't publish entry": "Eintrag konnte nicht veröffentlicht werden",
     "Couldn't save entry": "Eintrag konnte nicht gespeichert werden",
     "Couldn't save term": "Begriff konnte nicht gespeichert werden",
+    "Couldn't unpublish entry": "Veröffentlichung konnte nicht aufgehoben werden",
     "CP Nav Preferences": "Voreinstellungen CP Navigation",
     "Create": "Erstellen",
     "Create & Link Item": "Eintrag erstellen & verknüpfen",

diff --git a/resources/lang/de_CH.json b/resources/lang/de_CH.json
@@ -239,8 +239,10 @@
     "Copy Password Reset Link": "Passwort Zurücksetzen Link kopieren",
     "Copy URL": "URL kopieren",
     "Core": "Core",
+    "Couldn't publish entry": "Eintrag konnte nicht veröffentlicht werden",
     "Couldn't save entry": "Eintrag konnte nicht gespeichert werden",
     "Couldn't save term": "Begriff konnte nicht gespeichert werden",
+    "Couldn't unpublish entry": "Veröffentlichung konnte nicht aufgehoben werden",
     "CP Nav Preferences": "Voreinstellungen CP Navigation",
     "Create": "Erstellen",
     "Create & Link Item": "Eintrag erstellen & verknüpfen",

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -240,8 +240,10 @@
     "Copy Password Reset Link": "Copier le lien de réinitialisation du mot de passe",
     "Copy URL": "Copier l'URL",
     "Core": "Core",
+    "Couldn't publish entry": "Impossible de publier l'entrée",
     "Couldn't save entry": "Impossible d'enregistrer l'entrée",
     "Couldn't save term": "Impossible d'enregistrer le terme",
+    "Couldn't unpublish entry": "Impossible de dépublier l'entrée",
     "CP Nav Preferences": "Préférences de navigation du CP",
     "Create": "Créer",
     "Create & Link Item": "Créer et lier l'élément",

diff --git a/resources/lang/nl.json b/resources/lang/nl.json
@@ -236,8 +236,10 @@
     "Copy Password Reset Link": "Kopieer wachtwoordresetlink",
     "Copy URL": "Kopieer URL",
     "Core": "Core",
+    "Couldn't publish entry": "Kon de entry niet publiceren",
     "Couldn't save entry": "Kon de entry niet opslaan",
     "Couldn't save term": "Kon de term niet opslaan",
+    "Couldn't unpublish entry": "Kon de entry niet depubliceren",
     "CP Nav Preferences": "CP Nav Instellingen",
     "Create": "Aanmaken",
     "Create & Link Item": "Item aanmaken & linken",

diff --git a/src/Http/Controllers/CP/Collections/PublishedEntriesController.php b/src/Http/Controllers/CP/Collections/PublishedEntriesController.php
@@ -20,6 +20,10 @@ public function store(Request $request, $collection, $entry)
             'user' => User::fromUser($request->user()),
         ]);
 
+        if ($entry === false) {
+            return ['saved' => false];
+        }
+
         $blueprint = $entry->blueprint();
 
         [$values] = $this->extractFromFields($entry, $blueprint);
@@ -28,6 +32,7 @@ public function store(Request $request, $collection, $entry)
             'data' => array_merge((new EntryResource($entry->fresh()))->resolve()['data'], [
                 'values' => $values,
             ]),
+            'saved' => true,
         ];
     }
 
@@ -40,6 +45,10 @@ public function destroy(Request $request, $collection, $entry)
             'user' => User::fromUser($request->user()),
         ]);
 
+        if ($entry === false) {
+            return ['saved' => false];
+        }
+
         $blueprint = $entry->blueprint();
 
         [$values] = $this->extractFromFields($entry, $blueprint);
@@ -48,6 +57,7 @@ public function destroy(Request $request, $collection, $entry)
             'data' => array_merge((new EntryResource($entry->fresh()))->resolve()['data'], [
                 'values' => $values,
             ]),
+            'saved' => true,
         ];
     }
 }
diff --git a/src/Revisions/Revisable.php b/src/Revisions/Revisable.php
@@ -78,11 +78,15 @@ public function publishWorkingCopy($options = [])
             $item->remove('parent');
         }
 
-        $item
+        $saved = $item
             ->published(true)
             ->updateLastModified($user = $options['user'] ?? false)
             ->save();
 
+        if (! $saved) {
+            return false;
+        }
+
         if ($item instanceof Entry && $item->collection()->hasStructure() && $parent) {
             $tree = $item->collection()->structure()->in($item->locale());
 
@@ -111,11 +115,15 @@ public function unpublishWorkingCopy($options = [])
     {
         $item = $this->fromWorkingCopy();
 
-        $item
+        $saved = $item
             ->published(false)
             ->updateLastModified($user = $options['user'] ?? false)
             ->save();
 
+        if (! $saved) {
+            return false;
+        }
+
         $item
             ->makeRevision()
             ->user($user)