blacklight-spotlight 4.6.1 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c1e34d4e9beb99a5032c7361b9fb355f461b4cd7a532f6aea0c25730858753
-  data.tar.gz: 5f6879362e353cd851f04653aec67ad93b35d5b799f7a3d48e81f07eb4c53e62
+  metadata.gz: ebea908eb8ae3ba884d61eb1b965f382443e87d479fd297f29c7f290f2bd5566
+  data.tar.gz: 2d73d341ada846d8870482711d63a020405185b3f3d75b8809f42ab67354790f
 SHA512:
-  metadata.gz: 909f10a67ab1e3144bb2a43fc2590bbaf9ad7a5e9f0134f178b88bbc8674796acb1f868511f167f1e916985633aee927b274e3f0b5d479cd87ba41fbe15709b7
-  data.tar.gz: f5bc2b2ba5addad2ccbc01881e3e5b2bd5240fe96a82fc7fc742f94b5bda6132044f7b400cc132276173c0cc86e798741ba97156d0e5179bcb8e8338e9356ba0
+  metadata.gz: 3d9909da016ef1d4ac572ad2e1306b4cfe8fb9ed85e6f737d33e2619fcc71c7e4b2398ef71d4a04ed6ec7978821d1bf97d650958dc7e407c1823e59ea04910d5
+  data.tar.gz: 0d05c74d317579c3981ca44a93668c432ff786db7ec215315849eec0a095fa8f0e69dd98b032bdd6c696438790439686a4fd2c0e4fbfe99fa037f1258305e18f

data/Rakefile

@@ -19,6 +19,7 @@ end
 Bundler::GemHelper.install_tasks
 
 require 'solr_wrapper'
+require 'open3'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
@@ -30,16 +31,45 @@ require 'engine_cart/rake_task'
 
 require 'spotlight/version'
 
-task ci: ['engine_cart:generate'] do
-  ENV['environment'] = 'test'
+def system_with_error_handling(*args)
+  Open3.popen3(*args) do |_stdin, stdout, stderr, thread|
+    puts stdout.read
+    raise "Unable to run #{args.inspect}: #{stderr.read}" unless thread.value.success?
+  end
+end
 
-  SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: 'lib/generators/spotlight/templates/solr/conf') do
-      Rake::Task['spotlight:fixtures'].invoke
+def with_solr(&block) # rubocop:disable Metrics/MethodLength
+  # We're being invoked by the app entrypoint script and solr is already up via docker compose
+  if ENV['SOLR_ENV'] == 'docker-compose'
+    yield
+  elsif system('docker compose version')
+    # We're not running `docker compose up' but still want to use a docker instance of solr.
+    begin
+      puts 'Starting Solr'
+      system_with_error_handling 'docker compose up -d solr'
+      yield
+    ensure
+      puts 'Stopping Solr'
+      system_with_error_handling 'docker compose stop solr'
+    end
+  else
+    SolrWrapper.wrap do |solr|
+      solr.with_collection(&block)
+    end
+  end
+end
+
+task :ci do
+  ENV['environment'] = 'test'
 
-      # run the tests
-      Rake::Task['spec'].invoke
+  with_solr do
+    Rake::Task['spotlight:fixtures'].invoke
+    within_test_app do
+      system 'bin/rake spec:prepare'
     end
+
+    # run the tests
+    Rake::Task['spec'].invoke
   end
 end
 

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

@@ -5137,7 +5137,7 @@ jQuery.fn.scrollStop = function(callback) {
 class Pages {
   connect(){
     SirTrevor.setDefaults({
-      iconUrl: Spotlight.sirTrevorIcon,
+      iconUrl: Spotlight.sirTrevorIcon || window.sirTrevorIcon,
       uploadUrl: $('[data-attachment-endpoint]').data('attachment-endpoint'),
       ajaxOptions: {
         headers: {
@@ -5990,7 +5990,7 @@ Spotlight$1.Block.Resources = (function(){
       }
       var resource_id = data.slug || data.id;
       var markup = `
-          <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId("item_" + data.id)}">
+          <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId(index)}">
             <input type="hidden" name="item[${index}][id]" value="${resource_id}" />
             <input type="hidden" name="item[${index}][title]" value="${data.title}" />
             ${this._itemPanelIiifFields(index, data)}
@@ -6193,7 +6193,7 @@ SirTrevor.Blocks.Browse = (function(){
       }
       var resource_id = data.slug || data.id;
       var markup = `
-           <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId("item_" + data.id)}">
+           <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId(index)}">
             <input type="hidden" name="item[${index}][id]" value="${resource_id}" />
             <input type="hidden" name="item[${index}][full_title]" value="${(data.full_title || data.title)}" />
             <input data-property="weight" type="hidden" name="item[${index}][weight]" value="${data.weight}" />
@@ -6290,7 +6290,7 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
       }
       var resource_id = data.slug || data.id;
       var markup = `
-        <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId("item_" + data.id)}">
+        <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId(index)}">
           <input type="hidden" name="item[${index}][id]" value="${resource_id}" />
           <input type="hidden" name="item[${index}][title]" value="${data.title}" />
           <input data-property="weight" type="hidden" name="item[${index}][weight]" value="${data.weight}" />
@@ -6902,7 +6902,7 @@ SirTrevor.Blocks.UploadedItems = (function(){
       var dataUrl = data.url || data.file.url;
 
       var markup = `
-          <li class="field form-inline dd-item dd3-item" data-id="${index}" id="${this.formId("item_" + dataId)}">
+          <li class="field form-inline dd-item dd3-item" data-id="${index}" id="${this.formId(index)}">
             <input type="hidden" name="item[${index}][id]" value="${dataId}" />
             <input type="hidden" name="item[${index}][title]" value="${dataTitle}" />
             <input type="hidden" name="item[${index}][url]" data-item-grid-thumbnail="true"  value="${dataUrl}"/>