Skip to content

Commit

Permalink
Show reporting user on issues screen
Browse files Browse the repository at this point in the history
  • Loading branch information
nertc committed Jan 22, 2025
1 parent 7b19ba5 commit eb7309c
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 0 deletions.
8 changes: 8 additions & 0 deletions app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,14 @@ tr.turn {
}
}

/* Rules for the issues page */

.issues.issues-index {
td.reporter_users {
max-width: 5rem;
}
}

/* Rules for the account confirmation page */

.accounts-terms-show {
Expand Down
5 changes: 5 additions & 0 deletions app/controllers/issues_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ def index
end

@issues, @newer_issues_id, @older_issues_id = get_page_items(@issues, :limit => @params[:limit])

@unique_reporters = @issues.each_with_object({}) do |issue, reporters|
reporters[issue.id] = issue.reports.order(:created_at => :desc).preload(:user).map(&:user).uniq
end

render :partial => "page" if turbo_frame_request_id == "pagination"
end

Expand Down
9 changes: 9 additions & 0 deletions app/views/issues/_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<th><%= t ".reports" %></th>
<th><%= t ".reported_item" %></th>
<th><%= t ".reported_user" %></th>
<th class="reporter_users"><%= t ".reporter_users" %></th>
<th><%= t ".last_updated" %></th>
</tr>
</thead>
Expand All @@ -23,6 +24,14 @@
<td class="text-nowrap"><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
<td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
<td><%= link_to issue.reported_user.display_name, issue.reported_user if issue.reported_user %></td>
<td class="reporter_users text-truncate">
<% @unique_reporters[issue.id].first(3).each do |reporter| %>
<%= link_to reporter.display_name, reporter, :class => "d-block text-truncate", :title => reporter.display_name %>
<% end %>
<% if @unique_reporters[issue.id].size > 3 %>
<p class="m-0"><%= t ".more_reporters", :count => @unique_reporters[issue.id].size - 3 %></p>
<% end %>
</td>
<td>
<% if issue.user_updated %>
<%= t ".last_updated_time_ago_user_html", :user => link_to(issue.user_updated.display_name, issue.user_updated),
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1509,9 +1509,11 @@ en:
reports: Reports
last_updated: Last Updated
last_updated_time_ago_user_html: "%{time_ago} by %{user}"
reporter_users: Reporter Users
reports_count:
one: "%{count} Report"
other: "%{count} Reports"
more_reporters: "and %{count} more"
reported_item: Reported Item
states:
ignored: Ignored
Expand Down
49 changes: 49 additions & 0 deletions test/system/issues_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,53 @@ def test_issues_pagination
assert_no_content(/extra_#{n}[^\d]/i)
end
end

def test_single_issue_reporters
sign_in_as(create(:moderator_user))
issue = create(:issue, :assigned_role => "moderator")
issue.reports << create(:report, :user => create(:user, :display_name => "Test Name"))

visit issues_path
assert_content issue.reported_user.display_name
assert_content issue.reports.first.user.display_name
end

def test_multiple_issue_reporters
sign_in_as(create(:moderator_user))
issue = create(:issue, :assigned_role => "moderator")

1.upto(5).each do |n|
issue.reports << create(:report, :user => create(:user, :display_name => "Test Name #{n}"))
end

visit issues_path
0.upto(1).each do |n|
assert_no_content issue.reports[n].user.display_name
end
2.upto(4).each do |n|
assert_content issue.reports[n].user.display_name
end
end

def test_ordering_issue_reporters
sign_in_as(create(:moderator_user))
issue = create(:issue, :assigned_role => "moderator")

reporters = 0.upto(5).map { |n| create(:user, :display_name => "Test Name #{n}") }

0.upto(5).each do |n|
issue.reports << create(:report, :user => reporters[n])
end
5.downto(0).each do |n|
issue.reports << create(:report, :user => reporters[n])
end

visit issues_path
0.upto(2).each do |n|
assert_content reporters[n].display_name
end
3.upto(5).each do |n|
assert_no_content reporters[n].display_name
end
end
end

0 comments on commit eb7309c

Please sign in to comment.