bulkrax 4.4.0 → 5.1.0

data/app/models/bulkrax/exporter.rb

@@ -69,7 +69,7 @@ module Bulkrax
     end
 
     def workflow_status_list
-      Sipity::WorkflowState.all.map { |s| [s.name&.titleize, s.name] }.uniq
+      Sipity::WorkflowState.all.map { |s| [s.name&.titleize, s.name] }.uniq if defined?(::Hyrax)
     end
 
     # If field_mapping is empty, setup a default based on the export_properties
@@ -84,12 +84,20 @@ module Bulkrax
     end
 
     def export_from_list
-      [
-        [I18n.t('bulkrax.exporter.labels.importer'), 'importer'],
-        [I18n.t('bulkrax.exporter.labels.collection'), 'collection'],
-        [I18n.t('bulkrax.exporter.labels.worktype'), 'worktype'],
-        [I18n.t('bulkrax.exporter.labels.all'), 'all']
-      ]
+      if defined?(::Hyrax)
+        [
+          [I18n.t('bulkrax.exporter.labels.importer'), 'importer'],
+          [I18n.t('bulkrax.exporter.labels.collection'), 'collection'],
+          [I18n.t('bulkrax.exporter.labels.worktype'), 'worktype'],
+          [I18n.t('bulkrax.exporter.labels.all'), 'all']
+        ]
+      else
+        [
+          [I18n.t('bulkrax.exporter.labels.importer'), 'importer'],
+          [I18n.t('bulkrax.exporter.labels.collection'), 'collection'],
+          [I18n.t('bulkrax.exporter.labels.all'), 'all']
+        ]
+      end
     end
 
     def export_type_list

data/app/models/bulkrax/importer.rb

@@ -15,7 +15,7 @@ module Bulkrax
     has_many :entries, as: :importerexporter, dependent: :destroy
 
     validates :name, presence: true
-    validates :admin_set_id, presence: true
+    validates :admin_set_id, presence: true if defined?(::Hyrax)
     validates :parser_klass, presence: true
 
     delegate :valid_import?, :write_errored_entries_file, :visibility, to: :parser
@@ -47,12 +47,12 @@ module Bulkrax
       if importer_run.failed_records.positive?
         if importer_run.invalid_records.present?
           e = Bulkrax::ImportFailed.new('Failed with Invalid Records', importer_run.invalid_records.split("\n"))
-          importer_run.importer.status_info(e)
+          importer_run.importer.set_status_info(e)
         else
-          importer_run.importer.status_info('Complete (with failures)')
+          importer_run.importer.set_status_info('Complete (with failures)')
         end
       else
-        importer_run.importer.status_info('Complete')
+        importer_run.importer.set_status_info('Complete')
       end
     end
 

data/app/models/bulkrax/importer_run.rb

@@ -9,5 +9,11 @@ module Bulkrax
     def parents
       pending_relationships.pluck(:parent_id).uniq
     end
+
+    def user
+      # An importer might not have a user, the CLI ingest need not assign a user.  As such, we
+      # fallback to the configured user.
+      importer.user || Bulkrax.fallback_user_for_importer_exporter_processing
+    end
   end
 end

data/app/models/bulkrax/oai_entry.rb

@@ -5,10 +5,19 @@ require 'ostruct'
 
 module Bulkrax
   class OaiEntry < Entry
-    serialize :raw_metadata, JSON
+    serialize :raw_metadata, Bulkrax::NormalizedJson
 
     delegate :record, to: :raw_record
 
+    # @api private
+    #
+    # Included to assist in testing; namely so that you can copy down an OAI entry, store it locally,
+    # and then manually construct an {OAI::GetRecordResponse}.
+    #
+    # @see Bulkrax::EntrySpecHelper.oai_entry_for
+    attr_writer :raw_record
+
+    # @return [OAI::GetRecordResponse]
     def raw_record
       @raw_record ||= client.get_record(identifier: identifier, metadata_prefix: parser.parser_fields['metadata_prefix'])
     end
@@ -28,13 +37,16 @@ module Bulkrax
     def build_metadata
       self.parsed_metadata = {}
       self.parsed_metadata[work_identifier] = [record.header.identifier]
+      self.raw_metadata = { record: record.metadata.to_s, header: record.header.to_s }
 
-      record.metadata.children.each do |child|
-        child.children.each do |node|
-          add_metadata(node.name, node.content)
-        end
-      end
-      add_metadata('thumbnail_url', thumbnail_url)
+      # We need to establish the #factory_class before we proceed with the metadata.  See
+      # https://github.com/samvera-labs/bulkrax/issues/702 for further details.
+      #
+      # tl;dr - if we don't have the right factory_class we might skip properties that are
+      # specifically assigned to the factory class
+      establish_factory_class
+      add_metadata_from_record
+      add_thumbnail_url
 
       add_visibility
       add_rights_statement
@@ -53,11 +65,43 @@ module Bulkrax
       end
     end
 
+    # To ensure we capture the correct parse data, we first need to establish the factory_class.
+    # @see https://github.com/samvera-labs/bulkrax/issues/702
+    def establish_factory_class
+      model_field_names = parser.model_field_mappings
+
+      each_candidate_metadata_node do |node|
+        next unless model_field_names.include?(node.name)
+        add_metadata(node.name, node.content)
+      end
+    end
+
+    def add_metadata_from_record
+      each_candidate_metadata_node do |node|
+        add_metadata(node.name, node.content)
+      end
+    end
+
+    # A method that you could override to better handle the shape of the record's metadata.
+    # @yieldparam node [Object<#name, #content>]
+    def each_candidate_metadata_node
+      record.metadata.children.each do |child|
+        child.children.each do |node|
+          yield(node)
+        end
+      end
+    end
+
+    def add_thumbnail_url
+      add_metadata('thumbnail_url', thumbnail_url)
+    end
+
     # Retrieve list of collections for the entry; add to collection_ids
     # If OAI-PMH doesn't return setSpec in the headers for GetRecord, use parser.collection_name
     #   in this case, if 'All' is selected, records will not be added to a collection.
     def find_collection_ids
-      return self.collection_ids if collections_created?
+      return self.collection_ids if defined?(@called_find_collection_ids)
+
       if sets.blank? || parser.collection_name != 'all'
         collection = find_collection(importerexporter.unique_collection_identifier(parser.collection_name))
         self.collection_ids << collection.id if collection.present? && !self.collection_ids.include?(collection.id)
@@ -67,6 +111,8 @@ module Bulkrax
           self.collection_ids << c.id if c.present? && !self.collection_ids.include?(c.id)
         end
       end
+
+      @called_find_collection_ids = true
       return self.collection_ids
     end
   end

data/app/models/bulkrax/pending_relationship.rb

@@ -3,5 +3,9 @@
 module Bulkrax
   class PendingRelationship < ApplicationRecord
     belongs_to :importer_run
+
+    # Ideally we wouldn't have a column named "order", as it is a reserved SQL term.  However, if we
+    # quote the column, all is well...for the application.
+    scope :ordered, -> { order("#{quoted_table_name}.#{connection.quote_column_name('order')}") }
   end
 end

data/app/models/bulkrax/rdf_entry.rb

@@ -3,7 +3,7 @@
 require 'rdf'
 module Bulkrax
   class RdfEntry < Entry
-    serialize :raw_metadata, JSON
+    serialize :raw_metadata, Bulkrax::NormalizedJson
 
     def self.read_data(path)
       RDF::Reader.open(path)

data/app/models/bulkrax/xml_entry.rb

@@ -4,7 +4,7 @@ require 'nokogiri'
 module Bulkrax
   # Generic XML Entry
   class XmlEntry < Entry
-    serialize :raw_metadata, JSON
+    serialize :raw_metadata, Bulkrax::NormalizedJson
 
     def self.fields_from_data(data); end
 
@@ -43,15 +43,14 @@ module Bulkrax
       raise StandardError, "Missing source identifier (#{source_identifier})" if self.raw_metadata[source_identifier].blank?
       self.parsed_metadata = {}
       self.parsed_metadata[work_identifier] = [self.raw_metadata[source_identifier]]
-      xml_elements.each do |element_name|
-        elements = record.xpath("//*[name()='#{element_name}']")
-        next if elements.blank?
-        elements.each do |el|
-          el.children.map(&:content).each do |content|
-            add_metadata(element_name, content) if content.present?
-          end
-        end
-      end
+
+      # We need to establish the #factory_class before we proceed with the metadata.  See
+      # https://github.com/samvera-labs/bulkrax/issues/702 for further details.
+      #
+      # tl;dr - if we don't have the right factory_class we might skip properties that are
+      # specifically assigned to the factory class
+      establish_factory_class
+      add_metadata_from_record
       add_visibility
       add_rights_statement
       add_admin_set_id
@@ -63,11 +62,54 @@ module Bulkrax
       self.parsed_metadata
     end
 
-    # Grab the class from the real parser
-    def xml_elements
+    def establish_factory_class
+      model_field_names = parser.model_field_mappings
+
+      each_candidate_metadata_node_name_and_content(elements: parser.model_field_mappings) do |name, content|
+        next unless model_field_names.include?(name)
+        add_metadata(name, content)
+      end
+    end
+
+    def add_metadata_from_record
+      each_candidate_metadata_node_name_and_content do |name, content|
+        add_metadata(name, content)
+      end
+    end
+
+    def each_candidate_metadata_node_name_and_content(elements: field_mapping_from_values_for_xml_element_names)
+      elements.each do |name|
+        # NOTE: the XML element name's case matters
+        nodes = record.xpath("//*[name()='#{name}']")
+        next if nodes.empty?
+
+        nodes.each do |node|
+          node.children.each do |content|
+            next if content.to_s.blank?
+
+            yield(name, content.to_s)
+          end
+        end
+      end
+    end
+
+    # Returns the explicitly declared "from" key's value of each parser's element's value.  (Yes, I
+    # would like a proper class for the thing I just tried to describe.)
+    #
+    # @return [Array<String>]
+    #
+    # @todo Additionally, we may want to revisit the XML parser fundamental logic; namely we only
+    #       parse nodes that are explicitly declared with in the `from`.  This is a bit different
+    #       than other parsers, in that they will make assumptions about each encountered column (in
+    #       the case of CSV) or node (in the case of OAI).  tl;dr - Here there be dragons.
+    def field_mapping_from_values_for_xml_element_names
       Bulkrax.field_mappings[self.importerexporter.parser_klass].map do |_k, v|
         v[:from]
       end.flatten.compact.uniq
     end
+
+    # Included for potential downstream adopters
+    alias xml_elements field_mapping_from_values_for_xml_element_names
+    deprecation_deprecate xml_elements: "Use '#{self}#field_mapping_from_values_for_xml_element_names' instead"
   end
 end

data/app/models/concerns/bulkrax/dynamic_record_lookup.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module Bulkrax
+  # TODO: Extract methods to class methods; there's no reason for these methods to be a mixin.
+  # TODO: Add specs to test in isolation
   module DynamicRecordLookup
     # Search entries, collections, and every available work type for a record that
     # has the provided identifier.

data/app/models/concerns/bulkrax/file_factory.rb

@@ -45,9 +45,15 @@ module Bulkrax
     end
 
     def new_remote_files
-      return if object.is_a? FileSet
-
-      @new_remote_files ||= if object.present? && object.file_sets.present?
+      @new_remote_files ||= if object.is_a? FileSet
+                              parsed_remote_files.select do |file|
+                                # is the url valid?
+                                is_valid = file[:url]&.match(URI::ABS_URI)
+                                # does the file already exist
+                                is_existing = object.import_url && object.import_url == file[:url]
+                                is_valid && !is_existing
+                              end
+                            elsif object.present? && object.file_sets.present?
                               parsed_remote_files.select do |file|
                                 # is the url valid?
                                 is_valid = file[:url]&.match(URI::ABS_URI)

data/app/models/concerns/bulkrax/import_behavior.rb

@@ -117,23 +117,30 @@ module Bulkrax
       Bulkrax.qa_controlled_properties.each do |field|
         next if parsed_metadata[field].blank?
 
-        parsed_metadata[field].each_with_index do |value, i|
-          next if value.blank?
-
-          if (validated_uri_value = validate_value(value, field))
-            parsed_metadata[field][i] = validated_uri_value
-          else
-            debug_msg = %(Unable to locate active authority ID "#{value}" in config/authorities/#{field.pluralize}.yml)
-            Rails.logger.debug(debug_msg)
-            error_msg = %("#{value}" is not a valid and/or active authority ID for the :#{field} field)
-            raise ::StandardError, error_msg
+        if multiple?(field)
+          parsed_metadata[field].each_with_index do |value, i|
+            next if value.blank?
+            parsed_metadata[field][i] = sanitize_controlled_uri_value(field, value)
           end
+        else
+          parsed_metadata[field] = sanitize_controlled_uri_value(field, parsed_metadata[field])
         end
       end
 
       true
     end
 
+    def sanitize_controlled_uri_value(field, value)
+      if (validated_uri_value = validate_value(value, field))
+        validated_uri_value
+      else
+        debug_msg = %(Unable to locate active authority ID "#{value}" in config/authorities/#{field.pluralize}.yml)
+        Rails.logger.debug(debug_msg)
+        error_msg = %("#{value}" is not a valid and/or active authority ID for the :#{field} field)
+        raise ::StandardError, error_msg
+      end
+    end
+
     # @param value [String] value to validate
     # @param field [String] name of the controlled property
     # @return [String, nil] validated URI value or nil

data/app/models/concerns/bulkrax/status_info.rb

@@ -33,16 +33,21 @@ module Bulkrax
       current_status&.created_at
     end
 
-    def status_info(e = nil, current_run = nil)
+    def set_status_info(e = nil, current_run = nil)
+      runnable = current_run || last_run
       if e.nil?
-        self.statuses.create!(status_message: 'Complete', runnable: current_run || last_run)
+        self.statuses.create!(status_message: 'Complete', runnable: runnable)
       elsif e.is_a?(String)
-        self.statuses.create!(status_message: e, runnable: current_run || last_run)
+        self.statuses.create!(status_message: e, runnable: runnable)
       else
-        self.statuses.create!(status_message: 'Failed', runnable: current_run || last_run, error_class: e.class.to_s, error_message: e.message, error_backtrace: e.backtrace)
+        self.statuses.create!(status_message: 'Failed', runnable: runnable, error_class: e.class.to_s, error_message: e.message, error_backtrace: e.backtrace)
       end
     end
 
+    alias status_info set_status_info
+
+    deprecation_deprecate status_info: "Favor Bulkrax::StatusInfo.set_status_info.  We will be removing .status_info in Bulkrax v6.0.0"
+
     # api compatible with previous error structure
     def last_error
       return unless current_status && current_status.error_class.present?

data/app/parsers/bulkrax/application_parser.rb

@@ -51,6 +51,12 @@ module Bulkrax
       raise NotImplementedError, 'must be defined'
     end
 
+    # @api public
+    # @abstract Subclass and override {#file_set_entry_class} to implement behavior for the parser.
+    def file_set_entry_class
+      raise NotImplementedError, 'must be defined'
+    end
+
     # @api public
     # @abstract Subclass and override {#records} to implement behavior for the parser.
     def records(_opts = {})
@@ -153,7 +159,7 @@ module Bulkrax
     # @see #create_relationships
     def create_objects(types = [])
       types.each do |object_type|
-        parser.send("create_#{object_type.pluralize}")
+        send("create_#{object_type.pluralize}")
       end
     end
 

data/app/parsers/bulkrax/bagit_parser.rb

@@ -143,7 +143,7 @@ module Bulkrax
           begin
             bag.add_file(file_name, file.path) if bag.bag_files.select { |b| b.include?(file_name) }.blank?
           rescue => e
-            entry.status_info(e)
+            entry.set_status_info(e)
             status_info(e)
           end
         end

data/app/parsers/bulkrax/csv_parser.rb

@@ -196,10 +196,13 @@ module Bulkrax
         @collection_ids = ActiveFedora::SolrService.query("has_model_ssim:Collection #{extra_filters}", method: :post, rows: 2_147_483_647).map(&:id)
         @file_set_ids = ActiveFedora::SolrService.query("has_model_ssim:FileSet #{extra_filters}", method: :post, rows: 2_147_483_647).map(&:id)
       when 'collection'
-        @work_ids = ActiveFedora::SolrService.query("member_of_collection_ids_ssim:#{importerexporter.export_source + extra_filters} AND has_model_ssim:(#{Hyrax.config.curation_concerns.join(' OR ')})", method: :post, rows: 2_000_000_000).map(&:id)
+        @work_ids = ActiveFedora::SolrService.query(
+"member_of_collection_ids_ssim:#{importerexporter.export_source + extra_filters} AND has_model_ssim:(#{Hyrax.config.curation_concerns.join(' OR ')})", method: :post, rows: 2_000_000_000
+).map(&:id)
         # get the parent collection and child collections
         @collection_ids = ActiveFedora::SolrService.query("id:#{importerexporter.export_source} #{extra_filters}", method: :post, rows: 2_147_483_647).map(&:id)
-        @collection_ids += ActiveFedora::SolrService.query("has_model_ssim:Collection AND member_of_collection_ids_ssim:#{importerexporter.export_source}", method: :post, rows: 2_147_483_647).map(&:id)
+        @collection_ids += ActiveFedora::SolrService.query("has_model_ssim:Collection AND member_of_collection_ids_ssim:#{importerexporter.export_source}", method: :post,
+                                                                                                                                                            rows: 2_147_483_647).map(&:id)
         find_child_file_sets(@work_ids)
       when 'worktype'
         @work_ids = ActiveFedora::SolrService.query("has_model_ssim:#{importerexporter.export_source + extra_filters}", method: :post, rows: 2_000_000_000).map(&:id)
@@ -234,7 +237,7 @@ module Bulkrax
         instance_variable_set(instance_var, ActiveFedora::SolrService.post(
           extra_filters.to_s,
           fq: [
-            %(#{::Solrizer.solr_name(work_identifier)}:("#{complete_entry_identifiers.join('" OR "')}")),
+            %(#{solr_name(work_identifier)}:("#{complete_entry_identifiers.join('" OR "')}")),
             "has_model_ssim:(#{models_to_search.join(' OR ')})"
           ],
           fl: 'id',
@@ -243,6 +246,10 @@ module Bulkrax
       end
     end
 
+    def solr_name(base_name)
+      Module.const_defined?(:Solrizer) ? ::Solrizer.solr_name(base_name) : ::ActiveFedora.index_field_mapper.solr_name(base_name)
+    end
+
     def create_new_entries
       current_record_ids.each_with_index do |id, index|
         break if limit_reached?(limit, index)

data/app/parsers/bulkrax/xml_parser.rb

@@ -12,6 +12,12 @@ module Bulkrax
     # @todo not yet supported
     def create_collections; end
 
+    # @todo not yet supported
+    def file_set_entry_class; end
+
+    # @todo not yet supported
+    def create_file_sets; end
+
     # TODO: change to differentiate between collection and work records when adding ability to import collection metadata
     def works_total
       total

data/app/views/bulkrax/exporters/_form.html.erb

@@ -11,7 +11,7 @@
     </div>
   <% end %>
 
-  <%= form.input :name, label: t('bulkrax.exporter.labels.name') %>
+  <%= form.input :name, label: t('bulkrax.exporter.labels.name'), input_html: { class: 'form-control' } %>
 
   <%= form.hidden_field :user_id, value: current_user.id %>
 
@@ -19,20 +19,22 @@
     collection:  form.object.export_type_list,
     label: t('bulkrax.exporter.labels.export_type'),
     required: true,
-    prompt: 'Please select an export type' %>
+    prompt: 'Please select an export type',
+    input_html: { class: 'form-control' } %>
 
   <%= form.input :export_from,
     collection: form.object.export_from_list,
     label: t('bulkrax.exporter.labels.export_from'),
     required: true,
-    prompt: 'Please select an export source' %>
+    prompt: 'Please select an export source',
+    input_html: { class: 'form-control' } %>
 
   <%= form.input :export_source_importer,
     label: t('bulkrax.exporter.labels.importer'),
     required: true,
     prompt: 'Select from the list',
     label_html: { class: 'importer export-source-option hidden' },
-    input_html: { class: 'importer export-source-option hidden' },
+    input_html: { class: 'importer export-source-option hidden form-control' },
     collection:  form.object.importers_list.sort %>
 
   <%= form.input :export_source_collection,
@@ -42,7 +44,7 @@
     placeholder: @collection&.title&.first,
     label_html: { class: 'collection export-source-option hidden' },
     input_html: {
-      class: 'collection export-source-option hidden',
+      class: 'collection export-source-option hidden form-control',
       data: {
         'autocomplete-url' => '/authorities/search/collections',
         'autocomplete' => 'collection'
@@ -50,18 +52,22 @@
     }
   %>
 
-  <%= form.input :export_source_worktype,
+  <%  if defined?(::Hyrax) %>
+    <%= form.input :export_source_worktype,
     label: t('bulkrax.exporter.labels.worktype'),
     required: true,
     prompt: 'Select from the list',
     label_html: { class: 'worktype export-source-option hidden' },
-    input_html: { class: 'worktype export-source-option hidden' },
+    input_html: { class: 'worktype export-source-option hidden form-control' },
     collection: Hyrax.config.curation_concerns.map {|cc| [cc.to_s, cc.to_s] } %>
+  <% end %>
+  
 
   <%= form.input :limit,
     as: :integer,
     hint: 'leave blank or 0 for all records',
-    label: t('bulkrax.exporter.labels.limit') %>
+    label: t('bulkrax.exporter.labels.limit'),
+    input_html: { class: 'form-control' } %>
 
   <%= form.input :generated_metadata?,
                  as: :boolean,
@@ -76,26 +82,36 @@
   <%= form.input :date_filter,
                  as: :boolean,
                  label: t('bulkrax.exporter.labels.filter_by_date') %>
+
   <div id="date_filter_picker" class="hidden">
     <%= form.input :start_date,
                    as: :date,
-                   label: t('bulkrax.exporter.labels.start_date') %>
+                   label: t('bulkrax.exporter.labels.start_date'),
+                   input_html: { class: 'form-control' } %>
 
     <%= form.input :finish_date,
                    as: :date,
-                   label: t('bulkrax.exporter.labels.finish_date') %>
+                   label: t('bulkrax.exporter.labels.finish_date'),
+                   input_html: { class: 'form-control' } %>
   </div>
-  <%= form.input :work_visibility,
-                 collection: form.object.work_visibility_list,
-                 label: t('bulkrax.exporter.labels.visibility') %>
+  <% if defined?(::Hyrax) %>
+    <%= form.input :work_visibility,
+                   collection: form.object.work_visibility_list,
+                  label: t('bulkrax.exporter.labels.visibility'),
+                  input_html: { class: 'form-control' } %>
+  <% end %>
 
-  <%= form.input :workflow_status,
-                 collection: form.object.workflow_status_list,
-                 label: t('bulkrax.exporter.labels.status') %>
+  <% if defined?(::Hyrax) %>
+    <%= form.input :workflow_status,
+                  collection: form.object.workflow_status_list,
+                  label: t('bulkrax.exporter.labels.status'),
+                  input_html: { class: 'form-control' } %>
+  <% end %>
 
   <%= form.input :parser_klass,
     collection: Bulkrax.parsers.map {|p| [p[:name], p[:class_name], {'data-partial' => p[:partial]}] if p[:class_name].constantize.export_supported? }.compact,
-    label: t('bulkrax.exporter.labels.export_format') %>
+    label: t('bulkrax.exporter.labels.export_format'),
+    input_html: { class: 'form-control' } %>
 </div>
 
 <%# Find definitions for the functions called in this script in

data/app/views/bulkrax/exporters/edit.html.erb

@@ -4,7 +4,7 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs">
+    <div class="panel panel-default tabs exporter-form">
       <%= simple_form_for @exporter do |form| %>
         <%= render 'form', exporter: @exporter, form: form %>
         <div class="panel-footer">

data/app/views/bulkrax/exporters/new.html.erb

@@ -4,7 +4,7 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs">
+    <div class="panel panel-default tabs exporter-form">
       <%= simple_form_for @exporter do |form| %>
         <%= render 'form', exporter: @exporter, form: form %>
         <div class="panel-footer">

data/app/views/bulkrax/importers/_form.html.erb

@@ -11,17 +11,17 @@
     </div>
   <% end %>
 
-  <%= form.input :name %>
+  <%= form.input :name, input_html: { class: 'form-control' } %>
 
-  <%= form.input :admin_set_id, collection: available_admin_sets %>
+  <%= form.input :admin_set_id, collection: available_admin_sets if defined?(::Hyrax) %>
 
   <%= form.hidden_field :user_id, value: current_user.id %>
 
-  <%= form.input :frequency, collection: form.object.class.frequency_enums %>
+  <%= form.input :frequency, collection: form.object.class.frequency_enums, input_html: { class: 'form-control' } %>
 
-  <%= form.input :limit, as: :integer, hint: 'leave blank or 0 for all records' %>
+  <%= form.input :limit, as: :integer, hint: 'leave blank or 0 for all records', input_html: { class: 'form-control'} %>
 
-  <%= form.input :parser_klass, collection: Bulkrax.parsers.map {|p| [p[:name], p[:class_name], {'data-partial' => p[:partial]}]}, label: "Parser" %>
+  <%= form.input :parser_klass, collection: Bulkrax.parsers.map {|p| [p[:name], p[:class_name], {'data-partial' => p[:partial]}]}, label: "Parser", input_html: { class: 'form-control' } %>
 
   <%= form.fields_for :parser_fields do |fi| %>
     <div class='parser_fields'>

data/app/views/hyrax/dashboard/sidebar/_bulkrax_sidebar_additions.html.erb

@@ -1,7 +1,9 @@
-<% if ENV.fetch('HYKU_BULKRAX_ENABLED', 'true') == 'true' %>
+<% if current_ability.can_import_works? %>
   <%= menu.nav_link(bulkrax.importers_path) do %>
     <span class="fa fa-cloud-upload" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('bulkrax.admin.sidebar.importers') %></span>
   <% end %>
+<% end %>
+<% if current_ability.can_export_works? %>
   <%= menu.nav_link(bulkrax.exporters_path) do %>
     <span class="fa fa-cloud-download" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('bulkrax.admin.sidebar.exporters') %></span>
   <% end %>