+ <% document_presenters = documents.map { |doc| document_presenter(doc) } -%>
+ <%= render view_config.document_component.with_collection(document_presenters, partials: view_config.partials, counter_offset: @response&.start || 0) %>
+
diff --git a/app/views/catalog/_index_default.html.erb b/app/views/catalog/_index_default.html.erb
index 4bff45aa3..a0b8eb4e4 100644
--- a/app/views/catalog/_index_default.html.erb
+++ b/app/views/catalog/_index_default.html.erb
@@ -1,39 +1,11 @@
-<% doc_presenter = document_presenter(document) %>
+<%# Blacklight 8 renders the default document title + metadata automatically.
+ Keep this partial limited to the custom extras that used to live below the metadata. %>
-
- <%= render partial: 'index_availability', locals: { document: document } unless Settings.readonly %>
+ <%= render partial: 'catalog/index_availability', locals: { document: document } unless Settings.readonly %>
diff --git a/app/views/catalog/_record_toolbar.html.erb b/app/views/catalog/_record_toolbar.html.erb
index 53815e68c..f92221113 100644
--- a/app/views/catalog/_record_toolbar.html.erb
+++ b/app/views/catalog/_record_toolbar.html.erb
@@ -1,27 +1,7 @@
Actions for <%= document_presenter(@document).html_title.split('/').first %>
-
- <%= render_show_doc_actions @document do |config, inner| %>
- <% if (config.key == :citation) %>
- <%= inner %>
- <% end %>
- <% end %>
-
-
-
-
+ <%= render Blacklight::Document::ShowToolsComponent.new(document: @document) %>
<%= render(partial: 'bookmark_control', locals: { document: @document }) %>
diff --git a/app/views/catalog/email_success.html.erb b/app/views/catalog/email_success.html.erb
new file mode 100644
index 000000000..33212dbe6
--- /dev/null
+++ b/app/views/catalog/email_success.html.erb
@@ -0,0 +1,6 @@
+<%= render Blacklight::System::ModalComponent.new do |component| %>
+ <% component.with_title(t('blacklight.email.form.title')) %>
+
+ <%= render partial: '/shared/flash_msg' %>
+
+<% end %>
diff --git a/app/views/catalog/index.html.erb b/app/views/catalog/index.html.erb
index c0af2dbe1..80ae136c6 100644
--- a/app/views/catalog/index.html.erb
+++ b/app/views/catalog/index.html.erb
@@ -1,5 +1,9 @@
<% content_for(:sidebar) do %>
- <%= render 'search_sidebar' %>
+ <% conf = blacklight_config.view_config(document_index_view_type) %>
+
+ <%= render conf.sidebar_component.new(blacklight_config: blacklight_config,
+ response: @response,
+ view_config: conf) %>
<% end %>
<% unless has_search_parameters? %>
diff --git a/app/views/catalog/report_issue.html.erb b/app/views/catalog/report_issue.html.erb
index 89db56b14..033e917d7 100644
--- a/app/views/catalog/report_issue.html.erb
+++ b/app/views/catalog/report_issue.html.erb
@@ -1,7 +1,7 @@
<%= render Blacklight::System::ModalComponent.new do |component| %>
- <% component.with(:title, t('blackcat.report_issue.form.title')) %>
+ <% component.with_title(t('blackcat.report_issue.form.title')) %>
- <% component.with(:body) do %>
+ <% component.with_body do %>
<%= render 'report_issue_form' %>
<% end %>
<% end %>
diff --git a/app/views/catalog/report_issue_success.html.erb b/app/views/catalog/report_issue_success.html.erb
index 08c259eb5..3e1f5d686 100644
--- a/app/views/catalog/report_issue_success.html.erb
+++ b/app/views/catalog/report_issue_success.html.erb
@@ -1,6 +1,8 @@
<%= render Blacklight::System::ModalComponent.new do |component| %>
- <% component.with(:title, t('blacklight.email.success')) %>
+ <% component.with_title(t('blacklight.email.success')) %>
- <%= render partial: '/shared/flash_msg' %>
-
+ <% component.with_body do %>
+ <%= render partial: '/shared/flash_msg' %>
+
+ <% end %>
<% end %>
diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb
index c82e36701..5df391815 100644
--- a/app/views/layouts/blacklight/base.html.erb
+++ b/app/views/layouts/blacklight/base.html.erb
@@ -55,8 +55,8 @@
<%= link_back_to_catalog label: t('blacklight.back_to_search.html'), class: 'btn btn-outline-secondary btn-sm' %>
<% end %>
+ <%= render(Blacklight::SearchContext::ServerItemPaginationComponent.new(search_context: @search_context, search_session: search_session, current_document: @document)) if search_session['document_id'] == @document.id %>
- <%= render 'previous_next_doc' if search_session['document_id'] == @document.id %>
<% end %>
<% if @document %>
<%= render 'record_toolbar' %>
diff --git a/app/views/record_mailer/email_record.text.erb b/app/views/record_mailer/email_record.text.erb
index 5042042cf..cc82b2fd2 100644
--- a/app/views/record_mailer/email_record.text.erb
+++ b/app/views/record_mailer/email_record.text.erb
@@ -1,10 +1,15 @@
Penn State University Libraries record(s):
<% @documents.each do |document| %>
-<%= document.to_email_text %>
+<% title = Array(document['title_display_ssm']).first || Array(document['title_tsim']).first || document.id %>
+<%= "Title: #{title}" %>
+
+<% author = Array(document['author_person_display_ssm']).first || Array(document['author_tsim']).first %>
+<%= "Author: #{author}" if author.present? %>
+
<%= t('blacklight.email.text.url', :url =>polymorphic_url(document, @url_gen_params)) %>
-
+
<% end %>
<%= t('blacklight.email.text.message', :message => @message) %>
diff --git a/config/locales/blacklight.en.yml b/config/locales/blacklight.en.yml
index d0fd5466c..14db43ac5 100644
--- a/config/locales/blacklight.en.yml
+++ b/config/locales/blacklight.en.yml
@@ -12,6 +12,7 @@ en:
html: '
Back to results'
tools:
librarian_view: 'MARC View'
+ ris: 'RIS File'
sms: 'SMS'
search:
errors:
diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb
index 3134c18b0..1f24c00c1 100644
--- a/spec/controllers/catalog_controller_spec.rb
+++ b/spec/controllers/catalog_controller_spec.rb
@@ -4,12 +4,6 @@
RSpec.describe CatalogController do
describe 'index action' do
- it 'gets the homepage and renders only the homepage facets' do
- get :index
- configured_home_page_facets = %w[access_facet format campus_facet media_type_facet classification_pivot_field]
- expect(assigns(:blacklight_config)[:facet_fields].keys).to eq(configured_home_page_facets)
- end
-
it 'updates the blacklight Solr URL from request context' do
request_config = instance_double(
PsulibBlacklight::SolrRequestConfig,
@@ -97,20 +91,9 @@
before do
allow(controller).to receive(:search_service).and_return(service)
allow(service).to receive(:search_results) { |*_args| raise fake_error }
- allow(Rails.env).to receive_messages(test?: false)
- end
-
- it 'redirects the user to the root url for a bad search' do
- expect(controller.logger).to receive(:error).with(fake_error)
- get :index, params: { q: '+' }
- expect(response.redirect_url).to eq root_url
- expect(request.flash[:notice]).to eq I18n.t('blacklight.search.errors.request_error')
- expect(response).not_to be_successful
- expect(response).to have_http_status :found
end
- it 'returns status 500 if the catalog path is raising an exception' do
- allow(controller).to receive(:flash).and_return(notice: I18n.t('blacklight.search.errors.request_error'))
+ it 'raises an InvalidRequest exception' do
expect { get :index, params: { q: '+' } }.to raise_error Blacklight::Exceptions::InvalidRequest
end
end
diff --git a/spec/features/share_spec.rb b/spec/features/share_spec.rb
index 80a139658..6aecfdb16 100644
--- a/spec/features/share_spec.rb
+++ b/spec/features/share_spec.rb
@@ -27,6 +27,6 @@
visit '/catalog/22090269'
sleep 0.5
click_on 'Share'
- expect(page).to have_link 'RIS file'
+ expect(page).to have_link 'RIS File'
end
end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 25542b3b7..3bc45cc96 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -52,7 +52,7 @@
RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
- config.fixture_path = Rails.root.join('spec/fixtures').to_s
+ config.fixture_paths = [Rails.root.join('spec/fixtures').to_s]
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
diff --git a/spec/services/document_ris_spec.rb b/spec/services/document_ris_spec.rb
index dbc1a1ad3..db4dceda4 100644
--- a/spec/services/document_ris_spec.rb
+++ b/spec/services/document_ris_spec.rb
@@ -4,22 +4,17 @@
RSpec.describe DocumentRis do
let(:service) { described_class.new(document) }
- let(:document) { [{ 'response' =>
- { 'numFound' => 1,
- 'start' => 0,
- 'numFoundExact' => true,
- 'docs' =>
- [{ 'id' => '24053587',
- 'isbn_valid_ssm' => ['9781524763138', '1524763136'],
- 'title_245ab_tsim' => ['Becoming'],
- 'author_tsim' => ['Obama, Michelle, 1964-'],
- 'author_addl_tsim' => ['Additional Author'],
- 'publication_display_ssm' => ['New York : Crown, [2018]'],
- 'edition_display_ssm' => ['First edition.'],
- 'pub_date_illiad_ssm' => ['2018'],
- 'publisher_name_ssm' => ['Crown'],
- 'publication_place_ssm' => ['New York'],
- 'format' => ['Book'] }] } }]}
+ let(:document) { { 'id' => '24053587',
+ 'isbn_valid_ssm' => ['9781524763138', '1524763136'],
+ 'title_245ab_tsim' => ['Becoming'],
+ 'author_tsim' => ['Obama, Michelle, 1964-'],
+ 'author_addl_tsim' => ['Additional Author'],
+ 'publication_display_ssm' => ['New York : Crown, [2018]'],
+ 'edition_display_ssm' => ['First edition.'],
+ 'pub_date_illiad_ssm' => ['2018'],
+ 'publisher_name_ssm' => ['Crown'],
+ 'publication_place_ssm' => ['New York'],
+ 'format' => ['Book'] }}
let(:ris) { "TY - BOOK\r\n" \
"TI - Becoming\r\n" \
"A1 - Obama, Michelle, 1964-\r\n" \
diff --git a/spec/views/shared/_header_navbar.html.erb_spec.rb b/spec/views/shared/_header_navbar.html.erb_spec.rb
index 4251382d4..f7b22b7e5 100644
--- a/spec/views/shared/_header_navbar.html.erb_spec.rb
+++ b/spec/views/shared/_header_navbar.html.erb_spec.rb
@@ -8,7 +8,8 @@
before do
stub_template 'shared/_user_util_links.html.erb' => 'Some content'
stub_template 'catalog/_search_form.html.erb' => 'Other content'
- assign(:search_bar, Blacklight::SearchBarPresenter.new(controller, blacklight_config))
+ # "The SearchBarPresenter has been deprecated. Call `render Blacklight::SearchBarComponent.new' instead"
+ # assign(:search_bar, Blacklight::SearchBarPresenter.new(controller, blacklight_config))
end
it 'displays search bar except on Advanced Search' do