DEV: Fix imports

assets/javascripts/discourse/components/repo-status.js

@@ -1,7 +1,7 @@
-import Discourse from "manager-client/discourse";
 import Component from "@ember/component";
 import { computed } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { getURLWithCDN } from "discourse-common/lib/get-url";
 
 export default Component.extend({
   router: service(),
@@ -28,11 +28,11 @@ export default Component.extend({
 
   officialRepoImageSrc: computed("repo.official", function () {
     if (this.get("repo.fork")) {
-      return Discourse.getAppURL(
+      return getURLWithCDN(
         "/plugins/docker_manager/images/font-awesome-exclamation-circle.png"
       );
     } else if (this.get("repo.official")) {
-      return Discourse.getAppURL(
+      return getURLWithCDN(
         "/plugins/docker_manager/images/font-awesome-check-circle.png"
       );
     }

assets/javascripts/discourse/controllers/application.js

@@ -1,6 +1,6 @@
-import Discourse from "manager-client/discourse";
 import Controller from "@ember/controller";
 import { computed } from "@ember/object";
+import getURL from "discourse-common/lib/get-url";
 
 export default Controller.extend({
   showBanner: computed("banner", "bannerDismissed", "banner.[]", function() {
@@ -20,16 +20,8 @@ export default Controller.extend({
     this.set("banner", banner);
   },
 
-  logoUrl: computed(function() {
-    return Discourse.logoUrl;
-  }),
-
-  returnToSiteUrl: computed(function() {
-    return Discourse.getAppURL("/");
-  }),
-
   backupsUrl: computed(function() {
-    return Discourse.getAppURL("/admin/backups");
+    return getURL("/admin/backups");
   }),
 
   actions: {

assets/javascripts/discourse/controllers/upgrade.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 
 /* global MessageBus, bootbox */
-import Repo from "manager-client/models/repo";
+import Repo from "discourse/plugins/docker_manager/discourse/models/repo";
 import Controller from "@ember/controller";
 import { equal } from "@ember/object/computed";
 import { computed } from "@ember/object";

assets/javascripts/discourse/models/process-list.js

@@ -1,13 +1,11 @@
 import EmberObject from "@ember/object";
-import Discourse from "manager-client/discourse";
-import jQuery from "jquery";
+import { ajax } from "discourse/lib/ajax";
 
 const ProcessList = EmberObject.extend({
   output: null,
 
   refresh() {
-    return jQuery
-      .ajax(Discourse.getAppURL("/admin/docker/ps"), {
+    return ajax("/admin/docker/ps", {
         dataType: "text",
       })
       .then((result) => {

assets/javascripts/discourse/models/repo.js

@@ -1,9 +1,8 @@
-import Discourse from "manager-client/discourse";
 import { default as EmberObject, computed } from "@ember/object";
 import { or } from "@ember/object/computed";
 import { isNone } from "@ember/utils";
 import { Promise } from "rsvp";
-import jQuery from "jquery";
+import { ajax } from "discourse/lib/ajax";
 
 let loaded = [];
 
@@ -55,7 +54,7 @@ const Repo = EmberObject.extend({
     args = args || {};
     args.data = this.getProperties("path", "version", "branch");
 
-    return jQuery.ajax(Discourse.getAppURL(url), args);
+    return ajax(url, args);
   },
 
   findLatest() {
@@ -66,7 +65,7 @@ const Repo = EmberObject.extend({
       }
 
       this.set("checking", true);
-      this.repoAjax(Discourse.getAppURL("/admin/docker/latest")).then(
+      this.repoAjax("/admin/docker/latest").then(
         (result) => {
           this.setProperties({
             unloaded: false,
@@ -81,13 +80,13 @@ const Repo = EmberObject.extend({
   },
 
   findProgress() {
-    return this.repoAjax(Discourse.getAppURL("/admin/docker/progress")).then(
+    return this.repoAjax("/admin/docker/progress").then(
       (result) => result.progress
     );
   },
 
   resetUpgrade() {
-    return this.repoAjax(Discourse.getAppURL("/admin/docker/upgrade"), {
+    return this.repoAjax("/admin/docker/upgrade", {
       dataType: "text",
       type: "DELETE",
     }).then(() => {
@@ -98,7 +97,7 @@ const Repo = EmberObject.extend({
   startUpgrade() {
     this.set("upgrading", true);
 
-    return this.repoAjax(Discourse.getAppURL("/admin/docker/upgrade"), {
+    return this.repoAjax("/admin/docker/upgrade", {
       dataType: "text",
       type: "POST",
     }).catch(() => {
@@ -114,7 +113,7 @@ Repo.reopenClass({
         return resolve(loaded);
       }
 
-      jQuery.ajax(Discourse.getAppURL("/admin/docker/repos")).then((result) => {
+      ajax("/admin/docker/repos").then((result) => {
         loaded = result.repos.map((r) => Repo.create(r));
         resolve(loaded);
       });
@@ -130,7 +129,7 @@ Repo.reopenClass({
   },
 
   upgradeAll() {
-    return jQuery.ajax(Discourse.getAppURL("/admin/docker/upgrade"), {
+    return ajax("/admin/docker/upgrade", {
       dataType: "text",
       type: "POST",
       data: { path: "all" },
@@ -138,7 +137,7 @@ Repo.reopenClass({
   },
 
   resetAll(repos) {
-    return jQuery.ajax(Discourse.getAppURL("/admin/docker/upgrade"), {
+    return ajax("/admin/docker/upgrade", {
       dataType: "text",
       type: "DELETE",
       data: { path: "all", version: concatVersions(repos) },
@@ -146,7 +145,7 @@ Repo.reopenClass({
   },
 
   findLatestAll() {
-    return jQuery.ajax(Discourse.getAppURL("/admin/docker/latest"), {
+    return ajax("/admin/docker/latest", {
       dataType: "text",
       type: "GET",
       data: { path: "all" },
@@ -154,7 +153,7 @@ Repo.reopenClass({
   },
 
   findAllProgress(repos) {
-    return jQuery.ajax(Discourse.getAppURL("/admin/docker/progress"), {
+    return ajax("/admin/docker/progress", {
       dataType: "text",
       type: "GET",
       data: { path: "all", version: concatVersions(repos) },

assets/javascripts/discourse/routes/index.js

@@ -1,4 +1,4 @@
-import Repo from "manager-client/models/repo";
+import Repo from "discourse/plugins/docker_manager/discourse/models/repo";
 import Route from "@ember/routing/route";
 
 export default Route.extend({

assets/javascripts/discourse/routes/processes.js

@@ -1,4 +1,4 @@
-import { find } from "manager-client/models/process-list";
+import { find } from "discourse/plugins/docker_manager/discourse/models/process-list";
 import Route from "@ember/routing/route";
 
 export default Route.extend({

assets/javascripts/discourse/routes/upgrade.js

@@ -1,4 +1,4 @@
-import Repo from "manager-client/models/repo";
+import Repo from "discourse/plugins/docker_manager/discourse/models/repo";
 import Route from "@ember/routing/route";
 import EmberObject from "@ember/object";
 import { Promise } from "rsvp";

test/javascripts/integration/components/repo-status-test.js

@@ -2,7 +2,7 @@ import { module, test } from "qunit";
 import { setupRenderingTest } from "ember-qunit";
 import { render, find } from "@ember/test-helpers";
 import hbs from "htmlbars-inline-precompile";
-import Repo from "manager-client/models/repo";
+import Repo from "discourse/plugins/docker_manager/discourse/models/repo";
 
 const repoObject = Repo.create({
   unloaded: false,