A platform for community discussion. Free, open, simple.
FIX: composer rollback on failed post update (#39071)
David Battersbya1640393224e
diff --git a/frontend/discourse/app/models/composer.js b/frontend/discourse/app/models/composer.jsindex d67252d1f74..fb6631bf7d2 100644--- a/frontend/discourse/app/models/composer.js+++ b/frontend/discourse/app/models/composer.js@@ -1119,7 +1119,7 @@ export default class Composer extends RestModel {}const rollback = throwAjaxError((error) => {- post.setProperties("cooked", oldCooked);+ post.setProperties({ cooked: oldCooked });this.set("composeState", OPEN);if (error.jqXHR && error.jqXHR.status === 409) {this.set("editConflict", true);diff --git a/frontend/discourse/tests/unit/models/composer-test.js b/frontend/discourse/tests/unit/models/composer-test.jsindex 3f0cb2a9d6a..e679394bf95 100644--- a/frontend/discourse/tests/unit/models/composer-test.js+++ b/frontend/discourse/tests/unit/models/composer-test.js@@ -559,4 +559,27 @@ module("Unit | Model | composer", function (hooks) {"shows category chooser when lazy_load_categories is enabled even with no categories loaded");});++ test("editPost rolls back state on save failure", async function (assert) {+ const store = getOwner(this).lookup("service:store");+ const post = store.createRecord("post", {+ id: 123,+ post_number: 2,+ cooked: "<p>original content</p>",+ });++ const composer = createComposer.call(this, {+ action: EDIT,+ post,+ reply: "this will 409",+ topic: store.createRecord("topic", { id: 456 }),+ });++ await assert.rejects(composer.editPost({}));++ assert.strictEqual(post.cooked, "<p>original content</p>");+ assert.false(post.staged);+ assert.strictEqual(composer.composeState, "open");+ assert.true(composer.editConflict);+ });});