diff --git a/app/controllers/moderation/bulk_controller.rb b/app/controllers/moderation/bulk_controller.rb deleted file mode 100644 index aa28b3213..000000000 --- a/app/controllers/moderation/bulk_controller.rb +++ /dev/null @@ -1,18 +0,0 @@ -class Moderation::BulkController < Moderation::BaseController - - def index - @debates = Debate.sort_for_moderation.page(params[:page]).per(100).includes(:author) - end - - def hide - debates = Debate.where(id: params[:debate_ids]) - if params[:commit] == t('moderation.bulk.index.hide_debates') - debates.each(&:hide) - elsif params[:commit] == t('moderation.bulk.index.block_authors') - debates.includes(:author).map(&:author).uniq.each(&:block) - end - - redirect_to action: :index - end - -end diff --git a/app/controllers/moderation/debates_controller.rb b/app/controllers/moderation/debates_controller.rb index c54851cb9..1fe3eb4b4 100644 --- a/app/controllers/moderation/debates_controller.rb +++ b/app/controllers/moderation/debates_controller.rb @@ -1,32 +1,43 @@ class Moderation::DebatesController < Moderation::BaseController has_filters %w{pending_flag_review all with_ignored_flag}, only: :index + has_orders %w{flags created_at}, only: :index - before_action :load_debates, only: :index + before_action :load_debates, only: [:index, :moderate] load_and_authorize_resource def index - @debates = @debates.send(@current_filter).page(params[:page]) + @debates = @debates.send(@current_filter) + .send("sort_by_#{@current_order}") + .page(params[:page]) + .per(50) end def hide @debate.hide end - def hide_in_moderation_screen - @debate.hide - redirect_to request.query_parameters.merge(action: :index) - end + def moderate + @debates = @debates.where(id: params[:debate_ids]) + + if params[:hide_debates].present? + @debates.accessible_by(current_ability, :hide).each(&:hide) + + elsif params[:ignore_flags].present? + @debates.accessible_by(current_ability, :ignore_flag).each(&:ignore_flag) + + elsif params[:block_authors].present? + author_ids = @debates.pluck(:author_id).uniq + User.where(id: author_ids).accessible_by(current_ability, :block).each(&:block) + end - def ignore_flag - @debate.ignore_flag redirect_to request.query_parameters.merge(action: :index) end private def load_debates - @debates = Debate.accessible_by(current_ability, :hide).flagged.sort_for_moderation + @debates = Debate.accessible_by(current_ability, :moderate) end end diff --git a/app/models/ability.rb b/app/models/ability.rb index 23c6f9f01..bbe59f736 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -65,6 +65,9 @@ class Ability can :ignore_flag, Debate, ignored_flag_at: nil, hidden_at: nil cannot :ignore_flag, Debate, author_id: user.id + can :moderate, Debate + cannot :moderate, Debate, author_id: user.id + can :hide, Proposal, hidden_at: nil cannot :hide, Proposal, author_id: user.id diff --git a/app/models/debate.rb b/app/models/debate.rb index 4785ab04f..d6483f0ad 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -25,13 +25,13 @@ class Debate < ActiveRecord::Base before_save :calculate_hot_score, :calculate_confidence_score - scope :sort_for_moderation, -> { order(flags_count: :desc, updated_at: :desc) } scope :for_render, -> { includes(:tags) } scope :sort_by_hot_score , -> { order(hot_score: :desc) } scope :sort_by_confidence_score , -> { order(confidence_score: :desc) } scope :sort_by_created_at, -> { order(created_at: :desc) } scope :sort_by_most_commented, -> { order(comments_count: :desc) } scope :sort_by_random, -> { order("RANDOM()") } + scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } # Ahoy setup visitable # Ahoy will automatically assign visit_id on create diff --git a/app/views/moderation/_menu.html.erb b/app/views/moderation/_menu.html.erb index 04bd02f4d..577b66342 100644 --- a/app/views/moderation/_menu.html.erb +++ b/app/views/moderation/_menu.html.erb @@ -31,12 +31,5 @@ <%= t("moderation.menu.users") %> <% end %> - -
  • > - <%= link_to moderation_bulk_path do %> - - <%= t("moderation.menu.bulk") %> - <% end %> -
    • diff --git a/app/views/moderation/bulk/index.html.erb b/app/views/moderation/bulk/index.html.erb deleted file mode 100644 index 5451d4b1c..000000000 --- a/app/views/moderation/bulk/index.html.erb +++ /dev/null @@ -1,46 +0,0 @@ -

    <%= t("moderation.bulk.index.title") %>

    - -

    <%= page_entries_info @debates %>

    - -<%= form_tag moderation_bulk_hide_path, method: :put do %> -

    - <%= t('moderation.bulk.index.check') %>: - <%= link_to t('moderation.bulk.index.check_all'), '#', data: {check_all: "debate_ids[]"} %> - | - <%= link_to t('moderation.bulk.index.check_none'), '#', data: {check_none: "debate_ids[]"} %> -

    - - - - - - - - <% @debates.each do |debate| %> - - - - - - <% end %> -
    - <%= t("moderation.bulk.index.headers.debate") %> - <%= t("moderation.bulk.index.headers.flags") %> - <%= t("moderation.bulk.index.headers.moderate") %> -
    - <%= link_to debate.title, debate, target: "_blank" %> -  •  - <%= debate.author.username %> -  •  - <%= l debate.updated_at.to_date %> -
    - <%= debate.description %> -     		<%= debate.flags_count %> - <%= check_box_tag "debate_ids[]", debate.id, nil, id: "#{dom_id(debate)}_check" %> -
    - - <%= submit_tag t('moderation.bulk.index.hide_debates'), class: "button radius", data: {confirm: t('moderation.bulk.index.confirm')} %> - <%= submit_tag t('moderation.bulk.index.block_authors'), class: "button radius", data: {confirm: t('moderation.bulk.index.confirm')} %> -<% end %> - -<%= paginate @debates %> diff --git a/app/views/moderation/comments/index.html.erb b/app/views/moderation/comments/index.html.erb index d18dca8e8..f19620842 100644 --- a/app/views/moderation/comments/index.html.erb +++ b/app/views/moderation/comments/index.html.erb @@ -13,7 +13,7 @@ <%= t("moderation.comments.index.headers.comment") %> <%= t("moderation.comments.index.headers.flags") %> - <%= t("moderation.debates.index.headers.actions") %> +   <% @comments.each do |comment| %> diff --git a/app/views/moderation/debates/index.html.erb b/app/views/moderation/debates/index.html.erb index 3fc3f402b..1de188144 100644 --- a/app/views/moderation/debates/index.html.erb +++ b/app/views/moderation/debates/index.html.erb @@ -2,43 +2,74 @@ <%= render 'shared/filter_subnav', i18n_namespace: "moderation.debates.index" %> -

    <%= page_entries_info @debates %>

    +
    +

    <%= page_entries_info @debates %>

    +
    +
    + <%= t("moderation.debates.index.order") %> + <%= render 'shared/order_selector', i18n_namespace: "moderation.debates.index" %> +
    +
    +
    - - - - - - - <% @debates.each do |debate| %> - - - - - <% if can? :ignore_flag, debate %> - - <% end %> - <% if debate.ignored_flag? %> - - <% end %> +<%= form_tag moderate_moderation_debates_path(request.query_parameters), method: :put do %> +

    + <%= t('shared.check') %>: + <%= link_to t('shared.check_all'), '#', data: {check_all: "debate_ids[]"} %> + | + <%= link_to t('shared.check_none'), '#', data: {check_none: "debate_ids[]"} %> +

    + +
    - <%= t("moderation.debates.index.headers.title") %> |  - <%= t("moderation.debates.index.headers.updated_at") %> |  - <%= t("moderation.debates.index.headers.description") %> - <%= t("moderation.debates.index.headers.flags") %><%= t("moderation.debates.index.headers.actions") %>
    - <%= link_to debate.title, debate, target: "_blank" %> -
    - <%= l debate.updated_at.to_date %> -
    - <%= debate.description %> -     		<%= debate.flags_count %> - <%= link_to t("moderation.debates.index.hide"), hide_in_moderation_screen_moderation_debate_path(debate, request.query_parameters), method: :put, class: "delete" %> - - <%= link_to t("moderation.debates.index.ignore_flag"), ignore_flag_moderation_debate_path(debate, request.query_parameters), method: :put, class: "button radius tiny warning" %> - - <%= t("moderation.debates.index.ignored_flag") %> -
    + + + - <% end %> -
    + <%= t("moderation.debates.index.headers.debate") %> + + <%= t("moderation.debates.index.headers.moderate") %> +
    + <% @debates.each do |debate| %> + + + <%= link_to debate.title, debate, target: "_blank" %> +
    + <%= l debate.updated_at.to_date %> +  •  + <%= debate.flags_count %> +  •  + <%= debate.author.username %> +
    +
    + <%= debate.description %> +
    + + + <%= check_box_tag "debate_ids[]", debate.id, nil, id: "#{dom_id(debate)}_check" %> + + + <% end %> + -<%= paginate @debates %> + <%= submit_tag t('moderation.debates.index.block_authors'), + name: "block_authors", + class: "button radius alert", + data: {confirm: t('moderation.debates.index.confirm')} + %> + +
    + <%= submit_tag t('moderation.debates.index.hide_debates'), + name: "hide_debates", + class: "button radius alert", + data: {confirm: t('moderation.debates.index.confirm')} + %> + <%= submit_tag t('moderation.debates.index.ignore_flags'), + name: "ignore_flags", + class: "button radius success", + data: {confirm: t('moderation.debates.index.confirm')} + %> +
    + + <%= paginate @debates %> + +<% end %> diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 496b202f7..87c735ce7 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -113,6 +113,8 @@ ignore_unused: - 'moderation.debates.index.filter*' - 'moderation.proposals.index.filter*' - 'moderation.proposals.index.order*' + - 'moderation.debates.index.filter*' + - 'moderation.debates.index.order*' - 'debates.index.orders.*' - 'debates.index.search_form.*' - 'proposals.index.orders.*' diff --git a/config/locales/moderation.en.yml b/config/locales/moderation.en.yml index 7a0d100d6..4dba3f21a 100644 --- a/config/locales/moderation.en.yml +++ b/config/locales/moderation.en.yml @@ -5,7 +5,6 @@ en: flagged_debates: Debates flagged_comments: Comments users: Ban users - bulk: Bulk moderation dashboard: index: title: Moderation @@ -28,21 +27,23 @@ en: with_ignored_flag: Ignored debates: index: - title: Debates flagged as inappropriate + hide_debates: Hide debates + block_authors: Block authors + ignore_flags: Ignore flags + title: Debates headers: - flags: Flags - updated_at: Date - title: Title - description: Description - actions: Actions - hide: Hide - ignore_flag: Ignore - ignored_flag: Ignored + debate: Debate + moderate: Moderate filter: Filter filters: all: All pending_flag_review: Pending with_ignored_flag: Ignored + order: Order + orders: + created_at: Newest + flags: Most flagged + confirm: Are you sure? proposals: index: hide_proposals: Hide proposals @@ -62,19 +63,6 @@ en: created_at: Newest flags: Most flagged confirm: Are you sure? - bulk: - index: - title: Bulk moderation - headers: - debate: Debate - flags: Denuncias - moderate: Moderar - hide_debates: Hide debates - block_authors: Block authors - confirm: Are you sure? - check: Select - check_all: All - check_none: None users: notice_hide: User banned. index: diff --git a/config/locales/moderation.es.yml b/config/locales/moderation.es.yml index 42dcb6da3..6f7a01bfa 100644 --- a/config/locales/moderation.es.yml +++ b/config/locales/moderation.es.yml @@ -5,7 +5,6 @@ es: flagged_debates: Debates flagged_comments: Comentarios users: Bloquear usuarios - bulk: Moderar en bloque dashboard: index: title: Moderación @@ -28,21 +27,23 @@ es: with_ignored_flag: Ignorados debates: index: - title: Debates denunciados como inapropiados + hide_debates: Ocultar debates + block_authors: Bloquear autores + ignore_flags: Marcar como revisados + title: Debates headers: - flags: Denuncias - updated_at: Fecha - title: Título - description: Descripción - actions: Acciones - hide: Ocultar - ignore_flag: Ignorar - ignored_flag: Ignorado + debate: Debate + moderate: Moderar filter: Filtrar filters: all: Todos pending_flag_review: Pendientes with_ignored_flag: Marcados como revisados + order: Orden + orders: + created_at: Más nuevos + flags: Más denunciados + confirm: ¿Estás seguro? proposals: index: hide_proposals: Ocultar Propuestas @@ -62,19 +63,6 @@ es: created_at: Más recientes flags: Más denunciadas confirm: ¿Estás seguro? - bulk: - index: - title: Moderar en bloque - headers: - debate: Debate - flags: Denuncias - moderate: Moderar - hide_debates: Ocultar debates - block_authors: Bloquear usuarios - confirm: ¿Estás seguro? - check: Seleccionar - check_all: Todos - check_none: Ninguno users: notice_hide: Usuario bloqueado. Se han ocultado todos sus debates y comentarios. index: diff --git a/config/routes.rb b/config/routes.rb index 2ad0d2199..63b67012e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -127,8 +127,9 @@ Rails.application.routes.draw do resources :debates, only: :index do member do put :hide - put :hide_in_moderation_screen - put :ignore_flag + end + collection do + put :moderate end end @@ -148,9 +149,6 @@ Rails.application.routes.draw do put :ignore_flag end end - - get '/bulk', to: "bulk#index" - put '/bulk/hide', to: "bulk#hide" end resource :stats, only: [:show] diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index 08ff1d8c1..32260992b 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -56,15 +56,15 @@ feature 'Debates' do login_as(author) visit new_debate_path - fill_in 'debate_title', with: 'End evictions' + fill_in 'debate_title', with: 'A title for a debate' fill_in 'debate_description', with: 'This is very important because...' fill_in 'debate_captcha', with: correct_captcha_text check 'debate_terms_of_service' click_button 'Start a debate' + expect(page).to have_content 'A title for a debate' expect(page).to have_content 'Debate was successfully created.' - expect(page).to have_content 'End evictions' expect(page).to have_content 'This is very important because...' expect(page).to have_content author.name expect(page).to have_content I18n.l(Debate.last.created_at.to_date) diff --git a/spec/features/moderation/bulk_spec.rb b/spec/features/moderation/bulk_spec.rb deleted file mode 100644 index fd3a408b3..000000000 --- a/spec/features/moderation/bulk_spec.rb +++ /dev/null @@ -1,52 +0,0 @@ -require 'rails_helper' - -feature 'Moderate in bulk' do - background do - moderator = create(:moderator) - login_as(moderator.user) - end - - feature "When a debate has been selected for moderation" do - background do - @debate = create(:debate) - visit moderation_bulk_path - - within("#debate_#{@debate.id}") do - check "debate_#{@debate.id}_check" - end - - expect(page).to_not have_css("debate_#{@debate.id}") - end - - scenario 'Hide the debate' do - click_on "Hide debates" - expect(page).to_not have_css("debate_#{@debate.id}") - expect(@debate.reload).to be_hidden - expect(@debate.author).to_not be_hidden - end - - scenario 'Block the author' do - click_on "Block authors" - expect(page).to_not have_css("debate_#{@debate.id}") - expect(@debate.reload).to be_hidden - expect(@debate.author).to be_hidden - end - end - - scenario "select all/none", :js do - create_list(:debate, 2) - - visit moderation_bulk_path - - click_on 'All' - all('input[type=checkbox]').each do |checkbox| - expect(checkbox).to be_checked - end - - click_on 'None' - all('input[type=checkbox]').each do |checkbox| - expect(checkbox).to_not be_checked - end - end - -end diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb index 1df1776c7..303950e45 100644 --- a/spec/features/moderation/debates_spec.rb +++ b/spec/features/moderation/debates_spec.rb @@ -36,13 +36,85 @@ feature 'Moderate debates' do end end - feature '/moderation/ menu' do + feature '/moderation/ screen' do background do moderator = create(:moderator) login_as(moderator.user) end + feature 'moderate in bulk' do + feature "When a debate has been selected for moderation" do + background do + @debate = create(:debate) + visit moderation_debates_path + within('.sub-nav') do + click_link "All" + end + + within("#debate_#{@debate.id}") do + check "debate_#{@debate.id}_check" + end + + expect(page).to_not have_css("debate_#{@debate.id}") + end + + scenario 'Hide the debate' do + click_on "Hide debates" + expect(page).to_not have_css("debate_#{@debate.id}") + expect(@debate.reload).to be_hidden + expect(@debate.author).to_not be_hidden + end + + scenario 'Block the author' do + click_on "Block authors" + expect(page).to_not have_css("debate_#{@debate.id}") + expect(@debate.reload).to be_hidden + expect(@debate.author).to be_hidden + end + + scenario 'Ignore the debate' do + click_on "Ignore flags" + expect(page).to_not have_css("debate_#{@debate.id}") + expect(@debate.reload).to be_ignored_flag + expect(@debate.reload).to_not be_hidden + expect(@debate.author).to_not be_hidden + end + end + + scenario "select all/none", :js do + create_list(:debate, 2) + + visit moderation_debates_path + + within('.js-check') { click_on 'All' } + + all('input[type=checkbox]').each do |checkbox| + expect(checkbox).to be_checked + end + + within('.js-check') { click_on 'None' } + + all('input[type=checkbox]').each do |checkbox| + expect(checkbox).to_not be_checked + end + end + + scenario "remembering page, filter and order" do + create_list(:debate, 52) + + visit moderation_debates_path(filter: 'all', page: '2', order: 'created_at') + + click_on "Ignore flags" + + expect(page).to have_selector('.js-order-selector[data-order="created_at"]') + + expect(current_url).to include('filter=all') + expect(current_url).to include('page=2') + expect(current_url).to include('order=created_at') + end + end + scenario "Current filter is properly highlighted" do visit moderation_debates_path expect(page).to_not have_link('Pending') @@ -50,98 +122,74 @@ feature 'Moderate debates' do expect(page).to have_link('Ignored') visit moderation_debates_path(filter: 'all') - expect(page).to_not have_link('All') - expect(page).to have_link('Pending') - expect(page).to have_link('Ignored') + within('.sub-nav') do + expect(page).to_not have_link('All') + expect(page).to have_link('Pending') + expect(page).to have_link('Ignored') + end visit moderation_debates_path(filter: 'pending_flag_review') - expect(page).to have_link('All') - expect(page).to_not have_link('Pending') - expect(page).to have_link('Ignored') + within('.sub-nav') do + expect(page).to have_link('All') + expect(page).to_not have_link('Pending') + expect(page).to have_link('Ignored') + end visit moderation_debates_path(filter: 'with_ignored_flag') - expect(page).to have_link('All') - expect(page).to have_link('Pending') - expect(page).to_not have_link('Ignored') + within('.sub-nav') do + expect(page).to have_link('All') + expect(page).to have_link('Pending') + expect(page).to_not have_link('Ignored') + end end scenario "Filtering debates" do + create(:debate, title: "Regular debate") create(:debate, :flagged, title: "Pending debate") - create(:debate, :flagged, :hidden, title: "Hidden debate") + create(:debate, :hidden, title: "Hidden debate") create(:debate, :flagged, :with_ignored_flag, title: "Ignored debate") visit moderation_debates_path(filter: 'all') + expect(page).to have_content('Regular debate') expect(page).to have_content('Pending debate') expect(page).to_not have_content('Hidden debate') expect(page).to have_content('Ignored debate') visit moderation_debates_path(filter: 'pending_flag_review') + expect(page).to_not have_content('Regular debate') expect(page).to have_content('Pending debate') expect(page).to_not have_content('Hidden debate') expect(page).to_not have_content('Ignored debate') visit moderation_debates_path(filter: 'with_ignored_flag') + expect(page).to_not have_content('Regular debate') expect(page).to_not have_content('Pending debate') expect(page).to_not have_content('Hidden debate') expect(page).to have_content('Ignored debate') end - scenario "Reviewing links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:debate, :flagged) } + scenario "sorting debates" do + create(:debate, title: "Flagged debate", created_at: Time.now - 1.day, flags_count: 5) + create(:debate, title: "Flagged newer debate", created_at: Time.now - 12.hours, flags_count: 3) + create(:debate, title: "Newer debate", created_at: Time.now) - visit moderation_debates_path(filter: 'pending_flag_review', page: 2) + visit moderation_debates_path(order: 'created_at') - click_link('Ignore', match: :first, exact: true) + expect("Flagged newer debate").to appear_before("Flagged debate") - expect(current_url).to include('filter=pending_flag_review') - expect(current_url).to include('page=2') - end + visit moderation_debates_path(order: 'flags') - feature 'A flagged debate exists' do + expect("Flagged debate").to appear_before("Flagged newer debate") - background do - @debate = create(:debate, :flagged, title: 'spammy spam', description: 'buy buy buy') - visit moderation_debates_path - end + visit moderation_debates_path(filter: 'all', order: 'created_at') - scenario 'It is displayed with the correct attributes' do - within("#debate_#{@debate.id}") do - expect(page).to have_link('spammy spam') - expect(page).to have_content('buy buy buy') - expect(page).to have_content('1') - expect(page).to have_link('Hide') - expect(page).to have_link('Ignore') - end - end + expect("Newer debate").to appear_before("Flagged newer debate") + expect("Flagged newer debate").to appear_before("Flagged debate") - scenario 'Hiding the debate' do - within("#debate_#{@debate.id}") do - click_link('Hide') - end + visit moderation_debates_path(filter: 'all', order: 'flags') - expect(current_path).to eq(moderation_debates_path) - expect(page).to_not have_selector("#debate_#{@debate.id}") - - expect(@debate.reload).to be_hidden - end - - scenario 'Marking the debate as ignored' do - within("#debate_#{@debate.id}") do - click_link('Ignore') - end - - expect(current_path).to eq(moderation_debates_path) - - click_link('All') - - within("#debate_#{@debate.id}") do - expect(page).to have_content('Ignored') - end - - expect(@debate.reload).to be_ignored_flag - end + expect("Flagged debate").to appear_before("Flagged newer debate") + expect("Flagged newer debate").to appear_before("Newer debate") end end - end