From 26df6dfc5f875a2cd9993b12135522f1d579c3a3 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Fri, 8 Mar 2024 09:26:09 +0800
Subject: [PATCH] UX: Don't hide new navigation item in experimental new new
 view (#26094)

Why this change?

Before this change, the new navigation item in the topic list will be
hidden when there are no new or unread topics for the user. We have
started to find this behaviour confusing UX wise so we decided to stop
hiding it.
---
 .../discourse/app/components/navigation-item.js           | 8 ++++----
 spec/system/dismissing_new_spec.rb                        | 4 ++++
 .../system/page_objects/components/topic_list_controls.rb | 5 +++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/navigation-item.js b/app/assets/javascripts/discourse/app/components/navigation-item.js
index 15c20e55e95..6ef9379c960 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-item.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-item.js
@@ -32,14 +32,14 @@ export default Component.extend({
     return contentFilterType === filterType;
   },
 
-  @discourseComputed("content.count")
-  isHidden(count) {
+  @discourseComputed("content.count", "content.name")
+  isHidden(count, name) {
     return (
       !this.active &&
       this.currentUser &&
+      !this.currentUser.new_new_view_enabled &&
       this.currentUser.trust_level > 0 &&
-      (this.content.get("name") === "new" ||
-        this.content.get("name") === "unread") &&
+      (name === "new" || name === "unread") &&
       count < 1
     );
   },
diff --git a/spec/system/dismissing_new_spec.rb b/spec/system/dismissing_new_spec.rb
index 4fdc10d101e..898e8ad10a0 100644
--- a/spec/system/dismissing_new_spec.rb
+++ b/spec/system/dismissing_new_spec.rb
@@ -110,6 +110,10 @@ RSpec.describe "Dismissing New", type: :system do
       expect(topic_list_controls).to have_new(count: 0)
 
       using_session(:tab_1) { expect(topic_list_controls).to have_new(count: 0) }
+
+      topic_list_controls.click_latest
+
+      expect(topic_list_controls).to have_new(count: 0)
     end
 
     it "displays confirmation modal with preselected options" do
diff --git a/spec/system/page_objects/components/topic_list_controls.rb b/spec/system/page_objects/components/topic_list_controls.rb
index b5daea5b614..d5066343eac 100644
--- a/spec/system/page_objects/components/topic_list_controls.rb
+++ b/spec/system/page_objects/components/topic_list_controls.rb
@@ -36,6 +36,11 @@ module PageObjects
         click_button("dismiss-new-top")
         self
       end
+
+      def click_latest
+        find(".nav-item_latest").click
+        self
+      end
     end
   end
 end