A platform for community discussion. Free, open, simple.
FIX: Wire up wrench post-menu actions in nested replies (#40138)
Rafael dos Santos Silvaaaa5d8fdf46e
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rbindex f2f86afbd28..7d0d048e45e 100644--- a/app/controllers/user_badges_controller.rb+++ b/app/controllers/user_badges_controller.rb@@ -96,7 +96,8 @@ class UserBadgesController < ApplicationControllerendif route = Discourse.route_for(params[:reason])- if route[:controller] == "topics" && route[:action] == "show"+ if (route[:controller] == "topics" && route[:action] == "show") ||+ route[:controller] == "nested_topics"topic_id = (route[:id] || route[:topic_id]).to_ipost_number = route[:post_number] || 1post_id = Post.find_by(topic_id: topic_id, post_number: post_number)&.id if topic_id > 0@@ -183,6 +184,10 @@ class UserBadgesController < ApplicationControllerdef is_badge_reason_valid?(reason)route = Discourse.route_for(reason)- route && (route[:controller] == "posts" || route[:controller] == "topics")+ route &&+ (+ route[:controller] == "posts" || route[:controller] == "topics" ||+ route[:controller] == "nested_topics"+ )endenddiff --git a/frontend/discourse/app/components/nested.gjs b/frontend/discourse/app/components/nested.gjsindex 1bc370ce959..0ca94996fa1 100644--- a/frontend/discourse/app/components/nested.gjs+++ b/frontend/discourse/app/components/nested.gjs@@ -102,6 +102,17 @@ export default class Nested extends Component {@editPost={{@editPost}}@showHistory={{@showHistory}}@replyToPost={{@replyToPost}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}@showPostMenu={{true}}@registerPost={{this.viewportTracker.registerPost}}/>@@ -162,6 +173,17 @@ export default class Nested extends Component {@recoverPost={{@recoverPost}}@showFlags={{@showFlags}}@showHistory={{@showHistory}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}@expansionState={{@expansionState}}@fetchedChildrenCache={{@fetchedChildrenCache}}@scrollAnchor={{@scrollAnchor}}diff --git a/frontend/discourse/app/components/nested/context-view.gjs b/frontend/discourse/app/components/nested/context-view.gjsindex ea3faec4e48..970a011bafb 100644--- a/frontend/discourse/app/components/nested/context-view.gjs+++ b/frontend/discourse/app/components/nested/context-view.gjs@@ -150,6 +150,17 @@ export default class NestedContextView extends Component {@topic={{@topic}}@editPost={{@editPost}}@showHistory={{@showHistory}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}@registerPost={{this.viewportTracker.registerPost}}/>@@ -217,6 +228,17 @@ export default class NestedContextView extends Component {@recoverPost={{@recoverPost}}@showFlags={{@showFlags}}@showHistory={{@showHistory}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}@expansionState={{@expansionState}}@fetchedChildrenCache={{@fetchedChildrenCache}}@scrollAnchor={{@scrollAnchor}}diff --git a/frontend/discourse/app/components/nested/op.gjs b/frontend/discourse/app/components/nested/op.gjsindex 19c09a77c7e..8950911581d 100644--- a/frontend/discourse/app/components/nested/op.gjs+++ b/frontend/discourse/app/components/nested/op.gjs@@ -137,6 +137,20 @@ export default class NestedOp extends Component {@copyLink={{this.copyLink}}@replyToPost={{@replyToPost}}@editPost={{fn @editPost @post}}+ @changeNotice={{fn @changeNotice @post}}+ @changePostOwner={{fn @changePostOwner @post}}+ @grantBadge={{fn @grantBadge @post}}+ @lockPost={{fn @lockPost @post}}+ @unlockPost={{fn @unlockPost @post}}+ @permanentlyDeletePost={{fn+ @permanentlyDeletePost+ @post+ }}+ @rebakePost={{fn @rebakePost @post}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{fn @togglePostType @post}}+ @toggleWiki={{fn @toggleWiki @post}}+ @unhidePost={{fn @unhidePost @post}}@share={{this.share}}@toggleLike={{this.toggleLike}}@showLogin={{this.showLogin}}diff --git a/frontend/discourse/app/components/nested/post-children.gjs b/frontend/discourse/app/components/nested/post-children.gjsindex 0b04892c471..133e9812d7f 100644--- a/frontend/discourse/app/components/nested/post-children.gjs+++ b/frontend/discourse/app/components/nested/post-children.gjs@@ -223,6 +223,17 @@ export default class NestedPostChildren extends Component {@recoverPost={{@recoverPost}}@showFlags={{@showFlags}}@showHistory={{@showHistory}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}@collapseParent={{@collapseParent}}@highlightParentLine={{@highlightParentLine}}@unhighlightParentLine={{@unhighlightParentLine}}diff --git a/frontend/discourse/app/components/nested/post.gjs b/frontend/discourse/app/components/nested/post.gjsindex ac8e82b0460..a2e65adb7b6 100644--- a/frontend/discourse/app/components/nested/post.gjs+++ b/frontend/discourse/app/components/nested/post.gjs@@ -545,6 +545,20 @@ export default class NestedPost extends Component {@replyToPost={{fn @replyToPost @post @depth}}@share={{this.share}}@showFlags={{fn @showFlags @post}}+ @changeNotice={{fn @changeNotice @post}}+ @changePostOwner={{fn @changePostOwner @post}}+ @grantBadge={{fn @grantBadge @post}}+ @lockPost={{fn @lockPost @post}}+ @unlockPost={{fn @unlockPost @post}}+ @permanentlyDeletePost={{fn+ @permanentlyDeletePost+ @post+ }}+ @rebakePost={{fn @rebakePost @post}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{fn @togglePostType @post}}+ @toggleWiki={{fn @toggleWiki @post}}+ @unhidePost={{fn @unhidePost @post}}@toggleLike={{this.toggleLike}}@toggleReplies={{unlessthis.atMaxDepth@@ -597,6 +611,17 @@ export default class NestedPost extends Component {@recoverPost={{@recoverPost}}@showFlags={{@showFlags}}@showHistory={{@showHistory}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}@collapseParent={{this.toggleExpanded}}@highlightParentLine={{this.highlightLine}}@unhighlightParentLine={{this.unhighlightLine}}diff --git a/frontend/discourse/app/controllers/nested.js b/frontend/discourse/app/controllers/nested.jsindex 71c2364f66a..46c92782886 100644--- a/frontend/discourse/app/controllers/nested.js+++ b/frontend/discourse/app/controllers/nested.js@@ -290,6 +290,61 @@ export default class NestedController extends Controller {this.#topicRoute.showFlags(post);}+ @action+ changeNotice(post) {+ return this.#topicController.changeNotice(post);+ }++ @action+ changePostOwner(post) {+ return this.#topicRoute.changeOwner(post);+ }++ @action+ grantBadge(post) {+ return this.#topicRoute.showGrantBadgeModal(post);+ }++ @action+ lockPost(post) {+ return this.#topicController.lockPost(post);+ }++ @action+ unlockPost(post) {+ return this.#topicController.unlockPost(post);+ }++ @action+ permanentlyDeletePost(post) {+ return this.#topicController.permanentlyDeletePost(post);+ }++ @action+ rebakePost(post) {+ return this.#topicController.rebakePost(post);+ }++ @action+ showPagePublish() {+ return this.#topicRoute.showPagePublish();+ }++ @action+ togglePostType(post) {+ return this.#topicController.togglePostType(post);+ }++ @action+ toggleWiki(post) {+ return this.#topicController.toggleWiki(post);+ }++ @action+ unhidePost(post) {+ return this.#topicController.unhidePost(post);+ }+@actionshowActivityLog() {this.modal.show(NestedActivityLog, {diff --git a/frontend/discourse/app/controllers/topic.js b/frontend/discourse/app/controllers/topic.jsindex 99e02cb97dd..3923b7d8c0f 100644--- a/frontend/discourse/app/controllers/topic.js+++ b/frontend/discourse/app/controllers/topic.js@@ -1323,8 +1323,7 @@ export default class TopicController extends Controller {@actionchangePostOwner(post) {- this.selectedPostIds = [post.id];- this.send("changeOwner");+ this.send("changeOwner", post);}@action@@ -1339,8 +1338,7 @@ export default class TopicController extends Controller {@actiongrantBadge(post) {- this.selectedPostIds = [post.id];- this.send("showGrantBadgeModal");+ this.send("showGrantBadgeModal", post);}@actiondiff --git a/frontend/discourse/app/routes/topic.js b/frontend/discourse/app/routes/topic.jsindex 12531fc6d5d..f626d5651d5 100644--- a/frontend/discourse/app/routes/topic.js+++ b/frontend/discourse/app/routes/topic.js@@ -208,11 +208,11 @@ export default class TopicRoute extends DiscourseRoute {}@action- showGrantBadgeModal() {+ showGrantBadgeModal(post = null) {const topicController = this.controllerFor("topic");this.modal.show(GrantBadgeModal, {model: {- selectedPost: topicController.selectedPosts[0],+ selectedPost: post ?? topicController.selectedPosts[0],},});}@@ -238,17 +238,18 @@ export default class TopicRoute extends DiscourseRoute {}@action- changeOwner() {+ changeOwner(post = null) {const topicController = this.controllerFor("topic");this.modal.show(ChangeOwnerModal, {model: {deselectAll: topicController.deselectAll,multiSelect: topicController.multiSelect,- selectedPostsCount: topicController.selectedPostsCount,- selectedPostIds: topicController.selectedPostIds,- selectedPostUsername: topicController.selectedPostsUsername,+ selectedPostsCount: post ? 1 : topicController.selectedPostsCount,+ selectedPostIds: post ? [post.id] : topicController.selectedPostIds,+ selectedPostUsername:+ post?.username ?? topicController.selectedPostsUsername,toggleMultiSelect: topicController.toggleMultiSelect,- topic: this.modelFor("topic"),+ topic: post?.topic ?? this.modelFor("topic"),},});}diff --git a/frontend/discourse/app/templates/nested.gjs b/frontend/discourse/app/templates/nested.gjsindex 34b7413d2a7..a77263e5de2 100644--- a/frontend/discourse/app/templates/nested.gjs+++ b/frontend/discourse/app/templates/nested.gjs@@ -29,6 +29,17 @@ export default <template>@recoverPost={{@controller.recoverPost}}@showFlags={{@controller.showFlags}}@showHistory={{@controller.showHistory}}+ @changeNotice={{@controller.changeNotice}}+ @changePostOwner={{@controller.changePostOwner}}+ @grantBadge={{@controller.grantBadge}}+ @lockPost={{@controller.lockPost}}+ @unlockPost={{@controller.unlockPost}}+ @permanentlyDeletePost={{@controller.permanentlyDeletePost}}+ @rebakePost={{@controller.rebakePost}}+ @showPagePublish={{@controller.showPagePublish}}+ @togglePostType={{@controller.togglePostType}}+ @toggleWiki={{@controller.toggleWiki}}+ @unhidePost={{@controller.unhidePost}}@editingTopic={{@controller.editingTopic}}@startEditingTopic={{@controller.startEditingTopic}}@cancelEditingTopic={{@controller.cancelEditingTopic}}@@ -61,6 +72,17 @@ export default <template>@recoverPost={{@controller.recoverPost}}@showFlags={{@controller.showFlags}}@showHistory={{@controller.showHistory}}+ @changeNotice={{@controller.changeNotice}}+ @changePostOwner={{@controller.changePostOwner}}+ @grantBadge={{@controller.grantBadge}}+ @lockPost={{@controller.lockPost}}+ @unlockPost={{@controller.unlockPost}}+ @permanentlyDeletePost={{@controller.permanentlyDeletePost}}+ @rebakePost={{@controller.rebakePost}}+ @showPagePublish={{@controller.showPagePublish}}+ @togglePostType={{@controller.togglePostType}}+ @toggleWiki={{@controller.toggleWiki}}+ @unhidePost={{@controller.unhidePost}}@postNumber={{@controller.postNumber}}@pinnedPostIds={{@controller.pinnedPostIds}}@newRootPostCount={{@controller.newRootPostIds.length}}diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rbindex af8a726fb5f..3d83127833c 100644--- a/spec/requests/user_badges_controller_spec.rb+++ b/spec/requests/user_badges_controller_spec.rb@@ -314,6 +314,26 @@ RSpec.describe UserBadgesController doexpect(response.status).to eq(200)end+ it "grants badge when a nested-view post link is given in reason" do+ post = create_post+ topic = post.topic+ nested_url = "#{Discourse.base_url}/n/#{topic.slug}/#{topic.id}/#{post.post_number}"++ sign_in(admin)++ post "/user_badges.json",+ params: {+ badge_id: badge.id,+ username: user.username,+ reason: nested_url,+ }++ expect(response.status).to eq(200)+ expect(UserBadge.exists?(badge_id: badge.id, post_id: post.id, granted_by: admin.id)).to eq(+ true,+ )+ end+describe "with relative_url_root" doit "grants badge when valid post/topic link is given in reason" doset_subfolder "/discuss"diff --git a/spec/system/nested_post_admin_menu_spec.rb b/spec/system/nested_post_admin_menu_spec.rbnew file mode 100644index 00000000000..3fea3a354dd--- /dev/null+++ b/spec/system/nested_post_admin_menu_spec.rb@@ -0,0 +1,59 @@+# frozen_string_literal: true++RSpec.describe "Nested view post admin menu" do+ fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }+ fab!(:topic) { Fabricate(:topic, user: user) }+ fab!(:op) do+ Fabricate(+ :post,+ topic: topic,+ user: user,+ post_number: 1,+ raw: "Original OP content that is long enough to render",+ )+ end+ fab!(:reply) { Fabricate(:post, topic: topic, user: user, raw: "Some reply body here") }++ let(:nested_view) { PageObjects::Pages::NestedView.new }++ before { SiteSetting.nested_replies_enabled = true }++ def open_admin_menu_for(post)+ selector = "[data-post-number='#{post.post_number}']"+ within(selector) do+ find(".show-more-actions").click if has_css?(".show-more-actions", wait: 2)+ find(".post-action-menu__admin").click+ end+ end++ context "as an admin" do+ before { sign_in(admin) }++ it "fires lockPost when clicking the admin menu item on a reply" do+ nested_view.visit_nested(topic)+ open_admin_menu_for(reply)+ expect(page).to have_css("[data-content][data-identifier='admin-post-menu']")+ find("[data-content][data-identifier='admin-post-menu'] .lock-post").click++ try_until_success { expect(reply.reload.locked_by_id).to eq(admin.id) }+ end++ it "fires lockPost when clicking the admin menu item on the OP" do+ nested_view.visit_nested(topic)+ open_admin_menu_for(op)+ expect(page).to have_css("[data-content][data-identifier='admin-post-menu']")+ find("[data-content][data-identifier='admin-post-menu'] .lock-post").click++ try_until_success { expect(op.reload.locked_by_id).to eq(admin.id) }+ end++ it "opens the change-owner modal when clicking the admin menu item" do+ nested_view.visit_nested(topic)+ open_admin_menu_for(reply)+ find("[data-content][data-identifier='admin-post-menu'] .change-owner").click++ expect(page).to have_css(".change-ownership-modal")+ end+ end+end