blacklight-spotlight 3.6.0.beta4 → 3.6.0.beta6

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

@@ -89,7 +89,7 @@ module Spotlight
 
       def manifest_metadata
         metadata = metadata_class.new(manifest).to_solr
-        return {} unless metadata.present?
+        return {} if metadata.blank?
 
         create_sidecars_for(*metadata.keys)
 
@@ -203,7 +203,7 @@ module Spotlight
         end
 
         def metadata_hash
-          return {} unless metadata.present?
+          return {} if metadata.blank?
           return {} unless metadata.is_a?(Array)
 
           metadata.each_with_object({}) do |md, hash|

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

@@ -61,7 +61,7 @@ module Spotlight
 
           thing.manifests.each(&block)
 
-          return unless thing.collections.present?
+          return if thing.collections.blank?
 
           thing.collections.each do |collection|
             recursive_manifests(collection, &block)

data/app/views/layouts/spotlight/base.html.erb

@@ -26,9 +26,9 @@
     <%= render partial: 'shared/body_preamble' %>
     <div id="skip-link">
       <% if should_render_spotlight_search_bar? %>
-        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3' %>
       <% end %>
-      <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3' %>
       <%= content_for(:skip_links) %>
     </div>
 

data/app/views/spotlight/dashboards/_page.html.erb

@@ -4,10 +4,10 @@
     <div class="page-links pt-0">
       <% if page.is_a?(Spotlight::HomePage) %>
           <%= link_to action_default_value(page, :view), current_exhibit %> &middot;
-          <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), data: { turbolinks: false } %>
+          <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), data: { turbolinks: false, turbo: false } %>
       <% else %>
         <%= exhibit_view_link page %> &middot;
-        <%= exhibit_edit_link page, data: { turbolinks: false } %>
+        <%= exhibit_edit_link page, data: { turbolinks: false, turbo: false } %>
       <% end %>
     </div>
   </td>

data/app/views/spotlight/home_pages/_edit_page_link.html.erb

@@ -1 +1,2 @@
-<%= exhibit_edit_link @page, spotlight.edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-right btn btn-primary', data: { turbolinks: false } %>
+<%= exhibit_edit_link @page, spotlight.edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-right btn btn-primary',
+                      data: { turbolinks: false, turbo: false } %>

data/app/views/spotlight/pages/_edit_page_link.html.erb

@@ -1 +1,2 @@
-<%= exhibit_edit_link @page, class: 'edit-button float-right btn btn-primary', data: { turbolinks: false } %>
+<%= exhibit_edit_link @page, class: 'edit-button float-right btn btn-primary',
+                      data: { turbolinks: false, turbo: false } %>

data/app/views/spotlight/pages/_page.html.erb

@@ -3,7 +3,7 @@
   <% case section when :additional_options %>
     <div class="page-links">
       <%= exhibit_view_link page %> &middot;
-      <%= exhibit_edit_link page, data: { turbolinks: false } %> &middot;
+      <%= exhibit_edit_link page, data: { turbolinks: false, turbo: false } %> &middot;
       <%= exhibit_delete_link page %>
     </div>
     <%- if page.feature_page? -%>

data/app/views/spotlight/shared/_locale_picker.html.erb

@@ -6,7 +6,8 @@
     <ul class="dropdown-menu">
       <% locale_selecter_dropown_options.each do |language| %>
         <li>
-          <%= link_to language.to_native, current_page_for_locale(language.locale), class: 'dropdown-item', data: { turbolinks: false } %>
+          <%= link_to language.to_native, current_page_for_locale(language.locale), class: 'dropdown-item',
+                      data: { turbolinks: false, turbo: false } %>
         </li>
       <% end %>
     </ul>

data/config/importmap.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+pin_all_from File.expand_path('../app/javascript/spotlight', __dir__), under: 'spotlight'
+pin_all_from File.expand_path('../vendor/assets/javascripts', __dir__)

data/lib/generators/spotlight/install_generator.rb

@@ -21,6 +21,9 @@ module Spotlight
     def add_manifest
       append_to_file 'app/assets/javascripts/application.js', "\n//= require_tree .\n"
       append_to_file 'app/assets/config/manifest.js', "\n//= link spotlight/manifest.js"
+
+      # Rails installed importmap by default, but we don't have importmap + Blacklight 7 working yet.
+      remove_file 'app/javascript/application.js'
     end
 
     def inject_spotlight_routes

data/lib/generators/spotlight/templates/spotlight.scss

@@ -1,6 +1,4 @@
-/*
-*= require bootstrap-tagsinput
-*/
+@import 'bootstrap-tagsinput';
 @import 'spotlight/variables_bootstrap';
 @import 'bootstrap';
 @import 'sir-trevor/main';

data/lib/migration/iiif.rb

@@ -97,7 +97,7 @@ module Migration
     end
 
     def coordinates(image)
-      return unless image.image_crop_x.present?
+      return if image.image_crop_x.blank?
 
       [image.image_crop_x, image.image_crop_y, image.image_crop_w, image.image_crop_h].join(',')
     end

data/lib/spotlight/engine.rb

@@ -41,7 +41,6 @@ module Spotlight
     require 'redcarpet' # required for markdown support in github/markup https://github.com/github/markup#markups
     require 'github/markup'
     require 'openseadragon'
-    require 'handlebars_assets'
 
     config.assets.precompile += %w[spotlight/fallback/*.png]
 
@@ -64,8 +63,23 @@ module Spotlight
       FactoryBot.definition_file_paths << File.expand_path('../../spec/factories', __dir__) if defined?(FactoryBot)
     end
 
+    PRECOMPILE_ASSETS = %w[
+      spotlight/blocks/sir-trevor-icons.svg
+      spotlight/default_thumbnail.jpg
+      spotlight/default_browse_thumbnail.jpg
+      spotlight/spotlight.js
+      spotlight/spotlight.js.map
+      spotlight/spotlight.esm.js
+      spotlight/spotlight.esm.js.map
+    ].freeze
+
     initializer 'spotlight.assets.precompile' do |app|
-      app.config.assets.precompile += %w[spotlight/default_thumbnail.jpg spotlight/default_browse_thumbnail.jpg]
+      app.config.assets.paths << Engine.root.join('app/javascript')
+      app.config.assets.precompile += PRECOMPILE_ASSETS
+    end
+
+    initializer 'spotlight.importmap', before: 'importmap' do |app|
+      app.config.importmap.paths << Engine.root.join('config/importmap.rb') if app.config.respond_to?(:importmap)
     end
 
     def self.user_class
@@ -326,4 +340,5 @@ module Spotlight
       config.active_record.yaml_column_permitted_classes += [Symbol, ActiveSupport::HashWithIndifferentAccess]
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.6.0.beta4'
+  VERSION = '3.6.0.beta6'
 end

data/spec/support/features/test_features_helpers.rb

@@ -46,7 +46,7 @@ module Spotlight
     end
 
     def click_add_widget
-      unless all('.st-block-replacer').present?
+      if all('.st-block-replacer').blank?
         expect(page).to have_css('.st-block-addition')
         first('.st-block-addition').click
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta4
+  version: 3.6.0.beta6
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -261,20 +261,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: handlebars_assets
-  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: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -925,6 +911,7 @@ files:
 - app/assets/stylesheets/spotlight/browse_group_categories_block.scss
 - app/assets/stylesheets/spotlight/typeahead.scss
 - app/builders/spotlight/bootstrap_breadcrumbs_builder.rb
+- app/components/spotlight/document_component.rb
 - app/controllers/concerns/spotlight/base.rb
 - app/controllers/concerns/spotlight/catalog.rb
 - app/controllers/concerns/spotlight/config.rb
@@ -989,11 +976,11 @@ files:
 - app/helpers/spotlight/searches_helper.rb
 - app/helpers/spotlight/title_helper.rb
 - app/helpers/spotlight/translations_helper.rb
-- app/javascript/spotlight/admin/add_another.es6
-- app/javascript/spotlight/admin/add_image_selector.es6
-- app/javascript/spotlight/admin/add_new_button.es6
-- app/javascript/spotlight/admin/appearance.es6
-- app/javascript/spotlight/admin/blacklight_configuration.es6
+- app/javascript/spotlight/admin/add_another.js
+- app/javascript/spotlight/admin/add_image_selector.js
+- app/javascript/spotlight/admin/add_new_button.js
+- app/javascript/spotlight/admin/appearance.js
+- app/javascript/spotlight/admin/blacklight_configuration.js
 - app/javascript/spotlight/admin/block_mixins/autocompleteable.js
 - app/javascript/spotlight/admin/block_mixins/formable.js
 - app/javascript/spotlight/admin/block_mixins/plustextable.js
@@ -1014,39 +1001,39 @@ 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/checkbox_submit.es6
-- app/javascript/spotlight/admin/copy_email_addresses.es6
+- app/javascript/spotlight/admin/checkbox_submit.js
+- app/javascript/spotlight/admin/copy_email_addresses.js
 - app/javascript/spotlight/admin/crop.js
-- app/javascript/spotlight/admin/croppable.es6
-- app/javascript/spotlight/admin/edit_in_place.es6
-- app/javascript/spotlight/admin/exhibit_tag_autocomplete.es6
-- app/javascript/spotlight/admin/exhibits.es6
-- app/javascript/spotlight/admin/form_observer.es6
+- app/javascript/spotlight/admin/croppable.js
+- app/javascript/spotlight/admin/edit_in_place.js
+- app/javascript/spotlight/admin/exhibit_tag_autocomplete.js
+- app/javascript/spotlight/admin/exhibits.js
+- app/javascript/spotlight/admin/form_observer.js
 - app/javascript/spotlight/admin/iiif.js
 - app/javascript/spotlight/admin/index.js
-- app/javascript/spotlight/admin/locks.es6
+- app/javascript/spotlight/admin/locks.js
 - app/javascript/spotlight/admin/multi_image_selector.js
-- app/javascript/spotlight/admin/pages.es6
-- app/javascript/spotlight/admin/progress_monitor.es6
-- app/javascript/spotlight/admin/readonly_checkbox.es6
+- app/javascript/spotlight/admin/pages.js
+- app/javascript/spotlight/admin/progress_monitor.js
+- app/javascript/spotlight/admin/readonly_checkbox.js
 - app/javascript/spotlight/admin/search_typeahead.js
-- app/javascript/spotlight/admin/select_related_input.es6
+- app/javascript/spotlight/admin/select_related_input.js
 - app/javascript/spotlight/admin/sir-trevor/block_controls.js
 - app/javascript/spotlight/admin/sir-trevor/block_limits.js
 - app/javascript/spotlight/admin/sir-trevor/locales.js
 - app/javascript/spotlight/admin/spotlight_nestable.js
-- app/javascript/spotlight/admin/tabs.es6
-- app/javascript/spotlight/admin/translation_progress.es6
-- app/javascript/spotlight/admin/users.es6
-- app/javascript/spotlight/admin/visibility_toggle.es6
+- app/javascript/spotlight/admin/tabs.js
+- app/javascript/spotlight/admin/translation_progress.js
+- app/javascript/spotlight/admin/users.js
+- app/javascript/spotlight/admin/visibility_toggle.js
+- app/javascript/spotlight/core.js
 - app/javascript/spotlight/index.js
-- app/javascript/spotlight/spotlight.js
-- app/javascript/spotlight/user/browse_group_categories.es6
-- app/javascript/spotlight/user/carousel.es6
-- app/javascript/spotlight/user/clear_form_button.es6
+- app/javascript/spotlight/user/browse_group_categories.js
+- app/javascript/spotlight/user/carousel.js
+- app/javascript/spotlight/user/clear_form_button.js
 - app/javascript/spotlight/user/index.js
-- app/javascript/spotlight/user/report_a_problem.es6
-- app/javascript/spotlight/user/zpr_links.es6
+- app/javascript/spotlight/user/report_a_problem.js
+- app/javascript/spotlight/user/zpr_links.js
 - app/jobs/concerns/spotlight/gather_documents.rb
 - app/jobs/concerns/spotlight/job_tracking.rb
 - app/jobs/concerns/spotlight/limit_concurrency.rb
@@ -1218,7 +1205,6 @@ files:
 - app/views/spotlight/catalog/_admin_header.html.erb
 - app/views/spotlight/catalog/_admin_index_header_default.html.erb
 - app/views/spotlight/catalog/_admin_thumbnail_default.html.erb
-- app/views/spotlight/catalog/_curation_mode_toggle_default.html.erb
 - app/views/spotlight/catalog/_document.html.erb
 - app/views/spotlight/catalog/_document_admin_table.html.erb
 - app/views/spotlight/catalog/_document_row.html.erb
@@ -1227,7 +1213,6 @@ files:
 - app/views/spotlight/catalog/_edit_sidecar.html.erb
 - app/views/spotlight/catalog/_index_compact_default.html.erb
 - app/views/spotlight/catalog/_reindex_progress_panel.html.erb
-- app/views/spotlight/catalog/_tophat_default.html.erb
 - app/views/spotlight/catalog/admin.html.erb
 - app/views/spotlight/catalog/edit.html.erb
 - app/views/spotlight/catalog/index.iiif_json.jbuilder
@@ -1369,6 +1354,7 @@ files:
 - app/views/spotlight/translations/edit.html.erb
 - app/views/spotlight/translations/show.yaml.yamlbuilder
 - config/i18n-tasks.yml
+- config/importmap.rb
 - config/locales/devise.en.yml
 - config/locales/spotlight.ar.yml
 - config/locales/spotlight.de.yml
@@ -1542,7 +1528,6 @@ files:
 - vendor/assets/javascripts/tiny-slider.js
 - vendor/assets/javascripts/typeahead.bundle.min.js
 - vendor/assets/stylesheets/bootstrap-tagsinput.css
-- vendor/assets/stylesheets/leaflet-areaselect.css
 - vendor/assets/stylesheets/sir-trevor/_icons.scss
 - vendor/assets/stylesheets/sir-trevor/_variables.scss
 - vendor/assets/stylesheets/sir-trevor/base.scss
@@ -1579,7 +1564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections

data/app/views/spotlight/catalog/_curation_mode_toggle_default.html.erb

@@ -1 +0,0 @@
-<%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-right btn btn-primary' if can?(:curate, current_exhibit) and !current_page? [:edit, current_exhibit, document]  %>

data/app/views/spotlight/catalog/_tophat_default.html.erb

@@ -1 +0,0 @@
-<% add_document_meta_content(@document) %>

data/vendor/assets/stylesheets/leaflet-areaselect.css

@@ -1,15 +0,0 @@
-.leaflet-areaselect-shade {
-    position: absolute;
-    background: rgba(0,0,0, 0.4);
-}
-.leaflet-areaselect-handle {
-    position: absolute;
-    background: #fff;
-    border: 1px solid #666;
-    -moz-box-shadow: 1px 1px rgba(0,0,0, 0.2);
-    -webkit-box-shadow: 1px 1px rgba(0,0,0, 0.2);
-    box-shadow: 1px 1px rgba(0,0,0, 0.2);
-    width: 14px;
-    height: 14px;
-    cursor: move;
-}