inline_forms 8.1.59 → 8.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122426ec8aafea8e48c9693153e155891b9f97cb73a40983a0bdcf21051acc26
-  data.tar.gz: bbf2a4dacbfa14d9cf84cab79de9356f5623542e28029aa18f000fe25c21b432
+  metadata.gz: 1c2157f464ca5f6e0a7f42dfbf783dfdbcd606942f8c40be8385479237889794
+  data.tar.gz: aa502e01d242a09fc6989b5f7f865c9fbbde33a98592273116daf07d96a8821d
 SHA512:
-  metadata.gz: 043a09c0faaedf4d13ecc8ea20cf6b772709fc20237c7a6e87da188a2392045fab619a7b589a2966ae7f9fa49bc27e5f1caa37778b86605842595ccd74c4f56d
-  data.tar.gz: eaa601424c02655fdec7721a81f5f48af2674d58077e2325f2c1ccab49375d60f1dea794891a86dd7d85e7e3c3b2cebb8fad26fedaa2cded1fe2326f65fd9a27
+  metadata.gz: 9ca4f57a7ae8c58b68b63103553b6de3f59f187b9fa9cef64fdaa9e5dcdfb494a69dfbce24f3207b0c6198c08dd03d79de84d6c542283115959edd3b7518e776
+  data.tar.gz: 651bf78a377bebbdb9fbf1a17f6ad995e00c5de0b399c90377f2680db8d816d592ebf394a8d49a963a244798a890e04c9a09554486767e7c59487e2cbe3da69c

data/CHANGELOG.md

@@ -4,6 +4,42 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [8.1.61] - 2026-10-30
+
+### Fixed
+
+- **`pdf_link`: the `preview` and `pdf` links work again under Turbo.** They sit inside the field's `<turbo-frame>`, so a click loaded the response into that frame: the preview showed Turbo's "Content missing", and the PDF, which is not HTML, went to the same frame. Both links now carry `data-turbo="false"`, as `simple_file_field`'s download link does, and the preview opens in a new tab so the record stays open. An app that worked around this can drop its override.
+
+### Tests
+
+- `legacy_elements_test`: both `pdf_link` links carry `data-turbo="false"`, and only the preview has `target="_blank"`.
+
+### Lockstep
+
+- validation_hints 8.1.61, inline_forms_installer 8.1.61, inline_forms_schema_edit 8.1.61.
+
+## [8.1.60] - 2026-10-28
+
+Fixes from a review of 8.1.58 and 8.1.59.
+
+### Fixed
+
+- **Dropdowns take only the order from `inline_forms_list`.** 8.1.59's rule 3 merged the whole `inline_forms_list` scope into `dropdown` and `dropdown_with_other`, so a `where` or `joins` there hid records from the dropdown. A record whose current value was hidden showed the first option instead, and saving the inline form silently changed it. Rule 3 now uses only the scope's ORDER BY (added to a `default_scope` order, as the merge did). The scope still filters `/index`.
+- **`check_list` keeps the `inline_forms_list` filter.** Under rules 1 and 2 (a declared order or a `dropdown_order` column) 8.1.59 skipped the scope, so `check_list` listed records its `where` used to hide. It now applies the scope's filter under every rule, as before 8.1.59; the order is still `InlineForms::DropdownOrder`'s.
+- **A `dropdown` whose lookup defines `disabled_for_dropdown?` loads the lookup once.** 8.1.59 loaded it to find the disabled options and again, ordered, for the options.
+- **Installer: a gem path with a space no longer breaks the Dart Sass build.** 8.1.58's initializer put the gem's stylesheet dir first as a `build_options` entry, and dartsass-rails splits those on whitespace, so a gem installed under e.g. `/Users/John Doe/…` gave Sass two broken arguments. `config/initializers/inline_forms_dartsass_builds.rb` now prepends the dir to `Dartsass::Runner`'s own `--load-path` list as a separate argument, still ahead of `app/assets/builds`. Apps generated with 8.1.58 or 8.1.59 can copy the new initializer from the installer's `lib/installer_templates/dartsass/`.
+- **Example app: rolling back the seed migration works.** Its `down` destroyed the seeded owners while the seeded apartments still pointed at them, and `apartments.owner_id` / `apartments.phase_id` have foreign keys, so `Owner#destroy` raised `ActiveRecord::InvalidForeignKey`. It now sets those columns to NULL on every apartment that points at a seeded owner or phase before destroying it.
+- The installer's `ApplicationRecord` template says rule 3 is the ORDER BY of `inline_forms_list`.
+
+### Tests
+
+- `dropdown_test`: a filtering `inline_forms_list` orders a dropdown without hiding records, `check_list` keeps that filter under a declared order, and `disabled_for_dropdown?` costs no second query.
+- Example app: `example_app_dartsass_build_test` checks that the gem's stylesheet dir is the first `--load-path` and a separate argument.
+
+### Lockstep
+
+- validation_hints 8.1.60, inline_forms_installer 8.1.60, inline_forms_schema_edit 8.1.60.
+
 ## [8.1.59] - 2026-10-22
 
 ### Fixed

data/lib/generators/templates/application_record.rb

@@ -31,7 +31,8 @@ class ApplicationRecord < ActiveRecord::Base
   #   1. inline_forms_dropdown_order :col            # or :col, :desc
   #   2. a `dropdown_order` integer column, ascending (e.g. '---' 0,
   #      'helprequest' 10, 'decision' 20, 'admittance' 30)
-  #   3. inline_forms_list above
+  #   3. the order of inline_forms_list above (only its ORDER BY: a where
+  #      there filters #index, not the dropdowns)
   #   4. database order
   # 1 and 2 put NULLs last and break ties on id.
 

data/lib/inline_forms/dropdown_order.rb

@@ -7,11 +7,13 @@ module InlineForms
   # 1. the model declares `inline_forms_dropdown_order :column, :asc|:desc`;
   # 2. the table has a `dropdown_order` column (ascending), so a lookup can
   #    put '---' / 'onbekend' first and process phases in process order;
-  # 3. the model's `inline_forms_list` scope (its list order);
+  # 3. the ORDER BY of the model's `inline_forms_list` scope (its list order;
+  #    only the order: a where/joins in that scope does not hide records here);
   # 4. database order (a default_scope order included).
   #
   # 1 and 2 replace any default_scope order, put NULLs last (a record nobody
-  # numbered yet goes to the end) and break ties on the primary key.
+  # numbered yet goes to the end) and break ties on the primary key. 3 adds to
+  # a default_scope order, as merging the scope did.
   #
   # The macro is on every Active Record model (engine initializer), so hosts
   # need no ApplicationRecord change.
@@ -51,11 +53,15 @@ module InlineForms
         keys = [ table[column].public_send(direction).nulls_last ]
         keys << table[klass.primary_key].asc if klass.primary_key && klass.primary_key != column
         relation.reorder(*keys)
-      elsif klass.respond_to?(:inline_forms_list)
-        relation.merge(klass.inline_forms_list)
+      elsif (list_order = list_order_values(klass)).any?
+        relation.order(*list_order)
       else
         relation
       end
     end
+
+    def self.list_order_values(klass)
+      klass.respond_to?(:inline_forms_list) ? klass.inline_forms_list.order_values : []
+    end
   end
 end

data/lib/inline_forms/form_elements/check_list_helper.rb

@@ -21,6 +21,9 @@ module InlineForms
       object.send(attribute).build  if object.send(attribute).empty?
       klass = object.send(attribute).first.class
       values = cancan_enabled? ? klass.accessible_by(current_ability) : klass.all
+      # check_list has always applied the list scope's filter (a where in
+      # inline_forms_list hides records here); the order is DropdownOrder's.
+      values = values.merge(klass.inline_forms_list.unscope(:order)) if klass.respond_to?(:inline_forms_list)
       values = InlineForms::DropdownOrder.apply(values)
       out = ''
       values.each do | item |

data/lib/inline_forms/form_elements/dropdown_helper.rb

@@ -25,11 +25,12 @@ module InlineForms
       else
         values = klass.all
       end
+      values = InlineForms::DropdownOrder.apply(values)
       options_disabled = nil
       if klass.method_defined? :disabled_for_dropdown?
+        # loads values; collection_select below reuses the loaded records
         options_disabled = values.map{|v| v.id if v.disabled_for_dropdown?}.compact
       end
-      values = InlineForms::DropdownOrder.apply(values)
       # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
       collection_select( ('_' + object.class.to_s.underscore).to_sym,
                           attribute.to_s.foreign_key.to_sym,

data/lib/inline_forms/form_elements/pdf_link_helper.rb

@@ -7,7 +7,8 @@ module InlineForms
     
     def pdf_link_show(object, attribute)
       # the attribute is the action
-      "#{link_to 'preview', "/#{attribute}/#{object.id}", :class => "pdf_preview"} #{link_to 'pdf', "/#{attribute}/#{object.id}.pdf", :class => "pdf_open"}".html_safe
+      # turbo:false so the links leave the field's turbo-frame: the preview has no matching frame ("Content missing") and the PDF is not HTML; the preview gets its own tab so the record stays open
+      "#{link_to 'preview', "/#{attribute}/#{object.id}", :class => "pdf_preview", :target => "_blank", :data => { :turbo => false }} #{link_to 'pdf', "/#{attribute}/#{object.id}.pdf", :class => "pdf_open", :data => { :turbo => false }}".html_safe
     end
     
     def pdf_link_edit(object, attribute)

data/lib/inline_forms/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module InlineForms
-  VERSION = "8.1.59"
+  VERSION = "8.1.61"
 end

data/test/integration/dropdown_test.rb

@@ -10,6 +10,11 @@ class DropdownTest < InlineFormsIntegrationTestCase
     [ Phase, Machine, Kind, Part ].each do |klass|
       klass.remove_instance_variable(:@inline_forms_dropdown_order) if klass.instance_variable_defined?(:@inline_forms_dropdown_order)
     end
+    # Back to ApplicationRecord's `inline_forms_list -> { all }`.
+    [ Kind, Part ].each do |klass|
+      klass.singleton_class.remove_method(:inline_forms_list) if klass.singleton_class.method_defined?(:inline_forms_list, false)
+    end
+    Phase.remove_method(:disabled_for_dropdown?) if Phase.method_defined?(:disabled_for_dropdown?, false)
   end
 
   def view
@@ -76,6 +81,32 @@ class DropdownTest < InlineFormsIntegrationTestCase
     assert_equal %w[Zeta Alpha], InlineForms::DropdownOrder.apply(Kind.all).map(&:name)
   end
 
+  test "a filtering inline_forms_list only orders a dropdown, it hides no records" do
+    %w[Zeta Hidden Alpha].each { |name| Kind.create!(name: name) }
+    Kind.define_singleton_method(:inline_forms_list) { where.not(name: "Hidden").order(:name, :id) }
+
+    html = view.dropdown_with_other_edit(Widget.create!(name: "W"), :kind)
+
+    assert_equal %w[Alpha Hidden Zeta], html.scan(/<option value="([^"]*)">/).flatten
+  end
+
+  test "disabled_for_dropdown? and the options come from one query" do
+    create_phases
+    Phase.define_method(:disabled_for_dropdown?) { name == "decision" }
+    selects = []
+    counter = ->(*, payload) { selects << payload[:sql] if payload[:sql].match?(/\ASELECT .*FROM "phases"/) }
+
+    view_context, part = view, Part.create!(name: "Gear")
+
+    html = ActiveSupport::Notifications.subscribed(counter, "sql.active_record") do
+      view_context.dropdown_edit(part, :phase)
+    end
+
+    assert_equal 1, selects.size, selects.join("\n")
+    assert_match(/<option disabled="disabled" value="\d+">decision</, html)
+    assert_equal [ "---", "helprequest", "decision", "admittance", "nieuw" ], option_texts(html)
+  end
+
   test "dropdown_with_other offers its datalist in the dropdown order" do
     %w[Zeta Alpha Mu].each { |name| Kind.create!(name: name) }
     Kind.inline_forms_dropdown_order :name
@@ -95,6 +126,17 @@ class DropdownTest < InlineFormsIntegrationTestCase
     assert_equal %w[Nut Bolt Axle], html.scan(%r{<label for=[^>]*>([^<]*)</label>}).flatten.reject(&:empty?)
   end
 
+  test "check_list keeps the inline_forms_list filter under a declared order" do
+    machine = Machine.create!(name: "Press")
+    %w[Bolt Hidden Nut Axle].each { |name| Part.create!(name: name) }
+    Part.define_singleton_method(:inline_forms_list) { where.not(name: "Hidden").order(:name) }
+    Part.inline_forms_dropdown_order :name, :desc
+
+    html = view.check_list_edit(machine, :parts)
+
+    assert_equal %w[Nut Bolt Axle], html.scan(%r{<label for=[^>]*>([^<]*)</label>}).flatten.reject(&:empty?)
+  end
+
   test "an unknown direction or column is refused" do
     assert_raises(ArgumentError) { Phase.inline_forms_dropdown_order :name, :up }
 

data/test/integration/legacy_elements_test.rb

@@ -51,4 +51,22 @@ class LegacyElementsTest < InlineFormsIntegrationTestCase
     assert_includes response.body, %(href="/report/#{@widget.id}")
     assert_includes response.body, %(href="/report/#{@widget.id}.pdf")
   end
+
+  test "pdf_link links leave the field's turbo frame" do
+    frame = "widget_#{@widget.id}"
+    get widget_path(@widget, update: frame), headers: frame_headers(frame)
+
+    assert_response :success
+    assert_select %(a[href="/report/#{@widget.id}"][data-turbo="false"])
+    assert_select %(a[href="/report/#{@widget.id}.pdf"][data-turbo="false"])
+  end
+
+  test "pdf_link preview opens in a new tab, the pdf link does not" do
+    frame = "widget_#{@widget.id}"
+    get widget_path(@widget, update: frame), headers: frame_headers(frame)
+
+    assert_response :success
+    assert_select %(a[href="/report/#{@widget.id}"][target="_blank"])
+    assert_select %(a[href="/report/#{@widget.id}.pdf"][target]), false
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 8.1.59
+  version: 8.1.61
 platform: ruby
 authors:
 - Ace Suares