[4.x] Prevent showing "Saved" toast message when listener cancels save (#9040)

* Prevent showing "Saved" toast message when listener prevents saving

* Apply the same fix to taxonomy terms

* Change approach: Pass saved state in the response, then toast from the JS

* Do the same for terms

* Support `RevisionSaving`

* Support `GlobalSetSaving`

* Support `UserSaving`

Author: duncanmcclean

resources/js/components/entries/PublishForm.vue

@@ -538,6 +538,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, payload).then(response => {
                 this.saving = false;
+                if (! response.data.saved) {
+                    return this.$toast.error(__(`Couldn't save entry`));
+                }
                 this.title = response.data.data.title;
                 this.isWorkingCopy = true;
                 if (this.isBase) {

resources/js/components/globals/PublishForm.vue

@@ -222,6 +222,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, payload).then(response => {
                 this.saving = false;
+                if (!response.data.saved) {
+                    return this.$toast.error(`Couldn't save global set`)
+                }
                 if (!this.isCreating) this.$toast.success(__('Saved'));
                 this.$refs.container.saved();
                 this.runAfterSaveHook(response);

resources/js/components/terms/PublishForm.vue

@@ -445,6 +445,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, payload).then(response => {
                 this.saving = false;
+                if (! response.data.saved) {
+                    return this.$toast.error(__(`Couldn't save term`));
+                }
                 this.title = response.data.data.title;
                 this.permalink = response.data.data.permalink;
                 this.isWorkingCopy = true;

resources/js/components/users/PublishForm.vue

@@ -111,6 +111,9 @@ export default {
 
             this.$axios[this.method](this.actions.save, this.visibleValues).then(response => {
                 this.title = response.data.title;
+                if (!response.data.saved) {
+                    return this.$toast.error(`Couldn't save user`)
+                }
                 if (!this.isCreating) this.$toast.success(__('Saved'));
                 this.$refs.container.saved();
                 this.$nextTick(() => this.$emit('saved', response));

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -242,7 +242,7 @@ public function update(Request $request, $collection, $entry)
         $this->validateUniqueUri($entry, $tree ?? null, $parent ?? null);
 
         if ($entry->revisionsEnabled() && $entry->published()) {
-            $entry
+            $saved = $entry
                 ->makeWorkingCopy()
                 ->user(User::current())
                 ->save();
@@ -254,13 +254,14 @@ public function update(Request $request, $collection, $entry)
                 $entry->published($request->published);
             }
 
-            $entry->updateLastModified(User::current())->save();
+            $saved = $entry->updateLastModified(User::current())->save();
         }
 
         [$values] = $this->extractFromFields($entry, $blueprint);
 
         return (new EntryResource($entry->fresh()))
             ->additional([
+                'saved' => $saved,
                 'data' => [
                     'values' => $values,
                 ],
@@ -394,15 +395,16 @@ public function store(Request $request, $collection, $site)
         $this->validateUniqueUri($entry, $tree ?? null, $parent ?? null);
 
         if ($entry->revisionsEnabled()) {
-            $entry->store([
+            $saved = $entry->store([
                 'message' => $request->message,
                 'user' => User::current(),
             ]);
         } else {
-            $entry->updateLastModified(User::current())->save();
+            $saved = $entry->updateLastModified(User::current())->save();
         }
 
-        return new EntryResource($entry);
+        return (new EntryResource($entry))
+            ->additional(['saved' => $saved]);
     }
 
     private function resolveSlug($request)

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -104,9 +104,11 @@ public function update(Request $request, $handle)
 
         $set->data($values);
 
-        $set->globalSet()->addLocalization($set)->save();
+        $save = $set->globalSet()->addLocalization($set)->save();
 
-        return response('', 204);
+        return response()->json([
+            'saved' => is_bool($save) ? $save : true,
+        ]);
     }
 
     protected function extractFromFields($set, $blueprint)

src/Http/Controllers/CP/Taxonomies/TermsController.php

@@ -195,10 +195,11 @@ public function update(Request $request, $taxonomy, $term, $site)
                 $term->published($request->published);
             }
 
-            $term->updateLastModified(User::current())->save();
+            $saved = $term->updateLastModified(User::current())->save();
         }
 
-        return new TermResource($term);
+        return (new TermResource($term))
+            ->additional(['saved' => $saved]);
     }
 
     public function create(Request $request, $taxonomy, $site)
@@ -299,10 +300,11 @@ public function store(Request $request, $taxonomy, $site)
                 'user' => User::current(),
             ]);
         } else {
-            $term->updateLastModified(User::current())->save();
+            $saved = $term->updateLastModified(User::current())->save();
         }
 
-        return new TermResource($term);
+        return (new TermResource($term))
+            ->additional(['saved' => $saved]);
     }
 
     protected function extractFromFields($term, $blueprint)

src/Http/Controllers/CP/Users/UsersController.php

@@ -283,9 +283,12 @@ public function update(Request $request, $user)
             $user->groups($request->groups);
         }
 
-        $user->save();
+        $save = $user->save();
 
-        return ['title' => $user->title()];
+        return [
+            'title' => $user->title(),
+            'saved' => is_bool($save) ? $save : true,
+        ];
     }
 
     public function destroy($user)

src/Revisions/Revisable.php

@@ -116,7 +116,7 @@ public function store($options = [])
             ->updateLastModified($user = $options['user'] ?? false)
             ->save();
 
-        $this
+        return $this
             ->makeRevision()
             ->user($user)
             ->message($options['message'] ?? false)

src/Revisions/Revision.php

@@ -138,6 +138,8 @@ public function save()
         Revisions::save($this);
 
         RevisionSaved::dispatch($this);
+
+        return true;
     }
 
     public function delete()