From 6bb77d30553a346c22bc9efb52a977ce7ae0c33a Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 29 Jul 2022 12:31:53 +1000
Subject: [PATCH] FIX: Show bookmarks loading spinner correctly (#17726)

There was a minor issue where the bookmark loading
spinner would not show correctly because of how
the route was handling the setting of loading,
this fixes the issue.
---
 .../app/controllers/user-activity-bookmarks.js       |  2 +-
 .../discourse/app/routes/user-activity-bookmarks.js  | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
index a4221a0087e..093d4ec3122 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity-bookmarks.js
@@ -15,7 +15,7 @@ export default Controller.extend({
 
   application: controller(),
   user: controller(),
-  loading: false,
+  loading: true,
   loadingMore: false,
   permissionDenied: false,
   inSearchMode: notEmpty("q"),
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
index 386b1054663..24d9c851b71 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js
@@ -40,7 +40,8 @@ export default DiscourseRoute.extend({
         this.session.set("bookmarksModel", model);
         return model;
       })
-      .catch(() => controller.set("permissionDenied", true));
+      .catch(() => controller.set("permissionDenied", true))
+      .finally(() => controller.set("loading", false));
   },
 
   renderTemplate() {
@@ -53,15 +54,6 @@ export default DiscourseRoute.extend({
     return true;
   },
 
-  @action
-  loading(transition) {
-    let controller = this.controllerFor("user-activity-bookmarks");
-    controller.set("loading", true);
-    transition.promise.finally(function () {
-      controller.set("loading", false);
-    });
-  },
-
   @action
   triggerRefresh() {
     this.refresh();