Merge pull request #1907 from codidact/cellio/1496-edits-deleted-posts

show pending edits on deleted posts (and the indicator) IFF current user can handle them

Author: Oaphi

app/controllers/categories_controller.rb

@@ -47,9 +47,7 @@ def create
       AuditLog.admin_audit(event_type: 'category_create', related: @category, user: current_user,
                            comment: "<<Category #{before}>>")
       flash[:success] = 'Your category was created.'
-      Rails.cache.delete "#{RequestContext.community_id}/header_categories"
-      Rails.cache.delete 'categories/by_lowercase_name'
-      Rails.cache.delete 'categories/by_id'
+      clear_categories_cache
       redirect_to category_path(@category)
     else
       flash[:danger] = 'There were some errors while trying to save your category.'
@@ -69,9 +67,7 @@ def update
       AuditLog.admin_audit(event_type: 'category_update', related: @category, user: current_user,
                            comment: "from <<Category #{before}>>\nto <<Category #{after}>>")
       flash[:success] = 'Your category was updated.'
-      Rails.cache.delete "#{RequestContext.community_id}/header_categories"
-      Rails.cache.delete 'categories/by_lowercase_name'
-      Rails.cache.delete 'categories/by_id'
+      clear_categories_cache
       redirect_to category_path(@category)
     else
       flash[:danger] = 'There were some errors while trying to save your category.'
@@ -207,6 +203,12 @@ def set_list_posts
     @posts = @posts.paginate(page: params[:page], per_page: 50).order(sort_param)
   end
 
+  def clear_categories_cache
+    Rails.cache.delete 'header_categories'
+    Rails.cache.delete 'categories/by_lowercase_name'
+    Rails.cache.delete 'categories/by_id'
+  end
+
   # Updates last visit cache for a given category
   # @param category [Category] category to update
   # @return [Boolean] whether the cache entry is deleted

app/controllers/suggested_edit_controller.rb

@@ -14,8 +14,8 @@ def category_index
 
     @category = params[:category].present? ? Category.find(params[:category]) : nil
 
-    @edits = SuggestedEdit.where(post: Post.undeleted.in(@category),
-                                 active: !@show_decided)
+    @edits = SuggestedEdit.accessible_to(current_user, @category)
+                          .where(active: !@show_decided)
                           .order(@sort_type => @sort_order)
   end
 

app/helpers/categories_helper.rb

@@ -46,4 +46,15 @@ def pending_suggestions?
       SuggestedEdit.where(post: Post.undeleted.in(current_category), active: true).any?
     end
   end
+
+  ##
+  # Checks if there are any pending edit suggestions in the current category,
+  # including on deleted posts (for viewers who can both edit and see deleted).
+  # @note Cached - cache is manually broken when new suggestions are created.
+  # @return [Boolean]
+  def pending_suggestions_with_deleted?
+    Rails.cache.fetch "pending_suggestions_with_deleted/#{current_category.id}" do
+      SuggestedEdit.where(post: Post.in(current_category), active: true).any?
+    end
+  end
 end

app/models/suggested_edit.rb

@@ -22,8 +22,18 @@ class SuggestedEdit < ApplicationRecord
   scope :by, ->(user) { where(user: user) }
   scope :rejected, -> { where(active: false, accepted: false) }
 
+  # Gets suggested edits scoped for a given user and category
+  # @param user [User] user to check
+  # @param category [Category] category to check
+  # @return [ActiveRecord::Relation<SuggestedEdit>]
+  def self.accessible_to(user, category)
+    posts = user&.can_see_deleted_posts? ? Post.in(category) : Post.undeleted.in(category)
+    SuggestedEdit.where(post: posts)
+  end
+
   def clear_pending_cache
     Rails.cache.delete "pending_suggestions/#{post.category_id}"
+    Rails.cache.delete "pending_suggestions_with_deleted/#{post.category_id}"
   end
 
   def pending?

app/views/layouts/_header.html.erb

@@ -280,7 +280,7 @@
                   <%= link_to suggested_edits_queue_path(current_cat),
                       class: "category-header--nav-item #{active?(current_cat) && controller_name == 'suggested_edit' ? 'is-active' : ''}" do %>
                     Edits
-                    <% if pending_suggestions?  && check_your_privilege('edit_posts') %>
+                    <% if check_your_privilege('edit_posts') && (pending_suggestions? || (pending_suggestions_with_deleted? && check_your_privilege('flag_curate'))) %>
                       <span class="badge is-status" title="Suggested edits pending"></span>
                     <% end %>
                   <% end %>

app/views/suggested_edit/category_index.html.erb

@@ -1,7 +1,9 @@
 <h1>Suggested Edits</h1>
 <p class="is-lead">Suggested edits for review.</p>
 
-<% categories = Category.unscoped.where(community: @community).order(sequence: :asc, id: :asc) %>
+<% categories = Category.unscoped.accessible_to(current_user)
+                                 .where(community: @community)
+                                 .order(sequence: :asc, id: :asc) %>
 <% current_cat = current_category %>
 
 <div class="suggested-edits-list-header">
@@ -34,8 +36,7 @@
       <th>pending edits</th>
     </tr>
     <% categories.each do |cat| %>
-      <% next if (cat.min_view_trust_level || -1) > (current_user&.trust_level || 0) %>
-      <% sug_edits = SuggestedEdit.where(post: Post.undeleted.in(cat), active: !@show_decided).count %>
+      <% sug_edits_count = SuggestedEdit.accessible_to(current_user, cat).where(active: !@show_decided).count %>
       <% queue_url = suggested_edits_queue_url(cat, params.permit(:sort, :order, :show_decided)) %>
       <tr>
         <td>
@@ -47,9 +48,9 @@
         </td>
         <td>
           <% if cat == current_cat %>
-            <%= sug_edits %>
+            <%= sug_edits_count %>
           <% else %>
-<%= link_to sug_edits, queue_url %>
+            <%= link_to sug_edits_count, queue_url %>
           <% end %>
         </td>
       </tr>
@@ -60,7 +61,7 @@
 <% if @edits.any? %>
   <div class="widget">
     <% @edits.each do |edit| %>
-      <div class="widget--body h-p-b-0" data-ckb-list-item data-ckb-item-type="link">
+      <div class="widget--body h-p-b-0 <%= 'deleted-content' if edit.post.deleted? %>" data-ckb-list-item data-ckb-item-type="link">
         <div>
           <%= link_to suggested_edit_path(edit.id), class: 'has-font-size-larger', data: {'ckb-item-link' => ''} do %>
             <%= edit.post.post_type.name %>: <strong><%= edit.post.post_type.is_top_level ? edit.post.title : edit.post.parent.title %></strong>

test/fixtures/suggested_edits.yml

@@ -85,3 +85,14 @@ approved_edit_scorer:
   decided_at: 2000-01-01T00:00:00.000000Z
   decided_by: editor
   title: approved suggested edit by the user used for edit score tests
+
+on_deleted_post:
+  post: deleted
+  user: standard_user
+  community: sample
+  body: This suggested edit is on a deleted post
+  title: Edit on a deleted post
+  body_markdown: <p>This suggested edit is on a deleted post</p>
+  comment: for users with access only
+  active: true
+  accepted: false

test/models/suggested_edit_test.rb

@@ -16,4 +16,27 @@ class SuggestedEditTest < ActiveSupport::TestCase
     assert suggested_edits(:accepted_suggested_edit).approved?
     assert suggested_edits(:rejected_suggested_edit).rejected?
   end
+
+  test 'accessible_to should correctly scope suggested edits' do
+    categories_with_edits_on_deleted_posts = suggested_edits
+                                             .select { |edit| edit.post.deleted? }
+                                             .map { |edit| edit.post.category.id }
+                                             .uniq
+
+    assert categories_with_edits_on_deleted_posts.any?
+
+    users.each do |user|
+      categories_with_edits_on_deleted_posts.each do |category|
+        edits = SuggestedEdit.accessible_to(user, category)
+
+        assert edits.any?
+
+        if user.can_see_deleted_posts?
+          assert(edits.any? { |edit| edit.post.deleted? })
+        else
+          assert(edits.none? { |edit| edit.post.deleted? })
+        end
+      end
+    end
+  end
 end