blacklight-spotlight 5.2.2 → 5.2.4

data/app/assets/stylesheets/spotlight/_blacklight_overrides.scss

@@ -5,10 +5,6 @@
     width: 100%;
   }
 
-  .search-btn {
-    max-height: 2.375rem;
-  }
-
   .search_field {
     background: transparent;
     border: none;

data/app/assets/stylesheets/spotlight/_browse.scss

@@ -138,20 +138,20 @@ $image-overlay-max-height: 300px;
   width: 100%;
 
   .col-form-label {
-    text-align: right;
+    text-align: end;
   }
 
   .browse-search-form {
     .btn-reset {
       background-color: transparent;
       display: none;
-      margin-left: -42px;
-      left: -40px;
+      margin-inline-start: -42px;
+      inset-inline-start: -40px;
       z-index: 20;
     }
 
     .search-btn {
-      left: -40px;
+      inset-inline-start: -40px;
       z-index: 30;
     }
   }

data/app/assets/stylesheets/spotlight/_catalog.scss

@@ -122,7 +122,6 @@ form.edit_solr_document {
 
   .btn,
   .btn-group {
-    margin-left: $spacer * 0.1;
     margin-top: $spacer * 0.25;
   }
 }

data/app/assets/stylesheets/spotlight/_collapse_toggle.scss

@@ -3,12 +3,12 @@
 .btn.collapse-toggle {
   & + .collapse-chevron {
     display: inline-block;
-    text-align: right;
+    text-align: end;
     transform: rotate(90deg);
     width: 16px;
   }
   &.collapsed + .collapse-chevron {
-    text-align: left;
+    text-align: start;
     transform: none;
   }
 }

data/app/assets/stylesheets/spotlight/_curation.scss

@@ -27,7 +27,7 @@
     display: none;
   }
   [data-expanded-add-button] {
-    text-align: left;
+    text-align: start;
   }
 }
 
@@ -80,28 +80,6 @@
   }
 }
 
-
-.card.page-admin {
-  &:hover {
-    @include panel-hover-highlighting;
-  }
-  .card-title {
-    @extend .mb-0;
-    @extend .py-2;
-  }
-
-  .page-links, .contact-links {
-    text-align: right;
-    a {
-      padding: 0 2px;
-    }
-  }
-  .main {
-    width: 99%;
-    vertical-align: text-top;
-  }
-}
-
 .contacts_admin .card-header.page .main {
   width: 95%;
 }
@@ -180,7 +158,7 @@ h1,h2,h3,h4,h5,h6 {
 .facet-metadata {
   @extend .text-muted;
   font-size: $font-size-base;
-  text-align: right;
+  text-align: end;
 }
 
 table#exhibit-specific-fields {
@@ -210,7 +188,7 @@ table.users {
 
 table.tags {
   td:nth-child(2), th:nth-child(2) {
-    text-align: right;
+    text-align: end;
   }
   td:nth-child(3), th:nth-child(3) {
     text-align: center;

data/app/assets/stylesheets/spotlight/_header.scss

@@ -34,10 +34,6 @@
       margin-bottom: 0;
     }
   }
-
-  .navbar-form {
-    text-align: right;
-  }
 }
 
 .resource-masthead {

data/app/assets/stylesheets/spotlight/_nestable.scss

@@ -81,9 +81,6 @@ tr.dd-item {
     min-height: 3rem;
   }
 }
-.dd3-content.page-admin {
-  position: relative;
-}
 
 .dd3-item > button { margin-left: 30px; }
 

data/app/assets/stylesheets/spotlight/_report_a_problem.scss

@@ -8,6 +8,6 @@
 
 @include media-breakpoint-up(sm) {
   #new_contact_form .col-form-label {
-    text-align: right;
+    text-align: end;
   }
 }

data/app/assets/stylesheets/spotlight/_sir-trevor_overrides.scss

@@ -57,6 +57,10 @@
   display: block !important;
 }
 
+.st-block-addition-top {
+  text-align: start;
+}
+
 .st-block-controls {
   display: none !important;
 }

data/app/assets/stylesheets/spotlight/_slideshow_block.scss

@@ -5,6 +5,7 @@
     margin-left: auto;
     margin-right: auto;
     max-width: 100%;
+    object-fit: contain;
   }
 
   .carousel-caption {
@@ -56,7 +57,7 @@
     left: initial;
     margin-left: 0;
     margin-right: 0;
-    text-align: left;
+    text-align: start;
 
     &.col-sm-6 {
       @extend .col-sm-6;

data/app/components/blacklight/icons/arrow_alt_circle_left_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for ArrowAltCircleLeft
-    class ArrowAltCircleLeftComponent < Spotlight::IconComponent
+    class ArrowAltCircleLeftComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
           <!-- Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->

data/app/components/blacklight/icons/arrow_alt_circle_right_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for ArrowAltCircleRight
-    class ArrowAltCircleRightComponent < Spotlight::IconComponent
+    class ArrowAltCircleRightComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
           <!-- Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->

data/app/components/blacklight/icons/arrow_back_ios_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for ArrowBackIos
-    class ArrowBackIosComponent < Spotlight::IconComponent
+    class ArrowBackIosComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path opacity=".87" fill="none" d="M0 0h24v24H0V0z"/>

data/app/components/blacklight/icons/arrow_forward_ios_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for ArrowForwardIos
-    class ArrowForwardIosComponent < Spotlight::IconComponent
+    class ArrowForwardIosComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path opacity=".87" fill="none" d="M24 24H0V0h24v24z"/>

data/app/components/blacklight/icons/check_circle_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for CheckCircle
-    class CheckCircleComponent < Spotlight::IconComponent
+    class CheckCircleComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path fill="none" d="M0 0h24v24H0V0z"/>

data/app/components/blacklight/icons/check_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for Check
-    class CheckComponent < Spotlight::IconComponent
+    class CheckComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path fill="none" d="M0 0h24v24H0V0z"/>

data/app/components/blacklight/icons/chevron_right_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for ChevronRight
-    class ChevronRightComponent < Spotlight::IconComponent
+    class ChevronRightComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path fill="none" d="M0 0h24v24H0V0z"/>

data/app/components/blacklight/icons/close_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for Close
-    class CloseComponent < Spotlight::IconComponent
+    class CloseComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
           <path d="M0 0h24v24H0V0z" fill="none"/>

data/app/components/blacklight/icons/edit_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for Edit
-    class EditComponent < Spotlight::IconComponent
+    class EditComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path fill="none" d="M0 0h24v24H0V0z"/>

data/app/components/blacklight/icons/error_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for Error
-    class ErrorComponent < Spotlight::IconComponent
+    class ErrorComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"/>

data/app/components/blacklight/icons/highlight_off_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for HighlightOff
-    class HighlightOffComponent < Spotlight::IconComponent
+    class HighlightOffComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
           <path d="M0 0h24v24H0V0z" fill="none"/>

data/app/components/blacklight/icons/info_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for Info
-    class InfoComponent < Spotlight::IconComponent
+    class InfoComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path fill="none" d="M0 0h24v24H0V0z"/>

data/app/components/blacklight/icons/warning_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for Warning
-    class WarningComponent < Spotlight::IconComponent
+    class WarningComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
           <path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/>

data/app/components/blacklight/icons/zoom_in_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for ZoomIn
-    class ZoomInComponent < Spotlight::IconComponent
+    class ZoomInComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
           <path d="M0 0h24v24H0V0z" fill="none"/>

data/app/components/blacklight/icons/zoom_out_component.rb

@@ -3,7 +3,7 @@
 module Blacklight
   module Icons
     # Icon for ZoomOut
-    class ZoomOutComponent < Spotlight::IconComponent
+    class ZoomOutComponent < Blacklight::Icons::IconComponent
       self.svg = <<~SVG
         <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
           <path d="M0 0h24v24H0V0z" fill="none"/>

data/app/components/spotlight/icon_component.rb

@@ -3,11 +3,11 @@
 module Spotlight
   # Displays the document
   class IconComponent < Blacklight::Icons::IconComponent
-    if Blacklight.version < '7.39'
-      # Work around https://github.com/projectblacklight/blacklight/issues/3232 (fixed in Blacklight 7.39)
-      def classes
-        ((@classes || (super if defined?(super)) || []) - ['blacklight-icons-'] + ["blacklight-icons-#{name}"]).uniq
-      end
+    def initialize(*args, **kwargs)
+      Spotlight.deprecator.warn(
+        'Spotlight::IconComponent is deprecated and will be removed in a future version. Use Blacklight::Icons::IconComponent instead.'
+      )
+      super
     end
   end
 end

data/app/controllers/spotlight/metadata_configurations_controller.rb

@@ -44,7 +44,7 @@ module Spotlight
       views = @blacklight_configuration.default_blacklight_config.view.keys | [:show]
 
       @blacklight_configuration.blacklight_config.index_fields.keys.index_with do |_element|
-        (%i[enabled label weight] | views)
+        %i[enabled label weight] | views
       end
     end
   end

data/app/controllers/spotlight/resources_controller.rb

@@ -55,7 +55,7 @@ module Spotlight
 
     def resource_params
       params.require(:resource).tap { |x| x['type'] ||= resource_class.name }
-            .permit(:url, :type, *resource_class.stored_attributes[:data], data: params[:resource][:data].try(:keys))
+                               .permit(:url, :type, *resource_class.stored_attributes[:data], data: params[:resource][:data].try(:keys))
     end
   end
 end

data/app/helpers/spotlight/application_helper.rb

@@ -5,6 +5,7 @@ module Spotlight
   # General spotlight application helpers
   module ApplicationHelper
     include CrudLinkHelpers
+    include ExhibitThemeHelper
     include TitleHelper
     include MetaHelper
     include CropHelper
@@ -151,19 +152,6 @@ module Spotlight
       current_exhibit.blacklight_configuration.default_blacklight_config.view.to_h.reject { |_k, v| v.if == false }
     end
 
-    def exhibit_stylesheet_link_tag(tag)
-      if current_exhibit_theme && current_exhibit.theme != 'default'
-        stylesheet_link_tag "#{tag}_#{current_exhibit_theme}"
-      else
-        Rails.logger.warn "Exhibit theme '#{current_exhibit_theme}' not in the list of available themes: #{current_exhibit.themes}"
-        stylesheet_link_tag(tag)
-      end
-    end
-
-    def current_exhibit_theme
-      current_exhibit.theme if current_exhibit && current_exhibit.theme.present? && current_exhibit.themes.include?(current_exhibit.theme)
-    end
-
     def render_search_bar
       return super if defined?(super)
 

data/app/helpers/spotlight/exhibit_theme_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ##
+  # Exhibit theme/stylesheet helper
+  module ExhibitThemeHelper
+    def exhibit_stylesheet_link_tag(tag)
+      if current_exhibit_theme && current_exhibit&.theme != 'default'
+        stylesheet_link_tag "#{tag}_#{current_exhibit_theme}"
+      else
+        Rails.logger.debug { "Exhibit theme '#{current_exhibit_theme}' not in the list of available themes: #{current_exhibit&.themes}" }
+        stylesheet_link_tag(tag)
+      end
+    end
+
+    def current_exhibit_theme
+      current_exhibit.theme if current_exhibit && current_exhibit.theme.present? && current_exhibit.themes.include?(current_exhibit.theme)
+    end
+  end
+end

data/app/helpers/spotlight/main_app_helpers.rb

@@ -5,6 +5,7 @@ module Spotlight
   # Helpers that are injected into the main application (because they used in layouts)
   module MainAppHelpers
     include Blacklight::DocumentHelperBehavior
+    include Spotlight::ExhibitThemeHelper
     include Spotlight::NavbarHelper
     include Spotlight::MastheadHelper
 
@@ -37,18 +38,5 @@ module Spotlight
         blacklight_config.view_config(action_name: :show).document_presenter_class
       end
     end
-
-    def exhibit_stylesheet_link_tag(tag)
-      if current_exhibit_theme && current_exhibit&.theme != 'default'
-        stylesheet_link_tag "#{tag}_#{current_exhibit_theme}"
-      else
-        Rails.logger.debug { "Exhibit theme '#{current_exhibit_theme}' not in the list of available themes: #{current_exhibit&.themes}" }
-        stylesheet_link_tag(tag)
-      end
-    end
-
-    def current_exhibit_theme
-      current_exhibit.theme if current_exhibit && current_exhibit.theme.present? && current_exhibit.themes.include?(current_exhibit.theme)
-    end
   end
 end

data/app/models/spotlight/featured_image.rb

@@ -24,13 +24,6 @@ module Spotlight
       Spotlight::TemporaryImage.find(upload_id).delete if upload_id.present?
     end
 
-    after_save do
-      if image.present?
-        image.cache! unless image.cached?
-        image.store!
-      end
-    end
-
     after_save :bust_containing_resource_caches
 
     attr_accessor :upload_id

data/app/models/spotlight/resource.rb

@@ -7,11 +7,13 @@ module Spotlight
     class_attribute :indexing_pipeline, default: (Spotlight::Etl::Pipeline.new do |pipeline|
       pipeline.sources = [Spotlight::Etl::Sources::IdentitySource]
       pipeline.transforms = [
-        reject_blank: Spotlight::Etl::Transforms::RejectBlank,
-        reject_missing: Spotlight::Etl::Transforms::RejectMissingUniqueId,
-        apply_exhibit_metadata: Spotlight::Etl::Transforms::ApplyExhibitMetadata,
-        apply_application_metadata: Spotlight::Etl::Transforms::ApplyApplicationMetadata,
-        apply_pipeline_metadata: Spotlight::Etl::Transforms::ApplyPipelineMetadata
+        {
+          reject_blank: Spotlight::Etl::Transforms::RejectBlank,
+          reject_missing: Spotlight::Etl::Transforms::RejectMissingUniqueId,
+          apply_exhibit_metadata: Spotlight::Etl::Transforms::ApplyExhibitMetadata,
+          apply_application_metadata: Spotlight::Etl::Transforms::ApplyApplicationMetadata,
+          apply_pipeline_metadata: Spotlight::Etl::Transforms::ApplyPipelineMetadata
+        }
       ]
       pipeline.loaders = [Spotlight::Etl::SolrLoader]
     end)

data/app/models/spotlight/resources/iiif_manifest_v3.rb

@@ -28,8 +28,8 @@ module Spotlight
         @resources ||=
           canvases
           .flat_map(&:items).select { |item| item.type == 'AnnotationPage' }
-          .flat_map(&:items).select { |item| item.motivation == 'painting' }
-          .flat_map(&:body)
+                            .flat_map(&:items).select { |item| item.motivation == 'painting' }
+                                              .flat_map(&:body)
           .flat_map(&:service)
       end
 

data/config/importmap.rb

@@ -3,7 +3,7 @@
 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.skypack.dev/clipboard@2.0.10'
-pin 'sir-trevor', to: 'https://cdn.skypack.dev/sir-trevor@0.8.2'
-pin 'sortablejs', to: 'https://cdn.skypack.dev/sortablejs@^1.15.3'
-pin '@github/auto-complete-element', to: 'https://cdn.skypack.dev/@github/auto-complete-element'
+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/spotlight/version.rb

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

data/lib/spotlight.rb

@@ -7,6 +7,6 @@ require 'spotlight/engine'
 # Spotlight
 module Spotlight
   def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new('5.0', 'blacklight-spotlight')
+    @deprecator ||= ActiveSupport::Deprecation.new('6.0', 'blacklight-spotlight')
   end
 end

data/spec/support/views/test_view_helpers.rb

@@ -12,6 +12,7 @@ module Spotlight
         view.send(:extend, Spotlight::TitleHelper)
         view.send(:extend, Spotlight::NavbarHelper)
         view.send(:extend, Spotlight::CropHelper)
+        view.send(:extend, Spotlight::ExhibitThemeHelper)
         view.send(:extend, Spotlight::PagesHelper)
         view.send(:extend, Blacklight::ComponentHelperBehavior)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.4
 platform: ruby
 authors:
 - Chris Beer
@@ -129,7 +129,7 @@ dependencies:
         version: 2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
         version: 2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -960,6 +960,7 @@ files:
 - app/helpers/spotlight/browse_helper.rb
 - app/helpers/spotlight/crop_helper.rb
 - app/helpers/spotlight/crud_link_helpers.rb
+- app/helpers/spotlight/exhibit_theme_helper.rb
 - app/helpers/spotlight/job_trackers_helper.rb
 - app/helpers/spotlight/languages_helper.rb
 - app/helpers/spotlight/main_app_helpers.rb
@@ -1021,7 +1022,6 @@ 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
@@ -1561,7 +1561,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 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/controllers/clipboard_controller.js~

@@ -1,6 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-
-// Connects to data-controller="clipboard"
-export default class extends Controller {
-
-}