A platform for community discussion. Free, open, simple.
FEATURE: Ability to select posts in nested topic view (#40611)
Mark VanLandinghame7f0979d4243
diff --git a/app/assets/stylesheets/common/nested-view.scss b/app/assets/stylesheets/common/nested-view.scssindex 1c6afb424a9..dfb38145d50 100644--- a/app/assets/stylesheets/common/nested-view.scss+++ b/app/assets/stylesheets/common/nested-view.scss@@ -1,5 +1,11 @@@use "lib/viewport";+.selected-posts.nested-view__selected-posts {+ @include viewport.from(sm) {+ width: min(18rem, calc(100vw - 2rem));+ }+}+// ── Top-level nested view ──────────────────────────────────────────.nested-view {background: var(--secondary);@@ -199,6 +205,27 @@}}+ &__op-article {+ .select-posts {+ display: flex;+ align-items: center;+ gap: var(--space-2);+ white-space: nowrap;++ button {+ background-color: var(--primary-low);+ color: var(--primary);+ box-shadow: var(--shadow-dropdown);+ }+ }++ &.selected .select-posts button.select-post {+ background-color: var(--tertiary);+ color: var(--secondary);+ border-color: var(--tertiary);+ }+ }+&__op-row {display: flex;gap: 0.75em;@@ -600,6 +627,25 @@.topic-meta-data {padding: 0;}++ .select-posts {+ display: flex;+ align-items: center;+ gap: var(--space-2);+ white-space: nowrap;++ button {+ background-color: var(--primary-low);+ color: var(--primary);+ box-shadow: var(--shadow-dropdown);+ }+ }+ }++ &.selected &__article .select-posts button.select-post {+ background-color: var(--tertiary);+ color: var(--secondary);+ border-color: var(--tertiary);}&__header {@@ -623,6 +669,7 @@.post-infos {order: 1;+ margin-inline-start: auto;font-size: var(--font-down-2);color: var(--primary-medium);transform: translateY(1px); // optical alignment with username baselinediff --git a/frontend/discourse/app/components/nested.gjs b/frontend/discourse/app/components/nested.gjsindex 723f7410d70..c37ab702144 100644--- a/frontend/discourse/app/components/nested.gjs+++ b/frontend/discourse/app/components/nested.gjs@@ -279,6 +279,11 @@ export default class Nested extends Component {@collapseFromDepth={{if @collapseReplies 0}}@focusPost={{this.focusPath}}@forceExpanded={{true}}+ @multiSelect={{@multiSelect}}+ @togglePostSelection={{@togglePostSelection}}+ @selectReplies={{@selectReplies}}+ @selectBelow={{@selectBelow}}+ @postSelected={{@postSelected}}/></div>{{/each}}@@ -303,6 +308,11 @@ export default class Nested extends Component {@unhidePost={{@unhidePost}}@showPostMenu={{true}}@registerPost={{this.viewportTracker.registerPost}}+ @multiSelect={{@multiSelect}}+ @togglePostSelection={{@togglePostSelection}}+ @selectReplies={{@selectReplies}}+ @selectBelow={{@selectBelow}}+ @postSelected={{@postSelected}}/>{{#if this.currentUser}}@@ -374,6 +384,11 @@ export default class Nested extends Component {@cloakBelow={{this.cloakBelow}}@collapseFromDepth={{if @collapseReplies 0}}@focusPost={{this.focusPath}}+ @multiSelect={{@multiSelect}}+ @togglePostSelection={{@togglePostSelection}}+ @selectReplies={{@selectReplies}}+ @selectBelow={{@selectBelow}}+ @postSelected={{@postSelected}}/><PluginOutlet@name="nested-roots-between"diff --git a/frontend/discourse/app/components/nested/context-view.gjs b/frontend/discourse/app/components/nested/context-view.gjsindex 930a2ee6ebd..cca3a8fc1e9 100644--- a/frontend/discourse/app/components/nested/context-view.gjs+++ b/frontend/discourse/app/components/nested/context-view.gjs@@ -191,6 +191,11 @@ export default class NestedContextView extends Component {@toggleWiki={{@toggleWiki}}@unhidePost={{@unhidePost}}@registerPost={{this.viewportTracker.registerPost}}+ @multiSelect={{@multiSelect}}+ @togglePostSelection={{@togglePostSelection}}+ @selectReplies={{@selectReplies}}+ @selectBelow={{@selectBelow}}+ @postSelected={{@postSelected}}/><div class="nested-view__controls">@@ -272,6 +277,11 @@ export default class NestedContextView extends Component {@cloakAbove={{this.cloakAbove}}@cloakBelow={{this.cloakBelow}}@collapseFromDepth={{this.effectiveCollapseFromDepth}}+ @multiSelect={{@multiSelect}}+ @togglePostSelection={{@togglePostSelection}}+ @selectReplies={{@selectReplies}}+ @selectBelow={{@selectBelow}}+ @postSelected={{@postSelected}}/>{{/each}}</div>diff --git a/frontend/discourse/app/components/nested/op.gjs b/frontend/discourse/app/components/nested/op.gjsindex 8d1dbf87b82..cd91f50113d 100644--- a/frontend/discourse/app/components/nested/op.gjs+++ b/frontend/discourse/app/components/nested/op.gjs@@ -87,6 +87,25 @@ export default class NestedOp extends Component {return this.currentUser && this.args.topic?.details?.can_create_post;}+ get selected() {+ return this.args.multiSelect && this.args.postSelected?.(this.args.post);+ }++ @action+ togglePostSelection() {+ return this.args.togglePostSelection?.(this.args.post);+ }++ @action+ selectReplies() {+ return this.args.selectReplies?.(this.args.post);+ }++ @action+ selectBelow() {+ return this.args.selectBelow?.(this.args.post);+ }+@actionshowLogin() {getOwner(this).lookup("route:application").send("showLogin");@@ -98,7 +117,8 @@ export default class NestedOp extends Component {{{#let (lazyHash post=@post nestedReplyView=true) as |postOutletArgs|}}<PluginOutlet @name="post-article" @outletArgs={{postOutletArgs}}><article- class="nested-view__op-article boxed"+ class="nested-view__op-article boxed+ {{if this.selected 'selected'}}"data-post-id={{@post.id}}data-post-number={{@post.post_number}}{{@registerPost @post}}@@ -117,7 +137,12 @@ export default class NestedOp extends Component {<PostMetaData@post={{@post}}@editPost={{fn @editPost @post}}+ @multiSelect={{@multiSelect}}+ @selected={{this.selected}}+ @selectBelow={{this.selectBelow}}+ @selectReplies={{this.selectReplies}}@showHistory={{fn @showHistory @post}}+ @togglePostSelection={{this.togglePostSelection}}/></PluginOutlet><div class="nested-view__op-content">diff --git a/frontend/discourse/app/components/nested/post-children.gjs b/frontend/discourse/app/components/nested/post-children.gjsindex f0496148997..b71e4ecfdcb 100644--- a/frontend/discourse/app/components/nested/post-children.gjs+++ b/frontend/discourse/app/components/nested/post-children.gjs@@ -245,6 +245,11 @@ export default class NestedPostChildren extends Component {@registerPost={{@registerPost}}@collapseFromDepth={{@collapseFromDepth}}@focusPost={{@focusPost}}+ @multiSelect={{@multiSelect}}+ @togglePostSelection={{@togglePostSelection}}+ @selectReplies={{@selectReplies}}+ @selectBelow={{@selectBelow}}+ @postSelected={{@postSelected}}/>{{/each}}diff --git a/frontend/discourse/app/components/nested/post.gjs b/frontend/discourse/app/components/nested/post.gjsindex 10819610f18..475d9fc9289 100644--- a/frontend/discourse/app/components/nested/post.gjs+++ b/frontend/discourse/app/components/nested/post.gjs@@ -232,6 +232,10 @@ export default class NestedPost extends Component {return this.args.post.user_id === this.args.topic?.user_id;}+ get selected() {+ return this.args.multiSelect && this.args.postSelected?.(this.args.post);+ }+get contextUrl() {return getURL(`/n/${this.args.topic.slug}/${this.args.topic.id}/${this.args.post.post_number}?context=0`@@ -389,6 +393,21 @@ export default class NestedPost extends Component {}}+ @action+ togglePostSelection() {+ return this.args.togglePostSelection?.(this.args.post);+ }++ @action+ selectReplies() {+ return this.args.selectReplies?.(this.args.post);+ }++ @action+ selectBelow() {+ return this.args.selectBelow?.(this.args.post);+ }+@actionshowLogin() {getOwner(this).lookup("route:application").send("showLogin");@@ -405,6 +424,7 @@ export default class NestedPost extends Component {(if @post.isWhisper "nested-post--whisper")(if (or @post.deleted @post.user_deleted) "nested-post--deleted")(if this.cloakingData.active "nested-post--cloaked")+ (if this.selected "selected")}}style={{this.cloakingData.style}}{{this.restoreScroll}}@@ -580,7 +600,12 @@ export default class NestedPost extends Component {<PostMetaData@post={{@post}}@editPost={{fn @editPost @post}}+ @multiSelect={{@multiSelect}}+ @selected={{this.selected}}+ @selectBelow={{this.selectBelow}}+ @selectReplies={{this.selectReplies}}@showHistory={{fn @showHistory @post}}+ @togglePostSelection={{this.togglePostSelection}}/></PluginOutlet>{{#if this.isOP}}@@ -711,6 +736,11 @@ export default class NestedPost extends Component {@registerPost={{@registerPost}}@collapseFromDepth={{@collapseFromDepth}}@focusPost={{@focusPost}}+ @multiSelect={{@multiSelect}}+ @togglePostSelection={{@togglePostSelection}}+ @selectReplies={{@selectReplies}}+ @selectBelow={{@selectBelow}}+ @postSelected={{@postSelected}}/>{{/if}}</div>diff --git a/frontend/discourse/app/controllers/nested.js b/frontend/discourse/app/controllers/nested.jsindex b63e1f84e2e..885c066176f 100644--- a/frontend/discourse/app/controllers/nested.js+++ b/frontend/discourse/app/controllers/nested.js@@ -11,8 +11,11 @@ import { bind } from "discourse/lib/decorators";import { headerOffset } from "discourse/lib/offset-calculator";import QuoteState from "discourse/lib/quote-state";import Composer from "discourse/models/composer";+import Post from "discourse/models/post";import { i18n } from "discourse-i18n";-import processNode from "../lib/process-node";+import processNode, {+ registerPostInTopicPostStream,+} from "../lib/process-node";export default class NestedController extends Controller {@service appEvents;@@ -101,6 +104,136 @@ export default class NestedController extends Controller {return this.#topicController.minimumRequiredTags;}+ get multiSelect() {+ return this.#topicController.multiSelect;+ }++ get selectedPostsCount() {+ return this.#topicController.selectedPostsCount;+ }++ get canSelectAll() {+ return this.#nestedSelectablePostIds().some(+ (id) => !this.#topicController.selectedPostIds.includes(id)+ );+ }++ get canDeselectAll() {+ return this.selectedPostsCount > 0;+ }++ get canDeleteSelected() {+ const selectedPosts = this.#topicController.selectedPosts;++ return (+ this.selectedPostsCount > 0 &&+ this.selectedPostsCount === selectedPosts.length &&+ selectedPosts.every((post) => post.can_delete)+ );+ }++ get canMergeTopic() {+ return this.#topicController.canMergeTopic;+ }++ get canChangeOwner() {+ return this.#topicController.canChangeOwner;+ }++ get canMergePosts() {+ return this.#topicController.canMergePosts;+ }++ @bind+ postSelected(post) {+ return this.#topicController.postSelected(post);+ }++ @action+ toggleMultiSelect(event) {+ return this.#topicController.toggleMultiSelect(event);+ }++ @action+ togglePostSelection(post) {+ return this.#topicController.togglePostSelection(post);+ }++ @action+ selectReplies(post) {+ return this.#topicController.selectReplies(post);+ }++ @action+ selectBelow(post) {+ const postIds = this.#visiblePostIdsBelow(post);++ if (postIds.length > 0) {+ this.#topicController._updateSelectedPostIds(postIds);+ }+ }++ @action+ selectAll(event) {+ event?.preventDefault();+ this.#topicController._updateSelectedPostIds(+ this.#nestedSelectablePostIds()+ );+ }++ @action+ deselectAll(event) {+ return this.#topicController.deselectAll(event);+ }++ @action+ deleteSelected() {+ const user = this.currentUser;+ this.dialog.yesNoConfirm({+ message: i18n("post.delete.confirm", {+ count: this.selectedPostsCount,+ }),+ didConfirm: () => {+ Post.deleteMany(this.#topicController.selectedPostIds);+ (this.topic?.postStream?.posts || []).forEach(+ (post) =>+ this.postSelected(post) &&+ post.setDeletedState &&+ post.setDeletedState(user)+ );+ this.toggleMultiSelect();+ },+ });+ }++ @action+ mergePosts() {+ return this.#topicController.mergePosts();+ }++ #visiblePostIdsBelow(post) {+ const viewSelector = this.contextMode+ ? ".nested-context-view"+ : ".nested-view:not(.nested-context-view)";+ const view = document.querySelector(viewSelector);+ if (!view) {+ return [post.id];+ }++ const postIds = Array.from(+ view.querySelectorAll("article[data-post-id]")+ ).map((element) => Number(element.dataset.postId));+ const index = postIds.indexOf(post.id);++ return index === -1 ? [post.id] : postIds.slice(index);+ }++ #nestedSelectablePostIds() {+ return (this.topic?.postStream?.posts || [])+ .map((post) => post.id)+ .filter((id) => id != null);+ }+@actionasync loadMoreRoots() {if (this.loadingMore || !this.hasMoreRoots) {@@ -303,7 +436,7 @@ export default class NestedController extends Controller {if (!postStream.findLoadedPost(id)) {for (const post of this.postRegistry.values()) {if (post.id === id) {- postStream.storePost(post);+ registerPostInTopicPostStream(this.topic, post);break;}}@@ -481,7 +614,6 @@ export default class NestedController extends Controller {#onPostRegistered(post) {if (post?.post_number != null) {- this.topic?.postStream?.storePost(post);this.postRegistry.set(post.post_number, post);}}diff --git a/frontend/discourse/app/lib/process-node.js b/frontend/discourse/app/lib/process-node.jsindex 323a6de09c0..5b8d46d45e9 100644--- a/frontend/discourse/app/lib/process-node.js+++ b/frontend/discourse/app/lib/process-node.js@@ -1,6 +1,32 @@+export function registerPostInTopicPostStream(topic, post) {+ const postStream = topic?.postStream;+ if (!postStream) {+ return post;+ }++ const storedPost = postStream.storePost(post);+ if (!storedPost) {+ return storedPost;+ }++ if (postStream.posts && !postStream.posts.includes(storedPost)) {+ postStream.posts.push(storedPost);+ }++ if (+ postStream.stream &&+ storedPost.id != null &&+ !postStream.stream.includes(storedPost.id)+ ) {+ postStream.stream.push(storedPost.id);+ }++ return storedPost;+}+export default function processNode(store, topic, nodeData) {const createdPost = store.createRecord("post", nodeData);- const post = topic.postStream?.storePost(createdPost) || createdPost;+ const post = registerPostInTopicPostStream(topic, createdPost) || createdPost;if (post.topic !== topic) {post.topic = topic;diff --git a/frontend/discourse/app/routes/nested.js b/frontend/discourse/app/routes/nested.jsindex 3ed2c420a14..0da60f04fe0 100644--- a/frontend/discourse/app/routes/nested.js+++ b/frontend/discourse/app/routes/nested.js@@ -3,17 +3,21 @@ import { getOwner } from "@ember/owner";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";+import MoveToTopicModal from "discourse/components/modal/move-to-topic";import { ajax } from "discourse/lib/ajax";import EmbedMode from "discourse/lib/embed-mode";import PreloadStore from "discourse/lib/preload-store";import topicTitleToken from "discourse/lib/topic-title-token";import Draft from "discourse/models/draft";import DiscourseRoute from "discourse/routes/discourse";-import processNode from "../lib/process-node";+import processNode, {+ registerPostInTopicPostStream,+} from "../lib/process-node";export default class NestedRoute extends DiscourseRoute {@service composer;@service header;+ @service modal;@service nestedViewCache;@service router;@service screenTrack;@@ -95,7 +99,9 @@ export default class NestedRoute extends DiscourseRoute {// Hydrate the topic controller so core components that do// lookup("controller:topic") (e.g. share modal) find valid state.- this.controllerFor("topic").set("model", model.topic);+ const topicController = this.controllerFor("topic");+ topicController.set("model", model.topic);+ this._resetTopicControllerBulkSelection(topicController);// Set the topic route's currentModel so route actions that call// this.modelFor("topic") (e.g. showFeatureTopic, showTopicTimerModal)@@ -109,11 +115,10 @@ export default class NestedRoute extends DiscourseRoute {this.header.enterTopic(model.topic, !model.contextMode);- // Store the OP in the postStream so core components that call- // postStream.findLoadedPost() (e.g. share modal's "reply as new topic")- // find a valid post instead of undefined.+ // Store the OP in the postStream so core components that read loaded posts+ // (e.g. share modal's "reply as new topic", bulk selection) find it.if (model.opPost && model.topic.postStream) {- model.topic.postStream.storePost(model.opPost);+ registerPostInTopicPostStream(model.topic, model.opPost);}this.screenTrack.start(model.topic.id, controller);@@ -141,6 +146,7 @@ export default class NestedRoute extends DiscourseRoute {const controller = this.controller;this._saveToCache(controller);+ this._resetTopicControllerBulkSelection();controller.unsubscribe();this.screenTrack.stop();}@@ -161,6 +167,33 @@ export default class NestedRoute extends DiscourseRoute {return true;}+ @action+ moveToTopic() {+ const topicController = this.controllerFor("topic");+ this.modal.show(MoveToTopicModal, {+ model: {+ topic: this.modelFor("topic"),+ selectedPostsCount: topicController.selectedPostsCount,+ selectedAllPosts: false,+ selectedPosts: topicController.selectedPosts,+ selectedPostIds: topicController.selectedPostIds,+ toggleMultiSelect: topicController.toggleMultiSelect,+ },+ });+ }++ @action+ changeOwner(post = null) {+ return getOwner(this).lookup("route:topic").changeOwner(post);+ }++ _resetTopicControllerBulkSelection(+ topicController = this.controllerFor("topic")+ ) {+ topicController.set("multiSelect", false);+ topicController.selectedPostIds = [];+ }+_saveToCache(controller) {if (!controller.topic) {return;diff --git a/frontend/discourse/app/routes/topic.js b/frontend/discourse/app/routes/topic.jsindex 58116809b9d..6f16fc2e06f 100644--- a/frontend/discourse/app/routes/topic.js+++ b/frontend/discourse/app/routes/topic.js@@ -207,7 +207,7 @@ export default class TopicRoute extends DiscourseRoute {multiSelect: topicController.multiSelect,selectedPostsCount: post ? 1 : topicController.selectedPostsCount,selectedPostIds: post ? [post.id] : topicController.selectedPostIds,- selectedPostUsername:+ selectedPostsUsername:post?.username ?? topicController.selectedPostsUsername,toggleMultiSelect: topicController.toggleMultiSelect,topic: post?.topic ?? this.modelFor("topic"),diff --git a/frontend/discourse/app/templates/nested.gjs b/frontend/discourse/app/templates/nested.gjsindex a77263e5de2..d81f52852ef 100644--- a/frontend/discourse/app/templates/nested.gjs+++ b/frontend/discourse/app/templates/nested.gjs@@ -1,6 +1,7 @@import Nested from "discourse/components/nested";import NestedContextView from "discourse/components/nested/context-view";import PostTextSelection from "discourse/components/post-text-selection";+import SelectedPosts from "discourse/components/selected-posts";export default <template><PostTextSelection@@ -11,6 +12,26 @@ export default <template>@topic={{@controller.topic}}/>+ <div+ class="selected-posts nested-view__selected-posts+ {{unless @controller.multiSelect 'hidden'}}"+ >+ <SelectedPosts+ @selectedPostsCount={{@controller.selectedPostsCount}}+ @canSelectAll={{@controller.canSelectAll}}+ @canDeselectAll={{@controller.canDeselectAll}}+ @canDeleteSelected={{@controller.canDeleteSelected}}+ @canMergeTopic={{@controller.canMergeTopic}}+ @canChangeOwner={{@controller.canChangeOwner}}+ @canMergePosts={{@controller.canMergePosts}}+ @toggleMultiSelect={{@controller.toggleMultiSelect}}+ @mergePosts={{@controller.mergePosts}}+ @deleteSelected={{@controller.deleteSelected}}+ @deselectAll={{@controller.deselectAll}}+ @selectAll={{@controller.selectAll}}+ />+ </div>+{{#if @controller.contextMode}}<NestedContextView@topic={{@controller.topic}}@@ -55,6 +76,11 @@ export default <template>@scrollAnchor={{@controller.scrollAnchor}}@showActivityLog={{@controller.showActivityLog}}@collapseReplies={{@controller.collapseReplies}}+ @multiSelect={{@controller.multiSelect}}+ @togglePostSelection={{@controller.togglePostSelection}}+ @selectReplies={{@controller.selectReplies}}+ @selectBelow={{@controller.selectBelow}}+ @postSelected={{@controller.postSelected}}/>{{else}}<Nested@@ -102,6 +128,11 @@ export default <template>@scrollAnchor={{@controller.scrollAnchor}}@showActivityLog={{@controller.showActivityLog}}@collapseReplies={{@controller.collapseReplies}}+ @multiSelect={{@controller.multiSelect}}+ @togglePostSelection={{@controller.togglePostSelection}}+ @selectReplies={{@controller.selectReplies}}+ @selectBelow={{@controller.selectBelow}}+ @postSelected={{@controller.postSelected}}/>{{/if}}</template>diff --git a/frontend/discourse/tests/integration/components/nested/op-test.gjs b/frontend/discourse/tests/integration/components/nested/op-test.gjsnew file mode 100644index 00000000000..fe51fd9b9d3--- /dev/null+++ b/frontend/discourse/tests/integration/components/nested/op-test.gjs@@ -0,0 +1,110 @@+import { getOwner } from "@ember/owner";+import { click, render } from "@ember/test-helpers";+import { modifier } from "ember-modifier";+import { module, test } from "qunit";+import NestedOp from "discourse/components/nested/op";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import { i18n } from "discourse-i18n";++const noop = () => {};+const registerPost = modifier(() => {});++function renderComponent(context) {+ return render(+ <template>+ <NestedOp+ @post={{context.post}}+ @topic={{context.topic}}+ @editPost={{noop}}+ @showHistory={{noop}}+ @replyToPost={{noop}}+ @changeNotice={{noop}}+ @changePostOwner={{noop}}+ @grantBadge={{noop}}+ @lockPost={{noop}}+ @unlockPost={{noop}}+ @permanentlyDeletePost={{noop}}+ @rebakePost={{noop}}+ @showPagePublish={{noop}}+ @togglePostType={{noop}}+ @toggleWiki={{noop}}+ @unhidePost={{noop}}+ @registerPost={{registerPost}}+ @multiSelect={{context.multiSelect}}+ @togglePostSelection={{context.togglePostSelection}}+ @selectReplies={{context.selectReplies}}+ @selectBelow={{context.selectBelow}}+ @postSelected={{context.postSelected}}+ />+ </template>+ );+}++module("Integration | Component | Nested | Op", function (hooks) {+ setupRenderingTest(hooks);++ hooks.beforeEach(function () {+ this.store = getOwner(this).lookup("service:store");+ this.topic = this.store.createRecord("topic", {+ id: 1,+ slug: "nested-topic",+ posts_count: 2,+ views: 1,+ word_count: 1,+ like_count: 0,+ participant_count: 0,+ is_nested_view: true,+ });+ this.multiSelect = false;+ this.togglePostSelection = noop;+ this.selectReplies = noop;+ this.selectBelow = noop;+ this.postSelected = () => false;+ this.post = this.store.createRecord("post", {+ id: 1,+ post_number: 1,+ topic: this.topic,+ user_id: 1,+ username: "op-user",+ avatar_template: "/letter_avatar_proxy/v4/letter/o/25/48.png",+ cooked: "<p>Original post</p>",+ created_at: "2026-01-01T00:00:00.000Z",+ actions_summary: [],+ });+ });++ test("renders multi-select controls for the OP", async function (assert) {+ let selectedPost;+ this.multiSelect = true;+ this.togglePostSelection = (post) => {+ selectedPost = post;+ };++ await renderComponent(this);++ assert+ .dom(".select-post")+ .hasText(i18n("topic.multi_select.select_post.label"));+ assert+ .dom(".select-below")+ .doesNotExist("does not render select-below for the first post");++ await click(".select-post");++ assert.strictEqual(selectedPost, this.post, "passes the OP to selection");+ });++ test("marks the selected OP", async function (assert) {+ this.multiSelect = true;+ this.postSelected = (post) => post === this.post;++ await renderComponent(this);++ assert+ .dom(".nested-view__op-article")+ .hasClass("selected", "adds the selected state class");+ assert+ .dom(".select-post")+ .hasText(i18n("topic.multi_select.selected_post.label"));+ });+});diff --git a/frontend/discourse/tests/integration/components/nested/post-test.gjs b/frontend/discourse/tests/integration/components/nested/post-test.gjsindex 578bae41e8f..638bde6f09c 100644--- a/frontend/discourse/tests/integration/components/nested/post-test.gjs+++ b/frontend/discourse/tests/integration/components/nested/post-test.gjs@@ -39,6 +39,11 @@ function renderComponent(context) {@expansionState={{context.expansionState}}@fetchedChildrenCache={{context.fetchedChildrenCache}}@registerPost={{registerPost}}+ @multiSelect={{context.multiSelect}}+ @togglePostSelection={{context.togglePostSelection}}+ @selectReplies={{context.selectReplies}}+ @selectBelow={{context.selectBelow}}+ @postSelected={{context.postSelected}}/></template>);@@ -59,6 +64,11 @@ module("Integration | Component | Nested | Post", function (hooks) {this.children = [];this.expansionState = new Map();this.fetchedChildrenCache = new Map();+ this.multiSelect = false;+ this.togglePostSelection = noop;+ this.selectReplies = noop;+ this.selectBelow = noop;+ this.postSelected = () => false;this.post = this.store.createRecord("post", {id: 2,post_number: 2,@@ -121,4 +131,40 @@ module("Integration | Component | Nested | Post", function (hooks) {"stores the expanded leaf state");});++ test("renders multi-select controls", async function (assert) {+ let selectedPost;+ this.multiSelect = true;+ this.postSelected = () => false;+ this.togglePostSelection = (post) => {+ selectedPost = post;+ };++ await renderComponent(this);++ assert+ .dom(".select-post")+ .hasText(i18n("topic.multi_select.select_post.label"));+ assert+ .dom(".select-below")+ .hasText(i18n("topic.multi_select.select_below.label"));++ await click(".select-post");++ assert.strictEqual(selectedPost, this.post, "passes the post to selection");+ });++ test("marks selected posts", async function (assert) {+ this.multiSelect = true;+ this.postSelected = (post) => post === this.post;++ await renderComponent(this);++ assert+ .dom(".nested-post")+ .hasClass("selected", "adds the selected state class");+ assert+ .dom(".select-post")+ .hasText(i18n("topic.multi_select.selected_post.label"));+ });});diff --git a/frontend/discourse/tests/unit/controllers/nested-controller-read-posts-test.js b/frontend/discourse/tests/unit/controllers/nested-controller-read-posts-test.jsindex d477beab921..df157e6fe29 100644--- a/frontend/discourse/tests/unit/controllers/nested-controller-read-posts-test.js+++ b/frontend/discourse/tests/unit/controllers/nested-controller-read-posts-test.js@@ -1,6 +1,7 @@+import { setupTest } from "ember-qunit";import { module, test } from "qunit";-module("Unit | Controller | nested – readPosts with postRegistry", function () {+module("Unit | Controller | nested - readPosts with postRegistry", function () {function makePost(postNumber, read = false) {let _read = read;return {@@ -106,3 +107,135 @@ module("Unit | Controller | nested – readPosts with postRegistry", function ()assert.false(post.read);});});++module("Unit | Controller | nested - bulk select delegation", function (hooks) {+ setupTest(hooks);++ hooks.afterEach(function () {+ document.getElementById("qunit-fixture").innerHTML = "";+ });++ function setTopicControllerModel(controller, postIds) {+ controller.setProperties({+ model: {+ postStream: {+ isMegaTopic: false,+ posts: postIds.map((id) => ({ id })),+ stream: postIds,+ },+ },+ });+ controller.selectedPostIds = [];+ }++ test("uses the topic controller selection state", function (assert) {+ const nestedController = this.owner.lookup("controller:nested");+ const topicController = this.owner.lookup("controller:topic");+ const post = { id: 123 };++ topicController.multiSelect = false;+ topicController.selectedPostIds = [];++ nestedController.toggleMultiSelect();++ assert.true(+ nestedController.multiSelect,+ "reflects multi-select state from the topic controller"+ );++ nestedController.togglePostSelection(post);++ assert.deepEqual(+ topicController.selectedPostIds,+ [post.id],+ "selects posts through the topic controller"+ );+ assert.true(+ nestedController.postSelected(post),+ "checks selection through the topic controller"+ );+ });++ test("selectBelow uses nested root view display order", function (assert) {+ const nestedController = this.owner.lookup("controller:nested");+ const topicController = this.owner.lookup("controller:topic");+ setTopicControllerModel(topicController, [1, 10, 30, 20, 40]);+ nestedController.contextMode = false;++ document.getElementById("qunit-fixture").innerHTML = `+ <div class="nested-view">+ <article data-post-id="1"></article>+ <article data-post-id="10"></article>+ <article data-post-id="30"></article>+ <article data-post-id="20"></article>+ <article data-post-id="40"></article>+ </div>+ `;++ nestedController.selectBelow({ id: 30 });++ assert.deepEqual(+ topicController.selectedPostIds,+ [30, 20, 40],+ "selects the clicked post and visible posts after it"+ );+ });++ test("selectBelow uses nested context view display order", function (assert) {+ const nestedController = this.owner.lookup("controller:nested");+ const topicController = this.owner.lookup("controller:topic");+ setTopicControllerModel(topicController, [1, 2, 3, 4, 5]);+ nestedController.contextMode = true;++ document.getElementById("qunit-fixture").innerHTML = `+ <div class="nested-view">+ <article data-post-id="5"></article>+ </div>+ <div class="nested-view nested-context-view">+ <article data-post-id="1"></article>+ <article data-post-id="2"></article>+ <article data-post-id="3"></article>+ <article data-post-id="4"></article>+ </div>+ `;++ nestedController.selectBelow({ id: 3 });++ assert.deepEqual(+ topicController.selectedPostIds,+ [3, 4],+ "selects below from the active context view"+ );+ });++ test("selectAll selects loaded nested post ids", function (assert) {+ const nestedController = this.owner.lookup("controller:nested");+ const topicController = this.owner.lookup("controller:topic");+ const posts = [{ id: 1 }, { id: 2 }, { id: 3 }];+ setTopicControllerModel(+ topicController,+ posts.map((post) => post.id)+ );+ nestedController.topic = {+ postStream: {+ posts,+ },+ };++ nestedController.selectAll();++ assert.deepEqual(+ topicController.selectedPostIds,+ [1, 2, 3],+ "selects the loaded nested posts"+ );+ assert.false(+ nestedController.canSelectAll,+ "does not offer select-all once loaded nested posts are selected"+ );+ assert.true(+ nestedController.canDeselectAll,+ "offers deselect when nested posts are selected"+ );+ });+});diff --git a/frontend/discourse/tests/unit/lib/process-node-test.js b/frontend/discourse/tests/unit/lib/process-node-test.jsindex 85a99995146..8bc31dad357 100644--- a/frontend/discourse/tests/unit/lib/process-node-test.js+++ b/frontend/discourse/tests/unit/lib/process-node-test.js@@ -32,6 +32,8 @@ module("Unit | Lib | process-node", function (hooks) {id: 42,slug: "test",postStream: {+ posts: [],+ stream: [],storePost(post) {storedPosts.push(post);return post;@@ -44,9 +46,37 @@ module("Unit | Lib | process-node", function (hooks) {assert.strictEqual(storedPosts.length, 1);assert.strictEqual(storedPosts[0], result.post);+ assert.deepEqual(topic.postStream.posts, [result.post]);+ assert.deepEqual(topic.postStream.stream, [result.post.id]);assert.strictEqual(result.post.topic, topic);});+ test("does not duplicate existing post stream records", function (assert) {+ const store = getStore(this);+ const existingPost = store.createRecord("post", {+ id: 100,+ post_number: 2,+ });+ const topic = {+ id: 42,+ slug: "test",+ postStream: {+ posts: [existingPost],+ stream: [existingPost.id],+ storePost() {+ return existingPost;+ },+ },+ };+ const nodeData = { id: 100, post_number: 2 };++ const result = processNode(store, topic, nodeData);++ assert.strictEqual(result.post, existingPost);+ assert.deepEqual(topic.postStream.posts, [existingPost]);+ assert.deepEqual(topic.postStream.stream, [existingPost.id]);+ });+test("returns empty children when node has no children", function (assert) {const store = getStore(this);const topic = { id: 42, slug: "test" };diff --git a/frontend/discourse/tests/unit/routes/nested-test.js b/frontend/discourse/tests/unit/routes/nested-test.jsindex 8701f8631e4..badadc00771 100644--- a/frontend/discourse/tests/unit/routes/nested-test.js+++ b/frontend/discourse/tests/unit/routes/nested-test.js@@ -28,4 +28,145 @@ module("Unit | Route | nested", function (hooks) {"the nested route contributes the same title tokens as the topic route");});++ test("selected-post route actions open modals through the topic route", function (assert) {+ const nestedRoute = this.owner.lookup("route:nested");+ const topicRoute = this.owner.lookup("route:topic");+ const topicController = this.owner.lookup("controller:topic");+ const modal = this.owner.lookup("service:modal");+ const actions = nestedRoute.actions || nestedRoute._actions;+ const topic = { id: 42, url: "/t/nested-topic/42" };+ const posts = [+ { id: 10, username: "sam" },+ { id: 20, username: "sam" },+ { id: 30, username: "different" },+ ];++ modal.shown = [];+ modal.show = (component, options) => {+ modal.shown.push({ component, options });+ };++ topicRoute.currentModel = topic;+ topicController.setProperties({+ model: {+ postStream: {+ isMegaTopic: false,+ posts,+ stream: posts.map((post) => post.id),+ },+ },+ multiSelect: true,+ });+ topicController.selectedPostIds = [10, 20, 30];++ actions.moveToTopic.call(nestedRoute);++ topicController.selectedPostIds = [10, 20];+ actions.changeOwner.call(nestedRoute);++ const moveModel = modal.shown[0].options.model;+ assert.strictEqual(moveModel.topic, topic, "move modal receives the topic");+ assert.deepEqual(+ moveModel.selectedPostIds,+ [10, 20, 30],+ "move modal receives selected ids"+ );+ assert.deepEqual(+ moveModel.selectedPosts,+ posts,+ "move modal receives selected post records"+ );+ assert.false(+ moveModel.selectedAllPosts,+ "nested move never treats loaded nested posts as the whole topic"+ );++ const changeOwnerModel = modal.shown[1].options.model;+ assert.strictEqual(+ changeOwnerModel.topic,+ topic,+ "change-owner modal receives the topic"+ );+ assert.deepEqual(+ changeOwnerModel.selectedPostIds,+ [10, 20],+ "change-owner modal receives selected ids"+ );+ assert.strictEqual(+ changeOwnerModel.selectedPostsUsername,+ "sam",+ "change-owner modal receives the selected posts username"+ );+ });++ test("setupController clears stale topic bulk selection", function (assert) {+ const nestedRoute = this.owner.lookup("route:nested");+ const nestedController = this.owner.lookup("controller:nested");+ const topicController = this.owner.lookup("controller:topic");+ const store = this.owner.lookup("service:store");+ const staleTopic = store.createRecord("topic", { id: 41 });+ const topic = store.createRecord("topic", {+ id: 42,+ slug: "nested-topic",+ });+ const opPost = store.createRecord("post", {+ id: 1,+ post_number: 1,+ topic,+ });++ nestedRoute.header.enterTopic = () => {};+ nestedRoute.screenTrack.start = () => {};+ nestedController.subscribe = () => {};+ topicController.setProperties({+ model: staleTopic,+ multiSelect: true,+ });+ topicController.selectedPostIds = [10, 20];++ nestedRoute.setupController(nestedController, {+ topic,+ opPost,+ contextMode: true,+ });++ assert.strictEqual(+ topicController.model,+ topic,+ "hydrates the topic controller with the new nested topic"+ );+ assert.false(topicController.multiSelect, "clears stale multi-select mode");+ assert.deepEqual(+ topicController.selectedPostIds,+ [],+ "clears stale selected post ids"+ );+ });++ test("deactivate clears topic bulk selection", function (assert) {+ const nestedRoute = this.owner.lookup("route:nested");+ const topicController = this.owner.lookup("controller:topic");+ let unsubscribed = false;++ nestedRoute.controller = {+ topic: null,+ unsubscribe() {+ unsubscribed = true;+ },+ };+ nestedRoute.screenTrack.stop = () => {};+ topicController.set("multiSelect", true);+ topicController.selectedPostIds = [10, 20];++ nestedRoute.deactivate();++ assert.true(unsubscribed, "preserves nested controller deactivation");+ assert.false(topicController.multiSelect, "clears stale multi-select mode");+ assert.deepEqual(+ topicController.selectedPostIds,+ [],+ "clears stale selected post ids"+ );+ });});