Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 09:10:25 +08:00
Code Packages Activity Actions 11

DEV: Sort imports alphabetically (#11382)

Browse source
This commit is contained in:
Roman Rizzi 2020-12-01 15:31:26 -03:00 • committed by GitHub
parent d1d87b6fa3
commit bbe5d8d5cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1070 changed files with 3158 additions and 3158 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.eslintrc
View file

@ -2,7 +2,8 @@
"extends": "eslint-config-discourse", "extends": "eslint-config-discourse",
"rules": { "rules": {
"discourse-ember/global-ember": 2, "discourse-ember/global-ember": 2,
"no-duplicate-imports": 2 "no-duplicate-imports": 2,
"sort-imports": 2
}, },
"globals": { "globals": {
"moduleFor": "off", "moduleFor": "off",

2
app/assets/javascripts/admin/addon/components/ace-editor.js
View file

@ -1,6 +1,6 @@
import Component from "@ember/component"; import Component from "@ember/component";
import loadScript from "discourse/lib/load-script";
import getURL from "discourse-common/lib/get-url"; import getURL from "discourse-common/lib/get-url";
import loadScript from "discourse/lib/load-script";
import { observes } from "discourse-common/utils/decorators"; import { observes } from "discourse-common/utils/decorators";
import { on } from "@ember/object/evented"; import { on } from "@ember/object/evented";

8
app/assets/javascripts/admin/addon/components/admin-backups-logs.js
View file

@ -1,8 +1,8 @@
import I18n from "I18n";
import { scheduleOnce } from "@ember/runloop";
import Component from "@ember/component";
import discourseDebounce from "discourse/lib/debounce";
import { observes, on } from "discourse-common/utils/decorators"; import { observes, on } from "discourse-common/utils/decorators";
import Component from "@ember/component";
import I18n from "I18n";
import discourseDebounce from "discourse/lib/debounce";
import { scheduleOnce } from "@ember/runloop";
export default Component.extend({ export default Component.extend({
classNames: ["admin-backups-logs"], classNames: ["admin-backups-logs"],

4
app/assets/javascripts/admin/addon/components/admin-report-chart.js
View file

@ -1,8 +1,8 @@
import { makeArray } from "discourse-common/lib/helpers";
import { debounce, schedule } from "@ember/runloop"; import { debounce, schedule } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";
import { number } from "discourse/lib/formatter";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import { makeArray } from "discourse-common/lib/helpers";
import { number } from "discourse/lib/formatter";
export default Component.extend({ export default Component.extend({
classNames: ["admin-report-chart"], classNames: ["admin-report-chart"],

2
app/assets/javascripts/admin/addon/components/admin-report-counts.js
View file

@ -1,5 +1,5 @@
import { match } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import { match } from "@ember/object/computed";
export default Component.extend({ export default Component.extend({
allTime: true, allTime: true,
tagName: "tr", tagName: "tr",

4
app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js
View file

@ -1,8 +1,8 @@
import { makeArray } from "discourse-common/lib/helpers";
import { debounce, schedule } from "@ember/runloop"; import { debounce, schedule } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";
import { number } from "discourse/lib/formatter";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import { makeArray } from "discourse-common/lib/helpers";
import { number } from "discourse/lib/formatter";
export default Component.extend({ export default Component.extend({
classNames: ["admin-report-chart", "admin-report-stacked-chart"], classNames: ["admin-report-chart", "admin-report-stacked-chart"],

6
app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js
View file

@ -1,7 +1,7 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import { alias } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import { alias } from "@ember/object/computed";
import discourseComputed from "discourse-common/utils/decorators";
import { setting } from "discourse/lib/computed"; import { setting } from "discourse/lib/computed";
export default Component.extend({ export default Component.extend({

4
app/assets/javascripts/admin/addon/components/admin-report-table-cell.js
View file

@ -1,6 +1,6 @@
import discourseComputed from "discourse-common/utils/decorators";
import { alias } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import { alias } from "@ember/object/computed";
import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
tagName: "td", tagName: "td",

2
app/assets/javascripts/admin/addon/components/admin-report-table-header.js
View file

@ -1,5 +1,5 @@
import discourseComputed from "discourse-common/utils/decorators";
import Component from "@ember/component"; import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
tagName: "th", tagName: "th",

4
app/assets/javascripts/admin/addon/components/admin-report-table.js
View file

@ -1,7 +1,7 @@
import Component from "@ember/component";
import { alias } from "@ember/object/computed";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse-common/lib/helpers";
import { alias } from "@ember/object/computed";
import Component from "@ember/component";
const PAGES_LIMIT = 8; const PAGES_LIMIT = 8;

20
app/assets/javascripts/admin/addon/components/admin-report.js
View file

@ -1,16 +1,16 @@
import I18n from "I18n"; import EmberObject, { action, computed } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import { makeArray } from "discourse-common/lib/helpers";
import { alias, or, and, equal, notEmpty } from "@ember/object/computed";
import EmberObject, { computed, action } from "@ember/object";
import { next } from "@ember/runloop";
import Component from "@ember/component";
import ReportLoader from "discourse/lib/reports-loader";
import { exportEntity } from "discourse/lib/export-csv";
import { outputExportResult } from "discourse/lib/export-result";
import Report, { SCHEMA_VERSION } from "admin/models/report"; import Report, { SCHEMA_VERSION } from "admin/models/report";
import { alias, and, equal, notEmpty, or } from "@ember/object/computed";
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 { isPresent } from "@ember/utils"; import { isPresent } from "@ember/utils";
import { isTesting } from "discourse-common/config/environment"; 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";
const TABLE_OPTIONS = { const TABLE_OPTIONS = {
perPage: 8, perPage: 8,

4
app/assets/javascripts/admin/addon/components/admin-theme-editor.js
View file

@ -1,8 +1,8 @@
import I18n from "I18n";
import { next } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { fmt } from "discourse/lib/computed"; import { fmt } from "discourse/lib/computed";
import { next } from "@ember/runloop";
export default Component.extend({ export default Component.extend({
@discourseComputed("theme.targets", "onlyOverridden", "showAdvanced") @discourseComputed("theme.targets", "onlyOverridden", "showAdvanced")

18
app/assets/javascripts/admin/addon/components/admin-user-field-item.js
View file

@ -1,16 +1,16 @@
import I18n from "I18n";
import { isEmpty } from "@ember/utils";
import { empty } from "@ember/object/computed";
import { scheduleOnce } from "@ember/runloop";
import Component from "@ember/component";
import UserField from "admin/models/user-field";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { propertyEqual, i18n } from "discourse/lib/computed";
import discourseComputed, { import discourseComputed, {
observes, observes,
on, on,
} from "discourse-common/utils/decorators"; } 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 { empty } from "@ember/object/computed";
import { isEmpty } from "@ember/utils";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { scheduleOnce } from "@ember/runloop";
export default Component.extend(bufferedProperty("userField"), { export default Component.extend(bufferedProperty("userField"), {
editing: empty("userField.id"), editing: empty("userField.id"),

4
app/assets/javascripts/admin/addon/components/admin-watched-word.js
View file

@ -1,7 +1,7 @@
import I18n from "I18n";
import Component from "@ember/component"; import Component from "@ember/component";
import { iconHTML } from "discourse-common/lib/icon-library"; import I18n from "I18n";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { iconHTML } from "discourse-common/lib/icon-library";
export default Component.extend({ export default Component.extend({
classNames: ["watched-word"], classNames: ["watched-word"],

6
app/assets/javascripts/admin/addon/components/admin-web-hook-event-chooser.js
View file

@ -1,7 +1,7 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import { alias } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import { alias } from "@ember/object/computed";
import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
classNames: ["hook-event"], classNames: ["hook-event"],

10
app/assets/javascripts/admin/addon/components/admin-web-hook-event.js
View file

@ -1,10 +1,10 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import Component from "@ember/component";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter"; import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter";
import Component from "@ember/component";
import I18n from "I18n";
import { ajax } from "discourse/lib/ajax";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Component.extend({ export default Component.extend({
tagName: "li", tagName: "li",

2
app/assets/javascripts/admin/addon/components/admin-web-hook-status.js
View file

@ -1,6 +1,6 @@
import Component from "@ember/component";
import I18n from "I18n"; import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import Component from "@ember/component";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
export default Component.extend({ export default Component.extend({

6
app/assets/javascripts/admin/addon/components/color-input.js
View file

@ -1,8 +1,8 @@
import { schedule } from "@ember/runloop"; import { action, computed } from "@ember/object";
import Component from "@ember/component";
import { computed, action } from "@ember/object";
import loadScript, { loadCSS } from "discourse/lib/load-script"; import loadScript, { loadCSS } from "discourse/lib/load-script";
import Component from "@ember/component";
import { observes } from "discourse-common/utils/decorators"; import { observes } from "discourse-common/utils/decorators";
import { schedule } from "@ember/runloop";
/** /**
An input field for a color. An input field for a color.

4
app/assets/javascripts/admin/addon/components/email-styles-editor.js
View file

@ -1,8 +1,8 @@
import Component from "@ember/component";
import I18n from "I18n"; import I18n from "I18n";
import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { reads } from "@ember/object/computed"; import { reads } from "@ember/object/computed";
import Component from "@ember/component";
import bootbox from "bootbox";
export default Component.extend({ export default Component.extend({
editorId: reads("fieldName"), editorId: reads("fieldName"),

14
app/assets/javascripts/admin/addon/components/embeddable-host.js
View file

@ -1,16 +1,16 @@
import I18n from "I18n";
import discourseComputed, { import discourseComputed, {
on,
observes, observes,
on,
} from "discourse-common/utils/decorators"; } from "discourse-common/utils/decorators";
import Category from "discourse/models/category";
import Component from "@ember/component";
import I18n from "I18n";
import bootbox from "bootbox";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import { or } from "@ember/object/computed"; import { or } from "@ember/object/computed";
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import Category from "discourse/models/category"; import { schedule } from "@ember/runloop";
import bootbox from "bootbox";
export default Component.extend(bufferedProperty("host"), { export default Component.extend(bufferedProperty("host"), {
editToggled: false, editToggled: false,

2
app/assets/javascripts/admin/addon/components/embedding-setting.js
View file

@ -1,5 +1,5 @@
import discourseComputed from "discourse-common/utils/decorators";
import Component from "@ember/component"; import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
classNames: ["embed-setting"], classNames: ["embed-setting"],

2
app/assets/javascripts/admin/addon/components/highlighted-code.js
View file

@ -1,5 +1,5 @@
import { observes, on } from "discourse-common/utils/decorators";
import Component from "@ember/component"; import Component from "@ember/component";
import { on, observes } from "discourse-common/utils/decorators";
import highlightSyntax from "discourse/lib/highlight-syntax"; import highlightSyntax from "discourse/lib/highlight-syntax";
export default Component.extend({ export default Component.extend({

14
app/assets/javascripts/admin/addon/components/ip-lookup.js
View file

@ -1,12 +1,12 @@
import I18n from "I18n";
import EmberObject from "@ember/object";
import { later } from "@ember/runloop";
import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators";
import { ajax } from "discourse/lib/ajax";
import AdminUser from "admin/models/admin-user"; import AdminUser from "admin/models/admin-user";
import copyText from "discourse/lib/copy-text"; import Component from "@ember/component";
import EmberObject from "@ember/object";
import I18n from "I18n";
import { ajax } from "discourse/lib/ajax";
import bootbox from "bootbox"; import bootbox from "bootbox";
import copyText from "discourse/lib/copy-text";
import discourseComputed from "discourse-common/utils/decorators";
import { later } from "@ember/runloop";
export default Component.extend({ export default Component.extend({
classNames: ["ip-lookup"], classNames: ["ip-lookup"],

4
app/assets/javascripts/admin/addon/components/penalty-post-action.js
View file

@ -1,9 +1,9 @@
import I18n from "I18n";
import discourseComputed, { import discourseComputed, {
afterRender, afterRender,
} from "discourse-common/utils/decorators"; } from "discourse-common/utils/decorators";
import { equal } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import { equal } from "@ember/object/computed";
const ACTIONS = ["delete", "delete_replies", "edit", "none"]; const ACTIONS = ["delete", "delete_replies", "edit", "none"];

8
app/assets/javascripts/admin/addon/components/permalink-form.js
View file

@ -1,10 +1,10 @@
import I18n from "I18n";
import { schedule } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators"; import I18n from "I18n";
import { fmt } from "discourse/lib/computed";
import Permalink from "admin/models/permalink"; import Permalink from "admin/models/permalink";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
import { fmt } from "discourse/lib/computed";
import { schedule } from "@ember/runloop";
export default Component.extend({ export default Component.extend({
classNames: ["permalink-form"], classNames: ["permalink-form"],

2
app/assets/javascripts/admin/addon/components/report-filters/bool.js
View file

@ -1,5 +1,5 @@
import { action } from "@ember/object";
import FilterComponent from "admin/components/report-filters/filter"; import FilterComponent from "admin/components/report-filters/filter";
import { action } from "@ember/object";
export default FilterComponent.extend({ export default FilterComponent.extend({
checked: false, checked: false,

2
app/assets/javascripts/admin/addon/components/report-filters/category.js
View file

@ -1,6 +1,6 @@
import FilterComponent from "admin/components/report-filters/filter";
import { action } from "@ember/object"; import { action } from "@ember/object";
import { readOnly } from "@ember/object/computed"; import { readOnly } from "@ember/object/computed";
import FilterComponent from "admin/components/report-filters/filter";
export default FilterComponent.extend({ export default FilterComponent.extend({
category: readOnly("filter.default"), category: readOnly("filter.default"),

2
app/assets/javascripts/admin/addon/components/report-filters/group.js
View file

@ -1,5 +1,5 @@
import { computed } from "@ember/object";
import FilterComponent from "admin/components/report-filters/filter"; import FilterComponent from "admin/components/report-filters/filter";
import { computed } from "@ember/object";
export default FilterComponent.extend({ export default FilterComponent.extend({
classNames: ["group-filter"], classNames: ["group-filter"],

6
app/assets/javascripts/admin/addon/components/resumable-upload.js
View file

@ -1,9 +1,9 @@
import getURL from "discourse-common/lib/get-url"; import discourseComputed, { on } from "discourse-common/utils/decorators";
import I18n from "I18n";
import { later, schedule } from "@ember/runloop"; import { later, schedule } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import getURL from "discourse-common/lib/get-url";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
import discourseComputed, { on } from "discourse-common/utils/decorators";
/*global Resumable:true */ /*global Resumable:true */

6
app/assets/javascripts/admin/addon/components/screened-ip-address-form.js
View file

@ -1,9 +1,9 @@
import I18n from "I18n";
import discourseComputed, { on } from "discourse-common/utils/decorators"; import discourseComputed, { on } from "discourse-common/utils/decorators";
import { schedule } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";
import bootbox from "bootbox"; import I18n from "I18n";
import ScreenedIpAddress from "admin/models/screened-ip-address"; import ScreenedIpAddress from "admin/models/screened-ip-address";
import bootbox from "bootbox";
import { schedule } from "@ember/runloop";
/** /**
A form to create an IP address that will be blocked or allowed. A form to create an IP address that will be blocked or allowed.

2
app/assets/javascripts/admin/addon/components/secret-value-list.js
View file

@ -1,6 +1,6 @@
import Component from "@ember/component";
import I18n from "I18n"; import I18n from "I18n";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import Component from "@ember/component";
import { on } from "discourse-common/utils/decorators"; import { on } from "discourse-common/utils/decorators";
import { set } from "@ember/object"; import { set } from "@ember/object";

2
app/assets/javascripts/admin/addon/components/simple-list.js
View file

@ -1,6 +1,6 @@
import { empty } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import { action } from "@ember/object"; import { action } from "@ember/object";
import { empty } from "@ember/object/computed";
import { on } from "discourse-common/utils/decorators"; import { on } from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({

4
app/assets/javascripts/admin/addon/components/site-setting.js
View file

@ -1,7 +1,7 @@
import Component from "@ember/component";
import BufferedContent from "discourse/mixins/buffered-content"; import BufferedContent from "discourse/mixins/buffered-content";
import SiteSetting from "admin/models/site-setting"; import Component from "@ember/component";
import SettingComponent from "admin/mixins/setting-component"; import SettingComponent from "admin/mixins/setting-component";
import SiteSetting from "admin/models/site-setting";
import { readOnly } from "@ember/object/computed"; import { readOnly } from "@ember/object/computed";
export default Component.extend(BufferedContent, SettingComponent, { export default Component.extend(BufferedContent, SettingComponent, {

2
app/assets/javascripts/admin/addon/components/site-settings/bool.js
View file

@ -1,6 +1,6 @@
import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import Component from "@ember/component";
export default Component.extend({ export default Component.extend({
@discourseComputed("value") @discourseComputed("value")

2
app/assets/javascripts/admin/addon/components/site-settings/category-list.js
View file

@ -1,5 +1,5 @@
import Component from "@ember/component";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import Component from "@ember/component";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
export default Component.extend({ export default Component.extend({

2
app/assets/javascripts/admin/addon/components/site-settings/color.js
View file

@ -1,5 +1,5 @@
import { action, computed } from "@ember/object";
import Component from "@ember/component"; import Component from "@ember/component";
import { computed, action } from "@ember/object";
function RGBToHex(rgb) { function RGBToHex(rgb) {
// Choose correct separator // Choose correct separator

2
app/assets/javascripts/admin/addon/components/site-settings/group-list.js
View file

@ -1,5 +1,5 @@
import { computed } from "@ember/object";
import Component from "@ember/component"; import Component from "@ember/component";
import { computed } from "@ember/object";
export default Component.extend({ export default Component.extend({
tokenSeparator: "|", tokenSeparator: "|",

2
app/assets/javascripts/admin/addon/components/site-settings/tag-list.js
View file

@ -1,6 +1,6 @@
import discourseComputed from "discourse-common/utils/decorators";
import Component from "@ember/component"; import Component from "@ember/component";
import { action } from "@ember/object"; import { action } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
@discourseComputed("value") @discourseComputed("value")

2
app/assets/javascripts/admin/addon/components/site-text-summary.js
View file

@ -1,6 +1,6 @@
import Component from "@ember/component"; import Component from "@ember/component";
import { on } from "discourse-common/utils/decorators";
import highlightHTML from "discourse/lib/highlight-html"; import highlightHTML from "discourse/lib/highlight-html";
import { on } from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
classNames: ["site-text"], classNames: ["site-text"],

4
app/assets/javascripts/admin/addon/components/suspension-details.js
View file

@ -1,8 +1,8 @@
import Component from "@ember/component"; import Component from "@ember/component";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "I18n"; import I18n from "I18n";
import { equal } from "@ember/object/computed";
import { action } from "@ember/object"; import { action } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import { equal } from "@ember/object/computed";
const CUSTOM_REASON_KEY = "custom"; const CUSTOM_REASON_KEY = "custom";

4
app/assets/javascripts/admin/addon/components/tags-uploader.js
View file

@ -1,7 +1,7 @@
import I18n from "I18n";
import { alias } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import UploadMixin from "discourse/mixins/upload"; import UploadMixin from "discourse/mixins/upload";
import { alias } from "@ember/object/computed";
import bootbox from "bootbox"; import bootbox from "bootbox";
export default Component.extend(UploadMixin, { export default Component.extend(UploadMixin, {

2
app/assets/javascripts/admin/addon/components/theme-setting-editor.js
View file

@ -1,5 +1,5 @@
import Component from "@ember/component";
import BufferedContent from "discourse/mixins/buffered-content"; import BufferedContent from "discourse/mixins/buffered-content";
import Component from "@ember/component";
import SettingComponent from "admin/mixins/setting-component"; import SettingComponent from "admin/mixins/setting-component";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { url } from "discourse/lib/computed"; import { url } from "discourse/lib/computed";

2
app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js
View file

@ -1,5 +1,5 @@
import Component from "@ember/component";
import BufferedContent from "discourse/mixins/buffered-content"; import BufferedContent from "discourse/mixins/buffered-content";
import Component from "@ember/component";
import SettingComponent from "admin/mixins/setting-component"; import SettingComponent from "admin/mixins/setting-component";
export default Component.extend(BufferedContent, SettingComponent, { export default Component.extend(BufferedContent, SettingComponent, {

4
app/assets/javascripts/admin/addon/components/theme-translation.js
View file

@ -1,7 +1,7 @@
import { alias } from "@ember/object/computed";
import Component from "@ember/component";
import BufferedContent from "discourse/mixins/buffered-content"; import BufferedContent from "discourse/mixins/buffered-content";
import Component from "@ember/component";
import SettingComponent from "admin/mixins/setting-component"; import SettingComponent from "admin/mixins/setting-component";
import { alias } from "@ember/object/computed";
export default Component.extend(BufferedContent, SettingComponent, { export default Component.extend(BufferedContent, SettingComponent, {
layoutName: "admin/templates/components/site-setting", layoutName: "admin/templates/components/site-setting",

8
app/assets/javascripts/admin/addon/components/themes-list-item.js
View file

@ -1,10 +1,10 @@
import { gt, and } from "@ember/object/computed"; import { and, gt } from "@ember/object/computed";
import { schedule } from "@ember/runloop";
import Component from "@ember/component";
import discourseComputed, { observes } from "discourse-common/utils/decorators"; import discourseComputed, { observes } from "discourse-common/utils/decorators";
import { iconHTML } from "discourse-common/lib/icon-library"; import Component from "@ember/component";
import { escape } from "pretty-text/sanitizer"; import { escape } from "pretty-text/sanitizer";
import { iconHTML } from "discourse-common/lib/icon-library";
import { isTesting } from "discourse-common/config/environment"; import { isTesting } from "discourse-common/config/environment";
import { schedule } from "@ember/runloop";
const MAX_COMPONENTS = 4; const MAX_COMPONENTS = 4;

4
app/assets/javascripts/admin/addon/components/themes-list.js
View file

@ -1,6 +1,6 @@
import { gt, equal } from "@ember/object/computed"; import { COMPONENTS, THEMES } from "admin/models/theme";
import { equal, gt } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import { THEMES, COMPONENTS } from "admin/models/theme";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";

2
app/assets/javascripts/admin/addon/components/value-list.js
View file

@ -1,7 +1,7 @@
import discourseComputed, { on } from "discourse-common/utils/decorators"; import discourseComputed, { on } from "discourse-common/utils/decorators";
import { makeArray } from "discourse-common/lib/helpers";
import { empty, reads } from "@ember/object/computed"; import { empty, reads } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import { makeArray } from "discourse-common/lib/helpers";
export default Component.extend({ export default Component.extend({
classNameBindings: [":value-list"], classNameBindings: [":value-list"],

14
app/assets/javascripts/admin/addon/components/watched-word-form.js
View file

@ -1,13 +1,13 @@
import I18n from "I18n"; import discourseComputed, {
import { isEmpty } from "@ember/utils"; observes,
import { schedule } from "@ember/runloop"; on,
} from "discourse-common/utils/decorators";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import WatchedWord from "admin/models/watched-word"; import WatchedWord from "admin/models/watched-word";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed, { import { isEmpty } from "@ember/utils";
on, import { schedule } from "@ember/runloop";
observes,
} from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
classNames: ["watched-word-form"], classNames: ["watched-word-form"],

6
app/assets/javascripts/admin/addon/components/watched-word-uploader.js
View file

@ -1,9 +1,9 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import { alias } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import I18n from "I18n";
import UploadMixin from "discourse/mixins/upload"; import UploadMixin from "discourse/mixins/upload";
import { alias } from "@ember/object/computed";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
export default Component.extend(UploadMixin, { export default Component.extend(UploadMixin, {
type: "txt", type: "txt",

2
app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js
View file

@ -1,5 +1,5 @@
import { popupAjaxError } from "discourse/lib/ajax-error";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend({ export default Controller.extend({
actions: { actions: {

4
app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
View file

@ -1,7 +1,7 @@
import I18n from "I18n";
import { isBlank } from "@ember/utils";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { isBlank } from "@ember/utils";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";

4
app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
View file

@ -1,8 +1,8 @@
import { bufferedProperty } from "discourse/mixins/buffered-content";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { empty } from "@ember/object/computed";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import { empty } from "@ember/object/computed";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
export default Controller.extend(bufferedProperty("model"), { export default Controller.extend(bufferedProperty("model"), {

8
app/assets/javascripts/admin/addon/controllers/admin-backups-index.js
View file

@ -1,10 +1,10 @@
import I18n from "I18n";
import { alias, equal } from "@ember/object/computed";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { alias, equal } from "@ember/object/computed";
import { i18n, setting } from "discourse/lib/computed";
import I18n from "I18n";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import discourseComputed from "discourse-common/utils/decorators";
import { setting, i18n } from "discourse/lib/computed";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
adminBackups: controller(), adminBackups: controller(),

2
app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js
View file

@ -1,5 +1,5 @@
import { alias } from "@ember/object/computed";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { alias } from "@ember/object/computed";
export default Controller.extend({ export default Controller.extend({
adminBackups: controller(), adminBackups: controller(),

2
app/assets/javascripts/admin/addon/controllers/admin-backups.js
View file

@ -1,4 +1,4 @@
import { not, and } from "@ember/object/computed"; import { and, not } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
export default Controller.extend({ export default Controller.extend({
noOperationIsRunning: not("model.isOperationRunning"), noOperationIsRunning: not("model.isOperationRunning"),

4
app/assets/javascripts/admin/addon/controllers/admin-badges-award.js
View file

@ -1,8 +1,8 @@
import I18n from "I18n";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import I18n from "I18n";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend({ export default Controller.extend({
saving: false, saving: false,

14
app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
View file

@ -1,12 +1,12 @@
import I18n from "I18n";
import discourseComputed, { observes } from "discourse-common/utils/decorators";
import { reads } from "@ember/object/computed";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error"; import discourseComputed, { observes } from "discourse-common/utils/decorators";
import { bufferedProperty } from "discourse/mixins/buffered-content"; import I18n from "I18n";
import { propertyNotEqual } from "discourse/lib/computed";
import { run } from "@ember/runloop";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { propertyNotEqual } from "discourse/lib/computed";
import { reads } from "@ember/object/computed";
import { run } from "@ember/runloop";
export default Controller.extend(bufferedProperty("model"), { export default Controller.extend(bufferedProperty("model"), {
adminBadges: controller(), adminBadges: controller(),

2
app/assets/javascripts/admin/addon/controllers/admin-badges.js
View file

@ -1,6 +1,6 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { inject as service } from "@ember/service";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { inject as service } from "@ember/service";
export default Controller.extend({ export default Controller.extend({
routing: service("-routing"), routing: service("-routing"),

4
app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
View file

@ -1,8 +1,8 @@
import Controller from "@ember/controller";
import I18n from "I18n"; import I18n from "I18n";
import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { later } from "@ember/runloop"; import { later } from "@ember/runloop";
import Controller from "@ember/controller";
import bootbox from "bootbox";
export default Controller.extend({ export default Controller.extend({
@discourseComputed("model.colors", "onlyOverridden") @discourseComputed("model.colors", "onlyOverridden")

6
app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js
View file

@ -1,8 +1,8 @@
import I18n from "I18n";
import EmberObject from "@ember/object";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import showModal from "discourse/lib/show-modal"; import EmberObject from "@ember/object";
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import showModal from "discourse/lib/show-modal";
export default Controller.extend({ export default Controller.extend({
@discourseComputed("model.@each.id") @discourseComputed("model.@each.id")

4
app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js
View file

@ -1,7 +1,7 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import I18n from "I18n";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
@discourseComputed("model.isSaving") @discourseComputed("model.isSaving")

8
app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js
View file

@ -1,10 +1,10 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error"; import I18n from "I18n";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { action } from "@ember/object"; import { action } from "@ember/object";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend(bufferedProperty("emailTemplate"), { export default Controller.extend(bufferedProperty("emailTemplate"), {
adminCustomizeEmailTemplates: controller(), adminCustomizeEmailTemplates: controller(),

4
app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js
View file

@ -1,6 +1,6 @@
import { sort } from "@ember/object/computed";
import { action } from "@ember/object";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { action } from "@ember/object";
import { sort } from "@ember/object/computed";
export default Controller.extend({ export default Controller.extend({
sortedTemplates: sort("emailTemplates", "titleSorting"), sortedTemplates: sort("emailTemplates", "titleSorting"),

2
app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js
View file

@ -1,7 +1,7 @@
import { not } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { bufferedProperty } from "discourse/mixins/buffered-content"; import { bufferedProperty } from "discourse/mixins/buffered-content";
import { not } from "@ember/object/computed";
import { propertyEqual } from "discourse/lib/computed"; import { propertyEqual } from "discourse/lib/computed";
export default Controller.extend(bufferedProperty("model"), { export default Controller.extend(bufferedProperty("model"), {

4
app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
View file

@ -1,7 +1,7 @@
import I18n from "I18n";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { url } from "discourse/lib/computed"; import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { url } from "discourse/lib/computed";
export default Controller.extend({ export default Controller.extend({
section: null, section: null,

16
app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js
View file

@ -1,21 +1,21 @@
import I18n from "I18n"; import { COMPONENTS, THEMES } from "admin/models/theme";
import { makeArray } from "discourse-common/lib/helpers";
import { import {
empty, empty,
filterBy, filterBy,
match,
mapBy, mapBy,
match,
notEmpty, notEmpty,
} from "@ember/object/computed"; } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import EmberObject from "@ember/object";
import I18n from "I18n";
import ThemeSettings from "admin/models/theme-settings";
import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { url } from "discourse/lib/computed"; import { makeArray } from "discourse-common/lib/helpers";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
import ThemeSettings from "admin/models/theme-settings"; import { url } from "discourse/lib/computed";
import { THEMES, COMPONENTS } from "admin/models/theme";
import EmberObject from "@ember/object";
import bootbox from "bootbox";
const THEME_UPLOAD_VAR = 2; const THEME_UPLOAD_VAR = 2;

2
app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js
View file

@ -1,6 +1,6 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseComputed from "discourse-common/utils/decorators";
import { THEMES } from "admin/models/theme"; import { THEMES } from "admin/models/theme";
import discourseComputed from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
currentTab: THEMES, currentTab: THEMES,

10
app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js
View file

@ -1,13 +1,13 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import { makeArray } from "discourse-common/lib/helpers";
import Controller, { inject } from "@ember/controller"; import Controller, { inject } from "@ember/controller";
import { setting } from "discourse/lib/computed";
import AdminDashboard from "admin/models/admin-dashboard"; import AdminDashboard from "admin/models/admin-dashboard";
import Report from "admin/models/report"; import I18n from "I18n";
import PeriodComputationMixin from "admin/mixins/period-computation"; import PeriodComputationMixin from "admin/mixins/period-computation";
import Report from "admin/models/report";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import getURL from "discourse-common/lib/get-url"; import getURL from "discourse-common/lib/get-url";
import { makeArray } from "discourse-common/lib/helpers";
import { setting } from "discourse/lib/computed";
function staticReport(reportType) { function staticReport(reportType) {
return computed("reports.[]", function () { return computed("reports.[]", function () {

4
app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js
View file

@ -1,8 +1,8 @@
import getURL from "discourse-common/lib/get-url";
import discourseComputed from "discourse-common/utils/decorators";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import PeriodComputationMixin from "admin/mixins/period-computation"; import PeriodComputationMixin from "admin/mixins/period-computation";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import getURL from "discourse-common/lib/get-url";
export default Controller.extend(PeriodComputationMixin, { export default Controller.extend(PeriodComputationMixin, {
@discourseComputed @discourseComputed

4
app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js
View file

@ -1,7 +1,7 @@
import discourseComputed from "discourse-common/utils/decorators";
import { debounce } from "@ember/runloop";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import { debounce } from "@ember/runloop";
import discourseComputed from "discourse-common/utils/decorators";
const { get } = Ember; const { get } = Ember;

6
app/assets/javascripts/admin/addon/controllers/admin-dashboard.js
View file

@ -1,9 +1,9 @@
import discourseComputed from "discourse-common/utils/decorators";
import Controller, { inject } from "@ember/controller"; import Controller, { inject } from "@ember/controller";
import { setting } from "discourse/lib/computed";
import { computed } from "@ember/object";
import AdminDashboard from "admin/models/admin-dashboard"; import AdminDashboard from "admin/models/admin-dashboard";
import VersionCheck from "admin/models/version-check"; import VersionCheck from "admin/models/version-check";
import { computed } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import { setting } from "discourse/lib/computed";
const PROBLEMS_CHECK_MINUTES = 1; const PROBLEMS_CHECK_MINUTES = 1;

2
app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js
View file

@ -1,7 +1,7 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs"; import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import { INPUT_DELAY } from "discourse-common/config/environment";
import discourseDebounce from "discourse/lib/debounce"; import discourseDebounce from "discourse/lib/debounce";
import { observes } from "discourse-common/utils/decorators"; import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment";
export default AdminEmailLogsController.extend({ export default AdminEmailLogsController.extend({
@observes("filter.{status,user,address,type}") @observes("filter.{status,user,address,type}")

6
app/assets/javascripts/admin/addon/controllers/admin-email-index.js
View file

@ -1,9 +1,9 @@
import I18n from "I18n";
import { empty } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import I18n from "I18n";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { observes } from "discourse-common/utils/decorators";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { empty } from "@ember/object/computed";
import { observes } from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
/** /**

4
app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js
View file

@ -1,8 +1,8 @@
import { empty, or, notEmpty } from "@ember/object/computed"; import { empty, notEmpty, or } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import EmailPreview from "admin/models/email-preview"; import EmailPreview from "admin/models/email-preview";
import { popupAjaxError } from "discourse/lib/ajax-error";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend({ export default Controller.extend({
username: null, username: null,

6
app/assets/javascripts/admin/addon/controllers/admin-email-received.js
View file

@ -1,8 +1,8 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs"; import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import discourseDebounce from "discourse/lib/debounce";
import IncomingEmail from "admin/models/incoming-email";
import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import IncomingEmail from "admin/models/incoming-email";
import discourseDebounce from "discourse/lib/debounce";
import { observes } from "discourse-common/utils/decorators";
export default AdminEmailLogsController.extend({ export default AdminEmailLogsController.extend({
@observes("filter.{status,from,to,subject}") @observes("filter.{status,from,to,subject}")

6
app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js
View file

@ -1,8 +1,8 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs"; import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import discourseDebounce from "discourse/lib/debounce";
import IncomingEmail from "admin/models/incoming-email";
import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import IncomingEmail from "admin/models/incoming-email";
import discourseDebounce from "discourse/lib/debounce";
import { observes } from "discourse-common/utils/decorators";
export default AdminEmailLogsController.extend({ export default AdminEmailLogsController.extend({
@observes("filter.{status,from,to,subject,error}") @observes("filter.{status,from,to,subject,error}")

2
app/assets/javascripts/admin/addon/controllers/admin-email-sent.js
View file

@ -1,7 +1,7 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs"; import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import { INPUT_DELAY } from "discourse-common/config/environment";
import discourseDebounce from "discourse/lib/debounce"; import discourseDebounce from "discourse/lib/debounce";
import { observes } from "discourse-common/utils/decorators"; import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment";
export default AdminEmailLogsController.extend({ export default AdminEmailLogsController.extend({
@observes("filter.{status,user,address,type,reply_key}") @observes("filter.{status,user,address,type,reply_key}")

2
app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js
View file

@ -1,7 +1,7 @@
import AdminEmailLogsController from "admin/controllers/admin-email-logs"; import AdminEmailLogsController from "admin/controllers/admin-email-logs";
import { INPUT_DELAY } from "discourse-common/config/environment";
import discourseDebounce from "discourse/lib/debounce"; import discourseDebounce from "discourse/lib/debounce";
import { observes } from "discourse-common/utils/decorators"; import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment";
export default AdminEmailLogsController.extend({ export default AdminEmailLogsController.extend({
@observes("filter.{status,user,address,type}") @observes("filter.{status,user,address,type}")

2
app/assets/javascripts/admin/addon/controllers/admin-embedding.js
View file

@ -1,5 +1,5 @@
import discourseComputed from "discourse-common/utils/decorators";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend({ export default Controller.extend({

4
app/assets/javascripts/admin/addon/controllers/admin-emojis.js
View file

@ -1,9 +1,9 @@
import I18n from "I18n";
import { sort } from "@ember/object/computed";
import EmberObject, { action, computed } from "@ember/object"; import EmberObject, { action, computed } from "@ember/object";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import I18n from "I18n";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { sort } from "@ember/object/computed";
const ALL_FILTER = "all"; const ALL_FILTER = "all";

2
app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js
View file

@ -1,7 +1,7 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import ScreenedEmail from "admin/models/screened-email";
import { exportEntity } from "discourse/lib/export-csv"; import { exportEntity } from "discourse/lib/export-csv";
import { outputExportResult } from "discourse/lib/export-result"; import { outputExportResult } from "discourse/lib/export-result";
import ScreenedEmail from "admin/models/screened-email";
export default Controller.extend({ export default Controller.extend({
loading: false, loading: false,

12
app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js
View file

@ -1,12 +1,12 @@
import I18n from "I18n";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseDebounce from "discourse/lib/debounce"; import I18n from "I18n";
import { outputExportResult } from "discourse/lib/export-result";
import { exportEntity } from "discourse/lib/export-csv";
import ScreenedIpAddress from "admin/models/screened-ip-address";
import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import ScreenedIpAddress from "admin/models/screened-ip-address";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseDebounce from "discourse/lib/debounce";
import { exportEntity } from "discourse/lib/export-csv";
import { observes } from "discourse-common/utils/decorators";
import { outputExportResult } from "discourse/lib/export-result";
export default Controller.extend({ export default Controller.extend({
loading: false, loading: false,

2
app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js
View file

@ -1,7 +1,7 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import ScreenedUrl from "admin/models/screened-url";
import { exportEntity } from "discourse/lib/export-csv"; import { exportEntity } from "discourse/lib/export-csv";
import { outputExportResult } from "discourse/lib/export-result"; import { outputExportResult } from "discourse/lib/export-result";
import ScreenedUrl from "admin/models/screened-url";
export default Controller.extend({ export default Controller.extend({
loading: false, loading: false,

4
app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
View file

@ -1,10 +1,10 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { scheduleOnce } from "@ember/runloop"; import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { exportEntity } from "discourse/lib/export-csv"; import { exportEntity } from "discourse/lib/export-csv";
import { outputExportResult } from "discourse/lib/export-result"; import { outputExportResult } from "discourse/lib/export-result";
import I18n from "I18n"; import { scheduleOnce } from "@ember/runloop";
export default Controller.extend({ export default Controller.extend({
queryParams: ["filters"], queryParams: ["filters"],

8
app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
View file

@ -1,10 +1,10 @@
import I18n from "I18n";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseDebounce from "discourse/lib/debounce"; import I18n from "I18n";
import Permalink from "admin/models/permalink";
import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import Permalink from "admin/models/permalink";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseDebounce from "discourse/lib/debounce";
import { observes } from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
loading: false, loading: false,

2
app/assets/javascripts/admin/addon/controllers/admin-plugins.js
View file

@ -1,5 +1,5 @@
import discourseComputed from "discourse-common/utils/decorators";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseComputed from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
@discourseComputed @discourseComputed

2
app/assets/javascripts/admin/addon/controllers/admin-reports-show.js
View file

@ -1,5 +1,5 @@
import discourseComputed from "discourse-common/utils/decorators";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseComputed from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
queryParams: ["start_date", "end_date", "filters", "chart_grouping"], queryParams: ["start_date", "end_date", "filters", "chart_grouping"],

2
app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js
View file

@ -1,5 +1,5 @@
import I18n from "I18n";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import I18n from "I18n";
export const DEFAULT_PERIOD = "yearly"; export const DEFAULT_PERIOD = "yearly";
export default Controller.extend({ export default Controller.extend({

2
app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js
View file

@ -1,6 +1,6 @@
import I18n from "I18n";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index"; import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index";
import I18n from "I18n";
export default Controller.extend({ export default Controller.extend({
loading: false, loading: false,

2
app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js
View file

@ -1,5 +1,5 @@
import discourseComputed from "discourse-common/utils/decorators";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import discourseComputed from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
adminSiteSettings: controller(), adminSiteSettings: controller(),

10
app/assets/javascripts/admin/addon/controllers/admin-site-settings.js
View file

@ -1,10 +1,10 @@
import I18n from "I18n";
import { isEmpty } from "@ember/utils";
import { alias } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseDebounce from "discourse/lib/debounce"; import I18n from "I18n";
import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import { alias } from "@ember/object/computed";
import discourseDebounce from "discourse/lib/debounce";
import { isEmpty } from "@ember/utils";
import { observes } from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
filter: null, filter: null,

8
app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js
View file

@ -1,9 +1,9 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error"; import I18n from "I18n";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend(bufferedProperty("siteText"), { export default Controller.extend(bufferedProperty("siteText"), {
saved: false, saved: false,

2
app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
View file

@ -1,5 +1,5 @@
import { debounce } from "@ember/runloop";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { debounce } from "@ember/runloop";
let lastSearch; let lastSearch;
export default Controller.extend({ export default Controller.extend({

10
app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
View file

@ -1,11 +1,11 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import { alias, sort } from "@ember/object/computed";
import { next } from "@ember/runloop";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import { alias, sort } from "@ember/object/computed";
import GrantBadgeController from "discourse/mixins/grant-badge-controller"; import GrantBadgeController from "discourse/mixins/grant-badge-controller";
import { popupAjaxError } from "discourse/lib/ajax-error"; import I18n from "I18n";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
import { next } from "@ember/runloop";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend(GrantBadgeController, { export default Controller.extend(GrantBadgeController, {
adminUser: controller(), adminUser: controller(),

4
app/assets/javascripts/admin/addon/controllers/admin-user-fields.js
View file

@ -1,8 +1,8 @@
import I18n from "I18n";
import { gte, sort } from "@ember/object/computed"; import { gte, sort } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error"; import I18n from "I18n";
import bootbox from "bootbox"; import bootbox from "bootbox";
import { popupAjaxError } from "discourse/lib/ajax-error";
const MAX_FIELDS = 30; const MAX_FIELDS = 30;

18
app/assets/javascripts/admin/addon/controllers/admin-user-index.js
View file

@ -1,16 +1,16 @@
import I18n from "I18n"; import { and, notEmpty } from "@ember/object/computed";
import { notEmpty, and } from "@ember/object/computed"; import { fmt, propertyNotEqual, setting } from "discourse/lib/computed";
import { inject as service } from "@ember/service";
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
import CanCheckEmails from "discourse/mixins/can-check-emails"; import CanCheckEmails from "discourse/mixins/can-check-emails";
import { propertyNotEqual, setting, fmt } from "discourse/lib/computed"; import Controller from "@ember/controller";
import { userPath } from "discourse/lib/url"; import I18n from "I18n";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { ajax } from "discourse/lib/ajax";
import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { inject as service } from "@ember/service";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
import bootbox from "bootbox"; import { userPath } from "discourse/lib/url";
export default Controller.extend(CanCheckEmails, { export default Controller.extend(CanCheckEmails, {
adminTools: service(), adminTools: service(),

8
app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js
View file

@ -1,11 +1,11 @@
import I18n from "I18n";
import discourseComputed, { observes } from "discourse-common/utils/decorators"; import discourseComputed, { observes } from "discourse-common/utils/decorators";
import Controller from "@ember/controller";
import discourseDebounce from "discourse/lib/debounce";
import { i18n } from "discourse/lib/computed";
import AdminUser from "admin/models/admin-user"; import AdminUser from "admin/models/admin-user";
import CanCheckEmails from "discourse/mixins/can-check-emails"; import CanCheckEmails from "discourse/mixins/can-check-emails";
import Controller from "@ember/controller";
import I18n from "I18n";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import discourseDebounce from "discourse/lib/debounce";
import { i18n } from "discourse/lib/computed";
export default Controller.extend(CanCheckEmails, { export default Controller.extend(CanCheckEmails, {
model: null, model: null,

12
app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
View file

@ -1,13 +1,13 @@
import I18n from "I18n";
import discourseComputed from "discourse-common/utils/decorators";
import { or } from "@ember/object/computed";
import { schedule } from "@ember/runloop";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import I18n from "I18n";
import WatchedWord from "admin/models/watched-word"; import WatchedWord from "admin/models/watched-word";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { fmt } from "discourse/lib/computed";
import showModal from "discourse/lib/show-modal";
import bootbox from "bootbox"; import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
import { fmt } from "discourse/lib/computed";
import { or } from "@ember/object/computed";
import { schedule } from "@ember/runloop";
import showModal from "discourse/lib/show-modal";
export default Controller.extend({ export default Controller.extend({
adminWatchedWords: controller(), adminWatchedWords: controller(),

10
app/assets/javascripts/admin/addon/controllers/admin-watched-words.js
View file

@ -1,10 +1,10 @@
import { isEmpty } from "@ember/utils";
import { alias } from "@ember/object/computed";
import EmberObject from "@ember/object";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import discourseDebounce from "discourse/lib/debounce"; import EmberObject from "@ember/object";
import { observes } from "discourse-common/utils/decorators";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
import { alias } from "@ember/object/computed";
import discourseDebounce from "discourse/lib/debounce";
import { isEmpty } from "@ember/utils";
import { observes } from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
filter: null, filter: null,

4
app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js
View file

@ -1,7 +1,7 @@
import discourseComputed from "discourse-common/utils/decorators";
import { alias } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { alias } from "@ember/object/computed";
import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
export default Controller.extend({ export default Controller.extend({

Some files were not shown because too many files have changed in this diff Show more