+
<% if @notifications.blank? %>
<%= t('proposals.show.no_notifications') %>
@@ -8,9 +8,15 @@
<% end %>
<% @notifications.each do |notification| %>
-
<%= notification.title %>
-
<%= notification.created_at.to_date %>
-
<%= notification.body %>
+
+
<%= notification.title %>
+
<%= notification.created_at.to_date %>
+ <%= simple_format text_with_links(notification.body), {}, sanitize: false %>
+
+
+ <%= render 'proposal_notifications/actions', notification: notification %>
+
+
<% end %>
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 2ad35f3c1..a79e521bf 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -129,6 +129,7 @@ ignore_unused:
- 'admin.banners.index.filters.*'
- 'admin.debates.index.filter*'
- 'admin.proposals.index.filter*'
+ - 'admin.proposal_notifications.index.filter*'
- 'admin.budgets.index.filter*'
- 'admin.budget_investments.index.filter*'
- 'admin.spending_proposals.index.filter*'
@@ -151,6 +152,8 @@ ignore_unused:
- 'moderation.proposals.index.order*'
- 'moderation.debates.index.filter*'
- 'moderation.debates.index.order*'
+ - 'moderation.proposal_notifications.index.filter*'
+ - 'moderation.proposal_notifications.index.order*'
- 'valuation.spending_proposals.index.filter*'
- 'valuation.budgets.index.filter*'
- 'valuation.budget_investments.index.filter*'
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index 7ea038a92..8e44f6ea9 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -103,6 +103,9 @@ en:
poll:
one: "Poll"
other: "Polls"
+ proposal_notification:
+ one: "Proposal notification"
+ other: "Proposal notifications"
attributes:
budget:
name: "Name"
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index d9504beea..67273c327 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -504,6 +504,7 @@ en:
hidden_comments: Hidden comments
hidden_debates: Hidden debates
hidden_proposals: Hidden proposals
+ hidden_proposal_notifications: Hidden proposal notifications
hidden_users: Hidden users
administrators: Administrators
managers: Managers
@@ -940,6 +941,15 @@ en:
without_confirmed_hide: Pending
title: Hidden proposals
no_hidden_proposals: There is no hidden proposals.
+ proposal_notifications:
+ index:
+ filter: Filter
+ filters:
+ all: All
+ with_confirmed_hide: Confirmed
+ without_confirmed_hide: Pending
+ title: Hidden notifications
+ no_hidden_proposals: There is no hidden notifications.
settings:
flash:
updated: Value updated
diff --git a/config/locales/en/moderation.yml b/config/locales/en/moderation.yml
index f6648d49d..5ed2f69bb 100644
--- a/config/locales/en/moderation.yml
+++ b/config/locales/en/moderation.yml
@@ -47,6 +47,7 @@ en:
flagged_comments: Comments
flagged_debates: Debates
proposals: Proposals
+ proposal_notifications: Proposals notifications
users: Block users
proposals:
index:
@@ -67,6 +68,25 @@ en:
created_at: Most recent
flags: Most flagged
title: Proposals
+ proposal_notifications:
+ index:
+ block_authors: Block authors
+ confirm: Are you sure?
+ filter: Filter
+ filters:
+ all: All
+ pending_review: Pending review
+ ignored: Mark as viewed
+ headers:
+ moderate: Moderate
+ proposal_notification: Proposal notification
+ hide_proposal_notifications: Hide proposals
+ ignore_flags: Mark as viewed
+ order: Order by
+ orders:
+ created_at: Most recent
+ moderated: Moderated
+ title: Proposal notifications
users:
index:
hidden: Blocked
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 3b137d67b..2da027031 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -103,6 +103,9 @@ es:
poll:
one: "Votación"
other: "Votaciones"
+ proposal_notification:
+ one: "Notificación de propuesta"
+ other: "Notificaciones de propuestas"
attributes:
budget:
name: "Nombre"
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 65c2e8ffa..8e3c546f9 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -504,6 +504,7 @@ es:
hidden_comments: Comentarios ocultos
hidden_debates: Debates ocultos
hidden_proposals: Propuestas ocultas
+ hidden_proposal_notifications: Notificationes de propuesta ocultas
hidden_users: Usuarios bloqueados
administrators: Administradores
managers: Gestores
@@ -940,6 +941,15 @@ es:
without_confirmed_hide: Pendientes
title: Propuestas ocultas
no_hidden_proposals: No hay propuestas ocultas.
+ proposal_notifications:
+ index:
+ filter: Filtro
+ filters:
+ all: Todas
+ with_confirmed_hide: Confirmadas
+ without_confirmed_hide: Pendientes
+ title: Notificaciones ocultas
+ no_hidden_proposals: No hay notificaciones ocultas.
settings:
flash:
updated: Valor actualizado
diff --git a/config/locales/es/moderation.yml b/config/locales/es/moderation.yml
index 43fc98790..c51013aee 100644
--- a/config/locales/es/moderation.yml
+++ b/config/locales/es/moderation.yml
@@ -47,6 +47,7 @@ es:
flagged_comments: Comentarios
flagged_debates: Debates
proposals: Propuestas
+ proposal_notifications: Notificaciones de propuestas
users: Bloquear usuarios
proposals:
index:
@@ -67,6 +68,25 @@ es:
created_at: Más recientes
flags: Más denunciadas
title: Propuestas
+ proposal_notifications:
+ index:
+ block_authors: Bloquear autores
+ confirm: '¿Estás seguro?'
+ filter: Filtro
+ filters:
+ all: Todas
+ pending_review: Pendientes de revisión
+ ignored: Marcadas como revisadas
+ headers:
+ moderate: Moderar
+ proposal_notification: Notificación de propuesta
+ hide_proposal_notifications: Ocultar notificaciones
+ ignore_flags: Marcar como revisadas
+ order: Ordenar por
+ orders:
+ created_at: Más recientes
+ moderated: Moderadas
+ title: Notificaciones de propuestas
users:
index:
hidden: Bloqueado
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 374b4512c..001456f6e 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -38,6 +38,13 @@ namespace :admin do
get :summary, on: :collection
end
+ resources :proposal_notifications, only: :index do
+ member do
+ put :restore
+ put :confirm_hide
+ end
+ end
+
resources :budgets do
member do
put :calculate_winners
diff --git a/config/routes/moderation.rb b/config/routes/moderation.rb
index 77eb0a216..90dc9be27 100644
--- a/config/routes/moderation.rb
+++ b/config/routes/moderation.rb
@@ -22,4 +22,9 @@ namespace :moderation do
put :hide, on: :member
put :moderate, on: :collection
end
+
+ resources :proposal_notifications, only: :index do
+ put :hide, on: :member
+ put :moderate, on: :collection
+ end
end
diff --git a/db/migrate/20180516105911_add_moderation_flags_to_proposal_notifications.rb b/db/migrate/20180516105911_add_moderation_flags_to_proposal_notifications.rb
new file mode 100644
index 000000000..f62c1e1cf
--- /dev/null
+++ b/db/migrate/20180516105911_add_moderation_flags_to_proposal_notifications.rb
@@ -0,0 +1,8 @@
+class AddModerationFlagsToProposalNotifications < ActiveRecord::Migration
+ def change
+ add_column :proposal_notifications, :moderated, :boolean, default: false
+ add_column :proposal_notifications, :hidden_at, :datetime
+ add_column :proposal_notifications, :ignored_at, :datetime
+ add_column :proposal_notifications, :confirmed_hide_at, :datetime
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d1408273d..916342063 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -874,8 +874,12 @@ ActiveRecord::Schema.define(version: 20180519132610) do
t.text "body"
t.integer "author_id"
t.integer "proposal_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.boolean "moderated", default: false
+ t.datetime "hidden_at"
+ t.datetime "ignored_at"
+ t.datetime "confirmed_hide_at"
end
create_table "proposals", force: :cascade do |t|
diff --git a/spec/factories.rb b/spec/factories.rb
index 3aeaef9e2..50dd0dec8 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -749,6 +749,23 @@ FactoryBot.define do
sequence(:title) { |n| "Thank you for supporting my proposal #{n}" }
sequence(:body) { |n| "Please let others know so we can make it happen #{n}" }
proposal
+ association :author, factory: :user
+
+ trait :moderated do
+ moderated true
+ end
+
+ trait :ignored do
+ ignored_at Date.current
+ end
+
+ trait :hidden do
+ hidden_at Date.current
+ end
+
+ trait :with_confirmed_hide do
+ confirmed_hide_at Time.current
+ end
end
factory :direct_message do
diff --git a/spec/features/admin/proposal_notifications_spec.rb b/spec/features/admin/proposal_notifications_spec.rb
new file mode 100644
index 000000000..62f4bf340
--- /dev/null
+++ b/spec/features/admin/proposal_notifications_spec.rb
@@ -0,0 +1,95 @@
+require 'rails_helper'
+
+feature 'Admin proposal notifications' do
+
+ background do
+ admin = create(:administrator)
+ login_as(admin.user)
+ end
+
+ scenario 'List shows all relevant info' do
+ proposal_notification = create(:proposal_notification, :hidden)
+ visit admin_proposal_notifications_path
+
+ expect(page).to have_content(proposal_notification.title)
+ expect(page).to have_content(proposal_notification.body)
+ end
+
+ scenario 'Restore' do
+ proposal_notification = create(:proposal_notification, :hidden, created_at: Date.current - 5.days)
+ visit admin_proposal_notifications_path
+
+ click_link 'Restore'
+
+ expect(page).not_to have_content(proposal_notification.title)
+
+ expect(proposal_notification.reload).not_to be_hidden
+ expect(proposal_notification).to be_ignored
+ expect(proposal_notification).not_to be_moderated
+ end
+
+ scenario 'Confirm hide' do
+ proposal_notification = create(:proposal_notification, :hidden, created_at: Date.current - 5.days)
+ visit admin_proposal_notifications_path
+
+ click_link 'Confirm moderation'
+
+ expect(page).not_to have_content(proposal_notification.title)
+ click_link('Confirmed')
+ expect(page).to have_content(proposal_notification.title)
+
+ expect(proposal_notification.reload).to be_confirmed_hide
+ end
+
+ scenario "Current filter is properly highlighted" do
+ visit admin_proposal_notifications_path
+ expect(page).not_to have_link('Pending')
+ expect(page).to have_link('All')
+ expect(page).to have_link('Confirmed')
+
+ visit admin_proposal_notifications_path(filter: 'Pending')
+ expect(page).not_to have_link('Pending')
+ expect(page).to have_link('All')
+ expect(page).to have_link('Confirmed')
+
+ visit admin_proposal_notifications_path(filter: 'all')
+ expect(page).to have_link('Pending')
+ expect(page).not_to have_link('All')
+ expect(page).to have_link('Confirmed')
+
+ visit admin_proposal_notifications_path(filter: 'with_confirmed_hide')
+ expect(page).to have_link('All')
+ expect(page).to have_link('Pending')
+ expect(page).not_to have_link('Confirmed')
+ end
+
+ scenario "Filtering proposals" do
+ create(:proposal_notification, :hidden, title: "Unconfirmed notification")
+ create(:proposal_notification, :hidden, :with_confirmed_hide, title: "Confirmed notification")
+
+ visit admin_proposal_notifications_path(filter: 'pending')
+ expect(page).to have_content('Unconfirmed notification')
+ expect(page).not_to have_content('Confirmed notification')
+
+ visit admin_proposal_notifications_path(filter: 'all')
+ expect(page).to have_content('Unconfirmed notification')
+ expect(page).to have_content('Confirmed notification')
+
+ visit admin_proposal_notifications_path(filter: 'with_confirmed_hide')
+ expect(page).not_to have_content('Unconfirmed notification')
+ expect(page).to have_content('Confirmed notification')
+ end
+
+ scenario "Action links remember the pagination setting and the filter" do
+ per_page = Kaminari.config.default_per_page
+ (per_page + 2).times { create(:proposal_notification, :hidden, :with_confirmed_hide) }
+
+ visit admin_proposal_notifications_path(filter: 'with_confirmed_hide', page: 2)
+
+ click_on('Restore', match: :first, exact: true)
+
+ expect(current_url).to include('filter=with_confirmed_hide')
+ expect(current_url).to include('page=2')
+ end
+
+end
diff --git a/spec/features/moderation/proposal_notifications_spec.rb b/spec/features/moderation/proposal_notifications_spec.rb
new file mode 100644
index 000000000..4af3a815d
--- /dev/null
+++ b/spec/features/moderation/proposal_notifications_spec.rb
@@ -0,0 +1,189 @@
+require 'rails_helper'
+
+feature 'Moderate proposal notifications' do
+
+ scenario 'Hide', :js do
+ citizen = create(:user)
+ proposal = create(:proposal)
+ proposal_notification = create(:proposal_notification, proposal: proposal, created_at: Date.current - 4.days)
+ moderator = create(:moderator)
+
+ login_as(moderator.user)
+ visit proposal_path(proposal)
+ click_link "Notifications (1)"
+
+ within("#proposal_notification_#{proposal_notification.id}") do
+ accept_confirm { click_link 'Hide' }
+ end
+
+ expect(page).to have_css("#proposal_notification_#{proposal.id}.faded")
+
+ logout
+ login_as(citizen)
+ visit proposal_path(proposal)
+
+ expect(page).to have_content "Notifications (0)"
+ end
+
+ scenario 'Can not hide own proposal notification' do
+ moderator = create(:moderator)
+ proposal = create(:proposal, author: moderator.user)
+ proposal_notification = create(:proposal_notification, proposal: proposal, created_at: Date.current - 4.days)
+
+ login_as(moderator.user)
+ visit proposal_path(proposal)
+
+ within("#proposal_notification_#{proposal_notification.id}") do
+ expect(page).not_to have_link('Hide')
+ expect(page).not_to have_link('Block author')
+ end
+ end
+
+ feature '/moderation/ screen' do
+
+ background do
+ moderator = create(:moderator)
+ login_as(moderator.user)
+ end
+
+ feature 'moderate in bulk' do
+ feature "When a proposal has been selected for moderation" do
+ background do
+ proposal = create(:proposal)
+ @proposal_notification = create(:proposal_notification, proposal: proposal, created_at: Date.current - 4.days)
+ visit moderation_proposal_notifications_path
+ within('.menu.simple') do
+ click_link "All"
+ end
+
+ within("#proposal_notification_#{@proposal_notification.id}") do
+ check "proposal_notification_#{@proposal_notification.id}_check"
+ end
+ end
+
+ scenario 'Hide the proposal' do
+ click_on "Hide proposals"
+ expect(page).not_to have_css("#proposal_notification_#{@proposal_notification.id}")
+ expect(@proposal_notification.reload).to be_hidden
+ expect(@proposal_notification.author).not_to be_hidden
+ end
+
+ scenario 'Block the author' do
+ author = create(:user)
+ @proposal_notification.update(author: author)
+ click_on "Block authors"
+ expect(page).not_to have_css("#proposal_notification_#{@proposal_notification.id}")
+ expect(@proposal_notification.reload).to be_hidden
+ expect(author.reload).to be_hidden
+ end
+
+ scenario 'Ignore the proposal' do
+ click_button "Mark as viewed"
+
+ expect(@proposal_notification.reload).to be_ignored
+ expect(@proposal_notification.reload).not_to be_hidden
+ expect(@proposal_notification.author).not_to be_hidden
+ end
+ end
+
+ scenario "select all/none", :js do
+ create_list(:proposal_notification, 2)
+
+ visit moderation_proposal_notifications_path
+
+ within('.js-check') { click_on 'All' }
+
+ expect(all('input[type=checkbox]')).to all(be_checked)
+
+ within('.js-check') { click_on 'None' }
+
+ all('input[type=checkbox]').each do |checkbox|
+ expect(checkbox).not_to be_checked
+ end
+ end
+
+ scenario "remembering page, filter and order" do
+ create_list(:proposal, 52)
+
+ visit moderation_proposal_notifications_path(filter: 'all', page: '2', order: 'created_at')
+
+ click_button "Mark as viewed"
+
+ 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_proposal_notifications_path
+ expect(page).not_to have_link('Pending review')
+ expect(page).to have_link('All')
+ expect(page).to have_link('Mark as viewed')
+
+ visit moderation_proposal_notifications_path(filter: 'all')
+ within('.menu.simple') do
+ expect(page).not_to have_link('All')
+ expect(page).to have_link('Pending review')
+ expect(page).to have_link('Mark as viewed')
+ end
+
+ visit moderation_proposal_notifications_path(filter: 'pending_review')
+ within('.menu.simple') do
+ expect(page).to have_link('All')
+ expect(page).not_to have_link('Pending review')
+ expect(page).to have_link('Mark as viewed')
+ end
+
+ visit moderation_proposal_notifications_path(filter: 'ignored')
+ within('.menu.simple') do
+ expect(page).to have_link('All')
+ expect(page).to have_link('Pending review')
+ expect(page).not_to have_link('Marked as viewed')
+ end
+ end
+
+ scenario "Filtering proposals" do
+ proposal = create(:proposal)
+ create(:proposal_notification, title: "Regular proposal", proposal: proposal)
+ create(:proposal_notification, :moderated, title: "Pending proposal", proposal: proposal)
+ create(:proposal_notification, :hidden, title: "Hidden proposal", proposal: proposal)
+ create(:proposal_notification, :moderated, :ignored, title: "Ignored proposal", proposal: proposal)
+
+ visit moderation_proposal_notifications_path(filter: 'all')
+ expect(page).to have_content('Regular proposal')
+ expect(page).to have_content('Pending proposal')
+ expect(page).not_to have_content('Hidden proposal')
+ expect(page).to have_content('Ignored proposal')
+
+ visit moderation_proposal_notifications_path(filter: 'pending_review')
+ expect(page).not_to have_content('Regular proposal')
+ expect(page).to have_content('Pending proposal')
+ expect(page).not_to have_content('Hidden proposal')
+ expect(page).not_to have_content('Ignored proposal')
+
+ visit moderation_proposal_notifications_path(filter: 'ignored')
+ expect(page).not_to have_content('Regular proposal')
+ expect(page).not_to have_content('Pending proposal')
+ expect(page).not_to have_content('Hidden proposal')
+ expect(page).to have_content('Ignored proposal')
+ end
+
+ scenario "sorting proposal notifications" do
+ moderated_notification = create(:proposal_notification, :moderated, title: "Moderated notification", created_at: Time.current - 1.day)
+ moderated_new_notification = create(:proposal_notification, :moderated, title: "Moderated new notification", created_at: Time.current - 12.hours)
+ newer_notification = create(:proposal_notification, title: "Newer notification", created_at: Time.current)
+ old_moderated_notification = create(:proposal_notification, :moderated, title: "Older notification", created_at: Time.current - 2.days)
+
+ visit moderation_proposal_notifications_path(filter: 'all', order: 'created_at')
+
+ expect(moderated_new_notification.title).to appear_before(moderated_notification.title)
+
+ visit moderation_proposal_notifications_path(filter: 'all', order: 'moderated')
+
+ expect(old_moderated_notification.title).to appear_before(newer_notification.title)
+ end
+ end
+end