From 334a2f216f0c365d97bd3d390ca89f195aea9323 Mon Sep 17 00:00:00 2001
From: Blake Erickson <o.blakeerickson@gmail.com>
Date: Thu, 11 Apr 2024 15:54:28 -0600
Subject: [PATCH] FEATURE: User Notifications Links Page (#26609)

---
 .../app/lib/notification-types/linked-consolidated.js |  5 +++--
 .../javascripts/discourse/app/models/user-action.js   |  1 +
 .../javascripts/discourse/app/routes/app-route-map.js |  1 +
 .../discourse/app/routes/user-notifications-links.js  | 11 +++++++++++
 .../discourse/app/templates/user/notifications.hbs    |  9 +++++++++
 .../notification-types/linked-consolidated-test.js    |  2 +-
 app/models/user_action.rb                             |  3 +++
 app/services/user_action_manager.rb                   |  2 ++
 config/locales/client.en.yml                          |  1 +
 9 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/routes/user-notifications-links.js

diff --git a/app/assets/javascripts/discourse/app/lib/notification-types/linked-consolidated.js b/app/assets/javascripts/discourse/app/lib/notification-types/linked-consolidated.js
index bfe4a896108..9ea8fcf43ce 100644
--- a/app/assets/javascripts/discourse/app/lib/notification-types/linked-consolidated.js
+++ b/app/assets/javascripts/discourse/app/lib/notification-types/linked-consolidated.js
@@ -4,8 +4,9 @@ import I18n from "discourse-i18n";
 
 export default class extends NotificationTypeBase {
   get linkHref() {
-    // Linking here for now until we have a proper new page for "linked" in the profile
-    return userPath(`${this.currentUser.username}/notifications`);
+    return userPath(
+      `${this.currentUser.username}/notifications/links?acting_username=${this.notification.data.username}`
+    );
   }
 
   get description() {
diff --git a/app/assets/javascripts/discourse/app/models/user-action.js b/app/assets/javascripts/discourse/app/models/user-action.js
index aa194418313..4891b3bc812 100644
--- a/app/assets/javascripts/discourse/app/models/user-action.js
+++ b/app/assets/javascripts/discourse/app/models/user-action.js
@@ -19,6 +19,7 @@ const UserActionTypes = {
   edits: 11,
   messages_sent: 12,
   messages_received: 13,
+  links: 17,
 };
 const InvertedActionTypes = {};
 
diff --git a/app/assets/javascripts/discourse/app/routes/app-route-map.js b/app/assets/javascripts/discourse/app/routes/app-route-map.js
index 727026cade5..226aed8d478 100644
--- a/app/assets/javascripts/discourse/app/routes/app-route-map.js
+++ b/app/assets/javascripts/discourse/app/routes/app-route-map.js
@@ -140,6 +140,7 @@ export default function () {
           this.route("likesReceived", { path: "likes-received" });
           this.route("mentions");
           this.route("edits");
+          this.route("links");
         }
       );
 
diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications-links.js b/app/assets/javascripts/discourse/app/routes/user-notifications-links.js
new file mode 100644
index 00000000000..16940719640
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/routes/user-notifications-links.js
@@ -0,0 +1,11 @@
+import UserAction from "discourse/models/user-action";
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
+import I18n from "discourse-i18n";
+
+export default UserActivityStreamRoute.extend({
+  userActionType: UserAction.TYPES["links"],
+
+  titleToken() {
+    return I18n.t("user_action_groups.17");
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 0ecd1a5a7d0..6df0e7e85a6 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -53,6 +53,15 @@
       <span>{{i18n "user_action_groups.11"}}</span>
     </DNavigationItem>
 
+    <DNavigationItem
+      @route="userNotifications.links"
+      @ariaCurrentContext="subNav"
+      class="user-nav__notifications-links"
+    >
+      {{d-icon "link"}}
+      <span>{{i18n "user_action_groups.17"}}</span>
+    </DNavigationItem>
+
     <PluginOutlet
       @name="user-notifications-bottom"
       @connectorTagName="li"
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/notification-types/linked-consolidated-test.js b/app/assets/javascripts/discourse/tests/unit/lib/notification-types/linked-consolidated-test.js
index 26cf97209af..6b254536fcc 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/notification-types/linked-consolidated-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/notification-types/linked-consolidated-test.js
@@ -43,7 +43,7 @@ module("Unit | Notification Types | linked-consolidated", function (hooks) {
     );
     assert.strictEqual(
       director.linkHref,
-      "/u/eviltrout/notifications",
+      "/u/eviltrout/notifications/links?acting_username=liker439",
       "links to the notifications page of the user"
     );
   });
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 8c4e8d3709e..b17740e80a2 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -22,6 +22,7 @@ class UserAction < ActiveRecord::Base
   GOT_PRIVATE_MESSAGE = 13
   SOLVED = 15
   ASSIGNED = 16
+  LINKED = 17
 
   ORDER =
     Hash[
@@ -38,6 +39,7 @@ class UserAction < ActiveRecord::Base
         EDIT,
         SOLVED,
         ASSIGNED,
+        LINKED,
       ].each_with_index.to_a.flatten
     ]
 
@@ -60,6 +62,7 @@ class UserAction < ActiveRecord::Base
         got_private_message: 13,
         solved: 15,
         assigned: 16,
+        linked: 17,
       )
   end
 
diff --git a/app/services/user_action_manager.rb b/app/services/user_action_manager.rb
index 61a207687d0..97c370438bb 100644
--- a/app/services/user_action_manager.rb
+++ b/app/services/user_action_manager.rb
@@ -104,6 +104,8 @@ class UserActionManager
         UserAction::MENTION
       when Notification.types[:edited]
         UserAction::EDIT
+      when Notification.types[:linked]
+        UserAction::LINKED
       end
 
     # skip any invalid items, eg failed to save post and so on
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e008cdc24f7..58385fe6eab 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1049,6 +1049,7 @@ en:
       "13": "Inbox"
       "14": "Pending"
       "15": "Drafts"
+      "17": "Links"
 
     categories:
       categories_label: "categories"