Record asset deltas at publish, with changed assets as participants

3 files changed, 45 insertions, 6 deletions

diff --git a/app/helpers/node_actions_helper.rb b/app/helpers/node_actions_helper.rb
index ed8d0407..4041ffa9 100644
--- a/app/helpers/node_actions_helper.rb
+++ b/app/helpers/node_actions_helper.rb
@@ -49,7 +49,7 @@ module NodeActionsHelper
     m = action.metadata
     return true if m["translation_diff"].present?
     return true if m["title"].is_a?(Hash) && m.dig("title", "from") != m.dig("title", "to")
-    %w[author tags template_changed assets_changed
+    %w[author tags template_changed assets assets_changed assets_reordered
        abstract_changed body_changed].any? { |key| m[key].present? }
   end
 
@@ -69,6 +69,13 @@ module NodeActionsHelper
     items << t("node_actions.abstract_changed") if m["abstract_changed"]
     items << t("node_actions.body_changed")     if m["body_changed"]
     items << t("node_actions.template_changed") if m["template_changed"]
+    if m["assets"]
+      items << t("node_actions.detail_assets_added",
+                  :names => Array(m.dig("assets", "added")).join(", "))   if m.dig("assets", "added")
+      items << t("node_actions.detail_assets_removed",
+                  :names => Array(m.dig("assets", "removed")).join(", ")) if m.dig("assets", "removed")
+    end
+    items << t("node_actions.assets_reordered") if m["assets_reordered"]
     items << t("node_actions.assets_changed")   if m["assets_changed"]
     items
   end
diff --git a/app/models/node.rb b/app/models/node.rb
index 0a9cd2d1..274b2f94 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -249,7 +249,9 @@ class Node < ApplicationRecord
         self.head.save!
         self.draft = nil
 
-        NodeAction.record!(:node => self, :page => self.head, :user => current_user,
+        NodeAction.record!(:node => self,
+                            :participants => [self] + NodeAction.changed_assets(outgoing_head, self.head),
+                            :page => self.head, :user => current_user,
                             :action => "publish", :via => "draft",
                             **NodeAction.head_diff(outgoing_head, self.head))
       end
@@ -296,7 +298,9 @@ class Node < ApplicationRecord
       self.head = page
       self.save!
 
-      NodeAction.record!(:node => self, :page => page, :user => current_user,
+      NodeAction.record!(:node => self,
+                          :participants => [self] + NodeAction.changed_assets(outgoing_head, page),
+                          :page => page, :user => current_user,
                           :action => "publish", :via => "revision",
                           **NodeAction.head_diff(outgoing_head, page))
       self
diff --git a/app/models/node_action.rb b/app/models/node_action.rb
index aa52f489..afa2195c 100644
--- a/app/models/node_action.rb
+++ b/app/models/node_action.rb
@@ -35,8 +35,16 @@ class NodeAction < ApplicationRecord
   #   "title"  -- pair, always; "from" null on first publish
   #   "author" -- pair, when the byline changed (incl. first publish)
   #   "tags"   -- pair of arrays, when changed
-  #   "assets_changed", "template_changed",
-  #   "abstract_changed", "body_changed"
+  #   "assets" -- {"added" => [asset names], "removed" => [asset names]},
+  #               keys only when any; a delta, not a pair. The event IS
+  #               the delta, full sets would bloat every entry. Changed
+  #               assets are participants of the entry. Replaces the
+  #               legacy "assets_changed" boolean, which witnessed
+  #               pre-contract entries still carry and the renderer keeps
+  #               understanding. Assets destroyed since leave no trace in
+  #               regenerated deltas, their joins died with them.
+  #   "assets_reordered" -- boolean, set unchanged but gallery order not
+  #   "template_changed", "abstract_changed", "body_changed"
   #            -- the last two for the default locale; page_id links
   #               to the revision for the real diff (never stored)
   #   "translation_diff" -- only when a non-default locale differs:
@@ -155,7 +163,17 @@ class NodeAction < ApplicationRecord
     diff[:tags] = { "from" => old_tags, "to" => new_tags } if old_tags != new_tags
 
     diff[:template_changed] = true if old_page.template_name != new_page.template_name
-    diff[:assets_changed]   = true if old_page.assets.map(&:id) != new_page.assets.map(&:id)
+
+    old_assets, new_assets = old_page.assets.to_a, new_page.assets.to_a
+    added, removed = new_assets - old_assets, old_assets - new_assets
+    if added.any? || removed.any?
+      assets = {}
+      assets["added"]   = added.map   { |a| a.name.presence || a.upload_file_name } if added.any?
+      assets["removed"] = removed.map { |a| a.name.presence || a.upload_file_name } if removed.any?
+      diff[:assets] = assets
+    elsif old_assets.map(&:id) != new_assets.map(&:id)
+      diff[:assets_reordered] = true
+    end
 
     old_t = old_page.translations.find_by(:locale => default)
     new_t = new_page.translations.find_by(:locale => default)
@@ -188,6 +206,16 @@ class NodeAction < ApplicationRecord
     diff
   end
 
+  # The asset records added or removed between an outgoing head and its
+  # replacement -- the participant complement to head_diff's "assets"
+  # names. Empty on first publish, mirroring head_diff, which records
+  # no asset delta when everything is new.
+  def self.changed_assets old_page, new_page
+    return [] unless old_page
+    old_a, new_a = old_page.assets.to_a, new_page.assets.to_a
+    (new_a - old_a) | (old_a - new_a)
+  end
+
   def actor_name
     metadata["username"] || "unknown"
   end