diff --git a/app/assets/javascripts/orangelight.js b/app/assets/javascripts/orangelight.js index 6f20f2aca..03287ea78 100644 --- a/app/assets/javascripts/orangelight.js +++ b/app/assets/javascripts/orangelight.js @@ -11,14 +11,6 @@ $(document).ready(function() { } ); - //tooltip for facet remove button - $(".facet-values").tooltip({ - selector: "[data-toggle='tooltip']", - placement: "right", - container: "body", - trigger: "hover" - }); - $('.chosen-select').chosen({ allow_single_deselect: true, no_results_text: 'No results matched' diff --git a/app/components/facet_item_component.rb b/app/components/facet_item_component.rb deleted file mode 100644 index 00c8e84a1..000000000 --- a/app/components/facet_item_component.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -# Overriding the Blacklight component in order to include -# our local customizations to facet display. Currently -# only includes one override, to add PUL's tooltips for -# the removal icon, but we may add more overrides as -# we migrate to components. -class FacetItemComponent < Blacklight::FacetItemComponent - def render_selected_facet_value - tag.span(class: "facet-label") do - tag.span(@label, class: "selected") + - # remove link - link_to(@href, class: "remove", rel: "nofollow") do - # Add our custom tooltip - tag.i(class: "fa fa-times", aria: { hidden: true }, data: { toggle: 'tooltip', original_title: 'Remove' }) + - tag.span(helpers.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only visually-hidden') - end - end + render_facet_count(classes: ["selected"]) - end -end diff --git a/app/helpers/facets_helper.rb b/app/helpers/facets_helper.rb deleted file mode 100644 index c7fc7250f..000000000 --- a/app/helpers/facets_helper.rb +++ /dev/null @@ -1,62 +0,0 @@ -# frozen_string_literal: true - -module FacetsHelper - include Blacklight::FacetsHelperBehavior - - def initial_collapse(field, display_facet) - if display_facet.class == Blacklight::Solr::Response::Facets::FacetItem - pivot_facet_child_in_params?(field, display_facet) ? 'collapse in' : 'collapse' - else - 'facet-values' - end - end - - def facet_item_component_class(facet_config) - return Blacklight::FacetItemPivotComponent if facet_config.pivot - default_component = FacetItemComponent - facet_config.fetch(:item_component, default_component) - end - - def facet_value_id(display_facet) - display_facet.respond_to?('value') ? "id=#{display_facet.field.parameterize}-#{display_facet.value.parameterize}" : '' - end - - def pivot_facet_child_in_params?(field, item, pivot_in_params = false) - field = item.field if item&.respond_to?(:field) - - value = facet_value_for_facet_item(item) - - pivot_in_params = true if params[:f] && params[:f][field] && params[:f][field].include?(value) - if item.items.present? - item.items.each { |pivot_item| pivot_in_params = true if pivot_facet_child_in_params?(pivot_item.field, pivot_item) } - end - pivot_in_params - end - - def pivot_facet_in_params?(field, item) - field = item.field if item&.respond_to?(:field) - - value = facet_value_for_facet_item(item) - params[:f] && params[:f][field] && params[:f][field].include?(value) - end - - ## - # Are any facet restrictions for a field in the query parameters? - # - # @param [String] facet field - # @return [Boolean] - def facet_field_in_params?(field) - pivot = facet_configuration_for_field(field).pivot - if pivot - pivot_facet_field_in_params?(pivot) - else - params[:f] && params[:f][field] - end - end - - def pivot_facet_field_in_params?(pivot) - in_params = false - pivot.each { |field| in_params = true if params[:f] && params[:f][field] } - in_params - end -end diff --git a/app/views/catalog/_facet_layout.html.erb b/app/views/catalog/_facet_layout.html.erb deleted file mode 100644 index 31c1ed967..000000000 --- a/app/views/catalog/_facet_layout.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -
-
collapse-toggle facet-field-heading" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>"> - <%= link_to facet_field_label(facet_field.key), - "#", :"data-no-turbolink" => true, - :role=> "button", - aria: {expanded: "#{!should_collapse_facet?(facet_field)}" } %> -
- -
-
- <%= yield %> -
-
-
diff --git a/spec/features/facets_spec.rb b/spec/features/facets_spec.rb index 153c49e3a..910d0ca15 100644 --- a/spec/features/facets_spec.rb +++ b/spec/features/facets_spec.rb @@ -24,24 +24,24 @@ before do visit '/catalog' end - it 'card-header in facet-panel-collapse has link with aria-expanded' do - a_tag_first = find(:xpath, "//*[@id='facet-panel-collapse']/div[1]/div[1]/a") + it 'card-header in facet-panel-collapse has button with aria-expanded' do + a_tag_first = find(:xpath, "//*[@id='facet-panel-collapse']/div[1]/h3/button") expect(a_tag_first['aria-expanded']).to be_truthy end - it 'when keydown Enter on tag it toggles the aria-expanded value', js: true do - a_tag_first = find(:xpath, "//*[@id='facet-panel-collapse']/div[1]/div[1]/a") + it 'when keydown Enter on