Silence deprecation warnings of our own methods and blacklight helper…

…s that are in the inner loop
sul-dlss · Jul 27, 2020 · 295f384 · 295f384
1 parent 2bc30d0
commit 295f384
Showing 1 changed file with 31 additions and 25 deletions.
diff --git a/app/helpers/blacklight/hierarchy_helper.rb b/app/helpers/blacklight/hierarchy_helper.rb
@@ -1,36 +1,40 @@
 require 'deprecation'
 
 module Blacklight::HierarchyHelper
+  extend Deprecation
+
   # Putting bare HTML strings in a helper sucks. But in this case, with a
   # lot of recursive tree-walking going on, it's an order of magnitude faster
   # than either render(:partial) or content_tag
   def render_facet_hierarchy_item(field_name, data, key)
     item = data[:_]
     subset = data.reject { |k, _v| !k.is_a?(String) }
 
-    li_class = subset.empty? ? 'h-leaf' : 'h-node'
-    id = SecureRandom.uuid
-    ul = ''
-    li = ''
-    li << facet_toggle_button(field_name, id) if subset.any?
-    li << if item.nil?
-            key
-          elsif qfacet_selected?(field_name, item)
-            render_selected_qfacet_value(field_name, item)
-          else
-            render_qfacet_value(field_name, item, id: id)
-          end
-
-    unless subset.empty?
-      subul = subset.keys.sort.collect do |subkey|
-        render_facet_hierarchy_item(field_name, subset[subkey], subkey)
-      end.join('')
-      ul = "<ul role=\"group\">#{subul}</ul>".html_safe
-    end
+    Deprecation.silence(Blacklight::HierarchyHelper) do
+      li_class = subset.empty? ? 'h-leaf' : 'h-node'
+      id = SecureRandom.uuid
+      ul = ''
+      li = ''
+      li << facet_toggle_button(field_name, id) if subset.any?
+      li << if item.nil?
+              key
+            elsif qfacet_selected?(field_name, item)
+              render_selected_qfacet_value(field_name, item)
+            else
+              render_qfacet_value(field_name, item, id: id)
+            end
+
+      unless subset.empty?
+        subul = subset.keys.sort.collect do |subkey|
+          render_facet_hierarchy_item(field_name, subset[subkey], subkey)
+        end.join('')
+        ul = "<ul role=\"group\">#{subul}</ul>".html_safe
+      end
 
-    %(<li class="#{li_class}" role="treeitem">#{li.html_safe}#{ul.html_safe}</li>).html_safe
+      %(<li class="#{li_class}" role="treeitem">#{li.html_safe}#{ul.html_safe}</li>).html_safe
+    end
   end
-  deprecation_deprecate :render_facet_hierarchy_item
+  # deprecation_deprecate :render_facet_hierarchy_item
 
   def qfacet_selected?(field_name, item)
     config = facet_configuration_for_field(field_name)
@@ -54,10 +58,12 @@ def render_hierarchy(bl_facet_field, delim = '_')
   deprecation_deprecate :render_hierarchy
 
   def render_qfacet_value(facet_solr_field, item, options = {})
-    id = options.delete(:id)
-    facet_config = facet_configuration_for_field(facet_solr_field)
-    path_for_facet = facet_item_presenter(facet_config, item.qvalue, facet_solr_field).href
-    (link_to_unless(options[:suppress_link], item.value, path_for_facet, id: id, class: 'facet_select') + ' ' + render_facet_count(item.hits)).html_safe
+    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
+      id = options.delete(:id)
+      facet_config = facet_configuration_for_field(facet_solr_field)
+      path_for_facet = facet_item_presenter(facet_config, item.qvalue, facet_solr_field).href
+      (link_to_unless(options[:suppress_link], item.value, path_for_facet, id: id, class: 'facet_select') + ' ' + render_facet_count(item.hits)).html_safe
+    end
   end
   deprecation_deprecate :render_qfacet_value