hyrax 3.4.2 → 4.0.0.beta2

data/app/views/hyrax/uploads/_js_templates_versioning.html.erb

@@ -1,5 +1,5 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
+<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
 <script id="versioning-template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
@@ -12,24 +12,24 @@
         </td>
         <td>
             <p class="size">Processing...</p>
-            <div class="progress progress-striped active"
+            <div class="progress"
                  role="progressbar"
                  aria-valuemin="0"
                  aria-valuemax="100"
                  aria-valuenow="0">
-               <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+               <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
              </div>
         </td>
         <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
-                    <span class="glyphicon glyphicon-upload"></span>
+                    <span class="fa fa-upload"></span>
                     <span><%= t('.start') %></span>
                 </button>
             {% } %}
             {% if (!i) { %}
                 <button class="btn btn-sm btn-warning cancel">
-                    <span class="glyphicon glyphicon-ban-circle"></span>
+                    <span class="fa fa-ban"></span>
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
@@ -69,26 +69,26 @@
             </div>
             <div class="col-sm-6">
               {% if (file.error) { %}
-                  <div><span class="label label-danger">Error</span> {%=file.error%}</div>
+                  <div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
               {% } %}
               <span class="size">{%=o.formatFileSize(file.size)%}</span>
-              <button class="btn btn-sm btn-danger delete pull-right"
+              <button class="btn btn-sm btn-danger delete float-right"
                       data-type="{%=file.deleteType%}"
                       data-url="{%=file.deleteUrl%}"
                       {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-trash"></span>
+                  <span class="fa fa-trash"></span>
                   <span><%= t('helpers.action.delete') %></span>
               </button>
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-12 form-horizontal">
-              <div class="form-group">
-                <label for="title_{%=file.id%}" class="col-sm-5 control-label"><%= t('.display_label') %></label>
+            <div class="col-sm-12">
+              <div class="form-group row">
+                <label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
                 <div class="col-sm-7 padding-bottom">
                   <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
                 </div>
-                <label for="resource_type_{%=file.id%}" class="col-sm-5 control-label">Resource Type</label>
+                <label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
                 <div class="col-sm-7 padding-bottom">
                   <select class="form-control resource_type_dropdown"
                           multiple="multiple"
@@ -98,7 +98,7 @@
                            value="{%=file.name%}">
                     <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
                   </select>
-                  <button class="btn btn-default pull-right resource_type_button"
+                  <button class="btn btn-secondary float-right resource_type_button"
                           onClick="setAllResourceTypesVersioning({%= file.id %}); return false;">
                           <%= t('.set_all_to_this_resource_type') %>
                   </button>
@@ -125,7 +125,7 @@
                   <input type="hidden" name="files_files[]" value="{%=file.id%}">
                 </span>
                 {% if (file.error) { %}
-                  <span><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</span>
+                  <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
                 {% } %}
               </div>
 
@@ -134,7 +134,7 @@
                         data-type="{%=file.deleteType%}"
                         data-url="{%=file.deleteUrl%}"
                         onclick=$("#files").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
                     <%= t('.previous') %>

data/app/views/hyrax/users/_activity.html.erb

@@ -1,3 +1,3 @@
-        <div class="tab-pane" id="activity_log">
-          <%= render 'hyrax/users/activity_log', events: presenter.events %>
-        </div>
+<div class="tab-pane" id="activity_log">
+  <%= render 'hyrax/users/activity_log', events: presenter.events %>
+</div>

data/app/views/hyrax/users/_contributions.html.erb

@@ -1,4 +1,4 @@
-<div class="tab-pane active" id="contributions">
+<div class="tab-pane show active" id="contributions">
   <% if presenter.trophies.count > 0 %>
     <table>
       <% presenter.trophies.each do |t| %>
@@ -11,8 +11,8 @@
           <td>
             <%= link_to t.to_s, [main_app, t] %>
             <% if presenter.current_user? %>
-              <%= display_trophy_link current_user, t.id, class: 'glyphicon glyphicon-star', data: { removerow: true } do %>
-                <span class='trophy-on glyphicon glyphicon-remove'></span>
+              <%= display_trophy_link current_user, t.id, class: 'fa fa-star', data: { removerow: true } do %>
+                <span class='trophy-on fa fa-times'></span>
               <% end %>
             <% end %>
           </td>

data/app/views/hyrax/users/_left_sidebar.html.erb

@@ -1,4 +1,4 @@
 <%= render 'hyrax/users/user', user: @user %>
 
 <br />
-<a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="glyphicon glyphicon-globe" aria-hidden="true"></i><%= t('.view_users') %></a>
+<a class="btn btn-primary" href="<%= hyrax.users_path %>"><i class="fa fa-globe" aria-hidden="true"></i><%= t('.view_users') %></a>

data/app/views/hyrax/users/_profile_tabs.html.erb

@@ -1,9 +1,17 @@
-      <ul class="nav nav-tabs" id="myTab">
-        <li class="active"><a href="#contributions"><span class="glyphicon glyphicon-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %></a></li>
-        <li><a href="#activity_log"><span class="glyphicon glyphicon-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %></a></li>
-      </ul>
+<ul class="nav nav-tabs" id="myTab">
+  <li class="nav-item">
+    <a class="nav-link active" href="#contributions">
+      <span class="fa fa-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %>
+    </a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link" href="#activity_log">
+      <span class="fa fa-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %>
+    </a>
+  </li>
+</ul>
 
-      <div class="tab-content panel-body">
-        <%= render 'contributions', presenter: presenter %>
-        <%= render 'activity', presenter: presenter %>
-      </div> <!-- /tab-content -->
+<div class="tab-content card-body">
+  <%= render 'contributions', presenter: presenter %>
+  <%= render 'activity', presenter: presenter %>
+</div> <!-- /tab-content -->

data/app/views/hyrax/users/_search_form.html.erb

@@ -4,9 +4,9 @@
     <label class="sr-only" for="user_search"><%= t('.search_users') %></label>
     <%= text_field_tag :uq, params[:uq], class: "q", placeholder: t('.search_users'), size: '30', type: "search", id: "user_search" %>
     <%= hidden_field_tag :sort, params[:sort], id: 'user_sort' %>
-    <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
+    <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
     <button type="submit" class="btn btn-primary" id="user_submit">
-      <span class="glyphicon glyphicon-search"></span><%= t('.go') %>
+      <span class="fa fa-search"></span><%= t('.go') %>
     </button>
   <% end %>
 </div>

data/app/views/hyrax/users/_user.html.erb

@@ -1,5 +1,5 @@
-<div class="panel panel-default panel-user">
-  <div class="panel-heading">
+<div class="card panel-user">
+  <div class="card-header">
     <%= image_tag user.avatar.url(:thumb), width: 100 if user.avatar.present? %>
     <h3>
       <%= user.name %>
@@ -14,10 +14,10 @@
     </div>
   </div>
 
-  <div class="panel-footer clearfix">
+  <div class="card-footer clearfix">
     <% if can? :edit, user %>
-      <%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-default pull-right" do %>
-        <span class="glyphicon glyphicon-edit"></span> <%= t("hyrax.edit_profile") %>
+      <%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-secondary float-right" do %>
+        <span class="fa fa-edit"></span> <%= t("hyrax.edit_profile") %>
       <% end %>
     <% end %>
   </div>

data/app/views/hyrax/users/_user_info.html.erb

@@ -34,12 +34,12 @@
   <dd><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>
-    <dt><span class="glyphicon glyphicon-bullhorn" aria-hidden="true"></span> Chat ID</dt>
+    <dt><span class="fa fa-bullhorn" aria-hidden="true"></span> Chat ID</dt>
     <dd><%= user.chat_id %></dd>
   <% end %>
 
   <% if user.website %>
-    <dt><span class="glyphicon glyphicon-globe" aria-hidden="true"></span> Website(s)</dt>
+    <dt><span class="fa fa-globe" aria-hidden="true"></span> Website(s)</dt>
     <dd><%= iconify_auto_link(user.website) %></dd>
   <% end %>
 
@@ -64,7 +64,7 @@
   <% end %>
 
   <% if user.address %>
-    <dt><span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span> Address</dt>
+    <dt><span class="fa fa-map-marker" aria-hidden="true"></span> Address</dt>
     <dd><%= user.address %></dd>
   <% end %>
 
@@ -74,7 +74,7 @@
   <% end %>
 
   <% if user.telephone %>
-    <dt><span class="glyphicon glyphicon-earphone" aria-hidden="true"></span> Telephone</dt>
+    <dt><span class="fa fa-phone" aria-hidden="true"></span> Telephone</dt>
     <dd><%= link_to_telephone(user) %></dd>
   <% end %>
 

data/app/views/hyrax/users/_vitals.html.erb

@@ -1,15 +1,15 @@
 <div class="list-group-item">
-  <span class="glyphicon glyphicon-time" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
+  <span class="fa fa-clock-o" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
 </div>
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_collections(user) %></span>
-  <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
+  <span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
 </div>
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_works(user) %></span>
-  <span class="glyphicon glyphicon-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
+  <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
       <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>

data/app/views/hyrax/users/show.html.erb

@@ -1,9 +1,9 @@
 <div class="row profile">
-  <div class="col-xs-3">
+  <div class="col-3">
     <%= render 'left_sidebar' %>
   </div>
   <!-- right col -->
-  <div class="col-xs-9">
+  <div class="col-9">
     <%= render 'profile_tabs', presenter: @presenter %>
   </div>
 </div>

data/app/views/layouts/hyrax/dashboard.html.erb

@@ -9,18 +9,18 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: 'fixed-top' %>
     <%= content_for(:navbar) %>
     <div id="content-wrapper" role="main">
       <div class="sidebar maximized">
         <%= render 'hyrax/dashboard/sidebar' %>
       </div>
-      <div class="main-content maximized">
+      <div class="main-content maximized<%= " admin-stats" if request.fullpath.include? '/admin/stats' %>">
         <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
         <%= render '/flash_msg' %>
         <% if content_for?(:page_header) %>
           <div class="row">
-            <div class="col-xs-12 main-header">
+            <div class="col-12 main-header">
               <%= yield(:page_header) %>
             </div>
           </div>
@@ -33,6 +33,6 @@
       </div>
 
     </div><!-- /#content-wrapper -->
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>

data/app/views/layouts/hyrax.html.erb

@@ -9,15 +9,16 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: nil %>
     <%= content_for(:navbar) %>
     <%= content_for(:precontainer_content) %>
     <div id="content-wrapper" class="container" role="main">
+      <%= content_for(:container_header) %>
       <%= render '/flash_msg' %>
       <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
       <% if content_for?(:page_header) %>
         <div class="row">
-          <div class="col-xs-12 main-header">
+          <div class="col-12 main-header">
             <%= yield(:page_header) %>
           </div>
         </div>
@@ -28,6 +29,6 @@
       <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>

data/app/views/shared/_appearance_styles.html.erb

@@ -2,17 +2,17 @@
 <style>
 <% appearance = Hyrax::Forms::Admin::Appearance.new %>
 a { color: <%= appearance.link_color %>; }
-.navbar-inverse .navbar-link { color: <%= appearance.footer_link_color %>; }
+.navbar-dark.bg-dark .navbar-link { color: <%= appearance.footer_link_color %>; }
 
-.navbar-inverse { background-color: <%= appearance.header_background_color %>; }
+.navbar-dark.bg-dark { background-color: <%= appearance.header_background_color %> !important; }
 
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
+.navbar-dark.bg-dark .navbar-nav > .open > a,
+.navbar-dark.bg-dark .navbar-nav > .open > a:hover,
+.navbar-dark.bg-dark .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
 
-.navbar-inverse .navbar-nav > li > a,
-.navbar-inverse .navbar-text,
-.navbar-inverse .navbar-brand { color: <%= appearance.header_text_color %>; }
+.navbar-dark.bg-dark .navbar-nav > li > a,
+.navbar-dark.bg-dark .navbar-text,
+.navbar-dark.bg-dark .navbar-brand { color: <%= appearance.header_text_color %>; }
 
 .btn-primary {
   background-color: <%= appearance.primary_button_background_color %>;

data/app/views/shared/_footer.html.erb

@@ -1,4 +1,4 @@
-<footer class="navbar navbar-inverse site-footer">
+<footer class="navbar navbar-dark bg-dark site-footer">
   <div class="container-fluid">
     <div class="navbar-text text-left">
         <p><%= t('hyrax.footer.service_html') %></p>

data/app/views/shared/_locale_picker.html.erb

@@ -2,15 +2,12 @@
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="language-dropdown-menu">
         <span class="sr-only"><%= t('hyrax.toolbar.language_switch') %></span>
         <span title="<%= t('hyrax.toolbar.language_switch') %>"><%= available_translations[I18n.locale.to_s] %></span>
-        <b class="caret"></b>
     </a>
-    <ul id="language-dropdown-menu" class="dropdown-menu" role="menu">
-        <li role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></li>
-        <li role="presentation" class="divider"></li>
+    <div id="language-dropdown-menu" class="dropdown-menu" role="menu">
+        <div role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></div>
+        <div role="presentation" class="dropdown-divider"></div>
         <% available_translations.each do |language, label| %>
-            <li role="presentation" lang="<%= language %>">
-                <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', tabindex: '-1', data: { locale: language } %>
-            </li>
+            <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', lang: language, tabindex: '-1', data: { locale: language } %>
         <% end %>
-    </ul>
+    </div>
 </li>

data/app/views/shared/_nav_safety_modal.html.erb

@@ -5,8 +5,8 @@
         <%= t(:'hyrax.nav_safety.change_tab_message') %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-default" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
+        <button type="button" class="btn btn-secondary" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-secondary" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
       </div>
     </div>
   </div>

data/app/views/shared/_select_work_type_modal.html.erb

@@ -3,8 +3,8 @@
   <div class="modal-dialog" role="document">
     <form class="modal-content new-work-select">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
         <h2 class="modal-title" id="select-worktype-label"><%= t('hyrax.dashboard.heading_actions.select_type_of_work') %></h2>
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
       </div>
       <div class="modal-body">
         <% create_work_presenter.each do |row_presenter| %>
@@ -25,7 +25,7 @@
         <% end %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
         <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.heading_actions.create_work') %>" />
       </div>
     </form>

data/chart/hyrax/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 1.5.1
+version: 1.6.0
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo

data/chart/hyrax/templates/_helpers.tpl

@@ -163,8 +163,12 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
+{{- define "hyrax.solr.port" -}}
+{{- .Values.externalSolrPort | default "8983" }}
+{{- end -}}
+
 {{- define "hyrax.solr.url" -}}
-{{- printf "http://%s:%s@%s:%s/solr/%s" (include "hyrax.solr.username" .) (include "hyrax.solr.password" .) (include "hyrax.solr.host" .) "8983" (include "hyrax.solr.collectionName" .)  -}}
+{{- printf "http://%s:%s@%s:%s/solr/%s" (include "hyrax.solr.username" .) (include "hyrax.solr.password" .) (include "hyrax.solr.host" .) (include "hyrax.solr.port" .) (include "hyrax.solr.collectionName" .)  -}}
 {{- end -}}
 
 {{- define "hyrax.zk.fullname" -}}

data/chart/hyrax/templates/configmap-env.yaml

@@ -38,5 +38,5 @@ data:
   SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}
   SOLR_CONFIGSET_NAME: {{ template "hyrax.fullname" . }}
   SOLR_HOST: {{ template "hyrax.solr.host" . }}
-  SOLR_PORT: "8983"
+  SOLR_PORT: {{ (include "hyrax.solr.port" .) | quote }}
   SOLR_URL: {{ template "hyrax.solr.url" . }}

data/chart/hyrax/values.yaml

@@ -22,6 +22,7 @@ loadSolrConfigSet: true
 #   ignored if `solr.enabled` is true
 solrExistingSecret: ""
 externalSolrHost: ""
+externalSolrPort: ""
 externalSolrUser: ""
 externalSolrPassword: ""
 externalSolrCollection: "hyrax"

data/config/features.rb

@@ -47,5 +47,5 @@ Flipflop.configure do
           default: false,
           description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
 rescue Flipflop::StrategyError, Flipflop::FeatureError => err
-  Rails.logger.warn "Ignoring #{err}: #{err.message}"
+  Hyrax.logger.warn "Ignoring #{err}: #{err.message}"
 end

data/config/initializers/reform_rails_6_1_monkey_patch.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Taken from https://github.com/trailblazer/reform-rails/issues/86#issuecomment-763120151
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Lint/UselessAssignment
+module Reform
+  class Contract < Disposable::Twin
+    class Result
+      private
+
+      # this doesn't do nested errors (e.g. )
+      def filter_for(method, *args)
+        @results.collect { |r| r.public_send(method, *args).to_h }
+                .inject({}) { |hah, err| hah.merge(err) { |_key, old_v, new_v| (new_v.is_a?(Array) ? (old_v |= new_v) : old_v.merge(new_v)) } }
+                .find_all do |_k, v| # filter :nested=>{:something=>["too nested!"]} #DISCUSS: do we want that here?
+                  if v.is_a?(Hash)
+                    nested_errors = v.select { |attr_key, val| attr_key.is_a?(Integer) && val.is_a?(Array) && val.any? }
+                    v = nested_errors.to_a if nested_errors.any?
+                  end
+                  v.is_a?(ActiveModel::DeprecationHandlingMessageArray)
+                end.to_h
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:disable Lint/UselessAssignment

data/config/locales/hyrax.de.yml

@@ -557,7 +557,7 @@ de:
           actions: Aktion
           title: Sammlungstitel
       form_permission:
-        visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </ Small>
+        visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </small>
       form_permission_under_embargo:
         help_html: "<strong>Diese Arbeit ist unter Embargo.</strong> Hier können Sie die Einstellungen des Embargos ändern, oder Sie können den %{edit_link} besuchen, um ihn zu deaktivieren."
         legend_html: Sichtbarkeit <small>Wer sollte in der Lage sein, diesen Inhalt anzusehen oder herunterzuladen?</small>
@@ -596,6 +596,7 @@ de:
         legend_html: Miniaturansicht
       form_visibility_component:
         visibility: Sichtbarkeit
+        subtitle_html: <small>Wer sollte diesen Inhalt anzeigen oder herunterladen können?</small>
       inspect_work:
         back_to: Zurück zu
         entity_id: Mandanten-ID
@@ -1086,14 +1087,14 @@ de:
       no_transfers: Sie haben keine Arbeit übertragen
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </ i> Bild ändern
+          change_picture: <i class = "fa fa-camera"> </ i> Bild ändern
           delete_picture: Bild löschen
           delete_picture_data_content: Wenn Sie Ihr Bild vollständig entfernen möchten, aktivieren Sie das Kontrollkästchen und speichern Sie Ihr Profil.
           delete_picture_data_original_title: Bild löschen
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </ i> Facebook-Handle
           google_handle: <i class = "fa-fa-google-plus"> </ i> Google+ Handle
           help_change_picture_type: JPG, GIF oder PNG (weniger als 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </ i> Profil speichern
+          save_profile: <i class = "fa fa-floppy-o"> </ i> Profil speichern
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </ i> Twitter-Handle
       proxy_activity: Vertreter-Aktivität
       proxy_add_deny: Sie können sich nicht selbst zum Stellvertreter machen
@@ -1483,7 +1484,7 @@ de:
       read: Lesen/Download
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Suchen
+        html: <span class="fa fa-search"></span> Suchen
         text: Suche
       form:
         option:
@@ -1829,7 +1830,7 @@ de:
         find_child_work: Suche nach einer Arbeit ...
         member_of_collection_ids: Wählen Sie eine Sammlung ...
     required:
-      html: <span class="label label-info required-tag">erforderlich</span>
+      html: <span class="badge badge-info required-tag">erforderlich</span>
   total_view:
     one: Diese Arbeit hat 1 Gesamtansicht
     other: Dieses Werk hat insgesamt %{count} Aufrufe

data/config/locales/hyrax.en.yml

@@ -588,6 +588,7 @@ en:
         legend_html: Thumbnail
       form_visibility_component:
         visibility: Visibility
+        subtitle_html: <small>Who should be able to view or download this content?</small>
       inspect_work:
         back_to: Back to
         entity_id: Entity ID
@@ -1077,14 +1078,14 @@ en:
       no_transfers: You haven't transferred any work
       profiles:
         edit_primary:
-          change_picture: <i class="glyphicon glyphicon-camera"></i> Change picture
+          change_picture: <i class="fa fa-camera"></i> Change picture
           delete_picture: Delete picture
           delete_picture_data_content: If you would like to remove your picture entirely, check the box and save your profile.
           delete_picture_data_original_title: Delete Picture
           facebook_handle: <i class="fa fa-facebook" aria-hidden="true"></i> Facebook Handle
           google_handle: <i class="fa fa-google-plus"></i> Google+ Handle
           help_change_picture_type: JPG, GIF, or PNG (less than 2MB)
-          save_profile: <i class="glyphicon glyphicon-save"></i> Save Profile
+          save_profile: <i class="fa fa-floppy-o"></i> Save Profile
           twitter_handle: <i class="fa fa-twitter" aria-hidden="true"></i> Twitter Handle
       proxy_activity: Proxy Activity
       proxy_add_deny: You cannot make yourself a proxy
@@ -1473,7 +1474,7 @@ en:
     read_only: The repository is in read-only mode for maintenance. No submissions or edits can be made at this time.
     search:
       button:
-        html: <span class="glyphicon glyphicon-search" aria-hidden="true"></span> Go
+        html: <span class="fa fa-search" aria-hidden="true"></span> Go
         text: Search
       form:
         option:
@@ -1687,6 +1688,8 @@ en:
         note_html: Keep to myself with option to share.
         text: Private
       restricted_title_attr: Change the visibility of this resource
+      unknown:
+        text: Unknown
     work_button_row:
       attach_child: Attach Child
     workflow:
@@ -1818,7 +1821,7 @@ en:
         find_child_work: Search for a work…
         member_of_collection_ids: Select a collection…
     required:
-      html: <span class="label label-info required-tag">required</span>
+      html: <span class="badge badge-info required-tag">required</span>
   total_view:
     one: This work has 1 total view
     other: This work has %{count} total views