A platform for community discussion. Free, open, simple.
FIX: Saving an edit on a reply can fail after expanding replies (#39919)
Régis Hanol350f81a4b945
diff --git a/frontend/discourse/app/services/store.js b/frontend/discourse/app/services/store.jsindex a34759b621d..5af5644fa12 100644--- a/frontend/discourse/app/services/store.js+++ b/frontend/discourse/app/services/store.js@@ -433,7 +433,10 @@ export default class StoreService extends Service {// If a property value is unchanged, remove it from the update listupdatedProperties &&Object.keys(updatedProperties).forEach((key) => {- if (existing[key] === updatedProperties[key]) {+ if (+ key.startsWith("__") ||+ existing[key] === updatedProperties[key]+ ) {delete updatedProperties[key];}});diff --git a/frontend/discourse/tests/unit/services/store-test.js b/frontend/discourse/tests/unit/services/store-test.jsindex 9f4e4e68b5e..0252cc40730 100644--- a/frontend/discourse/tests/unit/services/store-test.js+++ b/frontend/discourse/tests/unit/services/store-test.js@@ -27,6 +27,22 @@ module("Unit | Service | store", function (hooks) {assert.strictEqual(widget.id, undefined, "there is no id");});+ test("createRecord doesn't overwrite __-prefixed metadata", function (assert) {+ const store = getOwner(this).lookup("service:store");+ const widget = store.createRecord("widget", { id: 77, name: "first" });++ store.createRecord("widget", {+ id: 77,+ name: "second",+ __type: "evil",+ __plugin: "evil",+ });++ assert.strictEqual(widget.name, "second");+ assert.strictEqual(widget.__type, "widget");+ assert.strictEqual(widget.__plugin, undefined);+ });+test("createRecord doesn't modify the input `id` field", function (assert) {const store = getOwner(this).lookup("service:store");const widget = store.createRecord("widget", { id: 1, name: "hello" });diff --git a/spec/system/page_objects/components/post.rb b/spec/system/page_objects/components/post.rbindex 3617841daa6..8d603c69bcd 100644--- a/spec/system/page_objects/components/post.rb+++ b/spec/system/page_objects/components/post.rb@@ -24,6 +24,12 @@ module PageObjectspost.find(".show-replies").clickend+ def jump_to_reply(reply)+ find(+ "#embedded-posts__bottom--#{@post_number} .reply[data-post-id='#{reply.id}'] a.post-info.arrow",+ ).click+ end+def load_more_repliesfind("#embedded-posts__bottom--#{@post_number} .load-more-replies").clickenddiff --git a/spec/system/post_replies_spec.rb b/spec/system/post_replies_spec.rbindex d727e5a10e7..48ac9f5a0ef 100644--- a/spec/system/post_replies_spec.rb+++ b/spec/system/post_replies_spec.rb@@ -57,4 +57,31 @@ describe "Post replies" doexpect(third_chained_reply).to have_no_parent_post_content("reply 3")endend++ context "when editing a reply reached via expanded replies" do+ fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }+ fab!(:reply_1) { Fabricate(:post, topic:, reply_to_post_number: post.post_number) }+ fab!(:reply_2) { Fabricate(:post, topic:, reply_to_post_number: post.post_number) }++ let(:composer) { PageObjects::Components::Composer.new }+ let(:reply_1_post) { PageObjects::Components::Post.new(reply_1.post_number) }++ before do+ PostReply.create!(post:, reply: reply_1)+ PostReply.create!(post:, reply: reply_2)+ post.update!(reply_count: 2)+ end++ it "saves a no-op edit without errors" do+ sign_in(admin)+ visit(topic.url)++ first_post.show_replies+ first_post.jump_to_reply(reply_1)+ reply_1_post.edit+ composer.submit++ expect(page).to have_no_css(".dialog-body")+ end+ endend