diff --git a/app/assets/javascripts/admin/addon/components/ace-editor.js b/app/assets/javascripts/admin/addon/components/ace-editor.js index 84aa4351e15..7f36fd7e3c9 100644 --- a/app/assets/javascripts/admin/addon/components/ace-editor.js +++ b/app/assets/javascripts/admin/addon/components/ace-editor.js @@ -1,11 +1,11 @@ +import Component from "@ember/component"; import { action } from "@ember/object"; import { classNames } from "@ember-decorators/component"; import { observes, on } from "@ember-decorators/object"; -import Component from "@ember/component"; -import getURL from "discourse-common/lib/get-url"; import loadScript from "discourse/lib/load-script"; -import I18n from "I18n"; +import getURL from "discourse-common/lib/get-url"; import { bind } from "discourse-common/utils/decorators"; +import I18n from "I18n"; const COLOR_VARS_REGEX = /\$(primary|secondary|tertiary|quaternary|header_background|header_primary|highlight|danger|success|love)(\s|;|-(low|medium|high))/g; diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js index e1c12d04a32..ef6771a2751 100644 --- a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js @@ -1,9 +1,9 @@ +import Component from "@ember/component"; +import { scheduleOnce } from "@ember/runloop"; import { classNames } from "@ember-decorators/component"; import { observes, on } from "@ember-decorators/object"; -import Component from "@ember/component"; -import I18n from "I18n"; import discourseDebounce from "discourse-common/lib/debounce"; -import { scheduleOnce } from "@ember/runloop"; +import I18n from "I18n"; @classNames("admin-backups-logs") export default class AdminBackupsLogs extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.js b/app/assets/javascripts/admin/addon/components/admin-editable-field.js index a99265b20cb..bc848ddc50d 100644 --- a/app/assets/javascripts/admin/addon/components/admin-editable-field.js +++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.js @@ -1,6 +1,6 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class AdminEditableField extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-form-row.js b/app/assets/javascripts/admin/addon/components/admin-form-row.js index 266301263d4..dcebfe7f9f9 100644 --- a/app/assets/javascripts/admin/addon/components/admin-form-row.js +++ b/app/assets/javascripts/admin/addon/components/admin-form-row.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("row") export default class AdminFormRow extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-graph.js b/app/assets/javascripts/admin/addon/components/admin-graph.js index 4ef05fca32e..29852f1c09c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-graph.js +++ b/app/assets/javascripts/admin/addon/components/admin-graph.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; import loadScript from "discourse/lib/load-script"; @tagName("canvas") diff --git a/app/assets/javascripts/admin/addon/components/admin-nav.gjs b/app/assets/javascripts/admin/addon/components/admin-nav.gjs index be3aa02cb4a..fd08dd5ad5c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-nav.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-nav.gjs @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class AdminNav extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js index 0931ac8e4a4..35206b8cc69 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; @classNames("penalty-history") diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js index 08314925460..f27d1d55614 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js @@ -1,6 +1,6 @@ +import Component from "@ember/component"; import { action } from "@ember/object"; import { equal } from "@ember/object/computed"; -import Component from "@ember/component"; import discourseComputed, { afterRender, } from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js index e8d037d249b..726dcbec8db 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js @@ -1,7 +1,7 @@ -import { tagName } from "@ember-decorators/component"; -import { equal } from "@ember/object/computed"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { equal } from "@ember/object/computed"; +import { tagName } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; import I18n from "I18n"; diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js index 52996d458f3..4531b83d9d8 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js @@ -1,6 +1,6 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { tagName } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; @tagName("") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-chart.js index 64f09aa0d7d..4f3184cbeb2 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-chart.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-chart.js @@ -1,12 +1,12 @@ -import { classNames } from "@ember-decorators/component"; -import Report from "admin/models/report"; import Component from "@ember/component"; -import discourseDebounce from "discourse-common/lib/debounce"; -import loadScript from "discourse/lib/load-script"; -import { makeArray } from "discourse-common/lib/helpers"; -import { number } from "discourse/lib/formatter"; import { schedule } from "@ember/runloop"; +import { classNames } from "@ember-decorators/component"; +import { number } from "discourse/lib/formatter"; +import loadScript from "discourse/lib/load-script"; +import discourseDebounce from "discourse-common/lib/debounce"; +import { makeArray } from "discourse-common/lib/helpers"; import { bind } from "discourse-common/utils/decorators"; +import Report from "admin/models/report"; @classNames("admin-report-chart") export default class AdminReportChart extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-report-counters.js b/app/assets/javascripts/admin/addon/components/admin-report-counters.js index 6e3dab52366..29d42a40204 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-counters.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-counters.js @@ -1,5 +1,5 @@ -import { attributeBindings, classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { attributeBindings, classNames } from "@ember-decorators/component"; @classNames("admin-report-counters") @attributeBindings("model.description:title") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-counts.js index fd1b6cc68d6..e6ef645aa0e 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-counts.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-counts.js @@ -1,6 +1,6 @@ -import { classNameBindings, tagName } from "@ember-decorators/component"; -import { match } from "@ember/object/computed"; import Component from "@ember/component"; +import { match } from "@ember/object/computed"; +import { classNameBindings, tagName } from "@ember-decorators/component"; @tagName("tr") @classNameBindings("reverseColors") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js index 3e770da6467..c1919679b97 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("admin-report-inline-table") export default class AdminReportInlineTable extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js index ee48a5138f2..b5d5984f988 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("tr") export default class AdminReportPerDayCounts extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js index b69e75141e8..e34901eefc9 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js @@ -1,12 +1,12 @@ -import { classNames } from "@ember-decorators/component"; -import Report from "admin/models/report"; import Component from "@ember/component"; -import discourseDebounce from "discourse-common/lib/debounce"; -import loadScript from "discourse/lib/load-script"; -import { makeArray } from "discourse-common/lib/helpers"; -import { number } from "discourse/lib/formatter"; import { schedule } from "@ember/runloop"; +import { classNames } from "@ember-decorators/component"; +import { number } from "discourse/lib/formatter"; +import loadScript from "discourse/lib/load-script"; +import discourseDebounce from "discourse-common/lib/debounce"; +import { makeArray } from "discourse-common/lib/helpers"; import { bind } from "discourse-common/utils/decorators"; +import Report from "admin/models/report"; @classNames("admin-report-chart", "admin-report-stacked-chart") export default class AdminReportStackedChart extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js index ee0d7d24764..56a726cb7e6 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js @@ -1,9 +1,9 @@ -import { classNames } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; +import { alias } from "@ember/object/computed"; +import { classNames } from "@ember-decorators/component"; import { setting } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; @classNames("admin-report-storage-stats") export default class AdminReportStorageStats extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js index 89997c9afab..9bd4750376b 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js @@ -1,11 +1,11 @@ +import Component from "@ember/component"; +import { alias } from "@ember/object/computed"; import { attributeBindings, classNameBindings, classNames, tagName, } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; -import Component from "@ember/component"; import discourseComputed from "discourse-common/utils/decorators"; @tagName("td") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js index 7de3ac97088..e27ad5a1f03 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js @@ -1,10 +1,10 @@ +import Component from "@ember/component"; import { attributeBindings, classNameBindings, classNames, tagName, } from "@ember-decorators/component"; -import Component from "@ember/component"; import discourseComputed from "discourse-common/utils/decorators"; @tagName("th") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-row.js b/app/assets/javascripts/admin/addon/components/admin-report-table-row.js index e5e275aa7ad..53b56a1b1c6 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-row.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-row.js @@ -1,5 +1,5 @@ -import { classNames, tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames, tagName } from "@ember-decorators/component"; @tagName("tr") @classNames("admin-report-table-row") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table.js b/app/assets/javascripts/admin/addon/components/admin-report-table.js index 3638625f872..494636a335e 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; -import { classNameBindings, classNames } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; +import { alias } from "@ember/object/computed"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { makeArray } from "discourse-common/lib/helpers"; +import discourseComputed from "discourse-common/utils/decorators"; const PAGES_LIMIT = 8; diff --git a/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js index 6da6a748934..0c41a0f6167 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("tr") export default class AdminReportTrustLevelCounts extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-report.js b/app/assets/javascripts/admin/addon/components/admin-report.js index fede9cc2d60..74fff51553e 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report.js +++ b/app/assets/javascripts/admin/addon/components/admin-report.js @@ -1,17 +1,17 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; -import { alias, and, equal, notEmpty, or } from "@ember/object/computed"; -import EmberObject, { action, computed } from "@ember/object"; -import Report, { DAILY_LIMIT_DAYS, SCHEMA_VERSION } from "admin/models/report"; import Component from "@ember/component"; -import I18n from "I18n"; -import ReportLoader from "discourse/lib/reports-loader"; -import discourseComputed from "discourse-common/utils/decorators"; -import { exportEntity } from "discourse/lib/export-csv"; +import EmberObject, { action, computed } from "@ember/object"; +import { alias, and, equal, notEmpty, or } from "@ember/object/computed"; +import { next } from "@ember/runloop"; import { isPresent } from "@ember/utils"; +import { classNameBindings, classNames } from "@ember-decorators/component"; +import { exportEntity } from "discourse/lib/export-csv"; +import { outputExportResult } from "discourse/lib/export-result"; +import ReportLoader from "discourse/lib/reports-loader"; import { isTesting } from "discourse-common/config/environment"; import { makeArray } from "discourse-common/lib/helpers"; -import { next } from "@ember/runloop"; -import { outputExportResult } from "discourse/lib/export-result"; +import discourseComputed from "discourse-common/utils/decorators"; +import Report, { DAILY_LIMIT_DAYS, SCHEMA_VERSION } from "admin/models/report"; +import I18n from "I18n"; const TABLE_OPTIONS = { perPage: 8, diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js index 31a0d02ec91..7489a0dbf1a 100644 --- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js +++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js @@ -1,10 +1,10 @@ import Component from "@ember/component"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { fmt } from "discourse/lib/computed"; -import { isDocumentRTL } from "discourse/lib/text-direction"; import { action, computed } from "@ember/object"; import { next } from "@ember/runloop"; +import { fmt } from "discourse/lib/computed"; +import { isDocumentRTL } from "discourse/lib/text-direction"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminThemeEditor extends Component { warning = null; diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js index faf374788c5..08b0b869a82 100644 --- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js +++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js @@ -1,13 +1,13 @@ -import discourseComputed from "discourse-common/utils/decorators"; -import { i18n, propertyEqual } from "discourse/lib/computed"; import Component from "@ember/component"; -import I18n from "I18n"; -import UserField from "admin/models/user-field"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; +import { action } from "@ember/object"; +import { schedule } from "@ember/runloop"; import { isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { schedule } from "@ember/runloop"; -import { action } from "@ember/object"; +import { i18n, propertyEqual } from "discourse/lib/computed"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import discourseComputed from "discourse-common/utils/decorators"; +import UserField from "admin/models/user-field"; +import I18n from "I18n"; export default Component.extend(bufferedProperty("userField"), { tagName: "", diff --git a/app/assets/javascripts/admin/addon/components/admin-watched-word.js b/app/assets/javascripts/admin/addon/components/admin-watched-word.js index d6bde8016d2..25775acac01 100644 --- a/app/assets/javascripts/admin/addon/components/admin-watched-word.js +++ b/app/assets/javascripts/admin/addon/components/admin-watched-word.js @@ -1,9 +1,9 @@ -import { classNames } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { alias, equal } from "@ember/object/computed"; import Component from "@ember/component"; -import discourseComputed from "discourse-common/utils/decorators"; import { action } from "@ember/object"; +import { alias, equal } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; +import { classNames } from "@ember-decorators/component"; +import discourseComputed from "discourse-common/utils/decorators"; import I18n from "I18n"; @classNames("watched-word") diff --git a/app/assets/javascripts/admin/addon/components/cancel-link.js b/app/assets/javascripts/admin/addon/components/cancel-link.js index aa5d4dda65c..c023fb8cf97 100644 --- a/app/assets/javascripts/admin/addon/components/cancel-link.js +++ b/app/assets/javascripts/admin/addon/components/cancel-link.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class CancelLink extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js index 9c1c67f0442..bb225341380 100644 --- a/app/assets/javascripts/admin/addon/components/color-input.js +++ b/app/assets/javascripts/admin/addon/components/color-input.js @@ -1,6 +1,6 @@ -import { classNames } from "@ember-decorators/component"; -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; +import { classNames } from "@ember-decorators/component"; import { observes } from "@ember-decorators/object"; /** diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js index 46b7559585b..141833627fb 100644 --- a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js +++ b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js @@ -1,6 +1,6 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; import Component from "@ember/component"; import { action, computed } from "@ember/object"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { ajax } from "discourse/lib/ajax"; @classNames("section", "dashboard-new-features") diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.js b/app/assets/javascripts/admin/addon/components/email-styles-editor.js index 2e1fc059be1..b6d2347c562 100644 --- a/app/assets/javascripts/admin/addon/components/email-styles-editor.js +++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.js @@ -1,9 +1,9 @@ -import { action, computed } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { reads } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; +import { action, computed } from "@ember/object"; +import { reads } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class EmailStylesEditor extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js index 2375aa81412..759009c69ac 100644 --- a/app/assets/javascripts/admin/addon/components/embeddable-host.js +++ b/app/assets/javascripts/admin/addon/components/embeddable-host.js @@ -1,14 +1,14 @@ -import { action } from "@ember/object"; -import { tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { or } from "@ember/object/computed"; -import Category from "discourse/models/category"; import Component from "@ember/component"; -import I18n from "I18n"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; +import { or } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { isEmpty } from "@ember/utils"; +import { tagName } from "@ember-decorators/component"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import Category from "discourse/models/category"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; @tagName("tr") export default class EmbeddableHost extends Component.extend( diff --git a/app/assets/javascripts/admin/addon/components/embedding-setting.js b/app/assets/javascripts/admin/addon/components/embedding-setting.js index 85c26e7ea6d..e99b85a0336 100644 --- a/app/assets/javascripts/admin/addon/components/embedding-setting.js +++ b/app/assets/javascripts/admin/addon/components/embedding-setting.js @@ -1,8 +1,8 @@ -import { classNames } from "@ember-decorators/component"; -import { computed } from "@ember/object"; import Component from "@ember/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import { computed } from "@ember/object"; import { dasherize } from "@ember/string"; +import { classNames } from "@ember-decorators/component"; +import discourseComputed from "discourse-common/utils/decorators"; @classNames("embed-setting") export default class EmbeddingSetting extends Component { diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.js b/app/assets/javascripts/admin/addon/components/emoji-value-list.js index 40363b874d8..fc6e78d9039 100644 --- a/app/assets/javascripts/admin/addon/components/emoji-value-list.js +++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.js @@ -1,11 +1,11 @@ -import { classNameBindings } from "@ember-decorators/component"; import Component from "@ember/component"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { emojiUrlFor } from "discourse/lib/text"; import { action, set, setProperties } from "@ember/object"; import { schedule } from "@ember/runloop"; +import { classNameBindings } from "@ember-decorators/component"; +import { emojiUrlFor } from "discourse/lib/text"; import discourseLater from "discourse-common/lib/later"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; @classNameBindings(":value-list", ":emoji-list") export default class EmojiValueList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/flag-user-lists.js b/app/assets/javascripts/admin/addon/components/flag-user-lists.js index 0096ce0a575..e44dc9831a0 100644 --- a/app/assets/javascripts/admin/addon/components/flag-user-lists.js +++ b/app/assets/javascripts/admin/addon/components/flag-user-lists.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("flag-user-lists") export default class FlagUserLists extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.js b/app/assets/javascripts/admin/addon/components/form-template/form.js index 242568826d0..ddfd5d27b42 100644 --- a/app/assets/javascripts/admin/addon/components/form-template/form.js +++ b/app/assets/javascripts/admin/addon/components/form-template/form.js @@ -1,12 +1,12 @@ import Component from "@glimmer/component"; +import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import { tracked } from "@glimmer/tracking"; -import I18n from "I18n"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import FormTemplateValidationOptionsModal from "admin/components/modal/form-template-validation-options"; import { templateFormFields } from "admin/lib/template-form-fields"; import FormTemplate from "admin/models/form-template"; -import FormTemplateValidationOptionsModal from "admin/components/modal/form-template-validation-options"; +import I18n from "I18n"; export default class FormTemplateForm extends Component { @service router; diff --git a/app/assets/javascripts/admin/addon/components/highlighted-code.js b/app/assets/javascripts/admin/addon/components/highlighted-code.js index 782754682f3..65208dc6eff 100644 --- a/app/assets/javascripts/admin/addon/components/highlighted-code.js +++ b/app/assets/javascripts/admin/addon/components/highlighted-code.js @@ -1,5 +1,5 @@ -import { observes, on } from "@ember-decorators/object"; import Component from "@ember/component"; +import { observes, on } from "@ember-decorators/object"; import highlightSyntax from "discourse/lib/highlight-syntax"; export default class HighlightedCode extends Component { diff --git a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js index 8618e4044b4..d7ba4bc40c0 100644 --- a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js +++ b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js @@ -1,6 +1,6 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { classNames } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; @classNames("inline-edit") diff --git a/app/assets/javascripts/admin/addon/components/install-theme-item.js b/app/assets/javascripts/admin/addon/components/install-theme-item.js index 459dc5dc673..d755c575060 100644 --- a/app/assets/javascripts/admin/addon/components/install-theme-item.js +++ b/app/assets/javascripts/admin/addon/components/install-theme-item.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("install-theme-item") export default class InstallThemeItem extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js index 42c5f128116..a95d6efeb60 100644 --- a/app/assets/javascripts/admin/addon/components/ip-lookup.js +++ b/app/assets/javascripts/admin/addon/components/ip-lookup.js @@ -1,14 +1,14 @@ -import { classNames } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import AdminUser from "admin/models/admin-user"; import Component from "@ember/component"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; +import { inject as service } from "@ember/service"; +import { classNames } from "@ember-decorators/component"; import { ajax } from "discourse/lib/ajax"; -import copyText from "discourse/lib/copy-text"; -import discourseComputed from "discourse-common/utils/decorators"; -import discourseLater from "discourse-common/lib/later"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import copyText from "discourse/lib/copy-text"; +import discourseLater from "discourse-common/lib/later"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdminUser from "admin/models/admin-user"; +import I18n from "I18n"; @classNames("ip-lookup") export default class IpLookup extends Component { diff --git a/app/assets/javascripts/admin/addon/components/modal/badge-preview.js b/app/assets/javascripts/admin/addon/components/modal/badge-preview.js index 399eee7d97e..136f85b0248 100644 --- a/app/assets/javascripts/admin/addon/components/modal/badge-preview.js +++ b/app/assets/javascripts/admin/addon/components/modal/badge-preview.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import I18n from "I18n"; import { escapeExpression } from "discourse/lib/utilities"; +import I18n from "I18n"; export default class BadgePreview extends Component { get processedSample() { diff --git a/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js b/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js index 491ee03dd7d..310bbb3a637 100644 --- a/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js +++ b/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; export default class ColorSchemeSelectBase extends Component { @tracked diff --git a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js index 42692d197f3..ba182675902 100644 --- a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js +++ b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; export default class CustomDateRange extends Component { @tracked startDate = this.args.model.startDate; diff --git a/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js b/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js index f4b9448b40d..6738dc68450 100644 --- a/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js +++ b/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; -import AdminUser from "admin/models/admin-user"; +import { action } from "@ember/object"; import { extractError } from "discourse/lib/ajax-error"; +import AdminUser from "admin/models/admin-user"; import I18n from "I18n"; export default class DeleteUserPostsProgress extends Component { diff --git a/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js b/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js index de40d2b6cec..0201af67cad 100644 --- a/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js +++ b/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js @@ -1,11 +1,11 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { inject as service } from "@ember/service"; -import { action } from "@ember/object"; -import I18n from "I18n"; import { A } from "@ember/array"; -import { ajax } from "discourse/lib/ajax"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { TrackedArray } from "@ember-compat/tracked-built-ins"; +import { ajax } from "discourse/lib/ajax"; +import I18n from "I18n"; export default class EditBadgeGroupings extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/modal/install-theme.js b/app/assets/javascripts/admin/addon/components/modal/install-theme.js index 14cfb4c9d7b..9b67bc0954a 100644 --- a/app/assets/javascripts/admin/addon/components/modal/install-theme.js +++ b/app/assets/javascripts/admin/addon/components/modal/install-theme.js @@ -1,12 +1,12 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { COMPONENTS, THEMES } from "admin/models/theme"; -import { POPULAR_THEMES } from "discourse-common/lib/popular-themes"; -import { ajax } from "discourse/lib/ajax"; -import I18n from "I18n"; import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { POPULAR_THEMES } from "discourse-common/lib/popular-themes"; +import { COMPONENTS, THEMES } from "admin/models/theme"; +import I18n from "I18n"; const MIN_NAME_LENGTH = 4; diff --git a/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js b/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js index ea174d115e2..4bda6e935ec 100644 --- a/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js +++ b/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { inject as service } from "@ember/service"; -import { bind } from "discourse-common/utils/decorators"; import DiscourseURL from "discourse/lib/url"; +import { bind } from "discourse-common/utils/decorators"; import I18n from "I18n"; export default class MergeUsersProgress extends Component { diff --git a/app/assets/javascripts/admin/addon/components/modal/penalize-user.js b/app/assets/javascripts/admin/addon/components/modal/penalize-user.js index 8e8d1dfd1a4..6c7b6acd397 100644 --- a/app/assets/javascripts/admin/addon/components/modal/penalize-user.js +++ b/app/assets/javascripts/admin/addon/components/modal/penalize-user.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { isEmpty } from "@ember/utils"; import { inject as service } from "@ember/service"; +import { isEmpty } from "@ember/utils"; import { extractError } from "discourse/lib/ajax-error"; import I18n from "I18n"; diff --git a/app/assets/javascripts/admin/addon/components/modal/reseed.js b/app/assets/javascripts/admin/addon/components/modal/reseed.js index e2581ba20ca..193987a2362 100644 --- a/app/assets/javascripts/admin/addon/components/modal/reseed.js +++ b/app/assets/javascripts/admin/addon/components/modal/reseed.js @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; +import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; -import { tracked } from "@glimmer/tracking"; +import I18n from "I18n"; export default class Reseed extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/modal/start-backup.js b/app/assets/javascripts/admin/addon/components/modal/start-backup.js index 8dd1bf27a0e..5b1f4ae1c98 100644 --- a/app/assets/javascripts/admin/addon/components/modal/start-backup.js +++ b/app/assets/javascripts/admin/addon/components/modal/start-backup.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; import { inject as service } from "@ember/service"; import I18n from "I18n"; diff --git a/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js b/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js index fadd2905b34..9bdaf064077 100644 --- a/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js +++ b/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; export default class UploadedImageList extends Component { @tracked diff --git a/app/assets/javascripts/admin/addon/components/moderation-history-item.js b/app/assets/javascripts/admin/addon/components/moderation-history-item.js index a94d4e65532..e7aa1d46422 100644 --- a/app/assets/javascripts/admin/addon/components/moderation-history-item.js +++ b/app/assets/javascripts/admin/addon/components/moderation-history-item.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("tr") export default class ModerationHistoryItem extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/permalink-form.js b/app/assets/javascripts/admin/addon/components/permalink-form.js index 129ab0d58e4..2c0f5cbd102 100644 --- a/app/assets/javascripts/admin/addon/components/permalink-form.js +++ b/app/assets/javascripts/admin/addon/components/permalink-form.js @@ -1,12 +1,12 @@ -import { tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; import Component from "@ember/component"; -import I18n from "I18n"; -import Permalink from "admin/models/permalink"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; -import { fmt } from "discourse/lib/computed"; -import { schedule } from "@ember/runloop"; import { action } from "@ember/object"; +import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { tagName } from "@ember-decorators/component"; +import { fmt } from "discourse/lib/computed"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import Permalink from "admin/models/permalink"; +import I18n from "I18n"; @tagName("") export default class PermalinkForm extends Component { diff --git a/app/assets/javascripts/admin/addon/components/report-filters/bool.js b/app/assets/javascripts/admin/addon/components/report-filters/bool.js index d406b1e87e5..602ed3c0766 100644 --- a/app/assets/javascripts/admin/addon/components/report-filters/bool.js +++ b/app/assets/javascripts/admin/addon/components/report-filters/bool.js @@ -1,5 +1,5 @@ -import FilterComponent from "admin/components/report-filters/filter"; import { action } from "@ember/object"; +import FilterComponent from "admin/components/report-filters/filter"; export default class Bool extends FilterComponent { checked = false; diff --git a/app/assets/javascripts/admin/addon/components/report-filters/category.js b/app/assets/javascripts/admin/addon/components/report-filters/category.js index c32e99c50f7..cf381edbb9b 100644 --- a/app/assets/javascripts/admin/addon/components/report-filters/category.js +++ b/app/assets/javascripts/admin/addon/components/report-filters/category.js @@ -1,6 +1,6 @@ +import { action } from "@ember/object"; import { readOnly } from "@ember/object/computed"; import FilterComponent from "admin/components/report-filters/filter"; -import { action } from "@ember/object"; export default class Category extends FilterComponent { @readOnly("filter.default") category; diff --git a/app/assets/javascripts/admin/addon/components/report-filters/group.js b/app/assets/javascripts/admin/addon/components/report-filters/group.js index 8ac7eb3b9a2..720840e3386 100644 --- a/app/assets/javascripts/admin/addon/components/report-filters/group.js +++ b/app/assets/javascripts/admin/addon/components/report-filters/group.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import { computed } from "@ember/object"; +import { classNames } from "@ember-decorators/component"; import FilterComponent from "admin/components/report-filters/filter"; @classNames("group-filter") diff --git a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js index fe7945dee79..ef6c077d2a5 100644 --- a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js +++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js @@ -1,11 +1,11 @@ -import { action } from "@ember/object"; -import { classNames, tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import discourseComputed from "discourse-common/utils/decorators"; import Component from "@ember/component"; -import I18n from "I18n"; -import ScreenedIpAddress from "admin/models/screened-ip-address"; +import { action } from "@ember/object"; import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { classNames, tagName } from "@ember-decorators/component"; +import discourseComputed from "discourse-common/utils/decorators"; +import ScreenedIpAddress from "admin/models/screened-ip-address"; +import I18n from "I18n"; /** A form to create an IP address that will be blocked or allowed. diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.js b/app/assets/javascripts/admin/addon/components/secret-value-list.js index eae2a34d6dc..de1b5bdb080 100644 --- a/app/assets/javascripts/admin/addon/components/secret-value-list.js +++ b/app/assets/javascripts/admin/addon/components/secret-value-list.js @@ -1,9 +1,9 @@ -import { classNameBindings } from "@ember-decorators/component"; import Component from "@ember/component"; -import I18n from "I18n"; -import { isEmpty } from "@ember/utils"; -import { on } from "@ember-decorators/object"; import { action, set } from "@ember/object"; +import { isEmpty } from "@ember/utils"; +import { classNameBindings } from "@ember-decorators/component"; +import { on } from "@ember-decorators/object"; +import I18n from "I18n"; @classNameBindings(":value-list", ":secret-value-list") export default class SecretValueList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/silence-details.js b/app/assets/javascripts/admin/addon/components/silence-details.js index b50edba07ee..c51e6079181 100644 --- a/app/assets/javascripts/admin/addon/components/silence-details.js +++ b/app/assets/javascripts/admin/addon/components/silence-details.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class SilenceDetails extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/simple-list.js b/app/assets/javascripts/admin/addon/components/simple-list.js index e30d06c0725..0d096cac94a 100644 --- a/app/assets/javascripts/admin/addon/components/simple-list.js +++ b/app/assets/javascripts/admin/addon/components/simple-list.js @@ -1,9 +1,9 @@ -import { classNameBindings } from "@ember-decorators/component"; -import { empty } from "@ember/object/computed"; import Component from "@ember/component"; import { action } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import { empty } from "@ember/object/computed"; +import { classNameBindings } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; +import discourseComputed from "discourse-common/utils/decorators"; @classNameBindings(":simple-list", ":value-list") export default class SimpleList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-setting.js b/app/assets/javascripts/admin/addon/components/site-setting.js index f405a425285..33331677de5 100644 --- a/app/assets/javascripts/admin/addon/components/site-setting.js +++ b/app/assets/javascripts/admin/addon/components/site-setting.js @@ -1,6 +1,6 @@ +import Component from "@ember/component"; import { readOnly } from "@ember/object/computed"; import BufferedContent from "discourse/mixins/buffered-content"; -import Component from "@ember/component"; import SettingComponent from "admin/mixins/setting-component"; import SiteSetting from "admin/models/site-setting"; diff --git a/app/assets/javascripts/admin/addon/components/site-settings/bool.js b/app/assets/javascripts/admin/addon/components/site-settings/bool.js index 8837213db27..dc6001d31fb 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/bool.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/bool.js @@ -1,5 +1,5 @@ -import { computed } from "@ember/object"; import Component from "@ember/component"; +import { computed } from "@ember/object"; import { isEmpty } from "@ember/utils"; export default class Bool extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js index 44fdee3a715..65966787210 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js @@ -1,6 +1,6 @@ +import Component from "@ember/component"; import { action, computed } from "@ember/object"; import Category from "discourse/models/category"; -import Component from "@ember/component"; export default class CategoryList extends Component { @computed("value") diff --git a/app/assets/javascripts/admin/addon/components/site-settings/color.js b/app/assets/javascripts/admin/addon/components/site-settings/color.js index a044348c0b2..e9d9fb7cfed 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/color.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/color.js @@ -1,5 +1,5 @@ -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; function RGBToHex(rgb) { // Choose correct separator diff --git a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js index 35d86e32dce..c1823ecd327 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js @@ -1,5 +1,5 @@ -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; import { makeArray } from "discourse-common/lib/helpers"; export default class CompactList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js index e483afc3951..dafef1f6c66 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js @@ -1,5 +1,5 @@ -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; export default class GroupList extends Component { tokenSeparator = "|"; diff --git a/app/assets/javascripts/admin/addon/components/site-text-summary.js b/app/assets/javascripts/admin/addon/components/site-text-summary.js index a8706d5ba55..3509a29bfde 100644 --- a/app/assets/javascripts/admin/addon/components/site-text-summary.js +++ b/app/assets/javascripts/admin/addon/components/site-text-summary.js @@ -1,7 +1,7 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; import Component from "@ember/component"; -import highlightHTML from "discourse/lib/highlight-html"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; +import highlightHTML from "discourse/lib/highlight-html"; @classNames("site-text") @classNameBindings("siteText.overridden") diff --git a/app/assets/javascripts/admin/addon/components/staff-actions.js b/app/assets/javascripts/admin/addon/components/staff-actions.js index 4e4fe55c508..feb9db749ec 100644 --- a/app/assets/javascripts/admin/addon/components/staff-actions.js +++ b/app/assets/javascripts/admin/addon/components/staff-actions.js @@ -1,6 +1,6 @@ -import { tagName } from "@ember-decorators/component"; -import { action } from "@ember/object"; import Component from "@ember/component"; +import { action } from "@ember/object"; +import { tagName } from "@ember-decorators/component"; import DiscourseURL from "discourse/lib/url"; @tagName("") diff --git a/app/assets/javascripts/admin/addon/components/tags-uploader.js b/app/assets/javascripts/admin/addon/components/tags-uploader.js index acc31e3506e..3ffabd91f49 100644 --- a/app/assets/javascripts/admin/addon/components/tags-uploader.js +++ b/app/assets/javascripts/admin/addon/components/tags-uploader.js @@ -1,8 +1,8 @@ -import { inject as service } from "@ember/service"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; +import { alias } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import UppyUploadMixin from "discourse/mixins/uppy-upload"; +import I18n from "I18n"; export default class TagsUploader extends Component.extend(UppyUploadMixin) { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js index 1982145c03c..e28bbc95fbd 100644 --- a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js +++ b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js @@ -1,6 +1,6 @@ -import SiteSettingComponent from "./site-setting"; import { ajax } from "discourse/lib/ajax"; import { url } from "discourse/lib/computed"; +import SiteSettingComponent from "./site-setting"; export default class extends SiteSettingComponent { @url("model.id", "/admin/themes/%@/setting") updateUrl; diff --git a/app/assets/javascripts/admin/addon/components/theme-settings-editor.js b/app/assets/javascripts/admin/addon/components/theme-settings-editor.js index 17993846ace..d1d20d89659 100644 --- a/app/assets/javascripts/admin/addon/components/theme-settings-editor.js +++ b/app/assets/javascripts/admin/addon/components/theme-settings-editor.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; -import { ajax } from "discourse/lib/ajax"; +import { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import I18n from "I18n"; export default class ThemeSettingsEditor extends Component { diff --git a/app/assets/javascripts/admin/addon/components/theme-translation.js b/app/assets/javascripts/admin/addon/components/theme-translation.js index c111b350515..6c3834f80e1 100644 --- a/app/assets/javascripts/admin/addon/components/theme-translation.js +++ b/app/assets/javascripts/admin/addon/components/theme-translation.js @@ -1,7 +1,7 @@ -import SiteSettingComponent from "./site-setting"; +import { alias } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; import { url } from "discourse/lib/computed"; -import { alias } from "@ember/object/computed"; +import SiteSettingComponent from "./site-setting"; export default class ThemeTranslation extends SiteSettingComponent { @alias("translation") setting; diff --git a/app/assets/javascripts/admin/addon/components/theme-upload-add.js b/app/assets/javascripts/admin/addon/components/theme-upload-add.js index 5ef4604b161..dcb35fb2d1c 100644 --- a/app/assets/javascripts/admin/addon/components/theme-upload-add.js +++ b/app/assets/javascripts/admin/addon/components/theme-upload-add.js @@ -1,10 +1,10 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; +import { action } from "@ember/object"; import { isEmpty } from "@ember/utils"; +import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4]; const SCSS_VARIABLE_NAMES = [ diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js index b059b96ea47..d395776fe77 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list-item.js +++ b/app/assets/javascripts/admin/addon/components/themes-list-item.js @@ -1,10 +1,10 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; -import { and, gt } from "@ember/object/computed"; -import discourseComputed from "discourse-common/utils/decorators"; import Component from "@ember/component"; +import { action } from "@ember/object"; +import { and, gt } from "@ember/object/computed"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { escape } from "pretty-text/sanitizer"; import { iconHTML } from "discourse-common/lib/icon-library"; -import { action } from "@ember/object"; +import discourseComputed from "discourse-common/utils/decorators"; const MAX_COMPONENTS = 4; diff --git a/app/assets/javascripts/admin/addon/components/themes-list.js b/app/assets/javascripts/admin/addon/components/themes-list.js index 63d2d8b6b40..32296a7c0ea 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list.js +++ b/app/assets/javascripts/admin/addon/components/themes-list.js @@ -1,11 +1,11 @@ -import { classNames } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { equal, gt, gte } from "@ember/object/computed"; -import { COMPONENTS, THEMES } from "admin/models/theme"; import Component from "@ember/component"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; import { action } from "@ember/object"; +import { equal, gt, gte } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; +import { classNames } from "@ember-decorators/component"; import DeleteThemesConfirm from "discourse/components/modal/delete-themes-confirm"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import { COMPONENTS, THEMES } from "admin/models/theme"; @classNames("themes-list") export default class ThemesList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/value-list.js b/app/assets/javascripts/admin/addon/components/value-list.js index 078fbab2133..68386eda1e1 100644 --- a/app/assets/javascripts/admin/addon/components/value-list.js +++ b/app/assets/javascripts/admin/addon/components/value-list.js @@ -1,10 +1,10 @@ -import { action } from "@ember/object"; -import { classNames } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; -import { on } from "@ember-decorators/object"; -import { empty, reads } from "@ember/object/computed"; import Component from "@ember/component"; +import { action } from "@ember/object"; +import { empty, reads } from "@ember/object/computed"; +import { classNames } from "@ember-decorators/component"; +import { on } from "@ember-decorators/object"; import { makeArray } from "discourse-common/lib/helpers"; +import discourseComputed from "discourse-common/utils/decorators"; @classNames("value-list") export default class ValueList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.js b/app/assets/javascripts/admin/addon/components/watched-word-form.js index e3ab1c7b212..1dd28884351 100644 --- a/app/assets/javascripts/admin/addon/components/watched-word-form.js +++ b/app/assets/javascripts/admin/addon/components/watched-word-form.js @@ -1,14 +1,14 @@ -import { action } from "@ember/object"; -import { classNames, tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { equal, not } from "@ember/object/computed"; -import discourseComputed from "discourse-common/utils/decorators"; -import { observes } from "@ember-decorators/object"; import Component from "@ember/component"; -import I18n from "I18n"; -import WatchedWord from "admin/models/watched-word"; -import { isEmpty } from "@ember/utils"; +import { action } from "@ember/object"; +import { equal, not } from "@ember/object/computed"; import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { isEmpty } from "@ember/utils"; +import { classNames, tagName } from "@ember-decorators/component"; +import { observes } from "@ember-decorators/object"; +import discourseComputed from "discourse-common/utils/decorators"; +import WatchedWord from "admin/models/watched-word"; +import I18n from "I18n"; @tagName("form") @classNames("watched-word-form") diff --git a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js index 3c29a88cf7c..f76e3eeb429 100644 --- a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js +++ b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js @@ -1,9 +1,9 @@ -import { classNames } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; -import UppyUploadMixin from "discourse/mixins/uppy-upload"; +import { alias } from "@ember/object/computed"; +import { classNames } from "@ember-decorators/component"; import { dialog } from "discourse/lib/uploads"; +import UppyUploadMixin from "discourse/mixins/uppy-upload"; +import I18n from "I18n"; @classNames("watched-words-uploader") export default class WatchedWordUploader extends Component.extend( diff --git a/app/assets/javascripts/admin/addon/components/webhook-event.js b/app/assets/javascripts/admin/addon/components/webhook-event.js index bb6b81bb378..d2658e9171d 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-event.js +++ b/app/assets/javascripts/admin/addon/components/webhook-event.js @@ -1,11 +1,11 @@ import Component from "@glimmer/component"; -import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter"; -import I18n from "I18n"; +import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { inject as service } from "@ember/service"; -import { action } from "@ember/object"; -import { tracked } from "@glimmer/tracking"; +import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter"; +import I18n from "I18n"; export default class WebhookEvent extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/webhook-events.js b/app/assets/javascripts/admin/addon/components/webhook-events.js index 5f887202e4d..a0447a0c6fc 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-events.js +++ b/app/assets/javascripts/admin/addon/components/webhook-events.js @@ -1,11 +1,11 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { ajax } from "discourse/lib/ajax"; import { gt, readOnly } from "@ember/object/computed"; -import { bind } from "discourse-common/utils/decorators"; +import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bind } from "discourse-common/utils/decorators"; export default class WebhookEvents extends Component { @service messageBus; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js index bac3168656a..5b7114a7da5 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js @@ -1,12 +1,12 @@ -import { equal } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { isBlank } from "@ember/utils"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { action, get } from "@ember/object"; -import { ajax } from "discourse/lib/ajax"; +import { equal } from "@ember/object/computed"; import { inject as service } from "@ember/service"; +import { isBlank } from "@ember/utils"; +import { ajax } from "discourse/lib/ajax"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; import ApiKeyUrlsModal from "../components/modal/api-key-urls"; export default class AdminApiKeysNewController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js index 499bd0c75d8..29e8e7f275b 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js @@ -1,10 +1,10 @@ +import Controller from "@ember/controller"; import { action } from "@ember/object"; import { empty } from "@ember/object/computed"; -import Controller from "@ember/controller"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; +import { inject as service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { inject as service } from "@ember/service"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; import ApiKeyUrlsModal from "../components/modal/api-key-urls"; export default class AdminApiKeysShowController extends Controller.extend( diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js index 09b7a3f9734..d2aafd751c0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js @@ -1,12 +1,11 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { alias, equal } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import { i18n, setting } from "discourse/lib/computed"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { alias, equal } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; - +import { i18n, setting } from "discourse/lib/computed"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminBackupsIndexController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js index 3eae5564d17..ab60b3bb1a0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js @@ -1,5 +1,5 @@ -import { alias } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; +import { alias } from "@ember/object/computed"; export default class AdminBackupsLogsController extends Controller { @controller adminBackups; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups.js b/app/assets/javascripts/admin/addon/controllers/admin-backups.js index bb5c7251b16..402d0a7b155 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups.js @@ -1,5 +1,5 @@ -import { and, not } from "@ember/object/computed"; import Controller from "@ember/controller"; +import { and, not } from "@ember/object/computed"; export default class AdminBackupsController extends Controller { @not("model.isOperationRunning") noOperationIsRunning; @not("rollbackEnabled") rollbackDisabled; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-badges.js index 50af52d17f8..52cd67455d7 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges.js @@ -1,6 +1,6 @@ +import { tracked } from "@glimmer/tracking"; import Controller from "@ember/controller"; import { inject as service } from "@ember/service"; -import { tracked } from "@glimmer/tracking"; export default class AdminBadgesController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js index 93745bd79ed..68b64e1c3d3 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js @@ -1,10 +1,10 @@ +import { tracked } from "@glimmer/tracking"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; -import { action } from "@ember/object"; -import { tracked } from "@glimmer/tracking"; -import { inject as service } from "@ember/service"; +import I18n from "I18n"; export default class AdminBadgesAwardController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js index a2981cc4a0a..47dcfefae3d 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js @@ -1,5 +1,5 @@ -import Controller from "@ember/controller"; import { tracked } from "@glimmer/tracking"; +import Controller from "@ember/controller"; export default class AdminBadgesIndexController extends Controller { // Set by the route diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js index 9f49f32f744..1d80b3b1a39 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js @@ -1,13 +1,13 @@ -import Controller, { inject as controller } from "@ember/controller"; -import { observes } from "@ember-decorators/object"; -import I18n from "I18n"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; -import { popupAjaxError } from "discourse/lib/ajax-error"; -import { next } from "@ember/runloop"; -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import getURL from "discourse-common/lib/get-url"; import { tracked } from "@glimmer/tracking"; +import Controller, { inject as controller } from "@ember/controller"; +import { action } from "@ember/object"; +import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { observes } from "@ember-decorators/object"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import getURL from "discourse-common/lib/get-url"; +import I18n from "I18n"; const IMAGE = "image"; const ICON = "icon"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js index e92f513e208..b29fd43becc 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js @@ -1,9 +1,9 @@ import Controller from "@ember/controller"; -import I18n from "I18n"; -import discourseLater from "discourse-common/lib/later"; import { action, computed } from "@ember/object"; -import { clipboardCopy } from "discourse/lib/utilities"; import { inject as service } from "@ember/service"; +import { clipboardCopy } from "discourse/lib/utilities"; +import discourseLater from "discourse-common/lib/later"; +import I18n from "I18n"; export default class AdminCustomizeColorsShowController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js index 5cf067b5ddf..32bcb54eacf 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js @@ -1,9 +1,9 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; import { inject as service } from "@ember/service"; +import discourseComputed from "discourse-common/utils/decorators"; import ColorSchemeSelectBaseModal from "admin/components/modal/color-scheme-select-base"; +import I18n from "I18n"; export default class AdminCustomizeColorsController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js index 02b553c4312..0665bfd19a0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js @@ -1,8 +1,8 @@ +import Controller from "@ember/controller"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import Controller from "@ember/controller"; -import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminCustomizeEmailStyleEditController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js index b517fc3feda..65b016b04ed 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js @@ -1,10 +1,10 @@ -import { inject as service } from "@ember/service"; import Controller, { inject as controller } from "@ember/controller"; -import I18n from "I18n"; import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; import { bufferedProperty } from "discourse/mixins/buffered-content"; import discourseComputed from "discourse-common/utils/decorators"; -import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; export default class AdminCustomizeEmailTemplatesEditController extends Controller.extend( bufferedProperty("emailTemplate") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js index a5781f50d56..25578bb2958 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js @@ -1,6 +1,6 @@ -import { sort } from "@ember/object/computed"; import Controller from "@ember/controller"; import { action } from "@ember/object"; +import { sort } from "@ember/object/computed"; import { inject as service } from "@ember/service"; export default class AdminCustomizeEmailTemplatesController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js index de93b226c3b..a51f9fb45e9 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js @@ -1,9 +1,9 @@ +import Controller from "@ember/controller"; import { action } from "@ember/object"; import { not } from "@ember/object/computed"; -import Controller from "@ember/controller"; import { ajax } from "discourse/lib/ajax"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; import { propertyEqual } from "discourse/lib/computed"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; export default class AdminCustomizeRobotsTxtController extends Controller.extend( bufferedProperty("model") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js index 82079543641..37ee5b04d2a 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { url } from "discourse/lib/computed"; +import { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import { url } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminCustomizeThemesEditController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js index b37756645c4..54a91fed0d1 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js @@ -1,4 +1,5 @@ -import { inject as service } from "@ember/service"; +import Controller from "@ember/controller"; +import EmberObject, { action } from "@ember/object"; import { empty, filterBy, @@ -6,16 +7,15 @@ import { match, notEmpty, } from "@ember/object/computed"; -import { COMPONENTS, THEMES } from "admin/models/theme"; -import Controller from "@ember/controller"; -import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import ThemeSettings from "admin/models/theme-settings"; -import discourseComputed from "discourse-common/utils/decorators"; -import { makeArray } from "discourse-common/lib/helpers"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { url } from "discourse/lib/computed"; +import { makeArray } from "discourse-common/lib/helpers"; +import discourseComputed from "discourse-common/utils/decorators"; import ThemeSettingsEditor from "admin/components/theme-settings-editor"; +import { COMPONENTS, THEMES } from "admin/models/theme"; +import ThemeSettings from "admin/models/theme-settings"; +import I18n from "I18n"; import ThemeUploadAddModal from "../components/theme-upload-add"; const THEME_UPLOAD_VAR = 2; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js index 341114f89fb..57049eaee5c 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js @@ -1,6 +1,6 @@ import Controller from "@ember/controller"; -import { THEMES } from "admin/models/theme"; import discourseComputed from "discourse-common/utils/decorators"; +import { THEMES } from "admin/models/theme"; export default class AdminCustomizeThemesController extends Controller { currentTab = THEMES; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js index da1181db066..c8cc2e855f8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js @@ -1,14 +1,14 @@ -import { action, computed } from "@ember/object"; import Controller, { inject as controller } from "@ember/controller"; -import AdminDashboard from "admin/models/admin-dashboard"; -import I18n from "I18n"; -import PeriodComputationMixin from "admin/mixins/period-computation"; -import Report from "admin/models/report"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action, computed } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { setting } from "discourse/lib/computed"; import getURL from "discourse-common/lib/get-url"; import { makeArray } from "discourse-common/lib/helpers"; -import { setting } from "discourse/lib/computed"; -import { inject as service } from "@ember/service"; +import discourseComputed from "discourse-common/utils/decorators"; +import PeriodComputationMixin from "admin/mixins/period-computation"; +import AdminDashboard from "admin/models/admin-dashboard"; +import Report from "admin/models/report"; +import I18n from "I18n"; import CustomDateRangeModal from "../components/modal/custom-date-range"; function staticReport(reportType) { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js index 636695b851d..b4e79e41b07 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js @@ -1,9 +1,9 @@ -import { action, computed } from "@ember/object"; import Controller from "@ember/controller"; -import PeriodComputationMixin from "admin/mixins/period-computation"; -import discourseComputed from "discourse-common/utils/decorators"; -import getURL from "discourse-common/lib/get-url"; +import { action, computed } from "@ember/object"; import { inject as service } from "@ember/service"; +import getURL from "discourse-common/lib/get-url"; +import discourseComputed from "discourse-common/utils/decorators"; +import PeriodComputationMixin from "admin/mixins/period-computation"; import CustomDateRangeModal from "../components/modal/custom-date-range"; export default class AdminDashboardModerationController extends Controller.extend( diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js index 920f9459eca..a7f615f68f0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js @@ -1,8 +1,8 @@ import Controller from "@ember/controller"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseComputed from "discourse-common/utils/decorators"; -import discourseDebounce from "discourse-common/lib/debounce"; import { action, get } from "@ember/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import discourseComputed from "discourse-common/utils/decorators"; export default class AdminDashboardReportsController extends Controller { filter = null; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js index abe340f2eea..cf95ce7fe3b 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js @@ -1,10 +1,10 @@ -import { action, computed } from "@ember/object"; import Controller, { inject as controller } from "@ember/controller"; +import { action, computed } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { setting } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; import AdminDashboard from "admin/models/admin-dashboard"; import VersionCheck from "admin/models/version-check"; -import discourseComputed from "discourse-common/utils/decorators"; -import { setting } from "discourse/lib/computed"; -import { inject as service } from "@ember/service"; const PROBLEMS_CHECK_MINUTES = 1; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js b/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js index 1b27a572b6f..2ae222da0c7 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js @@ -1,5 +1,5 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; +import { action } from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js index 79384e70f18..834d6fa9aa8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js @@ -1,8 +1,8 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import { action } from "@ember/object"; +import { observes } from "@ember-decorators/object"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; -import { action } from "@ember/object"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailBouncedController extends AdminEmailLogsController { @action diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js index 81bda7c5b16..c09562b7bb8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js @@ -1,12 +1,12 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { empty } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; -import { observes } from "@ember-decorators/object"; +import { action } from "@ember/object"; +import { empty } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { htmlSafe } from "@ember/template"; +import { observes } from "@ember-decorators/object"; +import { ajax } from "discourse/lib/ajax"; import { escapeExpression } from "discourse/lib/utilities"; +import I18n from "I18n"; export default class AdminEmailIndexController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js index cb8e04736a7..08349d37326 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js @@ -1,6 +1,6 @@ import Controller from "@ember/controller"; -import EmailLog from "admin/models/email-log"; import EmberObject, { action } from "@ember/object"; +import EmailLog from "admin/models/email-log"; export default class AdminEmailLogsController extends Controller { loading = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js index 4120390eedb..2a1e55bb37d 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js @@ -1,9 +1,9 @@ -import { inject as service } from "@ember/service"; -import { empty, notEmpty, or } from "@ember/object/computed"; import Controller from "@ember/controller"; -import EmailPreview from "admin/models/email-preview"; import { action, get } from "@ember/object"; +import { empty, notEmpty, or } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import EmailPreview from "admin/models/email-preview"; export default class AdminEmailPreviewDigestController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js index 65434538eff..1f55fec6eb3 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import IncomingEmail from "admin/models/incoming-email"; -import discourseDebounce from "discourse-common/lib/debounce"; import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import IncomingEmail from "admin/models/incoming-email"; export default class AdminEmailReceivedController extends AdminEmailLogsController { @observes("filter.{status,from,to,subject}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js index 184d632db66..60bfd89dd74 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js @@ -1,9 +1,9 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import IncomingEmail from "admin/models/incoming-email"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; import { action } from "@ember/object"; +import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import IncomingEmail from "admin/models/incoming-email"; export default class AdminEmailRejectedController extends AdminEmailLogsController { @observes("filter.{status,from,to,subject,error}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js index 6d28b33d798..f1c9aa3b46f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js @@ -1,7 +1,7 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import { observes } from "@ember-decorators/object"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailSentController extends AdminEmailLogsController { @observes("filter.{status,user,address,type,reply_key}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js index 366f27b8d2e..d7082aecd33 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js @@ -1,7 +1,7 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import { observes } from "@ember-decorators/object"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailSkippedController extends AdminEmailLogsController { @observes("filter.{status,user,address,type}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js index 9fcccf318fc..2fecb6717a0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js @@ -1,7 +1,7 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse-common/utils/decorators"; export default class AdminEmbeddingController extends Controller { saved = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js index 6e7f86d88aa..723369579e4 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js @@ -1,9 +1,9 @@ -import { inject as service } from "@ember/service"; -import { sort } from "@ember/object/computed"; -import EmberObject, { action, computed } from "@ember/object"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import EmberObject, { action, computed } from "@ember/object"; +import { sort } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; +import I18n from "I18n"; const ALL_FILTER = "all"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js index 4ce490eff02..1869a63fdd9 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js @@ -1,8 +1,8 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import ScreenedEmail from "admin/models/screened-email"; +import { action } from "@ember/object"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; +import ScreenedEmail from "admin/models/screened-email"; export default class AdminLogsScreenedEmailsController extends Controller { loading = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js index 99e0bcfc2bd..5259954d9eb 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js @@ -1,13 +1,13 @@ -import { inject as service } from "@ember/service"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import ScreenedIpAddress from "admin/models/screened-ip-address"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { exportEntity } from "discourse/lib/export-csv"; -import { observes } from "@ember-decorators/object"; -import { outputExportResult } from "discourse/lib/export-result"; import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { observes } from "@ember-decorators/object"; +import { exportEntity } from "discourse/lib/export-csv"; +import { outputExportResult } from "discourse/lib/export-result"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import ScreenedIpAddress from "admin/models/screened-ip-address"; +import I18n from "I18n"; export default class AdminLogsScreenedIpAddressesController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js index dc1e174d6a5..83b227c7956 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js @@ -1,8 +1,8 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import ScreenedUrl from "admin/models/screened-url"; +import { action } from "@ember/object"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; +import ScreenedUrl from "admin/models/screened-url"; export default class AdminLogsScreenedUrlsController extends Controller { loading = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js index 73c61699696..3726563ef83 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js @@ -1,13 +1,13 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { exportEntity } from "discourse/lib/export-csv"; -import { outputExportResult } from "discourse/lib/export-result"; import { scheduleOnce } from "@ember/runloop"; import { inject as service } from "@ember/service"; -import ThemeChangeModal from "../components/modal/theme-change"; +import { exportEntity } from "discourse/lib/export-csv"; +import { outputExportResult } from "discourse/lib/export-result"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; import StaffActionLogDetailsModal from "../components/modal/staff-action-log-details"; +import ThemeChangeModal from "../components/modal/theme-change"; export default class AdminLogsStaffActionLogsController extends Controller { @service modal; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js index dcd31f10207..b13fde101f3 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js @@ -1,13 +1,13 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { or } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import Permalink from "admin/models/permalink"; -import discourseDebounce from "discourse-common/lib/debounce"; +import { action } from "@ember/object"; +import { or } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { observes } from "@ember-decorators/object"; import { clipboardCopy } from "discourse/lib/utilities"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import Permalink from "admin/models/permalink"; +import I18n from "I18n"; export default class AdminPermalinksController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js index af26474bcb7..75a20376b8a 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js @@ -1,8 +1,8 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import SiteSetting from "admin/models/site-setting"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import SiteSetting from "admin/models/site-setting"; export default class AdminPluginsIndexController extends Controller { @service session; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js index 1f7f10282ab..14a19551112 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js @@ -1,5 +1,5 @@ -import { inject as service } from "@ember/service"; import Controller from "@ember/controller"; +import { inject as service } from "@ember/service"; export default class AdminPluginsController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js index a72bab8faa6..a0a23f11b66 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js @@ -1,12 +1,12 @@ -import { alias } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import { isEmpty } from "@ember/utils"; -import { debounce } from "discourse-common/utils/decorators"; -import { observes } from "@ember-decorators/object"; import { action } from "@ember/object"; +import { alias } from "@ember/object/computed"; import { inject as service } from "@ember/service"; +import { isEmpty } from "@ember/utils"; +import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import { debounce } from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminSiteSettingsController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js index 45b0e797cba..059a7c2619f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js @@ -1,10 +1,10 @@ import Controller from "@ember/controller"; -import I18n from "I18n"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; -import discourseComputed from "discourse-common/utils/decorators"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default Controller.extend(bufferedProperty("siteText"), { dialog: service(), diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js index bf35700c0ac..a5bec89e901 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; -import Controller from "@ember/controller"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { inject as service } from "@ember/service"; import { tracked } from "@glimmer/tracking"; +import Controller from "@ember/controller"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { disableImplicitInjections } from "discourse/lib/implicit-injections"; +import discourseDebounce from "discourse-common/lib/debounce"; import ReseedModal from "admin/components/modal/reseed"; let lastSearch; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js index 8b7e4eef166..4e59bf625af 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js @@ -1,13 +1,13 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { alias, empty, sort } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import UserBadge from "discourse/models/user-badge"; -import { grantableBadges } from "discourse/lib/grant-badge-utils"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; +import { alias, empty, sort } from "@ember/object/computed"; import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { grantableBadges } from "discourse/lib/grant-badge-utils"; +import UserBadge from "discourse/models/user-badge"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminUserBadgesController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js index 3670bd51b5a..a37f210f08b 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { gte, sort } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { gte, sort } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; const MAX_FIELDS = 30; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js index d041d8ca2de..391dd59bf59 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js @@ -1,22 +1,22 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { and, notEmpty } from "@ember/object/computed"; -import DiscourseURL, { userPath } from "discourse/lib/url"; -import { fmt, propertyNotEqual, setting } from "discourse/lib/computed"; -import CanCheckEmails from "discourse/mixins/can-check-emails"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import getURL from "discourse-common/lib/get-url"; +import { action } from "@ember/object"; +import { and, notEmpty } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { htmlSafe } from "@ember/template"; +import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { fmt, propertyNotEqual, setting } from "discourse/lib/computed"; +import DiscourseURL, { userPath } from "discourse/lib/url"; +import CanCheckEmails from "discourse/mixins/can-check-emails"; +import getURL from "discourse-common/lib/get-url"; +import discourseComputed from "discourse-common/utils/decorators"; import AdminUser from "admin/models/admin-user"; -import MergeUsersConfirmationModal from "../components/modal/merge-users-confirmation"; -import MergeUsersPromptModal from "../components/modal/merge-users-prompt"; -import MergeUsersProgressModal from "../components/modal/merge-users-progress"; +import I18n from "I18n"; import DeletePostsConfirmationModal from "../components/modal/delete-posts-confirmation"; import DeleteUserPostsProgressModal from "../components/modal/delete-user-posts-progress"; +import MergeUsersConfirmationModal from "../components/modal/merge-users-confirmation"; +import MergeUsersProgressModal from "../components/modal/merge-users-progress"; +import MergeUsersPromptModal from "../components/modal/merge-users-prompt"; export default class AdminUserIndexController extends Controller.extend( CanCheckEmails diff --git a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js index 7865e57c5d6..af41a29024e 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js @@ -1,13 +1,13 @@ -import { action } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; -import { observes } from "@ember-decorators/object"; -import AdminUser from "admin/models/admin-user"; -import CanCheckEmails from "discourse/mixins/can-check-emails"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { observes } from "@ember-decorators/object"; +import { i18n } from "discourse/lib/computed"; +import CanCheckEmails from "discourse/mixins/can-check-emails"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { i18n } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdminUser from "admin/models/admin-user"; +import I18n from "I18n"; export default class AdminUsersListShowController extends Controller.extend( CanCheckEmails diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js index ca097c2ac6c..a126943233f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js @@ -1,14 +1,14 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { or } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import I18n from "I18n"; -import WatchedWord from "admin/models/watched-word"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import { fmt } from "discourse/lib/computed"; +import { action } from "@ember/object"; +import { or } from "@ember/object/computed"; import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; +import { fmt } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; import WatchedWordTestModal from "admin/components/modal/watched-word-test"; +import WatchedWord from "admin/models/watched-word"; +import I18n from "I18n"; export default class AdminWatchedWordsActionController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js index 72a2dedd430..06f582b62f8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js @@ -1,9 +1,9 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import { isEmpty } from "@ember/utils"; import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; export default class AdminWatchedWordsController extends Controller { filter = null; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js index c0db1eb3eb8..97a5ff00b78 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js @@ -1,11 +1,11 @@ -import { inject as service } from "@ember/service"; -import { alias } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; +import { alias } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminWebHooksEditController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js index 865fbad990c..caa1fc5ff54 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js @@ -1,9 +1,9 @@ -import { inject as service } from "@ember/service"; -import { alias } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import I18n from "I18n"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { action } from "@ember/object"; +import { alias } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; export default class AdminWebHooksIndexController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js index 0cb4ef04996..41b8852c9de 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js @@ -1,8 +1,8 @@ -import { inject as service } from "@ember/service"; import Controller, { inject as controller } from "@ember/controller"; import { action } from "@ember/object"; -import I18n from "I18n"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; export default class AdminWebHooksShowController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin.js b/app/assets/javascripts/admin/addon/controllers/admin.js index 9b802fe89e9..a636b077208 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin.js +++ b/app/assets/javascripts/admin/addon/controllers/admin.js @@ -1,5 +1,5 @@ -import { inject as service } from "@ember/service"; import Controller from "@ember/controller"; +import { inject as service } from "@ember/service"; import { dasherize } from "@ember/string"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js index 80820b0bc63..7fc641b851e 100644 --- a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js +++ b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js @@ -1,6 +1,6 @@ import Helper from "@ember/component/helper"; -import { iconHTML } from "discourse-common/lib/icon-library"; import { htmlSafe } from "@ember/template"; +import { iconHTML } from "discourse-common/lib/icon-library"; export default class DispositionIcon extends Helper { compute([disposition]) { diff --git a/app/assets/javascripts/admin/addon/helpers/human-size.js b/app/assets/javascripts/admin/addon/helpers/human-size.js index 06094bed343..5d97883aaad 100644 --- a/app/assets/javascripts/admin/addon/helpers/human-size.js +++ b/app/assets/javascripts/admin/addon/helpers/human-size.js @@ -1,4 +1,4 @@ -import I18n from "I18n"; import { htmlHelper } from "discourse-common/lib/helpers"; +import I18n from "I18n"; export default htmlHelper((size) => I18n.toHumanSize(size)); diff --git a/app/assets/javascripts/admin/addon/mixins/period-computation.js b/app/assets/javascripts/admin/addon/mixins/period-computation.js index b46503e73c0..76ea98e06cb 100644 --- a/app/assets/javascripts/admin/addon/mixins/period-computation.js +++ b/app/assets/javascripts/admin/addon/mixins/period-computation.js @@ -1,5 +1,5 @@ -import DiscourseURL from "discourse/lib/url"; import Mixin from "@ember/object/mixin"; +import DiscourseURL from "discourse/lib/url"; import discourseComputed from "discourse-common/utils/decorators"; export default Mixin.create({ diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js index 6ea8aeb9679..f60fef0654c 100644 --- a/app/assets/javascripts/admin/addon/mixins/setting-component.js +++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js @@ -1,16 +1,16 @@ -import { isNone } from "@ember/utils"; -import { fmt, propertyNotEqual } from "discourse/lib/computed"; -import { alias, oneWay } from "@ember/object/computed"; -import I18n from "I18n"; -import Mixin from "@ember/object/mixin"; -import { ajax } from "discourse/lib/ajax"; -import { categoryLinkHTML } from "discourse/helpers/category-link"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; -import { htmlSafe } from "@ember/template"; import { warn } from "@ember/debug"; import { action } from "@ember/object"; -import { splitString } from "discourse/lib/utilities"; +import { alias, oneWay } from "@ember/object/computed"; +import Mixin from "@ember/object/mixin"; import { inject as service } from "@ember/service"; +import { htmlSafe } from "@ember/template"; +import { isNone } from "@ember/utils"; +import { categoryLinkHTML } from "discourse/helpers/category-link"; +import { ajax } from "discourse/lib/ajax"; +import { fmt, propertyNotEqual } from "discourse/lib/computed"; +import { splitString } from "discourse/lib/utilities"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import I18n from "I18n"; import SiteSettingDefaultCategoriesModal from "../components/modal/site-setting-default-categories"; const CUSTOM_TYPES = [ diff --git a/app/assets/javascripts/admin/addon/mixins/setting-object.js b/app/assets/javascripts/admin/addon/mixins/setting-object.js index 1830cc89847..05ce6daee46 100644 --- a/app/assets/javascripts/admin/addon/mixins/setting-object.js +++ b/app/assets/javascripts/admin/addon/mixins/setting-object.js @@ -1,9 +1,9 @@ -import I18n from "I18n"; -import Mixin from "@ember/object/mixin"; import { computed } from "@ember/object"; import { readOnly } from "@ember/object/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import Mixin from "@ember/object/mixin"; import { isPresent } from "@ember/utils"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default Mixin.create({ @discourseComputed("value", "default") diff --git a/app/assets/javascripts/admin/addon/models/admin-user.js b/app/assets/javascripts/admin/addon/models/admin-user.js index 4b9c94d7954..f95dff4374d 100644 --- a/app/assets/javascripts/admin/addon/models/admin-user.js +++ b/app/assets/javascripts/admin/addon/models/admin-user.js @@ -1,14 +1,14 @@ import { filter, gt, lt, not, or } from "@ember/object/computed"; -import Group from "discourse/models/group"; -import I18n from "I18n"; import { Promise } from "rsvp"; -import User from "discourse/models/user"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import getURL from "discourse-common/lib/get-url"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { propertyNotEqual } from "discourse/lib/computed"; import { userPath } from "discourse/lib/url"; +import Group from "discourse/models/group"; +import User from "discourse/models/user"; +import getURL from "discourse-common/lib/get-url"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminUser extends User { static find(user_id) { diff --git a/app/assets/javascripts/admin/addon/models/api-key.js b/app/assets/javascripts/admin/addon/models/api-key.js index f40d643270b..89bd6793803 100644 --- a/app/assets/javascripts/admin/addon/models/api-key.js +++ b/app/assets/javascripts/admin/addon/models/api-key.js @@ -1,9 +1,9 @@ import { computed } from "@ember/object"; -import AdminUser from "admin/models/admin-user"; -import RestModel from "discourse/models/rest"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; import { fmt } from "discourse/lib/computed"; +import RestModel from "discourse/models/rest"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdminUser from "admin/models/admin-user"; export default class ApiKey extends RestModel { @fmt("truncated_key", "%@...") truncatedKey; diff --git a/app/assets/javascripts/admin/addon/models/backup-status.js b/app/assets/javascripts/admin/addon/models/backup-status.js index e9ee065f3e2..095239d9c7f 100644 --- a/app/assets/javascripts/admin/addon/models/backup-status.js +++ b/app/assets/javascripts/admin/addon/models/backup-status.js @@ -1,5 +1,5 @@ -import { not } from "@ember/object/computed"; import EmberObject from "@ember/object"; +import { not } from "@ember/object/computed"; import discourseComputed from "discourse-common/utils/decorators"; export default class BackupStatus extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/color-scheme-color.js b/app/assets/javascripts/admin/addon/models/color-scheme-color.js index 72efcb32c13..92a5ae185dc 100644 --- a/app/assets/javascripts/admin/addon/models/color-scheme-color.js +++ b/app/assets/javascripts/admin/addon/models/color-scheme-color.js @@ -1,8 +1,8 @@ -import discourseComputed from "discourse-common/utils/decorators"; -import { observes, on } from "@ember-decorators/object"; import EmberObject from "@ember/object"; -import I18n from "I18n"; +import { observes, on } from "@ember-decorators/object"; import { propertyNotEqual } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ColorSchemeColor extends EmberObject { // Whether the current value is different than Discourse's default color scheme. diff --git a/app/assets/javascripts/admin/addon/models/color-scheme.js b/app/assets/javascripts/admin/addon/models/color-scheme.js index 53f8ea7eeda..faf52813a67 100644 --- a/app/assets/javascripts/admin/addon/models/color-scheme.js +++ b/app/assets/javascripts/admin/addon/models/color-scheme.js @@ -1,11 +1,11 @@ -import { not } from "@ember/object/computed"; import { A } from "@ember/array"; import ArrayProxy from "@ember/array/proxy"; -import ColorSchemeColor from "admin/models/color-scheme-color"; import EmberObject from "@ember/object"; -import I18n from "I18n"; +import { not } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import ColorSchemeColor from "admin/models/color-scheme-color"; +import I18n from "I18n"; class ColorSchemes extends ArrayProxy {} diff --git a/app/assets/javascripts/admin/addon/models/email-log.js b/app/assets/javascripts/admin/addon/models/email-log.js index 18034d9f949..921c416e393 100644 --- a/app/assets/javascripts/admin/addon/models/email-log.js +++ b/app/assets/javascripts/admin/addon/models/email-log.js @@ -1,7 +1,7 @@ -import AdminUser from "admin/models/admin-user"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import getURL from "discourse-common/lib/get-url"; +import AdminUser from "admin/models/admin-user"; export default class EmailLog extends EmberObject { static create(attrs) { diff --git a/app/assets/javascripts/admin/addon/models/email-template.js b/app/assets/javascripts/admin/addon/models/email-template.js index f3d8c514cbd..360935f30e8 100644 --- a/app/assets/javascripts/admin/addon/models/email-template.js +++ b/app/assets/javascripts/admin/addon/models/email-template.js @@ -1,6 +1,6 @@ -import RestModel from "discourse/models/rest"; -import { ajax } from "discourse/lib/ajax"; import { getProperties } from "@ember/object"; +import { ajax } from "discourse/lib/ajax"; +import RestModel from "discourse/models/rest"; export default class EmailTemplate extends RestModel { revert() { diff --git a/app/assets/javascripts/admin/addon/models/flag-type.js b/app/assets/javascripts/admin/addon/models/flag-type.js index 3bb399fc2e5..ea0cf9890e8 100644 --- a/app/assets/javascripts/admin/addon/models/flag-type.js +++ b/app/assets/javascripts/admin/addon/models/flag-type.js @@ -1,6 +1,6 @@ -import I18n from "I18n"; import RestModel from "discourse/models/rest"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class FlagType extends RestModel { @discourseComputed("id") diff --git a/app/assets/javascripts/admin/addon/models/form-template.js b/app/assets/javascripts/admin/addon/models/form-template.js index 9981d9ebbb5..6eb18a98f12 100644 --- a/app/assets/javascripts/admin/addon/models/form-template.js +++ b/app/assets/javascripts/admin/addon/models/form-template.js @@ -1,5 +1,5 @@ -import RestModel from "discourse/models/rest"; import { ajax } from "discourse/lib/ajax"; +import RestModel from "discourse/models/rest"; export default class FormTemplate extends RestModel { static createTemplate(data) { diff --git a/app/assets/javascripts/admin/addon/models/incoming-email.js b/app/assets/javascripts/admin/addon/models/incoming-email.js index 90c244f28af..5bc316d09d8 100644 --- a/app/assets/javascripts/admin/addon/models/incoming-email.js +++ b/app/assets/javascripts/admin/addon/models/incoming-email.js @@ -1,6 +1,6 @@ -import AdminUser from "admin/models/admin-user"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import AdminUser from "admin/models/admin-user"; export default class IncomingEmail extends EmberObject { static create(attrs) { diff --git a/app/assets/javascripts/admin/addon/models/permalink.js b/app/assets/javascripts/admin/addon/models/permalink.js index 580b111f0ae..21bafb83de9 100644 --- a/app/assets/javascripts/admin/addon/models/permalink.js +++ b/app/assets/javascripts/admin/addon/models/permalink.js @@ -1,7 +1,7 @@ -import Category from "discourse/models/category"; -import DiscourseURL from "discourse/lib/url"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import DiscourseURL from "discourse/lib/url"; +import Category from "discourse/models/category"; import discourseComputed from "discourse-common/utils/decorators"; export default class Permalink extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/report.js b/app/assets/javascripts/admin/addon/models/report.js index dd868a00e02..c0a87fb3109 100644 --- a/app/assets/javascripts/admin/addon/models/report.js +++ b/app/assets/javascripts/admin/addon/models/report.js @@ -1,19 +1,19 @@ +import EmberObject from "@ember/object"; +import { isEmpty } from "@ember/utils"; +import { renderAvatar } from "discourse/helpers/user-avatar"; +import { ajax } from "discourse/lib/ajax"; import { durationTiny, number } from "discourse/lib/formatter"; +import round from "discourse/lib/round"; import { escapeExpression, fillMissingDates, formatUsername, toNumber, } from "discourse/lib/utilities"; -import EmberObject from "@ember/object"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; import getURL from "discourse-common/lib/get-url"; -import { isEmpty } from "@ember/utils"; import { makeArray } from "discourse-common/lib/helpers"; -import { renderAvatar } from "discourse/helpers/user-avatar"; -import round from "discourse/lib/round"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; // Change this line each time report format change // and you want to ensure cache is reset diff --git a/app/assets/javascripts/admin/addon/models/screened-email.js b/app/assets/javascripts/admin/addon/models/screened-email.js index 8d7a3161ad8..5d7f2ead3fb 100644 --- a/app/assets/javascripts/admin/addon/models/screened-email.js +++ b/app/assets/javascripts/admin/addon/models/screened-email.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ScreenedEmail extends EmberObject { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/screened-ip-address.js b/app/assets/javascripts/admin/addon/models/screened-ip-address.js index 87979087aaa..606d37941bc 100644 --- a/app/assets/javascripts/admin/addon/models/screened-ip-address.js +++ b/app/assets/javascripts/admin/addon/models/screened-ip-address.js @@ -1,8 +1,8 @@ -import { equal } from "@ember/object/computed"; import EmberObject from "@ember/object"; -import I18n from "I18n"; +import { equal } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ScreenedIpAddress extends EmberObject { static findAll(filter) { diff --git a/app/assets/javascripts/admin/addon/models/screened-url.js b/app/assets/javascripts/admin/addon/models/screened-url.js index 3d2c5f97941..a0e022b44cb 100644 --- a/app/assets/javascripts/admin/addon/models/screened-url.js +++ b/app/assets/javascripts/admin/addon/models/screened-url.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ScreenedUrl extends EmberObject { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/site-setting.js b/app/assets/javascripts/admin/addon/models/site-setting.js index 6cd7852834e..a625cb5979b 100644 --- a/app/assets/javascripts/admin/addon/models/site-setting.js +++ b/app/assets/javascripts/admin/addon/models/site-setting.js @@ -1,8 +1,8 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; -import Setting from "admin/mixins/setting-object"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import Setting from "admin/mixins/setting-object"; +import I18n from "I18n"; export default class SiteSetting extends EmberObject.extend(Setting) { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/site-text.js b/app/assets/javascripts/admin/addon/models/site-text.js index 0460ab3d9dc..d35352c3cc1 100644 --- a/app/assets/javascripts/admin/addon/models/site-text.js +++ b/app/assets/javascripts/admin/addon/models/site-text.js @@ -1,6 +1,6 @@ -import RestModel from "discourse/models/rest"; -import { ajax } from "discourse/lib/ajax"; import { getProperties } from "@ember/object"; +import { ajax } from "discourse/lib/ajax"; +import RestModel from "discourse/models/rest"; export default class SiteText extends RestModel { revert(locale) { diff --git a/app/assets/javascripts/admin/addon/models/staff-action-log.js b/app/assets/javascripts/admin/addon/models/staff-action-log.js index 4eb7864dd44..bead05a14f3 100644 --- a/app/assets/javascripts/admin/addon/models/staff-action-log.js +++ b/app/assets/javascripts/admin/addon/models/staff-action-log.js @@ -1,9 +1,9 @@ +import { ajax } from "discourse/lib/ajax"; +import { escapeExpression } from "discourse/lib/utilities"; +import RestModel from "discourse/models/rest"; +import discourseComputed from "discourse-common/utils/decorators"; import AdminUser from "admin/models/admin-user"; import I18n from "I18n"; -import RestModel from "discourse/models/rest"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import { escapeExpression } from "discourse/lib/utilities"; function format(label, value, escape = true) { return value diff --git a/app/assets/javascripts/admin/addon/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js index 83d96dddffc..f1257f20252 100644 --- a/app/assets/javascripts/admin/addon/models/theme.js +++ b/app/assets/javascripts/admin/addon/models/theme.js @@ -1,10 +1,10 @@ +import { get } from "@ember/object"; import { gt, or } from "@ember/object/computed"; import { isBlank, isEmpty } from "@ember/utils"; -import I18n from "I18n"; +import { popupAjaxError } from "discourse/lib/ajax-error"; import RestModel from "discourse/models/rest"; import discourseComputed from "discourse-common/utils/decorators"; -import { get } from "@ember/object"; -import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; const THEME_UPLOAD_VAR = 2; const FIELDS_IDS = [0, 1, 5]; diff --git a/app/assets/javascripts/admin/addon/models/user-field.js b/app/assets/javascripts/admin/addon/models/user-field.js index 5a8bdea1832..b27f8b5aff1 100644 --- a/app/assets/javascripts/admin/addon/models/user-field.js +++ b/app/assets/javascripts/admin/addon/models/user-field.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; -import RestModel from "discourse/models/rest"; import { i18n } from "discourse/lib/computed"; +import RestModel from "discourse/models/rest"; export default class UserField extends RestModel { static fieldTypes() { diff --git a/app/assets/javascripts/admin/addon/models/watched-word.js b/app/assets/javascripts/admin/addon/models/watched-word.js index a6de62cc9db..78ce16bb9f9 100644 --- a/app/assets/javascripts/admin/addon/models/watched-word.js +++ b/app/assets/javascripts/admin/addon/models/watched-word.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; +import I18n from "I18n"; export default class WatchedWord extends EmberObject { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/web-hook.js b/app/assets/javascripts/admin/addon/models/web-hook.js index c955d67ae98..cf37020d547 100644 --- a/app/assets/javascripts/admin/addon/models/web-hook.js +++ b/app/assets/javascripts/admin/addon/models/web-hook.js @@ -1,11 +1,11 @@ import { computed } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import { isEmpty } from "@ember/utils"; import { observes } from "@ember-decorators/object"; import Category from "discourse/models/category"; import Group from "discourse/models/group"; import RestModel from "discourse/models/rest"; import Site from "discourse/models/site"; -import { isEmpty } from "@ember/utils"; +import discourseComputed from "discourse-common/utils/decorators"; export default class WebHook extends RestModel { content_type = 1; // json diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js index 60187bf3722..545a2ba592e 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js @@ -1,6 +1,6 @@ -import Backup from "admin/models/backup"; import Route from "@ember/routing/route"; import { bind } from "discourse-common/utils/decorators"; +import Backup from "admin/models/backup"; export default class AdminBackupsIndexRoute extends Route { activate() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js index 62fe429b057..e61d868d585 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; -import PreloadStore from "discourse/lib/preload-store"; import Route from "@ember/routing/route"; +import PreloadStore from "discourse/lib/preload-store"; export default class AdminBackupsLogsRoute extends Route { // since the logs are pushed via the message bus diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups.js b/app/assets/javascripts/admin/addon/routes/admin-backups.js index ed3a2c56475..63a047fb61a 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups.js @@ -1,16 +1,16 @@ -import { inject as service } from "@ember/service"; -import Backup from "admin/models/backup"; -import BackupStatus from "admin/models/backup-status"; -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import PreloadStore from "discourse/lib/preload-store"; -import User from "discourse/models/user"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; +import PreloadStore from "discourse/lib/preload-store"; +import User from "discourse/models/user"; +import DiscourseRoute from "discourse/routes/discourse"; import getURL from "discourse-common/lib/get-url"; import { bind } from "discourse-common/utils/decorators"; import StartBackupModal from "admin/components/modal/start-backup"; +import Backup from "admin/models/backup"; +import BackupStatus from "admin/models/backup-status"; +import I18n from "I18n"; const LOG_CHANNEL = "/admin/backups/logs"; diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges.js b/app/assets/javascripts/admin/addon/routes/admin-badges.js index b3169966357..b61a933eaf8 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-badges.js +++ b/app/assets/javascripts/admin/addon/routes/admin-badges.js @@ -1,8 +1,8 @@ +import { ajax } from "discourse/lib/ajax"; import Badge from "discourse/models/badge"; import BadgeGrouping from "discourse/models/badge-grouping"; import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; export default class AdminBadgesRoute extends DiscourseRoute { _json = null; diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges/show.js b/app/assets/javascripts/admin/addon/routes/admin-badges/show.js index b19daf69faa..b35669a663d 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-badges/show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-badges/show.js @@ -1,11 +1,11 @@ +import { action, get } from "@ember/object"; +import Route from "@ember/routing/route"; +import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import Badge from "discourse/models/badge"; import I18n from "I18n"; -import Route from "@ember/routing/route"; -import { ajax } from "discourse/lib/ajax"; -import { action, get } from "@ember/object"; -import { inject as service } from "@ember/service"; -import EditBadgeGroupingsModal from "../../components/modal/edit-badge-groupings"; import BadgePreviewModal from "../../components/modal/badge-preview"; +import EditBadgeGroupingsModal from "../../components/modal/edit-badge-groupings"; export default class AdminBadgesShowRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js index 5d6dbf9c833..d9e3c4631c5 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js @@ -1,5 +1,5 @@ -import ColorScheme from "admin/models/color-scheme"; import Route from "@ember/routing/route"; +import ColorScheme from "admin/models/color-scheme"; export default class AdminCustomizeColorsRoute extends Route { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js index 7ca5c589bb8..8d7c82775fa 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js @@ -1,7 +1,7 @@ import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; import I18n from "I18n"; -import Route from "@ember/routing/route"; export default class AdminCustomizeEmailStyleEditRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js index 2808b693e1e..91ce35668a8 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js @@ -1,5 +1,5 @@ -import Route from "@ember/routing/route"; import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; export default class AdminCustomizeEmailTemplatesRoute extends Route { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js index 364388c29da..e449e04b307 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { action } from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; import FormTemplate from "admin/models/form-template"; export default class AdminCustomizeFormTemplatesIndex extends DiscourseRoute { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js index d1170bfb8ad..f1dedf2d146 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js @@ -1,7 +1,7 @@ import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; import I18n from "I18n"; -import Route from "@ember/routing/route"; export default class AdminCustomizeThemesEditRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js index 9479dc4dc76..4033d81aa27 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; +import { scrollTop } from "discourse/mixins/scroll-top"; import { COMPONENTS, THEMES } from "admin/models/theme"; import I18n from "I18n"; -import Route from "@ember/routing/route"; -import { scrollTop } from "discourse/mixins/scroll-top"; export default class AdminCustomizeThemesShowRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js index c17412b588a..ec86d4215b3 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; import Route from "@ember/routing/route"; +import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; import I18n from "I18n"; import InstallThemeModal from "../components/modal/install-theme"; -import { next } from "@ember/runloop"; export default class AdminCustomizeThemesRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js index dd0ba24a349..cdcf818b23f 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js +++ b/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminDashboardReportsRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-dashboard.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard.js index ca539ff87ad..fdff87f669f 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-dashboard.js +++ b/app/assets/javascripts/admin/addon/routes/admin-dashboard.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { scrollTop } from "discourse/mixins/scroll-top"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminDashboardRoute extends DiscourseRoute { activate() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js index 5a5d410c176..71458ff84eb 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js +++ b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import AdminEmailLogs from "admin/routes/admin-email-logs"; -import IncomingEmail from "admin/models/incoming-email"; -import IncomingEmailModal from "../components/modal/incoming-email"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import IncomingEmail from "admin/models/incoming-email"; +import AdminEmailLogs from "admin/routes/admin-email-logs"; +import IncomingEmailModal from "../components/modal/incoming-email"; export default class AdminEmailBouncedRoute extends AdminEmailLogs { @service modal; diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js index 104a0663945..e0ef990e50d 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js +++ b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js @@ -1,5 +1,5 @@ -import EmailPreview, { oneWeekAgo } from "admin/models/email-preview"; import DiscourseRoute from "discourse/routes/discourse"; +import EmailPreview, { oneWeekAgo } from "admin/models/email-preview"; export default class AdminEmailPreviewDigestRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js index bb8b73f77a5..0e2cc5d24af 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js +++ b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js @@ -1,8 +1,8 @@ import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; +import IncomingEmail from "admin/models/incoming-email"; import AdminEmailIncomings from "admin/routes/admin-email-incomings"; import IncomingEmailModal from "../components/modal/incoming-email"; -import IncomingEmail from "admin/models/incoming-email"; -import { inject as service } from "@ember/service"; export default class AdminEmailRejectedRoute extends AdminEmailIncomings { @service modal; diff --git a/app/assets/javascripts/admin/addon/routes/admin-emojis.js b/app/assets/javascripts/admin/addon/routes/admin-emojis.js index 793a2ef31c8..f1f6432e716 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-emojis.js +++ b/app/assets/javascripts/admin/addon/routes/admin-emojis.js @@ -1,6 +1,6 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminEmojisRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js index 213e80258fb..e04b2f6b4a8 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminLogsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js index d027c870f0a..0ee9132372c 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js @@ -1,6 +1,6 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject, { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminLogsStaffActionLogsRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-plugins.js b/app/assets/javascripts/admin/addon/routes/admin-plugins.js index ba021be4b93..ed4b6c1a5df 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-plugins.js +++ b/app/assets/javascripts/admin/addon/routes/admin-plugins.js @@ -1,6 +1,6 @@ import Route from "@ember/routing/route"; -import AdminPlugin from "admin/models/admin-plugin"; import { inject as service } from "@ember/service"; +import AdminPlugin from "admin/models/admin-plugin"; export default class AdminPluginsRoute extends Route { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-reports-index.js b/app/assets/javascripts/admin/addon/routes/admin-reports-index.js index e7196d83de5..59c31497e5a 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-reports-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-reports-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminReportsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-reports-show.js b/app/assets/javascripts/admin/addon/routes/admin-reports-show.js index 3f50d031af7..b06a093438f 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-reports-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-reports-show.js @@ -1,6 +1,6 @@ import { action } from "@ember/object"; -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminReportsShowRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js index 8c93fdc30dd..03de7453f4a 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js @@ -1,6 +1,6 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminSearchLogsIndexRoute extends DiscourseRoute { queryParams = { diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js index c0c658e6b5f..25bf963898c 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js +++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js @@ -1,8 +1,8 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; -import { fillMissingDates } from "discourse/lib/utilities"; import { translateResults } from "discourse/lib/search"; +import { fillMissingDates } from "discourse/lib/utilities"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminSearchLogsTermRoute extends DiscourseRoute { queryParams = { diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js index 0d4f770db80..bb90f8e34f2 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js +++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; export default class AdminSiteSettingsCategoryRoute extends DiscourseRoute { diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js index ebd4c28513d..7b2939490b0 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js @@ -2,8 +2,8 @@ Handles when you click the Site Settings tab in admin, but haven't chosen a category. It will redirect to the first category. **/ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminSiteSettingsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js index a424d954be7..a4b20779515 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js @@ -1,6 +1,6 @@ import Route from "@ember/routing/route"; -import { disableImplicitInjections } from "discourse/lib/implicit-injections"; import { inject as service } from "@ember/service"; +import { disableImplicitInjections } from "discourse/lib/implicit-injections"; @disableImplicitInjections export default class AdminSiteTextIndexRoute extends Route { diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js index fcde5d4d749..ae29c2e38d2 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js +++ b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js @@ -1,6 +1,6 @@ import Badge from "discourse/models/badge"; -import DiscourseRoute from "discourse/routes/discourse"; import UserBadge from "discourse/models/user-badge"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUserBadgesRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-index.js b/app/assets/javascripts/admin/addon/routes/admin-user-index.js index 7244eb35323..14a4b67ad93 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-user-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-user-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import Group from "discourse/models/group"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUserIndexRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-user.js b/app/assets/javascripts/admin/addon/routes/admin-user.js index 2fad4956a84..10e866e6280 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-user.js +++ b/app/assets/javascripts/admin/addon/routes/admin-user.js @@ -1,6 +1,6 @@ -import AdminUser from "admin/models/admin-user"; -import DiscourseRoute from "discourse/routes/discourse"; import { get } from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; +import AdminUser from "admin/models/admin-user"; export default class AdminUserRoute extends DiscourseRoute { serialize(model) { diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-index.js index 0dd8fcce4fd..6ba35bccb37 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-users-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-users-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUsersIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js index 7ccd3d62596..d62e0eea806 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUsersListIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list.js b/app/assets/javascripts/admin/addon/routes/admin-users-list.js index b9c246cb98c..56a25a571b2 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-users-list.js +++ b/app/assets/javascripts/admin/addon/routes/admin-users-list.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import AdminUser from "admin/models/admin-user"; -import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; -import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; +import AdminUser from "admin/models/admin-user"; export default class AdminUsersListRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js index 721e193b117..f37e2ce6f59 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js +++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; export default class AdminWatchedWordsActionRoute extends DiscourseRoute { diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js index 7eedaef9326..64dca12e68b 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminWatchedWordsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js index f7f821ddfd0..0dc7fbd6966 100644 --- a/app/assets/javascripts/admin/addon/services/admin-tools.js +++ b/app/assets/javascripts/admin/addon/services/admin-tools.js @@ -1,12 +1,12 @@ +import { getOwner } from "@ember/application"; +import { action } from "@ember/object"; +import Service, { inject as service } from "@ember/service"; +import { htmlSafe } from "@ember/template"; +import { Promise } from "rsvp"; +import { ajax } from "discourse/lib/ajax"; +import PenalizeUserModal from "admin/components/modal/penalize-user"; import AdminUser from "admin/models/admin-user"; import I18n from "I18n"; -import { Promise } from "rsvp"; -import Service, { inject as service } from "@ember/service"; -import { ajax } from "discourse/lib/ajax"; -import { getOwner } from "@ember/application"; -import { htmlSafe } from "@ember/template"; -import { action } from "@ember/object"; -import PenalizeUserModal from "admin/components/modal/penalize-user"; // A service that can act as a bridge between the front end Discourse application // and the admin application. Use this if you need front end code to access admin diff --git a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js index 4a2bde4f3d2..ae9371b1c2c 100644 --- a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js +++ b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; export default class DialogHolder extends Component { @service dialog; diff --git a/app/assets/javascripts/dialog-holder/addon/services/dialog.js b/app/assets/javascripts/dialog-holder/addon/services/dialog.js index 3ccaaf2df1a..6040c4027c6 100644 --- a/app/assets/javascripts/dialog-holder/addon/services/dialog.js +++ b/app/assets/javascripts/dialog-holder/addon/services/dialog.js @@ -1,7 +1,7 @@ +import { next } from "@ember/runloop"; import Service from "@ember/service"; import A11yDialog from "a11y-dialog"; import { bind } from "discourse-common/utils/decorators"; -import { next } from "@ember/runloop"; export default Service.extend({ dialogInstance: null, diff --git a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js index c109a7b1d33..681e24ddd2c 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js @@ -1,5 +1,5 @@ -import I18n from "I18n"; import { htmlSafe } from "@ember/template"; +import I18n from "I18n"; export default function boundI18n(key, options) { return htmlSafe(I18n.t(key, options)); diff --git a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js index 7df981e96f4..ed26d7a09b3 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js @@ -1,5 +1,5 @@ -import deprecated from "discourse-common/lib/deprecated"; import { htmlSafe } from "@ember/template"; +import deprecated from "discourse-common/lib/deprecated"; import { registerUnbound } from "discourse-common/lib/helpers"; import { renderIcon } from "discourse-common/lib/icon-library"; diff --git a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js index 995df7dfd2e..04a8ffddba0 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js @@ -1,5 +1,5 @@ -import I18n from "I18n"; import { registerUnbound } from "discourse-common/lib/helpers"; +import I18n from "I18n"; export default function i18n(key, params) { return I18n.t(key, params); diff --git a/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js b/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js index 41a7d7a2eb4..214ef05e934 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js +++ b/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js @@ -1,6 +1,6 @@ +import { escape } from "pretty-text/sanitizer"; import { getURLWithCDN } from "discourse-common/lib/get-url"; import { helperContext } from "discourse-common/lib/helpers"; -import { escape } from "pretty-text/sanitizer"; import { deepMerge } from "discourse-common/lib/object"; let allowedSizes = null; diff --git a/app/assets/javascripts/discourse-common/addon/lib/helpers.js b/app/assets/javascripts/discourse-common/addon/lib/helpers.js index a0d08262d32..f91bdf57cdb 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/helpers.js +++ b/app/assets/javascripts/discourse-common/addon/lib/helpers.js @@ -1,8 +1,8 @@ import Helper from "@ember/component/helper"; -import RawHandlebars from "discourse-common/lib/raw-handlebars"; import { get } from "@ember/object"; -import { htmlSafe } from "@ember/template"; import { dasherize } from "@ember/string"; +import { htmlSafe } from "@ember/template"; +import RawHandlebars from "discourse-common/lib/raw-handlebars"; export function makeArray(obj) { if (obj === null || obj === undefined) { diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js index b59c8dbc28b..f165968c8e6 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js +++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js @@ -1,9 +1,9 @@ -import I18n from "I18n"; -import attributeHook from "discourse-common/lib/attribute-hook"; import { h } from "virtual-dom"; import { isDevelopment } from "discourse-common/config/environment"; -import escape from "discourse-common/lib/escape"; +import attributeHook from "discourse-common/lib/attribute-hook"; import deprecated from "discourse-common/lib/deprecated"; +import escape from "discourse-common/lib/escape"; +import I18n from "I18n"; const SVG_NAMESPACE = "http://www.w3.org/2000/svg"; let _renderers = []; diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js index 2a7c2a3a747..52c6b3d4960 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js +++ b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js @@ -1,5 +1,5 @@ -import { getResolverOption } from "discourse-common/resolver"; import require from "require"; +import { getResolverOption } from "discourse-common/resolver"; export const __DISCOURSE_RAW_TEMPLATES = {}; diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js index f4f146506bc..651e48be51f 100644 --- a/app/assets/javascripts/discourse-common/addon/resolver.js +++ b/app/assets/javascripts/discourse-common/addon/resolver.js @@ -1,9 +1,9 @@ import { dasherize, decamelize } from "@ember/string"; +import Resolver from "ember-resolver"; import deprecated from "discourse-common/lib/deprecated"; +import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map"; import { findHelper } from "discourse-common/lib/helpers"; import SuffixTrie from "discourse-common/lib/suffix-trie"; -import Resolver from "ember-resolver"; -import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map"; let _options = {}; let moduleSuffixTrie = null; diff --git a/app/assets/javascripts/discourse-common/addon/utils/category-macro.js b/app/assets/javascripts/discourse-common/addon/utils/category-macro.js index 625cbde74dc..6afd08a56c2 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/category-macro.js +++ b/app/assets/javascripts/discourse-common/addon/utils/category-macro.js @@ -1,5 +1,5 @@ -import Category from "discourse/models/category"; import { computed, get } from "@ember/object"; +import Category from "discourse/models/category"; export default function categoryFromId(property) { return computed(property, function () { diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js index 56bab146578..1bc54021b1f 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js +++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js @@ -1,9 +1,3 @@ -import { on as emberOn } from "@ember/object/evented"; -import { - observes as emberObservesDecorator, - on as emberOnDecorator, -} from "@ember-decorators/object"; - import { observer } from "@ember/object"; import { alias as EmberAlias, @@ -35,15 +29,20 @@ import { union as EmberUnion, uniq as EmberUniq, } from "@ember/object/computed"; +import CoreObject from "@ember/object/core"; +import { on as emberOn } from "@ember/object/evented"; import { bind as emberBind, schedule } from "@ember/runloop"; +import { + observes as emberObservesDecorator, + on as emberOnDecorator, +} from "@ember-decorators/object"; +import discourseDebounce from "discourse-common/lib/debounce"; +import deprecated from "discourse-common/lib/deprecated"; import decoratorAlias from "discourse-common/utils/decorator-alias"; import extractValue from "discourse-common/utils/extract-value"; import handleDescriptor from "discourse-common/utils/handle-descriptor"; import isDescriptor from "discourse-common/utils/is-descriptor"; import macroAlias from "discourse-common/utils/macro-alias"; -import discourseDebounce from "discourse-common/lib/debounce"; -import CoreObject from "@ember/object/core"; -import deprecated from "discourse-common/lib/deprecated"; export default function discourseComputedDecorator(...params) { // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed diff --git a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js index d37e19111f8..20a7d4b7430 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js +++ b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js @@ -1,5 +1,5 @@ -import CoreObject from "@ember/object/core"; import { computed, get } from "@ember/object"; +import CoreObject from "@ember/object/core"; import extractValue from "./extract-value"; export default function handleDescriptor(target, key, desc, params = []) { diff --git a/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js b/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js index 7a2f4f87204..1004c13002f 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js +++ b/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js @@ -1,5 +1,5 @@ -import isDescriptor from "discourse-common/utils/is-descriptor"; import deprecated from "discourse-common/lib/deprecated"; +import isDescriptor from "discourse-common/utils/is-descriptor"; function handleDescriptor(target, property, desc, fn, params = []) { return { diff --git a/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js index 3d4f077eb45..e9c35a1fc60 100644 --- a/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js +++ b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js @@ -1,7 +1,7 @@ -import { avatarFor as avatar } from "discourse/widgets/post"; import { dateNode } from "discourse/helpers/node"; -import { iconNode } from "discourse-common/lib/icon-library"; +import { avatarFor as avatar } from "discourse/widgets/post"; import rawHtml from "discourse/widgets/raw-html"; +import { iconNode } from "discourse-common/lib/icon-library"; export default { avatar, diff --git a/app/assets/javascripts/discourse/app/adapters/post.js b/app/assets/javascripts/discourse/app/adapters/post.js index 3a203510f4f..58a7ce4094e 100644 --- a/app/assets/javascripts/discourse/app/adapters/post.js +++ b/app/assets/javascripts/discourse/app/adapters/post.js @@ -1,6 +1,6 @@ +import { underscore } from "@ember/string"; import RestAdapter, { Result } from "discourse/adapters/rest"; import { ajax } from "discourse/lib/ajax"; -import { underscore } from "@ember/string"; export default RestAdapter.extend({ find(store, type, findArgs) { diff --git a/app/assets/javascripts/discourse/app/adapters/rest.js b/app/assets/javascripts/discourse/app/adapters/rest.js index 6209ea9cca8..102c4afa32e 100644 --- a/app/assets/javascripts/discourse/app/adapters/rest.js +++ b/app/assets/javascripts/discourse/app/adapters/rest.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; +import { underscore } from "@ember/string"; import { ajax } from "discourse/lib/ajax"; import { hashString } from "discourse/lib/hash"; -import { underscore } from "@ember/string"; const ADMIN_MODELS = [ "plugin", diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js index e5bdd606dbb..5975ece8a44 100644 --- a/app/assets/javascripts/discourse/app/adapters/topic-list.js +++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js @@ -1,6 +1,6 @@ -import PreloadStore from "discourse/lib/preload-store"; import RestAdapter from "discourse/adapters/rest"; import { ajax } from "discourse/lib/ajax"; +import PreloadStore from "discourse/lib/preload-store"; export default RestAdapter.extend({ find(store, type, { filter, params }) { diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js index 1593ebe5057..8c0174c0c86 100644 --- a/app/assets/javascripts/discourse/app/app.js +++ b/app/assets/javascripts/discourse/app/app.js @@ -1,12 +1,11 @@ +import Application from "@ember/application"; import "./global-compat"; import "./loader-shims"; - import require from "require"; -import Application from "@ember/application"; -import { buildResolver } from "discourse-common/resolver"; -import { isTesting } from "discourse-common/config/environment"; -import { normalizeEmberEventHandling } from "./lib/ember-events"; import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections"; +import { isTesting } from "discourse-common/config/environment"; +import { buildResolver } from "discourse-common/resolver"; +import { normalizeEmberEventHandling } from "./lib/ember-events"; const _pluginCallbacks = []; let _unhandledThemeErrors = []; diff --git a/app/assets/javascripts/discourse/app/components/about-page-users.js b/app/assets/javascripts/discourse/app/components/about-page-users.js index 3ef57cf10a2..cd3c32e4bc5 100644 --- a/app/assets/javascripts/discourse/app/components/about-page-users.js +++ b/app/assets/javascripts/discourse/app/components/about-page-users.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { computed } from "@ember/object"; -import { prioritizeNameInUx } from "discourse/lib/settings"; import { renderAvatar } from "discourse/helpers/user-avatar"; +import { prioritizeNameInUx } from "discourse/lib/settings"; import { userPath } from "discourse/lib/url"; export default Component.extend({ diff --git a/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs index 86a5e087ceb..77527a6f8b9 100644 --- a/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs +++ b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs @@ -1,5 +1,5 @@ -import bodyClass from "discourse/helpers/body-class"; import { concat } from "@ember/helper"; +import bodyClass from "discourse/helpers/body-class"; const AddCategoryTagClasses =