FIX: Change bookmarks-with-reminders URL back to bookmarks for user activity (#9566)

* Bookmarks with reminders is a core feature now, no need to have a separate URL
* Keep around the old /u/:username/activity/bookmarks-with-reminders route for backwards compat in Ember but just redirect to user activity bookmarks.

app/assets/javascripts/discourse/app/routes/discovery.js

@@ -18,10 +18,7 @@ export default DiscourseRoute.extend(OpenComposer, {
     // and being based on a different model. better to just redirect
     const url = transition.intent.url;
     if (url === "/bookmarks") {
-      this.transitionTo(
+      this.transitionTo("userActivity.bookmarks", this.currentUser);
-        "userActivity.bookmarksWithReminders",
-        this.currentUser
-      );
     }
 
     if (

app/assets/javascripts/discourse/app/routes/user-activity-bookmarks-with-reminders.js

@@ -1,29 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  noContentHelpKey: "user_activity.no_bookmarks",
+  redirect() {
-
+    this.transitionTo("userActivity.bookmarks");
-  queryParams: {
-    acting_username: { refreshModel: true }
-  },
-
-  model() {
-    return this.modelFor("user").get("bookmarks");
-  },
-
-  renderTemplate() {
-    this.render("user_bookmarks");
-  },
-
-  setupController(controller, model) {
-    controller.set("model", model);
-    controller.loadItems();
-  },
-
-  actions: {
-    didTransition() {
-      this.controllerFor("user-activity")._showFooter();
-      return true;
-    }
   }
 });

app/assets/javascripts/discourse/app/routes/user-activity-bookmarks.js

@@ -1,13 +1,28 @@
-import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
+import DiscourseRoute from "discourse/routes/discourse";
-import UserAction from "discourse/models/user-action";
 
-export default UserActivityStreamRoute.extend({
+export default DiscourseRoute.extend({
-  userActionType: UserAction.TYPES["bookmarks"],
   noContentHelpKey: "user_activity.no_bookmarks",
 
+  queryParams: {
+    acting_username: { refreshModel: true }
+  },
+
+  model() {
+    return this.modelFor("user").get("bookmarks");
+  },
+
+  renderTemplate() {
+    this.render("user_bookmarks");
+  },
+
+  setupController(controller, model) {
+    controller.set("model", model);
+    controller.loadItems();
+  },
+
   actions: {
     didTransition() {
-      this.controllerFor("application").set("showFooter", true);
+      this.controllerFor("user-activity")._showFooter();
       return true;
     }
   }

app/assets/javascripts/discourse/app/templates/user/activity.hbs

@@ -19,7 +19,7 @@
     </li>
     {{#if user.showBookmarks}}
       <li>
-        {{#link-to 'userActivity.bookmarksWithReminders'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
+        {{#link-to "userActivity.bookmarks"}}{{i18n "user_action_groups.3"}}{{/link-to}}
       </li>
     {{/if}}
     {{plugin-outlet

app/assets/javascripts/discourse/app/templates/user/summary.hbs

@@ -27,7 +27,7 @@
         </li>
         {{#if model.bookmark_count}}
           <li class="linked-stat">
-            {{#link-to "userActivity.bookmarksWithReminders"}}
+            {{#link-to "userActivity.bookmarks"}}
               {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}
             {{/link-to}}
           </li>

app/assets/javascripts/discourse/app/widgets/quick-access-bookmarks.js

@@ -16,7 +16,7 @@ createWidgetFrom(QuickAccessPanel, "quick-access-bookmarks", {
   },
 
   showAllHref() {
-    return `${this.attrs.path}/activity/bookmarks-with-reminders`;
+    return `${this.attrs.path}/activity/bookmarks`;
   },
 
   emptyStatePlaceholderItem() {

app/assets/javascripts/discourse/app/widgets/user-menu.js

@@ -62,7 +62,7 @@ createWidget("user-menu-links", {
       label: "user.bookmarks",
       className: "user-bookmarks-link",
       icon: "bookmark",
-      href: `${this.attrs.path}/activity/bookmarks-with-reminders`
+      href: `${this.attrs.path}/activity/bookmarks`
     };
   },
 

plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb

@@ -238,7 +238,7 @@ module DiscourseNarrativeBot
       return unless @post.user_id == self.discobot_user.id
 
       profile_page_url = url_helpers(:user_url, username: @user.username)
-      bookmark_url = "#{profile_page_url}/activity/bookmarks-with-reminders"
+      bookmark_url = "#{profile_page_url}/activity/bookmarks"
       raw = <<~RAW
         #{I18n.t("#{I18N_KEY}.bookmark.reply", i18n_post_args(bookmark_url: bookmark_url))}
 

plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb

@@ -256,7 +256,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
         profile_page_url = "#{Discourse.base_url}/u/#{user.username}"
 
         expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks-with-reminders", base_uri: '')}
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.bookmark.reply', bookmark_url: "#{profile_page_url}/activity/bookmarks", base_uri: '')}
 
           #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.instructions', base_uri: '')}
         RAW

test/javascripts/acceptance/user-bookmarks-test.js

@@ -15,13 +15,13 @@ acceptance("User's bookmarks", {
 });
 
 test("listing user bookmarks", async assert => {
-  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+  await visit("/u/eviltrout/activity/bookmarks");
 
   assert.ok(find(".bookmark-list-item").length);
 });
 
 test("removing a bookmark", async assert => {
-  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+  await visit("/u/eviltrout/activity/bookmarks");
 
   const dropdown = selectKit(".bookmark-actions-dropdown");
   await dropdown.expand();
@@ -44,7 +44,7 @@ test("listing users bookmarks - no bookmarks", async assert => {
     }
   ]);
 
-  await visit("/u/eviltrout/activity/bookmarks-with-reminders");
+  await visit("/u/eviltrout/activity/bookmarks");
 
   assert.equal(find(".alert.alert-info").text(), "no bookmarks");
 });