blacklight-spotlight 2.6.1.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99e741c6d655545a5e60834cd1303cff3bdb8a91f664b616e50203f877775bf
-  data.tar.gz: c5c5e37f19b4c210ad669417472efb886c4108d09dad793083daa0383fd31808
+  metadata.gz: 8445fcedab2b6c93ecc559cb0ecc02c1c0d6e42c987d7467a7b17b1a04c86456
+  data.tar.gz: 63e9bc33643a7db25d6b3e875c3dae7374085389c42224bfb71572a8e7995221
 SHA512:
-  metadata.gz: 97065dbe90e1d70dc6b5e25fa54e0e0059b1a1cf18020edb39725042e69ad1888d46fb941fb388dafde971d52bcd04928e74f708772f6c2ccdb16c35e37c4cbf
-  data.tar.gz: c7caa256cfb6bba53f6dd4bc3bdd989bdbdc0e9f1ba722405a2d5d5fbadfeeaba4a283915aebca3a113ce1c08101b15fb35331909743a386f005afc9e50b50d2
+  metadata.gz: 0e7ecb7302c87a9006ffcd74aa4c2b3da56d17cded2cfd90f2803c9582fa11cb35385ad9edfbabee44bed698acb7191ee2dd22f48e19034c106d7bfa447071e7
+  data.tar.gz: 9417a9864e63890323ace42f0b5d1b8f1d63449b2d437f22d47df9f4d882e7037713aa097910b24fd58a80b20b4939a4d39c4b2aee2c2a3d77b3329bbfa90dfd

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(){
 
@@ -77,7 +77,7 @@ SirTrevor.Blocks.SolrDocumentsBase = (function(){
       var manifestUrl = data.iiif_manifest || data.iiif_manifest_url;
 
       if (!manifestUrl) {
-        $(panel).find('[name$="[thumbnail_image_url]"]').val(data.thumbnail);
+        $(panel).find('[name$="[thumbnail_image_url]"]').val(data.thumbnail_image_url || data.thumbnail);
         $(panel).find('[name$="[full_image_url]"]').val(data.full_image_url);
 
         return;
@@ -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/{crop.es6 → admin/crop.es6}

@@ -245,6 +245,8 @@ export default class Crop {
   }
 
   uploadFile() {
+    // Set a ujs adapter to support both rails-ujs and jquery-ujs
+    var ujs = typeof Rails === 'undefined' ? $.rails : Rails;
     var url = this.fileInput.data('endpoint')
     // Every post creates a new image/masthead.
     // Because they create IIIF urls which are heavily cached.
@@ -255,6 +257,9 @@ export default class Crop {
       // error: errorHandler,
       // Form data
       data: this.getData(),
+      headers: {
+        'X-CSRF-Token': ujs.csrfToken() || ''
+      },
       //Options to tell jQuery not to process data or worry about content-type.
       cache: false,
       contentType: false,

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/pages_controller.rb

@@ -31,7 +31,7 @@ module Spotlight
 
     # GET /pages/1
     def show
-      fresh_when([@page.exhibit, @page])
+      fresh_when([@page.exhibit, @page, request.query_parameters.to_query])
     end
 
     def preview

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