inline_forms 8.1.64 → 8.1.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65f5d0ad495091211688c0db04b4466e240ea578b1349523e97a1ce66d3cd00
-  data.tar.gz: 9aca4b16c7481547715c240283ff8bac4de6d1d19caa57e3bc239aa51ed2899c
+  metadata.gz: acc7bbb91a0ebefa61a500e74814588ffeed1ac4bb9c4da36098b09d47c8483e
+  data.tar.gz: 448a2bd05b8ef8cf69d4a4268c29cfaa7c8955089f4b57675632334e5b2ef42c
 SHA512:
-  metadata.gz: 05afb1bc303bfdda7506735a166f1f69f0ee5f8a79efa2279a4d928e308c69047037bfd00383a260a3e547f5540bdd7f36d8aff476da0c54c9c7b92df21a39b2
-  data.tar.gz: c059604b46b459595cc34fb574704a1e0203aab6eb40083825df0763c0e9ae48489765515529efa30561f0b2bed44ec39944566750b7e6fc14b7da2c4d209033
+  metadata.gz: ead6649bf5d9c969bc93b4f937f2fe11e97be176184788ff884e94932471baf893408711a3556ef274f4a3eea2be0ffd3401e52f03848b69c3bf2a89ca454880
+  data.tar.gz: 1f74c4a96abc1dfcb0215e6f465636e80d0512a3f9a4ab590a33ab3764d0d7d9f3377e39576cfcac2f9ad79b2890de33b7cd8ffd3bee4ba59d406a0f96d9dd6f

data/CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [8.1.65] - 2026-10-31
+
+Fixes from a review of 8.1.60 to 8.1.64.
+
+### Fixed
+
+- **Dropdowns honour a `reorder` in `inline_forms_list`.** Since 8.1.60 rule 3 added the scope's order to a `default_scope` order, so a scope that reorders lost: Scouting's lookups with `inline_forms_list_by_name` would have sorted by name and lost their pinned entries. Rule 3 now uses the scope's order as it stands: it follows a `default_scope` order, unless the scope reorders.
+- **A list order on a joined table no longer breaks the dropdown.** Since 8.1.60 rule 3 dropped the scope's joins and kept its ORDER BY, which was invalid SQL. Association joins now come along as LEFT joins, so the order works and no record is hidden. A string join stays as written, so it can still hide records.
+- **`pdf_link` needs no model method.** `pdf_link_edit` called the attribute, so a new form with a `pdf_link` row raised `NoMethodError` unless the model had a stub. The example app's `def report` is gone.
+- **`pdf_link` works under a sub-path.** Both links now start with the app's `request.script_name`.
+
+### Tests
+
+- `dropdown_test`: `default_scope` with a list scope, a `reorder`, and a list order on a joined table (`dropdown` and `check_list`).
+- `legacy_elements_test`: `pdf_link` in a new form without a model method, and under a sub-path.
+- Example app: `example_app_seed_rollback_test` runs the seed migration's `down`.
+
+### Documentation
+
+- `CLAUDE.md`: inline_forms is released with `rake release:all`.
+- The 8.1.59 changelog date is the release date, 2026-10-25.
+
+### Lockstep
+
+- validation_hints 8.1.65, inline_forms_installer 8.1.65, inline_forms_schema_edit 8.1.65.
+
 ## [8.1.64] - 2026-10-31
 
 ### Changed
@@ -82,7 +108,7 @@ Fixes from a review of 8.1.58 and 8.1.59.
 
 - validation_hints 8.1.60, inline_forms_installer 8.1.60, inline_forms_schema_edit 8.1.60.
 
-## [8.1.59] - 2026-10-22
+## [8.1.59] - 2026-10-25
 
 ### Fixed
 

data/lib/inline_forms/dropdown_order.rb

@@ -8,12 +8,14 @@ module InlineForms
   # 2. the table has a `dropdown_order` column (ascending), so a lookup can
   #    put '---' / 'onbekend' first and process phases in process 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);
+  #    only the order: a where in that scope does not hide records here, and
+  #    its joins come along as LEFT joins, for an order on a joined table);
   # 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. 3 adds to
-  # a default_scope order, as merging the scope did.
+  # numbered yet goes to the end) and break ties on the primary key. 3 keeps a
+  # default_scope order after it, unless the scope reorders: the scope's own
+  # order_values already say which.
   #
   # The macro is on every Active Record model (engine initializer), so hosts
   # need no ApplicationRecord change.
@@ -53,15 +55,26 @@ 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 (list_order = list_order_values(klass)).any?
-        relation.order(*list_order)
+      elsif (list = list_scope(klass))&.order_values&.any?
+        with_list_joins(relation, list).reorder(*list.order_values)
       else
         relation
       end
     end
 
-    def self.list_order_values(klass)
-      klass.respond_to?(:inline_forms_list) ? klass.inline_forms_list.order_values : []
+    def self.list_scope(klass)
+      klass.inline_forms_list if klass.respond_to?(:inline_forms_list)
+    end
+
+    # An association join becomes a LEFT join, so a record without the
+    # association stays in the list. A string join can't: it stays as written.
+    def self.with_list_joins(relation, list)
+      named, raw = list.joins_values.partition { |join| join.is_a?(Symbol) || join.is_a?(Hash) }
+      named = (named | list.left_outer_joins_values | list.eager_load_values) - relation.joins_values
+      raw -= relation.joins_values
+      relation = relation.left_outer_joins(*named) if named.any?
+      relation = relation.joins(*raw) if raw.any?
+      relation
     end
   end
 end

data/lib/inline_forms/form_elements/pdf_link_helper.rb

@@ -8,10 +8,17 @@ module InlineForms
     def pdf_link_show(object, attribute)
       # the attribute is the action
       # 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 t("inline_forms.files.preview", :default => "preview"), "/#{attribute}/#{object.id}", :class => "pdf_preview", :target => "_blank", :data => { :turbo => false }} | #{link_to t("inline_forms.files.download_pdf", :default => "download pdf"), "/#{attribute}/#{object.id}.pdf", :class => "pdf_open", :data => { :turbo => false }}".html_safe
+      # script_name so the links work in an app deployed under a sub-path
+      path = "#{request.script_name}/#{attribute}/#{object.id}"
+      safe_join([
+        link_to(t("inline_forms.files.preview", :default => "preview"), path, :class => "pdf_preview", :target => "_blank", :data => { :turbo => false }),
+        link_to(t("inline_forms.files.download_pdf", :default => "download pdf"), "#{path}.pdf", :class => "pdf_open", :data => { :turbo => false })
+      ], " | ")
     end
     
     def pdf_link_edit(object, attribute)
+      # the attribute is an action: a model needs no method for it
+      return unless object.respond_to?(attribute)
       o = object.send(attribute)
       o = o.to_s + " (" + distance_of_time_in_words_to_now(o) + ")" if o.is_a?(Time)
       o = o._presentation if o.respond_to?(:_presentation)

data/lib/inline_forms/version.rb

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

data/test/integration/dropdown_test.rb

@@ -15,6 +15,7 @@ class DropdownTest < InlineFormsIntegrationTestCase
       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)
+    Kind.default_scopes = []
   end
 
   def view
@@ -90,6 +91,45 @@ class DropdownTest < InlineFormsIntegrationTestCase
     assert_equal %w[Alpha Hidden Zeta], html.scan(/<option value="([^"]*)">/).flatten
   end
 
+  test "a reorder in inline_forms_list replaces a default_scope order" do
+    Kind.send(:default_scope) { order(:name) }
+    %w[Alpha Otro Zeta].each { |name| Kind.create!(name: name) }
+    Kind.define_singleton_method(:inline_forms_list) { reorder(Arel::Nodes::Descending.new(arel_table[:name].eq("Otro")), :name) }
+
+    assert_equal %w[Otro Alpha Zeta], InlineForms::DropdownOrder.apply(Kind.all).map(&:name)
+  end
+
+  test "the list order follows a default_scope order, without repeating it" do
+    Kind.send(:default_scope) { order(:name) }
+    Kind.define_singleton_method(:inline_forms_list) { order(:id) }
+
+    sql = InlineForms::DropdownOrder.apply(Kind.all).to_sql
+
+    assert_equal 1, sql.scan('"kinds"."name"').size, sql
+    assert_operator sql.index('"kinds"."name"'), :<, sql.index('"kinds"."id"')
+  end
+
+  test "an inline_forms_list order on a joined table hides no records" do
+    Part.create!(name: "Axle", phase: Phase.create!(name: "z"))
+    Part.create!(name: "Bolt", phase: Phase.create!(name: "a"))
+    Part.create!(name: "Free")
+    Part.define_singleton_method(:inline_forms_list) { joins(:phase).order("phases.name DESC") }
+
+    assert_equal %w[Axle Bolt Free], InlineForms::DropdownOrder.apply(Part.all).map(&:name)
+  end
+
+  test "check_list keeps a joining inline_forms_list filter and its order" do
+    machine = Machine.create!(name: "Press")
+    Part.create!(name: "Axle", phase: Phase.create!(name: "z"))
+    Part.create!(name: "Bolt", phase: Phase.create!(name: "a"))
+    Part.create!(name: "Hidden")
+    Part.define_singleton_method(:inline_forms_list) { joins(:phase).order("phases.name") }
+
+    html = view.check_list_edit(machine, :parts)
+
+    assert_equal %w[Bolt Axle], html.scan(%r{<label for=[^>]*>([^<]*)</label>}).flatten.reject(&:empty?)
+  end
+
   test "disabled_for_dropdown? and the options come from one query" do
     create_phases
     Phase.define_method(:disabled_for_dropdown?) { name == "decision" }

data/test/integration/legacy_elements_test.rb

@@ -62,6 +62,23 @@ class LegacyElementsTest < InlineFormsIntegrationTestCase
     assert_match %r{>preview</a> \| <a[^>]*>download pdf</a>}, response.body
   end
 
+  test "pdf_link needs no model method in the new form" do
+    assert_not Widget.new.respond_to?(:report)
+
+    get new_widget_path(update: "widgets_list"), headers: frame_headers("widgets_list")
+
+    assert_response :success
+  end
+
+  test "pdf_link links keep the app's sub-path" do
+    frame = "widget_#{@widget.id}"
+    get widget_path(@widget, update: frame), headers: frame_headers(frame), env: { "SCRIPT_NAME" => "/portal" }
+
+    assert_response :success
+    assert_select %(a.pdf_preview[href="/portal/report/#{@widget.id}"])
+    assert_select %(a.pdf_open[href="/portal/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)

data/test/integration/locale_test.rb

@@ -123,11 +123,11 @@ class LocaleTest < InlineFormsIntegrationTestCase
   end
 
   test "pdf_link reads Dutch" do
+    original_default = I18n.default_locale
     widget = Widget.create!(name: "Rapport")
     frame = "widget_#{widget.id}"
 
     # Not strictly: the dummy's dropdown values have no nl texts.
-    original_default = I18n.default_locale
     I18n.with_locale(:nl) do
       I18n.default_locale = :nl
       get widget_path(widget, update: frame), headers: frame_headers(frame)

metadata

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