inline_forms 8.1.15 → 8.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e6670831f8bce627752b9797371fb20d2f3b14f571a4bc8c879478b71f5ff6
-  data.tar.gz: 32fd5f2f3503126e9113d10a3bea9ba23468667f11cc4db8252d78078b101af8
+  metadata.gz: b7336d7c761e22dd4378a0c2d01b54f7558a2a29d9818a085b4478c17e664ead
+  data.tar.gz: 3e08954932efda044a18cf4f4a68ad3299ffdb382581c9369bc733023ff57906
 SHA512:
-  metadata.gz: d9e59af7820b05e5ef046c1771a85f37ee1d7dd4ab9affbe0f8e2dfda03fe49db57d9452972406a889f699732165b8117bb56ecdee6c6a5edf9c05b0d14642f8
-  data.tar.gz: 55be4d675321e511079de4a362688b664e65dce704dd56ef5929c8db2a286f0fef034312a2572016138808155a18e4f7150472a26aa904adb65e926d762da949
+  metadata.gz: 93339e380b5d224fe1b1d3b5459cc6675682ed81bd87f7a28594afafaa9304b50467dc8cb2b628641c78fb39ba68649c02fd9a38b154388815458e51e2781afe
+  data.tar.gz: e33e98b2676db0ec7d0af1196a1bf9be4b423b231d52f9636391fd830fdb29779a6e03381a5150bdde4258374ec13c4ad3b908f55cdd1e3ebf2d03ad86ac2cbc

data/CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [8.1.17] - 2026-05-28
+
+### Fixed
+
+- **`RecordNotUnique` on `photos.id` (and any primary record) when restoring a `destroy` version while the row still exists.** PaperTrail records a non-empty changeset for `destroy` events, so the versions panel shows a Restore link on `destroy` rows. Reverting a `destroy` reifies a record with the original primary key and `new_record? == true`; the normal undo (row currently deleted) path correctly INSERTs it, but once the row had already been restored a blind `save!` re-INSERTed the existing id and raised `SQLite3::ConstraintException: UNIQUE constraint failed: photos.id`. `revert` now upserts the primary record by PK (mirroring the 8.1.16 rich-text fix): when a row with that id already exists, the reified column values are copied onto it and saved in place, so restoring a `destroy` version is idempotent across repeated delete/undo cycles.
+
+### Added
+
+- **Regression test:** restore a Photo `destroy` version while the row still exists (panel Restore / replayed undo) must not raise `RecordNotUnique`.
+
+## [8.1.16] - 2026-05-28
+
+### Fixed
+
+- **`RecordNotUnique` on `action_text_rich_texts.id` when undoing a delete more than once.** Restoring rich text after parent undo used `reify.save!`, which INSERTs the old primary key. A second delete/undo cycle (or an already-restored row) hit SQLite's unique constraint. Restoration now upserts by `(record_type, record_id, name)` and copies `body` only, and only the latest PaperTrail `destroy` version per attribute is applied.
+
+### Added
+
+- **Regression test:** nested Photo delete → undo → delete → undo.
+
 ## [8.1.15] - 2026-05-28
 
 ### Fixed

data/app/controllers/inline_forms_controller.rb

@@ -318,8 +318,7 @@ class InlineFormsController < ApplicationController
       @rich_text_record.save!
       @parent.touch if @parent.respond_to?(:touch)
     else
-      @parent = @object
-      @parent.save!
+      @parent = persist_reverted_primary!(@object)
       restore_rich_texts_for_reverted_parent!(@parent)
       @parent.reload
     end
@@ -328,26 +327,79 @@ class InlineFormsController < ApplicationController
 
   private
 
+  # Persist a reified *primary* record (Apartment, Photo, ...) for +revert+.
+  #
+  # +reify+ on a +destroy+ version returns a record with +new_record? == true+
+  # carrying the original primary key. The normal undo (row currently deleted)
+  # path INSERTs that id and is correct. But the versions panel also offers
+  # Restore on +destroy+ rows (their changeset is non-empty in apps that track
+  # +object_changes+ on destroy), and the post-delete undo banner can be
+  # replayed. Once the row has been restored, a blind +save!+ re-INSERTs the
+  # existing id and raises +RecordNotUnique+ (SQLite: +UNIQUE constraint failed:
+  # photos.id+). Mirror the rich-text upsert (8.1.16): when a row with that PK
+  # already exists, copy the reified column values onto it and +save!+ that
+  # instead, so reverting is idempotent across repeated delete/undo cycles.
+  def persist_reverted_primary!(object)
+    klass = object.class
+    primary_key = klass.primary_key
+
+    if object.new_record? && object.id.present? && klass.exists?(object.id)
+      existing = klass.find(object.id)
+      existing.assign_attributes(object.attributes.except(primary_key))
+      existing.save!
+      existing
+    else
+      object.save!
+      object
+    end
+  end
+
   # Undoing a parent +destroy+ reifies the Apartment/Photo row only. ActionText
   # bodies live in +action_text_rich_texts+ and get their own PaperTrail
   # +destroy+ versions; those rows are gone after +parent.destroy+, so we also
-  # reify and save each matching +ActionText::RichText+ destroy snapshot.
+  # reify each matching +ActionText::RichText+ destroy snapshot.
+  #
+  # Use +find_or_initialize_by(record_type, record_id, name)+ and copy +body+
+  # only. Reified rows carry the old PK; +save!+ on a new record would INSERT
+  # that id and raise +RecordNotUnique+ on a second delete/undo cycle when the
+  # row already exists. Only the newest destroy version per attribute name is
+  # applied (repeat delete/undo leaves multiple RT destroy versions in the table).
   def restore_rich_texts_for_reverted_parent!(parent)
     return unless defined?(ActionText::RichText)
 
     record_type = parent.class.base_class.name
     record_id = parent.id
+    versions_by_name = {}
+
+    PaperTrail::Version
+      .where(item_type: "ActionText::RichText", event: "destroy")
+      .order(id: :desc)
+      .each do |version|
+        attrs = version.object_deserialized
+        next unless attrs.is_a?(Hash)
 
-    PaperTrail::Version.where(item_type: "ActionText::RichText", event: "destroy").find_each do |version|
-      attrs = version.object_deserialized
-      next unless attrs.is_a?(Hash)
+        type = attrs["record_type"] || attrs[:record_type]
+        rid = attrs["record_id"] || attrs[:record_id]
+        next unless type == record_type && rid.to_i == record_id
 
-      type = attrs["record_type"] || attrs[:record_type]
-      rid = attrs["record_id"] || attrs[:record_id]
-      next unless type == record_type && rid.to_i == record_id
+        name = (attrs["name"] || attrs[:name]).to_s
+        next if name.empty?
+
+        versions_by_name[name] ||= version
+      end
 
-      rich_text = version.reify
-      rich_text&.save!
+    versions_by_name.each_value do |version|
+      reified = version.reify
+      next unless reified
+
+      name = reified.name.to_s
+      record = ActionText::RichText.find_or_initialize_by(
+        record_type: record_type,
+        record_id: record_id,
+        name: name
+      )
+      record.body = reified.body if reified.respond_to?(:body)
+      record.save!
     end
   end
 

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "8.1.15"
+  VERSION = "8.1.17"
 end

metadata

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