active_scaffold 4.1.6 → 4.2.1

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers rendering action links
@@ -5,16 +7,16 @@ module ActiveScaffold
       # params which mustn't be copying to nested links
       NESTED_PARAMS = %i[eid embedded association parent_scaffold].freeze
 
-      def skip_action_link?(link, *args)
-        !link.ignore_method.nil? && controller.respond_to?(link.ignore_method, true) && controller.send(link.ignore_method, *args)
+      def skip_action_link?(link, *)
+        !link.ignore_method.nil? && controller.respond_to?(link.ignore_method, true) && controller.send(link.ignore_method, *)
       end
 
-      def action_link_authorized?(link, *args)
+      def action_link_authorized?(link, *args) # rubocop:disable Naming/PredicateMethod
         auth, reason =
           if link.security_method_set? || controller.respond_to?(link.security_method, true)
             controller.send(link.security_method, *args)
           else
-            args.empty? ? true : args.first.authorized_for?(crud_type: link.crud_type, action: link.action, reason: true)
+            args.empty? || args.first.authorized_for?(crud_type: link.crud_type, action: link.action, reason: true)
           end
         [auth, reason]
       end
@@ -22,6 +24,8 @@ module ActiveScaffold
       def display_dynamic_action_group(action_link, links, record_or_ul_options = nil, ul_options = nil)
         ul_options = record_or_ul_options if ul_options.nil? && record_or_ul_options.is_a?(Hash)
         record = record_or_ul_options unless record_or_ul_options.is_a?(Hash)
+        ul_options ||= {}
+        ul_options[:class] = [ul_options[:class], 'dynamic-menu'].compact.join(' ')
         html = content_tag :ul, ul_options do
           safe_join(links.map { |link| content_tag :li, link })
         end
@@ -33,7 +37,7 @@ module ActiveScaffold
         options[:options_level_0_tag] ||= nil
         options[:level] ||= 0
         options[:first_action] = true
-        output = ActiveSupport::SafeBuffer.new
+        output = options.delete(:output) || ActiveSupport::SafeBuffer.new
         prev_link = separator = nil
 
         action_links.each(reverse: options.delete(:reverse), groups: true) do |link|
@@ -62,10 +66,14 @@ module ActiveScaffold
       end
 
       def display_action_link_group(link, record, options, &)
-        options[:level] += 1
-        content = display_action_links(link, record, options, &)
-        options[:level] -= 1
-        display_action_link(link, content, record, options).tap { options[:first_action] = false } if content.present?
+        if link.click_menu?
+          display_click_menu_link(link, record, options)
+        else
+          options[:level] += 1
+          content = display_action_links(link, record, options, &)
+          options[:level] -= 1
+          display_action_link(link, content, record, options).tap { options[:first_action] = false } if content.present?
+        end
       end
 
       def display_action_link_separator(options)
@@ -73,14 +81,30 @@ module ActiveScaffold
         content_tag(tag || :li, ' '.html_safe, class: 'separator')
       end
 
+      def display_click_menu_link(link, record, options)
+        action_link =
+          if link.path.start_with?('collection.')
+            ActiveScaffold::DataStructures::ActionLinks::COLLECTION_CLICK_MENU_LINK
+          else
+            ActiveScaffold::DataStructures::ActionLinks::MEMBER_CLICK_MENU_LINK
+          end
+        html = display_action_link(
+          action_link,
+          nil,
+          record,
+          options.merge(authorized: true, link: link.label(record), link_id: get_action_link_id(link, record))
+        )
+        html.gsub('--ACTION-LINKS--', ERB::Util.unwrapped_html_escape(link.path)).html_safe # rubocop:disable Rails/OutputSafety
+      end
+
       def display_action_link(link, content, record, options)
         if content
           html_classes = hover_via_click? ? 'hover_click ' : ''
           if options[:level].zero?
-            html_classes << 'action_group'
+            html_classes += 'action_group'
             group_tag = :div
           else
-            html_classes << 'top' if options[:first_action]
+            html_classes += 'top' if options[:first_action]
             group_tag = :li
           end
           content = content_tag(group_tag, class: html_classes.presence, onclick: ('' if hover_via_click?)) do
@@ -100,17 +124,61 @@ module ActiveScaffold
           options[:authorized] = false if link.action.nil? || link.controller.nil?
           options.delete :link if link.crud_type == :create
         end
-        if link.action.nil? || (link.type == :member && options.key?(:authorized) && !options[:authorized])
-          html_class = "disabled #{link.action}#{" #{link.html_options[:class]}" if link.html_options[:class].present?}"
-          html_options = {link: action_link_text(link, record, options), class: html_class, title: options[:not_authorized_reason]}
-          action_link_html(link, nil, html_options, record)
+        method =
+          if link.action.nil? || (link.type == :member && options.key?(:authorized) && !options[:authorized])
+            :render_unauthorized_action_link
+          else
+            :render_authorized_action_link
+          end
+
+        cache_link = cache_action_link?(link)
+        label = options[:link]
+        result = optional_cache_helper(method, link.name_to_cache.to_s, cache_link, link, record, options, cache: cache_link)
+        cache_link ? replace_tags_for_action_link(result, method, link, label, record, options) : result
+      end
+
+      def optional_cache_helper(method, key, cache, ...)
+        if cache
+          ActiveScaffold::Registry.cache(method, key) { send(method, ...) }
         else
-          url = action_link_url(link, record)
-          html_options = action_link_html_options(link, record, options)
-          action_link_html(link, url, html_options, record)
+          send(method, ...)
         end
       end
 
+      def replace_tags_for_action_link(html, method, link, label, record, options) # rubocop:disable Metrics/ParameterLists
+        case method
+        when :render_unauthorized_action_link
+          html = html.gsub('--REASON--', ERB::Util.unwrapped_html_escape(options[:not_authorized_reason]))
+        when :render_authorized_action_link
+          html = html.gsub('--URL--', ERB::Util.unwrapped_html_escape(action_link_url(link, record)))
+                   .gsub('--LINK_ID--', ERB::Util.unwrapped_html_escape(options[:link_id] || get_action_link_id(link, record)))
+                   .gsub('--CONFIRM--') { ERB::Util.unwrapped_html_escape(link.confirm(h(record&.to_label))) }
+                   .gsub('--PROMPT--') { ERB::Util.unwrapped_html_escape(link.prompt(h(record&.to_label))) }
+                   .gsub('--ACTIVE--') { action_link_selected?(link, record) ? 'active' : '' }
+        end
+        html&.gsub('--LABEL--', h(label || link.label(record)))&.html_safe # rubocop:disable Rails/OutputSafety
+      end
+
+      def render_unauthorized_action_link(link, record = nil, options = {}, cache: false)
+        html_class = "disabled #{link.action}#{" #{link.html_options[:class]}" if link.html_options[:class].present?}"
+        options[:link] = '--LABEL--' if cache
+        html_options = {
+          link: action_link_text(link, record, options),
+          class: html_class,
+          title: cache ? '--REASON--' : options[:not_authorized_reason]
+        }
+        html = action_link_html(link, nil, html_options, record)
+        cache ? html.to_str : html
+      end
+
+      def render_authorized_action_link(link, record = nil, options = {}, cache: false)
+        url = cache ? '--URL--' : action_link_url(link, record)
+        options[:link] = '--LABEL--' if cache
+        html_options = action_link_html_options(link, record, options, cache: cache)
+        html = action_link_html(link, url, html_options, record)
+        cache ? html.to_str : html
+      end
+
       # setup the action link to inline form
       def action_link_to_inline_form(link, record)
         link = link.dup
@@ -182,6 +250,10 @@ module ActiveScaffold
         active_scaffold_config.user.cache_action_link_urls && link.type == :member && !link.dynamic_parameters.is_a?(Proc) && !sti_record?(record)
       end
 
+      def cache_action_link?(link)
+        active_scaffold_config.user.cache_action_links && link.type == :member
+      end
+
       def cached_action_link_url(link, record)
         @action_links_urls ||= {}
         @action_links_urls[link.name_to_cache.to_s] || begin
@@ -196,7 +268,7 @@ module ActiveScaffold
       end
 
       def replace_id_params_in_action_link_url(link, record, url)
-        url = record ? url.sub('--ID--', record.to_param.to_s) : url.clone
+        url = record ? url.sub('--ID--', record.to_param.to_s) : url.dup
         if link.column&.association&.singular?
           child_id = record.send(link.column.association.name)&.to_param
           if child_id.present?
@@ -284,12 +356,7 @@ module ActiveScaffold
       end
 
       def cached_action_link_url_options(link, record)
-        @action_links_url_options ||= {}
-        @action_links_url_options[link.name_to_cache.to_s] || begin
-          options = action_link_url_options(link, record)
-          @action_links_url_options[link.name_to_cache.to_s] = options if cache_action_link_url_options?(link, record)
-          options
-        end
+        optional_cache_helper(:action_link_url_options, link.name_to_cache.to_s, cache_action_link_url_options?(link, record), link, record)
       end
 
       def action_link_url_options(link, record)
@@ -317,7 +384,7 @@ module ActiveScaffold
       def action_link_text(link, record, options)
         if link.image
           title = options[:link] || link.label(record)
-          asset = (@_link_images ||= {})[link.image[:name]] ||= image_path(link.image[:name])
+          asset = ActiveScaffold::Registry.cache(:link_images, link.image[:name]) { image_path(link.image[:name]) }
           text = image_tag(asset, size: link.image[:size], alt: title, title: title, skip_pipeline: true)
         end
         text || options[:link]
@@ -354,8 +421,8 @@ module ActiveScaffold
         end
       end
 
-      def action_link_html_options(link, record, options)
-        link_id = get_action_link_id(link, record)
+      def action_link_html_options(link, record, options, cache: false)
+        link_id = cache ? '--LINK_ID--' : options[:link_id] || get_action_link_id(link, record)
         html_options = options[:html_options] || link.html_options
         html_options = html_options.merge(class: [html_options[:class], link.action.to_s].compact.join(' '))
         html_options[:link] = action_link_text(link, record, options)
@@ -365,23 +432,27 @@ module ActiveScaffold
 
         html_options[:data] ||= {}
         html_options[:data] = html_options[:data].deep_dup if html_options[:data].frozen?
-        html_options[:data][:confirm] = link.confirm(h(record&.to_label)) if link.confirm?
+        html_options[:data][:confirm] = cache ? '--CONFIRM--' : link.confirm(h(record&.to_label)) if link.confirm?
         if !options[:page] && !options[:popup] && (options[:inline] || link.inline?)
-          html_options[:class] << ' as_action'
+          html_options[:class] += ' as_action'
           html_options[:data][:position] = link.position if link.position
           html_options[:data][:action] = link.action
           html_options[:data][:cancel_refresh] = true if link.refresh_on_close
           html_options[:data][:keep_open] = true if link.keep_open?
           if link.prompt?
-            html_options[:data][:prompt] = link.prompt(h(record&.to_label))
+            html_options[:data][:prompt] = cache ? '--PROMPT--' : link.prompt(h(record&.to_label))
             html_options[:data][:prompt_required] = true if link.prompt_required?
           end
           html_options[:remote] = true
         end
 
         if link.toggle
-          html_options[:class] << ' toggle'
-          html_options[:class] << ' active' if action_link_selected?(link, record)
+          html_options[:class] += ' toggle'
+          if cache
+            html_options[:class] << ' --ACTIVE--'
+          elsif action_link_selected?(link, record)
+            html_options[:class] << ' active'
+          end
         end
 
         if !options[:page] && !options[:inline] && (options[:popup] || link.popup?)
@@ -393,7 +464,7 @@ module ActiveScaffold
       end
 
       def get_action_link_id(link, record = nil)
-        column = link.column
+        column = link.column unless link.is_a?(ActiveScaffold::DataStructures::ActionLinks)
         if column&.association && record
           associated = record.send(column.association.name) unless column.association.collection?
           id =
@@ -405,10 +476,14 @@ module ActiveScaffold
         end
         id ||= record&.id&.to_s || (nested? ? nested_parent_id.to_s : '')
         action_link_id = ActiveScaffold::Registry.cache :action_link_id, link.name_to_cache.to_s do
-          if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)
-            controller_id = id_from_controller("#{link.controller}-")
+          if link.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+            action_link_id(link.path.tr('.', '_'), '--ID--')
+          else
+            if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)
+              controller_id = id_from_controller("#{link.controller}-")
+            end
+            action_link_id("#{controller_id}#{link.action}", '--ID--')
           end
-          action_link_id("#{controller_id}#{link.action}", '--ID--')
         end
         action_link_id.sub('--ID--', id)
       end

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     module AssociationHelpers
@@ -39,7 +41,7 @@ module ActiveScaffold
             include_assoc = includes_for_association(column, klass)
             relation = relation.includes(include_assoc) if include_assoc
           end
-          if column&.sort && column.sort&.dig(:sql)
+          if column&.sort&.dig(:sql)
             # with threasafe enabled, column.sort[:sql] returns proxied strings and
             # regexp capture won't work, which rails uses internally, so to_s is needed
             relation = relation.order(Array(column.sort[:sql]).map { |sql| Arel.sql(sql.to_s) })
@@ -92,7 +94,7 @@ module ActiveScaffold
       def sorted_association_options_find(association, conditions = nil, record = nil)
         options = association_options_find(association, conditions, nil, record)
         column = column_for_association(association, record)
-        unless column&.sort && column.sort&.dig(:sql)
+        unless column&.sort&.dig(:sql)
           method = column.options[:label_method] if column
           options = options.sort_by(&(method || :to_label).to_sym)
         end

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     module ControllerHelpers

data/lib/active_scaffold/helpers/filter_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Helpers
     # Helpers rendering filters
@@ -9,8 +11,14 @@ module ActiveScaffold
       end
 
       def display_filters(filters)
-        content = filters.sort_by(&:weight).map { |filter| display_filter(filter) }
-        content_tag :div, safe_join(content), class: 'filters' if content.present?
+        return unless filters_enabled?
+
+        content = render_filters filters
+        content_tag :div, content, class: 'filters' if content.present?
+      end
+
+      def render_filters(filters)
+        safe_join(filters.sort_by(&:weight).filter_map { |filter| display_filter(filter) })
       end
 
       def display_filter(filter)
@@ -29,7 +37,7 @@ module ActiveScaffold
         content = options.map do |option|
           content_tag :option, option.label(nil), data: {url: action_link_url(option, nil)}, selected: action_link_selected?(option, nil), title: option.description
         end
-        select_tag nil, safe_join(content), class: "action_group #{link.css_class}", title: filter.description || filter.label, data: {remote: :url} if content.present?
+        select_tag nil, safe_join(content), class: "action_group #{filter.css_class}", title: filter.description || filter.label, data: {remote: :url} if content.present?
       end
     end
   end