active_scaffold 3.7.5 → 3.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba64ea5cfd0c7476b2a534dd60d646c9b25b00f86278873e132d930336007673
-  data.tar.gz: 5ec04a9180e01392a6718ba25453a2731819a53551ef15de1e58e207533b1881
+  metadata.gz: cfe45d0a0b28f5cb324e7104add97e7a105de6986accf8d64db02cf5f65f19ea
+  data.tar.gz: f8461b6a58ce6b1c93df2eaf95540a759fdcd73d21f256ee1a38ea4436b73987
 SHA512:
-  metadata.gz: 67a8322a087fbb94b4c2b51d2bb8a4687fe76e0d4c73eae18d57b30d2457fb85bbe30d67c5b84a1e3b6dfd0100710b79cd304d81cac087d49f9f0967900343df
-  data.tar.gz: ff5d7ae043ba814460a375d3f146115fc8b9fd0a21b5d9ea7c31410ff52b85c83641d27ac5ab9c99724b22e38265542eb141c8eafd64ba173e76e0c4145ecefb
+  metadata.gz: a65de91f886605e57d0f183295d9d1f8ea358b4657826143265f8359f4d41761b6325644fcb6d5dc1d5e5d4b87bbc966bf8cd9d4ee66db0ae4048455eb0c6b62
+  data.tar.gz: 9fb4e3b6a38c5f340cdf430146ae9616a5e9a93e66c11e32dece9cb5704229499610da861916371e3bafb973d43705c9716228b5d04c50f896d5538320e0125c

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= 3.7.6
+- Respect :label_method set in form_ui_options on list.
+- Fix grouped search for PostgreSQL
+- Fix loading current search params when search form is open and store_user_settings is disabled
+
 = 3.7.5
 - Fix always show search for nested list on multi-level through associations
 - Support changing step, min and max options with column options or search_ui options for decimal and integer search_ui

data/lib/active_scaffold/actions/common_search.rb

@@ -3,9 +3,9 @@ module ActiveScaffold::Actions
     def self.included(base)
       return if base < InstanceMethods
       base.send :include, InstanceMethods
-      base.before_action :search_authorized_filter, :only => :show_search
-      base.before_action :store_search_params_into_session, :only => [:index]
-      base.before_action :do_search, :only => [:index]
+      base.before_action :search_authorized_filter, only: :show_search
+      base.before_action :store_search_params_into_session, :only => %i[index show_search]
+      base.before_action :do_search, only: [:index]
       base.helper_method :search_params
     end
 

data/lib/active_scaffold/actions/field_search.rb

@@ -56,25 +56,33 @@ module ActiveScaffold::Actions
 
       def custom_finder_options
         if grouped_search?
-          group_sql = calculation_for_group_by(search_group_column&.field || search_group_name)
-          select_query = grouped_search_select
-          select_query << group_sql.as(search_group_column.name.to_s) if search_group_column && group_sql.respond_to?(:to_sql)
-          {group: group_sql, select: select_query}
+          grouped_search_finder_options
         else
           super
         end
       end
 
+      def grouped_search_finder_options
+        group_sql = calculation_for_group_by(search_group_column&.field || search_group_name, search_group_function) if search_group_function
+        group_by = group_sql&.to_sql || quoted_select_columns(search_group_column&.select_columns || [search_group_name])
+        select_query = grouped_search_select + (group_sql ? [group_sql.as(search_group_column.name.to_s)] : group_by)
+        {group: group_by, select: select_query, reorder: grouped_sorting(group_by)}
+      end
+
       def grouped_search_select
-        select_query = quoted_select_columns(search_group_column&.select_columns || [search_group_name])
-        if active_scaffold_config.model.columns_hash.include?(active_scaffold_config.model.inheritance_column)
-          select_query << active_scaffold_config.columns[active_scaffold_config.model.inheritance_column].field
-        end
-        grouped_columns_calculations.each do |name, part|
-          select_query << (part.respond_to?(:as) ? part : Arel::Nodes::SqlLiteral.new(part)).as(name.to_s)
+        grouped_columns_calculations.map do |name, part|
+          (part.respond_to?(:as) ? part : Arel::Nodes::SqlLiteral.new(part)).as(name.to_s)
         end
       end
 
+      def grouped_sorting(group_sql)
+        return unless search_group_column && active_scaffold_config.list.user.sorting
+        group_sort = search_group_function ? group_sql : search_group_column.sort[:sql] if search_group_column.sortable?
+        grouped_columns = grouped_columns_calculations.merge(search_group_column.name => group_sort)
+        sorting = active_scaffold_config.list.user.sorting.clause(grouped_columns)
+        active_scaffold_config.active_record? ? sorting&.map(&Arel.method(:sql)) : sorting
+      end
+
       def grouped_columns_calculations
         @grouped_columns_calculations ||= list_columns[1..-1].each_with_object({}) do |c, h|
           h[c.name] = calculation_for_group_search(c)
@@ -85,21 +93,24 @@ module ActiveScaffold::Actions
         sql_function column.calculate.to_s, column.active_record_class.arel_table[column.name]
       end
 
-      def calculation_for_group_by(group_sql)
-        return group_sql unless search_group_function
+      def calculation_for_group_by(group_sql, group_function)
         group_sql = Arel::Nodes::SqlLiteral.new(group_sql)
-        case search_group_function
+        case group_function
         when 'year', 'month', 'quarter'
-          sql_function(search_group_function, group_sql)
+          extract_sql_fn(group_function, group_sql)
         when 'year_month'
-          sql_function('extract', sql_operator(Arel::Nodes::SqlLiteral.new('YEAR_MONTH'), 'FROM', group_sql))
+          sql_operator(sql_operator(extract_sql_fn('year', group_sql), '*', 100), '+', extract_sql_fn('month', group_sql))
         when 'year_quarter'
-          sql_operator(sql_operator(sql_function('year', group_sql), '*', 10), '+', sql_function('quarter', group_sql))
+          sql_operator(sql_operator(extract_sql_fn('year', group_sql), '*', 10), '+', extract_sql_fn('quarter', group_sql))
         else
-          raise "#{search_group_function} unsupported, override calculation_for_group_by in #{self.class.name}"
+          raise "#{group_function} unsupported, override calculation_for_group_by in #{self.class.name}"
         end
       end
 
+      def extract_sql_fn(part, column)
+        sql_function('extract', sql_operator(Arel::Nodes::SqlLiteral.new(part), 'FROM', column))
+      end
+
       def sql_function(function, *args)
         args.map! { |arg| quoted_arel_value(arg) }
         Arel::Nodes::NamedFunction.new(function, args)

data/lib/active_scaffold/data_structures/sorting.rb

@@ -121,14 +121,14 @@ module ActiveScaffold::DataStructures
     end
 
     # builds an order-by clause
-    def clause(grouped_columns_calculations = nil)
+    def clause(grouped_columns = nil)
       return nil if sorts_by_method? || default_sorting?
 
       # unless the sorting is by method, create the sql string
       order = []
       each do |sort_column, sort_direction|
         next if constraint_columns.include? sort_column.name
-        sql = grouped_columns_calculations&.dig(sort_column.name) || sort_column.sort[:sql]
+        sql = grouped_columns ? grouped_columns[sort_column.name] : sort_column.sort[:sql]
         next if sql.blank?
         sql = sql.to_sql if sql.respond_to?(:to_sql)
 
@@ -138,7 +138,7 @@ module ActiveScaffold::DataStructures
         order << parts
       end
 
-      order << @primary_key_order_clause if @sorting_by_primary_key
+      order << @primary_key_order_clause if @sorting_by_primary_key && grouped_columns.nil?
       order.flatten!(1)
       order unless order.empty?
     end

data/lib/active_scaffold/finder.rb

@@ -577,7 +577,7 @@ module ActiveScaffold
     def finder_options(options = {})
       search_conditions = all_conditions
 
-      sorting = options[:sorting]&.clause((grouped_columns_calculations if grouped_search?))
+      sorting = options[:sorting]&.clause
       sorting = sorting.map(&Arel.method(:sql)) if sorting && active_scaffold_config.active_record?
       # create a general-use options array that's compatible with Rails finders
       finder_options = {

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -226,7 +226,10 @@ module ActiveScaffold
           I18n.t(options[:group_format] || search_group_function, scope: 'date.formats', num: value)
         when 'month'
           I18n.l(Date.new(Time.zone.today.year, value, 1), format: options[:group_format] || search_group_function.to_sym)
-        else value
+        when 'year'
+          value.to_i
+        else
+          value
         end
       end
 
@@ -263,7 +266,7 @@ module ActiveScaffold
       end
 
       def format_association_value(value, column, size)
-        method = column.options[:label_method] || :to_label
+        method = (column.list_ui_options || column.options)[:label_method] || :to_label
         value =
           if column.association.collection?
             format_collection_association_value(value, column, method, size)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 7
-    PATCH = 5
+    PATCH = 6
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

data/test/misc/finder_test.rb

@@ -75,13 +75,13 @@ class FinderTest < Minitest::Test
 
   def test_condition_for_column
     column = ActiveScaffold::DataStructures::Column.new('adult', Person)
-    assert_equal ['"people"."adult" = ?', false], ClassWithFinder.condition_for_column(column, '0')
+    assert_equal ['"people"."adult" = ?', false], ClassWithFinder.condition_for_column(column, '0', :full, {})
   end
 
   def test_condition_for_polymorphic_column
     column = ActiveScaffold::DataStructures::Column.new('addressable', Address)
     column.search_sql = [{subquery: [Building, 'name']}]
-    condition = ClassWithFinder.condition_for_column(column, 'test search')
+    condition = ClassWithFinder.condition_for_column(column, 'test search', :full, {})
     assert_equal Building.where(['name LIKE ?', '%test search%']).select(:id).to_sql, condition[1].to_sql
     assert_equal '"addresses"."addressable_id" IN (?) AND "addresses"."addressable_type" = ?', condition[0]
     assert_equal ['Building'], condition[2..-1]
@@ -90,7 +90,7 @@ class FinderTest < Minitest::Test
   def test_condition_for_polymorphic_column_with_relation
     column = ActiveScaffold::DataStructures::Column.new('contactable', Contact)
     column.search_sql = [{subquery: [Person.joins(:buildings), 'first_name', 'last_name']}]
-    condition = ClassWithFinder.condition_for_column(column, 'test search')
+    condition = ClassWithFinder.condition_for_column(column, 'test search', :full, {})
     assert_equal Person.joins(:buildings).where(['first_name LIKE ? OR last_name LIKE ?', '%test search%', '%test search%']).select(:id).to_sql, condition[1].to_sql
     assert_equal '"contacts"."contactable_id" IN (?) AND "contacts"."contactable_type" = ?', condition[0]
     assert_equal ['Person'], condition[2..-1]
@@ -100,7 +100,7 @@ class FinderTest < Minitest::Test
     column = ActiveScaffold::DataStructures::Column.new('owner', Building)
     column.search_sql = [{subquery: [Person, 'first_name', 'last_name'], conditions: ['floor_count > 0']}]
     column.search_ui = :text
-    condition = ClassWithFinder.condition_for_column(column, 'test search')
+    condition = ClassWithFinder.condition_for_column(column, 'test search', :full, {})
     assert_equal Person.where(['first_name LIKE ? OR last_name LIKE ?', '%test search%', '%test search%']).select(:id).to_sql, condition[1].to_sql
     assert_equal '"buildings"."owner_id" IN (?) AND floor_count > 0', condition[0]
     assert_equal [], condition[2..-1]
@@ -110,7 +110,7 @@ class FinderTest < Minitest::Test
     column = ActiveScaffold::DataStructures::Column.new('owner', Building)
     column.search_sql = [{subquery: [Person, 'first_name', 'last_name'], conditions: ['floor_count > 0 AND name != ?', '']}]
     column.search_ui = :text
-    condition = ClassWithFinder.condition_for_column(column, 'test search')
+    condition = ClassWithFinder.condition_for_column(column, 'test search', :full, {})
     assert_equal Person.where(['first_name LIKE ? OR last_name LIKE ?', '%test search%', '%test search%']).select(:id).to_sql, condition[1].to_sql
     assert_equal '"buildings"."owner_id" IN (?) AND floor_count > 0 AND name != ?', condition[0]
     assert_equal [''], condition[2..-1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.7.5
+  version: 3.7.6
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails