Skip to content

A platform for community discussion. Free, open, simple.

FIX: Keep the flag pending when an "Edit post" review is cancelled

Régis Hanold2f441477ddb
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e7311b6afe1..f5048beae35 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -6291,8 +6291,8 @@ en:
complete: "Post hidden, user has been notified."
agree_and_edit:
title: "Edit post"
- description: "Agree with flag and open a composer window to edit the post."
- complete: "Flag acknowledged, you can now edit the post."
+ description: "Agree with flag once you save the edit."
+ complete: "Post edited and flag acknowledged."
delete:
title: "Delete"
complete: "Post deleted."
diff --git a/frontend/discourse/app/components/reviewable/item.gjs b/frontend/discourse/app/components/reviewable/item.gjs
index 0effdb51222..88b6c633cd3 100644
--- a/frontend/discourse/app/components/reviewable/item.gjs
+++ b/frontend/discourse/app/components/reviewable/item.gjs
@@ -475,11 +475,10 @@ export default class ReviewableItem extends Component {
draftKey: post.get("topic.draft_key"),
draftSequence: post.get("topic.draft_sequence"),
skipJumpOnSave: true,
+ onSaved: () => performAction().catch(popupAjaxError),
};
- this.composer.open(opts);
-
- return performAction();
+ return this.composer.open(opts);
}
_penalize(adminToolMethod, reviewable, performAction) {
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.js
index 710966dc596..f7b4f3c1146 100644
--- a/frontend/discourse/app/services/composer.js
+++ b/frontend/discourse/app/services/composer.js
@@ -137,6 +137,7 @@ export default class ComposerService extends Service {
topic = null;
linkLookup = null;
+ #onSaved = null;
@tracked _allowPreview = null;
@tracked _showPreview;
@@ -1487,6 +1488,8 @@ export default class ComposerService extends Service {
return DiscourseURL.routeTo(result.responseJson.route_to);
}
+ const onSaved = this.#onSaved;
+
this.close();
this.currentUser.set("any_posts", true);
@@ -1499,6 +1502,8 @@ export default class ComposerService extends Service {
skipIfOnScreen: true,
});
}
+
+ onSaved?.();
})
.catch((error) => {
composer.set("disableDrafts", false);
@@ -1604,6 +1609,7 @@ export default class ComposerService extends Service {
@param {Boolean} [opts.skipFormTemplate] Option to skip the form template even if configured for the category
@param {String} [opts.hijackPreview] Option to hijack the preview with a custom component, you must pass { component: CustomPreviewComponent, model: { ... } }
@param {String} [opts.selectedTranslationLocale] The locale to use for the translation
+ @param {Function} [opts.onSaved] Called once after this composer session is saved, never if it is closed, discarded or replaced.
**/
async open(opts = {}) {
if (!opts.draftKey) {
@@ -1718,6 +1724,8 @@ export default class ComposerService extends Service {
}
await this._setModel(composerModel, opts);
+
+ this.#onSaved = opts.onSaved ?? null;
} finally {
this.skipAutoSave = false;
this.appEvents.trigger("composer:open", { model: this.model });
@@ -2134,6 +2142,8 @@ export default class ComposerService extends Service {
this.set("formTemplateInitialValues", undefined);
this.composerActionState.clear();
+
+ this.#onSaved = null;
}
@computed("model.action")
diff --git a/spec/system/reviewables_spec.rb b/spec/system/reviewables_spec.rb
index 2f024da13cf..69c07a44933 100644
--- a/spec/system/reviewables_spec.rb
+++ b/spec/system/reviewables_spec.rb
@@ -24,6 +24,13 @@ describe "Reviewables" do
end
describe "reviewable actions" do
+ let(:discard_draft_modal) { PageObjects::Modals::DiscardDraft.new }
+
+ def open_agree_and_edit
+ PageObjects::Components::SelectKit.new(".dropdown-select-box.post-agree-and-hide").expand
+ find("[data-value='post-agree_and_edit']").click
+ end
+
it "should have agree_and_edit action" do
visit("/review")
select_kit =
@@ -33,17 +40,42 @@ describe "Reviewables" do
expect(select_kit).to have_option_value("post-agree_and_edit")
end
- it "agree_and_edit should open the composer" do
+ it "agree_and_edit does not touch the flag until the edit is saved" do
visit("/review")
- select_kit =
- PageObjects::Components::SelectKit.new(".dropdown-select-box.post-agree-and-hide")
- select_kit.expand
- find("[data-value='post-agree_and_edit']").click
+ open_agree_and_edit
+
+ expect(composer).to have_value(post.raw)
+ expect(review_page).to have_reviewable_with_pending_status(short_reviewable)
+
+ composer.fill_content("The moderator changed their mind about this.")
+ composer.discard
+
+ expect(discard_draft_modal).to be_open
+
+ discard_draft_modal.click_discard
+
+ expect(composer).to be_closed
+ expect(review_page).to have_reviewable_with_pending_status(short_reviewable)
+ expect(short_reviewable.reload).to be_pending
+ expect(post.reload.revisions.count).to eq(0)
+ end
+
+ it "agree_and_edit agrees with the flag once the edit is saved" do
+ visit("/review")
+
+ open_agree_and_edit
+
+ expect(composer).to have_value(post.raw)
+
+ composer.fill_content("This post has been edited by a moderator.")
+ composer.submit
- expect(composer).to be_opened
- expect(composer.composer_input.value).to eq(post.raw)
+ expect(composer).to be_closed
expect(toasts).to have_success(I18n.t("reviewables.actions.agree_and_edit.complete"))
+ expect(review_page).to have_reviewable_with_approved_status(short_reviewable)
+ expect(short_reviewable.reload).to be_approved
+ expect(post.reload.raw).to eq("This post has been edited by a moderator.")
end
it "should open a modal when suspending a user" do