hyrax 5.1.0 → 5.2.0

data/CONTAINERS.md

@@ -53,7 +53,7 @@ With `docker compose up` running, any changes you make to your cloned Hyrax code
 Any changes you make to Hyrax should be tested. You can run the full test suite using the following command:
 
 ```sh
-docker compose exec -w /app/samvera/hyrax-engine app sh -c "bundle exec rspec"
+docker compose exec -w /app/samvera/hyrax-engine web sh -c "bundle exec rspec"
 ```
 
 Let's break down the above command:
@@ -63,8 +63,8 @@ Let's break down the above command:
 <dd>Tell docker to run the following:</dd>
 <dt><code>-w /app/samvera/hyrax-engine</code></dt>
 <dd>In the working directory "/app/samvera/hyrax-engine" (e.g. your cloned Hyrax repository)</dd>
-<dt><code>app</code></dt>
-<dd>of the container named "app"</dd>
+<dt><code>web</code></dt>
+<dd>of the container named "web"</dd>
 <dt><code>sh -c</code>
 <dd>run the following shell script</dd>
 <dt><code>"bundle exec rspec"</code></dt>
@@ -73,26 +73,26 @@ Let's break down the above command:
 
 _**Note:**_ The `bundle exec rspec` portion of the command runs the whole test suite. See the [rspec command documentation](https://github.com/rspec/rspec-core#the-rspec-command) for how to refine your test runs.
 
-#### The Docker Container Named "app"
+#### The Docker Container Named "web"
 
 As a developer, you may need to run commands against the Hyrax-based application and/or the Hyrax engine.  Examples
 of those commands are `rails db:migrate` and `rspec`.  You would run `rails db:migrate` on the Hyrax-based
 application, and `rspec` on the Hyrax engine.
 
-In the engine development `app` container, the `.dassie` test Hyrax-based application is setup as a docker
+In the engine development `web` container, the `.dassie` test Hyrax-based application is setup as a docker
 bind mount to `/app/samvera/hyrax-webapp`, and your local development copy of Hyrax (eg. the clone [samvera/hyrax](https://github.com/samvera/hyrax)) is bound to
 `/app/samvera/hyrax-engine`.  Those directories are defined as part of the [Dockerfile](Dockerfile) configuration.
                                                                                                                                  .
 What does this structure mean? Let's look at an example. The following command will list the rake tasks for the Hyrax-based application running in Docker:
 
 ```sh
-docker compose exec -w /app/samvera/hyrax-webapp app sh -c "bundle exec rake -T"
+docker compose exec -w /app/samvera/hyrax-webapp web sh -c "bundle exec rake -T"
 ```
 
 And this command lists the rake tasks for the Hyrax engine that is in Docker:
 
 ```sh
-docker compose exec -w /app/samvera/hyrax-engine app sh -c "bundle exec rake -T"
+docker compose exec -w /app/samvera/hyrax-engine web sh -c "bundle exec rake -T"
 ```
 
 In the two examples, note the difference in the `-w` switch. In the first case, it's referencing the Hyrax-based application. In the latter case, it's referencing the Hyrax engine.
@@ -165,13 +165,13 @@ Currently Koppie should not be used for running specs. See [Code Changes and Tes
 
 ```sh
 docker compose -f docker-compose-koppie.yml up
-docker compose -f docker-compose-koppie.yml exec app bundle exec rails c
+docker compose -f docker-compose-koppie.yml exec web bundle exec rails c
 ```
 #### Troubleshooting Koppie
 
 If the postgres service logs show permissions errors, there may be old data from alternate versions of the postgres image. The old data volumes can deleted by using `docker compose -f docker-compose-koppie.yml down -v`
 
-Errors such as `exec /app/samvera/hyrax-entrypoint.sh: no such file or directory` in the app, sidekiq and db_migrate services may indicate an outdated cached hyrax-base image layer was used to build the koppie image. Try `docker compose -f docker-compose-koppie.yml build --no-cache`  to rebuild all the image layers.
+Errors such as `exec /app/samvera/hyrax-entrypoint.sh: no such file or directory` in the web, sidekiq and db_migrate services may indicate an outdated cached hyrax-base image layer was used to build the koppie image. Try `docker compose -f docker-compose-koppie.yml build --no-cache`  to rebuild all the image layers.
 
 It was also seen on a Windows 10 host and was resolved by using the git `--core.autocrlf` option when cloning the repo.
 
@@ -217,7 +217,7 @@ Currently Sirenia should not be used for running specs. See [Code Changes and Te
 
 ```sh
 docker compose -f docker-compose-sirenia.yml up
-docker compose -f docker-compose-sirenia.yml exec app bundle exec rails c
+docker compose -f docker-compose-sirenia.yml exec web bundle exec rails c
 ```
 
 ### Maintaining

data/Gemfile

@@ -20,5 +20,6 @@ group :development, :test do
   gem 'rspec'
   gem 'ruby-prof', require: false
   gem 'semaphore_test_boosters'
-  gem "simplecov", require: false
+  gem 'simplecov', require: false
+  gem 'timecop'
 end

data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb

@@ -102,6 +102,7 @@ module Hyrax
     def find_file_metadata(file_set:, use: :original_file, mime_type: nil)
       if mime_type.nil?
         use = :thumbnail_file if use == :thumbnail
+        use = :original_file unless Hyrax::FileMetadata::Use.keys.include?(use)
         use = Hyrax::FileMetadata::Use.uri_for(use: use)
         results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
       else

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -359,8 +359,9 @@ module Hyrax
       # intersection, we get the files they added via BrowseEverything
       # that they have not removed from the upload widget.
       uploaded_files = params.fetch(:uploaded_files, [])
+      params.permit(selected_files: [:expires, :file_name, :url])
       selected_files = params.fetch(:selected_files, {}).values
-                             .map { |f| f.permit(:expires, :file_name, :url, {}) }
+
       browse_everything_urls = uploaded_files &
                                selected_files.map { |f| f[:url] }
 

data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb

@@ -14,9 +14,9 @@ module Hyrax
           @works_count = @accessible_works.count
           @top_works = paginate(top_works_list, rows: 10)
           @top_file_set_downloads = paginate(top_files_list, rows: 10)
-
-          @pageviews = Hyrax::Analytics.daily_events('work-view'), @downloads = Hyrax::Analytics.daily_events('file-set-download') if current_user.ability.admin?
-
+          # rubocop:disable Style/ParallelAssignment
+          @pageviews, @downloads = Hyrax::Analytics.daily_events('work-view'), Hyrax::Analytics.daily_events('file-set-download') if current_user.ability.admin?
+          # rubocop:enable Style/ParallelAssignment
           respond_to do |format|
             format.html
             format.csv { export_data }
@@ -34,7 +34,7 @@ module Hyrax
           end
         end
 
-  private
+        private
 
         def accessible_works
           models = Hyrax::ModelRegistry.work_rdf_representations.map { |m| "\"#{m}\"" }

data/app/controllers/hyrax/file_sets_controller.rb

@@ -167,7 +167,7 @@ module Hyrax
       return unless @file_set.class == ::FileSet
       # We can tell if a Hyrax::FileSet was improperly cast because this AF method will
       # return nil since its parent is not a ActiveFedora work.
-      @file_set = @file_set.valkyrie_resource if @file_set.parent&.id.nil?
+      @file_set = @file_set.valkyrie_resource if @file_set.respond_to?(:parent) && @file_set.parent&.id.nil?
     end
 
     def parent(file_set: curation_concern)

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -68,10 +68,10 @@ module Hyrax
       mailbox = UserMailbox.new(user)
       unread_notifications = mailbox.unread_count
       link_to(hyrax.notifications_path,
-              'aria-label' => mailbox.label(params[:locale]),
+              'aria-description' => mailbox.label(params[:locale]),
               class: 'notify-number nav-link') do
         capture do
-          concat tag.span('', class: 'fa fa-bell')
+          concat tag.span('', class: 'fa fa-bell', 'aria-label': t('hyrax.admin.sidebar.notifications'))
           concat "\n"
           concat tag.span(unread_notifications,
                              class: count_classes_for(unread_notifications))

data/app/helpers/hyrax/trophy_helper.rb

@@ -15,7 +15,7 @@ module Hyrax
       args[:data]['remove-text'] = args[:remove_text]
 
       args[:data][:url] = hyrax.trophy_work_path(id)
-      link_to '#', id: 'action-highlight-work', class: args[:class], data: args[:data] do
+      link_to '#', id: 'action-highlight-work', role: args[:role], class: args[:class], data: args[:data] do
         yield(text)
       end
     end

data/app/jobs/concerns/hyrax/queued_job_behavior.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Hyrax
+  # Grants the user's edit access on the provided FileSet
+  module QueuedJobBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      queue_as Hyrax.config.ingest_queue_name
+      cattr_accessor :requeue_frequency
+    end
+
+    private
+
+    def redis_queue
+      Valkyrie::IndexingAdapter.find(:redis_queue)
+    end
+
+    def requeue(**args)
+      self.class.set(wait_until: (self.class.requeue_frequency || 5.minutes).from_now).perform_later(**args)
+    end
+  end
+end

data/app/jobs/hyrax/propagate_change_depositor_job.rb

@@ -26,7 +26,7 @@ module Hyrax
     def apply_depositor_metadata(resource, depositor)
       depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
       resource.depositor = depositor_id if resource.respond_to? :depositor=
-      Hyrax::AccessControlList.new(resource: resource).grant(:edit).to(::User.find_by_user_key(depositor_id)).save
+      resource.permission_manager.acl.grant(:edit).to(::User.find_by_user_key(depositor_id)).save
     end
   end
 end

data/app/jobs/hyrax/queued_delete_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Hyrax
+  class QueuedDeleteJob < ApplicationJob
+    include QueuedJobBehavior
+
+    def perform(size: 200)
+      redis_queue.delete_queue(size: size)
+      requeue(size: size)
+    end
+  end
+end

data/app/jobs/hyrax/queued_indexing_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Hyrax
+  class QueuedIndexingJob < ApplicationJob
+    include QueuedJobBehavior
+
+    def perform(size: 200)
+      redis_queue.index_queue(size: size)
+      requeue(size: size)
+    end
+  end
+end

data/app/jobs/migrate_files_to_valkyrie_job.rb

@@ -2,6 +2,11 @@
 # Responsible for conditionally enqueuing the file and thumbnail migration
 # logic of an ActiveFedora object.
 class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
+  # Define a logger for this job
+  def logger
+    FileUtils.mkdir_p(Hyrax.config.working_path)
+    @logger ||= Logger.new(Hyrax.config.working_path.join('migrate_files_to_valkyrie_job.log'))
+  end
   ##
   #
   # @param resource [Hyrax::FileSet]
@@ -33,6 +38,7 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
     # @todo should we trigger a job if the member is a child work?
     paths = Hyrax::DerivativePath.derivatives_for_reference(resource)
     paths.each do |path|
+      next unless File.size?(path) # skip blank files
       container = container_for(path)
       mime_type = Marcel::MimeType.for(extension: File.extname(path))
       directives = { url: path, container: container, mime_type: mime_type }
@@ -50,27 +56,33 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
 
     files = Hyrax.custom_queries.find_many_file_metadata_by_ids(ids: resource.file_ids)
     files.each do |file|
-      # If it doesn't start with fedora, we've likely already migrated it.
-      next unless /^fedora:/.match?(file.file_identifier.to_s)
-      resource.file_ids.delete(file.id)
+      begin
+        # If it doesn't start with fedora, we've likely already migrated it.
+        next unless /^fedora:/.match?(file.file_identifier.to_s)
+        resource.file_ids.delete(file.id)
 
-      Tempfile.create do |tempfile|
-        tempfile.binmode
-        tempfile.write(URI.open(file.file_identifier.to_s.gsub("fedora:", "http:")).read)
-        tempfile.rewind
+        Tempfile.create do |tempfile|
+          tempfile.binmode
+          tempfile.write(URI.open(file.file_identifier.to_s.gsub("fedora:", "http:")).read)
+          tempfile.rewind
 
-        # valkyrie_file = Hyrax.storage_adapter.upload(resource: resource, file: tempfile, original_filename: file.original_filename)
-        valkyrie_file = Hyrax::ValkyrieUpload.file(
-          filename: resource.label,
-          file_set: resource,
-          io: tempfile,
-          use: file.pcdm_use.select {|use| Hyrax::FileMetadata::Use.use_list.include?(use)},
-          user: User.find_or_initialize_by(User.user_key_field => resource.depositor),
-          mime_type: file.mime_type,
-          skip_derivatives: true
-        )
-        valkyrie_file = copy_attributes(valkyrie_file:, original_file: file)
-        Hyrax.persister.save(resource: valkyrie_file)
+          # valkyrie_file = Hyrax.storage_adapter.upload(resource: resource, file: tempfile, original_filename: file.original_filename)
+          valkyrie_file = Hyrax::ValkyrieUpload.file(
+            filename: resource.label,
+            file_set: resource,
+            io: tempfile,
+            use: file.pcdm_use.select {|use| Hyrax::FileMetadata::Use.use_list.include?(use)},
+            user: User.find_or_initialize_by(User.user_key_field => resource.depositor),
+            mime_type: file.mime_type,
+            skip_derivatives: true
+          )
+          valkyrie_file = copy_attributes(valkyrie_file:, original_file: file)
+          Hyrax.persister.save(resource: valkyrie_file)
+        end
+      rescue StandardError => e
+        # Log errors specific to file migration
+        logger.error("Error migrating file #{file.id} for resource #{resource.id}: #{e.message}")
+        logger.error(e.backtrace.join("\n"))
       end
     end
     # reindex the file set after migrating files to include characterization info
@@ -93,9 +105,9 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
   #
   # @param filename [String] the name of the derivative file: i.e. 'x-thumbnail.jpg'
   # @return [String]
-  def container_for(filename)
+  def container_for(path)
     # we want the portion between the '-' and the '.'
-    file_blob = File.basename(filename, '.*').split('-').last
+    file_blob = File.basename(path, '.*').split('-').last
 
     case file_blob
     when 'thumbnail'

data/app/jobs/migrate_sipity_entity_job.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# migrates a resource's sipity entity so it can be found
+class MigrateSipityEntityJob < ApplicationJob
+  # input [String] id of a migrated resource
+  def perform(id:)
+    resource = Hyrax.query_service.find_by(id: id)
+    new_gid = Hyrax::GlobalID(resource).to_s
+    return if Sipity::Entity.find_by(proxy_for_global_id: new_gid)
+
+    work = resource.internal_resource.constantize.find(id)
+    original_gid = Hyrax::GlobalID(work).to_s
+    return if new_gid == original_gid
+    original_entity = Sipity::Entity.find_by(proxy_for_global_id: original_gid)
+    return if original_entity.nil?
+    original_entity.update(proxy_for_global_id: new_gid)
+  rescue ActiveFedora::ObjectNotFoundError
+    # this happens when the resource was never in Fedora so there is nothing to migrate.
+    # We don't want to retry the job so we don't raise an error.
+  end
+end

data/app/models/concerns/hyrax/ability.rb

@@ -404,8 +404,10 @@ module Hyrax
                                     .select(:source_id)
                                     .distinct
                                     .pluck(:source_id)
-
-      Hyrax.custom_queries.find_ids_by_model(model: Hyrax::AdministrativeSet, ids: ids).any?
+      return false if ids.empty?
+      Hyrax::SolrQueryService.new.with_ids(ids: ids).query_result(rows: 1000)['response']['docs'].any? do |doc|
+        (Hyrax::ModelRegistry.admin_set_rdf_representations & doc['has_model_ssim']).present?
+      end
     end
 
     def registered_user?

data/app/models/concerns/hyrax/solr_document_behavior.rb

@@ -82,9 +82,12 @@ module Hyrax
 
     # Method to return the model
     def hydra_model(classifier: nil)
+      # finds the model from the solr document
       model = first('has_model_ssim')&.safe_constantize
-      model = (first('has_model_ssim')&.+ 'Resource')&.safe_constantize if Hyrax.config.valkyrie_transition?
-      model || model_classifier(classifier).classifier(self).best_model
+      # this returns nil if it isn't a valid model
+      resource_model = (first('has_model_ssim')&.+ 'Resource')&.safe_constantize if Hyrax.config.valkyrie_transition?
+      # if valkyrie_transition is enabled, we generally want to use the resource model if it exists
+      resource_model || model || model_classifier(classifier).classifier(self).best_model
     end
 
     def depositor(default = '')

data/app/models/hyrax/file_metadata.rb

@@ -44,16 +44,31 @@ module Hyrax
 
       # @return [Array<RDF::URI>] list of all uses
       def use_list
-        [ORIGINAL_FILE,
-         THUMBNAIL_IMAGE,
-         EXTRACTED_TEXT,
-         INTERMEDIATE_FILE,
-         PRESERVATION_FILE,
-         SERVICE_FILE,
-         TRANSCRIPT]
+        [
+          EXTRACTED_TEXT,
+          INTERMEDIATE_FILE,
+          ORIGINAL_FILE,
+          PRESERVATION_FILE,
+          SERVICE_FILE,
+          THUMBNAIL_IMAGE,
+          TRANSCRIPT
+        ]
       end
       module_function :use_list
 
+      def keys
+        [
+          :extracted_file,
+          :intermediate_file,
+          :original_file,
+          :preservation_file,
+          :service_file,
+          :thumbnail_file,
+          :transcript_file
+        ]
+      end
+      module_function :keys
+
       ##
       # @param use [RDF::URI, Symbol]
       #

data/app/services/hyrax/analytics/ga4/base.rb

@@ -88,7 +88,7 @@ module Hyrax
         end
 
         def unwrap_metric(metric)
-          metric.metric_values.first.value.to_i
+          metric&.metric_values&.first&.value.to_i
         end
       end
     end

data/app/services/hyrax/analytics/ga4.rb

@@ -76,7 +76,11 @@ module Hyrax
           end
 
           def account_info
-            @account_info ||= JSON.parse(account_json_string)
+            @account_info ||= if account_json_string.is_a? Hash
+                                account_json_string
+                              else
+                                JSON.parse(account_json_string)
+                              end
           end
 
           KEYS.each do |key|

data/app/services/hyrax/change_depositor_service.rb

@@ -63,7 +63,7 @@ module Hyrax
     def self.apply_depositor_metadata(resource, depositor)
       depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
       resource.depositor = depositor_id if resource.respond_to? :depositor=
-      Hyrax::AccessControlList.new(resource: resource).grant(:edit).to(::User.find_by_user_key(depositor_id)).save
+      resource.permission_manager.acl.grant(:edit).to(::User.find_by_user_key(depositor_id)).save
     end
     private_class_method :apply_depositor_metadata
   end

data/app/services/hyrax/characterization/valkyrie_characterization_service.rb

@@ -107,13 +107,19 @@ class Hyrax::Characterization::ValkyrieCharacterizationService
   end
 
   # Assign values of the instance properties from the metadata mapping :prop => val
+  # @todo push exceptional per-property behavior into the mapping somehow?
   # @return [Hash]
   def apply_metadata(terms)
-    terms.each_pair do |term, value|
-      property = property_for(term)
-      next if property.nil?
-
-      Array(value).each { |v| append_property_value(property, v) }
+    values_by_property(terms).each do |property, values|
+      value = if property == :mime_type
+                values.last
+              elsif [:height, :width].include?(property)
+                # keep only the max height or width
+                values.map(&:to_i).max.to_s
+              else
+                values
+              end
+      metadata.public_send("#{property}=", value)
     end
   end
 
@@ -127,13 +133,15 @@ class Hyrax::Characterization::ValkyrieCharacterizationService
     end
   end
 
-  ##
-  # @todo push exceptional per-property behavior into the mapping somehow?
-  def append_property_value(property, value)
-    # We don't want multiple mime_types; this overwrites each time to accept last value
-    value = Array(metadata.public_send(property)) + [value] unless property == :mime_type
-    # We don't want multiple heights / widths, pick the max
-    value = value.map(&:to_i).max.to_s if property == :height || property == :width
-    metadata.public_send("#{property}=", value)
+  # Map each term to the corresponding property
+  # (multiple terms can map to the same property),
+  # and gather all values for each property
+  # @return [Hash]
+  def values_by_property(terms)
+    terms.each_with_object({}) do |(term, value), property_values|
+      next unless (property = property_for(term))
+
+      (property_values[property] ||= []).concat(Array(value))
+    end
   end
 end

data/app/services/hyrax/custom_queries/find_ids_by_model.rb

@@ -8,8 +8,9 @@ module Hyrax
         [:find_ids_by_model]
       end
 
-      def initialize(query_service:)
+      def initialize(query_service:, query_rows: 1_000)
         @query_service = query_service
+        @query_rows = query_rows
       end
 
       attr_reader :query_service
@@ -23,14 +24,38 @@ module Hyrax
       #
       # @param model [Class]
       # @param ids [Enumerable<#to_s>, Symbol]
+      # @param use_solr [Boolean]
       #
       # @return [Enumerable<Valkyrie::ID>]
-      def find_ids_by_model(model:, ids: :all)
-        return query_service.find_all_of_model(model: model).map(&:id) if ids == :all
+      def find_ids_by_model(model:, ids: :all, use_solr: true)
+        if use_solr
+          query_solr(model, ids)
+        else
+          return query_service.find_all_of_model(model: model).map(&:id) if ids == :all
+          query_service.find_many_by_ids(ids: ids).select do |resource|
+            resource.is_a?(model)
+          end.map(&:id)
+        end
+      end
+
+      private
+
+      def query_solr(model, ids)
+        return enum_for(:query_solr, model, ids) unless block_given?
+        model_name = Hyrax::ModelRegistry.rdf_representations_from(Array(model)).first
+
+        solr_query = "_query_:\"{!raw f=has_model_ssim}#{model_name}\""
+        solr_response = Hyrax::SolrService.get(solr_query, fl: 'id', rows: @query_rows)['response']
+
+        loop do
+          response_docs = solr_response['docs']
+          response_docs.select! { |doc| ids.include?(doc['id']) } unless ids == :all
+
+          response_docs.each { |doc| yield doc['id'] }
 
-        query_service.find_many_by_ids(ids: ids).select do |resource|
-          resource.is_a?(model)
-        end.map(&:id)
+          break if (solr_response['start'] + solr_response['docs'].count) >= solr_response['numFound']
+          solr_response = Hyrax::SolrService.get(solr_query, fl: 'id', rows: @query_rows, start: solr_response['start'] + @query_rows)['response']
+        end
       end
     end
   end

data/app/services/hyrax/edit_permissions_service.rb

@@ -33,23 +33,24 @@ module Hyrax
     #    * use work the file_set is in
     #    No other object types are supported by this view.
     def self.build_service_object_from(form:, ability:)
-      if form.object.respond_to?(:model) && form.object.model.work?
+      obj = form.object
+      if obj.respond_to?(:model) && obj.model.work?
         # The provided form object is a work form.
-        new(object: form.object, ability: ability)
-      elsif form.object.respond_to?(:model) && form.object.model.file_set?
+        new(object: obj, ability: ability)
+      elsif obj.respond_to?(:model) && obj.model.file_set?
         # The provided form object is a FileSet form. For Valkyrie forms
         # (+Hyrax::Forms::FileSetForm+), +:in_works_ids+ is prepopulated onto
         # the form object itself. For +Hyrax::Forms::FileSetEditForm+, the
         # +:in_works+ method is present on the wrapped +:model+.
-        if form.object.is_a?(Hyrax::Forms::FileSetForm)
-          object_id = form.object.in_works_ids.first
+        if obj.is_a?(Hyrax.config.file_set_form)
+          object_id = obj.in_works_ids.first
           new(object: Hyrax.query_service.find_by(id: object_id), ability: ability)
         else
-          new(object: form.object.model.in_works.first, ability: ability)
+          new(object: obj.model.in_works.first, ability: ability)
         end
-      elsif form.object.file_set?
+      elsif obj.file_set?
         # The provided form object is a FileSet.
-        new(object: form.object.in_works.first, ability: ability)
+        new(object: obj.in_works.first, ability: ability)
       end
     end
 

data/app/services/hyrax/workflow/workflow_factory.rb

@@ -50,9 +50,9 @@ module Hyrax
       private
 
       def create_workflow_entity!
-        Sipity::Entity.create!(proxy_for_global_id: Hyrax::GlobalID(work).to_s,
-                               workflow: workflow_for(work),
-                               workflow_state: nil)
+        Sipity::Entity.find_or_create_by!(proxy_for_global_id: Hyrax::GlobalID(work).to_s,
+                                          workflow: workflow_for(work),
+                                          workflow_state: nil)
       end
 
       def assign_specific_roles_to(entity:)

data/app/services/migrate_resource_service.rb

@@ -8,7 +8,7 @@ class MigrateResourceService
   end
 
   def model
-    @model || Wings::ModelRegistry.lookup(resource.class).to_s
+    @model ||= Wings::ModelRegistry.lookup(resource.class).to_s
   end
 
   def call

data/app/views/_user_util_links.html.erb

@@ -14,7 +14,8 @@
         <%= link_to "My Profile", hyrax.dashboard_profile_path(current_user), class: 'dropdown-item' %>
         <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path, class: "dropdown-item" %>
         <div class="dropdown-divider"></div>
-        <%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path, class: "dropdown-item" %>
+        <%= button_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path, class: "dropdown-item",
+                      method: ::Devise.sign_out_via %>
       </div>
     </li>
   <% else %>

data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb

@@ -1,5 +1,5 @@
 <div class="card">
-  
+
   <div class="card-header">
     <h4><%= t('.top_collections') %>
     <div class="btn-group float-right">
@@ -41,15 +41,11 @@
       </tbody>
     </table>
   </div>
-  
+
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @top_collections %>
+      <%= paginate @top_collections, outer_window: 2, theme: 'blacklight' %>
     </div>
   </div>
 
 </div>
-
-
-
-