active_scaffold 4.2.3 → 4.3.0

data/lib/active_scaffold/assets.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module ActiveScaffold
+  module Assets
+    autoload :CssDepsGenerator, 'active_scaffold/assets/css_deps_generator'
+    autoload :JqueryUiManifest, 'active_scaffold/assets/jquery_ui_manifest'
+    autoload :JqueryUiThemeGenerator, 'active_scaffold/assets/jquery_ui_theme_generator'
+
+    CORE_STYLESHEETS = ['active_scaffold/core'].freeze
+    CORE_JAVASCRIPTS = ['jquery.ba-throttle-debounce', 'jquery.visible.min', 'active_scaffold/jquery.editinplace', 'active_scaffold/active_scaffold'].freeze
+
+    class << self
+      # Returns array of stylesheet paths based on load mode
+      def active_scaffold_stylesheets(load = :all)
+        case load
+        when :all
+          CORE_STYLESHEETS + active_scaffold_stylesheets(:deps)
+        when :deps
+          jquery_ui_stylesheets + ActiveScaffold.stylesheets + bridge_stylesheets
+        when :core
+          CORE_STYLESHEETS
+        when :plugins
+          ActiveScaffold.stylesheets
+        when :bridges
+          bridge_stylesheets
+        when :jquery_ui
+          jquery_ui_stylesheets
+        else
+          raise ArgumentError, "Unknown load mode: #{load.inspect}"
+        end
+      end
+
+      # Returns array of javascript paths based on load mode
+      def active_scaffold_javascripts(load = :all)
+        case load
+        when :all
+          jquery_ui_javascripts + CORE_JAVASCRIPTS + ActiveScaffold.javascripts + bridge_javascripts
+        when :deps
+          jquery_ui_javascripts + ActiveScaffold.javascripts + bridge_javascripts
+        when :core
+          CORE_JAVASCRIPTS
+        when :plugins
+          ActiveScaffold.javascripts
+        when :bridges
+          bridge_javascripts
+        when :jquery_ui
+          jquery_ui_javascripts
+        else
+          raise ArgumentError, "Unknown load mode: #{load.inspect}"
+        end
+      end
+
+      def active_scaffold_js_code(load = :all)
+        code =
+          case load
+          when :all
+            [jquery_ui_js_code, active_scaffold_js_config]
+          when :deps, :jquery_ui
+            [jquery_ui_js_code]
+          when :core
+            [active_scaffold_js_config]
+          when :plugins, :bridges
+            []
+          else
+            raise ArgumentError, "Unknown load mode: #{load.inspect}"
+          end
+        code.join("\n")
+      end
+
+      private
+
+      def jquery_ui_stylesheets
+        return [] unless ActiveScaffold.jquery_ui_included?
+
+        sheets = []
+        if Object.const_defined?(:Jquery) && Jquery.const_defined?(:Ui)
+          sheets << 'active_scaffold/jquery-ui/theme' if defined?(Propshaft)
+          sheets << 'jquery-ui/datepicker'
+        end
+        sheets << 'jquery-ui-theme' if ActiveScaffold.jquery_ui_included?
+        sheets
+      end
+
+      def bridge_stylesheets
+        ActiveScaffold::Bridges.all_stylesheets
+      end
+
+      def jquery_ui_javascripts
+        return [] unless ActiveScaffold.jquery_ui_included?
+
+        # For Propshaft, we need all jQuery UI dependencies
+        ActiveScaffold::Assets::JqueryUiManifest.all_dependencies +
+          ['jquery-ui-timepicker-addon', 'active_scaffold/date_picker_bridge', 'active_scaffold/draggable_lists']
+      end
+
+      def jquery_ui_js_code
+        ActiveScaffold::Bridges[:date_picker].localization if ActiveScaffold.jquery_ui_included?
+      end
+
+      def active_scaffold_js_config
+        "ActiveScaffold.config = #{ActiveScaffold.js_config.to_json};"
+      end
+
+      def bridge_javascripts
+        ActiveScaffold::Bridges.all_javascripts
+      end
+    end
+  end
+end

data/lib/active_scaffold/attribute_params.rb

@@ -83,7 +83,7 @@ module ActiveScaffold
         message = "on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect} " \
                   "(value from params #{attributes[column.name].inspect})"
         ActiveScaffold.log_exception(e, message)
-        raise e.class, "#{e.message} -- #{message}", e.backtrace
+        raise e, "#{e.message} -- #{message}", e.backtrace
       end
     end
 
@@ -173,6 +173,9 @@ module ActiveScaffold
         # convert empty strings into nil. this works better with 'null => true' columns (and validations),
         # for 'null => false' columns is just converted to default value from column
         column.default_for_empty_value
+      elsif value.is_a?(Array)
+        # for select_multiple or checkboxes in DB columns, needs to remove blank string used to clear the column
+        value.compact_blank!
       else
         value
       end
@@ -224,12 +227,18 @@ module ActiveScaffold
       @new_records[record.class][id] = record
     end
 
+    def subform_columns(column, klass)
+      subform_cfg = active_scaffold_config_for(klass).subform
+      columns = (column.form_ui_options || column.options)[:subform_columns]
+      columns ? subform_cfg.build_action_columns(columns) : subform_cfg.columns
+    end
+
     def manage_nested_record_from_params(parent_record, column, attributes, avoid_changes = false)
       return nil unless avoid_changes || build_record_from_params?(attributes, column, parent_record)
 
       record = find_or_create_for_params(attributes, column, parent_record, avoid_changes)
       if record
-        record_columns = active_scaffold_config_for(record.class).subform.columns
+        record_columns = subform_columns(column, record.class)
         prev_constraints = record_columns.constraint_columns
         record_columns.constraint_columns = [column.association.reverse].compact
         update_record_from_params(record, record_columns, attributes, avoid_changes)

data/lib/active_scaffold/bridges/active_storage/form_ui.rb

@@ -3,7 +3,7 @@
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column
-    module FormColumnHelpers
+    module FormUiHelpers
       def active_scaffold_input_active_storage_has_one(column, options, ui_options: column.options)
         record = options[:object]
         active_storage = record.send(column.name.to_s)

data/lib/active_scaffold/bridges/carrierwave/form_ui.rb

@@ -2,7 +2,7 @@
 
 module ActiveScaffold
   module Helpers
-    module FormColumnHelpers
+    module FormUiHelpers
       def active_scaffold_input_carrierwave(column, options, ui_options: column.options)
         record = options[:object]
         carrierwave = record.send(column.name.to_s)

data/lib/active_scaffold/bridges/chosen.rb

@@ -10,6 +10,6 @@ class ActiveScaffold::Bridges::Chosen < ActiveScaffold::DataStructures::Bridge
   end
 
   def self.javascripts
-    ['chosen-jquery', 'jquery/active_scaffold_chosen']
+    ['chosen-jquery', 'active_scaffold/active_scaffold_chosen']
   end
 end

data/lib/active_scaffold/bridges/dragonfly/form_ui.rb

@@ -2,7 +2,7 @@
 
 module ActiveScaffold
   module Helpers
-    module FormColumnHelpers
+    module FormUiHelpers
       def active_scaffold_input_dragonfly(column, options, ui_options: column.options)
         record = options[:object]
         dragonfly = record.send(column.name.to_s)

data/lib/active_scaffold/bridges/file_column/form_ui.rb

@@ -3,7 +3,7 @@
 module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column
-    module FormColumnHelpers
+    module FormUiHelpers
       def active_scaffold_input_file_column(column, options, ui_options: column.options)
         record = options[:object]
         if record.send(column.name)

data/lib/active_scaffold/bridges/paperclip/form_ui.rb

@@ -2,7 +2,7 @@
 
 module ActiveScaffold
   module Helpers
-    module FormColumnHelpers
+    module FormUiHelpers
       def active_scaffold_input_paperclip(column, options, ui_options: column.options)
         record = options[:object]
         paperclip = record.send(column.name.to_s)

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -87,7 +87,7 @@ class ActiveScaffold::Bridges::RecordSelect
       rescue StandardError => e
         message = "Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
         Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
-        raise e.class, "#{e.message} -- #{message}", e.backtrace
+        raise e, "#{e.message} -- #{message}", e.backtrace
       end
     end
   end

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -6,6 +6,7 @@ class ActiveScaffold::Bridges::TinyMce
       base.class_eval do
         include FormColumnHelpers
         include SearchColumnHelpers
+        include ShowColumnHelpers
       end
     end
 

data/lib/active_scaffold/bridges/tiny_mce.rb

@@ -11,7 +11,12 @@ class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
   end
 
   def self.javascripts
-    ['tinymce', 'jquery/tiny_mce_bridge']
+    lib = defined?(Sprockets) ? ['tinymce'] : ['tinymce/tinymce', 'tinymce/rails']
+    lib << 'active_scaffold/tiny_mce_bridge'
+  end
+
+  def self.javascript_tags
+    :tinymce_preinit unless defined?(Sprockets)
   end
 
   def self.stylesheets

data/lib/active_scaffold/bridges.rb

@@ -64,6 +64,13 @@ module ActiveScaffold
         bridge.javascripts if bridge&.install?
       end.flatten
     end
+
+    def self.all_javascript_tags
+      bridges.keys.filter_map do |bridge_name|
+        bridge = self[bridge_name]
+        bridge.javascript_tags if bridge&.install?
+      end.flatten
+    end
   end
 end
 

data/lib/active_scaffold/config/core.rb

@@ -261,7 +261,8 @@ module ActiveScaffold::Config
 
       underscored_name = action_name.to_s.underscore.to_sym
       unless @actions.include? underscored_name
-        raise ArgumentError, "#{action_name.to_s.camelcase} is not enabled. Please enable it or remove any references in your configuration (e.g. config.#{underscored_name}.columns = [...])."
+        raise ArgumentError,
+              "#{action_name.to_s.camelcase} is not enabled for #{model.name}. Please enable it or remove any references in your configuration (e.g. config.#{underscored_name}.columns = [...])."
       end
 
       @action_configs ||= {}
@@ -283,7 +284,9 @@ module ActiveScaffold::Config
     end
 
     def self.config_class?(name)
-      ActiveScaffold::Config.const_defined? name.to_s.camelcase
+      ActiveScaffold::Config.const_defined? name.to_s.camelcase, false
+    rescue NameError
+      false
     end
 
     def self.respond_to_missing?(name, include_all = false)
@@ -331,7 +334,8 @@ module ActiveScaffold::Config
       end
 
       def method_missing(name, *args)
-        value = @conf.actions.include?(name) ? @conf.send(name) : super
+        # check if it's an action instead of checking if action is enabled, so we get a better error message when the action is not setup in the controller
+        value = args.empty? && @conf.class.config_class?(name) ? @conf.send(name) : super
         value.is_a?(Base) ? action_user_settings(value) : value
       end
 

data/lib/active_scaffold/constraints.rb

@@ -159,7 +159,7 @@ module ActiveScaffold
       if association.through_singular? && association.source_reflection.reverse
         create_on_through_singular(record, association, association.klass.find(value))
       elsif association.collection?
-        record.send(k.to_s).send(:<<, association.klass.find(value)) unless association.nested?
+        record.send(association.name).send(:<<, association.klass.find(value)) unless association.nested?
       elsif association.polymorphic?
         apply_constraint_on_polymorphic_association(record, association, value)
       elsif !association.source_reflection&.through? && # regular singular association, or one-level through association

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -41,8 +41,74 @@ module ActiveScaffold::DataStructures
     # Whether this column set is collapsed by default in contexts where collapsing is supported
     attr_accessor :collapsed
 
+    # Layout mode: nil/:single for flat columns, :multiple for column groups
+    attr_reader :layout
+
+    def layout=(value)
+      case value
+      when :multiple
+        if @layout != :multiple && !@set.empty?
+          group = ActiveScaffold::DataStructures::ActionColumns.new(*@set)
+          group.action = action
+          @set = [group]
+        end
+      when :single, nil
+        if @layout == :multiple
+          merged = []
+          @set.each do |item|
+            if item.is_a?(ActiveScaffold::DataStructures::ActionColumns)
+              item.each { |col| merged << col }
+            else
+              merged << item
+            end
+          end
+          @set = merged
+        end
+      end
+      @layout = value
+    end
+
+    def set_values(*)
+      @layout = nil
+      super
+    end
+
+    def add(*)
+      if @layout == :multiple
+        group = ActiveScaffold::DataStructures::ActionColumns.new(*)
+        group.action = action
+        @set << group
+      else
+        super
+      end
+    end
+    alias << add
+
+    def [](arg)
+      if @layout == :multiple && arg.is_a?(Integer)
+        @set[arg]
+      else
+        find_by_name(arg)
+      end
+    end
+
+    def []=(index, val)
+      raise '[]= is only supported when layout is :multiple' unless @layout == :multiple
+      raise ArgumentError, "index #{index} is out of range, max is #{@set.length}" if index > @set.length
+
+      if index == @set.length
+        group = ActiveScaffold::DataStructures::ActionColumns.new(*val)
+        group.action = action
+        @set << group
+      else
+        @set[index].set_values(*val)
+      end
+    end
+
     # nests a subgroup in the column set
     def add_subgroup(label, &)
+      raise 'add_subgroup is not supported when layout is :multiple' if @layout == :multiple
+
       columns = ActiveScaffold::DataStructures::ActionColumns.new
       columns.label = label
       columns.action = action

data/lib/active_scaffold/data_structures/bridge.rb

@@ -20,5 +20,7 @@ module ActiveScaffold::DataStructures
     def self.stylesheets; end
 
     def self.javascripts; end
+
+    def self.javascript_tags; end
   end
 end

data/lib/active_scaffold/data_structures/column.rb

@@ -62,6 +62,9 @@ module ActiveScaffold::DataStructures
         # config.columns[:my_column].hide_form_column_if = :hide_tractor_fields?
         attr_accessor :hide_form_column_if
 
+        # works like hide_form_column_if, but the form will send an empty value to clear the column when is hidden
+        attr_accessor :clear_form_column_if
+
         # text to display when the column is empty, defaults nil, so list.empty_field_text is used
         attr_accessor :empty_field_text
 

data/lib/active_scaffold/engine.rb

@@ -56,5 +56,45 @@ module ActiveScaffold
       require 'active_scaffold/extensions/localize'
       require 'active_scaffold/extensions/paginator_extensions'
     end
+
+    initializer 'active_scaffold.assets' do |app|
+      if defined?(::Sprockets)
+        # Tell sprockets where your assets are located
+        app.config.assets.precompile += %w[active_scaffold/manifest.js]
+      end
+    end
+
+    initializer 'active_scaffold.testing' do
+      ActiveSupport.on_load(:action_dispatch_integration_test) do
+        include ActiveScaffold::Testing::AssertEmbeddedLoad
+      end
+
+      ActiveSupport.on_load(:action_controller_test_case) do
+        include ActiveScaffold::Testing::AssertEmbeddedLoad
+      end
+
+      if defined?(RSpec)
+        RSpec.configure do |config|
+          config.include ActiveScaffold::Testing::AssertEmbeddedLoad, type: :request
+          config.include ActiveScaffold::Testing::AssertEmbeddedLoad, type: :controller
+        end
+      end
+    end
+
+    config.after_initialize do
+      if defined?(Propshaft)
+        ActiveScaffold::Assets::JqueryUiThemeGenerator.generate_if_needed if ActiveScaffold.jquery_ui_included?
+        ActiveScaffold::Assets::CssDepsGenerator.generate!
+      end
+    end
+
+    # Make rake tasks available to the host app
+    rake_tasks do
+      # Load all rake tasks
+      Dir[File.expand_path('../tasks/active_scaffold/**/*.rake', __dir__)].each { |f| load f }
+
+      # Load the precompile hook
+      load File.expand_path('railties/tasks.rake', __dir__)
+    end
   end
 end

data/lib/active_scaffold/finder.rb

@@ -143,7 +143,7 @@ module ActiveScaffold
         rescue StandardError => e
           message = "on the ActiveScaffold column :#{column.name}, search_ui = #{search_ui} in #{name}"
           ActiveScaffold.log_exception(e, message)
-          raise e.class, "#{e.message} -- #{message}", e.backtrace
+          raise e, "#{e.message} -- #{message}", e.backtrace
         end
       end
 

data/lib/active_scaffold/helpers/assets_helpers.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module ActiveScaffold
+  module Helpers
+    module AssetsHelpers
+      def active_scaffold_javascript_tag
+        js_tags = ActiveScaffold::Bridges.all_javascript_tags.map { |method| send(method) }
+        js_tags << active_scaffold_javascript_config
+        unless defined?(Importmap)
+          # Without importmap, active_scaffold/load must be added to the layout too
+          js_tags << javascript_include_tag('active_scaffold/load')
+        end
+        safe_join js_tags
+      end
+
+      private
+
+      def active_scaffold_javascript_config
+        config = ActiveScaffold.js_config.merge(
+          jqueryUiIncluded: ActiveScaffold.jquery_ui_included?,
+          bridges: ActiveScaffold::Bridges.all_javascripts.map { |asset| asset_path(asset, extname: '.js') },
+          plugins: ActiveScaffold.javascripts.map { |asset| asset_path(asset, extname: '.js') }
+        )
+        if ActiveScaffold.jquery_ui_included?
+          config[:datepickerLocalization] = ActiveScaffold::Assets.active_scaffold_js_code(:jquery_ui)
+        end
+
+        if Object.const_defined?(:Jquery) && Jquery.const_defined?(:Ui)
+          config[:jqueryUi] = ActiveScaffold::Assets::JqueryUiManifest.all_dependencies.map { |asset| asset_path(asset, extname: '.js') }
+        end
+
+        javascript_tag <<~JS
+          window.ActiveScaffold = window.ActiveScaffold || {};
+          window.ActiveScaffold.config = #{config.to_json};
+        JS
+      end
+    end
+  end
+end

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -129,7 +129,7 @@ module ActiveScaffold
       end
 
       def main_form_controller
-        parent_controller_name.constantize if params[:parent_controller]
+        @main_form_controller ||= parent_controller_name.constantize if params[:parent_controller]
       end
 
       def render_parent?