hyrax 5.1.0.pre.beta1 → 5.2.0

data/config/initializers/reform_rails_6_1_monkey_patch.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+return if Rails::VERSION::MAJOR >= 7
+
+# Taken from https://github.com/trailblazer/reform-rails/issues/86#issuecomment-763120151
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Lint/UselessAssignment
+module Reform
+  class Contract < Disposable::Twin
+    class Result
+      private
+
+      # this doesn't do nested errors (e.g. )
+      def filter_for(method, *args)
+        @results.collect { |r| r.public_send(method, *args).to_h }
+                .inject({}) { |hah, err| hah.merge(err) { |_key, old_v, new_v| (new_v.is_a?(Array) ? (old_v |= new_v) : old_v.merge(new_v)) } }
+                .find_all do |_k, v| # filter :nested=>{:something=>["too nested!"]} #DISCUSS: do we want that here?
+          if v.is_a?(Hash)
+            nested_errors = v.select { |attr_key, val| attr_key.is_a?(Integer) && val.is_a?(Array) && val.any? }
+            v = nested_errors.to_a if nested_errors.any?
+          end
+          v.is_a?(ActiveModel::DeprecationHandlingMessageArray)
+        end.to_h
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:disable Lint/UselessAssignment

data/config/metadata/core_metadata.yaml

@@ -20,4 +20,5 @@ attributes:
     type: string
     predicate: http://id.loc.gov/vocabulary/relators/dpt
     index_keys:
+      - "depositor_ssim"
       - "depositor_tesim"

data/docker-compose-dassie.yml

@@ -6,7 +6,7 @@ services:
       args:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.dassie
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -40,7 +40,7 @@ services:
       - hyrax
 
   worker:
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root
@@ -68,14 +68,14 @@ services:
   chrome:
     image: selenium/standalone-chromium:4
     environment:
-#      - START_XVFB=false
+      #      - START_XVFB=false
       - SE_NODE_SESSION_TIMEOUT=800
       - SE_ENABLE_TRACING=false
       - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true
       - SE_BROWSER_ARGS_DISABLE_DSHM=--disable-dev-shm-usage
       - SE_BROWSER_ARGS_HEADLESS=--headless=new
-#    logging:
-#      driver: none
+    #    logging:
+    #      driver: none
     volumes:
       - /dev/shm:/dev/shm
     shm_size: 2g
@@ -118,7 +118,7 @@ services:
   memcached:
     image: bitnami/memcached
     ports:
-      - '11211:11211'
+      - "11211:11211"
     networks:
       - hyrax
 

data/docker-compose-koppie.yml

@@ -8,7 +8,7 @@ services:
       args:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.koppie
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -43,7 +43,7 @@ services:
       - koppie
 
   worker:
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root

data/docker-compose-sirenia.yml

@@ -8,7 +8,7 @@ services:
       args:
         - EXTRA_APK_PACKAGES=git less
         - BUNDLE_GEMFILE=Gemfile.koppie
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
@@ -46,7 +46,7 @@ services:
       - sirenia
 
   worker:
-    image: samvera/hyrax-dev
+    image: ghcr.io/samvera/hyrax-dev:${GITHUB_SHA:-latest}
     entrypoint: worker-entrypoint.sh
     command: sh -c 'bundle exec sidekiq'
     user: root

data/documentation/developing-your-hyrax-based-app.md

@@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co
 During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v5.1.0-beta1__. If you are looking for instructions on installing a different
+v5.2.0__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -148,7 +148,7 @@ Generate a new Rails application using the template.
 **NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process.
 
 ```shell
-HYRAX_SKIP_WINGS=true rails _7.2.2.1_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.1.0-beta1/template.rb
+HYRAX_SKIP_WINGS=true rails _7.2.2.1_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.2.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -32,13 +32,13 @@ SUMMARY
   # NOTE: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
-  spec.add_dependency 'rails', '~> 7.2', '< 8.0'
+  spec.add_dependency 'rails', '> 6.1', '< 8.0'
 
   spec.add_dependency 'active-fedora', '~> 15.0'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'blacklight', '~> 7.29'
-  spec.add_dependency 'blacklight-gallery', '~> 4.7.0'
+  spec.add_dependency 'blacklight-gallery', '~> 4.6.4'
   spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
   spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0'
   spec.add_dependency 'carrierwave', '~> 1.0'
@@ -100,7 +100,7 @@ SUMMARY
   spec.add_development_dependency 'pg', '~> 1.2'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency 'rspec-its', '~> 1.1'
-  spec.add_development_dependency 'rspec-rails', '~> 7.0'
+  spec.add_development_dependency 'rspec-rails', '> 6.1'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency "selenium-webdriver", '~> 4.4'
   spec.add_development_dependency 'i18n-debug'

data/lib/freyja/persister.rb

@@ -13,6 +13,7 @@ module Freyja
     #   was modified in the database between been read into memory and persisted
     # rubocop:disable Lint/UnusedMethodArgument
     def save(resource:, external_resource: false, perform_af_validation: false)
+      was_wings = resource.respond_to?(:wings?) && resource.wings?
       orm_object = resource_factory.from_resource(resource: resource)
       orm_object.transaction do
         orm_object.save!
@@ -23,18 +24,24 @@ module Freyja
                 "Called from #{Gem.location_of_caller.join(':')}"
         end
       end
-      convert_and_migrate_resource(orm_object)
+      convert_and_migrate_resource(orm_object, was_wings)
 
     rescue ActiveRecord::StaleObjectError
       raise Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process."
     end
     # rubocop:enable Lint/UnusedMethodArgument
 
-    def convert_and_migrate_resource(orm_object)
+    def convert_and_migrate_resource(orm_object, was_wings)
       new_resource = resource_factory.to_resource(object: orm_object)
-      if Hyrax.config.valkyrie_transition?
+      # if the resource was wings and is now a Valkyrie resource, we need to migrate sipity, files, and members
+      if Hyrax.config.valkyrie_transition? && was_wings && !new_resource.wings?
         MigrateFilesToValkyrieJob.perform_later(new_resource) if new_resource.is_a?(Hyrax::FileSet) && new_resource.file_ids.size == 1 && new_resource.file_ids.first.id.to_s.match('/files/')
-        MigrateResourcesJob.perform_later(ids: new_resource.member_ids.map(&:to_s)) if new_resource.is_a?(Hyrax::Work)
+        # migrate any members if the resource is a Hyrax work
+        if new_resource.is_a?(Hyrax::Work)
+          member_ids = new_resource.member_ids.map(&:to_s)
+          MigrateResourcesJob.perform_later(ids: member_ids) unless member_ids.empty?
+          MigrateSipityEntityJob.perform_now(id: new_resource.id.to_s)
+        end
       end
       new_resource
     end

data/lib/generators/hyrax/install_generator.rb

@@ -209,10 +209,5 @@ module Hyrax
         gem 'dotenv-rails', '~> 2.8'
       end
     end
-
-    def support_analytics
-      gem 'google-protobuf', force_ruby_platform: true # required because google-protobuf is not compatible with Alpine linux
-      gem 'grpc', force_ruby_platform: true # required because grpc is not compatible with Alpine linux
-    end
   end
 end

data/lib/generators/hyrax/templates/.env

@@ -1,6 +1,6 @@
 CH12N_TOOL=fits_servlet
 DATABASE_URL=postgresql://postgres@localhost:5437/hyrax-dev?pool=5
-FCREPO_URL=http://fedoraAdmin:fedoraAdmin@fcrepo:8989/fcrepo/rest
+FEDORA_URL=http://fedoraAdmin:fedoraAdmin@localhost:8989/fcrepo/rest
 FITS_SERVLET_URL=http://localhost:8085/fits
 HYRAX_ACTIVE_JOB_QUEUE=async
 REDIS_URL=redis://localhost:6384

data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb

@@ -32,7 +32,7 @@ Valkyrie::MetadataAdapter.register(
 # Valkyrie::MetadataAdapter.register(
 #   Valkyrie::Persistence::Fedora::MetadataAdapter.new(
 #     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
-#       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
+#       ENV.fetch('FEDORA_URL') { "http://localhost:8080/fcrepo/rest" }
 #     )),
 #     base_path: Rails.env,
 #     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
@@ -67,7 +67,7 @@ Valkyrie.config.metadata_adapter = ENV.fetch('VALKYRIE_METADATA_ADAPTER') { :pg_
 # Valkyrie::StorageAdapter.register(
 #   Valkyrie::Storage::Fedora.new(
 #     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
-#       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
+#       ENV.fetch('FEDORA_URL') { "http://localhost:8080/fcrepo/rest" }
 #     )),
 #     base_path: Rails.env,
 #     fedora_version: 6.5,
@@ -86,21 +86,23 @@ Valkyrie.config.storage_adapter  = ENV.fetch('VALKYRIE_STORAGE_ADAPTER') { :vers
 
 Valkyrie.config.indexing_adapter = :solr_index
 
-custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
-                  Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
-                  Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
-                  Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
-                  Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
-                  Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
-                  Hyrax::CustomQueries::Navigators::FindFiles,
-                  Hyrax::CustomQueries::FindAccessControl,
-                  Hyrax::CustomQueries::FindCollectionsByType,
-                  Hyrax::CustomQueries::FindFileMetadata,
-                  Hyrax::CustomQueries::FindIdsByModel,
-                  Hyrax::CustomQueries::FindManyByAlternateIds,
-                  Hyrax::CustomQueries::FindModelsByAccess,
-                  Hyrax::CustomQueries::FindCountBy,
-                  Hyrax::CustomQueries::FindByDateRange]
-custom_queries.each do |handler|
-  Hyrax.query_service.custom_queries.register_query_handler(handler)
+Rails.application.reloader.to_prepare do
+  custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
+                    Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
+                    Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
+                    Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
+                    Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+                    Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
+                    Hyrax::CustomQueries::Navigators::FindFiles,
+                    Hyrax::CustomQueries::FindAccessControl,
+                    Hyrax::CustomQueries::FindCollectionsByType,
+                    Hyrax::CustomQueries::FindFileMetadata,
+                    Hyrax::CustomQueries::FindIdsByModel,
+                    Hyrax::CustomQueries::FindManyByAlternateIds,
+                    Hyrax::CustomQueries::FindModelsByAccess,
+                    Hyrax::CustomQueries::FindCountBy,
+                    Hyrax::CustomQueries::FindByDateRange]
+  custom_queries.each do |handler|
+    Hyrax.query_service.custom_queries.register_query_handler(handler)
+  end
 end

data/lib/generators/hyrax/templates/db/migrate/20170131142607_add_permission_template_to_sipity_workflow.rb.erb

@@ -1,4 +1,4 @@
-class AddPermissionTemplateToSipityWorkflow < ActiveRecord::Migration<%= migration_version %>
+class AddPermissionTemplateToSipityWorkflow < ActiveRecord::Migration[6.1]
   def change
     add_column :sipity_workflows, :permission_template_id, :integer, index: true
     remove_index :sipity_workflows, :name

data/lib/generators/hyrax/templates/db/migrate/20170810190549_update_collection_type_column_options.rb.erb

@@ -1,4 +1,4 @@
-class UpdateCollectionTypeColumnOptions < ActiveRecord::Migration<%= migration_version %>
+class UpdateCollectionTypeColumnOptions < ActiveRecord::Migration[6.1]
   def up
     change_column :hyrax_collection_types, :title, :string, unique: true
     change_column :hyrax_collection_types, :machine_id, :string, unique: true

data/lib/generators/hyrax/templates/db/migrate/20230821153635_add_fields_to_counter_metric.rb.erb

@@ -1,4 +1,4 @@
-class AddFieldsToCounterMetric < ActiveRecord::Migration<%= migration_version %>
+class AddFieldsToCounterMetric < ActiveRecord::Migration[6.1]
   def change
     add_column :hyrax_counter_metrics, :title, :string
     add_column :hyrax_counter_metrics, :year_of_publication, :integer, index: true

data/lib/hyrax/configuration.rb

@@ -133,8 +133,23 @@ module Hyrax
     attr_writer :analytics_reporting
     attr_reader :analytics_reporting
     def analytics_reporting?
-      @analytics_reporting ||=
+      @analytics_reporting ||= begin
+        required_env_vars = %w[
+          HYRAX_ANALYTICS_REPORTING
+          GOOGLE_ANALYTICS_ID
+          GOOGLE_ANALYTICS_PROPERTY_ID
+        ]
+
+        required_env_vars << if ENV['GOOGLE_ACCOUNT_JSON'].blank?
+                               'GOOGLE_ACCOUNT_JSON_PATH'
+                             else
+                               'GOOGLE_ACCOUNT_JSON'
+                             end
+
+        return false if required_env_vars.any? { |var| ENV.fetch(var, '').blank? }
+
         ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_ANALYTICS_REPORTING', false))
+      end
     end
 
     # Currently supports 'google' or 'matomo'
@@ -142,7 +157,7 @@ module Hyrax
     attr_writer :analytics_provider
     def analytics_provider
       @analytics_provider ||=
-        ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'google')
+        ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'ga4')
     end
 
     ##
@@ -478,31 +493,31 @@ module Hyrax
     # Path on the local file system where derivatives will be stored
     attr_writer :derivatives_path
     def derivatives_path
-      @derivatives_path ||= ENV.fetch('HYRAX_DERIVATIVES_PATH', Rails.root.join('tmp', 'derivatives'))
+      @derivatives_path ||= Pathname.new(ENV.fetch('HYRAX_DERIVATIVES_PATH', Rails.root.join('tmp', 'derivatives')))
     end
 
     # Path on the local file system where originals will be staged before being ingested into Fedora.
     attr_writer :working_path
     def working_path
-      @working_path ||= ENV.fetch('HYRAX_UPLOAD_PATH', Rails.root.join('tmp', 'uploads'))
+      @working_path ||= Pathname.new(ENV.fetch('HYRAX_UPLOAD_PATH', Rails.root.join('tmp', 'uploads')))
     end
 
     # @todo do we use both upload_path and working path?
     # Path on the local file system where originals will be staged before being ingested into Fedora.
     attr_writer :upload_path
     def upload_path
-      @upload_path ||= ->() { ENV.fetch('HYRAX_UPLOAD_PATH') { Rails.root.join('tmp', 'uploads') } }
+      @upload_path ||= ->() { Pathname.new(ENV.fetch('HYRAX_UPLOAD_PATH') { Rails.root.join('tmp', 'uploads') }) }
     end
 
     attr_writer :cache_path
     def cache_path
-      @cache_path ||= ->() { ENV.fetch('HYRAX_CACHE_PATH') { Rails.root.join('tmp', 'cache') } }
+      @cache_path ||= ->() { Pathname.new(ENV.fetch('HYRAX_CACHE_PATH') { Rails.root.join('tmp', 'cache') }) }
     end
 
     # Path on the local file system where where log and banners will be stored.
     attr_writer :branding_path
     def branding_path
-      @branding_path ||= ENV.fetch('HYRAX_BRANDING_PATH', Rails.root.join('public', 'branding'))
+      @branding_path ||= Pathname.new(ENV.fetch('HYRAX_BRANDING_PATH', Rails.root.join('public', 'branding')))
     end
 
     # @!endgroup

data/lib/hyrax/controlled_vocabulary/importer/language.rb

@@ -13,7 +13,11 @@ module Hyrax
           stdout_logger.formatter = proc do |_severity, _datetime, _progname, msg|
             "#{msg}\n"
           end
-          ActiveSupport::BroadcastLogger.new(Hyrax.logger, stdout_logger)
+          if Rails.version >= '7.1'
+            ActiveSupport::BroadcastLogger.new(Hyrax.logger, stdout_logger)
+          else
+            Hyrax.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
+          end
         end
 
         def import

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

@@ -20,10 +20,11 @@ module Hyrax
         ##
         # @param [Hyrax::Work] obj
         # @param [Enumerable<UploadedFile>] uploaded_files
-        # @param [Enumerable<Hash>] file_set_params
+        # @param [Enumerable<Hash>] file_set_params or nil
         #
         # @return [Dry::Monads::Result]
         def call(obj, uploaded_files: [], file_set_params: [])
+          return Success(obj) if uploaded_files.empty? && file_set_params.blank? # Skip if no files to attach
           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

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.1.0-beta1'
+  VERSION = '5.2.0'
 end

data/lib/hyrax.rb

@@ -23,6 +23,7 @@ require 'hyrax/valkyrie_can_can_adapter'
 require 'retriable'
 require 'valkyrie/indexing_adapter'
 require 'valkyrie/indexing/solr/indexing_adapter'
+require 'valkyrie/indexing/redis_queue/indexing_adapter'
 require 'valkyrie/indexing/null_indexing_adapter'
 
 ##

data/lib/tasks/workflow.rake

@@ -3,8 +3,7 @@ namespace :hyrax do
   namespace :workflow do
     desc "Load workflow configuration into the database"
     task load: :environment do
-      logger = Logger.new(STDOUT)
-      logger.level = Logger::DEBUG
+      logger = Hyrax.logger || Logger.new(STDOUT, level: Logger::DEBUG)
       Hyrax::Workflow::WorkflowImporter.load_workflows(logger: logger)
       errors = Hyrax::Workflow::WorkflowImporter.load_errors
       abort("Failed to process all workflows:\n  #{errors.join('\n  ')}") unless errors.empty?

data/lib/valkyrie/indexing/redis_queue/indexing_adapter.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+module Valkyrie
+  module Indexing
+    module RedisQueue
+      class IndexingAdapter
+        ##
+        # @!attribute [r] connection
+        #   @return [RSolr::Client]
+        attr_writer :connection
+        attr_accessor :index_queue_name, :delete_queue_name, :index_error_name, :delete_error_name
+
+        ##
+        # @param connection [RSolr::Client] The RSolr connection to index to.
+        def initialize(connection: nil, index_queue_name: 'toindex', delete_queue_name: 'todelete')
+          @connection = connection
+          @index_queue_name = index_queue_name
+          @delete_queue_name = delete_queue_name
+          @index_error_name = index_queue_name + "-error"
+          @delete_error_name = delete_queue_name + "-error"
+        end
+
+        def connection
+          @connection ||= default_connection
+        end
+
+        def save(resource:)
+          persist([resource])
+        end
+
+        def save_all(resources:)
+          persist(resources)
+        end
+
+        # Deletes a Solr Document using the ID
+        # @return [Array<Valkyrie::Resource>] resources which have been deleted from Solr
+        def delete(resource:)
+          connection.zadd(delete_queue_name, Time.current.to_i, resource.id.to_s)
+        end
+
+        # Delete the Solr index of all Documents
+        def wipe!
+          connection.del(index_queue_name)
+          connection.del(index_error_name)
+          connection.del(delete_queue_name)
+          connection.del(delete_error_name)
+        end
+
+        def reset!
+          self.connection = default_connection
+        end
+
+        def index_queue(size: 200)
+          set = connection.zpopmin(index_queue_name, size)
+          return [] if set.blank?
+          # we have to load these one at a time because find_all_by_id gets duplicates during wings transition
+          resources = set.map { |id, _time| Hyrax.query_service.find_by(id: id) }
+          solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
+          solr_indexer.save_all(resources: resources)
+          solr_indexer.connection.commit
+        rescue
+          # if anything goes wrong, try to requeue the items
+          set.each { |id, time| connection.zadd(index_error_name, time, id) }
+          raise
+        end
+
+        # If a batch fails, try running them one at a time to get down to just records that really fail
+        def index_error_queue(size: 200)
+          @set = []
+          solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
+
+          size.times do
+            @set = queue.connection.zpopmin(index_error_name, 1)
+            return [] if @set.blank?
+            # we have to load these one at a time because find_all_by_id gets duplicates during wings transition
+            resource = Hyrax.query_service.find_by(id: @set[0])
+            solr_indexer.save(resource: resource)
+          rescue
+            # if anything goes wrong, try to requeue the items
+            @set.each { |id, _time| queue.connection.zadd(index_error_name + "-twice", Time.now.to_i, id) }
+          end
+          solr_indexer.connection.commit
+        end
+
+        # We reach in to solr directly here to prevent needing to load the objects unnecessarily
+        def delete_queue(size: 200)
+          set = connection.zpopmin(delete_queue_name, size)
+          return [] if set.blank?
+          solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
+          set.each do |id, _time|
+            solr_indexer.connection.delete_by_id id.to_s, { softCommit: true }
+          end
+          solr_indexer.connection.commit
+        rescue
+          # if anything goes wrong, try to requeue the items
+          set.each { |id, time| connection.zadd(delete_error_name, time, id) }
+          raise
+        end
+
+        # If a batch fails, try running them one at a time to get down to just records that really fail
+        def delete_error_queue(size: 200)
+          @set = []
+          size.times do
+            @set = connection.zpopmin(delete_error_name, 1)
+            return [] if @set.blank?
+            solr_indexer = Valkyrie::IndexingAdapter.find(:solr_index)
+            solr_indexer.connection.delete_by_id @set[0].to_s, { softCommit: true }
+            solr_indexer.connection.commit
+          rescue
+            # if anything goes wrong, try to requeue the items
+            @set.each { |id, _time| connection.zadd(delete_error_name, Time.now.to_i, id) }
+          end
+        end
+
+        def list_index
+          connection.zrange(index_queue_name, 0, -1, with_scores: true)
+        end
+
+        def list_delete
+          connection.zrange(delete_queue_name, 0, -1, with_scores: true)
+        end
+
+        def list_index_errors
+          connection.zrange(index_error_name, 0, -1, with_scores: true)
+        end
+
+        def list_delete_errors
+          connection.zrange(delete_error_name, 0, -1, with_scores: true)
+        end
+
+        private
+
+        def persist(resources)
+          resources.map do |r|
+            connection.zadd(index_queue_name, Time.current.to_i, r.id.to_s)
+          end
+        end
+
+        def default_connection
+          Hyrax.config.redis_connection
+        end
+      end
+    end
+  end
+end

data/lib/wings/valkyrie/query_service.rb

@@ -63,11 +63,10 @@ module Wings
       #
       # @param model [Class]
       # @return [Array<Valkyrie::Resource>]
-      #
-      # @note Due to implementation details, .find_all_of_model and .count_all_of_model may not
-      #       return the same number of results.  Is that a bug?  Probably.
       def find_all_of_model(model:)
-        model_class_for(model).all.map do |obj|
+        ActiveFedora::Base
+          .where(has_model_ssim: [model_class_for(model).to_rdf_representation,
+                                  model.to_rdf_representation]).map do |obj|
           resource_factory.to_resource(object: obj)
         end
       end

data/template.rb

@@ -4,6 +4,6 @@ insert_into_file 'config/application.rb', after: /config\.load_defaults [0-9.]+$
   "\n    config.add_autoload_paths_to_load_path = true"
 end
 
-gem 'hyrax', '5.1.0-beta1'
+gem 'hyrax', '5.2.0'
 run 'bundle install'
 generate 'hyrax:install', '-f'