discourse · yuriyaran · Jul 22, 2025 · Jul 9, 2025 · Jul 17, 2025 · Jul 17, 2025
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
@@ -1,6 +1,9 @@
+import { service } from "@ember/service";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default class AdminSiteSettingsCategoryRoute extends DiscourseRoute {
+  @service router;
+
   model(params) {
     return this.modelFor("adminSiteSettings").filteredSettings.findBy(
       "nameKey",

diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages-user.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages-user.js
@@ -4,6 +4,7 @@ import { i18n } from "discourse-i18n";
 
 export default class extends Controller {
   @service currentUser;
+  @service pmTopicTrackingState;
   @service router;
   @controller user;
 

diff --git a/app/assets/javascripts/discourse/app/instance-initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/app/instance-initializers/subscribe-user-notifications.js
@@ -20,6 +20,7 @@ import Notification from "discourse/models/notification";
 class SubscribeUserNotificationsInit {
   @service currentUser;
   @service messageBus;
+  @service pmTopicTrackingState;
   @service store;
   @service appEvents;
   @service siteSettings;
@@ -67,6 +68,8 @@ class SubscribeUserNotificationsInit {
 
     this.messageBus.subscribe("/client_settings", this.onClientSettings);
 
+    this.pmTopicTrackingState.startTracking();
+
     if (!isTesting()) {
       this.messageBus.subscribe(alertChannel(this.currentUser), this.onAlert);
 

diff --git a/.../javascripts/discourse/app/lib/sidebar/user/community-section/my-messages-section-link.js b/.../javascripts/discourse/app/lib/sidebar/user/community-section/my-messages-section-link.js
@@ -1,7 +1,10 @@
+import { service } from "@ember/service";
 import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
 import { i18n } from "discourse-i18n";
 
 export default class MyMessagesSectionLink extends BaseSectionLink {
+  @service pmTopicTrackingState;
+
   get name() {
     return "my-messages";
   }
@@ -27,6 +30,63 @@ export default class MyMessagesSectionLink extends BaseSectionLink {
     );
   }
 
+  get totalCount() {
+    const newUserMsgs = this._lookupCount({ type: "new", inboxFilter: "user" });
+    const unreadUserMsgs = this._lookupCount({
+      type: "unread",
+      inboxFilter: "user",
+    });
+    const groupMsgsCount = this.currentUser.groupsWithMessages?.reduce(
+      (count, group) => {
+        const newGroupMsgs = this._lookupCount({
+          type: "new",
+          inboxFilter: "group",
+          groupName: group.name,
+        });
+        const unreadGroupMsgs = this._lookupCount({
+          type: "unread",
+          inboxFilter: "group",
+          groupName: group.name,
+        });
+
+        return count + newGroupMsgs + unreadGroupMsgs;
+      },
+      0
+    );
+
+    return newUserMsgs + unreadUserMsgs + groupMsgsCount;
+  }
+
+  _lookupCount({ type, inboxFilter, groupName }) {
+    const opts = { inboxFilter };
+    return this.pmTopicTrackingState.lookupCount(
+      type,
+      groupName ? { ...opts, groupName } : opts
+    );
+  }
+
+  get showCount() {
+    return this.currentUser?.sidebarShowCountOfNewItems;
+  }
+
+  get badgeText() {
+    return this.showCount && this.totalCount;
+  }
+
+  get suffixCSSClass() {
+    return "unread";
+  }
+
+  get suffixType() {
+    return "icon";
+  }
+
+  get suffixValue() {
+    if (!this.showCount && this.totalCount > 0) {
+      return "circle";
+    }
+  }
+
   get shouldDisplay() {
     return this.currentUser?.can_send_private_messages;
   }

diff --git a/app/assets/javascripts/discourse/app/routes/discourse.js b/app/assets/javascripts/discourse/app/routes/discourse.js
@@ -5,7 +5,7 @@ import { service } from "@ember/service";
 import { seenUser } from "discourse/lib/user-presence";
 
 export default class DiscourseRoute extends Route {
-  @service router;
+  @service currentUser;
 
   willTransition() {
     seenUser();

diff --git a/app/assets/javascripts/discourse/app/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js
@@ -11,6 +11,7 @@ import DiscourseRoute from "discourse/routes/discourse";
 export default class TopicFromParams extends DiscourseRoute {
   @service composer;
   @service header;
+  @service router;
 
   // Avoid default model hook
   model(params) {

diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages.js b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
@@ -1,16 +1,9 @@
 import { action } from "@ember/object";
-import { service } from "@ember/service";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default class UserPrivateMessages extends DiscourseRoute {
-  @service composer;
-
   templateName = "user/messages";
 
-  afterModel() {
-    this.pmTopicTrackingState.startTracking();
-  }
-
   @action
   triggerRefresh() {
     this.refresh();

diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-user.gjs b/app/assets/javascripts/discourse/app/templates/user-private-messages-user.gjs
@@ -50,7 +50,6 @@ export default RouteTemplate(
           {{icon "circle-plus"}}
           <span>{{@controller.unreadLinkText}}</span>
         </DNavigationItem>
-
       {{/if}}
 
       <DNavigationItem

diff --git a/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js b/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js
@@ -51,8 +51,8 @@ acceptance("Page tracking - loading slider", function (needs) {
     assertRequests({
       assert,
       tracked: 0,
-      untracked: 0,
-      message: "no requests before app boot",
+      untracked: 1,
+      message: "no tracked requests before app boot",
     });
 
     await visit("/");
@@ -94,8 +94,8 @@ acceptance("Page tracking - loading spinner", function (needs) {
     assertRequests({
       assert,
       tracked: 0,
-      untracked: 0,
-      message: "no requests before app boot",
+      untracked: 1,
+      message: "no tracked requests before app boot",
     });
 
     await visit("/");

diff --git a/spec/system/page_objects/components/navigation_menu/sidebar.rb b/spec/system/page_objects/components/navigation_menu/sidebar.rb
@@ -78,18 +78,28 @@ def my_messages
           I18n.t("js.sidebar.sections.community.links.my_messages.content")
         end
 
+        def my_messages_link_css
+          ".sidebar-section-link[data-link-name='#{my_messages.downcase.parameterize}']"
+        end
+
         def has_my_messages_link?(text = my_messages)
-          page.has_css?(
-            ".sidebar-section-link[data-link-name='#{my_messages.downcase.parameterize}']",
-            text:,
-          )
+          page.has_css?(my_messages_link_css, text:)
         end
 
-        def has_no_my_messages_link?
-          page.has_no_css?(
-            ".sidebar-section-link[data-link-name='#{my_messages.downcase.parameterize}']",
-            text: my_messages,
-          )
+        def has_no_my_messages_link?(text = my_messages)
+          page.has_no_css?(my_messages_link_css, text:)
+        end
+
+        def has_my_messages_link_with_unread_icon?
+          page.has_css?("#{my_messages_link_css} .sidebar-section-link-suffix.icon.unread")
+        end
+
+        def has_my_messages_link_without_unread_icon?
+          page.has_no_css?("#{my_messages_link_css} .sidebar-section-link-suffix.icon.unread")
+        end
+
+        def has_my_messages_link_with_unread_count?
+          page.has_css?("#{my_messages_link_css} .sidebar-section-link-content-badge")
         end
       end
     end

diff --git a/spec/system/page_objects/pages/user_private_messages.rb b/spec/system/page_objects/pages/user_private_messages.rb
@@ -16,6 +16,10 @@ def visit_group_inbox(user, group)
       def has_right_inbox_dropdown_value?(value)
         has_css?(".user-nav-messages-dropdown .combo-box-header[data-name='#{value}']")
       end
+
+      def click_unseen_private_mesage(topic_id)
+        find("tr[data-topic-id='#{topic_id}'] a[data-topic-id='#{topic_id}']").click
+      end
     end
   end
 end
diff --git a/spec/system/viewing_sidebar_spec.rb b/spec/system/viewing_sidebar_spec.rb
@@ -167,7 +167,7 @@
       end
     end
 
-    describe "My messages sidebar link" do
+    describe "when My messages sidebar link" do
       it "should show for user with `can_send_private_messages` permission" do
         sign_in(admin)
         visit("/")
@@ -196,6 +196,34 @@
           expect(sidebar).to have_my_messages_link("Overrided")
         end
       end
+
+      describe "has unread messages" do
+        fab!(:private_message) do
+          Fabricate(:private_message_post, user: user, recipient: admin).topic
+        end
+        let(:user_private_messages_page) { PageObjects::Pages::UserPrivateMessages.new }
+
+        it "should show new messages indicator" do
+          sign_in(admin)
+          visit("/")
+          expect(sidebar).to have_my_messages_link_with_unread_icon
+        end
+
+        it "should show a count of the new items" do
+          admin.user_option.update!(sidebar_show_count_of_new_items: true)
+          sign_in(admin)
+          visit("/")
+          expect(sidebar).to have_my_messages_link_with_unread_count
+        end
+
+        it "should remove unread icon after all messages are read" do
+          sign_in(admin)
+          user_private_messages_page.visit(admin)
+          user_private_messages_page.click_unseen_private_mesage(private_message.id)
+          expect(sidebar).to have_my_messages_link_with_unread_icon
+          try_until_success { expect(sidebar).to have_my_messages_link_without_unread_icon }
+        end
+      end
     end
 
     it "shouldn't display the panel header for the main sidebar" do