blacklight-spotlight 5.2.1 → 5.2.2

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/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/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/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/javascript/spotlight/controllers/clipboard_controller.js~

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

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/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/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.2'
 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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 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
@@ -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
@@ -1023,6 +1021,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
@@ -1562,7 +1561,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.7
 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/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