active_scaffold 4.1.6 → 4.2.1

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column
@@ -23,7 +25,7 @@ module ActiveScaffold
 
         elsif column.association
           # if we get here, it's because the column has a form_ui but not one ActiveScaffold knows about.
-          raise "Unknown form_ui `#{column.form_ui}' for column `#{column.name}'" if column.form_ui
+          raise ArgumentError, "Unknown form_ui `#{column.form_ui}' for column `#{column.name}'" if column.form_ui
 
           # its an association and nothing is specified, we will assume form_ui :select
           active_scaffold_input_select(column, options)
@@ -47,14 +49,15 @@ module ActiveScaffold
           text_field(:record, column.name, options.merge(column.options).except(:format))
         end
       rescue StandardError => e
-        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
-        raise e
+        message = "on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        ActiveScaffold.log_exception(e, message)
+        raise e.class, "#{e.message} -- #{message}", e.backtrace
       end
 
       def active_scaffold_render_subform_column(column, scope, crud_type, readonly, add_class = false, record = nil) # rubocop:disable Metrics/ParameterLists
         if add_class
           col_class = []
-          col_class << 'required' if column.required?(action_for_validation?(record))
+          col_class << 'required' if column.required?(action_for_validation(record))
           col_class << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
           col_class << 'hidden' if column_renders_as(column) == :hidden
           col_class << 'checkbox' if column.form_ui == :checkbox
@@ -77,6 +80,18 @@ module ActiveScaffold
         }
       end
 
+      def active_scaffold_subform_record_actions(association_column, record, locked, scope)
+        return unless association_column.association.collection? && !locked
+
+        auth = %i[destroy delete_all delete].exclude?(association_column.association.dependent)
+        auth, reason = record.authorized_for?(crud_type: :delete, reason: true) unless auth
+        if auth
+          link_to(as_(:remove), '#', class: 'destroy')
+        else
+          content_tag :span, reason, class: 'destroy reason'
+        end
+      end
+
       # the standard active scaffold options used for textual inputs
       def active_scaffold_input_text_options(options = {})
         options[:autocomplete] ||= 'off'
@@ -84,7 +99,7 @@ module ActiveScaffold
         options
       end
 
-      def action_for_validation?(record)
+      def action_for_validation(record)
         record&.persisted? ? :update : :create
       end
 
@@ -94,7 +109,7 @@ module ActiveScaffold
         record = options[:object]
 
         # Add some HTML5 attributes for in-browser validation and better user experience
-        if column.required?(action_for_validation?(record)) && (!@disable_required_for_new || scope.nil? || record&.persisted?)
+        if column.required?(action_for_validation(record)) && (!@disable_required_for_new || scope.nil? || record&.persisted?)
           options[:required] = true
         end
         options[:placeholder] = column.placeholder if column.placeholder.present?
@@ -112,7 +127,9 @@ module ActiveScaffold
       end
 
       def current_form_columns(record, scope, subform_controller = nil)
-        if scope
+        if @main_columns && (scope.nil? || subform_controller == controller.class)
+          @main_columns.visible_columns_names
+        elsif scope
           subform_controller.active_scaffold_config.subform.columns.visible_columns_names
         elsif %i[new create edit update render_field].include? action_name.to_sym
           # disable update_columns for inplace_edit (GET render_field)
@@ -122,29 +139,33 @@ module ActiveScaffold
         end
       end
 
+      def url_options_for_render_field(column, record, scope, subform_controller, url_params)
+        url_params.reverse_merge! params_for(action: 'render_field', column: column.name, id: record.to_param)
+        if nested? && scope
+          url_params[:nested] = url_params.slice(:parent_scaffold, :association, nested.param_name)
+          url_params = url_params.except(:parent_scaffold, :association, nested.param_name)
+        end
+        if scope
+          url_params[:parent_controller] ||= url_params[:controller].gsub(%r{^/}, '')
+          url_params[:controller] = subform_controller.controller_path
+          url_params[:scope] = scope
+          url_params[:parent_id] = params[:parent_id] || params[:id]
+        end
+        url_params
+      end
+
       def update_columns_options(column, scope, options, force = false, form_columns: nil, url_params: {})
         record = options[:object]
         subform_controller = controller.class.active_scaffold_controller_for(record.class) if scope
-        if @main_columns && (scope.nil? || subform_controller == controller.class)
-          form_columns ||= @main_columns.visible_columns_names
-        end
         form_columns ||= current_form_columns(record, scope, subform_controller)
-        if force || (form_columns && column.update_columns&.intersect?(form_columns))
-          url_params.reverse_merge! params_for(action: 'render_field', column: column.name, id: record.to_param)
-          if nested? && scope
-            url_params[:nested] = url_params.slice(:parent_scaffold, :association, nested.param_name)
-            url_params = url_params.except(:parent_scaffold, :association, nested.param_name)
-          end
-          if scope
-            url_params[:parent_controller] ||= url_params[:controller].gsub(%r{^/}, '')
-            url_params[:controller] = subform_controller.controller_path
-            url_params[:scope] = scope
-            url_params[:parent_id] = params[:parent_id] || params[:id]
-          end
+        update_columns = column.update_columns&.flat_map { |col| col.is_a?(Hash) ? col.keys : col }
+        force = true if update_columns&.include?(:__root__)
 
+        if force || (form_columns && update_columns&.intersect?(form_columns))
+          url_params = url_options_for_render_field(column, record, scope, subform_controller, url_params)
           options[:class] = "#{options[:class]} update_form".strip
           options['data-update_url'] = url_for(url_params)
-          options['data-update_send_form'] = column.send_form_on_update_column
+          options['data-update_send_form'] = column.update_columns&.any?(Hash) || column.send_form_on_update_column
           options['data-update_send_form_selector'] = column.options[:send_form_selector] if column.options[:send_form_selector]
           options['data-skip-disable-form'] = !column.disable_on_update_column
         end
@@ -203,13 +224,18 @@ module ActiveScaffold
         end
       end
 
+      def column_description(column, record, scope = nil)
+        desc = column.description(record, scope)
+        content_tag(:span, h(desc) + content_tag(:span, nil, class: 'close'), class: 'description') if desc.present?
+      end
+
       def form_attribute(column, record, scope = nil, only_value = false, col_class = nil)
         column_options = active_scaffold_input_options(column, scope, object: record)
         collapsible_id = column_options.delete :collapsible_id
         attributes = field_attributes(column, record)
         attributes[:class] = "#{attributes[:class]} #{col_class}" if col_class.present?
         if only_value
-          field = content_tag(:span, get_column_value(record, column), column_options.except(:name, :object))
+          field = content_tag(:span, show_column_value(record, column), column_options.except(:name, :object))
           if column.association.nil? || column.association.belongs_to?
             # hidden field probably not needed, but leaving it just in case
             # but it isn't working for assocations which are not belongs_to
@@ -221,8 +247,8 @@ module ActiveScaffold
         end
         if field
           field << loading_indicator_tag(action: :render_field, id: params[:id]) if column.update_columns
-          desc = column.description(record, scope)
-          field << content_tag(:span, desc, class: 'description') if desc.present?
+          desc = column_description(column, record, scope)
+          field << desc if desc.present?
         end
 
         label = label_tag(label_for(column, column_options), form_column_label(column, record, scope))
@@ -352,7 +378,6 @@ module ActiveScaffold
             collection_select(:record, method, select_options, :id, ui_options[:label_method] || :to_label, options, html_options)
           end
         html << active_scaffold_refresh_link(column, html_options, record, ui_options) if ui_options[:refresh_link]
-        html << active_scaffold_add_new(column, record, html_options, ui_options: ui_options) if ui_options[:add_new]
         html
       end
 
@@ -368,19 +393,7 @@ module ActiveScaffold
 
       def active_scaffold_add_new(column, record, html_options, ui_options: column.options, skip_link: false)
         options = ui_options[:add_new] == true ? {} : ui_options[:add_new]
-        if options.is_a?(Array)
-          ActiveScaffold.deprecator.warn "use add_new: {types: #{options.inspect}} instead of add_new: #{options.inspect}"
-          options = {types: options}
-        end
-        if ui_options[:hide_subgroups] && !options.key?(:hide_subgroups)
-          ActiveScaffold.deprecator.warn "use add_new: {hide_subgroups: #{ui_options[:hide_subgroups]}} instead of hide_subgroups: #{ui_options[:hide_subgroups]}"
-          options[:hide_subgroups] = ui_options[:hide_subgroups]
-        end
-        if ui_options[:layout] && !options.key?(:layout)
-          ActiveScaffold.deprecator.warn "use add_new: {layout: #{ui_options[:layout]}} instead of layout: #{ui_options[:layout]}"
-          options[:layout] = ui_options[:layout]
-        end
-
+        options[:mode] = :popup if column.association&.collection?
         case options[:mode]
         when nil, :subform
           active_scaffold_new_record_subform(column, record, html_options, options: options, skip_link: skip_link)
@@ -461,36 +474,37 @@ module ActiveScaffold
         link_to(label, '#', data: data, class: 'show-new-subform')
       end
 
-      def active_scaffold_file_with_remove_link(column, options, content, remove_file_prefix, controls_class, ui_options: column.options, &block)
+      def active_scaffold_file_with_content(column, options, content, remove_file_prefix, controls_class, ui_options: column.options)
         options = active_scaffold_input_text_options(options.merge(ui_options))
+        options[:style] = 'display: none' if content
+        field = file_field(:record, column.name, options)
+
         if content
-          active_scaffold_file_with_content(column, content, options, remove_file_prefix, controls_class, &block)
+          content = [content, ' | ']
+          content << yield if block_given?
+          object_name, method = options[:name].split(/\[(#{column.name})\]/)
+          method.sub!(/#{column.name}/, "#{remove_file_prefix}\\0")
+          content << hidden_field(object_name, method, value: 'false', class: 'remove_file')
+          active_scaffold_file_with_remove_link(safe_join(content), options, controls_class) { field }
         else
-          file_field(:record, column.name, options)
+          field
         end
       end
 
-      def active_scaffold_file_with_content(column, content, options, remove_file_prefix, controls_class)
+      def active_scaffold_file_with_remove_link(content, options, controls_class, link_key = nil)
         required = options.delete(:required)
-        js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
-        js_dont_remove_file_code = "jQuery(this).parents('div.#{controls_class}').find('input.remove_file').val('false'); return false;"
-
-        object_name, method = options[:name].split(/\[(#{column.name})\]/)
-        method.sub!(/#{column.name}/, "#{remove_file_prefix}\\0")
-        fields = block_given? ? yield : ''
-        link_key = options[:multiple] ? :remove_files : :remove_file
-        input = file_field(:record, column.name, options.merge(onchange: js_dont_remove_file_code))
-        content_tag(:div, class: controls_class) do
-          content_tag(:div) do
-            safe_join [content, ' | ', fields,
-                       hidden_field(object_name, method, value: 'false', class: 'remove_file'),
-                       content_tag(:a, as_(link_key), href: '#', onclick: js_remove_file_code)]
-          end << content_tag(:div, input, style: 'display: none')
+        link_key ||= options[:multiple] ? :remove_files : :remove_file
+        content_tag(:div, class: "#{controls_class} file-input-controls", data: {required: required}) do
+          content_line = content_tag(:div) do
+            safe_join [content, content_tag(:a, as_(link_key), href: '#', class: 'remove-file-btn')]
+          end
+          content_line << yield if block_given?
+          content_line
         end
       end
 
       def active_scaffold_refresh_link(column, html_options, record, ui_options = {})
-        link_options = {object: record}
+        link_options = {object: record, data: {field_selector: ui_options[:field_selector] || "##{html_options[:id]}"}}
         if html_options['data-update_url']
           link_options['data-update_send_form'] = html_options['data-update_send_form']
           link_options['data-update_send_form_selector'] = html_options['data-update_send_form_selector']
@@ -533,7 +547,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_input_draggable(column, options, ui_options: column.options)
-        active_scaffold_input_plural_association(column, options.merge(draggable_lists: true), ui_options: ui_options)
+        active_scaffold_input_select(column, options.merge(draggable_lists: true), ui_options: ui_options)
       end
 
       def active_scaffold_checkbox_option(option, label_method, associated_ids, checkbox_options, li_options = {})
@@ -594,13 +608,20 @@ module ActiveScaffold
       end
 
       def active_scaffold_input_select(column, html_options, ui_options: column.options)
-        if column.association&.singular?
-          active_scaffold_input_singular_association(column, html_options, ui_options: ui_options)
-        elsif column.association&.collection?
-          active_scaffold_input_plural_association(column, html_options, ui_options: ui_options)
-        else
-          active_scaffold_input_enum(column, html_options, ui_options: ui_options)
+        record = html_options[:object]
+        html =
+          if column.association&.singular?
+            active_scaffold_input_singular_association(column, html_options, ui_options: ui_options)
+          elsif column.association&.collection?
+            active_scaffold_input_plural_association(column, html_options, ui_options: ui_options)
+          else
+            active_scaffold_input_enum(column, html_options, ui_options: ui_options)
+          end
+        if ui_options[:add_new]
+          html = content_tag(:div, html, class: 'select-field') <<
+                 active_scaffold_add_new(column, record, html_options, ui_options: ui_options)
         end
+        html
       end
 
       def active_scaffold_input_select_multiple(column, options, ui_options: column.options)
@@ -623,6 +644,54 @@ module ActiveScaffold
         content_tag(:label, radio_button(:record, column.name, value, radio_options) + text)
       end
 
+      def active_scaffold_input_radio_content(column, record, options, html_options, ui_options)
+        if ui_options[:add_new]
+          add_new_subform = ui_options[:add_new] == true || ui_options[:add_new][:mode].in?([nil, :subform])
+          if add_new_subform
+            html_options[:data] ||= {}
+            html_options[:data][:subform_id] = active_scaffold_subform_attributes(column, ui_options: ui_options)[:id]
+          end
+          radio_html_options = html_options.merge(class: "#{html_options[:class]} hide-new-subform")
+        else
+          radio_html_options = html_options
+        end
+
+        selected = record.send(column.association.name) if column.association
+        radios = options.map do |option|
+          active_scaffold_radio_option(option, selected&.id, column, radio_html_options, ui_options: ui_options)
+        end
+
+        if ui_options[:include_blank]
+          label = ui_options[:include_blank]
+          label = as_(ui_options[:include_blank]) if ui_options[:include_blank].is_a?(Symbol)
+          radio_id = "#{html_options[:id]}-"
+          radios.prepend content_tag(:label, radio_button(:record, column.name, '', html_options.merge(id: radio_id)) + label)
+        end
+        if ui_options[:add_new]
+          if add_new_subform
+            create_new = content_tag(:label) do
+              radio_button_tag(html_options[:name], '', selected&.new_record?, html_options.merge(
+                id: "#{html_options[:id]}-create_new", class: "#{html_options[:class]} show-new-subform"
+              ).except(:object)) <<
+                active_scaffold_add_new_text(ui_options[:add_new], :add_new_text, :create_new)
+            end
+            radios << create_new
+            skip_link = true
+          else
+            ui_options = ui_options.merge(add_new: ui_options[:add_new].merge(
+              url_options: {
+                parent_scope: html_options[:name].gsub(/^record|\[[^\]]*\]$/, '').presence,
+                radio_data: html_options.slice(*html_options.keys.grep(/^data-update_/))
+              }
+            ))
+            radios << content_tag(:span, '', class: 'new-radio-container', id: html_options[:id])
+          end
+          radios << active_scaffold_add_new(column, record, html_options, ui_options: ui_options, skip_link: skip_link)
+        end
+
+        safe_join radios
+      end
+
       def active_scaffold_input_radio(column, html_options, ui_options: column.options)
         record = html_options[:object]
         html_options.merge!(ui_options[:html_options] || {})
@@ -635,53 +704,19 @@ module ActiveScaffold
             send(enum_options_method, column, record, ui_options: ui_options)
           end
 
-        selected = record.send(column.association.name) if column.association
-        selected_id = selected&.id
         if options.present?
+          html = active_scaffold_input_radio_content(column, record, options, html_options, ui_options)
+        else
+          html = content_tag(:span, as_(:no_options), class: "#{html_options[:class]} no-options")
+          html << hidden_field_tag(html_options[:name], '', id: html_options[:id])
           if ui_options[:add_new]
-            html_options[:data] ||= {}
-            html_options[:data][:subform_id] = active_scaffold_subform_attributes(column, ui_options: ui_options)[:id]
-            radio_html_options = html_options.merge(class: "#{html_options[:class]} hide-new-subform")
-          else
-            radio_html_options = html_options
-          end
-          radios = options.map do |option|
-            active_scaffold_radio_option(option, selected_id, column, radio_html_options, ui_options: ui_options)
-          end
-          if ui_options[:include_blank]
-            label = ui_options[:include_blank]
-            label = as_(ui_options[:include_blank]) if ui_options[:include_blank].is_a?(Symbol)
-            radio_id = "#{html_options[:id]}-"
-            radios.prepend content_tag(:label, radio_button(:record, column.name, '', html_options.merge(id: radio_id)) + label)
-          end
-          if ui_options[:add_new]
-            if ui_options[:add_new] == true || ui_options[:add_new][:mode].in?([nil, :subform])
-              create_new = content_tag(:label) do
-                radio_button_tag(html_options[:name], '', selected&.new_record?, html_options.merge(
-                  id: "#{html_options[:id]}-create_new", class: "#{html_options[:class]} show-new-subform"
-                ).except(:object)) <<
-                  active_scaffold_add_new_text(ui_options[:add_new], :add_new_text, :create_new)
-              end
-              radios << create_new
-              skip_link = true
-            else
-              ui_options = ui_options.merge(add_new: ui_options[:add_new].merge(
-                url_options: {
-                  parent_scope: html_options[:name].gsub(/^record|\[[^\]]*\]$/, '').presence,
-                  radio_data: html_options.slice(*html_options.keys.grep(/^data-update_/))
-                }
-              ))
-              radios << content_tag(:span, '', class: 'new-radio-container', id: html_options[:id])
-            end
-            radios << active_scaffold_add_new(column, record, html_options, ui_options: ui_options, skip_link: skip_link)
+            html = content_tag(:div, html, class: 'select-field') <<
+                   active_scaffold_add_new(column, record, html_options, ui_options: ui_options)
           end
-          safe_join radios
-        else
-          html = content_tag(:span, as_(:no_options), class: "#{html_options[:class]} no-options", id: html_options[:id])
-          html << hidden_field_tag(html_options[:name], '', id: nil)
-          html << active_scaffold_add_new(column, record, html_options, ui_options: ui_options) if ui_options[:add_new]
           html
         end
+        html << active_scaffold_refresh_link(column, html_options, record, ui_options.merge(field_selector: "[name=\"#{html_options[:name]}\"]")) if ui_options[:refresh_link]
+        html
       end
 
       def active_scaffold_input_checkbox(column, options, ui_options: column.options)
@@ -851,9 +886,9 @@ module ActiveScaffold
         end
       end
 
-      def column_scope(column, scope = nil, record = nil)
+      def column_scope(column, scope = nil, record = nil, generated_id = nil)
         if column.association&.collection?
-          "#{scope}[#{column.name}][#{record.id || generate_temporary_id(record)}]"
+          "#{scope}[#{column.name}][#{record.id || generate_temporary_id(record, generated_id)}]"
         else
           "#{scope}[#{column.name}]"
         end

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with rendering of a human readable search statement

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # A bunch of helper methods to produce the common view ids

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a List Column
@@ -22,8 +24,9 @@ module ActiveScaffold
         value = ' '.html_safe if value.nil? || value.blank? # fix for IE 6
         value
       rescue StandardError => e
-        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
-        raise e
+        message = "on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
+        ActiveScaffold.log_exception(e, message)
+        raise e.class, "#{e.message} -- #{message}", e.backtrace
       end
 
       def get_column_method(record, column)
@@ -62,8 +65,9 @@ module ActiveScaffold
           text
         end
       rescue StandardError => e
-        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
-        raise e
+        message = "on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        ActiveScaffold.log_exception(e, message)
+        raise e.class, "#{e.message} -- #{message}", e.backtrace
       end
 
       def column_wrap_tag
@@ -303,7 +307,7 @@ module ActiveScaffold
             empty_field_text(column)
           elsif column_value.is_a?(Time) || column_value.is_a?(Date)
             l(column_value, format: options&.dig(:format) || :default)
-          elsif !!column_value == column_value # rubocop:disable Style/DoubleNegation fast check for boolean
+          elsif !!column_value == column_value # rubocop:disable Style/DoubleNegation -- fast check for boolean
             as_(column_value.to_s.to_sym)
           else
             column_value.to_s

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     module PaginationHelpers
@@ -27,7 +29,7 @@ module ActiveScaffold
 
         html = []
         if current_page.number == 1
-          last_page = 0 # rubocop:disable Lint/UselessAssignment
+          last_page = 0
         else
           last_page = 1
           last_page.upto([last_page + outer_window, current_page.number - 1].min) do |num|

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column
@@ -43,8 +45,9 @@ module ActiveScaffold
           text_field(:record, column.name, options.merge(column.options))
         end
       rescue StandardError => e
-        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
-        raise e
+        message = "on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        ActiveScaffold.log_exception(e, message)
+        raise e.class, "#{e.message} -- #{message}", e.backtrace
       end
 
       # the standard active scaffold options used for class, name and scope
@@ -205,13 +208,20 @@ module ActiveScaffold
       end
 
       def active_scaffold_search_range_comparator_options(column, ui_options: column.options)
-        select_options = ActiveScaffold::Finder::NUMERIC_COMPARATORS.collect { |comp| [as_(comp.downcase.to_sym), comp] }
+        select_options = []
         if active_scaffold_search_range_string?(column)
-          comparators = ActiveScaffold::Finder::STRING_COMPARATORS.collect { |title, comp| [as_(title), comp] }
-          select_options.unshift(*comparators)
+          if column.search_sql.present?
+            select_options.concat(ActiveScaffold::Finder::STRING_COMPARATORS.collect { |title, comp| [as_(title), comp] })
+          end
+          if ActiveScaffold::Finder::LOGICAL_COMPARATORS.present? && column.logical_search.present?
+            select_options.concat(ActiveScaffold::Finder::LOGICAL_COMPARATORS.collect { |comp| [as_(comp.downcase.to_sym), comp] })
+          end
         end
-        if include_null_comparators? column, ui_options: ui_options
-          select_options.concat(ActiveScaffold::Finder::NULL_COMPARATORS.collect { |comp| [as_(comp), comp] })
+        if column.search_sql.present?
+          select_options.concat(ActiveScaffold::Finder::NUMERIC_COMPARATORS.collect { |comp| [as_(comp.downcase.to_sym), comp] })
+          if include_null_comparators? column, ui_options: ui_options
+            select_options.concat(ActiveScaffold::Finder::NULL_COMPARATORS.collect { |comp| [as_(comp), comp] })
+          end
         end
         select_options
       end
@@ -338,7 +348,7 @@ module ActiveScaffold
                      options_for_select(active_scaffold_search_datetime_trend_units(column), current_search['unit']),
                      class: 'text-input')
         ]
-        show = current_search.key?(:show) ? current_search[:show] : current_search['opt'] == 'PAST' || current_search['opt'] == 'FUTURE'
+        show = current_search.key?(:show) ? current_search[:show] : %w[PAST FUTURE].include?(current_search['opt'])
         content_tag('span', safe_join(trend_controls, ' '),
                     id: "#{options[:id]}_trend", class: 'search-date-trend',
                     style: ('display: none' unless show))
@@ -407,7 +417,7 @@ module ActiveScaffold
         visibles = []
         hiddens = []
         columns.each_column do |column|
-          next unless column.respond_to?(:each_column) || column.search_sql
+          next unless column.respond_to?(:each_column) || column.searchable?
 
           if search_config.optional_columns.include?(column.name) && !searched_by?(column)
             hiddens << column

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a List Column
@@ -27,14 +29,14 @@ module ActiveScaffold
       end
 
       def active_scaffold_show_horizontal(record, column, ui_options: column.options)
-        raise ':horizontal show_ui must be used on association column' unless column.association
+        raise ArgumentError, ':horizontal show_ui must be used on association column' unless column.association
 
         vars = {column: column, parent_record: record, show_partial: :horizontal}
         render partial: 'show_association', locals: vars.merge(ui_options.slice(:tabbed_by, :tab_value, :tab_id))
       end
 
       def active_scaffold_show_vertical(record, column, ui_options: column.options)
-        raise ':vertical show_ui must be used on association column' unless column.association
+        raise ArgumentError, ':vertical show_ui must be used on association column' unless column.association
 
         render partial: 'show_association', locals: {column: column, parent_record: record, show_partial: :vertical}
       end

data/lib/active_scaffold/helpers/tabs_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers that assist with rendering of tabs in forms
@@ -59,13 +61,13 @@ module ActiveScaffold
       end
 
       def active_scaffold_tab(label, tab_id, active)
-        content_tag :li, class: "nav-item #{:active if active}" do
-          link_to(label, "##{tab_id}", class: 'nav-link', data: {toggle: :tab})
+        content_tag :li, class: 'nav-item' do
+          link_to(label, "##{tab_id}", class: "nav-link #{:active if active}", data: {bs_toggle: :tab})
         end
       end
 
       def active_scaffold_tab_content(tab_id, active, content)
-        content_tag(:div, content, class: "tab-pane fade#{' in active' if active}", id: tab_id)
+        content_tag(:div, content, class: "tab-pane fade#{' active show' if active}", id: tab_id)
       end
 
       def active_scaffold_tabs_for(column, record, subsection_id, tab_options, used_tabs)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # All extra helpers that should be included in the View.
@@ -20,9 +22,7 @@ module ActiveScaffold
       ##
 
       def active_scaffold_controller_for(klass)
-        ActiveScaffold::Registry.cache :as_controller, klass do
-          controller.class.active_scaffold_controller_for(klass)
-        end
+        controller.class.active_scaffold_controller_for(klass)
       end
 
       ##

data/lib/active_scaffold/marked_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module MarkedModel
     # This is a module aimed at making the make session_stored marked_records available to ActiveRecord models
@@ -5,11 +7,12 @@ module ActiveScaffold
     def self.included(base)
       base.class_eval do
         extend ClassMethods
+
         scope :as_marked, -> { where(primary_key => marked_record_ids) }
       end
     end
 
-    def as_marked
+    def as_marked # rubocop:disable Naming/PredicateMethod
       marked_records.include?(id.to_s)
     end
 
@@ -26,7 +29,7 @@ module ActiveScaffold
         ActiveScaffold::Registry.marked_records ||= {}
       end
 
-      def marked_records=(marked)
+      def marked_records=(marked) # rubocop:disable Rails/Delegate
         ActiveScaffold::Registry.marked_records = marked
       end
 
@@ -36,8 +39,6 @@ module ActiveScaffold
     end
 
     # Instance-level access to the marked_records
-    def marked_records
-      self.class.marked_records
-    end
+    delegate :marked_records, to: :class
   end
 end

data/lib/active_scaffold/orm_checks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module OrmChecks
     class << self