Merge branch 'main' into update-submodule-remove-simple-schema-loader…

…-decorator

Dockerfile

@@ -2,10 +2,9 @@ FROM ghcr.io/samvera/hyku/base:20b8c56e as hyku-knap-base
 
 # This is specifically NOT $APP_PATH but the parent directory
 COPY --chown=1001:101 . /app/samvera
-COPY --chown=1001:101 bundler.d/ /app/.bundler.d/
+RUN ln -s /app/samvera/bundler.d /app/.bundler.d
 ENV BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
 ENV BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true
-ENV BUNDLE_BUNDLER_INJECT__GEM_PATH=/app/samvera/bundler.d
 
 RUN bundle install --jobs "$(nproc)"
 

app/controllers/application_controller_decorator.rb

@@ -82,7 +82,7 @@ def global_request_logging
 
   def set_sentry_context
     Sentry.set_user(id: session[:current_user_id]) # Set user context
-    Sentry.set_extras(params: params.to_unsafe_h, url: request.url)  # Set extra context
+    Sentry.set_extras(params: params.to_unsafe_h, url: request.url) # Set extra context
   end
 end
 

app/services/adl/thumbnail_path_service_decorator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax v5.0.0rc2 + Hyku v6.0 - to set custom collection thumbnail default
+
+module Adl
+  module ThumbnailPathServiceDecorator
+    def default_collection_image
+      Site.instance.default_collection_image&.url || ActionController::Base.helpers.image_path('default-collection.png')
+    end
+  end
+end
+
+Hyrax::ThumbnailPathServiceDecorator.prepend(Adl::ThumbnailPathServiceDecorator)

app/views/themes/reshare_show/_user_util_links.html.erb

@@ -1,24 +1,26 @@
-<ul id="user_utility_links" class="nav navbar-nav navbar-right">
+<ul id="user_utility_links" class="navbar-nav ml-auto">
   <%= render 'shared/locale_picker' if available_translations.size > 1 %>
   <% if current_ability.user_groups.include?('admin') %>
-    <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 %>
+      <%= link_to hyrax.dashboard_profile_path(current_user), class: 'nav-link dropdown-toggle', id: 'navbarDropdown', role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
         <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
-        <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+        <%= current_user.name %>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
-        <span class="fa fa-user" aria-hidden="true"></span>
-        <span class="caret"></span>
+        <i class="fa fa-user" aria-hidden="true"></i>
       <% 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("hyku.toolbar.profile.edit_registration"), main_app.edit_user_registration_path %></li>
-        <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
-      </ul>
+      <div id="user-util-links" class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+        <a class="dropdown-item" href="<%= hyrax.dashboard_path %>"><%= t("hyrax.toolbar.dashboard.menu") %></a>
+	<% if Flipflop.show_login_link? || current_ability.user_groups.include?('admin') %>
+          <div class="dropdown-divider"></div>
+          <% if Devise.mappings[:user]&.registerable? %>
+            <a class="dropdown-item" href="<%= main_app.edit_user_registration_path %>"><%= t("hyku.toolbar.profile.edit_registration") %></a>
+          <% end %>
+          <a class="dropdown-item" href="<%= main_app.destroy_user_session_path %>"><%= t("hyrax.toolbar.profile.logout") %></a>
+	<% end %>
+      </div>
     </li><!-- /.btn-group -->
   <% end %>
 </ul>

bundler.d/example.rb

@@ -6,6 +6,6 @@
 # or `ensure_gem` to make sure a gem is there w/o worrying about if it is an
 # override or not
 
-gem "sentry-ruby"
-gem "sentry-rails"
-gem "sentry-sidekiq"
+ensure_gem "sentry-ruby"
+ensure_gem "sentry-rails"
+ensure_gem "sentry-sidekiq"

config/metadata/collection_resource.yaml

@@ -75,6 +75,14 @@ attributes:
       - "bibliographic_citation_sim"
       - "bibliographic_citation_tesim"
     predicate: http://purl.org/dc/terms/bibliographicCitation
+  collection_subtitle:
+    type: string
+    multiple: true
+    form:
+      primary: true
+    index_keys:
+      - 'collection_subtitle_sim'
+      - 'collection_subtitle_tesim'
   contributor:
     type: string
     multiple: true
@@ -88,8 +96,8 @@ attributes:
     type: string
     multiple: true
     form:
-      required: true
-      primary: true
+      required: false
+      primary: false
     index_keys:
       - "creator_sim"
       - "creator_tesim"
@@ -107,7 +115,7 @@ attributes:
     type: string
     multiple: true
     form:
-      primary: false
+      primary: true
     index_keys:
       - "description_sim"
       - "description_tesim"
@@ -202,7 +210,7 @@ attributes:
     type: string
     multiple: true
     form:
-      primary: true
+      primary: false
     index_keys:
       - "rights_statement_sim"
       - "rights_statement_tesim"

config/show_themes.yml

@@ -0,0 +1,19 @@
+# These settings are to provide information about your theme
+# and should follow the format
+# theme:
+#   name: Theme notes
+#   notes: Notes about the theme you want to display
+#
+default_show:
+  name: Default Show Page
+  notes: This is the default Hyku show page. It is recommended for use with cultural repositories.
+cultural_show:
+  name: Cultural Show Page
+  notes: This image based show page is recommended for cultural repositories.
+scholarly_show:
+  name: Scholarly Show Page
+  notes: This text based show page is recommended for institutional repositories.
+reshare_show:
+  name: ReShare Show Page
+  notes: For ReShare CDL Pilot use only, do not use unless instructed to do so.
+

ops/staging-deploy.tmpl.yaml

@@ -66,8 +66,6 @@ ingress:
       secretName: palni-palci-staging-tls
 
 extraEnvVars: &envVars
-  - name: BUNDLE_BUNDLER_INJECT__GEM_PATH
-    value: /app/samvera/bundler.d
   - name: BUNDLE_DISABLE_LOCAL_BRANCH_CHECK
     value: "true"
   - name: BUNDLE_LOCAL__HYKU_KNAPSACK
@@ -181,7 +179,7 @@ extraEnvVars: &envVars
   - name: SOLR_COLLECTION_NAME
     value: palni-palci-staging
   - name: SOLR_CONFIGSET_NAME
-    value: palni-palci-staging
+    value: production-palni-palci
   - name: SOLR_HOST
     value: solr.solr
   - name: SOLR_PORT
@@ -194,6 +192,8 @@ extraEnvVars: &envVars
     value: testing123
   - name: VALKYRIE_ID_TYPE
     value: string
+  - name: VALKYRIE_TRANSITION
+    value: "true"
 
 worker:
   replicaCount: 1