github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 11:32:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: ensures activeMessage is reset with channel (#21031)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2023-04-10 08:10:01 +02:00 committed by GitHub
parent c7b49a14c7
commit c1dc6a2db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ export default {
return dasherize(this.channel.slugifiedTitle);
}
@computed("chatService.activeChannel")
get classNames() {
const classes = [];

15
plugins/chat/assets/javascripts/discourse/services/chat.js
View File

@ -30,8 +30,6 @@ export default class Chat extends Service {
@service chatChannelPane;
@service chatChannelThreadPane;
@tracked activeChannel = null;
cook = null;
presenceChannel = null;
sidebarActive = false;
@ -40,6 +38,19 @@ export default class Chat extends Service {
@and("currentUser.has_chat_enabled", "siteSettings.chat_enabled") userCanChat;
@tracked _activeMessage = null;
@tracked _activeChannel = null;
get activeChannel() {
return this._activeChannel;
}
set activeChannel(channel) {
if (!channel) {
this._activeMessage = null;
}
this._activeChannel = channel;
}
@computed("currentUser.staff", "currentUser.groups.[]")
get userCanDirectMessage() {

19
plugins/chat/spec/system/drawer_spec.rb
View File

@ -68,6 +68,25 @@ RSpec.describe "Drawer", type: :system, js: true do
end
end
context "when closing the drawer" do
fab!(:channel_1) { Fabricate(:chat_channel) }
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
before { channel_1.add(current_user) }
it "resets the active message" do
visit("/")
chat_page.open_from_header
drawer.open_channel(channel_1)
channel_page.hover_message(message_1)
expect(page).to have_css(".chat-message-actions-container")
find(".chat-composer-input").send_keys(:escape)
expect(page).to have_no_css(".chat-message-actions-container")
end
end
context "when clicking the drawer's header" do
it "collapses the drawer" do
visit("/")