From 90f1e2df8020dbb552e414ed26efc687c4ab16ba Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 5 Oct 2022 09:54:32 +0800
Subject: [PATCH] FIX: Link to `discovery.category` in sidebar` (#18467)

`discovery.category` route respects the default view of the category as
configured by `Category#default_view`. `discovery.latestCategory` forces
the latest filter when viewing the category which is not what we want.

https://meta.discourse.org/t/239999
---
 .../user/categories-section/category-section-link.js      | 4 ++--
 .../acceptance/sidebar-user-categories-section-test.js    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
index 365aa1ead5..6fa4638dbc 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js
@@ -37,7 +37,7 @@ export default class CategorySectionLink {
   }
 
   get currentWhen() {
-    return "discovery.unreadCategory discovery.topCategory discovery.newCategory discovery.latestCategory";
+    return "discovery.unreadCategory discovery.topCategory discovery.newCategory discovery.latestCategory discovery.category";
   }
 
   get title() {
@@ -84,7 +84,7 @@ export default class CategorySectionLink {
     } else if (this.totalNew > 0) {
       return "discovery.newCategory";
     } else {
-      return "discovery.latestCategory";
+      return "discovery.category";
     }
   }
 }
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
index 8737c9eb9e..e7e617893e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js
@@ -212,8 +212,8 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       currentURL(),
-      `/c/${category1.slug}/${category1.id}/l/latest`,
-      "it should transition to the category1's discovery page"
+      `/c/${category1.slug}/${category1.id}`,
+      "it should transition to the category1 page"
     );
 
     assert.strictEqual(
@@ -231,8 +231,8 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
 
     assert.strictEqual(
       currentURL(),
-      `/c/${category2.slug}/${category2.id}/l/latest`,
-      "it should transition to the category2's discovery page"
+      `/c/${category2.slug}/${category2.id}`,
+      "it should transition to the category2's page"
     );
 
     assert.strictEqual(