hyrax 3.3.0 → 4.0.0.beta1

data/app/utils/hyrax/data_destroyers/default_admin_set_id_cache_destroyer.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+module Hyrax
+  module DataDestroyers
+    # When the default admin set is removed using wipe!, the cache of the default
+    # admin set id also needs to be deleted.
+    #
+    # @note WARNING: DO NOT USE IN PRODUCTION!  The methods in this class are destructive.
+    #   Data can not be recovered.
+    #
+    class DefaultAdminSetIdCacheDestroyer
+      class << self
+        attr_accessor :logger
+
+        def destroy_data(logger: Logger.new(STDOUT), allow_destruction_in_production: false)
+          raise("DefaultAdminSetIdCacheDestroyer is not for use in production!") if Rails.env.production? && !allow_destruction_in_production
+          @logger = logger
+
+          logger.info("Destroying default admin set id cache...")
+
+          Hyrax::DefaultAdministrativeSet.destroy_all
+          logger.info("   default admin set id cache -- DESTROYED")
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/data_destroyers/featured_works_destroyer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+module Hyrax
+  module DataDestroyers
+    # Featured works are tightly coupled to works in the repository. When they
+    # are removed using wipe!, the associated database entries for featured
+    # works also need to be deleted.
+    #
+    # @note WARNING: DO NOT USE IN PRODUCTION!  The methods in this class are destructive.
+    #   Data can not be recovered.
+    #
+    class FeaturedWorksDestroyer
+      class << self
+        attr_accessor :logger
+
+        def destroy_data(logger: Logger.new(STDOUT), allow_destruction_in_production: false)
+          raise("FeaturedWorksDestroyer is not for use in production!") if Rails.env.production? && !allow_destruction_in_production
+          @logger = logger
+
+          logger.info("Destroying featured works...")
+
+          FeaturedWork.destroy_all
+          logger.info("   featured works -- DESTROYED")
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/data_destroyers/permission_templates_destroyer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Hyrax
+  module DataDestroyers
+    # PermissionTemplates are tightly coupled to admin sets and collections.
+    # When they are removed using wipe!, the associated database entries for
+    # permission templates also have to be deleted.
+    #
+    # @note WARNING: DO NOT USE IN PRODUCTION!  The methods in this class are destructive.
+    #   Data can not be recovered.
+    #
+    class PermissionTemplatesDestroyer
+      class << self
+        attr_accessor :logger
+
+        def destroy_data(logger: Logger.new(STDOUT), allow_destruction_in_production: false)
+          raise("PermissionTemplatesDestroyer is not for use in production!") if Rails.env.production? && !allow_destruction_in_production
+          @logger = logger
+
+          logger.info("Destroying permission templates...")
+
+          Hyrax::PermissionTemplateAccess.destroy_all
+          logger.info("   permission templates access -- DESTROYED")
+
+          Hyrax::PermissionTemplate.destroy_all
+          logger.info("   permission templates -- DESTROYED")
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/data_destroyers/repository_metadata_destroyer.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+module Hyrax
+  module DataDestroyers
+    # Clear all repository metadata from the datastore (e.g. Fedora, Postgres)
+    # and from Solr.
+    #
+    # @note WARNING: DO NOT USE IN PRODUCTION!  The methods in this class are destructive.
+    #   Data can not be recovered.
+    #
+    # @note When using Wings adapter, which wraps ActiveFedora, the persister wipe!
+    #   method clears both Fedora and Solr.  Optionally, an index_adapter may also
+    #   be set to use Valkyrie to write to a second Solr core.  If the Hyrax index
+    #   adapter is the NullIndexingAdapter, that means that Valkyrie is not being
+    #   used to index the repository metadata and does not need to be cleared using
+    #   the Hyrax index adapter.
+    #
+    #   When using other Valkyrie persistence adapters, wipe! only clears the repository
+    #   metadata from the datastore (e.g. ORM table in Postgres).  The index adapter
+    #   is used to clear metadata from Solr.
+    #
+    class RepositoryMetadataDestroyer
+      class << self
+        attr_accessor :logger
+
+        def destroy_metadata(logger: Logger.new(STDOUT), allow_destruction_in_production: false)
+          raise("RepositoryMetadataDestroyer is not for use in production!") if Rails.env.production? && !allow_destruction_in_production
+          @logger = logger
+
+          logger.info("Destroying all repository metadata...")
+
+          unless Hyrax.index_adapter.is_a? Valkyrie::Indexing::NullIndexingAdapter
+            conn = Hyrax.index_adapter.connection
+            conn.delete_by_query('*:*', params: { 'softCommit' => true })
+          end
+          Hyrax.persister.wipe!
+
+          logger.info("   repository metadata -- DESTROYED")
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/data_destroyers/stats_destroyer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Hyrax
+  module DataDestroyers
+    # Stats are tightly coupled to works and files in the repository. When they
+    # are removed using wipe!, the associated database entries for stats also
+    # need to be deleted.
+    #
+    # @note WARNING: DO NOT USE IN PRODUCTION!  The methods in this class are destructive.
+    #   Data can not be recovered.
+    #
+    class StatsDestroyer
+      class << self
+        attr_accessor :logger
+
+        def destroy_data(logger: Logger.new(STDOUT), allow_destruction_in_production: false)
+          raise("StatsDataDestroyer is not for use in production!") if Rails.env.production? && !allow_destruction_in_production
+          @logger = logger
+
+          logger.info("Destroying stats...")
+
+          FileDownloadStat.destroy_all
+          logger.info("   file download stats -- DESTROYED")
+
+          FileViewStat.destroy_all
+          logger.info("   file view stats -- DESTROYED")
+
+          WorkViewStat.destroy_all
+          logger.info("   work view stats -- DESTROYED")
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/data_maintenance.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Hyrax
+  ##
+  # These methods created for use in rake tasks and db/seeds.rb  They can be used to:
+  # * clear repository metadata and related data and files
+  # * clear temporary files
+  # * clear logs
+  #
+  # @note WARNING: DO NOT USE IN PRODUCTION!  The methods in this class are destructive.
+  #   Data can not be recovered.
+  #
+  class DataMaintenance
+    attr_accessor :logger, :allow_destruction_in_production
+
+    def initialize(logger: Logger.new(STDOUT), allow_destruction_in_production: false)
+      raise("Destruction of data is not for use in production!") if Rails.env.production? && !allow_destruction_in_production
+      @logger = logger
+      @allow_destruction_in_production = allow_destruction_in_production
+    end
+
+    # Clear repository metadata and related data
+    # * clear repository metadata from the datastore (e.g. Fedora, Postgres) and from Solr
+    # * clear targeted application data that is tightly coupled to repository metadata
+    # * delete files that are tightly coupled to repository metadata
+    def destroy_repository_metadata_and_related_data
+      Hyrax::DataDestroyers::RepositoryMetadataDestroyer.destroy_metadata(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+      Hyrax::DataDestroyers::StatsDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+      Hyrax::DataDestroyers::FeaturedWorksDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+      Hyrax::DataDestroyers::PermissionTemplatesDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+      Hyrax::DataDestroyers::CollectionBrandingDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+      Hyrax::DataDestroyers::DefaultAdminSetIdCacheDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+      Hyrax::DataDestroyers::CollectionTypesDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+
+      # TODO: Stubbed until RepositoryFilesDestroyer is written
+      # Hyrax::DataDestroyers::RepositoryFilesDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+    end
+
+    # @todo write code to clear out log files
+    def destroy_log_files
+      # Stubbed until LogFilesDestroyer is written
+      # Hyrax::DataDestroyers::LogFilesDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+    end
+
+    # @todo write code to delete tmp files
+    def destroy_tmp_files
+      # Stubbed until TmpFilesDestroyer is written
+      # Hyrax::DataDestroyers::TmpFilesDestroyer.destroy_data(logger: logger, allow_destruction_in_production: allow_destruction_in_production)
+    end
+  end
+end

data/app/utils/hyrax/required_data_seeder.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Hyrax
+  # This class was created for use in rake tasks and db/seeds.rb.  It generates
+  # required repository metadata including Admin Set and User collection types and
+  # the default admin set.
+  #
+  # Seeders of required data are non-destructive.  If the data already exists,
+  # it will not be replaced.
+  class RequiredDataSeeder
+    attr_accessor :logger
+
+    def initialize(logger: Logger.new(STDOUT))
+      @logger = logger
+    end
+
+    def generate_seed_data
+      Hyrax::RequiredDataSeeders::CollectionTypeSeeder.generate_seeds(logger: logger)
+      Hyrax::RequiredDataSeeders::CollectionSeeder.generate_seeds(logger: logger)
+    end
+  end
+end

data/app/utils/hyrax/required_data_seeders/collection_seeder.rb

@@ -0,0 +1,26 @@
+
+
+# frozen_string_literal: true
+module Hyrax
+  module RequiredDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # collections that are required for all Hyrax applications.
+    #
+    # Seeders of required data are non-destructive.  If the data already exists,
+    # it will not be replaced.
+    class CollectionSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT))
+          @logger = logger
+
+          logger.info("Adding required collections...")
+
+          default_admin_set = Hyrax::AdminSetCreateService.find_or_create_default_admin_set
+          logger.info "   #{default_admin_set.title.first} -- FOUND OR CREATED"
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/required_data_seeders/collection_type_seeder.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Hyrax
+  module RequiredDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # collection types that are required for all Hyrax applications.
+    #
+    # Seeders of required data are non-destructive.  If the data already exists,
+    # it will not be replaced.
+    class CollectionTypeSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT))
+          @logger = logger
+
+          logger.info("Adding required collection types...")
+
+          as_ct = Hyrax::CollectionType.find_or_create_admin_set_type
+          set_badge_color(as_ct, '#990000')
+          logger.info("   #{as_ct.title} -- FOUND OR CREATED")
+
+          user_ct = Hyrax::CollectionType.find_or_create_default_collection_type
+          set_badge_color(user_ct, '#0099cc')
+          logger.info("   #{user_ct.title} -- FOUND OR CREATED")
+        end
+
+        private
+
+        def set_badge_color(collection_type, badge_color = nil)
+          collection_type.badge_color = badge_color
+          collection_type.save
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/test_data_seeder.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Hyrax
+  # This class was created for use in rake tasks and db/seeds.rb.  It generates
+  # repository metadata needed for release testing.  This data can also be helpful
+  # for local development testing.
+  class TestDataSeeder
+    attr_accessor :logger, :allow_seeding_in_production
+
+    def initialize(logger: Logger.new(STDOUT), allow_seeding_in_production: false)
+      raise("TestDataSeeder is not for use in production!") if Rails.env.production? && !allow_seeding_in_production
+      @logger = logger
+      @allow_seeding_in_production = allow_seeding_in_production
+    end
+
+    def generate_seed_data
+      Hyrax::TestDataSeeders::UserSeeder.generate_seeds(logger: logger, allow_seeding_in_production: allow_seeding_in_production)
+      Hyrax::TestDataSeeders::CollectionTypeSeeder.generate_seeds(logger: logger, allow_seeding_in_production: allow_seeding_in_production)
+      Hyrax::TestDataSeeders::CollectionSeeder.generate_seeds(logger: logger, allow_seeding_in_production: allow_seeding_in_production)
+      # TODO: add work seeder
+      # Hyrax::TestDataSeeders::WorkSeeder.generate_seeds(logger: logger, allow_seeding_in_production: allow_seeding_in_production)
+    end
+  end
+end

data/app/utils/hyrax/test_data_seeders/collection_seeder.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+module Hyrax
+  module TestDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # collection that can be used in release testing.  This data can also be helpful
+    # for local development testing.
+    #
+    # Adding collections is non-destructive.  But it may create an additional
+    # collection of the same.
+    #
+    # @todo Do we want to assume that if a collection of the same name exists, then
+    #   it is the collection we want for release testing?
+    class CollectionSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT), allow_seeding_in_production: false) # rubocop:disable Metrics/AbcSize
+          raise("TestDataSeeders are not for use in production!") if Rails.env.production? && !allow_seeding_in_production
+          @logger = logger
+
+          logger.info("Adding collections...")
+
+          create_collection("Grand Parent Collection", collection_types['Nestable only'])
+          create_collection("Parent Collection", collection_types['Nestable only'])
+          create_collection("Child Collection", collection_types['Nestable only'])
+          create_collection("Branded Collection", collection_types['Brandable only'])
+          create_collection("Discoverable Collection", collection_types['Discoverable only'])
+          create_collection("Shared", collection_types['Sharable only'])
+          create_collection("Share Applies to Works", collection_types['Sharable only (and works)'])
+          create_collection("(SM1) Single Membership Collection", collection_types['Single Membership 1'])
+          create_collection("(SM1) Another Single Membership Collection", collection_types['Single Membership 1'])
+          create_collection("(SM2) Single Membership Collection", collection_types['Single Membership 2'])
+          create_collection("(SM2) Another Single Membership Collection", collection_types['Single Membership 2'])
+        end
+
+        ##
+        # @api private
+        class NullUser
+          ##
+          # @return [nil]
+          def user_key
+            nil
+          end
+        end
+
+        private
+
+        def create_collection(title, collection_type_gid)
+          return unless valid_collection_type?(title, collection_type_gid)
+          return if exists?(title, collection_type_gid)
+
+          collection = Hyrax::PcdmCollection.new(title: title, collection_type_gid: collection_type_gid)
+          Hyrax.persister.save(resource: collection)
+          Hyrax.publisher.publish('collection.metadata.updated', collection: collection, user: seed_user)
+          logger.info("   #{collection.title.first} -- CREATED")
+        end
+
+        def seed_user
+          @seed_user ||= NullUser.new
+        end
+
+        def collection_types
+          @collection_types ||=
+            Hyrax::CollectionType.all
+                                 .each_with_object({}) { |ct, hsh| hsh[ct.title] = ct.to_global_id.to_s }
+        end
+
+        def valid_collection_type?(title, collection_type_gid)
+          return true if collection_type_gid.present? && collection_types.value?(collection_type_gid.to_s)
+
+          msg = "   #{title} -- NOT CREATED -- Collection type gid (#{collection_type_gid}) " \
+                  "is invalid or doesn't exist."
+          logger.info(msg)
+          false
+        end
+
+        def existing_collections
+          @existing_collections ||=
+            Hyrax.query_service.find_all_of_model(model: Hyrax::PcdmCollection)
+                 .each_with_object({}) { |col, hsh| hsh[col.title&.first] = col.collection_type_gid.to_s }
+        end
+
+        def exists?(title, collection_type_gid)
+          return false unless existing_collections[title] == collection_type_gid.to_s
+          logger.info("   #{title} -- ALREADY EXISTS")
+          true
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/test_data_seeders/collection_type_seeder.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+module Hyrax
+  module TestDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # collection types that can be used in release testing.  This data can also be
+    # helpful for local development testing.
+    #
+    # Adding collection types is non-destructive.  If a collection type with the
+    # title already exists, it will not be replaced.
+    class CollectionTypeSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT), allow_seeding_in_production: false) # rubocop:disable Metrics/MethodLength
+          raise("TestDataSeeders are not for use in production!") if Rails.env.production? && !allow_seeding_in_production
+          @logger = logger
+
+          logger.info("Adding collection types...")
+
+          create_collection_type(title: "Nestable only", badge_color: "#282D3C", nestable: true,
+                                 description: "Collections of this type can be nested.")
+          create_collection_type(title: "Brandable only", badge_color: "#ff6600", brandable: true,
+                                 description: "Collections of this type can have branding images.")
+          create_collection_type(title: "Discoverable only", badge_color: "#00A170", discoverable: true,
+                                 description: "Collections of this type can have visibility settings modified.")
+          create_collection_type(title: "Sharable only", badge_color: "#ff0066", sharable: true, share_applies_to_new_works: false,
+                                 description: "Collections of this type are sharable.  Works " \
+                                              "do NOT inherit sharable settings when they are created.")
+          create_collection_type(title: "Sharable only (and works)", badge_color: "#0072B5", sharable: true, share_applies_to_new_works: true,
+                                 description: "Collections of this type are sharable.  Works " \
+                                              "inherit sharable settings when they are created.")
+          create_collection_type(title: "Single Membership 1", badge_color: "#b34700", allow_multiple_membership: false,
+                                 description: "This Single Membership 1 collection type restricts collection membership. " \
+                                              "Collections of this type do not allow works to live in multiple collections of this type.")
+          create_collection_type(title: "Single Membership 2", badge_color: "#926AA6", allow_multiple_membership: false,
+                                 description: "This Single Membership 2 collection type restricts collection membership. " \
+                                              "Collections of this type do not allow works to live in multiple collections of this type.")
+        end
+
+        private
+
+        def collection_type_titles
+          @collection_type_titles ||= Hyrax::CollectionType.all.map(&:title)
+        end
+
+        def create_collection_type(options = {})
+          title = options[:title]
+          return logger.info("   #{title} -- ALREADY EXISTS") if collection_type_titles.include? title
+
+          defaults_for_options(options)
+          Hyrax::CollectionType.new(options).save
+          logger.info("   #{title} -- CREATED")
+        end
+
+        def defaults_for_options(options = {})
+          options[:nestable] ||= false
+          options[:brandable] ||= false
+          options[:discoverable] ||= false
+          options[:sharable] ||= false
+          options[:share_applies_to_new_works] ||= false
+          options[:allow_multiple_membership] ||= true
+
+          # These should always false unless the collection type is Admin Set.
+          # Admin Set collection type is created by required_data_seeders
+          options[:require_membership] = false
+          options[:assigns_workflow] = false
+          options[:assigns_visibility] = false
+        end
+      end
+    end
+  end
+end

data/app/utils/hyrax/test_data_seeders/user_seeder.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+module Hyrax
+  module TestDataSeeders
+    # This class was created for use in rake tasks and db/seeds.rb.  It generates
+    # users that can be used in release testing.  This data can also be helpful
+    # for local development testing.
+    #
+    # Adding users is non-destructive.  If a user with the email already exists,
+    # they will not be replaced.
+    class UserSeeder
+      class << self
+        attr_accessor :logger
+
+        def generate_seeds(logger: Logger.new(STDOUT), allow_seeding_in_production: false)
+          raise("TestDataSeeders are not for use in production!") if Rails.env.production? && !allow_seeding_in_production
+          @logger = logger
+
+          logger.info("Adding users...")
+
+          add_user('admin@example.com', 'admin_password', admin_role)
+          add_user('basic_user@example.com', 'password')
+          add_user('another_user@example.com', 'password')
+        end
+
+        private
+
+        def admin_role
+          unless defined? Role
+            logger.warn("Cannot create `Role` because the `hyrda-role-management` gem, or " \
+                        "other gem providing a definition for a Role class, is not installed.  " \
+                        "For development, you can edit `config/role_map.yml` and add the user's " \
+                        "email under the role you want to assign.")
+            return
+          end
+          @admin_role ||= Role.find_by(name: Hyrax.config.admin_user_group_name)
+        end
+
+        def add_user(email, password, role = nil)
+          created = false
+          user = ::User.find_or_create_by(email: email) do |f|
+            created = true
+            f.password = password
+          end
+          logger.info("   #{email} -- #{created ? 'CREATED' : 'ALREADY EXISTS'}")
+          return unless role && !user.roles.include?(role)
+          user.roles << role
+          user.save
+        end
+      end
+    end
+  end
+end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # Validates that the record passes the multiple membership requirements for collections.
+  class CollectionMembershipValidator < ActiveModel::Validator
+    ##
+    # @param multiple_membership_checker
+    def initialize(multiple_membership_checker: Hyrax::MultipleMembershipChecker, **options)
+      @multiple_membership_checker = multiple_membership_checker
+      super(options)
+    end
+
+    def validate(record)
+      # collections-in-collections do not have multi-membership restrictions
+      return true if record.is_a? Hyrax::Forms::PcdmCollectionForm
+      checker = @multiple_membership_checker.new(item: nil)
+      ids = collections_ids(record)
+
+      errors = Array(checker.check(collection_ids: ids))
+      record.errors[:member_of_collection_ids].concat(errors)
+    end
+
+    private
+
+    def collections_ids(record)
+      collection_ids = record.member_of_collection_ids.reject(&:blank?)
+
+      if record.member_of_collections_attributes.present?
+        record.member_of_collections_attributes
+              .each do |_k, h|
+                next if h["_destroy"] == "true"
+                collection_ids << Valkyrie::ID.new(h["id"])
+              end
+      end
+
+      collection_ids
+    end
+  end
+end

data/app/views/_controls.html.erb

@@ -1,19 +1,15 @@
-<nav class="navbar navbar-default navbar-static-top" role="navigation" aria-label="Root Menu">
-  <div class="container-fluid">
-    <div class="row">
-      <ul class="nav navbar-nav col-sm-5">
-        <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
-          <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
-          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
-          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
-          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
-      </ul><!-- /.nav -->
-      <div class="searchbar-right navbar-right col-sm-7">
-        <%= render partial: 'catalog/search_form' %>
-      </div>
+<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">
+    <ul class="nav navbar-nav col-sm-5">
+      <li class="nav-item <%= 'active' 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) %>">
+        <%= 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) %>">
+        <%= 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) %>">
+        <%= 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">
+      <%= render partial: 'catalog/search_form' %>
     </div>
-  </div>
-</nav><!-- /.navbar -->
+  </nav><!-- /.navbar -->

data/app/views/_logo.html.erb

@@ -1,4 +1,3 @@
 <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-  <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
   <span class="institution_name"><%= application_name %></span>
 </a>

data/app/views/_masthead.html.erb

@@ -1,22 +1,12 @@
-<header aria-label="header">
-  <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation" aria-label="masthead">
+<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>
-    <div class="container-fluid">
-      <!-- Brand and toggle get grouped for better mobile display -->
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <%= render '/logo' %>
-      </div>
-
-      <div class="collapse navbar-collapse" id="top-navbar-collapse">
-        <%= render '/user_util_links' %>
-      </div>
+    <%= 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>
+    </button>
+    <div class="collapse navbar-collapse justify-content-end" id="top-navbar-collapse">
+      <%= render '/user_util_links' %>
     </div>
   </nav>
 </header>
-