blacklight 7.19.2 → 7.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f48da02e969e0c163d09760d711066ce9c0b4d5078636c8f50e19699ec58e8e
-  data.tar.gz: 77da2b86854e93f08a79ba9e28c86c7c91116b9f6934229eb6936cc6872bfdc6
+  metadata.gz: ca8e0f469ef3139ac8bc06f0fbb2d4e54631dbf845a1997d88af3ef9f67c48b1
+  data.tar.gz: b8b43f4594c8d0a1fc2359aff9ee7f655eab4d3ee1ce7bb41c370b494641fa87
 SHA512:
-  metadata.gz: a42155551ab05fa25e433a7aad6e40078ce7cbc2918de03f6ede94aef53ade03b4b16f4411a915b737b1233a631d9cb2baddc9d560aa70b67df237776c01e7f6
-  data.tar.gz: 6430192899c4db45277e988217aecc04e954d856645941773176e36ecefd3ddda3c2a9988caffb7bde50f8aa76702a10cd00da67216f17c6fb49a2802a678dfe
+  metadata.gz: a883ed83bd85c66be0e4234085a24cca6a921b8962e934e018b40e70065e0323db43e1ecb033801dae79b506de5172030a20c5f481b0fe9f5c0476993902db72
+  data.tar.gz: b4234d29c467782346278cc832899ac580a4d0dd06fa3a7831288fbcdba783e9fb1897126dd4ddc267671a59c1712bfc8ad05602ef687c658b9a5507d6665304

data/.babelrc

@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "entry",
+        "corejs": "2.0"
+      }
+    ]
+  ]
+}

data/.env

@@ -1,5 +1,5 @@
 ALPINE_RUBY_VERSION=2.6.5
-RAILS_VERSION=5.2.4.1
+RAILS_VERSION=5.2.5
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/workflows/ruby.yml

@@ -9,9 +9,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   lint:
@@ -43,6 +43,24 @@ jobs:
       run: bundle exec rake ci
       env:
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  test_bootstrap5:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [3.0]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        BOOTSTRAP_VERSION: '~> 5.0'
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
   test_rails6_0:
     runs-on: ubuntu-latest
     strategy:
@@ -87,7 +105,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7]
+        ruby: [2.7, 3.0]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/.rubocop.yml

@@ -50,6 +50,10 @@ Metrics/ModuleLength:
     - 'app/controllers/concerns/blacklight/catalog.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
+Metrics/AbcSize:
+  Exclude:
+    - "lib/blacklight/search_state/filter_field.rb"
+
 Naming/HeredocDelimiterNaming:
   Enabled: false
 

data/Gemfile

@@ -27,7 +27,7 @@ else
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge'
     else
       gem 'rails', ENV['RAILS_VERSION']
     end

data/README.md

@@ -35,11 +35,11 @@ rails generate blacklight:install
 
 * Ruby 2.2+
 * Bundler
-* Rails 5.1+
+* Rails 5.2+
 
 ## Contributing Code
 
-Code contributions are always welcome, instructions for contributing can be found at [CONTRIBUTING.md](https://github.com/projectblacklight/blacklight/blob/master/CONTRIBUTING.md).
+Code contributions are always welcome, instructions for contributing can be found at [CONTRIBUTING.md](https://github.com/projectblacklight/blacklight/blob/main/CONTRIBUTING.md).
 
 ## Configuring Apache Solr
 You'll also want some information about how Blacklight expects [Apache Solr](http://lucene.apache.org/solr ) to run, which you can find in [README_SOLR](https://github.com/projectblacklight/blacklight/wiki/README_SOLR)

data/VERSION

@@ -1 +1 @@
-7.19.2
+7.21.1

data/app/assets/javascripts/blacklight/blacklight.js

@@ -1,18 +1,22 @@
-Blacklight = function () {
+"use strict";
+
+var Blacklight = function () {
   var buffer = new Array();
   return {
-    onLoad: function (func) {
+    onLoad: function onLoad(func) {
       buffer.push(func);
     },
-    activate: function () {
+    activate: function activate() {
       for (var i = 0; i < buffer.length; i++) {
         buffer[i].call();
       }
     },
-    listeners: function () {
+    listeners: function listeners() {
       var listeners = [];
 
-      if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+      if (typeof Turbo !== 'undefined') {
+        listeners.push('turbo:load');
+      } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
         // Turbolinks 5
         if (Turbolinks.BrowserAdapter) {
           listeners.push('turbolinks:load');
@@ -36,7 +40,14 @@ Blacklight.listeners().forEach(function (listener) {
     Blacklight.activate();
   });
 });
-$('.no-js').removeClass('no-js').addClass('js');
+Blacklight.onLoad(function () {
+  var elem = document.querySelector('.no-js'); // The "no-js" class may already have been removed because this function is
+  // run on every turbo:load event, in that case, it won't find an element.
+
+  if (!elem) return;
+  elem.classList.remove('no-js');
+  elem.classList.add('js');
+});
 /*global Bloodhound */
 
 Blacklight.onLoad(function () {
@@ -82,7 +93,7 @@ Blacklight.onLoad(function () {
     $(Blacklight.doBookmarkToggleBehavior.selector).blCheckboxSubmit({
       // cssClass is added to elements added, plus used for id base
       cssClass: 'toggle-bookmark',
-      success: function (checked, response) {
+      success: function success(checked, response) {
         if (response.bookmarks) {
           $('[data-role=bookmark-counter]').text(response.bookmarks.count);
         }
@@ -100,8 +111,8 @@ Blacklight.onLoad(function () {
   // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
   // Safari both do not set focus to a button on button click.
   // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
-  document.querySelectorAll('button.collapse-toggle').forEach(button => {
-    button.addEventListener('click', () => {
+  document.querySelectorAll('button.collapse-toggle').forEach(function (button) {
+    button.addEventListener('click', function () {
       event.target.focus();
     });
   });
@@ -188,12 +199,12 @@ Blacklight.onLoad(function () {
           dataType: 'json',
           type: form.attr('method').toUpperCase(),
           data: form.serialize(),
-          error: function () {
+          error: function error() {
             label.removeAttr('disabled');
             checkbox.removeAttr('disabled');
             options.error.call();
           },
-          success: function (data, status, xhr) {
+          success: function success(data, status, xhr) {
             //if app isn't running at all, xhr annoyingly
             //reports success with status 0.
             if (xhr.status != 0) {
@@ -219,10 +230,10 @@ Blacklight.onLoad(function () {
   $.fn.blCheckboxSubmit.defaults = {
     //cssClass is added to elements added, plus used for id base
     cssClass: 'blCheckboxSubmit',
-    error: function () {
+    error: function error() {
       alert("Error");
     },
-    success: function () {} //callback
+    success: function success() {} //callback
 
   };
 })(jQuery);
@@ -238,12 +249,12 @@ Blacklight.doResizeFacetLabelsAndCounts = function () {
   }
 
   document.querySelectorAll('.facet-values, .pivot-facet').forEach(function (elem) {
-    const nodes = elem.querySelectorAll('.facet-count'); // TODO: when we drop ie11 support, this can become the spread operator:
+    var nodes = elem.querySelectorAll('.facet-count'); // TODO: when we drop ie11 support, this can become the spread operator:
 
-    const longest = Array.from(nodes).sort(longer)[0];
+    var longest = Array.from(nodes).sort(longer)[0];
 
     if (longest && longest.textContent) {
-      const width = longest.textContent.length + 1 + 'ch';
+      var width = longest.textContent.length + 1 + 'ch';
       elem.querySelector('.facet-count').style.width = width;
     }
   });
@@ -360,7 +371,7 @@ Blacklight.modal.onFailure = function (jqXHR, textStatus, errorThrown) {
 Blacklight.modal.receiveAjax = function (contents) {
   // does it have a data- selector for container?
   // important we don't execute script tags, we shouldn't.
-  // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/master/src/ajax/load.js?source=c#L62
+  // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/main/src/ajax/load.js?source=c#L62
   var container = $('<div>').append(jQuery.parseHTML(contents)).find(Blacklight.modal.containerSelector).first();
 
   if (container.length !== 0) {
@@ -438,14 +449,26 @@ Blacklight.doSearchContextBehavior = function () {
     return Blacklight.do_search_context_behavior();
   }
 
-  const elements = document.querySelectorAll('a[data-context-href]'); // Equivalent to Array.from(), but supports ie11
+  var elements = document.querySelectorAll('a[data-context-href]'); // Equivalent to Array.from(), but supports ie11
 
-  const nodes = Array.prototype.slice.call(elements);
+  var nodes = Array.prototype.slice.call(elements);
   nodes.forEach(function (element) {
     element.addEventListener('click', function (e) {
       Blacklight.handleSearchContextMethod.call(e.currentTarget, e);
     });
   });
+};
+
+Blacklight.csrfToken = function () {
+  var _document$querySelect;
+
+  return (_document$querySelect = document.querySelector('meta[name=csrf-token]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.content;
+};
+
+Blacklight.csrfParam = function () {
+  var _document$querySelect2;
+
+  return (_document$querySelect2 = document.querySelector('meta[name=csrf-param]')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.content;
 }; // this is the Rails.handleMethod with a couple adjustments, described inline:
 // first, we're attaching this directly to the event handler, so we can check for meta-keys
 
@@ -458,22 +481,21 @@ Blacklight.handleSearchContextMethod = function (event) {
 
   var link = this; // instead of using the normal href, we need to use the context href instead
 
-  let href = link.getAttribute('data-context-href');
-  let target = link.getAttribute('target');
-  let csrfToken = Rails.csrfToken();
-  let csrfParam = Rails.csrfParam();
-  let form = document.createElement('form');
+  var href = link.getAttribute('data-context-href');
+  var target = link.getAttribute('target');
+  var csrfToken = Blacklight.csrfToken();
+  var csrfParam = Blacklight.csrfParam();
+  var form = document.createElement('form');
   form.method = 'post';
   form.action = href;
-  let formContent = `<input name="_method" value="post" type="hidden" />
-    <input name="redirect" value="${link.getAttribute('href')}" type="hidden" />`; // check for meta keys.. if set, we should open in a new tab
+  var formContent = "<input name=\"_method\" value=\"post\" type=\"hidden\" />\n    <input name=\"redirect\" value=\"".concat(link.getAttribute('href'), "\" type=\"hidden\" />"); // check for meta keys.. if set, we should open in a new tab
 
   if (event.metaKey || event.ctrlKey) {
     target = '_blank';
   }
 
   if (csrfParam !== undefined && csrfToken !== undefined) {
-    formContent += `<input name="${csrfParam}" value="${csrfToken}" type="hidden" />`;
+    formContent += "<input name=\"".concat(csrfParam, "\" value=\"").concat(csrfToken, "\" type=\"hidden\" />");
   } // Must trigger submit by click on a button, else "submit" event handler won't work!
   // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
 
@@ -495,3 +517,4 @@ Blacklight.handleSearchContextMethod = function (event) {
 Blacklight.onLoad(function () {
   Blacklight.doSearchContextBehavior();
 });
+

data/app/assets/stylesheets/blacklight/_constraints.scss

@@ -1,27 +1,30 @@
 .constraints-container {
   @extend .mb-2;
+  display: flex;
 }
 
 .applied-filter {
+  @extend .mx-1;
+
   .constraint-value {
     cursor: default;
     text-overflow: ellipsis;
     overflow: hidden;
 
     @media (max-width: breakpoint-min(sm)) {
-      max-width: breakpoint-min(sm) / 2;
+      max-width: breakpoint-min(sm) * .5;
     }
 
     @media (min-width: breakpoint-min(sm)) and (max-width: breakpoint-max(sm)) {
-      max-width: breakpoint-min(sm) / 2;
+      max-width: breakpoint-min(sm) * .5;
     }
 
     @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
-      max-width: breakpoint-min(md) / 2;
+      max-width: breakpoint-min(md) * .5;
     }
 
     @media (min-width: breakpoint-min(lg)) {
-      max-width: breakpoint-min(lg) / 2;
+      max-width: breakpoint-min(lg) * .5;
     }
 
     &:hover, &:active {

data/app/assets/stylesheets/blacklight/_controls.scss

@@ -1,3 +1,11 @@
+.search-widgets {
+  display: flex;
+
+  > * {
+    @extend .mx-1;
+  }
+}
+
 .sort-pagination,
 .pagination-search-widgets {
   border-bottom: $pagination-border-width solid $pagination-border-color;

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -83,7 +83,7 @@
   .remove {
     color: $text-muted;
     font-weight: bold;
-    padding-left: $spacer / 2;
+    padding-left: $spacer * .5;
     text-decoration: none;
 
     &:hover {
@@ -104,7 +104,7 @@
     padding-right: 1em;
     text-indent: -15px;
     padding-left: 15px;
-    padding-bottom: $spacer / 2;
+    padding-bottom: $spacer * .5;
     @include hyphens-auto;
   }
 

data/app/assets/stylesheets/blacklight/_pagination.scss

@@ -6,7 +6,7 @@
 }
 
 .record-padding {
-  margin-top: $spacer / 2;
+  margin-top: $spacer * .5;
 }
 
 .pagination {

data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss

@@ -1,4 +1,5 @@
 .twitter-typeahead {
+  display: inline-flex !important;
   flex-grow: 2;
   z-index: $zindex-typeahead;
 

data/app/components/blacklight/constraints_component.rb

@@ -64,7 +64,7 @@ module Blacklight
       Deprecation.silence(Blacklight::SearchState) do
         @search_state.filters.map do |facet|
           facet.values.map do |val|
-            next if val.blank? # skip empty string
+            next if val.blank?
 
             if val.is_a?(Array)
               yield inclusive_facet_item_presenter(facet.config, val, facet.key) if val.any?(&:present?)

data/app/components/blacklight/document_component.rb

@@ -121,10 +121,10 @@ module Blacklight
     end
 
     def before_render
-      set_slot(:title) unless title
-      set_slot(:thumbnail, component: @thumbnail_component || presenter.view_config&.thumbnail_component) unless thumbnail || show?
-      set_slot(:metadata, component: @metadata_component, fields: presenter.field_presenters) unless metadata
-      set_slot(:embed, component: @embed_component || presenter.view_config&.embed_component) unless embed
+      set_slot(:title, nil) unless title
+      set_slot(:thumbnail, nil, component: @thumbnail_component || presenter.view_config&.thumbnail_component) unless thumbnail || show?
+      set_slot(:metadata, nil, component: @metadata_component, fields: presenter.field_presenters) unless metadata
+      set_slot(:embed, nil, component: @embed_component || presenter.view_config&.embed_component) unless embed
     end
 
     private

data/app/components/blacklight/facet_item_component.rb

@@ -72,7 +72,7 @@ module Blacklight
     # @private
     def render_facet_value
       tag.span(class: "facet-label") do
-        link_to_unless(@suppress_link, @label, @href, class: "facet-select")
+        link_to_unless(@suppress_link, @label, @href, class: "facet-select", rel: "nofollow")
       end + render_facet_count
     end
 
@@ -85,7 +85,7 @@ module Blacklight
       tag.span(class: "facet-label") do
         tag.span(@label, class: "selected") +
           # remove link
-          link_to(@href, class: "remove") do
+          link_to(@href, class: "remove", rel: "nofollow") do
             tag.span('✖', class: "remove-icon", aria: { hidden: true }) +
               tag.span(@view_context.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only visually-hidden')
           end

data/app/components/blacklight/metadata_field_layout_component.rb

@@ -23,7 +23,7 @@ module Blacklight
     end
 
     def value(*args, **kwargs, &block)
-      return set_slot(:values, *args, **kwargs, &block) if block_given?
+      return set_slot(:values, nil, *args, **kwargs, &block) if block_given?
 
       Deprecation.warn(Blacklight::MetadataFieldLayoutComponent, 'The `value` content area is deprecated; render from the values slot instead')
 

data/app/components/blacklight/response/pagination_component.html.erb

@@ -1,3 +1,3 @@
-<%= content_tag :nav, class: 'pagination', role: 'region', **@html_attr do %>
+<%= content_tag :section, class: 'pagination',  **@html_attr do %>
   <%= pagination %>
 <% end %>

data/app/components/blacklight/system/modal_component.html.erb

@@ -6,8 +6,8 @@
       <h1 class="modal-title"><%= title %></h1>
     <% end) %>
 
-    <button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="blacklight-modal-close btn-close close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true" class="visually-hidden">&times;</span>
     </button>
   </div>
 

data/app/controllers/concerns/blacklight/bookmarks.rb

@@ -48,9 +48,6 @@ module Blacklight::Bookmarks
       format.html {}
       format.rss  { render layout: false }
       format.atom { render layout: false }
-      format.json do
-        render json: render_search_results_as_json
-      end
 
       additional_response_formats(format)
       document_export_formats(format)

data/app/controllers/concerns/blacklight/catalog.rb

@@ -2,6 +2,9 @@
 module Blacklight::Catalog
   extend ActiveSupport::Concern
 
+  # MimeResponds is part of ActionController::Base, but not ActionController::API
+  include ActionController::MimeResponds
+
   include Blacklight::Base
   include Blacklight::Facet
   include Blacklight::Searchable
@@ -257,7 +260,7 @@ module Blacklight::Catalog
 
   # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def email_action documents
-    mail = RecordMailer.email_record(documents, { to: params[:to], message: params[:message] }, url_options)
+    mail = RecordMailer.email_record(documents, { to: params[:to], message: params[:message], config: blacklight_config }, url_options)
     if mail.respond_to? :deliver_now
       mail.deliver_now
     else
@@ -268,7 +271,7 @@ module Blacklight::Catalog
   # SMS action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def sms_action documents
     to = "#{params[:to].gsub(/[^\d]/, '')}@#{params[:carrier]}"
-    mail = RecordMailer.sms_record(documents, { to: to }, url_options)
+    mail = RecordMailer.sms_record(documents, { to: to, config: blacklight_config }, url_options)
     if mail.respond_to? :deliver_now
       mail.deliver_now
     else

data/app/controllers/concerns/blacklight/controller.rb

@@ -3,6 +3,7 @@
 # as this module is mixed-in to the application controller in the hosting app on installation.
 module Blacklight::Controller
   extend ActiveSupport::Concern
+  extend Deprecation
 
   included do
     include Blacklight::SearchFields
@@ -38,11 +39,6 @@ module Blacklight::Controller
     # TODO: move to Searchable
     class_attribute :search_service_class
     self.search_service_class = Blacklight::SearchService
-
-    # This callback runs when a user first logs in
-
-    define_callbacks :logging_in_user
-    set_callback :logging_in_user, :before, :transfer_guest_user_actions_to_current_user
   end
 
   # @private
@@ -136,6 +132,13 @@ module Blacklight::Controller
 
   ##
   # When a user logs in, transfer any saved searches or bookmarks to the current_user
+  def transfer_guest_to_user
+    Deprecation.silence(Blacklight::Controller) do
+      transfer_guest_user_actions_to_current_user
+    end
+  end
+
+  # @deprecated use canonical `transfer_guest_to_user` method instead
   def transfer_guest_user_actions_to_current_user
     return unless respond_to?(:current_user) && respond_to?(:guest_user) && current_user && guest_user
 
@@ -155,6 +158,7 @@ module Blacklight::Controller
     # let guest_user know we've moved some bookmarks from under it
     guest_user.reload if guest_user.persisted?
   end
+  deprecation_deprecate :transfer_guest_user_actions_to_current_user
 
   ##
   # To handle failed authorization attempts, redirect the user to the

data/app/controllers/concerns/blacklight/search_context.rb

@@ -73,7 +73,7 @@ module Blacklight::SearchContext
   #
   def agent_is_crawler?
     crawler_proc = blacklight_config.crawler_detector
-    return false if crawler_proc.nil? || current_user.present?
+    return false if crawler_proc.nil? || (defined?(current_user) && current_user.present?)
 
     crawler_proc.call(request)
   end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -47,11 +47,9 @@ module Blacklight::CatalogHelperBehavior
     entry_name = if entry_name
                    entry_name.pluralize(collection.size, I18n.locale)
                  else
-                   collection.entry_name(count: collection.size).to_s.downcase
+                   collection.entry_name(count: collection.size).to_s
                  end
 
-    entry_name = entry_name.pluralize unless collection.total_count == 1
-
     # grouped response objects need special handling
     end_num = if collection.respond_to?(:groups) && render_grouped_response?(collection)
                 collection.groups.length

data/app/javascript/blacklight/core.js

@@ -1,4 +1,4 @@
-Blacklight = function() {
+const Blacklight = function() {
   var buffer = new Array;
   return {
     onLoad: function(func) {
@@ -13,7 +13,9 @@ Blacklight = function() {
 
     listeners: function () {
       var listeners = [];
-      if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+      if (typeof Turbo !== 'undefined') {
+        listeners.push('turbo:load');
+      } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
         // Turbolinks 5
         if (Turbolinks.BrowserAdapter) {
           listeners.push('turbolinks:load');
@@ -38,4 +40,13 @@ Blacklight.listeners().forEach(function(listener) {
   })
 })
 
-$('.no-js').removeClass('no-js').addClass('js');
+Blacklight.onLoad(function () {
+  const elem = document.querySelector('.no-js');
+
+  // The "no-js" class may already have been removed because this function is
+  // run on every turbo:load event, in that case, it won't find an element.
+  if (!elem) return;
+
+  elem.classList.remove('no-js')
+  elem.classList.add('js')
+})

data/app/javascript/blacklight/modal.js

@@ -120,7 +120,7 @@ Blacklight.modal.onFailure = function(jqXHR, textStatus, errorThrown) {
 Blacklight.modal.receiveAjax = function (contents) {
     // does it have a data- selector for container?
     // important we don't execute script tags, we shouldn't.
-    // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/master/src/ajax/load.js?source=c#L62
+    // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/main/src/ajax/load.js?source=c#L62
     var container =  $('<div>').
       append( jQuery.parseHTML(contents) ).find( Blacklight.modal.containerSelector ).first();
     if (container.length !== 0) {

data/app/javascript/blacklight/search_context.js

@@ -15,6 +15,9 @@ Blacklight.doSearchContextBehavior = function() {
   })
 };
 
+Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content
+Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content
+
 // this is the Rails.handleMethod with a couple adjustments, described inline:
 // first, we're attaching this directly to the event handler, so we can check for meta-keys
 Blacklight.handleSearchContextMethod = function(event) {
@@ -27,8 +30,8 @@ Blacklight.handleSearchContextMethod = function(event) {
   // instead of using the normal href, we need to use the context href instead
   let href = link.getAttribute('data-context-href')
   let target = link.getAttribute('target')
-  let csrfToken = Rails.csrfToken()
-  let csrfParam = Rails.csrfParam()
+  let csrfToken = Blacklight.csrfToken()
+  let csrfParam = Blacklight.csrfParam()
   let form = document.createElement('form')
   form.method = 'post'
   form.action = href