Skip to content

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

FEATURE: Make can_permanently_delete visible with strong safeguards (#39179)

Régis HANOLd56fca0fd793
diff --git a/app/assets/stylesheets/common/base/dialog.scss b/app/assets/stylesheets/common/base/dialog.scss
index 65b0746ea53..d064191e390 100644
--- a/app/assets/stylesheets/common/base/dialog.scss
+++ b/app/assets/stylesheets/common/base/dialog.scss
@@ -84,6 +84,95 @@
}
}
+.permanently-delete-confirm {
+ .dialog-content {
+ min-width: 25vw;
+ width: 25vw;
+ }
+
+ &.--fire-easter-egg-dialog {
+ .dialog-content {
+ background-color: transparent;
+ color: white;
+
+ .confirmation-phrase {
+ z-index: 100000;
+ }
+ }
+ }
+
+ &__message {
+ margin-bottom: var(--space-4);
+ }
+
+ &__instruction {
+ display: flex;
+ flex-direction: column;
+ gap: 0.5em;
+
+ .confirmation-phrase {
+ width: 100%;
+ margin: 0;
+ }
+ }
+
+ --glitter: url("/images/firenoise.png");
+
+ .fire-easter-egg::before,
+ .fire-easter-egg::after {
+ content: "";
+ position: absolute;
+ inset: 0;
+ }
+
+ .fire-easter-egg::before {
+ content: "";
+ background-image:
+ var(--glitter), var(--glitter),
+ linear-gradient(
+ 0deg,
+ white 0,
+ #ff8951 5px,
+ #dcbc169c 30%,
+ transparent 70%
+ ),
+ radial-gradient(ellipse at bottom, transparent 30%, black 60%);
+ background-size:
+ 350px 500px,
+ 400px 650px,
+ 100% 100%,
+ 100% 100%;
+ background-blend-mode: hard-light, color-dodge, multiply;
+ background-position:
+ 0 0,
+ 0 0,
+ var(--gradientPos);
+ background-repeat: repeat, repeat, repeat, no-repeat;
+ mix-blend-mode: color-dodge;
+ filter: brightness(3.7) blur(7px) contrast(6);
+ animation: fire-easter-egg 1.75s linear infinite;
+ box-shadow: inset 0 -40px 50px -60px #63bbc5;
+ }
+
+ @keyframes fire-easter-egg {
+ 0% {
+ background-position:
+ center 0,
+ center 0,
+ 50% 100%,
+ center center;
+ }
+
+ 100% {
+ background-position:
+ center -500px,
+ center -650px,
+ 50% 100%,
+ center center;
+ }
+ }
+}
+
.dialog-footer {
display: flex;
flex-wrap: wrap;
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 4ad243481f0..c64a83d45f9 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -510,6 +510,18 @@ class PostsController < ApplicationController
render body: nil
end
+ def permanently_delete_check
+ post = find_post_from_params
+ obj = post.is_first_post? ? post.topic : post
+
+ if guardian.can_permanently_delete?(obj)
+ render json: { can_permanently_delete: true }
+ else
+ reason = obj.cannot_permanently_delete_reason(current_user)
+ render json: { can_permanently_delete: false, reason: }
+ end
+ end
+
def permanently_delete_revisions
guardian.ensure_can_permanently_delete_post_revisions!
diff --git a/app/models/topic.rb b/app/models/topic.rb
index b4c24a0e7d3..4e5f17068a5 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -2117,18 +2117,14 @@ class Topic < ActiveRecord::Base
).performed!
end
- def cannot_permanently_delete_reason(user)
- all_posts_count =
- Post
- .with_deleted
- .where(topic_id: self.id)
- .where(
- post_type: [Post.types[:regular], Post.types[:moderator_action], Post.types[:whisper]],
- )
- .count
+ def deletable_posts_count
+ Post.with_deleted.where(topic_id: self.id).where.not(post_type: Post.types[:small_action]).count
+ end
- if posts_count > 0 || all_posts_count > 1
- I18n.t("post.cannot_permanently_delete.many_posts")
+ def cannot_permanently_delete_reason(user)
+ remaining = deletable_posts_count - 1
+ if posts_count > 0 || remaining > 0
+ I18n.t("post.cannot_permanently_delete.many_posts", count: remaining)
elsif self.deleted_by_id == user&.id && self.deleted_at >= Post::PERMANENT_DELETE_TIMER.ago
time_left =
RateLimiter.time_left(
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 50197124456..fc2b2896cc4 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3659,6 +3659,11 @@ en:
not_logged_in_user: "user page with summary of current activity and preferences"
current_user: "go to your user page"
view_all: "view all %{tab}"
+ permanently_delete:
+ title: "Are you absolutely sure?"
+ confirm_instruction: "Please type <b>%{phrase}</b> below to confirm:"
+ controls:
+ delete: "I understand the consequences, permanently delete"
user_menu:
generic_no_items: "There are no items in this list."
sr_menu_tabs: "User menu tabs"
@@ -4595,8 +4600,10 @@ en:
just_the_post: "No, just this post"
admin: "post admin actions"
admin_action: "Admin"
- permanently_delete: "Permanently Delete"
- permanently_delete_confirmation: "Are you sure you permanently want to delete this post? You will not be able to recover it."
+ permanently_delete: "Permanently delete"
+ permanently_delete_post_confirmation: "This action <b>cannot</b> be undone. This will <b>permanently delete</b> this post and remove it from the database."
+ permanently_delete_topic_confirmation: "This action <b>cannot</b> be undone. This will <b>permanently delete</b> this topic and remove it from the database."
+ permanently_delete_confirm_phrase: "permanently delete"
wiki: "Make Wiki"
wiki_description: "let allowed groups edit this post"
unwiki: "Remove Wiki"
@@ -8923,6 +8930,9 @@ en:
clean_up_inactive_users_after_days:
prompt: "Setting this value to anything other than 0 will cause users who are no longer active for that many days to be permanently deleted. Are you sure you want to proceed?"
confirm: "Yes, I understand that inactive users will be permanently deleted unless I set this value to 0"
+ can_permanently_delete:
+ prompt: "Enabling this allows admins to permanently destroy posts, topics, and post revisions. Permanently deleted data cannot be recovered. This may also affect data integrity and break existing links."
+ confirm: "Yes, I understand permanently deleted data cannot be recovered"
job_status:
completed: "Update completed"
enqueued: "Update in progress"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2429d2642c7..357fd96bd90 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -927,7 +927,9 @@ en:
one: "%{count} Like"
other: "%{count} Likes"
cannot_permanently_delete:
- many_posts: "This topic has undeleted posts. Please permanently delete them before permanently deleting the topic."
+ many_posts:
+ one: "This topic still has %{count} post that needs to be permanently deleted before the topic itself can be permanently deleted."
+ other: "This topic still has %{count} posts that need to be permanently deleted before the topic itself can be permanently deleted."
wait_or_different_admin: "You must wait %{time_left} before permanently deleting this post or a different administrator must do it."
rate_limiter:
@@ -1949,6 +1951,7 @@ en:
content_security_policy_frame_ancestors: "Restrict who can embed this site in iframes via CSP. Control allowed hosts on <a href='%{base_path}/admin/customize/embedding'>Embedding</a>"
content_security_policy_script_src: "Additional allowlisted script sources. The current host and CDN are included by default. See <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigate XSS Attacks with Content Security Policy.</a> (CSP). Other host sources are ignored as strict-dynamic is enabled."
invalidate_inactive_admin_email_after_days: "Admin accounts that have not visited the site in this number of days will need to re-validate their email address before logging in. Set to 0 to disable."
+ can_permanently_delete: "Allow admins to permanently destroy posts, topics, and post revisions. Permanently deleted data is completely removed from the database and cannot be recovered."
suppress_secured_categories_from_admin: "Suppress private topics and PMs in some parts of UI for admins. Content will still be visible in some places. This is not a security feature: admins can always access all content on the site."
include_secure_categories_in_tag_counts: "When enabled, count of topics for a tag will include topics that are in read restricted categories for all users. When disabled, normal users are only shown a count of topics for a tag where all the topics are in public categories."
display_personal_messages_tag_counts: "When enabled, count of personal messages tagged with a given tag will be displayed."
diff --git a/config/routes.rb b/config/routes.rb
index f516cd2e3ca..05fd437bc07 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1272,6 +1272,8 @@ Discourse::Application.routes.draw do
put "revisions/:revision/show" => "posts#show_revision", :constraints => { revision: /\d+/ }
put "revisions/:revision/revert" => "posts#revert", :constraints => { revision: /\d+/ }
delete "revisions/permanently_delete" => "posts#permanently_delete_revisions"
+ get "permanently_delete_check" => "posts#permanently_delete_check",
+ :constraints => AdminConstraint.new
put "recover"
collection do
delete "destroy_many"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 091fa0a1a9c..2ecce012776 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2804,7 +2804,7 @@ security:
can_permanently_delete:
default: false
client: true
- hidden: true
+ requires_confirmation: "simple_on_enable"
suppress_secured_categories_from_admin:
default: false
include_secure_categories_in_tag_counts:
diff --git a/frontend/discourse/admin/lib/constants.js b/frontend/discourse/admin/lib/constants.js
index 5d0620382bf..7f5e443ed48 100644
--- a/frontend/discourse/admin/lib/constants.js
+++ b/frontend/discourse/admin/lib/constants.js
@@ -12,6 +12,7 @@ export const ADMIN_SEARCH_RESULT_TYPES = [
export const SITE_SETTING_REQUIRES_CONFIRMATION_TYPES = {
simple: "simple",
+ simple_on_enable: "simple_on_enable",
user_option: "user_option",
};
diff --git a/frontend/discourse/admin/models/site-setting.js b/frontend/discourse/admin/models/site-setting.js
index d804d1afc72..cf767ab7e5b 100644
--- a/frontend/discourse/admin/models/site-setting.js
+++ b/frontend/discourse/admin/models/site-setting.js
@@ -144,10 +144,16 @@ export default class SiteSetting extends EmberObject {
}
get requiresConfirmation() {
- return (
- this.requires_confirmation ===
- SITE_SETTING_REQUIRES_CONFIRMATION_TYPES.simple
- );
+ switch (this.requires_confirmation) {
+ case SITE_SETTING_REQUIRES_CONFIRMATION_TYPES.simple:
+ return true;
+ case SITE_SETTING_REQUIRES_CONFIRMATION_TYPES.simple_on_enable: {
+ const val = this.buffered?.get("value");
+ return val === true || val === "true";
+ }
+ default:
+ return false;
+ }
}
get requiresReload() {
diff --git a/frontend/discourse/app/components/dialog-messages/permanently-delete-confirm.gjs b/frontend/discourse/app/components/dialog-messages/permanently-delete-confirm.gjs
new file mode 100644
index 00000000000..9739a54a110
--- /dev/null
+++ b/frontend/discourse/app/components/dialog-messages/permanently-delete-confirm.gjs
@@ -0,0 +1,85 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import { trustHTML } from "@ember/template";
+import { i18n } from "discourse-i18n";
+
+export function buildPermanentlyDeleteConfirmDialogArgs(
+ message,
+ confirmPhrase,
+ didConfirm,
+ overrideOpts = {}
+) {
+ return {
+ title: overrideOpts.title || i18n("permanently_delete.title"),
+ class: overrideOpts.class || "permanently-delete-confirm",
+ bodyComponent: PermanentlyDeleteConfirm,
+ bodyComponentModel: {
+ message,
+ confirmPhrase,
+ },
+ confirmButtonLabel:
+ overrideOpts.confirmButtonLabel || "permanently_delete.controls.delete",
+ confirmButtonClass: "btn-danger",
+ confirmButtonDisabled: true,
+ didConfirm,
+ };
+}
+
+export default class PermanentlyDeleteConfirm extends Component {
+ @service dialog;
+
+ @tracked inputtedConfirmPhrase;
+
+ confirmPhrase = this.args.model.confirmPhrase.trim().toLocaleLowerCase();
+ originalDialogClass = this.dialog.class;
+
+ @action
+ onInput(event) {
+ this.inputtedConfirmPhrase = event.target.value.trim().toLocaleLowerCase();
+
+ this.dialog.set(
+ "confirmButtonDisabled",
+ this.inputtedConfirmPhrase !== this.confirmPhrase
+ );
+
+ if (this.showEasterEgg) {
+ this.dialog.set("class", this.dialog.class + " --fire-easter-egg-dialog");
+ } else {
+ this.dialog.set("class", this.originalDialogClass);
+ }
+ }
+
+ get showEasterEgg() {
+ return (
+ this.inputtedConfirmPhrase === this.confirmPhrase + " below to confirm"
+ );
+ }
+
+ <template>
+ <div class="permanently-delete-confirm__message">{{trustHTML
+ @model.message
+ }}</div>
+ <div class="permanently-delete-confirm__instruction">
+ <span>{{trustHTML
+ (i18n
+ "permanently_delete.confirm_instruction" [email protected]
+ )
+ }}</span>
+ <input
+ {{on "input" this.onInput}}
+ name="confirmationPhrase"
+ type="text"
+ class="confirmation-phrase"
+ placeholder={{@model.confirmPhrase}}
+ />
+
+ {{#if this.showEasterEgg}}
+ Comedian, eh?
+ <div class="fire-easter-egg"></div>
+ {{/if}}
+ </div>
+ </template>
+}
diff --git a/frontend/discourse/app/components/modal/history.gjs b/frontend/discourse/app/components/modal/history.gjs
index 02c921959df..f4164f0aa23 100644
--- a/frontend/discourse/app/components/modal/history.gjs
+++ b/frontend/discourse/app/components/modal/history.gjs
@@ -5,6 +5,7 @@ import { action } from "@ember/object";
import { service } from "@ember/service";
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
import DModal from "discourse/components/d-modal";
+import { buildPermanentlyDeleteConfirmDialogArgs } from "discourse/components/dialog-messages/permanently-delete-confirm";
import Revision from "discourse/components/modal/history/revision";
import Revisions from "discourse/components/modal/history/revisions";
import TopicFooter from "discourse/components/modal/history/topic-footer";
@@ -336,14 +337,18 @@ export default class History extends Component {
@action
permanentlyDeleteVersions() {
- this.dialog.yesNoConfirm({
- message: i18n("post.revisions.controls.destroy_confirm"),
- didConfirm: () => {
- Post.permanentlyDeleteRevisions(this.postRevision?.post_id).then(() => {
- this.args.closeModal();
- });
- },
- });
+ const postId = this.postRevision?.post_id;
+ this.args.closeModal();
+
+ this.dialog.confirm(
+ buildPermanentlyDeleteConfirmDialogArgs(
+ i18n("post.revisions.controls.destroy_confirm"),
+ i18n("post.controls.permanently_delete_confirm_phrase"),
+ () => {
+ Post.permanentlyDeleteRevisions(postId);
+ }
+ )
+ );
}
@action
diff --git a/frontend/discourse/app/controllers/topic.js b/frontend/discourse/app/controllers/topic.js
index ba4499506aa..2a3c46c1cc9 100644
--- a/frontend/discourse/app/controllers/topic.js
+++ b/frontend/discourse/app/controllers/topic.js
@@ -10,6 +10,7 @@ import { observes } from "@ember-decorators/object";
import BufferedProxy from "ember-buffered-proxy/proxy";
import { Promise } from "rsvp";
import DEditorOriginalTranslationPreview from "discourse/components/d-editor-original-translation-preview";
+import { buildPermanentlyDeleteConfirmDialogArgs } from "discourse/components/dialog-messages/permanently-delete-confirm";
import BookmarkModal from "discourse/components/modal/bookmark";
import ChangePostNoticeModal from "discourse/components/modal/change-post-notice";
import ConvertToPublicTopicModal from "discourse/components/modal/convert-to-public-topic";
@@ -999,13 +1000,31 @@ export default class TopicController extends Controller {
}
@action
- permanentlyDeletePost(post) {
- return this.dialog.yesNoConfirm({
- message: i18n("post.controls.permanently_delete_confirmation"),
- didConfirm: () => {
- this.send("deletePost", post, { force_destroy: true });
- },
- });
+ async permanentlyDeletePost(post) {
+ let result;
+ try {
+ result = await ajax(`/posts/${post.id}/permanently_delete_check.json`);
+ } catch (error) {
+ return popupAjaxError(error);
+ }
+
+ if (!result.can_permanently_delete) {
+ return this.dialog.alert(result.reason);
+ }
+
+ const message = post.firstPost
+ ? i18n("post.controls.permanently_delete_topic_confirmation")
+ : i18n("post.controls.permanently_delete_post_confirmation");
+
+ return this.dialog.confirm(
+ buildPermanentlyDeleteConfirmDialogArgs(
+ message,
+ i18n("post.controls.permanently_delete_confirm_phrase"),
+ () => {
+ this.send("deletePost", post, { force_destroy: true });
+ }
+ )
+ );
}
@action
diff --git a/frontend/discourse/tests/integration/components/dialog-holder-test.gjs b/frontend/discourse/tests/integration/components/dialog-holder-test.gjs
index 3c25ca7eeb0..aba220f377f 100644
--- a/frontend/discourse/tests/integration/components/dialog-holder-test.gjs
+++ b/frontend/discourse/tests/integration/components/dialog-holder-test.gjs
@@ -9,6 +9,7 @@ import {
} from "@ember/test-helpers";
import { module, test } from "qunit";
import GroupDeleteDialogMessage from "discourse/components/dialog-messages/group-delete";
+import PermanentlyDeleteConfirm from "discourse/components/dialog-messages/permanently-delete-confirm";
import SecondFactorConfirmPhrase from "discourse/components/dialog-messages/second-factor-confirm-phrase";
import DialogHolder from "discourse/dialog-holder/components/dialog-holder";
import { setupRenderingTest } from "discourse/tests/helpers/component-test";
@@ -310,6 +311,40 @@ module("Integration | Component | dialog-holder", function (hooks) {
assert.dom(".btn-danger").isEnabled();
});
+ test("permanently delete confirm with typed confirmation phrase", async function (assert) {
+ await render(<template><DialogHolder /></template>);
+
+ const confirmPhrase = i18n(
+ "post.controls.permanently_delete_confirm_phrase"
+ );
+
+ this.dialog.confirm({
+ bodyComponent: PermanentlyDeleteConfirm,
+ bodyComponentModel: {
+ message: "Are you sure?",
+ confirmPhrase: i18n("post.controls.permanently_delete_confirm_phrase"),
+ },
+ confirmButtonClass: "btn-danger",
+ confirmButtonDisabled: true,
+ });
+ await settled();
+
+ assert.dom(".dialog-body").includesText("Are you sure?");
+ assert.dom(".btn-danger").isDisabled();
+
+ await fillIn("input.confirmation-phrase", "wrong");
+ assert.dom(".btn-danger").isDisabled();
+
+ await fillIn("input.confirmation-phrase", confirmPhrase);
+ assert.dom(".btn-danger").isEnabled();
+
+ await fillIn("input.confirmation-phrase", confirmPhrase.toUpperCase());
+ assert.dom(".btn-danger").isEnabled();
+
+ await fillIn("input.confirmation-phrase", ` ${confirmPhrase} `);
+ assert.dom(".btn-danger").isEnabled();
+ });
+
test("delete confirm with a component and model", async function (assert) {
await render(<template><DialogHolder /></template>);
const message_count = 5;
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index c6507e702e5..6ca1a44886a 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -174,15 +174,7 @@ module TopicGuardian
# All other posts that were deleted still must be permanently deleted
# before the topic can be deleted with the exception of small action
# posts that will be deleted right before the topic is.
- all_posts_count =
- Post
- .with_deleted
- .where(topic_id: topic.id)
- .where(
- post_type: [Post.types[:regular], Post.types[:moderator_action], Post.types[:whisper]],
- )
- .count
- return false if all_posts_count > 1
+ return false if topic.deletable_posts_count > 1
return false if !is_admin? || !can_see_topic?(topic)
return false if !topic.deleted_at
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 9141c5cfb0e..b4a146898ac 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -33,7 +33,11 @@ class SiteSettings::TypeSupervisor
# For plugins, so they can tell if a feature is supported
SUPPORTED_TYPES = %i[email username list enum].freeze
- REQUIRES_CONFIRMATION_TYPES = { simple: "simple", user_option: "user_option" }.freeze
+ REQUIRES_CONFIRMATION_TYPES = {
+ simple: "simple",
+ simple_on_enable: "simple_on_enable",
+ user_option: "user_option",
+ }.freeze
def self.types
@types ||=
diff --git a/public/images/firenoise.png b/public/images/firenoise.png
new file mode 100644
index 00000000000..ac6bb960533
Binary files /dev/null and b/public/images/firenoise.png differ
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index f6f2206c3ef..838edd579d9 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -3741,12 +3741,12 @@ RSpec.describe Topic do
PostDestroyer.new(admin, post).destroy
expect(topic.reload.cannot_permanently_delete_reason(Fabricate(:admin))).to eq(
- I18n.t("post.cannot_permanently_delete.many_posts"),
+ I18n.t("post.cannot_permanently_delete.many_posts", count: 1),
)
PostDestroyer.new(admin, post_2.reload).destroy
expect(topic.reload.cannot_permanently_delete_reason(Fabricate(:admin))).to eq(
- I18n.t("post.cannot_permanently_delete.many_posts"),
+ I18n.t("post.cannot_permanently_delete.many_posts", count: 1),
)
PostDestroyer.new(admin, post_2.reload, force_destroy: true).destroy
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 9cffbb32e16..a2fb55b2835 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -2675,6 +2675,69 @@ RSpec.describe PostsController do
end
end
+ describe "#permanently_delete_check" do
+ fab!(:post)
+
+ before { SiteSetting.can_permanently_delete = true }
+
+ it "returns 404 for anonymous users" do
+ get "/posts/#{post.id}/permanently_delete_check.json"
+ expect(response.status).to eq(404)
+ end
+
+ it "returns 404 for regular users" do
+ sign_in(user)
+ get "/posts/#{post.id}/permanently_delete_check.json"
+ expect(response.status).to eq(404)
+ end
+
+ it "returns 404 for moderators" do
+ sign_in(moderator)
+ get "/posts/#{post.id}/permanently_delete_check.json"
+ expect(response.status).to eq(404)
+ end
+
+ context "when logged in as admin" do
+ before { sign_in(admin) }
+
+ it "returns can_permanently_delete true when allowed" do
+ PostDestroyer.new(Fabricate(:admin), post).destroy
+
+ get "/posts/#{post.id}/permanently_delete_check.json"
+
+ expect(response.status).to eq(200)
+ json = response.parsed_body
+ expect(json["can_permanently_delete"]).to eq(true)
+ expect(json["reason"]).to be_nil
+ end
+
+ it "returns the reason when the same admin must wait" do
+ PostDestroyer.new(admin, post).destroy
+
+ get "/posts/#{post.id}/permanently_delete_check.json"
+
+ expect(response.status).to eq(200)
+ json = response.parsed_body
+ expect(json["can_permanently_delete"]).to eq(false)
+ expect(json["reason"]).to eq(
+ I18n.t("post.cannot_permanently_delete.wait_or_different_admin", time_left: "5 minutes"),
+ )
+ end
+
+ it "returns the reason when topic has undeleted posts" do
+ Fabricate(:post, topic: post.topic)
+ PostDestroyer.new(Fabricate(:admin), post).destroy
+
+ get "/posts/#{post.id}/permanently_delete_check.json"
+
+ expect(response.status).to eq(200)
+ json = response.parsed_body
+ expect(json["can_permanently_delete"]).to eq(false)
+ expect(json["reason"]).to eq(I18n.t("post.cannot_permanently_delete.many_posts", count: 1))
+ end
+ end
+ end
+
describe "#permanently_delete_revisions" do
before { SiteSetting.can_permanently_delete = true }
diff --git a/spec/system/admin_site_setting_requires_confirmation_spec.rb b/spec/system/admin_site_setting_requires_confirmation_spec.rb
index 5c1a499f82b..0e974c93c4e 100644
--- a/spec/system/admin_site_setting_requires_confirmation_spec.rb
+++ b/spec/system/admin_site_setting_requires_confirmation_spec.rb
@@ -37,4 +37,24 @@ describe "Admin Site Setting Requires Confirmation" do
expect(dialog).to be_closed
expect(settings_page).to have_no_overridden_setting("min_password_length")
end
+
+ context "with simple_on_enable confirmation type" do
+ it "shows confirmation when enabling the setting" do
+ settings_page.visit("can_permanently_delete")
+ settings_page.toggle_bool_setting("can_permanently_delete")
+ expect(dialog).to be_open
+ expect(dialog).to have_content(
+ I18n.t(
+ "admin_js.admin.site_settings.requires_confirmation_messages.can_permanently_delete.prompt",
+ ),
+ )
+ end
+
+ it "does not show confirmation when disabling the setting" do
+ SiteSetting.can_permanently_delete = true
+ settings_page.visit("can_permanently_delete")
+ settings_page.toggle_bool_setting("can_permanently_delete")
+ expect(dialog).to be_closed
+ end
+ end
end
diff --git a/spec/system/page_objects/components/dialog.rb b/spec/system/page_objects/components/dialog.rb
index f22e9f1cecd..a1d9066a841 100644
--- a/spec/system/page_objects/components/dialog.rb
+++ b/spec/system/page_objects/components/dialog.rb
@@ -28,6 +28,18 @@ module PageObjects
def click_no
find(".dialog-footer .btn-default").click
end
+
+ def has_confirm_button_disabled?
+ has_css?(".dialog-footer .btn-danger[disabled]")
+ end
+
+ def has_no_confirm_button_disabled?
+ has_no_css?(".dialog-footer .btn-danger[disabled]")
+ end
+
+ def fill_in_confirmation_phrase(phrase)
+ find(".dialog-body input.confirmation-phrase").fill_in(with: phrase)
+ end
end
end
end
diff --git a/spec/system/page_objects/modals/post_history.rb b/spec/system/page_objects/modals/post_history.rb
index 48394c24f60..97d14878d73 100644
--- a/spec/system/page_objects/modals/post_history.rb
+++ b/spec/system/page_objects/modals/post_history.rb
@@ -22,6 +22,19 @@ module PageObjects
revision_numbers.find("strong:nth-child(3)")
end
+ def hide_revision
+ footer.find("button.hide-revision").click
+ self
+ end
+
+ def destroy_revisions
+ footer.find("button.destroy-revision").click
+ end
+
+ def has_destroy_revisions_button?
+ footer.has_css?("button.destroy-revision")
+ end
+
def has_tag_changes?
body.has_css?(".-tag-revisions")
end
diff --git a/spec/system/page_objects/pages/admin_site_settings.rb b/spec/system/page_objects/pages/admin_site_settings.rb
index 0165dbb396b..d74d94f42d7 100644
--- a/spec/system/page_objects/pages/admin_site_settings.rb
+++ b/spec/system/page_objects/pages/admin_site_settings.rb
@@ -72,6 +72,12 @@ module PageObjects
save_setting(setting)
end
+ def toggle_bool_setting(setting_name)
+ setting = find_setting(setting_name)
+ setting.find(".setting-value input[type='checkbox']").click
+ save_setting(setting)
+ end
+
def change_number_setting(setting_name, value, save_changes = true)
setting = find_setting(setting_name)
setting.fill_in(with: value)
diff --git a/spec/system/page_objects/pages/topic.rb b/spec/system/page_objects/pages/topic.rb
index 2faeb03a646..8ed0538dbef 100644
--- a/spec/system/page_objects/pages/topic.rb
+++ b/spec/system/page_objects/pages/topic.rb
@@ -185,11 +185,23 @@ module PageObjects
element_klass += " .grant-badge"
when :change_owner
element_klass += " .change-owner"
+ when :permanently_delete
+ element_klass += " .permanently-delete"
end
find(element_klass).click
end
+ def permanently_delete_post(post)
+ expand_post_actions(post)
+ expand_post_admin_actions(post)
+ click_post_admin_action_button(post, :permanently_delete)
+ end
+
+ def open_post_history(post)
+ post_by_number(post).find(".post-info.edits").click
+ end
+
def click_topic_bookmark_button
within_topic_footer_buttons { find(".bookmark-menu-trigger").click }
end
diff --git a/spec/system/permanently_delete_spec.rb b/spec/system/permanently_delete_spec.rb
new file mode 100644
index 00000000000..2eeb083a673
--- /dev/null
+++ b/spec/system/permanently_delete_spec.rb
@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+describe "Permanently delete" do
+ fab!(:admin)
+ fab!(:other_admin, :admin)
+ fab!(:topic)
+ fab!(:post) { Fabricate(:post, topic:) }
+
+ let(:topic_page) { PageObjects::Pages::Topic.new }
+ let(:dialog) { PageObjects::Components::Dialog.new }
+
+ let(:confirmation_phrase) { I18n.t("js.post.controls.permanently_delete_confirm_phrase") }
+
+ before { SiteSetting.can_permanently_delete = true }
+
+ context "when permanently deleting a post" do
+ before do
+ PostDestroyer.new(other_admin, post).destroy
+ sign_in(admin)
+ topic_page.visit_topic(topic)
+ expect(topic_page).to have_deleted_post(post)
+ end
+
+ it "permanently deletes the post after confirmation" do
+ topic_page.permanently_delete_post(post)
+ dialog.fill_in_confirmation_phrase(confirmation_phrase)
+ dialog.click_danger
+
+ expect(page).to have_no_css("#post_#{post.post_number}")
+ expect(Post.unscoped.exists?(post.id)).to eq(false)
+ end
+
+ it "does not delete the post when cancelling" do
+ topic_page.permanently_delete_post(post)
+ dialog.click_no
+
+ expect(dialog).to be_closed
+ expect(topic_page).to have_deleted_post(post)
+ expect(Post.unscoped.exists?(post.id)).to eq(true)
+ end
+ end
+
+ context "when the same admin tries to permanently delete too soon" do
+ before do
+ PostDestroyer.new(admin, post).destroy
+ sign_in(admin)
+ topic_page.visit_topic(topic)
+ expect(topic_page).to have_deleted_post(post)
+ end
+
+ it "shows a cooldown message instead of the confirmation dialog" do
+ topic_page.permanently_delete_post(post)
+
+ expect(dialog).to be_open
+ expect(dialog).to have_content("before permanently deleting this post")
+ dialog.click_ok
+ expect(Post.with_deleted.exists?(post.id)).to eq(true)
+ end
+ end
+
+ context "when permanently deleting a topic via first post" do
+ fab!(:first_post) { topic.first_post }
+
+ before do
+ PostDestroyer.new(other_admin, post).destroy
+ PostDestroyer.new(other_admin, first_post).destroy
+ sign_in(admin)
+ visit(topic.url)
+ end
+
+ it "permanently deletes the topic after confirmation" do
+ topic_page.permanently_delete_post(first_post)
+ dialog.fill_in_confirmation_phrase(confirmation_phrase)
+ dialog.click_danger
+
+ expect(page).to have_current_path("/")
+ expect(Topic.unscoped.exists?(topic.id)).to eq(false)
+ end
+ end
+
+ context "when permanently deleting post revisions" do
+ fab!(:post_with_revisions) { Fabricate(:post, topic:, user: admin, version: 2) }
+ fab!(:revision) do
+ Fabricate(
+ :post_revision,
+ post: post_with_revisions,
+ user: admin,
+ number: 2,
+ modifications: {
+ "raw" => %w[original edited],
+ },
+ )
+ end
+
+ let(:post_history_modal) { PageObjects::Modals::PostHistory.new }
+
+ before do
+ sign_in(admin)
+ topic_page.visit_topic(topic)
+ end
+
+ it "permanently deletes revisions after confirmation" do
+ revision_id = revision.id
+
+ topic_page.open_post_history(post_with_revisions)
+ expect(post_history_modal).to be_open
+
+ post_history_modal.hide_revision
+ expect(post_history_modal).to have_destroy_revisions_button
+ post_history_modal.destroy_revisions
+
+ expect(dialog).to be_open
+ dialog.fill_in_confirmation_phrase(confirmation_phrase)
+ dialog.click_danger
+
+ expect(page).to have_no_css("#post_#{post_with_revisions.post_number} .post-info.edits")
+ expect(PostRevision.exists?(revision_id)).to eq(false)
+ end
+ end
+end