From 457b10e68aca3bb0a6eb5887b13927b73dd80076 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 7 Aug 2023 15:28:17 +0100
Subject: [PATCH] DEV: Make `navigateToTopic` more robust for themes/plugins
 (#22992)

This function was previously expecting multiple services to be injected on any class that uses it. This kind of hidden requirement leads to some very difficult-to-debug situations, so this commit updates the function to lookup all its required services inline.
---
 .../discourse/app/components/topic-list-item.js   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 029771c44cf..07eb0892b10 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -14,6 +14,7 @@ import { topicTitleDecorators } from "discourse/components/topic-title";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import { htmlSafe } from "@ember/template";
 import { inject as service } from "@ember/service";
+import { getOwner } from "@ember/application";
 
 export function showEntrance(e) {
   let target = $(e.target);
@@ -35,15 +36,21 @@ export function showEntrance(e) {
 }
 
 export function navigateToTopic(topic, href) {
-  if (this.siteSettings.page_loading_indicator !== "slider") {
+  const owner = getOwner(this);
+  const siteSettings = owner.lookup("service:site-settings");
+  const router = owner.lookup("service:router");
+  const session = owner.lookup("service:session");
+  const appEvents = owner.lookup("service:appEvents");
+
+  if (siteSettings.page_loading_indicator !== "slider") {
     // With the slider, it feels nicer for the header to update once the rest of the topic content loads,
     // so skip setting it early.
-    this.appEvents.trigger("header:update-topic", topic);
+    appEvents.trigger("header:update-topic", topic);
   }
 
-  this.session.set("lastTopicIdViewed", {
+  session.set("lastTopicIdViewed", {
     topicId: topic.id,
-    historyUuid: this.router.location.getState?.().uuid,
+    historyUuid: router.location.getState?.().uuid,
   });
 
   DiscourseURL.routeTo(href || topic.get("url"));