Merge branch 'add-crc-resource-type-property' into 'develop'

Add CRC resource_type property

See merge request FDM/rdm-system/rdms!9

hyrax/app/forms/hyrax/crc_dataset_form.rb

@@ -21,7 +21,6 @@ module Hyrax
       :title,
       :alternative_title,
       :complex_person,
-      :resource_type,
       :abstract,
       :description,
       :complex_identifier,
@@ -30,6 +29,7 @@ module Hyrax
       :complex_subject,
       :approval_number,
       :keyword,
+      :crc_resource_type,
       :subject,
       :publisher,
       :language,
@@ -48,7 +48,7 @@ module Hyrax
 
     self.required_fields += [
       # Adding all required fields in order of display in form
-      :title, :complex_person, :abstract, :keyword, :license
+      :title, :complex_person, :abstract, :keyword, :crc_resource_type, :license
     ]
 
     protected
@@ -132,6 +132,7 @@ module Hyrax
       permitted = super
       permitted << :doi
       permitted << :modality
+      permitted << :crc_resource_type
       permitted << :approval_number
       permitted << :extra_information
       permitted << :software_version

hyrax/app/models/crc_dataset.rb

@@ -69,6 +69,10 @@ class CrcDataset < ActiveFedora::Base
 
 
   # ------ properties from CRC metadata ------
+  property :crc_resource_type, predicate: ::RDF::Vocab::Rdms.crcResourceType, multiple: false do |index|
+    index.as :stored_searchable, :facetable
+  end
+
   property :modality, predicate: ::RDF::Vocab::Rdms.modality, multiple: false do |index|
     index.as :stored_searchable, :facetable
   end

hyrax/app/services/crc_resource_type_service.rb

+# Provide select options for CRC Resource types
+class CrcResourceTypeService < QaSelectServiceExtended
+  def initialize(_authority_name = nil)
+    super('crc_resource_types')
+  end
+end

hyrax/app/views/records/edit_fields/_crc_resource_type.html.erb

+<% service = CrcResourceTypeService.new %>
+<%= f.input :crc_resource_type, as: :select,
+            collection: service.select_all_options,
+            include_blank: true,
+            item_helper: service.method(:include_current_value),
+            input_html: { class: 'form-control' }
+%>

hyrax/config/authorities/crc_resource_types.yml

+terms:
+  - id: Analysed
+    term: Analysed
+  - id: Measured
+    term: Measured
+  - id: Simulated
+    term: Simulated

hyrax/lib/vocabularies/rdms.rb

@@ -17,6 +17,7 @@ module RDF
       property 'approvalNumber'
       property 'extraInformation'
       property 'modality'
+      property 'crcResourceType'
       property 'softwareVersion'
       property 'subject' # of type Rdms.Subject
       property 'SubjectIdentifier'

hyrax/spec/models/crc_dataset_spec.rb

@@ -449,6 +449,13 @@ RSpec.describe CrcDataset do
   end
 
   # ------ properties from CRC metadata ------
+  describe `crc_resource_type` do
+    it 'has crc_resource_type' do
+      @obj = build(:crc_dataset, crc_resource_type: 'Analysed')
+      expect(@obj.crc_resource_type).to eq 'Analysed'
+    end
+  end
+
   describe `modality` do
     it 'has modality' do
       @obj = build(:crc_dataset, modality: 'modality 1')