's
- def search_links(electronic_access)
- urls = []
- unless electronic_access.nil?
- links_hash = JSON.parse(electronic_access)
- links_hash.first(2).each do |url, text|
- link = link_to(text.first, EzProxyService.ez_proxy_url(url), target: '_blank', rel: 'noopener')
- link = "#{text[1]}: ".html_safe + link if text[1]
- urls << content_tag(:div, link, class: 'library-location')
- end
- end
- urls
- end
-
def show_regular_search?
!((%w[generate numismatics advanced_search].include? params[:action]) || (%w[advanced].include? params[:controller]))
end
- # Returns electronic portfolio links for Alma records.
- # @param document [SolrDocument]
- # @return [Array
] array containing the links
- def electronic_portfolio_links(document)
- return [] if document.try(:electronic_portfolios).blank?
- document.electronic_portfolios.map do |portfolio|
- content_tag(:div, class: 'library-location') do
- link_to(portfolio["title"], portfolio["url"], target: '_blank', rel: 'noopener')
- end
- end
- end
-
# Retrieve a URL for a stack map location URL given a record, a call number, and the library in which it is held
# @param location [Hash] location information for the item holding
# @param document [SolrDocument] the Solr Document for the record
diff --git a/app/helpers/holdings_helper.rb b/app/helpers/holdings_helper.rb
index 06b3a6c70..1aa9193bd 100644
--- a/app/helpers/holdings_helper.rb
+++ b/app/helpers/holdings_helper.rb
@@ -8,29 +8,22 @@ module HoldingsHelper
def holding_block_search(document)
block = ''.html_safe
- links = holding_block_search_links(document)
holdings_hash = document.holdings_all_display
@scsb_multiple = false
holdings_hash.first(2).each do |id, holding|
- block << first_two_holdings_block(document, id, holding, links)
+ block << first_two_holdings_block(document, id, holding)
block << content_tag(:li, cdl_placeholder)
end
- if @scsb_multiple == true
+ block << controller.view_context.render(Holdings::OnlineHoldingsComponent.new(document:))
+
+ if @scsb_multiple == true || holdings_hash.length > 2
block << view_record_for_full_avail_li(document)
- elsif holdings_hash.length > 2
- block << additional_holdings_span
elsif !holdings_hash.empty?
block << view_record_for_full_avail_li_two(document)
end
- if block.empty? && links.present?
- # All other options came up empty but since we have electronic access let's show the
- # Online badge with the electronic access link (rather than a misleading "No holdings")
- block << content_tag(:li, online_holding_block(links))
- end
-
if block.empty?
content_tag(:div, t('blacklight.holdings.search_missing'))
else
@@ -40,18 +33,17 @@ def holding_block_search(document)
# rubocop:disable Metrics/MethodLength
# Currently having trouble breaking up this method further due to the "check_availability" variable
- def first_two_holdings_block(document, id, holding, links)
+ def first_two_holdings_block(document, id, holding)
location = holding_location(holding)
check_availability = render_availability?
accumulator = ''.html_safe
if holding['library'] == 'Online'
- check_availability = false
- if links.empty?
- check_availability = render_availability?
- accumulator << empty_link_online_holding_block
- else
- accumulator << online_holding_block(links)
- end
+ rendered_online_holdings_block = controller.view_context.render(Holdings::OnlineHoldingsComponent.new(document:))
+ return rendered_online_holdings_block if rendered_online_holdings_block.present?
+
+ check_availability = render_availability?
+ accumulator << empty_link_online_holding_block
+
else
if holding['dspace'] || holding['location_code'] == 'rare$num'
check_availability = false
@@ -74,12 +66,6 @@ def first_two_holdings_block(document, id, holding, links)
end
# rubocop:enable Metrics/MethodLength
- def holding_block_search_links(document)
- portfolio_links = electronic_portfolio_links(document)
- search_links = search_links(document['electronic_access_1display'])
- search_links + portfolio_links
- end
-
def empty_link_online_holding_block
data = content_tag(
:span,
@@ -93,15 +79,6 @@ def empty_link_online_holding_block
)
end
- def online_holding_block(links)
- data = content_tag(
- :span,
- 'Online',
- class: 'availability-icon badge badge-primary'
- )
- data << links.shift
- end
-
def onsite_access_span
content_tag(
:span,
@@ -212,13 +189,5 @@ def view_record_for_full_avail_li_two(document)
data: { record_id: document['id'] }
)
end
-
- def additional_holdings_span
- content_tag(
- :span,
- "View record for information on additional holdings",
- "style": "font-size: small; font-style: italic;"
- )
- end
end
# rubocop:enable Metrics/ModuleLength
diff --git a/app/javascript/orangelight/lux_import.js b/app/javascript/orangelight/lux_import.js
index e71c579b2..9d6e4154d 100644
--- a/app/javascript/orangelight/lux_import.js
+++ b/app/javascript/orangelight/lux_import.js
@@ -2,6 +2,7 @@ import { createApp } from 'vue';
import 'lux-design-system/dist/style.css';
import { LuxLibraryFooter } from 'lux-design-system';
import OrangelightHeader from '../orangelight/vue_components/orangelight_header.vue';
+import OnlineOptions from './vue_components/online_options.vue';
export function luxImport() {
const app = createApp({});
@@ -12,6 +13,7 @@ export function luxImport() {
for (let i = 0; i < elements.length; i++) {
createMyApp()
.component('lux-library-footer', LuxLibraryFooter)
+ .component('online-options', OnlineOptions)
.component('orangelight-header', OrangelightHeader)
.mount(elements[i]);
}
diff --git a/app/javascript/orangelight/vue_components/online_options.vue b/app/javascript/orangelight/vue_components/online_options.vue
new file mode 100644
index 000000000..3ad64d51c
--- /dev/null
+++ b/app/javascript/orangelight/vue_components/online_options.vue
@@ -0,0 +1,31 @@
+
+ Online options
+
+
+
+
+
+
diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb
index 1a4c3600e..87e4240dc 100644
--- a/app/models/solr_document.rb
+++ b/app/models/solr_document.rb
@@ -177,6 +177,18 @@ def numismatics_record?
solr_document_id&.start_with? 'coin'
end
+ def in_a_special_collection?
+ holdings_1display = self['holdings_1display']
+ return true unless holdings_1display
+
+ JSON.parse(holdings_1display)
+ &.values
+ &.any? do |holding|
+ location_code = holding['location_code']
+ Bibdata.holding_locations.dig(location_code, 'aeon_location') if location_code
+ end
+ end
+
# host_id an Array of host id(s)
# appends the host_id in each host_holding
# merges host_holding in holdings
diff --git a/app/views/catalog/_index_default.html.erb b/app/views/catalog/_index_default.html.erb
index feb42d638..15c8f66c7 100644
--- a/app/views/catalog/_index_default.html.erb
+++ b/app/views/catalog/_index_default.html.erb
@@ -14,7 +14,5 @@
<%= render Blacklight::Document::BookmarkComponent.new document:, action: %>
<% end %>
- <%= content_tag(:div, class: "document-thumbnail", data: document.identifier_data) do %>
-
- <% end %>
+ <%= render ThumbnailComponent.new document: %>