A platform for community discussion. Free, open, simple.
FIX: Don't double subfolder when clicking chat icon after opening chat in drawer (#42030)
Chris Albertic86322800419
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.jsindex 1b55a5f3594..4bf087a6740 100644--- a/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js+++ b/plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js@@ -195,8 +195,10 @@ export default class ChatStateManager extends Service {}get lastKnownChatURL() {- if (this._chatURL) {- return this._chatURL;+ const url = this._chatURL;++ if (url) {+ return withoutPrefix(url);}// On mobile or drawer mode, default to starred channels if user has anydiff --git a/plugins/chat/spec/system/drawer_spec.rb b/plugins/chat/spec/system/drawer_spec.rbindex 91eaf1d6f0c..efb4fafde67 100644--- a/plugins/chat/spec/system/drawer_spec.rb+++ b/plugins/chat/spec/system/drawer_spec.rb@@ -228,6 +228,25 @@ RSpec.describe "Drawer" doexpect(page).to have_current_path("/discuss/categories")expect(page).to have_no_css("body.has-full-page-chat")end++ it "does not double the subfolder when returning to a chat channel via the header icon after a programmatic navigation" do+ visit("/discuss/chat")+ expect(page).to have_css("html.has-chat")++ find(".title a").click+ expect(page).to have_current_path("/discuss/")++ find(".sidebar-section-link.channel-#{channel.id}").click+ expect(page).to have_css("body.has-drawer-chat")++ drawer_page.close++ find(".chat-header-icon").click++ expect(page).to have_current_path("/discuss/")+ expect(page).to have_css("body.has-drawer-chat")+ expect(page).to have_css(".chat-channel.--loaded[data-id='#{channel.id}']")+ endendcontext "when sending a message from a thread while viewing a topic" do