hyrax 3.5.0 → 4.0.0.beta1

data/config/locales/hyrax.fr.yml

@@ -440,7 +440,7 @@ fr:
           end_label: Terminer [par défaut pour le moment]
           headers:
             main: Statistiques de travail
-            total: 'Total des travaux :'
+            total: 'Total des travaux :'
             visibility: Totaux par visibilité
           heading: Afficher les fichiers déposés par les utilisateurs
           start_label: Départ
@@ -563,7 +563,7 @@ fr:
           actions: action
           title: Titre de la collection
       form_permission:
-        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </small>
+        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </ Small>
       form_permission_under_embargo:
         help_html: "<strong>Ce travail est sous embargo.</strong> Vous pouvez modifier les paramètres de l'embargo ici, ou vous pouvez visiter le %{edit_link} pour le désactiver."
         legend_html: Visibilité <small>Qui devrait pouvoir afficher ou télécharger ce contenu?</small>
@@ -602,7 +602,6 @@ fr:
         legend_html: La vignette
       form_visibility_component:
         visibility: Visibilité
-        subtitle_html: <small>Qui devrait être en mesure d’afficher ou de télécharger ce contenu?</small>
       inspect_work:
         back_to: Retour à
         entity_id: ID d'entité
@@ -1093,14 +1092,14 @@ fr:
       no_transfers: Vous n'avez transféré aucun travail
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </ i> Changer photo
+          change_picture: <i class = "fa fa-camera"> </ i> Changer photo
           delete_picture: Supprimer la photo
           delete_picture_data_content: Si vous souhaitez supprimer entièrement votre image, cochez la case et enregistrez votre profil.
           delete_picture_data_original_title: Supprimer l'image
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </ i> Poignée Facebook
           google_handle: <i class = "fa fa-google-plus"> </ i> Poignée Google+
           help_change_picture_type: JPG, GIF ou PNG (moins de 2 Mo)
-          save_profile: <i class = "glyphicon glyphicon-save"> </ i> Enregistrer le profil
+          save_profile: <i class = "fa fa-floppy-o"> </ i> Enregistrer le profil
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </ i> Poignée Twitter
       proxy_activity: Activité de procuration
       proxy_add_deny: Vous ne pouvez pas vous faire un proxy
@@ -1456,7 +1455,7 @@ fr:
         changes_required:
           message: |-
             %{title} (%{link}) nécessite des modifications supplémentaires avant d'être approuvé.
-             '%{comment}'
+             '%{comment}'
           subject: Votre dépôt nécessite des modifications
         deposited:
           message: "%{title} (%{link}) a été approuvé par %{user}. %{comment}"
@@ -1490,7 +1489,7 @@ fr:
       read: Voir le téléchargement
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Aller
+        html: <span class="fa fa-search"></span> Aller
         text: Chercher
       form:
         option:
@@ -1836,7 +1835,7 @@ fr:
         find_child_work: Rechercher un travail ...
         member_of_collection_ids: Sélectionnez une collection ...
     required:
-      html: <span class="label label-info required-tag">Champs obligatoires</span>
+      html: <span class="badge badge-info required-tag">Champs obligatoires</span>
   total_view:
     one: Ce travail a 1 vue totale
-    other: Ce travail a zxzxxx0 vues au total
+    other: Ce travail a zxzxxx0 vues au total

data/config/locales/hyrax.it.yml

@@ -601,7 +601,6 @@ it:
         legend_html: Thumbnail
       form_visibility_component:
         visibility: Visibilità
-        subtitle_html: <small>Chi dovrebbe essere in grado di visualizzare o scaricare questo contenuto?</small>
       inspect_work:
         back_to: Torna a
         entity_id: ID entità
@@ -1092,14 +1091,14 @@ it:
       no_transfers: Non hai trasferito alcun lavoro
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Cambia immagine
+          change_picture: <i class = "fa fa-camera"> </i> Cambia immagine
           delete_picture: Elimina foto
           delete_picture_data_content: Se desideri rimuovere completamente la tua foto, seleziona la casella e salva il tuo profilo.
           delete_picture_data_original_title: Elimina immagine
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </i> Handle di Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Handle di Google+
           help_change_picture_type: JPG, GIF o PNG (meno di 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Salva profilo
+          save_profile: <i class = "fa fa-floppy-o"> </i> Salva profilo
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </i> Handle di Twitter
       proxy_activity: Attività proxy
       proxy_add_deny: Non puoi renderti un proxy
@@ -1455,7 +1454,7 @@ it:
         changes_required:
           message: |-
             %{title} (%{link}) richiede ulteriori modifiche prima dell'approvazione.
-             '%{comment}'
+             '%{comment}'
           subject: Il tuo deposito richiede modifiche
         deposited:
           message: "%{title} (%{link}) è stato approvato da %{user}. %{comment}"
@@ -1489,7 +1488,7 @@ it:
       read: Visualizza / Scarica
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Partire
+        html: <span class="fa fa-search"></span> Partire
         text: Ricerca
       form:
         option:
@@ -1835,7 +1834,7 @@ it:
         find_child_work: Cerca un lavoro ...
         member_of_collection_ids: Seleziona una collezione ...
     required:
-      html: <span class="label label-info required-tag">necessario</span>
+      html: <span class="badge badge-info required-tag">necessario</span>
   total_view:
     one: Quest'opera ha 1 vista totale
-    other: Questo lavoro ha %{count} visualizzazioni totali
+    other: Questo lavoro ha %{count} visualizzazioni totali

data/config/locales/hyrax.pt-BR.yml

@@ -596,7 +596,6 @@ pt-BR:
         legend_html: Miniatura
       form_visibility_component:
         visibility: Visibilidade
-        subtitle_html: <small>Quem deve conseguir visualizar ou baixar este conteúdo?</small>
       inspect_work:
         back_to: De volta a
         entity_id: ID da entidade
@@ -1087,14 +1086,14 @@ pt-BR:
       no_transfers: Você não transferiu nenhuma obra
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Alterar imagem
+          change_picture: <i class = "fa fa-camera"> </i> Alterar imagem
           delete_picture: Excluir foto
           delete_picture_data_content: Se você deseja remover sua foto completamente, marque a caixa e salve seu perfil.
           delete_picture_data_original_title: Excluir imagem
           facebook_handle: <i class = "fa-facebook" aria-hidden = "true"> </i> Manipulação do Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Manipulação do Google+
           help_change_picture_type: JPG, GIF ou PNG (menos de 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Salvar perfil
+          save_profile: <i class = "fa fa-floppy-o"> </i> Salvar perfil
           twitter_handle: <i class = "fa-twitter" aria-hidden = "true"> </i> Manipulação do Twitter
       proxy_activity: Atividade de suplente
       proxy_add_deny: Você não pode se tornar um proxy
@@ -1450,7 +1449,7 @@ pt-BR:
         changes_required:
           message: |-
             %{title} (%{link}) requer alterações adicionais antes da aprovação.
-             '%{comment}'
+             '%{comment}'
           subject: Seu depósito requer alterações
         deposited:
           message: "%{title} (%{link}) foi aprovado por %{user}. %{comment}"
@@ -1484,7 +1483,7 @@ pt-BR:
       read: Visualizar download
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Ir
+        html: <span class="fa fa-search"></span> Ir
         text: Pesquisar
       form:
         option:
@@ -1830,7 +1829,7 @@ pt-BR:
         find_child_work: Procure uma obra ...
         member_of_collection_ids: Selecione uma coleção ...
     required:
-      html: <span class="label label-info required-tag">obrigatórios</span>
+      html: <span class="badge badge-info required-tag">obrigatórios</span>
   total_view:
     one: Este trabalho tem 1 visualização total
-    other: Este trabalho tem %{count} visualizações totais
+    other: Este trabalho tem %{count} visualizações totais

data/config/locales/hyrax.zh.yml

@@ -599,7 +599,6 @@ zh:
         legend_html: 缩略图
       form_visibility_component:
         visibility: 可见性
-        subtitle_html: <small>谁应该能够查看或下载此内容？</ small>
       inspect_work:
         back_to: 回到
         entity_id: 实体ID
@@ -1090,14 +1089,14 @@ zh:
       no_transfers: 您没有转让任何作品
       profiles:
         edit_primary:
-          change_picture: "<i class =“glyphicon glyphicon-camera”> </ i>更改图片"
+          change_picture: "<i class =“fa fa-camera”> </ i>更改图片"
           delete_picture: 删除图片
           delete_picture_data_content: 如果您想完全删除图片，请选中相应复选框并保存您的个人资料。
           delete_picture_data_original_title: 删除图片
           facebook_handle: "<i class =“fa fa-facebook”aria-hidden =“true”> </ i> Facebook句柄"
           google_handle: "<i class =“fa fa-google-plus”> </ i> Google+处理"
           help_change_picture_type: JPG，GIF或PNG（小于2MB）
-          save_profile: "<i class =“glyphicon glyphicon-save”> </ i>保存个人资料"
+          save_profile: "<i class =“fa fa-floppy-o”> </ i>保存个人资料"
           twitter_handle: "<i class =“fa fa-twitter”aria-hidden =“true”> </ i> Twitter句柄"
       proxy_activity: 代理活动
       proxy_add_deny: 你不能让自己成为代理人
@@ -1453,7 +1452,7 @@ zh:
         changes_required:
           message: |-
             %{title}（%{link}）在批准之前需要进行其他更改。
-             '%{comment}'
+             '%{comment}'
           subject: 您的存款需要更改
         deposited:
           message: zxzxzxx（%{link}）被%{user}批准。 %{comment}
@@ -1487,7 +1486,7 @@ zh:
       read: 查看/下载
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> 转到
+        html: <span class="fa fa-search"></span> 转到
         text: 搜索
       form:
         option:
@@ -1833,7 +1832,7 @@ zh:
         find_child_work: 搜索工作...
         member_of_collection_ids: 选择一个集合...
     required:
-      html: <span class="label label-info required-tag">需要的</span>
+      html: <span class="badge badge-info required-tag">需要的</span>
   total_view:
     one: 该作品共有 1 次浏览
-    other: 此作品总浏览量为 %{count}
+    other: 此作品总浏览量为 %{count}

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.5.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.5.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.5.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'
   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