bulkrax 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae65205e27f8cff17680fb48e361dd9ed1740decda56dcded099a44413c4ae89
-  data.tar.gz: c4db878ab4205b3b6bbbb82f251ea3947ea5390dfaf1fe4138d2fc82f3cb0c6b
+  metadata.gz: 6ca767b1e461d5830774bb4d7c49eade799d14298625bdbdccdcbdc0ac997f88
+  data.tar.gz: b5024ea772132123fcb922fbe183d22950428ea50b7a8b4152c6bd781b94510f
 SHA512:
-  metadata.gz: 4ee86776f2716cd07747e93ba4e3f8d48a8427c10595d14a0a24a321a9a28de8729494bdbb48b4f4b40db4ff102dc184401ab869135cbb36032dbf5f55f623f5
-  data.tar.gz: 5daf4da40338fc769052052106fc051746967a4c8ecabc89219daddb87a676e2500a1c42906aa55a14bbbcf6749868b1d41dff5388dad636b4d806da7f62bb6d
+  metadata.gz: 91004f88a97054107a3bbbcbe7f3b3dd84226a286df47992c13bfc5fb483c3bfd4aaa9190e08e567258e5105a317a37bba58fa7857ee6c534153ba930b608ad7
+  data.tar.gz: 89a32c155c3931e486b2d41215942b291eb724c59833a031fdc4815a72d26a2df13b015c1b1e2c0dafd608e58ec481a574e20da7bcf95ed76b3e45c3d5f19287

data/app/assets/javascripts/bulkrax/datatables.js

@@ -133,7 +133,7 @@ function refreshLink() {
   refreshLink.onclick = function() {
     this.api().ajax.reload(null, false)
   }.bind(this)
-  refreshLink.classList.value = 'glyphicon glyphicon-refresh'
+  refreshLink.classList.value = 'fa fa-refresh'
   refreshLink.style.marginLeft = '10px'
   document.querySelector('div.dataTables_filter').firstChild.append(refreshLink)
 }

data/app/controllers/bulkrax/exporters_controller.rb

@@ -60,7 +60,7 @@ module Bulkrax
       end
 
       # Correctly populate export_source_collection input
-      @collection = Collection.find(@exporter.export_source) if @exporter.export_source.present? && @exporter.export_from == 'collection'
+      @collection = Bulkrax.object_factory.find(@exporter.export_source) if @exporter.export_source.present? && @exporter.export_from == 'collection'
     end
 
     # POST /exporters

data/app/controllers/bulkrax/importers_controller.rb

@@ -214,10 +214,11 @@ module Bulkrax
       return if file.blank? && cloud_files.blank?
       @importer[:parser_fields]['import_file_path'] = @importer.parser.write_import_file(file) if file.present?
       if cloud_files.present?
+        @importer[:parser_fields]['cloud_file_paths'] = cloud_files
         # For BagIt, there will only be one bag, so we get the file_path back and set import_file_path
         # For CSV, we expect only file uploads, so we won't get the file_path back
         # and we expect the import_file_path to be set already
-        target = @importer.parser.retrieve_cloud_files(cloud_files)
+        target = @importer.parser.retrieve_cloud_files(cloud_files, @importer)
         @importer[:parser_fields]['import_file_path'] = target if target.present?
       end
       @importer.save

data/app/controllers/concerns/bulkrax/datatables_behavior.rb

@@ -103,7 +103,7 @@ module Bulkrax
       {
         data: result,
         recordsTotal: Bulkrax::Importer.count,
-        recordsFiltered: importers.size
+        recordsFiltered: Bulkrax::Importer.count
       }
     end
 
@@ -120,7 +120,7 @@ module Bulkrax
       {
         data: result,
         recordsTotal: Bulkrax::Exporter.count,
-        recordsFiltered: exporters.size
+        recordsFiltered: Bulkrax::Exporter.count
       }
     end
 
@@ -145,37 +145,37 @@ module Bulkrax
 
     def entry_util_links(e, item)
       links = []
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-info-sign"></span>'), view_context.item_entry_path(item, e))
-      links << "<a class='glyphicon glyphicon-repeat' data-toggle='modal' data-target='#bulkraxItemModal' data-entry-id='#{e.id}'></a>" if view_context.an_importer?(item)
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-trash"></span>'), view_context.item_entry_path(item, e), method: :delete, data: { confirm: 'This will delete the entry and any work associated with it. Are you sure?' })
+      links << view_context.link_to(view_context.raw('<span class="fa fa-info-circle"></span>'), view_context.item_entry_path(item, e))
+      links << "<a class='fa fa-repeat' data-toggle='modal' data-target='#bulkraxItemModal' data-entry-id='#{e.id}'></a>" if view_context.an_importer?(item)
+      links << view_context.link_to(view_context.raw('<span class="fa fa-trash"></span>'), view_context.item_entry_path(item, e), method: :delete, data: { confirm: 'This will delete the entry and any work associated with it. Are you sure?' })
       links.join(" ")
     end
 
     def status_message_for(e)
       if e.status_message == "Complete"
-        "<td><span class='glyphicon glyphicon-ok' style='color: green;'></span> #{e.status_message}</td>"
+        "<td><span class='fa fa-check' style='color: green;'></span> #{e.status_message}</td>"
       elsif e.status_message == "Pending"
-        "<td><span class='glyphicon glyphicon-option-horizontal' style='color: blue;'></span> #{e.status_message}</td>"
+        "<td><span class='fa fa-ellipsis-h' style='color: blue;'></span> #{e.status_message}</td>"
       elsif e.status_message == "Skipped"
-        "<td><span class='glyphicon glyphicon-step-forward' style='color: yellow;'></span> #{e.status_message}</td>"
+        "<td><span class='fa fa-step-forward' style='color: yellow;'></span> #{e.status_message}</td>"
       else
-        "<td><span class='glyphicon glyphicon-remove' style='color: #{e.status == 'Deleted' ? 'green' : 'red'};'></span> #{e.status_message}</td>"
+        "<td><span class='fa fa-remove' style='color: #{e.status == 'Deleted' ? 'green' : 'red'};'></span> #{e.status_message}</td>"
       end
     end
 
     def importer_util_links(i)
       links = []
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-info-sign"></span>'), importer_path(i))
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-pencil"></span>'), edit_importer_path(i))
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-remove"></span>'), i, method: :delete, data: { confirm: 'Are you sure?' })
+      links << view_context.link_to(view_context.raw('<span class="fa fa-info-circle"></span>'), importer_path(i))
+      links << view_context.link_to(view_context.raw('<span class="fa fa-pencil"></span>'), edit_importer_path(i))
+      links << view_context.link_to(view_context.raw('<span class="fa fa-remove"></span>'), i, method: :delete, data: { confirm: 'Are you sure?' })
       links.join(" ")
     end
 
     def exporter_util_links(i)
       links = []
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-info-sign"></span>'), exporter_path(i))
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-pencil"></span>'), edit_exporter_path(i), data: { turbolinks: false })
-      links << view_context.link_to(view_context.raw('<span class="glyphicon glyphicon-remove"></span>'), i, method: :delete, data: { confirm: 'Are you sure?' })
+      links << view_context.link_to(view_context.raw('<span class="fa fa-info-circle"></span>'), exporter_path(i))
+      links << view_context.link_to(view_context.raw('<span class="fa fa-pencil"></span>'), edit_exporter_path(i), data: { turbolinks: false })
+      links << view_context.link_to(view_context.raw('<span class="fa fa-remove"></span>'), i, method: :delete, data: { confirm: 'Are you sure?' })
       links.join(" ")
     end
 

data/app/factories/bulkrax/object_factory.rb

@@ -1,153 +1,171 @@
 # frozen_string_literal: true
 
 module Bulkrax
-  class ObjectFactory # rubocop:disable Metrics/ClassLength
-    extend ActiveModel::Callbacks
+  # rubocop:disable Metrics/ClassLength
+  class ObjectFactory < ObjectFactoryInterface
     include Bulkrax::FileFactory
-    include DynamicRecordLookup
 
-    # @api private
-    #
-    # These are the attributes that we assume all "work type" classes (e.g. the given :klass) will
-    # have in addition to their specific attributes.
-    #
-    # @return [Array<Symbol>]
-    # @see #permitted_attributes
-    class_attribute :base_permitted_attributes,
-      default: %i[id edit_users edit_groups read_groups visibility work_members_attributes admin_set_id]
+    ##
+    # @!group Class Method Interface
 
-    # @return [Boolean]
-    #
-    # @example
-    #   Bulkrax::ObjectFactory.transformation_removes_blank_hash_values = true
-    #
-    # @see #transform_attributes
-    # @see https://github.com/samvera-labs/bulkrax/pull/708 For discussion concerning this feature
-    # @see https://github.com/samvera-labs/bulkrax/wiki/Interacting-with-Metadata For documentation
-    #      concerning default behavior.
-    class_attribute :transformation_removes_blank_hash_values, default: false
+    ##
+    # @note This does not save either object.  We need to do that in another
+    #       loop.  Why?  Because we might be adding many items to the parent.
+    def self.add_child_to_parent_work(parent:, child:)
+      return true if parent.ordered_members.to_a.include?(child_record)
 
-    define_model_callbacks :save, :create
-    attr_reader :attributes, :object, :source_identifier_value, :klass, :replace_files, :update_files, :work_identifier, :work_identifier_search_field, :related_parents_parsed_mapping, :importer_run_id
+      parent.ordered_members << child
+    end
 
-    # rubocop:disable Metrics/ParameterLists
-    def initialize(attributes:, source_identifier_value:, work_identifier:, work_identifier_search_field:, related_parents_parsed_mapping: nil, replace_files: false, user: nil, klass: nil, importer_run_id: nil, update_files: false)
-      @attributes = ActiveSupport::HashWithIndifferentAccess.new(attributes)
-      @replace_files = replace_files
-      @update_files = update_files
-      @user = user || User.batch_user
-      @work_identifier = work_identifier
-      @work_identifier_search_field = work_identifier_search_field
-      @related_parents_parsed_mapping = related_parents_parsed_mapping
-      @source_identifier_value = source_identifier_value
-      @klass = klass || Bulkrax.default_work_type.constantize
-      @importer_run_id = importer_run_id
+    def self.add_resource_to_collection(collection:, resource:, user:)
+      collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX) if
+        defined?(Hyrax::Adapters::NestingIndexAdapter)
+      resource.member_of_collections << collection
+      save!(resource: resource, user: user)
     end
-    # rubocop:enable Metrics/ParameterLists
 
-    # update files is set, replace files is set or this is a create
-    def with_files
-      update_files || replace_files || !object
+    def self.update_index_for_file_sets_of(resource:)
+      resource.file_sets.each(&:update_index) if resource.respond_to?(:file_sets)
     end
 
-    def run
-      arg_hash = { id: attributes[:id], name: 'UPDATE', klass: klass }
-      @object = find
-      if object
-        object.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX if object.respond_to?(:reindex_extent)
-        ActiveSupport::Notifications.instrument('import.importer', arg_hash) { update }
-      else
-        ActiveSupport::Notifications.instrument('import.importer', arg_hash.merge(name: 'CREATE')) { create }
-      end
-      yield(object) if block_given?
-      object
+    ##
+    # @see Bulkrax::ObjectFactoryInterface
+    def self.export_properties
+      # TODO: Consider how this may or may not work for Valkyrie
+      properties = Bulkrax.curation_concerns.map { |work| work.properties.keys }.flatten.uniq.sort
+      properties.reject { |prop| Bulkrax.reserved_properties.include?(prop) }
     end
 
-    def run!
-      self.run
-      # Create the error exception if the object is not validly saved for some reason
-      raise ActiveFedora::RecordInvalid, object if !object.persisted? || object.changed?
-      object
+    def self.field_multi_value?(field:, model:)
+      return false unless field_supported?(field: field, model: model)
+      return false unless model.singleton_methods.include?(:properties)
+
+      model&.properties&.[](field)&.[]("multiple")
     end
 
-    def update
-      raise "Object doesn't exist" unless object
-      destroy_existing_files if @replace_files && ![Collection, FileSet].include?(klass)
-      attrs = transform_attributes(update: true)
-      run_callbacks :save do
-        if klass == Collection
-          update_collection(attrs)
-        elsif klass == FileSet
-          update_file_set(attrs)
-        else
-          update_work(attrs)
-        end
-      end
-      object.apply_depositor_metadata(@user) && object.save! if object.depositor.nil?
-      log_updated(object)
+    def self.field_supported?(field:, model:)
+      model.method_defined?(field) && model.properties[field].present?
+    end
+
+    def self.file_sets_for(resource:)
+      return [] if resource.blank?
+      return [resource] if resource.is_a?(Bulkrax.file_model_class)
+
+      resource.file_sets
     end
 
-    def find
-      found = find_by_id if attributes[:id].present?
-      return found if found.present?
-      return search_by_identifier if attributes[work_identifier].present?
+    ##
+    #
+    # @see Bulkrax::ObjectFactoryInterface
+    def self.find(id)
+      ActiveFedora::Base.find(id)
+    rescue ActiveFedora::ObjectNotFoundError => e
+      raise ObjectFactoryInterface::ObjectNotFoundError, e.message
     end
 
-    def find_by_id
-      klass.find(attributes[:id]) if klass.exists?(attributes[:id])
+    def self.find_or_create_default_admin_set
+      # NOTE: Hyrax 5+ removed this method
+      AdminSet.find_or_create_default_admin_set_id
     end
 
-    def find_or_create
-      o = find
-      return o if o
-      run(&:save!)
+    def self.publish(**)
+      return true
     end
 
-    def search_by_identifier
-      query = { work_identifier_search_field =>
-                source_identifier_value }
-      # Query can return partial matches (something6 matches both something6 and something68)
-      # so we need to weed out any that are not the correct full match. But other items might be
-      # in the multivalued field, so we have to go through them one at a time.
-      match = klass.where(query).detect { |m| m.send(work_identifier).include?(source_identifier_value) }
+    ##
+    # @param value [String]
+    # @param klass [Class, #where]
+    # @param field [String, Symbol] A convenience parameter where we pass the
+    #        same value to search_field and name_field.
+    # @param search_field [String, Symbol] the Solr field name
+    #        (e.g. "title_tesim")
+    # @param name_field [String] the ActiveFedora::Base property name
+    #        (e.g. "title")
+    # @param verify_property [TrueClass] when true, verify that the given :klass
+    #
+    # @return [NilClass] when no object is found.
+    # @return [ActiveFedora::Base] when a match is found, an instance of given
+    #         :klass
+    # rubocop:disable Metrics/ParameterLists
+    #
+    # @note HEY WE'RE USING THIS FOR A WINGS CUSTOM QUERY.  BE CAREFUL WITH
+    #       REMOVING IT.
+    #
+    # @see # {Wings::CustomQueries::FindBySourceIdentifier#find_by_model_and_property_value}
+    def self.search_by_property(value:, klass:, field: nil, search_field: nil, name_field: nil, verify_property: false)
+      return nil unless klass.respond_to?(:where)
+      # We're not going to try to match nil nor "".
+      return if value.blank?
+      return if verify_property && !klass.properties.keys.include?(search_field)
+
+      search_field ||= field
+      name_field ||= field
+      raise "You must provide either (search_field AND name_field) OR field parameters" if search_field.nil? || name_field.nil?
+      # NOTE: Query can return partial matches (something6 matches both
+      # something6 and something68) so we need to weed out any that are not the
+      # correct full match. But other items might be in the multivalued field,
+      # so we have to go through them one at a time.
+      #
+      # A ssi field is string, so we're looking at exact matches.
+      # A tesi field is text, so partial matches work.
+      #
+      # We need to wrap the result in an Array, else we might have a scalar that
+      # will result again in partial matches.
+      match = klass.where(search_field => value).detect do |m|
+        # Don't use Array.wrap as we likely have an ActiveTriples::Relation
+        # which defiantly claims to be an Array yet does not behave consistently
+        # with an Array.  Hopefully the name_field is not a Date or Time object,
+        # Because that too will be a mess.
+        Array(m.send(name_field)).include?(value)
+      end
       return match if match
     end
+    # rubocop:enable Metrics/ParameterLists
+
+    def self.query(q, **kwargs)
+      ActiveFedora::SolrService.query(q, **kwargs)
+    end
 
-    # An ActiveFedora bug when there are many habtm <-> has_many associations means they won't all get saved.
-    # https://github.com/projecthydra/active_fedora/issues/874
-    # 2+ years later, still open!
-    def create
-      attrs = transform_attributes
-      @object = klass.new
-      object.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX if defined?(Hyrax::Adapters::NestingIndexAdapter) && object.respond_to?(:reindex_extent)
-      run_callbacks :save do
-        run_callbacks :create do
-          if klass == Collection
-            create_collection(attrs)
-          elsif klass == FileSet
-            create_file_set(attrs)
-          else
-            create_work(attrs)
-          end
-        end
+    def self.clean!
+      super do
+        ActiveFedora::Cleaner.clean!
       end
-      object.apply_depositor_metadata(@user) && object.save! if object.depositor.nil?
-      log_created(object)
     end
 
-    def log_created(obj)
-      msg = "Created #{klass.model_name.human} #{obj.id}"
-      Rails.logger.info("#{msg} (#{Array(attributes[work_identifier]).first})")
+    def self.solr_name(field_name)
+      if defined?(Hyrax)
+        Hyrax.index_field_mapper.solr_name(field_name)
+      else
+        ActiveFedora.index_field_mapper.solr_name(field_name)
+      end
+    end
+
+    def self.ordered_file_sets_for(object)
+      object&.ordered_members.to_a.select(&:file_set?)
+    end
+
+    def self.save!(resource:, **)
+      resource.save!
     end
 
-    def log_updated(obj)
-      msg = "Updated #{klass.model_name.human} #{obj.id}"
-      Rails.logger.info("#{msg} (#{Array(attributes[work_identifier]).first})")
+    def self.update_index(resources: [])
+      Array(resources).each(&:update_index)
     end
+    # @!endgroup Class Method Interface
+    ##
 
-    def log_deleted_fs(obj)
-      msg = "Deleted All Files from #{obj.id}"
-      Rails.logger.info("#{msg} (#{Array(attributes[work_identifier]).first})")
+    def find_by_id
+      return false if attributes[:id].blank?
+      # Rails / Ruby upgrade, we moved from :exists? to :exist?  However we want to continue (for a
+      # bit) to support older versions.
+      method_name = klass.respond_to?(:exist?) ? :exist? : :exists?
+      klass.find(attributes[:id]) if klass.send(method_name, attributes[:id])
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+      false
+    end
+
+    def delete(_user)
+      find&.delete
     end
 
     private
@@ -238,52 +256,6 @@ module Bulkrax
       update == true ? actor.update_content(tmp_file) : actor.create_content(tmp_file, from_url: true)
       tmp_file.close
     end
-
-    def clean_attrs(attrs)
-      # avoid the "ArgumentError: Identifier must be a string of size > 0 in order to be treeified" error
-      # when setting object.attributes
-      attrs.delete('id') if attrs['id'].blank?
-      attrs
-    end
-
-    def collection_type(attrs)
-      return attrs if attrs['collection_type_gid'].present?
-
-      attrs['collection_type_gid'] = Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id.to_s
-      attrs
-    end
-
-    # Override if we need to map the attributes from the parser in
-    # a way that is compatible with how the factory needs them.
-    def transform_attributes(update: false)
-      @transform_attributes = attributes.slice(*permitted_attributes)
-      @transform_attributes.merge!(file_attributes(update_files)) if with_files
-      @transform_attributes = remove_blank_hash_values(@transform_attributes) if transformation_removes_blank_hash_values?
-      update ? @transform_attributes.except(:id) : @transform_attributes
-    end
-
-    # Regardless of what the Parser gives us, these are the properties we are prepared to accept.
-    def permitted_attributes
-      klass.properties.keys.map(&:to_sym) + base_permitted_attributes
-    end
-
-    # Return a copy of the given attributes, such that all values that are empty or an array of all
-    # empty values are fully emptied.  (See implementation details)
-    #
-    # @param attributes [Hash]
-    # @return [Hash]
-    #
-    # @see https://github.com/emory-libraries/dlp-curate/issues/1973
-    def remove_blank_hash_values(attributes)
-      dupe = attributes.dup
-      dupe.each do |key, values|
-        if values.is_a?(Array) && values.all? { |value| value.is_a?(String) && value.empty? }
-          dupe[key] = []
-        elsif values.is_a?(String) && values.empty?
-          dupe[key] = nil
-        end
-      end
-      dupe
-    end
   end
+  # rubocop:enable Metrics/ClassLength
 end