hyrax 5.0.0 → 5.0.3

data/lib/hyrax/configuration.rb

@@ -118,6 +118,7 @@ module Hyrax
 
     # @!group Analytics
 
+    # This value determines whether to collect analytics or not
     attr_writer :analytics
     attr_reader :analytics
     def analytics?
@@ -125,6 +126,16 @@ module Hyrax
         ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_ANALYTICS', false))
     end
 
+    # This value determines whether to show reports on the dashboard, work and collection report pages
+    # With Google: it's dependent on the GOOGLE_OAUTH_XXX values
+    # With Matomo: TODO
+    attr_writer :analytics_reporting
+    attr_reader :analytics_reporting
+    def analytics_reporting?
+      @analytics_reporting ||=
+        ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_ANALYTICS_REPORTING', false))
+    end
+
     # Currently supports 'google' or 'matomo'
     # google is default for backward compatability
     attr_writer :analytics_provider
@@ -294,6 +305,14 @@ module Hyrax
       @fixity_service ||= Hyrax::Fixity::ActiveFedoraFixityService
     end
 
+    # This value determines whether to use load the Freyja adapter in dassie
+    attr_writer :valkyrie_transition
+    attr_reader :valkyrie_transition
+    def valkyrie_transition?
+      @valkyrie_transition ||=
+        ActiveModel::Type::Boolean.new.cast(ENV.fetch('VALKYRIE_TRANSITION', false))
+    end
+
     attr_writer :max_days_between_fixity_checks
     def max_days_between_fixity_checks
       @max_days_between_fixity_checks ||= 7
@@ -556,6 +575,22 @@ module Hyrax
     end
     attr_writer :disable_wings
 
+    ##
+    # @return [Boolean]
+    def disable_freyja
+      return @disable_freyja unless @disable_freyja.nil?
+      ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_SKIP_FREYJA', false))
+    end
+    attr_writer :disable_freyja
+
+    ##
+    # @return [Boolean]
+    def disable_frigg
+      return @disable_frigg unless @disable_frigg.nil?
+      ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_SKIP_FRIGG', false))
+    end
+    attr_writer :disable_frigg
+
     attr_writer :display_media_download_link
     # @return [Boolean]
     def display_media_download_link?
@@ -869,6 +904,21 @@ module Hyrax
       collection_model.safe_constantize
     end
 
+    ##
+    # @api private
+    #
+    # There are assumptions baked into {Wings} and tests regarding what the
+    # correct conceptual collection will be.  This helps provide that connective
+    # tissue.
+    #
+    # It is definitely a hack to appease tests and the Double Combo/Goddess
+    # adapter migration.
+    def collection_class_for_wings
+      return collection_class if collection_class < Hyrax::Resource
+
+      Hyrax::PcdmCollection
+    end
+
     attr_writer :admin_set_model
     ##
     # @return [#constantize] a string representation of the admin set
@@ -883,6 +933,21 @@ module Hyrax
       admin_set_model.constantize
     end
 
+    ##
+    # @api private
+    #
+    # There are assumptions baked into {Wings} and tests regarding what the
+    # correct conceptual admin set will be.  This helps provide that connective
+    # tissue.
+    #
+    # It is definitely a hack to appease tests and the Double Combo/Goddess
+    # adapter migration.
+    def admin_set_class_for_wings
+      return admin_set_class if admin_set_class < Hyrax::Resource
+
+      Hyrax::AdministrativeSet
+    end
+
     ##
     # @return [String] the default admin set id
     def default_admin_set_id
@@ -1089,6 +1154,24 @@ module Hyrax
       @visibility_map ||= Hyrax::VisibilityMap.instance
     end
 
+    attr_writer :simple_schema_loader_config_search_paths
+    # A configuration for modifying the SimpleSchemaLoader#config_search_paths
+    # which will allow gems to add their own metadata yaml files and easily keep
+    # them within the gem.
+    #
+    # @return [Array<Pathname>]
+    # @see Hyrax::SimpleSchemaLoader#config_search_paths
+    # @example
+    #   Hyrax.config do |config|
+    #     config.simple_schema_loader_config_search_paths.unshift(HykuKnapsack::Engine.root)
+    #   end
+    #
+    #   Hyrax.config.simple_schema_loader_config_search_paths
+    #   => [#<Pathname:/app/samvera>, #<Pathname:/app/samvera/hyrax-webapp>, #<Pathname:/app/samvera/hyrax-webapp/gems/hyrax>]
+    def simple_schema_loader_config_search_paths
+      @simple_schema_loader_config_search_paths ||= [Rails.root, Hyrax::Engine.root]
+    end
+
     private
 
     # @param [Symbol, #to_s] model_name - symbol representing the model

data/lib/hyrax/engine.rb

@@ -89,6 +89,8 @@ module Hyrax
 
     initializer 'requires' do
       require 'wings' unless Hyrax.config.disable_wings
+      require 'freyja' unless Hyrax.config.disable_freyja
+      require 'frigg' unless Hyrax.config.disable_frigg
     end
 
     initializer 'routing' do

data/lib/hyrax/form_fields.rb

@@ -46,12 +46,10 @@ module Hyrax
 
     def included(descendant)
       super
-
       form_field_definitions.each do |field_name, options|
-        descendant.property field_name.to_sym, options.merge(display: true, default: [])
+        descendant.property field_name.to_sym, options.merge(display: options.fetch(:display, true), default: [])
         descendant.validates field_name.to_sym, presence: true if options.fetch(:required, false)
       end
-
       # Auto include any matching FormFieldBehaviors
       schema_name = name.to_s.camelcase
       behavior = "#{schema_name}FormFieldsBehavior".safe_constantize ||

data/lib/hyrax/name.rb

@@ -17,5 +17,10 @@ module Hyrax
       @singular_route_key = ActiveSupport::Inflector.singularize(@route_key)
       @route_key += "_index" if @plural == @singular
     end
+
+    ##
+    # Expose the underlying klass which can be helpful when consider that we have the
+    # Hyrax::ValkyrieLazyMigration
+    attr_reader :klass
   end
 end

data/lib/hyrax/publisher.rb

@@ -124,6 +124,16 @@ module Hyrax
 
     # @since 3.5.0
     # @macro a_registered_event
+    #   @note this event SHOULD be published file is characteried by the
+    #     characterization service. Normally, this should happen close to
+    #     when the `file.metadata.updated` event (since characterization
+    #     typically involves updating the metadata). Listeners that intend
+    #     to track updates to file metadata should listen on that event
+    #     topic.
+    #     The event payload MUST include a `:file_set` ({Hyrax::FileSet}),
+    #     a `:file_id` (the id of the {Valkyrie::StorageAdapter::File}),
+    #     and MAY have a `path_hint` for a local path / cache for the
+    #     file.
     register_event('file.characterized')
 
     # @since 3.3.0
@@ -208,6 +218,7 @@ module Hyrax
       @default_listeners ||=
         [Hyrax::Listeners::ACLIndexListener.new,
          Hyrax::Listeners::BatchNotificationListener.new,
+         Hyrax::Listeners::FileListener.new,
          Hyrax::Listeners::FileMetadataListener.new,
          Hyrax::Listeners::FileSetLifecycleListener.new,
          Hyrax::Listeners::FileSetLifecycleNotificationListener.new,

data/lib/hyrax/rubocop/custom_cops.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rubocop'
+
+module Hyrax
+  module RuboCop
+    module CustomCops
+      # This custom cop checks for mixins of Hyrax::ArResource
+      class ArResource < ::RuboCop::Cop::Cop
+        MSG = 'Do not `include Hyrax::ArResource`.'
+
+        # checks for `include Hyrax::ArResource`
+        def_node_search :includes_hyrax_ar_resource?, <<-PATTERN
+          (send nil? {:include :extend} (const (const nil? :Hyrax) :ArResource))
+        PATTERN
+
+        # checks for `include ArResource`
+        def_node_search :includes_ar_resource?, <<-PATTERN
+          (send nil? {:include :extend} (const nil? :ArResource))
+        PATTERN
+
+        def on_send(send_node)
+          add_offense(send_node, message: MSG) if includes_hyrax_ar_resource?(send_node) || includes_ar_resource?(send_node)
+        end
+      end
+
+      # class AdditionalCustomCops < ::RuboCop::Cop::Cop; end
+    end
+  end
+end

data/lib/hyrax/specs/capybara.rb

@@ -19,13 +19,13 @@ require 'selenium-webdriver'
 Capybara.save_path = ENV['CI'] ? "/tmp/test-results" : Rails.root.join('tmp', 'capybara')
 
 options = Selenium::WebDriver::Chrome::Options.new.tap do |opts|
-  opts.add_argument("--headless") if ENV["CHROME_HEADLESS_MODE"]
+  opts.add_argument("--headless=new") if ENV["CHROME_HEADLESS_MODE"]
+  # opts.add_argument("--no-sandbox")
+  # opts.add_argument("--disable-dev-shm-usage")
   opts.add_argument("--disable-gpu") if Gem.win_platform?
-  # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
-  opts.add_argument("--disable-site-isolation-trials")
   opts.add_argument("--window-size=1440,1440")
-  opts.add_argument("--enable-features=NetworkService,NetworkServiceInProcess")
-  opts.add_argument("--disable-features=VizDisplayCompositor")
+  # opts.add_argument("--enable-features=NetworkService,NetworkServiceInProcess")
+  # opts.add_argument("--disable-features=VizDisplayCompositor")
 end
 
 Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
@@ -46,7 +46,8 @@ end
 Capybara.server_host = '0.0.0.0'
 Capybara.server_port = 3010
 
-ip = IPSocket.getaddress(Socket.gethostname)
+# ip = IPSocket.getaddress(Socket.gethostname)
+ip = `hostname -s`.strip
 Capybara.app_host = "http://#{ip}:#{Capybara.server_port}"
 
 Capybara.default_driver = :rack_test # This is a faster driver
@@ -87,5 +88,8 @@ end
 RSpec.configure do |config|
   config.after(:each, :js) do |example|
     save_timestamped_page_and_screenshot(Capybara.page, example.metadata) if example.exception
+    # Quitting forces the browser session to be reinitialized during the next :js spec.
+    # This is slower but more resilient to timeouts (in theory).
+    Capybara.page.driver.quit
   end
 end

data/{spec → lib/hyrax/specs/shared_specs}/factories/admin_sets.rb

@@ -11,6 +11,7 @@ FactoryBot.define do
     after(:create) do |admin_set, evaluator|
       if evaluator.with_permission_template
         attributes = { source_id: admin_set.id }
+        attributes = evaluator.permission_template_attributes.merge(attributes) if evaluator.permission_template_attributes.respond_to?(:merge)
         attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
         # There is a unique constraint on permission_templates.source_id; I don't want to
         # create a permission template if one already exists for this admin_set
@@ -21,6 +22,7 @@ FactoryBot.define do
     transient do
       # false, true, or Hash with keys for permission_template
       with_permission_template { false }
+      permission_template_attributes { {} }
     end
 
     factory :complete_admin_set do

data/{spec → lib/hyrax/specs/shared_specs}/factories/hyrax_embargo.rb

@@ -5,6 +5,10 @@ FactoryBot.define do
     visibility_after_embargo  { 'open' }
     visibility_during_embargo { 'authenticated' }
 
+    after(:build) do |embargo, evaluator|
+      embargo.embargo_release_date = evaluator.embargo_release_date.to_datetime
+    end
+
     to_create do |instance|
       saved_instance = Valkyrie.config.metadata_adapter.persister.save(resource: instance)
       instance.id = saved_instance.id

data/{spec → lib/hyrax/specs/shared_specs}/factories/hyrax_lease.rb

@@ -5,6 +5,10 @@ FactoryBot.define do
     visibility_after_lease  { 'authenticated' }
     visibility_during_lease { 'open' }
 
+    after(:build) do |lease, evaluator|
+      lease.lease_expiration_date = evaluator.lease_expiration_date.to_datetime
+    end
+
     to_create do |instance|
       saved_instance = Valkyrie.config.metadata_adapter.persister.save(resource: instance)
       instance.id = saved_instance.id

data/{spec → lib/hyrax/specs/shared_specs}/factories/hyrax_work.rb

@@ -66,6 +66,11 @@ FactoryBot.define do
           .assign_access_for(visibility: evaluator.visibility_setting)
       end
 
+      if evaluator.respond_to?(:admin_set) && evaluator.admin_set.present?
+        template = Hyrax::PermissionTemplate.find_by(source_id: evaluator.admin_set.id)
+        Hyrax::PermissionTemplateApplicator.apply(template).to(model: work) if template
+      end
+
       work.permission_manager.edit_groups = work.permission_manager.edit_groups.to_a + evaluator.edit_groups
       work.permission_manager.edit_users  = work.permission_manager.edit_users.to_a + evaluator.edit_users
       work.permission_manager.read_users  = work.permission_manager.read_users.to_a + evaluator.read_users
@@ -80,6 +85,19 @@ FactoryBot.define do
           .new(resource: work)
           .assign_access_for(visibility: evaluator.visibility_setting)
       end
+
+      if evaluator.respond_to?(:admin_set) && evaluator.admin_set.present?
+        # We're likely going to want to apply permissions
+        template = Hyrax::PermissionTemplate.find_by(source_id: evaluator.admin_set.id)
+        if template
+          Hyrax::PermissionTemplateApplicator.apply(template).to(model: work)
+          if template.active_workflow.present?
+            user = User.find_by(Hydra.config.user_key_field => work.depositor)
+            Hyrax::Workflow::WorkflowFactory.create(work, {}, user)
+          end
+        end
+      end
+
       work.permission_manager.edit_groups = work.permission_manager.edit_groups.to_a + evaluator.edit_groups
       work.permission_manager.edit_users  = work.permission_manager.edit_users.to_a + evaluator.edit_users
       work.permission_manager.read_users  = work.permission_manager.read_users.to_a + evaluator.read_users
@@ -89,7 +107,14 @@ FactoryBot.define do
       Hyrax::EmbargoManager.new(resource: work).apply
       Hyrax::LeaseManager.new(resource: work).apply
 
-      work.permission_manager.acl.save
+      if evaluator.with_index
+        work.permission_manager.acl.save
+      else
+        # manually save acl change_set so it does not automatically index the work
+        change_set = work.permission_manager.acl.send(:change_set)
+        change_set.sync
+        Hyrax.persister.save(resource: change_set.resource)
+      end
 
       # This has to happen after permissions for permissions to propagate.
       if evaluator.uploaded_files.present?

data/lib/hyrax/specs/shared_specs/hydra_works.rb

@@ -374,7 +374,7 @@ RSpec.shared_examples 'a Hyrax::FileSet', valkyrie_adapter: :test_adapter do
       end
 
       context 'with simulated original file' do
-        let(:file_metadata_double) { double("Fake Hyrax::FileMetadata", id: SecureRandom.uuid, file_identifier: SecureRandom.uuid, versions: [file_double]) }
+        let(:file_metadata_double) { double("Fake Hyrax::FileMetadata", id: SecureRandom.uuid, file_identifier: "versiondisk://#{Rails.root.join / 'tmp' / 'test_adapter_uploads'}/#{SecureRandom.uuid}", versions: [file_double]) }
         let(:file_double) { double("Fake Valkyrie::StorageAdapter::File", id: SecureRandom.uuid, version_id: SecureRandom.uuid)}
 
         before do

data/lib/hyrax/transactions/admin_set_destroy.rb

@@ -11,7 +11,8 @@ module Hyrax
       DEFAULT_STEPS = ['admin_set_resource.check_default',
                        'admin_set_resource.check_empty',
                        'admin_set_resource.delete',
-                       'admin_set_resource.delete_acl'].freeze
+                       'admin_set_resource.delete_acl',
+                       'admin_set_resource.delete_permission_template'].freeze
 
       ##
       # @see Hyrax::Transactions::Transaction

data/lib/hyrax/transactions/collection_destroy.rb

@@ -11,7 +11,8 @@ module Hyrax
       # TODO: Add step that checks if collection is empty for collections of types that require it
       DEFAULT_STEPS = ['collection_resource.delete_acl',
                        'collection_resource.remove_from_membership',
-                       'collection_resource.delete'].freeze
+                       'collection_resource.delete',
+                       'collection_resource.delete_permission_template'].freeze.freeze
 
       ##
       # @see Hyrax::Transactions::Transaction

data/lib/hyrax/transactions/container.rb

@@ -42,6 +42,7 @@ module Hyrax
       require 'hyrax/transactions/steps/delete_access_control'
       require 'hyrax/transactions/steps/delete_all_file_metadata'
       require 'hyrax/transactions/steps/delete_all_file_sets'
+      require 'hyrax/transactions/steps/delete_permission_template'
       require 'hyrax/transactions/steps/delete_resource'
       require 'hyrax/transactions/steps/ensure_admin_set'
       require 'hyrax/transactions/steps/file_metadata_delete'
@@ -202,6 +203,10 @@ module Hyrax
         ops.register 'save_acl' do
           Steps::SaveAccessControl.new
         end
+
+        ops.register 'delete_permission_template' do
+          Steps::DeletePermissionTemplate.new
+        end
       end
 
       namespace 'collection_resource' do |ops| # Hyrax::PcdmCollection resource
@@ -229,6 +234,10 @@ module Hyrax
           Steps::SaveAccessControl.new
         end
 
+        ops.register 'delete_permission_template' do
+          Steps::DeletePermissionTemplate.new
+        end
+
         ops.register 'save_collection_banner' do
           Steps::SaveCollectionBanner.new
         end

data/lib/hyrax/transactions/steps/add_file_sets.rb

@@ -27,8 +27,9 @@ module Hyrax
           if @handler.new(work: obj).add(files: uploaded_files, file_set_params: file_set_params).attach
             file_sets = obj.member_ids.map do |member|
               Hyrax.query_service.find_by(id: member) if Hyrax.query_service.find_by(id: member).is_a? Hyrax::FileSet
-            end
+            end.compact
 
+            # TODO: improve queries - Non performant to perform single queries. Perhapds queries ids then reject.
             Hyrax::LeaseManager.create_or_update_lease_on_members(file_sets, obj) if obj.lease
             Hyrax::EmbargoManager.create_or_update_embargo_on_members(file_sets, obj) if obj.embargo
             Success(obj)

data/lib/hyrax/transactions/steps/delete_all_file_metadata.rb

@@ -14,8 +14,7 @@ module Hyrax
 
         ##
         # @params [#save] persister
-        def initialize(property: :file_ids, query_service: Hyrax.query_service, persister: Hyrax.persister, publisher: Hyrax.publisher)
-          @property = property
+        def initialize(query_service: Hyrax.query_service, persister: Hyrax.persister, publisher: Hyrax.publisher)
           @persister = persister
           @query_service = query_service
           @publisher = publisher
@@ -29,10 +28,10 @@ module Hyrax
         def call(resource)
           return Failure(:resource_not_persisted) unless resource.persisted?
 
-          resource[@property].each do |file_id|
-            return Failure[:failed_to_delete_file_metadata, file_id] unless
+          @query_service.custom_queries.find_files(file_set: resource).each do |file_metadata|
+            return Failure[:failed_to_delete_file_metadata, file_metadata.id] unless
               Hyrax::Transactions::Container['file_metadata.destroy']
-              .call(@query_service.custom_queries.find_file_metadata_by(id: file_id))
+              .call(file_metadata)
               .success?
           rescue ::Ldp::Gone
             nil

data/lib/hyrax/transactions/steps/delete_permission_template.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Deletes the Hyrax::PermissionTemplate for a resource.
+      # If no PermissionTemplate associated with that resource is found, succeeds.
+      #
+      # @see https://dry-rb.org/gems/dry-monads/1.0/result/
+      class DeletePermissionTemplate
+        include Dry::Monads[:result]
+
+        ##
+        # @param [Valkyrie::Resource] obj
+        #
+        # @return [Dry::Monads::Result]
+        def call(obj)
+          permission_template = Hyrax::PermissionTemplate.find_by(source_id: obj.id)
+          return Success(obj) if permission_template.nil?
+
+          permission_template.destroy || (return Failure[:failed_to_delete_permission_template, permission_template])
+
+          Success(obj)
+        end
+      end
+    end
+  end
+end

data/lib/hyrax/transactions/steps/delete_resource.rb

@@ -27,8 +27,8 @@ module Hyrax
         def call(resource, user: nil)
           return Failure(:resource_not_persisted) unless resource.persisted?
 
-          @persister.delete(resource: resource)
           publish_changes(resource: resource, user: user)
+          @persister.delete(resource: resource)
 
           Success(resource)
         end

data/lib/hyrax/transactions/steps/save_collection_logo.rb

@@ -19,7 +19,8 @@ module Hyrax
         #
         # @return [Dry::Monads::Result] `Failure` if the work fails to save;
         #   `Success(input)`, otherwise.
-        def call(collection_resource, update_logo_file_ids: nil, alttext_values: nil, linkurl_values: nil)
+        def call(collection_resource, update_logo_file_ids: nil, alttext_values: nil, linkurl_values: nil, logo_unchanged_indicator: true)
+          return Success(collection_resource) if ActiveModel::Type::Boolean.new.cast(logo_unchanged_indicator)
           collection_id = collection_resource.id.to_s
           process_logo_input(collection_id: collection_id, update_logo_file_ids: update_logo_file_ids, alttext_values: alttext_values, linkurl_values: linkurl_values)
           Success(collection_resource)

data/lib/hyrax/valkyrie_can_can_adapter.rb

@@ -19,10 +19,17 @@ module Hyrax
     #
     # @raise Hyrax::ObjectNotFoundError
     def self.find(_model_class, id)
-      return Hyrax.query_service.find_by(id: id) unless Hyrax.config.enable_noids?
+      self.find_by(id:) ||
       Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id)
     rescue Valkyrie::Persistence::ObjectNotFoundError => err
       raise Hyrax::ObjectNotFoundError, err.message
     end
+
+    private
+
+    def self.find_by(id:)
+      Hyrax.query_service.find_by(id:)
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+    end
   end
 end

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.0.0'
+  VERSION = '5.0.3'
 end

data/lib/wings/active_fedora_converter.rb

@@ -143,18 +143,26 @@ module Wings
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
+    # rubocop:disable Metrics/AbcSize
     def parse_attributes(af_object)
       converted_attrs = normal_attributes
-      members = Array.wrap(converted_attrs.delete(:members))
-      files = converted_attrs.delete(:files)
-      af_object.attributes = converted_attrs
+      af_object.attributes = converted_attrs.except(:members, :files, :file_name)
+      af_object.original_filename = converted_attrs[:file_name] if converted_attrs[:file_name]
       af_object.extracted_text = create_extrated_text(af_object) if resource.attributes[:extracted_text_id].present?
       perform_lease_conversion(af_object: af_object, resource: resource)
       perform_embargo_conversion(af_object: af_object, resource: resource)
-      members.empty? ? af_object.try(:ordered_members)&.clear : af_object.try(:ordered_members=, members)
-      af_object.try(:members)&.replace(members)
+
+      if converted_attrs.keys.include?(:members)
+        members = Array.wrap(converted_attrs.delete(:members))
+        members.empty? ? af_object.try(:ordered_members)&.clear : af_object.try(:ordered_members=, members)
+        af_object.try(:members)&.replace(members)
+      end
+
+      return unless converted_attrs.keys.include?(:files)
+      files = converted_attrs.delete(:files)
       af_object.files.build_or_set(files) if files
     end
+    # rubocop:enable Metrics/AbcSize
 
     def create_extrated_text(af_object)
       pcdm_et_file = af_object.extracted_text.presence || af_object.create_extracted_text

data/lib/wings/converter_value_mapper.rb

@@ -246,6 +246,7 @@ module Wings
     attr_reader :attributes
 
     def initialize(attributes)
+      attributes = attributes.merge(file_name: attributes[:original_filename]) if attributes[:original_filename]
       @attributes = attributes
     end
 

data/lib/wings/services/custom_queries/find_collections_by_type.rb

@@ -19,7 +19,8 @@ module Wings
       # @param global_id [GlobalID] global id for a Hyrax::CollectionType
       #
       # @return [Enumerable<PcdmCollection>]
-      def find_collections_by_type(global_id:)
+      def find_collections_by_type(global_id:, **)
+        # TODO: Consider how to do this without the hard-coded Collection
         ::Collection.where(Hyrax.config.collection_type_index_field.to_sym => global_id.to_s).map(&:valkyrie_resource)
       end
     end

data/lib/wings/services/custom_queries/find_file_metadata.rb

@@ -63,7 +63,7 @@ module Wings
       def find_file_metadata_by_alternate_identifier(alternate_identifier:, use_valkyrie: true)
         alternate_identifier = ::Valkyrie::ID.new(alternate_identifier).to_s
         object = Hydra::PCDM::File.find(alternate_identifier)
-        raise Hyrax::ObjectNotFoundError if object.new_record?
+        raise Hyrax::ObjectNotFoundError if object.new_record? || object.empty?
 
         if use_valkyrie == false
           warn_about_deprecation
@@ -108,7 +108,7 @@ module Wings
       #
       def find_many_file_metadata_by_use(resource:, use:, use_valkyrie: true)
         pcdm_files = find_many_file_metadata_by_ids(ids: resource.file_ids, use_valkyrie: false)
-        pcdm_files.select! { |pcdm_file| pcdm_file.metadata_node.type.include?(use) }
+        pcdm_files.select! { |pcdm_file| !pcdm_file.empty? && pcdm_file.metadata_node.type.include?(use) }
 
         if use_valkyrie == false
           warn_about_deprecation

data/lib/wings/setup.rb

@@ -127,9 +127,18 @@ custom_queries.each do |query_handler|
   Valkyrie.config.metadata_adapter.query_service.custom_queries.register_query_handler(query_handler)
 end
 
-Wings::ModelRegistry.register(Hyrax::AccessControl,     Hydra::AccessControl)
-Wings::ModelRegistry.register(Hyrax::AdministrativeSet, AdminSet)
-Wings::ModelRegistry.register(Hyrax::PcdmCollection,    ::Collection)
+Valkyrie.config.resource_class_resolver = lambda do |resource_klass_name|
+  return resource_klass_name.constantize unless defined?(Wings)
+  klass_name = resource_klass_name.gsub(/Resource$/, '')
+  # Second one should throw a name error because we do not know what you want if
+  # it isn't one of these two options
+  klass = klass_name.safe_constantize || resource_klass_name.constantize
+  Wings::ModelRegistry.reverse_lookup(klass) || klass
+end
+
+Wings::ModelRegistry.register(Hyrax::AccessControl, Hydra::AccessControl)
+Wings::ModelRegistry.register(Hyrax.config.admin_set_class_for_wings, AdminSet)
+Wings::ModelRegistry.register(Hyrax.config.collection_class_for_wings, ::Collection)
 Wings::ModelRegistry.register(Hyrax::FileSet,           FileSet)
 Wings::ModelRegistry.register(Hyrax::Embargo,           Hydra::AccessControls::Embargo)
 Wings::ModelRegistry.register(Hyrax::Lease,             Hydra::AccessControls::Lease)

data/lib/wings/transformer_value_mapper.rb

@@ -49,8 +49,12 @@ module Wings
     end
 
     ##
-    # @return [RDF::Term]
+    # Valkyrie objects contain a URI string for location objects so we need
+    # to return just the string for mapping from Fedora
+    #
+    # @return [RDF::Term || String]
     def result
+      return value.id if value.is_a?(Hyrax::ControlledVocabularies::Location)
       value.to_term
     end
   end

data/lib/wings/valkyrie/persister.rb

@@ -24,7 +24,8 @@ module Wings
       # @param [Valkyrie::Resource] resource
       # @param [Boolean] perform_af_validation
       # @return [Valkyrie::Resource] the persisted/updated resource
-      def save(resource:, perform_af_validation: false)
+      # rubocop:disable Lint/UnusedMethodArgument
+      def save(resource:, perform_af_validation: false, external_resource: false)
         af_object = resource_factory.from_resource(resource: resource)
 
         check_lock_tokens(af_object: af_object, resource: resource)
@@ -43,6 +44,7 @@ module Wings
 
         raise FailedSaveError.new(err.message, obj: af_object)
       end
+      # rubocop:enable Lint/UnusedMethodArgument
 
       # Persists a resource using ActiveFedora
       # @param [Valkyrie::Resource] resource