From d6821900afdbdb31e10457c01b994c3783bd64e5 Mon Sep 17 00:00:00 2001
From: awesomerobot <kris.aubuchon@discourse.org>
Date: Fri, 4 Nov 2022 15:06:49 -0400
Subject: [PATCH] UX: update assigns in exp user menu nav

---
 .../user-messages-nav/assigned-messages.hbs   | 10 ++++----
 .../initializers/extend-for-assigns.js        | 23 +++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs b/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
index 4582d60..086128d 100644
--- a/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
+++ b/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
@@ -1,4 +1,6 @@
-{{#link-to "userPrivateMessages.assigned" model}}
-  {{d-icon "user-plus" class="glyph"}}
-  {{i18n "discourse_assign.assigned"}}
-{{/link-to}}
+{{#unless this.currentUser.redesigned_user_page_nav_enabled}}
+  {{#link-to "userPrivateMessages.assigned" model}}
+    {{d-icon "user-plus" class="glyph"}}
+    {{i18n "discourse_assign.assigned"}}
+  {{/link-to}}
+{{/unless}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js
index 6c3f0bd..59e42a4 100644
--- a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js
+++ b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js
@@ -9,6 +9,10 @@ import { getOwner } from "discourse-common/lib/get-owner";
 import { htmlSafe } from "@ember/template";
 import getURL from "discourse-common/lib/get-url";
 import SearchAdvancedOptions from "discourse/components/search-advanced-options";
+import MessagesGroupsDropdown from "discourse/components/user-nav/messages-groups-dropdown";
+import UserPrivateMessages from "discourse/controllers/user-private-messages";
+import { computed } from "@ember/object";
+
 import TopicButtonAction, {
   addBulkButton,
 } from "discourse/controllers/topic-bulk-actions";
@@ -945,6 +949,25 @@ export default {
       });
     }
 
+    MessagesGroupsDropdown.reopen({
+      groupsWithMessages: computed(function () {
+        return this._super("groupsWithMessages").concat([
+          {
+            name: I18n.t("discourse_assign.assigned"),
+            url: `/u/${this.user.username}/messages/assigned`,
+          },
+        ]);
+      }),
+    });
+
+    UserPrivateMessages.reopen({
+      customFilter: computed("router.currentRouteName", function () {
+        return this.router.currentRouteName === "userPrivateMessages.assigned"
+          ? I18n.t("discourse_assign.assigned")
+          : null;
+      }),
+    });
+
     withPluginApi("0.13.0", (api) => includeIsAssignedOnTopic(api));
     withPluginApi("0.11.0", (api) => initialize(api));
     withPluginApi("0.8.28", (api) => registerTopicFooterButtons(api));