Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure embed components for testing. #3163

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Configure embed components for testing. #3163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9303e85
Don't populate the embed partial if an embed component is defined.
cbeer Sep 27, 2024
63f4192
Configure embed components for testing for Blacklight 8
cbeer Sep 27, 2024
4d03d1a
Blacklight 8 always inflicts a blank partial slot on us, so we have t…
cbeer Sep 27, 2024
ea0377c
Drop BL 7 support
corylown Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/components/spotlight/solr_document_legacy_embed_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<% if body.present? %>
<%= body %>
<% elsif partials? %>
<% partials.each do |partial| %>
<%= partial %>
<% end %>
<% elsif embed? %>
<%= embed %>
<% elsif thumbnail? %>
Expand Down
2 changes: 1 addition & 1 deletion app/models/spotlight/blacklight_configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def blacklight_config
config.view.embed!
# This is blacklight-gallery's openseadragon partial
unless config.view.embed.document_component
config.view.embed.partials ||= ['openseadragon']
config.view.embed.partials ||= ['openseadragon'] unless config.view.embed.embed_component
Copy link
Member

@jcoyne jcoyne Sep 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to put something in the CatalogController template that shows the usage of embed_component?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Some future version of the blacklight_gallery:install generator will do that.

config.view.embed.document_component = Spotlight::SolrDocumentLegacyEmbedComponent
end
config.view.embed.if = false
Expand Down
6 changes: 1 addition & 5 deletions app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<div class="box" data-id="<%= document.id %>">
<% view_config = blacklight_config.view_config(:embed) %>
<%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new((Blacklight.version > '8.0' ? :document : :presenter) => 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 %>
<%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new(:document => document_presenter(document, view_config: view_config), counter: nil, block: local_assigns[:block]) %>
</div>
8 changes: 7 additions & 1 deletion spec/test_app_templates/catalog_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ 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',
Expand Down
Loading