A platform for community discussion. Free, open, simple.
FIX: Show correct document title for nested topics (#40499)
Mark VanLandingham2d608ce8e1cc
diff --git a/frontend/discourse/app/lib/topic-title-token.js b/frontend/discourse/app/lib/topic-title-token.jsnew file mode 100644index 00000000000..85c5c3a8700--- /dev/null+++ b/frontend/discourse/app/lib/topic-title-token.js@@ -0,0 +1,42 @@+export default function topicTitleToken(model, siteSettings) {+ if (!model) {+ return;+ }++ if (model.get("errorHtml")) {+ return model.get("errorTitle");+ }++ let result;++ const titleLocalized = model.get("fancy_title_localized");+ if (titleLocalized) {+ const fancyTitle = model.get("fancy_title");+ const tempDiv = document.createElement("div");+ tempDiv.innerHTML = fancyTitle;+ result = tempDiv.textContent || tempDiv.innerText || fancyTitle;+ } else {+ result = model.get("unicode_title") || model.get("title");+ }++ const cat = model.get("category");+ if (+ siteSettings.topic_page_title_includes_category &&+ cat &&+ !(+ cat.get("isUncategorizedCategory") &&+ cat.get("name").toLowerCase() === "uncategorized"+ )+ ) {+ let catName = cat.get("name");++ const parentCategory = cat.get("parentCategory");+ if (parentCategory) {+ catName = parentCategory.get("name") + " / " + catName;+ }++ return [result, catName];+ }++ return result;+}diff --git a/frontend/discourse/app/routes/nested.js b/frontend/discourse/app/routes/nested.jsindex 7437a446852..3ed2c420a14 100644--- a/frontend/discourse/app/routes/nested.js+++ b/frontend/discourse/app/routes/nested.js@@ -1,16 +1,17 @@import { action } from "@ember/object";import { getOwner } from "@ember/owner";-import Route from "@ember/routing/route";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 PreloadStore from "discourse/lib/preload-store";+import topicTitleToken from "discourse/lib/topic-title-token";import Draft from "discourse/models/draft";+import DiscourseRoute from "discourse/routes/discourse";import processNode from "../lib/process-node";-export default class NestedRoute extends Route {+export default class NestedRoute extends DiscourseRoute {@service composer;@service header;@service nestedViewCache;@@ -30,6 +31,10 @@ export default class NestedRoute extends Route {return { scrollOnTransition: false };}+ titleToken() {+ return topicTitleToken(this.currentModel?.topic, this.siteSettings);+ }+async model(params) {const { topic_id, slug, post_number } = params;const sort =diff --git a/frontend/discourse/app/routes/topic.js b/frontend/discourse/app/routes/topic.jsindex f626d5651d5..58116809b9d 100644--- a/frontend/discourse/app/routes/topic.js+++ b/frontend/discourse/app/routes/topic.js@@ -19,6 +19,7 @@ import PostFlag from "discourse/lib/flag-targets/post-flag";import TopicFlag from "discourse/lib/flag-targets/topic-flag";import discourseLater from "discourse/lib/later";import { setTopicId } from "discourse/lib/topic-list-tracker";+import topicTitleToken from "discourse/lib/topic-title-token";import DiscourseURL from "discourse/lib/url";import { ID_CONSTRAINT } from "discourse/models/topic";import DiscourseRoute from "discourse/routes/discourse";@@ -50,47 +51,7 @@ export default class TopicRoute extends DiscourseRoute {}titleToken() {- const model = this.modelFor("topic");- if (model) {- if (model.get("errorHtml")) {- return model.get("errorTitle");- }-- let result;-- const titleLocalized = model.get("fancy_title_localized");- if (titleLocalized) {- const fancyTitle = model.get("fancy_title");- // doing this helps with decoding entities- // e.g., “ -> ", — -> —- const tempDiv = document.createElement("div");- tempDiv.innerHTML = fancyTitle;- result = tempDiv.textContent || tempDiv.innerText || fancyTitle;- } else {- result = model.get("unicode_title") || model.get("title");- }-- const cat = model.get("category");- // Only display uncategorized in the title tag if it was renamed- if (- this.siteSettings.topic_page_title_includes_category &&- cat &&- !(- cat.get("isUncategorizedCategory") &&- cat.get("name").toLowerCase() === "uncategorized"- )- ) {- let catName = cat.get("name");-- const parentCategory = cat.get("parentCategory");- if (parentCategory) {- catName = parentCategory.get("name") + " / " + catName;- }-- return [result, catName];- }- return result;- }+ return topicTitleToken(this.modelFor("topic"), this.siteSettings);}@actiondiff --git a/frontend/discourse/tests/unit/routes/nested-test.js b/frontend/discourse/tests/unit/routes/nested-test.jsnew file mode 100644index 00000000000..8701f8631e4--- /dev/null+++ b/frontend/discourse/tests/unit/routes/nested-test.js@@ -0,0 +1,31 @@+import EmberObject from "@ember/object";+import { setupTest } from "ember-qunit";+import { module, test } from "qunit";++module("Unit | Route | nested", function (hooks) {+ setupTest(hooks);++ 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"+ );+ });+});