mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 06:15:28 +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
155 lines
5.2 KiB
Ruby
155 lines
5.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
describe "Uploading files in chat messages", type: :system, js: true do
|
|
fab!(:current_user) { Fabricate(:user) }
|
|
fab!(:channel_1) { Fabricate(:chat_channel) }
|
|
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
|
|
|
|
let(:chat) { PageObjects::Pages::Chat.new }
|
|
let(:channel) { PageObjects::Pages::ChatChannel.new }
|
|
|
|
before { chat_system_bootstrap }
|
|
|
|
context "when uploading to a new message" do
|
|
before do
|
|
channel_1.add(current_user)
|
|
sign_in(current_user)
|
|
end
|
|
|
|
it "allows uploading a single file" do
|
|
chat.visit_channel(channel_1)
|
|
file_path = file_from_fixtures("logo.png", "images").path
|
|
attach_file(file_path) do
|
|
channel.open_action_menu
|
|
channel.click_action_button("chat-upload-btn")
|
|
end
|
|
|
|
expect(page).to have_css(".chat-composer-upload .preview .preview-img")
|
|
|
|
channel.send_message("upload testing")
|
|
|
|
expect(page).not_to have_css(".chat-composer-upload")
|
|
expect(channel).to have_message(text: "upload testing")
|
|
expect(Chat::Message.last.uploads.count).to eq(1)
|
|
end
|
|
|
|
it "allows uploading multiple files" do
|
|
chat.visit_channel(channel_1)
|
|
|
|
file_path_1 = file_from_fixtures("logo.png", "images").path
|
|
file_path_2 = file_from_fixtures("logo.jpg", "images").path
|
|
attach_file([file_path_1, file_path_2]) do
|
|
channel.open_action_menu
|
|
channel.click_action_button("chat-upload-btn")
|
|
end
|
|
|
|
expect(page).to have_css(".chat-composer-upload .preview .preview-img", count: 2)
|
|
channel.send_message("upload testing")
|
|
|
|
expect(page).not_to have_css(".chat-composer-upload")
|
|
expect(channel).to have_message(text: "upload testing")
|
|
expect(Chat::Message.last.uploads.count).to eq(2)
|
|
end
|
|
|
|
it "allows uploading a huge image file with preprocessing" do
|
|
SiteSetting.composer_media_optimization_image_bytes_optimization_threshold = 200.kilobytes
|
|
chat.visit_channel(channel_1)
|
|
file_path = file_from_fixtures("huge.jpg", "images").path
|
|
attach_file(file_path) do
|
|
channel.open_action_menu
|
|
channel.click_action_button("chat-upload-btn")
|
|
end
|
|
|
|
expect(find(".chat-composer-upload")).to have_content("Processing")
|
|
|
|
# image processing clientside is slow! here we are waiting for processing
|
|
# to complete then the upload to complete as well
|
|
using_wait_time(10) do
|
|
expect(find(".chat-composer-upload")).to have_content("Uploading")
|
|
expect(page).to have_css(".chat-composer-upload .preview .preview-img")
|
|
end
|
|
|
|
channel.send_message("upload testing")
|
|
|
|
expect(page).not_to have_css(".chat-composer-upload")
|
|
expect(channel).to have_message(text: "upload testing")
|
|
expect(Chat::Message.last.uploads.count).to eq(1)
|
|
end
|
|
end
|
|
|
|
context "when editing a message with uploads" do
|
|
fab!(:message_2) { Fabricate(:chat_message, user: current_user, chat_channel: channel_1) }
|
|
fab!(:upload_reference) do
|
|
Fabricate(
|
|
:upload_reference,
|
|
target: message_2,
|
|
upload: Fabricate(:upload, user: current_user),
|
|
)
|
|
end
|
|
|
|
before do
|
|
channel_1.add(current_user)
|
|
sign_in(current_user)
|
|
|
|
file = file_from_fixtures("logo-dev.png", "images")
|
|
url = Discourse.store.store_upload(file, upload_reference.upload)
|
|
upload_reference.upload.update!(url: url, sha1: Upload.generate_digest(file))
|
|
end
|
|
|
|
it "allows deleting uploads" do
|
|
chat.visit_channel(channel_1)
|
|
channel.open_edit_message(message_2)
|
|
find(".chat-composer-upload").hover
|
|
find(".chat-composer-upload__remove-btn").click
|
|
channel.click_send_message
|
|
expect(channel.message_by_id(message_2.id)).not_to have_css(".chat-uploads")
|
|
try_until_success(timeout: 5) { expect(message_2.reload.uploads).to be_empty }
|
|
end
|
|
|
|
it "allows adding more uploads" do
|
|
chat.visit_channel(channel_1)
|
|
channel.open_edit_message(message_2)
|
|
|
|
file_path = file_from_fixtures("logo.png", "images").path
|
|
attach_file(file_path) do
|
|
channel.open_action_menu
|
|
channel.click_action_button("chat-upload-btn")
|
|
end
|
|
|
|
expect(page).to have_css(".chat-composer-upload .preview .preview-img", count: 2)
|
|
|
|
channel.click_send_message
|
|
|
|
expect(page).not_to have_css(".chat-composer-upload")
|
|
expect(page).to have_css(".chat-img-upload", count: 2)
|
|
|
|
try_until_success(timeout: 5) { expect(message_2.reload.uploads.count).to eq(2) }
|
|
end
|
|
end
|
|
|
|
context "when uploads are not allowed" do
|
|
fab!(:user_2) { Fabricate(:user) }
|
|
fab!(:direct_message_channel_1) do
|
|
Fabricate(:direct_message_channel, users: [current_user, user_2])
|
|
end
|
|
|
|
before do
|
|
SiteSetting.chat_allow_uploads = false
|
|
channel_1.add(current_user)
|
|
sign_in(current_user)
|
|
end
|
|
|
|
it "does not show the action button for uploading files in public channels" do
|
|
chat.visit_channel(channel_1)
|
|
channel.open_action_menu
|
|
expect(page).not_to have_css(".chat-upload-btn")
|
|
end
|
|
|
|
it "does not show the action button for uploading files in direct message channels" do
|
|
chat.visit_channel(direct_message_channel_1)
|
|
channel.open_action_menu
|
|
expect(page).not_to have_css(".chat-upload-btn")
|
|
end
|
|
end
|
|
end
|