Merge branch '210008-the-same-chart-appears-twice-for-different-embeds' into 'master'

Resolve "The same chart appears twice for different embeds"

See merge request gitlab-org/gitlab!26997

changelogs/unreleased/210008-the-same-chart-appears-twice-for-different-embeds.yml

+---
+title: Fix embeds so that a chart appears only once
+merge_request: 26997
+author:
+type: fixed

ee/lib/banzai/filter/inline_cluster_metrics_filter.rb

@@ -5,9 +5,10 @@ module Banzai
     class InlineClusterMetricsFilter < ::Banzai::Filter::InlineEmbedsFilter
       def embed_params(node)
         url = node['href']
+        @query_params = query_params(url)
 
         return unless [:group, :title, :y_label].all? do |param|
-          query_params(url).include?(param)
+          @query_params.include?(param)
         end
 
         link_pattern.match(url) { |m| m.named_captures }.symbolize_keys
@@ -32,7 +33,7 @@ module Banzai
           cluster_type: :project,
           embedded: true,
           format: :json,
-          **query_params(params['url'])
+          **@query_params
         )
       end
     end

lib/banzai/filter/inline_embeds_filter.rb

@@ -6,7 +6,6 @@ module Banzai
     # a given link format. To transform references to DB
     # resources in place, prefer to inherit from AbstractReferenceFilter.
     class InlineEmbedsFilter < HTML::Pipeline::Filter
-      include Gitlab::Utils::StrongMemoize
       # Find every relevant link, create a new node based on
       # the link, and insert this node after any html content
       # surrounding the link.
@@ -74,9 +73,7 @@ module Banzai
       # Ex) 'https://<root>/<project>/<environment>/metrics?title=Title&group=Group'
       #       --> { title: 'Title', group: 'Group' }
       def query_params(url)
-        strong_memoize(:query_params) do
-          Gitlab::Metrics::Dashboard::Url.parse_query(url)
-        end
+        Gitlab::Metrics::Dashboard::Url.parse_query(url)
       end
 
       # Implement in child class.

spec/features/markdown/metrics_spec.rb

@@ -62,6 +62,29 @@ describe 'Metrics rendering', :js, :use_clean_rails_memory_store_caching, :sidek
         expect(page).to have_text(chart_params[:title])
         expect(page).to have_text(chart_params[:y_label])
       end
+
+      context 'when two dashboard urls are included' do
+        let(:chart_params_2) do
+          {
+            group: 'System metrics (Kubernetes)',
+            title: 'Core Usage (Total)',
+            y_label: 'Total Cores'
+          }
+        end
+        let(:metrics_url_2) { urls.metrics_project_environment_url(project, environment, **chart_params_2) }
+        let(:description) { "See [metrics dashboard](#{metrics_url}) for info. \n See [metrics dashboard](#{metrics_url_2}) for info." }
+        let(:issue) { create(:issue, project: project, description: description) }
+
+        it 'shows embedded metrics for both urls' do
+          visit project_issue_path(project, issue)
+
+          expect(page).to have_css('div.prometheus-graph')
+          expect(page).to have_text(chart_params[:title])
+          expect(page).to have_text(chart_params[:y_label])
+          expect(page).to have_text(chart_params_2[:title])
+          expect(page).to have_text(chart_params_2[:y_label])
+        end
+      end
     end
   end