From cd09095309eb1c1e9788c9b685a84e050d820550 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Fri, 9 May 2025 15:36:28 +0400
Subject: [PATCH 1/8] FIX: resolve discard draft keep editing

---
 .../app/components/modal/discard-draft.gjs    |  8 ++++-
 .../discourse/app/services/composer.js        |  1 +
 spec/system/composer/discard_draft_spec.rb    | 30 +++++++++++++++++++
 .../page_objects/components/composer.rb       |  5 ++++
 .../page_objects/modals/discard_draft.rb      |  4 +++
 5 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs b/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
index 10acf7e6d958a..5e8da22f08733 100644
--- a/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
@@ -17,6 +17,12 @@ export default class DiscardDraftModal extends Component {
     this.args.closeModal();
   }
 
+  @action
+  async keepEditing() {
+    this.args.model.onKeepEditing();
+    this.args.closeModal();
+  }
+
   <template>
     <DModal
       @closeModal={{@closeModal}}
@@ -45,7 +51,7 @@ export default class DiscardDraftModal extends Component {
         {{/if}}
         <DButton
           @label="post.cancel_composer.keep_editing"
-          @action={{@closeModal}}
+          @action={{this.keepEditing}}
           class="keep-editing"
         />
       </:footer>
diff --git a/app/assets/javascripts/discourse/app/services/composer.js b/app/assets/javascripts/discourse/app/services/composer.js
index 02723a1d283e3..3839d70b803f4 100644
--- a/app/assets/javascripts/discourse/app/services/composer.js
+++ b/app/assets/javascripts/discourse/app/services/composer.js
@@ -1643,6 +1643,7 @@ export default class ComposerService extends Service {
               this.appEvents.trigger("composer:cancelled");
               return resolve();
             },
+            onKeepEditing: () => resolve(),
           },
         });
       } else {
diff --git a/spec/system/composer/discard_draft_spec.rb b/spec/system/composer/discard_draft_spec.rb
index da7e36451666e..94677f8a79f91 100644
--- a/spec/system/composer/discard_draft_spec.rb
+++ b/spec/system/composer/discard_draft_spec.rb
@@ -94,4 +94,34 @@
       wait_for(timeout: 5) { Draft.count == 0 }
     end
   end
+
+  context "when clicking keep editing" do
+    fab!(:post_1) { Fabricate(:post, topic:, user: admin) }
+    let(:dialog) { PageObjects::Components::Dialog.new }
+
+    it "saves further changes made to draft" do
+      topic_page.visit_topic(post_1.topic)
+      topic_page.click_post_action_button(post_1, :edit)
+
+      composer.fill_content(" with")
+      composer.close
+
+      expect(discard_draft_modal).to be_open
+
+      discard_draft_modal.click_keep_editing
+
+      expect(discard_draft_modal).to be_closed
+
+      composer.fill_content(" latest updates")
+
+      composer.minimize
+
+      # reload the page to see if current draft reflects the changes
+      topic_page.visit_topic(post_1.topic)
+      topic_page.click_post_action_button(post_1, :edit)
+
+      expect(composer).to be_opened
+      expect(composer).to have_content("with latest updates")
+    end
+  end
 end
diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index 54b106265ff48..15be1ca87e7d6 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -66,6 +66,11 @@ def minimize
         self
       end
 
+      def maximize
+        find("#{COMPOSER_ID} .toggle-fullscreen").click
+        self
+      end
+
       def append_content(content)
         current_content = composer_input.value
         composer_input.set(current_content + content)
diff --git a/spec/system/page_objects/modals/discard_draft.rb b/spec/system/page_objects/modals/discard_draft.rb
index 0800e45d07355..ac81d54305d7d 100644
--- a/spec/system/page_objects/modals/discard_draft.rb
+++ b/spec/system/page_objects/modals/discard_draft.rb
@@ -19,6 +19,10 @@ def click_save
       def click_discard
         footer.find("button.discard-draft").click
       end
+
+      def click_keep_editing
+        footer.find("button.keep-editing").click
+      end
     end
   end
 end

From ec7c17f9d2961cf40ff51e05e24c67a7ef8d6814 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Fri, 9 May 2025 15:37:52 +0400
Subject: [PATCH 2/8] update tests

---
 spec/system/page_objects/components/composer.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index 15be1ca87e7d6..54b106265ff48 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -66,11 +66,6 @@ def minimize
         self
       end
 
-      def maximize
-        find("#{COMPOSER_ID} .toggle-fullscreen").click
-        self
-      end
-
       def append_content(content)
         current_content = composer_input.value
         composer_input.set(current_content + content)

From 1fda5fed28b3a3c784bd698136c193c00ce4b653 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Tue, 13 May 2025 16:07:27 +0400
Subject: [PATCH 3/8] only retry opening composer when saving or discarding
 from modal

---
 .../discourse/app/components/modal/discard-draft.gjs |  2 +-
 .../javascripts/discourse/app/services/composer.js   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs b/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
index 5e8da22f08733..ebe53d94f2c7a 100644
--- a/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
@@ -19,7 +19,7 @@ export default class DiscardDraftModal extends Component {
 
   @action
   async keepEditing() {
-    this.args.model.onKeepEditing();
+    await this.args.model.onKeepEditing();
     this.args.closeModal();
   }
 
diff --git a/app/assets/javascripts/discourse/app/services/composer.js b/app/assets/javascripts/discourse/app/services/composer.js
index 3839d70b803f4..38608deec0a8d 100644
--- a/app/assets/javascripts/discourse/app/services/composer.js
+++ b/app/assets/javascripts/discourse/app/services/composer.js
@@ -1448,8 +1448,10 @@ export default class ComposerService extends Service {
           }
         }
 
-        await this.cancelComposer(opts);
-        await this.open(opts);
+        const retry = await this.cancelComposer(opts);
+        if (retry) {
+          await this.open(opts);
+        }
         return;
       }
 
@@ -1633,7 +1635,7 @@ export default class ComposerService extends Service {
                 })
                 .finally(() => {
                   this.appEvents.trigger("composer:cancelled");
-                  resolve();
+                  resolve(true);
                 });
             },
             onSaveDraft: () => {
@@ -1641,9 +1643,9 @@ export default class ComposerService extends Service {
               this.model.clearState();
               this.close();
               this.appEvents.trigger("composer:cancelled");
-              return resolve();
+              return resolve(true);
             },
-            onKeepEditing: () => resolve(),
+            onKeepEditing: () => resolve(false),
           },
         });
       } else {

From 8031185f91e8075232a690bb552c21d1f273c342 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Tue, 13 May 2025 17:05:43 +0400
Subject: [PATCH 4/8] update system test to wait for draft to save

---
 spec/system/composer/discard_draft_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/composer/discard_draft_spec.rb b/spec/system/composer/discard_draft_spec.rb
index 94677f8a79f91..0d3e1e623ef6e 100644
--- a/spec/system/composer/discard_draft_spec.rb
+++ b/spec/system/composer/discard_draft_spec.rb
@@ -114,7 +114,7 @@
 
       composer.fill_content(" latest updates")
 
-      composer.minimize
+      wait_for(timeout: 5) { Draft.count == 1 }
 
       # reload the page to see if current draft reflects the changes
       topic_page.visit_topic(post_1.topic)

From 7a314a6802ad697971193bc371f1933f60d28ca7 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Tue, 13 May 2025 18:35:47 +0400
Subject: [PATCH 5/8] switch to frontend test

---
 .../tests/acceptance/composer-test.js         | 51 +++++++++++++++++++
 spec/system/composer/discard_draft_spec.rb    | 30 -----------
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index c036e67c974d3..0ca4ee514b366 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -461,6 +461,57 @@ import { i18n } from "discourse-i18n";
           .hasNoValue("discards draft and reset composer textarea");
       });
 
+      test("Autosaves drafts after clicking keep editing in discard modal", async function (assert) {
+        const saveDraftStub = sinon.stub();
+
+        pretender.post("/drafts.json", function () {
+          saveDraftStub();
+          return response(200, {});
+        });
+
+        await visit("/t/internationalization-localization/280");
+
+        await click("#topic-footer-buttons .btn.create");
+
+        await fillIn(
+          ".d-editor-input",
+          "this is draft content of the reply",
+          "fills in the composer"
+        );
+
+        assert.true(saveDraftStub.calledOnce, "first draft is auto saved");
+
+        await click("#reply-control button.cancel");
+
+        assert
+          .dom(".discard-draft-modal.modal")
+          .exists("pops up the discard drafts modal");
+
+        await click(".d-modal__footer button.keep-editing");
+        assert.dom(".discard-draft-modal.modal").doesNotExist("hides modal");
+
+        assert
+          .dom(".d-editor-input")
+          .hasValue(
+            "this is draft content of the reply",
+            "composer has the content of the first draft"
+          );
+
+        await fillIn(
+          ".d-editor-input",
+          "this is the updated content of the reply",
+          "update content in the composer"
+        );
+
+        assert.true(saveDraftStub.calledTwice, "second draft is saved");
+
+        await click("#reply-control button.create");
+
+        assert
+          .dom(".topic-post:last-of-type .cooked p")
+          .hasText("this is the updated content of the reply");
+      });
+
       test("Create an enqueued Reply", async function (assert) {
         pretender.post("/posts", function () {
           return response(200, {
diff --git a/spec/system/composer/discard_draft_spec.rb b/spec/system/composer/discard_draft_spec.rb
index 0d3e1e623ef6e..da7e36451666e 100644
--- a/spec/system/composer/discard_draft_spec.rb
+++ b/spec/system/composer/discard_draft_spec.rb
@@ -94,34 +94,4 @@
       wait_for(timeout: 5) { Draft.count == 0 }
     end
   end
-
-  context "when clicking keep editing" do
-    fab!(:post_1) { Fabricate(:post, topic:, user: admin) }
-    let(:dialog) { PageObjects::Components::Dialog.new }
-
-    it "saves further changes made to draft" do
-      topic_page.visit_topic(post_1.topic)
-      topic_page.click_post_action_button(post_1, :edit)
-
-      composer.fill_content(" with")
-      composer.close
-
-      expect(discard_draft_modal).to be_open
-
-      discard_draft_modal.click_keep_editing
-
-      expect(discard_draft_modal).to be_closed
-
-      composer.fill_content(" latest updates")
-
-      wait_for(timeout: 5) { Draft.count == 1 }
-
-      # reload the page to see if current draft reflects the changes
-      topic_page.visit_topic(post_1.topic)
-      topic_page.click_post_action_button(post_1, :edit)
-
-      expect(composer).to be_opened
-      expect(composer).to have_content("with latest updates")
-    end
-  end
 end

From 0e68b24fb9abda00d8e1c3e4cf207ebb909f2c5a Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Wed, 14 May 2025 11:32:39 +0400
Subject: [PATCH 6/8] update test

---
 .../discourse/tests/acceptance/composer-test.js           | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 0ca4ee514b366..b43484b7a9a28 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -462,10 +462,8 @@ import { i18n } from "discourse-i18n";
       });
 
       test("Autosaves drafts after clicking keep editing in discard modal", async function (assert) {
-        const saveDraftStub = sinon.stub();
-
         pretender.post("/drafts.json", function () {
-          saveDraftStub();
+          assert.step("saveDraft");
           return response(200, {});
         });
 
@@ -479,7 +477,7 @@ import { i18n } from "discourse-i18n";
           "fills in the composer"
         );
 
-        assert.true(saveDraftStub.calledOnce, "first draft is auto saved");
+        assert.verifySteps(["saveDraft"], "first draft is auto saved");
 
         await click("#reply-control button.cancel");
 
@@ -503,7 +501,7 @@ import { i18n } from "discourse-i18n";
           "update content in the composer"
         );
 
-        assert.true(saveDraftStub.calledTwice, "second draft is saved");
+        assert.verifySteps(["saveDraft"], "second draft is saved");
 
         await click("#reply-control button.create");
 

From c9c0df4f3f2169b748e24b6cec9e98a1d5edc5fc Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Mon, 26 May 2025 15:01:39 +0400
Subject: [PATCH 7/8] remove redundant modal method

---
 spec/system/page_objects/modals/discard_draft.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spec/system/page_objects/modals/discard_draft.rb b/spec/system/page_objects/modals/discard_draft.rb
index ac81d54305d7d..0800e45d07355 100644
--- a/spec/system/page_objects/modals/discard_draft.rb
+++ b/spec/system/page_objects/modals/discard_draft.rb
@@ -19,10 +19,6 @@ def click_save
       def click_discard
         footer.find("button.discard-draft").click
       end
-
-      def click_keep_editing
-        footer.find("button.keep-editing").click
-      end
     end
   end
 end

From a214fd7e4508c4d2e7c6955e9ebd6626ea181f82 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Mon, 26 May 2025 16:50:08 +0400
Subject: [PATCH 8/8] update tests

---
 .../javascripts/discourse/tests/acceptance/composer-test.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index b43484b7a9a28..375a37a416414 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -471,11 +471,7 @@ import { i18n } from "discourse-i18n";
 
         await click("#topic-footer-buttons .btn.create");
 
-        await fillIn(
-          ".d-editor-input",
-          "this is draft content of the reply",
-          "fills in the composer"
-        );
+        await fillIn(".d-editor-input", "this is draft content of the reply");
 
         assert.verifySteps(["saveDraft"], "first draft is auto saved");