Skip to content

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

DEV: Convert 10 components to glimmer (#43541)

Jarek Radosz7d0de005dd4e
diff --git a/frontend/discourse/admin/components/admin-editable-field.gjs b/frontend/discourse/admin/components/admin-editable-field.gjs
index 04e62f8068e..f81d40a5256 100644
--- a/frontend/discourse/admin/components/admin-editable-field.gjs
+++ b/frontend/discourse/admin/components/admin-editable-field.gjs
@@ -1,34 +1,31 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
import { on } from "@ember/modifier";
import { action } from "@ember/object";
-import { tagName } from "@ember-decorators/component";
import DButton from "discourse/ui-kit/d-button";
import DTextField from "discourse/ui-kit/d-text-field";
import { i18n } from "discourse-i18n";
-@tagName("")
export default class AdminEditableField extends Component {
- buffer = "";
- editing = false;
+ @tracked buffer = "";
@action
edit(event) {
event?.preventDefault();
- this.set("buffer", this.value);
- this.toggleProperty("editing");
+ this.buffer = this.args.value;
+ this.args.toggleEditing();
}
@action
save() {
- // Action has to toggle 'editing' property.
- this.action(this.buffer);
+ // Saving is what leaves edit mode, so the caller toggles `editing` too.
+ this.args.action(this.buffer);
}
<template>
- <div class="field">{{i18n this.name}}</div>
+ <div class="field">{{i18n @name}}</div>
<div class="value">
- {{#if this.editing}}
+ {{#if @editing}}
<DTextField
@autocomplete="off"
@autofocus="autofocus"
@@ -36,12 +33,12 @@ export default class AdminEditableField extends Component {
/>
{{else}}
<a class="inline-editable-field" href {{on "click" this.edit}}>
- <span>{{this.value}}</span>
+ <span>{{@value}}</span>
</a>
{{/if}}
</div>
<div class="controls">
- {{#if this.editing}}
+ {{#if @editing}}
<DButton
class="btn-default"
@action={{this.save}}
diff --git a/frontend/discourse/admin/components/admin-form-row.gjs b/frontend/discourse/admin/components/admin-form-row.gjs
index a12cc3b38d6..c5d7a91e8bd 100644
--- a/frontend/discourse/admin/components/admin-form-row.gjs
+++ b/frontend/discourse/admin/components/admin-form-row.gjs
@@ -1,32 +1,28 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
import { eq } from "discourse/truth-helpers";
import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import { i18n } from "discourse-i18n";
-@tagName("")
-export default class AdminFormRow extends Component {
- <template>
- <div class="row" ...attributes>
- <div class="form-element label-area">
- {{#if this.label}}
- <label
- class={{dConcatClass (if (eq @type "checkbox") "checkbox-label")}}
- >{{i18n this.label}}</label>
- {{else}}
- &nbsp;
- {{/if}}
- </div>
- <div class="form-element input-area">
- {{#if this.wrapLabel}}
- <label
- class={{dConcatClass (if (eq @type "checkbox") "checkbox-label")}}
- >{{yield}}</label>
- {{else}}
- {{yield}}
- {{/if}}
- </div>
+const AdminFormRow = <template>
+ <div class="row" ...attributes>
+ <div class="form-element label-area">
+ {{#if @label}}
+ <label
+ class={{dConcatClass (if (eq @type "checkbox") "checkbox-label")}}
+ >{{i18n @label}}</label>
+ {{else}}
+ &nbsp;
+ {{/if}}
</div>
- </template>
-}
+ <div class="form-element input-area">
+ {{#if @wrapLabel}}
+ <label
+ class={{dConcatClass (if (eq @type "checkbox") "checkbox-label")}}
+ >{{yield}}</label>
+ {{else}}
+ {{yield}}
+ {{/if}}
+ </div>
+ </div>
+</template>;
+
+export default AdminFormRow;
diff --git a/frontend/discourse/admin/components/admin-nav.gjs b/frontend/discourse/admin/components/admin-nav.gjs
index 36484b7ecf7..ca930ec0490 100644
--- a/frontend/discourse/admin/components/admin-nav.gjs
+++ b/frontend/discourse/admin/components/admin-nav.gjs
@@ -1,16 +1,11 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
+const AdminNav = <template>
+ <div class="admin-controls">
+ <nav>
+ <ul class="nav nav-pills">
+ {{yield}}
+ </ul>
+ </nav>
+ </div>
+</template>;
-@tagName("")
-export default class AdminNav extends Component {
- <template>
- <div class="admin-controls">
- <nav>
- <ul class="nav nav-pills">
- {{yield}}
- </ul>
- </nav>
- </div>
- </template>
-}
+export default AdminNav;
diff --git a/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjs b/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjs
index aba79913df0..1b3f98ca1f3 100644
--- a/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjs
+++ b/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjs
@@ -1,13 +1,10 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
+import Component from "@glimmer/component";
import { fn, hash } from "@ember/helper";
import { action } from "@ember/object";
import { service } from "@ember/service";
-import { tagName } from "@ember-decorators/component";
import UploadedImageListModal from "discourse/admin/components/modal/uploaded-image-list";
import DButton from "discourse/ui-kit/d-button";
-@tagName("")
export default class UploadedImageList extends Component {
@service modal;
@@ -16,7 +13,7 @@ export default class UploadedImageList extends Component {
this.modal.show(UploadedImageListModal, {
model: {
title: `admin.site_settings.${setting.setting}.title`,
- changeValue: (v) => this.set("value", v),
+ changeValue: this.args.changeValueCallback,
value,
},
});
@@ -25,10 +22,7 @@ export default class UploadedImageList extends Component {
<template>
<div ...attributes>
<DButton
- @action={{fn
- this.showUploadModal
- (hash value=this.value setting=this.setting)
- }}
+ @action={{fn this.showUploadModal (hash value=@value setting=@setting)}}
@disabled={{@disabled}}
@label="admin.site_settings.uploaded_image_list.label"
/>
diff --git a/frontend/discourse/admin/controllers/admin-user/index.js b/frontend/discourse/admin/controllers/admin-user/index.js
index d3587a01e51..5b7b0c01c1d 100644
--- a/frontend/discourse/admin/controllers/admin-user/index.js
+++ b/frontend/discourse/admin/controllers/admin-user/index.js
@@ -528,6 +528,11 @@ export default class AdminUserIndexController extends Controller {
this.adminTools.showSilenceModal(this.model);
}
+ @action
+ toggleEditing(field) {
+ this.toggleProperty(field);
+ }
+
@action
saveUsername(newUsername) {
const oldUsername = this.get("model.username");
diff --git a/frontend/discourse/admin/templates/admin-user/index.gjs b/frontend/discourse/admin/templates/admin-user/index.gjs
index c9fd1b2c43d..4d09551ffa2 100644
--- a/frontend/discourse/admin/templates/admin-user/index.gjs
+++ b/frontend/discourse/admin/templates/admin-user/index.gjs
@@ -64,6 +64,7 @@ export default <template>
@action={{@controller.saveUsername}}
@editing={{@controller.editingUsername}}
@name="user.username.title"
+ @toggleEditing={{fn @controller.toggleEditing "editingUsername"}}
@value={{@controller.model.username}}
/>
</div>
@@ -73,6 +74,7 @@ export default <template>
@action={{@controller.saveName}}
@editing={{@controller.editingName}}
@name="user.name.title"
+ @toggleEditing={{fn @controller.toggleEditing "editingName"}}
@value={{@controller.model.name}}
/>
</div>
@@ -220,6 +222,7 @@ export default <template>
@action={{@controller.saveTitle}}
@editing={{@controller.editingTitle}}
@name="user.title.title"
+ @toggleEditing={{fn @controller.toggleEditing "editingTitle"}}
@value={{@controller.model.title}}
/>
</div>
diff --git a/frontend/discourse/app/components/categories-boxes-topic.gjs b/frontend/discourse/app/components/categories-boxes-topic.gjs
index 3bbbef29f6a..84009206aba 100644
--- a/frontend/discourse/app/components/categories-boxes-topic.gjs
+++ b/frontend/discourse/app/components/categories-boxes-topic.gjs
@@ -1,29 +1,30 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { computed } from "@ember/object";
+import Component from "@glimmer/component";
+import { get } from "@ember/object";
import { trustHTML } from "@ember/template";
-import { tagName } from "@ember-decorators/component";
import dIcon from "discourse/ui-kit/helpers/d-icon";
-@tagName("")
export default class CategoriesBoxesTopic extends Component {
- @computed("topic.pinned", "topic.closed", "topic.archived")
+ // `pinned`, `closed` and `archived` are plain fields on the topic model, so they are
+ // only tracked when read through `get`.
get topicStatusIcon() {
- if (this.topic?.pinned) {
+ if (!this.args.topic) {
+ return "far-file-lines";
+ }
+ if (get(this.args.topic, "pinned")) {
return "thumbtack";
}
- if (this.topic?.closed || this.topic?.archived) {
+ if (get(this.args.topic, "closed") || get(this.args.topic, "archived")) {
return "category.restricted";
}
return "far-file-lines";
}
<template>
- <li data-topic-id={{this.topic.id}} ...attributes>
+ <li data-topic-id={{@topic.id}} ...attributes>
{{dIcon this.topicStatusIcon}}
- <a class="title" href={{this.topic.lastUnreadUrl}}>
- {{trustHTML this.topic.fancyTitle}}
+ <a class="title" href={{@topic.lastUnreadUrl}}>
+ {{trustHTML @topic.fancyTitle}}
</a>
</li>
</template>
diff --git a/frontend/discourse/app/components/links-redirect.gjs b/frontend/discourse/app/components/links-redirect.gjs
new file mode 100644
index 00000000000..dcaddc912cd
--- /dev/null
+++ b/frontend/discourse/app/components/links-redirect.gjs
@@ -0,0 +1,19 @@
+import Component from "@glimmer/component";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import { getOwner } from "@ember/owner";
+import ClickTrack from "discourse/lib/click-track";
+
+export default class LinksRedirect extends Component {
+ @action
+ click(event) {
+ if (event.target.closest("a")) {
+ return ClickTrack.trackClick(event, getOwner(this));
+ }
+ }
+
+ <template>
+ {{! eslint-disable ember/template-no-invalid-interactive }}
+ <div ...attributes {{on "click" this.click}}>{{yield}}</div>
+ </template>
+}
diff --git a/frontend/discourse/app/components/links-redirect.js b/frontend/discourse/app/components/links-redirect.js
deleted file mode 100644
index fd97dd88f90..00000000000
--- a/frontend/discourse/app/components/links-redirect.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
-import Component from "@ember/component";
-import { getOwner } from "@ember/owner";
-import ClickTrack from "discourse/lib/click-track";
-
-export default class LinksRedirect extends Component {
- click(event) {
- if (event.target.closest("a")) {
- return ClickTrack.trackClick(event, getOwner(this));
- }
- }
-}
diff --git a/frontend/discourse/app/components/reviewable-field-tags.gjs b/frontend/discourse/app/components/reviewable-field-tags.gjs
index a2722377e40..fd1b40a1ac4 100644
--- a/frontend/discourse/app/components/reviewable-field-tags.gjs
+++ b/frontend/discourse/app/components/reviewable-field-tags.gjs
@@ -1,17 +1,23 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
import { hash } from "@ember/helper";
import { action } from "@ember/object";
-import { tagName } from "@ember-decorators/component";
import MiniTagChooser from "discourse/select-kit/components/mini-tag-chooser";
-@tagName("")
export default class ReviewableFieldTags extends Component {
+ // The reviewable is not updated until the edit is saved, so the picked tags are held
+ // here rather than read back from `@value`.
+ @tracked editedValue;
+
+ get value() {
+ return this.editedValue ?? this.args.value;
+ }
+
@action
onChange(tags) {
- this.set("value", tags);
+ this.editedValue = tags;
- this.valueChanged?.({
+ this.args.valueChanged?.({
target: {
value: tags,
},
@@ -21,7 +27,7 @@ export default class ReviewableFieldTags extends Component {
<template>
<MiniTagChooser
@onChange={{this.onChange}}
- @options={{hash categoryId=this.tagCategoryId}}
+ @options={{hash categoryId=@tagCategoryId}}
@value={{this.value}}
/>
</template>
diff --git a/frontend/discourse/app/components/search-result-entries.gjs b/frontend/discourse/app/components/search-result-entries.gjs
index e5c82abb42b..8fd771637a3 100644
--- a/frontend/discourse/app/components/search-result-entries.gjs
+++ b/frontend/discourse/app/components/search-result-entries.gjs
@@ -1,22 +1,18 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
import SearchResultEntry from "discourse/components/search-result-entry";
-@tagName("")
-export default class SearchResultEntries extends Component {
- <template>
- <div class="fps-result-entries" role="list">
- {{#each this.posts as |post|}}
- <SearchResultEntry
- @bulkSelectEnabled={{this.bulkSelectEnabled}}
- @highlightQuery={{this.highlightQuery}}
- @isPMOnly={{this.isPMOnly}}
- @post={{post}}
- @searchLogId={{this.searchLogId}}
- @selected={{this.selected}}
- />
- {{/each}}
- </div>
- </template>
-}
+const SearchResultEntries = <template>
+ <div class="fps-result-entries" role="list">
+ {{#each @posts as |post|}}
+ <SearchResultEntry
+ @bulkSelectEnabled={{@bulkSelectEnabled}}
+ @highlightQuery={{@highlightQuery}}
+ @isPMOnly={{@isPMOnly}}
+ @post={{post}}
+ @searchLogId={{@searchLogId}}
+ @selected={{@selected}}
+ />
+ {{/each}}
+ </div>
+</template>;
+
+export default SearchResultEntries;
diff --git a/frontend/discourse/app/components/user-profile-avatar.gjs b/frontend/discourse/app/components/user-profile-avatar.gjs
index 9794257e47d..caa51629128 100644
--- a/frontend/discourse/app/components/user-profile-avatar.gjs
+++ b/frontend/discourse/app/components/user-profile-avatar.gjs
@@ -1,34 +1,30 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { tagName } from "@ember-decorators/component";
import PluginOutlet from "discourse/components/plugin-outlet";
import lazyHash from "discourse/helpers/lazy-hash";
import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";
import dBoundAvatar from "discourse/ui-kit/helpers/d-bound-avatar";
-@tagName("")
-export default class UserProfileAvatar extends Component {
- <template>
- <PluginOutlet
- @name="user-profile-avatar-wrapper"
- @outletArgs={{lazyHash user=@user}}
- >
- <div class="user-profile-avatar">
- <PluginOutlet
- @name="user-profile-avatar-img-wrapper"
- @outletArgs={{lazyHash user=@user}}
- >
- {{dBoundAvatar @user "huge"}}
- </PluginOutlet>
+const UserProfileAvatar = <template>
+ <PluginOutlet
+ @name="user-profile-avatar-wrapper"
+ @outletArgs={{lazyHash user=@user}}
+ >
+ <div class="user-profile-avatar">
+ <PluginOutlet
+ @name="user-profile-avatar-img-wrapper"
+ @outletArgs={{lazyHash user=@user}}
+ >
+ {{dBoundAvatar @user "huge"}}
+ </PluginOutlet>
- <DUserAvatarFlair @user={{@user}} />
- <div>
- <PluginOutlet
- @name="user-profile-avatar-flair"
- @outletArgs={{lazyHash model=@user}}
- />
- </div>
+ <DUserAvatarFlair @user={{@user}} />
+ <div>
+ <PluginOutlet
+ @name="user-profile-avatar-flair"
+ @outletArgs={{lazyHash model=@user}}
+ />
</div>
- </PluginOutlet>
- </template>
-}
+ </div>
+ </PluginOutlet>
+</template>;
+
+export default UserProfileAvatar;
diff --git a/frontend/discourse/app/components/user-summary-topic.gjs b/frontend/discourse/app/components/user-summary-topic.gjs
index c883b85eb36..7b514962c08 100644
--- a/frontend/discourse/app/components/user-summary-topic.gjs
+++ b/frontend/discourse/app/components/user-summary-topic.gjs
@@ -1,38 +1,34 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
import { trustHTML } from "@ember/template";
-import { tagName } from "@ember-decorators/component";
import PluginOutlet from "discourse/components/plugin-outlet";
import lazyHash from "discourse/helpers/lazy-hash";
import dFormatDate from "discourse/ui-kit/helpers/d-format-date";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import dNumber from "discourse/ui-kit/helpers/d-number";
-@tagName("")
-export default class UserSummaryTopic extends Component {
- <template>
- <li ...attributes>
- <PluginOutlet
- @name="user-summary-topic-wrapper"
- @outletArgs={{lazyHash
- topic=@topic
- url=@url
- createdAt=@createdAt
- likes=@likes
- }}
- >
- <span class="topic-info">
- {{dFormatDate @createdAt format="tiny" noTitle="true"}}
- {{#if @likes}}
- &middot;
- {{dIcon "heart"}}&nbsp;<span class="like-count">{{dNumber
- @likes
- }}</span>
- {{/if}}
- </span>
- <br />
- <a href={{@url}}>{{trustHTML @topic.fancyTitle}}</a>
- </PluginOutlet>
- </li>
- </template>
-}
+const UserSummaryTopic = <template>
+ <li ...attributes>
+ <PluginOutlet
+ @name="user-summary-topic-wrapper"
+ @outletArgs={{lazyHash
+ topic=@topic
+ url=@url
+ createdAt=@createdAt
+ likes=@likes
+ }}
+ >
+ <span class="topic-info">
+ {{dFormatDate @createdAt format="tiny" noTitle="true"}}
+ {{#if @likes}}
+ &middot;
+ {{dIcon "heart"}}&nbsp;<span class="like-count">{{dNumber
+ @likes
+ }}</span>
+ {{/if}}
+ </span>
+ <br />
+ <a href={{@url}}>{{trustHTML @topic.fancyTitle}}</a>
+ </PluginOutlet>
+ </li>
+</template>;
+
+export default UserSummaryTopic;