DEV: Fix function prototype deprecations (#8681)

* DEV: Fix the function prototype observers deprecation DEPRECATION: Function prototype extensions have been deprecated, please migrate from function(){}.observes('foo') to observer('foo', function() {}). [deprecation id: function-prototype-extensions.observes] See https://deprecations.emberjs.com/v3.x/#toc_function-prototype-extensions-observes for more details. * DEV: Fix the function prototype event listeners deprecation DEPRECATION: Function prototype extensions have been deprecated, please migrate from function(){}.on('foo') to on('foo', function() {}). [deprecation id: function-prototype-extensions.on] See https://deprecations.emberjs.com/v3.x/#toc_function-prototype-extensions-on for more details. * DEV: Simplify `default as` imports Co-authored-by: Joffrey JAFFEUX <j.jaffeux@gmail.com>
2020-01-16 18:56:53 +01:00
parent ff5a82b614
commit fe588cc7f8
161 changed files with 227 additions and 356 deletions
@@ -8,7 +8,7 @@ import ReportLoader from "discourse/lib/reports-loader";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import { isNumeric } from "discourse/lib/utilities";
-import { SCHEMA_VERSION, default as Report } from "admin/models/report";
+import Report, { SCHEMA_VERSION } from "admin/models/report";
 import ENV from "discourse-common/config/environment";

 const TABLE_OPTIONS = {
@@ -1,6 +1,6 @@
 import { next } from "@ember/runloop";
 import Component from "@ember/component";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";

 export default Component.extend({
@@ -7,8 +7,7 @@ import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { propertyEqual } from "discourse/lib/computed";
 import { i18n } from "discourse/lib/computed";
-import {
-  default as discourseComputed,
+import discourseComputed, {
  observes,
  on
 } from "discourse-common/utils/decorators";
@@ -1,6 +1,7 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import { default as loadScript, loadCSS } from "discourse/lib/load-script";
+import loadScript, { loadCSS } from "discourse/lib/load-script";
+import { observes } from "discourse-common/utils/decorators";

 /**
  An input field for a color.
@@ -11,6 +12,8 @@ import { default as loadScript, loadCSS } from "discourse/lib/load-script";
 **/
 export default Component.extend({
  classNames: ["color-picker"],
+
+  @observes("hexValue", "brightnessValue", "valid")
  hexValueChanged: function() {
    var hex = this.hexValue;
    let text = this.element.querySelector("input.hex-input");
@@ -33,7 +36,7 @@ export default Component.extend({
    } else {
      text.setAttribute("style", "");
    }
-  }.observes("hexValue", "brightnessValue", "valid"),
+  },

  didInsertElement() {
    loadScript("/javascripts/spectrum.js").then(() => {
@@ -1,8 +1,5 @@
 import Component from "@ember/component";
-import {
-  default as discourseComputed,
-  observes
-} from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";

 export default Component.extend({
  classNames: ["inline-edit"],
@@ -1,7 +1,7 @@
 import EmberObject from "@ember/object";
 import { later } from "@ember/runloop";
 import Component from "@ember/component";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
 import copyText from "discourse/lib/copy-text";
@@ -1,6 +1,6 @@
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import Permalink from "admin/models/permalink";

@@ -1,5 +1,5 @@
 import Category from "discourse/models/category";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import FilterComponent from "admin/components/report-filters/filter";

 export default FilterComponent.extend({
@@ -1,5 +1,5 @@
 import FilterComponent from "admin/components/report-filters/filter";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";

 export default FilterComponent.extend({
  classNames: ["group-filter"],
@@ -2,10 +2,7 @@ import { schedule } from "@ember/runloop";
 import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { iconHTML } from "discourse-common/lib/icon-library";
-import {
-  default as discourseComputed,
-  on
-} from "discourse-common/utils/decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";

 /*global Resumable:true */

@@ -1,10 +1,7 @@
 import { gt, and } from "@ember/object/computed";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
-import {
-  default as discourseComputed,
-  observes
-} from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { escape } from "pretty-text/sanitizer";
 import ENV from "discourse-common/config/environment";
@@ -2,8 +2,7 @@ import { isEmpty } from "@ember/utils";
 import { schedule } from "@ember/runloop";
 import Component from "@ember/component";
 import WatchedWord from "admin/models/watched-word";
-import {
-  default as discourseComputed,
+import discourseComputed, {
  on,
  observes
 } from "discourse-common/utils/decorators";
@@ -1,4 +1,4 @@
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";

 export default Ember.Controller.extend({
@@ -2,7 +2,7 @@ import { alias, equal } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { setting, i18n } from "discourse/lib/computed";

 export default Controller.extend({
@@ -1,4 +1,4 @@
-import discourseComputed from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { alias } from "@ember/object/computed";
 import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
@@ -27,10 +27,11 @@ export default Controller.extend(bufferedProperty("model"), {
    return modelQuery && modelQuery.trim().length > 0;
  },

+  @observes("model.id")
  _resetSaving: function() {
    this.set("saving", false);
    this.set("savingStatus", "");
-  }.observes("model.id"),
+  },

  actions: {
    save() {
@@ -1,7 +1,7 @@
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";

 export default Controller.extend({
  @discourseComputed("model.@each.id")
@@ -1,6 +1,6 @@
 import Controller from "@ember/controller";
 import { url } from "discourse/lib/computed";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";

 export default Controller.extend({
  section: null,
@@ -7,7 +7,7 @@ import {
  notEmpty
 } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { url } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import showModal from "discourse/lib/show-modal";
@@ -1,5 +1,5 @@
 import Controller from "@ember/controller";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { THEMES } from "admin/models/theme";

 export default Controller.extend({
@@ -1,8 +1,10 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";

 export default AdminEmailLogsController.extend({
+  @observes("filter.{status,user,address,type}")
  filterEmailLogs: discourseDebounce(function() {
    this.loadLogs();
-  }, 250).observes("filter.{status,user,address,type}")
+  }, 250)
 });
@@ -1,6 +1,8 @@
 import { empty } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
+import { observes } from "discourse-common/utils/decorators";
+
 export default Controller.extend({
  /**
    Is the "send test email" button disabled?
@@ -14,9 +16,10 @@ export default Controller.extend({

    @method testEmailAddressChanged
  **/
+  @observes("testEmailAddress")
  testEmailAddressChanged: function() {
    this.set("sentTestEmail", false);
-  }.observes("testEmailAddress"),
+  },

  actions: {
    /**
@@ -1,11 +1,13 @@
 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";

 export default AdminEmailLogsController.extend({
+  @observes("filter.{status,from,to,subject}")
  filterIncomingEmails: discourseDebounce(function() {
    this.loadLogs(IncomingEmail);
-  }, 250).observes("filter.{status,from,to,subject}"),
+  }, 250),

  actions: {
    loadMore() {
@@ -1,11 +1,13 @@
 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";

 export default AdminEmailLogsController.extend({
+  @observes("filter.{status,from,to,subject,error}")
  filterIncomingEmails: discourseDebounce(function() {
    this.loadLogs(IncomingEmail);
-  }, 250).observes("filter.{status,from,to,subject,error}"),
+  }, 250),

  actions: {
    loadMore() {
@@ -1,8 +1,10 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";

 export default AdminEmailLogsController.extend({
+  @observes("filter.{status,user,address,type,reply_key}")
  filterEmailLogs: discourseDebounce(function() {
    this.loadLogs();
-  }, 250).observes("filter.{status,user,address,type,reply_key}")
+  }, 250)
 });
@@ -1,8 +1,10 @@
 import AdminEmailLogsController from "admin/controllers/admin-email-logs";
 import discourseDebounce from "discourse/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";

 export default AdminEmailLogsController.extend({
+  @observes("filter.{status,user,address,type}")
  filterEmailLogs: discourseDebounce(function() {
    this.loadLogs();
-  }, 250).observes("filter.{status,user,address,type}")
+  }, 250)
 });
@@ -3,18 +3,20 @@ import discourseDebounce 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";
+import { observes } from "discourse-common/utils/decorators";

 export default Controller.extend({
  loading: false,
  filter: null,
  savedIpAddress: null,

+  @observes("filter")
  show: discourseDebounce(function() {
    this.set("loading", true);
    ScreenedIpAddress.findAll(this.filter).then(result => {
      this.setProperties({ model: result, loading: false });
    });
-  }, 250).observes("filter"),
+  }, 250),

  actions: {
    allow(record) {
@@ -4,10 +4,7 @@ import { scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
-import {
-  default as discourseComputed,
-  on
-} from "discourse-common/utils/decorators";
+import discourseComputed, { on } from "discourse-common/utils/decorators";

 export default Controller.extend({
  model: null,
@@ -1,17 +1,19 @@
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
 import Permalink from "admin/models/permalink";
+import { observes } from "discourse-common/utils/decorators";

 export default Controller.extend({
  loading: false,
  filter: null,

+  @observes("filter")
  show: discourseDebounce(function() {
    Permalink.findAll(this.filter).then(result => {
      this.set("model", result);
      this.set("loading", false);
    });
-  }, 250).observes("filter"),
+  }, 250),

  actions: {
    recordAdded(arg) {
@@ -2,6 +2,7 @@ import { isEmpty } from "@ember/utils";
 import { alias } from "@ember/object/computed";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";

 export default Controller.extend({
  filter: null,
@@ -76,13 +77,14 @@ export default Controller.extend({
    );
  },

+  @observes("filter", "onlyOverridden", "model")
  filterContent: discourseDebounce(function() {
    if (this._skipBounce) {
      this.set("_skipBounce", false);
    } else {
      this.filterContentNow();
    }
-  }, 250).observes("filter", "onlyOverridden", "model"),
+  }, 250),

  actions: {
    clearFilter() {
@@ -6,7 +6,7 @@ import CanCheckEmails from "discourse/mixins/can-check-emails";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
 import { userPath } from "discourse/lib/url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
 import { htmlSafe } from "@ember/template";

@@ -1,4 +1,4 @@
-import discourseComputed 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";
@@ -29,9 +29,10 @@ export default Controller.extend(CanCheckEmails, {
    return I18n.t("admin.users.titles." + query);
  },

+  @observes("listFilter")
  _filterUsers: discourseDebounce(function() {
    this.resetFilters();
-  }, 250).observes("listFilter"),
+  }, 250),

  resetFilters() {
    this._page = 1;
@@ -3,6 +3,7 @@ import { alias } from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import Controller from "@ember/controller";
 import discourseDebounce from "discourse/lib/debounce";
+import { observes } from "discourse-common/utils/decorators";

 export default Controller.extend({
  filter: null,
@@ -43,10 +44,11 @@ export default Controller.extend({
    this.set("model", matchesByAction);
  },

+  @observes("filter")
  filterContent: discourseDebounce(function() {
    this.filterContentNow();
    this.set("filtered", !isEmpty(this.filter));
-  }, 250).observes("filter"),
+  }, 250),

  actions: {
    clearFilter() {
@@ -4,10 +4,7 @@ import { inject } from "@ember/controller";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
-import {
-  default as discourseComputed,
-  observes
-} from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";

 const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
@@ -1,6 +1,6 @@
 import { alias, map } from "@ember/object/computed";
 import Controller from "@ember/controller";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { escapeExpression } from "discourse/lib/utilities";

 export default Controller.extend({
@@ -4,10 +4,7 @@ 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";
-import {
-  default as discourseComputed,
-  observes
-} from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { THEMES, COMPONENTS } from "admin/models/theme";
 import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
 import { set } from "@ember/object";
@@ -1,5 +1,5 @@
 import Controller from "@ember/controller";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";

 export default Controller.extend(ModalFunctionality, {
@@ -1,5 +1,4 @@
-import {
-  default as discourseComputed,
+import discourseComputed, {
  observes,
  on
 } from "discourse-common/utils/decorators";
@@ -2,7 +2,7 @@ import { get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
 import { or, gt } from "@ember/object/computed";
 import RestModel from "discourse/models/rest";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
 import { escapeExpression } from "discourse/lib/utilities";
@@ -2,10 +2,7 @@ import { isEmpty } from "@ember/utils";
 import RestModel from "discourse/models/rest";
 import Category from "discourse/models/category";
 import Group from "discourse/models/group";
-import {
-  default as discourseComputed,
-  observes
-} from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Site from "discourse/models/site";

 export default RestModel.extend({
@@ -1,8 +1,5 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import {
-  default as EmailPreview,
-  oneWeekAgo
-} from "admin/models/email-preview";
+import EmailPreview, { oneWeekAgo } from "admin/models/email-preview";

 export default DiscourseRoute.extend({
  model() {