blacklight-spotlight 5.2.1 → 5.2.3

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

@@ -138,7 +138,7 @@ $image-overlay-max-height: 300px;
   width: 100%;
 
   .col-form-label {
-    text-align: right;
+    text-align: end;
   }
 
   .browse-search-form {

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/_multi_up_item_grid.scss

@@ -1,33 +1,3 @@
-.item-grid-admin {
-  .field {
-    input[type='text'] {
-      width: 89%;
-    }
-
-    .twitter-typeahead {  
-      margin-bottom: 2*$spacer;
-    }
-  }
-  .field-select {
-    margin-top: 2*$spacer;
-    select {
-      display: inline;
-      width: auto;
-    }
-  }
-  .dd3-item {
-    margin-bottom: 2*$spacer;
-  }
-}
-// Hide the secondary caption field
-// for the Features block so we can
-// re-use the rest from the generic
-// multi-up item grid.
-[data-type='item-features'] {
-  .secondary-caption {
-    display: none;
-  }
-}
 .spotlight-flexbox {
   display: -webkit-box;
   display: -moz-box;

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

@@ -56,7 +56,7 @@
     left: initial;
     margin-left: 0;
     margin-right: 0;
-    text-align: left;
+    text-align: start;
 
     &.col-sm-6 {
       @extend .col-sm-6;

data/app/controllers/spotlight/exhibits_controller.rb

@@ -54,6 +54,7 @@ module Spotlight
       build_initial_exhibit_contact_emails
     end
 
+    # rubocop:disable Metrics/AbcSize
     def create
       @exhibit.attributes = exhibit_params
 
@@ -61,9 +62,12 @@ module Spotlight
         @exhibit.roles.create user: current_user, role: 'admin' if current_user
         redirect_to spotlight.exhibit_dashboard_path(@exhibit), notice: t(:'helpers.submit.exhibit.created', model: @exhibit.class.model_name.human.downcase)
       else
-        render action: :new
+        flash.now[:alert] = t('spotlight.exhibits.new_exhibit_form.errors.slug_taken') if @exhibit.errors[:slug].present?
+
+        render :new, status: :unprocessable_entity
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def update
       if @exhibit.update(exhibit_params)

data/app/controllers/spotlight/featured_images_controller.rb

@@ -5,6 +5,8 @@ module Spotlight
   class FeaturedImagesController < Spotlight::ApplicationController
     load_and_authorize_resource instance_name: :featured_image, class: 'Spotlight::TemporaryImage'
 
+    rescue_from CarrierWave::UploadError, with: :handle_upload_error
+
     def create
       if @featured_image.save && @featured_image.file_present?
         render json: { tilesource:, id: @featured_image.id }
@@ -15,6 +17,10 @@ module Spotlight
 
     private
 
+    def handle_upload_error(exception)
+      render json: { error: [exception.message] }, status: :unprocessable_entity
+    end
+
     def tilesource
       Spotlight::Engine.config.iiif_service.info_url(@featured_image, request.host)
     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/crop_helper.rb

@@ -27,6 +27,7 @@ module Spotlight
     def iiif_upload_tag(f)
       content_tag(:div) do
         concat f.file_field_without_bootstrap :file, name: 'featured_image[image]', data: { endpoint: polymorphic_path(f.object.model_name.route_key) }
+        concat content_tag(:div, '', class: 'featured-image invalid-feedback')
         concat f.hidden_field :upload_id
       end
     end

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/javascript/spotlight/admin/blocks/search_result_block.js

@@ -1,5 +1,3 @@
-//= require spotlight/admin/blocks/browse_block
-
 SirTrevor.Blocks.SearchResults =  (function(){
 
   return SirTrevor.Blocks.Browse.extend({

data/app/javascript/spotlight/admin/blocks/solr_documents_block.js

@@ -1,5 +1,3 @@
-//= require spotlight/admin/blocks/solr_documents_base_block
-
 SirTrevor.Blocks.SolrDocuments = (function(){
 
   return SirTrevor.Blocks.SolrDocumentsBase.extend({

data/app/javascript/spotlight/admin/blocks/solr_documents_carousel_block.js

@@ -1,5 +1,3 @@
-//= require spotlight/admin/blocks/solr_documents_base_block
-
 SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
 
   return SirTrevor.Blocks.SolrDocumentsBase.extend({

data/app/javascript/spotlight/admin/blocks/solr_documents_embed_block.js

@@ -1,5 +1,3 @@
-//= require spotlight/admin/blocks/solr_documents_base_block
-
 SirTrevor.Blocks.SolrDocumentsEmbed = (function(){
 
   return SirTrevor.Blocks.SolrDocumentsBase.extend({

data/app/javascript/spotlight/admin/blocks/solr_documents_features_block.js

@@ -1,5 +1,3 @@
-//= require spotlight/admin/blocks/solr_documents_base_block
-
 SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
 
   return SirTrevor.Blocks.SolrDocumentsBase.extend({

data/app/javascript/spotlight/admin/blocks/solr_documents_grid_block.js

@@ -1,5 +1,3 @@
-//= require spotlight/admin/blocks/solr_documents_base_block
-
 SirTrevor.Blocks.SolrDocumentsGrid = (function(){
 
   return SirTrevor.Blocks.SolrDocumentsBase.extend({

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

@@ -285,7 +285,7 @@ export default class Crop {
       url: url,  //Server script to process data
       type: 'POST',
       success: (data, stat, xhr) => this.successHandler(data, stat, xhr),
-      // error: errorHandler,
+      error: (xhr, stat, error) => this.errorHandler(xhr, stat, error),
       // Form data
       data: this.getData(),
       headers: {
@@ -301,6 +301,39 @@ export default class Crop {
   successHandler(data, stat, xhr) {
     this.setIiifFields({ tilesource: data.tilesource });
     this.setUploadId(data.id);
+    this.clearUploadErrors()
+  }
+
+  errorHandler(xhr, stat, error) {
+    let errorMessage = "Upload failed"
+    if (xhr.responseJSON) {
+      if (xhr.responseJSON.errors) {
+        errorMessage = xhr.responseJSON.errors.join(', ')
+      } else if (xhr.responseJSON.error) {
+        errorMessage = xhr.responseJSON.error
+      }
+    }
+    this.showUploadError(errorMessage)
+  }
+
+  getUploadErrorsElement() {
+    return this.cropTool.find(".featured-image.invalid-feedback")
+  }
+
+  showUploadError(errorMessage) {
+    const errorsElement = this.getUploadErrorsElement()
+    if (errorsElement) {
+      errorsElement.text(errorMessage).show()
+    } else {
+      console.error("uploadFile", error, errorMessage)
+    }
+  }
+
+  clearUploadErrors() {
+    const errorsElement = this.getUploadErrorsElement()
+    if (errorsElement) {
+      errorsElement.text("").hide()
+    }
   }
 
   setUploadId(id) {

data/app/models/spotlight/exhibit.rb

@@ -28,7 +28,7 @@ module Spotlight
     end
 
     validates :title, presence: true, if: -> { I18n.locale == I18n.default_locale }
-    validates :slug, uniqueness: true
+    validates :slug, uniqueness: { message: I18n.t('spotlight.exhibits.new_exhibit_form.errors.slug_taken') }
     validates :theme, inclusion: { in: Spotlight::Engine.config.exhibit_themes }, allow_blank: true
 
     after_validation :move_friendly_id_error_to_slug

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/app/services/spotlight/clone_translated_page_from_locale.rb

@@ -24,7 +24,7 @@ module Spotlight
     private
 
     def destroy
-      page.translated_page_for(locale).destroy if page.translated_page_for(locale).present?
+      page.translated_page_for(locale).presence&.destroy
     end
   end
 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/config/locales/spotlight.en.yml

@@ -23,6 +23,12 @@ en:
       spotlight/page:
         display_sidebar?: Show sidebar
         display_title: Show title
+    errors:
+      models:
+        spotlight/exhibit:
+          attributes:
+            slug:
+              taken: Slug is already taken.
     help:
       spotlight/exhibit:
         tag_list: Enter tags separated by commas.
@@ -616,6 +622,8 @@ en:
       new:
         page_title: Create a new exhibit
       new_exhibit_form:
+        errors:
+          slug_taken: Slug is already taken. Please choose another.
         fields:
           slug:
             help_block: A hyphenated name to be displayed in the URL for the exhibit (e.g., "maps-of-africa").

data/lib/spotlight/engine.rb

@@ -28,8 +28,6 @@ module Spotlight
     require 'redcarpet' # required for markdown support
     require 'openseadragon'
 
-    config.assets.precompile += %w[spotlight/fallback/*.png] if defined?(Sprockets)
-
     config.autoload_paths += %W[
       #{config.root}/app/builders
       #{config.root}/app/controllers/concerns

data/lib/spotlight/version.rb

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

data/spec/support/features/test_features_helpers.rb

@@ -6,8 +6,9 @@ module Spotlight
       type = opts[:type] || 'default'
 
       # Role=combobox indicates that the auto-complete is initialized
-      expect(page).to have_css("auto-complete [data-#{type}-typeahead][role='combobox']")
-      find("auto-complete [data-#{type}-typeahead]").fill_in(with: opts[:with])
+      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
     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.1
+  version: 5.2.3
 platform: ruby
 authors:
 - Chris Beer
@@ -35,7 +35,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -385,7 +385,7 @@ dependencies:
         version: '11.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -395,7 +395,7 @@ dependencies:
         version: '11.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '17'
+        version: '18'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -801,12 +801,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/config/spotlight/manifest.js
 - app/assets/images/spotlight/blocks/sir-trevor-icons.svg
 - app/assets/images/spotlight/default_browse_thumbnail.jpg
 - app/assets/images/spotlight/default_thumbnail.jpg
 - app/assets/images/spotlight/fallback/default.png
-- app/assets/javascripts/spotlight/application.js
 - app/assets/javascripts/spotlight/spotlight.esm.js
 - app/assets/javascripts/spotlight/spotlight.esm.js.map
 - app/assets/javascripts/spotlight/spotlight.js
@@ -962,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

data/app/assets/config/spotlight/manifest.js

@@ -1,3 +0,0 @@
-//= link_tree ../../images
-//= link_tree ../../../javascript .js
-//= link_tree ../../../../vendor/assets/javascripts .js

data/app/assets/javascripts/spotlight/application.js

@@ -1,7 +0,0 @@
-// This is the sprockets entrypoint.
-//= require leaflet
-//= require sir-trevor
-//= require clipboard
-//= require tiny-slider
-
-//= require spotlight/spotlight