FIX: resolve discard draft keep editing (#32667)

dbattersby · web-flow · commit 804bdcfe5fba · 2025-05-26T17:40:28.000+04:00
Fixes a bug where clicking keep editing in the discard modal dialog
would result in the composer auto save being disabled. Because of this
updates to drafts after this point can easily be lost.

The issue was that the `cancelComposer` was not resolving the promise,
and therefore not setting `skipAutoSave` to false in the final step.

This change also includes another fix for an issue that was revealed
where the discard draft dialog would continually open again after we
close it. This would happen when editing a draft while viewing a
different topic. It wasn't noticed before as the `keep editing` button
would result in the code hanging at the `await
this.cancelComposer(opts)` stage and not opening the composer again for
the new topic reply.
diff --git 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() {
+    await 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
@@ -1442,8 +1442,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;
       }
 
@@ -1627,16 +1629,17 @@ export default class ComposerService extends Service {
                 })
                 .finally(() => {
                   this.appEvents.trigger("composer:cancelled");
-                  resolve();
+                  resolve(true);
                 });
             },
             onSaveDraft: () => {
               this._saveDraft();
               this.model.clearState();
               this.close();
               this.appEvents.trigger("composer:cancelled");
-              return resolve();
+              return resolve(true);
             },
+            onKeepEditing: () => resolve(false),
           },
         });
       } else {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -469,6 +469,51 @@ 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) {
+        pretender.post("/drafts.json", function () {
+          assert.step("saveDraft");
+          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");
+
+        assert.verifySteps(["saveDraft"], "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.verifySteps(["saveDraft"], "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, {
