From b2e638988b107c7311d1800f6dc82b337fed14cf Mon Sep 17 00:00:00 2001 From: Cory Lown Date: Thu, 25 Sep 2025 11:17:18 -0400 Subject: [PATCH] Stop using show.partials.insert --- .../spotlight/solr_document_legacy_embed_component.rb | 2 +- app/models/spotlight/blacklight_configuration.rb | 6 +----- .../spotlight/sir_trevor/blocks/_embedded_document.html.erb | 2 +- spec/test_app_templates/catalog_controller.rb | 6 +++++- .../blocks/_solr_documents_embed_block.html.erb_spec.rb | 4 +--- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/components/spotlight/solr_document_legacy_embed_component.rb b/app/components/spotlight/solr_document_legacy_embed_component.rb index cb78c4adc..d72632571 100644 --- a/app/components/spotlight/solr_document_legacy_embed_component.rb +++ b/app/components/spotlight/solr_document_legacy_embed_component.rb @@ -12,7 +12,7 @@ def initialize(*args, block: nil, **kwargs) end def before_render - with_embed(block_context) unless embed + with_embed(block_context: block_context) unless embed super end diff --git a/app/models/spotlight/blacklight_configuration.rb b/app/models/spotlight/blacklight_configuration.rb index 81a1f88ca..faae876b6 100644 --- a/app/models/spotlight/blacklight_configuration.rb +++ b/app/models/spotlight/blacklight_configuration.rb @@ -121,11 +121,7 @@ def blacklight_config config.default_per_page = default_per_page if default_per_page config.view.embed! - # This is blacklight-gallery's openseadragon partial - unless config.view.embed.document_component - config.view.embed.partials ||= ['openseadragon'] - config.view.embed.document_component = Spotlight::SolrDocumentLegacyEmbedComponent - end + config.view.embed.document_component = Spotlight::SolrDocumentLegacyEmbedComponent unless config.view.embed.document_component config.view.embed.if = false # blacklight-gallery requires tile_source_field diff --git a/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb b/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb index 97da914ea..00e1ae1bd 100644 --- a/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb +++ b/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb @@ -3,6 +3,6 @@ <%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new(document: document_presenter(document, view_config: view_config), counter: nil, block: local_assigns[:block]) do |component| %> <% component.with_partial do %> <%= render_document_partials document, view_config.partials, component: component, document_counter: nil, view_config: view_config, block: local_assigns[:block], **(view_config.locals) %> - <% end if view_config&.partials&.any? %> + <% end if Blacklight.version < '9.0' && view_config&.partials&.any? %> <% end %> diff --git a/spec/test_app_templates/catalog_controller.rb b/spec/test_app_templates/catalog_controller.rb index 427401fa4..00fc4ab5c 100644 --- a/spec/test_app_templates/catalog_controller.rb +++ b/spec/test_app_templates/catalog_controller.rb @@ -12,8 +12,12 @@ class CatalogController < ApplicationController # config.view.gallery.classes = 'row-cols-2 row-cols-md-3' config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent, icon: Blacklight::Gallery::Icons::MasonryComponent) config.view.slideshow(document_component: Blacklight::Gallery::SlideshowComponent, icon: Blacklight::Gallery::Icons::SlideshowComponent) + config.view.embed(if: false, + partials: [], + document_component: Spotlight::SolrDocumentLegacyEmbedComponent, + embed_component: Blacklight::Gallery::OpenseadragonEmbedComponent) config.show.tile_source_field = :content_metadata_image_iiif_info_ssm - config.show.partials.insert(1, :openseadragon) + config.show.embed_component = Blacklight::Gallery::OpenseadragonEmbedComponent ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params config.default_solr_params = { qt: 'search', diff --git a/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb b/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb index f91c6fc1d..435a2f9cb 100644 --- a/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +++ b/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb @@ -33,11 +33,10 @@ end it 'has a embed block' do - expect(view).to receive(:render_document_partials).with(doc, %w[a b c], hash_including(a: 1, block:)).and_return('OSD') render partial: p, locals: { solr_documents_embed_block: block } expect(rendered).to have_selector 'h3', text: 'Some title' expect(rendered).to have_content 'Some text' - expect(rendered).to have_selector '.box', text: 'OSD' + expect(rendered).to have_selector '.box' expect(rendered).to have_selector '.items-col' expect(rendered).to have_selector '.text-col' expect(rendered).to have_no_selector '.col-md-12' @@ -49,7 +48,6 @@ end it 'does not have a two column layout' do - expect(view).to receive(:render_document_partials).with(doc, %w[a b c], hash_including(a: 1, block:)).and_return('OSD') render partial: p, locals: { solr_documents_embed_block: block } expect(rendered).to have_selector '.col-md-12' expect(rendered).to have_selector '.items-col h3', text: 'Some title'