From 6f56fba01666d3f157aa1307a95af3e440c237c3 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 23 Apr 2019 12:18:39 -0400
Subject: [PATCH] UX: Update post actions to "Approve Post" and "Reject Post"
This should be more clear.
---
app/controllers/queued_posts_controller.rb | 4 ++--
app/jobs/scheduled/auto_queue_handler.rb | 2 +-
app/models/reviewable_queued_post.rb | 20 ++++++++++++----
config/locales/server.en.yml | 4 ++++
spec/components/new_post_manager_spec.rb | 2 +-
spec/models/reviewable_queued_post_spec.rb | 24 ++++++++++----------
spec/models/reviewable_spec.rb | 8 +++----
spec/models/web_hook_spec.rb | 4 ++--
spec/requests/posts_controller_spec.rb | 2 +-
spec/requests/reviewables_controller_spec.rb | 2 +-
10 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb
index e2afe3d590c..d3ef8d2b9e8 100644
--- a/app/controllers/queued_posts_controller.rb
+++ b/app/controllers/queued_posts_controller.rb
@@ -37,9 +37,9 @@ class QueuedPostsController < ApplicationController
state = update_params[:state]
begin
if state == 'approved'
- reviewable.perform(current_user, :approve)
+ reviewable.perform(current_user, :approve_post)
elsif state == 'rejected'
- reviewable.perform(current_user, :reject)
+ reviewable.perform(current_user, :reject_post)
if update_params[:delete_user] == 'true' && guardian.can_delete_user?(reviewable.created_by)
UserDestroyer.new(current_user).destroy(reviewable.created_by, user_deletion_opts)
end
diff --git a/app/jobs/scheduled/auto_queue_handler.rb b/app/jobs/scheduled/auto_queue_handler.rb
index 46072b8698f..78d8a8af957 100644
--- a/app/jobs/scheduled/auto_queue_handler.rb
+++ b/app/jobs/scheduled/auto_queue_handler.rb
@@ -16,7 +16,7 @@ module Jobs
if reviewable.is_a?(ReviewableFlaggedPost)
reviewable.perform(Discourse.system_user, :ignore)
elsif reviewable.is_a?(ReviewableQueuedPost)
- reviewable.perform(Discourse.system_user, :reject)
+ reviewable.perform(Discourse.system_user, :reject_post)
elsif reviewable.is_a?(ReviewableUser)
reviewable.perform(Discourse.system_user, :reject_user_delete)
end
diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rb
index 289705b8152..1ab4dc2a5bf 100644
--- a/app/models/reviewable_queued_post.rb
+++ b/app/models/reviewable_queued_post.rb
@@ -10,8 +10,20 @@ class ReviewableQueuedPost < Reviewable
def build_actions(actions, guardian, args)
if guardian.is_staff?
- actions.add(:approve) unless approved?
- actions.add(:reject) unless rejected?
+
+ unless approved?
+ actions.add(:approve_post) do |a|
+ a.icon = 'check'
+ a.label = "reviewables.actions.approve_post.title"
+ end
+ end
+
+ unless rejected?
+ actions.add(:reject_post) do |a|
+ a.icon = 'times'
+ a.label = "reviewables.actions.reject_post.title"
+ end
+ end
if pending? && guardian.can_delete_user?(created_by)
actions.add(:delete_user) do |action|
@@ -46,7 +58,7 @@ class ReviewableQueuedPost < Reviewable
result
end
- def perform_approve(performed_by, args)
+ def perform_approve_post(performed_by, args)
created_post = nil
creator = PostCreator.new(created_by, create_options.merge(
@@ -83,7 +95,7 @@ class ReviewableQueuedPost < Reviewable
create_result(:success, :approved) { |result| result.created_post = created_post }
end
- def perform_reject(performed_by, args)
+ def perform_reject_post(performed_by, args)
# Backwards compatibility, new code should listen for `reviewable_transitioned_to`
DiscourseEvent.trigger(:rejected_post, self)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 86ade46efe7..c433b7fce7e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -4477,6 +4477,10 @@ en:
title: "Ignore"
approve:
title: "Approve"
+ approve_post:
+ title: "Approve Post"
+ reject_post:
+ title: "Reject Post"
approve_user:
title: "Approve User"
reject_user:
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index 837c81d0a9e..dd78f1831bd 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -294,7 +294,7 @@ describe NewPostManager do
expect(Reviewable.list_for(Discourse.system_user).count).to eq(1)
expect(@counter).to be(0)
- reviewable.perform(Discourse.system_user, :approve)
+ reviewable.perform(Discourse.system_user, :approve_post)
manager = NewPostManager.new(
topic.user,
diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rb
index a7c78f49900..1ab47bdea4e 100644
--- a/spec/models/reviewable_queued_post_spec.rb
+++ b/spec/models/reviewable_queued_post_spec.rb
@@ -35,16 +35,16 @@ RSpec.describe ReviewableQueuedPost, type: :model do
context "actions" do
- context "approve" do
+ context "approve_post" do
it 'triggers an extensibility event' do
- event = DiscourseEvent.track(:approved_post) { reviewable.perform(moderator, :approve) }
+ event = DiscourseEvent.track(:approved_post) { reviewable.perform(moderator, :approve_post) }
expect(event).to be_present
expect(event[:params].first).to eq(reviewable)
end
it "creates a post" do
topic_count, post_count = Topic.count, Post.count
- result = reviewable.perform(moderator, :approve)
+ result = reviewable.perform(moderator, :approve_post)
expect(result.success?).to eq(true)
expect(result.created_post).to be_present
expect(result.created_post).to be_valid
@@ -64,12 +64,12 @@ RSpec.describe ReviewableQueuedPost, type: :model do
expect(notifications).to be_present
# We can't approve twice
- expect(-> { reviewable.perform(moderator, :approve) }).to raise_error(Reviewable::InvalidAction)
+ expect(-> { reviewable.perform(moderator, :approve_post) }).to raise_error(Reviewable::InvalidAction)
end
it "skips validations" do
reviewable.payload['raw'] = 'x'
- result = reviewable.perform(moderator, :approve)
+ result = reviewable.perform(moderator, :approve_post)
expect(result.created_post).to be_present
end
@@ -82,28 +82,28 @@ RSpec.describe ReviewableQueuedPost, type: :model do
SiteSetting.num_users_to_silence_new_user = 1
expect(Guardian.new(newuser).can_create_post?(topic)).to eq(false)
- result = reviewable.perform(moderator, :approve)
+ result = reviewable.perform(moderator, :approve_post)
expect(result.success?).to eq(true)
end
end
- context "reject" do
+ context "reject_post" do
it 'triggers an extensibility event' do
- event = DiscourseEvent.track(:rejected_post) { reviewable.perform(moderator, :reject) }
+ event = DiscourseEvent.track(:rejected_post) { reviewable.perform(moderator, :reject_post) }
expect(event).to be_present
expect(event[:params].first).to eq(reviewable)
end
it "doesn't create a post" do
post_count = Post.count
- result = reviewable.perform(moderator, :reject)
+ result = reviewable.perform(moderator, :reject_post)
expect(result.success?).to eq(true)
expect(result.created_post).to be_nil
expect(Post.count).to eq(post_count)
# We can't reject twice
- expect(-> { reviewable.perform(moderator, :reject) }).to raise_error(Reviewable::InvalidAction)
+ expect(-> { reviewable.perform(moderator, :reject_post) }).to raise_error(Reviewable::InvalidAction)
end
end
@@ -147,7 +147,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do
it "creates the post and topic when approved" do
topic_count, post_count = Topic.count, Post.count
- result = reviewable.perform(moderator, :approve)
+ result = reviewable.perform(moderator, :approve_post)
expect(result.success?).to eq(true)
expect(result.created_post).to be_present
@@ -163,7 +163,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do
it "creates the post and topic when rejected" do
topic_count, post_count = Topic.count, Post.count
- result = reviewable.perform(moderator, :reject)
+ result = reviewable.perform(moderator, :reject_post)
expect(result.success?).to eq(true)
expect(result.created_post).to be_blank
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 777219db046..9155f8cf9a9 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -204,25 +204,25 @@ RSpec.describe Reviewable, type: :model do
it "triggers a notification on pending -> approve" do
reviewable = Fabricate(:reviewable_queued_post)
Jobs.expects(:enqueue).with(:notify_reviewable, has_key(:reviewable_id))
- reviewable.perform(moderator, :approve)
+ reviewable.perform(moderator, :approve_post)
end
it "triggers a notification on pending -> reject" do
reviewable = Fabricate(:reviewable_queued_post)
Jobs.expects(:enqueue).with(:notify_reviewable, has_key(:reviewable_id))
- reviewable.perform(moderator, :reject)
+ reviewable.perform(moderator, :reject_post)
end
it "doesn't trigger a notification on approve -> reject" do
reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:approved])
Jobs.expects(:enqueue).with(:notify_reviewable, has_key(:reviewable_id)).never
- reviewable.perform(moderator, :reject)
+ reviewable.perform(moderator, :reject_post)
end
it "doesn't trigger a notification on reject -> approve" do
reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:approved])
Jobs.expects(:enqueue).with(:notify_reviewable, has_key(:reviewable_id)).never
- reviewable.perform(moderator, :reject)
+ reviewable.perform(moderator, :reject_post)
end
end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index e2834b5b316..7444616e59a 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -491,14 +491,14 @@ describe WebHook do
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(reviewable.id)
- reviewable.perform(Discourse.system_user, :approve)
+ reviewable.perform(Discourse.system_user, :approve_post)
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("approved_post")
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(reviewable.id)
- reviewable.perform(Discourse.system_user, :reject)
+ reviewable.perform(Discourse.system_user, :reject_post)
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("rejected_post")
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 5a0ebd2c21e..d8e8b82e040 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -808,7 +808,7 @@ describe PostsController do
expect(parsed['pending_post']['raw']).to eq("this is the test content")
mod = Fabricate(:moderator)
- rp.perform(mod, :approve)
+ rp.perform(mod, :approve_post)
user.reload
expect(user).not_to be_silenced
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index e70551ce653..186c525a8e2 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -258,7 +258,7 @@ describe ReviewablesController do
it "can properly return errors" do
qp = Fabricate(:reviewable_queued_post_topic, topic_id: -100)
- put "/review/#{qp.id}/perform/approve.json?version=#{qp.version}"
+ put "/review/#{qp.id}/perform/approve_post.json?version=#{qp.version}"
expect(response.code).to eq("422")
result = ::JSON.parse(response.body)
expect(result['errors']).to be_present