From 7c7e2aeff89f3ef1eb1eb73f4d0079c187e9f1d9 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Thu, 21 Dec 2023 12:39:17 -0600
Subject: [PATCH] DEV: Move menu-item-end PluginOutlet outside <a> tag (#25001)

---
 .../discourse/app/components/user-menu/menu-item.hbs     | 9 ++++-----
 .../discourse/app/components/user-menu/menu-item.js      | 4 ++++
 .../discourse/app/lib/user-menu/notification-item.js     | 6 ++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs
index 5c7c25ac939..f1e7848db94 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs
@@ -25,10 +25,9 @@
       {{/if}}
     </div>
 
-    <PluginOutlet @name="menu-item-end" @outletArgs={{hash item=this}}>
-      {{#if this.endComponent}}
-        <this.endComponent />
-      {{/if}}
-    </PluginOutlet>
+    {{#if this.endComponent}}
+      <this.endComponent />
+    {{/if}}
   </a>
+  <PluginOutlet @name="menu-item-end" @outletArgs={{this.endOutletArgs}} />
 </li>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js
index b8481864f7d..34c4b8d0845 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js
+++ b/app/assets/javascripts/discourse/app/components/user-menu/menu-item.js
@@ -61,6 +61,10 @@ export default class UserMenuItem extends Component {
     return this.#item.endComponent;
   }
 
+  get endOutletArgs() {
+    return this.#item.endOutletArgs;
+  }
+
   get #item() {
     return this.args.item;
   }
diff --git a/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js b/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js
index 55b299778e4..99ca27d3bc9 100644
--- a/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js
+++ b/app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js
@@ -70,6 +70,12 @@ export default class UserMenuNotificationItem extends UserMenuBaseItem {
     return this.notification.acting_user_avatar_template;
   }
 
+  get endOutletArgs() {
+    return {
+      notification: this.notification,
+    };
+  }
+
   get #notificationName() {
     return this.site.notificationLookup[this.notification.notification_type];
   }