From 2bcb5360b602f1672bf73a848c22c6d42f08309d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 6 Jan 2022 19:15:29 +0000
Subject: [PATCH] DEV: Modernise navigation-bar plugin-outlet (#15478)

This workaround was introduced before we had the ability to render components with no wrapper element. Now we can pass `tagName=""` to `plugin-outlet`.
---
 .../javascripts/discourse/app/components/navigation-bar.js   | 2 --
 .../discourse/app/templates/components/navigation-bar.hbs    | 5 +----
 .../app/templates/mobile/components/navigation-bar.hbs       | 4 +---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.js b/app/assets/javascripts/discourse/app/components/navigation-bar.js
index 546841c8a5..ab9a5b9c71 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-bar.js
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.js
@@ -3,7 +3,6 @@ import Component from "@ember/component";
 import DiscourseURL from "discourse/lib/url";
 import FilterModeMixin from "discourse/mixins/filter-mode";
 import { next } from "@ember/runloop";
-import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
 
 export default Component.extend(FilterModeMixin, {
   tagName: "ul",
@@ -12,7 +11,6 @@ export default Component.extend(FilterModeMixin, {
 
   init() {
     this._super(...arguments);
-    this.set("connectors", renderedConnectorsFor("extra-nav-item", null, this));
   },
 
   @discourseComputed("filterType", "navItems")
diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
index 25a520642a..166504a74c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
@@ -2,7 +2,4 @@
   {{navigation-item content=navItem filterMode=filterMode category=category}}
 {{/each}}
 {{custom-html name="extraNavItem" tagName="li"}}
-{{!- this is done to avoid DIV in the UL, originally {{plugin-outlet name="extra-nav-item"}}
-{{#each connectors as |c|}}
-  {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
-{{/each}}
+{{plugin-outlet name="extra-nav-item" tagName="" connectorTagName="li" args=(hash category=category filterMode=filterMode)}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
index d0610da670..4747ba6e81 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
@@ -9,8 +9,6 @@
     {{#each navItems as |navItem|}}
       {{navigation-item content=navItem filterMode=filterMode category=category}}
     {{/each}}
-    {{#each connectors as |c|}}
-      {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
-    {{/each}}
+    {{plugin-outlet name="extra-nav-item" tagName="" connectorTagName="li" args=(hash category=category filterMode=filterMode)}}
   </ul>
 {{/if}}