From b4b1b67cb37ba0947b5b3e0d66cf268d62da6534 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 20 May 2025 22:59:23 +0200
Subject: [PATCH 1/5] DEV: allows to pass `@currentWhen` to `NavItem`

Some cases are more complex than the default behavior of `this.router.isActive(this.args.route)`, in this case you can give a function as `@currentWhen` to your `NavItem` component.

Example:

```
@action
isItCurrent(route) {
  return true;
}

<template>
  <NavItem @i18nLabel="test" @currentWhen={{this.isItCurrent}} />
</template>
```

No test as I can't write a component test for this as it relies on the router.
---
 .../admin/addon/components/admin-badges.gjs        |  9 +++++++++
 .../discourse/app/components/nav-item.gjs          | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/admin-badges.gjs b/app/assets/javascripts/admin/addon/components/admin-badges.gjs
index 385bedad4fbec..ff7c0d277e66a 100644
--- a/app/assets/javascripts/admin/addon/components/admin-badges.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-badges.gjs
@@ -27,6 +27,14 @@ export default class AdminBadges extends Component {
     });
   }
 
+  @action
+  activeBadges(currentRoute) {
+    return (
+      currentRoute.name === "adminBadges.index" ||
+      currentRoute.name === "adminBadges.show"
+    );
+  }
+
   <template>
     <div class="badges">
       <DPageHeader
@@ -75,6 +83,7 @@ export default class AdminBadges extends Component {
           <NavItem
             @route="adminBadges.index"
             @label="admin.config.badges.title"
+            @currentWhen={{this.activeBadges}}
             class="admin-badges-tabs__index"
           />
         </:tabs>
diff --git a/app/assets/javascripts/discourse/app/components/nav-item.gjs b/app/assets/javascripts/discourse/app/components/nav-item.gjs
index bbe77b49d3698..b42eecd64dacc 100644
--- a/app/assets/javascripts/discourse/app/components/nav-item.gjs
+++ b/app/assets/javascripts/discourse/app/components/nav-item.gjs
@@ -24,6 +24,10 @@ export default class NavItem extends Component {
       return;
     }
 
+    if (this.args.currentWhen) {
+      return this.args.currentWhen(this.router.currentRoute);
+    }
+
     if (this.args.routeParam) {
       // This is needed because the setting route is underneath /admin/plugins/:plugin_id,
       // but is not a child route of the plugin routes themselves. E.g. discourse-ai
@@ -58,9 +62,15 @@ export default class NavItem extends Component {
           @current-when={{this.active}}
         >{{this.contents}}</LinkTo>
       {{else if @route}}
-        <LinkTo @route={{@route}}>{{this.contents}}</LinkTo>
+        <LinkTo
+          @route={{@route}}
+          @current-when={{this.active}}
+        >{{this.contents}}</LinkTo>
       {{else}}
-        <a href={{getURL @path}} data-auto-route="true">{{this.contents}}</a>
+        <a
+          href={{getURL @path}}
+          data-auto-route="admin.badges"
+        >{{this.contents}}</a>
       {{/if}}
     </li>
   </template>

From bbb59cadf0e986807151afe5cb95de1442253647 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 20 May 2025 23:07:31 +0200
Subject: [PATCH 2/5] mistake

---
 app/assets/javascripts/discourse/app/components/nav-item.gjs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/nav-item.gjs b/app/assets/javascripts/discourse/app/components/nav-item.gjs
index b42eecd64dacc..64751b96386ec 100644
--- a/app/assets/javascripts/discourse/app/components/nav-item.gjs
+++ b/app/assets/javascripts/discourse/app/components/nav-item.gjs
@@ -67,10 +67,7 @@ export default class NavItem extends Component {
           @current-when={{this.active}}
         >{{this.contents}}</LinkTo>
       {{else}}
-        <a
-          href={{getURL @path}}
-          data-auto-route="admin.badges"
-        >{{this.contents}}</a>
+        <a href={{getURL @path}} data-auto-route="true">{{this.contents}}</a>
       {{/if}}
     </li>
   </template>

From ad7a37a11002c332c45f1757d05aa09809356fc5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 21 May 2025 00:00:01 +0200
Subject: [PATCH 3/5] mimic current-when

---
 .../admin/addon/components/admin-badges.gjs      | 10 +---------
 .../discourse/app/components/nav-item.gjs        | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/admin-badges.gjs b/app/assets/javascripts/admin/addon/components/admin-badges.gjs
index ff7c0d277e66a..9680c7c0227fd 100644
--- a/app/assets/javascripts/admin/addon/components/admin-badges.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-badges.gjs
@@ -27,14 +27,6 @@ export default class AdminBadges extends Component {
     });
   }
 
-  @action
-  activeBadges(currentRoute) {
-    return (
-      currentRoute.name === "adminBadges.index" ||
-      currentRoute.name === "adminBadges.show"
-    );
-  }
-
   <template>
     <div class="badges">
       <DPageHeader
@@ -83,7 +75,7 @@ export default class AdminBadges extends Component {
           <NavItem
             @route="adminBadges.index"
             @label="admin.config.badges.title"
-            @currentWhen={{this.activeBadges}}
+            @currentWhen="adminBadges.show adminBadges.index"
             class="admin-badges-tabs__index"
           />
         </:tabs>
diff --git a/app/assets/javascripts/discourse/app/components/nav-item.gjs b/app/assets/javascripts/discourse/app/components/nav-item.gjs
index 64751b96386ec..a9dc0f27c113a 100644
--- a/app/assets/javascripts/discourse/app/components/nav-item.gjs
+++ b/app/assets/javascripts/discourse/app/components/nav-item.gjs
@@ -3,6 +3,7 @@ import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
+import { isPresent } from "@ember/utils";
 import concatClass from "discourse/helpers/concat-class";
 import getURL from "discourse/lib/get-url";
 import { iconHTML } from "discourse/lib/icon-library";
@@ -24,8 +25,19 @@ export default class NavItem extends Component {
       return;
     }
 
-    if (this.args.currentWhen) {
-      return this.args.currentWhen(this.router.currentRoute);
+    if (isPresent(this.args.currentWhen)) {
+      const input = this.args.currentWhen;
+
+      if (typeof input === "boolean") {
+        return input;
+      }
+
+      const routes = input.split(" ").filter(Boolean);
+      if (routes.length) {
+        return routes.some((str) => str === this.router.currentRoute.name);
+      }
+
+      return false;
     }
 
     if (this.args.routeParam) {

From 88a582da0a632a0e92557ce25fcfa2de06cee596 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 21 May 2025 00:10:50 +0200
Subject: [PATCH 4/5] safer behavior

---
 app/assets/javascripts/discourse/app/components/nav-item.gjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/nav-item.gjs b/app/assets/javascripts/discourse/app/components/nav-item.gjs
index a9dc0f27c113a..6808cb83a1189 100644
--- a/app/assets/javascripts/discourse/app/components/nav-item.gjs
+++ b/app/assets/javascripts/discourse/app/components/nav-item.gjs
@@ -32,8 +32,8 @@ export default class NavItem extends Component {
         return input;
       }
 
-      const routes = input.split(" ").filter(Boolean);
-      if (routes.length) {
+      const routes = input?.split?.(" ")?.filter(Boolean);
+      if (routes?.length) {
         return routes.some((str) => str === this.router.currentRoute.name);
       }
 

From b16897a7768b60286a6311ad423b057b7aeac444 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 21 May 2025 00:13:12 +0200
Subject: [PATCH 5/5] simpler implementation

---
 .../discourse/app/components/nav-item.gjs     | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/nav-item.gjs b/app/assets/javascripts/discourse/app/components/nav-item.gjs
index 6808cb83a1189..6847c544d0a7f 100644
--- a/app/assets/javascripts/discourse/app/components/nav-item.gjs
+++ b/app/assets/javascripts/discourse/app/components/nav-item.gjs
@@ -26,18 +26,16 @@ export default class NavItem extends Component {
     }
 
     if (isPresent(this.args.currentWhen)) {
-      const input = this.args.currentWhen;
-
-      if (typeof input === "boolean") {
-        return input;
-      }
-
-      const routes = input?.split?.(" ")?.filter(Boolean);
-      if (routes?.length) {
-        return routes.some((str) => str === this.router.currentRoute.name);
+      const currentWhen = this.args.currentWhen;
+      if (typeof currentWhen === "boolean") {
+        return currentWhen;
+      } else if (typeof currentWhen === "string") {
+        return currentWhen
+          .split(" ")
+          .some((route) => route === this.router.currentRoute.name);
+      } else {
+        return false;
       }
-
-      return false;
     }
 
     if (this.args.routeParam) {