REFACTOR: Remove Discourse.Model

2019-11-08 14:13:35 -05:00
parent fa71919693
commit f03edb36be
35 changed files with 90 additions and 96 deletions
@@ -1,4 +1,5 @@
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";

 const GENERAL_ATTRIBUTES = [
  "updated_at",
@@ -6,7 +7,7 @@ const GENERAL_ATTRIBUTES = [
  "release_notes_link"
 ];

-const AdminDashboard = Discourse.Model.extend({});
+const AdminDashboard = EmberObject.extend({});

 AdminDashboard.reopenClass({
  fetch() {
@@ -1,7 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
+import EmberObject from "@ember/object";

-export default Discourse.Model.extend({
+export default EmberObject.extend({
  restoreDisabled: not("restoreEnabled"),

  @discourseComputed("allowRestore", "isOperationRunning")
@@ -1,7 +1,8 @@
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
+import EmberObject from "@ember/object";

-const Backup = Discourse.Model.extend({
+const Backup = EmberObject.extend({
  destroy() {
    return ajax("/admin/backups/" + this.filename, { type: "DELETE" });
  },
@@ -4,8 +4,9 @@ import {
  on
 } from "discourse-common/utils/decorators";
 import { propertyNotEqual } from "discourse/lib/computed";
+import EmberObject from "@ember/object";

-const ColorSchemeColor = Discourse.Model.extend({
+const ColorSchemeColor = EmberObject.extend({
  @on("init")
  startTrackingChanges() {
    this.set("originals", { hex: this.hex || "FFFFFF" });
@@ -2,8 +2,9 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { not } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
 import ColorSchemeColor from "admin/models/color-scheme-color";
+import EmberObject from "@ember/object";

-const ColorScheme = Discourse.Model.extend(Ember.Copyable, {
+const ColorScheme = EmberObject.extend(Ember.Copyable, {
  init() {
    this._super(...arguments);

@@ -1,7 +1,8 @@
 import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
+import EmberObject from "@ember/object";

-const EmailLog = Discourse.Model.extend({});
+const EmailLog = EmberObject.extend({});

 EmailLog.reopenClass({
  create(attrs) {
@@ -1,5 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
-const EmailPreview = Discourse.Model.extend({});
+import EmberObject from "@ember/object";
+
+const EmailPreview = EmberObject.extend({});

 export function oneWeekAgo() {
  return moment()
@@ -1,5 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
-const EmailSettings = Discourse.Model.extend({});
+import EmberObject from "@ember/object";
+
+const EmailSettings = EmberObject.extend({});

 EmailSettings.reopenClass({
  find: function() {
@@ -1,7 +1,8 @@
 import { ajax } from "discourse/lib/ajax";
 import AdminUser from "admin/models/admin-user";
+import EmberObject from "@ember/object";

-const IncomingEmail = Discourse.Model.extend({});
+const IncomingEmail = EmberObject.extend({});

 IncomingEmail.reopenClass({
  create(attrs) {
@@ -1,5 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
-const Permalink = Discourse.Model.extend({
+import EmberObject from "@ember/object";
+
+const Permalink = EmberObject.extend({
  save: function() {
    return ajax("/admin/permalinks.json", {
      type: "POST",
@@ -17,7 +17,7 @@ import { renderAvatar } from "discourse/helpers/user-avatar";
 // and you want to ensure cache is reset
 export const SCHEMA_VERSION = 4;

-const Report = Discourse.Model.extend({
+const Report = EmberObject.extend({
  average: false,
  percent: false,
  higher_is_better: true,
@@ -1,7 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";

-const ScreenedEmail = Discourse.Model.extend({
+const ScreenedEmail = EmberObject.extend({
  @discourseComputed("action")
  actionName(action) {
    return I18n.t("admin.logs.screened_actions." + action);
@@ -1,8 +1,9 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { equal } from "@ember/object/computed";
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";

-const ScreenedIpAddress = Discourse.Model.extend({
+const ScreenedIpAddress = EmberObject.extend({
  @discourseComputed("action_name")
  actionName(actionName) {
    return I18n.t(`admin.logs.screened_ips.actions.${actionName}`);
@@ -1,7 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";

-const ScreenedUrl = Discourse.Model.extend({
+const ScreenedUrl = EmberObject.extend({
  @discourseComputed("action")
  actionName(action) {
    return I18n.t("admin.logs.screened_actions." + action);
@@ -1,7 +1,8 @@
 import { ajax } from "discourse/lib/ajax";
 import Setting from "admin/mixins/setting-object";
+import EmberObject from "@ember/object";

-const SiteSetting = Discourse.Model.extend(Setting, {});
+const SiteSetting = EmberObject.extend(Setting, {});

 SiteSetting.reopenClass({
  findAll() {
@@ -1,3 +1,4 @@
 import Setting from "admin/mixins/setting-object";
+import EmberObject from "@ember/object";

-export default Discourse.Model.extend(Setting, {});
+export default EmberObject.extend(Setting, {});
@@ -1,6 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
+import EmberObject from "@ember/object";

-export default Discourse.Model.extend({
+export default EmberObject.extend({
  @discourseComputed("days_visited", "time_period")
  days_visited_percent(daysVisited, timePeriod) {
    return Math.round((daysVisited * 100) / timePeriod);
@@ -1,7 +1,8 @@
 import discourseComputed from "discourse-common/utils/decorators";
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";

-const VersionCheck = Discourse.Model.extend({
+const VersionCheck = EmberObject.extend({
  @discourseComputed("updated_at")
  noCheckPerformed(updatedAt) {
    return updatedAt === null;
@@ -1,7 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";

-const WatchedWord = Discourse.Model.extend({
+const WatchedWord = EmberObject.extend({
  save() {
    return ajax(
      "/admin/logs/watched_words" + (this.id ? "/" + this.id : "") + ".json",