Creative Commons License in main fields when adding a new work (#1525)

* add 'license' to primary_terms

* Test

app/forms/hyrax/form_terms.rb

@@ -0,0 +1,11 @@
+module Hyrax
+  module FormTerms
+    include Hyrax::Forms
+    # overrides Hyrax::Forms::WorkForm
+    # to display 'license' in the 'base-terms' div on the user dashboard "Add New Work" description
+    # by getting iterated over in hyrax/app/views/hyrax/base/_form_metadata.html.erb
+    def primary_terms
+      super + [:license]
+    end
+  end
+end

app/forms/hyrax/generic_work_form.rb

@@ -2,6 +2,7 @@
 #  `rails generate curation_concerns:work GenericWork`
 module Hyrax
   class GenericWorkForm < Hyrax::Forms::WorkForm
+    include Hyrax::FormTerms
     self.model_class = ::GenericWork
     include HydraEditor::Form::Permissions
     self.terms += %i[resource_type rendering_ids]

app/forms/hyrax/image_form.rb

@@ -2,6 +2,7 @@
 #  `rails generate hyrax:work Image`
 module Hyrax
   class ImageForm < Hyrax::Forms::WorkForm
+    include Hyrax::FormTerms
     self.model_class = ::Image
     self.terms += %i[resource_type extent rendering_ids]
 

lib/importer/factory/object_factory.rb

@@ -34,7 +34,11 @@ def update
       end
 
       def create_attributes
-        { collection_type: collection_type }.merge(transform_attributes)
+        if klass == Collection
+          { collection_type: collection_type }.merge(transform_attributes)
+        else
+          transform_attributes
+        end
       end
 
       def update_attributes

spec/forms/hyrax/generic_work_form_spec.rb

@@ -20,4 +20,6 @@
       expect(subject['rendering_ids']).to eq [file_set.id]
     end
   end
+
+  include_examples("work_form")
 end

spec/forms/hyrax/image_form_spec.rb

@@ -23,4 +23,6 @@
       expect(subject['extent']).to eq ['extent']
     end
   end
+
+  include_examples("work_form")
 end

spec/support/shared_examples_spec.rb

@@ -0,0 +1,7 @@
+RSpec.shared_examples "work_form" do
+  describe ".primary_terms" do
+    it 'includes the license field' do
+      expect(form.primary_terms).to include(:license)
+    end
+  end
+end