blacklight-spotlight 5.3.0 → 5.3.2

data/app/views/spotlight/translations/_search_fields.html.erb

@@ -1,10 +1,10 @@
 <div role="tabpanel" class="tab-pane <%= 'active' if @tab == 'search_fields' %>" id="search_fields">
   <%= bootstrap_form_for current_exhibit, url: spotlight.exhibit_translations_path(current_exhibit), layout: :horizontal do |f| %>
-    <% # Add hidden fields for the language and tab so the redirect knows how to come back here %>
+    <%# Add hidden fields for the language and tab so the redirect knows how to come back here %>
     <%= hidden_field_tag :language, @language %>
     <%= hidden_field_tag :tab, 'search_fields', id: nil %>
 
-    <div class='translation-field-based-search-fields'>
+    <div class="translation-field-based-search-fields">
       <%= render Spotlight::Translations::SubheadingComponent.new(key: 'search_fields.field_based_search_fields.label') %>
 
       <% current_exhibit.blacklight_config.search_fields.select { |_, config| config.if }.each do |key, search_config| %>
@@ -12,15 +12,15 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
+          <div data-translation-progress-item="true" class="row form-group mb-3 translation-form">
             <%= translation_fields.label :value, t("spotlight.search.fields.search.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
-            <div class='col-11 col-sm-9 card card-body panel-translation'>
+            <div class="col-11 col-sm-9 card card-body panel-translation">
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
               <div class="form-text text-muted mb-3">
                 <%= search_config.label %>
               </div>
             </div>
-            <div class='col-1'>
+            <div class="col-1">
               <% if translation.value.present? %>
                 <span data-translation-present="true">
                   <%= blacklight_icon('check', classes: 'translation-complete') %>
@@ -32,7 +32,7 @@
       <% end %>
     </div>
 
-    <div class='translation-facet-fields'>
+    <div class="translation-facet-fields">
       <%= render Spotlight::Translations::SubheadingComponent.new(key: 'search_fields.facet_fields.label') %>
 
       <% current_exhibit.blacklight_config.facet_fields.each do |key, facet_config| %>
@@ -40,15 +40,15 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
+          <div data-translation-progress-item="true" class="row form-group mb-3 translation-form">
             <%= translation_fields.label :value, t("spotlight.search.fields.facet.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
-            <div class='col-11 col-sm-9 card card-body panel-translation'>
+            <div class="col-11 col-sm-9 card card-body panel-translation">
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
               <div class="form-text text-muted mb-3">
                 <%= facet_config.label %>
               </div>
             </div>
-            <div class='col-1'>
+            <div class="col-1">
               <% if translation.value.present? %>
                 <span data-translation-present="true">
                   <%= blacklight_icon('check', classes: 'translation-complete') %>
@@ -60,7 +60,7 @@
       <% end %>
     </div>
 
-    <div class='translation-sort-fields'>
+    <div class="translation-sort-fields">
       <%= render Spotlight::Translations::SubheadingComponent.new(key: 'search_fields.sort_fields.label') %>
 
       <% current_exhibit.blacklight_config.sort_fields.each do |key, sort_config| %>
@@ -68,15 +68,15 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
+          <div data-translation-progress-item="true" class="row form-group mb-3 translation-form">
             <%= translation_fields.label :value, t("spotlight.search.fields.sort.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
-            <div class='col-11 col-sm-9 card card-body panel-translation'>
+            <div class="col-11 col-sm-9 card card-body panel-translation">
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
               <div class="form-text text-muted mb-3">
                 <%= sort_config.label %>
               </div>
             </div>
-            <div class='col-1'>
+            <div class="col-1">
               <% if translation.value.present? %>
                 <span data-translation-present="true">
                   <%= blacklight_icon('check', classes: 'translation-complete') %>

data/app/views/spotlight/translations/edit.html.erb

@@ -2,11 +2,11 @@
   <%= render 'spotlight/shared/exhibit_sidebar' %>
 <% end %>
 
-<div class='translation-edit-form'>
+<div class="translation-edit-form">
   <%= curation_page_title t('.title') %>
 
-  <div class='text-center'>
-    <ul class='nav nav-pills'>
+  <div class="text-center">
+    <ul class="nav nav-pills">
       <% current_exhibit.available_locales.each do |language| %>
         <li role="presentation" class="nav-item">
           <%= link_to spotlight.edit_exhibit_translations_path(current_exhibit, language: language), class: "nav-link #{'active' if @language == language}" do %>
@@ -20,9 +20,9 @@
   <%= render partial: 'import' %>
 
   <div role="tabpanel">
-    <ul class='nav nav-tabs' role="tablist">
+    <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="nav-item">
-        <a href='#general' class="nav-link <%= 'active' if @tab.blank? %>" aria-controls="general" role="tab" data-bs-toggle="tab" data-behavior="translation-progress">
+        <a href="#general" class="nav-link <%= 'active' if @tab.blank? %>" aria-controls="general" role="tab" data-bs-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.general.label') %> <span class="badge"></span>
         </a>
       </li>

data/config/importmap.rb

@@ -3,7 +3,6 @@
 pin_all_from File.expand_path('../app/javascript/spotlight', __dir__), under: 'spotlight'
 pin_all_from File.expand_path('../vendor/assets/javascripts', __dir__)
 
-pin 'clipboard', to: 'https://cdn.jsdelivr.net/npm/clipboard@2.0.11/+esm'
 pin 'sir-trevor', to: 'https://cdn.jsdelivr.net/npm/sir-trevor@0.8.2/+esm'
 pin 'sortablejs', to: 'https://cdn.jsdelivr.net/npm/sortablejs@^1.15.3/+esm'
 pin '@github/auto-complete-element', to: 'https://cdn.jsdelivr.net/npm/@github/auto-complete-element@3.8.0/+esm'

data/lib/generators/spotlight/assets/propshaft_generator.rb

@@ -26,7 +26,6 @@ module Spotlight
       def install_dependencies
         run 'yarn add @github/auto-complete-element'
         run 'yarn add @hotwired/turbo-rails'
-        run 'yarn add clipboard'
         run 'yarn add leaflet'
         run 'yarn add sir-trevor'
         run 'yarn add sortablejs'

data/lib/generators/spotlight/templates/solr/conf/admin-extra.html

@@ -1,31 +1,31 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top
-of the admin page.  Uncomment this as an example to see there the content
-will show up.
-
-<hr>
-<i>This line will appear before the first table</i>
-<tr>
-<td colspan="2">
-This row will be appended to the end of the first table
-</td>
-</tr>
-<hr>
-
--->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
+
+-->

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '5.3.0'
+  VERSION = '5.3.2'
 end

data/spec/factories/contact_images.rb

@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :contact_image, class: 'Spotlight::ContactImage' do
     image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
-    iiif_tilesource { 'https://exhibits-stage.stanford.edu/images/78' }
+    iiif_tilesource { 'http://127.0.0.1:9999/images/78' }
   end
 end

data/spec/factories/exhibit_thumbnails.rb

@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :exhibit_thumbnail, class: 'Spotlight::ExhibitThumbnail' do
     image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
-    iiif_tilesource { 'https://exhibits-stage.stanford.edu/images/78' }
+    iiif_tilesource { 'http://127.0.0.1:9999/images/78' }
   end
 end

data/spec/factories/featured_images.rb

@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :featured_image, class: 'Spotlight::FeaturedImage' do
     image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
-    iiif_tilesource { 'https://exhibits-stage.stanford.edu/images/78' }
+    iiif_tilesource { 'http://127.0.0.1:9999/images/78' }
   end
 
   factory :temporary_image, class: 'Spotlight::TemporaryImage' do

data/spec/support/features/test_features_helpers.rb

@@ -9,7 +9,16 @@ module Spotlight
       find("auto-complete [data-#{type}-typeahead][role='combobox']").fill_in(with: opts[:with])
       # Wait for the autocomplete to show both 'open' and 'aria-expanded="true"' or the results might be stale
       expect(page).to have_css("auto-complete[open] [data-#{type}-typeahead][role='combobox'][aria-expanded='true']")
-      first('auto-complete[open] [role="option"]', text: opts[:with]).click
+      # The auto-complete element fires one fetch on focus and another debounced fetch on input. In CI
+      # they can land out of order, and whichever returns second replaces the results <ul> wholesale
+      # turning any <li> we just located into a stale reference. Retry find+click as one unit so each
+      # attempt resolves against the latest DOM.
+      page.document.synchronize(
+        Capybara.default_max_wait_time,
+        errors: [Selenium::WebDriver::Error::StaleElementReferenceError, Capybara::ElementNotFound]
+      ) do
+        first('auto-complete[open] [role="option"]', text: opts[:with], minimum: 1).click
+      end
     end
 
     # just like #fill_in_typeahead_field, but wait for the
@@ -49,6 +58,37 @@ module Spotlight
       expect(page).to have_no_selector('.alert-danger')
     end
 
+    # Capybara's HTML5 drag emulation sends the drag events to a given element. This drags
+    # to a point instead, so the test covers what is under the pointer.
+    def drag_horizontally(handle, by:)
+      # elementFromPoint returns null for a point outside the viewport
+      page.scroll_to(handle, align: :center)
+      page.driver.browser.action.click_and_hold(handle.native).perform
+      error = page.evaluate_async_script(DRAG_HORIZONTALLY_SCRIPT, handle, by)
+      page.driver.browser.action.release.perform
+      raise error if error
+    end
+
+    DRAG_HORIZONTALLY_SCRIPT = <<~JS
+      const [handle, offset, done] = arguments
+      const item = handle.closest('.dd-item')
+      const tick = () => new Promise((resolve) => setTimeout(resolve, 50))
+      const opts = { bubbles: true, cancelable: true, dataTransfer: new DataTransfer() }
+
+      item.dispatchEvent(new DragEvent('dragstart', opts))
+      tick().then(() => {
+        const rect = handle.getBoundingClientRect()
+        const point = { clientX: rect.left + rect.width / 2 + offset, clientY: rect.top + rect.height / 2 }
+        const target = document.elementFromPoint(point.clientX, point.clientY)
+        target.dispatchEvent(new DragEvent('dragover', { ...opts, ...point }))
+        return tick().then(() => {
+          target.dispatchEvent(new DragEvent('drop', { ...opts, ...point }))
+          item.dispatchEvent(new DragEvent('dragend', { ...opts, ...point }))
+          done()
+        })
+      }).catch((error) => done(String(error)))
+    JS
+
     RSpec::Matchers.define :have_breadcrumbs do |*expected|
       match do |actual|
         errors = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 - Justin Coyne
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -328,20 +328,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oauth2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: openseadragon
   requirement: !ruby/object:Gem::Requirement
@@ -456,48 +442,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: roar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: roar-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: signet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -1003,7 +947,6 @@ files:
 - app/javascript/spotlight/admin/blocks/solr_documents_features_block.js
 - app/javascript/spotlight/admin/blocks/solr_documents_grid_block.js
 - app/javascript/spotlight/admin/blocks/uploaded_items_block.js
-- app/javascript/spotlight/admin/copy_email_addresses.js
 - app/javascript/spotlight/admin/crop.js
 - app/javascript/spotlight/admin/croppable.js
 - app/javascript/spotlight/admin/croppable_modal.js
@@ -1027,6 +970,7 @@ files:
 - app/javascript/spotlight/admin/translation_progress.js
 - app/javascript/spotlight/admin/users.js
 - app/javascript/spotlight/admin/visibility_toggle.js
+- app/javascript/spotlight/controllers/clipboard_controller.js
 - app/javascript/spotlight/controllers/index.js
 - app/javascript/spotlight/controllers/tag_selector_controller.js
 - app/javascript/spotlight/core.js
@@ -1527,7 +1471,6 @@ files:
 - vendor/assets/images/sir-trevor-icons.svg
 - vendor/assets/javascripts/Leaflet.Editable.js
 - vendor/assets/javascripts/Path.Drag.js
-- vendor/assets/javascripts/jquery.waitforimages.min.js
 - vendor/assets/javascripts/leaflet-iiif.js
 - vendor/assets/javascripts/parameterize.js
 - vendor/assets/javascripts/tiny-slider.js
@@ -1566,7 +1509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
   to create attractive, feature-rich websites that feature these collections.

data/app/javascript/spotlight/admin/copy_email_addresses.js

@@ -1,7 +0,0 @@
-import Clipboard from 'clipboard';
-
-export default class {
-    connect() {
-        new Clipboard('.copy-email-addresses');
-    }
-}

data/vendor/assets/javascripts/jquery.waitforimages.min.js

@@ -1,2 +0,0 @@
-/*! waitForImages jQuery Plugin 2013-07-20 */
-!function(a){var b="waitForImages";a.waitForImages={hasImageProperties:["backgroundImage","listStyleImage","borderImage","borderCornerImage","cursor"]},a.expr[":"].uncached=function(b){if(!a(b).is('img[src!=""]'))return!1;var c=new Image;return c.src=b.src,!c.complete},a.fn.waitForImages=function(c,d,e){var f=0,g=0;if(a.isPlainObject(arguments[0])&&(e=arguments[0].waitForAll,d=arguments[0].each,c=arguments[0].finished),c=c||a.noop,d=d||a.noop,e=!!e,!a.isFunction(c)||!a.isFunction(d))throw new TypeError("An invalid callback was supplied.");return this.each(function(){var h=a(this),i=[],j=a.waitForImages.hasImageProperties||[],k=/url\(\s*(['"]?)(.*?)\1\s*\)/g;e?h.find("*").addBack().each(function(){var b=a(this);b.is("img:uncached")&&i.push({src:b.attr("src"),element:b[0]}),a.each(j,function(a,c){var d,e=b.css(c);if(!e)return!0;for(;d=k.exec(e);)i.push({src:d[2],element:b[0]})})}):h.find("img:uncached").each(function(){i.push({src:this.src,element:this})}),f=i.length,g=0,0===f&&c.call(h[0]),a.each(i,function(e,i){var j=new Image;a(j).on("load."+b+" error."+b,function(a){return g++,d.call(i.element,g,f,"load"==a.type),g==f?(c.call(h[0]),!1):void 0}),j.src=i.src})})}}(jQuery);