Skip to content

A platform for community discussion. Free, open, simple.

DEV: Convert 5 components to glimmer (#43521)

Jarek Radosz14f39c327155
diff --git a/frontend/discourse/admin/components/admin-report-table-row.gjs b/frontend/discourse/admin/components/admin-report-table-row.gjs
index 40e70175132..d0bf9a68420 100644
--- a/frontend/discourse/admin/components/admin-report-table-row.gjs
+++ b/frontend/discourse/admin/components/admin-report-table-row.gjs
@@ -1,24 +1,18 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
import AdminReportTableCell from "discourse/admin/components/admin-report-table-cell";
-@tagName("")
-export default class AdminReportTableRow extends Component {
- options = null;
+const AdminReportTableRow = <template>
+ <tr class="admin-report-table-row" ...attributes>
+ {{#each @labels as |label|}}
+ <AdminReportTableCell
+ @data={{@data}}
+ @hasRelatedItems={{@hasRelatedItems}}
+ @label={{label}}
+ @options={{@options}}
+ @reportFilters={{@reportFilters}}
+ @reportType={{@reportType}}
+ />
+ {{/each}}
+ </tr>
+</template>;
- <template>
- <tr class="admin-report-table-row" ...attributes>
- {{#each this.labels as |label|}}
- <AdminReportTableCell
- @data={{this.data}}
- @hasRelatedItems={{@hasRelatedItems}}
- @label={{label}}
- @options={{this.options}}
- @reportFilters={{@reportFilters}}
- @reportType={{@reportType}}
- />
- {{/each}}
- </tr>
- </template>
-}
+export default AdminReportTableRow;
diff --git a/frontend/discourse/app/components/categories-and-latest-topics.gjs b/frontend/discourse/app/components/categories-and-latest-topics.gjs
index 5170e8e3cd0..4ae8399cfac 100644
--- a/frontend/discourse/app/components/categories-and-latest-topics.gjs
+++ b/frontend/discourse/app/components/categories-and-latest-topics.gjs
@@ -1,27 +1,23 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
import CategoriesOnly from "discourse/components/categories-only";
import CategoriesTopicList from "discourse/components/categories-topic-list";
import PluginOutlet from "discourse/components/plugin-outlet";
-@tagName("")
-export default class CategoriesAndLatestTopics extends Component {
- <template>
- <div class="categories-and-latest" ...attributes>
- <div class="column categories">
- <CategoriesOnly @categories={{this.categories}} />
- </div>
-
- <div class="column">
- <CategoriesTopicList
- class="latest-topic-list"
- @filter="latest"
- @topics={{this.topics}}
- />
- </div>
+const CategoriesAndLatestTopics = <template>
+ <div class="categories-and-latest" ...attributes>
+ <div class="column categories">
+ <CategoriesOnly @categories={{@categories}} />
+ </div>
- <PluginOutlet @connectorTagName="div" @name="extra-categories-column" />
+ <div class="column">
+ <CategoriesTopicList
+ class="latest-topic-list"
+ @filter="latest"
+ @topics={{@topics}}
+ />
</div>
- </template>
-}
+
+ <PluginOutlet @connectorTagName="div" @name="extra-categories-column" />
+ </div>
+</template>;
+
+export default CategoriesAndLatestTopics;
diff --git a/frontend/discourse/app/components/categories-and-top-topics.gjs b/frontend/discourse/app/components/categories-and-top-topics.gjs
index 3de30d9ec69..259efdf0421 100644
--- a/frontend/discourse/app/components/categories-and-top-topics.gjs
+++ b/frontend/discourse/app/components/categories-and-top-topics.gjs
@@ -1,27 +1,23 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
import CategoriesOnly from "discourse/components/categories-only";
import CategoriesTopicList from "discourse/components/categories-topic-list";
import PluginOutlet from "discourse/components/plugin-outlet";
-@tagName("")
-export default class CategoriesAndTopTopics extends Component {
- <template>
- <div class="categories-and-top" ...attributes>
- <div class="column categories">
- <CategoriesOnly @categories={{this.categories}} />
- </div>
-
- <div class="column">
- <CategoriesTopicList
- class="top-topic-list"
- @filter="top"
- @topics={{this.topics}}
- />
- </div>
+const CategoriesAndTopTopics = <template>
+ <div class="categories-and-top" ...attributes>
+ <div class="column categories">
+ <CategoriesOnly @categories={{@categories}} />
+ </div>
- <PluginOutlet @connectorTagName="div" @name="extra-categories-column" />
+ <div class="column">
+ <CategoriesTopicList
+ class="top-topic-list"
+ @filter="top"
+ @topics={{@topics}}
+ />
</div>
- </template>
-}
+
+ <PluginOutlet @connectorTagName="div" @name="extra-categories-column" />
+ </div>
+</template>;
+
+export default CategoriesAndTopTopics;
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/above-main-container/subscriptions-campaign.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/above-main-container/subscriptions-campaign.gjs
index 28c04f63230..d25639049de 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/above-main-container/subscriptions-campaign.gjs
+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/above-main-container/subscriptions-campaign.gjs
@@ -1,9 +1,6 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
+import Component from "@glimmer/component";
import CampaignBanner from "../../components/campaign-banner";
-@tagName("")
export default class SubscriptionsCampaign extends Component {
static shouldRender(args, context) {
const { siteSettings } = context;
diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/before-topic-list/subscriptions-campaign-sidebar.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/before-topic-list/subscriptions-campaign-sidebar.gjs
index a8db6f10052..6f6e7ffdc2c 100644
--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/before-topic-list/subscriptions-campaign-sidebar.gjs
+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/before-topic-list/subscriptions-campaign-sidebar.gjs
@@ -1,9 +1,6 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
+import Component from "@glimmer/component";
import CampaignBanner from "../../components/campaign-banner";
-@tagName("")
export default class SubscriptionsCampaignSidebar extends Component {
static shouldRender(args, context) {
const { siteSettings } = context;