Merge remote-tracking branch 'origin/master' into framework-ui

Author: scambra

CHANGELOG.rdoc

@@ -14,9 +14,14 @@
 - Support hashes in update_columns, keys are association names or :__root__ to refresh fields on subforms or at top of the form, values are list of columns or nested hashes.
 - Add custom_modules, in active_scaffold_config and global, to add modules which will be included after ActiveScaffold action modules, to customize the controllers.
 - 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)
 
 = 4.1.3
 - Columns using bitfields are not treated as number columns (e.g. don't get numeric class in list)

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_scaffold (4.1.3)
+    active_scaffold (4.1.4)
       dartsass-sprockets (~> 3.2.0)
       html_attrs (~> 1.1)
       ice_nine (~> 0.11)

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");
@@ -257,6 +259,22 @@
         if (span.data('editInPlace')) span.trigger('click.editInPlace');
         else ActiveScaffold.in_place_editor_field_clicked(span);
       });
+      jQuery(document).on('click', '.file-input-controls .remove-file-btn', function(event) {
+        event.preventDefault();
+        var btn = jQuery(this), file_line = btn.closest('.file-input-controls');
+        if (file_line.find('.remove_file').val('true').length) {
+          btn.parent().hide();
+          file_line.find('input').show();
+          if (file_line.attr('required')) file_line.find('input').attr('required', 'required');
+        } else {
+          file_line.remove();
+        }
+        return false;
+      });
+      jQuery(document).on('change', '.file-input-controls input[type=file]', function(event) {
+        var file_line = jQuery(this).closest('.file-input-controls');
+        file_line.find('.remove_file').val('false');
+      });
       jQuery(document).on('ajax:before', 'a.as_paginate',function(event) {
         var as_paginate = jQuery(this);
         as_paginate.prevAll('img.loading-indicator').css('visibility','visible');
@@ -287,9 +305,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) {

app/views/active_scaffold_overrides/_update_field_on_create.js.erb

@@ -7,13 +7,15 @@ var field = jQuery('#<%= params[:from_field] %>');
   field_options[:class] = "#{field_options[:class]} update_form" if field_options&.dig('data-update_url')
 %>
 if (field.is('select')) {
-  field.append('<%= j content_tag(:option, label, value: id) %>');
+  if (!field.find('option[value="<%= id %>"]').length) field.append('<%= j content_tag(:option, label, value: id) %>');
   field.val(<%= id %>);
 } else if (field.is('input.recordselect')) {
   field.val('<%= j label %>').addClass('selected');
   field.next().val(<%= id %>);
 } else if (field.is('.new-radio-container')) {
-  field.append('<%= j active_scaffold_radio_option(@record, id, column, field_options, ui_options: column.form_ui_options || column.options) if column %>');
+  if (!field.parent().find('input[type=radio][value="<%= id %>"]').length) {
+    field.append('<%= j active_scaffold_radio_option(@record, id, column, field_options, ui_options: column.form_ui_options || column.options) if column %>');
+  } else field = field.parent().find('input[type=radio][value="<%= id %>"]').prop('checked', true);
 }
 field.trigger('change');
 var action_link = ActiveScaffold.ActionLink.get(field.parent().find('a.as_action'));

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) %>

gemfiles/Gemfile.rails-7.2.x.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_scaffold (4.1.3)
+    active_scaffold (4.1.4)
       dartsass-sprockets (~> 3.2.0)
       html_attrs (~> 1.1)
       ice_nine (~> 0.11)

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/bridges/active_storage/form_ui.rb

@@ -8,16 +8,21 @@ def active_scaffold_input_active_storage_has_one(column, options, ui_options: co
         record = options[:object]
         active_storage = record.send(column.name.to_s)
         content = active_scaffold_column_active_storage_has_one(record, column, ui_options: ui_options) if active_storage.attached?
-        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls', ui_options: ui_options)
+        active_scaffold_file_with_content(column, options, content, 'delete_', 'active_storage_controls', ui_options: ui_options)
       end
 
       def active_scaffold_input_active_storage_has_many(column, options, ui_options: column.options)
         record = options[:object]
         options[:multiple] = 'multiple'
+        options[:include_hidden] = false
         options[:name] += '[]'
         active_storage = record.send(column.name.to_s)
-        content = active_scaffold_column_active_storage_has_many(record, column, ui_options: ui_options) if active_storage.attached?
-        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls', ui_options: ui_options)
+        existing = active_storage.map do |file|
+          content = hidden_field_tag(options[:name], file.signed_id) <<
+                    link_for_attachment(file, column, ui_options: ui_options) << h(' | ')
+          active_scaffold_file_with_remove_link(content, options, 'active_storage_controls', :remove)
+        end
+        safe_join existing << hidden_field_tag(options[:name]) << file_field(:record, column.name, options)
       end
     end
   end

lib/active_scaffold/bridges/carrierwave/form_ui.rb

@@ -7,7 +7,7 @@ def active_scaffold_input_carrierwave(column, options, ui_options: column.option
         record = options[:object]
         carrierwave = record.send(column.name.to_s)
         content = get_column_value(record, column) if carrierwave.file.present?
-        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'carrierwave_controls', ui_options: ui_options) do
+        active_scaffold_file_with_content(column, options, content, 'remove_', 'carrierwave_controls', ui_options: ui_options) do
           cache_field_options = {
             name: options[:name].gsub(/\[#{column.name}\]$/, "[#{column.name}_cache]"),
             id: "#{options[:id]}_cache"