Add indication to admin UI of whether a report has been forwarded (#13237)

* Add indication to admin UI of whether a report has been forwarded

* Rework how forwarded status is displayed

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

diff --git a/app/models/report.rb b/app/models/report.rb
index f31bcfd2e92f146ff91dfd1369eb73706a872185..cd08120e4130a9272c89eadd189936405304607e 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -14,6 +14,7 @@
 #  target_account_id          :bigint(8)        not null
 #  assigned_account_id        :bigint(8)
 #  uri                        :string
+#  forwarded                  :boolean
 #
 
 class Report < ApplicationRecord

diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index 1e955c1e704b70574511426e1e7f25097889d257..9d9c7d6c9fc1da60126dcce7e5964ac8ff211b34 100644 (file)
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -24,7 +24,8 @@ class ReportService < BaseService
       target_account: @target_account,
       status_ids: @status_ids,
       comment: @comment,
-      uri: @options[:uri]
+      uri: @options[:uri],
+      forwarded: ActiveModel::Type::Boolean.new.cast(@options[:forward])
     )
   end
 

diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index bb441380ec76870f4df401e6043ebe95baf1d0d0..721c55f71a6c4f86e6f06c03f92d5c39cbfe8769 100644 (file)
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -59,6 +59,10 @@
                 = fa_icon('camera')
                 = report.media_attachments.count
 
+              - if report.forwarded?
+                ·
+                = t('admin.reports.forwarded_to', domain: target_account.domain)
+
           .report-card__summary__item__assigned
             - if report.assigned_account.present?
               = admin_account_link_to report.assigned_account

diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 2681419ca2fb62356b31d11f134f92b38310f18a..b060c553f09df03ee32f470074ba10c768a516b4 100644 (file)
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -46,6 +46,16 @@
         %td{ colspan: 2 }
           - if @report.action_taken?
             = table_link_to 'envelope-open', t('admin.reports.reopen'), admin_report_path(@report, outcome: 'reopen'), method: :put
+      - unless @report.target_account.local?
+        %tr
+          %th= t('admin.reports.forwarded')
+          %td{ colspan: 3 }
+            - if @report.forwarded.nil?
+              \-
+            - elsif @report.forwarded?
+              = t('simple_form.yes')
+            - else
+              = t('simple_form.no')
       - if !@report.action_taken_by_account.nil?
         %tr
           %th= t('admin.reports.action_taken_by')

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 114f86fd11cbeae224d80c47af48780218ac40fa..3ff01ac86aefab6a1cb57886fbab78166af41e7e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -517,6 +517,8 @@ en:
       comment:
         none: None
       created_at: Reported
+      forwarded: Forwarded
+      forwarded_to: Forwarded to %{domain}
       mark_as_resolved: Mark as resolved
       mark_as_unresolved: Mark as unresolved
       notes:

diff --git a/db/migrate/20200309150742_add_forwarded_to_reports.rb b/db/migrate/20200309150742_add_forwarded_to_reports.rb
new file mode 100644 (file)
index 0000000..df27824
--- /dev/null
+++ b/db/migrate/20200309150742_add_forwarded_to_reports.rb
@@ -0,0 +1,5 @@
+class AddForwardedToReports < ActiveRecord::Migration[5.2]
+  def change
+    add_column :reports, :forwarded, :boolean
+  end
+end

diff --git a/db/schema.rb b/db/schema.rb
index 2f9d369be2ae4a13f786ec85455c9f0d13011951..55822a4b3d18c9ce856ceb44c9dd2ddcc890695f 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -717,6 +717,7 @@ ActiveRecord::Schema.define(version: 2020_12_06_004238) do
     t.bigint "target_account_id", null: false
     t.bigint "assigned_account_id"
     t.string "uri"
+    t.boolean "forwarded"
     t.index ["account_id"], name: "index_reports_on_account_id"
     t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end