mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 10:29:35 +08:00
bf886662df
This pull request is a full overhaul of the chat-composer and contains various improvements to the thread panel. They have been grouped in the same PR as lots of improvements/fixes to the thread panel needed an improved composer. This is meant as a first step. ### New features included in this PR - A resizable side panel - A clear dropzone area for uploads - A simplified design for image uploads, this is only a first step towards more redesign of this area in the future ### Notable fixes in this PR - Correct placeholder in thread panel - Allows to edit the last message of a thread with arrow up - Correctly focus composer when replying to a message - The reply indicator is added instantly in the channel when starting a thread - Prevents a large variety of bug where the composer could bug and prevent sending message or would clear your input while it has content ### Technical notes To achieve this PR, three important changes have been made: - `<ChatComposer>` has been fully rewritten and is now a glimmer component - The chat composer now takes a `ChatMessage` as input which can directly be used in other operations, it simplifies a lot of logic as we are always working a with a `ChatMessage` - `TextareaInteractor` has been created to wrap the existing `TextareaTextManipulation` mixin, it will make future migrations easier and allow us to have a less polluted `<ChatComposer>` Note ".chat-live-pane" has been renamed ".chat-channel" Design for upload dropzone is from @chapoi
191 lines
5.5 KiB
Ruby
191 lines
5.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe "Sidebar navigation menu", type: :system, js: true do
|
|
let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
|
|
let(:sidebar_component) { PageObjects::Components::Sidebar.new }
|
|
|
|
fab!(:current_user) { Fabricate(:user) }
|
|
|
|
before do
|
|
SiteSetting.navigation_menu = "sidebar"
|
|
chat_system_bootstrap
|
|
|
|
sign_in(current_user)
|
|
end
|
|
|
|
context "when displaying the public channels section" do
|
|
fab!(:channel_1) { Fabricate(:chat_channel) }
|
|
|
|
before { channel_1.add(current_user) }
|
|
|
|
it "displays correct channels section title" do
|
|
visit("/")
|
|
|
|
expect(sidebar_page.channels_section).to have_css(
|
|
".sidebar-section-header-text",
|
|
text: I18n.t("js.chat.chat_channels"),
|
|
)
|
|
end
|
|
|
|
it "displays the correct hash icon prefix" do
|
|
visit("/")
|
|
|
|
expect(sidebar_page.channels_section).to have_css(
|
|
".sidebar-section-link[data-link-name='#{channel_1.slug}'] .sidebar-section-link-prefix svg.prefix-icon.d-icon-d-chat",
|
|
)
|
|
end
|
|
|
|
it "channel link has the correct href" do
|
|
visit("/")
|
|
|
|
expect(page).to have_link(channel_1.name, href: "/chat/c/#{channel_1.slug}/#{channel_1.id}")
|
|
end
|
|
|
|
context "when the category is private" do
|
|
fab!(:group_1) { Fabricate(:group) }
|
|
fab!(:private_channel_1) { Fabricate(:private_category_channel, group: group_1) }
|
|
|
|
before do
|
|
group_1.add(current_user)
|
|
private_channel_1.add(current_user)
|
|
end
|
|
|
|
it "has a lock badge" do
|
|
visit("/")
|
|
|
|
expect(sidebar_page.channels_section).to have_css(
|
|
".sidebar-section-link[data-link-name='#{private_channel_1.slug}'] .sidebar-section-link-prefix svg.prefix-badge.d-icon-lock",
|
|
)
|
|
end
|
|
end
|
|
|
|
context "when the channel has an emoji in the title" do
|
|
fab!(:channel_1) { Fabricate(:chat_channel, name: "test :heart:") }
|
|
|
|
before { channel_1.add(current_user) }
|
|
|
|
it "unescapes the emoji" do
|
|
visit("/")
|
|
|
|
expect(sidebar_page.channels_section).to have_css(
|
|
".sidebar-section-link[data-link-name='#{channel_1.slug}'] .emoji",
|
|
)
|
|
end
|
|
end
|
|
|
|
context "when the channel is muted" do
|
|
fab!(:channel_2) { Fabricate(:chat_channel) }
|
|
|
|
before do
|
|
Fabricate(
|
|
:user_chat_channel_membership,
|
|
user: current_user,
|
|
chat_channel: channel_2,
|
|
muted: true,
|
|
)
|
|
end
|
|
|
|
it "has a muted class" do
|
|
visit("/")
|
|
|
|
expect(sidebar_page.channels_section).to have_css(
|
|
".sidebar-section-link[data-link-name='#{channel_2.slug}'].sidebar-section-link--muted",
|
|
)
|
|
end
|
|
end
|
|
|
|
context "when channel description contains malicious content" do
|
|
before { channel_1.update!(description: "<script>alert('hello')</script>") }
|
|
|
|
it "escapes the title attribute using it" do
|
|
visit("/")
|
|
|
|
expect(
|
|
sidebar_page.channels_section.find(
|
|
".sidebar-section-link[data-link-name='#{channel_1.slug}']",
|
|
)[
|
|
"title"
|
|
],
|
|
).to eq("<script>alert('hello')</script>")
|
|
end
|
|
end
|
|
end
|
|
|
|
context "when displaying the direct message channels section" do
|
|
context "when the channel has two participants" do
|
|
fab!(:other_user) { Fabricate(:user) }
|
|
fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user, other_user]) }
|
|
|
|
it "displays other user avatar in prefix when two participants" do
|
|
visit("/")
|
|
|
|
expect(
|
|
sidebar_page.dms_section.find(
|
|
"a.sidebar-section-link:nth-child(1) .sidebar-section-link-prefix img",
|
|
)[
|
|
"src"
|
|
],
|
|
).to include(other_user.username)
|
|
end
|
|
|
|
it "displays other user username as link text" do
|
|
visit("/")
|
|
|
|
expect(
|
|
sidebar_page.dms_section.find("a.sidebar-section-link:nth-child(1)"),
|
|
).to have_content(other_user.username)
|
|
end
|
|
|
|
context "when other user has status" do
|
|
before do
|
|
SiteSetting.enable_user_status = true
|
|
other_user.set_status!("online", "heart")
|
|
end
|
|
|
|
it "displays the status" do
|
|
visit("/")
|
|
|
|
expect(sidebar_page.dms_section.find("a.sidebar-section-link:nth-child(1)")).to have_css(
|
|
".user-status",
|
|
)
|
|
end
|
|
end
|
|
end
|
|
|
|
context "when channel has more than 2 participants" do
|
|
fab!(:user_1) { Fabricate(:user, username: "zoesmith") }
|
|
fab!(:user_2) { Fabricate(:user, username: "alansmith") }
|
|
fab!(:dm_channel_1) do
|
|
Fabricate(:direct_message_channel, users: [current_user, user_1, user_2])
|
|
end
|
|
|
|
it "displays all participants names in alphabetical order" do
|
|
visit("/")
|
|
expect(
|
|
sidebar_page.dms_section.find(
|
|
"a.sidebar-section-link:nth-child(1) .sidebar-section-link-content-text",
|
|
),
|
|
).to have_content("alansmith, zoesmith")
|
|
end
|
|
end
|
|
|
|
context "when username contains malicious content" do
|
|
fab!(:other_user) { Fabricate(:user) }
|
|
fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user, other_user]) }
|
|
|
|
before do
|
|
other_user.username = "<script>alert('hello')</script>"
|
|
other_user.save!(validate: false)
|
|
end
|
|
|
|
it "escapes the title attribute using it" do
|
|
visit("/")
|
|
|
|
expect(sidebar_page.dms_section.find(".channel-#{dm_channel_1.id}")["title"]).to eq(
|
|
"Chat in @<script>alert('hello')</script>",
|
|
)
|
|
end
|
|
end
|
|
end
|
|
end
|