blacklight-spotlight 3.1.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470ee8ce65eb987c54dedfe26ea4db9904c9f883df098df123adf369a40636cf
-  data.tar.gz: fd573fd059d88bd4a35dc7d253a0f01b0c593c5c3f6901fb1c6c50fe6d4e5b28
+  metadata.gz: fc89332ff348ea70e49058e10f7ae4ffe6513218603cb2b13741eefdc15c8f24
+  data.tar.gz: 76ff697064cedf09069292730e9bc3d7b1beac5a8e80e0ededdebbfc8f0008c5
 SHA512:
-  metadata.gz: c8892e30dbb4d6a7ccd1ead2a40e6d78f393bd43750bee2b5b87189976d0111b30ac649e5f30312051e7b94e6deac4b870244e8979a5d2c041a61c4739580538
-  data.tar.gz: 5da0981d722fd045dbafc9424344eed90a8a88aeae3fdc1ef2579f8828bd41c35957ae2aa80bc980c52852d221bd9ed9948d1ba7d4f41333c0892cc1ddc5aff7
+  metadata.gz: 23cb9a0b04c40a53e75a91a25a7d1ce88a54b80fd5200fdee257081ed524bea31f77264d7a1a7f17ec82f5ede0dacf08c05707ddb122af99a0a071faa06824cf
+  data.tar.gz: 87dac4804ad58c1c2b08bd1e582dde8f492a68434f193f679a72737ae73bd6a3b2dcf2cded7281e50fd341d07e7a7b369539a0bf5efcfc981b0de5f1b795e59d

data/README.md

@@ -9,8 +9,8 @@ Read more about what Spotlight is, our motivations for creating it, and how to i
 
 ## Requirements
 
-1. Ruby (2.5.0 or greater)
-2. Rails (5.1 or greater)
+1. Ruby (2.7 or greater)
+2. Rails (5.2 or greater)
 3. Java (7 or greater) *for Solr*
 4. ImageMagick (http://www.imagemagick.org/script/index.php) due to [carrierwave](https://github.com/carrierwaveuploader/carrierwave#adding-versions)
 

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

@@ -1,8 +1,6 @@
-.breadcrumb-item {
-  .truncated-value {
+.truncated-value {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    width: 30ex;
-  }
+    max-width: 30ex;
 }

data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb

@@ -25,7 +25,7 @@ module Spotlight
 
       html_class = 'active' if current
 
-      @context.content_tag(:li, class: "breadcrumb-item #{html_class}") do
+      @context.content_tag(:li, class: "breadcrumb-item truncated-value #{html_class}") do
         @context.link_to_unless(current, element_label(element), compute_path(element), element.options&.except(:current))
       end
     end
@@ -33,7 +33,7 @@ module Spotlight
     private
 
     def element_label(element)
-      @context.content_tag(:span, class: 'truncated-value') { compute_name(element) }
+      @context.content_tag(:span) { compute_name(element) }
     end
   end
 end

data/app/controllers/concerns/spotlight/controller.rb

@@ -67,38 +67,39 @@ module Spotlight
       end
     end
 
-    def search_action_url(*args)
+    def search_action_url(*args, **kwargs)
       if current_exhibit
-        exhibit_search_action_url(*args)
+        exhibit_search_action_url(*args, **kwargs)
       else
-        main_app.search_catalog_url(*args)
+        main_app.search_catalog_url(*args, **kwargs)
       end
     end
 
-    def search_facet_path(*args)
+    def search_facet_path(*args, **kwargs)
       if current_exhibit
-        exhibit_search_facet_path(*args)
+        exhibit_search_facet_path(*args, **kwargs)
       else
-        main_app.catalog_facet_url(*args)
+        main_app.catalog_facet_url(*args, **kwargs)
       end
     end
 
-    def exhibit_search_action_url(*args)
+    def exhibit_search_action_url(*args, **kwargs)
       options = args.extract_options!
+      options = options.merge(kwargs)
       only_path = options[:only_path]
       options.except! :exhibit_id, :only_path
 
       if only_path
-        spotlight.search_exhibit_catalog_path(current_exhibit, *args, options)
+        spotlight.search_exhibit_catalog_path(current_exhibit, *args, **options)
       else
-        spotlight.search_exhibit_catalog_url(current_exhibit, *args, options)
+        spotlight.search_exhibit_catalog_url(current_exhibit, *args, **options)
       end
     end
 
-    def exhibit_search_facet_path(*args)
+    def exhibit_search_facet_path(*args, **kwargs)
       options = args.extract_options!
-      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).except(:exhibit_id, :only_path)
-      spotlight.facet_exhibit_catalog_url(current_exhibit, *args, options)
+      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).merge(kwargs).except(:exhibit_id, :only_path)
+      spotlight.facet_exhibit_catalog_url(current_exhibit, *args, **options&.symbolize_keys)
     end
   end
 end

data/app/controllers/spotlight/attachments_controller.rb

@@ -17,7 +17,7 @@ module Spotlight
 
     private
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow trusted parameters through.
     def attachment_params
       params.require(:attachment).permit(:name, :file, :uid)
     end

data/app/controllers/spotlight/custom_search_fields_controller.rb

@@ -57,7 +57,7 @@ module Spotlight
       add_breadcrumb t(:'spotlight.configuration.sidebar.search_configuration'), edit_exhibit_search_configuration_path(@exhibit)
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow trusted parameters through.
     def custom_search_field_params
       params.require(:custom_search_field).permit(:slug, :field, :label)
     end

data/app/controllers/spotlight/pages_controller.rb

@@ -3,9 +3,6 @@
 module Spotlight
   ##
   # Base CRUD controller for pages
-  # rubocop:disable Metrics/ClassLength
-  # Disableing class length because this is a base
-  # controller that gives other controllers their behavior
   class PagesController < Spotlight::ApplicationController
     before_action :authenticate_user!, except: [:show]
     before_action :load_locale_specific_page, only: %i[destroy edit show update]
@@ -32,13 +29,13 @@ module Spotlight
 
       respond_to do |format|
         format.html
-        format.json { render json: @pages.for_locale.published.to_json(methods: [:thumbnail_image_url]) }
+        format.json { render json: @pages.for_default_locale.published.to_json(methods: [:thumbnail_image_url]) }
       end
     end
 
     # GET /pages/1
     def show
-      fresh_when([@page.exhibit, @page, request.query_parameters.to_query])
+      fresh_when([@page.exhibit, @page])
     end
 
     def preview
@@ -192,7 +189,7 @@ module Spotlight
       add_breadcrumb t(key, title: current_exhibit.title), spotlight.exhibit_root_path(current_exhibit)
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow trusted parameters through.
     def page_params
       params.require(controller_name.singularize).permit(allowed_page_params)
     end
@@ -208,5 +205,4 @@ module Spotlight
       end
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/app/controllers/spotlight/searches_controller.rb

@@ -117,9 +117,14 @@ module Spotlight
     end
 
     def query_params
-      params.to_unsafe_h.with_indifferent_access.except(:exhibit_id, :search, *blacklisted_search_session_params).reject { |_k, v| v.blank? }
+      params.to_unsafe_h.with_indifferent_access.except(:exhibit_id, :search, *excluded_search_session_params).reject { |_k, v| v.blank? }
     end
 
+    def excluded_search_session_params
+      blacklisted_search_session_params
+    end
+
+    # @deprecated
     def blacklisted_search_session_params
       %i[id commit counter total search_id page per_page authenticity_token utf8 action controller]
     end

data/app/helpers/spotlight/application_helper.rb

@@ -162,7 +162,7 @@ module Spotlight
       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 white-list of available themes: #{current_exhibit.themes}"
+        Rails.logger.warn "Exhibit theme '#{current_exhibit_theme}' not in the list of available themes: #{current_exhibit.themes}"
         stylesheet_link_tag(tag)
       end
     end

data/app/helpers/spotlight/job_trackers_helper.rb

@@ -4,7 +4,7 @@ module Spotlight
   # HTML <meta> tag helpers
   module JobTrackersHelper
     def job_status_icon(job_tracker)
-      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do # rubocop:disable Rails/ContentTag
+      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do
         if job_tracker.enqueued? || job_tracker.in_progress?
           '⏱'
         elsif job_tracker.completed?

data/app/helpers/spotlight/main_app_helpers.rb

@@ -40,7 +40,7 @@ module Spotlight
       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 white-list of available themes: #{current_exhibit&.themes}"
+        Rails.logger.warn "Exhibit theme '#{current_exhibit_theme}' not in the list of available themes: #{current_exhibit&.themes}"
         stylesheet_link_tag(tag)
       end
     end

data/app/helpers/spotlight/pages_helper.rb

@@ -16,6 +16,18 @@ module Spotlight
       end
     end
 
+    def sir_trevor_format(text, format: :markdown)
+      if format.to_s.to_sym == :html
+        sir_trevor_html(text)
+      else
+        sir_trevor_markdown(text)
+      end
+    end
+
+    def sir_trevor_html(text)
+      sanitize(text, tags: %w[b i a br p sup])
+    end
+
     ##
     # Override the default #sir_trevor_markdown so we can use
     # a more complete markdown rendered

data/app/helpers/spotlight/title_helper.rb

@@ -27,10 +27,8 @@ module Spotlight
       content_tag(:h1, html_content, class: 'page-header')
     end
 
-    # rubocop:disable Naming/AccessorMethodName
     def set_html_page_title(title = nil)
       @page_title = strip_tags(t(:'spotlight.html_title', title: title || t(:'.title', default: :'.header'), application_name: application_name)).html_safe
     end
-    # rubocop:enable Naming/AccessorMethodName
   end
 end

data/app/mailers/spotlight/confirmation_mailer.rb

@@ -6,8 +6,9 @@ module Spotlight
   class ConfirmationMailer < ActionMailer::Base
     include Devise::Mailers::Helpers
 
-    def confirmation_instructions(record, token, opts)
+    def confirmation_instructions(record, token, opts, exhibit: nil)
       @token = token
+      @exhibit = exhibit
       initialize_from_record(record)
       mail headers_for(:confirmation_instructions, opts)
     end

data/app/models/sir_trevor_rails/block.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module SirTrevorRails
+  # Forked from (former) upstream sir-trevor-rails 0.6.2 gem:
+  # https://github.com/madebymany/sir-trevor-rails/blob/931b9554f5268158b4da8817477cdc82e4e2e69c/lib/sir_trevor_rails/block.rb
+  # Copyright (c) 2013-2014 by ITV plc - http://www.itv.com
+  class Block < OpenStruct
+    DEFAULT_FORMAT = :markdown
+
+    def self.from_hash(hash, parent = nil)
+      hash = hash.deep_dup.with_indifferent_access
+      type_klass(hash).new(hash, parent)
+    end
+
+    def format
+      send(:[], :format).present? ? send(:[], :format).to_sym : DEFAULT_FORMAT
+    end
+
+    # Sets a list of custom block types to speed up lookup at runtime.
+    def self.custom_block_types
+      # You can define your custom block types directly here or in your engine config.
+      Spotlight::Engine.config.sir_trevor_widgets
+    end
+
+    def initialize(hash, parent)
+      @raw_data = hash
+      @parent  = parent
+      @type    = hash[:type].to_sym
+      super(hash[:data])
+    end
+
+    attr_reader :parent, :type
+
+    def to_partial_path
+      "sir_trevor/blocks/#{self.class.name.demodulize.underscore}"
+    end
+
+    def as_json(*_attrs)
+      {
+        type: @type.to_s,
+        data: marshal_dump
+      }
+    end
+
+    # Infers the block class.
+    # Safe lookup that tries to identify user created block class.
+    #
+    # @param [Symbol] type
+    def self.block_class(type)
+      type_name = type.to_s.camelize
+      block_name = "#{type_name}Block"
+      if custom_block_types.include?(type_name)
+        begin
+          block_name.constantize
+        rescue NameError
+          block_class!(block_name)
+        end
+      else
+        block_class!(block_name)
+      end
+    end
+
+    # Infers the block class.
+    # Failover from block_class.
+    # Safe lookup against the SirTevor::Blocks namespace
+    # If no block is found, create one with given name and inherit from Block class
+    #
+    # @param [Constant] block_name
+    def self.block_class!(block_name)
+      SirTrevorRails::Blocks.const_get(block_name)
+    rescue NameError
+      SirTrevorRails::Blocks.const_set(block_name, Class.new(Block))
+    end
+
+    def self.type_klass(hash)
+      if self == Block
+        block_class(hash[:type].to_sym)
+      else
+        self
+      end
+    end
+  end
+end

data/app/models/sir_trevor_rails/blocks/displayable.rb

@@ -14,7 +14,7 @@ module SirTrevorRails
       end
 
       def ordered_items
-        items.sort_by { |x| x[:weight] }.map { |x| x[:id] }
+        items.sort_by { |x| x[:weight].to_i }.map { |x| x[:id] }
       end
 
       private

data/app/models/sir_trevor_rails/blocks/featured_pages_block.rb

@@ -12,7 +12,7 @@ module SirTrevorRails
       end
 
       def pages
-        @pages ||= parent.exhibit.pages.published.where(slug: item_ids).sort do |a, b|
+        @pages ||= parent.exhibit.pages.for_default_locale.published.where(slug: item_ids).sort do |a, b|
           ordered_items.index(a.slug) <=> ordered_items.index(b.slug)
         end
       end
@@ -28,7 +28,7 @@ module SirTrevorRails
 
         result[:data][:item].transform_values! do |v|
           begin
-            v['thumbnail_image_url'] = parent.exhibit.pages.find(v['id']).thumbnail_image_url
+            v['thumbnail_image_url'] = parent.exhibit.pages.for_default_locale.find(v['id']).thumbnail_image_url
           rescue ActiveRecord::RecordNotFound
             v = nil
           end

data/app/models/spotlight/contact_email.rb

@@ -33,7 +33,7 @@ module Spotlight
     end
 
     def send_devise_notification(notification, *args)
-      notice = notification_mailer.send(notification, self, *args)
+      notice = notification_mailer.send(notification, self, *args, exhibit: exhibit)
       if notice.respond_to? :deliver_now
         notice.deliver_now
       else

data/app/models/spotlight/page.rb

@@ -46,6 +46,12 @@ module Spotlight
 
     after_update :update_translated_pages_weights_and_parent_page
 
+    def title
+      return super if I18n.locale == I18n.default_locale
+
+      translated_page_for(I18n.locale)&.title || super
+    end
+
     def content_changed!
       @content = nil
     end
@@ -133,6 +139,8 @@ module Spotlight
     end
 
     def translated_page_for(locale)
+      return self if locale == self.locale
+
       translated_pages.for_locale(locale).first
     end
 

data/app/models/spotlight/page_configurations.rb

@@ -57,7 +57,7 @@ module Spotlight
     end
 
     def available_view_configs
-      available_view_fields.map { |k, v| { key: k, label: v.display_label(k) } }
+      available_view_fields.map { |k, v| { key: k, label: v.display_label } }
     end
 
     def attachment_endpoint

data/app/models/spotlight/page_content/sir_trevor.rb

@@ -5,12 +5,21 @@ module Spotlight
     # Sir-Trevor created content
     class SirTrevor
       def self.parse(page, attribute)
-        content = page.read_attribute(attribute)
-        content ||= [].to_json
+        blocks = page.read_attribute(attribute)
+        blocks ||= [].to_json
 
-        return SirTrevorRails::BlockArray.new if content.blank?
+        return [] if blocks.blank?
 
-        SirTrevorRails::BlockArray.from_json(content, page)
+        blocks = JSON.parse(blocks, symbolize_names: true) if blocks.is_a?(String)
+
+        if blocks.is_a?(Hash)
+          blocks = blocks[:data] || blocks['data'] or
+            raise IndexError, 'No block data found'
+        end
+
+        blocks.map do |obj|
+          SirTrevorRails::Block.from_hash(obj, page)
+        end
       end
     end
   end

data/app/models/translation.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+unless defined?(Translation)
+  Translation = I18n::Backend::ActiveRecord::Translation
+  Translation.include Spotlight::CustomTranslationExtension
+
+  # Work-around for https://github.com/svenfuchs/i18n-active_record/pull/133
+  if Translation.respond_to?(:to_hash)
+    class << Translation
+      alias to_h to_hash
+      remove_method :to_hash
+    end
+
+    I18n::Backend::ActiveRecord.define_method(:init_translations) do
+      @translations = Translation.to_h
+    end
+  end
+end

data/app/services/spotlight/exhibit_import_export_service.rb

@@ -49,7 +49,7 @@ module Spotlight
       deserialize_featured_image(exhibit, :masthead, hash[:masthead]) if hash[:masthead]
       deserialize_featured_image(exhibit, :thumbnail, hash[:thumbnail]) if hash[:thumbnail]
 
-      exhibit.blacklight_configuration.update hash[:blacklight_configuration].deep_stringify_keys if hash[:blacklight_configuration]
+      exhibit.blacklight_configuration.update hash[:blacklight_configuration].with_indifferent_access if hash[:blacklight_configuration]
 
       hash[:main_navigations].each do |attr|
         ar = exhibit.main_navigations.find_or_initialize_by(nav_type: attr[:nav_type])

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

@@ -24,7 +24,9 @@
   <body class="<%= render_body_class %>">
     <%= render partial: 'shared/body_preamble' %>
     <div id="skip-link">
-      <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <% 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' } %>
+      <% 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' } %>
       <%= content_for(:skip_links) %>
     </div>

data/app/views/shared/_site_sidebar.html.erb

@@ -7,7 +7,7 @@
     <li class="nav-item"><%= link_to t(:'spotlight.sites.edit.page_title'), spotlight.edit_site_path, class: 'nav-link' %></li>
   <% end %>
 
-  <% if can? :manange, Spotlight::Exhibit %>
+  <% if can? :manage, Spotlight::Exhibit %>
     <li class="nav-item"><%= link_to t(:'spotlight.sites.edit_exhibits.page_title'), spotlight.edit_site_exhibits_path, class: 'nav-link' %></li>
     <li class="nav-item"><%= link_to t(:'spotlight.admin_users.index.page_title'), spotlight.admin_users_path, class: 'nav-link' %></li>
   <% end %>

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

@@ -10,7 +10,7 @@
 <%- if @response.empty? %>
   <%= render "zero_results" %>
 <%- else %>
-  <%= render_document_index %>
+  <%= render_document_index(@response.documents) %>
 <%- end %>
 
 <%= render 'results_pagination' %>

data/app/views/spotlight/confirmation_mailer/confirmation_instructions.html.erb

@@ -1,5 +1,5 @@
 <p><%= t(:'.welcome', email: @email) %></p>
-
-<p><%= t(:'.instructions') %></p>
-
+<br /><br />
+<%= simple_format t(:'.instructions', exhibit_title: @exhibit&.title) %>
+<br /><br />
 <p><%= link_to t(:'.confirm'), spotlight.contact_email_confirmation_url(:confirmation_token => @token) %></p>

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

@@ -4,7 +4,7 @@
       <p class="instructions"><%= t :'.instructions' %></p>
       <div class="form-group">
         <%= file_field_tag :file, class: 'form-control' %>
-        <%= hidden_field_tag :tab, 'import' %>
+        <%= hidden_field_tag :tab, 'import', id: nil %>
       </div>
       <div class="form-actions">
         <div class="primary-actions">

data/app/views/spotlight/exhibits/_languages.html.erb

@@ -4,7 +4,7 @@
   <%= bootstrap_form_for [current_exhibit, Spotlight::Language.new], layout: :horizontal, html: { class: 'row' }, label_col: "col-sm-3", control_col: "col-sm-9" do |f| %>
     <div class='col-sm-6'>
       <%= f.select('locale', add_exhibit_language_dropdown_options, prompt: t('.selection_prompt')) %>
-      <%= hidden_field_tag :tab, 'language' %>
+      <%= hidden_field_tag :tab, 'language', id: nil %>
     </div>
     <div class='col-sm-6'>
       <%= f.submit nil, class: 'btn btn-primary' %>
@@ -48,7 +48,7 @@
       </div>
       <div class="form-actions">
         <div class="primary-actions">
-          <%= hidden_field_tag :tab, 'language' %>
+          <%= hidden_field_tag :tab, 'language', id: nil %>
           <%= f.submit nil, class: 'btn btn-primary' %>
         </div>
       </div>

data/app/views/spotlight/filters/_form.html.erb

@@ -4,7 +4,7 @@
 
     <%= f.text_field :field %>
     <%= f.text_field :value %>
-    <%= hidden_field_tag :tab, 'filter' %>
+    <%= hidden_field_tag :tab, 'filter', id: nil %>
 
     <div class="form-actions">
       <div class="primary-actions">

data/app/views/spotlight/resources/upload/_form.html.erb

@@ -11,7 +11,7 @@
   <% end %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= hidden_field_tag :tab, 'upload' %>
+      <%= hidden_field_tag :tab, 'upload', id: nil %>
       <%= cancel_link @resource, :back, class: 'btn-sizing' %>
       <%= f.submit t('.add_item_and_continue'), name: 'add-and-continue', class: 'btn btn-secondary' %>
       <%= f.submit t('.add_item'), class: 'btn btn-primary' %>

data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb

@@ -1,7 +1,7 @@
 <%= f.form_group :document_index_view_types, label: {text: t(:'.label'), class: 'pt-0'} do %>
   <%= f.fields_for :document_index_view_types, @blacklight_configuration.document_index_view_types_selected_hash do |vt| %>
     <% @blacklight_configuration.default_blacklight_config.view.select { |_k, v| v.if != false }.each do |key, view| %>
-      <%= vt.check_box key, label: view.display_label(key) %>
+      <%= vt.check_box key, label: view.display_label %>
     <% end %>
   <% end %>
 <% end %>

data/app/views/spotlight/search_configurations/_facet_metadata.html.erb

@@ -1,8 +1,10 @@
 <%= content_tag :span, t(:'.document_count', count: metadata[:document_count]) %>
 <% if metadata[:document_count] > 0 %>
   •
-  <% if metadata[:value_count] > Spotlight::FieldMetadata::FACET_LIMIT %>
-    <%= content_tag :span, t(:'.too_many_values_count', count: Spotlight::FieldMetadata::FACET_LIMIT) %>
+  <% limit = field_config&.limit || Spotlight::FieldMetadata::FACET_LIMIT %>
+  <% limit = blacklight_config.default_facet_limit if limit == true %>
+  <% if metadata[:value_count] >= limit %>
+    <%= content_tag :span, t(:'.too_many_values_count', count: limit) %>
   <% else %>
     <%= content_tag :span, t(:'.value_count', count: metadata[:value_count]) %>
   <% end %>

data/app/views/spotlight/search_configurations/_facets.html.erb

@@ -16,7 +16,7 @@
               </div>
             <% when :additional_options  %>
               <div class="facet-metadata mr-3">
-                <%= render partial: 'facet_metadata', locals: { metadata: metadata } %>
+                <%= render partial: 'facet_metadata', locals: { blacklight_config: @blacklight_configuration.blacklight_config, field_config: config, metadata: metadata } %>
               </div>
             <% else %>
             <% end %>

data/app/views/spotlight/searches/_form.html.erb

@@ -40,7 +40,7 @@
         <% end %>
         <%= f.form_group label: { text: t(:".default_index_view_type"), class: 'pt-0' } do %>
           <% available_document_index_views.each do |key, view| %>
-            <%= f.radio_button :default_index_view_type, key, label: view.display_label(key) %>
+            <%= f.radio_button :default_index_view_type, key, label: view.display_label %>
           <% end %>
         <% end %>
         <% unless @search.query_params.blank? %>

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

@@ -1 +1 @@
-<%= sanitize iframe_block.code, tags: %w(iframe), attributes: %w(id width height marginwidth marginheight src frameborder allowfullscreen sandbox seamless srcdoc scrolling) %>
+<%= sanitize iframe_block.code, tags: %w(iframe), attributes: %w(id aria-label title width height marginwidth marginheight src frameborder allowfullscreen sandbox seamless srcdoc scrolling) %>

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

@@ -0,0 +1,5 @@
+<% if video.source == 'vimeo' %>
+  <%= render partial: '/spotlight/sir_trevor/blocks/videos/vimeo', vimeo: video %>
+<% elsif video.source == 'youtube' %>
+  <%= render partial: '/spotlight/sir_trevor/blocks/videos/youtube', youtube: video %>
+<% end %>

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

@@ -2,7 +2,7 @@
   <%= bootstrap_form_for current_exhibit, url: spotlight.exhibit_translations_path(current_exhibit), layout: :horizontal do |f| %>
     <% # Add hidden fields for the language and tab so the redirect knows how to come back here %>
     <%= hidden_field_tag :language, @language %>
-    <%= hidden_field_tag :tab, 'browse' %>
+    <%= hidden_field_tag :tab, 'browse', id: nil %>
     <div class="row">
       <div class="col-4 text-right">
         <span class="browse-translations-header">

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

@@ -2,7 +2,7 @@
   <%= bootstrap_form_for current_exhibit, url: spotlight.exhibit_translations_path(current_exhibit), layout: :horizontal do |f| %>
     <% # Add hidden fields for the language and tab so the redirect knows how to come back here %>
     <%= hidden_field_tag :language, @language %>
-    <%= hidden_field_tag :tab, 'groups' %>
+    <%= hidden_field_tag :tab, 'groups', id: nil %>
 
     <% current_exhibit.groups.each do |group| %>
       <% title_translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "#{group.slug}.title", locale: @language) %>