hyrax 5.0.0 → 5.0.3

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

@@ -25,30 +25,13 @@ module Hyrax
       # @param models [Array]
       # @param start_datetime [DateTime]
       # @param end_datetime [DateTime]
+      # @return [Array<Hyrax::Resource>]
       def find_by_date_range(start_datetime:, end_datetime: nil, models: nil)
-        end_datetime = 1.second.since(Time.zone.now) if end_datetime.blank?
-        if models.present?
-          query_service.run_query(find_models_by_date_range_query, start_datetime.to_s, end_datetime.to_s, models)
-        else
-          query_service.run_query(find_by_date_range_query, start_datetime.to_s, end_datetime.to_s)
-        end
-      end
-
-      def find_models_by_date_range_query
-        <<-SQL
-          SELECT * FROM orm_resources
-          WHERE created_at >= ?
-          AND created_at <= ?
-          AND internal_resource IN (?);
-        SQL
-      end
-
-      def find_by_date_range_query
-        <<-SQL
-          SELECT * FROM orm_resources
-          WHERE created_at >= ?
-          AND created_at <= ?;
-        SQL
+        end_range = end_datetime.blank? ? '*' : end_datetime.utc.xmlschema
+        query = "system_create_dtsi:[#{start_datetime.utc.xmlschema} TO #{end_range}]"
+        query += " AND has_model_ssim: (#{models.map { |m| "\"#{m}\"" }.join(' OR ')})" unless models.empty?
+        ids = Hyrax::SolrService.query_result(query, fl: 'id')['response']['docs'].map { |doc| doc['id'] }
+        Hyrax.query_service.find_many_by_ids(ids: ids)
       end
     end
   end

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

@@ -28,9 +28,9 @@ module Hyrax
       # @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:, model: Hyrax.config.collection_class)
         query_service
-          .find_all_of_model(model: Hyrax.config.collection_model.safe_constantize)
+          .find_all_of_model(model:)
           .select { |collection| collection.collection_type_gid == global_id }
       end
     end

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

@@ -25,37 +25,9 @@ module Hyrax
       # @param hash [Hash] the hash representation of the query
       def find_count_by(hash = {}, models: nil)
         return nil if models.empty? && hash.blank?
-
-        internal_array = ["{ #{hash.map { |k, v| "\"#{k}\": #{v}" }.join(', ')} }"] if hash.present?
-        if models.empty?
-          query_service.orm_class.count_by_sql(([find_count_by_properties_query] + internal_array))
-        elsif hash.blank?
-          query_service.orm_class.count_by_sql([find_count_by_models_query] + [models])
-        else
-          query_service.orm_class.count_by_sql(([find_count_by_properties_and_models_query] + internal_array + [models]))
-        end
-      end
-
-      def find_count_by_properties_and_models_query
-        <<-SQL
-          SELECT count(*) FROM orm_resources
-          WHERE metadata @> ?
-          AND internal_resource IN (?);
-        SQL
-      end
-
-      def find_count_by_models_query
-        <<-SQL
-          SELECT count(*) FROM orm_resources
-          WHERE internal_resource IN (?);
-        SQL
-      end
-
-      def find_count_by_properties_query
-        <<-SQL
-          SELECT count(*) FROM orm_resources
-          WHERE metadata @> ?;
-        SQL
+        flat_hash = hash.map { |k, v| "#{k}: \"#{v}\"" }.join(' ')
+        flat_hash += " has_model_ssim: (#{models.map { |m| "\"#{m}\"" }.join(' OR ')})" unless models.empty?
+        Hyrax::SolrService.count(flat_hash)
       end
     end
   end

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

@@ -31,7 +31,7 @@ module Hyrax
         result = query_service.find_by(id: id)
         unless result.is_a? Hyrax::FileMetadata
           raise ::Valkyrie::Persistence::ObjectNotFoundError,
-                "Result type #{result.internal_resource} for id #{id} is not a `Hyrax::FileMetadata`"
+                "Result type #{result&.internal_resource} for id #{id} is not a `Hyrax::FileMetadata`"
         end
         result
       end
@@ -44,7 +44,7 @@ module Hyrax
         result = query_service.find_by_alternate_identifier(alternate_identifier: alternate_identifier)
         unless result.is_a? Hyrax::FileMetadata
           raise ::Valkyrie::Persistence::ObjectNotFoundError,
-                "Result type #{result.internal_resource} for alternate_identifier #{alternate_identifier} is not a `Hyrax::FileMetadata`"
+                "Result type #{result&.internal_resource} for alternate_identifier #{alternate_identifier} is not a `Hyrax::FileMetadata`"
         end
         result
       end

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

@@ -24,35 +24,13 @@ module Hyrax
       #
       # @param model [Class]
       # @param ids [Enumerable<#to_s>, Symbol]
+      # @return [Array<Hyrax::Resource>]
       #
       def find_models_by_access(mode:, models: nil, agent:, group: nil)
-        agent = "group/#{agent}" if group.present?
-        internal_array = "{\"permissions\": [{\"mode\": \"#{mode}\", \"agent\": \"#{agent}\"}]}"
-        if models.present?
-          query_service.run_query(find_models_by_access_query, internal_array, models)
-        else
-          query_service.run_query(find_by_access_query, internal_array)
-        end
-      end
-
-      def find_models_by_access_query
-        <<-SQL
-          SELECT * FROM orm_resources
-          WHERE id IN (
-            SELECT uuid(metadata::json#>'{access_to,0}'->>'id') FROM orm_resources
-            WHERE metadata @> ?
-          ) AND internal_resource IN (?);
-        SQL
-      end
-
-      def find_by_access_query
-        <<-SQL
-          SELECT * FROM orm_resources
-          WHERE id IN (
-            SELECT uuid(metadata::json#>'{access_to,0}'->>'id') FROM orm_resources
-            WHERE metadata @> ?
-          );
-        SQL
+        query = "#{Hydra.config.permissions[mode.to_sym][(group ? 'group' : 'individual').to_sym]}:#{agent}"
+        query += " AND has_model_ssim: (#{models.map { |m| "\"#{m}\"" }.join(' OR ')})" unless models.empty?
+        ids = Hyrax::SolrService.query_result(query, fl: 'id')['response']['docs'].map { |doc| doc['id'] }
+        Hyrax.query_service.find_many_by_ids(ids: ids)
       end
     end
   end

data/app/services/hyrax/embargo_manager.rb

@@ -140,8 +140,9 @@ module Hyrax
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def create_or_update_embargo_on_members(members, work)
         # TODO: account for all members and levels, not just file sets. ref: #6131
-
         members.each do |member|
+          # reload member to make sure nothing in the transaction has changed it already
+          member = Hyrax.query_service.find_by(id: member.id)
           member_embargo_needs_updating = work.embargo.updated_at > member.embargo&.updated_at if member.embargo
 
           if member.embargo && member_embargo_needs_updating

data/app/services/hyrax/file_set_file_service.rb

@@ -32,7 +32,16 @@ module Hyrax
     end
 
     ##
-    # Return the Hyrax::FileMetadata which should be considered “primary” for
+    # Return the {Hyrax::FileMetadata} which should be considered “primary” for
+    # indexing and version‐tracking.
+    #
+    # @return [Hyrax::FileMetadata]
+    def self.primary_file_for(file_set:, query_service: Hyrax.query_service)
+      new(file_set: file_set, query_service: query_service).primary_file
+    end
+
+    ##
+    # Return the {Hyrax::FileMetadata} which should be considered “primary” for
     # indexing and version‐tracking.
     #
     # If +file_set.original_file_id+ is defined, it will be used; otherwise,

data/app/services/hyrax/listeners/file_listener.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Listeners
+    ##
+    # Listens for events related to Files ({Valkyrie::StorageAdapter::File})
+    class FileListener
+      ##
+      # Called when 'file.characterized' event is published;
+      # allows post-characterization handling, like derivatives generation.
+      #
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_characterized(event)
+        file_set = event[:file_set]
+
+        case file_set
+        when ActiveFedora::Base # ActiveFedora
+          CreateDerivativesJob
+            .perform_later(file_set, event[:file_id], event[:path_hint])
+        else
+          ValkyrieCreateDerivativesJob
+            .perform_later(file_set.id.to_s, event[:file_id])
+        end
+      end
+
+      ##
+      # Called when 'file.uploaded' event is published
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_uploaded(event)
+        # Run characterization for original file only and allow optional skip paramater
+        return if event.payload[:skip_derivatives] || !event[:metadata]&.original_file?
+
+        ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
+      end
+    end
+  end
+end

data/app/services/hyrax/listeners/file_metadata_listener.rb

@@ -5,25 +5,6 @@ module Hyrax
     ##
     # Listens for events related to {Hyrax::FileMetadata}
     class FileMetadataListener
-      ##
-      # Called when 'file.characterized' event is published;
-      # allows post-characterization handling, like derivatives generation.
-      #
-      # @param [Dry::Events::Event] event
-      # @return [void]
-      def on_file_characterized(event)
-        file_set = event[:file_set]
-
-        case file_set
-        when ActiveFedora::Base # ActiveFedora
-          CreateDerivativesJob
-            .perform_later(file_set, event[:file_id], event[:path_hint])
-        else
-          ValkyrieCreateDerivativesJob
-            .perform_later(file_set.id.to_s, event[:file_id])
-        end
-      end
-
       ##
       # Called when 'file.metadata.updated' event is published; reindexes a
       # {Hyrax::FileSet} when a file claiming to be its `pcdm_use:OriginalFile`
@@ -41,17 +22,6 @@ module Hyrax
                           "encountered an error #{err.message}. should this " \
                           "object be in a FileSet #{event[:metadata]}"
       end
-
-      ##
-      # Called when 'file.uploaded' event is published
-      # @param [Dry::Events::Event] event
-      # @return [void]
-      def on_file_uploaded(event)
-        # Run characterization for original file only
-        return unless event[:metadata]&.original_file?
-
-        ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
-      end
     end
   end
 end

data/app/services/hyrax/lock_manager.rb

@@ -16,11 +16,11 @@ module Hyrax
 
     ##
     # Blocks until lock is acquired or timeout.
-    def lock(key)
+    def lock(key, ttl: @ttl, retry_count: @retry_count, retry_delay: @retry_delay)
       returned_from_block = nil
 
       pool.then do |conn|
-        client(conn).lock(key, @ttl) do |locked|
+        client(conn, retry_count: retry_count, retry_delay: retry_delay).lock(key, ttl) do |locked|
           raise UnableToAcquireLockError unless locked
           returned_from_block = yield
         end
@@ -30,17 +30,17 @@ module Hyrax
     rescue ConnectionPool::TimeoutError => err
       Hyrax.logger.error(err.message)
       raise(ConnectionPool::TimeoutError,
-            "Failed to aquire a lock from Redlock due to a Redis connection " /
-            "timeout: #{err}. If you are using Redis via `ConnectionPool` " /
-            "you may wish to increase the pool size.")
+            "Failed to acquire a lock from Redlock due to a Redis connection " \
+              "timeout: #{err}. If you are using Redis via `ConnectionPool` " \
+              "you may wish to increase the pool size.")
     end
 
     private
 
     ##
     # @api_private
-    def client(conn)
-      Redlock::Client.new([conn], retry_count: @retry_count, retry_delay: @retry_delay)
+    def client(conn, retry_count:, retry_delay:)
+      Redlock::Client.new([conn], retry_count: retry_count, retry_delay: retry_delay)
     end
 
     ##

data/app/services/hyrax/lockable.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+require 'forwardable'
+
 module Hyrax
   module Lockable
+    extend Forwardable
     extend ActiveSupport::Concern
 
-    def acquire_lock_for(lock_key, &block)
-      lock_manager.lock(lock_key, &block)
-    end
+    def_delegator :lock_manager, :lock, :acquire_lock_for
 
     def lock_manager
       @lock_manager ||= LockManager.new(

data/app/services/hyrax/simple_schema_loader.rb

@@ -158,7 +158,7 @@ module Hyrax
     end
 
     def config_search_paths
-      [Rails.root, Hyrax::Engine.root]
+      Hyrax.config.simple_schema_loader_config_search_paths
     end
 
     def metadata_files

data/app/services/hyrax/solr_service.rb

@@ -54,7 +54,7 @@ module Hyrax
       end
 
       delegate :add, :commit, :count, :delete, :get, :instance, :ping, :post,
-               :query, :query_result, :delete_by_query, :search_by_id, :wipe!, to: :new
+               :query, :query_result, :query_in_batches, :delete_by_query, :search_by_id, :wipe!, to: :new
     end
 
     # Wraps rsolr get
@@ -111,6 +111,20 @@ module Hyrax
       end
     end
 
+    def query_in_batches(query, **args)
+      args[:rows] ||= 500
+      args[:start] ||= 0
+      loop do
+        result = query_result(query, **args)
+        break if result['response']['docs'].blank? || result['response']['numFound'] <= args[:start]
+        result['response']['docs'].select do |doc|
+          yield ::SolrHit.new(doc)
+          nil
+        end
+        args[:start] += args[:rows]
+      end
+    end
+
     # Wraps rsolr :delete_by_query
     def delete_by_query(query, **args)
       connection.delete_by_query(query, params: args)
@@ -149,6 +163,13 @@ module Hyrax
       result.first
     end
 
+    ##
+    # @api private
+    def connection
+      return self.class.instance.conn unless use_valkyrie
+      valkyrie_index.connection
+    end
+
     private
 
     ##
@@ -163,13 +184,6 @@ module Hyrax
       Hyrax.index_adapter
     end
 
-    ##
-    # @api private
-    def connection
-      return self.class.instance.conn unless use_valkyrie
-      valkyrie_index.connection
-    end
-
     def rows_warning
       "Calling Hyrax::SolrService.get without passing an explicit value for ':rows' is not recommended. You will end up with Solr's default (usually set to 10)\nCalled by #{caller[0]}"
     end

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

@@ -45,7 +45,7 @@ module Hyrax
       delegate :count, to: :relation
 
       def relation
-        Hyrax::WorkRelation.new
+        Hyrax.config.disable_wings ? Hyrax::ValkyrieWorkRelation.new : Hyrax::WorkRelation.new
       end
 
       private

data/app/services/hyrax/statistics/works/over_time.rb

@@ -16,7 +16,7 @@ module Hyrax
         private
 
         def relation
-          Hyrax::WorkRelation.new
+          Hyrax.config.disable_wings ? Hyrax::ValkyrieWorkRelation.new : Hyrax::WorkRelation.new
         end
       end
     end

data/app/services/hyrax/thumbnail_path_service.rb

@@ -31,6 +31,8 @@ module Hyrax
         return object if object.thumbnail_id == object.id ||
                          object.try(:file_ids)&.detect { |fid| fid == object.thumbnail_id }
         begin
+          # In some implmentations (e.g. Wings), `find_by(id:)` aliases
+          # `find_by_alternate_identifier`  but that is not guaranteed.
           return Hyrax.query_service.find_by(id: object.thumbnail_id)
         rescue
           nil

data/app/services/hyrax/user_stat_importer.rb

@@ -61,7 +61,7 @@ module Hyrax
 
     def process_works(stats, user, start_date)
       work_ids_for_user(user).each do |work_id|
-        work = Hyrax::WorkRelation.new.find(work_id)
+        work = Hyrax.query_service.find_by(id: work_id)
         work_stats = extract_stats_for(object: work, from: WorkViewStat, start_date: start_date, user: user)
         stats = tally_results(work_stats, :work_views, stats) if work_stats.present?
         delay
@@ -94,7 +94,7 @@ module Hyrax
       if last_cached_stat
         last_cached_stat.date + 1.day
       else
-        Hyrax.config.analytic_start_date
+        Hyrax.config.analytic_start_date || 1.week.ago
       end
     end
 
@@ -108,8 +108,8 @@ module Hyrax
 
     def work_ids_for_user(user)
       ids = []
-      Hyrax::WorkRelation.new.search_in_batches("#{depositor_field}:\"#{user.user_key}\"", fl: "id") do |group|
-        ids.concat group.map { |doc| doc["id"] }
+      Hyrax::SolrService.query_in_batches("#{depositor_field}:\"#{user.user_key}\"", fl: "id") do |hit|
+        ids << hit.id
       end
       ids
     end
@@ -124,7 +124,7 @@ module Hyrax
 
         date_key = stats.date.to_s
         old_count = total_stats[date_key] ? total_stats[date_key].fetch(stat_name) { 0 } : 0
-        new_count = old_count + stats.method(stat_name).call
+        new_count = old_count + stats.method(stat_name).call.to_i
 
         old_values = total_stats[date_key] || {}
         total_stats.store(date_key, old_values)

data/app/services/hyrax/valkyrie_upload.rb

@@ -18,10 +18,12 @@ class Hyrax::ValkyrieUpload
     io:,
     storage_adapter: Hyrax.storage_adapter,
     use: Hyrax::FileMetadata::Use::ORIGINAL_FILE,
-    user: nil
+    user: nil,
+    mime_type: nil,
+    skip_derivatives: false
   )
     new(storage_adapter: storage_adapter)
-      .upload(filename: filename, file_set: file_set, io: io, use: use, user: user)
+      .upload(filename: filename, file_set: file_set, io: io, use: use, user: user, mime_type: mime_type, skip_derivatives: skip_derivatives)
   end
 
   ##
@@ -30,17 +32,19 @@ class Hyrax::ValkyrieUpload
   attr_reader :storage_adapter
   ##
   # @param [Valkyrie::StorageAdapter] storage_adapter
-  def initialize(storage_adapter: Hyrax.storage_adapter)
+  # @param [Class] file_set_file_service implementer of {Hyrax::FileSetFileService}
+  def initialize(storage_adapter: Hyrax.storage_adapter, file_set_file_service: Hyrax.config.file_set_file_service)
     @storage_adapter = storage_adapter
+    @file_set_file_service = file_set_file_service
   end
 
-  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil, mime_type: nil) # rubocop:disable Metrics/AbcSize
+  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil, mime_type: nil, skip_derivatives: false) # rubocop:disable Metrics/AbcSize
     return version_upload(file_set: file_set, io: io, user: user) if use == Hyrax::FileMetadata::Use::ORIGINAL_FILE && file_set.original_file_id && storage_adapter.supports?(:versions)
     streamfile = storage_adapter.upload(file: io, original_filename: filename, resource: file_set)
     file_metadata = Hyrax::FileMetadata(streamfile)
     file_metadata.file_set_id = file_set.id
-    file_metadata.pcdm_use = [use]
-    file_metadata.recorded_size = [io.size]
+    file_metadata.pcdm_use = Array(use)
+    file_metadata.recorded_size = Array(io.size)
     file_metadata.mime_type = mime_type if mime_type
     file_metadata.original_filename = File.basename(filename).to_s || File.basename(io)
 
@@ -60,14 +64,15 @@ class Hyrax::ValkyrieUpload
                          file_metadata: saved_metadata,
                          user: user)
 
-    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
-    Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user)
+    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata, skip_derivatives: skip_derivatives)
+    Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user, skip_derivatices: skip_derivatives)
 
     saved_metadata
   end
 
   def version_upload(file_set:, io:, user:)
-    file_metadata = Hyrax.query_service.custom_queries.find_file_metadata_by(id: file_set.original_file_id)
+    file_metadata = @file_set_file_service.primary_file_for(file_set: file_set)
+
     Hyrax::VersioningService.create(file_metadata, user, io)
     Hyrax.publisher.publish("file.uploaded", metadata: file_metadata)
     ContentNewVersionEventJob.perform_later(file_set, user)

data/app/services/hyrax/versioning_service.rb

@@ -20,8 +20,16 @@ module Hyrax
 
     ##
     # @param resource [ActiveFedora::File | Hyrax::FileMetadata | NilClass]
-    def initialize(resource:, storage_adapter: Hyrax.storage_adapter)
-      @storage_adapter = storage_adapter
+    def initialize(resource:, storage_adapter: nil)
+      @storage_adapter = if storage_adapter.nil?
+                           if resource.respond_to?(:file_identifier)
+                             Valkyrie::StorageAdapter.adapter_for(id: resource.file_identifier)
+                           else
+                             Hyrax.storage_adapter
+                           end
+                         else
+                           storage_adapter
+                         end
       self.resource = resource
     end
 

data/app/services/hyrax/work_query_service.rb

@@ -3,7 +3,7 @@ module Hyrax
   # Responsible for retrieving information based on the given work.
   #
   # @see ProxyDepositRequest
-  # @see Hyrax::WorkRelation
+  # @see Hyrax::VaklyrieWorkRelation
   # @see SolrDocument
   # @see Hyrax::SolrService
   # @see ActiveFedora::SolrQueryBuilder
@@ -20,7 +20,7 @@ module Hyrax
     private
 
     def default_work_relation
-      Hyrax::WorkRelation.new
+      Hyrax.config.disable_wings ? Hyrax::ValkyrieWorkRelation.new : Hyrax::WorkRelation.new
     end
 
     public

data/app/services/migrate_resource_service.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# migrates models from AF to valkyrie
+class MigrateResourceService
+  attr_accessor :resource
+  def initialize(resource:)
+    @resource = resource
+  end
+
+  def model
+    @model || Wings::ModelRegistry.lookup(resource.class).to_s
+  end
+
+  def call
+    prep_resource
+    Hyrax::Transactions::Container[model_events(model)]
+      .with_step_args(**model_steps(model)).call(resource_form)
+  end
+
+  def prep_resource
+    case model
+    when 'FileSet'
+      resource.creator << ::User.batch_user.email if resource.creator.blank?
+    end
+  end
+
+  def resource_form
+    @resource_form ||= Hyrax::Forms::ResourceForm.for(resource: resource)
+  end
+
+  def model_events(model)
+    {
+      'AdminSet' => 'admin_set_resource.update',
+      'Collection' => 'change_set.update_collection',
+      'FileSet' => 'change_set.update_file_set'
+    }[model] || 'change_set.update_work'
+  end
+
+  def model_steps(model)
+    {
+      'AdminSet' => {},
+      'Collection' => {
+        'collection_resource.save_collection_banner' => { banner_unchanged_indicator: true },
+        'collection_resource.save_collection_logo' => { logo_unchanged_indicator: true }
+      },
+      'FileSet' => {
+        'file_set.save_acl' => {}
+      }
+    }[model] || {
+      'work_resource.add_file_sets' => { uploaded_files: [], file_set_params: [] },
+      'work_resource.update_work_members' => { work_members_attributes: [] },
+      'work_resource.save_acl' => { permissions_params: [] }
+    }
+  end
+end

data/app/views/_controls.html.erb

@@ -1,12 +1,12 @@
-<nav class="navbar navbar-light bg-light navbar-expand-sm justify-content-between align-items-center px-2 py-3 border-bottom" role="navigation" aria-label="Root Menu">
+<nav class="navbar bg-light navbar-expand-sm justify-content-between align-items-center px-2 py-3 border-bottom" role="navigation" aria-label="Root Menu">
     <ul class="nav navbar-nav col-sm-5">
-      <li class="nav-item <%= 'active' if current_page?(hyrax.root_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.root_path) %>">
         <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, class: "nav-link", aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
-      <li class="nav-item <%= 'active' if current_page?(hyrax.about_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.about_path) %>">
         <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, class: "nav-link", aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-      <li class="nav-item <%= 'active' if current_page?(hyrax.help_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.help_path) %>">
         <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, class: "nav-link", aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
-      <li class="nav-item <%= 'active' if current_page?(hyrax.contact_path) %>">
+      <li class="nav-item <%= 'active font-weight-bold' if current_page?(hyrax.contact_path) %>">
         <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, class: "nav-link", aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
     </ul><!-- /.nav -->
     <div class="col-sm-7">

data/app/views/_masthead.html.erb

@@ -1,6 +1,6 @@
 <header aria-label="header" class="top-header">
   <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between <%= placement_class %>" role="navigation" aria-label="masthead">
-    <h1 class="sr-only"><%= application_name %></h1>
+    <h1 class="sr-only navbar-text"><%= application_name %></h1>
     <%= render '/logo' %>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>