mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 04:31:56 +08:00
906caa63d7
This commit implements drafts for threads by adding a new `thread_id` column to `chat_drafts` table. This column is used to create draft keys on the frontend which are a compound key of the channel and the thread. If the draft is only for the channel, the key will be `c-${channelId}`, if for a thread: `c-${channelId}:t-${threadId}`. This commit also moves the draft holder from the service to the channel or thread model. The current draft can now always be accessed by doing: `channel.draft` or `thread.draft`. Other notable changes of this commit: - moves ChatChannel to gjs - moves ChatThread to gjs
247 lines
6.5 KiB
Ruby
247 lines
6.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe "Chat composer draft", type: :system do
|
|
fab!(:current_user) { Fabricate(:user) }
|
|
fab!(:channel_1) { Fabricate(:chat_channel) }
|
|
fab!(:message_1) do
|
|
Fabricate(
|
|
:chat_message,
|
|
chat_channel: channel_1,
|
|
message: "This is a message for draft and replies",
|
|
)
|
|
end
|
|
|
|
let(:chat_page) { PageObjects::Pages::Chat.new }
|
|
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
|
|
let(:thread_page) { PageObjects::Pages::ChatThread.new }
|
|
|
|
before { chat_system_bootstrap }
|
|
|
|
context "when loading a channel with a draft" do
|
|
before do
|
|
create_draft(channel_1, user: current_user)
|
|
channel_1.add(current_user)
|
|
sign_in(current_user)
|
|
end
|
|
|
|
it "loads the draft" do
|
|
chat_page.visit_channel(channel_1)
|
|
|
|
expect(channel_page.composer.value).to eq("draft")
|
|
end
|
|
|
|
context "when loading another channel and back" do
|
|
fab!(:channel_2) { Fabricate(:chat_channel) }
|
|
|
|
before do
|
|
create_draft(channel_2, user: current_user, data: { message: "draft2" })
|
|
channel_2.add(current_user)
|
|
end
|
|
|
|
it "loads the correct drafts" do
|
|
chat_page.visit_channel(channel_1)
|
|
|
|
expect(channel_page.composer.value).to eq("draft")
|
|
|
|
chat_page.visit_channel(channel_2)
|
|
|
|
expect(channel_page.composer.value).to eq("draft2")
|
|
|
|
chat_page.visit_channel(channel_1)
|
|
|
|
expect(channel_page.composer.value).to eq("draft")
|
|
end
|
|
end
|
|
|
|
context "when editing" do
|
|
before do
|
|
create_draft(
|
|
channel_1,
|
|
user: current_user,
|
|
data: {
|
|
message: message_1.message,
|
|
id: message_1.id,
|
|
editing: true,
|
|
},
|
|
)
|
|
end
|
|
|
|
it "loads the draft with the editing state" do
|
|
chat_page.visit_channel(channel_1)
|
|
|
|
expect(channel_page.composer).to be_editing_message(message_1)
|
|
end
|
|
|
|
context "when canceling editing" do
|
|
it "resets the draft" do
|
|
chat_page.visit_channel(channel_1)
|
|
channel_page.composer.message_details.cancel_edit
|
|
|
|
expect(channel_page.composer).to be_blank
|
|
expect(channel_page.composer).to have_unsaved_draft
|
|
expect(channel_page.composer).to have_saved_draft
|
|
end
|
|
end
|
|
end
|
|
|
|
context "with uploads" do
|
|
fab!(:upload_1) do
|
|
Fabricate(
|
|
:upload,
|
|
url: "/images/logo-dark.png",
|
|
original_filename: "logo_dark.png",
|
|
width: 400,
|
|
height: 300,
|
|
extension: "png",
|
|
)
|
|
end
|
|
|
|
before do
|
|
create_draft(channel_1, user: current_user, data: { message: "draft", uploads: [upload_1] })
|
|
end
|
|
|
|
it "loads the draft with the upload" do
|
|
chat_page.visit_channel(channel_1)
|
|
|
|
expect(channel_page.composer.value).to eq("draft")
|
|
expect(page).to have_selector(".chat-composer-upload--image", count: 1)
|
|
end
|
|
end
|
|
|
|
context "when replying" do
|
|
before do
|
|
create_draft(
|
|
channel_1,
|
|
user: current_user,
|
|
data: {
|
|
message: "draft",
|
|
replyToMsg: {
|
|
id: message_1.id,
|
|
excerpt: message_1.excerpt,
|
|
user: {
|
|
id: message_1.user.id,
|
|
name: nil,
|
|
avatar_template: message_1.user.avatar_template,
|
|
username: message_1.user.username,
|
|
},
|
|
},
|
|
},
|
|
)
|
|
end
|
|
|
|
it "loads the draft with replied to mesage" do
|
|
chat_page.visit_channel(channel_1)
|
|
|
|
expect(channel_page.composer.value).to eq("draft")
|
|
expect(page).to have_selector(".chat-reply__username", text: message_1.user.username)
|
|
expect(page).to have_selector(".chat-reply__excerpt", text: message_1.excerpt)
|
|
end
|
|
end
|
|
end
|
|
|
|
context "when loading a thread with a draft" do
|
|
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
|
|
fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1) }
|
|
|
|
before do
|
|
create_draft(channel_1, user: current_user, thread: thread_1)
|
|
channel_1.add(current_user)
|
|
sign_in(current_user)
|
|
end
|
|
|
|
it "loads the draft" do
|
|
chat_page.visit_thread(thread_1)
|
|
|
|
expect(thread_page.composer.value).to eq("draft")
|
|
end
|
|
|
|
context "when loading another channel and back" do
|
|
fab!(:channel_2) { Fabricate(:chat_channel, threading_enabled: true) }
|
|
fab!(:thread_2) { Fabricate(:chat_thread, channel: channel_2) }
|
|
|
|
before do
|
|
create_draft(channel_2, user: current_user, thread: thread_2, data: { message: "draft2" })
|
|
channel_2.add(current_user)
|
|
end
|
|
|
|
it "loads the correct drafts" do
|
|
chat_page.visit_thread(thread_1)
|
|
|
|
expect(thread_page.composer.value).to eq("draft")
|
|
|
|
chat_page.visit_thread(thread_2)
|
|
|
|
expect(thread_page.composer.value).to eq("draft2")
|
|
|
|
chat_page.visit_thread(thread_1)
|
|
|
|
expect(thread_page.composer.value).to eq("draft")
|
|
end
|
|
end
|
|
|
|
context "when editing" do
|
|
before do
|
|
create_draft(
|
|
channel_1,
|
|
user: current_user,
|
|
thread: thread_1,
|
|
data: {
|
|
message: message_1.message,
|
|
id: message_1.id,
|
|
editing: true,
|
|
},
|
|
)
|
|
end
|
|
|
|
it "loads the draft with the editing state" do
|
|
chat_page.visit_thread(thread_1)
|
|
|
|
expect(thread_page.composer).to be_editing_message(message_1)
|
|
end
|
|
|
|
context "when canceling editing" do
|
|
it "resets the draft" do
|
|
chat_page.visit_thread(thread_1)
|
|
thread_page.composer.message_details.cancel_edit
|
|
|
|
expect(thread_page.composer).to be_blank
|
|
expect(thread_page.composer).to have_unsaved_draft
|
|
expect(thread_page.composer).to have_saved_draft
|
|
end
|
|
end
|
|
end
|
|
|
|
context "with uploads" do
|
|
fab!(:upload_1) do
|
|
Fabricate(
|
|
:upload,
|
|
url: "/images/logo-dark.png",
|
|
original_filename: "logo_dark.png",
|
|
width: 400,
|
|
height: 300,
|
|
extension: "png",
|
|
)
|
|
end
|
|
|
|
before do
|
|
create_draft(
|
|
channel_1,
|
|
user: current_user,
|
|
thread: thread_1,
|
|
data: {
|
|
message: "draft",
|
|
uploads: [upload_1],
|
|
},
|
|
)
|
|
end
|
|
|
|
it "loads the draft with the upload" do
|
|
chat_page.visit_thread(thread_1)
|
|
|
|
expect(thread_page.composer.value).to eq("draft")
|
|
expect(page).to have_selector(".chat-composer-upload--image", count: 1)
|
|
end
|
|
end
|
|
end
|
|
end
|