WIP: refactor

discourse · Mar 4, 2024 · 8524998 · 8524998
1 parent 286efd1
commit 8524998
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/assets/javascripts/discourse/services/task-actions.js b/assets/javascripts/discourse/services/task-actions.js
@@ -46,7 +46,7 @@ export default class TaskActions extends Service {
   }
 
   unassignPost(postId) {
-    this.unassign(postId, "Post");
+    return this.unassign(postId, "Post");
   }
 
   showAssignModal(

diff --git a/assets/javascripts/discourse/widgets/assigned-to.js b/assets/javascripts/discourse/widgets/assigned-to.js
@@ -38,13 +38,13 @@ export const AssignedToWidget = ["assigned-to", {
         "span",
         hbs`
           <DMenu @inline={{true}} @label="...">
-            <Menu::Buttons::UnassignPost @post={{@data.post}} />
-            <Menu::Buttons::EditPostAssignment @post={{@data.post}} />
+            <button {{on "click" @data.unassign}}>Unassign</button>
             <button {{on "click" @data.editAssignment}}>Edit assignment...</button>
           </DMenu>
         `,
         {
           post: this.attrs.post,
+          unassign: () => this.unassign(),
           editAssignment: () => this.editAssignment()
         }
       )
@@ -56,5 +56,11 @@ export const AssignedToWidget = ["assigned-to", {
     taskActions.showAssignModal(this.attrs.post, {
       targetType: "Post",
     });
+  },
+
+  unassign() {
+    const taskActions = getOwner(this).lookup("service:task-actions");
+    const post = this.attrs.post;
+    taskActions.unassignPost(post.id).then(() => delete post.topic.indirectly_assigned_to[post.id]);
   }
 }];