From 431708b99f5ed82d13894bd3191060919398bf6d Mon Sep 17 00:00:00 2001
From: Keshav Sethi <36025262+keshavsethi@users.noreply.github.com>
Date: Wed, 26 Aug 2020 01:33:33 +0530
Subject: [PATCH] Spam2 minor bug fixes  (#8352)

* minor bugs fixes

* spam2 minor errors
---
 app/controllers/spam2_controller.rb |  2 +-
 app/views/spam2/_insights.html.erb  | 17 ++++++++---------
 app/views/spam2/_spam.html.erb      | 25 ++++++++++++++++---------
 app/views/spam2/_users.html.erb     |  2 ++
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/app/controllers/spam2_controller.rb b/app/controllers/spam2_controller.rb
index a41ba4238cf..172ab3150cd 100644
--- a/app/controllers/spam2_controller.rb
+++ b/app/controllers/spam2_controller.rb
@@ -76,7 +76,7 @@ def _spam_queue
 
   def _spam_users
     if logged_in_as(%w(moderator admin))
-      @users = User.paginate(page: params[:page], per_page: params[:pagination])
+      @users = User.paginate(page: params[:page], per_page: params[:pagination]).order('created_at DESC')
       @users = case params[:type]
                  when 'banned'
                    @users.where('rusers.status = 0')
diff --git a/app/views/spam2/_insights.html.erb b/app/views/spam2/_insights.html.erb
index c7386520c94..9a1cedc6b3a 100644
--- a/app/views/spam2/_insights.html.erb
+++ b/app/views/spam2/_insights.html.erb
@@ -3,8 +3,8 @@
     <div class="card-body">
     <a class="card-title  text-secondary h5 font-weight-bold" href="/spam2/filter/unmoderated/30"> <i class="fa fa-circle text-primary"></i>  Unmoderated</a>
       <ul class="list-group list-group-flush text-secondary  mt-3">
-        <li class="list-group-item"><%= Node.where(status: 4, created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
-        <li class="list-group-item"><%= Comment.where(status: 4, timestamp: (Time.now - 1.month)..Time.now).size %> Comments</li>
+        <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Unmoderated Nodes"><%= Node.where(status: 4).size%></span></li>
+        <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Unmoderated Comments"><%= Comment.where(status: 4).size %></span></li>
       </ul>
     </div>
   </div>
@@ -12,8 +12,8 @@
    <div class="card-body">
        <a class="card-title h5 text-secondary font-weight-bold" href="/spam2/filter/spammed/30"> <i class="fa fa-ban text-danger"></i>  Spammed</a>
       <ul class="list-group list-group-flush text-secondary mt-3">
-        <li class="list-group-item"><%= Node.where(status: 0, created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
-        <li class="list-group-item"><%= Comment.where(status: 0, timestamp: (Time.now - 1.month)..Time.now).size %> Comments</li>
+        <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Spammed Nodes"><%= Node.where(status: 0).size%></span></li>
+        <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Spammed Comments"><%= Comment.where(status: 0).size %></span></li>
       </ul>
     </div>
   </div>
@@ -21,8 +21,8 @@
     <div class="card-body">
         <a class="card-title h5 text-secondary font-weight-bold" href="/spam2/flags/filter/all/30"> <i class="fa fa-flag text-warning"></i>  Flagged</a>
       <ul class="list-group list-group-flush text-secondary mt-3">
-        <li class="list-group-item"><%= Node.where('flag > ?', 0).where(created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
-        <li class="list-group-item"><%= Comment.where('flag > ?', 0).where(timestamp: (Time.now - 1.month)..Time.now).size %> Comments</li>
+        <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Flagged Nodes"><%= Node.where('flag > ?', 0).size%></span></li>
+        <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Spammed Comments"><%= Comment.where('flag > ?', 0).size %></span></li>
       </ul>
     </div>
   </div>
@@ -30,13 +30,12 @@
     <div class="card-body">
         <a class="card-title h5 text-secondary font-weight-bold" href="/spam2/filter/published/30"> <i class="fa fa-check text-success"></i>  Published</a>
         <ul class="list-group list-group-flush text-secondary mt-3">
-            <li class="list-group-item"><%= Node.where(status: 1, created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
-            <li class="list-group-item"><%= Comment.where(status: 1, timestamp: (Time.now - 1.month)..Time.now).count %> Comments</li>
+            <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Published Nodes"><%= Node.where(status: 1).size%></span></li>
+            <li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Published Comments"><%= Comment.where(status: 1).count %></span></li>
         </ul>
     </div>
   </div>
 </div>
-<p class="text-secondary">* The above stats are for past month</p>
 <div class="card w-100 mt-2 border-0">
     <div class="card-body">
         <h4 class="card-title my-3 text-secondary font-weight-bold"> <i class="fa fa-line-chart text-primary"></i> Moderation graph</h4>
diff --git a/app/views/spam2/_spam.html.erb b/app/views/spam2/_spam.html.erb
index ad484dfac0d..b83f21f8028 100644
--- a/app/views/spam2/_spam.html.erb
+++ b/app/views/spam2/_spam.html.erb
@@ -27,18 +27,22 @@
         <a class="dropdown-item <% if params[:action] == "_spam_insights" %> active <% end %>" href="/spam2/insights"><i class="drop fa fa-line-chart text-primary"></i> Insights </a>
       <div class="dropdown-divider"></div>  
         <h6 class="dropdown-header">Spam Moderation</h6>
-        <a class="dropdown-item <% unless  params[:action] =="_spam_comments" ||params[:action] =="_spam_queue" || params[:action] =="_spam_insights"|| params[:action] =="_spam_revisions" || params[:action] =="_spam_flags" || params[:type] == "wiki" || params[:action] == "_spam_users"%> active <% end %>" href="/spam2/filter/all/30"><i class="drop fa fa-address-book text-primary"></i> Moderation</a>
-        <a class="dropdown-item <% if params[:type] == "wiki" %> active <% end %>" id="wiki_drop" href="/spam2/filter/wiki/30" ><i class="drop fa fa-book text-primary"></i> Wiki</a>
-        <a class="dropdown-item <% if params[:action] == "_spam_queue" %> active <% end %>" href="/spam2/queue/filter/everything" ><i class="drop fa fa-clock text-primary"></i> Queue</a>
-        <a class="dropdown-item <% if params[:action] == "_spam_revisions" %> active <% end %>" href="/spam2/revisions"><i class="drop fa fa-list text-primary"></i> Revision</a>
-        <a class="dropdown-item <% if params[:action] == "_spam_comments" %> active <% end %>" href="/spam2/comments/filter/all/30" ><i class="drop fa fa-comment text-primary"></i> Comments</a>
-        <a class="dropdown-item <% if params[:action] == "_spam_flags" %> active <% end %>"  href="/spam2/flags/filter/all/30" ><i class="drop fa fa-flag text-primary"></i> Flag </a>
-        <a class="dropdown-item  <% if params[:action] == "_spam_users" %> active <% end %>" href="/spam2/users/filter/all/30"><i class="drop fa fa-user text-primary"></i> User moderation</a>
+        <a class="drop_click dropdown-item <% unless  params[:action] =="_spam_comments" ||params[:action] =="_spam_queue" || params[:action] =="_spam_insights"|| params[:action] =="_spam_revisions" || params[:action] =="_spam_flags" || params[:type] == "wiki" || params[:action] == "_spam_users"%> active <% end %>" href="/spam2/filter/all/30"><i class="drop fa fa-address-book text-primary"></i> Moderation</a>
+        <a class="wiki_drop_click dropdown-item <% if params[:type] == "wiki" %> active <% end %>" id="wiki_drop" href="/spam2/filter/wiki/30" ><i class="drop fa fa-book text-primary"></i> Wiki</a>
+        <a class="drop_click dropdown-item <% if params[:action] == "_spam_queue" %> active <% end %>" href="/spam2/queue/filter/everything" ><i class="drop fa fa-clock text-primary"></i> Queue</a>
+        <a class="drop_click dropdown-item <% if params[:action] == "_spam_revisions" %> active <% end %>" href="/spam2/revisions"><i class="drop fa fa-list text-primary"></i> Revision</a>
+        <a class="drop_click dropdown-item <% if params[:action] == "_spam_comments" %> active <% end %>" href="/spam2/comments/filter/all/30" ><i class="drop fa fa-comment text-primary"></i> Comments</a>
+        <a class="drop_click dropdown-item <% if params[:action] == "_spam_flags" %> active <% end %>"  href="/spam2/flags/filter/all/30" ><i class="drop fa fa-flag text-primary"></i> Flag </a>
+        <a class="drop_click dropdown-item  <% if params[:action] == "_spam_users" %> active <% end %>" href="/spam2/users/filter/all/30"><i class="drop fa fa-user text-primary"></i> User moderation</a>
       </div>
     </div>
 </div>
 <script>
-  $('#wiki_drop').on('click', function () { // Wiki filter
+  $(document).on('click', '.drop_click', function(){
+    localStorage.setItem('page-select', "30");
+    localStorage.setItem('filter', 'all');
+  });
+  $(document).on('click', '.wiki_drop_click', function(){
     localStorage.setItem('page-select', "30");
     localStorage.setItem('filter', 'wiki');
   });
@@ -100,7 +104,10 @@
     <option value="30">30</option>
     <option value="50">50</option>
     <option value="100">100</option>
-    <option value="150">150</option>
+    <option value="200">200</option>
+    <option value="400">400</option>
+    <option value="600">600</option>
+    <option value="1000">1000</option>
   </select> 
 </div>
 <% end %>
diff --git a/app/views/spam2/_users.html.erb b/app/views/spam2/_users.html.erb
index ea73cdfd35b..0249f59fa8f 100644
--- a/app/views/spam2/_users.html.erb
+++ b/app/views/spam2/_users.html.erb
@@ -8,6 +8,8 @@ $(document).ready(function () {
 		$('#selectall').prop("checked", check);
 		disable_buttons('#selectall');
   });
+  var pageselect = localStorage.getItem('page-select') || '30';
+  $("#pageselect").val(pageselect);
 	$('#pageselect').change(function () {  
 		pagination("#pageselect", "/spam2/users/filter/");
   });