A platform for community discussion. Free, open, simple.
DEV: Convert @decorated macros to getters (#37955)
Sérgio Saquetim4b2c45376db6
diff --git a/frontend/discourse/admin/components/admin-penalty-post-action.gjs b/frontend/discourse/admin/components/admin-penalty-post-action.gjsindex ee757f0f792..d788f3636ee 100644--- a/frontend/discourse/admin/components/admin-penalty-post-action.gjs+++ b/frontend/discourse/admin/components/admin-penalty-post-action.gjs@@ -3,7 +3,6 @@ import { tracked } from "@glimmer/tracking";import Component, { Input, Textarea } from "@ember/component";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { equal } from "@ember/object/computed";import { trustHTML } from "@ember/template";import { afterRender } from "discourse/lib/decorators";import ComboBox from "discourse/select-kit/components/combo-box";@@ -18,8 +17,15 @@ export default class AdminPenaltyPostAction extends Component {postAction = null;postEdit = null;- @equal("postAction", "edit") editing;- @equal("postAction", "delete_all") deletingAll;+ @computed("postAction")+ get editing() {+ return this.postAction === "edit";+ }++ @computed("postAction")+ get deletingAll() {+ return this.postAction === "delete_all";+ }@computedget penaltyActions() {diff --git a/frontend/discourse/admin/components/admin-penalty-reason.gjs b/frontend/discourse/admin/components/admin-penalty-reason.gjsindex 32acdf062bc..0ffd3957e6f 100644--- a/frontend/discourse/admin/components/admin-penalty-reason.gjs+++ b/frontend/discourse/admin/components/admin-penalty-reason.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components */import Component, { Textarea } from "@ember/component";import { action, computed } from "@ember/object";-import { equal } from "@ember/object/computed";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import TextField from "discourse/components/text-field";@@ -25,7 +24,10 @@ export default class AdminPenaltyReason extends Component {CUSTOM_REASON_KEY,];- @equal("selectedReason", CUSTOM_REASON_KEY) isCustomReason;+ @computed("selectedReason")+ get isCustomReason() {+ return this.selectedReason === CUSTOM_REASON_KEY;+ }@computed("reasonKeys")get reasons() {diff --git a/frontend/discourse/admin/components/admin-report-storage-stats.gjs b/frontend/discourse/admin/components/admin-report-storage-stats.gjsindex bd26dd5c39e..028cdabc12a 100644--- a/frontend/discourse/admin/components/admin-report-storage-stats.gjs+++ b/frontend/discourse/admin/components/admin-report-storage-stats.gjs@@ -1,22 +1,37 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";-import { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import icon from "discourse/helpers/d-icon";import formatDate from "discourse/helpers/format-date";-import { setting } from "discourse/lib/computed";import getUrl from "discourse/lib/get-url";import I18n, { i18n } from "discourse-i18n";@tagName("")export default class AdminReportStorageStats extends Component {- @setting("backup_location") backupLocation;+ @computed("siteSettings.backup_location")+ get backupLocation() {+ return this.siteSettings.backup_location;+ }++ @computed("model.data.backups")+ get backupStats() {+ return this.model?.data?.backups;+ }- @alias("model.data.backups") backupStats;+ set backupStats(value) {+ set(this, "model.data.backups", value);+ }- @alias("model.data.uploads") uploadStats;+ @computed("model.data.uploads")+ get uploadStats() {+ return this.model?.data?.uploads;+ }++ set uploadStats(value) {+ set(this, "model.data.uploads", value);+ }@computed("backupStats")get showBackupStats() {diff --git a/frontend/discourse/admin/components/admin-report-table-cell.gjs b/frontend/discourse/admin/components/admin-report-table-cell.gjsindex 9aa46a8aecf..d1fb7d9df82 100644--- a/frontend/discourse/admin/components/admin-report-table-cell.gjs+++ b/frontend/discourse/admin/components/admin-report-table-cell.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";-import { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import concatClass from "discourse/helpers/concat-class";@@ -10,10 +9,41 @@ import concatClass from "discourse/helpers/concat-class";export default class AdminReportTableCell extends Component {options = null;- @alias("label.type") type;- @alias("label.mainProperty") property;- @alias("computedLabel.formattedValue") formattedValue;- @alias("computedLabel.value") value;+ @computed("label.type")+ get type() {+ return this.label?.type;+ }++ set type(value) {+ set(this, "label.type", value);+ }++ @computed("label.mainProperty")+ get property() {+ return this.label?.mainProperty;+ }++ set property(value) {+ set(this, "label.mainProperty", value);+ }++ @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")get computedLabel() {diff --git a/frontend/discourse/admin/components/admin-report-table.gjs b/frontend/discourse/admin/components/admin-report-table.gjsindex c999099edf2..15dce0ec7dc 100644--- a/frontend/discourse/admin/components/admin-report-table.gjs+++ b/frontend/discourse/admin/components/admin-report-table.gjs@@ -1,8 +1,7 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { fn } from "@ember/helper";-import { action, computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { tagName } from "@ember-decorators/component";import AdminReportTableHeader from "discourse/admin/components/admin-report-table-header";import AdminReportTableRow from "discourse/admin/components/admin-report-table-row";@@ -18,10 +17,17 @@ export default class AdminReportTable extends Component {sortable = false;sortDirection = 1;- @alias("options.perPage") perPage;-page = 0;+ @computed("options.perPage")+ get perPage() {+ return this.options?.perPage;+ }++ set perPage(value) {+ set(this, "options.perPage", value);+ }+@computed("model.computedLabels.length")get twoColumns() {return this.model?.computedLabels?.length === 2;diff --git a/frontend/discourse/admin/components/admin-theme-editor.gjs b/frontend/discourse/admin/components/admin-theme-editor.gjsindex fa889db9c97..23bd6fc54af 100644--- a/frontend/discourse/admin/components/admin-theme-editor.gjs+++ b/frontend/discourse/admin/components/admin-theme-editor.gjs@@ -11,7 +11,6 @@ import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import AceEditor from "discourse/components/ace-editor";import icon from "discourse/helpers/d-icon";-import { fmt } from "discourse/lib/computed";import { isDocumentRTL } from "discourse/lib/text-direction";import { gt, lte } from "discourse/truth-helpers";import { i18n } from "discourse-i18n";@@ -41,7 +40,10 @@ export default class AdminThemeEditor extends Component {warning = null;- @fmt("fieldName", "currentTargetName", "%@|%@") editorId;+ @computed("fieldName", "currentTargetName")+ get editorId() {+ return `${this.fieldName}|${this.currentTargetName}`;+ }get visibleTargets() {return this.theme.targets.filter((target) => {diff --git a/frontend/discourse/admin/components/admin-user-exports-table.gjs b/frontend/discourse/admin/components/admin-user-exports-table.gjsindex d25d887b626..7a24f069fa6 100644--- a/frontend/discourse/admin/components/admin-user-exports-table.gjs+++ b/frontend/discourse/admin/components/admin-user-exports-table.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";-import { action } from "@ember/object";-import { notEmpty } from "@ember/object/computed";+import { action, computed } from "@ember/object";import { service } from "@ember/service";+import { isEmpty } from "@ember/utils";import UserExport from "discourse/admin/models/user-export";import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import DButton from "discourse/components/d-button";@@ -21,8 +21,6 @@ export default class extends Component {@tracked userExport = null;@tracked userExportReloading = false;- @notEmpty("userExport") userExportAvailable;-constructor() {super(...arguments);this.messageBus.subscribe(EXPORT_PROGRESS_CHANNEL, this.onExportProgress);@@ -38,6 +36,11 @@ export default class extends Component {this.messageBus.unsubscribe(EXPORT_PROGRESS_CHANNEL, this.onExportProgress);}+ @computed("userExport")+ get userExportAvailable() {+ return !isEmpty(this.userExport);+ }+@bindonExportProgress(data) {if (data.user_export_id === this.model.id) {diff --git a/frontend/discourse/admin/components/edit-category-panel.gjs b/frontend/discourse/admin/components/edit-category-panel.gjsindex 217c0b516a7..13b3f2e806e 100644--- a/frontend/discourse/admin/components/edit-category-panel.gjs+++ b/frontend/discourse/admin/components/edit-category-panel.gjs@@ -1,6 +1,6 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */import Component from "@ember/component";-import { equal } from "@ember/object/computed";+import { computed } from "@ember/object";import { getOwner } from "@ember/owner";import { classNameBindings } from "@ember-decorators/component";@@ -26,7 +26,10 @@ export function buildCategoryPanel(tab) {`:edit-category-tab-${tab}`)class BuiltCategoryPanel extends EditCategoryPanel {- @equal("selectedTab", tab) activeTab;+ @computed("selectedTab")+ get activeTab() {+ return this.selectedTab === tab;+ }}return BuiltCategoryPanel;}diff --git a/frontend/discourse/admin/components/edit-category-security.gjs b/frontend/discourse/admin/components/edit-category-security.gjsindex f0c6b284319..f99c21e4c63 100644--- a/frontend/discourse/admin/components/edit-category-security.gjs+++ b/frontend/discourse/admin/components/edit-category-security.gjs@@ -1,6 +1,7 @@+import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";-import { not } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import { service } from "@ember/service";import { buildCategoryPanel } from "discourse/admin/components/edit-category-panel";import CategoryPermissionRow from "discourse/components/category-permission-row";@@ -16,9 +17,12 @@ export default class EditCategorySecurity extends buildCategoryPanel() {@service site;- selectedGroup = null;+ @tracked selectedGroup = null;- @not("selectedGroup") noGroupSelected;+ @dependentKeyCompat+ get noGroupSelected() {+ return !this.selectedGroup;+ }get everyonePermission() {return this.category.permissions.find(diff --git a/frontend/discourse/admin/components/edit-category-settings.gjs b/frontend/discourse/admin/components/edit-category-settings.gjsindex 24c5f2af134..76a0ae706c5 100644--- a/frontend/discourse/admin/components/edit-category-settings.gjs+++ b/frontend/discourse/admin/components/edit-category-settings.gjs@@ -2,8 +2,8 @@ import { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { and, empty } from "@ember/object/computed";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import { buildCategoryPanel } from "discourse/admin/components/edit-category-panel";import PluginOutlet from "discourse/components/plugin-outlet";import RelativeTimePicker from "discourse/components/relative-time-picker";@@ -11,7 +11,6 @@ import TextField from "discourse/components/text-field";import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import withEventValue from "discourse/helpers/with-event-value";-import { setting } from "discourse/lib/computed";import {POSTING_REVIEW_GROUP_BASED_MODES,SEARCH_PRIORITIES,@@ -25,12 +24,25 @@ import { i18n } from "discourse-i18n";export default class EditCategorySettings extends buildCategoryPanel("settings") {- @setting("email_in") emailInEnabled;- @setting("fixed_category_positions") showPositionInput;+ @computed("siteSettings.email_in")+ get emailInEnabled() {+ return this.siteSettings.email_in;+ }++ @computed("siteSettings.fixed_category_positions")+ get showPositionInput() {+ return this.siteSettings.fixed_category_positions;+ }- @and("category.show_subcategory_list", "isParentCategory")- showSubcategoryListStyle;- @empty("category.sort_order") isDefaultSortOrder;+ @computed("category.show_subcategory_list", "isParentCategory")+ get showSubcategoryListStyle() {+ return this.category?.show_subcategory_list && this.isParentCategory;+ }++ @computed("category.sort_order")+ get isDefaultSortOrder() {+ return isEmpty(this.category?.sort_order);+ }@computed("category.isParent",diff --git a/frontend/discourse/admin/components/edit-category-tab.gjs b/frontend/discourse/admin/components/edit-category-tab.gjsindex 014c4d18743..62e1c2571cc 100644--- a/frontend/discourse/admin/components/edit-category-tab.gjs+++ b/frontend/discourse/admin/components/edit-category-tab.gjs@@ -2,21 +2,28 @@import Component from "@ember/component";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { empty } from "@ember/object/computed";import { scheduleOnce } from "@ember/runloop";import { underscore } from "@ember/string";+import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import concatClass from "discourse/helpers/concat-class";import { addUniqueValueToArray } from "discourse/lib/array-tools";-import { propertyEqual } from "discourse/lib/computed";import getURL from "discourse/lib/get-url";+import { deepEqual } from "discourse/lib/object";import DiscourseURL from "discourse/lib/url";import { i18n } from "discourse-i18n";@tagName("")export default class EditCategoryTab extends Component {- @empty("params.slug") newCategory;- @propertyEqual("selectedTab", "tab") active;+ @computed("params.slug")+ get newCategory() {+ return isEmpty(this.params?.slug);+ }++ @computed("selectedTab", "tab")+ get active() {+ return deepEqual(this.selectedTab, this.tab);+ }@computed("tab")get tabClassName() {diff --git a/frontend/discourse/admin/components/edit-category-tags.gjs b/frontend/discourse/admin/components/edit-category-tags.gjsindex 567fb350822..f54b26474af 100644--- a/frontend/discourse/admin/components/edit-category-tags.gjs+++ b/frontend/discourse/admin/components/edit-category-tags.gjs@@ -1,8 +1,8 @@import { Input } from "@ember/component";import { array, fn, hash } from "@ember/helper";-import { action, set } from "@ember/object";-import { and, empty } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { LinkTo } from "@ember/routing";+import { isEmpty } from "@ember/utils";import { buildCategoryPanel } from "discourse/admin/components/edit-category-panel";import DButton from "discourse/components/d-button";import TextField from "discourse/components/text-field";@@ -12,9 +12,20 @@ import TagGroupChooser from "discourse/select-kit/components/tag-group-chooser";import { i18n } from "discourse-i18n";export default class EditCategoryTags extends buildCategoryPanel("tags") {- @empty("category.allowed_tags") allowedTagsEmpty;- @empty("category.allowed_tag_groups") allowedTagGroupsEmpty;- @and("allowedTagsEmpty", "allowedTagGroupsEmpty") disableAllowGlobalTags;+ @computed("category.allowed_tags.length")+ get allowedTagsEmpty() {+ return isEmpty(this.category?.allowed_tags);+ }++ @computed("category.allowed_tag_groups.length")+ get allowedTagGroupsEmpty() {+ return isEmpty(this.category?.allowed_tag_groups);+ }++ @computed("allowedTagsEmpty", "allowedTagGroupsEmpty")+ get disableAllowGlobalTags() {+ return this.allowedTagsEmpty && this.allowedTagGroupsEmpty;+ }@actiononTagGroupChange(rtg, valueArray) {diff --git a/frontend/discourse/admin/components/email-styles-editor.gjs b/frontend/discourse/admin/components/email-styles-editor.gjsindex c59aa21c71f..65de7d219e8 100644--- a/frontend/discourse/admin/components/email-styles-editor.gjs+++ b/frontend/discourse/admin/components/email-styles-editor.gjs@@ -1,8 +1,8 @@/* eslint-disable ember/no-classic-components */+import { tracked } from "@glimmer/tracking";import Component from "@ember/component";import { fn } from "@ember/helper";import { action, computed } from "@ember/object";-import { reads } from "@ember/object/computed";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";import AceEditor from "discourse/components/ace-editor";@@ -13,7 +13,19 @@ import { i18n } from "discourse-i18n";export default class EmailStylesEditor extends Component {@service dialog;- @reads("fieldName") editorId;+ @tracked _editorIdOverride;++ @computed("fieldName")+ get editorId() {+ if (this._editorIdOverride !== undefined) {+ return this._editorIdOverride;+ }+ return this.fieldName;+ }++ set editorId(value) {+ this._editorIdOverride = value;+ }@computed("fieldName")get currentEditorMode() {diff --git a/frontend/discourse/admin/components/emoji-uploader.gjs b/frontend/discourse/admin/components/emoji-uploader.gjsindex 6dba86ef765..2b4666170cc 100644--- a/frontend/discourse/admin/components/emoji-uploader.gjs+++ b/frontend/discourse/admin/components/emoji-uploader.gjs@@ -3,7 +3,6 @@ import Component, { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { notEmpty } from "@ember/object/computed";import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { isEmpty } from "@ember/utils";@@ -51,13 +50,20 @@ export default class EmojiUploader extends Component {},});- @notEmpty("name") hasName;- @notEmpty("group") hasGroup;-group = "default";emojiGroups = null;newEmojiGroups = null;+ @computed("name")+ get hasName() {+ return !isEmpty(this.name);+ }++ @computed("group")+ get hasGroup() {+ return !isEmpty(this.group);+ }+didReceiveAttrs() {super.didReceiveAttrs(...arguments);this.set("newEmojiGroups", this.emojiGroups);diff --git a/frontend/discourse/admin/components/permalink-form.gjs b/frontend/discourse/admin/components/permalink-form.gjsindex ebaa8072eca..fe999a7ebc2 100644--- a/frontend/discourse/admin/components/permalink-form.gjs+++ b/frontend/discourse/admin/components/permalink-form.gjs@@ -8,7 +8,6 @@ import { tagName } from "@ember-decorators/component";import Permalink from "discourse/admin/models/permalink";import DButton from "discourse/components/d-button";import TextField from "discourse/components/text-field";-import { fmt } from "discourse/lib/computed";import { bind } from "discourse/lib/decorators";import ComboBox from "discourse/select-kit/components/combo-box";import { i18n } from "discourse-i18n";@@ -20,11 +19,14 @@ export default class PermalinkForm extends Component {formSubmitted = false;permalinkType = "topic_id";- @fmt("permalinkType", "admin.permalink.%@") permalinkTypePlaceholder;-action = null;permalinkTypeValue = null;+ @computed("permalinkType")+ get permalinkTypePlaceholder() {+ return `admin.permalink.${this.permalinkType}`;+ }+@computedget permalinkTypes() {return [diff --git a/frontend/discourse/admin/components/report-filters/category.gjs b/frontend/discourse/admin/components/report-filters/category.gjsindex d31b90cf10b..597a982fea9 100644--- a/frontend/discourse/admin/components/report-filters/category.gjs+++ b/frontend/discourse/admin/components/report-filters/category.gjs@@ -1,11 +1,13 @@import { hash } from "@ember/helper";-import { action } from "@ember/object";-import { readOnly } from "@ember/object/computed";+import { action, computed } from "@ember/object";import FilterComponent from "discourse/admin/components/report-filters/filter";import SearchAdvancedCategoryChooser from "discourse/select-kit/components/search-advanced-category-chooser";export default class Category extends FilterComponent {- @readOnly("filter.default") category;+ @computed("filter.default")+ get category() {+ return this.filter?.default;+ }@actiononChange(categoryId) {diff --git a/frontend/discourse/admin/components/value-list.gjs b/frontend/discourse/admin/components/value-list.gjsindex eff272f64f9..0095fd02b30 100644--- a/frontend/discourse/admin/components/value-list.gjs+++ b/frontend/discourse/admin/components/value-list.gjs@@ -1,9 +1,10 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */+import { tracked } from "@glimmer/tracking";import Component, { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { empty, reads } from "@ember/object/computed";+import { isEmpty } from "@ember/utils";import { classNames } from "@ember-decorators/component";import DButton from "discourse/components/d-button";import {@@ -19,15 +20,30 @@ import ComboBox from "discourse/select-kit/components/combo-box";export default class ValueList extends Component {@autoTrackedArray collection = null;- @empty("newValue") inputInvalid;-inputDelimiter = null;inputType = null;newValue = "";values = null;onChange = null;- @reads("addKey") noneKey;+ @tracked _noneKeyOverride;++ @computed("newValue")+ get inputInvalid() {+ return isEmpty(this.newValue);+ }++ @computed("addKey")+ get noneKey() {+ if (this._noneKeyOverride !== undefined) {+ return this._noneKeyOverride;+ }+ return this.addKey;+ }++ set noneKey(value) {+ this._noneKeyOverride = value;+ }didReceiveAttrs() {super.didReceiveAttrs(...arguments);diff --git a/frontend/discourse/admin/components/watched-word-form.gjs b/frontend/discourse/admin/components/watched-word-form.gjsindex 8085b8e8439..d67f3d20254 100644--- a/frontend/discourse/admin/components/watched-word-form.gjs+++ b/frontend/discourse/admin/components/watched-word-form.gjs@@ -2,7 +2,6 @@import Component, { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { action, computed } from "@ember/object";-import { empty, equal } from "@ember/object/computed";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";@@ -24,10 +23,25 @@ export default class WatchedWordForm extends Component {selectedTags = [];words = [];- @empty("words") submitDisabled;- @equal("actionKey", "replace") canReplace;- @equal("actionKey", "tag") canTag;- @equal("actionKey", "link") canLink;+ @computed("words.length")+ get submitDisabled() {+ return isEmpty(this.words);+ }++ @computed("actionKey")+ get canReplace() {+ return this.actionKey === "replace";+ }++ @computed("actionKey")+ get canTag() {+ return this.actionKey === "tag";+ }++ @computed("actionKey")+ get canLink() {+ return this.actionKey === "link";+ }@computed("siteSettings.watched_words_regular_expressions")get placeholderKey() {diff --git a/frontend/discourse/admin/components/watched-word-uploader.gjs b/frontend/discourse/admin/components/watched-word-uploader.gjsindex 9dc68bf5ab5..1e63c5cd451 100644--- a/frontend/discourse/admin/components/watched-word-uploader.gjs+++ b/frontend/discourse/admin/components/watched-word-uploader.gjs@@ -1,6 +1,6 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";@@ -28,8 +28,6 @@ export default class WatchedWordUploader extends Component {},});- @alias("uppyUpload.uploading") addDisabled;-<template><div class="watched-words-uploader" ...attributes><label class="btn btn-default {{if this.addDisabled 'disabled'}}">@@ -44,4 +42,13 @@ export default class WatchedWordUploader extends Component {</label></div></template>++ @computed("uppyUpload.uploading")+ get addDisabled() {+ return this.uppyUpload?.uploading;+ }++ set addDisabled(value) {+ set(this, "uppyUpload.uploading", value);+ }}diff --git a/frontend/discourse/admin/components/webhook-events.gjs b/frontend/discourse/admin/components/webhook-events.gjsindex 6fd7f6b45d4..4279a4f26be 100644--- a/frontend/discourse/admin/components/webhook-events.gjs+++ b/frontend/discourse/admin/components/webhook-events.gjs@@ -2,8 +2,7 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";-import { action } from "@ember/object";-import { gt, readOnly } from "@ember/object/computed";+import { action, computed } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";@@ -31,14 +30,21 @@ export default class WebhookEvents extends Component {@tracked redeliverEnabled = true;@autoTrackedArray incomingEventIds = [];- @readOnly("incomingEventIds.length") incomingCount;- @gt("incomingCount", 0) hasIncoming;-constructor() {super(...arguments);this.loadEvents();}+ @computed("incomingEventIds.length")+ get incomingCount() {+ return this.incomingEventIds?.length;+ }++ @computed("incomingCount")+ get hasIncoming() {+ return this.incomingCount > 0;+ }+async loadEvents() {this.loading = true;diff --git a/frontend/discourse/admin/controllers/admin-api-keys/new.js b/frontend/discourse/admin/controllers/admin-api-keys/new.jsindex 43611a9615c..f7c86fe470e 100644--- a/frontend/discourse/admin/controllers/admin-api-keys/new.js+++ b/frontend/discourse/admin/controllers/admin-api-keys/new.js@@ -1,6 +1,7 @@+import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed, get } from "@ember/object";-import { equal } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import { service } from "@ember/service";import { isBlank } from "@ember/utils";import { ajax } from "discourse/lib/ajax";@@ -10,8 +11,11 @@ import ApiKeyUrlsModal from "../../components/modal/api-key-urls";export default class AdminApiKeysNewController extends Controller {@service router;+@service modal;+ @tracked userMode;+userModes = [{ id: "all", name: i18n("admin.api.all_users") },{ id: "single", name: i18n("admin.api.single_user") },@@ -24,13 +28,16 @@ export default class AdminApiKeysNewController extends Controller {globalScopes = null;scopes = null;- @equal("userMode", "single") showUserSelector;-init() {super.init(...arguments);this._loadScopes();}+ @dependentKeyCompat+ get showUserSelector() {+ return this.userMode === "single";+ }+@computed("model.{description,username}", "showUserSelector")get saveDisabled() {if (isBlank(this.model?.description)) {diff --git a/frontend/discourse/admin/controllers/admin-customize-robots-txt.js b/frontend/discourse/admin/controllers/admin-customize-robots-txt.jsindex 239bbaa7b2a..c99a3dd2a0d 100644--- a/frontend/discourse/admin/controllers/admin-customize-robots-txt.js+++ b/frontend/discourse/admin/controllers/admin-customize-robots-txt.js@@ -1,20 +1,25 @@import { cached, tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import { action } from "@ember/object";+import { action, computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { not } from "@ember/object/computed";import BufferedProxy from "ember-buffered-proxy/proxy";import { ajax } from "discourse/lib/ajax";-import { propertyEqual } from "discourse/lib/computed";+import { deepEqual } from "discourse/lib/object";export default class AdminCustomizeRobotsTxtController extends Controller {@tracked model;saved = false;isSaving = false;- @propertyEqual("model.robots_txt", "buffered.robots_txt") saveDisabled;+ @computed("model.overridden")+ get resetDisabled() {+ return !this.model?.overridden;+ }- @not("model.overridden") resetDisabled;+ @computed("model.robots_txt", "buffered.robots_txt")+ get saveDisabled() {+ return deepEqual(this.model?.robots_txt, this.get("buffered.robots_txt"));+ }@cached@dependentKeyCompatdiff --git a/frontend/discourse/admin/controllers/admin-customize-themes/edit.js b/frontend/discourse/admin/controllers/admin-customize-themes/edit.jsindex b38e83ba2bf..9adc1f0d89b 100644--- a/frontend/discourse/admin/controllers/admin-customize-themes/edit.js+++ b/frontend/discourse/admin/controllers/admin-customize-themes/edit.js@@ -1,7 +1,7 @@import Controller from "@ember/controller";import { action, computed } from "@ember/object";import { service } from "@ember/service";-import { url } from "discourse/lib/computed";+import getURL from "discourse/lib/get-url";import { i18n } from "discourse-i18n";export default class AdminCustomizeThemesEditController extends Controller {@@ -11,12 +11,15 @@ export default class AdminCustomizeThemesEditController extends Controller {currentTarget = 0;maximized = false;- @url("model.id", "/admin/themes/%@/preview") previewUrl;-showAdvanced = false;editRouteName = "adminCustomizeThemes.edit";showRouteName = "adminCustomizeThemes.show";+ @computed("model.id")+ get previewUrl() {+ return getURL(`/admin/themes/${this.model?.id}/preview`);+ }+setTargetName(name) {const target = this.get("model.targets").find((t) => t.name === name);this.set("currentTarget", target && target.id);diff --git a/frontend/discourse/admin/controllers/admin-customize-themes/show.js b/frontend/discourse/admin/controllers/admin-customize-themes/show.jsindex ed6392e759a..9780e324a2d 100644--- a/frontend/discourse/admin/controllers/admin-customize-themes/show.js+++ b/frontend/discourse/admin/controllers/admin-customize-themes/show.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { match } from "@ember/object/computed";import { service } from "@ember/service";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";@@ -10,7 +9,10 @@ export default class AdminCustomizeThemesShowController extends Controller {@service dialog;@service router;- @match("model.remote_theme.remote_url", /^http(s)?:\/\//) sourceIsHttp;+ @computed("model.remote_theme.remote_url")+ get sourceIsHttp() {+ return /^http(s)?:\/\//.test(this.model?.remote_theme?.remote_url);+ }@computed("model.remote_theme.remote_url", "model.remote_theme.branch")get remoteThemeLink() {diff --git a/frontend/discourse/admin/controllers/admin-customize-themes/show/index.js b/frontend/discourse/admin/controllers/admin-customize-themes/show/index.jsindex 25a28d8623b..9396d2a51f3 100644--- a/frontend/discourse/admin/controllers/admin-customize-themes/show/index.js+++ b/frontend/discourse/admin/controllers/admin-customize-themes/show/index.js@@ -1,13 +1,7 @@import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import {- empty,- filterBy,- mapBy,- notEmpty,- readOnly,-} from "@ember/object/computed";import { service } from "@ember/service";+import { isEmpty } from "@ember/utils";import ChangeThemeSourceModal from "discourse/admin/components/modal/change-theme-source";import ThemeSettingsEditor from "discourse/admin/components/theme-settings-editor";import SiteSetting from "discourse/admin/models/site-setting";@@ -16,7 +10,7 @@ import ThemeSettings from "discourse/admin/models/theme-settings";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";-import { url } from "discourse/lib/computed";+import getURL from "discourse/lib/get-url";import { makeArray } from "discourse/lib/helpers";import { i18n } from "discourse-i18n";import ThemeUploadAddModal from "../../../components/theme-upload-add";@@ -32,24 +26,92 @@ export default class AdminCustomizeThemesShowIndexController extends ControllereditRouteName = "adminCustomizeThemes.edit";- @url("model.id", "/admin/customize/themes/%@/export") downloadUrl;- @url("model.id", "/admin/themes/%@/preview") previewUrl;- @url("model.id", "model.locale", "/admin/themes/%@/translations/%@")- getTranslationsUrl;- @empty("selectedChildThemeId") addButtonDisabled;- @mapBy("model.parentThemes", "name") parentThemesNames;- @filterBy("allThemes", "component", false) availableParentThemes;- @filterBy("availableParentThemes", "isActive") availableActiveParentThemes;- @mapBy("availableParentThemes", "name") availableThemesNames;- @filterBy("availableChildThemes", "hasParents") availableActiveChildThemes;- @mapBy("availableChildThemes", "name") availableComponentsNames;- @mapBy("availableActiveChildThemes", "name") availableActiveComponentsNames;- @mapBy("model.childThemes", "name") childThemesNames;- @notEmpty("settings") hasSettings;- @notEmpty("translations") hasTranslations;- @notEmpty("model.themeable_site_settings") hasThemeableSiteSettings;- @readOnly("model.settings") settings;- @readOnly("model.themeable_site_settings") themeSiteSettings;+ @computed("model.id")+ get downloadUrl() {+ return getURL(`/admin/customize/themes/${this.model?.id}/export`);+ }++ @computed("model.id")+ get previewUrl() {+ return getURL(`/admin/themes/${this.model?.id}/preview`);+ }++ @computed("model.id", "model.locale")+ get getTranslationsUrl() {+ return getURL(+ `/admin/themes/${this.model?.id}/translations/${this.model?.locale}`+ );+ }++ @computed("selectedChildThemeId")+ get addButtonDisabled() {+ return isEmpty(this.selectedChildThemeId);+ }++ @computed("[email protected]")+ get parentThemesNames() {+ return this.model?.parentThemes?.map?.((item) => item.name) ?? [];+ }++ @computed("[email protected]")+ get availableParentThemes() {+ return this.allThemes?.filter?.((item) => item.component === false) ?? [];+ }++ @computed("[email protected]")+ get availableActiveParentThemes() {+ return this.availableParentThemes?.filter?.((item) => item.isActive) ?? [];+ }++ @computed("[email protected]")+ get availableThemesNames() {+ return this.availableParentThemes?.map?.((item) => item.name) ?? [];+ }++ @computed("[email protected]")+ get availableActiveChildThemes() {+ return this.availableChildThemes?.filter?.((item) => item.hasParents) ?? [];+ }++ @computed("[email protected]")+ get availableComponentsNames() {+ return this.availableChildThemes?.map?.((item) => item.name) ?? [];+ }++ @computed("[email protected]")+ get availableActiveComponentsNames() {+ return this.availableActiveChildThemes?.map?.((item) => item.name) ?? [];+ }++ @computed("[email protected]")+ get childThemesNames() {+ return this.model?.childThemes?.map?.((item) => item.name) ?? [];+ }++ @computed("settings.length")+ get hasSettings() {+ return !isEmpty(this.settings);+ }++ @computed("translations.length")+ get hasTranslations() {+ return !isEmpty(this.translations);+ }++ @computed("model.themeable_site_settings.length")+ get hasThemeableSiteSettings() {+ return !isEmpty(this.model?.themeable_site_settings);+ }++ @computed("model.settings")+ get settings() {+ return this.model?.settings;+ }++ @computed("model.themeable_site_settings")+ get themeSiteSettings() {+ return this.model?.themeable_site_settings;+ }@computed("model.component", "model.remote_theme")get showCheckboxes() {diff --git a/frontend/discourse/admin/controllers/admin-email-templates/index.js b/frontend/discourse/admin/controllers/admin-email-templates/index.jsindex bb2bf1f1a9e..d999855592e 100644--- a/frontend/discourse/admin/controllers/admin-email-templates/index.js+++ b/frontend/discourse/admin/controllers/admin-email-templates/index.js@@ -1,13 +1,20 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import { action } from "@ember/object";-import { sort } from "@ember/object/computed";+import { action, computed } from "@ember/object";+import { arraySortedByProperties } from "discourse/lib/array-tools";export default class AdminEmailTemplatesIndexController extends Controller {@tracked showOverridenOnly = false;titleSorting = ["title"];- @sort("emailTemplates.content", "titleSorting") sortedTemplates;++ @computed("emailTemplates.content", "titleSorting")+ get sortedTemplates() {+ return arraySortedByProperties(+ this.emailTemplates?.content,+ this.titleSorting+ );+ }get shownTemplates() {if (this.showOverridenOnly) {diff --git a/frontend/discourse/admin/controllers/admin-email/preview-digest.js b/frontend/discourse/admin/controllers/admin-email/preview-digest.jsindex 598b5b51bf9..51066efa2ac 100644--- a/frontend/discourse/admin/controllers/admin-email/preview-digest.js+++ b/frontend/discourse/admin/controllers/admin-email/preview-digest.js@@ -1,7 +1,7 @@import Controller from "@ember/controller";-import { action, get } from "@ember/object";-import { empty, notEmpty, or } from "@ember/object/computed";+import { action, computed, get } from "@ember/object";import { service } from "@ember/service";+import { isEmpty } from "@ember/utils";import EmailPreview from "discourse/admin/models/email-preview";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -12,10 +12,25 @@ export default class AdminEmailPreviewDigestController extends Controller {lastSeen = null;email = null;- @empty("email") emailEmpty;- @or("emailEmpty", "sendingEmail") sendEmailDisabled;- @notEmpty("model.html_content") showSendEmailForm;- @empty("model.html_content") htmlEmpty;+ @computed("email")+ get emailEmpty() {+ return isEmpty(this.email);+ }++ @computed("emailEmpty", "sendingEmail")+ get sendEmailDisabled() {+ return this.emailEmpty || this.sendingEmail;+ }++ @computed("model.html_content")+ get showSendEmailForm() {+ return !isEmpty(this.model?.html_content);+ }++ @computed("model.html_content")+ get htmlEmpty() {+ return isEmpty(this.model?.html_content);+ }@actiontoggleShowHtml(event) {diff --git a/frontend/discourse/admin/controllers/admin-email/server-settings.js b/frontend/discourse/admin/controllers/admin-email/server-settings.jsindex a149212e11d..dfca2455eba 100644--- a/frontend/discourse/admin/controllers/admin-email/server-settings.js+++ b/frontend/discourse/admin/controllers/admin-email/server-settings.js@@ -1,9 +1,9 @@/* eslint-disable ember/no-observers */import Controller from "@ember/controller";-import { action } from "@ember/object";-import { empty } from "@ember/object/computed";+import { action, computed } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import { observes } from "@ember-decorators/object";import { ajax } from "discourse/lib/ajax";import { escapeExpression } from "discourse/lib/utilities";@@ -17,13 +17,18 @@ export default class AdminEmailIndexController extends Controller {@property sendTestEmailDisabled**/- @empty("testEmailAddress") sendTestEmailDisabled;/**Clears the 'sentTestEmail' property on successful send.@method testEmailAddressChanged**/++ @computed("testEmailAddress")+ get sendTestEmailDisabled() {+ return isEmpty(this.testEmailAddress);+ }+@observes("testEmailAddress")testEmailAddressChanged() {this.set("sentTestEmail", false);diff --git a/frontend/discourse/admin/controllers/admin-site-settings-category.js b/frontend/discourse/admin/controllers/admin-site-settings-category.jsindex 1423b59729f..4c96de7b87e 100644--- a/frontend/discourse/admin/controllers/admin-site-settings-category.js+++ b/frontend/discourse/admin/controllers/admin-site-settings-category.js@@ -1,6 +1,16 @@+import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import { alias } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";export default class AdminSiteSettingsCategoryController extends Controller {- @alias("model") filteredSiteSettings;+ @tracked model;++ @dependentKeyCompat+ get filteredSiteSettings() {+ return this.model;+ }++ set filteredSiteSettings(value) {+ this.model = value;+ }}diff --git a/frontend/discourse/admin/controllers/admin-site-settings.js b/frontend/discourse/admin/controllers/admin-site-settings.jsindex f0e608c1e2c..7c84ecd6bd2 100644--- a/frontend/discourse/admin/controllers/admin-site-settings.js+++ b/frontend/discourse/admin/controllers/admin-site-settings.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";-import { action } from "@ember/object";-import { alias } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { service } from "@ember/service";import { debounce } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";@@ -8,8 +7,23 @@ import { INPUT_DELAY } from "discourse/lib/environment";export default class AdminSiteSettingsController extends Controller {@service router;- @alias("model.filteredSettings") visibleSiteSettings;- @alias("model.filtersApplied") filtersApplied;+ @computed("model.filteredSettings")+ get visibleSiteSettings() {+ return this.model?.filteredSettings;+ }++ set visibleSiteSettings(value) {+ set(this, "model.filteredSettings", value);+ }++ @computed("model.filtersApplied")+ get filtersApplied() {+ return this.model?.filtersApplied;+ }++ set filtersApplied(value) {+ set(this, "model.filtersApplied", value);+ }@debounce(INPUT_DELAY)filterContent(filterData) {diff --git a/frontend/discourse/admin/controllers/admin-user/badges.js b/frontend/discourse/admin/controllers/admin-user/badges.jsindex 0fb4e2a1838..39aa54ba479 100644--- a/frontend/discourse/admin/controllers/admin-user/badges.js+++ b/frontend/discourse/admin/controllers/admin-user/badges.js@@ -1,11 +1,10 @@import { tracked } from "@glimmer/tracking";import Controller, { inject as controller } from "@ember/controller";-import { action } from "@ember/object";+import { action, computed, set } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { alias, empty } from "@ember/object/computed";import { next } from "@ember/runloop";import { service } from "@ember/service";-import { compare } from "@ember/utils";+import { compare, isEmpty } from "@ember/utils";import AdminUser from "discourse/admin/models/admin-user";import { popupAjaxError } from "discourse/lib/ajax-error";import {@@ -26,11 +25,22 @@ export default class AdminUserBadgesController extends Controller {@autoTrackedArray badges;@autoTrackedArray expandedBadges = [];- @alias("adminUser.model") user;- @empty("availableBadges") noAvailableBadges;-badgeSortOrder = ["granted_at:desc"];+ @computed("adminUser.model")+ get user() {+ return this.adminUser?.model;+ }++ set user(value) {+ set(this, "adminUser.model", value);+ }++ @computed("availableBadges.length")+ get noAvailableBadges() {+ return isEmpty(this.availableBadges);+ }+@dependentKeyCompatget sortedBadges() {return arraySortedByProperties(this.model, this.badgeSortOrder);diff --git a/frontend/discourse/admin/controllers/admin-user/index.js b/frontend/discourse/admin/controllers/admin-user/index.jsindex a928d5aa827..394cbe4dd96 100644--- a/frontend/discourse/admin/controllers/admin-user/index.js+++ b/frontend/discourse/admin/controllers/admin-user/index.js@@ -1,15 +1,15 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { and, notEmpty } from "@ember/object/computed";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import AdminUser from "discourse/admin/models/admin-user";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";-import { fmt, propertyNotEqual, setting } from "discourse/lib/computed";import getURL from "discourse/lib/get-url";+import { deepEqual } from "discourse/lib/object";import DiscourseURL, { userPath } from "discourse/lib/url";import { i18n } from "discourse-i18n";import DeletePostsConfirmationModal from "../../components/modal/delete-posts-confirmation";@@ -32,17 +32,40 @@ export default class AdminUserIndexController extends Controller {ssoLastPayload = null;isLoading = false;- @setting("enable_badges") showBadges;- @setting("moderators_view_emails") canModeratorsViewEmails;- @notEmpty("model.manual_locked_trust_level") hasLockedTrustLevel;+ @computed("siteSettings.enable_badges")+ get showBadges() {+ return this.siteSettings.enable_badges;+ }++ @computed("siteSettings.moderators_view_emails")+ get canModeratorsViewEmails() {+ return this.siteSettings.moderators_view_emails;+ }++ @computed("model.manual_locked_trust_level")+ get hasLockedTrustLevel() {+ return !isEmpty(this.model?.manual_locked_trust_level);+ }- @propertyNotEqual("originalPrimaryGroupId", "model.primary_group_id")- primaryGroupDirty;+ @computed("originalPrimaryGroupId", "model.primary_group_id")+ get primaryGroupDirty() {+ return !deepEqual(+ this.originalPrimaryGroupId,+ this.model?.primary_group_id+ );+ }- @and("model.second_factor_enabled", "model.can_disable_second_factor")- canDisableSecondFactor;+ @computed("model.second_factor_enabled", "model.can_disable_second_factor")+ get canDisableSecondFactor() {+ return (+ this.model?.second_factor_enabled && this.model?.can_disable_second_factor+ );+ }- @fmt("model.username_lower", userPath("%@/preferences")) preferencesPath;+ @computed("model.username_lower")+ get preferencesPath() {+ return userPath(`${this.model?.username_lower}/preferences`);+ }get customGroupIds() {return this.model.customGroups.map((group) => group.id);diff --git a/frontend/discourse/admin/controllers/admin-users-list/show.js b/frontend/discourse/admin/controllers/admin-users-list/show.jsindex 7f301258ffd..ef07adf1b31 100644--- a/frontend/discourse/admin/controllers/admin-users-list/show.js+++ b/frontend/discourse/admin/controllers/admin-users-list/show.js@@ -1,12 +1,12 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed } from "@ember/object";+import { dependentKeyCompat } from "@ember/object/compat";import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import BulkUserDeleteConfirmation from "discourse/admin/components/bulk-user-delete-confirmation";import AdminUser from "discourse/admin/models/admin-user";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";-import { computedI18n, setting } from "discourse/lib/computed";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";@@ -22,7 +22,6 @@ export default class AdminUsersListShowController extends Controller {@tracked displayBulkActions = false;@tracked bulkSelectedUserIdsSet = new Set();@tracked bulkSelectedUsersMap = {};- @setting("moderators_view_emails") canModeratorsViewEmails;query = null;order = null;@@ -32,12 +31,20 @@ export default class AdminUsersListShowController extends Controller {listFilter = null;lastSelected = null;- @computedI18n("search_hint") searchHint;-_page = 1;_results = trackedArray();_canLoadMore = true;+ @computed("siteSettings.moderators_view_emails")+ get canModeratorsViewEmails() {+ return this.siteSettings.moderators_view_emails;+ }++ @dependentKeyCompat+ get searchHint() {+ return i18n(`search_hint`);+ }+get users() {return this._results.flat();}diff --git a/frontend/discourse/admin/controllers/admin-watched-words/action.js b/frontend/discourse/admin/controllers/admin-watched-words/action.jsindex 23cd7670dc7..e9195328020 100644--- a/frontend/discourse/admin/controllers/admin-watched-words/action.js+++ b/frontend/discourse/admin/controllers/admin-watched-words/action.js@@ -1,12 +1,11 @@import { cached, tracked } from "@glimmer/tracking";import Controller, { inject as controller } from "@ember/controller";-import { action } from "@ember/object";-import { or } from "@ember/object/computed";+import { action, computed } from "@ember/object";+import { dependentKeyCompat } from "@ember/object/compat";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import WatchedWordTestingModal from "discourse/admin/components/modal/watched-word-testing";import { ajax } from "discourse/lib/ajax";-import { fmt } from "discourse/lib/computed";import { i18n } from "discourse-i18n";export default class AdminWatchedWordsActionController extends Controller {@@ -16,11 +15,15 @@ export default class AdminWatchedWordsActionController extends Controller {@tracked actionNameKey = null;- @fmt("actionNameKey", "/admin/customize/watched_words/action/%@/download")- downloadLink;+ @dependentKeyCompat+ get downloadLink() {+ return `/admin/customize/watched_words/action/${this.actionNameKey}/download`;+ }- @or("adminWatchedWords.showWords", "adminWatchedWords.filter")- showWordsList;+ @computed("adminWatchedWords.showWords", "adminWatchedWords.filter")+ get showWordsList() {+ return this.adminWatchedWords?.showWords || this.adminWatchedWords?.filter;+ }get currentAction() {return this.adminWatchedWords.allWatchedWords.find(diff --git a/frontend/discourse/admin/controllers/admin/backups/index.js b/frontend/discourse/admin/controllers/admin/backups/index.jsindex a58cfb463df..2d102a3f745 100644--- a/frontend/discourse/admin/controllers/admin/backups/index.js+++ b/frontend/discourse/admin/controllers/admin/backups/index.js@@ -1,10 +1,9 @@import Controller, { inject as controller } from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias, equal } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";+import { dependentKeyCompat } from "@ember/object/compat";import { service } from "@ember/service";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";-import { computedI18n, setting } from "discourse/lib/computed";import getURL from "discourse/lib/get-url";import { i18n } from "discourse-i18n";@@ -12,10 +11,29 @@ export default class AdminBackupsIndexController extends Controller {@service dialog;@controller("admin.backups") adminBackups;- @alias("adminBackups.model") status;- @computedI18n("admin.backups.upload.label") uploadLabel;- @setting("backup_location") backupLocation;- @equal("backupLocation", "local") localBackupStorage;+ @computed("adminBackups.model")+ get status() {+ return this.adminBackups?.model;+ }++ set status(value) {+ set(this, "adminBackups.model", value);+ }++ @dependentKeyCompat+ get uploadLabel() {+ return i18n(`admin.backups.upload.label`);+ }++ @computed("siteSettings.backup_location")+ get backupLocation() {+ return this.siteSettings.backup_location;+ }++ @computed("backupLocation")+ get localBackupStorage() {+ return this.backupLocation === "local";+ }get restoreSettingsUrl() {return getURL("/admin/backups/settings?filter=allow_restore");diff --git a/frontend/discourse/admin/controllers/admin/backups/logs.js b/frontend/discourse/admin/controllers/admin/backups/logs.jsindex 61ffaa25660..6ec035e58c8 100644--- a/frontend/discourse/admin/controllers/admin/backups/logs.js+++ b/frontend/discourse/admin/controllers/admin/backups/logs.js@@ -1,11 +1,18 @@import Controller, { inject as controller } from "@ember/controller";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { autoTrackedArray } from "discourse/lib/tracked-tools";export default class AdminBackupsLogsController extends Controller {@controller("admin.backups") adminBackups;- @alias("adminBackups.model") status;-@autoTrackedArray logs = [];++ @computed("adminBackups.model")+ get status() {+ return this.adminBackups?.model;+ }++ set status(value) {+ set(this, "adminBackups.model", value);+ }}diff --git a/frontend/discourse/admin/controllers/admin/dashboard.js b/frontend/discourse/admin/controllers/admin/dashboard.jsindex 9e2bbd8b921..a255b372cb2 100644--- a/frontend/discourse/admin/controllers/admin/dashboard.js+++ b/frontend/discourse/admin/controllers/admin/dashboard.js@@ -4,7 +4,6 @@ import { action, computed } from "@ember/object";import { service } from "@ember/service";import AdminDashboard from "discourse/admin/models/admin-dashboard";import VersionCheck from "discourse/admin/models/version-check";-import { setting } from "discourse/lib/computed";import { autoTrackedArray } from "discourse/lib/tracked-tools";const PROBLEMS_CHECK_MINUTES = 1;@@ -21,7 +20,10 @@ export default class AdminDashboardController extends Controller {isLoading = false;dashboardFetchedAt = null;- @setting("version_checks") showVersionChecks;+ @computed("siteSettings.version_checks")+ get showVersionChecks() {+ return this.siteSettings.version_checks;+ }@computed("siteSettings.dashboard_visible_tabs")get visibleTabs() {diff --git a/frontend/discourse/admin/controllers/admin/dashboard/general.js b/frontend/discourse/admin/controllers/admin/dashboard/general.jsindex 75f22acd91f..a9b2a4fafd7 100644--- a/frontend/discourse/admin/controllers/admin/dashboard/general.js+++ b/frontend/discourse/admin/controllers/admin/dashboard/general.js@@ -4,7 +4,6 @@ import { service } from "@ember/service";import { REPORT_MODES } from "discourse/admin/lib/constants";import AdminDashboard from "discourse/admin/models/admin-dashboard";import Report from "discourse/admin/models/report";-import { setting } from "discourse/lib/computed";import getURL from "discourse/lib/get-url";import { makeArray } from "discourse/lib/helpers";import { i18n } from "discourse-i18n";@@ -24,12 +23,15 @@ export default class AdminDashboardGeneralController extends AdminDashboardTabCoisLoading = false;dashboardFetchedAt = null;- @setting("log_search_queries") logSearchQueriesEnabled;-@staticReport("users_by_type") usersByTypeReport;@staticReport("users_by_trust_level") usersByTrustLevelReport;@staticReport("storage_report") storageReport;+ @computed("siteSettings.log_search_queries")+ get logSearchQueriesEnabled() {+ return this.siteSettings.log_search_queries;+ }+get reportModes() {return REPORT_MODES;}diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.jsindex 223c27a6cfd..778391f9976 100644--- a/frontend/discourse/admin/controllers/edit-category/tabs.js+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js@@ -1,7 +1,6 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed, getProperties } from "@ember/object";-import { and } from "@ember/object/computed";import { next } from "@ember/runloop";import { service } from "@ember/service";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -117,8 +116,6 @@ export default class EditCategoryTabsController extends Controller {validators = [];textColors = ["000000", "FFFFFF"];- @and("showTooltip", "model.cannot_delete_reason") showDeleteReason;-/*** Callbacks registered by tab components that are invoked when the form* is reset, allowing child components to clean up their own state.@@ -126,6 +123,11 @@ export default class EditCategoryTabsController extends Controller {*/afterResetCallbacks = [];+ @computed("showTooltip", "model.cannot_delete_reason")+ get showDeleteReason() {+ return this.showTooltip && this.model?.cannot_delete_reason;+ }+@actioninitFormData() {const enableSimplifiedCategoryCreation =diff --git a/frontend/discourse/admin/models/admin-user.js b/frontend/discourse/admin/models/admin-user.jsindex 9c67dcae924..ee6a99823ee 100644--- a/frontend/discourse/admin/models/admin-user.js+++ b/frontend/discourse/admin/models/admin-user.js@@ -1,9 +1,8 @@import { computed } from "@ember/object";-import { gt, lt, not, or } from "@ember/object/computed";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";-import { propertyNotEqual } from "discourse/lib/computed";import getURL from "discourse/lib/get-url";+import { deepEqual } from "discourse/lib/object";import { autoTrackedArray } from "discourse/lib/tracked-tools";import { userPath } from "discourse/lib/url";import User from "discourse/models/user";@@ -34,12 +33,35 @@ export default class AdminUser extends User {@autoTrackedArray groups;- @or("active", "staged") canViewProfile;- @gt("bounce_score", 0) canResetBounceScore;- @propertyNotEqual("originalTrustLevel", "trust_level") dirty;- @lt("trust_level", 4) canLockTrustLevel;- @not("staff") canSuspend;- @not("staff") canSilence;+ @computed("active", "staged")+ get canViewProfile() {+ return this.active || this.staged;+ }++ @computed("bounce_score")+ get canResetBounceScore() {+ return this.bounce_score > 0;+ }++ @computed("originalTrustLevel", "trust_level")+ get dirty() {+ return !deepEqual(this.originalTrustLevel, this.trust_level);+ }++ @computed("trust_level")+ get canLockTrustLevel() {+ return this.trust_level < 4;+ }++ @computed("staff")+ get canSuspend() {+ return !this.staff;+ }++ @computed("staff")+ get canSilence() {+ return !this.staff;+ }get customGroups() {return this.groups?.filter((g) => !g.automatic) ?? [];diff --git a/frontend/discourse/admin/models/api-key.js b/frontend/discourse/admin/models/api-key.jsindex 841f54ad118..89d8f8c5601 100644--- a/frontend/discourse/admin/models/api-key.js+++ b/frontend/discourse/admin/models/api-key.js@@ -1,11 +1,13 @@import { computed } from "@ember/object";import AdminUser from "discourse/admin/models/admin-user";import { ajax } from "discourse/lib/ajax";-import { fmt } from "discourse/lib/computed";import RestModel from "discourse/models/rest";export default class ApiKey extends RestModel {- @fmt("truncated_key", "%@ ...") truncatedKey;+ @computed("truncated_key")+ get truncatedKey() {+ return `${this.truncated_key} ...`;+ }@computed("_user")get user() {diff --git a/frontend/discourse/admin/models/backup-status.js b/frontend/discourse/admin/models/backup-status.jsindex 60d8ef21853..51581de41ee 100644--- a/frontend/discourse/admin/models/backup-status.js+++ b/frontend/discourse/admin/models/backup-status.js@@ -1,8 +1,10 @@import EmberObject, { computed } from "@ember/object";-import { not } from "@ember/object/computed";export default class BackupStatus extends EmberObject {- @not("restoreEnabled") restoreDisabled;+ @computed("restoreEnabled")+ get restoreDisabled() {+ return !this.restoreEnabled;+ }@computed("allowRestore", "isOperationRunning")get restoreEnabled() {diff --git a/frontend/discourse/admin/models/color-scheme-color.js b/frontend/discourse/admin/models/color-scheme-color.jsindex c22d9e7a946..dd9d8d84d76 100644--- a/frontend/discourse/admin/models/color-scheme-color.js+++ b/frontend/discourse/admin/models/color-scheme-color.js@@ -1,24 +1,30 @@/* eslint-disable ember/no-observers */import { tracked } from "@glimmer/tracking";import EmberObject, { computed } from "@ember/object";+import { dependentKeyCompat } from "@ember/object/compat";import { observes, on } from "@ember-decorators/object";import { isValidHex, normalizeHex } from "discourse/lib/color-transformations";-import { propertyNotEqual } from "discourse/lib/computed";+import { deepEqual } from "discourse/lib/object";import { i18n } from "discourse-i18n";export default class ColorSchemeColor extends EmberObject {@tracked hex;@tracked originalHex;+ @tracked default_hex;// Whether the current value is different than Discourse's default color scheme.- @propertyNotEqual("hex", "default_hex") overridden;init(object) {super.init(...arguments);this.originalHex = object.hex;}+ @dependentKeyCompat+ get overridden() {+ return !deepEqual(this.hex, this.default_hex);+ }+discardColorChange() {this.hex = this.originalHex;}diff --git a/frontend/discourse/admin/models/color-scheme.js b/frontend/discourse/admin/models/color-scheme.jsindex d453c9a98ec..6f0a3378310 100644--- a/frontend/discourse/admin/models/color-scheme.js+++ b/frontend/discourse/admin/models/color-scheme.js@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";import EmberObject, { computed } from "@ember/object";-import { not } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import ColorSchemeColor from "discourse/admin/models/color-scheme-color";import { ajax } from "discourse/lib/ajax";import LegacyArrayLikeObject from "discourse/lib/legacy-array-like-object";@@ -50,10 +50,9 @@ export default class ColorScheme extends EmberObject {@tracked name;@tracked user_selectable;+ @tracked id;@autoTrackedArray colors;- @not("id") newRecord;-init() {super.init(...arguments);@@ -65,6 +64,11 @@ export default class ColorScheme extends EmberObject {this.startTrackingChanges();}+ @dependentKeyCompat+ get newRecord() {+ return !this.id;+ }+@computedget description() {return "" + this.name;diff --git a/frontend/discourse/admin/models/screened-ip-address.js b/frontend/discourse/admin/models/screened-ip-address.jsindex 1b639f54a77..33feae15fab 100644--- a/frontend/discourse/admin/models/screened-ip-address.js+++ b/frontend/discourse/admin/models/screened-ip-address.js@@ -1,5 +1,6 @@+import { tracked } from "@glimmer/tracking";import EmberObject, { computed } from "@ember/object";-import { equal } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import { ajax } from "discourse/lib/ajax";import { i18n } from "discourse-i18n";@@ -12,7 +13,12 @@ export default class ScreenedIpAddress extends EmberObject {);}- @equal("action_name", "block") isBlocked;+ @tracked action_name;++ @dependentKeyCompat+ get isBlocked() {+ return this.action_name === "block";+ }@computed("action_name")get actionName() {diff --git a/frontend/discourse/admin/models/site-setting.js b/frontend/discourse/admin/models/site-setting.jsindex 485696e9514..d804d1afc72 100644--- a/frontend/discourse/admin/models/site-setting.js+++ b/frontend/discourse/admin/models/site-setting.js@@ -1,6 +1,5 @@import { tracked } from "@glimmer/tracking";-import EmberObject, { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import EmberObject, { computed, set } from "@ember/object";import BufferedProxy from "ember-buffered-proxy/proxy";import {DEFAULT_USER_PREFERENCES,@@ -73,18 +72,65 @@ export default class SiteSetting extends EmberObject {settingObjectHelper = new SettingObjectHelper(this);- @alias("settingObjectHelper.overridden") overridden;- @alias("settingObjectHelper.computedValueProperty") computedValueProperty;- @alias("settingObjectHelper.computedNameProperty") computedNameProperty;- @alias("settingObjectHelper.validValues") validValues;- @alias("settingObjectHelper.allowsNone") allowsNone;- @alias("settingObjectHelper.anyValue") anyValue;-constructor() {super(...arguments);this.buffered = BufferedProxy.create({ content: this });}+ @computed("settingObjectHelper.overridden")+ get overridden() {+ return this.settingObjectHelper?.overridden;+ }++ set overridden(value) {+ set(this, "settingObjectHelper.overridden", value);+ }++ @computed("settingObjectHelper.computedValueProperty")+ get computedValueProperty() {+ return this.settingObjectHelper?.computedValueProperty;+ }++ set computedValueProperty(value) {+ set(this, "settingObjectHelper.computedValueProperty", value);+ }++ @computed("settingObjectHelper.computedNameProperty")+ get computedNameProperty() {+ return this.settingObjectHelper?.computedNameProperty;+ }++ set computedNameProperty(value) {+ set(this, "settingObjectHelper.computedNameProperty", value);+ }++ @computed("settingObjectHelper.validValues")+ get validValues() {+ return this.settingObjectHelper?.validValues;+ }++ set validValues(value) {+ set(this, "settingObjectHelper.validValues", value);+ }++ @computed("settingObjectHelper.allowsNone")+ get allowsNone() {+ return this.settingObjectHelper?.allowsNone;+ }++ set allowsNone(value) {+ set(this, "settingObjectHelper.allowsNone", value);+ }++ @computed("settingObjectHelper.anyValue")+ get anyValue() {+ return this.settingObjectHelper?.anyValue;+ }++ set anyValue(value) {+ set(this, "settingObjectHelper.anyValue", value);+ }+@computed("setting")get staffLogFilter() {if (!this.setting) {diff --git a/frontend/discourse/admin/models/theme.js b/frontend/discourse/admin/models/theme.jsindex ffaeeaea6f1..8f58b2d5106 100644--- a/frontend/discourse/admin/models/theme.js+++ b/frontend/discourse/admin/models/theme.js@@ -1,5 +1,4 @@import { computed, get } from "@ember/object";-import { gt, or } from "@ember/object/computed";import { isBlank, isEmpty } from "@ember/utils";import ThemeSettings from "discourse/admin/models/theme-settings";import ThemeSiteSettings from "discourse/admin/models/theme-site-settings";@@ -42,13 +41,28 @@ class Theme extends RestModel {@autoTrackedArray parentThemes;@autoTrackedArray theme_fields;- @or("default", "user_selectable") isActive;- @gt("remote_theme.commits_behind", 0) isPendingUpdates;- @gt("editedFields.length", 0) hasEditedFields;- @gt("parent_themes.length", 0) hasParents;-changed = false;+ @computed("default", "user_selectable")+ get isActive() {+ return this.default || this.user_selectable;+ }++ @computed("remote_theme.commits_behind")+ get isPendingUpdates() {+ return this.remote_theme?.commits_behind > 0;+ }++ @computed("editedFields.length")+ get hasEditedFields() {+ return this.editedFields?.length > 0;+ }++ @computed("parent_themes.length")+ get hasParents() {+ return this.parent_themes?.length > 0;+ }+@computed("theme_fields.[]")get targets() {return [diff --git a/frontend/discourse/admin/models/user-field.js b/frontend/discourse/admin/models/user-field.jsindex 13d9182ccf7..0704bd73be1 100644--- a/frontend/discourse/admin/models/user-field.js+++ b/frontend/discourse/admin/models/user-field.js@@ -1,7 +1,8 @@import { tracked } from "@glimmer/tracking";import EmberObject from "@ember/object";-import { i18n } from "discourse/lib/computed";+import { dependentKeyCompat } from "@ember/object/compat";import RestModel from "discourse/models/rest";+import { i18n } from "discourse-i18n";export default class UserField extends RestModel {static fieldTypes() {@@ -36,5 +37,10 @@ export default class UserField extends RestModel {}class UserFieldType extends EmberObject {- @i18n("id", "admin.user_fields.field_types.%@") name;+ @tracked id;++ @dependentKeyCompat+ get name() {+ return i18n(`admin.user_fields.field_types.${this.id}`);+ }}diff --git a/frontend/discourse/admin/services/admin-user-fields.js b/frontend/discourse/admin/services/admin-user-fields.jsindex 1abca8d1bf9..dd165d0375d 100644--- a/frontend/discourse/admin/services/admin-user-fields.js+++ b/frontend/discourse/admin/services/admin-user-fields.js@@ -1,16 +1,16 @@-import { sort } from "@ember/object/computed";+import { tracked } from "@glimmer/tracking";+import { dependentKeyCompat } from "@ember/object/compat";import Service, { service } from "@ember/service";import { popupAjaxError } from "discourse/lib/ajax-error";+import { arraySortedByProperties } from "discourse/lib/array-tools";import { autoTrackedArray } from "discourse/lib/tracked-tools";export default class AdminUserFields extends Service {@service store;- @autoTrackedArray userFields = [];-- @sort("userFields", "fieldSortOrder") sortedUserFields;+ @tracked fieldSortOrder = ["position"];- fieldSortOrder = ["position"];+ @autoTrackedArray userFields = [];constructor() {super(...arguments);@@ -18,6 +18,11 @@ export default class AdminUserFields extends Service {this.#fetchUserFields();}+ @dependentKeyCompat+ get sortedUserFields() {+ return arraySortedByProperties(this.userFields, this.fieldSortOrder);+ }+async #fetchUserFields() {try {const userFields = await this.store.findAll("user-field");diff --git a/frontend/discourse/app/components/basic-topic-list.gjs b/frontend/discourse/app/components/basic-topic-list.gjsindex 8b5b132cd97..aed153e2432 100644--- a/frontend/discourse/app/components/basic-topic-list.gjs+++ b/frontend/discourse/app/components/basic-topic-list.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components, ember/no-jquery, ember/no-observers, ember/require-tagless-components */import Component from "@ember/component";-import { computed } from "@ember/object";-import { alias, not } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { service } from "@ember/service";import { observes } from "@ember-decorators/object";import $ from "jquery";@@ -12,10 +11,6 @@ import { i18n } from "discourse-i18n";export default class BasicTopicList extends Component {@service site;- @alias("topicList.loadingMore") loadingMore;-- @not("loaded") loading;-init() {super.init(...arguments);const topicList = this.topicList;@@ -24,6 +19,20 @@ export default class BasicTopicList extends Component {}}+ @computed("topicList.loadingMore")+ get loadingMore() {+ return this.topicList?.loadingMore;+ }++ set loadingMore(value) {+ set(this, "topicList.loadingMore", value);+ }++ @computed("loaded")+ get loading() {+ return !this.loaded;+ }+@computed("topicList.loaded")get loaded() {let topicList = this.topicList;diff --git a/frontend/discourse/app/components/bread-crumbs.gjs b/frontend/discourse/app/components/bread-crumbs.gjsindex 90260695576..cdf0b6f2fbd 100644--- a/frontend/discourse/app/components/bread-crumbs.gjs+++ b/frontend/discourse/app/components/bread-crumbs.gjs@@ -3,7 +3,6 @@ import Component from "@ember/component";import { hash } from "@ember/helper";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-// A breadcrumb including category drop downsimport PluginOutlet from "discourse/components/plugin-outlet";import categoryVariables from "discourse/helpers/category-variables";import concatClass from "discourse/helpers/concat-class";diff --git a/frontend/discourse/app/components/bulk-actions/notification-level.gjs b/frontend/discourse/app/components/bulk-actions/notification-level.gjsindex 16a648403d3..4d284f34e92 100644--- a/frontend/discourse/app/components/bulk-actions/notification-level.gjs+++ b/frontend/discourse/app/components/bulk-actions/notification-level.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";-import { action } from "@ember/object";-import { empty } from "@ember/object/computed";+import { action, computed } from "@ember/object";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import DButton from "discourse/components/d-button";import RadioButton from "discourse/components/radio-button";import { topicLevels } from "discourse/lib/notification-levels";@@ -11,7 +11,10 @@ import { i18n } from "discourse-i18n";export default class NotificationLevel extends Component {notificationLevelId = null;- @empty("notificationLevelId") disabled;+ @computed("notificationLevelId")+ get disabled() {+ return isEmpty(this.notificationLevelId);+ }get notificationLevels() {return topicLevels.map((level) => ({diff --git a/frontend/discourse/app/components/card-contents-base.js b/frontend/discourse/app/components/card-contents-base.jsindex be29687e464..13ac7313059 100644--- a/frontend/discourse/app/components/card-contents-base.js+++ b/frontend/discourse/app/components/card-contents-base.js@@ -1,6 +1,6 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */import Component from "@ember/component";-import { alias, match } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { next, throttle } from "@ember/runloop";import { service } from "@ember/service";import { bind } from "discourse/lib/decorators";@@ -41,11 +41,22 @@ export default class CardContentsBase extends Component {post = null;isDocked = false;- @alias("topic.postStream") postStream;- @match("router.currentRouteName", /^topic\./) viewingTopic;-_menuInstance = null;+ @computed("topic.postStream")+ get postStream() {+ return this.topic?.postStream;+ }++ set postStream(value) {+ set(this, "topic.postStream", value);+ }++ @computed("router.currentRouteName")+ get viewingTopic() {+ return /^topic\./.test(this.router?.currentRouteName);+ }+_show(username, target, event) {// No user card for anonif (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) {diff --git a/frontend/discourse/app/components/composer-action-title.gjs b/frontend/discourse/app/components/composer-action-title.gjsindex dddefc8baf7..5f1f1c8caca 100644--- a/frontend/discourse/app/components/composer-action-title.gjs+++ b/frontend/discourse/app/components/composer-action-title.gjs@@ -1,8 +1,7 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { hash } from "@ember/helper";-import { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";@@ -34,11 +33,27 @@ export default class ComposerActionTitle extends Component {@service currentUser;@service siteSettings;- @alias("model.replyOptions") options;- @alias("model.action") action;-// Note we update when some other attributes like tag/category change to allow// text customizations to use those.++ @computed("model.replyOptions")+ get options() {+ return this.model?.replyOptions;+ }++ set options(value) {+ set(this, "model.replyOptions", value);+ }++ @computed("model.action")+ get action() {+ return this.model?.action;+ }++ set action(value) {+ set(this, "model.action", value);+ }+@computed("options", "action", "model.tags", "model.category")get actionTitle() {const result = this.model.customizationFor("actionTitle");diff --git a/frontend/discourse/app/components/composer-messages.gjs b/frontend/discourse/app/components/composer-messages.gjsindex eeeb32ab811..1e13fc0f9c7 100644--- a/frontend/discourse/app/components/composer-messages.gjs+++ b/frontend/discourse/app/components/composer-messages.gjs@@ -2,8 +2,7 @@import { tracked } from "@glimmer/tracking";import Component from "@ember/component";import { fn } from "@ember/helper";-import EmberObject, { action } from "@ember/object";-import { not } from "@ember/object/computed";+import EmberObject, { action, computed } from "@ember/object";import { schedule } from "@ember/runloop";import { tagName } from "@ember-decorators/component";import ComposerMessage from "discourse/components/composer-message";@@ -34,11 +33,14 @@ export default class ComposerMessages extends Component {usersNotSeen = null;recipientNames = [];- @not("composer.viewOpenOrFullscreen") hidden;-_lastSimilaritySearch = null;_similarTopicsMessage = null;+ @computed("composer.viewOpenOrFullscreen")+ get hidden() {+ return !this.composer?.viewOpenOrFullscreen;+ }+didInsertElement() {super.didInsertElement(...arguments);diff --git a/frontend/discourse/app/components/composer-title.gjs b/frontend/discourse/app/components/composer-title.gjsindex 79c7da17873..3b1aaa8d5cc 100644--- a/frontend/discourse/app/components/composer-title.gjs+++ b/frontend/discourse/app/components/composer-title.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components, ember/no-observers, ember/require-tagless-components */import Component from "@ember/component";-import EmberObject, { computed } from "@ember/object";-import { alias, or } from "@ember/object/computed";+import EmberObject, { computed, set } from "@ember/object";import { next, schedule } from "@ember/runloop";import { classNames } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";@@ -19,11 +18,22 @@ import { i18n } from "discourse-i18n";@classNames("title-input")export default class ComposerTitle extends Component {- @alias("composer.canEditTopicFeaturedLink") watchForLink;- @or("composer.loading", "composer.disableTitleInput") disabled;-isTitleFocused = false;+ @computed("composer.canEditTopicFeaturedLink")+ get watchForLink() {+ return this.composer?.canEditTopicFeaturedLink;+ }++ set watchForLink(value) {+ set(this, "composer.canEditTopicFeaturedLink", value);+ }++ @computed("composer.loading", "composer.disableTitleInput")+ get disabled() {+ return this.composer?.loading || this.composer?.disableTitleInput;+ }+didInsertElement() {super.didInsertElement(...arguments);const titleInput = this.element.querySelector("input");diff --git a/frontend/discourse/app/components/d-button.gjs b/frontend/discourse/app/components/d-button.gjsindex 40ec4caa4d4..4b11fba2040 100644--- a/frontend/discourse/app/components/d-button.gjs+++ b/frontend/discourse/app/components/d-button.gjs@@ -1,11 +1,11 @@// @ts-checkimport Component from "@glimmer/component";import { on } from "@ember/modifier";-import { action } from "@ember/object";-import { empty, equal, notEmpty } from "@ember/object/computed";+import { action, computed } from "@ember/object";import { next } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import concatClass from "discourse/helpers/concat-class";import icon from "discourse/helpers/d-icon";/** @type {import("discourse/helpers/element.gjs").default} */@@ -76,11 +76,20 @@ export default class DButton extends Component {@service router;@service capabilities;- @notEmpty("args.icon") btnIcon;+ @computed("args.icon")+ get btnIcon() {+ return !isEmpty(this.args?.icon);+ }- @equal("args.display", "link") btnLink;+ @computed("args.display")+ get btnLink() {+ return this.args?.display === "link";+ }- @empty("computedLabel") noText;+ @computed("computedLabel")+ get noText() {+ return isEmpty(this.computedLabel);+ }get forceDisabled() {return !!this.args.isLoading;diff --git a/frontend/discourse/app/components/d-navigation.gjs b/frontend/discourse/app/components/d-navigation.gjsindex 7e66f923dac..9bef4b76258 100644--- a/frontend/discourse/app/components/d-navigation.gjs+++ b/frontend/discourse/app/components/d-navigation.gjs@@ -16,7 +16,6 @@ import TagInfoButton from "discourse/components/tag-info-button";import TagNotificationsTracking from "discourse/components/tag-notifications-tracking";import TopicDismissButtons from "discourse/components/topic-dismiss-buttons";import lazyHash from "discourse/helpers/lazy-hash";-import { setting } from "discourse/lib/computed";import { filterTypeForMode } from "discourse/lib/filter-mode";import { NotificationLevels } from "discourse/lib/notification-levels";import { applyValueTransformer } from "discourse/lib/transformer";@@ -32,7 +31,10 @@ export default class DNavigation extends Component {@service siteSettings;@service currentUser;- @setting("fixed_category_positions") fixedCategoryPositions;+ @computed("siteSettings.fixed_category_positions")+ get fixedCategoryPositions() {+ return this.siteSettings.fixed_category_positions;+ }get createTopicLabel() {const defaultKey = "topic.create";diff --git a/frontend/discourse/app/components/directory-item.gjs b/frontend/discourse/app/components/directory-item.gjsindex f4e3d9f2116..967f769d58e 100644--- a/frontend/discourse/app/components/directory-item.gjs+++ b/frontend/discourse/app/components/directory-item.gjs@@ -1,5 +1,6 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";+import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import DirectoryItemUserFieldValue from "discourse/components/directory-item-user-field-value";import UserInfo from "discourse/components/user-info";@@ -9,12 +10,11 @@ import directoryColumnIsUserField from "discourse/helpers/directory-column-is-usimport directoryItemLabel from "discourse/helpers/directory-item-label";import directoryItemValue from "discourse/helpers/directory-item-value";import formatDuration from "discourse/helpers/format-duration";-import { propertyEqual } from "discourse/lib/computed";+import { deepEqual } from "discourse/lib/object";import { i18n } from "discourse-i18n";@tagName("")export default class DirectoryItem extends Component {- @propertyEqual("item.user.id", "currentUser.id") me;columns = null;<template>@@ -66,4 +66,9 @@ export default class DirectoryItem extends Component {{{/if}}</div></template>++ @computed("item.user.id", "currentUser.id")+ get me() {+ return deepEqual(this.item?.user?.id, this.currentUser?.id);+ }}diff --git a/frontend/discourse/app/components/discourse-topic.js b/frontend/discourse/app/components/discourse-topic.jsindex c8625a1843c..cf0c3f6ff4e 100644--- a/frontend/discourse/app/components/discourse-topic.js+++ b/frontend/discourse/app/components/discourse-topic.js@@ -1,6 +1,6 @@/* eslint-disable ember/no-classic-components, ember/no-jquery, ember/no-observers, ember/require-tagless-components */import Component from "@ember/component";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { getOwner } from "@ember/owner";import { schedule, scheduleOnce } from "@ember/runloop";import { service } from "@ember/service";@@ -22,9 +22,6 @@ import { highlightPost } from "discourse/lib/utilities";export default class DiscourseTopic extends Component {@service scrollManager;- @alias("topic.userFilters") userFilters;- @alias("topic.postStream") postStream;-menuVisible = true;SHORT_POST = 1200;dockAt = 0;@@ -43,6 +40,24 @@ export default class DiscourseTopic extends Component {this.appEvents.off("post:highlight", this, "_highlightPost");}+ @computed("topic.userFilters")+ get userFilters() {+ return this.topic?.userFilters;+ }++ set userFilters(value) {+ set(this, "topic.userFilters", value);+ }++ @computed("topic.postStream")+ get postStream() {+ return this.topic?.postStream;+ }++ set postStream(value) {+ set(this, "topic.postStream", value);+ }+@observes("enteredAt")_enteredTopic() {// Ember is supposed to only call observers when values change but somethingdiff --git a/frontend/discourse/app/components/flag-action-type.gjs b/frontend/discourse/app/components/flag-action-type.gjsindex 486cab82e2d..9304f9f8a39 100644--- a/frontend/discourse/app/components/flag-action-type.gjs+++ b/frontend/discourse/app/components/flag-action-type.gjs@@ -3,7 +3,6 @@ import Component, { Input, Textarea } from "@ember/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { computed } from "@ember/object";-import { and, equal } from "@ember/object/computed";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import concatClass from "discourse/helpers/concat-class";@@ -13,9 +12,20 @@ import { i18n } from "discourse-i18n";@tagName("")export default class FlagActionType extends Component {- @and("flag.require_message", "selected") showMessageInput;- @and("flag.isIllegal", "selected") showConfirmation;- @equal("flag.name_key", "notify_user") isNotifyUser;+ @computed("flag.require_message", "selected")+ get showMessageInput() {+ return this.flag?.require_message && this.selected;+ }++ @computed("flag.isIllegal", "selected")+ get showConfirmation() {+ return this.flag?.isIllegal && this.selected;+ }++ @computed("flag.name_key")+ get isNotifyUser() {+ return this.flag?.name_key === "notify_user";+ }get flagDescription() {return applyValueTransformer("flag-description", this.description, {diff --git a/frontend/discourse/app/components/future-date-input.gjs b/frontend/discourse/app/components/future-date-input.gjsindex 00bf4137d21..48b02e38001 100644--- a/frontend/discourse/app/components/future-date-input.gjs+++ b/frontend/discourse/app/components/future-date-input.gjs@@ -3,7 +3,7 @@ import Component, { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { and, empty, equal } from "@ember/object/computed";+import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import DatePickerFuture from "discourse/components/date-picker-future";import icon from "discourse/helpers/d-icon";@@ -25,10 +25,6 @@ export default class FutureDateInput extends Component {selection = null;includeDateTime = true;- @equal("selection", "custom") isCustom;- @and("includeDateTime", "isCustom") displayDateAndTimePicker;- @empty("_date") timeInputDisabled;-displayLabel = null;labelClasses = null;userTimezone = null;@@ -41,6 +37,21 @@ export default class FutureDateInput extends Component {this.userTimezone = this.currentUser.user_option.timezone;}+ @computed("selection")+ get isCustom() {+ return this.selection === "custom";+ }++ @computed("includeDateTime", "isCustom")+ get displayDateAndTimePicker() {+ return this.includeDateTime && this.isCustom;+ }++ @computed("_date")+ get timeInputDisabled() {+ return isEmpty(this._date);+ }+didReceiveAttrs() {super.didReceiveAttrs(...arguments);diff --git a/frontend/discourse/app/components/google-search.gjs b/frontend/discourse/app/components/google-search.gjsindex 7ec4a2b9c30..2ca73f0c61a 100644--- a/frontend/discourse/app/components/google-search.gjs+++ b/frontend/discourse/app/components/google-search.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";-import { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";import concatClass from "discourse/helpers/concat-class";@@ -11,7 +10,14 @@ import { i18n } from "discourse-i18n";@tagName("")export default class GoogleSearch extends Component {- @alias("siteSettings.login_required") hidden;+ @computed("siteSettings.login_required")+ get hidden() {+ return this.siteSettings?.login_required;+ }++ set hidden(value) {+ set(this, "siteSettings.login_required", value);+ }@computedget siteUrl() {diff --git a/frontend/discourse/app/components/group-card-contents.gjs b/frontend/discourse/app/components/group-card-contents.gjsindex 9fc645c9cce..989f0d35d2c 100644--- a/frontend/discourse/app/components/group-card-contents.gjs+++ b/frontend/discourse/app/components/group-card-contents.gjs@@ -1,6 +1,5 @@import { on } from "@ember/modifier";-import { action, computed } from "@ember/object";-import { alias, gt } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { classNameBindings, classNames } from "@ember-decorators/component";@@ -11,7 +10,6 @@ import DButton from "discourse/components/d-button";import GroupMembershipButton from "discourse/components/group-membership-button";import boundAvatar from "discourse/helpers/bound-avatar";import routeAction from "discourse/helpers/route-action";-import { setting } from "discourse/lib/computed";import { wantsNewWindow } from "discourse/lib/intercept-click";import { groupPath } from "discourse/lib/url";import { i18n } from "discourse-i18n";@@ -29,17 +27,35 @@ const maxMembersToDisplay = 10;export default class GroupCardContents extends CardContentsBase {@service composer;- @setting("allow_profile_backgrounds") allowBackgrounds;- @setting("enable_badges") showBadges;-- @alias("topic.postStream") postStream;- @gt("moreMembersCount", 0) showMoreMembers;-elementId = "group-card";mentionSelector = "a.mention-group";group = null;+ @computed("siteSettings.allow_profile_backgrounds")+ get allowBackgrounds() {+ return this.siteSettings.allow_profile_backgrounds;+ }++ @computed("siteSettings.enable_badges")+ get showBadges() {+ return this.siteSettings.enable_badges;+ }++ @computed("topic.postStream")+ get postStream() {+ return this.topic?.postStream;+ }++ set postStream(value) {+ set(this, "topic.postStream", value);+ }++ @computed("moreMembersCount")+ get showMoreMembers() {+ return this.moreMembersCount > 0;+ }+@computed("group.members.[]")get highlightedMembers() {return this.group?.members.slice(0, maxMembersToDisplay);diff --git a/frontend/discourse/app/components/groups-form-interaction-fields.gjs b/frontend/discourse/app/components/groups-form-interaction-fields.gjsindex 29e0864c7db..f43ab08f63d 100644--- a/frontend/discourse/app/components/groups-form-interaction-fields.gjs+++ b/frontend/discourse/app/components/groups-form-interaction-fields.gjs@@ -2,7 +2,6 @@import Component, { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { computed } from "@ember/object";-import { or } from "@ember/object/computed";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";import TextField from "discourse/components/text-field";@@ -15,18 +14,6 @@ import { i18n } from "discourse-i18n";@tagName("")export default class GroupsFormInteractionFields extends Component {- @or(- "model.members_visibility_level",- "visibilityLevelOptions.firstObject.value"- )- membersVisibilityLevel;-- @or("model.messageable_level", "aliasLevelOptions.firstObject.value")- messageableLevel;-- @or("model.mentionable_level", "aliasLevelOptions.firstObject.value")- mentionableLevel;-visibilityLevelOptions = [{name: i18n("admin.groups.manage.interaction.visibility_levels.public"),@@ -63,6 +50,33 @@ export default class GroupsFormInteractionFields extends Component {watchingNotificationLevel = NotificationLevels.WATCHING;+ @computed(+ "model.members_visibility_level",+ "visibilityLevelOptions.firstObject.value"+ )+ get membersVisibilityLevel() {+ return (+ this.model?.members_visibility_level ||+ this.visibilityLevelOptions?.firstObject?.value+ );+ }++ @computed("model.messageable_level", "aliasLevelOptions.firstObject.value")+ get messageableLevel() {+ return (+ this.model?.messageable_level ||+ this.aliasLevelOptions?.firstObject?.value+ );+ }++ @computed("model.mentionable_level", "aliasLevelOptions.firstObject.value")+ get mentionableLevel() {+ return (+ this.model?.mentionable_level ||+ this.aliasLevelOptions?.firstObject?.value+ );+ }+@computed("model.default_notification_level", "watchingNotificationLevel")get defaultNotificationLevel() {if (diff --git a/frontend/discourse/app/components/groups-form-membership-fields.gjs b/frontend/discourse/app/components/groups-form-membership-fields.gjsindex 920456b3abc..9c7b1ddf2c2 100644--- a/frontend/discourse/app/components/groups-form-membership-fields.gjs+++ b/frontend/discourse/app/components/groups-form-membership-fields.gjs@@ -3,7 +3,6 @@ import Component, { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { not, or as computedOr, readOnly } from "@ember/object/computed";import { tagName } from "@ember-decorators/component";import ExpandingTextArea from "discourse/components/expanding-text-area";import GroupFlairInputs from "discourse/components/group-flair-inputs";@@ -19,10 +18,6 @@ import { i18n } from "discourse-i18n";export default class GroupsFormMembershipFields extends Component {tokenSeparator = "|";- @readOnly("site.can_associate_groups") showAssociatedGroups;- @not("model.automatic") canEdit;- @computedOr("model.flair_icon", "model.flair_url") hasFlair;-trustLevelOptions = [{name: i18n("admin.groups.manage.membership.trust_levels_none"),@@ -42,6 +37,21 @@ export default class GroupsFormMembershipFields extends Component {}}+ @computed("site.can_associate_groups")+ get showAssociatedGroups() {+ return this.site?.can_associate_groups;+ }++ @computed("model.automatic")+ get canEdit() {+ return !this.model?.automatic;+ }++ @computed("model.flair_icon", "model.flair_url")+ get hasFlair() {+ return this.model?.flair_icon || this.model?.flair_url;+ }+@computed("model.grant_trust_level", "trustLevelOptions")get groupTrustLevel() {return (diff --git a/frontend/discourse/app/components/groups-form-profile-fields.gjs b/frontend/discourse/app/components/groups-form-profile-fields.gjsindex d791d51c06a..c357ee36170 100644--- a/frontend/discourse/app/components/groups-form-profile-fields.gjs+++ b/frontend/discourse/app/components/groups-form-profile-fields.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components, ember/no-observers */import Component from "@ember/component";import EmberObject, { computed } from "@ember/object";-import { not } from "@ember/object/computed";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";@@ -21,7 +20,10 @@ export default class GroupsFormProfileFields extends Component {disableSave = null;nameInput = null;- @not("model.automatic") canEdit;+ @computed("model.automatic")+ get canEdit() {+ return !this.model?.automatic;+ }didInsertElement() {super.didInsertElement(...arguments);diff --git a/frontend/discourse/app/components/invite-panel.gjs b/frontend/discourse/app/components/invite-panel.gjsindex 076562c7453..1ea5ce538de 100644--- a/frontend/discourse/app/components/invite-panel.gjs+++ b/frontend/discourse/app/components/invite-panel.gjs@@ -1,8 +1,7 @@/* eslint-disable ember/no-classic-components */import Component, { Textarea } from "@ember/component";import { fn, hash } from "@ember/helper";-import EmberObject, { action, computed } from "@ember/object";-import { alias, and, equal, readOnly } from "@ember/object/computed";+import EmberObject, { action, computed, set } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";@@ -11,7 +10,6 @@ import DButton from "discourse/components/d-button";import DiscourseLinkedText from "discourse/components/discourse-linked-text";import GeneratedInviteLink from "discourse/components/generated-invite-link";import TextField from "discourse/components/text-field";-import { computedI18n } from "discourse/lib/computed";import { getNativeContact } from "discourse/lib/pwa-utils";import { emailValid } from "discourse/lib/utilities";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";@@ -23,20 +21,9 @@ export default class InvitePanel extends Component {@service site;@service toasts;- @readOnly("currentUser.staff") isStaff;- @readOnly("currentUser.admin") isAdmin;- @alias("inviteModel.id") topicId;- @equal("inviteModel.archetype", "private_message") isPM;- @and("isStaff", "siteSettings.must_approve_users") showApprovalMessage;-// eg: visible only to specific group members- @and("invitingToTopic", "inviteModel.category.read_restricted")- isPrivateTopic;// scope to allowed usernames- @alias("invitingToTopic") allowExistingMembers;-- @computedI18n("invite.custom_message_placeholder") customMessagePlaceholder;groupIds = null;allGroups = null;@@ -56,6 +43,54 @@ export default class InvitePanel extends Component {this.setGroupOptions();}+ @computed("currentUser.staff")+ get isStaff() {+ return this.currentUser?.staff;+ }++ @computed("currentUser.admin")+ get isAdmin() {+ return this.currentUser?.admin;+ }++ @computed("inviteModel.id")+ get topicId() {+ return this.inviteModel?.id;+ }++ set topicId(value) {+ set(this, "inviteModel.id", value);+ }++ @computed("inviteModel.archetype")+ get isPM() {+ return this.inviteModel?.archetype === "private_message";+ }++ @computed("isStaff", "siteSettings.must_approve_users")+ get showApprovalMessage() {+ return this.isStaff && this.siteSettings?.must_approve_users;+ }++ @computed("invitingToTopic", "inviteModel.category.read_restricted")+ get isPrivateTopic() {+ return this.invitingToTopic && this.inviteModel?.category?.read_restricted;+ }++ @computed("invitingToTopic")+ get allowExistingMembers() {+ return this.invitingToTopic;+ }++ set allowExistingMembers(value) {+ set(this, "invitingToTopic", value);+ }++ @computed()+ get customMessagePlaceholder() {+ return i18n(`invite.custom_message_placeholder`);+ }+willDestroyElement() {super.willDestroyElement(...arguments);this.reset();diff --git a/frontend/discourse/app/components/modal/bookmark.gjs b/frontend/discourse/app/components/modal/bookmark.gjsindex 25f609fe557..b5fe815c5bb 100644--- a/frontend/discourse/app/components/modal/bookmark.gjs+++ b/frontend/discourse/app/components/modal/bookmark.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { fn } from "@ember/helper";-import { action } from "@ember/object";-import { and, notEmpty } from "@ember/object/computed";+import { action, computed } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import ItsATrap from "@discourse/itsatrap";import { Promise } from "rsvp";import DButton from "discourse/components/d-button";@@ -50,14 +50,6 @@ export default class BookmarkModal extends Component {@tracked flash = null;@tracked showOptions = this.args.model.bookmark.id ? true : false;- @notEmpty("userTimezone") userHasTimezoneSet;-- @notEmpty("bookmark.id") showDelete;-- @notEmpty("bookmark.id") editingExistingBookmark;-- @and("bookmark.id", "bookmark.reminderAt") existingBookmarkHasReminder;-@tracked _closeWithoutSaving = false;@tracked _savingBookmarkManually = false;@tracked _saving = false;@@ -72,6 +64,26 @@ export default class BookmarkModal extends Component {this.keyboardShortcuts.unpause();}+ @computed("userTimezone")+ get userHasTimezoneSet() {+ return !isEmpty(this.userTimezone);+ }++ @computed("bookmark.id")+ get showDelete() {+ return !isEmpty(this.bookmark?.id);+ }++ @computed("bookmark.id")+ get editingExistingBookmark() {+ return !isEmpty(this.bookmark?.id);+ }++ @computed("bookmark.id", "bookmark.reminderAt")+ get existingBookmarkHasReminder() {+ return this.bookmark?.id && this.bookmark?.reminderAt;+ }+get userTimezone() {return this.currentUser.user_option.timezone;}diff --git a/frontend/discourse/app/components/modal/share-topic.gjs b/frontend/discourse/app/components/modal/share-topic.gjsindex 6179e10ba76..13e5e2cd352 100644--- a/frontend/discourse/app/components/modal/share-topic.gjs+++ b/frontend/discourse/app/components/modal/share-topic.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components */import Component, { Input } from "@ember/component";import { action, computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import { getOwner } from "@ember/owner";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";@@ -23,10 +22,25 @@ import { i18n } from "discourse-i18n";export default class ShareTopicModal extends Component {@service modal;- @readOnly("model.topic") topic;- @readOnly("model.post") post;- @readOnly("model.category") category;- @readOnly("model.allowInvites") allowInvites;+ @computed("model.topic")+ get topic() {+ return this.model?.topic;+ }++ @computed("model.post")+ get post() {+ return this.model?.post;+ }++ @computed("model.category")+ get category() {+ return this.model?.category;+ }++ @computed("model.allowInvites")+ get allowInvites() {+ return this.model?.allowInvites;+ }didInsertElement() {this._showRestrictedGroupWarning();diff --git a/frontend/discourse/app/components/popup-input-tip.gjs b/frontend/discourse/app/components/popup-input-tip.gjsindex aac966897e7..3960a379a47 100644--- a/frontend/discourse/app/components/popup-input-tip.gjs+++ b/frontend/discourse/app/components/popup-input-tip.gjs@@ -1,7 +1,7 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */+import { tracked } from "@glimmer/tracking";import Component from "@ember/component";import { computed } from "@ember/object";-import { not, or, reads } from "@ember/object/computed";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import {@@ -20,9 +20,29 @@ export default class PopupInputTip extends Component {tipReason = null;tabindex = "0";- @or("shownAt", "validation.lastShownAt") lastShownAt;- @reads("validation.failed") bad;- @not("bad") good;+ @tracked _badOverride;++ @computed("shownAt", "validation.lastShownAt")+ get lastShownAt() {+ return this.shownAt || this.validation?.lastShownAt;+ }++ @computed("validation.failed")+ get bad() {+ if (this._badOverride !== undefined) {+ return this._badOverride;+ }+ return this.validation?.failed;+ }++ set bad(value) {+ this._badOverride = value;+ }++ @computed("bad")+ get good() {+ return !this.bad;+ }@computed("bad")get role() {diff --git a/frontend/discourse/app/components/reviewable-post-edits.gjs b/frontend/discourse/app/components/reviewable-post-edits.gjsindex 06274269478..fa367472bdd 100644--- a/frontend/discourse/app/components/reviewable-post-edits.gjs+++ b/frontend/discourse/app/components/reviewable-post-edits.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { action, computed } from "@ember/object";-import { gt } from "@ember/object/computed";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";import DButton from "discourse/components/d-button";@@ -14,7 +13,10 @@ import { i18n } from "discourse-i18n";export default class ReviewablePostEdits extends Component {@service modal;- @gt("reviewable.post_version", 1) hasEdits;+ @computed("reviewable.post_version")+ get hasEdits() {+ return this.reviewable?.post_version > 1;+ }@computed("reviewable.post_version")get editCount() {diff --git a/frontend/discourse/app/components/reviewable/item.gjs b/frontend/discourse/app/components/reviewable/item.gjsindex edb044ff0b9..610e736607d 100644--- a/frontend/discourse/app/components/reviewable/item.gjs+++ b/frontend/discourse/app/components/reviewable/item.gjs@@ -4,7 +4,6 @@ import Component from "@ember/component";import { concat, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed, set } from "@ember/object";-import { alias } from "@ember/object/computed";import { getOwner } from "@ember/owner";import { service } from "@ember/service";import { classify, dasherize } from "@ember/string";@@ -103,8 +102,6 @@ export default class ReviewableItem extends Component {@tracked disabled = false;@tracked activeTab = "timeline";- @alias("reviewable.claimed_by.automatic") autoClaimed;-updating = null;editing = false;_updates = null;@@ -121,6 +118,15 @@ export default class ReviewableItem extends Component {this.messageBus.unsubscribe("/reviewable_action", this._updateStatus);}+ @computed("reviewable.claimed_by.automatic")+ get autoClaimed() {+ return this.reviewable?.claimed_by?.automatic;+ }++ set autoClaimed(value) {+ set(this, "reviewable.claimed_by.automatic", value);+ }+@computed("reviewable.type","reviewable.last_performing_username",diff --git a/frontend/discourse/app/components/save-controls.gjs b/frontend/discourse/app/components/save-controls.gjsindex c0aa5579779..a5bd00e597c 100644--- a/frontend/discourse/app/components/save-controls.gjs+++ b/frontend/discourse/app/components/save-controls.gjs@@ -1,14 +1,16 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { computed } from "@ember/object";-import { or } from "@ember/object/computed";import { tagName } from "@ember-decorators/component";import DButton from "discourse/components/d-button";import { i18n } from "discourse-i18n";@tagName("")export default class SaveControls extends Component {- @or("model.isSaving", "saveDisabled") buttonDisabled;+ @computed("model.isSaving", "saveDisabled")+ get buttonDisabled() {+ return this.model?.isSaving || this.saveDisabled;+ }didInsertElement() {super.didInsertElement(...arguments);diff --git a/frontend/discourse/app/components/share-panel.gjs b/frontend/discourse/app/components/share-panel.gjsindex a61e6dbe572..ddcae4002b1 100644--- a/frontend/discourse/app/components/share-panel.gjs+++ b/frontend/discourse/app/components/share-panel.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";-import { action, computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import DTextarea from "discourse/components/d-textarea";@@ -14,9 +13,32 @@ import { i18n } from "discourse-i18n";export default class SharePanel extends Component {tagName = null;- @alias("panel.model.type") type;- @alias("panel.model.topic") topic;- @alias("panel.model.topic.category.read_restricted") privateCategory;+ @computed("panel.model.type")+ get type() {+ return this.panel?.model?.type;+ }++ set type(value) {+ set(this, "panel.model.type", value);+ }++ @computed("panel.model.topic")+ get topic() {+ return this.panel?.model?.topic;+ }++ set topic(value) {+ set(this, "panel.model.topic", value);+ }++ @computed("panel.model.topic.category.read_restricted")+ get privateCategory() {+ return this.panel?.model?.topic?.category?.read_restricted;+ }++ set privateCategory(value) {+ set(this, "panel.model.topic.category.read_restricted", value);+ }@computed("topic.{isPrivateMessage,invisible,category}")get sources() {diff --git a/frontend/discourse/app/components/tag-list.gjs b/frontend/discourse/app/components/tag-list.gjsindex e3cc6f1be0d..f5bb63d5590 100644--- a/frontend/discourse/app/components/tag-list.gjs+++ b/frontend/discourse/app/components/tag-list.gjs@@ -1,12 +1,12 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { computed } from "@ember/object";-import { sort } from "@ember/object/computed";import { tagName } from "@ember-decorators/component";import CategoryTitleLink from "discourse/components/category-title-link";import concatClass from "discourse/helpers/concat-class";import icon from "discourse/helpers/d-icon";import discourseTag from "discourse/helpers/discourse-tag";+import { arraySortedByProperties } from "discourse/lib/array-tools";import { slugify } from "discourse/lib/utilities";import Category from "discourse/models/category";import { i18n } from "discourse-i18n";@@ -15,7 +15,10 @@ import { i18n } from "discourse-i18n";export default class TagList extends Component {isPrivateMessage = false;- @sort("tags", "sortProperties") sortedTags;+ @computed("tags", "sortProperties")+ get sortedTags() {+ return arraySortedByProperties(this.tags, this.sortProperties);+ }@computed("titleKey")get title() {diff --git a/frontend/discourse/app/components/tap-tile.gjs b/frontend/discourse/app/components/tap-tile.gjsindex ff85060106e..0c9e25baa11 100644--- a/frontend/discourse/app/components/tap-tile.gjs+++ b/frontend/discourse/app/components/tap-tile.gjs@@ -1,13 +1,14 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */+import { tracked } from "@glimmer/tracking";import Component from "@ember/component";-import { reads } from "@ember/object/computed";+import { computed } from "@ember/object";import {attributeBindings,classNameBindings,classNames,} from "@ember-decorators/component";import icon from "discourse/helpers/d-icon";-import { propertyEqual } from "discourse/lib/computed";+import { deepEqual } from "discourse/lib/object";@classNames("tap-tile")@classNameBindings("active")@@ -16,14 +17,30 @@ export default class TapTile extends Component {role = "button";tabIndex = 0;- @reads("active") ariaPressed;- @propertyEqual("activeTile", "tileId") active;+ @tracked _ariaPressedOverride;init() {super.init(...arguments);this.set("elementId", `tap_tile_${this.tileId}`);}+ @computed("active")+ get ariaPressed() {+ if (this._ariaPressedOverride !== undefined) {+ return this._ariaPressedOverride;+ }+ return this.active;+ }++ set ariaPressed(value) {+ this._ariaPressedOverride = value;+ }++ @computed("activeTile", "tileId")+ get active() {+ return deepEqual(this.activeTile, this.tileId);+ }+click() {this.onChange(this.tileId);}diff --git a/frontend/discourse/app/components/time-shortcut-picker.gjs b/frontend/discourse/app/components/time-shortcut-picker.gjsindex 5fcded28c9b..f4a0caa344c 100644--- a/frontend/discourse/app/components/time-shortcut-picker.gjs+++ b/frontend/discourse/app/components/time-shortcut-picker.gjs@@ -2,7 +2,6 @@import Component, { Input } from "@ember/component";import { fn } from "@ember/helper";import { action, computed } from "@ember/object";-import { and, equal } from "@ember/object/computed";import { tagName } from "@ember-decorators/component";import { observes, on } from "@ember-decorators/object";import DatePickerFuture from "discourse/components/date-picker-future";@@ -47,11 +46,6 @@ const BINDINGS = {@tagName("")export default class TimeShortcutPicker extends Component {- @equal("selectedShortcut", TIME_SHORTCUT_TYPES.CUSTOM) customDatetimeSelected;- @equal("selectedShortcut", TIME_SHORTCUT_TYPES.RELATIVE)- relativeTimeSelected;- @and("customDate", "customTime") customDatetimeFilled;-userTimezone = null;onTimeSelected = null;@@ -74,6 +68,21 @@ export default class TimeShortcutPicker extends Component {_itsatrap = null;+ @computed("selectedShortcut")+ get customDatetimeSelected() {+ return this.selectedShortcut === TIME_SHORTCUT_TYPES.CUSTOM;+ }++ @computed("selectedShortcut")+ get relativeTimeSelected() {+ return this.selectedShortcut === TIME_SHORTCUT_TYPES.RELATIVE;+ }++ @computed("customDate", "customTime")+ get customDatetimeFilled() {+ return this.customDate && this.customTime;+ }+@on("init")_setupPicker() {this.setProperties({diff --git a/frontend/discourse/app/components/topic-footer-buttons.gjs b/frontend/discourse/app/components/topic-footer-buttons.gjsindex e9f32b3585f..870cc11b972 100644--- a/frontend/discourse/app/components/topic-footer-buttons.gjs+++ b/frontend/discourse/app/components/topic-footer-buttons.gjs@@ -1,8 +1,7 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { concat, hash } from "@ember/helper";-import { computed } from "@ember/object";-import { alias, or } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { compare } from "@ember/utils";import { tagName } from "@ember-decorators/component";import DButton from "discourse/components/d-button";@@ -30,10 +29,37 @@ function bind(fn, context) {@tagName("")export default class TopicFooterButtons extends Component {- @alias("currentUser.can_send_private_messages") canSendPms;- @alias("topic.details.can_invite_to") canInviteTo;- @alias("currentUser.user_option.enable_defer") canDefer;- @or("topic.archived", "topic.closed", "topic.deleted") inviteDisabled;+ @computed("currentUser.can_send_private_messages")+ get canSendPms() {+ return this.currentUser?.can_send_private_messages;+ }++ set canSendPms(value) {+ set(this, "currentUser.can_send_private_messages", value);+ }++ @computed("topic.details.can_invite_to")+ get canInviteTo() {+ return this.topic?.details?.can_invite_to;+ }++ set canInviteTo(value) {+ set(this, "topic.details.can_invite_to", value);+ }++ @computed("currentUser.user_option.enable_defer")+ get canDefer() {+ return this.currentUser?.user_option?.enable_defer;+ }++ set canDefer(value) {+ set(this, "currentUser.user_option.enable_defer", value);+ }++ @computed("topic.archived", "topic.closed", "topic.deleted")+ get inviteDisabled() {+ return this.topic?.archived || this.topic?.closed || this.topic?.deleted;+ }get inlineButtons() {return getTopicFooterButtons(this);diff --git a/frontend/discourse/app/components/topic-progress.gjs b/frontend/discourse/app/components/topic-progress.gjsindex 84a77d485ce..d521e91f8c4 100644--- a/frontend/discourse/app/components/topic-progress.gjs+++ b/frontend/discourse/app/components/topic-progress.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */import Component from "@ember/component";-import { action, computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { scheduleOnce } from "@ember/runloop";import { trustHTML } from "@ember/template";import { classNameBindings } from "@ember-decorators/component";@@ -15,10 +14,17 @@ export default class TopicProgress extends Component {docked = false;progressPosition = null;- @alias("topic.postStream") postStream;-_streamPercentage = null;+ @computed("topic.postStream")+ get postStream() {+ return this.topic?.postStream;+ }++ set postStream(value) {+ set(this, "topic.postStream", value);+ }+@computed("postStream.loaded","topic.currentPost",diff --git a/frontend/discourse/app/components/user-card-contents.gjs b/frontend/discourse/app/components/user-card-contents.gjsindex e500dbc3ab7..faf93678484 100644--- a/frontend/discourse/app/components/user-card-contents.gjs+++ b/frontend/discourse/app/components/user-card-contents.gjs@@ -2,7 +2,6 @@import { array, fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import EmberObject, { action, computed, set } from "@ember/object";-import { alias, and, gt, gte, not, or } from "@ember/object/computed";import { LinkTo } from "@ember/routing";import { dasherize } from "@ember/string";import { trustHTML } from "@ember/template";@@ -28,7 +27,6 @@ import lazyHash from "discourse/helpers/lazy-hash";import replaceEmoji from "discourse/helpers/replace-emoji";import userStatus from "discourse/helpers/user-status";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";-import { setting } from "discourse/lib/computed";import { durationTiny } from "discourse/lib/formatter";import { getURLWithCDN } from "discourse/lib/get-url";import { wantsNewWindow } from "discourse/lib/intercept-click";@@ -55,36 +53,103 @@ export default class UserCardContents extends CardContentsBase {mentionSelector = "a.mention";ariaLabel = i18n("user.card");- @setting("allow_profile_backgrounds") allowBackgrounds;- @setting("enable_badges") showBadges;- @setting("display_local_time_in_user_card") showUserLocalTime;- @setting("moderators_view_emails") canModeratorsViewEmails;+ user = null;- @alias("topic.postStream") postStream;+ // If inside a topic+ topicPostCount = null;- @gte("topicPostCount", 2) enoughPostsForFiltering;+ @computed("siteSettings.allow_profile_backgrounds")+ get allowBackgrounds() {+ return this.siteSettings.allow_profile_backgrounds;+ }- @and("viewingTopic", "postStream.hasNoFilters", "enoughPostsForFiltering")- showFilter;+ @computed("siteSettings.enable_badges")+ get showBadges() {+ return this.siteSettings.enable_badges;+ }- @gt("postStream.userFilters.length", 0) hasUserFilters;- @gt("moreBadgesCount", 0) showMoreBadges;- @and("viewingAdmin", "showName", "user.canBeDeleted") showDelete;- @not("user.isBasic") linkWebsite;- @or("user.suspend_reason", "user.silence_reason") isRestricted;- @or("isRestricted", "user.bio_excerpt") isRestrictedOrHasBio;- @and("user.staged", "canCheckEmails") showCheckEmail;+ @computed("siteSettings.display_local_time_in_user_card")+ get showUserLocalTime() {+ return this.siteSettings.display_local_time_in_user_card;+ }- user = null;+ @computed("siteSettings.moderators_view_emails")+ get canModeratorsViewEmails() {+ return this.siteSettings.moderators_view_emails;+ }- // If inside a topic- topicPostCount = null;+ @computed("topic.postStream")+ get postStream() {+ return this.topic?.postStream;+ }++ set postStream(value) {+ set(this, "topic.postStream", value);+ }++ @computed("topicPostCount")+ get enoughPostsForFiltering() {+ return this.topicPostCount >= 2;+ }++ @computed(+ "viewingTopic",+ "postStream.hasNoFilters",+ "enoughPostsForFiltering"+ )+ get showFilter() {+ return (+ this.viewingTopic &&+ this.postStream?.hasNoFilters &&+ this.enoughPostsForFiltering+ );+ }++ @computed("postStream.userFilters.length")+ get hasUserFilters() {+ return this.postStream?.userFilters?.length > 0;+ }++ @computed("moreBadgesCount")+ get showMoreBadges() {+ return this.moreBadgesCount > 0;+ }++ @computed("viewingAdmin", "showName", "user.canBeDeleted")+ get showDelete() {+ return this.viewingAdmin && this.showName && this.user?.canBeDeleted;+ }++ @computed("user.isBasic")+ get linkWebsite() {+ return !this.user?.isBasic;+ }- @and(+ @computed("user.suspend_reason", "user.silence_reason")+ get isRestricted() {+ return this.user?.suspend_reason || this.user?.silence_reason;+ }++ @computed("isRestricted", "user.bio_excerpt")+ get isRestrictedOrHasBio() {+ return this.isRestricted || this.user?.bio_excerpt;+ }++ @computed("user.staged", "canCheckEmails")+ get showCheckEmail() {+ return this.user?.staged && this.canCheckEmails;+ }++ @computed("user.featured_topic","siteSettings.allow_featured_topic_on_user_profiles")- showFeaturedTopic;+ get showFeaturedTopic() {+ return (+ this.user?.featured_topic &&+ this.siteSettings?.allow_featured_topic_on_user_profiles+ );+ }@computed("user.name", "user.username")get showName() {diff --git a/frontend/discourse/app/components/user-info.gjs b/frontend/discourse/app/components/user-info.gjsindex 2bd327be7df..ed964e092c7 100644--- a/frontend/discourse/app/components/user-info.gjs+++ b/frontend/discourse/app/components/user-info.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";-import { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";import UserAvatarFlair from "discourse/components/user-avatar-flair";@@ -20,7 +19,14 @@ export default class UserInfo extends Component {includeLink = true;includeAvatar = true;- @alias("user.username") dataUsername;+ @computed("user.username")+ get dataUsername() {+ return this.user?.username;+ }++ set dataUsername(value) {+ set(this, "user.username", value);+ }didInsertElement() {super.didInsertElement(...arguments);diff --git a/frontend/discourse/app/components/user-notification-schedule-day.gjs b/frontend/discourse/app/components/user-notification-schedule-day.gjsindex 7d1d0f2ae25..b1643cb0630 100644--- a/frontend/discourse/app/components/user-notification-schedule-day.gjs+++ b/frontend/discourse/app/components/user-notification-schedule-day.gjs@@ -1,14 +1,12 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";+import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import { i18n as computedI18n } from "discourse/lib/computed";import ComboBox from "discourse/select-kit/components/combo-box";import { i18n } from "discourse-i18n";@tagName("")export default class UserNotificationScheduleDay extends Component {- @computedI18n("day", "user.notification_schedule.%@") dayLabel;-<template><tr class="day {{this.dayLabel}}"><td class="day-label">{{this.dayLabel}}</td>@@ -33,4 +31,9 @@ export default class UserNotificationScheduleDay extends Component {{{/if}}</tr></template>++ @computed("day")+ get dayLabel() {+ return i18n(`user.notification_schedule.${this.day}`);+ }}diff --git a/frontend/discourse/app/components/username-preference.gjs b/frontend/discourse/app/components/username-preference.gjsindex a128a2b223f..39b8a0805b2 100644--- a/frontend/discourse/app/components/username-preference.gjs+++ b/frontend/discourse/app/components/username-preference.gjs@@ -3,15 +3,13 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { on } from "@ember/modifier";-import { action } from "@ember/object";-import { empty, or } from "@ember/object/computed";+import { action, computed } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import DButton from "discourse/components/d-button";import DModalCancel from "discourse/components/d-modal-cancel";import { popupAjaxError } from "discourse/lib/ajax-error";-import { setting } from "discourse/lib/computed";import DiscourseURL, { userPath } from "discourse/lib/url";import User from "discourse/models/user";import { i18n } from "discourse-i18n";@@ -26,12 +24,31 @@ export default class UsernamePreference extends Component {@tracked saving = false;@tracked taken = false;- @setting("max_username_length") maxLength;- @setting("min_username_length") minLength;- @empty("newUsername") newUsernameEmpty;+ @computed("siteSettings.max_username_length")+ get maxLength() {+ return this.siteSettings.max_username_length;+ }++ @computed("siteSettings.min_username_length")+ get minLength() {+ return this.siteSettings.min_username_length;+ }- @or("saving", "newUsernameEmpty", "taken", "unchanged", "errorMessage")- saveDisabled;+ @computed("newUsername")+ get newUsernameEmpty() {+ return isEmpty(this.newUsername);+ }++ @computed("saving", "newUsernameEmpty", "taken", "unchanged", "errorMessage")+ get saveDisabled() {+ return (+ this.saving ||+ this.newUsernameEmpty ||+ this.taken ||+ this.unchanged ||+ this.errorMessage+ );+ }get unchanged() {return this.newUsername === this.args.user.username;diff --git a/frontend/discourse/app/controllers/about.js b/frontend/discourse/app/controllers/about.jsindex 070ad81fa04..82465910fda 100644--- a/frontend/discourse/app/controllers/about.js+++ b/frontend/discourse/app/controllers/about.js@@ -1,8 +1,18 @@import Controller from "@ember/controller";-import { alias, gt } from "@ember/object/computed";+import { computed, set } from "@ember/object";export default class AboutController extends Controller {- @gt("siteSettings.faq_url.length", 0) faqOverridden;+ @computed("siteSettings.faq_url.length")+ get faqOverridden() {+ return this.siteSettings?.faq_url?.length > 0;+ }- @alias("siteSettings.rename_faq_to_guidelines") renameFaqToGuidelines;+ @computed("siteSettings.rename_faq_to_guidelines")+ get renameFaqToGuidelines() {+ return this.siteSettings?.rename_faq_to_guidelines;+ }++ set renameFaqToGuidelines(value) {+ set(this, "siteSettings.rename_faq_to_guidelines", value);+ }}diff --git a/frontend/discourse/app/controllers/discovery/categories.js b/frontend/discourse/app/controllers/discovery/categories.jsindex 8ae958250d6..52ff0439197 100644--- a/frontend/discourse/app/controllers/discovery/categories.js+++ b/frontend/discourse/app/controllers/discovery/categories.js@@ -1,13 +1,25 @@+import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { reads } from "@ember/object/computed";import { service } from "@ember/service";export default class CategoriesController extends Controller {@service router;@service composer;- @reads("currentUser.staff") canEdit;+ @tracked _canEditOverride;++ @computed("currentUser.staff")+ get canEdit() {+ if (this._canEditOverride !== undefined) {+ return this._canEditOverride;+ }+ return this.currentUser?.staff;+ }++ set canEdit(value) {+ this._canEditOverride = value;+ }@computedget isCategoriesRoute() {diff --git a/frontend/discourse/app/controllers/exception.js b/frontend/discourse/app/controllers/exception.jsindex fcb46f4c984..a52c9ad3bea 100644--- a/frontend/discourse/app/controllers/exception.js+++ b/frontend/discourse/app/controllers/exception.js@@ -1,7 +1,6 @@import { cached } from "@glimmer/tracking";import Controller from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias, equal, gte, none } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { schedule } from "@ember/runloop";import DiscourseURL from "discourse/lib/url";import { i18n } from "discourse-i18n";@@ -27,13 +26,7 @@ export default class ExceptionController extends Controller {thrown;lastTransition;- @equal("thrown.status", 404) isNotFound;- @equal("thrown.status", 403) isForbidden;- @gte("thrown.status", 500) isServer;- @none("isNetwork", "isServer") isUnknown;-// Handling for the detailed_404 setting (which actually creates 403s)- @alias("thrown.responseJSON.extras.html") errorHtml;// TODO// make ajax requests to /srv/status with exponential backoff@@ -42,7 +35,43 @@ export default class ExceptionController extends Controller {loading = false;- @alias("thrown.requestedUrl") requestUrl;+ @computed("thrown.status")+ get isNotFound() {+ return this.thrown?.status === 404;+ }++ @computed("thrown.status")+ get isForbidden() {+ return this.thrown?.status === 403;+ }++ @computed("thrown.status")+ get isServer() {+ return this.thrown?.status >= 500;+ }++ @computed("isNetwork")+ get isUnknown() {+ return this.isNetwork == null;+ }++ @computed("thrown.responseJSON.extras.html")+ get errorHtml() {+ return this.thrown?.responseJSON?.extras?.html;+ }++ set errorHtml(value) {+ set(this, "thrown.responseJSON.extras.html", value);+ }++ @computed("thrown.requestedUrl")+ get requestUrl() {+ return this.thrown?.requestedUrl;+ }++ set requestUrl(value) {+ set(this, "thrown.requestedUrl", value);+ }@computed("thrown")get isNetwork() {diff --git a/frontend/discourse/app/controllers/full-page-search.js b/frontend/discourse/app/controllers/full-page-search.jsindex 0f799d3c641..c6ae6bef80a 100644--- a/frontend/discourse/app/controllers/full-page-search.js+++ b/frontend/discourse/app/controllers/full-page-search.js@@ -1,7 +1,8 @@/* eslint-disable ember/no-observers */+import { tracked } from "@glimmer/tracking";import Controller, { inject as controller } from "@ember/controller";import { action, computed } from "@ember/object";-import { gt, or } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import { observes } from "@ember-decorators/object";@@ -47,14 +48,21 @@ export function registerFullPageSearchType(export default class FullPageSearchController extends Controller {@service composer;+@service appEvents;+@service siteSettings;+@service searchPreferencesManager;+@service currentUser;+@controller application;+ @tracked searching = false;+ @tracked loading = false;+bulkSelectEnabled = null;- loading = false;queryParams = ["q",@@ -69,7 +77,6 @@ export default class FullPageSearchController extends Controller {context_id = null;search_type = SEARCH_TYPE_DEFAULT;context = null;- searching = false;sortOrder = 0;sortOrders = null;invalidSearch = false;@@ -78,8 +85,6 @@ export default class FullPageSearchController extends Controller {searchTypes = null;additionalSearchResults = [];error = null;- @gt("bulkSelectHelper.selected.length", 0) hasSelection;- @or("searching", "loading") searchButtonDisabled;_searchOnSortChange = true;init() {@@ -140,6 +145,16 @@ export default class FullPageSearchController extends Controller {this.bulkSelectHelper = new PostBulkSelectHelper(this);}+ @computed("bulkSelectHelper.selected.length")+ get hasSelection() {+ return this.bulkSelectHelper?.selected?.length > 0;+ }++ @dependentKeyCompat+ get searchButtonDisabled() {+ return this.searching || this.loading;+ }+@computed("resultCount")get hasResults() {return (this.resultCount || 0) > 0;diff --git a/frontend/discourse/app/controllers/invites/show.js b/frontend/discourse/app/controllers/invites/show.jsindex e23643fa1c4..641603dec8c 100644--- a/frontend/discourse/app/controllers/invites/show.js+++ b/frontend/discourse/app/controllers/invites/show.js@@ -1,8 +1,7 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import EmberObject, { action, computed } from "@ember/object";+import EmberObject, { action, computed, set } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { alias, bool, not, readOnly } from "@ember/object/computed";import { isEmpty } from "@ember/utils";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";@@ -46,22 +45,90 @@ export default class InvitesShowController extends Controller {getAccountPassword: () => this.accountPassword,});successMessage = null;- @readOnly("model.is_invite_link") isInviteLink;- @readOnly("model.invited_by") invitedBy;- @alias("model.email") email;- @alias("email") accountEmail;- @readOnly("model.existing_user_id") existingUserId;- @readOnly("model.existing_user_can_redeem") existingUserCanRedeem;- @readOnly("model.existing_user_can_redeem_error") existingUserCanRedeemError;- @bool("existingUserId") existingUserRedeeming;- @alias("model.hidden_email") hiddenEmail;- @alias("model.email_verified_by_link") emailVerifiedByLink;- @alias("model.different_external_email") differentExternalEmail;- @not("externalAuthsOnly") passwordRequired;errorMessage = null;authOptions = null;maskPassword = true;+ @computed("model.is_invite_link")+ get isInviteLink() {+ return this.model?.is_invite_link;+ }++ @computed("model.invited_by")+ get invitedBy() {+ return this.model?.invited_by;+ }++ @computed("model.email")+ get email() {+ return this.model?.email;+ }++ set email(value) {+ set(this, "model.email", value);+ }++ @computed("email")+ get accountEmail() {+ return this.email;+ }++ set accountEmail(value) {+ set(this, "email", value);+ }++ @computed("model.existing_user_id")+ get existingUserId() {+ return this.model?.existing_user_id;+ }++ @computed("model.existing_user_can_redeem")+ get existingUserCanRedeem() {+ return this.model?.existing_user_can_redeem;+ }++ @computed("model.existing_user_can_redeem_error")+ get existingUserCanRedeemError() {+ return this.model?.existing_user_can_redeem_error;+ }++ @computed("existingUserId")+ get existingUserRedeeming() {+ return !!this.existingUserId;+ }++ @computed("model.hidden_email")+ get hiddenEmail() {+ return this.model?.hidden_email;+ }++ set hiddenEmail(value) {+ set(this, "model.hidden_email", value);+ }++ @computed("model.email_verified_by_link")+ get emailVerifiedByLink() {+ return this.model?.email_verified_by_link;+ }++ set emailVerifiedByLink(value) {+ set(this, "model.email_verified_by_link", value);+ }++ @computed("model.different_external_email")+ get differentExternalEmail() {+ return this.model?.different_external_email;+ }++ set differentExternalEmail(value) {+ set(this, "model.different_external_email", value);+ }++ @computed("externalAuthsOnly")+ get passwordRequired() {+ return !this.externalAuthsOnly;+ }+get userFields() {return this.userFieldsValidationHelper.userFields;}diff --git a/frontend/discourse/app/controllers/login.js b/frontend/discourse/app/controllers/login.jsindex d73e6d7f8ac..89c1853562e 100644--- a/frontend/discourse/app/controllers/login.js+++ b/frontend/discourse/app/controllers/login.js@@ -1,13 +1,12 @@import { tracked } from "@glimmer/tracking";import Controller, { inject as controller } from "@ember/controller";-import { action } from "@ember/object";+import { action, computed } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import NotActivatedModal from "discourse/components/modal/not-activated";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";-import { setting } from "discourse/lib/computed";import cookie, { removeCookie } from "discourse/lib/cookie";import escape from "discourse/lib/escape";import getURL from "discourse/lib/get-url";@@ -51,8 +50,15 @@ export default class LoginPageController extends Controller {@tracked flash;@tracked flashType;- @setting("enable_local_logins") canLoginLocal;- @setting("enable_local_logins_via_email") canLoginLocalWithEmail;+ @computed("siteSettings.enable_local_logins")+ get canLoginLocal() {+ return this.siteSettings.enable_local_logins;+ }++ @computed("siteSettings.enable_local_logins_via_email")+ get canLoginLocalWithEmail() {+ return this.siteSettings.enable_local_logins_via_email;+ }get isAwaitingApproval() {return (diff --git a/frontend/discourse/app/controllers/password-reset.js b/frontend/discourse/app/controllers/password-reset.jsindex 1563c235c82..05c9f49389e 100644--- a/frontend/discourse/app/controllers/password-reset.js+++ b/frontend/discourse/app/controllers/password-reset.js@@ -1,7 +1,6 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias, or, readOnly } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { ajax } from "discourse/lib/ajax";import getURL from "discourse/lib/get-url";import { wantsNewWindow } from "discourse/lib/intercept-click";@@ -13,14 +12,6 @@ import { i18n } from "discourse-i18n";export default class PasswordResetController extends Controller {@tracked accountPassword;- @alias("model.is_developer") isDeveloper;- @alias("model.admin") admin;- @alias("model.second_factor_required") secondFactorRequired;- @alias("model.security_key_required") securityKeyRequired;- @alias("model.backup_enabled") backupEnabled;- @or("model.second_factor_required", "model.security_key_required")- securityKeyOrSecondFactorRequired;- @readOnly("model.multiple_second_factor_methods") otherMethodAllowed;passwordRequired = true;errorMessage = null;@@ -33,6 +24,63 @@ export default class PasswordResetController extends Controller {lockImageUrl = getURL("/images/lock.svg");+ @computed("model.is_developer")+ get isDeveloper() {+ return this.model?.is_developer;+ }++ set isDeveloper(value) {+ set(this, "model.is_developer", value);+ }++ @computed("model.admin")+ get admin() {+ return this.model?.admin;+ }++ set admin(value) {+ set(this, "model.admin", value);+ }++ @computed("model.second_factor_required")+ get secondFactorRequired() {+ return this.model?.second_factor_required;+ }++ set secondFactorRequired(value) {+ set(this, "model.second_factor_required", value);+ }++ @computed("model.security_key_required")+ get securityKeyRequired() {+ return this.model?.security_key_required;+ }++ set securityKeyRequired(value) {+ set(this, "model.security_key_required", value);+ }++ @computed("model.backup_enabled")+ get backupEnabled() {+ return this.model?.backup_enabled;+ }++ set backupEnabled(value) {+ set(this, "model.backup_enabled", value);+ }++ @computed("model.second_factor_required", "model.security_key_required")+ get securityKeyOrSecondFactorRequired() {+ return (+ this.model?.second_factor_required || this.model?.security_key_required+ );+ }++ @computed("model.multiple_second_factor_methods")+ get otherMethodAllowed() {+ return this.model?.multiple_second_factor_methods;+ }+@computed("securityKeyRequired", "selectedSecondFactorMethod")get displaySecurityKeyForm() {return (diff --git a/frontend/discourse/app/controllers/preferences/account.js b/frontend/discourse/app/controllers/preferences/account.jsindex d8d299b3f2f..0045932e76c 100644--- a/frontend/discourse/app/controllers/preferences/account.js+++ b/frontend/discourse/app/controllers/preferences/account.js@@ -1,15 +1,14 @@import Controller, { inject as controller } from "@ember/controller";-import EmberObject, { action, computed } from "@ember/object";-import { alias, gt, not, or } from "@ember/object/computed";+import EmberObject, { action, computed, set } from "@ember/object";import { next } from "@ember/runloop";import { service } from "@ember/service";import UserStatusModal from "discourse/components/modal/user-status";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";-import { propertyNotEqual, setting } from "discourse/lib/computed";import { exportUserArchive } from "discourse/lib/export-csv";import getURL from "discourse/lib/get-url";+import { deepEqual } from "discourse/lib/object";import { applyValueTransformer } from "discourse/lib/transformer";import DiscourseURL from "discourse/lib/url";import { findAll } from "discourse/models/login-method";@@ -20,17 +19,6 @@ export default class AccountController extends Controller {@service modal;@controller user;- @setting("enable_names") canEditName;- @setting("enable_user_status") canSelectUserStatus;- @setting("moderators_view_emails") canModeratorsViewEmails;-- @alias("user.viewingSelf") canDownloadPosts;- @not("currentUser.can_delete_account") cannotDeleteAccount;- @or("model.isSaving", "deleting", "cannotDeleteAccount") deleteDisabled;- @gt("model.availableTitles.length", 0) canSelectTitle;- @gt("model.availableFlairs.length", 0) canSelectFlair;- @propertyNotEqual("model.id", "currentUser.id") disableConnectButtons;-canSaveUser = true;newNameInput = null;newTitleInput = null;@@ -43,6 +31,55 @@ export default class AccountController extends Controller {this.set("revoking", {});}+ @computed("siteSettings.enable_names")+ get canEditName() {+ return this.siteSettings.enable_names;+ }++ @computed("siteSettings.enable_user_status")+ get canSelectUserStatus() {+ return this.siteSettings.enable_user_status;+ }++ @computed("siteSettings.moderators_view_emails")+ get canModeratorsViewEmails() {+ return this.siteSettings.moderators_view_emails;+ }++ @computed("user.viewingSelf")+ get canDownloadPosts() {+ return this.user?.viewingSelf;+ }++ set canDownloadPosts(value) {+ set(this, "user.viewingSelf", value);+ }++ @computed("currentUser.can_delete_account")+ get cannotDeleteAccount() {+ return !this.currentUser?.can_delete_account;+ }++ @computed("model.isSaving", "deleting", "cannotDeleteAccount")+ get deleteDisabled() {+ return this.model?.isSaving || this.deleting || this.cannotDeleteAccount;+ }++ @computed("model.availableTitles.length")+ get canSelectTitle() {+ return this.model?.availableTitles?.length > 0;+ }++ @computed("model.availableFlairs.length")+ get canSelectFlair() {+ return this.model?.availableFlairs?.length > 0;+ }++ @computed("model.id", "currentUser.id")+ get disableConnectButtons() {+ return !deepEqual(this.model?.id, this.currentUser?.id);+ }+get saveAttrNames() {return applyValueTransformer("preferences-save-attributes",diff --git a/frontend/discourse/app/controllers/preferences/email.js b/frontend/discourse/app/controllers/preferences/email.jsindex be4d85532ab..98bdc6442d7 100644--- a/frontend/discourse/app/controllers/preferences/email.js+++ b/frontend/discourse/app/controllers/preferences/email.js@@ -1,7 +1,7 @@import Controller from "@ember/controller";import EmberObject, { action, computed } from "@ember/object";-import { empty, or } from "@ember/object/computed";-import { propertyEqual } from "discourse/lib/computed";+import { isEmpty } from "@ember/utils";+import { deepEqual } from "discourse/lib/object";import { emailValid } from "discourse/lib/utilities";import { i18n } from "discourse-i18n";@@ -15,12 +15,26 @@ export default class EmailController extends Controller {newEmail = null;successMessage = null;- @empty("newEmail") newEmailEmpty;+ @computed("newEmail")+ get newEmailEmpty() {+ return isEmpty(this.newEmail);+ }- @or("saving", "newEmailEmpty", "taken", "unchanged", "invalidEmail")- saveDisabled;+ @computed("saving", "newEmailEmpty", "taken", "unchanged", "invalidEmail")+ get saveDisabled() {+ return (+ this.saving ||+ this.newEmailEmpty ||+ this.taken ||+ this.unchanged ||+ this.invalidEmail+ );+ }- @propertyEqual("newEmailLower", "oldEmail") unchanged;+ @computed("newEmailLower", "oldEmail")+ get unchanged() {+ return deepEqual(this.newEmailLower, this.oldEmail);+ }@computed("newEmail")get newEmailLower() {diff --git a/frontend/discourse/app/controllers/preferences/emails.js b/frontend/discourse/app/controllers/preferences/emails.jsindex 04ac8f30919..bdb4217bc88 100644--- a/frontend/discourse/app/controllers/preferences/emails.js+++ b/frontend/discourse/app/controllers/preferences/emails.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { equal } from "@ember/object/computed";import { popupAjaxError } from "discourse/lib/ajax-error";import { applyValueTransformer } from "discourse/lib/transformer";import { i18n } from "discourse-i18n";@@ -14,12 +13,6 @@ const EMAIL_LEVELS = {export default class EmailsController extends Controller {subpageTitle = i18n("user.preferences_nav.emails");- @equal("model.user_option.email_messages_level", EMAIL_LEVELS.ONLY_WHEN_AWAY)- emailMessagesLevelAway;-- @equal("model.user_option.email_level", EMAIL_LEVELS.ONLY_WHEN_AWAY)- emailLevelAway;-previousRepliesOptions = [{ name: i18n("user.email_previous_replies.always"), value: 0 },{ name: i18n("user.email_previous_replies.unless_emailed"), value: 1 },@@ -44,6 +37,19 @@ export default class EmailsController extends Controller {{ name: i18n("user.email_digests.every_six_months"), value: 259200 },];+ @computed("model.user_option.email_messages_level")+ get emailMessagesLevelAway() {+ return (+ this.model?.user_option?.email_messages_level ===+ EMAIL_LEVELS.ONLY_WHEN_AWAY+ );+ }++ @computed("model.user_option.email_level")+ get emailLevelAway() {+ return this.model?.user_option?.email_level === EMAIL_LEVELS.ONLY_WHEN_AWAY;+ }+get saveAttrNames() {return applyValueTransformer("preferences-save-attributes",diff --git a/frontend/discourse/app/controllers/preferences/interface.js b/frontend/discourse/app/controllers/preferences/interface.jsindex 8a97f37ec79..ed1b72a94d8 100644--- a/frontend/discourse/app/controllers/preferences/interface.js+++ b/frontend/discourse/app/controllers/preferences/interface.js@@ -9,8 +9,8 @@ import {loadColorSchemeStylesheet,updateColorSchemeCookie,} from "discourse/lib/color-scheme-picker";-import { propertyEqual } from "discourse/lib/computed";import { INTERFACE_COLOR_MODES } from "discourse/lib/constants";+import { deepEqual } from "discourse/lib/object";import {currentThemeId,listThemes,@@ -46,11 +46,18 @@ export default class InterfaceController extends Controller {previewingColorScheme = false;selectedDarkColorSchemeId = null;makeColorSchemeDefault = true;-- @propertyEqual("model.id", "currentUser.id") canPreviewColorScheme;- @propertyEqual("model.id", "currentUser.id") isViewingOwnProfile;subpageTitle = i18n("user.preferences_nav.interface");+ @computed("model.id", "currentUser.id")+ get canPreviewColorScheme() {+ return deepEqual(this.model?.id, this.currentUser?.id);+ }++ @computed("model.id", "currentUser.id")+ get isViewingOwnProfile() {+ return deepEqual(this.model?.id, this.currentUser?.id);+ }+@computed("makeThemeDefault")get saveAttrNames() {let attrs = [diff --git a/frontend/discourse/app/controllers/preferences/profile.js b/frontend/discourse/app/controllers/preferences/profile.jsindex 2368a18ab0b..2861c11efa4 100644--- a/frontend/discourse/app/controllers/preferences/profile.js+++ b/frontend/discourse/app/controllers/preferences/profile.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";import EmberObject, { action, computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import { service } from "@ember/service";import { compare, isEmpty } from "@ember/utils";import FeatureTopicOnProfileModal from "discourse/components/modal/feature-topic-on-profile";@@ -15,18 +14,36 @@ export default class ProfileController extends Controller {subpageTitle = i18n("user.preferences_nav.profile");- @readOnly("model.can_change_bio") canChangeBio;- @readOnly("model.can_change_location") canChangeLocation;- @readOnly("model.can_change_website") canChangeWebsite;- @readOnly("model.can_upload_profile_header") canUploadProfileHeader;- @readOnly("model.can_upload_user_card_background")- canUploadUserCardBackground;-calendarOptions = [{ name: i18n("download_calendar.google"), value: "google" },{ name: i18n("download_calendar.ics"), value: "ics" },];+ @computed("model.can_change_bio")+ get canChangeBio() {+ return this.model?.can_change_bio;+ }++ @computed("model.can_change_location")+ get canChangeLocation() {+ return this.model?.can_change_location;+ }++ @computed("model.can_change_website")+ get canChangeWebsite() {+ return this.model?.can_change_website;+ }++ @computed("model.can_upload_profile_header")+ get canUploadProfileHeader() {+ return this.model?.can_upload_profile_header;+ }++ @computed("model.can_upload_user_card_background")+ get canUploadUserCardBackground() {+ return this.model?.can_upload_user_card_background;+ }+get saveAttrNames() {return applyValueTransformer("preferences-save-attributes",diff --git a/frontend/discourse/app/controllers/preferences/second-factor.js b/frontend/discourse/app/controllers/preferences/second-factor.jsindex fc896565999..46ad99a474a 100644--- a/frontend/discourse/app/controllers/preferences/second-factor.js+++ b/frontend/discourse/app/controllers/preferences/second-factor.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { service } from "@ember/service";import ConfirmSession from "discourse/components/dialog-messages/confirm-session";import SecondFactorConfirmPhrase from "discourse/components/dialog-messages/second-factor-confirm-phrase";@@ -25,12 +24,19 @@ export default class SecondFactorController extends Controller {errorMessage = null;newUsername = null;- @alias("model.second_factor_backup_enabled") backupEnabled;-secondFactorMethod = SECOND_FACTOR_METHODS.TOTP;totps = [];security_keys = [];+ @computed("model.second_factor_backup_enabled")+ get backupEnabled() {+ return this.model?.second_factor_backup_enabled;+ }++ set backupEnabled(value) {+ set(this, "model.second_factor_backup_enabled", value);+ }+get isCurrentUser() {return this.currentUser?.id === this.model.id;}diff --git a/frontend/discourse/app/controllers/preferences/security.js b/frontend/discourse/app/controllers/preferences/security.jsindex 298b277b3e3..c120845d1cc 100644--- a/frontend/discourse/app/controllers/preferences/security.js+++ b/frontend/discourse/app/controllers/preferences/security.js@@ -1,13 +1,11 @@import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { gt } from "@ember/object/computed";import { service } from "@ember/service";import ConfirmSession from "discourse/components/dialog-messages/confirm-session";import AuthTokenModal from "discourse/components/modal/auth-token";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";-import { setting } from "discourse/lib/computed";import logout from "discourse/lib/logout";import { userPath } from "discourse/lib/url";import { isWebauthnSupported } from "discourse/lib/webauthn";@@ -22,14 +20,19 @@ export default class SecurityController extends Controller {@service router;@service currentUser;- @setting("moderators_view_emails") canModeratorsViewEmails;-passwordProgress = null;subpageTitle = i18n("user.preferences_nav.security");showAllAuthTokens = false;- @gt("model.user_auth_tokens.length", DEFAULT_AUTH_TOKENS_COUNT)- canShowAllAuthTokens;+ @computed("siteSettings.moderators_view_emails")+ get canModeratorsViewEmails() {+ return this.siteSettings.moderators_view_emails;+ }++ @computed("model.user_auth_tokens.length")+ get canShowAllAuthTokens() {+ return this.model?.user_auth_tokens?.length > DEFAULT_AUTH_TOKENS_COUNT;+ }@computed("model.id", "currentUser.id")get canCheckEmails() {diff --git a/frontend/discourse/app/controllers/preferences/users.js b/frontend/discourse/app/controllers/preferences/users.jsindex 191fda913b5..19395bfc033 100644--- a/frontend/discourse/app/controllers/preferences/users.js+++ b/frontend/discourse/app/controllers/preferences/users.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { and } from "@ember/object/computed";import { popupAjaxError } from "discourse/lib/ajax-error";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { makeArray } from "discourse/lib/helpers";@@ -8,13 +7,18 @@ import { applyValueTransformer } from "discourse/lib/transformer";import { i18n } from "discourse-i18n";export default class UsersController extends Controller {- @and(+ subpageTitle = i18n("user.preferences_nav.users");++ @computed("model.user_option.enable_allowed_pm_users","model.user_option.allow_private_messages")- allowPmUsersEnabled;-- subpageTitle = i18n("user.preferences_nav.users");+ get allowPmUsersEnabled() {+ return (+ this.model?.user_option?.enable_allowed_pm_users &&+ this.model?.user_option?.allow_private_messages+ );+ }get saveAttrNames() {return applyValueTransformer(diff --git a/frontend/discourse/app/controllers/second-factor-auth.js b/frontend/discourse/app/controllers/second-factor-auth.jsindex 8f0e821b29c..148405598ca 100644--- a/frontend/discourse/app/controllers/second-factor-auth.js+++ b/frontend/discourse/app/controllers/second-factor-auth.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { equal, readOnly } from "@ember/object/computed";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";import DiscourseURL from "discourse/lib/url";@@ -22,14 +21,45 @@ export default class SecondFactorAuthController extends Controller {userSelectedMethod = null;isLoading = false;- @readOnly("model.totp_enabled") totpEnabled;- @readOnly("model.backup_enabled") backupCodesEnabled;- @readOnly("model.security_keys_enabled") securityKeysEnabled;- @readOnly("model.allowed_methods") allowedMethods;- @readOnly("model.description") customDescription;- @equal("shownSecondFactorMethod", TOTP) showTotpForm;- @equal("shownSecondFactorMethod", SECURITY_KEY) showSecurityKeyForm;- @equal("shownSecondFactorMethod", BACKUP_CODE) showBackupCodesForm;+ @computed("model.totp_enabled")+ get totpEnabled() {+ return this.model?.totp_enabled;+ }++ @computed("model.backup_enabled")+ get backupCodesEnabled() {+ return this.model?.backup_enabled;+ }++ @computed("model.security_keys_enabled")+ get securityKeysEnabled() {+ return this.model?.security_keys_enabled;+ }++ @computed("model.allowed_methods")+ get allowedMethods() {+ return this.model?.allowed_methods;+ }++ @computed("model.description")+ get customDescription() {+ return this.model?.description;+ }++ @computed("shownSecondFactorMethod")+ get showTotpForm() {+ return this.shownSecondFactorMethod === TOTP;+ }++ @computed("shownSecondFactorMethod")+ get showSecurityKeyForm() {+ return this.shownSecondFactorMethod === SECURITY_KEY;+ }++ @computed("shownSecondFactorMethod")+ get showBackupCodesForm() {+ return this.shownSecondFactorMethod === BACKUP_CODE;+ }@computed("allowedMethods.[]", "totpEnabled")get totpAvailable() {diff --git a/frontend/discourse/app/controllers/signup.js b/frontend/discourse/app/controllers/signup.jsindex dde0ffdaea9..95d4fcf7447 100644--- a/frontend/discourse/app/controllers/signup.js+++ b/frontend/discourse/app/controllers/signup.js@@ -3,13 +3,11 @@ import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import EmberObject, { action, computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { notEmpty } from "@ember/object/computed";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import { observes } from "@ember-decorators/object";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";-import { setting } from "discourse/lib/computed";import { removeCookie } from "discourse/lib/cookie";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";@@ -69,9 +67,20 @@ export default class SignupPageController extends Controller {showValidationOnInit: false,});- @notEmpty("authOptions") hasAuthOptions;- @setting("enable_local_logins") canCreateLocal;- @setting("require_invite_code") requireInviteCode;+ @computed("authOptions")+ get hasAuthOptions() {+ return !isEmpty(this.authOptions);+ }++ @computed("siteSettings.enable_local_logins")+ get canCreateLocal() {+ return this.siteSettings.enable_local_logins;+ }++ @computed("siteSettings.require_invite_code")+ get requireInviteCode() {+ return this.siteSettings.require_invite_code;+ }@dependentKeyCompatget userFields() {diff --git a/frontend/discourse/app/controllers/tags/index.js b/frontend/discourse/app/controllers/tags/index.jsindex f7705560d63..f5025de1dd5 100644--- a/frontend/discourse/app/controllers/tags/index.js+++ b/frontend/discourse/app/controllers/tags/index.js@@ -1,9 +1,9 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias, notEmpty } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { schedule } from "@ember/runloop";import { service } from "@ember/service";+import { isEmpty } from "@ember/utils";import autosize from "autosize";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -21,11 +21,6 @@ export default class TagsIndexController extends Controller {sortedByCount = true;sortedByName = false;- @alias("siteSettings.tags_sort_alphabetically") sortAlphabetically;- @alias("currentUser.staff") canAdminTags;- @notEmpty("model.extras.categories") groupedByCategory;- @notEmpty("model.extras.tag_groups") groupedByTagGroup;-init() {super.init(...arguments);@@ -38,6 +33,34 @@ export default class TagsIndexController extends Controller {});}+ @computed("siteSettings.tags_sort_alphabetically")+ get sortAlphabetically() {+ return this.siteSettings?.tags_sort_alphabetically;+ }++ set sortAlphabetically(value) {+ set(this, "siteSettings.tags_sort_alphabetically", value);+ }++ @computed("currentUser.staff")+ get canAdminTags() {+ return this.currentUser?.staff;+ }++ set canAdminTags(value) {+ set(this, "currentUser.staff", value);+ }++ @computed("model.extras.categories.length")+ get groupedByCategory() {+ return !isEmpty(this.model?.extras?.categories);+ }++ @computed("model.extras.tag_groups.length")+ get groupedByTagGroup() {+ return !isEmpty(this.model?.extras?.tag_groups);+ }+get TagsAdminDropdownComponent() {return optionalRequire("discourse/admin/components/tags-admin-dropdown");}diff --git a/frontend/discourse/app/controllers/topic.js b/frontend/discourse/app/controllers/topic.jsindex 05c63144ebb..ba4499506aa 100644--- a/frontend/discourse/app/controllers/topic.js+++ b/frontend/discourse/app/controllers/topic.js@@ -1,9 +1,8 @@/* eslint-disable ember/no-observers */import { cached, tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import EmberObject, { action, computed } from "@ember/object";+import EmberObject, { action, computed, set } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { alias, and, not, or } from "@ember/object/computed";import { next, schedule } from "@ember/runloop";import { service } from "@ember/service";import { isEmpty, isPresent } from "@ember/utils";@@ -95,16 +94,6 @@ export default class TopicController extends Controller {queryParams = ["filter", "username_filters", "replies_to_post_number"];- @and("canEditTopicFeaturedLink", "buffered.featured_link")- canRemoveTopicFeaturedLink;- @not("model.isPrivateMessage") showCategoryChooser;- @or("model.errorHtml", "model.errorMessage") hasError;- @not("hasError") noErrorYet;- @alias("site.categoriesList") categories;- @alias("selectedAllPosts") canDeselectAll;- @or("model.postStream.loadedAllPosts", "model.postStream.loadingLastPost")- loadedAllPosts;-editingTopic = false;enteredAt = null;enteredIndex = null;@@ -138,6 +127,56 @@ export default class TopicController extends Controller {this.appEvents.off("post:show-revision", this, "_showRevision");}+ @computed("model.isPrivateMessage")+ get showCategoryChooser() {+ return !this.model?.isPrivateMessage;+ }++ @computed("model.errorHtml", "model.errorMessage")+ get hasError() {+ return this.model?.errorHtml || this.model?.errorMessage;+ }++ @computed("hasError")+ get noErrorYet() {+ return !this.hasError;+ }++ @computed("site.categoriesList")+ get categories() {+ return this.site?.categoriesList;+ }++ set categories(value) {+ set(this, "site.categoriesList", value);+ }++ @dependentKeyCompat+ get canDeselectAll() {+ return this.selectedAllPosts;+ }++ set canDeselectAll(value) {+ this.selectedAllPosts = value;+ }++ @computed(+ "model.postStream.loadedAllPosts",+ "model.postStream.loadingLastPost"+ )+ get loadedAllPosts() {+ return (+ this.model?.postStream?.loadedAllPosts ||+ this.model?.postStream?.loadingLastPost+ );+ }++ @computed("canEditTopicFeaturedLink", "buffered.featured_link")+ get canRemoveTopicFeaturedLink() {+ // TODO (devxp) we need a buffered proxy that works with tracked properties+ return this.canEditTopicFeaturedLink && this.get("buffered.featured_link");+ }+@cached@dependentKeyCompatget buffered() {diff --git a/frontend/discourse/app/controllers/user-activity/bookmarks.js b/frontend/discourse/app/controllers/user-activity/bookmarks.jsindex ceff1b5a215..25286ea0fc9 100644--- a/frontend/discourse/app/controllers/user-activity/bookmarks.js+++ b/frontend/discourse/app/controllers/user-activity/bookmarks.js@@ -1,9 +1,9 @@import Controller, { inject as controller } from "@ember/controller";import EmberObject, { action, computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { notEmpty } from "@ember/object/computed";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";import BulkSelectHelper from "discourse/lib/bulk-select-helper";@@ -25,7 +25,10 @@ export default class UserActivityBookmarksController extends Controller {bulkSelectHelper = new BulkSelectHelper(this);- @notEmpty("q") inSearchMode;+ @computed("q")+ get inSearchMode() {+ return !isEmpty(this.q);+ }@dependentKeyCompatget noContent() {diff --git a/frontend/discourse/app/controllers/user-invited/show.js b/frontend/discourse/app/controllers/user-invited/show.jsindex 5ffa641c79b..0ccd318c63a 100644--- a/frontend/discourse/app/controllers/user-invited/show.js+++ b/frontend/discourse/app/controllers/user-invited/show.js@@ -2,7 +2,7 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { equal, reads } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import { service } from "@ember/service";import { observes } from "@ember-decorators/object";import CreateInvite from "discourse/components/modal/create-invite";@@ -24,19 +24,43 @@ export default class UserInvitedShowController extends Controller {@tracked canLoadMore = true;@tracked hasLoadedInitialInvites = false;@tracked invitesLoading = false;+ @tracked filter = null;user = null;model = null;- filter = null;invitesCount = null;reinvitedAll = false;searchTerm = "";- @equal("filter", "redeemed") inviteRedeemed;- @equal("filter", "expired") inviteExpired;- @equal("filter", "pending") invitePending;- @reads("currentUser.can_invite_to_forum") canInviteToForum;+ @tracked _canInviteToForumOverride;++ @dependentKeyCompat+ get inviteRedeemed() {+ return this.filter === "redeemed";+ }++ @dependentKeyCompat+ get inviteExpired() {+ return this.filter === "expired";+ }++ @dependentKeyCompat+ get invitePending() {+ return this.filter === "pending";+ }++ @computed("currentUser.can_invite_to_forum")+ get canInviteToForum() {+ if (this._canInviteToForumOverride !== undefined) {+ return this._canInviteToForumOverride;+ }+ return this.currentUser?.can_invite_to_forum;+ }++ set canInviteToForum(value) {+ this._canInviteToForumOverride = value;+ }@computed("currentUser.admin", "siteSettings.allow_bulk_invite")get canBulkInvite() {diff --git a/frontend/discourse/app/controllers/user-private-messages.js b/frontend/discourse/app/controllers/user-private-messages.jsindex de4d571c626..707f75fb125 100644--- a/frontend/discourse/app/controllers/user-private-messages.js+++ b/frontend/discourse/app/controllers/user-private-messages.js@@ -1,7 +1,6 @@import { cached, tracked } from "@glimmer/tracking";import Controller, { inject as controller } from "@ember/controller";-import { action } from "@ember/object";-import { alias, and, equal, readOnly } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import DiscourseURL from "discourse/lib/url";@@ -35,12 +34,41 @@ export default class extends Controller {@tracked group;@tracked tagId;- @alias("group.name") groupFilter;- @and("user.viewingSelf", "currentUser.can_send_private_messages") showNewPM;- @equal("currentParentRouteName", "userPrivateMessages.group") isGroup;- @readOnly("user.viewingSelf") viewingSelf;- @readOnly("router.currentRoute.parent.name") currentParentRouteName;- @readOnly("site.can_tag_pms") pmTaggingEnabled;+ @computed("group.name")+ get groupFilter() {+ return this.group?.name;+ }++ set groupFilter(value) {+ set(this, "group.name", value);+ }++ @computed("user.viewingSelf", "currentUser.can_send_private_messages")+ get showNewPM() {+ return (+ this.user?.viewingSelf && this.currentUser?.can_send_private_messages+ );+ }++ @computed("currentParentRouteName")+ get isGroup() {+ return this.currentParentRouteName === "userPrivateMessages.group";+ }++ @computed("user.viewingSelf")+ get viewingSelf() {+ return this.user?.viewingSelf;+ }++ @computed("router.currentRoute.parent.name")+ get currentParentRouteName() {+ return this.router?.currentRoute?.parent?.name;+ }++ @computed("site.can_tag_pms")+ get pmTaggingEnabled() {+ return this.site?.can_tag_pms;+ }get bulkSelectHelper() {return this.userTopicsList.bulkSelectHelper;diff --git a/frontend/discourse/app/controllers/user-topics-list.js b/frontend/discourse/app/controllers/user-topics-list.jsindex 68af1d52a35..9521f63409d 100644--- a/frontend/discourse/app/controllers/user-topics-list.js+++ b/frontend/discourse/app/controllers/user-topics-list.js@@ -2,7 +2,6 @@ import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { or } from "@ember/object/computed";import { isNone } from "@ember/utils";import { popupAjaxError } from "discourse/lib/ajax-error";import BulkSelectHelper from "discourse/lib/bulk-select-helper";@@ -27,9 +26,6 @@ export default class UserTopicsListController extends Controller {bulkSelectHelper = new BulkSelectHelper(this);- @or("currentUser.canManageTopic", "showDismissRead", "showResetNew")- canBulkSelect;-constructor() {super(...arguments);@@ -38,6 +34,15 @@ export default class UserTopicsListController extends Controller {}}+ @computed("currentUser.canManageTopic", "showDismissRead", "showResetNew")+ get canBulkSelect() {+ return (+ this.currentUser?.canManageTopic ||+ this.showDismissRead ||+ this.showResetNew+ );+ }+@dependentKeyCompatget incomingCount() {return this.pmTopicTrackingState.newIncoming.length;diff --git a/frontend/discourse/app/controllers/user.js b/frontend/discourse/app/controllers/user.jsindex fb0a1160528..aa9e2a6bb3c 100644--- a/frontend/discourse/app/controllers/user.js+++ b/frontend/discourse/app/controllers/user.js@@ -1,11 +1,9 @@import Controller from "@ember/controller";import EmberObject, { action, computed, set } from "@ember/object";-import { and, equal, gt, not, or, readOnly } from "@ember/object/computed";import { service } from "@ember/service";import { dasherize } from "@ember/string";import { compare, isEmpty } from "@ember/utils";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";-import { setting } from "discourse/lib/computed";import getURL from "discourse/lib/get-url";import optionalService from "discourse/lib/optional-service";import { prioritizeNameInUx } from "discourse/lib/settings";@@ -17,20 +15,67 @@ export default class UserController extends Controller {@service dialog;@optionalService adminTools;- @setting("moderators_view_emails") canModeratorsViewEmails;-- @equal("router.currentRouteName", "user.summary") isSummaryRoute;- @or("model.can_ignore_user", "model.can_mute_user") canMuteOrIgnoreUser;- @gt("model.number_of_flags_given", 0) hasGivenFlags;- @gt("model.number_of_flags", 0) hasFlags;- @gt("model.number_of_deleted_posts", 0) hasDeletedPosts;- @gt("model.number_of_silencings", 0) hasBeenSilenced;- @gt("model.number_of_suspensions", 0) hasBeenSuspended;- @gt("model.warnings_received_count", 0) hasReceivedWarnings;- @gt("model.number_of_rejected_posts", 0) hasRejectedPosts;- @equal("model.trust_level", 0) isTrustLevelZero;- @or("isTrustLevelZero", "model.trust_level") hasTrustLevel;- @or(+ @computed("siteSettings.moderators_view_emails")+ get canModeratorsViewEmails() {+ return this.siteSettings.moderators_view_emails;+ }++ @computed("router.currentRouteName")+ get isSummaryRoute() {+ return this.router?.currentRouteName === "user.summary";+ }++ @computed("model.can_ignore_user", "model.can_mute_user")+ get canMuteOrIgnoreUser() {+ return this.model?.can_ignore_user || this.model?.can_mute_user;+ }++ @computed("model.number_of_flags_given")+ get hasGivenFlags() {+ return this.model?.number_of_flags_given > 0;+ }++ @computed("model.number_of_flags")+ get hasFlags() {+ return this.model?.number_of_flags > 0;+ }++ @computed("model.number_of_deleted_posts")+ get hasDeletedPosts() {+ return this.model?.number_of_deleted_posts > 0;+ }++ @computed("model.number_of_silencings")+ get hasBeenSilenced() {+ return this.model?.number_of_silencings > 0;+ }++ @computed("model.number_of_suspensions")+ get hasBeenSuspended() {+ return this.model?.number_of_suspensions > 0;+ }++ @computed("model.warnings_received_count")+ get hasReceivedWarnings() {+ return this.model?.warnings_received_count > 0;+ }++ @computed("model.number_of_rejected_posts")+ get hasRejectedPosts() {+ return this.model?.number_of_rejected_posts > 0;+ }++ @computed("model.trust_level")+ get isTrustLevelZero() {+ return this.model?.trust_level === 0;+ }++ @computed("isTrustLevelZero", "model.trust_level")+ get hasTrustLevel() {+ return this.isTrustLevelZero || this.model?.trust_level;+ }++ @computed("hasGivenFlags","hasFlags","hasDeletedPosts",@@ -39,15 +84,43 @@ export default class UserController extends Controller {"hasReceivedWarnings","hasRejectedPosts")- showStaffCounters;- @and(+ get showStaffCounters() {+ return (+ this.hasGivenFlags ||+ this.hasFlags ||+ this.hasDeletedPosts ||+ this.hasBeenSilenced ||+ this.hasBeenSuspended ||+ this.hasReceivedWarnings ||+ this.hasRejectedPosts+ );+ }++ @computed("model.featured_topic","siteSettings.allow_featured_topic_on_user_profiles")- showFeaturedTopic;- @not("model.isBasic") linkWebsite;- @and("model.can_be_deleted", "model.can_delete_all_posts") canDeleteUser;- @readOnly("router.currentRoute.parent.name") currentParentRoute;+ get showFeaturedTopic() {+ return (+ this.model?.featured_topic &&+ this.siteSettings?.allow_featured_topic_on_user_profiles+ );+ }++ @computed("model.isBasic")+ get linkWebsite() {+ return !this.model?.isBasic;+ }++ @computed("model.can_be_deleted", "model.can_delete_all_posts")+ get canDeleteUser() {+ return this.model?.can_be_deleted && this.model?.can_delete_all_posts;+ }++ @computed("router.currentRoute.parent.name")+ get currentParentRoute() {+ return this.router?.currentRoute?.parent?.name;+ }@computed("model.username")get viewingSelf() {diff --git a/frontend/discourse/app/controllers/user/badges.js b/frontend/discourse/app/controllers/user/badges.jsindex 7dcb6125dca..0b8e1db00e6 100644--- a/frontend/discourse/app/controllers/user/badges.js+++ b/frontend/discourse/app/controllers/user/badges.js@@ -1,16 +1,35 @@+import { tracked } from "@glimmer/tracking";import Controller, { inject as controller } from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias, filterBy, sort } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";+import { dependentKeyCompat } from "@ember/object/compat";+import { arraySortedByProperties } from "discourse/lib/array-tools";export default class UserBadgesController extends Controller {@controller user;- @alias("user.model.username_lower") username;- @sort("model", "badgeSortOrder") sortedBadges;- @filterBy("model", "is_favorite", true) favoriteBadges;-+ @tracked model;+ @trackedbadgeSortOrder = ["grouping_position", "badge.badge_type_id", "badge.id"];+ @computed("user.model.username_lower")+ get username() {+ return this.user?.model?.username_lower;+ }++ set username(value) {+ set(this, "user.model.username_lower", value);+ }++ @dependentKeyCompat+ get sortedBadges() {+ return arraySortedByProperties(this.model, this.badgeSortOrder);+ }++ @computed("[email protected]_favorite")+ get favoriteBadges() {+ return this.model?.filter?.((item) => item.is_favorite === true) ?? [];+ }+@computed("favoriteBadges.length")get canFavoriteMoreBadges() {return this.favoriteBadges?.length < this.siteSettings.max_favorite_badges;diff --git a/frontend/discourse/app/controllers/user/summary.js b/frontend/discourse/app/controllers/user/summary.jsindex cfe68f1bead..14de63b6045 100644--- a/frontend/discourse/app/controllers/user/summary.js+++ b/frontend/discourse/app/controllers/user/summary.js@@ -1,6 +1,5 @@import Controller, { inject as controller } from "@ember/controller";-import { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { duration } from "discourse/lib/formatter";// should be kept in sync with 'UserSummary::MAX_BADGES'@@ -9,7 +8,14 @@ const MAX_BADGES = 6;export default class UserSummaryController extends Controller {@controller("user") userController;- @alias("userController.model") user;+ @computed("userController.model")+ get user() {+ return this.userController?.model;+ }++ set user(value) {+ set(this, "userController.model", value);+ }@computed("model.badges.length")get moreBadges() {diff --git a/frontend/discourse/app/controllers/users.js b/frontend/discourse/app/controllers/users.jsindex 4ea8316094c..f0b154f9130 100644--- a/frontend/discourse/app/controllers/users.js+++ b/frontend/discourse/app/controllers/users.js@@ -1,6 +1,7 @@+import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";-import { action } from "@ember/object";-import { and, equal } from "@ember/object/computed";+import { action, computed } from "@ember/object";+import { dependentKeyCompat } from "@ember/object/compat";import { service } from "@ember/service";import EditUserDirectoryColumnsModal from "discourse/components/modal/edit-user-directory-columns";import discourseDebounce from "discourse/lib/debounce";@@ -10,6 +11,8 @@ import Group from "discourse/models/group";export default class UsersController extends Controller {@service modal;+ @tracked period = "weekly";+queryParams = ["period","order",@@ -20,7 +23,6 @@ export default class UsersController extends Controller {"exclude_groups",];- period = "weekly";order = "";asc = null;name = "";@@ -33,8 +35,15 @@ export default class UsersController extends Controller {groupOptions = null;params = null;- @and("currentUser", "groupOptions") showGroupFilter;- @equal("period", "all") showTimeRead;+ @computed("currentUser", "groupOptions")+ get showGroupFilter() {+ return this.currentUser && this.groupOptions;+ }++ @dependentKeyCompat+ get showTimeRead() {+ return this.period === "all";+ }loadUsers(params = null) {if (params) {diff --git a/frontend/discourse/app/models/action-summary.js b/frontend/discourse/app/models/action-summary.jsindex 3b8ce55cbb6..a628420481b 100644--- a/frontend/discourse/app/models/action-summary.js+++ b/frontend/discourse/app/models/action-summary.js@@ -1,12 +1,15 @@-import { or } from "@ember/object/computed";+import { computed } from "@ember/object";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import RestModel from "discourse/models/rest";export default class ActionSummary extends RestModel {- @or("can_undo", "can_act") canToggle;-// Remove it+ @computed("can_undo", "can_act")+ get canToggle() {+ return this.can_undo || this.can_act;+ }+removeAction() {this.setProperties({acted: false,diff --git a/frontend/discourse/app/models/archetype.js b/frontend/discourse/app/models/archetype.jsindex 6f9e60ecc48..69cae55a138 100644--- a/frontend/discourse/app/models/archetype.js+++ b/frontend/discourse/app/models/archetype.js@@ -1,9 +1,20 @@-import { gt, not } from "@ember/object/computed";-import { propertyEqual } from "discourse/lib/computed";+import { computed } from "@ember/object";+import { deepEqual } from "discourse/lib/object";import RestModel from "discourse/models/rest";export default class Archetype extends RestModel {- @gt("options.length", 0) hasOptions;- @propertyEqual("id", "site.default_archetype") isDefault;- @not("isDefault") notDefault;+ @computed("options.length")+ get hasOptions() {+ return this.options?.length > 0;+ }++ @computed("id", "site.default_archetype")+ get isDefault() {+ return deepEqual(this.id, this.site?.default_archetype);+ }++ @computed("isDefault")+ get notDefault() {+ return !this.isDefault;+ }}diff --git a/frontend/discourse/app/models/badge.js b/frontend/discourse/app/models/badge.jsindex 0f67fde3775..6337f4ce9ed 100644--- a/frontend/discourse/app/models/badge.js+++ b/frontend/discourse/app/models/badge.js@@ -1,5 +1,4 @@-import EmberObject, { computed } from "@ember/object";-import { alias, none } from "@ember/object/computed";+import EmberObject, { computed, set } from "@ember/object";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";import getURL from "discourse/lib/get-url";@@ -66,9 +65,19 @@ export default class Badge extends RestModel {);}- @none("id") newBadge;+ @computed("id")+ get newBadge() {+ return this.id == null;+ }++ @computed("image_url")+ get image() {+ return this.image_url;+ }- @alias("image_url") image;+ set image(value) {+ set(this, "image_url", value);+ }@computedget url() {diff --git a/frontend/discourse/app/models/bookmark.js b/frontend/discourse/app/models/bookmark.jsindex 8178e541c94..307eba655b6 100644--- a/frontend/discourse/app/models/bookmark.js+++ b/frontend/discourse/app/models/bookmark.js@@ -1,5 +1,4 @@import { computed } from "@ember/object";-import { none } from "@ember/object/computed";import { capitalize } from "@ember/string";import { isEmpty } from "@ember/utils";import { Promise } from "rsvp";@@ -58,7 +57,10 @@ export default class Bookmark extends RestModel {await applyModelTransformations("bookmark", bookmarks);}- @none("id") newBookmark;+ @computed("id")+ get newBookmark() {+ return this.id == null;+ }@computedget url() {diff --git a/frontend/discourse/app/models/composer.js b/frontend/discourse/app/models/composer.jsindex fb6631bf7d2..c3a250fc628 100644--- a/frontend/discourse/app/models/composer.js+++ b/frontend/discourse/app/models/composer.js@@ -2,7 +2,6 @@import { tracked } from "@glimmer/tracking";import EmberObject, { computed, set } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { and, equal, not, or, reads } from "@ember/object/computed";import { next, throttle } from "@ember/runloop";import { service } from "@ember/service";import { isHTMLSafe } from "@ember/template";@@ -221,32 +220,106 @@ export default class Composer extends RestModel {draftSaving = false;draftForceSave = false;showFullScreenExitPrompt = false;- @reads("site.archetypes") archetypes;- @equal("action", CREATE_SHARED_DRAFT) sharedDraft;- @equal("action", CREATE_TOPIC) creatingTopic;- @equal("action", CREATE_SHARED_DRAFT) creatingSharedDraft;- @equal("action", PRIVATE_MESSAGE) creatingPrivateMessage;- @not("creatingPrivateMessage") notCreatingPrivateMessage;- @not("privateMessage") notPrivateMessage;- @or("creatingTopic", "editingFirstPost") topicFirstPost;- @equal("composeState", OPEN) viewOpen;- @equal("composeState", DRAFT) viewDraft;- @equal("composeState", FULLSCREEN) viewFullscreen;- @or("viewOpen", "viewFullscreen") viewOpenOrFullscreen;- @and("editingPost", "post.firstPost") editingFirstPost;-- @or(++ @tracked _categoryId = null;++ @tracked _archetypesOverride;++ @computed("site.archetypes")+ get archetypes() {+ if (this._archetypesOverride !== undefined) {+ return this._archetypesOverride;+ }+ return this.site?.archetypes;+ }++ set archetypes(value) {+ this._archetypesOverride = value;+ }++ @computed("action")+ get sharedDraft() {+ return this.action === CREATE_SHARED_DRAFT;+ }++ @computed("action")+ get creatingTopic() {+ return this.action === CREATE_TOPIC;+ }++ @computed("action")+ get creatingSharedDraft() {+ return this.action === CREATE_SHARED_DRAFT;+ }++ @computed("action")+ get creatingPrivateMessage() {+ return this.action === PRIVATE_MESSAGE;+ }++ @computed("creatingPrivateMessage")+ get notCreatingPrivateMessage() {+ return !this.creatingPrivateMessage;+ }++ @computed("privateMessage")+ get notPrivateMessage() {+ return !this.privateMessage;+ }++ @computed("creatingTopic", "editingFirstPost")+ get topicFirstPost() {+ return this.creatingTopic || this.editingFirstPost;+ }++ @computed("composeState")+ get viewOpen() {+ return this.composeState === OPEN;+ }++ @computed("composeState")+ get viewDraft() {+ return this.composeState === DRAFT;+ }++ @computed("composeState")+ get viewFullscreen() {+ return this.composeState === FULLSCREEN;+ }++ @computed("viewOpen", "viewFullscreen")+ get viewOpenOrFullscreen() {+ return this.viewOpen || this.viewFullscreen;+ }++ @computed("editingPost", "post.firstPost")+ get editingFirstPost() {+ return this.editingPost && this.post?.firstPost;+ }++ @computed("creatingTopic","creatingPrivateMessage","editingFirstPost","creatingSharedDraft")- canEditTitle;-- @and("canEditTitle", "notCreatingPrivateMessage", "notPrivateMessage")- canCategorize;+ get canEditTitle() {+ return (+ this.creatingTopic ||+ this.creatingPrivateMessage ||+ this.editingFirstPost ||+ this.creatingSharedDraft+ );+ }- @tracked _categoryId = null;+ @computed("canEditTitle", "notCreatingPrivateMessage", "notPrivateMessage")+ get canCategorize() {+ return (+ this.canEditTitle &&+ this.notCreatingPrivateMessage &&+ this.notPrivateMessage+ );+ }@computed("reply", "originalText")get replyDirty() {diff --git a/frontend/discourse/app/models/group.js b/frontend/discourse/app/models/group.jsindex c449e115f9a..1c95c722f12 100644--- a/frontend/discourse/app/models/group.js+++ b/frontend/discourse/app/models/group.js@@ -1,7 +1,6 @@/* eslint-disable ember/no-observers */import EmberObject, { computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { equal } from "@ember/object/computed";import { trackedArray } from "@ember/reactive/collections";import { isEmpty } from "@ember/utils";import { observes } from "@ember-decorators/object";@@ -47,7 +46,10 @@ export default class Group extends RestModel {requestersLimit = null;requestersOffset = null;- @equal("mentionable_level", 99) canEveryoneMention;+ @computed("mentionable_level")+ get canEveryoneMention() {+ return this.mentionable_level === 99;+ }@computed("automatic_membership_email_domains")get emailDomains() {diff --git a/frontend/discourse/app/models/invite.js b/frontend/discourse/app/models/invite.jsindex 7c3b2706ffe..49d013a407a 100644--- a/frontend/discourse/app/models/invite.js+++ b/frontend/discourse/app/models/invite.js@@ -1,5 +1,4 @@-import EmberObject, { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import EmberObject, { computed, set } from "@ember/object";import { trackedArray } from "@ember/reactive/collections";import { isNone } from "@ember/utils";import { ajax } from "discourse/lib/ajax";@@ -51,8 +50,23 @@ export default class Invite extends EmberObject {});}- @alias("topics.firstObject.id") topicId;- @alias("topics.firstObject.title") topicTitle;+ @computed("topics.firstObject.id")+ get topicId() {+ return this.topics?.firstObject?.id;+ }++ set topicId(value) {+ set(this, "topics.firstObject.id", value);+ }++ @computed("topics.firstObject.title")+ get topicTitle() {+ return this.topics?.firstObject?.title;+ }++ set topicTitle(value) {+ set(this, "topics.firstObject.title", value);+ }save(data) {const promise = this.iddiff --git a/frontend/discourse/app/models/nav-item.js b/frontend/discourse/app/models/nav-item.jsindex 78a8aa4353c..eb4666c6485 100644--- a/frontend/discourse/app/models/nav-item.js+++ b/frontend/discourse/app/models/nav-item.js@@ -1,7 +1,6 @@import { tracked } from "@glimmer/tracking";import EmberObject, { computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { reads } from "@ember/object/computed";import { service } from "@ember/service";import deprecated from "discourse/lib/deprecated";import { getOwnerWithFallback } from "discourse/lib/get-owner";@@ -223,11 +222,24 @@ export default class NavItem extends EmberObject {@tracked name;@tracked tag;- @reads("name") filterType;@tracked _title;@tracked _displayName;+ @tracked _filterTypeOverride;++ @dependentKeyCompat+ get filterType() {+ if (this._filterTypeOverride !== undefined) {+ return this._filterTypeOverride;+ }+ return this.name;+ }++ set filterType(value) {+ this._filterTypeOverride = value;+ }+@dependentKeyCompatget title() {if (this._title) {diff --git a/frontend/discourse/app/models/pending-post.js b/frontend/discourse/app/models/pending-post.jsindex cc9d65779f1..f3ba27d87bc 100644--- a/frontend/discourse/app/models/pending-post.js+++ b/frontend/discourse/app/models/pending-post.js@@ -1,5 +1,5 @@+import { tracked } from "@glimmer/tracking";import { computed } from "@ember/object";-import { reads } from "@ember/object/computed";import { cook } from "discourse/lib/text";import { userPath } from "discourse/lib/url";import RestModel from "discourse/models/rest";@@ -8,10 +8,10 @@ import Category from "./category";export default class PendingPost extends RestModel {expandedExcerpt = null;- @reads("topic_url") postUrl;-truncated = false;+ @tracked _postUrlOverride;+init() {super.init(...arguments);cook(this.raw_text).then((cooked) => {@@ -19,6 +19,18 @@ export default class PendingPost extends RestModel {});}+ @computed("topic_url")+ get postUrl() {+ if (this._postUrlOverride !== undefined) {+ return this._postUrlOverride;+ }+ return this.topic_url;+ }++ set postUrl(value) {+ this._postUrlOverride = value;+ }+@computed("username")get userUrl() {return userPath(this.username.toLowerCase());diff --git a/frontend/discourse/app/models/post-action-type.js b/frontend/discourse/app/models/post-action-type.jsindex fc8788fec4f..f87c3120c9a 100644--- a/frontend/discourse/app/models/post-action-type.js+++ b/frontend/discourse/app/models/post-action-type.js@@ -1,12 +1,14 @@import { computed } from "@ember/object";-import { equal } from "@ember/object/computed";import RestModel from "discourse/models/rest";import { i18n } from "discourse-i18n";export const MAX_MESSAGE_LENGTH = 500;export default class PostActionType extends RestModel {- @equal("name_key", "illegal") isIllegal;+ @computed("name_key")+ get isIllegal() {+ return this.name_key === "illegal";+ }@computed()get translatedDescription() {diff --git a/frontend/discourse/app/models/post.js b/frontend/discourse/app/models/post.jsindex 94568033978..2d7964f3cdb 100644--- a/frontend/discourse/app/models/post.js+++ b/frontend/discourse/app/models/post.js@@ -1,13 +1,13 @@import { cached, tracked } from "@glimmer/tracking";-import EmberObject, { computed, get } from "@ember/object";-import { alias, and, equal, not, or } from "@ember/object/computed";+import EmberObject, { computed, get, set } from "@ember/object";+import { dependentKeyCompat } from "@ember/object/compat";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import { Promise } from "rsvp";import { resolveShareUrl } from "discourse/helpers/share-url";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";-import { propertyEqual } from "discourse/lib/computed";+import { deepEqual } from "discourse/lib/object";import { cook } from "discourse/lib/text";import { fancyTitle } from "discourse/lib/topic-fancy-title";import {@@ -199,16 +199,10 @@ export default class Post extends RestModel {@tracked via_email;@tracked wiki;@tracked yours;-- @alias("can_edit") canEdit; // for compatibility with existing code- @equal("trust_level", 0) new_user;- @equal("post_number", 1) firstPost;- @and("firstPost", "topic.deleted_at") deletedViaTopic; // mark fist post as deleted if topic was deleted- @or("deleted_at", "deletedViaTopic") deleted; // post is either highlighted as deleted or hidden/removed from the post stream- @not("deleted") notDeleted;- @or("deleted_at", "user_deleted") recoverable; // post or content still can be recovered- @propertyEqual("topic.details.created_by.id", "user_id") topicOwner;- @alias("topic.details.created_by.id") topicCreatedById;+ // for compatibility with existing code+ // mark fist post as deleted if topic was deleted+ // post is either highlighted as deleted or hidden/removed from the post stream+ // post or content still can be recoveredconstructor() {super(...arguments);@@ -219,6 +213,59 @@ export default class Post extends RestModel {});}+ @dependentKeyCompat+ get canEdit() {+ return this.can_edit;+ }++ set canEdit(value) {+ this.can_edit = value;+ }++ @dependentKeyCompat+ get new_user() {+ return this.trust_level === 0;+ }++ @dependentKeyCompat+ get firstPost() {+ return this.post_number === 1;+ }++ @computed("firstPost", "topic.deleted_at")+ get deletedViaTopic() {+ return this.firstPost && this.topic?.deleted_at;+ }++ @computed("deleted_at", "deletedViaTopic")+ get deleted() {+ return this.deleted_at || this.deletedViaTopic;+ }++ @computed("deleted")+ get notDeleted() {+ return !this.deleted;+ }++ @dependentKeyCompat+ get recoverable() {+ return this.deleted_at || this.user_deleted;+ }++ @computed("topic.details.created_by.id", "user_id")+ get topicOwner() {+ return deepEqual(this.topic?.details?.created_by?.id, this.user_id);+ }++ @computed("topic.details.created_by.id")+ get topicCreatedById() {+ return this.topic?.details?.created_by?.id;+ }++ set topicCreatedById(value) {+ set(this, "topic.details.created_by.id", value);+ }+get shareUrl() {const url = this.customShare || resolveShareUrl(this.url, this.currentUser);return applyValueTransformer("post-share-url", url, { post: this });diff --git a/frontend/discourse/app/models/rest.js b/frontend/discourse/app/models/rest.jsindex 035e75f4fef..9ffafd1765e 100644--- a/frontend/discourse/app/models/rest.js+++ b/frontend/discourse/app/models/rest.js@@ -1,7 +1,7 @@import { tracked } from "@glimmer/tracking";import { warn } from "@ember/debug";import EmberObject from "@ember/object";-import { equal } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import { getOwner, setOwner } from "@ember/owner";import { Promise } from "rsvp";import { getOwnerWithFallback } from "discourse/lib/get-owner";@@ -34,12 +34,20 @@ export default class RestModel extends EmberObject {}@tracked isSaving = false;- @equal("__state", "new") isNew;- @equal("__state", "created") isCreated;primaryKey = "id";@tracked __state;+ @dependentKeyCompat+ get isNew() {+ return this.__state === "new";+ }++ @dependentKeyCompat+ get isCreated() {+ return this.__state === "created";+ }+beforeCreate() {}afterCreate() {}diff --git a/frontend/discourse/app/models/reviewable-history.js b/frontend/discourse/app/models/reviewable-history.jsindex 0fac81c219f..a99e2d1bb4d 100644--- a/frontend/discourse/app/models/reviewable-history.js+++ b/frontend/discourse/app/models/reviewable-history.js@@ -1,4 +1,4 @@-import { equal } from "@ember/object/computed";+import { computed } from "@ember/object";import RestModel from "discourse/models/rest";export const CREATED = 0;@@ -6,5 +6,8 @@ export const TRANSITIONED_TO = 1;export const EDITED = 2;export default class ReviewableHistory extends RestModel {- @equal("reviewable_history_type", CREATED) created;+ @computed("reviewable_history_type")+ get created() {+ return this.reviewable_history_type === CREATED;+ }}diff --git a/frontend/discourse/app/models/site.js b/frontend/discourse/app/models/site.jsindex 0e835d951cd..b0fa7e3e25e 100644--- a/frontend/discourse/app/models/site.js+++ b/frontend/discourse/app/models/site.js@@ -1,12 +1,14 @@-import { cached } from "@glimmer/tracking";-import EmberObject, { computed, get } from "@ember/object";+import { cached, tracked } from "@glimmer/tracking";+import EmberObject, { computed, get, set } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { alias, sort } from "@ember/object/computed";import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import { removeValueFromArray } from "discourse/lib/array-tools";+import {+ arraySortedByProperties,+ removeValueFromArray,+} from "discourse/lib/array-tools";import { AUTO_GROUPS } from "discourse/lib/constants";import deprecated, { withSilencedDeprecations } from "discourse/lib/deprecated";import { isRailsTesting, isTesting } from "discourse/lib/environment";@@ -86,19 +88,23 @@ export default class Site extends RestModel {@service siteSettings;@service capabilities;+ @tracked topicCountDesc = ["topic_count:desc"];@autoTrackedArray categories = [];@autoTrackedArray groups = [];- @alias("is_readonly") isReadOnly;-- @sort("categories", "topicCountDesc") categoriesByCount;-#siteInitialized = false;- init() {- super.init(...arguments);+ @computed("is_readonly")+ get isReadOnly() {+ return this.is_readonly;+ }++ set isReadOnly(value) {+ set(this, "is_readonly", value);+ }- this.topicCountDesc = ["topic_count:desc"];+ get categoriesByCount() {+ return arraySortedByProperties(this.categories, this.topicCountDesc);}get groupsById() {diff --git a/frontend/discourse/app/models/tag.js b/frontend/discourse/app/models/tag.jsindex 0e0d6e04c96..d8cb0bc1398 100644--- a/frontend/discourse/app/models/tag.js+++ b/frontend/discourse/app/models/tag.js@@ -1,10 +1,12 @@import { computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import getURL from "discourse/lib/get-url";import RestModel from "discourse/models/rest";export default class Tag extends RestModel {- @readOnly("pm_only") pmOnly;+ @computed("pm_only")+ get pmOnly() {+ return this.pm_only;+ }@computed("slug", "id")get url() {diff --git a/frontend/discourse/app/models/topic-list.js b/frontend/discourse/app/models/topic-list.jsindex 0dfa45f4e0c..3186bc0c8f2 100644--- a/frontend/discourse/app/models/topic-list.js+++ b/frontend/discourse/app/models/topic-list.js@@ -1,6 +1,5 @@import { tracked } from "@glimmer/tracking";-import EmberObject, { action } from "@ember/object";-import { notEmpty } from "@ember/object/computed";+import EmberObject, { action, computed } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import { Promise } from "rsvp";@@ -127,7 +126,10 @@ export default class TopicList extends RestModel {@tracked loadingBefore = false;@autoTrackedArray topics;- @notEmpty("more_topics_url") canLoadMore;+ @computed("more_topics_url")+ get canLoadMore() {+ return !isEmpty(this.more_topics_url);+ }forEachNew(topics, callback) {const topicIds = new Set();diff --git a/frontend/discourse/app/models/topic.js b/frontend/discourse/app/models/topic.jsindex 94444979e9e..cd0eb3519f5 100644--- a/frontend/discourse/app/models/topic.js+++ b/frontend/discourse/app/models/topic.js@@ -1,20 +1,19 @@import { cached, tracked } from "@glimmer/tracking";-import EmberObject, { computed } from "@ember/object";+import EmberObject, { computed, set } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { alias, and, equal, notEmpty, or } from "@ember/object/computed";import { service } from "@ember/service";+import { isEmpty } from "@ember/utils";import { Promise } from "rsvp";import { resolveShareUrl } from "discourse/helpers/share-url";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValuesFromArray } from "discourse/lib/array-tools";-import { fmt, propertyEqual } from "discourse/lib/computed";import { TOPIC_VISIBILITY_REASONS } from "discourse/lib/constants";import deprecated from "discourse/lib/deprecated";import { longDate } from "discourse/lib/formatter";import getURL from "discourse/lib/get-url";import { applyModelTransformations } from "discourse/lib/model-transformers";-import { deepMerge } from "discourse/lib/object";+import { deepEqual, deepMerge } from "discourse/lib/object";import PreloadStore from "discourse/lib/preload-store";import { serializeTags } from "discourse/lib/serialize-tags";import { emojiUnescape } from "discourse/lib/text";@@ -341,20 +340,6 @@ export default class Topic extends RestModel {message = null;- @alias("lastPoster.user") lastPosterUser;- @alias("lastPoster.primary_group") lastPosterGroup;- @alias("details.allowed_groups") allowedGroups;- @notEmpty("deleted_at") deleted;- @fmt("url", "%@/print") printUrl;- @equal("archetype", "private_message") isPrivateMessage;- @equal("archetype", "banner") isBanner;- @alias("bookmarks.length") bookmarkCount;- @and("pinned", "category.isUncategorizedCategory") isPinnedUncategorized;- @notEmpty("excerpt") hasExcerpt;- @propertyEqual("last_read_post_number", "highest_post_number") readLastPost;- @and("pinned", "readLastPost") canClearPin;- @or("details.can_edit", "details.can_edit_tags") canEditTags;-@tracked _details = this.store.createRecord("topicDetails", {id: this.id,topic: this,@@ -368,6 +353,87 @@ export default class Topic extends RestModel {});}+ @computed("lastPoster.user")+ get lastPosterUser() {+ return this.lastPoster?.user;+ }++ set lastPosterUser(value) {+ set(this, "lastPoster.user", value);+ }++ @computed("lastPoster.primary_group")+ get lastPosterGroup() {+ return this.lastPoster?.primary_group;+ }++ set lastPosterGroup(value) {+ set(this, "lastPoster.primary_group", value);+ }++ @computed("details.allowed_groups")+ get allowedGroups() {+ return this.details?.allowed_groups;+ }++ set allowedGroups(value) {+ set(this, "details.allowed_groups", value);+ }++ @computed("deleted_at")+ get deleted() {+ return !isEmpty(this.deleted_at);+ }++ @computed("url")+ get printUrl() {+ return `${this.url}/print`;+ }++ @computed("archetype")+ get isPrivateMessage() {+ return this.archetype === "private_message";+ }++ @computed("archetype")+ get isBanner() {+ return this.archetype === "banner";+ }++ @computed("bookmarks.length")+ get bookmarkCount() {+ return this.bookmarks?.length;+ }++ set bookmarkCount(value) {+ set(this, "bookmarks.length", value);+ }++ @computed("pinned", "category.isUncategorizedCategory")+ get isPinnedUncategorized() {+ return this.pinned && this.category?.isUncategorizedCategory;+ }++ @computed("excerpt")+ get hasExcerpt() {+ return !isEmpty(this.excerpt);+ }++ @dependentKeyCompat+ get readLastPost() {+ return deepEqual(this.last_read_post_number, this.highest_post_number);+ }++ @computed("pinned", "readLastPost")+ get canClearPin() {+ return this.pinned && this.readLastPost;+ }++ @computed("details.can_edit", "details.can_edit_tags")+ get canEditTags() {+ return this.details?.can_edit || this.details?.can_edit_tags;+ }+@computed("last_read_post_number", "highest_post_number")get visited() {// >= to handle case where there are deleted posts at the end of the topicdiff --git a/frontend/discourse/app/models/user-action-stat.js b/frontend/discourse/app/models/user-action-stat.jsindex 4e4a6458c28..0da3797c95e 100644--- a/frontend/discourse/app/models/user-action-stat.js+++ b/frontend/discourse/app/models/user-action-stat.js@@ -1,10 +1,13 @@import { computed } from "@ember/object";-import { i18n } from "discourse/lib/computed";import RestModel from "discourse/models/rest";import UserAction from "discourse/models/user-action";+import { i18n } from "discourse-i18n";export default class UserActionStat extends RestModel {- @i18n("action_type", "user_action_groups.%@") description;+ @computed("action_type")+ get description() {+ return i18n(`user_action_groups.${this.action_type}`);+ }@computed("action_type")get isPM() {diff --git a/frontend/discourse/app/models/user-action.js b/frontend/discourse/app/models/user-action.jsindex a25f71d35c7..ebb80bf8413 100644--- a/frontend/discourse/app/models/user-action.js+++ b/frontend/discourse/app/models/user-action.js@@ -1,5 +1,4 @@import { computed } from "@ember/object";-import { equal, or } from "@ember/object/computed";import { service } from "@ember/service";import { emojiUnescape } from "discourse/lib/text";import { userPath } from "discourse/lib/url";@@ -85,18 +84,65 @@ export default class UserAction extends RestModel {@service currentUser;- @or("name", "username") presentName;- @or("target_name", "target_username") targetDisplayName;- @or("acting_name", "acting_username") actingDisplayName;- @equal("action_type", UserActionTypes.replies) replyType;- @equal("action_type", UserActionTypes.posts) postType;- @equal("action_type", UserActionTypes.topics) topicType;- @equal("action_type", UserActionTypes.bookmarks) bookmarkType;- @equal("action_type", UserActionTypes.messages_sent) messageSentType;- @equal("action_type", UserActionTypes.messages_received) messageReceivedType;- @equal("action_type", UserActionTypes.mentions) mentionType;- @or("messageSentType", "messageReceivedType") isPM;- @or("postType", "replyType") postReplyType;+ @computed("name", "username")+ get presentName() {+ return this.name || this.username;+ }++ @computed("target_name", "target_username")+ get targetDisplayName() {+ return this.target_name || this.target_username;+ }++ @computed("acting_name", "acting_username")+ get actingDisplayName() {+ return this.acting_name || this.acting_username;+ }++ @computed("action_type")+ get replyType() {+ return this.action_type === UserActionTypes.replies;+ }++ @computed("action_type")+ get postType() {+ return this.action_type === UserActionTypes.posts;+ }++ @computed("action_type")+ get topicType() {+ return this.action_type === UserActionTypes.topics;+ }++ @computed("action_type")+ get bookmarkType() {+ return this.action_type === UserActionTypes.bookmarks;+ }++ @computed("action_type")+ get messageSentType() {+ return this.action_type === UserActionTypes.messages_sent;+ }++ @computed("action_type")+ get messageReceivedType() {+ return this.action_type === UserActionTypes.messages_received;+ }++ @computed("action_type")+ get mentionType() {+ return this.action_type === UserActionTypes.mentions;+ }++ @computed("messageSentType", "messageReceivedType")+ get isPM() {+ return this.messageSentType || this.messageReceivedType;+ }++ @computed("postType", "replyType")+ get postReplyType() {+ return this.postType || this.replyType;+ }@computed("category_id")get category() {diff --git a/frontend/discourse/app/models/user-posts-stream.js b/frontend/discourse/app/models/user-posts-stream.jsindex 4fb9d492f04..4d973c78473 100644--- a/frontend/discourse/app/models/user-posts-stream.js+++ b/frontend/discourse/app/models/user-posts-stream.js@@ -1,7 +1,7 @@import { tracked } from "@glimmer/tracking";-import EmberObject from "@ember/object";+import EmberObject, { computed } from "@ember/object";import { ajax } from "discourse/lib/ajax";-import { url } from "discourse/lib/computed";+import getURL from "discourse/lib/get-url";import { autoTrackedArray } from "discourse/lib/tracked-tools";import UserAction from "discourse/models/user-action";@@ -14,8 +14,12 @@ export default class UserPostsStream extends EmberObject {@tracked loading = false;@autoTrackedArray content = [];- @url("user.username_lower", "filter", "itemsLoaded", "/posts/%@/%@?offset=%@")- url;+ @computed("user.username_lower", "filter", "itemsLoaded")+ get url() {+ return getURL(+ `/posts/${this.user?.username_lower}/${this.filter}?offset=${this.itemsLoaded}`+ );+ }async filterBy(opts) {if (this.loaded && this.filter === opts.filter) {diff --git a/frontend/discourse/app/models/user-stream.js b/frontend/discourse/app/models/user-stream.jsindex da75c9103dd..1bab5ef88bb 100644--- a/frontend/discourse/app/models/user-stream.js+++ b/frontend/discourse/app/models/user-stream.js@@ -2,7 +2,7 @@ import { tracked } from "@glimmer/tracking";import { computed } from "@ember/object";import { ajax } from "discourse/lib/ajax";import { removeValueFromArray } from "discourse/lib/array-tools";-import { url } from "discourse/lib/computed";+import getURL from "discourse/lib/get-url";import { autoTrackedArray } from "discourse/lib/tracked-tools";import RestModel from "discourse/models/rest";import Site from "discourse/models/site";@@ -16,12 +16,12 @@ export default class UserStream extends RestModel {@tracked itemsLoaded = 0;@autoTrackedArray content = [];- @url(- "itemsLoaded",- "user.username_lower",- "/user_actions.json?offset=%@&username=%@"- )- baseUrl;+ @computed("itemsLoaded", "user.username_lower")+ get baseUrl() {+ return getURL(+ `/user_actions.json?offset=${this.itemsLoaded}&username=${this.user?.username_lower}`+ );+ }@computed("filter")get filterParam() {diff --git a/frontend/discourse/app/models/user.js b/frontend/discourse/app/models/user.jsindex 0efa28636bb..3ffb95b5b17 100644--- a/frontend/discourse/app/models/user.js+++ b/frontend/discourse/app/models/user.js@@ -1,8 +1,7 @@/* eslint-disable ember/no-observers */import { tracked } from "@glimmer/tracking";-import EmberObject, { computed, get, getProperties } from "@ember/object";+import EmberObject, { computed, get, getProperties, set } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";-import { alias, equal, filterBy, gt, mapBy, or } from "@ember/object/computed";import Evented from "@ember/object/evented";import { getOwner, setOwner } from "@ember/owner";import { trackedArray } from "@ember/reactive/collections";@@ -18,7 +17,6 @@ import {removeValueFromArray,uniqueItemsFromArray,} from "discourse/lib/array-tools";-import { url } from "discourse/lib/computed";import {AUTO_GROUPS,INTERFACE_COLOR_MODES,@@ -253,26 +251,105 @@ export default class User extends RestModel.extend(Evented) {@userOption("treat_as_new_topic_start_date") treat_as_new_topic_start_date;@userOption("composition_mode") composition_mode;- @gt("private_messages_stats.all", 0) hasPMs;- @gt("private_messages_stats.mine", 0) hasStartedPMs;- @gt("private_messages_stats.unread", 0) hasUnreadPMs;- @url("id", "username_lower", "/admin/users/%@1/%@2") adminPath;- @equal("trust_level", 0) isBasic;- @equal("trust_level", 3) isRegular;- @equal("trust_level", 4) isLeader;- @or("staff", "isLeader") canManageTopic;- @alias("sidebar_category_ids") sidebarCategoryIds;- @alias("sidebar_sections") sidebarSections;- @mapBy("sidebarTags", "name") sidebarTagNames;- @filterBy("groups", "has_messages", true) groupsWithMessages;- @alias("can_pick_theme_with_custom_homepage") canPickThemeWithCustomHomepage;- @alias("can_edit_tags") canEditTags;- @alias("can_change_post_owner") canChangePostOwner;-numGroupsToDisplay = 2;statusManager = new UserStatusManager(this);+ @computed("private_messages_stats.all")+ get hasPMs() {+ return this.private_messages_stats?.all > 0;+ }++ @computed("private_messages_stats.mine")+ get hasStartedPMs() {+ return this.private_messages_stats?.mine > 0;+ }++ @computed("private_messages_stats.unread")+ get hasUnreadPMs() {+ return this.private_messages_stats?.unread > 0;+ }++ @computed("id", "username_lower")+ get adminPath() {+ return getURL(`/admin/users/${this.id}/${this.username_lower}`);+ }++ @computed("trust_level")+ get isBasic() {+ return this.trust_level === 0;+ }++ @computed("trust_level")+ get isRegular() {+ return this.trust_level === 3;+ }++ @computed("trust_level")+ get isLeader() {+ return this.trust_level === 4;+ }++ @computed("staff", "isLeader")+ get canManageTopic() {+ return this.staff || this.isLeader;+ }++ @computed("sidebar_category_ids")+ get sidebarCategoryIds() {+ return this.sidebar_category_ids;+ }++ set sidebarCategoryIds(value) {+ set(this, "sidebar_category_ids", value);+ }++ @dependentKeyCompat+ get sidebarSections() {+ return this.sidebar_sections;+ }++ set sidebarSections(value) {+ this.sidebar_sections = value;+ }++ @computed("[email protected]")+ get sidebarTagNames() {+ return this.sidebarTags?.map?.((item) => item.name) ?? [];+ }++ @computed("[email protected]_messages")+ get groupsWithMessages() {+ return this.groups?.filter?.((item) => item.has_messages === true) ?? [];+ }++ @computed("can_pick_theme_with_custom_homepage")+ get canPickThemeWithCustomHomepage() {+ return this.can_pick_theme_with_custom_homepage;+ }++ set canPickThemeWithCustomHomepage(value) {+ set(this, "can_pick_theme_with_custom_homepage", value);+ }++ @computed("can_edit_tags")+ get canEditTags() {+ return this.can_edit_tags;+ }++ set canEditTags(value) {+ set(this, "can_edit_tags", value);+ }++ @computed("can_change_post_owner")+ get canChangePostOwner() {+ return this.can_change_post_owner;+ }++ set canChangePostOwner(value) {+ set(this, "can_change_post_owner", value);+ }+@computed("user_option.composition_mode")get useRichEditor() {return (diff --git a/frontend/discourse/app/routes/application.js b/frontend/discourse/app/routes/application.jsindex 3eec2ef00b3..102e4bbecfa 100644--- a/frontend/discourse/app/routes/application.js+++ b/frontend/discourse/app/routes/application.js@@ -1,9 +1,8 @@-import { action } from "@ember/object";+import { action, computed } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";import NotActivatedModal from "discourse/components/modal/not-activated";import { RouteException } from "discourse/controllers/exception";-import { setting } from "discourse/lib/computed";import deprecated from "discourse/lib/deprecated";import EmbedMode from "discourse/lib/embed-mode";import getURL from "discourse/lib/get-url";@@ -29,8 +28,15 @@ export default class ApplicationRoute extends DiscourseRoute {@service site;@service restrictedRouting;- @setting("title") siteTitle;- @setting("short_site_description") shortSiteDescription;+ @computed("siteSettings.title")+ get siteTitle() {+ return this.siteSettings.title;+ }++ @computed("siteSettings.short_site_description")+ get shortSiteDescription() {+ return this.siteSettings.short_site_description;+ }@actionloading(transition) {diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.jsindex 596ff24d068..f70b9b7f387 100644--- a/frontend/discourse/app/services/composer.js+++ b/frontend/discourse/app/services/composer.js@@ -1,7 +1,6 @@/* eslint-disable ember/no-observers */import { tracked } from "@glimmer/tracking";-import EmberObject, { action, computed } from "@ember/object";-import { alias, and, or, reads } from "@ember/object/computed";+import EmberObject, { action, computed, set } from "@ember/object";import { getOwner } from "@ember/owner";import { cancel, next, scheduleOnce } from "@ember/runloop";import Service, { service } from "@ember/service";@@ -126,16 +125,68 @@ export default class ComposerService extends Service {composerHeight = null;- @and("site.mobileView", "showPreview") forcePreview;- @alias("site.categoriesList") categories;- @alias("topicController.model") topicModel;- @reads("currentUser.staff") isStaffUser;- @reads("currentUser.whisperer") whisperer;- @and("model.creatingTopic", "isStaffUser") canUnlistTopic;- @or("replyingToWhisper", "model.whisper") isWhispering;-@tracked _showPreview;+ @tracked _isStaffUserOverride;+ @tracked _whispererOverride;++ @computed("site.mobileView", "showPreview")+ get forcePreview() {+ return this.site?.mobileView && this.showPreview;+ }++ @computed("site.categoriesList")+ get categories() {+ return this.site?.categoriesList;+ }++ set categories(value) {+ set(this, "site.categoriesList", value);+ }++ @computed("topicController.model")+ get topicModel() {+ return this.topicController?.model;+ }++ set topicModel(value) {+ set(this, "topicController.model", value);+ }++ @computed("currentUser.staff")+ get isStaffUser() {+ if (this._isStaffUserOverride !== undefined) {+ return this._isStaffUserOverride;+ }+ return this.currentUser?.staff;+ }++ set isStaffUser(value) {+ this._isStaffUserOverride = value;+ }++ @computed("currentUser.whisperer")+ get whisperer() {+ if (this._whispererOverride !== undefined) {+ return this._whispererOverride;+ }+ return this.currentUser?.whisperer;+ }++ set whisperer(value) {+ this._whispererOverride = value;+ }++ @computed("model.creatingTopic", "isStaffUser")+ get canUnlistTopic() {+ return this.model?.creatingTopic && this.isStaffUser;+ }++ @computed("replyingToWhisper", "model.whisper")+ get isWhispering() {+ return this.replyingToWhisper || this.model?.whisper;+ }+get showPreview() {return (this._showPreview ??diff --git a/frontend/discourse/app/services/logs-notice.js b/frontend/discourse/app/services/logs-notice.jsindex 0288c6ae3dc..cd40d6d43cb 100644--- a/frontend/discourse/app/services/logs-notice.js+++ b/frontend/discourse/app/services/logs-notice.js@@ -1,6 +1,5 @@/* eslint-disable ember/no-observers */import { computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import Service, { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";@@ -20,8 +19,6 @@ export default class LogsNoticeService extends Service {text = "";- @readOnly("currentUser.admin") isAdmin;-init() {super.init(...arguments);@@ -49,6 +46,11 @@ export default class LogsNoticeService extends Service {);}+ @computed("currentUser.admin")+ get isAdmin() {+ return this.currentUser?.admin;+ }+@bindonLogRateLimit(data) {const { duration, rate } = data;diff --git a/frontend/discourse/select-kit/components/category-chooser.js b/frontend/discourse/select-kit/components/category-chooser.jsindex fe12051acb5..ed75cf43ab5 100644--- a/frontend/discourse/select-kit/components/category-chooser.js+++ b/frontend/discourse/select-kit/components/category-chooser.js@@ -3,7 +3,6 @@ import { trustHTML } from "@ember/template";import { isNone } from "@ember/utils";import { classNames } from "@ember-decorators/component";import { categoryBadgeHTML } from "discourse/helpers/category-link";-import { setting } from "discourse/lib/computed";import Category from "discourse/models/category";import PermissionType from "discourse/models/permission-type";import CategoryRow from "discourse/select-kit/components/category-row";@@ -26,9 +25,6 @@ import { pluginApiIdentifiers, selectKitOptions } from "./select-kit";})@pluginApiIdentifiers(["category-chooser"])export default class CategoryChooser extends ComboBoxComponent {- @setting("allow_uncategorized_topics") allowUncategorized;- @setting("fixed_category_positions_on_create") fixedCategoryPositionsOnCreate;-init() {super.init(...arguments);@@ -45,6 +41,16 @@ export default class CategoryChooser extends ComboBoxComponent {}}+ @computed("siteSettings.allow_uncategorized_topics")+ get allowUncategorized() {+ return this.siteSettings.allow_uncategorized_topics;+ }++ @computed("siteSettings.fixed_category_positions_on_create")+ get fixedCategoryPositionsOnCreate() {+ return this.siteSettings.fixed_category_positions_on_create;+ }+modifyComponentForRow() {return CategoryRow;}diff --git a/frontend/discourse/select-kit/components/category-drop.js b/frontend/discourse/select-kit/components/category-drop.jsindex c3450117c76..6be97717b8d 100644--- a/frontend/discourse/select-kit/components/category-drop.js+++ b/frontend/discourse/select-kit/components/category-drop.js@@ -1,9 +1,7 @@import { action, computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import { trustHTML } from "@ember/template";import { classNameBindings, classNames } from "@ember-decorators/component";import { categoryBadgeHTML } from "discourse/helpers/category-link";-import { setting } from "discourse/lib/computed";import DiscourseURL, {getCategoryAndTagUrl,getEditCategoryUrl,@@ -47,11 +45,6 @@ const MORE_COLLECTION = "MORE_COLLECTION";})@pluginApiIdentifiers(["category-drop"])export default class CategoryDrop extends ComboBoxComponent {- @readOnly("category.id") value;- @readOnly("categoriesWithShortcuts") content;- @readOnly("selectKit.options.parentCategory.displayName") parentCategoryName;- @setting("allow_uncategorized_topics") allowUncategorized;-noCategoriesLabel = i18n("categories.no_subcategories");navigateToEdit = false;editingCategory = false;@@ -62,6 +55,26 @@ export default class CategoryDrop extends ComboBoxComponent {this.insertAfterCollection(MAIN_COLLECTION, MORE_COLLECTION);}+ @computed("category.id")+ get value() {+ return this.category?.id;+ }++ @computed("categoriesWithShortcuts")+ get content() {+ return this.categoriesWithShortcuts;+ }++ @computed("selectKit.options.parentCategory.displayName")+ get parentCategoryName() {+ return this.selectKit?.options?.parentCategory?.displayName;+ }++ @computed("siteSettings.allow_uncategorized_topics")+ get allowUncategorized() {+ return this.siteSettings.allow_uncategorized_topics;+ }+modifyComponentForCollection(collection) {if (collection === MORE_COLLECTION) {return CategoryDropMoreCollection;diff --git a/frontend/discourse/select-kit/components/category-notifications-button.js b/frontend/discourse/select-kit/components/category-notifications-button.jsindex a8044c38607..a727ebabc8b 100644--- a/frontend/discourse/select-kit/components/category-notifications-button.js+++ b/frontend/discourse/select-kit/components/category-notifications-button.js@@ -1,4 +1,4 @@-import { readOnly } from "@ember/object/computed";+import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";import NotificationOptionsComponent from "discourse/select-kit/components/notifications-button";import { i18n } from "discourse-i18n";@@ -12,5 +12,8 @@ import { pluginApiIdentifiers, selectKitOptions } from "./select-kit";@pluginApiIdentifiers(["category-notifications-button"])@classNames("category-notifications-button")export default class CategoryNotificationsButton extends NotificationOptionsComponent {- @readOnly("category.deleted") isHidden;+ @computed("category.deleted")+ get isHidden() {+ return this.category?.deleted;+ }}diff --git a/frontend/discourse/select-kit/components/category-selector.js b/frontend/discourse/select-kit/components/category-selector.jsindex 054b7263946..5f670e28019 100644--- a/frontend/discourse/select-kit/components/category-selector.js+++ b/frontend/discourse/select-kit/components/category-selector.js@@ -1,5 +1,4 @@import EmberObject, { action, computed } from "@ember/object";-import { mapBy } from "@ember/object/computed";import { classNames } from "@ember-decorators/component";import { makeArray } from "discourse/lib/helpers";import Category from "discourse/models/category";@@ -21,8 +20,6 @@ export default class CategorySelector extends MultiSelectComponent {categories = null;blockedCategories = null;- @mapBy("categories", "id") value;-init() {super.init(...arguments);@@ -31,6 +28,11 @@ export default class CategorySelector extends MultiSelectComponent {}}+ @computed("[email protected]")+ get value() {+ return this.categories?.map?.((item) => item.id) ?? [];+ }+@computed("categories.[]", "blockedCategories.[]")get content() {return Category.list().filter((category) => {diff --git a/frontend/discourse/select-kit/components/combo-box.js b/frontend/discourse/select-kit/components/combo-box.jsindex 952ae7cfb2f..9566988d833 100644--- a/frontend/discourse/select-kit/components/combo-box.js+++ b/frontend/discourse/select-kit/components/combo-box.js@@ -1,4 +1,4 @@-import { gte } from "@ember/object/computed";+import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";import SingleSelectComponent from "discourse/select-kit/components/single-select";import ComboBoxHeader from "./combo-box/combo-box-header";@@ -19,5 +19,8 @@ import {shouldDisplayIcon: false,})export default class ComboBox extends SingleSelectComponent {- @gte("content.length", FILTER_VISIBILITY_THRESHOLD) autoFilterable;+ @computed("content.length")+ get autoFilterable() {+ return this.content?.length >= FILTER_VISIBILITY_THRESHOLD;+ }}diff --git a/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjs b/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjsindex b68841134d1..43e2c3155e7 100644--- a/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjs+++ b/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjs@@ -1,5 +1,5 @@+import { tracked } from "@glimmer/tracking";import { computed } from "@ember/object";-import { and, reads } from "@ember/object/computed";import { classNames } from "@ember-decorators/component";import DButton from "discourse/components/d-button";import icon from "discourse/helpers/d-icon";@@ -8,10 +8,50 @@ import SingleSelectHeaderComponent from "discourse/select-kit/components/select-@classNames("combo-box-header")export default class ComboBoxHeader extends SingleSelectHeaderComponent {- @reads("selectKit.options.clearable") clearable;- @reads("selectKit.options.caretUpIcon") caretUpIcon;- @reads("selectKit.options.caretDownIcon") caretDownIcon;- @and("clearable", "value") shouldDisplayClearableButton;+ @tracked _clearableOverride;+ @tracked _caretUpIconOverride;+ @tracked _caretDownIconOverride;++ @computed("selectKit.options.clearable")+ get clearable() {+ if (this._clearableOverride !== undefined) {+ return this._clearableOverride;+ }+ return this.selectKit?.options?.clearable;+ }++ set clearable(value) {+ this._clearableOverride = value;+ }++ @computed("selectKit.options.caretUpIcon")+ get caretUpIcon() {+ if (this._caretUpIconOverride !== undefined) {+ return this._caretUpIconOverride;+ }+ return this.selectKit?.options?.caretUpIcon;+ }++ set caretUpIcon(value) {+ this._caretUpIconOverride = value;+ }++ @computed("selectKit.options.caretDownIcon")+ get caretDownIcon() {+ if (this._caretDownIconOverride !== undefined) {+ return this._caretDownIconOverride;+ }+ return this.selectKit?.options?.caretDownIcon;+ }++ set caretDownIcon(value) {+ this._caretDownIconOverride = value;+ }++ @computed("clearable", "value")+ get shouldDisplayClearableButton() {+ return this.clearable && this.value;+ }@computed("selectKit.isExpanded", "caretUpIcon", "caretDownIcon")get caretIcon() {diff --git a/frontend/discourse/select-kit/components/composer-actions.js b/frontend/discourse/select-kit/components/composer-actions.jsindex c110b7864be..4d999726624 100644--- a/frontend/discourse/select-kit/components/composer-actions.js+++ b/frontend/discourse/select-kit/components/composer-actions.js@@ -1,5 +1,4 @@import { action, computed } from "@ember/object";-import { equal, gt } from "@ember/object/computed";import { service } from "@ember/service";import { camelize } from "@ember/string";import { isEmpty } from "@ember/utils";@@ -44,8 +43,15 @@ export default class ComposerActions extends DropdownSelectBoxComponent {seq = 0;- @equal("action", EDIT) isEditing;- @gt("topic.slow_mode_seconds", 0) isInSlowMode;+ @computed("action")+ get isEditing() {+ return this.action === EDIT;+ }++ @computed("topic.slow_mode_seconds")+ get isInSlowMode() {+ return this.topic?.slow_mode_seconds > 0;+ }@computed("isEditing", "action", "whisper", "noBump", "isInSlowMode")get iconForComposerAction() {diff --git a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjs b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjsindex 8d0b87dea23..2ac692f8f98 100644--- a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjs+++ b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjs@@ -1,5 +1,4 @@import { computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import { classNameBindings, classNames } from "@ember-decorators/component";import icon from "discourse/helpers/d-icon";import { resolveComponent } from "discourse/select-kit/components/select-kit";@@ -8,11 +7,30 @@ import SingleSelectHeaderComponent from "discourse/select-kit/components/select-@classNames("dropdown-select-box-header")@classNameBindings("btnClassName", "btnStyleClass", "btnCustomClasses")export default class DropdownSelectBoxHeader extends SingleSelectHeaderComponent {- @readOnly("selectKit.options.showFullTitle") showFullTitle;- @readOnly("selectKit.options.customStyle") customStyle;- @readOnly("selectKit.options.btnCustomClasses") btnCustomClasses;- @readOnly("selectKit.options.caretUpIcon") caretUpIcon;- @readOnly("selectKit.options.caretDownIcon") caretDownIcon;+ @computed("selectKit.options.showFullTitle")+ get showFullTitle() {+ return this.selectKit?.options?.showFullTitle;+ }++ @computed("selectKit.options.customStyle")+ get customStyle() {+ return this.selectKit?.options?.customStyle;+ }++ @computed("selectKit.options.btnCustomClasses")+ get btnCustomClasses() {+ return this.selectKit?.options?.btnCustomClasses;+ }++ @computed("selectKit.options.caretUpIcon")+ get caretUpIcon() {+ return this.selectKit?.options?.caretUpIcon;+ }++ @computed("selectKit.options.caretDownIcon")+ get caretDownIcon() {+ return this.selectKit?.options?.caretDownIcon;+ }@computed("showFullTitle")get btnClassName() {diff --git a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjs b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjsindex a097ba997d1..bcfbc5a6752 100644--- a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjs+++ b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjs@@ -1,4 +1,4 @@-import { readOnly } from "@ember/object/computed";+import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { classNames } from "@ember-decorators/component";import icon from "discourse/helpers/d-icon";@@ -6,8 +6,6 @@ import SelectKitRowComponent from "discourse/select-kit/components/select-kit/se@classNames("dropdown-select-box-row")export default class DropdownSelectBoxRow extends SelectKitRowComponent {- @readOnly("item.description") description;-<template>{{#if this.icons}}<div class="icons">@@ -25,4 +23,9 @@ export default class DropdownSelectBoxRow extends SelectKitRowComponent {{{/if}}</div></template>++ @computed("item.description")+ get description() {+ return this.item?.description;+ }}diff --git a/frontend/discourse/select-kit/components/future-date-input-selector.js b/frontend/discourse/select-kit/components/future-date-input-selector.jsindex 23db2601d4a..95fe30c328b 100644--- a/frontend/discourse/select-kit/components/future-date-input-selector.js+++ b/frontend/discourse/select-kit/components/future-date-input-selector.js@@ -1,5 +1,4 @@-import { action } from "@ember/object";-import { equal } from "@ember/object/computed";+import { action, computed } from "@ember/object";import { isEmpty } from "@ember/utils";import { classNames } from "@ember-decorators/component";import ComboBoxComponent from "discourse/select-kit/components/combo-box";@@ -19,8 +18,6 @@ export const FORMAT = "YYYY-MM-DD HH:mmZ";})@pluginApiIdentifiers("future-date-input-selector")export default class FutureDateInputSelector extends ComboBoxComponent {- @equal("value", "custom") isCustom;-userTimezone = null;init() {@@ -28,6 +25,11 @@ export default class FutureDateInputSelector extends ComboBoxComponent {this.userTimezone = this.currentUser.user_option.timezone;}+ @computed("value")+ get isCustom() {+ return this.value === "custom";+ }+modifyComponentForRow() {return FutureDateInputSelectorRow;}diff --git a/frontend/discourse/select-kit/components/group-dropdown.js b/frontend/discourse/select-kit/components/group-dropdown.jsindex d2f4da6c48b..af45295a0d3 100644--- a/frontend/discourse/select-kit/components/group-dropdown.js+++ b/frontend/discourse/select-kit/components/group-dropdown.js@@ -1,7 +1,6 @@+import { tracked } from "@glimmer/tracking";import { action, computed } from "@ember/object";-import { gte, reads } from "@ember/object/computed";import { classNames } from "@ember-decorators/component";-import { setting } from "discourse/lib/computed";import DiscourseURL from "discourse/lib/url";import ComboBoxComponent from "discourse/select-kit/components/combo-box";import {@@ -18,13 +17,33 @@ import { i18n } from "discourse-i18n";})@pluginApiIdentifiers("group-dropdown")export default class GroupDropdown extends ComboBoxComponent {- @reads("groupsWithShortcut") content;- @gte("content.length", 10) hasManyGroups;- @setting("enable_group_directory") enableGroupDirectory;-valueProperty = null;nameProperty = null;+ @tracked _contentOverride;++ @computed("groupsWithShortcut")+ get content() {+ if (this._contentOverride !== undefined) {+ return this._contentOverride;+ }+ return this.groupsWithShortcut;+ }++ set content(value) {+ this._contentOverride = value;+ }++ @computed("content.length")+ get hasManyGroups() {+ return this.content?.length >= 10;+ }++ @computed("siteSettings.enable_group_directory")+ get enableGroupDirectory() {+ return this.siteSettings.enable_group_directory;+ }+@computed("groups.[]")get groupsWithShortcut() {const shortcuts = [];diff --git a/frontend/discourse/select-kit/components/list-setting.js b/frontend/discourse/select-kit/components/list-setting.jsindex b60bc51fe53..e2e55c25ef0 100644--- a/frontend/discourse/select-kit/components/list-setting.js+++ b/frontend/discourse/select-kit/components/list-setting.js@@ -1,5 +1,4 @@import { computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import { classNames } from "@ember-decorators/component";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { makeArray } from "discourse/lib/helpers";@@ -23,7 +22,10 @@ export default class ListSetting extends MultiSelectComponent {nameProperty = null;valueProperty = null;- @readOnly("choices") content;+ @computed("choices")+ get content() {+ return this.choices;+ }modifyComponentForRow(collection) {if (collection === MAIN_COLLECTION && this.settingName?.includes("color")) {diff --git a/frontend/discourse/select-kit/components/mini-tag-chooser.js b/frontend/discourse/select-kit/components/mini-tag-chooser.jsindex 60ba6db8f55..e942cd56ba9 100644--- a/frontend/discourse/select-kit/components/mini-tag-chooser.js+++ b/frontend/discourse/select-kit/components/mini-tag-chooser.js@@ -1,12 +1,11 @@import { action, computed } from "@ember/object";-import { empty, or } from "@ember/object/computed";import { service } from "@ember/service";+import { isEmpty } from "@ember/utils";import {attributeBindings,classNameBindings,classNames,} from "@ember-decorators/component";-import { setting } from "discourse/lib/computed";import { bind } from "discourse/lib/decorators";import { makeArray } from "discourse/lib/helpers";import MultiSelectComponent from "discourse/select-kit/components/multi-select";@@ -44,11 +43,25 @@ export default class MiniTagChooser extends MultiSelectComponent {valueProperty = "id";nameProperty = "name";- @empty("value") noTags;- @or("allowCreate", "site.can_create_tag") allowAnyTag;+ @computed("value.length")+ get noTags() {+ return isEmpty(this.value);+ }++ @computed("allowCreate", "site.can_create_tag")+ get allowAnyTag() {+ return this.allowCreate || this.site?.can_create_tag;+ }- @setting("max_tag_search_results") maxTagSearchResults;- @setting("max_tags_per_topic") maxTagsPerTopic;+ @computed("siteSettings.max_tag_search_results")+ get maxTagSearchResults() {+ return this.siteSettings.max_tag_search_results;+ }++ @computed("siteSettings.max_tags_per_topic")+ get maxTagsPerTopic() {+ return this.siteSettings.max_tags_per_topic;+ }@computed("value.[]")get tags() {diff --git a/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjs b/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjsindex 7be0df089f8..8f8bd80a71e 100644--- a/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjs+++ b/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjs@@ -1,15 +1,27 @@/* eslint-disable ember/no-classic-components */+import { tracked } from "@glimmer/tracking";import Component from "@ember/component";import { fn } from "@ember/helper";import { computed } from "@ember/object";-import { reads } from "@ember/object/computed";import { tagName } from "@ember-decorators/component";import DButton from "discourse/components/d-button";import discourseTag from "discourse/helpers/discourse-tag";@tagName("")export default class SelectedCollection extends Component {- @reads("collection.content.selectedTags.[]") selectedTags;+ @tracked _selectedTagsOverride;++ @computed("collection.content.selectedTags.[]")+ get selectedTags() {+ if (this._selectedTagsOverride !== undefined) {+ return this._selectedTagsOverride;+ }+ return this.collection?.content?.selectedTags;+ }++ set selectedTags(value) {+ this._selectedTagsOverride = value;+ }@computed("selectedTags.[]", "selectKit.filter")get tags() {diff --git a/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjs b/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjsindex 72a30c90127..89feeeae280 100644--- a/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjs+++ b/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjs@@ -1,6 +1,6 @@+import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { computed } from "@ember/object";-import { reads } from "@ember/object/computed";import {attributeBindings,classNames,@@ -16,9 +16,45 @@ import { or } from "discourse/truth-helpers";@classNames("multi-select-header")@attributeBindings("ariaLabel:aria-label")export default class MultiSelectHeader extends SelectKitHeaderComponent {- @reads("selectKit.options.caretUpIcon") caretUpIcon;- @reads("selectKit.options.caretDownIcon") caretDownIcon;- @reads("selectKit.options.headerAriaLabel") ariaLabel;+ @tracked _caretUpIconOverride;+ @tracked _caretDownIconOverride;+ @tracked _ariaLabelOverride;++ @computed("selectKit.options.caretUpIcon")+ get caretUpIcon() {+ if (this._caretUpIconOverride !== undefined) {+ return this._caretUpIconOverride;+ }+ return this.selectKit?.options?.caretUpIcon;+ }++ set caretUpIcon(value) {+ this._caretUpIconOverride = value;+ }++ @computed("selectKit.options.caretDownIcon")+ get caretDownIcon() {+ if (this._caretDownIconOverride !== undefined) {+ return this._caretDownIconOverride;+ }+ return this.selectKit?.options?.caretDownIcon;+ }++ set caretDownIcon(value) {+ this._caretDownIconOverride = value;+ }++ @computed("selectKit.options.headerAriaLabel")+ get ariaLabel() {+ if (this._ariaLabelOverride !== undefined) {+ return this._ariaLabelOverride;+ }+ return this.selectKit?.options?.headerAriaLabel;+ }++ set ariaLabel(value) {+ this._ariaLabelOverride = value;+ }@computed("selectKit.isExpanded", "caretUpIcon", "caretDownIcon")get caretIcon() {diff --git a/frontend/discourse/select-kit/components/notifications-button/notifications-button-row.js b/frontend/discourse/select-kit/components/notifications-button/notifications-button-row.jsindex a386aeefe2f..8f17dbf1e5b 100644--- a/frontend/discourse/select-kit/components/notifications-button/notifications-button-row.js+++ b/frontend/discourse/select-kit/components/notifications-button/notifications-button-row.js@@ -1,5 +1,4 @@import { computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import { classNames } from "@ember-decorators/component";import { escapeExpression } from "discourse/lib/utilities";import DropdownSelectBoxRowComponent from "discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row";@@ -7,8 +6,15 @@ import { i18n } from "discourse-i18n";@classNames("notifications-button-row")export default class NotificationsButtonRow extends DropdownSelectBoxRowComponent {- @readOnly("selectKit.options.i18nPrefix") i18nPrefix;- @readOnly("selectKit.options.i18nPostfix") i18nPostfix;+ @computed("selectKit.options.i18nPrefix")+ get i18nPrefix() {+ return this.selectKit?.options?.i18nPrefix;+ }++ @computed("selectKit.options.i18nPostfix")+ get i18nPostfix() {+ return this.selectKit?.options?.i18nPostfix;+ }@computed("_start")get label() {diff --git a/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjs b/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjsindex 2af4eacca62..139f090d14c 100644--- a/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjs+++ b/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjs@@ -1,13 +1,15 @@import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";import icon from "discourse/helpers/d-icon";-import { fmt } from "discourse/lib/computed";import DropdownSelectBoxHeaderComponent from "discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header";import { i18n } from "discourse-i18n";@classNames("notifications-filter-header", "btn-flat")export default class NotificationsFilterHeader extends DropdownSelectBoxHeaderComponent {- @fmt("value", "user.user_notifications.filters.%@") label;+ @computed("value")+ get label() {+ return `user.user_notifications.filters.${this.value}`;+ }@computed("selectKit.isExpanded")get caretIcon() {diff --git a/frontend/discourse/select-kit/components/period-chooser.js b/frontend/discourse/select-kit/components/period-chooser.jsindex a5787c24232..c8b8ea7a3df 100644--- a/frontend/discourse/select-kit/components/period-chooser.js+++ b/frontend/discourse/select-kit/components/period-chooser.js@@ -1,5 +1,5 @@-import { action } from "@ember/object";-import { oneWay, readOnly } from "@ember/object/computed";+import { tracked } from "@glimmer/tracking";+import { action, computed } from "@ember/object";import { classNameBindings, classNames } from "@ember-decorators/component";import DropdownSelectBoxComponent from "discourse/select-kit/components/dropdown-select-box";import { selectKitOptions } from "discourse/select-kit/components/select-kit";@@ -20,13 +20,29 @@ import PeriodChooserRow from "./period-chooser/period-chooser-row";endDate: "endDate",})export default class PeriodChooser extends DropdownSelectBoxComponent {- @oneWay("site.periods") content;- @readOnly("period") value;-valueProperty = null;nameProperty = null;showPeriods = true;+ @tracked _contentOverride;++ @computed("site.periods")+ get content() {+ if (this._contentOverride !== undefined) {+ return this._contentOverride;+ }+ return this.site?.periods;+ }++ set content(value) {+ this._contentOverride = value;+ }++ @computed("period")+ get value() {+ return this.period;+ }+modifyComponentForRow() {return PeriodChooserRow;}diff --git a/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjs b/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjsindex 09b479d90bb..ecdeb1ef3a8 100644--- a/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjs+++ b/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjs@@ -2,7 +2,6 @@import Component, { Input } from "@ember/component";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";-import { not } from "@ember/object/computed";import { isPresent } from "@ember/utils";import {attributeBindings,@@ -20,7 +19,10 @@ import { i18n } from "discourse-i18n";export default class SelectKitFilter extends Component {tabIndex = -1;- @not("isHidden") isExpanded;+ @computed("isHidden")+ get isExpanded() {+ return !this.isHidden;+ }@computed("selectKit.options.{filterable,allowAny,autoFilterable}",diff --git a/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjs b/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjsindex cd2be6c7ee7..f88bc90c541 100644--- a/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjs+++ b/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjs@@ -1,7 +1,7 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */+import { tracked } from "@glimmer/tracking";import Component from "@ember/component";import { action, computed } from "@ember/object";-import { reads } from "@ember/object/computed";import { guidFor } from "@ember/object/internals";import { dasherize } from "@ember/string";import {@@ -44,7 +44,19 @@ export default class SelectKitRow extends Component {index = 0;role = "menuitemradio";- @reads("item.lang") lang;+ @tracked _langOverride;++ @computed("item.lang")+ get lang() {+ if (this._langOverride !== undefined) {+ return this._langOverride;+ }+ return this.item?.lang;+ }++ set lang(value) {+ this._langOverride = value;+ }didInsertElement() {super.didInsertElement(...arguments);diff --git a/frontend/discourse/select-kit/components/select-kit/single-select-header.gjs b/frontend/discourse/select-kit/components/select-kit/single-select-header.gjsindex 8803966811f..dbfdef2f79a 100644--- a/frontend/discourse/select-kit/components/select-kit/single-select-header.gjs+++ b/frontend/discourse/select-kit/components/select-kit/single-select-header.gjs@@ -1,5 +1,4 @@import { computed } from "@ember/object";-import { or } from "@ember/object/computed";import {attributeBindings,classNames,@@ -14,7 +13,10 @@ import { i18n } from "discourse-i18n";@classNames("single-select-header")@attributeBindings("name", "ariaLabel:aria-label")export default class SingleSelectHeader extends SelectKitHeaderComponent {- @or("selectKit.options.headerAriaLabel", "name") ariaLabel;+ @computed("selectKit.options.headerAriaLabel", "name")+ get ariaLabel() {+ return this.selectKit?.options?.headerAriaLabel || this.name;+ }focusIn(event) {event.stopImmediatePropagation();diff --git a/frontend/discourse/select-kit/components/selected-name.gjs b/frontend/discourse/select-kit/components/selected-name.gjsindex 2f0ebd5bcc2..15294333ed3 100644--- a/frontend/discourse/select-kit/components/selected-name.gjs+++ b/frontend/discourse/select-kit/components/selected-name.gjs@@ -1,8 +1,8 @@/* eslint-disable ember/no-classic-components */+import { tracked } from "@glimmer/tracking";import Component from "@ember/component";import { fn } from "@ember/helper";import { computed, get } from "@ember/object";-import { reads } from "@ember/object/computed";import { guidFor } from "@ember/object/internals";import { tagName } from "@ember-decorators/component";import DButton from "discourse/components/d-button";@@ -21,7 +21,7 @@ export default class SelectedName extends Component {headerLabel = null;id = null;- @reads("headerLang") lang;+ @tracked _langOverride;init() {super.init(...arguments);@@ -29,6 +29,18 @@ export default class SelectedName extends Component {this.set("id", guidFor(this));}+ @computed("headerLang")+ get lang() {+ if (this._langOverride !== undefined) {+ return this._langOverride;+ }+ return this.headerLang;+ }++ set lang(value) {+ this._langOverride = value;+ }+didReceiveAttrs() {super.didReceiveAttrs(...arguments);diff --git a/frontend/discourse/select-kit/components/tag-drop.js b/frontend/discourse/select-kit/components/tag-drop.jsindex fa9fa3997f8..de4babeb9f7 100644--- a/frontend/discourse/select-kit/components/tag-drop.js+++ b/frontend/discourse/select-kit/components/tag-drop.js@@ -1,8 +1,6 @@import { action, computed } from "@ember/object";-import { readOnly } from "@ember/object/computed";import { service } from "@ember/service";import { classNameBindings, classNames } from "@ember-decorators/component";-import { setting } from "discourse/lib/computed";import { bind } from "discourse/lib/decorators";import { makeArray } from "discourse/lib/helpers";import DiscourseURL, { getCategoryAndTagUrl } from "discourse/lib/url";@@ -39,18 +37,32 @@ const MORE_TAGS_COLLECTION = "MORE_TAGS_COLLECTION";export default class TagDrop extends ComboBoxComponent {@service tagUtils;- @readOnly("tag.id") value;-- @setting("max_tag_search_results") maxTagSearchResults;- @setting("tags_sort_alphabetically") sortTagsAlphabetically;- @setting("max_tags_in_filter_list") maxTagsInFilterList;-init() {super.init(...arguments);this.insertAfterCollection(MAIN_COLLECTION, MORE_TAGS_COLLECTION);}+ @computed("tag.id")+ get value() {+ return this.tag?.id;+ }++ @computed("siteSettings.max_tag_search_results")+ get maxTagSearchResults() {+ return this.siteSettings.max_tag_search_results;+ }++ @computed("siteSettings.tags_sort_alphabetically")+ get sortTagsAlphabetically() {+ return this.siteSettings.tags_sort_alphabetically;+ }++ @computed("siteSettings.max_tags_in_filter_list")+ get maxTagsInFilterList() {+ return this.siteSettings.max_tags_in_filter_list;+ }+@computed("maxTagsInFilterList", "topTags.[]", "mainCollection.[]")get shouldShowMoreTags() {if (this.selectKit.filter?.length > 0) {diff --git a/frontend/discourse/select-kit/components/tag-dropdown.js b/frontend/discourse/select-kit/components/tag-dropdown.jsindex fe87e7ec58d..7ea020fc9e0 100644--- a/frontend/discourse/select-kit/components/tag-dropdown.js+++ b/frontend/discourse/select-kit/components/tag-dropdown.js@@ -1,5 +1,5 @@+import { tracked } from "@glimmer/tracking";import { action, computed } from "@ember/object";-import { reads } from "@ember/object/computed";import { classNames } from "@ember-decorators/component";import DiscourseURL from "discourse/lib/url";import ComboBoxComponent from "discourse/select-kit/components/combo-box";@@ -16,11 +16,23 @@ import {})@pluginApiIdentifiers("tag-dropdown")export default class TagDropdown extends ComboBoxComponent {- @reads("tags") content;-valueProperty = "name";nameProperty = "name";+ @tracked _contentOverride;++ @computed("tags")+ get content() {+ if (this._contentOverride !== undefined) {+ return this._contentOverride;+ }+ return this.tags;+ }++ set content(value) {+ this._contentOverride = value;+ }+@computed("tags.[]")get tagNames() {return (this.tags || []).map((t) => t.name);diff --git a/package.json b/package.jsonindex 73545abf378..0a082b0e21c 100644--- a/package.json+++ b/package.json@@ -5,7 +5,7 @@"license": "GPL-2.0-only","devDependencies": {"@babel/plugin-proposal-decorators": "^7.29.0",- "@discourse/lint-configs": "^2.44.0",+ "@discourse/lint-configs": "^2.45.0","@discourse/moment-timezone-names-translations": "^1.0.0","@fortawesome/fontawesome-free": "7.2.0","@glint/ember-tsc": "^1.2.3",diff --git a/plugins/automation/admin/assets/javascripts/discourse/controllers/admin-plugins/show/automation/edit.js b/plugins/automation/admin/assets/javascripts/discourse/controllers/admin-plugins/show/automation/edit.jsindex a9e0e1dc40e..e210a33e1f9 100644--- a/plugins/automation/admin/assets/javascripts/discourse/controllers/admin-plugins/show/automation/edit.js+++ b/plugins/automation/admin/assets/javascripts/discourse/controllers/admin-plugins/show/automation/edit.js@@ -1,6 +1,6 @@+import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed, set } from "@ember/object";-import { filterBy, reads } from "@ember/object/computed";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { ajax } from "discourse/lib/ajax";@@ -15,9 +15,37 @@ export default class AutomationEdit extends Controller {isUpdatingAutomation = false;isTriggeringAutomation = false;- @reads("model.automation") automation;- @filterBy("automationForm.fields", "targetType", "script") scriptFields;- @filterBy("automationForm.fields", "targetType", "trigger") triggerFields;+ @tracked _automationOverride;++ @computed("model.automation")+ get automation() {+ if (this._automationOverride !== undefined) {+ return this._automationOverride;+ }+ return this.model?.automation;+ }++ set automation(value) {+ this._automationOverride = value;+ }++ @computed("[email protected]")+ get scriptFields() {+ return (+ this.automationForm?.fields?.filter?.(+ (item) => item.targetType === "script"+ ) ?? []+ );+ }++ @computed("[email protected]")+ get triggerFields() {+ return (+ this.automationForm?.fields?.filter?.(+ (item) => item.targetType === "trigger"+ ) ?? []+ );+ }@computed("model.automation.next_pending_automation_at")get nextPendingAutomationAtFormatted() {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjsindex 9ce70d81a7c..f1581af9ef2 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjs@@ -1,8 +1,7 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { fn } from "@ember/helper";-import { computed } from "@ember/object";-import { alias, equal } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import ChooseTopic from "discourse/components/choose-topic";@@ -24,12 +23,6 @@ export default class ChatToTopicSelector extends Component {newMessageSelection = NEW_MESSAGE_SELECTION;selection = null;- @equal("selection", NEW_TOPIC_SELECTION) newTopic;- @equal("selection", EXISTING_TOPIC_SELECTION) existingTopic;- @equal("selection", NEW_MESSAGE_SELECTION) newMessage;- @alias("site.can_create_tag") canAddTags;- @alias("site.can_tag_pms") canTagMessages;-topicTitle = null;categoryId = null;tags = null;@@ -37,6 +30,39 @@ export default class ChatToTopicSelector extends Component {chatMessageIds = null;chatChannelId = null;+ @computed("selection")+ get newTopic() {+ return this.selection === NEW_TOPIC_SELECTION;+ }++ @computed("selection")+ get existingTopic() {+ return this.selection === EXISTING_TOPIC_SELECTION;+ }++ @computed("selection")+ get newMessage() {+ return this.selection === NEW_MESSAGE_SELECTION;+ }++ @computed("site.can_create_tag")+ get canAddTags() {+ return this.site?.can_create_tag;+ }++ set canAddTags(value) {+ set(this, "site.can_create_tag", value);+ }++ @computed("site.can_tag_pms")+ get canTagMessages() {+ return this.site?.can_tag_pms;+ }++ set canTagMessages(value) {+ set(this, "site.can_tag_pms", value);+ }+@computed()get newTopicInstruction() {return trustHTML(this.instructionLabels[NEW_TOPIC_SELECTION]);diff --git a/plugins/chat/assets/javascripts/discourse/services/chat.js b/plugins/chat/assets/javascripts/discourse/services/chat.jsindex 8cfc46b26ee..a461b41798b 100644--- a/plugins/chat/assets/javascripts/discourse/services/chat.js+++ b/plugins/chat/assets/javascripts/discourse/services/chat.js@@ -1,6 +1,5 @@import { tracked } from "@glimmer/tracking";import { action, computed } from "@ember/object";-import { and } from "@ember/object/computed";import { cancel, next } from "@ember/runloop";import Service, { service } from "@ember/service";import { ajax } from "discourse/lib/ajax";@@ -35,8 +34,6 @@ export default class Chat extends Service {presenceChannel = null;isNetworkUnreliable = false;- @and("currentUser.has_chat_enabled", "siteSettings.chat_enabled") userCanChat;-@tracked _activeMessage = null;@tracked _activeChannel = null;@@ -63,6 +60,13 @@ export default class Chat extends Service {}}+ @computed("currentUser.has_chat_enabled", "siteSettings.chat_enabled")+ get userCanChat() {+ return (+ this.currentUser?.has_chat_enabled && this.siteSettings?.chat_enabled+ );+ }+get activeChannel() {return this._activeChannel;}diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjsindex f34d75207a8..2b34df64402 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjs@@ -1,5 +1,4 @@-import { action } from "@ember/object";-import { mapBy } from "@ember/object/computed";+import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import DButton from "discourse/components/d-button";import { makeArray } from "discourse/lib/helpers";@@ -8,7 +7,10 @@ import HouseAdsSetting from "./house-ads-setting";@tagName("")export default class HouseAdsListSetting extends HouseAdsSetting {- @mapBy("allAds", "name") adNames;+ @computed("[email protected]")+ get adNames() {+ return this.allAds?.map?.((item) => item.name) ?? [];+ }@actionchangeAdValue(value) {diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjsindex d22fa0f66aa..846d9dd8592 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjs@@ -1,12 +1,12 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";-import { action } from "@ember/object";+import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import DButton from "discourse/components/d-button";import TextField from "discourse/components/text-field";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";-import { i18n as computedI18n, propertyNotEqual } from "discourse/lib/computed";+import { deepEqual } from "discourse/lib/object";import { i18n } from "discourse-i18n";@tagName("")@@ -15,15 +15,26 @@ export default class HouseAdsSetting extends Component {saving = false;savingStatus = "";- @computedI18n("name", "admin.adplugin.house_ads.%@.title") title;- @computedI18n("name", "admin.adplugin.house_ads.%@.description") help;- @propertyNotEqual("adValue", "value") changed;-init() {super.init(...arguments);this.set("adValue", this.get("value"));}+ @computed("name")+ get title() {+ return i18n(`admin.adplugin.house_ads.${this.name}.title`);+ }++ @computed("name")+ get help() {+ return i18n(`admin.adplugin.house_ads.${this.name}.description`);+ }++ @computed("adValue", "value")+ get changed() {+ return !deepEqual(this.adValue, this.value);+ }+@actionasync save() {if (this.get("saving")) {diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.js b/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.jsindex fe777b7abb1..f374eabeae4 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.js+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.js@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */import Component from "@ember/component";-import { computed } from "@ember/object";-import { alias, or } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { service } from "@ember/service";import { ajax } from "discourse/lib/ajax";import { throwAjaxError } from "discourse/lib/ajax-error";@@ -13,33 +12,65 @@ import {export default class AdComponent extends Component {@service router;@service session;+ // Server needs to compute this in case hidden tags are being used.- @or(+ _impressionId = null;+ _clickTracked = false;++ _handleAdClick = () => {+ this.trackClick();+ };++ @computed("router.currentRoute.attributes.category.id","router.currentRoute.parent.attributes.category_id")- currentCategoryId;- @or(+ get currentCategoryId() {+ return (+ this.router?.currentRoute?.attributes?.category?.id ||+ this.router?.currentRoute?.parent?.attributes?.category_id+ );+ }++ @computed("router.currentRoute.attributes.category.slug","router.currentRoute.parent.attributes.category.slug")- currentCategorySlug;- // Server needs to compute this in case hidden tags are being used.- @alias("router.currentRoute.parent.attributes.tags_disable_ads")- topicTagsDisableAds;- @or(+ get currentCategorySlug() {+ return (+ this.router?.currentRoute?.attributes?.category?.slug ||+ this.router?.currentRoute?.parent?.attributes?.category?.slug+ );+ }++ @computed("router.currentRoute.parent.attributes.tags_disable_ads")+ get topicTagsDisableAds() {+ return this.router?.currentRoute?.parent?.attributes?.tags_disable_ads;+ }++ set topicTagsDisableAds(value) {+ set(this, "router.currentRoute.parent.attributes.tags_disable_ads", value);+ }++ @computed("router.currentRoute.attributes.category.read_restricted","router.currentRoute.parent.attributes.category.read_restricted")- isRestrictedCategory;- @alias("router.currentRoute.name") currentRouteName;+ get isRestrictedCategory() {+ return (+ this.router?.currentRoute?.attributes?.category?.read_restricted ||+ this.router?.currentRoute?.parent?.attributes?.category?.read_restricted+ );+ }- _impressionId = null;- _clickTracked = false;+ @computed("router.currentRoute.name")+ get currentRouteName() {+ return this.router?.currentRoute?.name;+ }- _handleAdClick = () => {- this.trackClick();- };+ set currentRouteName(value) {+ set(this, "router.currentRoute.name", value);+ }@computed("router.currentRoute.attributes.__type",diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/amazon-product-links.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/amazon-product-links.gjsindex eafc29296a9..9c49b545da1 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/amazon-product-links.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/amazon-product-links.gjs@@ -1,5 +1,4 @@import { computed } from "@ember/object";-import { and } from "@ember/object/computed";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import { i18n } from "discourse-i18n";@@ -7,9 +6,6 @@ import AdComponent from "./ad-component";@tagName("")export default class AmazonProductLinks extends AdComponent {- @and("showAmazonAds", "showToGroups", "showAfterPost", "showOnCurrentPage")- showAd;-init() {const data = {"topic-list-top": {},@@ -145,6 +141,21 @@ export default class AmazonProductLinks extends AdComponent {super.init();}+ @computed(+ "showAmazonAds",+ "showToGroups",+ "showAfterPost",+ "showOnCurrentPage"+ )+ get showAd() {+ return (+ this.showAmazonAds &&+ this.showToGroups &&+ this.showAfterPost &&+ this.showOnCurrentPage+ );+ }+@computed("amazon_width", "amazon_height")get adWrapperStyle() {return trustHTML(diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjsindex 8f69adfcdf4..fedd1128c3f 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjs@@ -1,5 +1,4 @@-import { computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import { on } from "@ember-decorators/object";@@ -250,9 +249,23 @@ export default class GoogleDfpAd extends AdComponent {loadedGoogletag = false;lastAdRefresh = null;- @alias("size.width") width;+ @computed("size.width")+ get width() {+ return this.size?.width;+ }++ set width(value) {+ set(this, "size.width", value);+ }- @alias("size.height") height;+ @computed("size.height")+ get height() {+ return this.size?.height;+ }++ set height(value) {+ set(this, "size.height", value);+ }@computedget size() {diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list.js b/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list.jsindex e41e7e3e1c9..91f6acdb862 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list.js+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list.js@@ -1,6 +1,8 @@+import { tracked } from "@glimmer/tracking";import { set } from "@ember/object";-import { sort } from "@ember/object/computed";+import { dependentKeyCompat } from "@ember/object/compat";import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";+import { arraySortedByProperties } from "discourse/lib/array-tools";import { i18n } from "discourse-i18n";import UserMenuAssignsListEmptyState from "./assigns-list-empty-state";@@ -58,15 +60,20 @@ export default class UserMenuAssignNotificationsList extends UserMenuNotificatio}class SortedItems {+ @tracked items;+ @trackeditemsSorting = ["notification.read","notification.data.message:desc","notification.created_at:desc",];- @sort("items", "itemsSorting") sortedItems;-constructor(items) {set(this, "items", items);}++ @dependentKeyCompat+ get sortedItems() {+ return arraySortedByProperties(this.items, this.itemsSorting);+ }}diff --git a/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.js b/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.jsindex b367f5620c9..1dd5f722636 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.js+++ b/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.js@@ -1,6 +1,5 @@import { inject as controller } from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { service } from "@ember/service";import UserTopicsList from "discourse/controllers/user-topics-list";import BulkSelectHelper from "discourse/lib/bulk-select-helper";@@ -22,7 +21,14 @@ export default class GroupAssignedShow extends UserTopicsList {selected = [];- @alias("currentUser.staff") canBulkSelect;+ @computed("currentUser.staff")+ get canBulkSelect() {+ return this.currentUser?.staff;+ }++ set canBulkSelect(value) {+ set(this, "currentUser.staff", value);+ }@computed("search", "model.topics.length")get hasAssignments() {diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/controllers/cakeday.js b/plugins/discourse-cakeday/assets/javascripts/discourse/controllers/cakeday.jsindex 0369561b70c..59f8355b884 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/controllers/cakeday.js+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/controllers/cakeday.js@@ -1,7 +1,22 @@import Controller from "@ember/controller";-import { alias } from "@ember/object/computed";+import { computed, set } from "@ember/object";export default class CakedayController extends Controller {- @alias("siteSettings.cakeday_enabled") cakedayEnabled;- @alias("siteSettings.cakeday_birthday_enabled") birthdayEnabled;+ @computed("siteSettings.cakeday_enabled")+ get cakedayEnabled() {+ return this.siteSettings?.cakeday_enabled;+ }++ set cakedayEnabled(value) {+ set(this, "siteSettings.cakeday_enabled", value);+ }++ @computed("siteSettings.cakeday_birthday_enabled")+ get birthdayEnabled() {+ return this.siteSettings?.cakeday_birthday_enabled;+ }++ set birthdayEnabled(value) {+ set(this, "siteSettings.cakeday_birthday_enabled", value);+ }}diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjs b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjsindex 596b19236b8..6a866c700bf 100644--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjs+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjs@@ -3,9 +3,9 @@ import Component from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import EmberObject, { action, computed } from "@ember/object";-import { notEmpty } from "@ember/object/computed";import { schedule } from "@ember/runloop";import { trustHTML } from "@ember/template";+import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";import CalendarDateTimeInput from "discourse/components/calendar-date-time-input";@@ -13,10 +13,10 @@ import DButton from "discourse/components/d-button";import DModal from "discourse/components/d-modal";import TextField from "discourse/components/text-field";import icon from "discourse/helpers/d-icon";-import { propertyNotEqual } from "discourse/lib/computed";import { debounce } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";import { applyLocalDates } from "discourse/lib/local-dates";+import { deepEqual } from "discourse/lib/object";import { cook } from "discourse/lib/text";import ComboBox from "discourse/select-kit/components/combo-box";import MultiSelect from "discourse/select-kit/components/multi-select";@@ -41,11 +41,6 @@ export default class LocalDatesCreate extends Component {fromSelected = null;toSelected = null;- @notEmpty("date") fromFilled;- @notEmpty("toDate") toFilled;- @propertyNotEqual("currentUserTimezone", "options.timezone")- timezoneIsDifferentFromUserTimezone;-init() {super.init(...arguments);@@ -61,6 +56,21 @@ export default class LocalDatesCreate extends Component {});}+ @computed("date")+ get fromFilled() {+ return !isEmpty(this.date);+ }++ @computed("toDate")+ get toFilled() {+ return !isEmpty(this.toDate);+ }++ @computed("currentUserTimezone", "options.timezone")+ get timezoneIsDifferentFromUserTimezone() {+ return !deepEqual(this.currentUserTimezone, this.options?.timezone);+ }+didInsertElement() {super.didInsertElement(...arguments);this.send("focusFrom");diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjsindex 0f68bc9c904..53582042082 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjs@@ -2,7 +2,6 @@import Component from "@ember/component";import { concat } from "@ember/helper";import { action, computed } from "@ember/object";-import { equal } from "@ember/object/computed";import { LinkTo } from "@ember/routing";import { later } from "@ember/runloop";import { service } from "@ember/service";@@ -14,7 +13,6 @@ import DButton from "discourse/components/d-button";import avatar from "discourse/helpers/avatar";import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";-import { setting } from "discourse/lib/computed";import { i18n } from "discourse-i18n";import formatCurrency from "../helpers/format-currency";@@ -27,36 +25,6 @@ export default class CampaignBanner extends Component {dismissed = false;loading = false;- @setting("discourse_subscriptions_campaign_banner_shadow_color")- dropShadowColor;-- @setting("discourse_subscriptions_campaign_banner_bg_image")- backgroundImageUrl;-- @equal(- "siteSettings.discourse_subscriptions_campaign_banner_location",- "Sidebar"- )- isSidebar;-- @setting("discourse_subscriptions_campaign_subscribers") subscribers;-- @equal("siteSettings.discourse_subscriptions_campaign_type", "Subscribers")- subscriberGoal;-- @setting("discourse_subscriptions_currency") currency;-- @setting("discourse_subscriptions_campaign_amount_raised") amountRaised;-- @setting("discourse_subscriptions_campaign_goal") goalTarget;-- @setting("discourse_subscriptions_campaign_product") product;-- @setting("discourse_subscriptions_pricing_table_enabled") pricingTableEnabled;-- @setting("discourse_subscriptions_campaign_show_contributors")- showContributors;-init() {super.init(...arguments);@@ -92,6 +60,67 @@ export default class CampaignBanner extends Component {}}+ @computed("siteSettings.discourse_subscriptions_campaign_banner_shadow_color")+ get dropShadowColor() {+ return this.siteSettings+ .discourse_subscriptions_campaign_banner_shadow_color;+ }++ @computed("siteSettings.discourse_subscriptions_campaign_banner_bg_image")+ get backgroundImageUrl() {+ return this.siteSettings.discourse_subscriptions_campaign_banner_bg_image;+ }++ @computed("siteSettings.discourse_subscriptions_campaign_banner_location")+ get isSidebar() {+ return (+ this.siteSettings?.discourse_subscriptions_campaign_banner_location ===+ "Sidebar"+ );+ }++ @computed("siteSettings.discourse_subscriptions_campaign_subscribers")+ get subscribers() {+ return this.siteSettings.discourse_subscriptions_campaign_subscribers;+ }++ @computed("siteSettings.discourse_subscriptions_campaign_type")+ get subscriberGoal() {+ return (+ this.siteSettings?.discourse_subscriptions_campaign_type === "Subscribers"+ );+ }++ @computed("siteSettings.discourse_subscriptions_currency")+ get currency() {+ return this.siteSettings.discourse_subscriptions_currency;+ }++ @computed("siteSettings.discourse_subscriptions_campaign_amount_raised")+ get amountRaised() {+ return this.siteSettings.discourse_subscriptions_campaign_amount_raised;+ }++ @computed("siteSettings.discourse_subscriptions_campaign_goal")+ get goalTarget() {+ return this.siteSettings.discourse_subscriptions_campaign_goal;+ }++ @computed("siteSettings.discourse_subscriptions_campaign_product")+ get product() {+ return this.siteSettings.discourse_subscriptions_campaign_product;+ }++ @computed("siteSettings.discourse_subscriptions_pricing_table_enabled")+ get pricingTableEnabled() {+ return this.siteSettings.discourse_subscriptions_pricing_table_enabled;+ }++ @computed("siteSettings.discourse_subscriptions_campaign_show_contributors")+ get showContributors() {+ return this.siteSettings.discourse_subscriptions_campaign_show_contributors;+ }+didInsertElement() {super.didInsertElement(...arguments);if (this.isSidebar && this.shouldShow && this.site.desktopView) {diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show/plans/show.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show/plans/show.jsindex 6e4cd519dd2..4779976a6a0 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show/plans/show.js+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/admin-plugins/discourse-subscriptions/products/show/plans/show.js@@ -1,6 +1,5 @@import Controller from "@ember/controller";-import { action, computed } from "@ember/object";-import { alias } from "@ember/object/computed";+import { action, computed, set } from "@ember/object";import { popupAjaxError } from "discourse/lib/ajax-error";import DiscourseURL from "discourse/lib/url";@@ -9,8 +8,24 @@ const ONE_TIME = "one_time";export default class AdminPluginsDiscourseSubscriptionsProductsShowPlansShowController extends Controller {// Also defined in settings.- @alias("model.plan.currency") selectedCurrency;- @alias("model.plan.interval") selectedInterval;++ @computed("model.plan.currency")+ get selectedCurrency() {+ return this.model?.plan?.currency;+ }++ set selectedCurrency(value) {+ set(this, "model.plan.currency", value);+ }++ @computed("model.plan.interval")+ get selectedInterval() {+ return this.model?.plan?.interval;+ }++ set selectedInterval(value) {+ set(this, "model.plan.interval", value);+ }@computed("model.plan.metadata.group_name")get selectedGroup() {diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/subscribe/show.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/subscribe/show.jsindex 985a014c934..74527f19083 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/subscribe/show.js+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/controllers/subscribe/show.js@@ -1,7 +1,6 @@/* global Stripe */import Controller from "@ember/controller";import { action, computed } from "@ember/object";-import { not } from "@ember/object/computed";import { service } from "@ember/service";import { i18n } from "discourse-i18n";import Subscription from "discourse/plugins/discourse-subscriptions/discourse/models/subscription";@@ -22,8 +21,6 @@ export default class SubscribeShowController extends Controller {postalCode: null,};- @not("currentUser") isAnonymous;-isCountryUS = false;isCountryCA = false;@@ -41,6 +38,11 @@ export default class SubscribeShowController extends Controller {this.set("isCountryCA", this.cardholderAddress.country === "CA");}+ @computed("currentUser")+ get isAnonymous() {+ return !this.currentUser;+ }+alert(path) {this.dialog.alert(i18n(`discourse_subscriptions.${path}`));}diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.gjsindex b11083167a9..1a18516a6cc 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.gjs@@ -1,7 +1,6 @@/* eslint-disable ember/no-classic-components, ember/require-tagless-components */import Component from "@ember/component";import { computed } from "@ember/object";-import { mapBy } from "@ember/object/computed";import { next } from "@ember/runloop";import { trustHTML } from "@ember/template";import { classNames } from "@ember-decorators/component";@@ -21,8 +20,6 @@ export default class PollBreakdownChart extends Component {highlightedOption = null;setHighlightedOption = null;- @mapBy("options", "votes") data;-_optionToSlice = null;_previousHighlightedSliceIndex = null;_previousDisplayMode = null;@@ -40,6 +37,11 @@ export default class PollBreakdownChart extends Component {}}+ @computed("[email protected]")+ get data() {+ return this.options?.map?.((item) => item.votes) ?? [];+ }+async didInsertElement() {super.didInsertElement(...arguments);diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.gjsindex e14e7643ddb..be60cb2a043 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.gjs@@ -2,11 +2,10 @@import Component from "@ember/component";import { on } from "@ember/modifier";import { computed } from "@ember/object";-import { equal } from "@ember/object/computed";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import { propertyEqual } from "discourse/lib/computed";import loadChartJS from "discourse/lib/load-chart-js";+import { deepEqual } from "discourse/lib/object";import I18n, { i18n } from "discourse-i18n";import { getColors } from "discourse/plugins/poll/lib/chart-colors";import decoratePollOption from "../modifiers/decorate-poll-option";@@ -23,10 +22,6 @@ export default class PollBreakdownOption extends Component {onMouseOver = null;onMouseOut = null;- @propertyEqual("highlightedOption", "index") highlighted;-- @equal("displayMode", "percentage") showPercentage;-constructor() {super(...arguments);loadChartJS().then((Chart) => {@@ -34,6 +29,16 @@ export default class PollBreakdownOption extends Component {});}+ @computed("highlightedOption", "index")+ get highlighted() {+ return deepEqual(this.highlightedOption, this.index);+ }++ @computed("displayMode")+ get showPercentage() {+ return this.displayMode === "percentage";+ }+@computed("option.votes", "totalVotes")get percent() {return I18n.toNumber((this.option?.votes / this.totalVotes) * 100.0, {diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex bb3584d2f51..d761736aa22 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -35,8 +35,8 @@ importers:specifier: ^7.29.0version: 7.29.0(@babel/[email protected])'@discourse/lint-configs':- specifier: ^2.44.0+ specifier: ^2.45.0+ version: 2.45.0([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]([email protected]))'@discourse/moment-timezone-names-translations':specifier: ^1.0.0version: 1.0.0@@ -1775,6 +1775,14 @@ packages:peerDependencies:prettier: 3.8.1+ '@discourse/[email protected]':+ resolution: {integrity: sha512-VhzVNv13Qw1D9SW7vdFxlTMHbdb93yDsqtcVKcQw5VQM/yuto+qAcAMd3oaLOBR2MjzKOXPMtuhfCAwO1QO4ZQ==}+ peerDependencies:+ ember-template-lint: 7.9.3+ eslint: 9.39.2+ prettier: 3.8.1+ stylelint: 17.5.0+'@discourse/[email protected]':resolution: {integrity: sha512-4xr1QWQ0nzmFa2ZXQgWZA+dtE/BU2ePA+qkJWPFzNpq4ZnQi8MmMMAS2285t3rc2ySMBQqYaAArmcSUiufUgRA==}@@ -10609,6 +10617,36 @@ snapshots:- postcss- supports-color+ '@discourse/[email protected]([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]([email protected]))':+ dependencies:+ '@babel/core': 7.29.0([email protected])+ '@babel/plugin-proposal-decorators': 7.29.0(@babel/[email protected])+ '@eslint/js': 9.39.4+ ember-eslint-parser: 0.5.13(@babel/[email protected])([email protected]([email protected]))([email protected])+ ember-template-lint: 7.9.3+ eslint: 9.39.2([email protected])+ eslint-plugin-decorator-position: 6.0.0(@babel/[email protected](@babel/[email protected])([email protected]([email protected])))([email protected]([email protected]))+ eslint-plugin-ember: 12.7.5(@babel/[email protected])([email protected]([email protected]))([email protected])+ eslint-plugin-import: 2.32.0([email protected]([email protected]))+ eslint-plugin-qunit: 8.2.6([email protected]([email protected]))+ eslint-plugin-simple-import-sort: 12.1.1([email protected]([email protected]))+ eslint-plugin-sort-class-members: 1.21.0([email protected]([email protected]))+ globals: 17.4.0+ prettier: 3.8.1+ prettier-plugin-ember-template-tag: 2.1.3([email protected])+ stylelint: 17.4.0([email protected])+ stylelint-config-standard: 40.0.0([email protected]([email protected]))+ stylelint-scss: 7.0.0([email protected]([email protected]))+ typescript: 5.9.3+ transitivePeerDependencies:+ - '@typescript-eslint/parser'+ - eslint-import-resolver-typescript+ - eslint-import-resolver-webpack+ - postcss+ - supports-color+'@discourse/[email protected]': {}'@discourse/[email protected]': {}