use a better remove link for has_many_attachments

it's only for remove, there is no replacing, and adding doesn't require to click it

Author: scambra

CHANGELOG.rdoc

@@ -16,8 +16,10 @@
 - Add active_scaffold_subform_record_actions helper to render the destroy action on the rows of a subform, so it can be used to add more actions
 - Improve ActiveStorage bridge to keep existing files in has_many_attachments
 - Helpers used by file upload bridges have been renamed and moved the JS code to active_scaffold.js
+- Support action link groups to open with click, like actions showing dynamic action link group
+- Open dynamic action link group nested in the menu tree, under the action opening it
 
-= 4-1-stable
+= 4.1.4
 - Fix dirty attributes on refresh_field action, record is built on unsaved instance copying attributes, but it reports only changed attributes from the form now
 - Fix incompatibility with Rails renderable objects (ViewComponent, Turbo Streams)
 

app/assets/javascripts/jquery/active_scaffold.js

@@ -40,7 +40,9 @@
       jQuery(document).on('focus', ':input', function() { ActiveScaffold.last_focus = this; });
       jQuery(document).on('blur', ':input', function(e) { ActiveScaffold.last_focus = e.relatedTarget; });
       jQuery(document).click(function(event) {
-        jQuery('.action_group.dyn > ul').hide(); // only hide so action links loading still work
+        if (!jQuery(event.target).closest('.action_group.dyn').length) {
+          jQuery('.action_group.dyn > ul').remove();
+        }
       });
       jQuery(document).on('ajax:beforeSend', 'form.as_form', function(event) {
         var as_form = jQuery(this).closest("form");
@@ -290,9 +292,13 @@
         } else return false;
       });
       jQuery(document).on('ajax:complete', '.action_group.dyn > ul a', function(event) {
-        var action_link = ActiveScaffold.find_action_link(event.target);
-        if (action_link && action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');
-        jQuery(event.target).closest('.action_group.dyn > ul').remove();
+        var action_link = ActiveScaffold.find_action_link(event.target), link = jQuery(event.target);
+        if (action_link && action_link.loading_indicator) action_link.loading_indicator.css('visibility', 'hidden');
+        setTimeout(function() {
+          if (!link.parent().is('.action_group.dyn')) {
+            link.closest('.action_group.dyn > ul').remove();
+          }
+        }, 100);
       });
 
       jQuery(document).on('change', 'input.update_form:not(.recordselect), textarea.update_form, select.update_form, .checkbox-list.update_form input:checkbox', function(event, additional_params) {
@@ -932,13 +938,12 @@
       display_dynamic_action_group: function(link, html) {
         var container;
         if (typeof(link) == 'string') link = jQuery('#' + link);
-        if (link.closest('td.actions').length) {
-          container = link.closest('td').addClass('action_group dyn');
-        } else {
-          if (link.parent('div.actions').length) link.wrap(jQuery('<div>'));
-          container = link.parent().addClass('action_group dyn');
+        if (link.parent('.actions').length) link.wrap(jQuery('<div>'));
+        container = link.parent().addClass('action_group dyn');
+        if (ActiveScaffold.config.dynamic_group_parent_class) {
+          container.addClass(ActiveScaffold.config.dynamic_group_parent_class);
         }
-        container.find('> ul').remove();
+        container.find('> ul.dynamic-menu').remove();
         container.append(html);
       },
 

app/views/active_scaffold_overrides/action_links_menu.js.erb

@@ -0,0 +1 @@
+<%= display_dynamic_action_group(@action_links, display_action_links(@action_links, @record, for: @record, output: []), @record) %>

lib/active_scaffold/actions/core.rb

@@ -548,11 +548,11 @@ def association_columns(columns)
 
     private
 
-    def respond_to_action(action)
+    def respond_to_action(action, formats = action_formats)
       return unless !conditional_get_support? || view_stale?
 
       respond_to do |type|
-        action_formats.each do |format|
+        formats.each do |format|
           type.send(format) do
             method_name = respond_method_for(action, format)
             send(method_name) if method_name

lib/active_scaffold/actions/list.rb

@@ -8,7 +8,9 @@ def self.included(base)
     end
 
     def index
-      if params[:id] && !params[:id].is_a?(Array) && request.xhr?
+      if params[:action_links] && request.xhr?
+        action_links_menu
+      elsif params[:id] && !params[:id].is_a?(Array) && request.xhr?
         row
       else
         list
@@ -17,6 +19,18 @@ def index
 
     protected
 
+    def action_links_menu
+      @record = find_if_allowed(params[:id], :read) if params[:id]
+      @action_links = params[:action_links].split('.').reduce(active_scaffold_config.action_links) do |links, submenu|
+        links.subgroup(submenu)
+      end
+      respond_to_action(:action_links_menu, action_links_menu_formats)
+    end
+
+    def action_links_menu_formats
+      %i[js]
+    end
+
     # get just a single row
     def row
       get_row
@@ -66,6 +80,10 @@ def row_respond_to_js
       render action: 'row'
     end
 
+    def action_links_menu_respond_to_js
+      render action: 'action_links_menu'
+    end
+
     # The actual algorithm to prepare for the list view
     def set_includes_for_columns(action = :list, sorting = active_scaffold_config.list.user.sorting)
       @cache_associations = true

lib/active_scaffold/data_structures/action_links.rb

@@ -4,15 +4,27 @@ module ActiveScaffold::DataStructures
   class ActionLinks
     include Enumerable
 
+    COLLECTION_CLICK_MENU_LINK = ActionLink.new(:index, position: false, type: :member, parameters: {action_links: '--ACTION-LINKS--', id: nil}) # member so it's cached
+    MEMBER_CLICK_MENU_LINK = ActionLink.new(:index, position: false, type: :member, parameters: {action_links: '--ACTION-LINKS--'})
+
     attr_accessor :default_type, :weight, :css_class
+    attr_writer :click_menu, :label
+    attr_reader :name, :path
 
-    def initialize(name = :root)
+    def initialize(name = :root, parent_path = nil)
       @set = []
       @name = name
       @css_class = name.to_s.downcase
       @weight = 0
+      @path = [parent_path, name].compact.join('.') unless name == :root
+    end
+
+    def click_menu?
+      @click_menu
     end
 
+    alias name_to_cache path
+
     # adds an ActionLink, creating one from the arguments if need be
     def add(action, options = {})
       link =
@@ -132,6 +144,7 @@ def collect
     delegate :empty?, to: :@set
 
     def subgroup(name, label = nil)
+      name = name.to_sym
       group = self if name == self.name
       group ||= @set.find do |item|
         name == item.name if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
@@ -140,16 +153,14 @@ def subgroup(name, label = nil)
       if group.nil?
         raise FrozenError, "Can't add new subgroup '#{name}', links are frozen" if frozen?
 
-        group = ActiveScaffold::DataStructures::ActionLinks.new(name)
+        group = ActiveScaffold::DataStructures::ActionLinks.new(name, path)
         group.label = label || name
-        group.default_type = self.name == :root ? (name.to_sym if %w[member collection].include?(name.to_s)) : default_type
+        group.default_type = self.name == :root ? (name if %i[member collection].include?(name)) : default_type
         add_to_set group
       end
       group
     end
 
-    attr_writer :label
-
     def label(record)
       case @label
       when Symbol
@@ -178,11 +189,9 @@ def method_missing(name, *args, &)
     end
 
     def respond_to_missing?(name, *)
-      name !~ /[!?]$/
+      name !~ /[=!?]$/
     end
 
-    attr_reader :name
-
     protected
 
     # called during clone or dup. makes the clone/dup deeper.

lib/active_scaffold/helpers/action_link_helpers.rb

@@ -35,7 +35,7 @@ def display_action_links(action_links, record, options, &block)
         options[:options_level_0_tag] ||= nil
         options[:level] ||= 0
         options[:first_action] = true
-        output = ActiveSupport::SafeBuffer.new
+        output = options[:output] || ActiveSupport::SafeBuffer.new
         prev_link = separator = nil
 
         action_links.each(reverse: options.delete(:reverse), groups: true) do |link|
@@ -64,17 +64,37 @@ def display_action_links(action_links, record, options, &block)
       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)
         tag = options[:level_0_tag] || :a if options[:level].zero?
         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 ' : ''
@@ -129,7 +149,7 @@ def replace_tags_for_action_link(html, method, link, label, record, options) # r
           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(get_action_link_id(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' : '' }
@@ -400,7 +420,7 @@ def action_link_selected?(link, record)
       end
 
       def action_link_html_options(link, record, options, cache: false)
-        link_id = cache ? '--LINK_ID--' : get_action_link_id(link, record)
+        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)
@@ -442,7 +462,7 @@ def action_link_html_options(link, record, options, cache: false)
       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 =
@@ -454,10 +474,14 @@ def get_action_link_id(link, record = nil)
         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