avo 3.7.1 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e38fc9752d4db0f6986c689d8dc5eafa64df514b411041ba8bfcb9507a5c5ad
-  data.tar.gz: ace327bb7d3c220da5ae56fa14d7bc278e4b5d62dcce413ba417b0bec92d6f65
+  metadata.gz: 14cb5c508e7408422bb0551c9a82571ea3467965cb91b9aa47488ebd8632a9b3
+  data.tar.gz: 0eb34a3785aeaaf47679d5ac189a5a8ac0ff8feb0758d217f1a5e9bc38ae17ca
 SHA512:
-  metadata.gz: b94790927c1949049b1575502ce7cc497169212410efd3d9f530373170c7b2e776ad303e51b49d432ac3aaafe9be6690f51d03e3b4a702bb311e60e0987ae0f6
-  data.tar.gz: 302af5c5888eb4c7b1ad58a5a6b62934884777059c86f884f46968e9c8cf0e4ceca7dbfeb37714ba481d63f9a8007f6a6fcdd73e534c0c9173bbf2baf305dbd5
+  metadata.gz: db7afe8be4b3a1967a8ada77d55eb58ab29f617d1a9394ed6e7801aae6e1be357682c6a1ddc54e9a170eaf478046bb0d18fc4f2b592a8e740d1abb2665dc0583
+  data.tar.gz: 658a22d98d8fd0f24d1ce61df6b11802f5e68b8d4e630b3df41b7a5742c6d7a74b46f02bcfb5bdc65673783188f0f278c5f86b826f09482d6115a6b6fc58f6f5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.7.1)
+    avo (3.7.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/base_component.rb

@@ -12,7 +12,7 @@ class Avo::BaseComponent < ViewComponent::Base
   # Use the @parent_resource to fetch the field using the @reflection name.
   def field
     reflection_name = params[:related_name]&.to_sym || @reflection.name
-    @parent_resource.get_field_definitions.find { |f| f.id == reflection_name }
+    @parent_resource.get_field(reflection_name)
   rescue
     nil
   end

data/app/components/avo/fields/common/heading_component.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag :div, class: "flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs", data: @data do %>
+<%= content_tag :div, class: @classes, data: @data do %>
   <div class="py-2 px-6 h-full w-full">
     <% if @field.as_html %>
       <%= sanitize @field.value %>

data/app/components/avo/fields/common/heading_component.rb

@@ -6,6 +6,7 @@ class Avo::Fields::Common::HeadingComponent < ViewComponent::Base
   def initialize(field:)
     @field = field
     @view = field.resource.view
+    @classes = "flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs #{@field.get_html(:classes, view: @view, element: :wrapper)}"
 
     @data = stimulus_data_attributes
     add_stimulus_attributes_for(field.resource, @data)

data/app/controllers/avo/associations_controller.rb

@@ -110,7 +110,7 @@ module Avo
     end
 
     def set_reflection_field
-      @field = @resource.get_field_definitions.find { |f| f.id == @related_resource_name.to_sym }
+      @field = @resource.get_field(@related_resource_name.to_sym)
       @field.hydrate(resource: @resource, record: @record, view: :new)
     rescue
     end

data/app/controllers/avo/base_controller.rb

@@ -34,21 +34,7 @@ module Avo
         @query = @query.includes(*@resource.includes)
       end
 
-      # Sort the items
-      if @index_params[:sort_by].present?
-        unless @index_params[:sort_by].eql? :created_at
-          @query = @query.unscope(:order)
-        end
-
-        # Check if the sortable field option is actually a proc and we need to do a custom sort
-        field_id = @index_params[:sort_by].to_sym
-        field = @resource.get_field_definitions.find { |field| field.id == field_id }
-        @query = if field&.sortable.is_a?(Proc)
-          Avo::ExecutionContext.new(target: field.sortable, query: @query, direction: @index_params[:sort_direction]).handle
-        else
-          @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
-        end
-      end
+      apply_sorting
 
       # Apply filters to the current query
       filters_to_be_applied.each do |filter_class, filter_value|
@@ -600,5 +586,33 @@ module Avo
     def apply_pagination
       @pagy, @records = @resource.apply_pagination(index_params: @index_params, query: pagy_query)
     end
+
+    def apply_sorting
+      return if @index_params[:sort_by].nil?
+
+      sort_by = @index_params[:sort_by].to_sym
+      if sort_by != :created_at
+        @query = @query.unscope(:order)
+      end
+
+      # Verify that sort_by param actually is bonded to a field.
+      field = @resource.get_field(sort_by)
+
+      # Check if the sortable field option is a proc and if there is a need to do a custom sort
+      @query = if field.present? && field.sortable.is_a?(Proc)
+        Avo::ExecutionContext.new(target: field.sortable, query: @query, direction: sanitized_sort_direction).handle
+      # Sanitize sort_by param by checking if have bounded field.
+      elsif field.present? && sanitized_sort_direction
+        @query.order("#{@resource.model_class.table_name}.#{sort_by} #{sanitized_sort_direction}")
+      # Transform Model to ActiveRecord::Relation because Avo expects one.
+      else
+        @query.where("1=1")
+      end
+    end
+
+    # Sanitize sort_direction param
+    def sanitized_sort_direction
+      @sanitized_sort_direction ||= @index_params[:sort_direction].presence_in(["asc", "desc"])
+    end
   end
 end

data/app/controllers/avo/search_controller.rb

@@ -173,9 +173,7 @@ module Avo
         user: _current_user
       )
 
-      reflection_resource.detect_fields.get_field_definitions.find do |field|
-        field.id.to_s == params[:via_association_id]
-      end
+      reflection_resource.detect_fields.get_field(params[:via_association_id])
     end
 
     def fetch_parent

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.7.1" unless const_defined?(:VERSION)
+  VERSION = "3.7.3" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.3
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord