Merge branch 'main' into update-hyrax-to-flexible_double_combo

.github/workflows/base.yaml

@@ -5,13 +5,13 @@ on:
     inputs:
       debug_enabled:
         type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+        description: "Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)"
         required: false
         default: false
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]
     secrets: inherit
     with:
       platforms: "linux/amd64,linux/arm64"

.github/workflows/build-test-lint.yaml

@@ -27,7 +27,7 @@ env:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]
     secrets: inherit
     with:
       platforms: "linux/amd64" # "linux/amd64,linux/arm64"
@@ -37,20 +37,20 @@ jobs:
 
   lint:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]
     with:
       webTarget: hyku-web
       workerTarget: hyku-worker
       rubocop_cmd: "bundle exec rubocop --parallel --format progress"
 
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]
     with:
       confdir: "/app/samvera/hyrax-webapp/solr/conf"
       rspec_cmd: "gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"
 
   reports:
     if: always()
     needs: [test, lint]
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]

.github/workflows/deploy.yaml

@@ -56,7 +56,7 @@ jobs:
     steps:
       - id: setup
         name: Setup
-        uses: scientist-softserv/actions/[email protected]
+        uses: notch8/actions/[email protected]
         with:
           tag: ${{ inputs.tag }}
           image_name: ${{ inputs.image_name }}

Gemfile

@@ -20,7 +20,7 @@ gem 'active-fedora', '~> 14.0'
 gem 'activerecord-nulldb-adapter'
 gem 'activesupport', '>= 4.2.0', group: %i[development test]
 gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed
-gem 'apartment', github: 'scientist-softserv/apartment', branch: 'development'
+gem 'apartment', github: 'notch8/apartment', branch: 'development'
 gem 'aws-sdk-sqs', group: %i[aws]
 gem 'bixby', group: %i[development test]
 gem 'blacklight', '~> 7.29'
@@ -58,7 +58,7 @@ gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
 gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
 gem 'i18n-debug', require: false, group: %i[development test]
 gem 'i18n-tasks', group: %i[development test]
-gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'i84-support-dynamic-metadata'
+gem 'iiif_print', github: 'notch8/iiif_print', branch: 'i84-support-dynamic-metadata'
 gem 'jbuilder', '~> 2.5'
 gem 'jquery-rails' # Use jquery as the JavaScript library
 gem 'openssl', '>= 3.2.0'
@@ -121,7 +121,7 @@ gem 'valkyrie-shrine'
 gem 'web-console', '>= 3.3.0', group: %i[development] # <%= console %> in views
 gem 'webdrivers', '~> 4.7.0', group: %i[test]
 gem 'webmock', group: %i[test]
-gem 'willow_sword', github: 'scientist-softserv/willow_sword', branch: 'main'
+gem 'willow_sword', github: 'notch8/willow_sword', branch: 'main'
 
 # Enabling the following gem breaks sidekiq. To Enable: assets.debug must be set to true in config/development.rb
 # gem "xray-rails", git: "https://github.com/brentd/xray-rails.git", branch: "bugs/ruby-3.0.0", group: %i[development]

Gemfile.lock

@@ -7,6 +7,39 @@ GIT
       aws-sdk-sqs (~> 1)
       rails (>= 4.2)
 
+GIT
+  remote: https://github.com/notch8/apartment.git
+  revision: 9ad4b0ef2ee6debb956e86ef9e7095c8358fef5e
+  branch: development
+  specs:
+    apartment (2.2.1)
+      activerecord (>= 3.1.2, < 7.0)
+      parallel (>= 0.7.1)
+      public_suffix (>= 2)
+      rack (>= 1.3.6)
+
+GIT
+  remote: https://github.com/notch8/iiif_print.git
+  revision: acef382ce710d6aad63e11cfa83b5803a9f30fa2
+  branch: main
+  specs:
+    iiif_print (3.0.1)
+      blacklight_iiif_search (>= 1.0, < 3.0)
+      derivative-rodeo (~> 0.5)
+      hyrax (>= 2.5, < 6)
+      nokogiri (>= 1.13.2)
+      rdf-vocab (~> 3.0)
+
+GIT
+  remote: https://github.com/notch8/willow_sword.git
+  revision: e4edebde9a29636d74c794efca423535db296880
+  branch: main
+  specs:
+    willow_sword (0.2.0)
+      bagit (~> 0.4)
+      rails (~> 6.1)
+      rubyzip (>= 1.0.0)
+
 GIT
   remote: https://github.com/rails/rails.git
   revision: d16199e507086e3d54d94253b7e1d87ead394d9f
@@ -141,7 +174,6 @@ GIT
       dry-logic (~> 1.5)
       dry-monads (~> 1.6)
       dry-validation (~> 1.10)
-      faraday (= 2.9.1)
       flipflop (~> 2.3)
       flot-rails (~> 0.0.6)
       font-awesome-rails (~> 4.2)
@@ -160,7 +192,7 @@ GIT
       noid-rails (~> 3.0)
       oauth
       oauth2 (~> 1.2)
-      openseadragon
+      openseadragon (~> 0.9)
       posix-spawn
       qa (~> 5.5, >= 5.5.1)
       rails (~> 6.1)
@@ -178,42 +210,9 @@ GIT
       signet
       sprockets (= 3.7.2)
       tinymce-rails (~> 5.10)
-      valkyrie (~> 3.3)
+      valkyrie (~> 3.5)
       view_component (~> 2.74.1)
 
-GIT
-  remote: https://github.com/scientist-softserv/apartment.git
-  revision: 9ad4b0ef2ee6debb956e86ef9e7095c8358fef5e
-  branch: development
-  specs:
-    apartment (2.2.1)
-      activerecord (>= 3.1.2, < 7.0)
-      parallel (>= 0.7.1)
-      public_suffix (>= 2)
-      rack (>= 1.3.6)
-
-GIT
-  remote: https://github.com/scientist-softserv/iiif_print.git
-  revision: 63ef540419fcb3aabc73d61c0010638b173c11aa
-  branch: i84-support-dynamic-metadata
-  specs:
-    iiif_print (3.0.1)
-      blacklight_iiif_search (>= 1.0, < 3.0)
-      derivative-rodeo (~> 0.5)
-      hyrax (>= 2.5, < 6)
-      nokogiri (>= 1.13.2)
-      rdf-vocab (~> 3.0)
-
-GIT
-  remote: https://github.com/scientist-softserv/willow_sword.git
-  revision: e4edebde9a29636d74c794efca423535db296880
-  branch: main
-  specs:
-    willow_sword (0.2.0)
-      bagit (~> 0.4)
-      rails (~> 6.1)
-      rubyzip (>= 1.0.0)
-
 GIT
   remote: https://github.com/stanhu/omniauth-cas.git
   revision: 4211e6d05941b4a981f9a36b49ec166cecd0e271
@@ -527,7 +526,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
     dry-inflector (1.0.0)
-    dry-initializer (3.1.1)
+    dry-initializer (3.2.0)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
@@ -1416,7 +1415,7 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    valkyrie (3.3.0)
+    valkyrie (3.5.0)
       activemodel
       activesupport
       dry-struct

app/assets/javascripts/application.js

@@ -28,7 +28,7 @@
 // Required by Blacklight
 //= require blacklight/blacklight
 //= require blacklight_advanced_search
-//= require blacklight_gallery/default
+//= require blacklight_gallery/blacklight-gallery
 
 // Moved the Hyku JS *above* the Hyrax JS to resolve #1187 (following
 // a pattern found in ScholarSphere)

app/assets/stylesheets/themes/cultural_show.scss

@@ -3,6 +3,10 @@
   dl.work-show dd {
     border-bottom: 1px solid #ddd;
 
+    &:last-child {
+      border-bottom: none; /* Removes border for the last dd element */
+    }
+
     .tabular {
       border-bottom: 0;
     }
@@ -45,6 +49,11 @@
     }
   }
 
+  .citations-container {
+    display: flex;
+    justify-content: center;
+  }
+
   li.attribute,
   td.attribute {
     font-size: 18px;

app/controllers/admin/accounts_controller.rb

@@ -29,7 +29,8 @@ def update
     private
 
     def account_params
-      params.require(:account).permit(:name, :cname, :title, *@account.public_settings.keys)
+      is_superadmin = current_ability.superadmin?
+      params.require(:account).permit(:name, :cname, :title, *@account.public_settings(is_superadmin: is_superadmin).keys)
     end
 
     def set_current_account

app/jobs/create_large_derivatives_job.rb

@@ -10,7 +10,7 @@
 #
 # @see CreateDerivativesJobDecorator
 # @see Hydra::Derivatives::Processors::Ffmpeg
-# @see https://github.com/scientist-softserv/palni-palci/issues/852
+# @see https://github.com/notch8/palni-palci/issues/852
 class CreateLargeDerivativesJob < CreateDerivativesJob
   queue_as :auxiliary
 end

app/models/sushi.rb

@@ -420,7 +420,7 @@ def coerce_author(params = {})
       return true unless params.key?(:author)
       @author = params[:author]
 
-      # See https://github.com/scientist-softserv/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance
+      # See https://github.com/notch8/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance
       raise Sushi::Error::InvalidReportFilterValueError.new(data: "You may not query for multiple authors (as specified by the `#{DELIMITER}' delimiter.)") if @author.include?(DELIMITER)
 
       # rubocop:disable Layout/LineLength

app/models/sushi/platform_report.rb

@@ -128,7 +128,7 @@ def attribute_performance_for_resource_types
       # We want to consider "or" behavior for multiple metric_types.  Namely if you specify any
       # metric type (other than Searches_Platform) you're going to get results.
       #
-      # See https://github.com/scientist-softserv/palni-palci/issues/686#issuecomment-1785326034
+      # See https://github.com/notch8/palni-palci/issues/686#issuecomment-1785326034
       return [] if metric_type_in_params && (metric_types & (ALLOWED_METRIC_TYPES - ['Searches_Platform'])).count.zero?
 
       data_for_resource_types.map do |record|

app/presenters/hyrax/collection_presenter_decorator.rb

@@ -97,7 +97,7 @@ def collection_featurable?
     #
     # @return [String]
     #
-    # @see https://github.com/scientist-softserv/palni-palci/issues/951
+    # @see https://github.com/notch8/palni-palci/issues/951
     # @see https://github.com/samvera/hyku/issues/1815
     def collection_type_badge
       return "" unless Site.account&.present?

app/services/hyrax/work_uploads_handler_decorator.rb

@@ -6,7 +6,7 @@ module WorkUploadsHandlerDecorator
     ##
     # OVERRIDE
     #
-    # @see https://github.com/scientist-softserv/palni-palci/blob/29f7e331a76751cf2c237e7fb2121bea38a9056b/app/jobs/attach_files_to_work_job.rb#L22
+    # @see https://github.com/notch8/palni-palci/blob/29f7e331a76751cf2c237e7fb2121bea38a9056b/app/jobs/attach_files_to_work_job.rb#L22
     def file_set_args(file)
       hash = super
       # NOTE: The respond to is me (Jeremy) being cautios.  I checked the

app/services/iiif_print/tenant_config.rb

@@ -14,10 +14,10 @@ module IiifPrint
   #       it is hopefully easier to understand the configuration requirements and scope to this
   #       change.  At some point, this might make sense to bring into IIIF Print directly.
   #
-  # @see https://github.com/scientist-softserv/palni-palci/issues/656 palni-palci#656
-  # @see https://github.com/scientist-softserv/palni-palci/issues/657 palni-palci#657
-  # @see https://github.com/scientist-softserv/palni-palci/issues/658 palni-palci#658
-  # @see https://github.com/scientist-softserv/palni-palci/issues/659 palni-palci#659
+  # @see https://github.com/notch8/palni-palci/issues/656 palni-palci#656
+  # @see https://github.com/notch8/palni-palci/issues/657 palni-palci#657
+  # @see https://github.com/notch8/palni-palci/issues/658 palni-palci#658
+  # @see https://github.com/notch8/palni-palci/issues/659 palni-palci#659
   module TenantConfig
     ##
     # When we were not planning on calling the underlying IiifPrint service but did due to some kind
@@ -94,8 +94,8 @@ def iiif_print_service_instance
     #      derivative_service_plugins: [ IiifPrint::TextExtractionDerivativeService ])
     #  end
     #
-    # @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
-    # @see https://github.com/scientist-softserv/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
+    # @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
+    # @see https://github.com/notch8/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
     module PdfSplitter
       mattr_accessor :iiif_print_splitter
       self.iiif_print_splitter = ::IiifPrint::SplitPdfs::PagesToJpgsSplitter
@@ -115,7 +115,7 @@ def self.call(*args)
     end
 
     ##
-    # @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
+    # @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
     module SkipSplittingPdfService
       ##
       # @return [Symbol] Always :tenant_does_not_split_pdfs
@@ -134,7 +134,7 @@ def self.conditionally_enqueue(*_args)
     # a relatively singular place for all of the configurations.
     module FileSetActorDecorator
       ##
-      # @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
+      # @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
       def service
         return TenantConfig::SkipSplittingPdfService unless TenantConfig.use_iiif_print?
 

app/views/admin/accounts/edit.html.erb

@@ -1,7 +1,6 @@
 <% content_for :page_header do %>
   <h1><span class="fa fa-gears"></span> Editing Account</h1>
 <% end %>
-
 <div class="row">
   <div class="col-md-12">
     <div class="card account-form">
@@ -17,21 +16,19 @@
               </ul>
             </div>
           <% end %>
-
           <div class="form-group">
             <%= f.label :tenant %><br>
             <%= f.text_field :tenant, class: 'form-control', readonly: @account.persisted? %>
           </div>
-
-          <% current_account.public_settings.each do |key, value| %>
+          <% is_superadmin = current_ability.superadmin? %>
+          <% current_account.public_settings(is_superadmin: is_superadmin).each do |key, value| %>
             <%= render 'shared/settings', f: f, key: key, value: value %>
           <% end %>
-
           <div class="card-footer">
             <%= f.submit class: 'btn btn-secondary float-right' %>
           </div>
         </div>
       <% end %>
     </div>
   </div>
-</div>
+</div>

app/views/catalog/_index_header_list_collection.html.erb

@@ -1,8 +1,8 @@
-<%# OVERRIDE Hyrax v5.0.0rc2 %>
+<%# OVERRIDE Hyrax v5.0.1 to use markdown and adjust h3 utility classes %>
 
-<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2 mb-3">
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
   <%# OVERRIDE begin %>
-  <h3 class="search-result-title mb-n2"><%= link_to markdown(document.title_or_label), generate_work_url(document, request) %></h3>
+  <h3 class="search-result-title"><%= link_to markdown(document.title_or_label), generate_work_url(document, request) %></h3>
   <%# OVERRIDE end %>
   <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>

app/views/hyrax/oers/_related_items.html.erb

@@ -32,7 +32,7 @@
   <div class="row">
     <% if presenter.total_pages > 1 %>
         <div class="row record-padding col-md-9">
-          <%= paginate array_of_ids, outer_window: 2, theme: 'blacklight', param_name: :page, route_set: main_app %>
+          <%= paginate presenter.list_of_item_ids_to_display, outer_window: 2, theme: 'blacklight', param_name: :page, route_set: main_app %>
         </div><!-- /pager -->
     <% end %>
   </div>

app/views/shared/_appearance_styles.html.erb

@@ -70,7 +70,7 @@ body.public-facing .nav-tabs > li.nav-item > a:focus {
 
 /* PRIMARY BUTTON STYLES */
 body.public-facing .btn-primary {
-  background-color: <%= appearance.primary_button_hover_color %> !important !important;
+  background-color: <%= appearance.primary_button_hover_color %> !important;
   border-color: <%= appearance.primary_button_border_color %> !important;
   color: <%= appearance.primary_button_text_color %> !important;
 }