Merge pull request #36 from paviliondev/fix-deprecations

Updates for Ember v3.28
paviliondev · Dec 22, 2023 · c24e18b · c24e18b
2 parents 839ff0a + 97cb0e5
commit c24e18b
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 14 deletions.
diff --git a/assets/javascripts/discourse/components/sidebar-container.js.es6 b/assets/javascripts/discourse/components/sidebar-container.js.es6
@@ -49,7 +49,7 @@ export default MountWidget.extend({
       sidebarMinimized,
     };
 
-    if (context === "discovery") {
+    if (context === "discovery/categories") {
       args.filter = this.filter;
     }
     if (

diff --git a/assets/javascripts/discourse/initializers/sidebars.js.es6 b/assets/javascripts/discourse/initializers/sidebars.js.es6
@@ -57,7 +57,7 @@ export default {
     });
 
     withPluginApi("0.8.32", (api) => {
-      api.modifyClass("controller:discovery", {
+      api.modifyClass("controller:discovery/list", {
         pluginId: PLUGIN_ID,
         router: service(),
         currentPath: readOnly("router.currentRouteName"),
@@ -83,9 +83,61 @@ export default {
           return defaultFilter;
         },
       });
+      api.modifyClass("controller:discovery/categories", {
+        pluginId: PLUGIN_ID,
+        router: service(),
+        currentPath: readOnly("router.currentRouteName"),
+        navigationDefault: controller("navigation/default"),
+        navigationCategory: controller("navigation/category"),
 
-      api.modifyClass("controller:topic", {
+        @discourseComputed(
+          "navigationDefault.filterType",
+          "navigationCategory.filterType",
+          "currentPath"
+        )
+        sidebarFilter(defaultFilter, categoryFilter, currentPath) {
+          if (!currentPath) {
+            return undefined;
+          }
+          let path = currentPath.toLowerCase();
+          if (path.indexOf("categories") > -1) {
+            return "categories";
+          }
+          if (path.indexOf("category") > -1) {
+            return categoryFilter;
+          }
+          return defaultFilter;
+        },
+      });
+      api.modifyClass("controller:discovery/filter", {
         pluginId: PLUGIN_ID,
+        router: service(),
+        currentPath: readOnly("router.currentRouteName"),
+        navigationDefault: controller("navigation/default"),
+        navigationCategory: controller("navigation/category"),
+
+        @discourseComputed(
+          "navigationDefault.filterType",
+          "navigationCategory.filterType",
+          "currentPath"
+        )
+        sidebarFilter(defaultFilter, categoryFilter, currentPath) {
+          if (!currentPath) {
+            return undefined;
+          }
+          let path = currentPath.toLowerCase();
+          if (path.indexOf("categories") > -1) {
+            return "categories";
+          }
+          if (path.indexOf("category") > -1) {
+            return categoryFilter;
+          }
+          return defaultFilter;
+        },
+      });
+
+      api.modifyClass("controller:topic", {
+        pluginId: `${PLUGIN_ID}-v2`,
         category: alias("model.category"),
         userHideRightSidebar: false,
       });

diff --git a/assets/javascripts/discourse/lib/layouts.js.es6 b/assets/javascripts/discourse/lib/layouts.js.es6
@@ -9,14 +9,57 @@ const layoutsNamespace = "layouts";
 const PLUGIN_ID = "discourse-layouts";
 
 const contexts = [
-  "discovery",
+  {
+    name: "discovery-categories",
+    route: "discovery/categories",
+    controller: "discovery/categories",
+    template: "discovery/categories",
+  },
+  {
+    name: "discovery-latest",
+    route: "discovery/latest",
+    controller: "discovery/list",
+    template: "discovery/list",
+  },
+  {
+    name: "discovery-unread",
+    route: "discovery/unread",
+    controller: "discovery/list",
+    template: "discovery/list",
+  },
+  {
+    name: "discovery-top",
+    route: "discovery/top",
+    controller: "discovery/list",
+    template: "discovery/list",
+  },
+  {
+    name: "discovery-category",
+    route: "discovery/category",
+    controller: "discovery/list",
+    template: "discovery/list",
+  },
+  {
+    name: "latest-category",
+    route: "discovery/latest-category",
+    controller: "discovery/list",
+    template: "discovery/list",
+  },
+  {
+    name: "top-category",
+    route: "discovery/top-category",
+    controller: "discovery/list",
+    template: "discovery/list",
+  },
   "topic",
   "user",
   "users",
   "tags-index",
   {
     name: "tag-show",
-    template: "tag-show",
+    route: "tag-show",
+    controller: "discovery/list",
+    template: "discovery/list",
   },
   "groups-index",
   "groups-new",
@@ -112,14 +155,13 @@ function listLayoutsWidgets() {
 
 function normalizeContext(input, opts = {}) {
   let map = {
-    discovery: [
-      "topics",
-      "discovery",
-      "topic list",
-      "Topics",
-      "Discovery",
-      "Topic List",
-    ],
+    "discovery-latest": ["discovery-latest"],
+    "discovery-categories": ["discovery-categories"],
+    "discovery-unread": ["discovery-unread"],
+    "discovery-top": ["discovery-top"],
+    "discovery-category": ["discovery-category"],
+    "latest-category": ["latest-category"],
+    "top-category": ["top-category"],
     topic: ["topic", "Topic"],
     user: ["user", "profile", "User", "Profile"],
     users: ["users"],
@@ -136,7 +178,13 @@ function normalizeContext(input, opts = {}) {
   if (opts.name) {
     context = I18n.t(
       {
-        discovery: "admin.layouts.widgets.context.discovery",
+        "discovery-latest": "admin.layouts.widgets.context.latest",
+        "discovery-categories": "admin.layouts.widgets.context.categories",
+        "discovery-unread": "admin.layouts.widgets.context.unread",
+        "discovery-top": "admin.layouts.widgets.context.top",
+        "discovery-category": "admin.layouts.widgets.context.category",
+        "latest-category": "admin.layouts.widgets.context.latest_category",
+        "top-category": "admin.layouts.widgets.context.top_category",
         topic: "topic.title",
         user: "user.profile",
         users: "user.users",

diff --git a/assets/javascripts/discourse/mixins/sidebars.js.es6 b/assets/javascripts/discourse/mixins/sidebars.js.es6
@@ -19,6 +19,8 @@ function hasWidgets(widgets, widgetsSet) {
 
 export default Mixin.create({
   router: service(),
+  siteSettings: service(),
+  appEvents: service(),
   path: alias("router._router.currentPath"),
   mobileView: false,
   tabletView: false,

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
@@ -27,6 +27,13 @@ en:
           context:
             label: "Contexts"
             discovery: "Topic List"
+            latest: "Latest"
+            top: "Top"
+            unread: "Unread"
+            categories: "Categories"
+            category: "Topic List"
+            top_category: "Top Category List"
+            latest_category: "Latest Category List"
           group:
             label: "Groups"
             users: "Users"