hyrax 3.6.0 → 4.0.0.beta1

data/docker-compose.yml

@@ -6,7 +6,7 @@ services:
       context: .
       target: hyrax-engine-dev
       args:
-        - EXTRA_APK_PACKAGES=git less
+        - EXTRA_APK_PACKAGES=git less chromium
     image: ghcr.io/samvera/dassie
     command: sh -l -c 'bundle && bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
@@ -27,6 +27,7 @@ services:
       - solr
     ports:
       - 3000:3000
+      - 9876:9876
     volumes:
       - .dassie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine

data/documentation/developing-your-hyrax-based-app.md

@@ -109,7 +109,7 @@ Hyrax requires Rails 5. We recommend the latest Rails 5.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.2.8.1
+gem install rails -v 5.2.6
 ```
 
 ### JavaScript runtime
@@ -125,7 +125,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.2.8.1_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.6.0/template.rb
+rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v4.0.0.beta1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/documentation/legacyREADME.md

@@ -50,7 +50,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v3.6.0__. If you are looking for instructions on installing a different
+v4.0.0.beta1__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -143,7 +143,7 @@ Hyrax requires Rails 5. We recommend the latest Rails 5.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.2.8.1
+gem install rails -v 5.2.6
 ```
 
 ### JavaScript runtime
@@ -159,7 +159,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.2.8.1_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.6.0/template.rb
+rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.0.2/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -23,19 +23,20 @@ SUMMARY
   spec.require_paths = ["lib"]
   spec.version       = Hyrax::VERSION
   spec.license       = 'Apache-2.0'
+  spec.metadata      = { "rubygems_mfa_required" => "true" }
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.7'
 
   # NOTE: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
-  spec.add_dependency 'rails', '~> 5.0'
+  spec.add_dependency 'rails', '~> 6.0'
 
   spec.add_dependency 'active-fedora', '~> 13.1', '>= 13.1.2'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
-  spec.add_dependency 'blacklight', '~> 6.14'
-  spec.add_dependency 'blacklight-gallery', '~> 0.7'
+  spec.add_dependency 'blacklight', '< 7.25'
+  spec.add_dependency 'blacklight-gallery', '~> 4.0'
   spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
   spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0'
   spec.add_dependency 'carrierwave', '~> 1.0'
@@ -44,7 +45,6 @@ SUMMARY
   spec.add_dependency 'dry-events', '~> 0.2.0'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
   spec.add_dependency 'dry-struct', '~> 1.0'
-  spec.add_dependency 'dry-monads', '< 1.5'
   spec.add_dependency 'dry-transaction', '~> 0.11'
   spec.add_dependency 'dry-validation', '~> 1.3'
   spec.add_dependency 'flipflop', '~> 2.3'
@@ -52,14 +52,11 @@ SUMMARY
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
-  spec.add_dependency 'hydra-editor', '~> 5.0', ">= 5.0.4"
+  spec.add_dependency 'hydra-editor', '~> 6.0'
   spec.add_dependency 'hydra-file_characterization', '~> 1.1.2'
-  spec.add_dependency 'hydra-head', '~> 11.0', ">= 11.0.1"
+  spec.add_dependency 'hydra-head', '~> 12.0'
   spec.add_dependency 'hydra-works', '>= 0.16'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 2.0'
-  spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
-  spec.add_dependency 'jquery-ui-rails', '~> 6.0'
-  spec.add_dependency 'json-ld', '< 3.2'
   spec.add_dependency 'json-schema' # for Arkivo
   # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
@@ -70,24 +67,25 @@ SUMMARY
   spec.add_dependency 'noid-rails', '~> 3.0.0'
   spec.add_dependency 'oauth'
   spec.add_dependency 'oauth2', '~> 1.2'
+  spec.add_dependency 'openseadragon'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
-  spec.add_dependency 'psych', '~> 3.3'
   spec.add_dependency 'qa', '~> 5.5', '>= 5.5.1' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'rdf-vocab', '~> 3.0'
-  spec.add_dependency 'redis', '~> 4.0'
   spec.add_dependency 'redis-namespace', '~> 1.5'
-  spec.add_dependency 'redlock', '>= 0.1.2', '< 2.0'
+  spec.add_dependency 'redlock', '>= 0.1.2'
   spec.add_dependency 'reform', '~> 2.3'
   spec.add_dependency 'reform-rails', '~> 0.2.0'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'samvera-nesting_indexer', '~> 2.0'
-  spec.add_dependency 'select2-rails', '~> 3.5'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
   spec.add_dependency 'valkyrie', '~> 2', '>= 2.1.1'
+  spec.add_dependency 'sprockets', '~> 3.7'
+  spec.add_dependency 'sass-rails', '~> 6.0'
+  spec.add_dependency 'select2-rails', '~> 3.5'
 
   spec.add_development_dependency "capybara", '~> 3.29'
   spec.add_development_dependency 'capybara-screenshot', '~> 1.0'
@@ -96,14 +94,12 @@ SUMMARY
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "factory_bot", '~> 4.4'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1'
-  spec.add_development_dependency "jasmine", '~> 2.3', '< 2.99'
-  spec.add_development_dependency "jasmine-core", '~> 2.3', '< 2.99'
   spec.add_development_dependency 'mida', '~> 0.3'
   spec.add_development_dependency 'okcomputer'
   spec.add_development_dependency 'pg', '~> 1.2'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency 'rspec-its', '~> 1.1'
-  spec.add_development_dependency 'rspec-rails', '~> 3.1'
+  spec.add_development_dependency 'rspec-rails', '~> 4.0'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency "selenium-webdriver"
   spec.add_development_dependency 'i18n-debug'
@@ -115,11 +111,4 @@ SUMMARY
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
   spec.add_development_dependency 'webdrivers', '~> 4.4'
   spec.add_development_dependency 'webmock'
-
-  ########################################################
-  # Temporarily pinned dependencies. INCLUDE EXPLANATIONS.
-  #
-  # Pin sass-rails to 5.x because rails 5.x apps have this same dependency in their generated Gemfiles
-  # See https://github.com/samvera/hyrax/issues/3919
-  spec.add_dependency 'sass-rails', '~> 5.0'
 end

data/karma.conf.js

@@ -0,0 +1,104 @@
+// Karma configuration
+// Generated on Fri May 20 2022 13:13:50 GMT+0000 (Coordinated Universal Time)
+
+require('dotenv').config();
+
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '.',
+
+    // frameworks to use
+    // available frameworks: https://www.npmjs.com/search?q=keywords:karma-adapter
+    frameworks: ['jasmine'],
+
+    client: {
+      jasmine: {
+        random: true,
+        oneFailurePerSpec: false,
+        failFast: false,
+        timeoutInterval: 1000
+      }
+    },
+
+    // list of files / patterns to load in the browser
+    // uses dotenv to allow for .internal_test_app or .dassie as the Rails root
+
+    files: [
+      {pattern: 'spec/javascripts/fixtures/*.html', watched: true, included: false, served: true},
+      process.env.RAILS_ROOT + '/public/assets/application-*.js',
+      'spec/javascripts/helpers/*',
+      'spec/javascripts/*_spec.js',
+      'spec/javascripts/*_spec.js.coffee',
+    ],
+
+    // list of files / patterns to exclude
+    exclude: [
+    ],
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://www.npmjs.com/search?q=keywords:karma-preprocessor
+    preprocessors: {
+      '**/*.coffee': ['coffee']
+    },
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://www.npmjs.com/search?q=keywords:karma-reporter
+    reporters: ['spec'],
+
+    specReporter: {
+      maxLogLines: 5,             // limit number of lines logged per test
+      suppressSummary: false,      // do not print summary
+      suppressErrorSummary: false, // do not print error summary
+      suppressFailed: false,      // do not print information about failed tests
+      suppressPassed: false,      // do not print information about passed tests
+      suppressSkipped: false,      // do not print information about skipped tests
+      showBrowser: true,         // print the browser for each spec
+      showSpecTiming: true,      // print the time elapsed for each spec
+      failFast: false,             // test would finish with error when a first fail occurs
+      prefixes: {
+        success: '    OK: ',      // override prefix for passed tests, default is '✓ '
+        failure: 'FAILED: ',      // override prefix for failed tests, default is '✗ '
+        skipped: 'SKIPPED: '      // override prefix for skipped tests, default is '- '
+      }
+    },
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+    // start these browsers
+    // available browser launchers: https://www.npmjs.com/search?q=keywords:karma-launcher
+    browsers: [process.env.KARMA_BROWSER],
+
+    customLaunchers: {
+      ChromiumHeadlessCustom: {
+        base: 'ChromiumHeadless',
+        flags: ['--no-sandbox']
+      },
+      ChromeHeadlessCustom: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox']
+      }
+    },
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true,
+
+    // Concurrency level
+    // how many browser instances should be started simultaneously
+    concurrency: 4
+  })
+}

data/lib/generators/hyrax/assets_generator.rb

@@ -18,11 +18,8 @@ class Hyrax::AssetsGenerator < Rails::Generators::Base
 
   def inject_js
     return if hyrax_javascript_installed?
-    insert_into_file 'app/assets/javascripts/application.js', after: '//= require_tree .' do
-      <<-JS.strip_heredoc
-
-        //= require hyrax
-      JS
+    insert_into_file 'app/assets/javascripts/application.js', after: "//= require blacklight/blacklight\n" do
+      "//= require hyrax\n" \
     end
   end
 

data/lib/generators/hyrax/install_generator.rb

@@ -35,15 +35,6 @@ module Hyrax
   18. Generates RIIIF image server implementation
          """
 
-    # browse-everything 1.2.0 is not compatible with Ruby 2.5
-    def pin_browse_everything
-      return unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6')
-      gem 'browse-everything', '~> 1.1.2'
-      Bundler.with_clean_env do
-        run "bundle update browse-everything"
-      end
-    end
-
     def run_required_generators
       say_status('info', '[Hyrax] GENERATING BLACKLIGHT', :blue)
       generate 'blacklight:install --devise'
@@ -54,13 +45,15 @@ module Hyrax
     end
 
     def replace_blacklight_layout
-      gsub_file 'app/controllers/application_controller.rb', /layout 'blacklight'/,
+      gsub_file 'app/controllers/application_controller.rb', /layout :determine_layout.+$/,
                 "include Hyrax::ThemedLayoutController\n  with_themed_layout '1_column'\n"
     end
 
     def insert_builder
-      insert_into_file 'app/models/search_builder.rb', after: /include Hydra::AccessControlsEnforcement/ do
-        "\n  include Hyrax::SearchFilters\n"
+      insert_into_file 'app/models/search_builder.rb', after: /include Blacklight::Solr::SearchBuilderBehavior/ do
+        "\n  # Add a filter query to restrict the search to documents the current user has access to\n"\
+        "  include Hydra::AccessControlsEnforcement\n"\
+        "  include Hyrax::SearchFilters\n"
       end
     end
 
@@ -160,21 +153,13 @@ module Hyrax
 
     def datatables
       javascript_manifest = 'app/assets/javascripts/application.js'
-      # Generator is broken https://github.com/rweng/jquery-datatables-rails/issues/225
-      # generate 'jquery:datatables:install bootstrap3'
       insert_into_file javascript_manifest, after: /jquery.?\n/ do
-        "//= require jquery_ujs\n" \
-        "//= require dataTables/jquery.dataTables\n" \
-        "//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap\n"
+        "//= require jquery.dataTables\n" \
+        "//= require dataTables.bootstrap4\n"
       end
 
-      # This is only necessary for Rails 5.1 and hopefully is temporary.
-      # There was some trouble getting the file-manager javascript (remote forms) to work well
-      # with rails-ujs. Note jquery_ujs was added to the block above (after jQuery)
-      gsub_file javascript_manifest, 'require rails-ujs', ''
-
       insert_into_file 'app/assets/stylesheets/application.css', before: ' *= require_self' do
-        " *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap\n"
+        " *= require dataTables.bootstrap4\n"
       end
     end
 
@@ -192,16 +177,7 @@ module Hyrax
 
     def universalviewer_files
       rake('hyrax:universal_viewer:install')
-    end
-
-    # Blacklight::Controller will by default add an after_action filter to discard all flash messages on xhr requests.
-    # This has caused problems when we perform a post-redirect-get cycle using xhr and turbolinks.
-    # This injector will modify the generated ApplicationController to skip this action.
-    # TODO: This may be removed in Blacklight 7.x, so we'll likely need to remove this after updating.
-    def inject_skip_blacklilght_flash_discarding
-      insert_into_file "app/controllers/application_controller.rb", after: "include Blacklight::Controller\n" do
-        "  skip_after_action :discard_flash_if_xhr\n"
-      end
+      rake('yarn:install')
     end
   end
 end

data/lib/generators/hyrax/templates/catalog_controller.rb

@@ -19,10 +19,6 @@ class CatalogController < ApplicationController
   configure_blacklight do |config|
     config.search_builder_class = Hyrax::CatalogSearchBuilder
 
-    # Show gallery view
-    config.view.gallery.partials = [:index_header, :index]
-    config.view.slideshow.partials = [:index]
-
     # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
     # Often, it's because they inadvertently exceeded the character limit of a GET request.
     config.http_method = :post
@@ -39,6 +35,17 @@ class CatalogController < ApplicationController
     config.index.display_type_field = "has_model_ssim"
     config.index.thumbnail_field = 'thumbnail_path_ss'
 
+    config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_results_collection_tool(:sort_widget)
+    config.add_results_collection_tool(:per_page_widget)
+    config.add_results_collection_tool(:view_type_group)
+    config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+    config.add_show_tools_partial(:citation)
+    config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
+    config.add_nav_action(:search_history, partial: 'blacklight/nav/search_history')
+
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
     config.add_facet_field "human_readable_type_sim", label: "Type", limit: 5
@@ -67,22 +74,22 @@ class CatalogController < ApplicationController
     #   The ordering of the field names is the order of the display
     config.add_index_field "title_tesim", label: "Title", itemprop: 'name', if: false
     config.add_index_field "description_tesim", itemprop: 'description', helper_method: :iconify_auto_link
-    config.add_index_field "keyword_tesim", itemprop: 'keywords', link_to_search: "keyword_sim"
-    config.add_index_field "subject_tesim", itemprop: 'about', link_to_search: "subject_sim"
-    config.add_index_field "creator_tesim", itemprop: 'creator', link_to_search: "creator_sim"
-    config.add_index_field "contributor_tesim", itemprop: 'contributor', link_to_search: "contributor_sim"
+    config.add_index_field "keyword_tesim", itemprop: 'keywords', link_to_facet: "keyword_sim"
+    config.add_index_field "subject_tesim", itemprop: 'about', link_to_facet: "subject_sim"
+    config.add_index_field "creator_tesim", itemprop: 'creator', link_to_facet: "creator_sim"
+    config.add_index_field "contributor_tesim", itemprop: 'contributor', link_to_facet: "contributor_sim"
     config.add_index_field "proxy_depositor_ssim", label: "Depositor", helper_method: :link_to_profile
     config.add_index_field "depositor_tesim", label: "Owner", helper_method: :link_to_profile
-    config.add_index_field "publisher_tesim", itemprop: 'publisher', link_to_search: "publisher_sim"
-    config.add_index_field "based_near_label_tesim", itemprop: 'contentLocation', link_to_search: "based_near_label_sim"
-    config.add_index_field "language_tesim", itemprop: 'inLanguage', link_to_search: "language_sim"
+    config.add_index_field "publisher_tesim", itemprop: 'publisher', link_to_facet: "publisher_sim"
+    config.add_index_field "based_near_label_tesim", itemprop: 'contentLocation', link_to_facet: "based_near_label_sim"
+    config.add_index_field "language_tesim", itemprop: 'inLanguage', link_to_facet: "language_sim"
     config.add_index_field "date_uploaded_dtsi", itemprop: 'datePublished', helper_method: :human_readable_date
     config.add_index_field "date_modified_dtsi", itemprop: 'dateModified', helper_method: :human_readable_date
     config.add_index_field "date_created_tesim", itemprop: 'dateCreated'
     config.add_index_field "rights_statement_tesim", helper_method: :rights_statement_links
     config.add_index_field "license_tesim", helper_method: :license_links
-    config.add_index_field "resource_type_tesim", label: "Resource Type", link_to_search: "resource_type_sim"
-    config.add_index_field "file_format_tesim", link_to_search: "file_format_sim"
+    config.add_index_field "resource_type_tesim", label: "Resource Type", link_to_facet: "resource_type_sim"
+    config.add_index_field "file_format_tesim", link_to_facet: "file_format_sim"
     config.add_index_field "identifier_tesim", helper_method: :index_field_link, field_name: 'identifier'
     config.add_index_field Hydra.config.permissions.embargo.release_date, label: "Embargo release date", helper_method: :human_readable_date
     config.add_index_field Hydra.config.permissions.lease.expiration_date, label: "Lease expiration date", helper_method: :human_readable_date

data/lib/generators/hyrax/templates/config/analytics.yml

@@ -2,13 +2,10 @@
 # You can manually fill in these values or use the ENV variables.
 #
 analytics:
-  ga4:
-    analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
   google:
     analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
     app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
     app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
-    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
     privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
     client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>

data/lib/generators/hyrax/templates/config/initializers/riiif.rb

@@ -20,7 +20,7 @@ ActiveSupport::Reloader.to_prepare do
     end
   end
 
-  Riiif::Image.authorization_service = Hyrax::IIIFAuthorizationService
+  Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
 
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')

data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml

@@ -50,7 +50,7 @@ pt-BR:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2018 Samvera </strong> Licenciado sob a Licença Apache, Versão 2.0"
+      copyright_html: "<strong>Copyright © 2022 Samvera </strong> Licenciado sob a Licença Apache, Versão 2.0"
       service_html: Um serviço de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Instituição
     institution_name_full: O Nome da Instituição

data/lib/generators/hyrax/templates/hyrax.scss

@@ -4,14 +4,13 @@
  *= require_self
 */
 
-@import "bootstrap-sprockets";
 @import "bootstrap-default-overrides";
 @import 'bootstrap';
-@import 'blacklight/blacklight';
 @import "font-awesome";
 @import "blacklight_gallery/gallery";
 @import "blacklight_gallery/masonry";
 @import "blacklight_gallery/slideshow";
 @import "blacklight_gallery/osd_viewer";
+@import "hyrax/blacklight_gallery";
 @import 'hyrax/hyrax';
 @import 'hyrax/login_signup';

data/lib/generators/hyrax/templates/package.json

@@ -3,15 +3,14 @@
   "private": true,
   "repository": "git@github.com:samvera/hyrax.git",
   "dependencies": {
-  "universalviewer": "^3.0.16"
-},
-"scripts": {
-  "preinstall": "rm -rf ./public/uv",
-  "postinstall": "yarn run uv-install && yarn run uv-config",
-  "uv-install": "shx cp -r ./node_modules/universalviewer/dist ./public/uv",
-  "uv-config": "shx cp ./config/uv/uv.html ./public/uv/uv.html & shx cp ./config/uv/uv-config.json ./public/uv/"
+    "universalviewer": "^3.1.4"
+  },
+  "scripts": {
+    "preinstall": "rm -rf ./public/uv",
+    "postinstall": "yarn run uv-install && yarn run uv-config",
+    "uv-install": "cp -r ./node_modules/universalviewer/dist ./public/uv",
+    "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/"
   },
   "devDependencies": {
-  "shx": "^0.3.2"
   }
 }

data/lib/hyrax/active_fedora_dummy_model.rb

@@ -35,25 +35,12 @@ module Hyrax
       @id
     end
 
-    ##
-    # @api public
-    def to_key
-      [@id]
-    end
-
     ##
     # @api public
     def model_name
       @model.model_name
     end
 
-    ##
-    # @api public
-    # @return [String]
-    def human_readable_type
-      @model.human_readable_type
-    end
-
     ##
     # @api public
     #

data/lib/hyrax/configuration.rb

@@ -137,21 +137,6 @@ module Hyrax
     attr_writer :analytic_start_date
     attr_reader :analytic_start_date
 
-    ##
-    # @deprecated use analytics_id from config/analytics.yml instead
-    def google_analytics_id=(value)
-      Deprecation.warn("google_analytics_id is deprecated; use analytics_id from config/analytics.yml instead.")
-      Hyrax::Analytics.config.analytics_id = value
-    end
-
-    ##
-    # @deprecated use analytics_id from config/analytics.yml instead
-    def google_analytics_id
-      Deprecation.warn("google_analytics_id is deprecated; use analytics_id from config/analytics.yml instead.")
-      Hyrax::Analytics.config.analytics_id
-    end
-    alias google_analytics_id? google_analytics_id
-
     # @!endgroup
     # @!group Groups
 
@@ -546,20 +531,6 @@ module Hyrax
       @ingest_queue_name ||= :default
     end
 
-    # @deprecated
-    def whitelisted_ingest_dirs
-      Deprecation.warn(self, "Samvera is deprecating #{self.class}#whitelisted_ingest_dirs " \
-        "in Hyrax 3.0. Instead use #{self.class}#registered_ingest_dirs.")
-      registered_ingest_dirs
-    end
-
-    # @deprecated
-    def whitelisted_ingest_dirs=(input)
-      Deprecation.warn(self, "Samvera is deprecating #{self.class}#whitelisted_ingest_dirs= " \
-        "in Hyrax 3.0. Instead use #{self.class}#registered_ingest_dirs=.")
-      self.registered_ingest_dirs = input
-    end
-
     # @!attribute [w] registered_ingest_dirs
     #   List of directories which can be used for local file system ingestion.
     attr_writer :registered_ingest_dirs
@@ -838,17 +809,6 @@ module Hyrax
       end
     end
 
-    attr_writer :resource_id_to_uri_transformer
-    def resource_id_to_uri_transformer
-      Deprecation.warn('Use Hyrax.config.translate_uri_to_id instead.')
-
-      @resource_id_to_uri_transformer ||= lambda do |resource, base_url|
-        file_id = CGI.escape(resource.file_identifier.to_s)
-        fs_id = CGI.escape(resource.file_set_id.to_s)
-        "#{base_url}#{::Noid::Rails.treeify(fs_id)}/files/#{file_id}"
-      end
-    end
-
     attr_writer :contact_email
     def contact_email
       @contact_email ||= "repo-admin@example.org"
@@ -875,17 +835,10 @@ module Hyrax
                     end
     end
 
-    def use_solr_graph_for_collection_nesting
-      ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_USE_SOLR_GRAPH_NESTING', false))
-    end
-
     attr_accessor :nested_relationship_reindexer
+
     def default_nested_relationship_reindexer
-      if use_solr_graph_for_collection_nesting
-        ->(id:, extent:) {}
-      else
-        ->(id:, extent:) { Samvera::NestingIndexer.reindex_relationships(id: id, extent: extent) }
-      end
+      ->(id:, extent:) { Samvera::NestingIndexer.reindex_relationships(id: id, extent: extent) }
     end
 
     attr_writer :solr_select_path

data/lib/hyrax/engine.rb

@@ -15,9 +15,8 @@ module Hyrax
     require 'flipflop'
     require 'flot-rails'
     require 'hydra-file_characterization'
-    require 'jquery-datatables-rails'
-    require 'jquery-ui-rails'
     require 'legato'
+    require 'openseadragon'
     require 'qa'
     require 'tinymce-rails'
     require 'valkyrie'

data/lib/hyrax/errors.rb

@@ -15,6 +15,4 @@ module Hyrax
   class SingleMembershipError < HyraxError; end
 
   class ObjectNotFoundError < ActiveFedora::ObjectNotFoundError; end
-
-  class ModelMismatchError < HyraxError; end
 end

data/lib/hyrax/publisher.rb

@@ -119,10 +119,6 @@ module Hyrax
     #     unique id), AND a `:user` (the ::User responsible for the update).
     register_event('collection.membership.updated')
 
-    # @since 3.5.0
-    # @macro a_registered_event
-    register_event('file.characterized')
-
     # @since 3.3.0
     # @macro a_registered_event
     register_event('file.downloaded')