Update BE sorting for archived fodlers&projects

SCI-5306

app/assets/javascripts/projects/index.js

@@ -8,7 +8,7 @@
 // - refactor view handling using library, ex. backbone.js
 
 /* global Comments CounterBadge animateSpinner initFormSubmitLinks HelperModule
-   I18n dropdownSelector Sidebar Turbolinks */
+   dropdownSelector Sidebar Turbolinks */
 
 (function(global) {
   var newProjectModal = null;
@@ -533,7 +533,7 @@
     // With turbolinks visit all those elements are updated.
     $(projectsPageSelector).on('click', '.archive-switch', function() {
       $(projectsPageSelector).find('.projects-container').remove();
-      Turbolinks.visit($(this).data('url'))
+      Turbolinks.visit($(this).data('url'));
     });
   }
 

app/assets/stylesheets/shared/content_pane.scss

@@ -25,13 +25,6 @@
       .caret {
         margin: 8px 0 8px 8px;
       }
-
-      &.sort-switch {
-        .caret {
-          margin: unset;
-        }
-      }
-
       &.open {
         .caret {
           transform: rotateX(180deg)
@@ -55,10 +48,6 @@
             background: $color-concrete;
           }
         }
-
-        &.sort-projects-menu {
-          min-width: 140px;
-        }
       }
     }
   }

app/helpers/projects_helper.rb

@@ -26,9 +26,9 @@ module ProjectsHelper
               when 'ztoa'
                 records.sort_by { |c| c.name.downcase }.reverse!
               when 'arch_old'
-                records.sort_by { |c| [c.class.to_s, c.archived_on] }
+                records.sort_by(&:archived_on)
               when 'arch_new'
-                records.sort_by { |c| [c.class.to_s, -c.archived_on.to_i] }
+                records.sort_by(&:archived_on).reverse!
               end
     folders_recursive_builder(nil, records)
   end

app/models/project_folder.rb

@@ -90,12 +90,6 @@ class ProjectFolder < ApplicationRecord
     end.flatten
   end
 
-  # projects_overview_service.rb needs archived_on for sorting. ProjectFolder does not have archived_on,
-  # we will use created_at instead.
-  def archived_on
-    created_at
-  end
-
   private
 
   def inherit_team_from_parent_folder

app/services/projects_overview_service.rb

@@ -188,9 +188,9 @@ class ProjectsOverviewService
     when 'ztoa'
       records.sort_by { |c| c.name.downcase }.reverse!
     when 'arch_old'
-      records.sort_by { |c| [c.class.to_s, c.archived_on] }
+      records.sort_by(&:archived_on)
     when 'arch_new'
-      records.sort_by { |c| [c.class.to_s, -c.archived_on.to_i] }
+      records.sort_by(&:archived_on).reverse!
     end
   end
 end