hyrax 5.0.5 → 5.1.0.pre.beta1

data/.koppie/config/environments/production.rb

@@ -26,8 +26,10 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = Uglifier.new(:harmony => true)
-  # config.assets.css_compressor = :sass
+  config.assets.configure do |env|
+    env.js_compressor = :uglifier
+    # env.css_compressor = :sass
+  end
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false

data/.koppie/config/environments/test.rb

@@ -43,7 +43,7 @@ Rails.application.configure do
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
 
   config.log_level = :warn
 end

data/.koppie/config/initializers/hyrax.rb

@@ -317,23 +317,26 @@ Qa::Authorities::Local.register_subauthority('subjects', 'Qa::Authorities::Local
 Qa::Authorities::Local.register_subauthority('languages', 'Qa::Authorities::Local::TableBasedAuthority')
 Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')
 
-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
 
+
 ActiveFedora.init(solr_config_path: Rails.root.join('config', 'solr.yml'))

data/.koppie/config/initializers/riiif.rb

@@ -35,32 +35,35 @@ end
 module Hyrax
   # Adds file locking to Riiif::File
   # @see RiiifFileResolver
-  class RiiifFile < Riiif::File
-    include ActiveSupport::Benchmarkable
-
-    attr_reader :id
-    def initialize(input_path, tempfile = nil, id:)
-      super(input_path, tempfile)
-      raise(ArgumentError, "must specify id") if id.blank?
-      @id = id
-    end
+  Rails.application.reloader.to_prepare do
+    class RiiifFile < Riiif::File
+      include ActiveSupport::Benchmarkable
+
+      attr_reader :id
+      def initialize(input_path, tempfile = nil, id:)
+        super(input_path, tempfile)
+        raise(ArgumentError, "must specify id") if id.blank?
+        @id = id
+      end
 
-    # Wrap extract in a read lock and benchmark it
-    def extract(transformation, image_info = nil)
-      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
-        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
-          super
+      # Wrap extract in a read lock and benchmark it
+      def extract(transformation, image_info = nil)
+        Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+          benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+            super
+          end
         end
       end
-    end
 
-    private
+      private
 
-    def logger
-      Hyrax.logger
+      def logger
+        Hyrax.logger
+      end
     end
   end
 
+
   class RiiifFileResolver
     include ActiveSupport::Benchmarkable
 

data/Dockerfile

@@ -1,5 +1,5 @@
-ARG ALPINE_VERSION=3.19
-ARG RUBY_VERSION=3.2.6
+ARG ALPINE_VERSION=3.21
+ARG RUBY_VERSION=3.3.6
 
 FROM ruby:$RUBY_VERSION-alpine$ALPINE_VERSION AS hyrax-base
 
@@ -7,6 +7,9 @@ ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
 ARG RUBYGEMS_VERSION=""
 
+RUN addgroup -S --gid 101 app && \
+  adduser -S -G app -u 1001 -s /bin/sh -h /app app
+
 RUN apk --no-cache upgrade && \
   apk --no-cache add acl \
   build-base \
@@ -32,8 +35,6 @@ RUN apk --no-cache upgrade && \
 RUN setfacl -d -m o::rwx /usr/local/bundle && \
   gem update --silent --system $RUBYGEMS_VERSION
 
-RUN addgroup -S --gid 101 app && \
-  adduser -S -G app -u 1001 -s /bin/sh -h /app app
 USER app
 
 RUN mkdir -p /app/samvera/hyrax-webapp
@@ -56,7 +57,7 @@ ARG BUNDLE_WITHOUT="development test"
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DATABASE_URL='nulldb://nulldb' bundle exec rake assets:precompile
 
 
 FROM hyrax-base AS hyrax-worker-base
@@ -88,7 +89,7 @@ ARG BUNDLE_WITHOUT="development test"
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
-ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DATABASE_URL='nulldb://nulldb' bundle exec rake assets:precompile
 
 
 FROM hyrax-worker-base AS hyrax-engine-dev

data/Gemfile

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

data/app/actors/hyrax/actors/add_to_work_actor.rb

@@ -69,7 +69,7 @@ module Hyrax
       end
 
       def add_permissions_error(work)
-        work.errors[:in_works_ids] << "Works can only be related to each other if user has ability to edit both."
+        work.errors.add(:in_works_ids, "Works can only be related to each other if user has ability to edit both.")
       end
     end
   end

data/app/actors/hyrax/actors/apply_order_actor.rb

@@ -41,7 +41,7 @@ module Hyrax
             env.curation_concern.ordered_members << work
             env.curation_concern.save!
           else
-            env.curation_concern.errors[:ordered_member_ids] << "Works can only be related to each other if user has ability to edit both."
+            env.curation_concern.errors.add(:ordered_member_ids, "Works can only be related to each other if user has ability to edit both.")
           end
         end
       end

data/app/assets/stylesheets/hyrax/_tinymce.scss

@@ -12,3 +12,9 @@
 .home_marketing_text #content_block_external_key {
   color: black;
 }
+
+// Prevents text from being clipped in Tiny MCE bottom status bar and drop-down style menu (Issue #6789)
+.tox .tox-statusbar { overflow: visible !important; }
+.tox .tox-tbtn--bespoke .tox-tbtn__select-label { overflow: visible !important; }
+.tox .tox-tbtn { overflow: visible !important; }
+.tox-tinymce { overflow: visible !important; }

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

@@ -102,7 +102,6 @@ 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

@@ -360,6 +360,7 @@ module Hyrax
       # that they have not removed from the upload widget.
       uploaded_files = params.fetch(:uploaded_files, [])
       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)
-          # 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
+
+          @pageviews = Hyrax::Analytics.daily_events('work-view'), @downloads = Hyrax::Analytics.daily_events('file-set-download') if current_user.ability.admin?
+
           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/admin/permission_template_accesses_controller.rb

@@ -21,14 +21,14 @@ module Hyrax
 
       def after_destroy_error
         if source.admin_set?
-          @permission_template_access.errors[:base] <<
-            t('hyrax.admin.admin_sets.form.permission_destroy_errors.participants')
+          @permission_template_access.errors.add(:base,
+            t('hyrax.admin.admin_sets.form.permission_destroy_errors.participants'))
           redirect_to hyrax.edit_admin_admin_set_path(source_id,
                                                       anchor: 'participants'),
                       alert: @permission_template_access.errors.full_messages.to_sentence
         else
-          @permission_template_access.errors[:base] <<
-            t('hyrax.dashboard.collections.form.permission_update_errors.sharing')
+          @permission_template_access.errors.add(:base,
+            t('hyrax.dashboard.collections.form.permission_update_errors.sharing'))
           redirect_to hyrax.edit_dashboard_collection_path(source_id,
                                                            anchor: 'sharing'),
                       alert: @permission_template_access.errors.full_messages.to_sentence

data/app/controllers/hyrax/api/zotero_controller.rb

@@ -14,7 +14,7 @@ module Hyrax
         session[:request_token] = request_token
         current_user.zotero_token = request_token
         current_user.save
-        redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url)
+        redirect_to request_token.authorize_url(identity: '1', oauth_callback: callback_url), allow_other_host: true
       rescue OAuth::Unauthorized
         redirect_to root_url, alert: 'Invalid Zotero client key pair'
       end

data/app/jobs/migrate_files_to_valkyrie_job.rb

@@ -2,11 +2,6 @@
 # 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]
@@ -38,7 +33,6 @@ 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 }
@@ -56,33 +50,27 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
 
     files = Hyrax.custom_queries.find_many_file_metadata_by_ids(ids: resource.file_ids)
     files.each do |file|
-      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)
+      # 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)
-        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"))
+        # 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
     end
     # reindex the file set after migrating files to include characterization info
@@ -105,9 +93,9 @@ class MigrateFilesToValkyrieJob < Hyrax::ApplicationJob
   #
   # @param filename [String] the name of the derivative file: i.e. 'x-thumbnail.jpg'
   # @return [String]
-  def container_for(path)
+  def container_for(filename)
     # we want the portion between the '-' and the '.'
-    file_blob = File.basename(path, '.*').split('-').last
+    file_blob = File.basename(filename, '.*').split('-').last
 
     case file_blob
     when 'thumbnail'

data/app/models/admin_set.rb

@@ -105,13 +105,13 @@ class AdminSet < ActiveFedora::Base
 
   def check_if_empty
     return true if members.empty?
-    errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_not_empty')
+    errors.add(:base, I18n.t('hyrax.admin.admin_sets.delete.error_not_empty'))
     throw :abort
   end
 
   def check_if_not_default_set
     return true unless Hyrax::AdminSetCreateService.default_admin_set?(id: id)
-    errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_default_set')
+    errors.add(:base, I18n.t('hyrax.admin.admin_sets.delete.error_default_set'))
     throw :abort
   end
 end

data/app/models/concerns/hyrax/permissions/writable.rb

@@ -23,8 +23,7 @@ module Hyrax
         valid = true
         paranoid_edit_permissions.each do |validation|
           next unless validation[:condition].call(self)
-          errors[validation[:key]] ||= []
-          errors[validation[:key]] << validation[:message]
+          errors.add(validation[:key], validation[:message])
           valid = false
         end
         valid

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

@@ -82,12 +82,9 @@ 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
-      # 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
+      model = (first('has_model_ssim')&.+ 'Resource')&.safe_constantize if Hyrax.config.valkyrie_transition?
+      model || model_classifier(classifier).classifier(self).best_model
     end
 
     def depositor(default = '')

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

@@ -22,6 +22,7 @@ module Hyrax
         instance_variables.each do |ivar|
           next if ivar == :@name
           next if ivar == :@klass
+          next if ivar == :@uncountable
           instance_variable_set(ivar, legacy_model.model_name.send(ivar[1..-1]))
         end
       end

data/app/models/hyrax/collection_type.rb

@@ -163,26 +163,26 @@ module Hyrax
 
     def ensure_no_collections
       return true unless collections?
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.not_empty')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.not_empty'))
       throw :abort
     end
 
     def ensure_no_settings_changes_for_admin_set_type
       return true unless admin_set? && collection_type_settings_changed? && exists_for_machine_id?(ADMIN_SET_MACHINE_ID)
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_admin_sets')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_admin_sets'))
       throw :abort
     end
 
     def ensure_no_settings_changes_for_user_collection_type
       return true unless user_collection? && collection_type_settings_changed? && exists_for_machine_id?(USER_COLLECTION_MACHINE_ID)
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_user_collections')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_for_user_collections'))
       throw :abort
     end
 
     def ensure_no_settings_changes_if_collections_exist
       return true unless collections?
       return true unless collection_type_settings_changed?
-      errors[:base] << I18n.t('hyrax.admin.collection_types.errors.no_settings_change_if_not_empty')
+      errors.add(:base, I18n.t('hyrax.admin.collection_types.errors.no_settings_change_if_not_empty'))
       throw :abort
     end
 

data/app/models/hyrax/file_metadata.rb

@@ -44,31 +44,16 @@ module Hyrax
 
       # @return [Array<RDF::URI>] list of all uses
       def use_list
-        [
-          EXTRACTED_TEXT,
-          INTERMEDIATE_FILE,
-          ORIGINAL_FILE,
-          PRESERVATION_FILE,
-          SERVICE_FILE,
-          THUMBNAIL_IMAGE,
-          TRANSCRIPT
-        ]
+        [ORIGINAL_FILE,
+         THUMBNAIL_IMAGE,
+         EXTRACTED_TEXT,
+         INTERMEDIATE_FILE,
+         PRESERVATION_FILE,
+         SERVICE_FILE,
+         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/models/single_use_link.rb

@@ -31,7 +31,7 @@ class SingleUseLink < ActiveRecord::Base
   end
 
   def cannot_be_destroyed
-    errors[:base] << "Single Use Link has already been used" if destroyed?
+    errors.add(:base, "Single Use Link has already been used") if destroyed?
   end
 
   def set_defaults

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

data/app/services/hyrax/listeners.rb

@@ -20,6 +20,7 @@ module Hyrax
     autoload :ACLIndexListener
     autoload :ActiveFedoraACLIndexListener
     autoload :BatchNotificationListener
+    autoload :FileListener
     autoload :FileMetadataListener
     autoload :FileSetLifecycleListener
     autoload :FileSetLifecycleNotificationListener

data/app/services/hyrax/statistics/term_query.rb

@@ -59,7 +59,7 @@ module Hyrax
         end
 
         # Allows us to create a Flot charts pie-graph
-        def as_json(opts)
+        def as_json(opts = nil)
           @data.as_json(opts)
         end
       end

data/app/services/hyrax/workflow.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module Hyrax
+  module Workflow
+    extend ActiveSupport::Autoload
+
+    autoload :WorkflowFactory
+  end
+end

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/validators/hyrax/has_one_title_validator.rb

@@ -4,7 +4,7 @@ module Hyrax
   class HasOneTitleValidator < ActiveModel::Validator
     def validate(record)
       return unless record.title.reject(&:empty?).empty?
-      record.errors[:title] << "You must provide a title"
+      record.errors.add(:title, "You must provide a title")
     end
   end
 end

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,11 +41,15 @@
       </tbody>
     </table>
   </div>
-
+  
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @top_collections, outer_window: 2, theme: 'blacklight' %>
+      <%= paginate @top_collections %>
     </div>
   </div>
 
 </div>
+
+
+
+

data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb

@@ -14,8 +14,8 @@
       <tbody>
           <% @top_file_set_downloads.each do |download| %>
             <tr>
-              <td><%= download[1] %></td>
-              <td><%= download[0] %></td>
+              <td><%= download[1] %></td> 
+              <td><%= download[0] %></td>  
               <td><%= download[2] %></td>
             </tr>
           <% end %>
@@ -24,7 +24,10 @@
   </div>
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @top_file_set_downloads, outer_window: 2, theme: 'blacklight' %>
+     <%= paginate @top_file_set_downloads %> 
     </div>
   </div>
 </div>
+ 
+
+

data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb

@@ -24,15 +24,16 @@
               <td><%= work[0] %></td>
               <td><%= work[2] %></td>
               <td><%= work[3] %></td>
-            </tr>
+            </tr>       
         <% end %>
       </tbody>
     </table>
   </div>
+  
 
   <div class="card-footer">
     <div class="float-right">
-      <%= paginate @top_works, outer_window: 2, theme: 'blacklight' %>
+      <%= paginate @top_works %>
     </div>
   </div>