active_scaffold 3.6.0.pre → 3.6.0.rc1

data/lib/active_scaffold/bridges/active_storage.rb

@@ -0,0 +1,6 @@
+class ActiveScaffold::Bridges::ActiveStorage < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    Dir[File.join(__dir__, 'active_storage', '*.rb')].each { |file| require file }
+    ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridge
+  end
+end

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

@@ -0,0 +1,33 @@
+module ActiveScaffold
+  module Bridges
+    class ActiveStorage
+      module ActiveStorageBridge
+        def initialize(model_id)
+          super
+          return unless ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers.klass_has_active_storage_fields?(model)
+
+          model.send :extend, ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers
+
+          # include the "delete" helpers for use with active scaffold, unless they are already included
+          model.generate_delete_helpers
+
+          update.multipart = true
+          create.multipart = true
+
+          model.active_storage_has_one_fields.each { |field| configure_active_storage_field(field.to_sym, :has_one) }
+          model.active_storage_has_many_fields.each { |field| configure_active_storage_field(field.to_sym, :has_many) }
+        end
+
+        private
+
+        def configure_active_storage_field(field, field_type)
+          columns << field
+          columns.exclude "#{field}_attachment#{'s' if field_type == :has_many}".to_sym
+          columns.exclude "#{field}_blob#{'s' if field_type == :has_many}".to_sym
+          columns[field].form_ui ||= "active_storage_#{field_type}".to_sym
+          columns[field].params.add "delete_#{field}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+module ActiveScaffold
+  module Bridges
+    class ActiveStorage
+      module ActiveStorageBridgeHelpers
+        mattr_accessor :thumbnail_variant
+        self.thumbnail_variant = {resize_to_limit: [nil, 30]}
+
+        class << self
+          # has_one :"#{name}_attachment", -> { where(name: name) }, class_name: "ActiveStorage::Attachment", as: :record, inverse_of: :record, dependent: false
+          def active_storage_has_one_fields(klass)
+            klass.reflect_on_all_associations(:has_one)&.select { |reflection| reflection.class_name == 'ActiveStorage::Attachment' } &.collect { |association| association.name[0..-12] } || []
+          end
+
+          # has_many :"#{name}_attachments", -> { where(name: name) }, as: :record, class_name: "ActiveStorage::Attachment", inverse_of: :record, dependent: false do
+          def active_storage_has_many_fields(klass)
+            klass.reflect_on_all_associations(:has_many)&.select { |reflection| reflection.class_name == 'ActiveStorage::Attachment' } &.collect { |association| association.name[0..-13] } || []
+          end
+
+          def klass_has_active_storage_fields?(klass)
+            active_storage_has_one_fields(klass).present? || active_storage_has_many_fields(klass).present?
+          end
+
+          def generate_delete_helpers(klass)
+            (active_storage_has_one_fields(klass) | active_storage_has_many_fields(klass)).each do |field|
+              klass.send :class_eval, <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
+                attr_reader :delete_#{field}
+
+                def delete_#{field}=(value)
+                  value = (value=="true") if String===value
+                  return unless value
+
+                  # passing nil to the file column causes the file to be deleted.
+                  self.#{field}.purge
+                end
+              CODE
+            end
+          end
+        end
+
+        def active_storage_has_one_fields
+          @active_storage_has_one_fields ||= ActiveStorageBridgeHelpers.active_storage_has_one_fields(self)
+        end
+
+        def active_storage_has_many_fields
+          @active_storage_has_many_fields ||= ActiveStorageBridgeHelpers.active_storage_has_many_fields(self)
+        end
+
+        def generate_delete_helpers
+          ActiveStorageBridgeHelpers.generate_delete_helpers(self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module ActiveScaffold
+  module Helpers
+    # Helpers that assist with the rendering of a Form Column
+    module FormColumnHelpers
+      def active_scaffold_input_active_storage_has_one(column, options)
+        record = options[:object]
+        active_storage = record.send(column.name.to_s)
+        content = active_scaffold_column_active_storage_has_one(record, column) if active_storage.attached?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls')
+      end
+
+      def active_scaffold_input_active_storage_has_many(column, options)
+        record = options[:object]
+        options[:multiple] = 'multiple'
+        options[:name] += '[]'
+        active_storage = record.send(column.name.to_s)
+        content = active_scaffold_column_active_storage_has_many(record, column) if active_storage.attached?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module ActiveScaffold
+  module Helpers
+    module ListColumnHelpers
+      def active_scaffold_column_active_storage_has_one(record, column)
+        attachment = record.send(column.name.to_s)
+        attachment.attached? ? link_for_attachment(attachment) : nil
+      end
+
+      def active_scaffold_column_active_storage_has_many(record, column)
+        active_storage_files = record.send(column.name.to_s)
+        return nil unless active_storage_files.attached?
+
+        attachments = active_storage_files.attachments
+        if attachments.size <= 3 # Lets display up to three links, otherwise just show the count.
+          links = attachments.map { |attachment| link_for_attachment(attachment) }
+          safe_join links, association_join_text(column)
+        else
+          pluralize attachments.size, column.name.to_s
+        end
+      end
+
+      private
+
+      def link_for_attachment(attachment)
+        variant = column.options[:thumb] || ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers.thumbnail_variant
+        content =
+          if variant && attachment.variable?
+            image_tag(attachment.variant(variant))
+          else
+            attachment.filename
+          end
+        link_to(content, rails_blob_url(attachment, disposition: 'attachment'), target: '_blank', rel: 'noopener noreferrer')
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/bitfields.rb

@@ -2,5 +2,6 @@ class ActiveScaffold::Bridges::Bitfields < ActiveScaffold::DataStructures::Bridg
   def self.install
     require File.join(File.dirname(__FILE__), 'bitfields/bitfields_bridge')
     ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
+    ActiveScaffold::Config::Core.after_config_callbacks << :_setup_bitfields
   end
 end

data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
           super
           return unless model.respond_to?(:bitfields) && model.bitfields.present?
 
-          model.bitfields.each_value do |_, options|
+          model.bitfields.each_value do |options|
             columns << options.keys
             options.each do |column, value|
               columns[column].form_ui = :checkbox
@@ -15,23 +15,20 @@ module ActiveScaffold
           end
         end
 
-        def _load_action_columns
-          if model.respond_to?(:bitfields) && model.bitfields.present?
-            model.bitfields.each do |column_name, options|
-              columns = options.keys.sort_by { |column| self.columns[column].weight }
-              %i[create update show subform].each do |action|
-                next unless actions.include? action
-                if send(action).columns.include? column_name
-                  send(action).columns.exclude column_name
-                  send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
-                else
-                  send(action).columns.exclude *columns
-                end
+        def _setup_bitfields
+          return unless model.respond_to?(:bitfields) && model.bitfields.present?
+          model.bitfields.each do |column_name, options|
+            columns = options.keys.sort_by { |column| self.columns[column].weight }
+            %i[create update show subform].each do |action|
+              next unless actions.include? action
+              if send(action).columns.include? column_name
+                send(action).columns.exclude column_name
+                send(action).columns.add_subgroup(column_name) { |group| group.add(*columns) }
+              else
+                send(action).columns.exclude(*columns)
               end
             end
           end
-
-          super
         end
       end
     end

data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb

@@ -45,6 +45,12 @@ module ActiveScaffold::Bridges
         def beginning_of_chain
           super.accessible_by(current_ability)
         end
+
+        # fix when ability allow access base on id
+        # can [:manage], Client, id: Client.of_employee(user).pluck(:id)
+        def new_model
+          super.tap { |record| record.id = nil }
+        end
       end
     end
 

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

@@ -7,11 +7,11 @@ module ActiveScaffold
         thumbnail_style = ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridgeHelpers.thumbnail_style
         content =
           if carrierwave.versions.keys.include?(thumbnail_style)
-            image_tag(carrierwave.url(thumbnail_style), :border => 0).html_safe
+            image_tag(carrierwave.url(thumbnail_style), :border => 0)
           else
             record.send(record.send(:_mounter, column.name).send(:serialization_column))
           end
-        link_to(content, carrierwave.url, :target => '_blank')
+        link_to(content, carrierwave.url, :target => '_blank', rel: 'noopener noreferrer')
       end
     end
   end

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -24,9 +24,7 @@ module ActiveScaffold::Bridges
       def self.date_options_for_locales
         I18n.available_locales.collect do |locale|
           locale_date_options = date_options(locale)
-          if locale_date_options
-            "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};"
-          end
+          "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};" if locale_date_options
         end.compact.join('')
       end
 
@@ -59,9 +57,7 @@ module ActiveScaffold::Bridges
       def self.datetime_options_for_locales
         I18n.available_locales.collect do |locale|
           locale_datetime_options = datetime_options(locale)
-          if locale_datetime_options
-            "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};"
-          end
+          "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};" if locale_datetime_options
         end.compact.join('')
       end
 
@@ -78,12 +74,7 @@ module ActiveScaffold::Bridges
         datetime_picker_options.merge!(as_datetime_picker_options) if as_datetime_picker_options.is_a? Hash
         Rails.logger.warn "ActiveScaffold: Missing datetime picker localization for your locale: #{locale}" if as_datetime_picker_options.blank?
 
-        date_format, time_format = split_datetime_format(to_datepicker_format(rails_time_format))
-        datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
-        unless time_format.nil?
-          datetime_picker_options[:timeFormat] = time_format
-          datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
-        end
+        datetime_picker_options.merge! format_to_datetime_picker(rails_time_format)
         datetime_picker_options
       rescue StandardError
         raise if locale == I18n.locale
@@ -92,7 +83,11 @@ module ActiveScaffold::Bridges
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
         if rails_format =~ /%[cUWwxXZz]/
-          Rails.logger.warn("AS DatePicker::Helper: rails date format #{rails_format} includes options which can't be converted to jquery datepicker format. Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed")
+          Rails.logger.warn(
+            "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
+            "which can't be converted to jquery datepicker format. "\
+            'Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed'
+          )
           nil
         end
         js_format = rails_format.dup
@@ -103,6 +98,17 @@ module ActiveScaffold::Bridges
         js_format
       end
 
+      def self.format_to_datetime_picker(rails_time_format)
+        date_format, time_format = split_datetime_format(to_datepicker_format(rails_time_format))
+        datetime_picker_options = {}
+        datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
+        unless time_format.nil?
+          datetime_picker_options[:timeFormat] = time_format
+          datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
+        end
+        datetime_picker_options
+      end
+
       def self.split_datetime_format(datetime_format)
         date_format = datetime_format
         time_format = nil
@@ -119,46 +125,44 @@ module ActiveScaffold::Bridges
       end
 
       module DatepickerColumnHelpers
-        def datepicker_split_datetime_format(datetime_format)
-          ActiveScaffold::Bridges::DatePicker::Helper.split_datetime_format(datetime_format)
-        end
-
         def to_datepicker_format(rails_format)
           ActiveScaffold::Bridges::DatePicker::Helper.to_datepicker_format(rails_format)
         end
 
-        def datepicker_format_options(column, format, options)
-          unless format == :default
-            if column.form_ui == :date_picker
-              js_format = to_datepicker_format(I18n.translate!("date.formats.#{format}"))
-              options['data-dateFormat'] = js_format unless js_format.nil?
-            else
-              rails_time_format = I18n.translate!("time.formats.#{format}")
-              date_format, time_format = datepicker_split_datetime_format(to_datepicker_format(rails_time_format))
-              options['data-dateFormat'] = date_format unless date_format.nil?
-              unless time_format.nil?
-                options['data-timeFormat'] = time_format
-                options['data-ampm'] = true if rails_time_format.include?('%I')
-              end
-            end
+        def datepicker_format_options(column, format)
+          return {} if format == :default
+          if column.form_ui == :date_picker
+            js_format = to_datepicker_format(I18n.translate!("date.formats.#{format}"))
+            js_format.nil? ? {} : {dateFormat: js_format}
+          else
+            rails_time_format = I18n.translate!("time.formats.#{format}")
+            ActiveScaffold::Bridges::DatePicker::Helper.format_to_datetime_picker(rails_time_format)
           end
         end
+
+        def datepicker_format(options, ui)
+          options.delete(:format) || (ui == :date_picker ? :default : :picker)
+        end
       end
 
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
-          value = if current_search.is_a? Hash
-                    controller.class.condition_value_for_datetime(column, current_search[name], column.search_ui == :date_picker ? :to_date : :to_time)
-                  else
-                    current_search
-                  end
+          value =
+            if current_search.is_a? Hash
+              controller.class.condition_value_for_datetime(column, current_search[name], column.search_ui == :date_picker ? :to_date : :to_time)
+            else
+              current_search
+            end
           options = column.options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
           options = active_scaffold_input_text_options(options.merge(column.options))
+          format = datepicker_format(options, column.search_ui)
           options[:class] << " #{column.search_ui}"
           options[:style] = 'display: none' if options[:show] == false # hide only if asked to hide
-          format = options.delete(:format) || (column.search_ui == :date_picker ? :default : :picker)
-          datepicker_format_options(column, format, options)
-          text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]", :object => nil))
+          options[:data] ||= {}
+          options[:data].merge! datepicker_format_options(column, format)
+          value = l(value, :format => format) if value
+          options = options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]", :object => nil)
+          text_field_tag("#{options[:name]}[#{name}]", value, options)
         end
       end
 
@@ -168,9 +172,10 @@ module ActiveScaffold::Bridges
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.form_ui}"
 
+          format = datepicker_format(options, column.form_ui)
           value = controller.class.condition_value_for_datetime(column, record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
-          format = options.delete(:format) || (column.form_ui == :date_picker ? :default : :picker)
-          datepicker_format_options(column, format, options)
+          options[:data] ||= {}
+          options[:data].merge! datepicker_format_options(column, format)
           options[:value] = (value ? l(value, :format => format) : nil)
           text_field(:record, column.name, options)
         end

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

@@ -10,7 +10,7 @@ module ActiveScaffold
           else
             attachment.name
           end
-        link_to(content, dragonfly_url_for_attachment(attachment, record, column), :target => '_blank')
+        link_to(content, dragonfly_url_for_attachment(attachment, record, column), :target => '_blank', rel: 'noopener noreferrer')
       end
 
       def dragonfly_url_for_attachment(attachment, record, column)

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

@@ -9,7 +9,7 @@ module ActiveScaffold
 
           def generate_delete_helpers(klass)
             file_column_fields(klass).each do |field|
-              klass.send :class_eval, <<-END, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
+              klass.send :class_eval, <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"#{field}_with_delete=")
                 attr_reader :delete_#{field}
 
                 def delete_#{field}=(value)
@@ -19,7 +19,7 @@ module ActiveScaffold
                   # passing nil to the file column causes the file to be deleted.  Don't delete if we just uploaded a file!
                   self.#{field} = nil unless self.#{field}_just_uploaded?
                 end
-              END
+              CODE
             end
           end
 

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

@@ -18,9 +18,9 @@ module ActiveScaffold
 
           content_tag(:div) do
             content_tag(:div) do
-              get_column_value(record, column) + " #{custom_hidden_field_tag} | ".html_safe <<
-                content_tag(:a, as_(:remove_file), :href => '#', :onclick => remove_file_js) <<
-                content_tag(:div, file_column_field('record', column.name, options), :style => 'display: none')
+              safe_join [get_column_value(record, column), custom_hidden_field_tag, '|',
+                         content_tag(:a, as_(:remove_file), :href => '#', :onclick => remove_file_js),
+                         content_tag(:div, 'test', :style => 'display: none')], ' '
             end
           end
         else

data/lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb

@@ -1,4 +1,6 @@
-require File.expand_path('../test_helper.rb', __dir__)
+require 'test_helper'
+require File.expand_path('../mock_model.rb', __dir__)
+require File.expand_path('../../file_column_helpers.rb', __dir__)
 
 class DeleteFileColumnTest < MiniTest::Test
   def setup

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

@@ -6,7 +6,7 @@ module ActiveScaffold
         self.thumbnail_style = :thumbnail
 
         def self.generate_delete_helper(klass, field)
-          klass.class_eval <<-END, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"delete_#{field}=")
+          klass.class_eval <<-CODE, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"delete_#{field}=")
             attr_reader :delete_#{field}
 
             def delete_#{field}=(value)
@@ -16,7 +16,7 @@ module ActiveScaffold
               # passing nil to the file column causes the file to be deleted. Don't delete if we just uploaded a file!
               self.#{field} = nil unless self.#{field}.dirty?
             end
-          END
+          CODE
         end
       end
     end