Resolve issue with batch submissions

Issue reported by Tomeu Viver now solved

Author: lmrodriguezr

app/models/name.rb

@@ -114,7 +114,10 @@ class Name < ApplicationRecord
       if: -> { nomenclatural_type_id? || nomenclatural_type_entry.present? }
     }
   )
-  validates(:nomenclatural_type_id, presence: { if: :nomenclatural_type_type? })
+  validates(
+    :nomenclatural_type_id,
+    presence: { if: :nomenclatural_type_type? }
+  )
 
   include HasObservers
   include HasExternalResources

app/models/tutorial/batch.rb

@@ -123,7 +123,9 @@ def check_ephemeral_names(user)
 
       # Is the etymology present?
       unless name.etymology?
-        name.errors.add(:etymology_xx_description, :missing, message: 'is missing')
+        name.errors.add(
+          :etymology_xx_description, :missing, message: 'is missing'
+        )
       end
 
       # Is the name already registered?
@@ -158,11 +160,16 @@ def check_ephemeral_names(user)
            :nomenclatural_type_entry, :does_not_exist,
            message: 'is not an existing genome and is not described here'
          )
-       elsif !genome_is_unique?(name)
-         name.errors.add(
-           :nomenclatural_type_entry, :is_a_type,
-           message: 'is already the type genome for a different name'
-         )
+       # TODO
+       # REVISE THIS: Note that a given genome could indeed be the type of two
+       # different names. For example, a new position could be proposed (a
+       # species name transferred to a different genus), or a species and a
+       # subspecies could share the same type genome 
+       #elsif !genome_is_unique?(name)
+       #  name.errors.add(
+       #    :nomenclatural_type_entry, :is_a_type,
+       #    message: 'is already the type genome for a different name'
+       #  )
        end
       end
     end
@@ -297,9 +304,6 @@ def batch_step_01(params, user)
         # Remove foreign keys in first pass
         par = par_ori.dup
         par['parent'] = nil
-        if par['nomenclatural_type_type'].to_s.downcase == 'name'
-          par['nomenclatural_type_entry'] = nil
-        end
 
         # Claim/update or create
         name = Name.find_by_variants(par['name'])
@@ -332,7 +336,8 @@ def batch_step_01(params, user)
               par['nomenclatural_type_entry'].present?
           new_par[:nomenclatural_type] =
             Name.find_by_variants(par['nomenclatural_type_entry'])
-          unless new_par[:type_accession]
+          # Deal with legacy type accession definitions
+          if new_par[:type_accession].present?
             name = Name.new(default_pars.merge(name: par['type_material']))
             name.save!
             new_par[:type_accession] = name.id

app/views/tutorials/_bar.html.erb

@@ -21,10 +21,17 @@
 
 <% if @tutorial.invalid_record %>
   <div class="alert alert-danger">
-    Errors detected for <%= display_link(@tutorial.invalid_record.record) %>:
+    Errors detected for <%= display_link(@tutorial.invalid_record.record) %>
+    <% id = modal('Record details', size: 'lg') do %>
+      <% r = @tutorial.invalid_record.record %>
+      <pre><%= JSON.pretty_generate(JSON.parse(r.to_json)) %></pre>
+    <% end %>
+    <%= modal_button(id, as_anchor: true) do %>(record details)<% end %>:
     <ul>
       <% @tutorial.invalid_record.record.errors.full_messages.each do |error| %>
-        <li><%= error %></li>
+        <li>
+          <%= error %>
+        </li>
       <% end %>
     </ul>
   </div>

app/views/tutorials/batch/_01.html.erb

@@ -51,7 +51,9 @@
               </p>
               <hr/>
               <p><b>Description:</b> <%= name.description %></p>
-              <p><b>Nomenclatural type:</b> <%= name.type_text %></p>
+              <p>
+                <b>Nomenclatural type:</b> <%= name.type_text.try(:html_safe) %>
+              </p>
               <% if name.errors.any? %>
                 <div class="alert alert-danger">
                   <h4>Issues detected in preliminary check:</h4>