A platform for community discussion. Free, open, simple.
FEATURE: Allow user to delete their pending topic/post at activity page (#41144)
small-lovely-cateed902a6502d
diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 26412724403..920d081d18b 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -940,6 +940,7 @@ en:help: "Remove this claim"awaiting_approval: "Awaiting Approval"delete: "Delete"+ delete_confirm: "Are you sure you want to delete this item from the review queue?"settings:saved: "Saved"save_changes: "Save Changes"diff --git a/frontend/discourse/app/controllers/user-activity/pending.js b/frontend/discourse/app/controllers/user-activity/pending.jsnew file mode 100644index 00000000000..d2b4e801929--- /dev/null+++ b/frontend/discourse/app/controllers/user-activity/pending.js@@ -0,0 +1,31 @@+import Controller, { inject as controller } from "@ember/controller";+import { action } from "@ember/object";+import { service } from "@ember/service";+import { ajax } from "discourse/lib/ajax";+import { popupAjaxError } from "discourse/lib/ajax-error";+import { removeValueFromArray } from "discourse/lib/array-tools";+import { i18n } from "discourse-i18n";++export default class UserActivityPendingController extends Controller {+ @service dialog;+ @controller user;++ get canDeletePending() {+ return this.user.viewingSelf;+ }++ @action+ deletePending(pending) {+ return this.dialog.deleteConfirm({+ message: i18n("review.delete_confirm"),+ didConfirm: async () => {+ try {+ await ajax(`/review/${pending.id}`, { type: "DELETE" });+ removeValueFromArray(this.model.content, pending);+ } catch (error) {+ popupAjaxError(error);+ }+ },+ });+ }+}diff --git a/frontend/discourse/app/templates/user-activity/pending.gjs b/frontend/discourse/app/templates/user-activity/pending.gjsindex ee3ac7dd67d..bea3662546d 100644--- a/frontend/discourse/app/templates/user-activity/pending.gjs+++ b/frontend/discourse/app/templates/user-activity/pending.gjs@@ -1,4 +1,6 @@+import { fn } from "@ember/helper";import PostList from "discourse/components/post-list/index";+import DButton from "discourse/ui-kit/d-button";export default <template><ul class="user-stream">@@ -8,6 +10,19 @@ export default <template>@showUserInfo={{false}}@additionalItemClasses="user-stream-item"class="user-stream"- />+ >+ <:belowPostItem as |pending|>+ {{#if @controller.canDeletePending}}+ <div class="reviewable-actions">+ <DButton+ @label="review.delete"+ @icon="trash-can"+ @action={{fn @controller.deletePending pending}}+ class="btn-danger"+ />+ </div>+ {{/if}}+ </:belowPostItem>+ </PostList></ul></template>diff --git a/frontend/discourse/tests/acceptance/pending-posts-test.js b/frontend/discourse/tests/acceptance/pending-posts-test.jsindex 00558b70109..6f5b155e8d1 100644--- a/frontend/discourse/tests/acceptance/pending-posts-test.js+++ b/frontend/discourse/tests/acceptance/pending-posts-test.js@@ -1,6 +1,7 @@import { click, visit } from "@ember/test-helpers";import { test } from "qunit";import { acceptance } from "discourse/tests/helpers/qunit-helpers";+import { i18n } from "discourse-i18n";acceptance("Pending posts - no existing pending posts", function (needs) {needs.user();@@ -14,11 +15,51 @@ acceptance("Pending posts - no existing pending posts", function (needs) {});acceptance("Pending posts - existing pending posts", function (needs) {- needs.user({ pending_posts_count: 2 });+ needs.user({ pending_posts_count: 3 });+ needs.pretender((server, helper) => {+ server.delete("/review/2", () => helper.response({ success: "OK" }));+ server.delete("/review/3", () => helper.response({ success: "OK" }));+ });test("Navigate to pending posts", async function (assert) {await visit("/u/eviltrout");await click("[href='/u/eviltrout/activity/pending']");+ assert.dom(".user-stream-item").exists({ count: 3 });+ assert+ .dom(".user-stream-item:nth-of-type(3)")+ .includesText("A queued topic");+ });++ test("Delete pending posts and topics", async function (assert) {+ await visit("/u/eviltrout/activity/pending");+ await click(".user-stream-item:nth-of-type(1) .btn-danger");++ assert.dom(".user-stream-item").exists({ count: 3 });+ assert.dom(".dialog-body").hasText(i18n("review.delete_confirm"));++ await click(".dialog-footer .btn-danger");+assert.dom(".user-stream-item").exists({ count: 2 });+ assert.dom(".user-stream-item").doesNotIncludeText("bold text");+ await click(".user-stream-item:nth-of-type(2) .btn-danger");++ assert.dom(".dialog-body").hasText(i18n("review.delete_confirm"));++ await click(".dialog-footer .btn-danger");++ assert.dom(".user-stream-item").exists({ count: 1 });+ assert.dom(".user-stream-item").doesNotIncludeText("A queued topic");+ });+});++acceptance("Pending posts - another user's pending posts", function (needs) {+ needs.user({ admin: true, username: "admin" });++ test("Delete actions are hidden", async function (assert) {+ await visit("/u/eviltrout/activity/pending");++ assert.dom(".user-stream-item").exists({ count: 3 });+ assert.dom(".user-stream-item .reviewable-actions").doesNotExist();+ assert.dom(".user-stream-item .btn-danger").doesNotExist();});});diff --git a/frontend/discourse/tests/fixtures/pending-posts.js b/frontend/discourse/tests/fixtures/pending-posts.jsindex c8637912ed8..f1ff9b123f1 100644--- a/frontend/discourse/tests/fixtures/pending-posts.js+++ b/frontend/discourse/tests/fixtures/pending-posts.js@@ -27,6 +27,19 @@ const pendingPostsFixtures = {topic_url: "/t/lorem-ipsum-dolor-sit-amet/130",username: "eviltrout",},+ {+ id: 3,+ avatar_template: "/user_avatar/localhost/eviltrout/{size}/5275.png",+ category_id: 2,+ created_at: "2021-10-19T08:38:35.110Z",+ created_by_id: 19,+ name: "Robin Ward",+ raw_text: "This pending topic will be moderated.",+ title: "A queued topic",+ topic_id: null,+ topic_url: null,+ username: "eviltrout",+ },],},};diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rbindex 9896d8e8240..9b83b73d905 100644--- a/spec/requests/reviewables_controller_spec.rb+++ b/spec/requests/reviewables_controller_spec.rb@@ -1106,6 +1106,16 @@ RSpec.describe ReviewablesController doexpect(queued_post.reload).to be_deletedend+ it "returns 200 if the user can delete their queued topic" do+ sign_in(user)+ queued_topic = Fabricate(:reviewable_queued_post_topic, target_created_by: user)++ delete "/review/#{queued_topic.id}.json"++ expect(response.code).to eq("200")+ expect(queued_topic.reload).to be_deleted+ end+it "denies attempts to destroy unowned reviewables" dosign_in(admin)queued_post = Fabricate(:reviewable_queued_post, target_created_by: user)@@ -1115,6 +1125,16 @@ RSpec.describe ReviewablesController doexpect(queued_post.reload).to be_presentend+ it "denies staff attempts to destroy another user's queued topic" do+ sign_in(admin)+ queued_topic = Fabricate(:reviewable_queued_post_topic, target_created_by: user)++ delete "/review/#{queued_topic.id}.json"++ expect(response.status).to eq(404)+ expect(queued_topic.reload).to be_present+ end+describe "via API" doit "admin can target another user with `username` param" doapi_key = Fabricate(:api_key, user: admin).key