Fix point versions (broken deserialization issue). Change UI to not hide the details under a dropdown, and only show what has changed.

Author: Evan Radkoff

app/helpers/application_helper.rb

@@ -94,11 +94,9 @@ def hide_tags(snippet)
     ).html_safe
   end
 
-  def format_figures(figure, first: true)
-    if first
-      figure.nil? ? 'No changes recorded' : figure.first
-    else
-      figure.nil? ? 'No changes recorded' : figure.second
-    end
+  def format_version_change(figure, first: true)
+    return 'No changes recorded' if figure.nil?
+
+    first ? figure.first : figure.last
   end
 end

app/views/points/_table_versions.html.erb

@@ -2,55 +2,66 @@
   <% counter = 1 %>
   <% @versions.each_with_index do |version, index| %>
   <% counter += 1 %>
-  <% event = version.event == "create" ? "Analysis created" : "Analysis updated" %>
+  <% is_create = version.event == "create" %>
+  <% event = is_create ? "Analysis created" : "Analysis updated" %>
   <% title = version.changeset["title"] %>
   <% analysis = version.changeset["analysis"] %>
   <% status = version.changeset["status"] %>
+
   <% version.changeset['change_reason'].nil? ? reason = "No reason provided for previous changes" : reason = version.changeset["change_reason"].second %>
   <div class="panel panel-default" id="panel<%=counter%>">
     <div class="panel-heading" id="panel-style">
       <div class="row">
-        <div class="col-sm-4">
+        <div class="col-sm-6">
           <h5>
               <b>Version <%= @versions.length - index %>:</b> <%= version.changeset["updated_at"].nil? ? @point.updated_at : version.changeset["updated_at"].second.time %> by <%= username version.whodunnit %> <%= rank_badge version.item.respond_to?(:user) ? version.item.user : version.whodunnit %>
           </h5>
         </div>
-        <div class="col-sm-4">
-          <h5>
-            <a data-toggle="collapse" data-target="#collapse<%=counter%>"
-              href="#collapse<%=counter%>" class="collapsed">
-              <%= event %>
-            </a>
-          </h5>
-        </div>
-        <div class="col-sm-4 text-right">
-          <a data-toggle="collapse" data-target="#collapse<%=counter%>"
-              href="#collapse<%=counter%>" class="collapsed">
-              <span class="glyphicon glyphicon-chevron-down" aria-hidden="true"></span>
-          </a>
+        <div class="col-sm-6">
+          <h5><%= event %></h5>
         </div>
+      </div>
     </div>
-  </div>
-    <div id="collapse<%=counter%>" class="panel-collapse collapse">
-      <div class="panel-body">
-        <div class="row">
-          <div class="col-sm-6">
-            <p><b>Previous Title:</b> <%= format_figures(title) %></p>
-            <p><b>Updated Title:</b> <%= format_figures(title, first: false) %></p>
-          </div>
-          <div class="col-sm-6">
-            <p><b>Previous Analysis:</b> <%= format_figures(analysis) %></p>
-            <p><b>Updated Analysis:</b> <%= format_figures(analysis, first: false) %></p>
-          </div>
-          <div class="col-sm-6">
-            <p><b>Previous Status:</b> <%= status_badge format_figures(status) %></p>
-            <p><b>Updated Status:</b> <%= status_badge format_figures(status, first: false) %></p>
-          </div>
-        </div>
+    <div class="panel-body">
+      <div class="row">
+        <% if is_create %>
+          <% if title %>
+            <div class="col-sm-6">
+              <p><b>Title:</b> <%= title&.last %></p>
+            </div>
+          <% end %>
+          <% if analysis %>
+            <div class="col-sm-6">
+              <p><b>Analysis:</b> <%= analysis&.last %></p>
+            </div>
+          <% end %>
+          <% if status %>
+            <div class="col-sm-6">
+              <p><b>Status:</b> <%= status_badge status&.last %></p>
+            </div>
+          <% end %>
+        <% else %>
+          <% if title %>
+            <div class="col-sm-6">
+              <p><b>Previous Title:</b> <%= format_version_change(title) %></p>
+              <p><b>Updated Title:</b> <%= format_version_change(title, first: false) %></p>
+            </div>
+          <% end %>
+          <% if analysis %>
+            <div class="col-sm-6">
+              <p><b>Previous Analysis:</b> <%= format_version_change(analysis) %></p>
+              <p><b>Updated Analysis:</b> <%= format_version_change(analysis, first: false) %></p>
+            </div>
+          <% end %>
+          <% if status %>
+            <div class="col-sm-6">
+              <p><b>Previous Status:</b> <%= status_badge format_version_change(status) %></p>
+              <p><b>Updated Status:</b> <%= status_badge format_version_change(status, first: false) %></p>
+            </div>
+          <% end %>
+        <% end %>
       </div>
     </div>
   </div>
   <% end %>
 </div>
-</div>
-

config/initializers/paper_trail.rb

@@ -3,3 +3,25 @@
 # Association Tracking for PaperTrail has been extracted to a separate gem. To use it, please add `paper_trail-association_tracking` to your Gemfile. If you don't use it (most people don't, that's the default) and you set `track_associations = false` somewhere (probably a rails initializer) you can remove that line now.
 
 # PaperTrail.config.track_associations = false
+
+# Psych 4 disabled unsafe YAML loading by default, which broke deserialization of existing `object_changes`
+# rows in the `versions` table containing ActiveSupport time objects. Permit the classes we store.
+module PaperTrail
+  module Serializers
+    module YAML
+      PERMITTED_YAML_CLASSES = [
+        ActiveSupport::TimeWithZone,
+        ActiveSupport::TimeZone,
+        Time,
+        Date,
+        DateTime,
+        Symbol,
+        BigDecimal
+      ].freeze
+
+      def self.load(string)
+        ::YAML.safe_load(string, permitted_classes: PERMITTED_YAML_CLASSES, aliases: true)
+      end
+    end
+  end
+end