hyrax 3.6.0 → 4.0.0.beta1

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

@@ -20,27 +20,11 @@ module Hyrax
       # @!attribute [rw] user
       #   @return [::User]
       attr_accessor :user
-      ##
-      # @!attribute [rw] workflow_state_filter
-      #   @return [String]
-      attr_accessor :workflow_state_filter
-      ##
-      # @!attribute [rw] page of results to return, 1 based
-      #   @return [Integer]
-      attr_accessor :page
-      ##
-      # @!attribute [rw] per_page number of results in the page
-      #   @return [Integer]
-      attr_accessor :per_page
 
       ##
       # @param [::User] user the user whose
-      # @param [String] optional filter by workstate name
-      def initialize(user:, workflow_state_filter: nil)
+      def initialize(user:)
         @user = user
-        @workflow_state_filter = workflow_state_filter
-        @page = 1
-        @per_page = 10
       end
 
       ##
@@ -50,8 +34,7 @@ module Hyrax
         ids_and_states = id_state_pairs
         return if ids_and_states.none?
 
-        docs = Hyrax::SolrQueryService.new.with_ids(ids: ids_and_states.map(&:first))
-                                      .solr_documents(page: @page, rows: @per_page, sort: 'system_create_dtsi ASC')
+        docs = Hyrax::SolrQueryService.new.with_ids(ids: ids_and_states.map(&:first)).solr_documents
 
         docs.each do |solr_doc|
           object = ObjectInWorkflowDecorator.new(solr_doc)
@@ -63,13 +46,6 @@ module Hyrax
         end
       end
 
-      ##
-      # @return [Integer] total number of entities selected
-      def total_count
-        PermissionQuery.scope_entities_for_the_user(user: user, workflow_state_filter: workflow_state_filter)
-                       .count
-      end
-
       private
 
       ##
@@ -77,8 +53,7 @@ module Hyrax
       # @return [Array[String, Sipity::WorkflowState]]
       def id_state_pairs
         gids_and_states = PermissionQuery
-                          .scope_entities_for_the_user(user: user, page: page, per_page: per_page, workflow_state_filter: workflow_state_filter)
-                          .order(created_at: :asc)
+                          .scope_entities_for_the_user(user: user)
                           .pluck(:proxy_for_global_id, :workflow_state_id)
 
         return [] if gids_and_states.none?

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

@@ -194,7 +194,7 @@ module Hyrax
       # @return [ActiveRecord::Relation<Sipity::Entity>]
       #
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      def scope_entities_for_the_user(user:, page: 1, per_page: nil, workflow_state_filter: nil)
+      def scope_entities_for_the_user(user:)
         entities = Sipity::Entity.arel_table
         workflow_state_actions = Sipity::WorkflowStateAction.arel_table
         workflow_states = Sipity::WorkflowState.arel_table
@@ -227,34 +227,13 @@ module Hyrax
         entity_specific_where = where_builder.call(entity_responsibilities).and(
           entities[:id].eq(entity_responsibilities[:entity_id])
         )
-        entity_specific_where = filter_by_workflow_state(entity_specific_where, workflow_states, workflow_state_filter) if workflow_state_filter
         workflow_specific_where = where_builder.call(workflow_responsibilities)
-        workflow_specific_where = filter_by_workflow_state(workflow_specific_where, workflow_states, workflow_state_filter) if workflow_state_filter
 
-        result = Sipity::Entity.where(
+        Sipity::Entity.where(
           entities[:id].in(entity_specific_joins.where(entity_specific_where))
           .or(entities[:id].in(workflow_specific_joins.where(workflow_specific_where)))
         )
-        # Apply paging if provided
-        if per_page.nil?
-          result
-        else
-          result.page(page).per(per_page)
-        end
       end
-
-      # @api private
-      #
-      # Append a filter by workflow state name to the provided where builder.
-      # If the filter begins with a !, it will filter to states not equal to the filter.
-      def filter_by_workflow_state(where_builder, workflow_states, filter)
-        if filter.start_with?('!')
-          where_builder.and(workflow_states[:name].not_eq(filter[1..-1]))
-        else
-          where_builder.and(workflow_states[:name].eq(filter))
-        end
-      end
-
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       # @api public

data/app/services/hyrax/working_directory.rb

@@ -3,6 +3,7 @@ module Hyrax
   # @deprecated Use JobIoWrapper instead
   class WorkingDirectory
     class << self
+      # @deprecated No longer used anywhere in Hyrax code, naively assumes filenames of versions/revisions are distinct
       # Returns the file passed as filepath if that file exists. Otherwise it grabs the file from repository,
       # puts it on the disk and returns that path.
       # @param [String] repository_file_id identifier for Hydra::PCDM::File
@@ -10,6 +11,7 @@ module Hyrax
       # @param [String, NilClass] filepath path to existing cached copy of the file
       # @return [String] path of the working file
       def find_or_retrieve(repository_file_id, id, filepath = nil)
+        Deprecation.warn("Hyrax::WorkingDirectory.find_or_retrieve() is deprecated and no longer used in Hyrax")
         return filepath if filepath && File.exist?(filepath)
         repository_file = Hydra::PCDM::File.find(repository_file_id)
         working_path = full_filename(id, repository_file.original_name)

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>
-

data/app/views/_user_util_links.html.erb

@@ -1,28 +1,26 @@
-<ul id="user_utility_links" class="nav navbar-nav navbar-right">
+<ul id="user_utility_links" class="navbar-nav navbar-dark">
   <%= render 'shared/locale_picker' if available_translations.size > 1 %>
   <% if user_signed_in? %>
-    <li>
+    <li class="nav-item">
       <%= render_notifications(user: current_user) %>
     </li>
-    <li class="dropdown">
-      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
-        <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+        <span><%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
-        <span class="fa fa-user" aria-hidden="true"></span>
-        <span class="caret"></span>
-      <% end %>
-      <ul id="user-util-links" class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
-
-        <li class="divider"></li>
-        <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
-      </ul>
-    </li><!-- /.btn-group -->
+      </a>
+      <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+        <%= 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" %>
+      </div>
+    </li>
   <% else %>
-    <li>
-      <%= link_to main_app.new_user_session_path do %>
-        <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
+    <li class="nav-item">
+      <%= link_to main_app.new_user_session_path, class: 'nav-link' do %>
+        <span class="fa fa-sign-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
       <% end %>
     </li>
   <% end %>

data/app/views/catalog/_document.html.erb

@@ -1,5 +1,5 @@
-<li id="document_<%= document.to_param %>" class="document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
-  <div class="row search-result-wrapper">
+<li id="document_<%= document.to_param %>" class="pb-3 document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
+  <div class="search-result-wrapper row">
     <%= render_document_partials document, blacklight_config.view_config(document_index_view_type).partials, document_counter: document_counter %>
   </div>
 </li>

data/app/views/catalog/_document_list.html.erb

@@ -1,6 +1,6 @@
 <%# container for all documents in index view -%>
 <div id="search-results">
-  <ul class="list-unstyled catalog" start="<%= document_counter_with_offset(0) %>">
+  <ul class="list-unstyled catalog mt-4" start="<%= document_counter_with_offset(0) %>">
     <%= render documents, as: :document %>
   </ul>
 </div>

data/app/views/catalog/_facet_limit.html.erb

@@ -5,7 +5,7 @@
   <% unless paginator.last_page? || params[:action] == "facet" %>
     <li class="more_facets_link">
       <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field_label(facet_field.field).pluralize),
-          search_facet_path(id: facet_field.key), class: "more_facets_link" %>
+          search_facet_path(id: facet_field.key), class: "more_facets_link", data: { blacklight_modal: 'trigger' } %>
     </li>
   <% end %>
 </ul>

data/app/views/catalog/_index_gallery_collection_wrapper.html.erb

@@ -1,4 +1,4 @@
-<div class="document col-xs-6 col-md-3">
+<div class="document col-6 col-md-3">
   <div class="thumbnail">
     <%= collection_thumbnail(document, {}, counter: document_counter_with_offset(document_counter)) %>
     <div class="caption">

data/app/views/catalog/_index_header_list_collection.html.erb

@@ -1,4 +1,4 @@
-<div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
+  <h3 class="search-result-title mb-0 pr-3"><%= link_to document.title_or_label, [hyrax, document] %></h3>
   <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>

data/app/views/catalog/_index_header_list_default.html.erb

@@ -1,5 +1,5 @@
 <% model = document.hydra_model %>
-<div class="search-results-title-row">
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
   <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
     <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
     <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>

data/app/views/catalog/_index_list_default.html.erb

@@ -1,11 +1,13 @@
-<div class="col-md-6">
+<div class="col-md-9 col-lg-6">
   <div class="metadata">
-    <dl class="dl-horizontal">
+    <dl>
     <% doc_presenter = index_presenter(document) %>
     <% index_fields(document).each do |field_name, field| -%>
       <% if should_render_index_field? document, field %>
-          <dt data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
-          <dd><%= doc_presenter.field_value field %></dd>
+        <div class="row">
+          <dt class="col-5 text-right" data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
+          <dd class="col-7"><%= doc_presenter.field_value field %></dd>
+        </div>
       <% end %>
     <% end %>
     </dl>
@@ -13,7 +15,7 @@
 </div>
 <% if document.collection? %>
 <% collection_presenter = Hyrax::CollectionPresenter.new(document, current_ability) %>
-<div class="col-md-4">
+<div class="col-md-12 col-lg-3">
   <div class="collection-counts-wrapper">
     <div class="collection-counts-item">
       <span><%= collection_presenter.total_viewable_collections %></span>Collections

data/app/views/catalog/_search_form.html.erb

@@ -1,43 +1,41 @@
-<%= form_tag search_form_action, method: :get, class: "form-horizontal search-form", id: "search-form-header", role: "search" do %>
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+<%= form_tag search_form_action, method: :get, class: "search-form", id: "search-form-header", role: "search" do %>
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <%= hidden_field_tag :search_field, 'all_fields' %>
-  <div class="form-group">
+  <div class="form-group row">
 
-    <label class="control-label col-sm-3" for="search-field-header">
+    <label class="col-sm-3 mb-0" for="search-field-header">
       <%= t("hyrax.search.form.q.label", application_name: application_name) %>
     </label>
 
-    <div class="input-group">
+    <div class="input-group col-sm-9">
       <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
-      <div class="input-group-btn">
+      <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>
         </button>
         <% if current_user %>
-          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+          <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
             <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
-            <span class="caret"></span>
           </button>
 
-          <ul class="dropdown-menu pull-right">
-            <li>
+          <ul class="dropdown-menu dropdown-menu-right">
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
                   data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
                   data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          <% end %>
-
-        </ul>
+          </ul>
+        <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
     

data/app/views/catalog/_thumbnail_list_collection.html.erb

@@ -1,4 +1,4 @@
-<div class="col-md-2">
-  <%= render_thumbnail_tag document, {}, suppress_link: true %>
+<div class="col-md-3">
+  <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, { suppress_link: true }) %>
 </div> 
 

data/app/views/catalog/_thumbnail_list_default.html.erb

@@ -1,10 +1,10 @@
 <% model = document.hydra_model %>
-<div class="col-md-2">
+<div class="col-md-3">
   <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
-    <%= render_thumbnail_tag document, {}, suppress_link: true %>
+    <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, suppress_link: true) %>
   <% else %>
     <div class="list-thumbnail">
-      <%= render_thumbnail_tag document %>
+      <%= document_presenter(document)&.thumbnail&.thumbnail_tag %>
     </div>
   <% end %>
 </div>

data/app/views/catalog/facet.html.erb

@@ -0,0 +1,21 @@
+<%# Blacklight 7.24.0 %>
+<%# Override app/views/catalog/facet.html.erb %>
+
+<%= render Blacklight::System::ModalComponent.new do |component| %>
+  <%# Removed component prefix that duplicates the facet pagination view %>
+
+  <% component.title { facet_field_label(@facet.key) } %>
+
+  <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
+
+  <div class="facet-extended-list">
+    <%= render_facet_limit(@display_facet, layout: false) %>
+  </div>
+
+  <%# Removed component footer and placed the facet pagination partial within a `container` div %>
+  <div class="container">
+    <div class="facet-pagination bottom row justify-content-between">
+      <%= render :partial=>'facet_pagination' %>
+    </div>
+  </div>
+<% end %>

data/app/views/catalog/index.html.erb

@@ -1,7 +1,9 @@
-<div id="content" class="col-md-9 col-md-push-3 col-sm-8 col-sm-push-4">
+<div class="row mt-4">
+  <div id="content" class="order-sm-1 order-md-2 col-md-9 col-sm-12">
     <%= render 'search_results' %>
-</div>
+  </div>
 
-<div id="sidebar" class="col-md-3 col-md-pull-9 col-sm-4 col-sm-pull-8">
-  <%= render 'search_sidebar' %>
+  <div id="sidebar" class="order-sm-2 order-md-1 col-md-3 col-sm-12">
+    <%= render 'search_sidebar' %>
+  </div>
 </div>

data/app/views/hyrax/admin/admin_sets/_form.html.erb

@@ -1,26 +1,26 @@
     <%= render 'shared/nav_safety_modal' %>
-    <div class="panel panel-default tabs" id="admin-set-controls">
+    <div class="tabs mt-4" id="admin-set-controls">
       <ul class="nav nav-tabs" role="tablist">
-        <li class="active">
-          <a href="#description" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.description') %></a>
+        <li class="nav-item">
+          <a href="#description" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm"><%= t('.tabs.description') %></a>
         </li>
         <% if @form.persisted? %>
-          <li>
-            <a href="#participants" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.participants') %></a>
+          <li class="nav-item">
+            <a href="#participants" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.participants') %></a>
           </li>
-          <li>
-            <a href="#visibility" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.visibility') %></a>
+          <li class="nav-item">
+            <a href="#visibility" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.visibility') %></a>
           </li>
-          <li>
-            <a href="#workflow" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.workflow') %></a>
+          <li class="nav-item">
+            <a href="#workflow" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('.tabs.workflow') %></a>
           </li>
         <% end %>
       </ul>
-      <div class="tab-content">
-        <div id="description" class="tab-pane active">
-          <div class="panel panel-default labels">
+      <div class="tab-content card">
+        <div id="description" class="tab-pane show active">
+          <div class="labels">
             <%= simple_form_for @form, url: [hyrax, :admin, @form], html: { class: 'nav-safety' } do |f| %>
-              <div class="panel-body">
+              <div class="card-body">
                 <%= render 'form_metadata', f: f %>
 
                 <% if f.object.persisted? && f.object.member_ids.present? %>
@@ -31,10 +31,10 @@
 
               </div>
 
-              <div class="panel-footer">
+              <div class="card-footer d-flex justify-content-end">
                 <% cancel_path = f.object.persisted? ? hyrax.admin_admin_set_path(f.object) : hyrax.dashboard_collections_path %>
-                <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default pull-right' %>
-                <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+                <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+                <%= link_to t('.cancel'), cancel_path, class: 'btn btn-light' %>
               </div>
             <% end %>
           </div>

data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb

@@ -1,33 +1,35 @@
-                  <h3><%= t(".#{access}.title") %></h3>
-                  <p><%= t(".#{access}.help") %></p>
-                  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
-                    <table class="table table-striped share-status">
-                      <thead>
-                        <tr>
-                          <th><%= t(".#{access}.agent_name") %></th>
-                          <th><%= t(".#{access}.type") %></th>
-                          <th><%= t(".#{access}.action") %></th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
-                        <tr>
-                          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
-                          <td><%= g.agent_type.titleize %></td>
-                          <td>
-                            <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
-                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
-                            <% else %>
-                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
-                            <% end %>
-                          </td>
-                        </tr>
-                      <% end %>
-                      </tbody>
-                    </table>
-                  <% else %>
-                    <p><em><%= t(".#{access}.empty") %></em></p>
-                  <% end %>
-                  <%= button_tag t('.allow_all_registered'),
-                                 class: 'btn btn-info',
-                                 data: { behavior: 'add-registered-users' } if access == 'depositors' %>
+<div class="mb-4">
+  <h3 class="h4"><%= t(".#{access}.title") %></h3>
+  <p><%= t(".#{access}.help") %></p>
+  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
+    <table class="table table-striped share-status">
+      <thead>
+        <tr>
+          <th><%= t(".#{access}.agent_name") %></th>
+          <th><%= t(".#{access}.type") %></th>
+          <th><%= t(".#{access}.action") %></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
+        <tr>
+          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
+          <td><%= g.agent_type.titleize %></td>
+          <td>
+            <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
+              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
+            <% else %>
+              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <p><em><%= t(".#{access}.empty") %></em></p>
+  <% end %>
+  <%= button_tag t('.allow_all_registered'),
+                  class: 'btn btn-primary ',
+                  data: { behavior: 'add-registered-users' } if access == 'depositors' %>
+</div>