REFACTOR: Remove Ember.Controller in favor of import

This commit is contained in:
Robin Ward
2019-10-23 13:06:54 -04:00
parent e18af18fec
commit 6287eccb35
172 changed files with 623 additions and 462 deletions

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { setting, i18n } from "discourse/lib/computed";
export default Ember.Controller.extend({
export default Controller.extend({
adminBackups: Ember.inject.controller(),
status: Ember.computed.alias("adminBackups.model"),
uploadLabel: i18n("admin.backups.upload.label"),

View File

@@ -1,4 +1,5 @@
export default Ember.Controller.extend({
import Controller from "@ember/controller";
export default Controller.extend({
adminBackups: Ember.inject.controller(),
status: Ember.computed.alias("adminBackups.model"),

View File

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

View File

@@ -1,9 +1,10 @@
import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { propertyNotEqual } from "discourse/lib/computed";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend(bufferedProperty("model"), {
export default Controller.extend(bufferedProperty("model"), {
adminBadges: Ember.inject.controller(),
saving: false,
savingStatus: "",

View File

@@ -1 +1,2 @@
export default Ember.Controller.extend();
import Controller from "@ember/controller";
export default Controller.extend();

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
@computed("model.colors", "onlyOverridden")
colors(allColors, onlyOverridden) {
if (onlyOverridden) {

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import showModal from "discourse/lib/show-modal";
import { default as computed } from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
@computed("model.@each.id")
baseColorScheme() {
return this.model.findBy("is_base", true);

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
@computed("model.isSaving")
saveButtonText(isSaving) {
return isSaving ? I18n.t("saving") : I18n.t("admin.customize.save");

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend(bufferedProperty("emailTemplate"), {
export default Controller.extend(bufferedProperty("emailTemplate"), {
saved: false,
@computed("buffered.body", "buffered.subject")

View File

@@ -1,4 +1,5 @@
export default Ember.Controller.extend({
import Controller from "@ember/controller";
export default Controller.extend({
emailTemplates: null,
sortedTemplates: Ember.computed.sort("emailTemplates", "titleSorting"),

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import { propertyEqual } from "discourse/lib/computed";
export default Ember.Controller.extend(bufferedProperty("model"), {
export default Controller.extend(bufferedProperty("model"), {
saved: false,
isSaving: false,
saveDisabled: propertyEqual("model.robots_txt", "buffered.robots_txt"),

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import { url } from "discourse/lib/computed";
import { default as computed } from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
section: null,
currentTarget: 0,
maximized: false,

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { url } from "discourse/lib/computed";
import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ import { THEMES, COMPONENTS } from "admin/models/theme";
const THEME_UPLOAD_VAR = 2;
export default Ember.Controller.extend({
export default Controller.extend({
downloadUrl: url("model.id", "/admin/customize/themes/%@/export"),
previewUrl: url("model.id", "/admin/themes/%@/preview"),
addButtonDisabled: Ember.computed.empty("selectedChildThemeId"),

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { THEMES } from "admin/models/theme";
export default Ember.Controller.extend({
export default Controller.extend({
currentTab: THEMES,
@computed("model", "model.@each.component")

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import { setting } from "discourse/lib/computed";
import computed from "ember-addons/ember-computed-decorators";
import AdminDashboard from "admin/models/admin-dashboard";
@@ -12,7 +13,7 @@ function staticReport(reportType) {
});
}
export default Ember.Controller.extend(PeriodComputationMixin, {
export default Controller.extend(PeriodComputationMixin, {
isLoading: false,
dashboardFetchedAt: null,
exceptionController: Ember.inject.controller("exception"),

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
import PeriodComputationMixin from "admin/mixins/period-computation";
export default Ember.Controller.extend(PeriodComputationMixin, {
export default Controller.extend(PeriodComputationMixin, {
@computed
flagsStatusOptions() {
return {

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
const { get } = Ember;
export default Ember.Controller.extend({
export default Controller.extend({
filter: null,
@computed("model.[]", "filter")

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import { setting } from "discourse/lib/computed";
import computed from "ember-addons/ember-computed-decorators";
import AdminDashboard from "admin/models/admin-dashboard";
@@ -5,7 +6,7 @@ import VersionCheck from "admin/models/version-check";
const PROBLEMS_CHECK_MINUTES = 1;
export default Ember.Controller.extend({
export default Controller.extend({
isLoading: false,
dashboardFetchedAt: null,
exceptionController: Ember.inject.controller("exception"),

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Ember.Controller.extend({
export default Controller.extend({
email: null,
text: null,
elided: null,

View File

@@ -1,5 +1,6 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
export default Ember.Controller.extend({
export default Controller.extend({
/**
Is the "send test email" button disabled?

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import EmailLog from "admin/models/email-log";
export default Ember.Controller.extend({
export default Controller.extend({
loading: false,
loadLogs(sourceModel, loadMore) {

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import EmailPreview from "admin/models/email-preview";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Ember.Controller.extend({
export default Controller.extend({
username: null,
lastSeen: null,

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Ember.Controller.extend({
export default Controller.extend({
saved: false,
embedding: null,

View File

@@ -1,5 +1,6 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
export default Ember.Controller.extend({
export default Controller.extend({
sortedEmojis: Ember.computed.sort("model", "emojiSorting"),
init() {

View File

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

View File

@@ -1,9 +1,10 @@
import Controller from "@ember/controller";
import debounce from "discourse/lib/debounce";
import { outputExportResult } from "discourse/lib/export-result";
import { exportEntity } from "discourse/lib/export-csv";
import ScreenedIpAddress from "admin/models/screened-ip-address";
export default Ember.Controller.extend({
export default Controller.extend({
loading: false,
filter: null,
savedIpAddress: null,

View File

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

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import { exportEntity } from "discourse/lib/export-csv";
import { outputExportResult } from "discourse/lib/export-result";
import {
@@ -5,7 +6,7 @@ import {
on
} from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
model: null,
filters: null,
filtersExists: Ember.computed.gt("filterCount", 0),

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import debounce from "discourse/lib/debounce";
import Permalink from "admin/models/permalink";
export default Ember.Controller.extend({
export default Controller.extend({
loading: false,
filter: null,

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
@computed
adminRoutes: function() {
return this.model

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
queryParams: ["start_date", "end_date", "filters"],
start_date: null,
end_date: null,

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
export const DEFAULT_PERIOD = "yearly";
export default Ember.Controller.extend({
export default Controller.extend({
loading: false,
period: DEFAULT_PERIOD,
searchType: "all",

View File

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

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
categoryNameKey: null,
adminSiteSettings: Ember.inject.controller(),

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import debounce from "discourse/lib/debounce";
export default Ember.Controller.extend({
export default Controller.extend({
filter: null,
allSiteSettings: Ember.computed.alias("model"),
visibleSiteSettings: null,

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { bufferedProperty } from "discourse/mixins/buffered-content";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend(bufferedProperty("siteText"), {
export default Controller.extend(bufferedProperty("siteText"), {
saved: false,
@computed("buffered.value")

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
let lastSearch;
export default Ember.Controller.extend({
export default Controller.extend({
searching: false,
siteTexts: null,
preferred: false,

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import GrantBadgeController from "discourse/mixins/grant-badge-controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend(GrantBadgeController, {
export default Controller.extend(GrantBadgeController, {
adminUser: Ember.inject.controller(),
user: Ember.computed.alias("adminUser.model"),
userBadges: Ember.computed.alias("model"),

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
const MAX_FIELDS = 20;
export default Ember.Controller.extend({
export default Controller.extend({
fieldTypes: null,
createDisabled: Ember.computed.gte("model.length", MAX_FIELDS),
sortedFields: Ember.computed.sort("model", "fieldSortOrder"),

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
import CanCheckEmails from "discourse/mixins/can-check-emails";
import { propertyNotEqual, setting } from "discourse/lib/computed";
@@ -6,7 +7,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { fmt } from "discourse/lib/computed";
export default Ember.Controller.extend(CanCheckEmails, {
export default Controller.extend(CanCheckEmails, {
adminTools: Ember.inject.service(),
originalPrimaryGroupId: null,
customGroupIdsBuffer: null,

View File

@@ -1 +1,2 @@
export default Ember.Controller.extend();
import Controller from "@ember/controller";
export default Controller.extend();

View File

@@ -1,10 +1,11 @@
import Controller from "@ember/controller";
import debounce from "discourse/lib/debounce";
import { i18n } from "discourse/lib/computed";
import AdminUser from "admin/models/admin-user";
import CanCheckEmails from "discourse/mixins/can-check-emails";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend(CanCheckEmails, {
export default Controller.extend(CanCheckEmails, {
model: null,
query: null,
order: null,

View File

@@ -1,10 +1,11 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
import WatchedWord from "admin/models/watched-word";
import { ajax } from "discourse/lib/ajax";
import { fmt } from "discourse/lib/computed";
import showModal from "discourse/lib/show-modal";
export default Ember.Controller.extend({
export default Controller.extend({
actionNameKey: null,
adminWatchedWords: Ember.inject.controller(),
showWordsList: Ember.computed.or(

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import debounce from "discourse/lib/debounce";
export default Ember.Controller.extend({
export default Controller.extend({
filter: null,
filtered: false,
showWords: false,

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
pingDisabled: false,
incomingCount: Ember.computed.alias("incomingEventIds.length"),

View File

@@ -1,9 +1,10 @@
import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { extractDomainFromUrl } from "discourse/lib/utilities";
import computed from "ember-addons/ember-computed-decorators";
import InputValidation from "discourse/models/input-validation";
export default Ember.Controller.extend({
export default Controller.extend({
adminWebHooks: Ember.inject.controller(),
eventTypes: Ember.computed.alias("adminWebHooks.eventTypes"),
defaultEventTypes: Ember.computed.alias("adminWebHooks.defaultEventTypes"),

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Ember.Controller.extend({
export default Controller.extend({
actions: {
destroy(webhook) {
return bootbox.confirm(

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend({
export default Controller.extend({
router: Ember.inject.service(),
@computed("siteSettings.enable_group_directory")

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { ajax } from "discourse/lib/ajax";
import {
@@ -52,7 +53,7 @@ const SCSS_VARIABLE_NAMES = [
"love-low"
];
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
adminCustomizeThemesShow: Ember.inject.controller(),
uploadUrl: "/admin/themes/upload_asset",

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import { default as computed } from "ember-addons/ember-computed-decorators";
import { escapeExpression } from "discourse/lib/utilities";
export default Ember.Controller.extend({
export default Controller.extend({
sample: Ember.computed.alias("model.sample"),
errors: Ember.computed.alias("model.errors"),
count: Ember.computed.alias("model.grant_count"),

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
adminCustomizeColors: Ember.inject.controller(),
actions: {

View File

@@ -1,8 +1,9 @@
import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { observes } from "ember-addons/ember-computed-decorators";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
@observes("model")
modelChanged() {
const model = this.model;

View File

@@ -1,10 +1,11 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import IncomingEmail from "admin/models/incoming-email";
import computed from "ember-addons/ember-computed-decorators";
import { longDate } from "discourse/lib/formatter";
import { popupAjaxError } from "discourse/lib/ajax-error";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
@computed("model.date")
date(d) {
return longDate(d);

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -10,7 +11,7 @@ import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
const MIN_NAME_LENGTH = 4;
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
popular: Ember.computed.equal("selection", "popular"),
local: Ember.computed.equal("selection", "local"),
remote: Ember.computed.equal("selection", "remote"),

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { ajax } from "discourse/lib/ajax";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
loading: true,
reseeding: false,
categories: null,

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
import PenaltyController from "admin/mixins/penalty-controller";
export default Ember.Controller.extend(PenaltyController, {
export default Controller.extend(PenaltyController, {
silenceUntil: null,
silencing: false,

View File

@@ -1,3 +1,4 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
export default Ember.Controller.extend(ModalFunctionality);
export default Controller.extend(ModalFunctionality);

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
adminBackupsLogs: Ember.inject.controller(),
actions: {

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import computed from "ember-addons/ember-computed-decorators";
import PenaltyController from "admin/mixins/penalty-controller";
export default Ember.Controller.extend(PenaltyController, {
export default Controller.extend(PenaltyController, {
suspendUntil: null,
suspending: false,

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { ajax } from "discourse/lib/ajax";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
loadDiff() {
this.set("loading", true);
ajax(

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import { on, observes } from "ember-addons/ember-computed-decorators";
import ModalFunctionality from "discourse/mixins/modal-functionality";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
@on("init")
@observes("model.value")
_setup() {

View File

@@ -1,7 +1,8 @@
import Controller from "@ember/controller";
import { default as computed } from "ember-addons/ember-computed-decorators";
import ModalFunctionality from "discourse/mixins/modal-functionality";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
@computed("value", "model.compiledRegularExpression")
matches(value, regexpString) {
if (!value || !regexpString) return;

View File

@@ -1,6 +1,7 @@
import Controller from "@ember/controller";
import ModalFunctionality from "discourse/mixins/modal-functionality";
export default Ember.Controller.extend(ModalFunctionality, {
export default Controller.extend(ModalFunctionality, {
onShow() {
this.set("updateExistingUsers", null);
},