blacklight-spotlight 2.7.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fba42c1479bb3e7c4f5e1a6a5e1a60cb7fb71d3322bbd4e657d783c26e86cf6
-  data.tar.gz: a6ab22442a850ca14014fde6fedf079aebe38c3eed68d406eb8dc78f827e14aa
+  metadata.gz: 2ac1f71a7c34266e2dd2f81dfda9a018875c4ad4944a5a8774049543f90db8b4
+  data.tar.gz: eaadb518e5265e68db7218316b47603c475c88dd28f897632a4284e825991092
 SHA512:
-  metadata.gz: bae2718c26a6d5cd83f1005f05095cae1503ae30ea87f25ce5bd2cc8213533b71c4449bf36c4163cb6aab8b433e8c37ae23dcba6c36d5fb09dcc5032c64fdb13
-  data.tar.gz: 3da13dddcf902c164dccdb6610dc038f204faa65d3210f2a5ca77658b681171f242463f141ff0d42cbb1d6403bec7a00df45798b1e4ce4be77c2117724fe411c
+  metadata.gz: fa75fcb80e27553c1ccfae5e68e758ed071f7b12859cbf49a99d34db9b47863b17d5bb2e32458a43a7cd019c793b4c88833b9fe61c15c2e2cfeec776c344d89f
+  data.tar.gz: d65c481345efae06a0734717111a14c98e3b4a094af74cd6cf3e7abfbd2bc5dadbb02fd0ece058ba077d20e87e402fcef3849ced5202dce44899027c00faed59

data/app/assets/javascripts/spotlight/admin/add_another.js

@@ -0,0 +1,22 @@
+Spotlight.onLoad(function() {
+  $("[data-action='add-another']").on("click", function(event) {
+    event.preventDefault();
+
+    var templateId = $(this).data('template-id');
+
+    var template = document.querySelector('#' + templateId);
+    var clone = document.importNode(template.content, true);
+
+    var count = $(this).closest('.form-group').find('[name="' + $(clone).find('[name]').attr('name') + '"]').length + 1;
+    $(clone).find('[id]').each(function(index, el) {
+      $(el).attr('id', $(el).attr('id') + '_' + String(count));
+    });
+
+    $(clone).find('[for]').each(function(index, el) {
+      $(el).attr('for', $(el).attr('for') + '_' + String(count));
+    });
+
+
+    $(clone).insertBefore(this);
+  });
+});

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/browse_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/resources_block
+//= require spotlight/admin/blocks/resources_block
 
 SirTrevor.Blocks.Browse = (function(){
 

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/link_to_search_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/browse_block
+//= require spotlight/admin/blocks/browse_block
 
 SirTrevor.Blocks.LinkToSearch = (function(){
 

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/pages_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/resources_block
+//= require spotlight/admin/blocks/resources_block
 
 SirTrevor.Blocks.FeaturedPages = (function(){
 

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/search_result_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/browse_block
+//= require spotlight/admin/blocks/browse_block
 
 SirTrevor.Blocks.SearchResults =  (function(){
 
@@ -15,7 +15,7 @@ SirTrevor.Blocks.SearchResults =  (function(){
     content: function() {
       return _.template([this.items_selector()].join("<hr />\n"))(this);
     },
-    
+
     item_options: function() {
       var block = this;
       var fields = $('[data-blacklight-configuration-search-views]').data('blacklight-configuration-search-views');
@@ -41,4 +41,4 @@ SirTrevor.Blocks.SearchResults =  (function(){
     },
 
   });
-})();
+})();

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/solr_documents_base_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/resources_block
+//= require spotlight/admin/blocks/resources_block
 
 SirTrevor.Blocks.SolrDocumentsBase = (function(){
 
@@ -85,7 +85,7 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
 
       $.ajax(manifestUrl).success(
         function(manifest) {
-          var Iiif = require('spotlight/iiif');
+          var Iiif = require('spotlight/admin/iiif');
           var iiifManifest = new Iiif(manifestUrl, manifest);
 
           var thumbs = iiifManifest.imagesArray();

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/solr_documents_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/solr_documents_base_block
+//= require spotlight/admin/blocks/solr_documents_base_block
 
 SirTrevor.Blocks.SolrDocuments = (function(){
 

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/solr_documents_carousel_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/solr_documents_base_block
+//= require spotlight/admin/blocks/solr_documents_base_block
 
 SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
 

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/solr_documents_embed_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/solr_documents_base_block
+//= require spotlight/admin/blocks/solr_documents_base_block
 
 SirTrevor.Blocks.SolrDocumentsEmbed = (function(){
 

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/solr_documents_features_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/solr_documents_base_block
+//= require spotlight/admin/blocks/solr_documents_base_block
 
 SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
 
@@ -7,7 +7,7 @@ SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
     type: "solr_documents_features",
 
     icon_name: "item_features",
-    
+
     afterPreviewLoad: function(options) {
       $(this.inner).find('.carousel').carousel();
 

data/app/assets/javascripts/spotlight/{blocks → admin/blocks}/solr_documents_grid_block.js

@@ -1,4 +1,4 @@
-//= require spotlight/blocks/solr_documents_base_block
+//= require spotlight/admin/blocks/solr_documents_base_block
 
 SirTrevor.Blocks.SolrDocumentsGrid = (function(){
 

data/app/assets/javascripts/spotlight/{croppable.js → admin/croppable.js}

@@ -12,7 +12,7 @@ Spotlight.onLoad(function() {
   $.fn.croppable = function() {
     var croppables = this;
 
-    var Crop = require('spotlight/crop');
+    var Crop = require('spotlight/admin/crop');
     $(croppables).each(function() {
       var cropElement = $(this);
       var c = new Crop(cropElement);

data/app/assets/javascripts/spotlight/admin/index.js

@@ -0,0 +1,18 @@
+//= require underscore
+//= require eventable
+//= require sir-trevor
+//= require nestable
+//= require parameterize
+//= require bootstrap-tagsinput
+//= require jquery.serializejson
+//= require clipboard
+//= require leaflet
+//= require leaflet-iiif
+//= require Leaflet.Editable
+//= require Path.Drag
+//= require MutationObserver
+
+// Provide AMD module support
+//= require almond
+//= require polyfill.min.js
+//= require_tree .

data/app/assets/javascripts/spotlight/{pages.js.erb → admin/pages.js.erb}

@@ -37,6 +37,4 @@ Spotlight.onLoad(function(){
 
     new Spotlight.BlockLimits(editor).enforceLimits(editor);
   }
-
-  $('.carousel').carousel();
 });

data/app/assets/javascripts/spotlight/{search_typeahead.js → admin/search_typeahead.js}

@@ -73,7 +73,7 @@ function addImageSelector(input, panel, manifestUrl, initialize) {
   var cropper = input.data('iiifCropper');
   $.ajax(manifestUrl).success(
     function(manifest) {
-      var Iiif = require('spotlight/iiif');
+      var Iiif = require('spotlight/admin/iiif');
       var iiifManifest = new Iiif(manifestUrl, manifest);
 
       var thumbs = iiifManifest.imagesArray();

data/app/assets/javascripts/spotlight/application.js

@@ -10,25 +10,5 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require underscore
-//= require eventable
-//= require sir-trevor
-//= require nestable
-//= require parameterize
-//= require spotlight/spotlight
-//= require bootstrap/tab
-//= require bootstrap/tooltip
-//= require bootstrap/popover
-//= require bootstrap/carousel
-//= require bootstrap-tagsinput
-//= require jquery.serializejson
-//= require clipboard
-//= require leaflet
-//= require leaflet-iiif
-//= require Leaflet.Editable
-//= require Path.Drag
-//= require MutationObserver
-// Provide AMD module support
-//= require almond
-//= require polyfill.min.js
-//= require_tree .
+//= require spotlight/user/index
+//= require spotlight/admin/index

data/app/assets/javascripts/spotlight/user/carousel.js

@@ -0,0 +1,3 @@
+Spotlight.onLoad(function(){
+  $('.carousel').carousel();
+});

data/app/assets/javascripts/spotlight/user/index.js

@@ -0,0 +1,6 @@
+//= require spotlight/spotlight
+//= require bootstrap/tab
+//= require bootstrap/tooltip
+//= require bootstrap/popover
+//= require bootstrap/carousel
+//= require_tree .

data/app/controllers/spotlight/catalog_controller.rb

@@ -197,7 +197,7 @@ module Spotlight
     end
 
     def custom_field_params
-      current_exhibit.custom_fields.writeable.pluck(:field)
+      current_exhibit.custom_fields.as_strong_params
     end
 
     def check_authorization

data/app/controllers/spotlight/custom_fields_controller.rb

@@ -56,7 +56,7 @@ module Spotlight
     end
 
     def custom_field_params
-      params.require(:custom_field).permit(:label, :short_description, :field_type)
+      params.require(:custom_field).permit(:label, :short_description, :field_type, :is_multiple)
     end
   end
 end

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

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

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

@@ -9,35 +9,38 @@ module Spotlight
       helper :all
 
       before_action :authenticate_user!
+      before_action :set_tab, only: [:new, :create]
 
       load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
       before_action :build_resource
 
       load_and_authorize_resource class: 'Spotlight::Resources::Upload', through_association: 'exhibit.resources', instance_name: 'resource'
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def create
-        @resource.attributes = resource_params
-        @resource.build_upload(image: params[:resources_upload][:url])
-
         if @resource.save_and_index
           flash[:notice] = t('spotlight.resources.upload.success')
-          if params['add-and-continue']
-            redirect_to new_exhibit_resource_path(@resource.exhibit, anchor: :new_resources_upload)
-          else
-            redirect_to admin_exhibit_catalog_path(@resource.exhibit, sort: :timestamp)
-          end
+          return redirect_to new_exhibit_resource_path(@resource.exhibit, tab: :upload) if params['add-and-continue']
         else
           flash[:error] = t('spotlight.resources.upload.error')
-          redirect_to admin_exhibit_catalog_path(@resource.exhibit, sort: :timestamp)
         end
+
+        redirect_to admin_exhibit_catalog_path(@resource.exhibit, sort: :timestamp)
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       private
 
+      def set_tab
+        @tab = params[:tab] || 'external_resources_form'
+      end
+
       def build_resource
-        @resource ||= Spotlight::Resources::Upload.new exhibit: current_exhibit
+        @resource ||= begin
+          resource = Spotlight::Resources::Upload.new exhibit: current_exhibit
+          resource.attributes = resource_params
+          resource.build_upload(image: params[:resources_upload][:url]) if params[:resources_upload][:url]
+
+          resource
+        end
       end
 
       def resource_params
@@ -45,7 +48,8 @@ module Spotlight
       end
 
       def data_param_keys
-        Spotlight::Resources::Upload.fields(current_exhibit).map(&:field_name) + current_exhibit.custom_fields.map(&:field)
+        Spotlight::Resources::Upload.fields(current_exhibit).map(&:field_name) +
+          current_exhibit.custom_fields.as_strong_params
       end
     end
   end

data/app/controllers/spotlight/resources_controller.rb

@@ -5,6 +5,7 @@ module Spotlight
   # CRUD actions for exhibit resources
   class ResourcesController < Spotlight::ApplicationController
     before_action :authenticate_user!, except: [:show]
+    before_action :set_tab, only: [:new, :create]
 
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
@@ -44,6 +45,10 @@ module Spotlight
 
     protected
 
+    def set_tab
+      @tab = params[:tab] || 'external_resources_form'
+    end
+
     def resource_class
       Spotlight::Resource
     end

data/app/controllers/spotlight/searches_controller.rb

@@ -4,7 +4,6 @@ module Spotlight
   ##
   # CRUD actions for curating browse categories (see
   # {Spotlight::BrowseController} for the end-user read and index actions)
-  # rubocop:disable Metrics/ClassLength
   class SearchesController < Spotlight::ApplicationController
     load_resource :exhibit, class: 'Spotlight::Exhibit'
     before_action :authenticate_user!
@@ -142,5 +141,4 @@ module Spotlight
       @search = current_exhibit.searches.find(params[:id]) if params[:id].present?
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/app/controllers/spotlight/solr_controller.rb

@@ -36,7 +36,14 @@ module Spotlight
       req = ActiveSupport::JSON.decode(json_content)
 
       Array.wrap(req).map do |r|
-        blacklight_config.document_model.new(r).to_solr.merge(@exhibit.solr_data).merge(r)
+        custom_field_data = r.dup.extract! @exhibit.custom_fields.pluck(:slug)
+        other_field_data = r.except(custom_field_data.keys)
+
+        doc = blacklight_config.document_model.new(other_field_data)
+
+        create_or_update_solr_document_sidecar(doc, r)
+
+        doc.to_solr.merge(@exhibit.solr_data).merge(other_field_data)
       end
     end
 
@@ -53,5 +60,15 @@ module Spotlight
 
       render plain: 'Spotlight is unable to write to solr', status: 409
     end
+
+    def create_or_update_solr_document_sidecar(doc, data)
+      return if data.blank?
+
+      sidecar = doc.sidecar(@exhibit)
+      sidecar.data = sidecar.data.merge(data)
+      sidecar.save
+
+      sidecar
+    end
   end
 end