DEV: Update modifyClass calls to native class syntax (#613)

assets/javascripts/discourse/initializers/extend-for-assigns.js

@@ -1,4 +1,5 @@
 import { getOwner } from "@ember/application";
+import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 import { isEmpty } from "@ember/utils";
 import { hbs } from "ember-cli-htmlbars";
@@ -24,8 +25,6 @@ import EditTopicAssignments from "../components/modal/edit-topic-assignments";
 import TopicLevelAssignMenu from "../components/topic-level-assign-menu";
 import { extendTopicModel } from "../models/topic";
 
-const PLUGIN_ID = "discourse-assign";
-
 const DEPENDENT_KEYS = [
   "topic.assigned_to_user",
   "topic.assigned_to_group",
@@ -361,18 +360,21 @@ function initialize(api) {
     return getURL(`/g/${assignedToGroup.name}/assigned/everyone`);
   }
 
-  api.modifyClass("model:bookmark", {
+  api.modifyClass(
-    pluginId: PLUGIN_ID,
+    "model:bookmark",
-
+    (Superclass) =>
+      class extends Superclass {
         @discourseComputed("assigned_to_user")
         assignedToUserPath(assignedToUser) {
           return assignedToUserPath(assignedToUser);
-    },
+        }
+
         @discourseComputed("assigned_to_group")
         assignedToGroupPath(assignedToGroup) {
           return assignedToGroupPath(assignedToGroup);
-    },
+        }
-  });
+      }
+  );
 
   api.modifyClass(
     "component:topic-notifications-button",
@@ -590,21 +592,24 @@ function initialize(api) {
     },
   });
 
-  api.modifyClass("model:group", {
+  api.modifyClass(
-    pluginId: PLUGIN_ID,
+    "model:group",
-
+    (Superclass) =>
+      class extends Superclass {
         asJSON() {
-      return Object.assign({}, this._super(...arguments), {
+          return Object.assign({}, super.asJSON(...arguments), {
             assignable_level: this.assignable_level,
           });
-    },
+        }
-  });
+      }
-
+  );
-  api.modifyClass("controller:topic", {
-    pluginId: PLUGIN_ID,
 
+  api.modifyClass(
+    "controller:topic",
+    (Superclass) =>
+      class extends Superclass {
         subscribe() {
-      this._super(...arguments);
+          super.subscribe(...arguments);
 
           this.messageBus.subscribe("/staff/topic-assignment", (data) => {
             const topic = this.model;
@@ -613,7 +618,9 @@ function initialize(api) {
             if (data.topic_id === topicId) {
               let post;
               if (data.post_id) {
-            post = topic.postStream.posts.find((p) => p.id === data.post_id);
+                post = topic.postStream.posts.find(
+                  (p) => p.id === data.post_id
+                );
               }
               const target = post || topic;
 
@@ -642,7 +649,9 @@ function initialize(api) {
                 this.appEvents.trigger("post-stream:refresh", {
                   id: topic.postStream.posts[0].id,
                 });
-            this.appEvents.trigger("post-stream:refresh", { id: data.post_id });
+                this.appEvents.trigger("post-stream:refresh", {
+                  id: data.post_id,
+                });
               }
               if (topic.closed) {
                 this.appEvents.trigger("post-stream:refresh", {
@@ -655,18 +664,19 @@ function initialize(api) {
               id: topic.postStream.posts[0].id,
             });
           });
-    },
+        }
 
         unsubscribe() {
-      this._super(...arguments);
+          super.unsubscribe(...arguments);
 
           if (!this.model?.id) {
             return;
           }
 
           this.messageBus.unsubscribe("/staff/topic-assignment");
-    },
+        }
-  });
+      }
+  );
 
   api.decorateWidget("post-contents:after-cooked", (dec) => {
     const postModel = dec.getModel();
@@ -710,16 +720,17 @@ function initialize(api) {
     "group-plus"
   );
 
-  api.modifyClass("controller:preferences/notifications", {
+  api.modifyClass(
-    pluginId: PLUGIN_ID,
+    "controller:preferences/notifications",
-
+    (Superclass) =>
-    actions: {
+      class extends Superclass {
+        @action
         save() {
           this.saveAttrNames.push("custom_fields");
-        this._super(...arguments);
+          super.save(...arguments);
-      },
+        }
-    },
+      }
-  });
+  );
 
   api.addKeyboardShortcut("g a", "", { path: "/my/activity/assigned" });
 }
@@ -834,7 +845,7 @@ export default {
     }
 
     withPluginApi("1.34.0", (api) => {
-      extendTopicModel(api, PLUGIN_ID);
+      extendTopicModel(api);
       initialize(api);
       registerTopicFooterButtons(api);
 

assets/javascripts/discourse/models/topic.js

@@ -1,9 +1,10 @@
 import { Assignment } from "./assignment";
 
-export function extendTopicModel(api, pluginId) {
+export function extendTopicModel(api) {
-  api.modifyClass("model:topic", {
+  api.modifyClass(
-    pluginId,
+    "model:topic",
-
+    (Superclass) =>
+      class extends Superclass {
         assignees() {
           const result = [];
 
@@ -14,54 +15,59 @@ export function extendTopicModel(api, pluginId) {
           const postAssignees = this.assignedPosts().map((p) => p.assigned_to);
           result.push(...postAssignees);
           return result;
-    },
+        }
 
         uniqueAssignees() {
           const map = new Map();
           this.assignees().forEach((user) => map.set(user.username, user));
           return [...map.values()];
-    },
+        }
 
         assignedPosts() {
           if (!this.indirectly_assigned_to) {
             return [];
           }
 
-      return Object.entries(this.indirectly_assigned_to).map(([key, value]) => {
+          return Object.entries(this.indirectly_assigned_to).map(
+            ([key, value]) => {
               value.postId = key;
               return value;
-      });
+            }
-    },
+          );
+        }
 
         assignments() {
           return [this.topicAssignment(), ...this.postAssignments()].compact();
-    },
+        }
 
         postAssignments() {
           if (!this.indirectly_assigned_to) {
             return [];
           }
 
-      return Object.entries(this.indirectly_assigned_to).map(([key, value]) => {
+          return Object.entries(this.indirectly_assigned_to).map(
+            ([key, value]) => {
               value.postId = key;
               return Assignment.fromPost(value);
-      });
+            }
-    },
+          );
+        }
 
         topicAssignment() {
           return Assignment.fromTopic(this);
-    },
+        }
 
         isAssigned() {
           return this.assigned_to_user || this.assigned_to_group;
-    },
+        }
 
         isAssignedTo(user) {
           return this.assigned_to_user?.username === user.username;
-    },
+        }
 
         hasAssignedPosts() {
           return !!this.postAssignments().length;
-    },
+        }
-  });
+      }
+  );
 }