blacklight-spotlight 4.7.1 → 5.0.0.pre.alpha2

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

@@ -33,7 +33,7 @@
 
       <% if default_value %>
         <div class="">
-          <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-secondary btn-sm #{'d-none' if label.blank? || label == default_value}" %>
+          <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-primary btn-sm #{'d-none' if label.blank? || label == default_value}" %>
         </div>
       <% end %>
 

data/app/views/spotlight/sir_trevor/blocks/_browse_group_categories_block.html.erb

@@ -9,7 +9,7 @@
           </div>
         </div>
         <% if group.searches.count > 1 %>
-          <ul class="browse-group-categories-controls p-0 pt-2 pt-md-0 ml-md-auto ms-md-auto mb-0 d-flex justify-content-center align-items-end">
+          <ul class="browse-group-categories-controls p-0 pt-2 pt-md-0 ms-md-auto mb-0 d-flex justify-content-center align-items-end">
             <li class="prev px-1 overflow-hidden">
               <%= blacklight_icon 'arrow_alt_circle_left' %>
             </li>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb

@@ -26,7 +26,7 @@
               </div>
             <% end %>
             <% if solr_documents_block.zpr_link? && block_options[:iiif_tilesource].present? %>
-              <button class="btn btn-secondary zpr-link" data-iiif-tilesource="<%= block_options[:iiif_tilesource] %>"><%= t('.zpr_link_html', title: doc_presenter.heading) %></button>
+              <button class="btn btn-primary zpr-link" data-iiif-tilesource="<%= block_options[:iiif_tilesource] %>"><%= t('.zpr_link_html', title: doc_presenter.heading) %></button>
             <% end %>
           </div>
         </div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb

@@ -3,7 +3,7 @@
 <% html_id = "carousel-#{solr_documents_carousel_block.object_id}" %>
 <div class="content-block carousel-block carousel-height-<%= solr_documents_carousel_block.max_height %>">
 <% if solr_documents_carousel_block.documents? %>
-  <div id="<%= html_id %>" class="carousel slide" data-ride="carousel" data-interval="<%= solr_documents_carousel_block.interval %>" <%= "data-bs-ride=carousel data-bs-interval=#{solr_documents_carousel_block.interval}" if solr_documents_carousel_block.autoplay? %>>
+  <div id="<%= html_id %>" class="carousel slide" <%= "data-bs-ride=carousel data-bs-interval=#{solr_documents_carousel_block.interval}" if solr_documents_carousel_block.autoplay? %>>
     <div class="carousel-inner text-center">
     <% solr_documents_carousel_block.each_document.each_with_index do |(block_options, document), index| %>
       <% doc_presenter = document_presenter(document) %>

data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb

@@ -19,7 +19,7 @@
             <% end %>
 
             <% if uploaded_items_block.zpr_link? %>
-              <%= button_tag t('.zpr_link_html', title: file[:caption]), class: 'btn btn-secondary zpr-link', data: { 'iiif-tilesource' => { type: 'image', url: file[:url] }.to_json } %>
+              <%= button_tag t('.zpr_link_html', title: file[:caption]), class: 'btn btn-primary zpr-link', data: { 'iiif-tilesource' => { type: 'image', url: file[:url] }.to_json } %>
             <% end %>
           </div>
         </div>

data/app/views/spotlight/tags/index.html.erb

@@ -13,9 +13,8 @@
         <%= f.fields_for :owned_tags_attributes, tag, index: index do |p| %>
           <%= render partial: 'tag', locals: { f: p } %>
         <% end %>
-      </ul>
-    <% end %>
-
+      <% end %>
+    </ul>
     <div class="float-right float-end">
       <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-primary" %>
     </div>

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

@@ -27,8 +27,8 @@
             <%= content_tag :span, t(".export_label") %>
           </div>
           <div class="col-12 col-md-9">
-            <%= link_to t(:'.export_current_locale', language: t(:"locales.#{@language}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: @language), class: 'btn btn-primary mr-3 me-3' %>
-            <%= link_to t(:'.export_default_locale', language: t(:"locales.#{I18n.default_locale}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: I18n.default_locale), class: 'btn btn-primary' %>
+            <%= link_to t(:'.export_current_locale', language: t(:"locales.#{@language}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: @language), class: 'btn btn-primary mr-3 me-3', data: { turbo: false } %>
+            <%= link_to t(:'.export_default_locale', language: t(:"locales.#{I18n.default_locale}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: I18n.default_locale), class: 'btn btn-primary', data: { turbo: false } %>
           </div>
         </div>
       </div>

data/config/importmap.rb

@@ -2,3 +2,8 @@
 
 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'

data/config/locales/spotlight.en.yml

@@ -734,9 +734,11 @@ en:
         header: Edit page
         locked: This page is currently being edited by %{user} (%{created_at})
       form:
+        instructions_html: "Adjust the image so that the rectangle contains the area you want to display to exhibit visitors. \n<ol> \n  <li>Click-and-drag to adjust position</li>\n  <li> Adjust zoom-level</li>\n</ol> \nSelect Save changes to save the image area.\n"
         page_content: Content
         page_options: Options
         page_thumbnail: Thumbnail
+        select_image: Select image area
         thumbnail:
           help: You can select and crop an image to visually represent this page. It will be used as the thumbnail image if you include this page in the Pages widget.
         title_placeholder: Title

data/config/routes.rb

@@ -26,7 +26,7 @@ Spotlight::Engine.routes.draw do
       post 'reindex', to: 'exhibits#reindex'
     end
 
-    resources :contact_email, only: [:destroy], defaults: { format: :json }
+    resources :contact_email, only: [:destroy]
     resources :attachments, only: :create
     resource :contact_form, path: 'contact', only: %i[new create]
     resource :blacklight_configuration, only: [:update]
@@ -42,7 +42,7 @@ Spotlight::Engine.routes.draw do
 
     concern :searchable, Blacklight::Routes::Searchable.new
 
-    resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
+    resource :catalog, only: [], as: 'catalog', path: '/catalog', controller: 'catalog' do
       concerns :searchable
 
       collection do
@@ -124,7 +124,7 @@ Spotlight::Engine.routes.draw do
 
     resources :contacts, only: %i[edit update destroy]
 
-    resources :pages, only: [:update_all] do
+    resources :pages do
       collection do
         patch :update_all
       end
@@ -193,4 +193,6 @@ Spotlight::Engine.routes.draw do
 
   get '/:exhibit_id' => 'home_pages#show', as: :exhibit_root
   post 'versions/:id/revert' => 'versions#revert', as: :revert_version
+
+  get '/:exhibit_id/select_image' => 'catalog#select_image'
 end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Spotlight
+  module Assets
+    # Utilities for the Spotlight assets generators
+    module GeneratorCommonUtilities
+      # Some versions of the blacklight/spotlight gem do not have a corresponding package on npm.
+      # Assume we want the most recent version that is compatible with the major version of the gem.
+      def package_yarn_version(package_name, requested_version)
+        versions = JSON.parse(`yarn info #{package_name} versions --json`)['data']
+        exact_match = versions.find { |v| v == requested_version }
+        return exact_match if exact_match
+
+        major_version = Gem::Version.new(requested_version).segments.first
+        "^#{major_version}"
+      end
+
+      def blacklight_yarn_version
+        package_yarn_version('blacklight-frontend', Blacklight::VERSION)
+      end
+
+      def spotlight_yarn_version
+        package_yarn_version('spotlight-frontend', Spotlight::VERSION)
+      end
+
+      def bootstrap_version
+        options[:'bootstrap-version'].presence || '~> 5.3'
+      end
+
+      # Support the gem version format e.g., `~> 5.3` for consistency.
+      def bootstrap_yarn_version
+        bootstrap_version.match(/(\d+(\.\d+)*)/)[0]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require_relative 'generator_common_utilities'
+
+module Spotlight
+  module Assets
+    # Spotlight Importmap Generator
+    class ImportmapGenerator < Rails::Generators::Base
+      include GeneratorCommonUtilities
+
+      source_root Spotlight::Engine.root.join('lib', 'generators', 'spotlight', 'templates')
+
+      class_option :test, type: :boolean, default: false, aliases: '-t', desc: 'Indicates that app will be installed in a test environment'
+      class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
+
+      desc <<-DESCRIPTION
+        This generator configures the Spotlight app to use importmap for
+        javascript and bundling for the styles:
+
+        - Adds the frontend style dependencies, including spotlight-frontend,
+          via yarn
+        - Configures cssbundling-rails to build the styles
+        - Javascript from gems such as Blacklight and Spotlight are delivered
+          via importmap/the asset pipeline without the need for bundling
+      DESCRIPTION
+
+      def add_stylesheet_dependencies
+        run "yarn add blacklight-frontend@#{blacklight_yarn_version}"
+        run "yarn add bootstrap@\"^#{bootstrap_yarn_version}\""
+        run 'yarn add leaflet'
+      end
+
+      # Needed for the stylesheets
+      def add_frontend
+        if ENV['CI']
+          run "yarn add file:#{Spotlight::Engine.root}"
+        elsif options[:test]
+          run 'yarn link spotlight-frontend'
+
+        # If a branch was specified (e.g. you are running a template.rb build
+        # against a test branch), use the latest version available on npm
+        elsif ENV['BRANCH']
+          run 'yarn add spotlight-frontend@latest'
+
+        # Otherwise, pick the version from npm that matches the Spotlight
+        # gem version
+        else
+          run "yarn add spotlight-frontend@#{spotlight_yarn_version}"
+        end
+      end
+
+      def add_javascript
+        # This may have been added from Blacklight, but it is a Spotlight dependency so ensure it is present.
+        insert_into_file 'app/javascript/application.js', "import githubAutoCompleteElement from \"@github/auto-complete-element\"\n"
+
+        append_to_file 'app/javascript/application.js' do
+          <<~CONTENT
+
+            import Spotlight from "spotlight"
+
+            Blacklight.onLoad(function() {
+              Spotlight.activate();
+            });
+          CONTENT
+        end
+      end
+
+      def add_stylesheets
+        copy_file 'assets/spotlight.scss', 'app/assets/stylesheets/spotlight.scss'
+        append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
+          <<~CONTENT
+            @import "spotlight";
+          CONTENT
+        end
+      end
+
+      private
+
+      def bootstrap_frontend_version
+        yarn_lock = File.read('yarn.lock')
+        bootstrap_entry = yarn_lock.match(/^"?bootstrap@.+:\n  version "(.+)"/)
+        bootstrap_entry ? bootstrap_entry[1] : nil
+      end
+    end
+  end
+end

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

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require_relative 'generator_common_utilities'
+
+module Spotlight
+  module Assets
+    # Spotlight Propshaft Generator
+    class PropshaftGenerator < Rails::Generators::Base
+      include GeneratorCommonUtilities
+
+      source_root Spotlight::Engine.root.join('lib', 'generators', 'spotlight', 'templates')
+
+      class_option :test, type: :boolean, default: false, aliases: '-t', desc: 'Indicates that app will be installed in a test environment'
+      class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
+
+      desc <<-DESCRIPTION
+        This generator configures the Spotlight app to use bundling for both
+        javascript and styles:
+
+        - Adds frontend dependencies, including spotlight-frontend, via yarn
+        - Configures jsbundling-rails (w/ esbuild) to bundle the JS
+        - Configures cssbundling-rails to build the styles
+      DESCRIPTION
+
+      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'
+      end
+
+      def add_blacklight_frontend
+        run "yarn add blacklight-frontend@#{blacklight_yarn_version}"
+      end
+
+      def add_bootstrap
+        run "yarn add bootstrap@\"^#{bootstrap_yarn_version}\""
+        run 'yarn add @popperjs/core'
+      end
+
+      # Pick a version of the frontend asset package and install it.
+      def add_frontend
+        if ENV['CI']
+          run "yarn add file:#{Spotlight::Engine.root}"
+        elsif options[:test]
+          run 'yarn link spotlight-frontend'
+
+        # If a branch was specified (e.g. you are running a template.rb build
+        # against a test branch), use the latest version available on npm
+        elsif ENV['BRANCH']
+          run 'yarn add spotlight-frontend@latest'
+
+        # Otherwise, pick the version from npm that matches the Spotlight
+        # gem version
+        else
+          run "yarn add spotlight-frontend@#{spotlight_yarn_version}"
+        end
+      end
+
+      def add_javascript
+        copy_file 'javascript/jquery-shim.js', 'app/javascript/jquery-shim.js'
+        gsub_file 'app/javascript/application.js', 'import "controllers"', '// import "controllers"'
+
+        # This may have been added from Blacklight, but it is a Spotlight dependency so ensure it is present.
+        insert_into_file 'app/javascript/application.js', "import githubAutoCompleteElement from \"@github/auto-complete-element\";\n"
+
+        append_to_file 'app/javascript/application.js' do
+          <<~CONTENT
+            import Spotlight from "spotlight-frontend"
+
+            Blacklight.onLoad(function() {
+              Spotlight.activate();
+            });
+          CONTENT
+        end
+      end
+
+      def add_stylesheets
+        copy_file 'assets/spotlight.scss', 'app/assets/stylesheets/spotlight.scss'
+        append_to_file 'app/assets/stylesheets/application.bootstrap.scss', "\n@import \"spotlight\";\n"
+      end
+
+      def configure_esbuild
+        # The main-fields option resolves a bundling issue with bootstrap/popper on esbuild.
+        custom_options = '--main-fields=main,module --alias:jquery=./app/javascript/jquery-shim.js'
+        custom_options = "#{custom_options} --preserve-symlinks" if options[:test]
+        gsub_file 'package.json',
+                  'esbuild app/javascript/*.* --bundle --sourcemap --format=esm --outdir=app/assets/builds --public-path=/assets',
+                  "esbuild app/javascript/*.* --bundle --sourcemap --format=esm --outdir=app/assets/builds --public-path=/assets #{custom_options}"
+      end
+    end
+  end
+end

data/lib/generators/spotlight/assets_generator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Run general asset setup and then delegate to the appropriate generator
+  # Based on Blacklight::AssetsGenerator
+  class AssetsGenerator < Rails::Generators::Base
+    class_option :test, type: :boolean, default: ENV.fetch('CI', false) == 'true', aliases: '-t',
+                        desc: 'Indicates that app will be installed in a test environment'
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
+
+    def run_asset_pipeline_specific_generator
+      generated_options = '--test=true' if options[:test]
+      generator = if defined?(Importmap)
+                    'spotlight:assets:importmap'
+                  elsif defined?(Propshaft)
+                    'spotlight:assets:propshaft'
+                  end
+
+      generate generator, generated_options
+    end
+  end
+end

data/lib/generators/spotlight/install_generator.rb

@@ -9,13 +9,15 @@ module Spotlight
     source_root File.expand_path('templates', __dir__)
     class_option :solr_update_class, type: :string, default: 'Spotlight::SolrDocument::AtomicUpdates'
     class_option :mailer_default_url_host, type: :string, default: '' # e.g. localhost:3000
+    class_option :test, type: :boolean, default: false, aliases: '-t', desc: 'Indicates that app will be installed in a test environment'
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
 
-    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'
+    def generate_assets
+      if options[:test]
+        generate 'spotlight:assets', '--test=true'
+      else
+        generate 'spotlight:assets'
+      end
     end
 
     def inject_spotlight_routes
@@ -56,11 +58,6 @@ module Spotlight
       EOS
     end
 
-    def assets
-      copy_file 'spotlight.scss', 'app/assets/stylesheets/spotlight.scss'
-      copy_file 'spotlight.js', 'app/assets/javascripts/spotlight.js'
-    end
-
     def add_roles_to_user
       inject_into_file 'app/models/user.rb', after: 'include Blacklight::User' do
         "\n  include Spotlight::User\n"
@@ -122,25 +119,6 @@ module Spotlight
       generate 'blacklight_gallery:install'
     end
 
-    def configure_osd_for_sprockets
-      return unless defined?(Sprockets)
-
-      append_to_file 'app/assets/javascripts/application.js', "\n//= require openseadragon\n//= require openseadragon-rails/openseadragon-rails\n"
-
-      append_to_file 'config/initializers/assets.rb' do
-        <<~CONTENT
-          Rails.application.config.assets.paths << Rails.root.join('node_modules/openseadragon/build/openseadragon/images')
-          Rails.application.config.assets.paths << Rails.root.join('node_modules/openseadragon/build/openseadragon')
-        CONTENT
-      end
-
-      append_to_file 'app/assets/config/manifest.js', "//= link_tree ../../../node_modules/openseadragon/build/openseadragon/images\n"
-
-      inject_into_file 'app/controllers/application_controller.rb', after: 'class ApplicationController < ActionController::Base' do
-        "\n  helper Openseadragon::OpenseadragonHelper\n"
-      end
-    end
-
     def add_oembed
       unless Bundler.locked_gems.dependencies.key? 'blacklight-oembed'
         gem 'blacklight-oembed', '~> 1.0'
@@ -148,12 +126,6 @@ module Spotlight
       end
       generate 'blacklight_oembed:install'
       copy_file 'config/initializers/oembed.rb'
-
-      return unless defined?(Sprockets)
-
-      # Use the rolled up assets from blacklight-oembed for sprockets
-      gsub_file 'app/assets/javascripts/blacklight_oembed.js', "import oembed from 'blacklight_oembed/oembed'",
-                '//= require blacklight_oembed/oembed'
     end
 
     def add_mailer_defaults

data/lib/generators/spotlight/scaffold_resource_generator.rb

@@ -38,7 +38,7 @@ module Spotlight
           <%= f.text_field :url  %>
           <div class="form-actions">
             <div class="primary-actions">
-              <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+              <%= cancel_link @resource, :back, class: 'btn btn-primary' %>
               <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
             </div>
           </div>

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

@@ -0,0 +1,6 @@
+// Leaflet
+@import "leaflet/dist/leaflet";
+
+// Spotlight, imported from spotlight-frontend package
+@import 'spotlight-frontend/vendor/assets/stylesheets/sir-trevor/main';
+@import 'spotlight-frontend/app/assets/stylesheets/spotlight/spotlight';

data/lib/generators/spotlight/templates/javascript/jquery-shim.js

@@ -0,0 +1 @@
+export default window.jQuery;

data/lib/spotlight/engine.rb

@@ -7,19 +7,15 @@ require 'devise'
 require 'devise_invitable'
 
 require 'activejob-status'
-require 'autoprefixer-rails'
 require 'blacklight'
-require 'clipboard/rails'
 require 'faraday'
 require 'faraday/follow_redirects'
 require 'friendly_id'
 require 'i18n/active_record'
-require 'leaflet-rails'
 require 'paper_trail'
 require 'riiif'
 require 'spotlight/riiif_service'
 require 'spotlight/upload_field_config'
-require 'tophat'
 
 module Spotlight
   ##
@@ -33,7 +29,7 @@ module Spotlight
     require 'github/markup'
     require 'openseadragon'
 
-    config.assets.precompile += %w[spotlight/fallback/*.png]
+    config.assets.precompile += %w[spotlight/fallback/*.png] if defined?(Sprockets)
 
     config.autoload_paths += %W[
       #{config.root}/app/builders
@@ -70,7 +66,10 @@ module Spotlight
     end
 
     initializer 'spotlight.importmap', before: 'importmap' do |app|
-      app.config.importmap.paths << Engine.root.join('config/importmap.rb') if app.config.respond_to?(:importmap)
+      if app.config.respond_to?(:importmap)
+        app.config.importmap.paths << Engine.root.join('config/importmap.rb')
+        app.config.importmap.cache_sweepers << Engine.root.join('app/javascript')
+      end
     end
 
     def self.user_class
@@ -192,6 +191,7 @@ module Spotlight
       ActiveSupport::Reloader.to_prepare do
         Spotlight::Engine.config.spotlight = OpenStruct.new
         Spotlight::Engine.config.spotlight.header_navigation_link_component = Spotlight::HeaderNavigationLinkComponent
+        Spotlight::Engine.config.spotlight.title_component = Spotlight::TitleComponent
       end
     end
 
@@ -275,6 +275,7 @@ module Spotlight
 
         Blacklight::Configuration.default_values[:search_state_fields] ||= []
         Blacklight::Configuration.default_values[:search_state_fields] += %i[id exhibit_id browse_category_id]
+        Blacklight::Configuration.default_values[:skip_link_component] = Spotlight::SkipLinkComponent
       end
     else
       config.to_prepare do

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '4.7.1'
+  VERSION = '5.0.0-alpha2'
 end

data/spec/support/features/capybara_wait_metadata_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module CapybaraWaitMetadataHelper
+  extend ActiveSupport::Concern
+
+  included do
+    around do |example|
+      using_wait_time example.metadata[:max_wait_time] || Capybara.default_max_wait_time do
+        example.run
+      end
+    end
+  end
+end

data/spec/support/features/test_features_helpers.rb

@@ -3,38 +3,19 @@
 module Spotlight
   module TestFeaturesHelpers
     def fill_in_typeahead_field(opts = {})
-      type = opts[:type] || 'twitter'
-      # Poltergeist / Capybara doesn't fire the events typeahead.js
-      # is listening for, so we help it out a little:
-      page.execute_script <<-EOF
-        $("[data-#{type}-typeahead]:visible").val("#{opts[:with]}").trigger("input");
-        $("[data-#{type}-typeahead]:visible").typeahead("open");
-        $(".tt-suggestion").click();
-      EOF
+      type = opts[:type] || 'default'
 
-      find('.tt-suggestion', text: opts[:with], match: :first).click
-    end
-
-    ##
-    # For typeahead "prefetched" fields, we need to wait for a resolved selector
-    # before proceeding.
-    def fill_in_prefetched_typeahead_field(opts)
-      type = opts[:type] || 'twitter'
-      # Poltergeist / Capybara doesn't fire the events typeahead.js
-      # is listening for, so we help it out a little:
-      find(opts[:wait_for]) if opts[:wait_for]
-      page.execute_script <<-EOF
-        $("[data-#{type}-typeahead]:visible").val("#{opts[:with]}").trigger("input");
-        $("[data-#{type}-typeahead]:visible").typeahead("open");
-        $(".tt-suggestion").click();
-      EOF
+      # 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[open] [role="option"]', text: opts[:with], match: :first).click
     end
 
     # just like #fill_in_typeahead_field, but wait for the
-    # form fields to show up on the page too
+    # form fields/thumbnail preview to show up on the page too
     def fill_in_solr_document_block_typeahead_field(opts)
       fill_in_typeahead_field(opts)
-      expect(page).to have_css('li[data-resource-id="' + opts[:with] + '"]')
+      expect(page).to have_css('li[data-resource-id="' + opts[:with] + '"] .img-thumbnail[src^="http"]')
     end
 
     def add_widget(type)
@@ -54,12 +35,17 @@ module Spotlight
       first('.st-block-replacer').click
     end
 
+    def wait_for_sir_trevor
+      expect(page).to have_selector('.st-blocks.st-ready')
+      sleep 1
+    end
+
     def save_page_changes
-      page.execute_script <<-EOF
-        SirTrevor.getInstance().onFormSubmit();
-      EOF
+      wait_for_sir_trevor
       click_button('Save changes')
-      # verify that the page was created
+      # Load bearing sleep. Remove or reduce at your own risk. Revisit if Sir Trevor is removed.
+      sleep 3 if ENV['CI']
+      # verify that the page was created.
       expect(page).to have_no_selector('.alert-danger')
       expect(page).to have_selector('.alert-info', text: 'page was successfully updated')
     end

data/vendor/assets/javascripts/tiny-slider.js

@@ -1,4 +1,5 @@
 // Includes an unreleased RTL support pull request: https://github.com/ganlanyuan/tiny-slider/pull/658
+// Includes "export default tns" at the end of the file for spotlight/user/browse_group_categories.js
 var tns = (function (){
 var win = window;
 
@@ -3216,3 +3217,5 @@ var tns = function(options) {
 
 return tns;
 })();
+
+export default tns;