github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 21:21:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Multiple channels marked active in sidebar (#21045)

Browse Source 
Followup to c1dc6a2db4d9e98caa62ba51beba3a16adf495a8,
this commit just missed removing one of the @computed
decorators which was causing multiple active channels
to show in the sidebar. Fix the issue and introduce a
system spec to catch this.
This commit is contained in:
Martin Brennan
2023-04-11 12:31:17 +10:00
committed by GitHub
parent 63a0466548
commit 7ae716fa69
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
View File

@ -9,7 +9,6 @@ import { emojiUnescape } from "discourse/lib/text";
import { decorateUsername } from "discourse/helpers/decorate-username-selector"; import { decorateUsername } from "discourse/helpers/decorate-username-selector";
import { until } from "discourse/lib/formatter"; import { until } from "discourse/lib/formatter";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
import { computed } from "@ember/object";
export default { export default {
name: "chat-sidebar", name: "chat-sidebar",
@ -196,7 +195,6 @@ export default {
return this.channel.slugifiedTitle; return this.channel.slugifiedTitle;
} }
@computed("chatService.activeChannel")
get classNames() { get classNames() {
const classes = []; const classes = [];

17
plugins/chat/spec/system/navigation_spec.rb
View File

@ -242,12 +242,29 @@ RSpec.describe "Navigation", type: :system, js: true do
end end
context "when opening a channel in full page" do context "when opening a channel in full page" do
fab!(:other_user) { Fabricate(:user) }
fab!(:dm_channel) { Fabricate(:direct_message_channel, users: [user, other_user]) }
it "activates the channel in the sidebar" do it "activates the channel in the sidebar" do
visit("/chat/c/#{category_channel.slug}/#{category_channel.id}") visit("/chat/c/#{category_channel.slug}/#{category_channel.id}")
expect(page).to have_css( expect(page).to have_css(
".sidebar-section-link-#{category_channel.slug}.sidebar-section-link--active", ".sidebar-section-link-#{category_channel.slug}.sidebar-section-link--active",
) )
end end
it "does not have multiple channels marked active in the sidebar" do
chat_page.visit_channel(dm_channel)
expect(page).to have_css(
".sidebar-section-link-#{other_user.username}.sidebar-section-link--active",
)
page.find(".sidebar-section-link-#{category_channel.slug}").click
expect(page).to have_css(
".sidebar-section-link-#{category_channel.slug}.sidebar-section-link--active",
)
expect(page).to have_css(".sidebar-section-link--active", count: 1)
end
end end
context "when going back to channel from channel settings in full page" do context "when going back to channel from channel settings in full page" do