Skip to content

A platform for community discussion. Free, open, simple.

DEV: route nested view through topic route (#40820)

Mark VanLandingham63c4950c90fd
diff --git a/app/assets/stylesheets/common/nested-view.scss b/app/assets/stylesheets/common/nested-view.scss
index 770e91d8b07..44bdc0e3fab 100644
--- a/app/assets/stylesheets/common/nested-view.scss
+++ b/app/assets/stylesheets/common/nested-view.scss
@@ -335,6 +335,45 @@
}
}
+// ── Context view ──────────────────────────────────────────────────
+.nested-context-view {
+ &__banner {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ gap: 0.5em;
+ padding: 0.75em 1em;
+ margin-bottom: 1em;
+ background: var(--tertiary-very-low);
+ border: 1px solid var(--tertiary-low);
+ border-radius: var(--d-border-radius);
+ font-size: var(--font-down-1);
+ position: sticky;
+ top: var(--header-offset, 0);
+ z-index: 9;
+ }
+
+ &__banner-icon {
+ color: var(--tertiary);
+
+ .d-icon {
+ width: 1em;
+ height: 1em;
+ }
+ }
+
+ &__banner-text {
+ color: var(--primary-high);
+ margin-right: auto;
+ }
+
+ &__nav {
+ display: flex;
+ gap: 0.5em;
+ align-items: center;
+ }
+}
+
// ── Nested post (single comment in tree) ───────────────────────────
.nested-post {
// Avatar size for the "small" PostAvatar used in nested posts.
diff --git a/app/controllers/nested_topics_controller.rb b/app/controllers/nested_topics_controller.rb
index 7cc92eba839..addfc75d821 100644
--- a/app/controllers/nested_topics_controller.rb
+++ b/app/controllers/nested_topics_controller.rb
@@ -14,20 +14,11 @@ class NestedTopicsController < ApplicationController
after_action :allow_embed_mode, only: %i[show context]
# GET /n/:slug/:topic_id (HTML + JSON)
- # HTML: preloads initial data into the Ember shell (crawlers redirect to flat view)
+ # HTML: redirects browser requests to the canonical topic route.
# JSON page 0: includes topic metadata, OP post, sort, and message_bus_last_id
# JSON page 1+: returns only roots for pagination
def show
- if spa_boot_request?
- if use_crawler_layout?
- redirect_to "/t/#{params[:slug]}/#{params[:topic_id]}", status: :moved_permanently
- return
- end
-
- store_preloaded("nested_topic_#{@topic.id}", MultiJson.dump(list_roots_response(page: 0)))
- render "default/empty"
- return
- end
+ return redirect_to topic_route_url, status: topic_route_redirect_status if spa_boot_request?
page = params[:page].to_i.clamp(0, 1000)
render json: list_roots_response(page: page)
@@ -53,21 +44,13 @@ class NestedTopicsController < ApplicationController
end
# GET /n/:slug/:topic_id/:post_number (HTML + JSON)
- # HTML: preloads context data into the Ember shell (crawlers redirect to flat view)
+ # HTML: redirects browser requests to the canonical topic route.
# JSON param: context (integer) -- controls ancestor depth.
# nil/absent = windowed ancestor chain capped at max_depth (deep-links, notifications)
# 0 = no ancestors, target at depth 0 ("Continue this thread")
def context
if spa_boot_request?
- if use_crawler_layout?
- redirect_to "/t/#{params[:slug]}/#{params[:topic_id]}/#{params[:post_number]}",
- status: :moved_permanently
- return
- end
-
- store_preloaded("nested_topic_#{@topic.id}", MultiJson.dump(show_context_response))
- render "default/empty"
- return
+ return(redirect_to topic_route_url(params[:post_number]), status: topic_route_redirect_status)
end
render json: show_context_response
@@ -145,6 +128,8 @@ class NestedTopicsController < ApplicationController
private
+ TOPIC_ROUTE_QUERY_PARAMS = %w[sort collapse_replies context embed_mode class_name].freeze
+
def list_roots_response(page:)
result = nil
NestedTopic::ListRoots.call(
@@ -183,6 +168,21 @@ class NestedTopicsController < ApplicationController
result
end
+ def topic_route_redirect_status
+ use_crawler_layout? ? :moved_permanently : :found
+ end
+
+ def topic_route_url(post_number = nil)
+ url = +"/t/#{@topic.slug}/#{@topic.id}"
+ post_number = post_number.to_i
+ url << "/#{post_number}" if post_number > 0
+
+ query = request.query_parameters.slice(*TOPIC_ROUTE_QUERY_PARAMS)
+ query.delete("class_name") unless query["embed_mode"] == "true"
+ url << "?#{query.to_query}" if query.present?
+ url
+ end
+
def ensure_nested_replies_enabled
raise Discourse::NotFound unless SiteSetting.nested_replies_enabled
end
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 965321af53c..4316a788c6c 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -194,21 +194,9 @@ class TopicsController < ApplicationController
return
end
- if !request.format.json? && !use_crawler_layout? && SiteSetting.nested_replies_enabled &&
- !@topic_view.topic.private_message? &&
- (@topic_view.topic.nested_topic.present? || SiteSetting.nested_replies_default) &&
- params[:flat] != "1"
- url = +"/n/#{@topic_view.topic.slug}/#{@topic_view.topic.id}"
- post_number = opts[:post_number].to_i
- url << "/#{post_number}" if post_number > 0
- if params[:embed_mode] == "true"
- embed_query = { embed_mode: true }
- embed_query[:class_name] = params[:class_name] if params[:class_name].present?
- url << "?#{embed_query.to_query}"
- end
- redirect_to url, status: :found
- return
- end
+ # Nested topics render through the normal topic route. The Ember topic
+ # route decides whether to mount the flat post stream or the nested tree;
+ # crawlers still receive the flat topic HTML from this controller.
track_visit_to_topic
diff --git a/app/models/notification.rb b/app/models/notification.rb
index e0c26f1a8da..aaca1834a30 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -429,8 +429,9 @@ class Notification < ActiveRecord::Base
protected
- # We build /n/ directly here rather than letting /t/ redirect because
- # the redirect strips the query string we need (sort, collapse_replies).
+ # Consolidated nested notifications target the topic route. The Ember topic
+ # route mounts the nested view and preserves the query string we need
+ # (sort, collapse_replies).
def consolidated_nested_replied?
notification_type == Notification.types[:replied] && data_hash["consolidated_count"].to_i > 1 &&
data_hash["reply_to_post_number"].present?
@@ -440,7 +441,7 @@ class Notification < ActiveRecord::Base
bucket = data_hash["reply_to_post_number"].to_i
slug_segment = topic.slug.present? ? "/#{topic.slug}" : ""
bucket_segment = bucket > TOPIC_ROOT_BUCKET ? "/#{bucket}" : ""
- "#{Discourse.base_path}/n#{slug_segment}/#{topic.id}#{bucket_segment}?sort=new&collapse_replies=true"
+ "#{Discourse.base_path}/t#{slug_segment}/#{topic.id}#{bucket_segment}?sort=new&collapse_replies=true"
end
def refresh_notification_count
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c2cece2e87d..d0987557549 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4177,6 +4177,10 @@ en:
link: "Activity log"
title: "Topic activity log"
empty: "No topic activity to show."
+ context:
+ banner: "You are viewing a single thread from this topic."
+ view_full_topic: "View full topic"
+ view_parent_context: "View parent context"
topic:
filter_to:
one: "%{count} post in topic"
diff --git a/frontend/discourse/app/components/admin-post-menu.gjs b/frontend/discourse/app/components/admin-post-menu.gjs
index 5f84bc2549b..56bd1e214de 100644
--- a/frontend/discourse/app/components/admin-post-menu.gjs
+++ b/frontend/discourse/app/components/admin-post-menu.gjs
@@ -11,7 +11,6 @@ import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
export default class AdminPostMenu extends Component {
@service currentUser;
@service siteSettings;
- @service router;
@service adminPostMenuButtons;
get reviewUrl() {
@@ -34,7 +33,8 @@ export default class AdminPostMenu extends Component {
if (!this.siteSettings.nested_replies_enabled) {
return null;
}
- if (!this.router.currentRouteName?.startsWith("nested")) {
+ const topicController = getOwner(this).lookup("controller:topic");
+ if (!topicController?.shouldRenderNestedView) {
return null;
}
diff --git a/frontend/discourse/app/components/nested.gjs b/frontend/discourse/app/components/nested.gjs
index 0715d09bdf8..e2df7f19994 100644
--- a/frontend/discourse/app/components/nested.gjs
+++ b/frontend/discourse/app/components/nested.gjs
@@ -37,11 +37,13 @@ const postExcerpt = helper(([post]) => {
// Depth is zero-based; depth 3 matches the server's root preload depth.
const MOBILE_ROOT_VIEW_COLLAPSE_DEPTH = 3;
+const STORED_SCROLL_ANCHORS = Object.create(null);
export default class Nested extends Component {
@service appEvents;
@service currentUser;
@service header;
+ @service router;
@service screenTrack;
@service site;
@service siteSettings;
@@ -60,12 +62,23 @@ export default class Nested extends Component {
#retryTimer = null;
#highlightTimer = null;
#lastScrollKey = null;
- #onPopstate = () => next(this, this.syncFocusFromURL);
+ #restoringStoredScroll = false;
+ #onPopstate = () => {
+ this.#restoringStoredScroll = true;
+ next(this, this.syncFocusFromURL);
+ };
+ #onScroll = () => this.persistScrollAnchor();
+ #onPageHide = () => this.persistScrollAnchor();
constructor() {
super(...arguments);
+ this.#restoringStoredScroll = Boolean(this.#loadStoredScrollAnchor());
this.applyInitialFocusedPath();
window.addEventListener("popstate", this.#onPopstate);
+ window.addEventListener("scroll", this.#onScroll, { passive: true });
+ document.addEventListener("scroll", this.#onScroll, { passive: true });
+ window.addEventListener("pagehide", this.#onPageHide);
+ this.router.on("routeWillChange", this.persistScrollAnchor);
this.appEvents.on("keyboard:move-selection", this, this.maybeLoadMoreRoots);
this.appEvents.on(
"nested:scroll-to-target",
@@ -99,7 +112,12 @@ export default class Nested extends Component {
cancel(this.#nextTimer);
cancel(this.#retryTimer);
clearTimeout(this.#highlightTimer);
+ this.persistScrollAnchor();
window.removeEventListener("popstate", this.#onPopstate);
+ window.removeEventListener("scroll", this.#onScroll);
+ document.removeEventListener("scroll", this.#onScroll);
+ window.removeEventListener("pagehide", this.#onPageHide);
+ this.router.off("routeWillChange", this.persistScrollAnchor);
this.viewportTracker.destroy();
}
@@ -131,6 +149,14 @@ export default class Nested extends Component {
.join(" ");
}
+ get showContextBanner() {
+ return this.args.contextMode && !this.site.mobileView;
+ }
+
+ get showParentContextLink() {
+ return this.args.contextNoAncestors || this.args.ancestorsTruncated;
+ }
+
get mobileFocusClass() {
return `nested-view__mobile-focus --${this.focusDirection}`;
}
@@ -200,6 +226,7 @@ export default class Nested extends Component {
this.findScrollAnchor() ||
this.scrollAnchorForPath(path);
this.args.saveScrollPosition?.(this.mobileReturnAnchor);
+ this.#saveStoredScrollAnchor(this.mobileReturnAnchor, null);
}
this.focusDirection =
@@ -238,6 +265,103 @@ export default class Nested extends Component {
return this.findScrollAnchor();
}
+ @action
+ persistScrollAnchor() {
+ if (this.isDestroying || this.isDestroyed || this.#restoringStoredScroll) {
+ return;
+ }
+
+ const anchor = this.findScrollAnchor();
+ if (anchor) {
+ this.args.saveScrollPosition?.(anchor);
+ this.#saveStoredScrollAnchor(
+ anchor,
+ this.isMobileFocused ? null : this.args.postNumber
+ );
+ }
+ }
+
+ @action
+ restoreStoredScrollAnchor() {
+ const anchor = this.args.scrollAnchor || this.#loadStoredScrollAnchor();
+ if (!anchor) {
+ return;
+ }
+
+ this.#restoreScrollAnchorAfterRender(anchor);
+ }
+
+ #restoreScrollAnchorAfterRender(anchor) {
+ this.#restoringStoredScroll = true;
+ schedule("afterRender", () => {
+ this.#restoreScrollAnchor(anchor);
+ for (const delay of [50, 150, 300, 600, 1000]) {
+ setTimeout(() => this.#restoreScrollAnchor(anchor), delay);
+ }
+ setTimeout(() => (this.#restoringStoredScroll = false), 1250);
+ });
+ }
+
+ #restoreScrollAnchor(anchor) {
+ if (Number.isFinite(anchor.scrollY)) {
+ window.scrollTo(0, anchor.scrollY);
+ return;
+ }
+
+ const article = document.querySelector(
+ `.nested-post [data-post-number="${anchor.postNumber}"]`
+ );
+ const element = article?.closest(".nested-post") || article;
+ if (element) {
+ const rect = element.getBoundingClientRect();
+ window.scrollTo(0, window.scrollY + rect.top - anchor.offsetFromTop);
+ }
+ }
+
+ #saveStoredScrollAnchor(anchor, postNumber = this.args.postNumber) {
+ const key = this.#scrollAnchorKey(postNumber);
+ this.#storedScrollAnchors[key] = anchor;
+
+ try {
+ sessionStorage.setItem(key, JSON.stringify(anchor));
+ } catch {
+ // Ignore storage failures; module-level in-memory cache still works.
+ }
+ }
+
+ #loadStoredScrollAnchor(postNumber = this.args.postNumber) {
+ const key = this.#scrollAnchorKey(postNumber);
+ const cached = this.#storedScrollAnchors[key];
+ if (cached) {
+ return cached;
+ }
+
+ try {
+ const value = sessionStorage.getItem(key);
+ return value ? JSON.parse(value) : null;
+ } catch {
+ return null;
+ }
+ }
+
+ get #storedScrollAnchors() {
+ return STORED_SCROLL_ANCHORS;
+ }
+
+ #scrollAnchorKey(postNumber = this.args.postNumber) {
+ const parts = [this.args.topic.id];
+ if (this.args.sort) {
+ parts.push(`s=${this.args.sort}`);
+ }
+ if (postNumber) {
+ parts.push(`p=${postNumber}`);
+ }
+ if (this.args.contextNoAncestors) {
+ parts.push("c=0");
+ }
+ return `nested-view-scroll:${parts.join(":")}`;
+ }
+
findScrollAnchor() {
const articles = document.querySelectorAll(
".nested-view__roots .nested-post [data-post-number]"
@@ -357,17 +481,32 @@ export default class Nested extends Component {
}
if (!postNumber) {
+ const storedAnchor = this.#loadStoredScrollAnchor();
+ const anchor =
+ this.mobileReturnAnchor ||
+ storedAnchor ||
+ (this.focusedPath.length > 0
+ ? this.scrollAnchorForPath(this.focusedPath)
+ : null);
+
this.args.setFocusedPostNumber?.(null, []);
if (this.focusedPath.length > 0) {
this.focusDirection = "back";
- this.mobileReturnAnchor ??= this.scrollAnchorForPath(this.focusedPath);
- this.focusedPath = [];
+ }
+ this.mobileReturnAnchor = anchor;
+ this.focusedPath = [];
+
+ if (anchor) {
+ this.#restoreScrollAnchorAfterRender(anchor);
+ } else {
+ this.#restoringStoredScroll = false;
}
return;
}
const path = this.#focusedPathsByPostNumber.get(postNumber);
if (!path) {
+ this.#restoringStoredScroll = false;
return;
}
@@ -375,6 +514,7 @@ export default class Nested extends Component {
this.focusDirection =
path.length >= this.focusedPath.length ? "forward" : "back";
this.focusedPath = path;
+ this.#restoringStoredScroll = false;
}
#pushURLForFocusedPath(path) {
@@ -415,7 +555,7 @@ export default class Nested extends Component {
#postNumberFromCurrentURL() {
const path = withoutPrefix(window.location.pathname);
- const match = /^\/n\/[^/]+\/(\d+)(?:\/(\d+))?/.exec(path);
+ const match = /^\/t\/[^/]+\/(\d+)(?:\/(\d+))?/.exec(path);
if (!match || String(match[1]) !== String(this.args.topic.id)) {
return undefined;
}
@@ -481,7 +621,10 @@ export default class Nested extends Component {
}
const controls = document.querySelector(
- ".nested-view > .nested-view__controls"
+ ".nested-view:not(.nested-context-view) > .nested-view__controls"
+ );
+ const banner = document.querySelector(
+ ".nested-context-view > .nested-context-view__banner"
);
const rect = target.getBoundingClientRect();
window.scrollTo({
@@ -489,7 +632,8 @@ export default class Nested extends Component {
window.scrollY +
rect.top -
(this.header.headerOffset || 0) -
- (controls?.offsetHeight || 0),
+ (controls?.offsetHeight || 0) -
+ (banner?.offsetHeight || 0),
behavior: "smooth",
});
} else if (this.#scrollAttempts < this.#maxScrollAttempts) {
@@ -499,7 +643,7 @@ export default class Nested extends Component {
}
#nestedURL(postNumber = null) {
- let path = `/n/${this.args.topic.slug}/${this.args.topic.id}`;
+ let path = `/t/${this.args.topic.slug}/${this.args.topic.id}`;
if (postNumber) {
path += `/${postNumber}`;
}
@@ -521,7 +665,9 @@ export default class Nested extends Component {
<div
class={{this.viewClass}}
{{didInsert this.scheduleTargetScroll}}
+ {{didInsert this.restoreStoredScrollAnchor}}
{{didUpdate this.scheduleTargetScroll @targetPostNumber @rootNodes}}
+ {{didUpdate this.restoreStoredScrollAnchor @scrollAnchor}}
{{didUpdate this.applyInitialFocusedPath @initialFocusedPath}}
{{this.viewportTracker.setup
eyeline=false
@@ -700,6 +846,37 @@ export default class Nested extends Component {
</div>
</div>
+ {{#if this.showContextBanner}}
+ <div class="nested-context-view__banner">
+ <span class="nested-context-view__banner-icon">{{dIcon
+ "nested-thread"
+ }}</span>
+ <span class="nested-context-view__banner-text">{{i18n
+ "nested_replies.context.banner"
+ }}</span>
+ <div class="nested-context-view__nav">
+ <DButton
+ class="btn-default btn-small nested-context-view__full-thread"
+ @action={{@viewFullThread}}
+ @icon="arrow-left"
+ @translatedLabel={{i18n
+ "nested_replies.context.view_full_topic"
+ }}
+ />
+ {{#if this.showParentContextLink}}
+ <DButton
+ class="btn-default btn-small nested-context-view__parent-context"
+ @action={{@viewParentContext}}
+ @icon="arrow-up"
+ @translatedLabel={{i18n
+ "nested_replies.context.view_parent_context"
+ }}
+ />
+ {{/if}}
+ </div>
+ </div>
+ {{/if}}
+
{{#if (gt @newRootPostCount 0)}}
<div class="nested-view__new-replies">
<DButton
diff --git a/frontend/discourse/app/components/nested/op.gjs b/frontend/discourse/app/components/nested/op.gjs
index cd91f50113d..d2e759c7c17 100644
--- a/frontend/discourse/app/components/nested/op.gjs
+++ b/frontend/discourse/app/components/nested/op.gjs
@@ -159,6 +159,7 @@ export default class NestedOp extends Component {
>
<PostMenu
@post={{@post}}
+ @nestedReplyView={{true}}
@canCreatePost={{this.canCreatePost}}
@copyLink={{this.copyLink}}
@replyToPost={{@replyToPost}}
diff --git a/frontend/discourse/app/components/nested/post-children.gjs b/frontend/discourse/app/components/nested/post-children.gjs
index 7e31261107b..a4703d2db26 100644
--- a/frontend/discourse/app/components/nested/post-children.gjs
+++ b/frontend/discourse/app/components/nested/post-children.gjs
@@ -164,8 +164,12 @@ export default class NestedPostChildren extends Component {
async loadChildren() {
this.loading = true;
try {
+ const query = new URLSearchParams({
+ sort: this.args.sort || "top",
+ depth: this.childDepth,
+ });
const data = await ajax(
- `/n/${this.args.topic.slug}/${this.args.topic.id}/children/${this.args.parentPostNumber}.json?sort=${this.args.sort || "top"}&depth=${this.childDepth}`
+ `/n/${this.args.topic.slug}/${this.args.topic.id}/children/${this.args.parentPostNumber}.json?${query}`
);
if (this.isDestroying || this.isDestroyed) {
return;
@@ -201,8 +205,13 @@ export default class NestedPostChildren extends Component {
// to preserve expanded state on already-loaded nodes.
// Subsequent fetches: normal pagination.
const nextPage = this._fetchedFromServer ? this.page + 1 : 0;
+ const query = new URLSearchParams({
+ page: nextPage,
+ sort: this.args.sort || "top",
+ depth: this.childDepth,
+ });
const data = await ajax(
- `/n/${this.args.topic.slug}/${this.args.topic.id}/children/${this.args.parentPostNumber}.json?page=${nextPage}&sort=${this.args.sort || "top"}&depth=${this.childDepth}`
+ `/n/${this.args.topic.slug}/${this.args.topic.id}/children/${this.args.parentPostNumber}.json?${query}`
);
if (this.isDestroying || this.isDestroyed) {
return;
diff --git a/frontend/discourse/app/components/nested/post.gjs b/frontend/discourse/app/components/nested/post.gjs
index e72b54b1cb1..5caef1626f3 100644
--- a/frontend/discourse/app/components/nested/post.gjs
+++ b/frontend/discourse/app/components/nested/post.gjs
@@ -318,7 +318,7 @@ export default class NestedPost extends Component {
get contextUrl() {
return getURL(
- `/n/${this.args.topic.slug}/${this.args.topic.id}/${this.args.post.post_number}?context=0`
+ `/t/${this.args.topic.slug}/${this.args.topic.id}/${this.args.post.post_number}?context=0`
);
}
@@ -399,8 +399,12 @@ export default class NestedPost extends Component {
this.loadingReplies = true;
try {
+ const query = new URLSearchParams({
+ sort: this.args.sort || "top",
+ depth: this.childDepth,
+ });
const data = await ajax(
- `/n/${this.args.topic.slug}/${this.args.topic.id}/children/${this.args.post.post_number}.json?sort=${this.args.sort || "top"}&depth=${this.childDepth}`
+ `/n/${this.args.topic.slug}/${this.args.topic.id}/children/${this.args.post.post_number}.json?${query}`
);
if (this.isDestroying || this.isDestroyed) {
return null;
@@ -801,6 +805,7 @@ export default class NestedPost extends Component {
<section class="nested-post__menu post-menu-area clearfix">
<PostMenu
@post={{@post}}
+ @nestedReplyView={{true}}
@canCreatePost={{this.canCreatePost}}
@copyLink={{this.copyLink}}
@deletePost={{fn @deletePost @post}}
diff --git a/frontend/discourse/app/components/post/menu.gjs b/frontend/discourse/app/components/post/menu.gjs
index edd51bb5180..a3cafcb56bb 100644
--- a/frontend/discourse/app/components/post/menu.gjs
+++ b/frontend/discourse/app/components/post/menu.gjs
@@ -598,6 +598,7 @@ export default class PostMenu extends Component {
isWhoLikedVisible: this.isWhoLikedVisible,
isWhoReadVisible: this.isWhoReadVisible,
isWikiMode: this.isWikiMode,
+ nestedReplyView: this.args.nestedReplyView,
repliesShown: this.args.repliesShown,
repliesButtonDisabled: this.args.repliesButtonDisabled,
replyDirectlyBelow:
diff --git a/frontend/discourse/app/components/post/menu/buttons/replies.gjs b/frontend/discourse/app/components/post/menu/buttons/replies.gjs
index e0961eb4d63..f8578fc7082 100644
--- a/frontend/discourse/app/components/post/menu/buttons/replies.gjs
+++ b/frontend/discourse/app/components/post/menu/buttons/replies.gjs
@@ -8,12 +8,9 @@ import { i18n } from "discourse-i18n";
export default class PostMenuRepliesButton extends Component {
static extraControls = true;
- static shouldRender(args, _context, owner) {
- if (owner) {
- const router = owner.lookup("service:router");
- if (router?.currentRouteName?.startsWith("nested")) {
- return false;
- }
+ static shouldRender(args) {
+ if (args.state.nestedReplyView) {
+ return false;
}
const replyCount = args.post.reply_count;
diff --git a/frontend/discourse/app/components/topic-admin-menu.gjs b/frontend/discourse/app/components/topic-admin-menu.gjs
index ef304312043..ccdf361631d 100644
--- a/frontend/discourse/app/components/topic-admin-menu.gjs
+++ b/frontend/discourse/app/components/topic-admin-menu.gjs
@@ -144,9 +144,10 @@ export default class TopicAdminMenu extends Component {
data: { enabled: newValue },
});
topic.set("is_nested_view", newValue);
+ topic.set("_forcedFlat", !newValue);
if (newValue) {
- DiscourseURL.routeTo(`/n/${slug}/${topicId}`);
+ DiscourseURL.routeTo(`/t/${slug}/${topicId}`);
} else {
DiscourseURL.routeTo(`/t/${slug}/${topicId}`);
}
diff --git a/frontend/discourse/app/controllers/nested.js b/frontend/discourse/app/controllers/nested.js
index 4399ca88076..1931f887a8c 100644
--- a/frontend/discourse/app/controllers/nested.js
+++ b/frontend/discourse/app/controllers/nested.js
@@ -44,6 +44,7 @@ export default class NestedController extends Controller {
@tracked sort;
@tracked messageBusLastId;
@tracked postNumber;
+ @tracked context = null;
@tracked contextMode = false;
@tracked contextChain = null;
@tracked initialFocusedPath = [];
@@ -60,7 +61,6 @@ export default class NestedController extends Controller {
// state. If we ever want to scope it to entry-only, clear after the
// initial render in the route.
@tracked collapseReplies = false;
- queryParams = ["sort", "context", { collapseReplies: "collapse_replies" }];
// Externalized expansion state: postNumber → { expanded, collapsed }
// Components read on construction, write on toggle.
@@ -80,6 +80,7 @@ export default class NestedController extends Controller {
// Populated by NestedPost components via appEvents so that readPosts
// can find posts at any depth, not just those in the preloaded tree.
postRegistry = new Map();
+ #latestScrollAnchor = null;
#postEventsSubscribed = false;
#messageBusChannel = null;
#pendingPostIds = new Set();
@@ -254,8 +255,12 @@ export default class NestedController extends Controller {
this.loadingMore = true;
try {
const nextPage = this.page + 1;
+ const query = new URLSearchParams({
+ page: nextPage,
+ sort: this.sort || "top",
+ });
const data = await ajax(
- `/n/${this.topic.slug}/${this.topic.id}.json?page=${nextPage}&sort=${this.sort}`
+ `/n/${this.topic.slug}/${this.topic.id}.json?${query}`
);
const newNodes = (data.roots || []).map((root) =>
@@ -310,10 +315,16 @@ export default class NestedController extends Controller {
@action
viewFullThread() {
+ this.saveToCache();
this.nestedViewCache.useNextTransition();
- this.router.transitionTo("nested", this.topic.slug, this.topic.id, {
- queryParams: { sort: this.sort, context: null },
- });
+ this.router.transitionTo(
+ "topic.fromParams",
+ this.topic.slug,
+ this.topic.id,
+ {
+ queryParams: { sort: this.sort, context: null },
+ }
+ );
}
@action
@@ -325,7 +336,7 @@ export default class NestedController extends Controller {
@action
saveScrollPosition(scrollAnchor) {
- this.saveToCache(scrollAnchor);
+ this.saveScrollAnchor(scrollAnchor);
}
@action
@@ -333,16 +344,19 @@ export default class NestedController extends Controller {
this.scrollAnchor = null;
}
- saveToCache(scrollAnchor) {
- if (!this.topic) {
+ saveScrollAnchor(scrollAnchor) {
+ if (!this.topic || !scrollAnchor) {
return;
}
- const cacheKey = this.nestedViewCache.buildKey(this.topic.id, {
- sort: this.sort,
- post_number: this.postNumber,
- context: this.contextNoAncestors ? 0 : undefined,
- });
+ this.#latestScrollAnchor = scrollAnchor;
+ this.#saveScrollAnchorToSession(this.#cacheKey(), scrollAnchor);
+ }
+
+ saveToCache(scrollAnchor = this.#latestScrollAnchor) {
+ if (!this.topic) {
+ return;
+ }
const modelData = {
topic: this.topic,
@@ -354,6 +368,7 @@ export default class NestedController extends Controller {
messageBusLastId: this.messageBusLastId,
pinnedPostIds: this.pinnedPostIds,
postNumber: this.postNumber,
+ context: this.context,
contextMode: this.contextMode,
contextChain: this.contextChain,
initialFocusedPath: this.initialFocusedPath,
@@ -364,6 +379,8 @@ export default class NestedController extends Controller {
newRootPostIds: this.newRootPostIds,
};
+ const cacheKey = this.#cacheKey();
+
this.nestedViewCache.save(cacheKey, {
formatVersion: NESTED_VIEW_CACHE_FORMAT_VERSION,
modelData: snapshotNestedModelData(modelData),
@@ -373,13 +390,38 @@ export default class NestedController extends Controller {
),
scrollAnchor,
});
+
+ if (scrollAnchor) {
+ this.#saveScrollAnchorToSession(cacheKey, scrollAnchor);
+ }
+ }
+
+ #cacheKey() {
+ return this.nestedViewCache.buildKey(this.topic.id, {
+ sort: this.sort,
+ post_number: this.postNumber,
+ context: this.context ?? undefined,
+ });
+ }
+
+ #saveScrollAnchorToSession(cacheKey, scrollAnchor) {
+ try {
+ sessionStorage.setItem(
+ `nested-view-scroll:${cacheKey}`,
+ JSON.stringify(scrollAnchor)
+ );
+ } catch {
+ // Ignore storage failures; in-memory scroll restoration still works.
+ }
}
@action
viewParentContext() {
+ this.saveToCache();
+
if (this.ancestorsTruncated && this.topAncestorPostNumber) {
this.router.transitionTo(
- "nestedPost",
+ "topic.fromParamsNear",
this.topic.slug,
this.topic.id,
this.topAncestorPostNumber,
@@ -387,7 +429,7 @@ export default class NestedController extends Controller {
);
} else {
this.router.transitionTo(
- "nestedPost",
+ "topic.fromParamsNear",
this.topic.slug,
this.topic.id,
this.targetPostNumber,
diff --git a/frontend/discourse/app/controllers/topic.js b/frontend/discourse/app/controllers/topic.js
index 3d61e2ed71b..700e071e706 100644
--- a/frontend/discourse/app/controllers/topic.js
+++ b/frontend/discourse/app/controllers/topic.js
@@ -1,8 +1,14 @@
/* eslint-disable ember/no-observers */
import { cached, tracked } from "@glimmer/tracking";
import Controller from "@ember/controller";
-import EmberObject, { action, computed, set } from "@ember/object";
+import EmberObject, {
+ action,
+ computed,
+ getProperties,
+ set,
+} from "@ember/object";
import { dependentKeyCompat } from "@ember/object/compat";
+import { getOwner } from "@ember/owner";
import { next, schedule } from "@ember/runloop";
import { service } from "@ember/service";
import { isEmpty, isPresent } from "@ember/utils";
@@ -58,6 +64,18 @@ let customPostMessageCallbacks = {};
const RETRIES_ON_RATE_LIMIT = 4;
const MIN_BOTTOM_MAP_WORD_COUNT = 200;
+const TOPIC_QUERY_PARAMS = [
+ "filter",
+ "username_filters",
+ "replies_to_post_number",
+ "flat",
+ "sort",
+ "context",
+ { collapseReplies: "collapse_replies" },
+];
+const TOPIC_PAGE_QUERY_PARAM_PROPERTIES = TOPIC_QUERY_PARAMS.map((param) =>
+ typeof param === "string" ? param : Object.keys(param)[0]
+);
export function resetCustomPostMessageCallbacks() {
customPostMessageCallbacks = {};
@@ -97,12 +115,7 @@ export default class TopicController extends Controller {
@autoTrackedArray bookmarks = [];
@autoTrackedArray selectedPostIds = [];
- queryParams = [
- "filter",
- "username_filters",
- "replies_to_post_number",
- "flat",
- ];
+ queryParams = TOPIC_QUERY_PARAMS;
editingTopic = false;
enteredAt = null;
@@ -113,6 +126,9 @@ export default class TopicController extends Controller {
replies_to_post_number = null;
filter = null;
flat = null;
+ sort = null;
+ context = null;
+ collapseReplies = false;
quoteState = new QuoteState();
currentPostId = null;
userLastReadPostNumber = null;
@@ -138,6 +154,38 @@ export default class TopicController extends Controller {
this.appEvents.off("post:show-revision", this, "_showRevision");
}
+ get nestedController() {
+ return getOwner(this).lookup("controller:nested");
+ }
+
+ @computed(
+ "filter",
+ "username_filters",
+ "replies_to_post_number",
+ "flat",
+ "sort",
+ "context",
+ "collapseReplies"
+ )
+ get topicPageQueryParams() {
+ return getProperties(this, TOPIC_PAGE_QUERY_PARAM_PROPERTIES);
+ }
+
+ @computed("flat", "model._forcedFlat")
+ get forceFlatView() {
+ return (
+ this.flat === true ||
+ this.flat === "true" ||
+ this.flat === "1" ||
+ this.model?._forcedFlat
+ );
+ }
+
+ @computed("model.is_nested_view", "forceFlatView")
+ get shouldRenderNestedView() {
+ return this.model?.is_nested_view && !this.forceFlatView;
+ }
+
@computed("model.isPrivateMessage")
get showCategoryChooser() {
return !this.model?.isPrivateMessage;
@@ -2020,6 +2068,11 @@ export default class TopicController extends Controller {
return;
}
+ if (this.shouldRenderNestedView) {
+ this.#onNestedTopicMessage(data);
+ return;
+ }
+
const postStream = this.get("model.postStream");
const currentPostNumber = topic.get("currentPost");
const opts =
@@ -2138,11 +2191,72 @@ export default class TopicController extends Controller {
}
}
+ #onNestedTopicMessage(data) {
+ const topic = this.model;
+
+ if (data.reload_topic) {
+ topic
+ .reload()
+ .then(() => this.appEvents.trigger("header:update-topic", topic));
+ return;
+ }
+
+ switch (data.type) {
+ case "created":
+ case "revised":
+ case "rebaked":
+ case "deleted":
+ case "destroyed":
+ case "recovered":
+ case "acted":
+ case "read":
+ case "liked":
+ case "unliked":
+ // The nested controller owns rendered-post updates for these messages.
+ break;
+ case "move_to_inbox":
+ topic.set("message_archived", false);
+ break;
+ case "archived":
+ topic.set("message_archived", true);
+ break;
+ case "stats":
+ ["last_posted_at", "like_count", "posts_count"].forEach((property) => {
+ const value = data[property];
+ if (typeof value !== "undefined") {
+ topic.set(property, value);
+ }
+ });
+
+ if (data["last_poster"]) {
+ topic.details.set("last_poster", data["last_poster"]);
+ }
+ break;
+ case "remove_allowed_user":
+ this.router.transitionTo("userPrivateMessages", this.currentUser);
+ break;
+ default: {
+ let callback = customPostMessageCallbacks[data.type];
+ if (callback) {
+ callback(this, data);
+ } else {
+ // eslint-disable-next-line no-console
+ console.warn("unknown topic bus message type", data);
+ }
+ }
+ }
+ }
+
reply() {
this.replyToPost();
}
readPosts(topicId, postNumbers) {
+ if (this.shouldRenderNestedView) {
+ this.nestedController.readPosts(topicId, postNumbers);
+ return;
+ }
+
const topic = this.model;
const postStream = topic.get("postStream");
diff --git a/frontend/discourse/app/lib/nested-post-url.js b/frontend/discourse/app/lib/nested-post-url.js
index 853df673302..cd1f9416f8d 100644
--- a/frontend/discourse/app/lib/nested-post-url.js
+++ b/frontend/discourse/app/lib/nested-post-url.js
@@ -1,5 +1,5 @@
import getURL from "discourse/lib/get-url";
export default function nestedPostUrl(topic, postNumber) {
- return getURL(`/n/${topic.slug}/${topic.id}/${postNumber}`);
+ return getURL(`/t/${topic.slug}/${topic.id}/${postNumber}`);
}
diff --git a/frontend/discourse/app/lib/nested-topic-model.js b/frontend/discourse/app/lib/nested-topic-model.js
new file mode 100644
index 00000000000..8f3aca38adc
--- /dev/null
+++ b/frontend/discourse/app/lib/nested-topic-model.js
@@ -0,0 +1,135 @@
+import processNode from "discourse/lib/process-node";
+
+export function processNestedRootResponse({
+ data,
+ params,
+ site,
+ siteSettings,
+ store,
+}) {
+ hydrateCategories(site, data);
+
+ const topic = buildNestedTopic(store, data);
+ const assignTopic = (postData) => buildPost(store, topic, postData);
+ const opPost = data.op_post ? assignTopic(data.op_post) : null;
+ const rootNodes = (data.roots || []).map((root) =>
+ processNode(store, topic, root)
+ );
+
+ return {
+ topic,
+ opPost,
+ rootNodes,
+ page: data.page || 0,
+ hasMoreRoots: data.has_more_roots || false,
+ sort: data.sort || siteSettings.nested_replies_default_sort || "top",
+ messageBusLastId: data.message_bus_last_id,
+ pinnedPostIds: data.pinned_post_ids || [],
+ postNumber: params.post_number ? Number(params.post_number) : null,
+ context: params.context ?? null,
+ contextMode: false,
+ contextChain: null,
+ initialFocusedPath: [],
+ targetPostNumber: null,
+ contextNoAncestors: false,
+ ancestorsTruncated: false,
+ topAncestorPostNumber: null,
+ newRootPostIds: [],
+ editingTopic: false,
+ };
+}
+
+export function processNestedContextResponse({
+ data,
+ params,
+ sort,
+ site,
+ store,
+}) {
+ hydrateCategories(site, data);
+
+ const topic = buildNestedTopic(store, data);
+ const assignTopic = (postData) => buildPost(store, topic, postData);
+ const opPost = data.op_post ? assignTopic(data.op_post) : null;
+
+ const targetNode = processNode(store, topic, data.target_post);
+ const ancestors = (data.ancestor_chain || []).map((a) => assignTopic(a));
+ const targetReplyTo = targetNode.post.reply_to_post_number;
+ const hasParentContext = targetReplyTo && targetReplyTo !== 1;
+ const noAncestors = ancestors.length === 0 && hasParentContext;
+
+ // Nest ancestors outermost-first so target ends up as the chain leaf.
+ let chainTip = targetNode;
+ const focusedPath = [targetNode];
+ for (let i = ancestors.length - 1; i >= 0; i--) {
+ chainTip = {
+ post: ancestors[i],
+ children: [chainTip],
+ _renderKey: ancestors[i].id,
+ };
+ focusedPath.unshift(chainTip);
+ }
+
+ // Force full NestedPost rebuild on every fetch: NestedPostChildren reads
+ // @preloadedChildren only in its constructor, so without a fresh key the
+ // inner cascade keeps rendering the previous target when two context
+ // views share a chain root.
+ chainTip._renderKey = crypto.randomUUID();
+
+ return {
+ topic,
+ opPost,
+ sort,
+ pinnedPostIds: [],
+ messageBusLastId: data.message_bus_last_id,
+ postNumber: Number(params.post_number),
+ context: params.context ?? null,
+ contextMode: true,
+ contextChain: chainTip,
+ initialFocusedPath: focusedPath,
+ targetPostNumber: Number(params.post_number),
+ contextNoAncestors: noAncestors,
+ ancestorsTruncated: data.ancestors_truncated || false,
+ topAncestorPostNumber:
+ ancestors.length > 0 ? ancestors[0].post_number : null,
+ rootNodes: [chainTip],
+ page: 0,
+ hasMoreRoots: false,
+ newRootPostIds: [],
+ editingTopic: false,
+ };
+}
+
+function hydrateCategories(site, data) {
+ // Match Topic.find: seed the site category store from the topic payload so
+ // lazy_load_categories installs can resolve category badges on the topic
+ // itself and on piggybacked suggested/related rows that only carry
+ // category_id.
+ data.topic?.categories?.forEach((category) => site.updateCategory(category));
+}
+
+function buildNestedTopic(store, data) {
+ const topic = store.createRecord("topic", data.topic);
+ topic.set("is_nested_view", true);
+
+ // Suggested/related are piggybacked at top-level on whichever response has
+ // has_more_roots=false.
+ for (const key of [
+ "suggested_topics",
+ "related_topics",
+ "related_messages",
+ "suggested_group_name",
+ ]) {
+ if (data[key] !== undefined) {
+ topic[key] = data[key];
+ }
+ }
+
+ return topic;
+}
+
+function buildPost(store, topic, postData) {
+ const post = store.createRecord("post", postData);
+ post.topic = topic;
+ return post;
+}
diff --git a/frontend/discourse/app/lib/nested-view-cache-snapshot.js b/frontend/discourse/app/lib/nested-view-cache-snapshot.js
index 867fc72bc0a..8c27ad41bd0 100644
--- a/frontend/discourse/app/lib/nested-view-cache-snapshot.js
+++ b/frontend/discourse/app/lib/nested-view-cache-snapshot.js
@@ -27,6 +27,7 @@ export function snapshotNestedModelData(modelData) {
messageBusLastId: modelData.messageBusLastId,
pinnedPostIds: snapshotValue(modelData.pinnedPostIds),
postNumber: modelData.postNumber,
+ context: modelData.context,
contextMode: modelData.contextMode,
contextChain: snapshotNode(modelData.contextChain),
initialFocusedPath: snapshotNodes(modelData.initialFocusedPath),
@@ -61,6 +62,7 @@ export function hydrateNestedModelData(store, snapshot) {
messageBusLastId: snapshot.messageBusLastId,
pinnedPostIds: snapshotValue(snapshot.pinnedPostIds) || [],
postNumber: snapshot.postNumber,
+ context: snapshot.context ?? null,
contextMode: snapshot.contextMode,
contextChain: hydrateNode(store, topic, snapshot.contextChain),
initialFocusedPath: hydrateNodes(store, topic, snapshot.initialFocusedPath),
diff --git a/frontend/discourse/app/lib/notification-types/replied.js b/frontend/discourse/app/lib/notification-types/replied.js
index e71089789b1..8d800786c38 100644
--- a/frontend/discourse/app/lib/notification-types/replied.js
+++ b/frontend/discourse/app/lib/notification-types/replied.js
@@ -24,7 +24,7 @@ export default class extends NotificationTypeBase {
// rather than a single post so the user sees all the new content at once.
get linkHref() {
if (this.isBucketed && this.consolidatedCount > 1 && this.topicId) {
- let url = getURL(`/n/${this.notification.slug}/${this.topicId}`);
+ let url = getURL(`/t/${this.notification.slug}/${this.topicId}`);
if (!this.isTopicBucket) {
url += `/${this.notification.data.reply_to_post_number}`;
}
diff --git a/frontend/discourse/app/lib/url.js b/frontend/discourse/app/lib/url.js
index feaf0b79cd4..5889d0a5aa3 100644
--- a/frontend/discourse/app/lib/url.js
+++ b/frontend/discourse/app/lib/url.js
@@ -377,7 +377,7 @@ class DiscourseURL extends EmberObject {
const internalPath = url.replace(this.origin, "");
- return internalPath.startsWith("/t/") || internalPath.startsWith("/n/");
+ return internalPath.startsWith("/t/");
}
/**
@@ -393,11 +393,17 @@ class DiscourseURL extends EmberObject {
const oldMatches = TOPIC_URL_REGEXP.exec(oldPath);
const oldTopicId = oldMatches ? oldMatches[2] : null;
+ // Nested topics use the topic route too, but post-number changes need to
+ // run the route model hook so it can load the nested context payload.
+ const topicController = this.container.lookup("controller:topic");
+ if (topicController.shouldRenderNestedView) {
+ return false;
+ }
+
// If the topic_id is the same
if (oldTopicId === newTopicId) {
this.replaceState(path);
- const topicController = this.container.lookup("controller:topic");
const opts = {};
const postStream = topicController.get("model.postStream");
diff --git a/frontend/discourse/app/models/post.js b/frontend/discourse/app/models/post.js
index 33ac2e970e5..c58fc74af88 100644
--- a/frontend/discourse/app/models/post.js
+++ b/frontend/discourse/app/models/post.js
@@ -7,7 +7,6 @@ import { Promise } from "rsvp";
import { resolveShareUrl } from "discourse/helpers/share-url";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
-import getURL from "discourse/lib/get-url";
import { deepEqual } from "discourse/lib/object";
import { cook } from "discourse/lib/text";
import { fancyTitle } from "discourse/lib/topic-fancy-title";
@@ -290,19 +289,8 @@ export default class Post extends RestModel {
return this.firstPost ? this.topic?.deleted_at : this.deleted_at;
}
- @computed(
- "post_number",
- "topic_id",
- "topic.slug",
- "topic.is_nested_view",
- "topic._forcedFlat"
- )
+ @computed("post_number", "topic_id", "topic.slug")
get url() {
- if (this.topic?.is_nested_view && !this.topic?._forcedFlat) {
- const slug = this.topic.slug || "topic";
- const topicId = this.topic_id || this.topic.id;
- return getURL(`/n/${slug}/${topicId}/${this.post_number}`);
- }
return postUrl(
this.topic?.slug || this.topic_slug,
this.topic_id || this.get("topic.id"),
diff --git a/frontend/discourse/app/models/topic.js b/frontend/discourse/app/models/topic.js
index c613bf61a22..cd9919ab64e 100644
--- a/frontend/discourse/app/models/topic.js
+++ b/frontend/discourse/app/models/topic.js
@@ -651,15 +651,12 @@ export default class Topic extends RestModel {
return `${getURL("/t/")}${slug}/${this.id}`;
}
- @computed("id", "slug", "is_nested_view", "_forcedFlat")
+ @computed("id", "slug")
get url() {
let slug = this.slug || "";
if (slug.trim().length === 0) {
slug = "topic";
}
- if (this.is_nested_view && !this._forcedFlat) {
- return `${getURL("/n/")}${slug}/${this.id}`;
- }
return `${getURL("/t/")}${slug}/${this.id}`;
}
diff --git a/frontend/discourse/app/routes/app-route-map.js b/frontend/discourse/app/routes/app-route-map.js
index b2b03bfb08f..d6146170a24 100644
--- a/frontend/discourse/app/routes/app-route-map.js
+++ b/frontend/discourse/app/routes/app-route-map.js
@@ -20,10 +20,6 @@ export default function () {
this.route("topicBySlugOrId", { path: "/t/:slug_or_id" });
- // Nested replies routes
- this.route("nested", { path: "/n/:slug/:topic_id" });
- this.route("nestedPost", { path: "/n/:slug/:topic_id/:post_number" });
-
this.route("discovery", { path: "/" }, function () {
// top by periods - legacy route
Site.currentProp("periods").forEach((period) => {
diff --git a/frontend/discourse/app/routes/nested-post.js b/frontend/discourse/app/routes/nested-post.js
deleted file mode 100644
index f63d9bbd918..00000000000
--- a/frontend/discourse/app/routes/nested-post.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import NestedRoute from "discourse/routes/nested";
-
-export default class NestedPostRoute extends NestedRoute {
- controllerName = "nested";
- templateName = "nested";
-
- queryParams = {
- sort: { refreshModel: true },
- context: { refreshModel: true },
- };
-}
diff --git a/frontend/discourse/app/routes/nested.js b/frontend/discourse/app/routes/nested.js
deleted file mode 100644
index 7e26b821f62..00000000000
--- a/frontend/discourse/app/routes/nested.js
+++ /dev/null
@@ -1,411 +0,0 @@
-import { action } from "@ember/object";
-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 {
- hydrateExpansionState,
- hydrateFetchedChildrenCache,
- hydrateNestedModelData,
- isValidNestedViewCacheSnapshot,
- NESTED_VIEW_CACHE_FORMAT_VERSION,
-} from "discourse/lib/nested-view-cache-snapshot";
-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, {
- registerPostInTopicPostStream,
-} from "../lib/process-node";
-
-export default class NestedRoute extends DiscourseRoute {
- @service composer;
- @service header;
- @service historyStore;
- @service modal;
- @service nestedViewCache;
- @service router;
- @service screenTrack;
- @service site;
- @service siteSettings;
- @service store;
-
- queryParams = {
- sort: { refreshModel: true },
- context: { refreshModel: true },
- collapseReplies: { refreshModel: false },
- };
-
- buildRouteInfoMetadata() {
- return { scrollOnTransition: false };
- }
-
- titleToken() {
- return topicTitleToken(this.currentModel?.topic, this.siteSettings);
- }
-
- async model(params, transition) {
- const { topic_id, slug, post_number } = params;
- this._teardownCurrentTopic(topic_id);
-
- const sort =
- params.sort || this.siteSettings.nested_replies_default_sort || "top";
-
- const cacheKey = this.nestedViewCache.buildKey(topic_id, {
- ...params,
- sort,
- });
- if (
- this.nestedViewCache.consumeTraversal({
- allowLocalSignal: transition?.from?.name?.startsWith("nested"),
- isPoppedState: this.historyStore.isPoppedState,
- })
- ) {
- const cached = this.nestedViewCache.get(cacheKey);
- if (cached) {
- const restored = this._hydrateCachedEntry(cached);
- if (restored) {
- this._restoringFromCache = restored;
- return restored.modelData;
- }
-
- this.nestedViewCache.remove(cacheKey);
- }
- }
- this._restoringFromCache = null;
-
- if (post_number) {
- const queryParts = [`sort=${sort}`, "track_visit=true"];
- if (params.context !== undefined && params.context !== null) {
- queryParts.push(`context=${params.context}`);
- }
- const contextQuery = `?${queryParts.join("&")}`;
- const data = await PreloadStore.getAndRemove(
- `nested_topic_${topic_id}`,
- () =>
- ajax(
- `/n/${slug}/${topic_id}/context/${post_number}.json${contextQuery}`
- )
- );
- return this._processContextResponse(data, params, sort);
- }
-
- const data = await PreloadStore.getAndRemove(
- `nested_topic_${topic_id}`,
- () => ajax(`/n/${slug}/${topic_id}.json?sort=${sort}&track_visit=true`)
- );
- return this._processResponse(data, params);
- }
-
- setupController(controller, model) {
- const restoringFromCache = this._restoringFromCache;
-
- if (restoringFromCache) {
- controller.expansionState = restoringFromCache.expansionState;
- controller.fetchedChildrenCache = restoringFromCache.fetchedChildrenCache;
- controller.scrollAnchor = restoringFromCache.scrollAnchor;
- this._restoringFromCache = null;
- } else {
- controller.expansionState = new Map();
- controller.fetchedChildrenCache = new Map();
- controller.scrollAnchor = null;
- }
-
- controller.setProperties(model);
- controller.subscribe();
-
- // Hydrate the topic controller so core components that do
- // lookup("controller:topic") (e.g. share modal) find valid state.
- 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)
- // find the topic instead of undefined.
- getOwner(this).lookup("route:topic").currentModel = model.topic;
-
- // The Topic details setter replaces _details without preserving the
- // back-reference to the parent topic. Restore it so that
- // topic.details.updateNotifications() can construct the correct URL.
- model.topic.details.set("topic", model.topic);
-
- this.header.enterTopic(model.topic, !model.contextMode);
-
- // 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) {
- registerPostInTopicPostStream(model.topic, model.opPost);
- }
-
- this.screenTrack.start(model.topic.id, controller);
-
- if (!isEmpty(model.topic.draft) && !EmbedMode.enabled) {
- this.composer.open({
- draft: Draft.getLocal(model.topic.draft_key, model.topic.draft),
- draftKey: model.topic.draft_key,
- draftSequence: model.topic.draft_sequence,
- ignoreIfChanged: true,
- topic: model.topic,
- });
- }
-
- if (!restoringFromCache && !model.contextMode) {
- // Nested opts out of the global scroll manager for cache restoration,
- // so fresh root-topic entries need their own top reset.
- schedule("afterRender", () => window.scrollTo(0, 0));
- }
- }
-
- deactivate() {
- super.deactivate(...arguments);
-
- const controller = this.controller;
- this._saveToCache(controller);
-
- this._resetTopicControllerBulkSelection();
- controller.unsubscribe();
- this.screenTrack.stop();
- controller.topic = null;
- }
-
- @action
- willTransition(transition) {
- transition.followRedirects().finally(() => {
- const routeName = this.router.currentRouteName;
-
- if (
- !routeName?.startsWith("topic.") &&
- !routeName?.startsWith("nested")
- ) {
- this.header.clearTopic();
- }
- });
-
- 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;
- }
-
- controller.saveToCache(this._findScrollAnchor());
- }
-
- _teardownCurrentTopic(nextTopicId) {
- const controller = this.controllerFor("nested");
- const currentTopicId = controller.topic?.id;
-
- if (!currentTopicId || String(currentTopicId) === String(nextTopicId)) {
- return;
- }
-
- this._saveToCache(controller);
- controller.unsubscribe();
- this.screenTrack.stop();
- }
-
- _findScrollAnchor() {
- const articles = document.querySelectorAll(
- ".nested-post [data-post-number]"
- );
- let best = null;
- let bestDistance = Infinity;
-
- for (const el of articles) {
- const rect = el.getBoundingClientRect();
- const distance = Math.abs(rect.top);
- if (distance < bestDistance) {
- bestDistance = distance;
- best = {
- postNumber: Number(el.dataset.postNumber),
- offsetFromTop: rect.top,
- };
- }
- }
- return best;
- }
-
- _hydrateCachedEntry(cached) {
- if (
- cached.formatVersion !== NESTED_VIEW_CACHE_FORMAT_VERSION ||
- !isValidNestedViewCacheSnapshot(cached.modelData)
- ) {
- return null;
- }
-
- const modelData = hydrateNestedModelData(this.store, cached.modelData);
-
- return {
- modelData,
- expansionState: hydrateExpansionState(cached.expansionState),
- fetchedChildrenCache: hydrateFetchedChildrenCache(
- this.store,
- modelData.topic,
- cached.fetchedChildrenCache
- ),
- scrollAnchor: cached.scrollAnchor,
- };
- }
-
- _processResponse(data, params) {
- // Match Topic.find: seed the site category store from the topic
- // payload so lazy_load_categories installs can resolve category
- // badges on the topic itself and on piggybacked suggested/related
- // rows that only carry category_id.
- data.topic?.categories?.forEach((c) => this.site.updateCategory(c));
-
- const topic = this.store.createRecord("topic", data.topic);
- topic.set("is_nested_view", true);
-
- // Suggested/related are piggybacked at top-level on whichever
- // response has has_more_roots=false — here, a short topic that
- // fits in one page; otherwise they arrive via loadMoreRoots.
- for (const key of [
- "suggested_topics",
- "related_topics",
- "related_messages",
- "suggested_group_name",
- ]) {
- if (data[key] !== undefined) {
- topic[key] = data[key];
- }
- }
-
- const assignTopic = (postData) => {
- const post = this.store.createRecord("post", postData);
- post.topic = topic;
- return post;
- };
-
- const opPost = data.op_post ? assignTopic(data.op_post) : null;
-
- const rootNodes = (data.roots || []).map((root) =>
- processNode(this.store, topic, root)
- );
-
- return {
- topic,
- opPost,
- rootNodes,
- page: data.page || 0,
- hasMoreRoots: data.has_more_roots || false,
- sort: data.sort || this.siteSettings.nested_replies_default_sort || "top",
- messageBusLastId: data.message_bus_last_id,
- pinnedPostIds: data.pinned_post_ids || [],
- postNumber: params.post_number ? Number(params.post_number) : null,
- contextMode: false,
- contextChain: null,
- initialFocusedPath: [],
- targetPostNumber: null,
- contextNoAncestors: false,
- ancestorsTruncated: false,
- topAncestorPostNumber: null,
- newRootPostIds: [],
- editingTopic: false,
- };
- }
-
- _processContextResponse(data, params, sort) {
- data.topic?.categories?.forEach((c) => this.site.updateCategory(c));
-
- const topic = this.store.createRecord("topic", data.topic);
- topic.set("is_nested_view", true);
-
- for (const key of [
- "suggested_topics",
- "related_topics",
- "related_messages",
- "suggested_group_name",
- ]) {
- if (data[key] !== undefined) {
- topic[key] = data[key];
- }
- }
-
- const assignTopic = (postData) => {
- const post = this.store.createRecord("post", postData);
- post.topic = topic;
- return post;
- };
-
- const opPost = data.op_post ? assignTopic(data.op_post) : null;
-
- const targetNode = processNode(this.store, topic, data.target_post);
- const ancestors = (data.ancestor_chain || []).map((a) => assignTopic(a));
- const targetReplyTo = targetNode.post.reply_to_post_number;
- const hasParentContext = targetReplyTo && targetReplyTo !== 1;
- const noAncestors = ancestors.length === 0 && hasParentContext;
-
- // Nest ancestors outermost-first so target ends up as the chain leaf.
- let chainTip = targetNode;
- const focusedPath = [targetNode];
- for (let i = ancestors.length - 1; i >= 0; i--) {
- chainTip = {
- post: ancestors[i],
- children: [chainTip],
- _renderKey: ancestors[i].id,
- };
- focusedPath.unshift(chainTip);
- }
-
- // Force full NestedPost rebuild on every fetch: NestedPostChildren reads
- // @preloadedChildren only in its constructor, so without a fresh key the
- // inner cascade keeps rendering the previous target when two context
- // views share a chain root.
- chainTip._renderKey = crypto.randomUUID();
-
- return {
- topic,
- opPost,
- sort,
- pinnedPostIds: [],
- messageBusLastId: data.message_bus_last_id,
- postNumber: Number(params.post_number),
- contextMode: true,
- contextChain: chainTip,
- initialFocusedPath: focusedPath,
- targetPostNumber: Number(params.post_number),
- contextNoAncestors: noAncestors,
- ancestorsTruncated: data.ancestors_truncated || false,
- topAncestorPostNumber:
- ancestors.length > 0 ? ancestors[0].post_number : null,
- rootNodes: [chainTip],
- page: 0,
- hasMoreRoots: false,
- newRootPostIds: [],
- editingTopic: false,
- };
- }
-}
diff --git a/frontend/discourse/app/routes/topic.js b/frontend/discourse/app/routes/topic.js
index 551dcea9c12..eb938ddf0cc 100644
--- a/frontend/discourse/app/routes/topic.js
+++ b/frontend/discourse/app/routes/topic.js
@@ -42,6 +42,9 @@ export default class TopicRoute extends DiscourseRoute {
filter: { replace: true },
username_filters: { replace: true },
flat: { replace: true },
+ sort: { replace: true, refreshModel: true },
+ context: { refreshModel: true },
+ collapseReplies: { replace: true },
};
buildRouteInfoMetadata() {
diff --git a/frontend/discourse/app/routes/topic/from-params.js b/frontend/discourse/app/routes/topic/from-params.js
index d85cc5610f0..4a33d39fb81 100644
--- a/frontend/discourse/app/routes/topic/from-params.js
+++ b/frontend/discourse/app/routes/topic/from-params.js
@@ -1,19 +1,58 @@
import { action } from "@ember/object";
+import { getOwner } from "@ember/owner";
import { schedule } from "@ember/runloop";
import { service } from "@ember/service";
import { isEmpty } from "@ember/utils";
+import { ajax } from "discourse/lib/ajax";
import EmbedMode from "discourse/lib/embed-mode";
import { isTesting } from "discourse/lib/environment";
+import {
+ processNestedContextResponse,
+ processNestedRootResponse,
+} from "discourse/lib/nested-topic-model";
+import {
+ hydrateExpansionState,
+ hydrateFetchedChildrenCache,
+ hydrateNestedModelData,
+ isValidNestedViewCacheSnapshot,
+ NESTED_VIEW_CACHE_FORMAT_VERSION,
+} from "discourse/lib/nested-view-cache-snapshot";
+import PreloadStore from "discourse/lib/preload-store";
+import { registerPostInTopicPostStream } from "discourse/lib/process-node";
import DiscourseURL from "discourse/lib/url";
import Draft from "discourse/models/draft";
import DiscourseRoute from "discourse/routes/discourse";
+export function nestedQueryString(params) {
+ const query = new URLSearchParams();
+
+ for (const [key, value] of Object.entries(params)) {
+ if (value !== undefined && value !== null) {
+ query.set(key, value);
+ }
+ }
+
+ return query.toString();
+}
+
// This route is used for retrieving a topic based on params
export default class TopicFromParams extends DiscourseRoute {
@service appEvents;
@service composer;
@service header;
+ @service historyStore;
+ @service nestedViewCache;
@service router;
+ @service screenTrack;
+ @service site;
+ @service siteSettings;
+ @service store;
+
+ buildRouteInfoMetadata() {
+ return {
+ scrollOnTransition: false,
+ };
+ }
// Avoid default model hook
model(params, transition) {
@@ -22,13 +61,19 @@ export default class TopicFromParams extends DiscourseRoute {
const topic = this.modelFor("topic");
- // Skip the full post-stream load when we know afterModel will redirect
- // to the nested route. The nested route handles its own visit tracking.
- const flatParam =
- transition?.to?.queryParams?.flat ||
- transition?.to?.parent?.queryParams?.flat;
+ const queryParams = transition?.to?.queryParams || {};
+ const flatParam = this.#truthyQueryParam(
+ queryParams.flat || transition?.to?.parent?.queryParams?.flat
+ );
if (topic.is_nested_view && !flatParam && !topic._forcedFlat) {
- return params;
+ return this.#loadNestedModel(topic, params, queryParams).catch((e) => {
+ if (!isTesting()) {
+ // eslint-disable-next-line no-console
+ console.log("Could not view nested topic", e);
+ }
+ params._loading_error = true;
+ return params;
+ });
}
const postStream = topic.postStream;
@@ -41,7 +86,12 @@ export default class TopicFromParams extends DiscourseRoute {
return postStream
.refresh(params)
- .then(() => params)
+ .then(() => {
+ if (topic.is_nested_view && !flatParam && !topic._forcedFlat) {
+ return this.#loadNestedModel(topic, params, queryParams);
+ }
+ return params;
+ })
.catch((e) => {
if (!isTesting()) {
// eslint-disable-next-line no-console
@@ -55,40 +105,18 @@ export default class TopicFromParams extends DiscourseRoute {
afterModel(model, transition) {
const topic = this.modelFor("topic");
+ if (model._nested) {
+ this.header.enterTopic(model._nested.topic, !model._nested.contextMode);
+ return;
+ }
+
if (topic.is_nested_view) {
- const flatParam =
+ const flatParam = this.#truthyQueryParam(
transition?.to?.queryParams?.flat ||
- transition?.to?.parent?.queryParams?.flat;
+ transition?.to?.parent?.queryParams?.flat
+ );
if (flatParam || topic._forcedFlat) {
topic.set("_forcedFlat", true);
- } else {
- const postNumber = model.nearPost;
- const targetsPost = postNumber && postNumber > 1;
- const alreadyOnTarget = this.#alreadyOnNestedTarget(topic, postNumber);
-
- // Re-route into the nested view. When alreadyOnTarget is true
- // this is a no-op transition that keeps the URL where it is;
- // when false it becomes a real route change. Either way we
- // must call it so we don't end up landing on /t/... — leaving
- // afterModel without a redirect would let the topic route's
- // setupController run.
- if (targetsPost) {
- this.router.replaceWith(
- "nestedPost",
- topic.slug,
- topic.id,
- postNumber
- );
- } else {
- this.router.replaceWith("nested", topic.slug, topic.id);
- }
-
- if (alreadyOnTarget) {
- // No transition will fire — nudge the context view to
- // re-scroll/highlight the target post.
- this.appEvents.trigger("nested:scroll-to-target");
- }
- return;
}
}
@@ -100,7 +128,15 @@ export default class TopicFromParams extends DiscourseRoute {
deactivate() {
super.deactivate(...arguments);
- this.controllerFor("topic").unsubscribe();
+
+ const topicController = this.controllerFor("topic");
+ const nestedController = this.controllerFor("nested");
+ this.#saveNestedToCache(nestedController);
+
+ topicController.unsubscribe();
+ this.#resetTopicControllerBulkSelection(topicController);
+ nestedController.unsubscribe();
+ nestedController.topic = null;
}
setupController(controller, params, { _discourse_anchor }) {
@@ -110,7 +146,22 @@ export default class TopicFromParams extends DiscourseRoute {
return;
}
+ if (params._nested) {
+ this.#setupNestedController(params._nested);
+ return;
+ }
+
const topicController = this.controllerFor("topic");
+ const nestedController = this.controllerFor("nested");
+ const wasNestedView = Boolean(nestedController.topic);
+ if (wasNestedView) {
+ this.#saveNestedToCache(nestedController);
+ }
+ nestedController.unsubscribe();
+ if (wasNestedView) {
+ this.#resetTopicControllerBulkSelection(topicController);
+ nestedController.topic = null;
+ }
const topic = this.modelFor("topic");
const postStream = topic.postStream;
@@ -138,6 +189,9 @@ export default class TopicFromParams extends DiscourseRoute {
this.appEvents.trigger("page:topic-loaded", topic);
topicController.subscribe();
+ if (wasNestedView) {
+ this.screenTrack.start(topic.id, topicController);
+ }
// Highlight our post after the next render
schedule("afterRender", () =>
@@ -169,19 +223,291 @@ export default class TopicFromParams extends DiscourseRoute {
}
}
- #alreadyOnNestedTarget(topic, postNumber) {
- const currentParams = this.router.currentRoute?.params;
- if (!currentParams || String(currentParams.topic_id) !== String(topic.id)) {
- return false;
+ async #loadNestedModel(topic, params, queryParams) {
+ const sort =
+ queryParams.sort ||
+ this.siteSettings.nested_replies_default_sort ||
+ "top";
+ const postNumber = Number(params.nearPost);
+ const targetsPost = Number.isInteger(postNumber) && postNumber > 1;
+ const slug = topic.slug || params.slug || "topic";
+ const nestedParams = {
+ ...params,
+ post_number: targetsPost ? postNumber : null,
+ context: queryParams.context,
+ };
+
+ const cacheKey = this.nestedViewCache.buildKey(topic.id, {
+ ...nestedParams,
+ sort,
+ });
+ const cached = this.#restoreNestedFromCache(cacheKey);
+
+ if (cached) {
+ params._nested = cached;
+ params._nested.collapseReplies = this.#truthyQueryParam(
+ queryParams.collapse_replies || queryParams.collapseReplies
+ );
+ return params;
+ }
+
+ if (targetsPost) {
+ const query = nestedQueryString({
+ sort,
+ track_visit: true,
+ context: queryParams.context,
+ });
+
+ const data = await PreloadStore.getAndRemove(
+ `nested_topic_${topic.id}`,
+ () => ajax(`/n/${slug}/${topic.id}/context/${postNumber}.json?${query}`)
+ );
+
+ params._nested = processNestedContextResponse({
+ data,
+ params: nestedParams,
+ site: this.site,
+ sort,
+ store: this.store,
+ });
+ } else {
+ const query = nestedQueryString({ sort, track_visit: true });
+ const data = await PreloadStore.getAndRemove(
+ `nested_topic_${topic.id}`,
+ () => ajax(`/n/${slug}/${topic.id}.json?${query}`)
+ );
+
+ params._nested = processNestedRootResponse({
+ data,
+ params: nestedParams,
+ site: this.site,
+ siteSettings: this.siteSettings,
+ store: this.store,
+ });
+ }
+
+ const scrollAnchor = this.#loadScrollAnchor(cacheKey);
+ if (scrollAnchor) {
+ this._restoringFromCache = {
+ expansionState: new Map(),
+ fetchedChildrenCache: new Map(),
+ scrollAnchor,
+ };
+ }
+
+ params._nested.collapseReplies = this.#truthyQueryParam(
+ queryParams.collapse_replies || queryParams.collapseReplies
+ );
+
+ return params;
+ }
+
+ #restoreNestedFromCache(cacheKey) {
+ const cached = this.nestedViewCache.get(cacheKey);
+ if (!cached) {
+ this._restoringFromCache = null;
+ return null;
+ }
+
+ const shouldRestore = this.nestedViewCache.consumeTraversal({
+ allowLocalSignal: true,
+ isPoppedState: this.historyStore.isPoppedState,
+ });
+
+ if (!shouldRestore) {
+ this._restoringFromCache = null;
+ return null;
+ }
+
+ const restored = this.#hydrateCachedEntry(cached);
+ if (!restored) {
+ this.nestedViewCache.remove(cacheKey);
+ this._restoringFromCache = null;
+ return null;
+ }
+
+ this._restoringFromCache = restored;
+ return restored.modelData;
+ }
+
+ #scrollAnchorKey(cacheKey) {
+ return `nested-view-scroll:${cacheKey}`;
+ }
+
+ #loadScrollAnchor(cacheKey) {
+ try {
+ const value = sessionStorage.getItem(this.#scrollAnchorKey(cacheKey));
+ return value ? JSON.parse(value) : null;
+ } catch {
+ return null;
}
- const currentRoute = this.router.currentRouteName;
- if (postNumber && postNumber > 1) {
- return (
- currentRoute === "nestedPost" &&
- String(currentParams.post_number) === String(postNumber)
+ }
+
+ #hydrateCachedEntry(cached) {
+ if (
+ cached.formatVersion !== NESTED_VIEW_CACHE_FORMAT_VERSION ||
+ !isValidNestedViewCacheSnapshot(cached.modelData)
+ ) {
+ return null;
+ }
+
+ const modelData = hydrateNestedModelData(this.store, cached.modelData);
+
+ return {
+ modelData,
+ expansionState: hydrateExpansionState(cached.expansionState),
+ fetchedChildrenCache: hydrateFetchedChildrenCache(
+ this.store,
+ modelData.topic,
+ cached.fetchedChildrenCache
+ ),
+ scrollAnchor: cached.scrollAnchor,
+ };
+ }
+
+ #setupNestedController(model) {
+ const topicController = this.controllerFor("topic");
+ const nestedController = this.controllerFor("nested");
+
+ const restoringFromCache = this._restoringFromCache;
+
+ if (!this.#teardownCurrentNestedTopic(nestedController, model.topic.id)) {
+ nestedController.unsubscribe();
+ }
+
+ topicController.set("model", model.topic);
+ this.#resetTopicControllerBulkSelection(topicController);
+ topicController.setProperties({
+ enteredAt: Date.now().toString(),
+ userLastReadPostNumber: model.topic.last_read_post_number,
+ highestPostNumber: model.topic.highest_post_number,
+ sort: model.sort,
+ context: model.context ?? (model.contextNoAncestors ? 0 : null),
+ collapseReplies: model.collapseReplies,
+ });
+
+ if (restoringFromCache) {
+ nestedController.expansionState = restoringFromCache.expansionState;
+ nestedController.fetchedChildrenCache =
+ restoringFromCache.fetchedChildrenCache;
+ nestedController.scrollAnchor = restoringFromCache.scrollAnchor;
+ this._restoringFromCache = null;
+ } else {
+ nestedController.expansionState = new Map();
+ nestedController.fetchedChildrenCache = new Map();
+ nestedController.scrollAnchor = null;
+ }
+
+ nestedController.setProperties(model);
+
+ // Set the topic route's currentModel so route actions that call
+ // this.modelFor("topic") (e.g. showFeatureTopic, showTopicTimerModal)
+ // find the hydrated topic.
+ getOwner(this).lookup("route:topic").currentModel = model.topic;
+
+ // The Topic details setter replaces _details without preserving the
+ // back-reference to the parent topic. Restore it so that
+ // topic.details.updateNotifications() can construct the correct URL.
+ model.topic.details.set("topic", model.topic);
+
+ // 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) {
+ registerPostInTopicPostStream(model.topic, model.opPost);
+ }
+
+ this.appEvents.trigger("page:topic-loaded", model.topic);
+ topicController.subscribe();
+ nestedController.subscribe();
+ this.screenTrack.start(model.topic.id, nestedController);
+
+ if (!isEmpty(model.topic.draft) && !EmbedMode.enabled) {
+ this.composer.open({
+ draft: Draft.getLocal(model.topic.draft_key, model.topic.draft),
+ draftKey: model.topic.draft_key,
+ draftSequence: model.topic.draft_sequence,
+ ignoreIfChanged: true,
+ topic: model.topic,
+ });
+ }
+
+ if (restoringFromCache?.scrollAnchor) {
+ schedule("afterRender", () =>
+ this.#restoreScrollAnchor(restoringFromCache.scrollAnchor)
);
+ } else if (!model.contextMode) {
+ schedule("afterRender", () => window.scrollTo(0, 0));
+ }
+ }
+
+ #restoreScrollAnchor(anchor) {
+ if (Number.isFinite(anchor.scrollY)) {
+ window.scrollTo(0, anchor.scrollY);
+ return;
+ }
+
+ const article = document.querySelector(
+ `.nested-post [data-post-number="${anchor.postNumber}"]`
+ );
+ const element = article?.closest(".nested-post") || article;
+ if (element) {
+ const rect = element.getBoundingClientRect();
+ window.scrollTo(0, window.scrollY + rect.top - anchor.offsetFromTop);
+ }
+ }
+
+ #teardownCurrentNestedTopic(controller, nextTopicId) {
+ const currentTopicId = controller.topic?.id;
+
+ if (!currentTopicId || String(currentTopicId) === String(nextTopicId)) {
+ return false;
+ }
+
+ this.#saveNestedToCache(controller);
+ controller.unsubscribe();
+ this.screenTrack.stop();
+ return true;
+ }
+
+ #saveNestedToCache(controller) {
+ if (!controller.topic) {
+ return;
+ }
+
+ const anchor = this.#findScrollAnchor();
+ controller.saveToCache(anchor);
+ }
+
+ #findScrollAnchor() {
+ const articles = document.querySelectorAll(
+ ".nested-post [data-post-number]"
+ );
+ let best = null;
+ let bestDistance = Infinity;
+
+ for (const el of articles) {
+ const rect = el.getBoundingClientRect();
+ const distance = Math.abs(rect.top);
+ if (distance < bestDistance) {
+ bestDistance = distance;
+ best = {
+ postNumber: Number(el.dataset.postNumber),
+ offsetFromTop: rect.top,
+ scrollY: window.scrollY,
+ };
+ }
}
- return currentRoute === "nested";
+
+ return best;
+ }
+
+ #resetTopicControllerBulkSelection(topicController) {
+ topicController.set("multiSelect", false);
+ topicController.selectedPostIds = [];
+ }
+
+ #truthyQueryParam(value) {
+ return value === true || value === "true" || value === "1" || value === 1;
}
@action
@@ -191,10 +517,7 @@ export default class TopicFromParams extends DiscourseRoute {
transition.followRedirects().finally(() => {
const routeName = this.router.currentRouteName;
- if (
- !routeName?.startsWith("topic.") &&
- !routeName?.startsWith("nested")
- ) {
+ if (!routeName?.startsWith("topic.")) {
this.header.clearTopic();
}
});
diff --git a/frontend/discourse/app/templates/nested.gjs b/frontend/discourse/app/templates/nested.gjs
deleted file mode 100644
index 7100b0bb81b..00000000000
--- a/frontend/discourse/app/templates/nested.gjs
+++ /dev/null
@@ -1,95 +0,0 @@
-import { array } from "@ember/helper";
-import Nested from "discourse/components/nested";
-import PostTextSelection from "discourse/components/post-text-selection";
-import SelectedPosts from "discourse/components/selected-posts";
-
-export default <template>
- {{#each (array @controller.topic) key="id" as |topic|}}
- <PostTextSelection
- @quoteState={{@controller.quoteState}}
- @selectText={{@controller.selectText}}
- @buildQuoteMarkdown={{@controller.buildQuoteMarkdown}}
- @editPost={{@controller.editPost}}
- @topic={{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>
-
- <Nested
- @topic={{topic}}
- @opPost={{@controller.opPost}}
- @rootNodes={{@controller.rootNodes}}
- @hasMoreRoots={{@controller.hasMoreRoots}}
- @loadingMore={{@controller.loadingMore}}
- @loadMoreRoots={{@controller.loadMoreRoots}}
- @sort={{@controller.sort}}
- @changeSort={{@controller.changeSort}}
- @replyToPost={{@controller.replyToPost}}
- @editPost={{@controller.editPost}}
- @deletePost={{@controller.deletePost}}
- @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}}
- @contextMode={{@controller.contextMode}}
- @targetPostNumber={{@controller.targetPostNumber}}
- @initialFocusedPath={{@controller.initialFocusedPath}}
- @setFocusedPostNumber={{@controller.setFocusedPostNumber}}
- @saveScrollPosition={{@controller.saveScrollPosition}}
- @viewFullThread={{@controller.viewFullThread}}
- @pinnedPostIds={{@controller.pinnedPostIds}}
- @newRootPostCount={{@controller.newRootPostCount}}
- @loadNewRoots={{@controller.loadNewRoots}}
- @editingTopic={{@controller.editingTopic}}
- @startEditingTopic={{@controller.startEditingTopic}}
- @cancelEditingTopic={{@controller.cancelEditingTopic}}
- @finishedEditingTopic={{@controller.finishedEditingTopic}}
- @showCategoryChooser={{@controller.showCategoryChooser}}
- @canEditTags={{@controller.canEditTags}}
- @buffered={{@controller.buffered}}
- @topicCategoryChanged={{@controller.topicCategoryChanged}}
- @topicTagsChanged={{@controller.topicTagsChanged}}
- @minimumRequiredTags={{@controller.minimumRequiredTags}}
- @expansionState={{@controller.expansionState}}
- @fetchedChildrenCache={{@controller.fetchedChildrenCache}}
- @scrollAnchor={{@controller.scrollAnchor}}
- @clearScrollAnchor={{@controller.clearScrollAnchor}}
- @showActivityLog={{@controller.showActivityLog}}
- @collapseReplies={{@controller.collapseReplies}}
- @multiSelect={{@controller.multiSelect}}
- @togglePostSelection={{@controller.togglePostSelection}}
- @selectReplies={{@controller.selectReplies}}
- @selectBelow={{@controller.selectBelow}}
- @postSelected={{@controller.postSelected}}
- />
- {{/each}}
-</template>
diff --git a/frontend/discourse/app/templates/topic.gjs b/frontend/discourse/app/templates/topic.gjs
index 5189a869730..335ab7d5925 100644
--- a/frontend/discourse/app/templates/topic.gjs
+++ b/frontend/discourse/app/templates/topic.gjs
@@ -1,6 +1,5 @@
import { array, concat, fn, hash } from "@ember/helper";
import { on } from "@ember/modifier";
-import { getProperties } from "@ember/object";
import { LinkTo } from "@ember/routing";
import { trustHTML } from "@ember/template";
import AddCategoryTagClasses from "discourse/components/add-category-tag-classes";
@@ -11,6 +10,7 @@ import DiscourseTopic from "discourse/components/discourse-topic";
import EmbedModeComposer from "discourse/components/embed-mode-composer";
import EmbedTopicFooter from "discourse/components/embed-topic-footer";
import MoreTopics from "discourse/components/more-topics";
+import Nested from "discourse/components/nested";
import PluginOutlet from "discourse/components/plugin-outlet";
import PostStream from "discourse/components/post-stream";
import PostTextSelection from "discourse/components/post-text-selection";
@@ -49,11 +49,13 @@ import { i18n } from "discourse-i18n";
import booleanString from "../helpers/boolean-string";
export default <template>
- {{#let @controller.model.postStream as |postStream|}}
- {{#unless (and postStream.loaded postStream.loadedAllPosts)}}
- {{hideApplicationFooter}}
- {{/unless}}
- {{/let}}
+ {{#unless @controller.shouldRenderNestedView}}
+ {{#let @controller.model.postStream as |postStream|}}
+ {{#unless (and postStream.loaded postStream.loadedAllPosts)}}
+ {{hideApplicationFooter}}
+ {{/unless}}
+ {{/let}}
+ {{/unless}}
<DiscourseTopic
@multiSelect={{@controller.multiSelect}}
@@ -72,607 +74,712 @@ export default <template>
/>
<AddTopicStatusClasses @topic={{@controller.model}} />
{{bodyClass (concat "archetype-" @controller.model.archetype)}}
- {{#unless @controller.shouldHideScrollableContentAbove}}
- <div class="container">
- <DiscourseBanner
- @overlay={{@controller.hasScrolled}}
- @hide={{@controller.model.errorLoading}}
+ {{#if @controller.shouldRenderNestedView}}
+ {{#let @controller.nestedController as |nested|}}
+ <PostTextSelection
+ @quoteState={{nested.quoteState}}
+ @selectText={{nested.selectText}}
+ @buildQuoteMarkdown={{nested.buildQuoteMarkdown}}
+ @editPost={{nested.editPost}}
+ @topic={{@controller.model}}
/>
- </div>
- {{/unless}}
- {{/if}}
- {{#unless @controller.shouldHideScrollableContentAbove}}
- {{#if @controller.showSharedDraftControls}}
- <SharedDraftControls @topic={{@controller.model}} />
- {{/if}}
-
- <span>
- <PluginOutlet
- @name="topic-above-post-stream"
- @connectorTagName="div"
- @outletArgs={{lazyHash
- }}
- />
- </span>
- {{/unless}}
-
- {{#if @controller.model.postStream.loaded}}
- {{#if @controller.model.postStream.firstPostPresent}}
- <TopicTitle
- @cancelled={{@controller.cancelEditingTopic}}
- @save={{@controller.finishedEditingTopic}}
- @model={{@controller.model}}
- >
- {{#if @controller.editingTopic}}
- <div class="edit-topic-title">
- <PrivateMessageGlyph
- @shouldShow={{@controller.model.isPrivateMessage}}
- />
+ <div
+ class="selected-posts nested-view__selected-posts
+ {{unless nested.multiSelect 'hidden'}}"
+ >
+ <SelectedPosts
+ @selectedPostsCount={{nested.selectedPostsCount}}
+ @canSelectAll={{nested.canSelectAll}}
+ @canDeselectAll={{nested.canDeselectAll}}
+ @canDeleteSelected={{nested.canDeleteSelected}}
+ @canMergeTopic={{nested.canMergeTopic}}
+ @canChangeOwner={{nested.canChangeOwner}}
+ @canMergePosts={{nested.canMergePosts}}
+ @toggleMultiSelect={{nested.toggleMultiSelect}}
+ @mergePosts={{nested.mergePosts}}
+ @deleteSelected={{nested.deleteSelected}}
+ @deselectAll={{nested.deselectAll}}
+ @selectAll={{nested.selectAll}}
+ />
+ </div>
- <TopicTitleEditor
- @isEditingLocalization={{@controller.editingTopicLocalization}}
- @translationTitle={{@controller.translationTitle}}
- @translationLocale={{@controller.translationLocale}}
- @bufferedTitle={{@controller.buffered.title}}
- @model={{@controller.model}}
- @buffered={{@controller.buffered}}
- />
+ <Nested
+ @topic={{@controller.model}}
+ @opPost={{nested.opPost}}
+ @rootNodes={{nested.rootNodes}}
+ @hasMoreRoots={{nested.hasMoreRoots}}
+ @loadingMore={{nested.loadingMore}}
+ @loadMoreRoots={{nested.loadMoreRoots}}
+ @sort={{nested.sort}}
+ @changeSort={{nested.changeSort}}
+ @replyToPost={{nested.replyToPost}}
+ @editPost={{nested.editPost}}
+ @deletePost={{nested.deletePost}}
+ @recoverPost={{nested.recoverPost}}
+ @showFlags={{nested.showFlags}}
+ @showHistory={{nested.showHistory}}
+ @changeNotice={{nested.changeNotice}}
+ @changePostOwner={{nested.changePostOwner}}
+ @grantBadge={{nested.grantBadge}}
+ @lockPost={{nested.lockPost}}
+ @unlockPost={{nested.unlockPost}}
+ @permanentlyDeletePost={{nested.permanentlyDeletePost}}
+ @rebakePost={{nested.rebakePost}}
+ @showPagePublish={{nested.showPagePublish}}
+ @togglePostType={{nested.togglePostType}}
+ @toggleWiki={{nested.toggleWiki}}
+ @unhidePost={{nested.unhidePost}}
+ @postNumber={{nested.postNumber}}
+ @contextMode={{nested.contextMode}}
+ @contextNoAncestors={{nested.contextNoAncestors}}
+ @ancestorsTruncated={{nested.ancestorsTruncated}}
+ @targetPostNumber={{nested.targetPostNumber}}
+ @initialFocusedPath={{nested.initialFocusedPath}}
+ @setFocusedPostNumber={{nested.setFocusedPostNumber}}
+ @saveScrollPosition={{nested.saveScrollPosition}}
+ @viewFullThread={{nested.viewFullThread}}
+ @viewParentContext={{nested.viewParentContext}}
+ @pinnedPostIds={{nested.pinnedPostIds}}
+ @newRootPostCount={{nested.newRootPostCount}}
+ @loadNewRoots={{nested.loadNewRoots}}
+ @editingTopic={{nested.editingTopic}}
+ @startEditingTopic={{nested.startEditingTopic}}
+ @cancelEditingTopic={{nested.cancelEditingTopic}}
+ @finishedEditingTopic={{nested.finishedEditingTopic}}
+ @showCategoryChooser={{nested.showCategoryChooser}}
+ @canEditTags={{nested.canEditTags}}
+ @buffered={{nested.buffered}}
+ @topicCategoryChanged={{nested.topicCategoryChanged}}
+ @topicTagsChanged={{nested.topicTagsChanged}}
+ @minimumRequiredTags={{nested.minimumRequiredTags}}
+ @expansionState={{nested.expansionState}}
+ @fetchedChildrenCache={{nested.fetchedChildrenCache}}
+ @scrollAnchor={{nested.scrollAnchor}}
+ @clearScrollAnchor={{nested.clearScrollAnchor}}
+ @showActivityLog={{nested.showActivityLog}}
+ @collapseReplies={{nested.collapseReplies}}
+ @multiSelect={{nested.multiSelect}}
+ @togglePostSelection={{nested.togglePostSelection}}
+ @selectReplies={{nested.selectReplies}}
+ @selectBelow={{nested.selectBelow}}
+ @postSelected={{nested.postSelected}}
+ />
+ {{/let}}
+ {{else}}
+
+ {{#unless @controller.shouldHideScrollableContentAbove}}
+ <div class="container">
+ <DiscourseBanner
+ @overlay={{@controller.hasScrolled}}
+ @hide={{@controller.model.errorLoading}}
+ />
+ </div>
+ {{/unless}}
- <TopicMetadata
- @buffered={{@controller.buffered}}
- @model={{@controller.model}}
- @showCategoryChooser={{@controller.showCategoryChooser}}
- @canEditTags={{@controller.canEditTags}}
- @minimumRequiredTags={{@controller.minimumRequiredTags}}
- @onSave={{@controller.finishedEditingTopic}}
- @onCancel={{@controller.cancelEditingTopic}}
- @topicCategoryChanged={{@controller.topicCategoryChanged}}
- @topicTagsChanged={{@controller.topicTagsChanged}}
- >
- {{#if @controller.canRemoveTopicFeaturedLink}}
- <a
- href
- {{on "click" @controller.removeFeaturedLink}}
- class="remove-featured-link"
- title={{i18n "composer.remove_featured_link"}}
- >
- {{dIcon "circle-xmark"}}
- {{@controller.featuredLinkDomain}}
- </a>
- {{/if}}
- </TopicMetadata>
- </div>
+ {{#unless @controller.shouldHideScrollableContentAbove}}
+ {{#if @controller.showSharedDraftControls}}
+ <SharedDraftControls @topic={{@controller.model}} />
+ {{/if}}
- {{else}}
- <h1
- data-topic-id={{@controller.model.id}}
- {{! Prevent duplicating the topic title heading on screen readers when the header is displaying the title
- in the header }}
- aria-hidden={{booleanString @controller.titleIsVisibleOnHeader}}
+ <span>
+ <PluginOutlet
+ @name="topic-above-post-stream"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash
+ }}
+ />
+ </span>
+ {{/unless}}
+
+ {{#if @controller.model.postStream.loaded}}
+ {{#if @controller.model.postStream.firstPostPresent}}
+ <TopicTitle
+ @cancelled={{@controller.cancelEditingTopic}}
+ @save={{@controller.finishedEditingTopic}}
+ @model={{@controller.model}}
>
- {{#unless @controller.model.is_warning}}
- {{#if @controller.canSendPms}}
+ {{#if @controller.editingTopic}}
+ <div class="edit-topic-title">
<PrivateMessageGlyph
@shouldShow={{@controller.model.isPrivateMessage}}
- @href={{@controller.pmPath}}
- @title="topic_statuses.personal_message.title"
- @ariaLabel="user.messages.inbox"
/>
- {{else}}
- <PrivateMessageGlyph
- @shouldShow={{@controller.model.isPrivateMessage}}
+
+ <TopicTitleEditor
+ @isEditingLocalization={{@controller.editingTopicLocalization}}
+ @translationTitle={{@controller.translationTitle}}
+ @translationLocale={{@controller.translationLocale}}
+ @bufferedTitle={{@controller.buffered.title}}
+ @model={{@controller.model}}
+ @buffered={{@controller.buffered}}
/>
- {{/if}}
- {{/unless}}
-
- {{#if @controller.model.details.loaded}}
- <TopicStatus @topic={{@controller.model}} />
- <a
- href={{@controller.model.url}}
- {{on "click" @controller.handleTitleClick}}
- class="fancy-title"
- >
- {{trustHTML @controller.model.fancyTitle~}}
- {{~#if @controller.model.details.can_edit~}}
- <span class="edit-topic__wrapper">
- {{dIcon "pencil" class="edit-topic"}}
- </span>
- {{~/if}}
- </a>
- {{/if}}
- <PluginOutlet
- @name="topic-title-suffix"
- @outletArgs={{lazyHash [email protected]}}
- />
- </h1>
+ <TopicMetadata
+ @buffered={{@controller.buffered}}
+ @model={{@controller.model}}
+ @showCategoryChooser={{@controller.showCategoryChooser}}
+ @canEditTags={{@controller.canEditTags}}
+ @minimumRequiredTags={{@controller.minimumRequiredTags}}
+ @onSave={{@controller.finishedEditingTopic}}
+ @onCancel={{@controller.cancelEditingTopic}}
+ @topicCategoryChanged={{@controller.topicCategoryChanged}}
+ @topicTagsChanged={{@controller.topicTagsChanged}}
+ >
+ {{#if @controller.canRemoveTopicFeaturedLink}}
+ <a
+ href
+ {{on "click" @controller.removeFeaturedLink}}
+ class="remove-featured-link"
+ title={{i18n "composer.remove_featured_link"}}
+ >
+ {{dIcon "circle-xmark"}}
+ {{@controller.featuredLinkDomain}}
+ </a>
+ {{/if}}
+ </TopicMetadata>
+ </div>
- <PluginOutlet
- @name="topic-category-wrapper"
- @outletArgs={{lazyHash [email protected]}}
- >
- <TopicCategory
- @topic={{@controller.model}}
- class="topic-category"
- />
- </PluginOutlet>
+ {{else}}
+ <h1
+ data-topic-id={{@controller.model.id}}
+ {{! Prevent duplicating the topic title heading on screen readers when the header is displaying the title
+ in the header }}
+ aria-hidden={{booleanString
+ @controller.titleIsVisibleOnHeader
+ }}
+ >
+ {{#unless @controller.model.is_warning}}
+ {{#if @controller.canSendPms}}
+ <PrivateMessageGlyph
+ @shouldShow={{@controller.model.isPrivateMessage}}
+ @href={{@controller.pmPath}}
+ @title="topic_statuses.personal_message.title"
+ @ariaLabel="user.messages.inbox"
+ />
+ {{else}}
+ <PrivateMessageGlyph
+ @shouldShow={{@controller.model.isPrivateMessage}}
+ />
+ {{/if}}
+ {{/unless}}
+
+ {{#if @controller.model.details.loaded}}
+ <TopicStatus @topic={{@controller.model}} />
+ <a
+ href={{@controller.model.url}}
+ {{on "click" @controller.handleTitleClick}}
+ class="fancy-title"
+ >
+ {{trustHTML @controller.model.fancyTitle~}}
+ {{~#if @controller.model.details.can_edit~}}
+ <span class="edit-topic__wrapper">
+ {{dIcon "pencil" class="edit-topic"}}
+ </span>
+ {{~/if}}
+ </a>
+ {{/if}}
+
+ <PluginOutlet
+ @name="topic-title-suffix"
+ @outletArgs={{lazyHash [email protected]}}
+ />
+ </h1>
+
+ <PluginOutlet
+ @name="topic-category-wrapper"
+ @outletArgs={{lazyHash [email protected]}}
+ >
+ <TopicCategory
+ @topic={{@controller.model}}
+ class="topic-category"
+ />
+ </PluginOutlet>
- {{/if}}
- </TopicTitle>
-
- {{#if @controller.model.publishedPage}}
- <div class="published-page-notice">
- <div class="details">
- {{#if @controller.model.publishedPage.public}}
- <span class="is-public">{{i18n
- "topic.publish_page.public"
- }}</span>
{{/if}}
- {{i18n "topic.publish_page.topic_published"}}
- <div>
- <a
- href={{@controller.model.publishedPage.url}}
- target="_blank"
- rel="noopener noreferrer"
- >{{@controller.model.publishedPage.url}}</a>
+ </TopicTitle>
+
+ {{#if @controller.model.publishedPage}}
+ <div class="published-page-notice">
+ <div class="details">
+ {{#if @controller.model.publishedPage.public}}
+ <span class="is-public">{{i18n
+ "topic.publish_page.public"
+ }}</span>
+ {{/if}}
+ {{i18n "topic.publish_page.topic_published"}}
+ <div>
+ <a
+ href={{@controller.model.publishedPage.url}}
+ target="_blank"
+ rel="noopener noreferrer"
+ >{{@controller.model.publishedPage.url}}</a>
+ </div>
+ </div>
+ <div class="controls">
+ <DButton
+ @icon="file"
+ @label="topic.publish_page.publishing_settings"
+ @action={{routeAction "showPagePublish"}}
+ />
+ </div>
</div>
- </div>
- <div class="controls">
- <DButton
- @icon="file"
- @label="topic.publish_page.publishing_settings"
- @action={{routeAction "showPagePublish"}}
- />
- </div>
- </div>
- {{/if}}
-
- {{/if}}
+ {{/if}}
- <div class="container posts">
- <div class="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}}
- {{#if (and @controller.showBottomTopicMap @controller.loadedAllPosts)}}
- <div class="topic-map --bottom">
- <TopicMap
- @model={{@controller.model}}
- @topicDetails={{@controller.model.details}}
- @postStream={{@controller.model.postStream}}
- @showPMMap={{eq @controller.model.archetype "private_message"}}
- @showInvite={{routeAction "showInvite"}}
- @removeAllowedGroup={{@controller.removeAllowedGroup}}
- @removeAllowedUser={{@controller.removeAllowedUser}}
- />
- </div>
- {{/if}}
+ <div class="container posts">
+ <div
+ class="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>
- <PluginOutlet @name="above-timeline" @connectorTagName="div" />
-
- <TopicNavigation
- @topic={{@controller.model}}
- @jumpToDate={{@controller.jumpToDate}}
- @jumpToIndex={{@controller.jumpToIndex}}
- class="topic-navigation"
- as |info|
- >
- <PluginOutlet
- @name="topic-navigation"
- @connectorTagName="div"
- @outletArgs={{lazyHash
- renderTimeline=info.renderTimeline
- topicProgressExpanded=info.topicProgressExpanded
+ {{#if
+ (and @controller.showBottomTopicMap @controller.loadedAllPosts)
}}
- />
+ <div class="topic-map --bottom">
+ <TopicMap
+ @model={{@controller.model}}
+ @topicDetails={{@controller.model.details}}
+ @postStream={{@controller.model.postStream}}
+ @showPMMap={{eq
+ @controller.model.archetype
+ "private_message"
+ }}
+ @showInvite={{routeAction "showInvite"}}
+ @removeAllowedGroup={{@controller.removeAllowedGroup}}
+ @removeAllowedUser={{@controller.removeAllowedUser}}
+ />
+ </div>
+ {{/if}}
- {{#if info.renderTimeline}}
- <TopicTimeline
- @info={{info}}
- @model={{@controller.model}}
- @replyToPost={{@controller.replyToPost}}
- @showTopReplies={{@controller.showTopReplies}}
- @jumpToPostPrompt={{@controller.jumpToPostPrompt}}
- @enteredIndex={{@controller.enteredIndex}}
- @prevEvent={{info.prevEvent}}
- @jumpTop={{@controller.jumpTop}}
- @jumpBottom={{@controller.jumpBottom}}
- @jumpEnd={{@controller.jumpEnd}}
- @jumpToIndex={{@controller.jumpToIndex}}
- @toggleMultiSelect={{@controller.toggleMultiSelect}}
- @showTopicSlowModeUpdate={{routeAction "showTopicSlowModeUpdate"}}
- @deleteTopic={{@controller.deleteTopic}}
- @recoverTopic={{@controller.recoverTopic}}
- @toggleClosed={{@controller.toggleClosed}}
- @toggleArchived={{@controller.toggleArchived}}
- @toggleVisibility={{@controller.toggleVisibility}}
- @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
- @showFeatureTopic={{routeAction "showFeatureTopic"}}
- @showChangeTimestamp={{routeAction "showChangeTimestamp"}}
- @resetBumpDate={{@controller.resetBumpDate}}
- @convertToPublicTopic={{@controller.convertToPublicTopic}}
- @convertToPrivateMessage={{@controller.convertToPrivateMessage}}
- @fullscreen={{info.topicProgressExpanded}}
- />
- {{else}}
- <TopicProgress
- @prevEvent={{info.prevEvent}}
+ <PluginOutlet @name="above-timeline" @connectorTagName="div" />
+
+ <TopicNavigation
@topic={{@controller.model}}
- @expanded={{info.topicProgressExpanded}}
- @jumpToPost={{@controller.jumpToPost}}
+ @jumpToDate={{@controller.jumpToDate}}
+ @jumpToIndex={{@controller.jumpToIndex}}
+ class="topic-navigation"
+ as |info|
>
<PluginOutlet
- @name="before-topic-progress"
+ @name="topic-navigation"
@connectorTagName="div"
@outletArgs={{lazyHash
- }}
- />
- <TopicAdminMenu
- @topic={{@controller.model}}
- @toggleMultiSelect={{@controller.toggleMultiSelect}}
- @showTopicSlowModeUpdate={{routeAction
- "showTopicSlowModeUpdate"
+ renderTimeline=info.renderTimeline
+ topicProgressExpanded=info.topicProgressExpanded
}}
- @deleteTopic={{@controller.deleteTopic}}
- @recoverTopic={{@controller.recoverTopic}}
- @toggleClosed={{@controller.toggleClosed}}
- @toggleArchived={{@controller.toggleArchived}}
- @toggleVisibility={{@controller.toggleVisibility}}
- @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
- @showFeatureTopic={{routeAction "showFeatureTopic"}}
- @showChangeTimestamp={{routeAction "showChangeTimestamp"}}
- @resetBumpDate={{@controller.resetBumpDate}}
- @convertToPublicTopic={{@controller.convertToPublicTopic}}
- @convertToPrivateMessage={{@controller.convertToPrivateMessage}}
/>
- </TopicProgress>
- {{/if}}
-
- <PluginOutlet
- @name="topic-navigation-bottom"
- @connectorTagName="div"
- @outletArgs={{lazyHash [email protected]}}
- />
- </TopicNavigation>
-
- <div class="row">
- <section
- class="topic-area"
- id="topic"
- data-topic-id={{@controller.model.id}}
- >
- <div class="posts-wrapper">
- <span>
- <PluginOutlet
- @name="topic-above-posts"
- @connectorTagName="div"
- @outletArgs={{lazyHash [email protected]}}
- />
- </span>
- {{#if @controller.model.postStream.firstPostNotLoaded}}
- {{hideScrollableContent "above"}}
- {{/if}}
-
- {{#unless @controller.model.postStream.loadingFilter}}
- <PostStream
- @postStream={{@controller.model.postStream}}
- @canCreatePost={{@controller.model.details.can_create_post}}
- @multiSelect={{@controller.multiSelect}}
- @selectedPostsCount={{@controller.selectedPostsCount}}
- @filteredPostsCount={{@controller.model.postStream.filteredPostsCount}}
- @selectedQuery={{@controller.selectedQuery}}
- @gaps={{@controller.model.postStream.gaps}}
- @showReadIndicator={{@controller.model.show_read_indicator}}
- @streamFilters={{@controller.model.postStream.streamFilters}}
- @lastReadPostNumber={{@controller.userLastReadPostNumber}}
- @highestPostNumber={{@controller.highestPostNumber}}
- @showFlags={{@controller.showPostFlags}}
- @editPost={{@controller.editPost}}
- @showHistory={{routeAction "showHistory"}}
- @showLogin={{routeAction "showLogin"}}
- @showRawEmail={{routeAction "showRawEmail"}}
- @deletePost={{@controller.deletePost}}
- @permanentlyDeletePost={{@controller.permanentlyDeletePost}}
- @recoverPost={{@controller.recoverPost}}
- @expandHidden={{@controller.expandHidden}}
- @toggleBookmark={{@controller.toggleBookmark}}
- @togglePostType={{@controller.togglePostType}}
- @rebakePost={{@controller.rebakePost}}
- @changePostOwner={{@controller.changePostOwner}}
- @grantBadge={{@controller.grantBadge}}
- @changeNotice={{@controller.changeNotice}}
- @lockPost={{@controller.lockPost}}
- @unlockPost={{@controller.unlockPost}}
- @unhidePost={{@controller.unhidePost}}
+ {{#if info.renderTimeline}}
+ <TopicTimeline
+ @info={{info}}
+ @model={{@controller.model}}
@replyToPost={{@controller.replyToPost}}
- @toggleWiki={{@controller.toggleWiki}}
@showTopReplies={{@controller.showTopReplies}}
- @cancelFilter={{@controller.cancelFilter}}
- @removeAllowedUser={{@controller.removeAllowedUser}}
- @removeAllowedGroup={{@controller.removeAllowedGroup}}
- @topVisibleChanged={{@controller.topVisibleChanged}}
- @currentPostChanged={{@controller.currentPostChanged}}
- @currentPostScrolled={{@controller.currentPostScrolled}}
- @bottomVisibleChanged={{@controller.bottomVisibleChanged}}
- @togglePostSelection={{@controller.togglePostSelection}}
- @selectReplies={{@controller.selectReplies}}
- @selectBelow={{@controller.selectBelow}}
- @fillGapBefore={{@controller.fillGapBefore}}
- @fillGapAfter={{@controller.fillGapAfter}}
- @showInvite={{routeAction "showInvite"}}
- @showPagePublish={{routeAction "showPagePublish"}}
- @filteringRepliesToPostNumber={{@controller.replies_to_post_number}}
- @updateTopicPageQueryParams={{@controller.updateTopicPageQueryParams}}
- @postSelected={{@controller.postSelected}}
- @topicPageQueryParams={{getProperties
- @controller
- @controller.queryParams
+ @jumpToPostPrompt={{@controller.jumpToPostPrompt}}
+ @enteredIndex={{@controller.enteredIndex}}
+ @prevEvent={{info.prevEvent}}
+ @jumpTop={{@controller.jumpTop}}
+ @jumpBottom={{@controller.jumpBottom}}
+ @jumpEnd={{@controller.jumpEnd}}
+ @jumpToIndex={{@controller.jumpToIndex}}
+ @toggleMultiSelect={{@controller.toggleMultiSelect}}
+ @showTopicSlowModeUpdate={{routeAction
+ "showTopicSlowModeUpdate"
}}
- @topic={{@controller.model}}
+ @deleteTopic={{@controller.deleteTopic}}
+ @recoverTopic={{@controller.recoverTopic}}
+ @toggleClosed={{@controller.toggleClosed}}
+ @toggleArchived={{@controller.toggleArchived}}
+ @toggleVisibility={{@controller.toggleVisibility}}
+ @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
+ @showFeatureTopic={{routeAction "showFeatureTopic"}}
+ @showChangeTimestamp={{routeAction "showChangeTimestamp"}}
+ @resetBumpDate={{@controller.resetBumpDate}}
+ @convertToPublicTopic={{@controller.convertToPublicTopic}}
+ @convertToPrivateMessage={{@controller.convertToPrivateMessage}}
+ @fullscreen={{info.topicProgressExpanded}}
/>
- {{/unless}}
-
- {{#if @controller.model.postStream.lastPostNotLoaded}}
- {{hideScrollableContent "below"}}
+ {{else}}
+ <TopicProgress
+ @prevEvent={{info.prevEvent}}
+ @topic={{@controller.model}}
+ @expanded={{info.topicProgressExpanded}}
+ @jumpToPost={{@controller.jumpToPost}}
+ >
+ <PluginOutlet
+ @name="before-topic-progress"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash
+ }}
+ />
+ <TopicAdminMenu
+ @topic={{@controller.model}}
+ @toggleMultiSelect={{@controller.toggleMultiSelect}}
+ @showTopicSlowModeUpdate={{routeAction
+ "showTopicSlowModeUpdate"
+ }}
+ @deleteTopic={{@controller.deleteTopic}}
+ @recoverTopic={{@controller.recoverTopic}}
+ @toggleClosed={{@controller.toggleClosed}}
+ @toggleArchived={{@controller.toggleArchived}}
+ @toggleVisibility={{@controller.toggleVisibility}}
+ @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
+ @showFeatureTopic={{routeAction "showFeatureTopic"}}
+ @showChangeTimestamp={{routeAction "showChangeTimestamp"}}
+ @resetBumpDate={{@controller.resetBumpDate}}
+ @convertToPublicTopic={{@controller.convertToPublicTopic}}
+ @convertToPrivateMessage={{@controller.convertToPrivateMessage}}
+ />
+ </TopicProgress>
{{/if}}
- </div>
- <div id="topic-bottom"></div>
- <DConditionalLoadingSpinner
- @condition={{@controller.model.postStream.loadingFilter}}
- >
- {{#if @controller.loadedAllPosts}}
+ <PluginOutlet
+ @name="topic-navigation-bottom"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash [email protected]}}
+ />
+ </TopicNavigation>
- {{#if @controller.model.pending_posts}}
- <div class="pending-posts">
- {{#each @controller.model.pending_posts as |pending|}}
- <div
- class="reviewable-item"
- data-reviewable-id={{pending.id}}
- >
- <div class="reviewable-meta-data">
- <span class="reviewable-type">
- {{i18n "review.awaiting_approval"}}
- </span>
- <span class="created-at">
- {{dAgeWithTooltip pending.created_at}}
- </span>
- </div>
- <div class="post-contents-wrapper">
- <ReviewableCreatedBy
- @user={{@controller.currentUser}}
- />
- <div class="post-contents">
- <ReviewableCreatedByName
- @user={{@controller.currentUser}}
- />
- <div class="post-body">
- <DCookText @rawText={{pending.raw}} />
+ <div class="row">
+ <section
+ class="topic-area"
+ id="topic"
+ data-topic-id={{@controller.model.id}}
+ >
+ <div class="posts-wrapper">
+ <span>
+ <PluginOutlet
+ @name="topic-above-posts"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash [email protected]}}
+ />
+ </span>
+
+ {{#if @controller.model.postStream.firstPostNotLoaded}}
+ {{hideScrollableContent "above"}}
+ {{/if}}
+
+ {{#unless @controller.model.postStream.loadingFilter}}
+ <PostStream
+ @postStream={{@controller.model.postStream}}
+ @canCreatePost={{@controller.model.details.can_create_post}}
+ @multiSelect={{@controller.multiSelect}}
+ @selectedPostsCount={{@controller.selectedPostsCount}}
+ @filteredPostsCount={{@controller.model.postStream.filteredPostsCount}}
+ @selectedQuery={{@controller.selectedQuery}}
+ @gaps={{@controller.model.postStream.gaps}}
+ @showReadIndicator={{@controller.model.show_read_indicator}}
+ @streamFilters={{@controller.model.postStream.streamFilters}}
+ @lastReadPostNumber={{@controller.userLastReadPostNumber}}
+ @highestPostNumber={{@controller.highestPostNumber}}
+ @showFlags={{@controller.showPostFlags}}
+ @editPost={{@controller.editPost}}
+ @showHistory={{routeAction "showHistory"}}
+ @showLogin={{routeAction "showLogin"}}
+ @showRawEmail={{routeAction "showRawEmail"}}
+ @deletePost={{@controller.deletePost}}
+ @permanentlyDeletePost={{@controller.permanentlyDeletePost}}
+ @recoverPost={{@controller.recoverPost}}
+ @expandHidden={{@controller.expandHidden}}
+ @toggleBookmark={{@controller.toggleBookmark}}
+ @togglePostType={{@controller.togglePostType}}
+ @rebakePost={{@controller.rebakePost}}
+ @changePostOwner={{@controller.changePostOwner}}
+ @grantBadge={{@controller.grantBadge}}
+ @changeNotice={{@controller.changeNotice}}
+ @lockPost={{@controller.lockPost}}
+ @unlockPost={{@controller.unlockPost}}
+ @unhidePost={{@controller.unhidePost}}
+ @replyToPost={{@controller.replyToPost}}
+ @toggleWiki={{@controller.toggleWiki}}
+ @showTopReplies={{@controller.showTopReplies}}
+ @cancelFilter={{@controller.cancelFilter}}
+ @removeAllowedUser={{@controller.removeAllowedUser}}
+ @removeAllowedGroup={{@controller.removeAllowedGroup}}
+ @topVisibleChanged={{@controller.topVisibleChanged}}
+ @currentPostChanged={{@controller.currentPostChanged}}
+ @currentPostScrolled={{@controller.currentPostScrolled}}
+ @bottomVisibleChanged={{@controller.bottomVisibleChanged}}
+ @togglePostSelection={{@controller.togglePostSelection}}
+ @selectReplies={{@controller.selectReplies}}
+ @selectBelow={{@controller.selectBelow}}
+ @fillGapBefore={{@controller.fillGapBefore}}
+ @fillGapAfter={{@controller.fillGapAfter}}
+ @showInvite={{routeAction "showInvite"}}
+ @showPagePublish={{routeAction "showPagePublish"}}
+ @filteringRepliesToPostNumber={{@controller.replies_to_post_number}}
+ @updateTopicPageQueryParams={{@controller.updateTopicPageQueryParams}}
+ @postSelected={{@controller.postSelected}}
+ @topicPageQueryParams={{@controller.topicPageQueryParams}}
+ @topic={{@controller.model}}
+ />
+ {{/unless}}
+
+ {{#if @controller.model.postStream.lastPostNotLoaded}}
+ {{hideScrollableContent "below"}}
+ {{/if}}
+ </div>
+ <div id="topic-bottom"></div>
+
+ <DConditionalLoadingSpinner
+ @condition={{@controller.model.postStream.loadingFilter}}
+ >
+ {{#if @controller.loadedAllPosts}}
+
+ {{#if @controller.model.pending_posts}}
+ <div class="pending-posts">
+ {{#each @controller.model.pending_posts as |pending|}}
+ <div
+ class="reviewable-item"
+ data-reviewable-id={{pending.id}}
+ >
+ <div class="reviewable-meta-data">
+ <span class="reviewable-type">
+ {{i18n "review.awaiting_approval"}}
+ </span>
+ <span class="created-at">
+ {{dAgeWithTooltip pending.created_at}}
+ </span>
+ </div>
+ <div class="post-contents-wrapper">
+ <ReviewableCreatedBy
+ @user={{@controller.currentUser}}
+ />
+ <div class="post-contents">
+ <ReviewableCreatedByName
+ @user={{@controller.currentUser}}
+ />
+ <div class="post-body">
+ <DCookText @rawText={{pending.raw}} />
+ </div>
+ </div>
+ </div>
+ <div class="reviewable-actions">
+ <PluginOutlet
+ @name="topic-additional-reviewable-actions"
+ @outletArgs={{lazyHash pending=pending}}
+ />
+ <DButton
+ @label="review.delete"
+ @icon="trash-can"
+ @action={{fn @controller.deletePending pending}}
+ class="btn-danger"
+ />
</div>
</div>
+ {{/each}}
+ </div>
+ {{/if}}
+
+ {{#if @controller.model.queued_posts_count}}
+ <div class="has-pending-posts">
+ <div>
+ {{trustHTML
+ (i18n
+ "review.topic_has_pending"
+ [email protected]_posts_count
+ )
+ }}
</div>
- <div class="reviewable-actions">
- <PluginOutlet
- @name="topic-additional-reviewable-actions"
- @outletArgs={{lazyHash pending=pending}}
- />
- <DButton
- @label="review.delete"
- @icon="trash-can"
- @action={{fn @controller.deletePending pending}}
- class="btn-danger"
- />
- </div>
+
+ <LinkTo
+ @route="review"
+ @query={{hash
+ type="ReviewableQueuedPost"
+ status="pending"
+ }}
+ >
+ {{i18n "review.view_pending"}}
+ </LinkTo>
</div>
- {{/each}}
- </div>
- {{/if}}
+ {{/if}}
- {{#if @controller.model.queued_posts_count}}
- <div class="has-pending-posts">
- <div>
- {{trustHTML
- (i18n
- "review.topic_has_pending"
- [email protected]_posts_count
- )
- }}
- </div>
-
- <LinkTo
- @route="review"
- @query={{hash
- type="ReviewableQueuedPost"
- status="pending"
+ <SlowModeInfo
+ @topic={{@controller.model}}
+ @user={{@controller.currentUser}}
+ />
+
+ <TopicTimerInfo
+ @topicClosed={{@controller.model.closed}}
+ @statusType={{@controller.model.topic_timer.status_type}}
+ @statusUpdate={{@controller.model.topic_status_update}}
+ @executeAt={{@controller.model.topic_timer.execute_at}}
+ @basedOnLastPost={{@controller.model.topic_timer.based_on_last_post}}
+ @durationMinutes={{@controller.model.topic_timer.duration_minutes}}
+ @categoryId={{@controller.model.topic_timer.category_id}}
+ @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
+ @removeTopicTimer={{fn
+ @controller.removeTopicTimer
+ @controller.model.topic_timer.status_type
+ "topic_timer"
}}
- >
- {{i18n "review.view_pending"}}
- </LinkTo>
- </div>
- {{/if}}
+ />
- <SlowModeInfo
- @topic={{@controller.model}}
- @user={{@controller.currentUser}}
- />
+ {{#if @controller.showSelectedPostsAtBottom}}
+ <div
+ class="selected-posts
+ {{unless @controller.multiSelect 'hidden'}}
+ {{if @controller.showSelectedPostsAtBottom '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}}
- <TopicTimerInfo
- @topicClosed={{@controller.model.closed}}
- @statusType={{@controller.model.topic_timer.status_type}}
- @statusUpdate={{@controller.model.topic_status_update}}
- @executeAt={{@controller.model.topic_timer.execute_at}}
- @basedOnLastPost={{@controller.model.topic_timer.based_on_last_post}}
- @durationMinutes={{@controller.model.topic_timer.duration_minutes}}
- @categoryId={{@controller.model.topic_timer.category_id}}
- @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
- @removeTopicTimer={{fn
- @controller.removeTopicTimer
- @controller.model.topic_timer.status_type
- "topic_timer"
- }}
+ {{/if}}
+ </DConditionalLoadingSpinner>
+
+ <PluginOutlet
+ @name="topic-area-bottom"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash [email protected]}}
/>
+ </section>
+ </div>
- {{#if @controller.showSelectedPostsAtBottom}}
- <div
- class="selected-posts
- {{unless @controller.multiSelect 'hidden'}}
- {{if @controller.showSelectedPostsAtBottom '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>
+ </div>
+ {{#if @controller.loadedAllPosts}}
+ {{#if @controller.session.showSignupCta}}
+ {{! replace "Log In to Reply" with the infobox }}
+ <SignupCta />
+ {{else}}
+ {{#if @controller.currentUser}}
+ <span>
+ <PluginOutlet
+ @name="topic-above-footer-buttons"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash [email protected]}}
+ />
+ </span>
+
+ {{#if @controller.showTopicFooterButtons}}
+ <TopicFooterButtons
+ @topic={{@controller.model}}
+ @toggleMultiSelect={{@controller.toggleMultiSelect}}
+ @showTopicSlowModeUpdate={{routeAction
+ "showTopicSlowModeUpdate"
+ }}
+ @deleteTopic={{@controller.deleteTopic}}
+ @recoverTopic={{@controller.recoverTopic}}
+ @toggleClosed={{@controller.toggleClosed}}
+ @toggleArchived={{@controller.toggleArchived}}
+ @toggleVisibility={{@controller.toggleVisibility}}
+ @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
+ @showFeatureTopic={{routeAction "showFeatureTopic"}}
+ @showChangeTimestamp={{routeAction "showChangeTimestamp"}}
+ @resetBumpDate={{@controller.resetBumpDate}}
+ @convertToPublicTopic={{@controller.convertToPublicTopic}}
+ @convertToPrivateMessage={{@controller.convertToPrivateMessage}}
+ @toggleBookmark={{@controller.toggleBookmark}}
+ @showFlagTopic={{routeAction "showFlagTopic"}}
+ @toggleArchiveMessage={{@controller.toggleArchiveMessage}}
+ @editFirstPost={{@controller.editFirstPost}}
+ @deferTopic={{@controller.deferTopic}}
+ @replyToPost={{@controller.replyToPost}}
+ />
{{/if}}
-
+ {{else}}
+ <AnonymousTopicFooterButtons @topic={{@controller.model}} />
{{/if}}
- </DConditionalLoadingSpinner>
+ {{/if}}
+
+ <br />
- <PluginOutlet
- @name="topic-area-bottom"
- @connectorTagName="div"
- @outletArgs={{lazyHash [email protected]}}
- />
- </section>
- </div>
-
- </div>
- {{#if @controller.loadedAllPosts}}
- {{#if @controller.session.showSignupCta}}
- {{! replace "Log In to Reply" with the infobox }}
- <SignupCta />
- {{else}}
- {{#if @controller.currentUser}}
<span>
<PluginOutlet
- @name="topic-above-footer-buttons"
+ @name="topic-above-suggested"
@connectorTagName="div"
@outletArgs={{lazyHash [email protected]}}
/>
</span>
- {{#if @controller.showTopicFooterButtons}}
- <TopicFooterButtons
- @topic={{@controller.model}}
- @toggleMultiSelect={{@controller.toggleMultiSelect}}
- @showTopicSlowModeUpdate={{routeAction
- "showTopicSlowModeUpdate"
- }}
- @deleteTopic={{@controller.deleteTopic}}
- @recoverTopic={{@controller.recoverTopic}}
- @toggleClosed={{@controller.toggleClosed}}
- @toggleArchived={{@controller.toggleArchived}}
- @toggleVisibility={{@controller.toggleVisibility}}
- @showTopicTimerModal={{routeAction "showTopicTimerModal"}}
- @showFeatureTopic={{routeAction "showFeatureTopic"}}
- @showChangeTimestamp={{routeAction "showChangeTimestamp"}}
- @resetBumpDate={{@controller.resetBumpDate}}
- @convertToPublicTopic={{@controller.convertToPublicTopic}}
- @convertToPrivateMessage={{@controller.convertToPrivateMessage}}
- @toggleBookmark={{@controller.toggleBookmark}}
- @showFlagTopic={{routeAction "showFlagTopic"}}
- @toggleArchiveMessage={{@controller.toggleArchiveMessage}}
- @editFirstPost={{@controller.editFirstPost}}
- @deferTopic={{@controller.deferTopic}}
- @replyToPost={{@controller.replyToPost}}
- />
- {{/if}}
- {{else}}
- <AnonymousTopicFooterButtons @topic={{@controller.model}} />
+ <MoreTopics @topic={{@controller.model}} />
+ <PluginOutlet
+ @name="topic-below-suggested"
+ @outletArgs={{lazyHash [email protected]}}
+ />
{{/if}}
+ <EmbedTopicFooter @topic={{@controller.model}} />
+ <EmbedModeComposer @topic={{@controller.model}} />
+ {{else}}
+ <div class="container">
+ <DConditionalLoadingSpinner @condition={{@controller.noErrorYet}}>
+ {{#if @controller.model.errorHtml}}
+ <div class="not-found">{{trustHTML
+ @controller.model.errorHtml
+ }}</div>
+ {{else}}
+ <div class="topic-error">
+ <div>{{@controller.model.errorMessage}}</div>
+ {{#if @controller.model.noRetry}}
+ {{#unless @controller.currentUser}}
+ <DButton
+ @action={{routeAction "showLogin"}}
+ @icon="user"
+ @label="log_in"
+ class="btn-primary topic-retry"
+ />
+ {{/unless}}
+ {{else}}
+ <DButton
+ @action={{@controller.retryLoading}}
+ @icon="arrows-rotate"
+ @label="errors.buttons.again"
+ class="btn-primary topic-retry"
+ />
+ {{/if}}
+ </div>
+ <DConditionalLoadingSpinner
+ @condition={{@controller.retrying}}
+ />
+ {{/if}}
+ </DConditionalLoadingSpinner>
+ </div>
{{/if}}
- <br />
-
- <span>
- <PluginOutlet
- @name="topic-above-suggested"
- @connectorTagName="div"
- @outletArgs={{lazyHash [email protected]}}
+ {{#each (array @controller.model) as |topic|}}
+ <PostTextSelection
+ @quoteState={{@controller.quoteState}}
+ @selectText={{@controller.selectText}}
+ @buildQuoteMarkdown={{@controller.buildQuoteMarkdown}}
+ @editPost={{@controller.editPost}}
+ @topic={{topic}}
/>
- </span>
-
- <MoreTopics @topic={{@controller.model}} />
- <PluginOutlet
- @name="topic-below-suggested"
- @outletArgs={{lazyHash [email protected]}}
- />
+ {{/each}}
{{/if}}
- <EmbedTopicFooter @topic={{@controller.model}} />
- <EmbedModeComposer @topic={{@controller.model}} />
- {{else}}
- <div class="container">
- <DConditionalLoadingSpinner @condition={{@controller.noErrorYet}}>
- {{#if @controller.model.errorHtml}}
- <div class="not-found">{{trustHTML
- @controller.model.errorHtml
- }}</div>
- {{else}}
- <div class="topic-error">
- <div>{{@controller.model.errorMessage}}</div>
- {{#if @controller.model.noRetry}}
- {{#unless @controller.currentUser}}
- <DButton
- @action={{routeAction "showLogin"}}
- @icon="user"
- @label="log_in"
- class="btn-primary topic-retry"
- />
- {{/unless}}
- {{else}}
- <DButton
- @action={{@controller.retryLoading}}
- @icon="arrows-rotate"
- @label="errors.buttons.again"
- class="btn-primary topic-retry"
- />
- {{/if}}
- </div>
- <DConditionalLoadingSpinner @condition={{@controller.retrying}} />
- {{/if}}
- </DConditionalLoadingSpinner>
- </div>
{{/if}}
-
- {{#each (array @controller.model) as |topic|}}
- <PostTextSelection
- @quoteState={{@controller.quoteState}}
- @selectText={{@controller.selectText}}
- @buildQuoteMarkdown={{@controller.buildQuoteMarkdown}}
- @editPost={{@controller.editPost}}
- @topic={{topic}}
- />
- {{/each}}
</DiscourseTopic>
</template>
diff --git a/frontend/discourse/tests/integration/components/nested/op-test.gjs b/frontend/discourse/tests/integration/components/nested/op-test.gjs
index fe51fd9b9d3..f6cac8e7f06 100644
--- a/frontend/discourse/tests/integration/components/nested/op-test.gjs
+++ b/frontend/discourse/tests/integration/components/nested/op-test.gjs
@@ -29,6 +29,7 @@ function renderComponent(context) {
@togglePostType={{noop}}
@toggleWiki={{noop}}
@unhidePost={{noop}}
+ @showPostMenu={{context.showPostMenu}}
@registerPost={{registerPost}}
@multiSelect={{context.multiSelect}}
@togglePostSelection={{context.togglePostSelection}}
@@ -56,6 +57,7 @@ module("Integration | Component | Nested | Op", function (hooks) {
is_nested_view: true,
});
this.multiSelect = false;
+ this.showPostMenu = false;
this.togglePostSelection = noop;
this.selectReplies = noop;
this.selectBelow = noop;
@@ -73,6 +75,17 @@ module("Integration | Component | Nested | Op", function (hooks) {
});
});
+ test("does not render the flat replies button in the nested OP menu", async function (assert) {
+ this.showPostMenu = true;
+ this.post.set("reply_count", 3);
+
+ await renderComponent(this);
+
+ assert
+ .dom(".nested-view__op-menu .post-action-menu__show-replies")
+ .doesNotExist("nested OP menu suppresses the flat replies button");
+ });
+
test("renders multi-select controls for the OP", async function (assert) {
let selectedPost;
this.multiSelect = true;
diff --git a/frontend/discourse/tests/integration/components/nested/post-test.gjs b/frontend/discourse/tests/integration/components/nested/post-test.gjs
index 9e3b82842f0..06e5167adf4 100644
--- a/frontend/discourse/tests/integration/components/nested/post-test.gjs
+++ b/frontend/discourse/tests/integration/components/nested/post-test.gjs
@@ -94,6 +94,25 @@ module("Integration | Component | Nested | Post", function (hooks) {
sinon.restore();
});
+ test("uses nested replies affordance instead of flat post-menu replies button", async function (assert) {
+ this.post.setProperties({
+ reply_count: 2,
+ direct_reply_count: 2,
+ total_descendant_count: 2,
+ });
+
+ await renderComponent(this);
+
+ assert
+ .dom(".nested-post__menu .post-action-menu__show-replies")
+ .doesNotExist(
+ "does not render the flat replies button in nested post menus"
+ );
+ assert
+ .dom(".nested-post__expand-replies")
+ .exists("keeps the nested replies expansion button");
+ });
+
test("leaf posts can be collapsed from the depth line", async function (assert) {
await renderComponent(this);
diff --git a/frontend/discourse/tests/unit/components/post-menu-test.gjs b/frontend/discourse/tests/unit/components/post-menu-test.gjs
index 55ea082050f..2cdade5a375 100644
--- a/frontend/discourse/tests/unit/components/post-menu-test.gjs
+++ b/frontend/discourse/tests/unit/components/post-menu-test.gjs
@@ -5,6 +5,8 @@ import PostMenu from "discourse/components/post/menu";
import { withPluginApi } from "discourse/lib/plugin-api";
import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+const noop = () => {};
+
module("Unit | Component | PostMenu", function (hooks) {
setupRenderingTest(hooks);
@@ -24,6 +26,40 @@ module("Unit | Component | PostMenu", function (hooks) {
});
});
+ test("replies button renders in flat post menus but not nested reply menus", async function (assert) {
+ this.post.set("reply_count", 2);
+ const post = this.post;
+
+ await render(
+ <template>
+ <PostMenu
+ @post={{post}}
+ @toggleReplies={{noop}}
+ @repliesShown={{false}}
+ />
+ </template>
+ );
+
+ assert
+ .dom(".post-action-menu__show-replies")
+ .exists("flat post menus still render the replies button");
+
+ await render(
+ <template>
+ <PostMenu
+ @post={{post}}
+ @nestedReplyView={{true}}
+ @toggleReplies={{noop}}
+ @repliesShown={{false}}
+ />
+ </template>
+ );
+
+ assert
+ .dom(".post-action-menu__show-replies")
+ .doesNotExist("nested post menus suppress the flat replies button");
+ });
+
test("post-menu-collapsed value transformer", async function (assert) {
this.siteSettings.post_menu_hidden_items = "bookmark|copyLink";
diff --git a/frontend/discourse/tests/unit/controllers/nested-test.js b/frontend/discourse/tests/unit/controllers/nested-test.js
index d88cfba1cce..ac8bf622357 100644
--- a/frontend/discourse/tests/unit/controllers/nested-test.js
+++ b/frontend/discourse/tests/unit/controllers/nested-test.js
@@ -19,6 +19,7 @@ module("Unit | Controller | nested", function (hooks) {
hooks.afterEach(function () {
this.controller.unsubscribe();
this.controller.topic = null;
+ this.controller.context = null;
this.controller.contextMode = false;
this.controller.rootNodes = [];
this.controller.newRootPostIds = [];
@@ -300,6 +301,29 @@ module("Unit | Controller | nested", function (hooks) {
}
});
+ test("scroll position persistence avoids full cache snapshots", function (assert) {
+ const topic = buildTopic(this.store, 725);
+ const anchor = { postNumber: 2, offsetFromTop: 80, scrollY: 1600 };
+ const cacheKey = this.nestedViewCache.buildKey(topic.id, { sort: "top" });
+
+ this.controller.topic = topic;
+ this.controller.sort = "top";
+ sessionStorage.removeItem(`nested-view-scroll:${cacheKey}`);
+
+ this.controller.saveScrollPosition(anchor);
+
+ assert.strictEqual(
+ this.nestedViewCache.get(cacheKey),
+ null,
+ "does not snapshot the full nested model for scroll-only updates"
+ );
+ assert.deepEqual(
+ JSON.parse(sessionStorage.getItem(`nested-view-scroll:${cacheKey}`)),
+ anchor,
+ "keeps the scroll anchor available for restoration"
+ );
+ });
+
test("focused post cache entries include the mobile focused path", function (assert) {
const topic = buildTopic(this.store, 724);
const focusedPost = buildPost(this.store, topic, 2001, 2);
@@ -307,13 +331,18 @@ module("Unit | Controller | nested", function (hooks) {
this.controller.topic = topic;
this.controller.sort = "top";
+ this.controller.context = 0;
this.controller.rootNodes = focusedPath;
this.controller.setFocusedPostNumber(2, focusedPath);
this.controller.saveToCache({ postNumber: 2, offsetFromTop: 80 });
const cached = this.nestedViewCache.get(
- this.nestedViewCache.buildKey(topic.id, { sort: "top", post_number: 2 })
+ this.nestedViewCache.buildKey(topic.id, {
+ sort: "top",
+ post_number: 2,
+ context: 0,
+ })
);
assert.strictEqual(
@@ -341,5 +370,6 @@ module("Unit | Controller | nested", function (hooks) {
2,
"stores the post URL cache entry under the focused post number"
);
+ assert.strictEqual(cached.modelData.context, 0, "preserves context depth");
});
});
diff --git a/frontend/discourse/tests/unit/lib/nested-post-url-test.js b/frontend/discourse/tests/unit/lib/nested-post-url-test.js
index 8bdc54a3af0..ca809603143 100644
--- a/frontend/discourse/tests/unit/lib/nested-post-url-test.js
+++ b/frontend/discourse/tests/unit/lib/nested-post-url-test.js
@@ -8,12 +8,12 @@ module("Unit | Lib | nested-post-url", function (hooks) {
test("builds a nested URL with topic slug, id and post number", function (assert) {
const topic = { slug: "test-topic", id: 42 };
- assert.strictEqual(nestedPostUrl(topic, 5), "/n/test-topic/42/5");
+ assert.strictEqual(nestedPostUrl(topic, 5), "/t/test-topic/42/5");
});
test("always produces a URL without context param", function (assert) {
const topic = { slug: "my-topic", id: 99 };
- assert.strictEqual(nestedPostUrl(topic, 7), "/n/my-topic/99/7");
+ assert.strictEqual(nestedPostUrl(topic, 7), "/t/my-topic/99/7");
});
});
diff --git a/frontend/discourse/tests/unit/lib/notification-types/replied-test.js b/frontend/discourse/tests/unit/lib/notification-types/replied-test.js
index 683a57427c9..958c1a1173a 100644
--- a/frontend/discourse/tests/unit/lib/notification-types/replied-test.js
+++ b/frontend/discourse/tests/unit/lib/notification-types/replied-test.js
@@ -82,7 +82,7 @@ module("Unit | Notification Types | replied", function (hooks) {
);
assert.strictEqual(
director.linkHref,
- "/n/test-topic/100?sort=new&collapse_replies=true"
+ "/t/test-topic/100?sort=new&collapse_replies=true"
);
});
@@ -97,7 +97,7 @@ module("Unit | Notification Types | replied", function (hooks) {
);
assert.strictEqual(
director.linkHref,
- "/n/test-topic/100/4?sort=new&collapse_replies=true"
+ "/t/test-topic/100/4?sort=new&collapse_replies=true"
);
});
diff --git a/frontend/discourse/tests/unit/lib/url-test.js b/frontend/discourse/tests/unit/lib/url-test.js
index cb740db2230..5bab2bf969b 100644
--- a/frontend/discourse/tests/unit/lib/url-test.js
+++ b/frontend/discourse/tests/unit/lib/url-test.js
@@ -90,7 +90,7 @@ module("Unit | Utility | url", function (hooks) {
test("isInternalTopic", function (assert) {
sinon.stub(DiscourseURL, "origin").get(() => "https://eviltrout.com");
assert.true(DiscourseURL.isInternalTopic("https://eviltrout.com/t/123"));
- assert.true(DiscourseURL.isInternalTopic("https://eviltrout.com/n/123"));
+ assert.false(DiscourseURL.isInternalTopic("https://eviltrout.com/n/123"));
assert.false(DiscourseURL.isInternalTopic("https://eviltrout.com/admin"));
assert.false(DiscourseURL.isInternalTopic("https://eviltrout.com/u/test"));
assert.false(DiscourseURL.isInternalTopic("https://eviltrout.com/tamales"));
@@ -105,7 +105,7 @@ module("Unit | Utility | url", function (hooks) {
assert.true(
DiscourseURL.isInternalTopic("https://eviltrout.com/forum/t/123")
);
- assert.true(
+ assert.false(
DiscourseURL.isInternalTopic("https://eviltrout.com/forum/n/123")
);
assert.false(
diff --git a/frontend/discourse/tests/unit/models/topic-test.js b/frontend/discourse/tests/unit/models/topic-test.js
index 2baabc96b89..6ee8a1edca7 100644
--- a/frontend/discourse/tests/unit/models/topic-test.js
+++ b/frontend/discourse/tests/unit/models/topic-test.js
@@ -115,9 +115,9 @@ module("Unit | Model | topic", function (hooks) {
is_nested_view: true,
});
- assert.strictEqual(topic.lastUnreadUrl, "/n/hello/101");
- assert.strictEqual(topic.lastReadUrl, "/n/hello/101");
- assert.strictEqual(topic.lastPostUrl, "/n/hello/101");
+ assert.strictEqual(topic.lastUnreadUrl, "/t/hello/101");
+ assert.strictEqual(topic.lastReadUrl, "/t/hello/101");
+ assert.strictEqual(topic.lastPostUrl, "/t/hello/101");
});
test("has details", function (assert) {
diff --git a/frontend/discourse/tests/unit/routes/nested-test.js b/frontend/discourse/tests/unit/routes/nested-test.js
deleted file mode 100644
index 84ddb60b0dd..00000000000
--- a/frontend/discourse/tests/unit/routes/nested-test.js
+++ /dev/null
@@ -1,532 +0,0 @@
-import EmberObject from "@ember/object";
-import { setupTest } from "ember-qunit";
-import { module, test } from "qunit";
-import sinon from "sinon";
-import {
- hydrateNestedModelData,
- NESTED_VIEW_CACHE_FORMAT_VERSION,
-} from "discourse/lib/nested-view-cache-snapshot";
-import PreloadStore from "discourse/lib/preload-store";
-
-module("Unit | Route | nested", function (hooks) {
- setupTest(hooks);
-
- hooks.afterEach(function () {
- sinon.restore();
- PreloadStore.reset();
- });
-
- test("contributes topic title tokens", function (assert) {
- const route = this.owner.lookup("route:nested");
- const category = EmberObject.create({
- name: "Support",
- isUncategorizedCategory: false,
- });
- const topic = EmberObject.create({
- title: "Nested topic title",
- category,
- });
- const tokens = [];
-
- route.siteSettings.topic_page_title_includes_category = true;
- route.currentModel = { topic };
-
- route._collectTitleTokens(tokens);
-
- assert.deepEqual(
- tokens,
- ["Nested topic title", "Support"],
- "the nested route contributes the same title tokens as the topic route"
- );
- });
-
- test("tears down the active nested topic before loading a different topic", function (assert) {
- const route = this.owner.lookup("route:nested");
- const controller = this.owner.lookup("controller:nested");
- controller.topic = { id: 509 };
-
- const saveToCache = sinon.stub(route, "_saveToCache");
- const unsubscribe = sinon.stub(controller, "unsubscribe");
- const stopScreenTrack = sinon.stub(route.screenTrack, "stop");
-
- route._teardownCurrentTopic(724);
-
- assert.true(
- saveToCache.calledOnceWith(controller),
- "stores the current topic state before replacing it"
- );
- assert.true(unsubscribe.calledOnce, "unsubscribes from the old topic");
- assert.true(stopScreenTrack.calledOnce, "stops old topic screen tracking");
- });
-
- test("keeps the active nested topic subscribed when the topic id is unchanged", function (assert) {
- const route = this.owner.lookup("route:nested");
- const controller = this.owner.lookup("controller:nested");
- controller.topic = { id: 509 };
-
- const saveToCache = sinon.stub(route, "_saveToCache");
- const unsubscribe = sinon.stub(controller, "unsubscribe");
- const stopScreenTrack = sinon.stub(route.screenTrack, "stop");
-
- route._teardownCurrentTopic("509");
-
- assert.false(saveToCache.called, "does not cache in-topic refreshes");
- assert.false(unsubscribe.called, "keeps the active subscription");
- assert.false(stopScreenTrack.called, "keeps screen tracking active");
- });
-
- test("passes route-family context into the cache traversal check", async function (assert) {
- const route = this.owner.lookup("route:nested");
- const cachedModel = { topic: { id: 42 } };
-
- sinon.stub(route.historyStore, "isPoppedState").get(() => false);
- sinon.stub(route.nestedViewCache, "buildKey").returns("cache-key");
- const consumeTraversal = sinon
- .stub(route.nestedViewCache, "consumeTraversal")
- .returns(true);
- const cachedEntry = { modelData: { topic: { id: 42 } } };
- sinon.stub(route.nestedViewCache, "get").returns(cachedEntry);
- sinon
- .stub(route, "_hydrateCachedEntry")
- .returns({ modelData: cachedModel });
-
- const model = await route.model(
- { topic_id: 42, slug: "nested-topic" },
- { from: { name: "discovery.latest" } }
- );
-
- assert.true(
- consumeTraversal.calledOnceWith({
- allowLocalSignal: false,
- isPoppedState: false,
- }),
- "normal navigations from outside nested cannot inherit stale popstate signals"
- );
- assert.strictEqual(model, cachedModel, "returns the cache service result");
- });
-
- test("allows cache traversal signals within the nested route family", async function (assert) {
- const route = this.owner.lookup("route:nested");
- const cachedModel = { topic: { id: 42 } };
-
- sinon.stub(route.historyStore, "isPoppedState").get(() => false);
- sinon.stub(route.nestedViewCache, "buildKey").returns("cache-key");
- const consumeTraversal = sinon
- .stub(route.nestedViewCache, "consumeTraversal")
- .returns(true);
- const cachedEntry = { modelData: { topic: { id: 42 } } };
- sinon.stub(route.nestedViewCache, "get").returns(cachedEntry);
- sinon
- .stub(route, "_hydrateCachedEntry")
- .returns({ modelData: cachedModel });
-
- const model = await route.model(
- { topic_id: 42, slug: "nested-topic" },
- { from: { name: "nestedPost" } }
- );
-
- assert.true(
- consumeTraversal.calledOnceWith({
- allowLocalSignal: true,
- isPoppedState: false,
- }),
- "browser traversal between nested routes can restore from cache"
- );
- assert.strictEqual(model, cachedModel, "returns the cache service result");
- });
-
- test("allows history-store popped transitions from outside nested", async function (assert) {
- const route = this.owner.lookup("route:nested");
- const cachedModel = { topic: { id: 42 } };
-
- sinon.stub(route.historyStore, "isPoppedState").get(() => true);
- sinon.stub(route.nestedViewCache, "buildKey").returns("cache-key");
- const consumeTraversal = sinon
- .stub(route.nestedViewCache, "consumeTraversal")
- .returns(true);
- const cachedEntry = { modelData: { topic: { id: 42 } } };
- sinon.stub(route.nestedViewCache, "get").returns(cachedEntry);
- sinon
- .stub(route, "_hydrateCachedEntry")
- .returns({ modelData: cachedModel });
-
- const model = await route.model(
- { topic_id: 42, slug: "nested-topic" },
- { from: { name: "discovery.latest" } }
- );
-
- assert.true(
- consumeTraversal.calledOnceWith({
- allowLocalSignal: false,
- isPoppedState: true,
- }),
- "browser forward/back from the topic list can restore from cache"
- );
- assert.strictEqual(model, cachedModel, "returns the cache service result");
- });
-
- test("hydrates cached snapshots into fresh records", function (assert) {
- const route = this.owner.lookup("route:nested");
- const cached = {
- formatVersion: NESTED_VIEW_CACHE_FORMAT_VERSION,
- modelData: {
- topic: {
- id: 42,
- slug: "nested-topic",
- title: "Nested topic",
- details: { can_create_post: true },
- },
- opPost: { id: 1, post_number: 1, cooked: "<p>op</p>" },
- rootNodes: [
- {
- post: { id: 2, post_number: 2, cooked: "<p>root</p>" },
- children: [],
- _renderKey: 2,
- },
- ],
- page: 0,
- hasMoreRoots: false,
- sort: "top",
- pinnedPostIds: [],
- postNumber: null,
- contextMode: false,
- initialFocusedPath: [],
- newRootPostIds: [],
- },
- expansionState: [[2, { expanded: false, collapsed: true }]],
- fetchedChildrenCache: [
- [
- 2,
- {
- childNodes: [
- {
- post: { id: 3, post_number: 3, cooked: "<p>child</p>" },
- children: [],
- _renderKey: 3,
- },
- ],
- page: 0,
- hasMore: false,
- fetchedFromServer: true,
- },
- ],
- ],
- scrollAnchor: { postNumber: 2, offsetFromTop: 40 },
- };
-
- const restored = route._hydrateCachedEntry(cached);
- const restoredTopic = restored.modelData.topic;
- const restoredRootPost = restored.modelData.rootNodes[0].post;
- const restoredChildPost =
- restored.fetchedChildrenCache.get(2).childNodes[0].post;
-
- assert.notStrictEqual(
- restoredTopic,
- cached.modelData.topic,
- "creates a fresh topic record"
- );
- assert.true(restoredTopic.is_nested_view, "marks restored topic as nested");
- assert.strictEqual(
- restoredRootPost.topic,
- restoredTopic,
- "wires restored root posts to the fresh topic"
- );
- assert.strictEqual(
- restoredChildPost.topic,
- restoredTopic,
- "wires restored cached children to the fresh topic"
- );
- assert.deepEqual(
- restored.expansionState.get(2),
- { expanded: false, collapsed: true },
- "restores expansion state"
- );
- assert.deepEqual(
- restored.scrollAnchor,
- cached.scrollAnchor,
- "restores scroll anchor"
- );
- });
-
- test("hydrates cached snapshots without reusing stale store records", function (assert) {
- const route = this.owner.lookup("route:nested");
- const stalePost = route.store.createRecord("post", {
- id: 2,
- post_number: 2,
- deleted_post_placeholder: true,
- });
- const snapshot = {
- topic: {
- id: 42,
- slug: "nested-topic",
- title: "Nested topic",
- details: { can_create_post: true },
- },
- opPost: { id: 1, post_number: 1, cooked: "<p>op</p>" },
- rootNodes: [
- {
- post: {
- id: 2,
- post_number: 2,
- cooked: "<p>restored root</p>",
- created_at: "2026-06-08T17:00:00.000Z",
- },
- children: [],
- _renderKey: 2,
- },
- ],
- };
-
- const restored = hydrateNestedModelData(route.store, snapshot);
- const restoredPost = restored.rootNodes[0].post;
-
- assert.notStrictEqual(
- restoredPost,
- stalePost,
- "creates a fresh post instead of reusing the store identity map"
- );
- assert.strictEqual(
- restoredPost.deleted_post_placeholder,
- undefined,
- "does not inherit placeholder state from a stale post record"
- );
- assert.strictEqual(
- restoredPost.created_at,
- "2026-06-08T17:00:00.000Z",
- "keeps the snapshot timestamp for relative date rendering"
- );
- });
-
- test("ignores and removes unversioned cache entries", async function (assert) {
- const route = this.owner.lookup("route:nested");
-
- sinon.stub(route.historyStore, "isPoppedState").get(() => true);
- sinon.stub(route.nestedViewCache, "buildKey").returns("cache-key");
- route.nestedViewCache.save("cache-key", {
- modelData: {
- topic: route.store.createRecord("topic", {
- id: 42,
- slug: "stale-topic",
- title: "Stale topic",
- }),
- rootNodes: [],
- },
- });
- const remove = sinon.spy(route.nestedViewCache, "remove");
-
- PreloadStore.store("nested_topic_42", {
- topic: {
- id: 42,
- slug: "nested-topic",
- title: "Fresh topic",
- details: { can_create_post: true },
- },
- op_post: { id: 1, post_number: 1, cooked: "<p>op</p>" },
- roots: [],
- page: 0,
- has_more_roots: false,
- sort: "top",
- pinned_post_ids: [],
- });
-
- const model = await route.model(
- { topic_id: 42, slug: "nested-topic" },
- { from: { name: "discovery.latest" } }
- );
-
- assert.true(
- remove.calledOnceWith("cache-key"),
- "removes the incompatible cache entry"
- );
- assert.strictEqual(
- model.topic.title,
- "Fresh topic",
- "falls back to the preloaded fresh topic payload"
- );
- });
-
- 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"
- );
- });
-
- test("deactivate clears stale nested topic before a later entry", function (assert) {
- const nestedRoute = this.owner.lookup("route:nested");
- const nestedController = this.owner.lookup("controller:nested");
- const saveToCache = sinon.stub(nestedRoute, "_saveToCache");
- const unsubscribe = sinon.stub(nestedController, "unsubscribe");
- const stopScreenTrack = sinon.stub(nestedRoute.screenTrack, "stop");
-
- nestedRoute.controller = nestedController;
- nestedController.topic = { id: 509 };
-
- nestedRoute.deactivate();
-
- assert.true(
- saveToCache.calledOnceWith(nestedController),
- "stores the active nested topic before leaving"
- );
- assert.true(unsubscribe.calledOnce, "unsubscribes from the active topic");
- assert.true(stopScreenTrack.calledOnce, "stops screen tracking");
- assert.strictEqual(
- nestedController.topic,
- null,
- "clears the inactive topic reference"
- );
-
- saveToCache.resetHistory();
- unsubscribe.resetHistory();
- stopScreenTrack.resetHistory();
-
- nestedRoute._teardownCurrentTopic(724);
-
- assert.false(
- saveToCache.called,
- "does not overwrite cache from a non-nested page"
- );
- assert.false(
- unsubscribe.called,
- "does not unsubscribe an already inactive nested topic"
- );
- assert.false(
- stopScreenTrack.called,
- "does not stop screen tracking a second time"
- );
- });
-});
diff --git a/frontend/discourse/tests/unit/routes/topic-from-params-test.js b/frontend/discourse/tests/unit/routes/topic-from-params-test.js
new file mode 100644
index 00000000000..923b057edbf
--- /dev/null
+++ b/frontend/discourse/tests/unit/routes/topic-from-params-test.js
@@ -0,0 +1,142 @@
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import TopicFromParams, {
+ nestedQueryString,
+} from "discourse/routes/topic/from-params";
+
+module("Unit | Route | topic.from-params", function (hooks) {
+ setupTest(hooks);
+
+ test("opts out of the global route scroll manager", function (assert) {
+ assert.deepEqual(TopicFromParams.prototype.buildRouteInfoMetadata(), {
+ scrollOnTransition: false,
+ });
+ });
+
+ test("encodes nested JSON query params", function (assert) {
+ const query = nestedQueryString({
+ sort: "new&track_visit=false",
+ track_visit: true,
+ context: "0&sort=old",
+ skipped: null,
+ });
+ const parsed = new URLSearchParams(query);
+
+ assert.strictEqual(parsed.get("sort"), "new&track_visit=false");
+ assert.strictEqual(parsed.get("track_visit"), "true");
+ assert.strictEqual(parsed.get("context"), "0&sort=old");
+ assert.false(parsed.has("skipped"));
+ assert.false(parsed.has("bad"), "does not allow query injection");
+ });
+
+ test("saves current nested topic before swapping topics", function (assert) {
+ const route = this.owner.lookup("route:topic.from-params");
+ const article = document.createElement("article");
+ article.dataset.postNumber = "3";
+ const wrapper = document.createElement("div");
+ wrapper.className = "nested-post";
+ wrapper.appendChild(article);
+ document.body.appendChild(wrapper);
+
+ let screenTrackStopped = 0;
+ let screenTrackStarted = 0;
+
+ Object.defineProperty(route, "appEvents", {
+ value: { trigger() {} },
+ });
+ Object.defineProperty(route, "screenTrack", {
+ value: {
+ start() {
+ screenTrackStarted += 1;
+ },
+ stop() {
+ screenTrackStopped += 1;
+ },
+ },
+ });
+
+ const nestedController = {
+ topic: { id: 1 },
+ unsubscribeCount: 0,
+ savedAnchor: null,
+ saveToCache(anchor) {
+ this.savedAnchor = anchor;
+ },
+ setProperties(properties) {
+ Object.assign(this, properties);
+ },
+ subscribe() {},
+ unsubscribe() {
+ this.unsubscribeCount += 1;
+ },
+ };
+ const topicController = {
+ selectedPostIds: [1],
+ set(key, value) {
+ this[key] = value;
+ },
+ setProperties(properties) {
+ Object.assign(this, properties);
+ },
+ subscribe() {},
+ };
+ const nextTopic = {
+ id: 2,
+ details: { set() {} },
+ draft: null,
+ highest_post_number: 3,
+ last_read_post_number: 1,
+ postStream: null,
+ };
+
+ route.controllerFor = (name) => {
+ if (name === "nested") {
+ return nestedController;
+ }
+
+ return topicController;
+ };
+
+ try {
+ route.setupController(
+ null,
+ {
+ _nested: {
+ topic: nextTopic,
+ contextMode: true,
+ sort: "top",
+ },
+ },
+ {}
+ );
+
+ assert.strictEqual(
+ nestedController.savedAnchor.postNumber,
+ 3,
+ "saves the previous nested topic cache with the current scroll anchor"
+ );
+ assert.strictEqual(
+ nestedController.unsubscribeCount,
+ 1,
+ "unsubscribes the previous nested topic once"
+ );
+ assert.strictEqual(
+ screenTrackStopped,
+ 1,
+ "stops screen tracking for the previous nested topic"
+ );
+ assert.strictEqual(
+ nestedController.topic,
+ nextTopic,
+ "sets up the new nested topic"
+ );
+ assert.strictEqual(
+ screenTrackStarted,
+ 1,
+ "starts tracking the new topic"
+ );
+ } finally {
+ wrapper.remove();
+ }
+ });
+});
diff --git a/frontend/discourse/tests/unit/routes/topic-header-cleanup-test.js b/frontend/discourse/tests/unit/routes/topic-header-cleanup-test.js
index ac457dc4558..223ee9c221c 100644
--- a/frontend/discourse/tests/unit/routes/topic-header-cleanup-test.js
+++ b/frontend/discourse/tests/unit/routes/topic-header-cleanup-test.js
@@ -35,27 +35,15 @@ module("Unit | Route | topic header cleanup", function (hooks) {
this.owner.register("service:header", HeaderStub);
});
- test("nested route does not clear header topic info when transitioning to flat topic route", async function (assert) {
- const route = this.owner.lookup("route:nested");
- const header = this.owner.lookup("service:header");
-
- setCurrentRouteName(route, "topic.fromParams");
-
- route.willTransition(completedTransition());
- await waitForTransitionCleanup();
-
- assert.strictEqual(
- header.clearCount,
- 0,
- "topic info remains registered for the flat topic route"
- );
+ hooks.afterEach(function () {
+ sinon.restore();
});
- test("flat topic route does not clear header topic info when transitioning to nested route", async function (assert) {
+ test("topic route does not clear header topic info when transitioning between topic routes", async function (assert) {
const route = this.owner.lookup("route:topic.from-params");
const header = this.owner.lookup("service:header");
- setCurrentRouteName(route, "nested");
+ setCurrentRouteName(route, "topic.fromParamsNear");
route.controllerFor = () => ({
set() {},
});
@@ -66,15 +54,18 @@ module("Unit | Route | topic header cleanup", function (hooks) {
assert.strictEqual(
header.clearCount,
0,
- "topic info remains registered for the nested topic route"
+ "topic info remains registered for topic route transitions"
);
});
- test("nested route clears header topic info when transitioning away from topic routes", async function (assert) {
- const route = this.owner.lookup("route:nested");
+ test("topic route clears header topic info when transitioning away from topic routes", async function (assert) {
+ const route = this.owner.lookup("route:topic.from-params");
const header = this.owner.lookup("service:header");
setCurrentRouteName(route, "discovery.latest");
+ route.controllerFor = () => ({
+ set() {},
+ });
route.willTransition(completedTransition());
await waitForTransitionCleanup();
diff --git a/frontend/discourse/tests/unit/services/nested-view-cache-test.js b/frontend/discourse/tests/unit/services/nested-view-cache-test.js
index b29d6b6edf6..0857bff7551 100644
--- a/frontend/discourse/tests/unit/services/nested-view-cache-test.js
+++ b/frontend/discourse/tests/unit/services/nested-view-cache-test.js
@@ -162,7 +162,7 @@ module("Unit | Service | nested-view-cache", function (hooks) {
assert.false(cache.consumeTraversal());
});
- test("consumeTraversal follows explicit popped-state outside nested routes", function (assert) {
+ test("consumeTraversal follows explicit popped-state outside nested topic transitions", function (assert) {
const cache = getService(this);
assert.true(
@@ -177,7 +177,7 @@ module("Unit | Service | nested-view-cache", function (hooks) {
assert.false(
cache.consumeTraversal({ allowLocalSignal: false, isPoppedState: false }),
- "does not restore from cache after returning to a non-nested route"
+ "does not restore from cache after returning to a non-nested topic path"
);
assert.false(
cache.consumeTraversal(),
@@ -191,7 +191,7 @@ module("Unit | Service | nested-view-cache", function (hooks) {
assert.true(
cache.consumeTraversal({ allowLocalSignal: true, isPoppedState: false }),
- "restores cache for browser traversal within the nested route family"
+ "restores cache for browser traversal within nested topic paths"
);
});
diff --git a/plugins/discourse-adplugin/spec/system/house_ads_nested_view_spec.rb b/plugins/discourse-adplugin/spec/system/house_ads_nested_view_spec.rb
index 517e512601d..9b31eeb81c0 100644
--- a/plugins/discourse-adplugin/spec/system/house_ads_nested_view_spec.rb
+++ b/plugins/discourse-adplugin/spec/system/house_ads_nested_view_spec.rb
@@ -5,6 +5,7 @@ describe "House ads in nested replies view" do
fab!(:topic)
fab!(:op) { Fabricate(:post, topic: topic) }
fab!(:root_replies) { Fabricate.times(7, :post, topic: topic) }
+ fab!(:nested_topic) { Fabricate(:nested_topic, topic: topic) }
fab!(:house_ad)
let(:nested_view) { PageObjects::Pages::NestedView.new }
diff --git a/plugins/discourse-solved/test/javascripts/acceptance/discourse-solved-post-menu-test.js b/plugins/discourse-solved/test/javascripts/acceptance/discourse-solved-post-menu-test.js
index da550a734a6..f2325922a08 100644
--- a/plugins/discourse-solved/test/javascripts/acceptance/discourse-solved-post-menu-test.js
+++ b/plugins/discourse-solved/test/javascripts/acceptance/discourse-solved-post-menu-test.js
@@ -14,6 +14,7 @@ function nestedTopicWithUnacceptedAnswer() {
return {
topic: {
...topic,
+ is_nested_view: true,
accepted_answers: [],
has_accepted_answer: false,
},
@@ -59,6 +60,12 @@ acceptance("Post Menu | Accept and Unaccept", function (needs) {
server.get("/t/12.json", () =>
helper.response(postStreamWithAcceptedAnswerExcerpt(null))
);
+ server.get("/t/23.json", () =>
+ helper.response({
+ ...postStreamWithAcceptedAnswerExcerpt(null),
+ is_nested_view: true,
+ })
+ );
server.get("/n/test-solved/23.json", () =>
helper.response(nestedTopicWithUnacceptedAnswer())
);
@@ -86,7 +93,7 @@ acceptance("Post Menu | Accept and Unaccept", function (needs) {
});
test("accepting a post in nested view updates the post menu button", async function (assert) {
- await visit("/n/test-solved/23");
+ await visit("/t/test-solved/23");
assert
.dom(
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index ef106ba5178..4399cde5b2a 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -327,7 +327,7 @@ RSpec.describe Notification do
}.to_json,
)
- expect(notification.url).to eq("/n/#{topic.slug}/#{topic.id}?sort=new&collapse_replies=true")
+ expect(notification.url).to eq("/t/#{topic.slug}/#{topic.id}?sort=new&collapse_replies=true")
end
it "returns the bucket parent's context with sort=new&collapse_replies=true for a consolidated per-post-bucket notification" do
@@ -346,11 +346,11 @@ RSpec.describe Notification do
)
expect(notification.url).to eq(
- "/n/#{topic.slug}/#{topic.id}/4?sort=new&collapse_replies=true",
+ "/t/#{topic.slug}/#{topic.id}/4?sort=new&collapse_replies=true",
)
end
- it "uses the legacy specific-post URL for a singular nested-bucket notification" do
+ it "uses the canonical specific-post URL for a singular nested-bucket notification" do
notification =
Fabricate(
:notification,
diff --git a/spec/requests/nested_topics_controller_spec.rb b/spec/requests/nested_topics_controller_spec.rb
index 36dc65a57a5..50e4c8fafc3 100644
--- a/spec/requests/nested_topics_controller_spec.rb
+++ b/spec/requests/nested_topics_controller_spec.rb
@@ -30,6 +30,30 @@ RSpec.describe NestedTopicsController, type: :request do
expect(response.status).to eq(301)
end
+ it "redirects browser requests to the canonical topic route" do
+ get "/n/#{topic.slug}/#{topic.id}"
+
+ expect(response).to redirect_to("/t/#{topic.slug}/#{topic.id}")
+ expect(response.status).to eq(302)
+ end
+
+ it "redirects browser context requests to the canonical topic route and preserves nested query params" do
+ get "/n/#{topic.slug}/#{topic.id}/5",
+ params: {
+ sort: "new",
+ context: "0",
+ collapse_replies: "true",
+ embed_mode: "true",
+ class_name: "lee-af",
+ ignored: "drop-me",
+ }
+
+ expect(response).to redirect_to(
+ "/t/#{topic.slug}/#{topic.id}/5?class_name=lee-af&collapse_replies=true&context=0&embed_mode=true&sort=new",
+ )
+ expect(response.status).to eq(302)
+ end
+
it "redirects crawlers to the flat topic view with post number" do
get "/n/#{topic.slug}/#{topic.id}/5", headers: { "HTTP_USER_AGENT" => "Googlebot" }
@@ -1499,10 +1523,12 @@ RSpec.describe NestedTopicsController, type: :request do
describe "embed mode" do
before { SiteSetting.embed_full_app = true }
- it "applies class_name to the html element when embed_mode is allowed" do
+ it "preserves class_name when redirecting embed_mode to the canonical topic route" do
SiteSetting.embed_any_origin = true
get("/n/#{topic.slug}/#{topic.id}", params: { embed_mode: "true", class_name: "lee-af" })
- expect(response.body).to match(/<html[^>]*\bclass="[^"]*\blee-af\b/)
+ expect(response).to redirect_to(
+ "/t/#{topic.slug}/#{topic.id}?class_name=lee-af&embed_mode=true",
+ )
end
it "strips X-Frame-Options when embed_mode is allowed" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index b1f85d167c9..fafb48647d7 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -3217,13 +3217,13 @@ RSpec.describe TopicsController do
expect(response).to redirect_to(topic.relative_url)
end
- it "redirects to nested view when nested_replies_default is enabled" do
+ it "serves the topic route when nested_replies_default is enabled" do
SiteSetting.nested_replies_enabled = true
SiteSetting.nested_replies_default = true
get "/t/#{topic.slug}/#{topic.id}"
- expect(response).to redirect_to("/n/#{topic.slug}/#{topic.id}")
+ expect(response.status).to eq(200)
end
it "does not redirect crawlers to nested view" do
@@ -3248,24 +3248,22 @@ RSpec.describe TopicsController do
expect(response).not_to redirect_to("/n/#{pm.slug}/#{pm.id}")
end
- it "preserves embed_mode when redirecting to nested view" do
+ it "serves embed_mode on the topic route for nested topics" do
SiteSetting.nested_replies_enabled = true
SiteSetting.nested_replies_default = true
get "/t/#{topic.slug}/#{topic.id}", params: { embed_mode: "true" }
- expect(response).to redirect_to("/n/#{topic.slug}/#{topic.id}?embed_mode=true")
+ expect(response.status).to eq(200)
end
- it "preserves class_name alongside embed_mode when redirecting to nested view" do
+ it "serves embed class_name on the topic route for nested topics" do
SiteSetting.nested_replies_enabled = true
SiteSetting.nested_replies_default = true
get "/t/#{topic.slug}/#{topic.id}", params: { embed_mode: "true", class_name: "lee-af" }
- expect(response).to redirect_to(
- "/n/#{topic.slug}/#{topic.id}?class_name=lee-af&embed_mode=true",
- )
+ expect(response.status).to eq(200)
end
it "returns 404 when an invalid slug is given and no id" do
diff --git a/spec/system/nested_activity_log_spec.rb b/spec/system/nested_activity_log_spec.rb
index 5313fa08f46..e52bad50010 100644
--- a/spec/system/nested_activity_log_spec.rb
+++ b/spec/system/nested_activity_log_spec.rb
@@ -7,13 +7,14 @@ RSpec.describe "Nested activity log" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(admin)
end
it "opens the activity log modal and lists small actions" do
topic.add_small_action(admin, "closed.enabled")
- page.visit("/n/#{topic.slug}/#{topic.id}")
+ page.visit("/t/#{topic.slug}/#{topic.id}")
find(".nested-view__activity-link").click
expect(page).to have_css(".nested-activity-log-modal")
@@ -21,7 +22,7 @@ RSpec.describe "Nested activity log" do
end
it "hides the activity log link on a topic with no small actions" do
- page.visit("/n/#{topic.slug}/#{topic.id}")
+ page.visit("/t/#{topic.slug}/#{topic.id}")
expect(page).to have_css(".nested-view__controls")
expect(page).to have_no_css(".nested-view__activity-link")
diff --git a/spec/system/nested_category_default_spec.rb b/spec/system/nested_category_default_spec.rb
index 688a409afc6..d86785dbf53 100644
--- a/spec/system/nested_category_default_spec.rb
+++ b/spec/system/nested_category_default_spec.rb
@@ -46,21 +46,21 @@ RSpec.describe "Nested view category default" do
end
end
- describe "topic redirect" do
+ describe "topic routing" do
before { sign_in(user) }
- it "redirects to nested view when visiting a topic URL directly" do
+ it "renders nested view when visiting a topic URL directly" do
page.visit("/t/#{topic.slug}/#{topic.id}")
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}})
expect(nested_view).to have_nested_view
end
- it "redirects to nested view when clicking a topic from the category page" do
+ it "renders nested view when clicking a topic from the category page" do
page.visit("/c/#{nested_category.slug}/#{nested_category.id}")
find(".topic-list-item .raw-topic-link[data-topic-id='#{topic.id}']").click
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}})
expect(nested_view).to have_nested_view
end
@@ -73,7 +73,7 @@ RSpec.describe "Nested view category default" do
topic_list.visit_topic(topic)
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}})
expect(nested_view).to have_nested_view
try_until_success { expect(page.evaluate_script("window.scrollY")).to eq(0) }
end
diff --git a/spec/system/nested_cloaking_spec.rb b/spec/system/nested_cloaking_spec.rb
index 42e31fa0c96..590b93eda6f 100644
--- a/spec/system/nested_cloaking_spec.rb
+++ b/spec/system/nested_cloaking_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe "Nested view cloaking" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
end
diff --git a/spec/system/nested_collapse_replies_spec.rb b/spec/system/nested_collapse_replies_spec.rb
index 29fed0ef1e2..985f9ca190c 100644
--- a/spec/system/nested_collapse_replies_spec.rb
+++ b/spec/system/nested_collapse_replies_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe "Nested view collapse_replies URL param" do
end
it "hides the root post's replies entirely when collapse_replies=true" do
- page.visit("/n/#{topic.slug}/#{topic.id}?collapse_replies=true")
+ page.visit("/t/#{topic.slug}/#{topic.id}?collapse_replies=true")
# Roots are the focal level — visible.
expect(nested_view).to have_post(root_post)
@@ -50,7 +50,7 @@ RSpec.describe "Nested view collapse_replies URL param" do
context "in the context view" do
it "renders direct replies but hides grandchildren when collapse_replies=true" do
- page.visit("/n/#{topic.slug}/#{topic.id}/#{root_post.post_number}?collapse_replies=true")
+ page.visit("/t/#{topic.slug}/#{topic.id}/#{root_post.post_number}?collapse_replies=true")
expect(nested_view).to have_context_view
@@ -71,7 +71,7 @@ RSpec.describe "Nested view collapse_replies URL param" do
# collapseFromDepth getter in nested.gjs ignores
# collapse_replies in that case.
it "ignores collapse_replies and shows the target when the chain has ancestors" do
- page.visit("/n/#{topic.slug}/#{topic.id}/#{reply_to_reply.post_number}?collapse_replies=true")
+ page.visit("/t/#{topic.slug}/#{topic.id}/#{reply_to_reply.post_number}?collapse_replies=true")
expect(nested_view).to have_context_view
diff --git a/spec/system/nested_context_view_spec.rb b/spec/system/nested_context_view_spec.rb
index da04563aabf..a3a69d35aca 100644
--- a/spec/system/nested_context_view_spec.rb
+++ b/spec/system/nested_context_view_spec.rb
@@ -28,6 +28,7 @@ RSpec.describe "Nested context view" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
end
@@ -42,6 +43,28 @@ RSpec.describe "Nested context view" do
expect(nested_view).to have_post(chain_posts[2])
end
+ it "shows the desktop context banner with full-topic navigation" do
+ nested_view.visit_nested_context(topic, post_number: chain_posts[2].post_number)
+
+ expect(nested_view).to have_context_banner
+ expect(nested_view).to have_view_full_thread_link
+ expect(nested_view).to have_no_view_parent_context_link
+
+ nested_view.click_view_full_thread
+
+ expect(nested_view).to have_nested_view
+ expect(nested_view).to have_no_context_view
+ expect(nested_view).to have_root_post(chain_posts[0])
+ end
+
+ it "keeps the desktop context banner out of the mobile stacked-root view", mobile: true do
+ nested_view.visit_nested_context(topic, post_number: chain_posts[2].post_number)
+
+ expect(nested_view).to have_context_view
+ expect(nested_view).to have_mobile_focus
+ expect(nested_view).to have_no_context_banner
+ end
+
it "marks direct post URLs as context routes" do
nested_view.visit_nested_context(topic, post_number: chain_posts[2].post_number)
@@ -72,6 +95,21 @@ RSpec.describe "Nested context view" do
expect(nested_view).to have_no_post(chain_posts[0])
expect(nested_view).to have_post_at_depth(chain_posts[3], depth: 0)
end
+
+ it "offers parent-context navigation" do
+ nested_view.visit_nested_context(topic, post_number: chain_posts[3].post_number, context: 0)
+
+ expect(nested_view).to have_context_banner
+ expect(nested_view).to have_view_parent_context_link
+
+ nested_view.click_view_parent_context
+
+ expect(nested_view).to have_context_view
+ expect(nested_view).to have_post(chain_posts[0])
+ expect(nested_view).to have_post(chain_posts[1])
+ expect(nested_view).to have_post(chain_posts[2])
+ expect(nested_view).to have_post(chain_posts[3])
+ end
end
context "with deeply nested posts exceeding max_depth" do
@@ -143,7 +181,7 @@ RSpec.describe "Nested context view" do
# by Glimmer (same post.id key) and its <NestedPostChildren> only
# reads @preloadedChildren in its constructor — so without a forced
# rebuild, the inner cascade keeps rendering the *previous* target's
- # chain. routes/nested.js stamps a per-fetch _renderKey on the chain
+ # chain. The topic route stamps a per-fetch _renderKey on the chain
# to force a full recreation; these specs guard that.
it "rebuilds the chain so the new target is visible" do
nested_view.visit_nested_context(topic, post_number: chain_posts[2].post_number)
@@ -152,7 +190,7 @@ RSpec.describe "Nested context view" do
nested_view.route_to_nested_context(topic, post_number: chain_posts[4].post_number)
expect(page).to have_current_path(
- %r{/n/#{Regexp.escape(topic.slug)}/#{topic.id}/#{chain_posts[4].post_number}\b},
+ %r{/t/#{Regexp.escape(topic.slug)}/#{topic.id}/#{chain_posts[4].post_number}\b},
)
expect(nested_view).to have_post(chain_posts[4])
expect(nested_view).to have_post(chain_posts[3])
@@ -169,18 +207,17 @@ RSpec.describe "Nested context view" do
end
# Notifications produce /t/slug/id/N URLs; topic/from-params.js
- # detects is_nested_view and redirects to /n/.../N. When N is the
- # post we're already viewing, the redirect is a no-op transition —
- # we still need the URL to stay on /n/ (not leak to /t/) and the
- # target to re-highlight via the nested:scroll-to-target appEvent.
- it "keeps the URL on /n/ and re-highlights when /t/ is routed to the post we're already on" do
+ # detects is_nested_view and keeps the topic route mounted while loading
+ # the nested context payload. When N is the post we're already viewing,
+ # the target should re-highlight without leaving /t/.
+ it "keeps the URL on /t/ and re-highlights when /t/ is routed to the post we're already on" do
nested_view.visit_nested_context(topic, post_number: chain_posts[2].post_number)
expect(nested_view).to have_highlighted_post(chain_posts[2])
nested_view.route_to_topic_post(topic, post_number: chain_posts[2].post_number)
expect(page).to have_current_path(
- %r{/n/#{Regexp.escape(topic.slug)}/#{topic.id}/#{chain_posts[2].post_number}\b},
+ %r{/t/#{Regexp.escape(topic.slug)}/#{topic.id}/#{chain_posts[2].post_number}\b},
)
expect(nested_view).to have_highlighted_post(chain_posts[2])
end
@@ -209,7 +246,7 @@ RSpec.describe "Nested context view" do
composer.submit
expect(composer).to be_closed
- expect(page).to have_current_path(%r{/n/})
+ expect(page).to have_current_path(%r{/t/})
end
end
end
diff --git a/spec/system/nested_copy_link_spec.rb b/spec/system/nested_copy_link_spec.rb
index a859bb5f04f..985a89673b3 100644
--- a/spec/system/nested_copy_link_spec.rb
+++ b/spec/system/nested_copy_link_spec.rb
@@ -24,6 +24,7 @@ RSpec.describe "Nested view copy link" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
cdp.allow_clipboard
end
@@ -33,7 +34,7 @@ RSpec.describe "Nested view copy link" do
nested_view.visit_nested(topic)
nested_view.click_copy_link_on_op
- expected = "#{Discourse.base_url}/n/#{topic.slug}/#{topic.id}/#{op.post_number}"
+ expected = "#{Discourse.base_url}/t/#{topic.slug}/#{topic.id}/#{op.post_number}"
cdp.clipboard_has_text?(expected)
end
end
@@ -43,7 +44,7 @@ RSpec.describe "Nested view copy link" do
nested_view.visit_nested(topic)
nested_view.click_copy_link_on_post(root_reply)
- expected = "#{Discourse.base_url}/n/#{topic.slug}/#{topic.id}/#{root_reply.post_number}"
+ expected = "#{Discourse.base_url}/t/#{topic.slug}/#{topic.id}/#{root_reply.post_number}"
cdp.clipboard_has_text?(expected)
end
end
@@ -53,7 +54,7 @@ RSpec.describe "Nested view copy link" do
nested_view.visit_nested_context(topic, post_number: child_reply.post_number, context: 0)
nested_view.click_copy_link_on_post(child_reply)
- expected = "#{Discourse.base_url}/n/#{topic.slug}/#{topic.id}/#{child_reply.post_number}"
+ expected = "#{Discourse.base_url}/t/#{topic.slug}/#{topic.id}/#{child_reply.post_number}"
cdp.clipboard_has_text?(expected)
end
end
diff --git a/spec/system/nested_depth_spec.rb b/spec/system/nested_depth_spec.rb
index 6a7a53097d2..72f7cd5e32a 100644
--- a/spec/system/nested_depth_spec.rb
+++ b/spec/system/nested_depth_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe "Nested view depth and nesting" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
end
diff --git a/spec/system/nested_floating_actions_spec.rb b/spec/system/nested_floating_actions_spec.rb
index ea530319c24..076b46a4c18 100644
--- a/spec/system/nested_floating_actions_spec.rb
+++ b/spec/system/nested_floating_actions_spec.rb
@@ -9,7 +9,10 @@ RSpec.describe "Nested view floating actions" do
let(:nested_view) { PageObjects::Pages::NestedView.new }
let(:composer) { PageObjects::Components::Composer.new }
- before { SiteSetting.nested_replies_enabled = true }
+ before do
+ SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
+ end
describe "as admin" do
before { sign_in(admin) }
diff --git a/spec/system/nested_hidden_posts_spec.rb b/spec/system/nested_hidden_posts_spec.rb
index 67ac0ccdeeb..90aafd8eea1 100644
--- a/spec/system/nested_hidden_posts_spec.rb
+++ b/spec/system/nested_hidden_posts_spec.rb
@@ -21,6 +21,7 @@ RSpec.describe "Nested view hidden posts" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(admin)
end
diff --git a/spec/system/nested_ignored_users_spec.rb b/spec/system/nested_ignored_users_spec.rb
index 872b2646514..2c209abdd4a 100644
--- a/spec/system/nested_ignored_users_spec.rb
+++ b/spec/system/nested_ignored_users_spec.rb
@@ -20,6 +20,7 @@ RSpec.describe "Nested view ignored users" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
Fabricate(:ignored_user, user: viewer, ignored_user: ignored_author)
sign_in(viewer)
end
diff --git a/spec/system/nested_pagination_spec.rb b/spec/system/nested_pagination_spec.rb
index 90e6f7eb6a9..21b827383ba 100644
--- a/spec/system/nested_pagination_spec.rb
+++ b/spec/system/nested_pagination_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe "Nested view pagination" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
end
diff --git a/spec/system/nested_post_admin_menu_spec.rb b/spec/system/nested_post_admin_menu_spec.rb
index 3fea3a354dd..9bf235ae98f 100644
--- a/spec/system/nested_post_admin_menu_spec.rb
+++ b/spec/system/nested_post_admin_menu_spec.rb
@@ -17,7 +17,10 @@ RSpec.describe "Nested view post admin menu" do
let(:nested_view) { PageObjects::Pages::NestedView.new }
- before { SiteSetting.nested_replies_enabled = true }
+ before do
+ SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
+ end
def open_admin_menu_for(post)
selector = "[data-post-number='#{post.post_number}']"
diff --git a/spec/system/nested_post_lifecycle_spec.rb b/spec/system/nested_post_lifecycle_spec.rb
index 02a53a5abf1..15d0fda4894 100644
--- a/spec/system/nested_post_lifecycle_spec.rb
+++ b/spec/system/nested_post_lifecycle_spec.rb
@@ -10,7 +10,10 @@ RSpec.describe "Nested view post lifecycle" do
let(:composer) { PageObjects::Components::Composer.new }
let(:dialog) { PageObjects::Components::Dialog.new }
- before { SiteSetting.nested_replies_enabled = true }
+ before do
+ SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
+ end
describe "editing a post and saving" do
fab!(:root_reply) do
diff --git a/spec/system/nested_quoting_spec.rb b/spec/system/nested_quoting_spec.rb
index f7966e2c305..3351646305a 100644
--- a/spec/system/nested_quoting_spec.rb
+++ b/spec/system/nested_quoting_spec.rb
@@ -20,6 +20,7 @@ RSpec.describe "Nested view quoting" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
end
diff --git a/spec/system/nested_realtime_spec.rb b/spec/system/nested_realtime_spec.rb
index 3ef330a1c0d..b3c2cc0d2f3 100644
--- a/spec/system/nested_realtime_spec.rb
+++ b/spec/system/nested_realtime_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe "Nested view real-time updates" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
end
diff --git a/spec/system/nested_redirect_fallback_spec.rb b/spec/system/nested_redirect_fallback_spec.rb
index cdadcd68699..7141b6447e0 100644
--- a/spec/system/nested_redirect_fallback_spec.rb
+++ b/spec/system/nested_redirect_fallback_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Nested redirect fallback for untracked topics" do
+RSpec.describe "Topic route fallback for untracked nested-capable topics" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:category)
fab!(:topic_author, :user)
@@ -15,12 +15,10 @@ RSpec.describe "Nested redirect fallback for untracked topics" do
sign_in(user)
end
- # When nested replies is enabled, the afterModel hook in
- # topic/from-params.js checks topic.is_nested_view and redirects via
- # router.replaceWith() to the nested route. That check relies on the
- # topic's category being present in client-side state so is_nested_view
- # can be resolved. When the topic is NOT in client-side tracking state
- # the category lookup may be async, exercising a fallback path.
+ # When nested replies is enabled, topic/from-params.js needs the topic's
+ # category metadata before it can resolve topic.is_nested_view and choose
+ # between flat and nested rendering. When the topic is NOT in client-side
+ # tracking state, the category lookup may be async, exercising a fallback path.
#
# These tests verify the fallback preserves the post number in the URL
# (so the user's scroll position isn't lost) and that non-nested topics
diff --git a/spec/system/nested_replying_spec.rb b/spec/system/nested_replying_spec.rb
index 20a6901b710..6107b065901 100644
--- a/spec/system/nested_replying_spec.rb
+++ b/spec/system/nested_replying_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe "Nested view replying" do
before do
SiteSetting.nested_replies_enabled = true
+ Fabricate(:nested_topic, topic: topic)
sign_in(user)
end
@@ -30,7 +31,7 @@ RSpec.describe "Nested view replying" do
expect(composer).to be_closed
expect(nested_view).to have_nested_view
- expect(page).to have_current_path(%r{/n/})
+ expect(page).to have_current_path(%r{/t/})
end
end
@@ -47,7 +48,7 @@ RSpec.describe "Nested view replying" do
expect(composer).to be_closed
expect(nested_view).to have_nested_view
- expect(page).to have_current_path(%r{/n/})
+ expect(page).to have_current_path(%r{/t/})
end
end
@@ -73,7 +74,7 @@ RSpec.describe "Nested view replying" do
expect(composer).to be_closed
expect(nested_view).to have_nested_view
- expect(page).to have_current_path(%r{/n/})
+ expect(page).to have_current_path(%r{/t/})
end
it "hides when the composer is open and reappears when closed" do
diff --git a/spec/system/nested_resume_draft_spec.rb b/spec/system/nested_resume_draft_spec.rb
index a12429609e8..622ca670742 100644
--- a/spec/system/nested_resume_draft_spec.rb
+++ b/spec/system/nested_resume_draft_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe "Nested view resuming a draft from the user activity page" do
drafts_page.visit(user)
page.find(".resume-draft").click
- expect(page).to have_current_path(%r{/n/})
+ expect(page).to have_current_path(%r{/t/})
expect(nested_view).to have_nested_view
expect(composer).to be_opened
expect(composer).to have_content("Resumed nested draft body")
diff --git a/spec/system/nested_topic_admin_toggle_spec.rb b/spec/system/nested_topic_admin_toggle_spec.rb
index 0bf8ba84c16..0cb1e7c1e36 100644
--- a/spec/system/nested_topic_admin_toggle_spec.rb
+++ b/spec/system/nested_topic_admin_toggle_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe "Nested replies topic admin toggle" do
topic_page.click_admin_menu_button
find(".topic-admin-nested-replies").click
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}})
expect(nested_view).to have_nested_view
topic.reload
diff --git a/spec/system/nested_view_spec.rb b/spec/system/nested_view_spec.rb
index 1eb6b0f0a9d..fe2339f54b4 100644
--- a/spec/system/nested_view_spec.rb
+++ b/spec/system/nested_view_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe "Nested view" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:topic) { Fabricate(:topic, user: user) }
fab!(:op) { Fabricate(:post, topic: topic, user: user, post_number: 1) }
+ fab!(:nested_topic_record) { Fabricate(:nested_topic, topic: topic) }
let(:nested_view) { PageObjects::Pages::NestedView.new }
let(:topic_list) { PageObjects::Components::TopicList.new }
@@ -19,6 +20,15 @@ RSpec.describe "Nested view" do
describe "basic rendering" do
fab!(:root_reply) { Fabricate(:post, topic: topic, user: Fabricate(:user), raw: "Root reply") }
+ fab!(:child_reply) do
+ Fabricate(
+ :post,
+ topic: topic,
+ user: Fabricate(:user),
+ raw: "Child reply",
+ reply_to_post_number: root_reply.post_number,
+ )
+ end
it "displays the nested view with root posts" do
nested_view.visit_nested(topic)
@@ -27,10 +37,12 @@ RSpec.describe "Nested view" do
expect(nested_view).to have_root_post(root_reply)
end
- it "does not show the standard replies button on the OP" do
+ it "does not show the standard replies button in nested post menus" do
+ root_reply.update!(reply_count: 1)
nested_view.visit_nested(topic)
expect(nested_view).to have_no_show_replies_button_for(op)
+ expect(nested_view).to have_no_show_replies_button_for(root_reply)
end
it "shows the original post content" do
@@ -45,7 +57,6 @@ RSpec.describe "Nested view" do
end
describe "topic list navigation" do
- fab!(:nested_topic_record) { Fabricate(:nested_topic, topic: topic) }
fab!(:root_reply) do
Fabricate(
:post,
@@ -60,7 +71,7 @@ RSpec.describe "Nested view" do
expect(topic_list).to have_topic(topic)
topic_list.visit_topic(topic)
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}})
expect(nested_view).to have_nested_view
expect(nested_view).to have_root_post(root_reply)
@@ -68,7 +79,7 @@ RSpec.describe "Nested view" do
expect(topic_list).to have_topic(topic)
topic_list.visit_topic(topic)
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}})
expect(nested_view).to have_nested_view
expect(nested_view).to have_root_post(root_reply)
end
@@ -349,7 +360,7 @@ RSpec.describe "Nested view" do
it "lets the user drill into reply branches without leaving the topic", mobile: true do
nested_view.visit_nested(topic)
- nested_path = %r{/n/#{topic.slug}/#{topic.id}}
+ nested_path = %r{/t/#{topic.slug}/#{topic.id}}
expect(nested_view).to have_post(child_reply)
expect(nested_view).to have_post(grandchild_reply)
@@ -360,7 +371,7 @@ RSpec.describe "Nested view" do
nested_view.click_replies_toggle(great_grandchild_reply)
expect(page).to have_current_path(
- %r{/n/#{topic.slug}/#{topic.id}/#{great_grandchild_reply.post_number}},
+ %r{/t/#{topic.slug}/#{topic.id}/#{great_grandchild_reply.post_number}},
)
expect(nested_view).to have_mobile_focus
expect(nested_view).to have_mobile_ancestor(root_reply)
@@ -388,13 +399,13 @@ RSpec.describe "Nested view" do
previous_scroll_y = nested_view.trigger_replies_toggle(great_grandchild_reply)
expect(page).to have_current_path(
- %r{/n/#{topic.slug}/#{topic.id}/#{great_grandchild_reply.post_number}},
+ %r{/t/#{topic.slug}/#{topic.id}/#{great_grandchild_reply.post_number}},
)
expect(nested_view).to have_mobile_focus
page.go_back
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}$})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}$})
expect(nested_view).to have_no_mobile_focus
try_until_success(reason: "scroll anchor restores after focused view closes") do
expect(page.evaluate_script("window.scrollY")).to be_within(250).of(previous_scroll_y)
@@ -405,7 +416,7 @@ RSpec.describe "Nested view" do
nested_view.visit_nested_context(topic, post_number: grandchild_reply.post_number)
expect(page).to have_current_path(
- %r{/n/#{topic.slug}/#{topic.id}/#{grandchild_reply.post_number}},
+ %r{/t/#{topic.slug}/#{topic.id}/#{grandchild_reply.post_number}},
)
expect(nested_view).to have_mobile_focus
expect(nested_view).to have_mobile_ancestor(root_reply)
@@ -414,7 +425,7 @@ RSpec.describe "Nested view" do
nested_view.click_mobile_ancestor(child_reply)
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}/#{child_reply.post_number}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}/#{child_reply.post_number}})
expect(nested_view).to have_mobile_ancestor(root_reply)
expect(nested_view).to have_no_mobile_ancestor(child_reply)
end
@@ -426,7 +437,7 @@ RSpec.describe "Nested view" do
nested_view.click_mobile_focus_back
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}(?:\?.*)?$})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}(?:\?.*)?$})
expect(nested_view).to have_no_mobile_focus
expect(nested_view).to have_root_post(root_reply)
expect(nested_view).to have_root_post(sibling_root_reply)
@@ -440,7 +451,7 @@ RSpec.describe "Nested view" do
nested_view.click_mobile_ancestor_avatar(child_reply)
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}/#{child_reply.post_number}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}/#{child_reply.post_number}})
expect(nested_view).to have_no_mobile_ancestor(child_reply)
expect(page).to have_no_css(".user-card.show")
end
@@ -510,7 +521,7 @@ RSpec.describe "Nested view" do
expect(nested_view).to have_nested_view
expect(nested_view).to have_root_post(root_reply)
- expect(page).to have_current_path(%r{/n/#{topic.slug}/#{topic.id}})
+ expect(page).to have_current_path(%r{/t/#{topic.slug}/#{topic.id}})
end
it "direct URL with post_number loads context view" do
@@ -567,12 +578,13 @@ RSpec.describe "Nested view" do
end
describe "plugin disabled" do
- it "returns 404 when plugin is disabled" do
+ it "renders the flat topic route when nested replies are disabled" do
SiteSetting.nested_replies_enabled = false
nested_view.visit_nested(topic)
- expect(page).to have_css(".page-not-found")
+ expect(nested_view).to have_no_nested_view
+ expect(page).to have_css("#post_1")
end
end
end
diff --git a/spec/system/page_objects/pages/nested_view.rb b/spec/system/page_objects/pages/nested_view.rb
index 93fa9582989..b03d3b0785a 100644
--- a/spec/system/page_objects/pages/nested_view.rb
+++ b/spec/system/page_objects/pages/nested_view.rb
@@ -4,14 +4,14 @@ module PageObjects
module Pages
class NestedView < PageObjects::Pages::Base
def visit_nested(topic, query: nil)
- url = "/n/#{topic.slug}/#{topic.id}"
+ url = "/t/#{topic.slug}/#{topic.id}"
url += "?#{query}" if query
page.visit(url)
self
end
def visit_nested_context(topic, post_number:, context: nil)
- url = "/n/#{topic.slug}/#{topic.id}/#{post_number}"
+ url = "/t/#{topic.slug}/#{topic.id}/#{post_number}"
url += "?context=#{context}" if context
page.visit(url)
self
@@ -29,7 +29,7 @@ module PageObjects
end
def route_to_nested_context(topic, post_number:, query: nil)
- path = "/n/#{topic.slug}/#{topic.id}/#{post_number}"
+ path = "/t/#{topic.slug}/#{topic.id}/#{post_number}"
path += "?#{query}" if query
route_to(path)
end
@@ -62,6 +62,30 @@ module PageObjects
has_css?(".nested-context-view")
end
+ def has_no_context_view?
+ has_no_css?(".nested-context-view")
+ end
+
+ def has_context_banner?
+ has_css?(".nested-context-view__banner", text: I18n.t("js.nested_replies.context.banner"))
+ end
+
+ def has_no_context_banner?
+ has_no_css?(".nested-context-view__banner")
+ end
+
+ def has_view_full_thread_link?
+ has_css?(".nested-context-view__full-thread")
+ end
+
+ def has_view_parent_context_link?
+ has_css?(".nested-context-view__parent-context")
+ end
+
+ def has_no_view_parent_context_link?
+ has_no_css?(".nested-context-view__parent-context")
+ end
+
# ── Post assertions ───────────────────────────────────────────
def has_post_at_depth?(post, depth:)
@@ -326,6 +350,16 @@ module PageObjects
self
end
+ def click_view_full_thread
+ find(".nested-context-view__full-thread").click
+ self
+ end
+
+ def click_view_parent_context
+ find(".nested-context-view__parent-context").click
+ self
+ end
+
def click_reply_on_post(post)
find("[data-post-number='#{post.post_number}'] .post-action-menu__reply").click
self
diff --git a/themes/horizon/test/acceptance/nested-suggested-navigation-test.gjs b/themes/horizon/test/acceptance/nested-suggested-navigation-test.gjs
index 8cab760d5be..0057a23df59 100644
--- a/themes/horizon/test/acceptance/nested-suggested-navigation-test.gjs
+++ b/themes/horizon/test/acceptance/nested-suggested-navigation-test.gjs
@@ -87,6 +87,20 @@ function nestedResponse({ id, slug, title, marker, suggestedTopic }) {
};
}
+function topicViewResponse(id, slug, title) {
+ const topic = topicAttrs(id, slug, title);
+ const opPost = postAttrs(topic, 1, id * 10 + 1, `${title} op`);
+
+ return {
+ ...topic,
+ post_stream: {
+ posts: [opPost],
+ stream: [opPost.id],
+ },
+ timeline_lookup: [[1, 0]],
+ };
+}
+
acceptance("Horizon | Nested suggested topic navigation", function (needs) {
needs.user();
needs.settings({
@@ -106,6 +120,18 @@ acceptance("Horizon | Nested suggested topic navigation", function (needs) {
"First nested topic"
);
+ server.get("/t/101.json", () =>
+ helper.response(
+ topicViewResponse(101, "first-nested-topic", "First nested topic")
+ )
+ );
+
+ server.get("/t/102.json", () =>
+ helper.response(
+ topicViewResponse(102, "second-nested-topic", "Second nested topic")
+ )
+ );
+
server.get("/n/first-nested-topic/101.json", () =>
helper.response(
nestedResponse({
@@ -132,7 +158,7 @@ acceptance("Horizon | Nested suggested topic navigation", function (needs) {
});
test("row-clicking a suggested nested topic replaces the old root branch", async function (assert) {
- await visit("/n/first-nested-topic/101");
+ await visit("/t/first-nested-topic/101");
assert
.dom(".nested-view__roots")
@@ -146,7 +172,7 @@ acceptance("Horizon | Nested suggested topic navigation", function (needs) {
await click("#suggested-topics .topic-list-item");
- assert.strictEqual(currentURL(), "/n/second-nested-topic/102?sort=old");
+ assert.strictEqual(currentURL(), "/t/second-nested-topic/102?sort=old");
assert
.dom(".nested-view__roots")
.includesText("SECOND_TOPIC_UNIQUE first branch");