From 3a0bf97401b6e275920a8246351008f7bcf2e992 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 11 Jan 2024 19:20:27 +0100
Subject: [PATCH] DEV: Minor cleanup of navbar components (#25222)

Convert components to template-only where applicable.
---
 .../components/chat/navbar/actions.gjs        | 41 +++++++++----------
 .../components/chat/navbar/channel-title.gjs  | 27 ++++++------
 .../components/chat/navbar/index.gjs          | 41 +++++++++----------
 .../components/chat/navbar/sub-title.gjs      | 22 +++++-----
 .../components/chat/navbar/title.gjs          | 33 +++++++--------
 5 files changed, 77 insertions(+), 87 deletions(-)

diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs
index c46ad3b7a8f..791dc986bb7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs
@@ -1,4 +1,3 @@
-import Component from "@glimmer/component";
 import { hash } from "@ember/helper";
 import CloseDrawerButton from "./close-drawer-button";
 import CloseThreadButton from "./close-thread-button";
@@ -11,23 +10,23 @@ import ThreadTrackingDropdown from "./thread-tracking-dropdown";
 import ThreadsListButton from "./threads-list-button";
 import ToggleDrawerButton from "./toggle-drawer-button";
 
-export default class ChatNavbarActions extends Component {
-  <template>
-    <nav class="c-navbar__actions">
-      {{yield
-        (hash
-          OpenDrawerButton=OpenDrawerButton
-          NewChannelButton=NewChannelButton
-          ThreadTrackingDropdown=ThreadTrackingDropdown
-          CloseThreadButton=CloseThreadButton
-          CloseThreadsButton=CloseThreadsButton
-          ThreadSettingsButton=ThreadSettingsButton
-          ThreadsListButton=ThreadsListButton
-          CloseDrawerButton=CloseDrawerButton
-          ToggleDrawerButton=ToggleDrawerButton
-          FullPageButton=FullPageButton
-        )
-      }}
-    </nav>
-  </template>
-}
+const ChatNavbarActions = <template>
+  <nav class="c-navbar__actions">
+    {{yield
+      (hash
+        OpenDrawerButton=OpenDrawerButton
+        NewChannelButton=NewChannelButton
+        ThreadTrackingDropdown=ThreadTrackingDropdown
+        CloseThreadButton=CloseThreadButton
+        CloseThreadsButton=CloseThreadsButton
+        ThreadSettingsButton=ThreadSettingsButton
+        ThreadsListButton=ThreadsListButton
+        CloseDrawerButton=CloseDrawerButton
+        ToggleDrawerButton=ToggleDrawerButton
+        FullPageButton=FullPageButton
+      )
+    }}
+  </nav>
+</template>;
+
+export default ChatNavbarActions;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjs
index 056e21743a1..b99092b97d4 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjs
@@ -1,17 +1,16 @@
-import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";
 
-export default class ChatNavbarChannelTitle extends Component {
-  <template>
-    {{#if @channel}}
-      <LinkTo
-        @route="chat.channel.info.members"
-        @models={{@channel.routeModels}}
-        class="c-navbar__channel-title"
-      >
-        <ChannelTitle @channel={{@channel}} />
-      </LinkTo>
-    {{/if}}
-  </template>
-}
+const ChatNavbarChannelTitle = <template>
+  {{#if @channel}}
+    <LinkTo
+      @route="chat.channel.info.members"
+      @models={{@channel.routeModels}}
+      class="c-navbar__channel-title"
+    >
+      <ChannelTitle @channel={{@channel}} />
+    </LinkTo>
+  {{/if}}
+</template>;
+
+export default ChatNavbarChannelTitle;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjs
index 791311a42b5..4d39054073b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjs
@@ -1,4 +1,3 @@
-import Component from "@glimmer/component";
 import { hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import concatClass from "discourse/helpers/concat-class";
@@ -8,23 +7,23 @@ import BackButton from "./back-button";
 import ChannelTitle from "./channel-title";
 import Title from "./title";
 
-export default class ChatNavbar extends Component {
-  <template>
-    {{! template-lint-disable no-invalid-interactive }}
-    <div
-      class={{concatClass "c-navbar-container" (if @onClick "-clickable")}}
-      {{on "click" (if @onClick @onClick (noop))}}
-    >
-      <nav class="c-navbar">
-        {{yield
-          (hash
-            BackButton=BackButton
-            ChannelTitle=ChannelTitle
-            Title=Title
-            Actions=Actions
-          )
-        }}
-      </nav>
-    </div>
-  </template>
-}
+const ChatNavbar = <template>
+  {{! template-lint-disable no-invalid-interactive }}
+  <div
+    class={{concatClass "c-navbar-container" (if @onClick "-clickable")}}
+    {{on "click" (if @onClick @onClick (noop))}}
+  >
+    <nav class="c-navbar">
+      {{yield
+        (hash
+          BackButton=BackButton
+          ChannelTitle=ChannelTitle
+          Title=Title
+          Actions=Actions
+        )
+      }}
+    </nav>
+  </div>
+</template>;
+
+export default ChatNavbar;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/sub-title.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/sub-title.gjs
index 985000915a9..bce87f2086e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/sub-title.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/sub-title.gjs
@@ -1,13 +1,11 @@
-import Component from "@glimmer/component";
+const ChatNavbarSubTitle = <template>
+  <div class="c-navbar__sub-title">
+    {{#if (has-block)}}
+      {{yield}}
+    {{else}}
+      {{@title}}
+    {{/if}}
+  </div>
+</template>;
 
-export default class ChatNavbarSubTitle extends Component {
-  <template>
-    <div class="c-navbar__sub-title">
-      {{#if (has-block)}}
-        {{yield}}
-      {{else}}
-        {{@title}}
-      {{/if}}
-    </div>
-  </template>
-}
+export default ChatNavbarSubTitle;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs
index b021bf86ae0..3030e6cc6b3 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs
@@ -1,23 +1,18 @@
-import Component from "@glimmer/component";
 import { hash } from "@ember/helper";
 import icon from "discourse-common/helpers/d-icon";
 import SubTitle from "./sub-title";
 
-export default class ChatNavbarTitle extends Component {
-  <template>
-    <div title={{@title}} class="c-navbar__title">
-      {{#if (has-block)}}
-        {{#if @icon}}
-          {{icon @icon}}
-        {{/if}}
-        {{@title}}
-        {{yield (hash SubTitle=SubTitle)}}
-      {{else}}
-        {{#if @icon}}
-          {{icon @icon}}
-        {{/if}}
-        {{@title}}
-      {{/if}}
-    </div>
-  </template>
-}
+const ChatNavbarTitle = <template>
+  <div title={{@title}} class="c-navbar__title">
+    {{#if (has-block)}}
+      {{if @icon (icon @icon)}}
+      {{@title}}
+      {{yield (hash SubTitle=SubTitle)}}
+    {{else}}
+      {{if @icon (icon @icon)}}
+      {{@title}}
+    {{/if}}
+  </div>
+</template>;
+
+export default ChatNavbarTitle;