A platform for community discussion. Free, open, simple.
DEV: Convert 5 components to glimmer (#43526)
Jarek Radosze23be76e0556
diff --git a/frontend/discourse/admin/components/admin-report-counters.gjs b/frontend/discourse/admin/components/admin-report-counters.gjsindex 5270207a860..4c2905b7d85 100644--- a/frontend/discourse/admin/components/admin-report-counters.gjs+++ b/frontend/discourse/admin/components/admin-report-counters.gjs@@ -1,54 +1,46 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";-import { tagName } from "@ember-decorators/component";import dIcon from "discourse/ui-kit/helpers/d-icon";import dNumber from "discourse/ui-kit/helpers/d-number";-@tagName("")-export default class AdminReportCounters extends Component {- <template>- <div- class="admin-report-counters"- title={{this.model.description}}- ...attributes- >- <div class="cell title">- {{#if this.model.icon}}- {{dIcon this.model.icon}}- {{/if}}- <a href={{this.model.reportUrl}}>{{this.model.title}}</a>- </div>+const AdminReportCounters = <template>+ <div class="admin-report-counters" title={{@model.description}} ...attributes>+ <div class="cell title">+ {{#if @model.icon}}+ {{dIcon @model.icon}}+ {{/if}}+ <a href={{@model.reportUrl}}>{{@model.title}}</a>+ </div>- <div class="cell value today-count">- {{dNumber this.model.todayCount}}- </div>+ <div class="cell value today-count">+ {{dNumber @model.todayCount}}+ </div>- <div- class="cell value yesterday-count {{this.model.yesterdayTrend}}"- title={{this.model.yesterdayCountTitle}}- >- {{dNumber this.model.yesterdayCount}}- {{dIcon this.model.yesterdayTrendIcon}}- </div>+ <div+ class="cell value yesterday-count {{@model.yesterdayTrend}}"+ title={{@model.yesterdayCountTitle}}+ >+ {{dNumber @model.yesterdayCount}}+ {{dIcon @model.yesterdayTrendIcon}}+ </div>- <div- class="cell value sevendays-count {{this.model.sevenDaysTrend}}"- title={{this.model.sevenDaysCountTitle}}- >- {{dNumber this.model.lastSevenDaysCount}}- {{dIcon this.model.sevenDaysTrendIcon}}- </div>+ <div+ class="cell value sevendays-count {{@model.sevenDaysTrend}}"+ title={{@model.sevenDaysCountTitle}}+ >+ {{dNumber @model.lastSevenDaysCount}}+ {{dIcon @model.sevenDaysTrendIcon}}+ </div>- <div- class="cell value thirty-days-count {{this.model.thirtyDaysTrend}}"- title={{this.model.thirtyDaysCountTitle}}- >- {{dNumber this.model.lastThirtyDaysCount}}+ <div+ class="cell value thirty-days-count {{@model.thirtyDaysTrend}}"+ title={{@model.thirtyDaysCountTitle}}+ >+ {{dNumber @model.lastThirtyDaysCount}}- {{#if this.model.canDisplayTrendIcon}}- {{dIcon this.model.thirtyDaysTrendIcon}}- {{/if}}- </div>+ {{#if @model.canDisplayTrendIcon}}+ {{dIcon @model.thirtyDaysTrendIcon}}+ {{/if}}</div>- </template>-}+ </div>+</template>;++export default AdminReportCounters;diff --git a/frontend/discourse/admin/components/images-uploader.gjs b/frontend/discourse/admin/components/images-uploader.gjsindex e093e2c1961..a9ba2de0792 100644--- a/frontend/discourse/admin/components/images-uploader.gjs+++ b/frontend/discourse/admin/components/images-uploader.gjs@@ -1,13 +1,10 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";+import Component from "@glimmer/component";import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import { tagName } from "@ember-decorators/component";import UppyUpload from "discourse/lib/uppy/uppy-upload";import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";-@tagName("")export default class ImagesUploader extends Component {uppyUpload = new UppyUpload(getOwner(this), {id: "images-uploader",@@ -16,7 +13,7 @@ export default class ImagesUploader extends Component {imagesOnly: true,},uploadDone: (upload) => {- this.done(upload);+ this.args.done(upload);},});diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjsindex 7c59f234162..a9922db3ec9 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjs@@ -1,12 +1,9 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";+import Component from "@glimmer/component";import { hash } from "@ember/helper";import { action } from "@ember/object";-import { tagName } from "@ember-decorators/component";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import { i18n } from "discourse-i18n";-@tagName("")export default class AssignedAdvancedSearch extends Component {static shouldRender(args, { currentUser }) {return currentUser?.can_assign_globally;@@ -14,7 +11,7 @@ export default class AssignedAdvancedSearch extends Component {@actiononChangeAssigned(value) {- this.outletArgs.onChangeSearchedTermField(+ this.args.onChangeSearchedTermField("assigned","updateSearchTermForAssignedUsername",value@@ -37,7 +34,7 @@ export default class AssignedAdvancedSearch extends Component {includeGroups=truecustomSearchOptions=(hash assignableGroups=true)}}- @value={{this.outletArgs.searchedTerms.assigned}}+ @value={{@searchedTerms.assigned}}/></div></div>diff --git a/plugins/discourse-events/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjsindex df46014da1b..2be32034faf 100644--- a/plugins/discourse-events/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs+++ b/plugins/discourse-events/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs@@ -1,10 +1,7 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";+import Component from "@glimmer/component";import { action } from "@ember/object";-import { tagName } from "@ember-decorators/component";import DButton from "discourse/ui-kit/d-button";-@tagName("")export default class BulkInviteSampleCsvFile extends Component {@actiondownloadSampleCsv() {diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjsindex 2685b38336d..c027e2b41c4 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjs@@ -1,18 +1,16 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";-import { tagName } from "@ember-decorators/component";+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { afterRender } from "discourse/lib/decorators";import { REPLACEMENTS } from "discourse/lib/icon-library";import discourseLater from "discourse/lib/later";import dIcon from "discourse/ui-kit/helpers/d-icon";-@tagName("")export default class StyleguideIcons extends Component {- iconIds = [];+ @tracked iconIds = [];- init() {- super.init(...arguments);+ constructor() {+ super(...arguments);this.setIconIds();}@@ -22,7 +20,7 @@ export default class StyleguideIcons extends Component {if (symbols.length > 0) {let ids = Array.from(symbols).map((item) => item.id);ids.push(...Object.keys(REPLACEMENTS));- this.set("iconIds", uniqueItemsFromArray(ids).sort());+ this.iconIds = uniqueItemsFromArray(ids).sort();} else {// Let's try again a short time later if there are no svgs loaded yetdiscourseLater(this, this.setIconIds, 1500);