blacklight-spotlight 3.0.0.alpha.10 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27efff1c809c87463bcd240ccc65b6edca2182b73238f1027bc178a2f009ab5e
-  data.tar.gz: 9df0f469fa0bc43f39a718d2cdb3bc7909e25da15a2e1d189ccc054b006eb579
+  metadata.gz: 8a3577af6f5ec30554f2e91955c7613e6501ef8e95f2822f6a92022626c03230
+  data.tar.gz: e45881b0867cba47bb74a93a7a008a843154383939c8db3abbb0c244e0a6ff57
 SHA512:
-  metadata.gz: fc49fe51f1c599c5c3569d4387f7b2c1e124e9d8369a2b554ec26e441d8197f4f7e154cec7ab0b9c8fd3bdb8597315675da6d54b129df4774cdafbecfa339c9f
-  data.tar.gz: c06bc5cd170cf772c13bf220bb8e0ebb136b81fb7a575b6cbfe16704fe77c4cf42c759131f9fda803361b909537ba97e9e366e58f4ab99b68d4275408b3c7853
+  metadata.gz: 7164e6ebcca3edd4db9d2b95ed7fafb2ec55188de3e16bdf92963b893e6b717dae262a7a2ab5f3fbfbe2e2f8de7a602083e2586b338fdbf5f1f2f96c4f5cb402
+  data.tar.gz: aaf1d73d51efd42699f32e1c9315ee43c4ab5e9bdb85e737eddbd94b4d9cf565e93deb58751074fecc5aaf8461cd82eb68db52fa5189db88df38035125e7ee60

data/app/assets/javascripts/spotlight/admin/crop.es6

@@ -40,6 +40,12 @@ export default class Crop {
     this.renderCropperMap();
 
     if (this.imageLayer) {
+      // Force a broken layer's container to be an element before removing.
+      // Code in leaflet-iiif land calls delete on the image layer's container when removing,
+      // which errors if there is an issue fetching the info.json and stops further necessary steps to execute.
+      if(!this.imageLayer._container) {
+        this.imageLayer._container = $('<div></div>');
+      }
       this.cropperMap.removeLayer(this.imageLayer);
     }
 

data/app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js

@@ -40,19 +40,28 @@
       }
     }
 
-    return Object.keys(groups).reduce(function(memo, groupKey) {
-      var group   = groups[groupKey];
-      var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" + groupKey + "</div></div>");
+    function generateBlock(groups, key) {
+      var group   = groups[key];
+      var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" + key + "</div></div>");
       var buttons = group.reduce(function(memo, btn) {
         return memo += btn;
       }, "");
       groupEl.append(buttons);
-      if (memo.length === 0) {
-        return memo += groupEl[0].outerHTML;
-      } else {
-        return memo += "<hr />" + groupEl[0].outerHTML;
+      return groupEl[0].outerHTML;
+    }
+
+    var standardWidgets = generateBlock(groups, i18n.t("blocks:group:undefined"));
+
+    var exhibitWidgets = Object.keys(groups).map(function(key) {
+      if (key !== i18n.t("blocks:group:undefined")) {
+        return generateBlock(groups, key);
       }
-    }, "");
+    }).filter(function (element) {
+      return element != null;
+    });
+
+    var blocks = [standardWidgets].concat(exhibitWidgets).join("<hr />");
+    return blocks;
   }
 
   function render(Blocks, availableTypes) {
@@ -65,7 +74,7 @@
     elButtons.appendChild(el);
     return elButtons;
   }
-  
+
   global.Spotlight.BlockControls = function() { };
   global.Spotlight.BlockControls.create = function(editor) {
     // REFACTOR - should probably not know about blockManager
@@ -83,10 +92,10 @@
       SirTrevor = null;
       el = null;
     }
-    
+
     function insert(e) {
       e.stopPropagation();
-      
+
       var parent = this.parentNode;
       if (!parent || hide() === parent) { return; }
       $('.st-block__inner', parent).after(el);
@@ -101,7 +110,7 @@
 
     $(editor.wrapper).delegate(".st-block-replacer", "click", insert);
     $(editor.wrapper).delegate(".st-block-controls__button", "click", insert);
-    
+
     return {
       el: el,
       hide: hide,

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

@@ -77,7 +77,7 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
         width: $no-sidebar-desktop-large-image-width;
         height: $no-sidebar-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("xl")) {
+      @media (min-width: breakpoint-min("lg")) {
         width: $no-sidebar-large-desktop-large-image-width;
         height: $no-sidebar-large-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
@@ -111,11 +111,11 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
         width: $with-sidebar-tablet-large-image-width;
         height: $with-sidebar-tablet-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("xl")) {
+      @media (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("lg")) {
         width: $with-sidebar-desktop-large-image-width;
         height: $with-sidebar-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("xl")) {
+      @media (min-width: breakpoint-min("lg")) {
         width: $with-sidebar-large-desktop-large-image-width;
         height: $with-sidebar-large-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
@@ -129,7 +129,7 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
         width: $with-sidebar-xs-image-width;
         height: $with-sidebar-xs-image-width * $aspect-ratio-factor-medium-image;
       }
-      @media (min-width: breakpoint-min("xl")) {
+      @media (min-width: breakpoint-min("lg")) {
         width: $with-sidebar-large-desktop-medium-image-width;
         height: $with-sidebar-large-desktop-medium-image-width * $aspect-ratio-factor-medium-image;
       }

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

@@ -21,6 +21,12 @@
   }
 }
 
+.item-text {
+  .item-col  {
+    z-index: 1;
+  }
+}
+
 .item-text-admin {
   .text-align {
     margin-top: 15px;

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

@@ -1,7 +1,10 @@
 #report-problem-form {
   display: none;
-  background-color: #e7e7e7;
-  border-bottom: 1px dotted $gray-600;
+  border-bottom: 1px solid $gray-600;
+
+  h2 {
+    @extend .sr-only;
+  }
 }
 
 @include media-breakpoint-up(sm) {

data/app/controllers/spotlight/resources/csv_upload_controller.rb

@@ -16,7 +16,7 @@ module Spotlight
 
       def create
         csv = CSV.parse(csv_io_param, headers: true, return_headers: false).map(&:to_hash)
-        Spotlight::AddUploadsFromCSV.perform_later(csv, current_exhibit, current_user)
+        Spotlight::AddUploadsFromCsv.perform_later(csv, current_exhibit, current_user)
         flash[:notice] = t('spotlight.resources.upload.csv.success', file_name: csv_io_name)
         redirect_to spotlight.admin_exhibit_catalog_path(current_exhibit)
       end

data/app/jobs/spotlight/add_uploads_from_csv.rb

@@ -3,15 +3,41 @@
 module Spotlight
   ##
   # Process a CSV upload into new Spotlight::Resource::Upload objects
-  class AddUploadsFromCSV < ActiveJob::Base
+  class AddUploadsFromCsv < ActiveJob::Base
+    attr_reader :count
+    attr_reader :errors
+
     queue_as :default
 
     after_perform do |job|
       csv_data, exhibit, user = job.arguments
-      Spotlight::IndexingCompleteMailer.documents_indexed(csv_data, exhibit, user).deliver_now
+      Spotlight::IndexingCompleteMailer.documents_indexed(
+        csv_data,
+        exhibit,
+        user,
+        indexed_count: job.count,
+        errors: job.errors
+      ).deliver_now
     end
 
     def perform(csv_data, exhibit, _user)
+      @count = 0
+      @errors = {}
+
+      resources(csv_data, exhibit).each_with_index do |resource, index|
+        if resource.save_and_index
+          @count += 1
+        else
+          @errors[index + 1] = resource.errors.full_messages + resource.upload&.errors&.full_messages
+        end
+      end
+    end
+
+    private
+
+    def resources(csv_data, exhibit)
+      return to_enum(:resources, csv_data, exhibit) unless block_given?
+
       encoded_csv(csv_data).each do |row|
         url = row.delete('url')
         next unless url.present?
@@ -21,12 +47,11 @@ module Spotlight
           exhibit: exhibit
         )
         resource.build_upload(remote_image_url: url) unless url == '~'
-        resource.save_and_index
+
+        yield resource
       end
     end
 
-    private
-
     def encoded_csv(csv)
       csv.map do |row|
         row.map do |label, column|

data/app/mailers/spotlight/indexing_complete_mailer.rb

@@ -5,9 +5,10 @@ module Spotlight
   # Notify the curator that we're finished processing a
   # batch upload
   class IndexingCompleteMailer < ActionMailer::Base
-    def documents_indexed(csv_data, exhibit, user)
-      @number = csv_data.length
+    def documents_indexed(csv_data, exhibit, user, indexed_count: nil, errors: [])
+      @number = indexed_count || csv_data.length
       @exhibit = exhibit
+      @errors = errors
       mail(to: user.email, subject: 'Document indexing complete')
     end
   end

data/app/models/spotlight/contact.rb

@@ -19,7 +19,7 @@ module Spotlight
       self.contact_info = contact_info.symbolize_keys
     end
 
-    before_save on: :create do
+    before_create do
       self.show_in_sidebar = true if show_in_sidebar.nil?
     end
 

data/app/models/spotlight/custom_field.rb

@@ -18,10 +18,10 @@ module Spotlight
       self.field_type ||= 'text'
     end
 
-    before_save :update_field_name, on: :update, if: -> { field_type_changed? || readonly_field_changed? }
+    before_update :update_field_name, if: -> { field_type_changed? || readonly_field_changed? }
 
-    after_commit :update_blacklight_configuration_after_field_name_change, on: :update, if: -> { saved_change_to_field? || saved_change_to_slug? }
-    after_commit :update_sidecar_data_after_field_name_change, on: :update, if: -> { saved_change_to_field? || saved_change_to_slug? }
+    after_update_commit :update_blacklight_configuration_after_field_name_change, if: -> { saved_change_to_field? || saved_change_to_slug? }
+    after_update_commit :update_sidecar_data_after_field_name_change, if: -> { saved_change_to_field? || saved_change_to_slug? }
 
     def label=(label)
       configuration['label'] = label

data/app/models/spotlight/featured_image.rb

@@ -66,7 +66,7 @@ module Spotlight
     def iiif_tilesource
       if self[:iiif_tilesource]
         self[:iiif_tilesource]
-      elsif source == 'remote' && file_present?
+      elsif file_present?
         riiif = Riiif::Engine.routes.url_helpers
         riiif.info_path(id)
       end

data/app/models/spotlight/page_configurations.rb

@@ -27,6 +27,7 @@ module Spotlight
              to: :context
 
     attr_reader :context, :page
+
     def initialize(context:, page:)
       @context = context
       @page = page

data/app/models/spotlight/page_content.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'spotlight/page_content/sir_trevor'
+
 module Spotlight
   # Factory for picking the right page content renderer
   module PageContent

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

@@ -3,9 +3,10 @@
 module Spotlight
   module Resources
     ##
-    # Shim object for CSV Uploads. see {Spotlight::AddUploadsFromCSV}
+    # Shim object for CSV Uploads. see {Spotlight::AddUploadsFromCsv}
     class CsvUpload
       attr_reader :url
+
       include ActiveModel::Model
       extend ActiveModel::Translation
     end

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

@@ -6,6 +6,7 @@ module Spotlight
     # A PORO to construct a solr hash for a given IiifManifest
     class IiifManifest
       attr_reader :collection
+
       def initialize(attrs = {})
         @url = attrs[:url]
         @manifest = attrs[:manifest]
@@ -36,6 +37,7 @@ module Spotlight
       private
 
       attr_reader :url, :manifest, :exhibit, :solr_hash
+
       delegate :blacklight_config, to: :exhibit
 
       def add_document_id

data/app/services/spotlight/solr_document_builder.rb

@@ -8,6 +8,7 @@ module Spotlight
     end
 
     attr_reader :resource
+
     delegate :exhibit, :document_model, to: :resource
 
     ##

data/app/values/custom_field_name.rb

@@ -5,6 +5,7 @@
 class CustomFieldName
   delegate :readonly_field?, :configuration, :field_type, to: :custom_field
   attr_reader :custom_field
+
   def initialize(custom_field)
     @custom_field = custom_field
   end

data/app/views/spotlight/indexing_complete_mailer/documents_indexed.html.erb

@@ -1,3 +1,12 @@
 <p><%= t :".title" %></p>
 
 <p><%= t :".body", count: @number, title: @exhibit.title %></p>
+
+<% if @errors.length > 0 %>
+  <p><%= t :".errors",  default: :'spotlight.catalog.reindex_progress_panel.error' %></p>
+  <ul>
+    <% @errors.each do |index, message| %>
+      <li><%= t :'.error', index: index, message: message.to_sentence %>
+    <% end %>
+  </ul>
+<% end  %>

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

@@ -40,7 +40,7 @@
         </div>
         <div class="form-group">
           <%= f.label :content, class: 'sr-only' %>
-          <%= f.text_area_without_bootstrap :content, value: { data: f.object.content.as_json }.to_json, class: content_editor_class(f.object), data: { 'block-types': Spotlight::Engine.config.sir_trevor_widgets } %>
+          <%= f.text_area_without_bootstrap :content, value: { data: f.object.content.as_json }.to_json, class: content_editor_class(f.object), data: { 'block-types': SirTrevorRails::Block.custom_block_types } %>
         </div>
       </div>
 

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

@@ -0,0 +1,4 @@
+<span style="display:none;visibility:hidden;">
+  <% honeypot_field_name = Spotlight::Engine.config.spambot_honeypot_email_field %>
+  <%= f.email_field honeypot_field_name, label: t(:'spotlight.shared.report_a_problem.honeypot_field_explanation') %>
+</span>

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

@@ -2,20 +2,17 @@
   <div class="row justify-content-center">
     <% contact_form ||= Spotlight::ContactForm.new current_url: request.original_url %>
     <%= bootstrap_form_for contact_form, url: spotlight.exhibit_contact_form_path(current_exhibit, contact_form), layout: :horizontal, label_col: 'col-sm-3', control_col: 'col-sm-9', html: { class: 'col-md-offset-2 col-md-8 my-3 '} do |f| %>
-
       <h2><%= t(:'.title') %></h2>
+      <div class="alert alert-primary"><%= t('.reporting_from', url: contact_form.current_url) %></div>
+      <%= f.text_area :message, rows: 4 %>
       <%= f.text_field :name %>
-      <span style="display:none;visibility:hidden;">
-        <% honeypot_field_name = Spotlight::Engine.config.spambot_honeypot_email_field %>
-        <%= f.email_field honeypot_field_name, label: t(:'.honeypot_field_explanation') %>
-      </span>
+      <%= render '/spotlight/shared/honeypot_field', f: f %>
       <%= f.email_field :email %>
-      <%= f.text_area :message, rows: 7 %>
       <%= f.hidden_field :current_url %>
-      <div class="form-actions">
-        <div class="primary-actions">
-        <%= link_to t(:'helpers.action.cancel'), '#', class: 'btn-sizing', data: { 'behavior' => 'cancel-link' } %>
-        <%= f.submit nil, class: 'btn btn-primary' %>
+      <div class="form-actions row">
+        <div class="col offset-sm-3">
+          <%= f.submit nil, class: 'btn btn-primary' %>
+          <%= link_to t(:'helpers.action.cancel'), '#', class: 'btn-sizing', data: { 'behavior' => 'cancel-link' } %>
         </div>
       </div>
     <% end %>

data/config/i18n-tasks.yml

@@ -34,6 +34,7 @@ ignore_unused:
   - activerecord.attributes.spotlight/page.{display_sidebar\?,display_title} # app/views/spotlight/home_pages/_page_options.html.erb
   - activerecord.attributes.spotlight/language.locale # app/views/spotlight/exhibits/_languages.html.erb
   - activerecord.attributes.spotlight/contact.avatar # app/views/spotlight/contacts/_form.html.erb
+  - activerecord.attributes.spotlight/exhibit.contact_emails # app/views/spotlight/exhibits/_form.html.erb
   - activerecord.attributes.spotlight/exhibit.published # app/views/spotlight/sites/_exhibit.html.erb
   - activerecord.attributes.spotlight/masthead.display # app/views/spotlight/appearances/edit.html.erb
   - activerecord.attributes.spotlight/custom_field.is_multiple # app/views/spotlight/custom_fields/_form.html.erb
@@ -66,6 +67,7 @@ ignore_unused:
   - helpers.submit.{submit,update} # Generically used set defaults
   - helpers.submit.contact.create # app/views/spotlight/contacts/_form.html.erb
   - helpers.action.exhibit.contact.submit # helpers.action.exhibit.contact.submit
+  - helpers.label.contact_form.{email,name} # app/views/spotlight/shared/_report_a_problem.html.erb
 
   # TODO Look into these as its unclear
   - activerecord.models.spotlight.page

data/config/locales/spotlight.ar.yml

@@ -16,25 +16,28 @@ ar:
     browse:
       search:
         item_count:
-          one: 1 عنصر
+          zero: "%{count} عنصر"
+          one: "%{count} عنصر"
+          two: "%{count} عنصرين"
           few: "%{count} عناصر"
-          many: "%{count} عناصر"
-          other: "%{count} عناصر"
-          two: عنصرين
-          zero: لا يوجد
+          many: "%{count} عنصراً"
+          other: "%{count} عنصراً"
+
       search_box:
         label: ابحث في فئة التصفح الحالية
         placeholder: بحث...
         reset: مسح استعلام البحث
         submit: ابحث في فئة التصفح
         success:
-          expand_html: يمكنك ايضاً <a href="%{expand_search_url}">البحث في كل مواد المعرض عن "%{browse_query}"</a>.
-          result_number_html: طابق استعلام البحث <strong> %{search_size} من %{parent_search_count} عنصر</strong> في هذه الفئة.
+          expand_html: "يمكنك ايضاً <a href=\"%{expand_search_url}\">البحث في كل مواد المعرض عن \"%{browse_query}\"</a>."
+          result_number_html: "طابق استعلام البحث <strong> %{search_size} من %{parent_search_count} عنصر</strong> في هذه الفئة."
         zero_results:
-          expand_html: تستطيع أن <a href="%{clear_search_url}"> تمسح استعلام البحث </a> أو محاولة <a href="%{expand_search_url}"> البحث في كل المواد المعروضة لاستعلام البحث ل"%{browse_query}"</a>
+          expand_html: "تستطيع أن <a href=\"%{clear_search_url}\"> تمسح استعلام البحث </a> أو محاولة <a href=\"%{expand_search_url}\"> البحث في كل المواد المعروضة لاستعلام البحث ل\"%{browse_query}\"</a>"
           result_number: لم يتطابق بحثك مع أي عنصر في هذه الفئة.
     header_links:
       contact: ملاحظات واقتراحات
+      login: تسجيل الدخول
+      logout: تسجيل الخروج
     shared:
       report_a_problem:
         honeypot_field_explanation: تجاهل هذا المربع النصي، فهو يُستخدم فقط لكشف المحتالين. إذا كتبت أي شيء في هذا المربع النصي، فلن يتم إرسال رسالتك.
@@ -43,17 +46,18 @@ ar:
       blocks:
         browse_block:
           items:
-            one: 1 عنصر
+            zero: "%{count} عنصر"
+            one: "%{count} عنصر"
+            two: "%{count} عنصرين"
             few: "%{count} عناصر"
-            many: "%{count} عناصر"
-            other: "%{count} عناصر"
-            two: عنصرين
-            zero: لا يوجد
+            many: "%{count} عنصراً"
+            other: "%{count} عنصراً"
+
         link_to_search_block:
           items:
-            one: 1 عنصر
+            zero: "%{count} عنصر"
+            one: "%{count} عنصر"
+            two: "%{count} عنصرين"
             few: "%{count} عناصر"
-            many: "%{count} عناصر"
-            other: "%{count} عناصر"
-            two: عنصرين
-            zero: لا يوجد
+            many: "%{count} عنصراً"
+            other: "%{count} عنصراً"