From 6a60cfa168081b194994198c9469097f9cbbc58d Mon Sep 17 00:00:00 2001
From: Kevin Cooper <cooperka92@gmail.com>
Date: Tue, 31 Oct 2023 11:52:26 -0400
Subject: [PATCH] 12494: unify with older logic for instanceName

---
 app/decorators/odk/form_decorator.rb         | 9 ++++-----
 app/views/forms/odk/_instances.xml.erb       | 5 +----
 spec/fixtures/odk/forms/default_patterns.xml | 4 +---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/decorators/odk/form_decorator.rb b/app/decorators/odk/form_decorator.rb
index 9e60131e7a..53a4a54c42 100644
--- a/app/decorators/odk/form_decorator.rb
+++ b/app/decorators/odk/form_decorator.rb
@@ -9,11 +9,10 @@ class FormDecorator < BaseDecorator
     IR_QUESTION = "ir01"
     IR_CODE = "ir02"
 
-    def default_response_name_instance_tag
-      if default_response_name.present?
-        content_tag(:meta, tag(:instanceName))
-      else
-        ""
+    def meta_tags
+      content_tag("orx:meta") do
+        h.concat(tag("orx:instanceID"))
+        h.concat(tag("orx:instanceName")) if default_response_name.present?
       end
     end
 
diff --git a/app/views/forms/odk/_instances.xml.erb b/app/views/forms/odk/_instances.xml.erb
index a04f4837f7..7e31b15eba 100644
--- a/app/views/forms/odk/_instances.xml.erb
+++ b/app/views/forms/odk/_instances.xml.erb
@@ -1,6 +1,5 @@
 <instance>
   <%= content_tag(:data, id: @form.id, version: @form.number) do %>
-    <%= @form.default_response_name_instance_tag %>
     <%= render("forms/odk/instance_node", node: @form.root_group) %>
 
     <%# Incomplete response question nodes %>
@@ -9,9 +8,7 @@
       <%= tag(ODK::FormDecorator::IR_CODE) %>
     <% end %>
 
-    <orx:meta>
-      <orx:instanceID/>
-    </orx:meta>
+    <%= @form.meta_tags %>
   <% end %>
 </instance>
 
diff --git a/spec/fixtures/odk/forms/default_patterns.xml b/spec/fixtures/odk/forms/default_patterns.xml
index b4526bc6e3..9157e31804 100644
--- a/spec/fixtures/odk/forms/default_patterns.xml
+++ b/spec/fixtures/odk/forms/default_patterns.xml
@@ -5,9 +5,6 @@
     <model>
       <instance>
         <data id="*form1*" version="*formver1*">
-          <meta>
-            <instanceName/>
-          </meta>
           <*itemcode1*>
             <header/>
             <*itemcode2*/>
@@ -19,6 +16,7 @@
           <*itemcode6*/>
           <orx:meta>
             <orx:instanceID/>
+            <orx:instanceName/>
           </orx:meta>
         </data>
       </instance>