also need to deal with extended metadata and template attributes #1648

app/models/sample_controlled_vocab.rb

@@ -7,6 +7,7 @@ class SampleControlledVocab < ApplicationRecord
                                            dependent: :destroy
   has_many :sample_attributes, inverse_of: :sample_controlled_vocab
   has_many :extended_metadata_attributes, inverse_of: :sample_controlled_vocab
+  has_many :template_attributes, inverse_of: :sample_controlled_vocab
 
   has_many :sample_types, through: :sample_attributes
   has_many :samples, through: :sample_types

db/migrate/20231114110205_add_allow_cv_free_text_to_attributes.rb

@@ -0,0 +1,7 @@
+class AddAllowCvFreeTextToAttributes < ActiveRecord::Migration[6.1]
+  def change
+    add_column :sample_attributes, :allow_cv_free_text, :boolean, default: false
+    add_column :template_attributes, :allow_cv_free_text, :boolean, default: false
+    add_column :extended_metadata_attributes, :allow_cv_free_text, :boolean, default: false
+  end
+end

db/migrate/20231114110917_remove_custom_input_from_cv.rb

@@ -1,9 +1,11 @@
 class RemoveCustomInputFromCv < ActiveRecord::Migration[6.1]
   def up
-    # Move to SampleAttribute first, for CV's without associated attributes the information will be lost
-    controlled_vocabs = SampleControlledVocab.where(custom_input: true).includes(:sample_attributes).select{|cv| cv.sample_attributes.any?}
+    # Move to Attribute first, for CV's without associated attributes the information will be lost
+    controlled_vocabs = SampleControlledVocab.where(custom_input: true).includes(:sample_attributes, :extended_metadata_attributes, :template_attributes)
     controlled_vocabs.each do |controlled_vocab|
       controlled_vocab.sample_attributes.update_all(allow_cv_free_text: true)
+      controlled_vocab.extended_metadata_attributes.update_all(allow_cv_free_text: true)
+      controlled_vocab.template_attributes.update_all(allow_cv_free_text: true)
     end
     remove_column :sample_controlled_vocabs, :custom_input
   end
@@ -12,7 +14,17 @@ def down
     add_column :sample_controlled_vocabs, :custom_input, :boolean, default: false
 
     # will only restore CV's that had attributes associated
-    attributes = SampleAttribute.where(allow_cv_free_text: true).includes(:sample_controlled_vocab)
+    attributes = SampleAttribute.where(allow_cv_free_text: true)
+    attributes.each do |attr|
+      attr.sample_controlled_vocab&.update_column(:custom_input, :true)
+    end
+
+    attributes = ExtendedMetadataAttribute.where(allow_cv_free_text: true)
+    attributes.each do |attr|
+      attr.sample_controlled_vocab&.update_column(:custom_input, :true)
+    end
+
+    attributes = TemplateAttribute.where(allow_cv_free_text: true)
     attributes.each do |attr|
       attr.sample_controlled_vocab&.update_column(:custom_input, :true)
     end

db/schema.rb

@@ -633,6 +633,7 @@
     t.text "description"
     t.string "label"
     t.integer "linked_extended_metadata_type_id"
+    t.boolean "allow_cv_free_text", default: false
     t.index ["extended_metadata_type_id"], name: "index_extended_metadata_attributes_on_extended_metadata_type_id"
     t.index ["sample_attribute_type_id"], name: "index_extended_metadata_attributes_on_sample_attribute_type_id"
     t.index ["sample_controlled_vocab_id"], name: "index_extended_metadata_attributes_on_sample_cv_id"
@@ -2095,6 +2096,7 @@
     t.boolean "is_title", default: false
     t.integer "isa_tag_id"
     t.string "pid"
+    t.boolean "allow_cv_free_text", default: false
     t.index ["template_id", "title"], name: "index_template_id_asset_id_title"
   end