A platform for community discussion. Free, open, simple.
DEV: Convert 10 components to glimmer (#44593)
Jarek Radosz27da4b0cb106
diff --git a/frontend/discourse/admin/components/admin-report-storage-stats.gjs b/frontend/discourse/admin/components/admin-report-storage-stats.gjsindex 2ab3e044a0a..10802cc29ea 100644--- a/frontend/discourse/admin/components/admin-report-storage-stats.gjs+++ b/frontend/discourse/admin/components/admin-report-storage-stats.gjs@@ -1,64 +1,47 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";-import { computed, set } from "@ember/object";+import Component from "@glimmer/component";+import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import { tagName } from "@ember-decorators/component";import getUrl from "discourse/lib/get-url";import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";-@tagName("")export default class AdminReportStorageStats extends Component {- @computed("model.data.backups")- get backupStats() {- return this.model?.data?.backups;- }+ @service currentUser;+ @service siteSettings;- set backupStats(value) {- set(this, "model.data.backups", value);+ get backupStats() {+ return this.args.model?.data?.backups;}- @computed("model.data.uploads")get uploadStats() {- return this.model?.data?.uploads;- }-- set uploadStats(value) {- set(this, "model.data.uploads", value);+ return this.args.model?.data?.uploads;}- @computed("siteSettings.backup_location")get backupLocation() {return this.siteSettings.backup_location;}- @computed("backupStats")get showBackupStats() {return this.backupStats && this.currentUser.admin;}- @computed("backupLocation")get backupLocationName() {return i18n(`admin.backups.location.${this.backupLocation}`);}- @computed("backupStats.used_bytes")get usedBackupSpace() {return I18n.toHumanSize(this.backupStats?.used_bytes);}- @computed("backupStats.free_bytes")get freeBackupSpace() {return I18n.toHumanSize(this.backupStats?.free_bytes);}- @computed("uploadStats.used_bytes")get usedUploadSpace() {return I18n.toHumanSize(this.uploadStats?.used_bytes);}- @computed("uploadStats.free_bytes")get freeUploadSpace() {return I18n.toHumanSize(this.uploadStats?.free_bytes);}diff --git a/frontend/discourse/admin/components/admin-report-table-cell.gjs b/frontend/discourse/admin/components/admin-report-table-cell.gjsindex e02345d751e..ea1d5f2953b 100644--- a/frontend/discourse/admin/components/admin-report-table-cell.gjs+++ b/frontend/discourse/admin/components/admin-report-table-cell.gjs@@ -1,73 +1,45 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";-import { computed, set } from "@ember/object";+import Component from "@glimmer/component";+import { cached } from "@glimmer/tracking";import { trustHTML } from "@ember/template";-import { tagName } from "@ember-decorators/component";import AdminReportTableSummary from "discourse/admin/components/admin-report-table-summary";import { adminReportRelatedItemsRenderer } from "discourse/admin/lib/admin-report-related-items";import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";-@tagName("")export default class AdminReportTableCell extends Component {- options = null;-- @computed("label.type")get type() {- return this.label?.type;- }-- set type(value) {- set(this, "label.type", value);+ return this.args.label?.type;}- @computed("label.mainProperty")get property() {- return this.label?.mainProperty;- }-- set property(value) {- set(this, "label.mainProperty", value);+ return this.args.label?.mainProperty;}- @computed("computedLabel.formattedValue")get formattedValue() {return this.computedLabel?.formattedValue;}- set formattedValue(value) {- set(this, "computedLabel.formattedValue", value);- }-- @computed("computedLabel.value")get value() {return this.computedLabel?.value;}- set value(value) {- set(this, "computedLabel.value", value);- }-- @computed("label", "data", "options")+ @cachedget computedLabel() {- return this.label.compute(this.data, this.options || {});+ return this.args.label.compute(this.args.data, this.args.options || {});}- @computed("hasRelatedItems", "type", "property", "value")get hasRelatedItemsSummary() {return (- this.hasRelatedItems &&+ this.args.hasRelatedItems &&this.type === "number" &&this.property === "y" &&this.value > 0);}- @computed("reportType")get relatedItemsRenderer() {- return adminReportRelatedItemsRenderer(this.reportType);+ return adminReportRelatedItemsRenderer(this.args.reportType);}- @computed("reportType")get relatedItemsSummary() {return this.relatedItemsRenderer?.tableSummary;}@@ -82,13 +54,13 @@ export default class AdminReportTableCell extends Component {{{#if this.relatedItemsRenderer}}{{#if this.relatedItemsSummary}}<AdminReportTableSummary- @date={{this.data.x}}+ @date={{@data.x}}@formattedValue={{this.formattedValue}}@itemComponent={{this.relatedItemsSummary.itemComponent}}@itemsKey={{this.relatedItemsSummary.itemsKey}}@listClass={{this.relatedItemsSummary.listClass}}- @reportFilters={{this.reportFilters}}- @reportType={{this.reportType}}+ @reportFilters={{@reportFilters}}+ @reportType={{@reportType}}@titleKey={{this.relatedItemsSummary.titleKey}}/>{{else}}@@ -96,10 +68,10 @@ export default class AdminReportTableCell extends Component {{{/if}}{{else}}<AdminReportTableSummary- @date={{this.data.x}}+ @date={{@data.x}}@formattedValue={{this.formattedValue}}- @reportFilters={{this.reportFilters}}- @reportType={{this.reportType}}+ @reportFilters={{@reportFilters}}+ @reportType={{@reportType}}/>{{/if}}{{else}}diff --git a/frontend/discourse/app/components/categories-boxes.gjs b/frontend/discourse/app/components/categories-boxes.gjsindex d826c11383e..ace8200e2c1 100644--- a/frontend/discourse/app/components/categories-boxes.gjs+++ b/frontend/discourse/app/components/categories-boxes.gjs@@ -1,9 +1,7 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";+import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import { tagName } from "@ember-decorators/component";import CategoryLogo from "discourse/components/category-logo";import CategoryTitleBefore from "discourse/components/category-title-before";import CategoryTitleLink from "discourse/components/category-title-link";@@ -21,22 +19,23 @@ import dCategoryLink, {import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";-@tagName("")export default class CategoriesBoxes extends Component {@service discovery;get anyLogos() {- return this.categories.some((c) => !isEmpty(c.get("uploaded_logo.url")));+ return this.args.categories.some(+ (c) => !isEmpty(c.get("uploaded_logo.url"))+ );}get hasSubcategories() {- return this.categories.some(+ return this.args.categories.some((c) => !isEmpty(categoryListSubcategories(c, { page: this.page })));}get page() {- return this.categoryListPage ?? this.discovery.categoryListPage;+ return this.args.categoryListPage ?? this.discovery.categoryListPage;}categoryName(category) {@@ -59,9 +58,9 @@ export default class CategoriesBoxes extends Component {><PluginOutlet@name="categories-boxes-wrapper"- @outletArgs={{lazyHash categories=this.categories}}+ @outletArgs={{lazyHash categories=@categories}}>- {{#each this.categories as |c|}}+ {{#each @categories as |c|}}<PluginOutlet@name="category-box-before-each-box"@outletArgs={{lazyHash category=c}}diff --git a/frontend/discourse/app/components/create-invite-uploader.gjs b/frontend/discourse/app/components/create-invite-uploader.gjsindex aa13b82d3ad..20f1ea783ae 100644--- a/frontend/discourse/app/components/create-invite-uploader.gjs+++ b/frontend/discourse/app/components/create-invite-uploader.gjs@@ -1,13 +1,13 @@-/* 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, computed } from "@ember/object";+import { action } from "@ember/object";import { getOwner } from "@ember/owner";-import { tagName } from "@ember-decorators/component";import UppyUpload from "discourse/lib/uppy/uppy-upload";-@tagName("")export default class CreateInviteUploader extends Component {+ @tracked uploaded = false;+uppyUpload = new UppyUpload(getOwner(this), {id: "create-invite-uploader",type: "csv",@@ -19,11 +19,10 @@ export default class CreateInviteUploader extends Component {csvOnly: true,},uploadDone: () => {- this.set("uploaded", true);+ this.uploaded = true;},});- @computed("uppyUpload.filesAwaitingUpload", "uppyUpload.uploading")get submitDisabled() {return !this.uppyUpload?.filesAwaitingUpload || this.uppyUpload?.uploading;}@@ -37,9 +36,9 @@ export default class CreateInviteUploader extends Component {<div ...attributes>{{yield(hash- data=this.data- uploading=this.uploading- uploadProgress=this.uploadProgress+ data=@data+ uploading=this.uppyUpload.uploading+ uploadProgress=this.uppyUpload.uploadProgressuploaded=this.uploadedsubmitDisabled=this.submitDisabledstartUpload=this.startUploaddiff --git a/frontend/discourse/app/components/featured-topic.gjs b/frontend/discourse/app/components/featured-topic.gjsindex ef3062ce19e..16bd4347641 100644--- a/frontend/discourse/app/components/featured-topic.gjs+++ b/frontend/discourse/app/components/featured-topic.gjs@@ -1,30 +1,24 @@-/* eslint-disable ember/no-classic-components, ember/require-tagless-components */-import Component from "@ember/component";import { trustHTML } from "@ember/template";-import {- attributeBindings,- classNameBindings,-} from "@ember-decorators/component";import TopicPostBadges from "discourse/components/topic-post-badges";import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";import TopicStatus from "./topic-status";-@classNameBindings(":featured-topic")-@attributeBindings("topic.id:data-topic-id")-export default class FeaturedTopic extends Component {- <template>- <TopicStatus @disableActions={{true}} @topic={{this.topic}} />- <a class="title" href={{this.topic.lastUnreadUrl}}>{{trustHTML- this.topic.fancyTitle+const FeaturedTopic = <template>+ <div class="featured-topic" ...attributes data-topic-id={{@topic.id}}>+ <TopicStatus @disableActions={{true}} @topic={{@topic}} />+ <a class="title" href={{@topic.lastUnreadUrl}}>{{trustHTML+ @topic.fancyTitle}}</a><TopicPostBadges- @unreadPosts={{this.topic.unread_posts}}- @unseen={{this.topic.unseen}}- @url={{this.topic.lastUnreadUrl}}+ @unreadPosts={{@topic.unread_posts}}+ @unseen={{@topic.unseen}}+ @url={{@topic.lastUnreadUrl}}/>- <a class="last-posted-at" href={{this.topic.lastPostUrl}}>{{dAgeWithTooltip- this.topic.last_posted_at+ <a class="last-posted-at" href={{@topic.lastPostUrl}}>{{dAgeWithTooltip+ @topic.last_posted_at}}</a>- </template>-}+ </div>+</template>;++export default FeaturedTopic;diff --git a/frontend/discourse/app/components/group-manage-email-settings.gjs b/frontend/discourse/app/components/group-manage-email-settings.gjsindex 8e5ee447020..c3af4fb160d 100644--- a/frontend/discourse/app/components/group-manage-email-settings.gjs+++ b/frontend/discourse/app/components/group-manage-email-settings.gjs@@ -1,69 +1,69 @@-/* eslint-disable ember/no-classic-components */-import Component, { Input } from "@ember/component";+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { Input } from "@ember/component";import { on } from "@ember/modifier";-import { action, computed } from "@ember/object";+import { action, get } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import { tagName } from "@ember-decorators/component";-import { on as onEvent } from "@ember-decorators/object";import GroupManageSaveButton from "discourse/components/group-manage-save-button";import GroupSmtpEmailSettings from "discourse/components/group-smtp-email-settings";import { not } from "discourse/truth-helpers";import { i18n } from "discourse-i18n";-@tagName("")export default class GroupManageEmailSettings extends Component {@service dialog;+ @service store;- smtpSettingsValid = false;+ @tracked smtpSettingsValid = false;++ constructor() {+ super(...arguments);+ this._determineSettingsValid();+ }- @computed("smtpSettingsValid", "group.smtp_enabled")get emailSettingsValid() {- return !this.group?.smtp_enabled || this.smtpSettingsValid;+ return !get(this.args.group, "smtp_enabled") || this.smtpSettingsValid;}@actiononChangeSmtpSettingsValid(valid) {- this.set("smtpSettingsValid", valid);+ this.smtpSettingsValid = valid;}@actionsmtpEnabledChange(event) {if (!event.target.checked &&- this.group.smtp_enabled &&+ this.args.group.smtp_enabled &&this._anySmtpFieldsFilled()) {this.dialog.confirm({message: i18n("groups.manage.email.smtp_disable_confirm"),- didConfirm: () => this.group.set("smtp_enabled", true),+ didConfirm: () => this.args.group.set("smtp_enabled", true),});}- this.group.set("smtp_enabled", event.target.checked);+ this.args.group.set("smtp_enabled", event.target.checked);}@actionafterSave() {- this.store.find("group", this.group.name).then(() => {+ this.store.find("group", this.args.group.name).then(() => {this._determineSettingsValid();});}- @onEvent("init")_determineSettingsValid() {- this.set(- "smtpSettingsValid",- this.group.smtp_enabled && this.group.smtp_server- );+ this.smtpSettingsValid =+ this.args.group.smtp_enabled && this.args.group.smtp_server;}_anySmtpFieldsFilled() {return [- this.group.smtp_server,- this.group.smtp_port,- this.group.email_username,- this.group.email_password,+ this.args.group.smtp_server,+ this.args.group.smtp_port,+ this.args.group.email_username,+ this.args.group.email_password,].some((value) => !isEmpty(value));}@@ -76,16 +76,16 @@ export default class GroupManageEmailSettings extends Component {<Inputid="enable_smtp"tabindex="1"- @checked={{this.group.smtp_enabled}}+ @checked={{@group.smtp_enabled}}@type="checkbox"{{on "input" this.smtpEnabledChange}}/>{{i18n "groups.manage.email.enable_smtp"}}</label>- {{#if this.group.smtp_enabled}}+ {{#if @group.smtp_enabled}}<GroupSmtpEmailSettings- @group={{this.group}}+ @group={{@group}}@onChangeSmtpSettingsValid={{this.onChangeSmtpSettingsValid}}@smtpSettingsValid={{this.smtpSettingsValid}}/>@@ -102,7 +102,7 @@ export default class GroupManageEmailSettings extends Component {id="allow_unknown_sender_topic_replies"name="allow_unknown_sender_topic_replies"tabindex="13"- @checked={{this.group.allow_unknown_sender_topic_replies}}+ @checked={{@group.allow_unknown_sender_topic_replies}}@type="checkbox"/><span>{{i18n@@ -118,9 +118,9 @@ export default class GroupManageEmailSettings extends Component {<br /><GroupManageSaveButton@afterSave={{this.afterSave}}- @beforeSave={{this.beforeSave}}+ @beforeSave={{@beforeSave}}@disabled={{not this.emailSettingsValid}}- @model={{this.group}}+ @model={{@group}}@tabindex="15"/></div>diff --git a/frontend/discourse/app/components/tag-list.gjs b/frontend/discourse/app/components/tag-list.gjsindex f991bec68ab..688f3647679 100644--- a/frontend/discourse/app/components/tag-list.gjs+++ b/frontend/discourse/app/components/tag-list.gjs@@ -1,7 +1,4 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";-import { computed } from "@ember/object";-import { tagName } from "@ember-decorators/component";+import Component from "@glimmer/component";import CategoryTitleLink from "discourse/components/category-title-link";import { arraySortedByProperties } from "discourse/lib/array-tools";import { slugify } from "discourse/lib/utilities";@@ -11,38 +8,33 @@ import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";-@tagName("")export default class TagList extends Component {- isPrivateMessage = false;+ get isPrivateMessage() {+ return this.args.isPrivateMessage ?? false;+ }- @computed("tags", "sortProperties")get sortedTags() {- return arraySortedByProperties(this.tags, this.sortProperties);+ return arraySortedByProperties(this.args.tags, this.args.sortProperties);}- @computed("titleKey")get title() {- return this.titleKey && i18n(this.titleKey);+ return this.args.titleKey && i18n(this.args.titleKey);}- @computed("categoryId")get category() {- return this.categoryId && Category.findById(this.categoryId);+ return this.args.categoryId && Category.findById(this.args.categoryId);}- @computed("category.fullSlug")get categoryClass() {return this.category?.fullSlug && `tag-list-${this.category?.fullSlug}`;}- @computed("tagGroupName")get tagGroupNameSlug() {- if (this.tagGroupName) {- return slugify(this.tagGroupName);+ if (this.args.tagGroupName) {+ return slugify(this.args.tagGroupName);}}- @computed("tagGroupNameSlug")get tagGroupNameClass() {return this.tagGroupNameSlug && `tag-group-${this.tagGroupNameSlug}`;}@@ -63,12 +55,12 @@ export default class TagList extends Component {{{#if this.category}}<CategoryTitleLink @category={{this.category}} />{{/if}}- {{#if this.tagGroupName}}+ {{#if @tagGroupName}}<h3 id={{this.tagGroupNameSlug}}><aaria-label={{i18n "post.heading_anchor"}}class="anchor"href="#{{this.tagGroupNameSlug}}"- ></a>{{this.tagGroupName}}</h3>+ ></a>{{@tagGroupName}}</h3>{{/if}}{{#each this.sortedTags as |tag|}}<div class="tag-box">@@ -77,7 +69,7 @@ export default class TagList extends Component {description=tag.descriptionisPrivateMessage=this.isPrivateMessagepmOnly=tag.pmOnly- tagsForUser=this.tagsForUser+ tagsForUser=@tagsForUser}}{{#if tag.pmOnly}}{{dIcon "envelope"}}diff --git a/frontend/discourse/app/ui-kit/d-date-time-input-range.gjs b/frontend/discourse/app/ui-kit/d-date-time-input-range.gjsindex 25910d3d76e..07207801310 100644--- a/frontend/discourse/app/ui-kit/d-date-time-input-range.gjs+++ b/frontend/discourse/app/ui-kit/d-date-time-input-range.gjs@@ -1,31 +1,37 @@-/* 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 { tagName } from "@ember-decorators/component";import { adjustedRangeEnd } from "discourse/lib/time-utils";import DDateTimeInput from "discourse/ui-kit/d-date-time-input";import { i18n } from "discourse-i18n";-@tagName("")export default class DDateTimeInputRange extends Component {- from = null;- to = null;- toTimeFirst = false;- showToTime = true;- showFromTime = true;- clearable = false;+ get toTimeFirst() {+ return this.args.toTimeFirst ?? false;+ }++ get showToTime() {+ return this.args.showToTime ?? true;+ }++ get showFromTime() {+ return this.args.showFromTime ?? true;+ }++ get clearable() {+ return this.args.clearable ?? false;+ }@actiononChangeRanges(options, value) {- if (!this.onChange) {+ if (!this.args.onChange) {return;}- const from = options.prop === "from" ? value : this.from;- const to = options.prop === "from" ? this.to : value;+ const from = options.prop === "from" ? value : this.args.from;+ const to = options.prop === "from" ? this.args.to : value;- this.onChange({+ this.args.onChange({from,to: adjustedRangeEnd(from, to, { dateOnly: !this.showToTime }),});@@ -35,7 +41,7 @@ export default class DDateTimeInputRange extends Component {<div class="d-date-time-input-range" ...attributes><DDateTimeInputclass="from"- @date={{this.from}}+ @date={{@from}}@onChange={{fn this.onChangeRanges (hash prop="from")}}@placeholder={{i18n "dates.from_placeholder"}}@showTime={{this.showFromTime}}@@ -45,10 +51,10 @@ export default class DDateTimeInputRange extends Component {<DDateTimeInputclass="to"@clearable={{this.clearable}}- @date={{this.to}}+ @date={{@to}}@onChange={{fn this.onChangeRanges (hash prop="to")}}@placeholder={{i18n "dates.to_placeholder"}}- @relativeDate={{this.from}}+ @relativeDate={{@from}}@showTime={{this.showToTime}}@timeFirst={{this.toTimeFirst}}@timezone={{@timezone}}diff --git a/frontend/discourse/tests/acceptance/group-manage-email-settings-test.js b/frontend/discourse/tests/acceptance/group-manage-email-settings-test.jsindex 6d5b71c5600..b0f121461e9 100644--- a/frontend/discourse/tests/acceptance/group-manage-email-settings-test.js+++ b/frontend/discourse/tests/acceptance/group-manage-email-settings-test.js@@ -63,6 +63,9 @@ acceptance("Managing Group Email Settings - SMTP Enabled", function (needs) {await click("#enable_smtp");assert.dom(".group-smtp-email-settings").exists();+ assert+ .dom(".group-manage-save")+ .isDisabled("cannot save until the SMTP settings are valid");await click("#prefill_smtp_gmail");assertdiff --git a/frontend/discourse/tests/integration/components/admin-report-storage-stats-test.gjs b/frontend/discourse/tests/integration/components/admin-report-storage-stats-test.gjsnew file mode 100644index 00000000000..4de31dd013e--- /dev/null+++ b/frontend/discourse/tests/integration/components/admin-report-storage-stats-test.gjs@@ -0,0 +1,44 @@+import { getOwner } from "@ember/owner";+import { render } from "@ember/test-helpers";+import { module, test } from "qunit";+import AdminReportStorageStats from "discourse/admin/components/admin-report-storage-stats";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import {+ logIn,+ updateCurrentUser,+} from "discourse/tests/helpers/qunit-helpers";++const MODEL = {+ data: {+ backups: { used_bytes: 1024, free_bytes: 2048, count: 3 },+ uploads: { used_bytes: 4096, free_bytes: null },+ },+};++module("Integration | Component | AdminReportStorageStats", function (hooks) {+ setupRenderingTest(hooks);++ test("shows backup stats to admins", async function (assert) {+ logIn(getOwner(this));+ updateCurrentUser({ admin: true });++ await render(+ <template><AdminReportStorageStats @model={{MODEL}} /></template>+ );++ assert.dom(".backups").exists("shows the backups section");+ assert.dom(".uploads").exists("shows the uploads section");+ });++ test("hides backup stats from moderators", async function (assert) {+ logIn(getOwner(this));+ updateCurrentUser({ admin: false, moderator: true });++ await render(+ <template><AdminReportStorageStats @model={{MODEL}} /></template>+ );++ assert.dom(".backups").doesNotExist();+ assert.dom(".uploads").exists();+ });+});diff --git a/frontend/discourse/tests/integration/components/create-invite-uploader-test.gjs b/frontend/discourse/tests/integration/components/create-invite-uploader-test.gjsnew file mode 100644index 00000000000..03894d1e03a--- /dev/null+++ b/frontend/discourse/tests/integration/components/create-invite-uploader-test.gjs@@ -0,0 +1,55 @@+import { on } from "@ember/modifier";+import didInsert from "@ember/render-modifiers/modifiers/did-insert";+import {+ click,+ find,+ render,+ triggerEvent,+ waitUntil,+} from "@ember/test-helpers";+import { module, test } from "qunit";+import CreateInviteUploader from "discourse/components/create-invite-uploader";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import pretender, { response } from "discourse/tests/helpers/create-pretender";+import { createFile } from "discourse/tests/helpers/qunit-helpers";++module("Integration | Component | CreateInviteUploader", function (hooks) {+ setupRenderingTest(hooks);++ test("yields the upload state", async function (assert) {+ let release;+ const held = new Promise((resolve) => (release = resolve));+ pretender.post("/invites/upload_csv.json", async () => {+ await held;+ return response({});+ });++ await render(+ <template>+ <CreateInviteUploader as |uploader setElement|>+ <input type="file" {{didInsert setElement}} />+ <span class="uploading">{{if uploader.uploading "yes" "no"}}</span>+ <span class="uploaded">{{if uploader.uploaded "yes" "no"}}</span>+ <button type="button" {{on "click" uploader.startUpload}}>+ upload+ </button>+ </CreateInviteUploader>+ </template>+ );++ await triggerEvent("input[type='file']", "change", {+ files: [createFile("invites.csv", "text/csv")],+ });+ click("button");+ await waitUntil(() => find(".uploading").textContent === "yes");++ assert.dom(".uploading").hasText("yes", "reports an upload in progress");+ assert.dom(".uploaded").hasText("no");++ release();+ await waitUntil(() => find(".uploaded").textContent === "yes");++ assert.dom(".uploading").hasText("no", "reports the upload finished");+ assert.dom(".uploaded").hasText("yes", "reports the upload succeeded");+ });+});diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/remind-assigns-frequency.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/remind-assigns-frequency.gjsindex 0881a98f55d..9f2c7adc4df 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/remind-assigns-frequency.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/remind-assigns-frequency.gjs@@ -1,38 +1,39 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";-import { fn } from "@ember/helper";-import { computed } from "@ember/object";-import { tagName } from "@ember-decorators/component";+import Component from "@glimmer/component";+import { action, get, set } from "@ember/object";+import { service } from "@ember/service";import ComboBox from "discourse/select-kit/components/combo-box";import { i18n } from "discourse-i18n";-@tagName("")export default class RemindAssignsFrequency extends Component {- @computed(- "user.custom_fields.remind_assigns_frequency",- "siteSettings.remind_assigns_frequency"- )+ @service siteSettings;+get selectedFrequency() {+ const user = this.args.user;+ const frequency =+ user && get(user, "custom_fields.remind_assigns_frequency");+if (- this.availableFrequencies- .map((freq) => freq.value)- .includes(this.user?.custom_fields?.remind_assigns_frequency)+ this.availableFrequencies.map((freq) => freq.value).includes(frequency)) {- return this.user?.custom_fields?.remind_assigns_frequency;+ return frequency;}- return this.siteSettings?.remind_assigns_frequency;+ return this.siteSettings.remind_assigns_frequency;}- @computed("user.reminders_frequency")get availableFrequencies() {- return this.user?.reminders_frequency?.map((freq) => ({+ return this.args.user?.reminders_frequency?.map((freq) => ({name: i18n(freq.name),value: freq.value,selected: false,}));}+ @action+ onChange(frequency) {+ set(this.args.user, "custom_fields.remind_assigns_frequency", frequency);+ }+<template><div ...attributes>{{#if this.siteSettings.assign_enabled}}@@ -43,9 +44,7 @@ export default class RemindAssignsFrequency extends Component {<ComboBox@content={{this.availableFrequencies}}@id="remind-assigns-frequency"- @onChange={{fn- (mut this.user.custom_fields.remind_assigns_frequency)- }}+ @onChange={{this.onChange}}@value={{this.selectedFrequency}}@valueProperty="value"/>diff --git a/plugins/discourse-assign/test/javascripts/integration/components/remind-assigns-frequency-test.gjs b/plugins/discourse-assign/test/javascripts/integration/components/remind-assigns-frequency-test.gjsnew file mode 100644index 00000000000..6adceaefe83--- /dev/null+++ b/plugins/discourse-assign/test/javascripts/integration/components/remind-assigns-frequency-test.gjs@@ -0,0 +1,42 @@+import EmberObject from "@ember/object";+import { render } from "@ember/test-helpers";+import { module, test } from "qunit";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import selectKit from "discourse/tests/helpers/select-kit-helper";+import RemindAssignsFrequency from "discourse/plugins/discourse-assign/discourse/components/remind-assigns-frequency";++module("Integration | Component | RemindAssignsFrequency", function (hooks) {+ setupRenderingTest(hooks);++ test("stores the picked frequency on the user and shows it", async function (assert) {+ this.siteSettings.assign_enabled = true;+ const user = EmberObject.create({+ custom_fields: { remind_assigns_frequency: 1440 },+ reminders_frequency: [+ { name: "Daily", value: 1440 },+ { name: "Weekly", value: 10080 },+ ],+ });++ await render(+ <template><RemindAssignsFrequency @user={{user}} /></template>+ );++ const subject = selectKit("#remind-assigns-frequency");+ assert.strictEqual(subject.header().value(), "1440");++ await subject.expand();+ await subject.selectRowByValue(10080);++ assert.strictEqual(+ user.custom_fields.remind_assigns_frequency,+ 10080,+ "stores the frequency on the user"+ );+ assert.strictEqual(+ subject.header().value(),+ "10080",+ "shows the picked frequency"+ );+ });+});diff --git a/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjs b/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjsindex d79019f7a47..c2c0b783610 100644--- a/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjs+++ b/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjs@@ -1,41 +1,46 @@-/* eslint-disable ember/no-classic-components */-import Component from "@ember/component";+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import { tagName } from "@ember-decorators/component";+import { service } from "@ember/service";import { ajax } from "discourse/lib/ajax";import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";-@tagName("")export default class ZendeskTopicActions extends Component {- init() {- super.init(...arguments);- const zendesk_id = this.topic.get("discourse_zendesk_plugin_zendesk_id");+ @service currentUser;++ @tracked dirty;+ @tracked zendesk_id;+ @tracked zendesk_url;++ constructor() {+ super(...arguments);+ const zendesk_id = this.args.topic.get(+ "discourse_zendesk_plugin_zendesk_id"+ );if (zendesk_id && zendesk_id !== "") {- this.set("zendesk_id", zendesk_id);+ this.zendesk_id = zendesk_id;}- this.setProperties({- zendesk_url: this.topic.get("discourse_zendesk_plugin_zendesk_url"),- valid_zendesk_credential: this.get(- "currentUser.discourse_zendesk_plugin_status"- ),- });+ this.zendesk_url = this.args.topic.get(+ "discourse_zendesk_plugin_zendesk_url"+ );+ }++ get valid_zendesk_credential() {+ return this.currentUser?.discourse_zendesk_plugin_status;}@actioncreateZendeskIssue() {- let self = this;- self.set("dirty", true);+ this.dirty = true;ajax("/zendesk-plugin/issues", {type: "POST",data: {- topic_id: this.get("topic").get("id"),+ topic_id: this.args.topic.get("id"),},}).then((topic) => {- self.setProperties({- zendesk_id: topic.discourse_zendesk_plugin_zendesk_id,- zendesk_url: topic.discourse_zendesk_plugin_zendesk_url,- });+ this.zendesk_id = topic.discourse_zendesk_plugin_zendesk_id;+ this.zendesk_url = topic.discourse_zendesk_plugin_zendesk_url;});}diff --git a/plugins/discourse-zendesk-plugin/test/javascripts/integration/components/zendesk-topic-actions-test.gjs b/plugins/discourse-zendesk-plugin/test/javascripts/integration/components/zendesk-topic-actions-test.gjsnew file mode 100644index 00000000000..9ea7451c6df--- /dev/null+++ b/plugins/discourse-zendesk-plugin/test/javascripts/integration/components/zendesk-topic-actions-test.gjs@@ -0,0 +1,34 @@+import EmberObject from "@ember/object";+import { getOwner } from "@ember/owner";+import { click, render } from "@ember/test-helpers";+import { module, test } from "qunit";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import pretender, { response } from "discourse/tests/helpers/create-pretender";+import {+ logIn,+ updateCurrentUser,+} from "discourse/tests/helpers/qunit-helpers";+import ZendeskTopicActions from "discourse/plugins/discourse-zendesk-plugin/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions";++module("Integration | Component | ZendeskTopicActions", function (hooks) {+ setupRenderingTest(hooks);++ test("links to the issue it creates", async function (assert) {+ logIn(getOwner(this));+ updateCurrentUser({ staff: true, discourse_zendesk_plugin_status: true });+ pretender.post("/zendesk-plugin/issues", () =>+ response({+ discourse_zendesk_plugin_zendesk_id: "42",+ discourse_zendesk_plugin_zendesk_url: "https://zendesk.example/42",+ })+ );+ const topic = EmberObject.create({ id: 1 });++ await render(<template><ZendeskTopicActions @topic={{topic}} /></template>);+ await click(".zendesk-topic-actions .btn-primary");++ assert+ .dom(".zendesk-topic-actions a.btn-primary")+ .hasAttribute("href", "https://zendesk.example/42", "links the issue");+ });+});