Skip to content
This repository was archived by the owner on Jul 14, 2025. It is now read-only.

Commit 76420f2

Browse files
committed
DEV: Remove the legacy widget post menu code
1 parent 70318da commit 76420f2

File tree

4 files changed

+12
-412
lines changed

4 files changed

+12
-412
lines changed

assets/javascripts/discourse/components/assign-button.gjs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,17 @@ export default class AssignButton extends Component {
2929
}
3030

3131
@action
32-
acceptAnswer() {
32+
async acceptAnswer() {
3333
if (this.isAssigned) {
34-
unassignPost(this.args.post, this.taskActions);
34+
const post = this.args.post;
35+
36+
await this.taskActions.unassign(post.id, "Post");
37+
delete post.topic.indirectly_assigned_to[post.id];
3538
} else {
36-
assignPost(this.args.post, this.taskActions);
39+
this.taskActions.showAssignModal(this.args.post, {
40+
isAssigned: false,
41+
targetType: "Post",
42+
});
3743
}
3844
}
3945

@@ -51,16 +57,3 @@ export default class AssignButton extends Component {
5157
/>
5258
</template>
5359
}
54-
55-
// TODO (glimmer-post-menu): Remove these exported functions and move the code into the button action after the widget code is removed
56-
export function assignPost(post, taskActions) {
57-
taskActions.showAssignModal(post, {
58-
isAssigned: false,
59-
targetType: "Post",
60-
});
61-
}
62-
63-
export async function unassignPost(post, taskActions) {
64-
await taskActions.unassign(post.id, "Post");
65-
delete post.topic.indirectly_assigned_to[post.id];
66-
}

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

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ function initialize(api) {
778778
}
779779

780780
function customizePostMenu(api) {
781-
const transformerRegistered = api.registerValueTransformer(
781+
api.registerValueTransformer(
782782
"post-menu-buttons",
783783
({
784784
value: dag,
@@ -804,47 +804,6 @@ function customizePostMenu(api) {
804804
);
805805
}
806806
);
807-
808-
const silencedKey =
809-
transformerRegistered && "discourse.post-menu-widget-overrides";
810-
811-
withSilencedDeprecations(silencedKey, () => customizeWidgetPostMenu(api));
812-
}
813-
814-
function customizeWidgetPostMenu(api) {
815-
api.addPostMenuButton("assign", (post) => {
816-
if (post.firstPost) {
817-
return;
818-
}
819-
if (post.assigned_to_user || post.assigned_to_group) {
820-
return {
821-
action: "unassignPost",
822-
icon: "user-xmark",
823-
className: "unassign-post",
824-
title: "discourse_assign.unassign_post.title",
825-
position:
826-
post.assigned_to_user?.id === api.getCurrentUser().id
827-
? "first"
828-
: "second-last-hidden",
829-
};
830-
} else {
831-
return {
832-
action: "assignPost",
833-
icon: "user-plus",
834-
className: "assign-post",
835-
title: "discourse_assign.assign_post.title",
836-
position: "second-last-hidden",
837-
};
838-
}
839-
});
840-
841-
api.attachWidgetAction("post", "assignPost", function () {
842-
assignPost(this.model, getOwner(this).lookup("service:task-actions"));
843-
});
844-
845-
api.attachWidgetAction("post", "unassignPost", function () {
846-
unassignPost(this.model, getOwner(this).lookup("service:task-actions"));
847-
});
848807
}
849808

850809
const REGEXP_USERNAME_PREFIX = /^(assigned:)/gi;

test/javascripts/acceptance/assign-enabled-test.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
1515
acceptance("Discourse Assign | Assign mobile", function (needs) {
1616
needs.user();
1717
needs.mobileView();
18-
needs.settings({ glimmer_post_menu_mode: "enabled", assign_enabled: true });
18+
needs.settings({ assign_enabled: true });
1919

2020
needs.pretender((server, helper) => {
2121
server.get("/assign/suggestions", () => {
@@ -47,7 +47,7 @@ acceptance("Discourse Assign | Assign mobile", function (needs) {
4747

4848
acceptance("Discourse Assign | Assign desktop", function (needs) {
4949
needs.user({ can_assign: true });
50-
needs.settings({ glimmer_post_menu_mode: "enabled", assign_enabled: true });
50+
needs.settings({ assign_enabled: true });
5151

5252
needs.pretender((server, helper) => {
5353
server.get("/assign/suggestions", () => {
@@ -121,7 +121,6 @@ acceptance("Discourse Assign | Assign Status enabled", function (needs) {
121121
can_assign: true,
122122
});
123123
needs.settings({
124-
glimmer_post_menu_mode: "enabled",
125124
assign_enabled: true,
126125
enable_assign_status: true,
127126
assign_statuses: "New|In Progress|Done",
@@ -184,7 +183,6 @@ acceptance("Discourse Assign | Assign Status disabled", function (needs) {
184183
can_assign: true,
185184
});
186185
needs.settings({
187-
glimmer_post_menu_mode: "enabled",
188186
assign_enabled: true,
189187
enable_assign_status: false,
190188
});
@@ -245,7 +243,6 @@ const remindersFrequency = [
245243
acceptance("Discourse Assign | User preferences", function (needs) {
246244
needs.user({ can_assign: true, reminders_frequency: remindersFrequency });
247245
needs.settings({
248-
glimmer_post_menu_mode: "enabled",
249246
assign_enabled: true,
250247
remind_assigns_frequency: 43200,
251248
});
@@ -292,7 +289,6 @@ acceptance(
292289
function (needs) {
293290
needs.user({ can_assign: true, reminders_frequency: remindersFrequency });
294291
needs.settings({
295-
glimmer_post_menu_mode: "enabled",
296292
assign_enabled: true,
297293
remind_assigns_frequency: 43200,
298294
});

0 commit comments

Comments
 (0)