Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'alma'
gem 'babel-transpiler'
gem 'bcrypt_pbkdf'
# Blacklight
gem 'blacklight', '~> 8.8'
gem 'blacklight', '~> 9.0.0.beta8'
gem 'blacklight_dynamic_sitemap'
gem 'blacklight-hierarchy'
gem 'blacklight-marc', '~>8.1'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ GEM
parser (>= 2.4)
smart_properties
bigdecimal (3.2.2)
blacklight (8.11.0)
blacklight (9.0.0.beta8)
globalid
i18n (>= 1.7.0)
jbuilder (~> 2.7)
kaminari (>= 0.15)
ostruct (>= 0.3.2)
rails (>= 6.1, < 9)
view_component (>= 2.74, < 4)
rails (>= 7.0, < 9)
view_component (>= 3.0, < 5.0)
zeitwerk
blacklight-hierarchy (6.6.0)
blacklight (>= 7.18, < 9)
Expand Down Expand Up @@ -788,7 +788,7 @@ DEPENDENCIES
babel-transpiler
bcrypt_pbkdf
benchmark-ips
blacklight (~> 8.8)
blacklight (~> 9.0.0.beta8)
blacklight-hierarchy
blacklight-marc (~> 8.1)
blacklight_dynamic_sitemap
Expand Down
2 changes: 1 addition & 1 deletion app/components/format_facet_item_component.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

class FormatFacetItemComponent < Blacklight::FacetItemComponent
class FormatFacetItemComponent < Blacklight::Facets::ItemComponent
def render_facet_value(...)
render_icon + super
end
Expand Down
4 changes: 2 additions & 2 deletions app/components/orangelight/constraint_component.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%= render(@layout.new(
classes: (Array(@classes) + ["filter-#{@facet_item_presenter.key.parameterize}"]).join(' '),
label: @facet_item_presenter.field_label,
label: field_label,
value: constraint_value,
remove_path: @facet_item_presenter.remove_href)) %>
remove_path: remove_href)) %>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<% component.with_label do %>
<%= label %>
<% end %>
<% component.with_value do %>
<%= subjectify %>
<% render_field_values.each_with_index do |value, index| %>
<% component.with_value(value:, index:) do %>
<%= subjectify %>
<% end %>
<% end %>
<% end %>
2 changes: 1 addition & 1 deletion spec/components/index_document_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
presenter = Blacklight::DocumentPresenter.new(document, instance_double(ActionView::Base, action_name: 'show'), blacklight_config)
allow(presenter).to receive(:fields).and_return([])
allow(document).to receive(:export_as_openurl_ctx_kev).and_return 'ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.issn=1045-4438'
render_inline(described_class.new(document:, presenter:))
render_inline(described_class.new(document: presenter))
end
it 'puts everything into an article tag' do
expect(subject.elements.first.name).to eq('article')
Expand Down
2 changes: 1 addition & 1 deletion spec/components/index_title_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

RSpec.describe IndexTitleComponent, type: :component do
subject do
render_inline described_class.new(document:)
render_inline described_class.new(presenter: Blacklight::DocumentPresenter.new(document, instance_double(ActionView::Base, action_name: 'show'), blacklight_config))
end
before do
allow_any_instance_of(Blacklight::Document::BookmarkComponent).to receive(:bookmarked?).and_return(false)
Expand Down
2 changes: 1 addition & 1 deletion spec/components/orangelight/constraint_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require "rails_helper"

RSpec.describe Orangelight::ConstraintComponent, type: :component do
let(:facet_item_presenter) { instance_double(Blacklight::FacetItemPresenter) }
let(:facet_item_presenter) { instance_double(Blacklight::ClausePresenter) }

it "can handle the odd format[0]-style params" do
allow(facet_item_presenter).to receive(:key).and_return('key')
Expand Down