add sorting for categories, add rescue for exeption if sorting params…

… are bad
ita-social-projects · Sep 19, 2023 · be90c6a · be90c6a
1 parent 92961c8
commit be90c6a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 2 deletions.
diff --git a/app/controllers/account/base_controller.rb b/app/controllers/account/base_controller.rb
@@ -10,4 +10,8 @@ class Account::BaseController < ApplicationController
       format.html { redirect_to root_path, alert: exception.message }
     end
   end
+
+  rescue_from ActiveRecord::StatementInvalid, ActiveRecord::UnknownAttributeReference do |exception|
+    redirect_back(fallback_location: root_path, alert: I18n.t("sort.sort_error"))
+  end
 end
diff --git a/app/controllers/account/categories_controller.rb b/app/controllers/account/categories_controller.rb
@@ -4,7 +4,7 @@ class Account::CategoriesController < Account::BaseController
   load_and_authorize_resource
 
   def index
-    @categories = collection
+    @categories = SortService.new(collection, params).call
   end
 
   def new

diff --git a/app/helpers/account/sort_helper.rb b/app/helpers/account/sort_helper.rb
@@ -29,4 +29,15 @@ def users_criterias
       [I18n.t("sort.last_sign_in_at_desc"), "last_sign_in_at desc"]
     ]
   end
+
+  def categories_criterias
+    [
+      [I18n.t("sort.id_asc"), "id asc"],
+      [I18n.t("sort.id_desc"), "id desc"],
+      [I18n.t("sort.name_asc"), "name asc"],
+      [I18n.t("sort.name_desc"), "name desc"],
+      [I18n.t("sort.priority_asc"), "priority asc"],
+      [I18n.t("sort.priority_desc"), "priority desc"]
+    ]
+  end
 end
diff --git a/app/views/account/categories/index.html.slim b/app/views/account/categories/index.html.slim
@@ -6,8 +6,9 @@
       span =t('.add_category_button')
 
 div class="container home"
+  = render 'account/shared/sort_selector', criterias: categories_criterias
 
-  table.table
+  table.table.mt-2
     thead
       tr
         th scope="col"  #

diff --git a/config/locales/en/en.yml b/config/locales/en/en.yml
@@ -713,3 +713,6 @@ en:
     email_desc: Email, descending
     last_sign_in_at_asc: Last sign in, ascending
     last_sign_in_at_desc: Last sign in, descending
+    priority_asc: Priority, ascending
+    priority_desc: Priority, descending
+    sort_error: Sorting by this parameter is not available
diff --git a/config/locales/uk/uk.yml b/config/locales/uk/uk.yml
@@ -769,3 +769,6 @@ uk:
     email_desc: Електронна адреса, за спаданням
     last_sign_in_at_asc: Час останнього візиту, за зростанням
     last_sign_in_at_desc: Час останнього візиту, за спаданням
+    priority_asc: Пріоритет, за зростанням
+    priority_desc: Пріоритет, за спаданням
+    sort_error: Сортування за цими параметрами недоступне