blacklight 8.0.1 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788296244ed7711b196967fcc206a6b7836db4b384bcbbe7e062cdf9f29d8b06
-  data.tar.gz: 4f83e1cf3421afde9db8cd8bfb7fed298c5f3c5874de2f22f7e7a48db2fe5979
+  metadata.gz: 995d0162eaaf76fe9e4fe2498145be544b61f63387a5f22400c4f3f6ae66c5f7
+  data.tar.gz: 23730f5c2cb706d7202da4c2d4f7757fd149b194041c7e1ec655d556e7a49155
 SHA512:
-  metadata.gz: 193f6a74d712c28cd42a7354ff0da15b7e303b94e51a3854de54401a38ef2e444bf76a1878130fcef71d5286080943cc5635d46f3f38b8bce7c539d2af6f10fe
-  data.tar.gz: 0cf1904df3915ed93d122d54d653201b576c2b4027b182fdb88e6d02bcc9885bac69ecc9c7f6331f4dd3d9ca7f637600e869a5edcb106dad03b2c88868e77e86
+  metadata.gz: 0f444539b52a3e6ec539b5a0865be12d09e98a12d0c8285e3df0e6a3cebf293520d3be5365be244093bccc39d33d973075e8eb5ad26fa0b44d1181a699601d63
+  data.tar.gz: f676071cd8a7b98b1de39c7f34edbd641ae511883a50445121649440c5ff4133701c57ae0eb5b521c8174c09d1b6a56d60074fe7b1a16106251c44a54f0a80ac

data/.env

@@ -1,6 +1,6 @@
 ALPINE_RUBY_VERSION=3.0.3
 RAILS_VERSION=6.1.4.6
-VIEW_COMPONENT_VERSION=2.6.6
+VIEW_COMPONENT_VERSION=2.66.0
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/workflows/ruby.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.2
         bundler: 'latest'
     - name: Install dependencies
       run: bundle install
@@ -33,7 +33,7 @@ jobs:
     name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} ${{ matrix.additional_name }})
     strategy:
       matrix:
-        ruby: [2.7, '3.0']
+        ruby: ['3.0']
         rails_version: ['6.1.7', '7.0.4']
         bootstrap_version: [null]
         view_component_version: ['~> 2.66']
@@ -41,8 +41,20 @@ jobs:
         additional_engine_cart_rails_options: ['']
         additional_name: ['']
         include:
-        - ruby: '3.2.0'
+        - ruby: '3.3.0'
+          rails_version: '7.1.1'
+        - ruby: '3.2.2'
+          rails_version: '7.1.1'
+        - ruby: '3.2.2'
           rails_version: '7.0.4'
+        - ruby: '3.2.2'
+          rails_version: '7.0.4'
+          solr_version: '9.3.0'
+          additional_name: 'Solr 9.3.0'
+        - ruby: '3.2.2'
+          rails_version: '7.0.4'
+          solr_version: '8.11.2'
+          additional_name: 'Solr 8.11.2'
         - ruby: '3.1'
           rails_version: '7.0.4'
         - ruby: '3.1'
@@ -64,10 +76,11 @@ jobs:
           additional_name: '/ API'
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
+      SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
       VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
       BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
       BLACKLIGHT_API_TEST: ${{ matrix.api }}
-      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

data/.rubocop.yml

@@ -1,4 +1,5 @@
 require:
+  - rubocop-capybara
   - rubocop-rspec
   - rubocop-rails
 
@@ -197,6 +198,9 @@ Security/IoMethods: # new in 1.22
   Enabled: true
 Style/ArgumentsForwarding: # new in 1.1
   Enabled: true
+  Exclude:
+    # This cop includes some checks specific to Ruby 3.2
+    - 'lib/blacklight/solr/response/group_response.rb'
 Style/CollectionCompact: # new in 1.2
   Enabled: true
 Style/DocumentDynamicEvalDefinition: # new in 1.1

data/.rubocop_todo.yml

@@ -1,20 +1,36 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-06-27 19:52:51 UTC using RuboCop version 1.31.0.
+# on 2023-12-05 17:55:17 UTC using RuboCop version 1.58.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Capybara/CurrentPathExpectation:
+  Exclude:
+    - 'spec/features/alternate_controller_spec.rb'
+
+# Offense count: 13
+Capybara/VisibilityMatcher:
+  Exclude:
+    - 'spec/features/facets_spec.rb'
+    - 'spec/features/search_filters_spec.rb'
+    - 'spec/helpers/blacklight_helper_spec.rb'
+
 # Offense count: 5
-# Configuration parameters: AutoCorrect.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: leading, trailing
 Layout/LineContinuationLeadingSpace:
   Exclude:
     - 'lib/generators/blacklight/controller_generator.rb'
     - 'lib/generators/blacklight/user_generator.rb'
 
 # Offense count: 1
-# Configuration parameters: IgnoredMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/blacklight/solr/search_builder_behavior.rb'
@@ -29,7 +45,7 @@ Lint/AmbiguousOperator:
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 44
+# Offense count: 45
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousRegexpLiteral:
   Exclude:
@@ -75,7 +91,8 @@ Lint/EmptyFile:
   Exclude:
     - 'spec/components/blacklight/document_metadata_component_spec.rb'
 
-# Offense count: 38
+# Offense count: 46
+# Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Enabled: false
 
@@ -94,14 +111,14 @@ Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'spec/models/blacklight/configuration_spec.rb'
 
-# Offense count: 74
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 81
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 46
 
 # Offense count: 1
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods, inherit_mode.
-# IgnoredMethods: refine
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 26
 
@@ -110,32 +127,33 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 43
-# Configuration parameters: IgnoredMethods.
+# Offense count: 42
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 69
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Offense count: 77
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 29
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 126
+  Max: 124
 
 # Offense count: 8
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 36
-# Configuration parameters: IgnoredMethods.
+# Offense count: 37
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 14
 
 # Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
@@ -146,7 +164,7 @@ Naming/MemoizedInstanceVariableName:
 
 # Offense count: 9
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
     - 'app/models/concerns/blacklight/document.rb'
@@ -158,47 +176,33 @@ Naming/MethodParameterName:
 # Offense count: 9
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
+# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'spec/lib/blacklight/search_state_spec.rb'
     - 'spec/models/blacklight/search_builder_spec.rb'
 
-# Offense count: 7
+# Offense count: 5
 RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/controllers/search_history_controller_spec.rb'
     - 'spec/models/blacklight/configurable_spec.rb'
     - 'spec/models/blacklight/document/dublin_core_spec.rb'
-    - 'spec/models/blacklight/document/email_spec.rb'
-    - 'spec/models/blacklight/document/sms_spec.rb'
     - 'spec/models/blacklight/solr/document_spec.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/Capybara/CurrentPathExpectation:
-  Exclude:
-    - 'spec/features/alternate_controller_spec.rb'
-
-# Offense count: 13
-RSpec/Capybara/VisibilityMatcher:
-  Exclude:
-    - 'spec/features/facets_spec.rb'
-    - 'spec/features/search_filters_spec.rb'
-    - 'spec/helpers/blacklight_helper_spec.rb'
-
-# Offense count: 98
-# Configuration parameters: Prefixes.
+# Offense count: 104
+# Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
 # Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
 
-# Offense count: 128
+# Offense count: 135
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 33
@@ -208,18 +212,17 @@ RSpec/ExpectInHook:
   Exclude:
     - 'spec/controllers/catalog_controller_spec.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
     - 'spec/controllers/blacklight/catalog/component_configuration_spec.rb'
-    - 'spec/features/sitelinks_search_box.rb'
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
     - 'spec/presenters/pipeline_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 128
+# Offense count: 108
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -232,7 +235,6 @@ RSpec/InstanceVariable:
     - 'spec/models/blacklight/document/dublin_core_spec.rb'
     - 'spec/models/blacklight/solr/document_spec.rb'
     - 'spec/models/record_mailer_spec.rb'
-    - 'spec/models/search_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
@@ -276,21 +278,23 @@ RSpec/MessageSpies:
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 364
+# Offense count: 382
 RSpec/MultipleExpectations:
   Max: 16
 
-# Offense count: 258
+# Offense count: 282
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
-# Offense count: 388
-# Configuration parameters: IgnoreSharedExamples.
+# Offense count: 394
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 55
+# Offense count: 59
+# Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
 
@@ -345,34 +349,27 @@ RSpec/SubjectStub:
     - 'spec/presenters/blacklight/document_presenter_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 77
+# Offense count: 79
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
 
 # Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
     - 'spec/models/search_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: slashes, arguments
-Rails/FilePath:
-  Exclude:
-    - 'lib/railties/blacklight.rake'
-
 # Offense count: 20
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
-    - 'app/helpers/blacklight/blacklight_helper_behavior.rb'
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-    - 'app/helpers/blacklight/document_helper_behavior.rb'
     - 'app/helpers/blacklight/component_helper_behavior.rb'
+    - 'app/helpers/blacklight/document_helper_behavior.rb'
     - 'app/helpers/blacklight/layout_helper_behavior.rb'
     - 'app/helpers/blacklight/render_partials_helper_behavior.rb'
 
@@ -383,12 +380,9 @@ Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/helpers/blacklight_helper_spec.rb'
 
-# Offense count: 10
+# Offense count: 1
 Rails/OutputSafety:
   Exclude:
-    - 'app/components/blacklight/search_context/server_item_pagination_component.rb'
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-    - 'app/helpers/blacklight/configuration_helper_behavior.rb'
     - 'app/presenters/blacklight/rendering/join.rb'
 
 # Offense count: 14
@@ -411,11 +405,11 @@ Style/Alias:
 
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
+# AllowedMethods: lambda, proc, it
 Style/BlockDelimiters:
   Exclude:
     - 'app/views/catalog/index.rss.builder'
@@ -449,17 +443,16 @@ Style/DocumentDynamicEvalDefinition:
     - 'app/builders/blacklight/action_builder.rb'
     - 'lib/blacklight/configuration/fields.rb'
 
-# Offense count: 105
+# Offense count: 128
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 Style/ExpandPathArguments:
   Exclude:
     - 'Gemfile'
-    - 'lib/generators/blacklight/assets_generator.rb'
     - 'lib/generators/blacklight/controller_generator.rb'
     - 'lib/generators/blacklight/document_generator.rb'
     - 'lib/generators/blacklight/install_generator.rb'
@@ -471,12 +464,14 @@ Style/ExpandPathArguments:
 
 # Offense count: 16
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, IgnoredMethods.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
+# AllowedMethods: redirect
 Style/FormatStringToken:
   EnforcedStyle: template
 
 # Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
@@ -486,7 +481,7 @@ Style/GuardClause:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 30
+# Offense count: 29
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false
@@ -501,7 +496,7 @@ Style/MultilineIfModifier:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMethodComparison.
+# Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
 Style/MultipleComparison:
   Exclude:
     - 'lib/blacklight/configuration/context.rb'
@@ -516,7 +511,7 @@ Style/MutableConstant:
 
 # Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
@@ -554,13 +549,27 @@ Style/PercentLiteralDelimiters:
     - 'lib/blacklight/engine.rb'
     - 'lib/blacklight/solr/request.rb'
 
-# Offense count: 7
+# Offense count: 15
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantParentheses:
+  Exclude:
+    - 'app/components/blacklight/advanced_search_form_component.rb'
+    - 'app/components/blacklight/document/actions_component.rb'
+    - 'app/components/blacklight/document_component.rb'
+    - 'app/components/blacklight/document_metadata_component.rb'
+    - 'app/components/blacklight/metadata_field_layout_component.rb'
+    - 'app/components/blacklight/system/dropdown_component.rb'
+    - 'app/views/catalog/_document.atom.builder'
+    - 'lib/blacklight/search_state/pivot_filter_field.rb'
+    - 'lib/railties/blacklight.rake'
+    - 'spec/models/blacklight/solr/search_builder_spec.rb'
+
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
   Exclude:
-    - 'app/models/record_mailer.rb'
     - 'lib/blacklight.rb'
     - 'lib/blacklight/configuration/fields.rb'
     - 'lib/railties/blacklight.rake'
@@ -594,7 +603,7 @@ Style/SoleNestedConditional:
   Exclude:
     - 'app/controllers/concerns/blacklight/controller.rb'
 
-# Offense count: 34
+# Offense count: 30
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets

data/VERSION

@@ -1 +1 @@
-8.0.1
+8.2.0

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

@@ -18,11 +18,11 @@ class CheckboxSubmit {
     this.form = form;
   }
 
-  async clicked(evt) {
+  clicked(evt) {
     this.spanTarget.innerHTML = this.form.getAttribute('data-inprogress');
     this.labelTarget.setAttribute('disabled', 'disabled');
     this.checkboxTarget.setAttribute('disabled', 'disabled');
-    const response = await fetch(this.formTarget.getAttribute('action'), {
+    fetch(this.formTarget.getAttribute('action'), {
       body: new FormData(this.formTarget),
       method: this.formTarget.getAttribute('method').toUpperCase(),
       headers: {
@@ -30,16 +30,17 @@ class CheckboxSubmit {
         'X-Requested-With': 'XMLHttpRequest',
         'X-CSRF-Token': document.querySelector('meta[name=csrf-token]')?.content
       }
-    });
-    this.labelTarget.removeAttribute('disabled');
-    this.checkboxTarget.removeAttribute('disabled');
-    if (response.ok) {
-      const json = await response.json();
+    }).then((response) => {
+      if (response.ok) return response.json();
+      return Promise.reject('response was not ok')
+    }).then((json) => {
+      this.labelTarget.removeAttribute('disabled');
+      this.checkboxTarget.removeAttribute('disabled');
       this.updateStateFor(!this.checked);
       document.querySelector('[data-role=bookmark-counter]').innerHTML = json.bookmarks.count;
-    } else {
-      alert('Error');
-    }
+    }).catch((error) => {
+      this.handleError(error);
+    });
   }
 
   get checked() {
@@ -62,6 +63,10 @@ class CheckboxSubmit {
     return this.form.querySelector('[data-checkboxsubmit-target="span"]')
   }
 
+  handleError() {
+    alert("Unable to save the bookmark at this time.");
+  }
+
   updateStateFor(state) {
     this.checkboxTarget.checked = state;
 
@@ -197,21 +202,35 @@ const Modal = (() => {
   };
 
   // Add the passed in contents to the modal and display it.
+  // We have specific handling so that scripts returned from the ajax call are executed.
+  // This enables adding a script like recaptcha to prevent bots from sending emails.
   modal.receiveAjax = function (contents) {
-      const domparser = new DOMParser();
-      const dom = domparser.parseFromString(contents, "text/html");
-      // If there is a containerSelector on the document, use its children.
-      let elements = dom.querySelectorAll(`${modal.containerSelector} > *`);
-      if (elements.length == 0) {
-        // If the containerSelector wasn't found, use the whole document
-        elements = dom.body.childNodes;
-      }
-
-      document.querySelector(`${modal.modalSelector} .modal-content`).replaceChildren(...elements);
+    const domparser = new DOMParser();
+    const dom = domparser.parseFromString(contents, "text/html");
+    // If there is a containerSelector on the document, use its children.
+    let elements = dom.querySelectorAll(`${modal.containerSelector} > *`);
+    const frag = document.createDocumentFragment();
+    if (elements.length == 0) {
+      // If the containerSelector wasn't found, use the whole document
+      elements = dom.body.childNodes;
+    }
+    elements.forEach((el) => frag.appendChild(el));
+    modal.activateScripts(frag);
+    
+    document.querySelector(`${modal.modalSelector} .modal-content`).replaceChildren(frag);
 
-      modal.show();
+    modal.show();
   };
 
+  // DOMParser doesn't allow scripts to be executed.  This fixes that.
+  modal.activateScripts = function (frag) {
+    frag.querySelectorAll('script').forEach((script) => {
+      const fixedScript = document.createElement('script');
+      fixedScript.src = script.src;
+      fixedScript.async = false;
+      script.parentNode.replaceChild(fixedScript, script);
+    });
+  };
 
   modal.modalAjaxLinkClick = function(e) {
     e.preventDefault();
@@ -287,6 +306,7 @@ SearchContext.handleSearchContextMethod = function(event) {
 
   // check for meta keys.. if set, we should open in a new tab
   if(event.metaKey || event.ctrlKey) {
+    form.dataset.turbo = "false";
     target = '_blank';
   }
 
@@ -363,6 +383,9 @@ Blacklight.onLoad(function () {
   elem.classList.add('js');
 });
 
+// ALL imports in this dir, including in files imported, should be RELATIVE
+
+
 const index = {
   BookmarkToggle,
   ButtonFocus,