From 4d7491226a4eac33f5a57ebd67f292ef91c8c51e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 9 Jan 2024 12:44:56 +0000
Subject: [PATCH] DEV: Resolve deprecations for compatibility with latest ember
 (#20)

---
 .../components/user-card-directory-toggle.hbs |  0
 .../components/user-card-directory-toggle.js  |  5 ++-
 .../user-card-directory-toggle.hbs            |  0
 .../initializers/user-card-directory.js       | 31 ++++++++-----------
 4 files changed, 17 insertions(+), 19 deletions(-)
 rename javascripts/discourse/{templates => }/components/user-card-directory-toggle.hbs (100%)
 rename javascripts/discourse/{templates => }/connectors/users-directory-controls/user-card-directory-toggle.hbs (100%)

diff --git a/javascripts/discourse/templates/components/user-card-directory-toggle.hbs b/javascripts/discourse/components/user-card-directory-toggle.hbs
similarity index 100%
rename from javascripts/discourse/templates/components/user-card-directory-toggle.hbs
rename to javascripts/discourse/components/user-card-directory-toggle.hbs
diff --git a/javascripts/discourse/components/user-card-directory-toggle.js b/javascripts/discourse/components/user-card-directory-toggle.js
index ed94faf..a35b877 100644
--- a/javascripts/discourse/components/user-card-directory-toggle.js
+++ b/javascripts/discourse/components/user-card-directory-toggle.js
@@ -8,7 +8,10 @@ export default Component.extend({
 
   @discourseComputed("router.currentRoute.queryParams.cards")
   showingCards(cardsParam) {
-    return cardsParam === "yes";
+    return (
+      cardsParam === "yes" ||
+      (cardsParam === undefined && settings.default_view === "cards")
+    );
   },
 
   actions: {
diff --git a/javascripts/discourse/templates/connectors/users-directory-controls/user-card-directory-toggle.hbs b/javascripts/discourse/connectors/users-directory-controls/user-card-directory-toggle.hbs
similarity index 100%
rename from javascripts/discourse/templates/connectors/users-directory-controls/user-card-directory-toggle.hbs
rename to javascripts/discourse/connectors/users-directory-controls/user-card-directory-toggle.hbs
diff --git a/javascripts/discourse/initializers/user-card-directory.js b/javascripts/discourse/initializers/user-card-directory.js
index 43c8844..a4a5e2b 100644
--- a/javascripts/discourse/initializers/user-card-directory.js
+++ b/javascripts/discourse/initializers/user-card-directory.js
@@ -11,6 +11,15 @@ export default {
     withPluginApi("0.8.7", (api) => {
       api.modifyClass("route:users", {
         pluginId: "user-card-directory",
+
+        get templateName() {
+          if (this.modelFor("users")?.showAsCards) {
+            return "users-as-card-directory";
+          } else {
+            return "users";
+          }
+        },
+
         resetController(controller, isExiting) {
           this._super(...arguments);
           if (isExiting) {
@@ -22,29 +31,15 @@ export default {
           cards: { refreshModel: true },
         },
 
-        beforeModel(transition) {
-          this._super(transition);
-          if (
-            settings.default_view === "cards" &&
-            !transition.to.queryParams.cards
-          ) {
-            this.transitionTo({ queryParams: { cards: "yes" } });
-          }
-        },
-
         model(params) {
           return this._super(params).then((model) => {
-            model.showAsCards = params["cards"] === "yes";
+            model.showAsCards =
+              params["cards"] === "yes" ||
+              (params["cards"] === undefined &&
+                settings.default_view === "cards");
             return model;
           });
         },
-
-        renderTemplate(controller, model) {
-          if (model.showAsCards) {
-            return this.render("users-as-card-directory");
-          }
-          return this._super();
-        },
       });
 
       api.modifyClass("controller:users", {