FIX: Navigating to home via route name (#24460)

discourse · Nov 20, 2023 · c5affa9 · c5affa9 · discoursebot · Nov 20, 2023
1 parent 5276afa
commit c5affa9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/app/assets/javascripts/discourse/app/lib/homepage-router-overrides.js b/app/assets/javascripts/discourse/app/lib/homepage-router-overrides.js
@@ -30,7 +30,11 @@ export function homepageDestination() {
 
 function rewriteIfNeeded(url, transition) {
   const intentUrl = transition?.intent?.url;
-  if (intentUrl?.startsWith(homepageDestination())) {
+  if (
+    intentUrl?.startsWith(homepageDestination()) ||
+    (transition?.intent.name === `discovery.${defaultHomepage()}` &&
+      transition?.intent.queryParams["_discourse_homepage_rewrite"])
+  ) {
     const params = url.split("?", 2)[1];
     url = "/";
     if (params) {

diff --git a/app/assets/javascripts/discourse/app/routes/discovery-index.js b/app/assets/javascripts/discourse/app/routes/discovery-index.js
@@ -9,7 +9,7 @@ export default class DiscoveryIndex extends DiscourseRoute {
 
   beforeModel(transition) {
     const url = transition.intent.url;
-    const params = url.split("?", 2)[1];
+    const params = url?.split("?", 2)[1];
     let destination = homepageDestination();
     if (params) {
       destination += `&${params}`;

diff --git a/app/assets/javascripts/discourse/tests/acceptance/homepage-test.js b/app/assets/javascripts/discourse/tests/acceptance/homepage-test.js
@@ -29,6 +29,9 @@ acceptance("Dynamic homepage handling", function () {
     await router.transitionTo("/").followRedirects();
     assertOnLatest("/");
 
+    await router.transitionTo("discovery.index").followRedirects();
+    assertOnLatest("/");
+
     await click(".nav-item_latest a");
     assertOnLatest("/latest");
 
@@ -65,6 +68,9 @@ acceptance("Dynamic homepage handling", function () {
     await router.transitionTo("/").followRedirects();
     assertOnCategories("/");
 
+    await router.transitionTo("discovery.index").followRedirects();
+    assertOnCategories("/");
+
     await click(".nav-item_categories a");
     assertOnCategories("/categories");
   });