.koppie/config/initializers/1_valkyrie.rb

@@ -34,7 +34,9 @@
       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
     base_path: Rails.env,
     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
-    fedora_version: 6
+    fedora_version: 6.5,
+    fedora_pairtree_count: 4,
+    fedora_pairtree_length: 2
   ), :fedora_metadata
 )
 
@@ -64,7 +66,9 @@
     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
     base_path: Rails.env,
-    fedora_version: 6
+    fedora_version: 6.5,
+    fedora_pairtree_count: 4,
+    fedora_pairtree_length: 2
   ), :fedora_storage
 )
 

app/assets/stylesheets/hyrax/_card.scss

@@ -2,6 +2,10 @@
   margin-bottom: 20px;
 }
 
+#featured_works .card {
+  margin-bottom: 5px;
+}
+
 .card-title {
   margin-top: 0;
   margin-bottom: 0;

app/assets/stylesheets/hyrax/_catalog.scss

@@ -23,6 +23,16 @@
     }
   }
 
+  .search-results-title-row {
+    .badge {
+      margin-bottom: 6px;
+    }
+
+    .search-result-title {
+      margin-right: 16px;
+    }
+  }
+
   .collection-icon-search {
     padding-bottom: 20px;
   }

app/assets/stylesheets/hyrax/_facets.scss

@@ -3,6 +3,18 @@
     width: 100%;
 }
 
+.facet-field-heading button.collapsed::after {
+    transition: transform 0.25s ease;
+}
+
+.facet-field-heading button::after {
+    transition: transform 0.25s ease;
+}
+
+.collapsing {
+    transition: height 0.25s ease;
+}
+
 .facets-header > .navbar-toggler {
     display: none;
 }

app/assets/stylesheets/hyrax/_featured.scss

@@ -44,3 +44,7 @@ ol#featured_works {
   padding: 1em 0;
   border-bottom: 1px dotted $gray-lighter;
 }
+
+.dd-handle.dd3-handle {
+  z-index: 1;
+}

app/assets/stylesheets/hyrax/_nestable.scss

@@ -47,12 +47,12 @@ tr.dd-item {
 
 .dd-placeholder,
 .dd-empty { margin: 5px 0; padding: 0; min-height: 30px; border: 1px dashed #b6bcbf; box-sizing: border-box; -moz-box-sizing: border-box; }
-.dd-empty { border: 1px dashed #bbb; min-height: 100px; 
-    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
+.dd-empty { border: 1px dashed #bbb; min-height: 100px;
+    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
                       -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image:    -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
+    background-image:    -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
                          -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image:         linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), 
+    background-image:         linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
                               linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
     background-size: 60px 60px;
     background-position: 0 0, 30px 30px;
@@ -95,15 +95,16 @@ tr.dd-item {
 
 .dd3-item > button { margin-left: 30px; }
 
-.dd3-handle { 
+.dd3-handle {
     position: absolute; margin: 0; left: 0; top: 0; cursor: pointer; width: 30px;
     text-indent: 100px;
     white-space: nowrap; overflow: hidden;
     border: 1px solid #aaa;
     background: #ddd;
     background: -webkit-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background:    -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background:         linear-gradient(top, #ddd 0%, #bbb 100%);
+    background: -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
+    background: -o-linear-gradient(to bottom, #ddd 0%, #bbb 100%);
+    background: linear-gradient(to bottom, #ddd 0%, #bbb 100%);
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
 }

app/presenters/hyrax/menu_presenter.rb

@@ -33,7 +33,7 @@ def settings_section?
     def nav_link(options, also_active_for: nil, **link_html_options)
       active_urls = [options, also_active_for].compact
       list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active nav-item' } : { class: 'nav-item' }
-      tag.li(list_options) do
+      tag.li(**list_options) do
         link_to(options, link_html_options) do
           yield
         end

app/views/hyrax/dashboard/_sidebar.html.erb

@@ -12,7 +12,7 @@
         </div>
       </div>
     </li>
-    <li class="nav-item">
+    <li class="nav-item <%= 'active' if current_page?(hyrax.dashboard_path) %>">
       <%= link_to hyrax.dashboard_path, class: "nav-link", title: t('hyrax.admin.sidebar.dashboard') do %>
         <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
       <% end %>

docker-compose-sirenia.yml

@@ -134,7 +134,8 @@ services:
         CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8
         -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
         -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
-      - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
+        -Dfcrepo.pid.minter.length=2 -Dfcrepo.pid.minter.count=4
+      - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dfcrepo.pid.minter.length=2 -Dfcrepo.pid.minter.count=4
     volumes:
       - fcrepo:/fcrepo-home
     ports:

hyrax.gemspec

@@ -85,7 +85,7 @@ SUMMARY
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
-  spec.add_dependency 'valkyrie', '~> 3.1.1'
+  spec.add_dependency 'valkyrie', '~> 3.3'
   spec.add_dependency 'view_component', '~> 2.74.1' # Pin until blacklight is updated with workaround for https://github.com/ViewComponent/view_component/issues/1565
   spec.add_dependency 'sprockets', '3.7.2' # 3.7.3 fails feature specs
   spec.add_dependency 'sass-rails', '~> 6.0'

lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb

@@ -36,7 +36,9 @@
 #     )),
 #     base_path: Rails.env,
 #     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
-#     fedora_version: 6
+#     fedora_version: 6.5,
+#     fedora_pairtree_count: 4,
+#     fedora_pairtree_length: 2
 #   ), :fedora_metadata
 # )
 
@@ -68,7 +70,9 @@
 #       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
 #     )),
 #     base_path: Rails.env,
-#     fedora_version: 6
+#     fedora_version: 6.5,
+#     fedora_pairtree_count: 4,
+#     fedora_pairtree_length: 2
 #   ), :fedora_storage
 # )
 

lib/hyrax/engine.rb

@@ -34,7 +34,6 @@ class Engine < ::Rails::Engine
     require 'hyrax/transactions'
     require 'hyrax/errors'
     require 'hyrax/valkyrie_simple_path_generator'
-    require 'hyrax/rubocop/custom_cops'
 
     # Force these models to be added to Legato's registry in development mode
     config.eager_load_paths += %W[

spec/lib/hyrax/rubocop/custom_cops_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'hyrax/rubocop/custom_cops'
 
 RSpec.describe Hyrax::RuboCop::CustomCops::ArResource do
   subject(:cop) { described_class.new }