From bd9bf836ad1a4367b7c2247d8ad2a46e16897c6b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 27 Nov 2023 12:45:21 +0000
Subject: [PATCH] DEV: Resolve router deprecation and only load assets for
 admin (#180)

---
 .../assets}/javascripts/admin/adapters/channel.js            | 0
 .../assets}/javascripts/admin/adapters/provider.js           | 0
 {assets => admin/assets}/javascripts/admin/adapters/rule.js  | 0
 .../assets}/javascripts/admin/chat-integration-route-map.js  | 0
 .../assets}/javascripts/admin/components/channel-data.hbs    | 0
 .../assets}/javascripts/admin/components/channel-details.hbs | 0
 .../assets}/javascripts/admin/components/channel-details.js  | 0
 .../javascripts/admin/components/channel-param-row.hbs       | 0
 .../javascripts/admin/components/channel-param-row.js        | 0
 .../assets}/javascripts/admin/components/rule-row.hbs        | 0
 .../assets}/javascripts/admin/components/rule-row.js         | 0
 .../controllers/admin-plugins-chat-integration-provider.js   | 0
 .../admin/controllers/admin-plugins-chat-integration.js      | 0
 .../modals/admin-plugins-chat-integration-edit-channel.js    | 0
 .../modals/admin-plugins-chat-integration-edit-rule.js       | 0
 .../modals/admin-plugins-chat-integration-test.js            | 0
 {assets => admin/assets}/javascripts/admin/models/channel.js | 0
 .../assets}/javascripts/admin/models/provider.js             | 0
 {assets => admin/assets}/javascripts/admin/models/rule.js    | 0
 .../admin/routes/admin-plugins-chat-integration-index.js     | 5 ++++-
 .../admin/routes/admin-plugins-chat-integration-provider.js  | 0
 .../admin/routes/admin-plugins-chat-integration.js           | 5 ++++-
 .../modal/admin-plugins-chat-integration-channel-error.hbs   | 0
 .../modal/admin-plugins-chat-integration-edit-channel.hbs    | 0
 .../modal/admin-plugins-chat-integration-edit-rule.hbs       | 0
 .../templates/modal/admin-plugins-chat-integration-test.hbs  | 0
 .../admin/templates/plugins-chat-integration-provider.hbs    | 0
 .../javascripts/admin/templates/plugins-chat-integration.hbs | 0
 28 files changed, 8 insertions(+), 2 deletions(-)
 rename {assets => admin/assets}/javascripts/admin/adapters/channel.js (100%)
 rename {assets => admin/assets}/javascripts/admin/adapters/provider.js (100%)
 rename {assets => admin/assets}/javascripts/admin/adapters/rule.js (100%)
 rename {assets => admin/assets}/javascripts/admin/chat-integration-route-map.js (100%)
 rename {assets => admin/assets}/javascripts/admin/components/channel-data.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/components/channel-details.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/components/channel-details.js (100%)
 rename {assets => admin/assets}/javascripts/admin/components/channel-param-row.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/components/channel-param-row.js (100%)
 rename {assets => admin/assets}/javascripts/admin/components/rule-row.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/components/rule-row.js (100%)
 rename {assets => admin/assets}/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js (100%)
 rename {assets => admin/assets}/javascripts/admin/controllers/admin-plugins-chat-integration.js (100%)
 rename {assets => admin/assets}/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js (100%)
 rename {assets => admin/assets}/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js (100%)
 rename {assets => admin/assets}/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js (100%)
 rename {assets => admin/assets}/javascripts/admin/models/channel.js (100%)
 rename {assets => admin/assets}/javascripts/admin/models/provider.js (100%)
 rename {assets => admin/assets}/javascripts/admin/models/rule.js (100%)
 rename {assets => admin/assets}/javascripts/admin/routes/admin-plugins-chat-integration-index.js (74%)
 rename {assets => admin/assets}/javascripts/admin/routes/admin-plugins-chat-integration-provider.js (100%)
 rename {assets => admin/assets}/javascripts/admin/routes/admin-plugins-chat-integration.js (69%)
 rename {assets => admin/assets}/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/templates/plugins-chat-integration-provider.hbs (100%)
 rename {assets => admin/assets}/javascripts/admin/templates/plugins-chat-integration.hbs (100%)

diff --git a/assets/javascripts/admin/adapters/channel.js b/admin/assets/javascripts/admin/adapters/channel.js
similarity index 100%
rename from assets/javascripts/admin/adapters/channel.js
rename to admin/assets/javascripts/admin/adapters/channel.js
diff --git a/assets/javascripts/admin/adapters/provider.js b/admin/assets/javascripts/admin/adapters/provider.js
similarity index 100%
rename from assets/javascripts/admin/adapters/provider.js
rename to admin/assets/javascripts/admin/adapters/provider.js
diff --git a/assets/javascripts/admin/adapters/rule.js b/admin/assets/javascripts/admin/adapters/rule.js
similarity index 100%
rename from assets/javascripts/admin/adapters/rule.js
rename to admin/assets/javascripts/admin/adapters/rule.js
diff --git a/assets/javascripts/admin/chat-integration-route-map.js b/admin/assets/javascripts/admin/chat-integration-route-map.js
similarity index 100%
rename from assets/javascripts/admin/chat-integration-route-map.js
rename to admin/assets/javascripts/admin/chat-integration-route-map.js
diff --git a/assets/javascripts/admin/components/channel-data.hbs b/admin/assets/javascripts/admin/components/channel-data.hbs
similarity index 100%
rename from assets/javascripts/admin/components/channel-data.hbs
rename to admin/assets/javascripts/admin/components/channel-data.hbs
diff --git a/assets/javascripts/admin/components/channel-details.hbs b/admin/assets/javascripts/admin/components/channel-details.hbs
similarity index 100%
rename from assets/javascripts/admin/components/channel-details.hbs
rename to admin/assets/javascripts/admin/components/channel-details.hbs
diff --git a/assets/javascripts/admin/components/channel-details.js b/admin/assets/javascripts/admin/components/channel-details.js
similarity index 100%
rename from assets/javascripts/admin/components/channel-details.js
rename to admin/assets/javascripts/admin/components/channel-details.js
diff --git a/assets/javascripts/admin/components/channel-param-row.hbs b/admin/assets/javascripts/admin/components/channel-param-row.hbs
similarity index 100%
rename from assets/javascripts/admin/components/channel-param-row.hbs
rename to admin/assets/javascripts/admin/components/channel-param-row.hbs
diff --git a/assets/javascripts/admin/components/channel-param-row.js b/admin/assets/javascripts/admin/components/channel-param-row.js
similarity index 100%
rename from assets/javascripts/admin/components/channel-param-row.js
rename to admin/assets/javascripts/admin/components/channel-param-row.js
diff --git a/assets/javascripts/admin/components/rule-row.hbs b/admin/assets/javascripts/admin/components/rule-row.hbs
similarity index 100%
rename from assets/javascripts/admin/components/rule-row.hbs
rename to admin/assets/javascripts/admin/components/rule-row.hbs
diff --git a/assets/javascripts/admin/components/rule-row.js b/admin/assets/javascripts/admin/components/rule-row.js
similarity index 100%
rename from assets/javascripts/admin/components/rule-row.js
rename to admin/assets/javascripts/admin/components/rule-row.js
diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js b/admin/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js
similarity index 100%
rename from assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js
rename to admin/assets/javascripts/admin/controllers/admin-plugins-chat-integration-provider.js
diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat-integration.js b/admin/assets/javascripts/admin/controllers/admin-plugins-chat-integration.js
similarity index 100%
rename from assets/javascripts/admin/controllers/admin-plugins-chat-integration.js
rename to admin/assets/javascripts/admin/controllers/admin-plugins-chat-integration.js
diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js b/admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js
similarity index 100%
rename from assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js
rename to admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-channel.js
diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js b/admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js
similarity index 100%
rename from assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js
rename to admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-edit-rule.js
diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js b/admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js
similarity index 100%
rename from assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js
rename to admin/assets/javascripts/admin/controllers/modals/admin-plugins-chat-integration-test.js
diff --git a/assets/javascripts/admin/models/channel.js b/admin/assets/javascripts/admin/models/channel.js
similarity index 100%
rename from assets/javascripts/admin/models/channel.js
rename to admin/assets/javascripts/admin/models/channel.js
diff --git a/assets/javascripts/admin/models/provider.js b/admin/assets/javascripts/admin/models/provider.js
similarity index 100%
rename from assets/javascripts/admin/models/provider.js
rename to admin/assets/javascripts/admin/models/provider.js
diff --git a/assets/javascripts/admin/models/rule.js b/admin/assets/javascripts/admin/models/rule.js
similarity index 100%
rename from assets/javascripts/admin/models/rule.js
rename to admin/assets/javascripts/admin/models/rule.js
diff --git a/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js b/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js
similarity index 74%
rename from assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js
rename to admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js
index 768c686..cc15cf9 100644
--- a/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js
+++ b/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-index.js
@@ -1,9 +1,12 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 
 export default class AdminPluginsChatIntegrationIndex extends DiscourseRoute {
+  @service router;
+
   afterModel(model) {
     if (model.totalRows > 0) {
-      this.transitionTo(
+      this.router.transitionTo(
         "adminPlugins.chat-integration.provider",
         model.get("firstObject").name
       );
diff --git a/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js b/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js
similarity index 100%
rename from assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js
rename to admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js
diff --git a/assets/javascripts/admin/routes/admin-plugins-chat-integration.js b/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration.js
similarity index 69%
rename from assets/javascripts/admin/routes/admin-plugins-chat-integration.js
rename to admin/assets/javascripts/admin/routes/admin-plugins-chat-integration.js
index b7e9313..63a48b3 100644
--- a/assets/javascripts/admin/routes/admin-plugins-chat-integration.js
+++ b/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration.js
@@ -1,14 +1,17 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 
 export default class AdminPluginsChatIntegration extends DiscourseRoute {
+  @service router;
+
   model() {
     return this.store.findAll("provider");
   }
 
   @action
   showSettings() {
-    this.transitionTo("adminSiteSettingsCategory", "plugins", {
+    this.router.transitionTo("adminSiteSettingsCategory", "plugins", {
       queryParams: { filter: "chat_integration" },
     });
   }
diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs b/admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs
similarity index 100%
rename from assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs
rename to admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-channel-error.hbs
diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs b/admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs
similarity index 100%
rename from assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs
rename to admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-channel.hbs
diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs b/admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs
similarity index 100%
rename from assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs
rename to admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-edit-rule.hbs
diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs b/admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs
similarity index 100%
rename from assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs
rename to admin/assets/javascripts/admin/templates/modal/admin-plugins-chat-integration-test.hbs
diff --git a/assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs b/admin/assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs
similarity index 100%
rename from assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs
rename to admin/assets/javascripts/admin/templates/plugins-chat-integration-provider.hbs
diff --git a/assets/javascripts/admin/templates/plugins-chat-integration.hbs b/admin/assets/javascripts/admin/templates/plugins-chat-integration.hbs
similarity index 100%
rename from assets/javascripts/admin/templates/plugins-chat-integration.hbs
rename to admin/assets/javascripts/admin/templates/plugins-chat-integration.hbs