Cleanup methods and simplify overrides

Reduce the number of methods to reduce the levels
of indirection. Also, made the CE methods easier
to extend so the EE overrides are simpler.

app/helpers/labels_helper.rb

@@ -46,7 +46,7 @@ module LabelsHelper
     end
   end
 
-  def render_label(label, tooltip: true, link: nil, dataset: nil, small: false)
+  def render_label(label, tooltip: true, link: nil, dataset: nil, small: false, wrapper_class: nil, wrapper_style: nil)
     # if scoped label is used then EE wraps label tag with scoped label
     # doc link
     html = render_colored_label(label)
@@ -60,10 +60,11 @@ module LabelsHelper
       )
     end
 
-    wrapper_class = "gl-label"
-    wrapper_class += " gl-label-sm" if small
+    wrapper_classes = Array.wrap(wrapper_class)
+    wrapper_classes << 'gl-label'
+    wrapper_classes << 'gl-label-sm' if small
 
-    content_tag(:span, html.html_safe, class: wrapper_class)
+    content_tag(:span, html.html_safe, class: wrapper_classes.join(' '), style: wrapper_style)
   end
 
   def render_colored_label(label, label_suffix: '')
@@ -290,9 +291,6 @@ module LabelsHelper
     css = 'gl-link gl-label-link'
     tooltip ? "#{css} has-tooltip" : css
   end
-
-  # Required for Banzai::Filter::LabelReferenceFilter
-  module_function :render_colored_label, :text_color_for_bg, :escape_once, :label_tooltip_title
 end
 
 LabelsHelper.prepend_if_ee('EE::LabelsHelper')

ee/app/helpers/ee/labels_helper.rb

@@ -9,62 +9,45 @@ module EE
     end
 
     def render_label(label, tooltip: true, link: nil, dataset: nil, small: false)
-      if label.scoped_label?
-        render_scoped_label(
+      return super unless label.scoped_label?
+
+      scoped_label_doc_wrapper(
+        super(
           label,
+          tooltip: tooltip,
           link: link,
-          css: label_css_classes(tooltip),
-          dataset: label_dataset(label, dataset, tooltip),
-          small: small
-        )
-      else
-        super
-      end
+          dataset: dataset,
+          small: small,
+          wrapper_class: 'gl-label-scoped',
+          wrapper_style: "color: #{label.color}"
+        ),
+        label
+      )
     end
 
-    def render_scoped_label(label, link: nil, css: nil, dataset: nil, small: false)
-      # if scoped label is used then EE wraps label tag with scoped label
-      # doc link
-      size_class = small ? "gl-label-sm" : ""
-      html = render_colored_scoped_label(label)
-      html = link_to(html, link, class: css, data: dataset) if link
-
-      html = %(<span class="gl-label gl-label-scoped #{size_class}" style="color: #{label.color}">#{html}</span>)
-      wrapped_html = scoped_label_wrapper(html, label)
-
-      wrapped_html.html_safe
-    end
+    def render_colored_label(label, label_suffix: '')
+      return super unless label.scoped_label?
 
-    def render_colored_scoped_label(label, label_suffix: '')
-      text_color_class = ::LabelsHelper.text_color_class_for_bg(label.color)
+      text_color_class = text_color_class_for_bg(label.color)
       scope_name, label_name = label.name.split(Label::SCOPED_LABEL_SEPARATOR)
 
-      # Intentionally not using content_tag here so that this method can be called
-      # by LabelReferenceFilter
       # Tooltip is omitted as it's attached to the link containing label title on scoped labels
-      ::LabelsHelper.render_partial_label(
+      render_partial_label(
         label, label_suffix: label_suffix,
         label_name: scope_name,
         css_class: text_color_class,
         bg_color: label.color
-      ) + ::LabelsHelper.render_partial_label(
+      ) + render_partial_label(
         label, label_suffix: label_suffix,
         label_name: label_name,
         css_class: 'gl-label-scoped-text'
       )
     end
 
-    def scoped_label_wrapper(link, label)
+    def scoped_label_doc_wrapper(link, label)
       %(<span class="d-inline-block position-relative scoped-label-wrapper">#{link}#{scoped_labels_doc_link(label)}</span>).html_safe
     end
 
-    def scoped_labels_doc_link(label)
-      content = %(<i class="fa fa-question-circle"></i>)
-      help_url = ::Gitlab::Routing.url_helpers.help_page_url('user/project/labels.md', anchor: 'scoped-labels')
-
-      %(<a href="#{help_url}" class="label scoped-label gl-link gl-label-icon" target="_blank" rel="noopener">#{content}</a>)
-    end
-
     def label_tooltip_title(label)
       tooltip = super
       tooltip = %(<span class='font-weight-bold scoped-label-tooltip-title'>Scoped label</span><br />#{tooltip}) if label.scoped_label?
@@ -101,14 +84,13 @@ module EE
       super + ['epics']
     end
 
+    private
+
     def scoped_labels_doc_link(label)
-      text_color = text_color_for_bg(label.color)
-      content = %(<i class="fa fa-question-circle" style="background-color: #{label.color}; color: #{text_color}"></i>)
+      content = %(<i class="fa fa-question-circle"></i>)
       help_url = ::Gitlab::Routing.url_helpers.help_page_url('user/project/labels.md', anchor: 'scoped-labels')
 
-      %(<a href="#{help_url}" class="label scoped-label" target="_blank" rel="noopener">#{content}</a>)
+      %(<a href="#{help_url}" class="label scoped-label gl-link gl-label-icon" target="_blank" rel="noopener">#{content}</a>)
     end
-
-    module_function :render_colored_scoped_label, :scoped_label_wrapper, :scoped_labels_doc_link, :label_tooltip_title
   end
 end

ee/lib/ee/banzai/filter/label_reference_filter.rb

@@ -6,20 +6,6 @@ module EE
       module LabelReferenceFilter
         extend ::Gitlab::Utils::Override
 
-        override :object_link_text
-        def object_link_text(object, matches)
-          presenter = label_link_text(object, matches)
-          label_suffix = label_link_suffix(object, matches)
-
-          content = if object.scoped_label?
-                      ::EE::LabelsHelper.render_colored_scoped_label(presenter, label_suffix: label_suffix)
-                    else
-                      ::LabelsHelper.render_colored_label(presenter, label_suffix: label_suffix)
-                    end
-
-          content
-        end
-
         override :wrap_link
         def wrap_link(link, label)
           content = super
@@ -27,8 +13,7 @@ module EE
 
           if label.scoped_label? && parent && parent.feature_available?(:scoped_labels)
             presenter = label.present(issuable_parent: parent)
-            content = %(<span class="gl-label gl-label-scoped gl-label-sm" style="color: #{label.color}">#{link}</span>)
-            content = ::EE::LabelsHelper.scoped_label_wrapper(content, presenter)
+            content = ::LabelsHelper.scoped_label_wrapper(content, presenter)
           end
 
           content
@@ -37,10 +22,6 @@ module EE
         def tooltip_title(label)
           ::LabelsHelper.label_tooltip_title(label)
         end
-
-        def object_link_title(object, matches)
-          ::EE::LabelsHelper.label_tooltip_title(object)
-        end
       end
     end
   end

ee/spec/lib/banzai/filter/label_reference_filter_spec.rb

@@ -33,11 +33,10 @@ describe Banzai::Filter::LabelReferenceFilter do
       stub_licensed_features(scoped_labels: false)
     end
 
-    it 'does not include link to scoped labels documentation' do
+    it 'renders label as a common label' do
       doc = reference_filter("See #{scoped_label.to_reference}")
-      scoped = scoped_label.name.split('::')
 
-      expect(doc.to_html).to match(%r(<span.+><a.+><span.+>#{scoped.first}</span><span.+>#{scoped.last}</span></a></span>$))
+      expect(doc.to_html).to match(%r(<span.+><a.+><span.+>#{scoped_label.name}</span></a></span>$))
     end
   end
 end

lib/banzai/filter/label_reference_filter.rb

@@ -80,15 +80,7 @@ module Banzai
         end
       end
 
-      def label_link_text(object, matches)
-        parent = project || group
-
-        presenter = object.present(issuable_subject: parent)
-
-        presenter
-      end
-
-      def label_link_suffix(object, matches)
+      def object_link_text(object, matches)
         label_suffix = ''
         parent = project || group
 
@@ -100,12 +92,7 @@ module Banzai
           label_suffix = " <i>in #{ERB::Util.html_escape(reference)}</i>" if reference.present?
         end
 
-        label_suffix
-      end
-
-      def object_link_text(object, matches)
-        presenter = label_link_text(object, matches)
-        label_suffix = label_link_suffix(object, matches)
+        presenter = object.present(issuable_subject: parent)
         LabelsHelper.render_colored_label(presenter, label_suffix: label_suffix)
       end
 
@@ -116,10 +103,6 @@ module Banzai
         content
       end
 
-      def tooltip_title(label)
-        nil
-      end
-
       def full_path_ref?(matches)
         matches[:namespace] && matches[:project]
       end