A platform for community discussion. Free, open, simple.
FIX: Discard draft modal shown after submitting post for approval (#38870)
Régis Hanol768d90d2aa24
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.jsindex bac43361288..596ff24d068 100644--- a/frontend/discourse/app/services/composer.js+++ b/frontend/discourse/app/services/composer.js@@ -1209,7 +1209,7 @@ export default class ComposerService extends Service {if (result.responseJson.action === "enqueued") {this.postWasEnqueued(result.responseJson);if (result.responseJson.pending_post) {- let pendingPosts = this.topicController.model.pending_posts;+ let pendingPosts = this.topicController.model?.pending_posts;if (pendingPosts) {pendingPosts.push(result.responseJson.pending_post);}diff --git a/spec/system/composer/enqueued_post_draft_spec.rb b/spec/system/composer/enqueued_post_draft_spec.rbnew file mode 100644index 00000000000..be7fd237ae1--- /dev/null+++ b/spec/system/composer/enqueued_post_draft_spec.rb@@ -0,0 +1,38 @@+# frozen_string_literal: true++describe "Composer draft after enqueued post" do+ fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }++ let(:composer) { PageObjects::Components::Composer.new }+ let(:discard_draft_modal) { PageObjects::Modals::DiscardDraft.new }++ before { sign_in(current_user) }++ context "when creating a new topic that requires approval" do+ fab!(:category) { Fabricate(:category).tap { |c| c.update!(require_topic_approval: true) } }++ it "clears the draft and does not show the discard draft modal when reopening the composer" do+ visit "/latest"+ find("#create-topic").click+ expect(composer).to be_opened++ composer.fill_title("This is a test topic requiring approval")+ composer.fill_content("This is the body of a test topic that requires admin approval")+ composer.switch_category(category.name)++ composer.create++ expect(page).to have_css(".post-enqueued-modal")+ find(".post-enqueued-modal .btn-primary").click+ expect(page).to have_no_css(".post-enqueued-modal")+ expect(composer).to be_closed++ try_until_success { expect(Draft.where(user: current_user).count).to eq(0) }++ find("#create-topic").click++ expect(discard_draft_modal).to be_closed+ expect(composer).to be_opened+ end+ end+end