Merge branch 'mwaw/inject_environments_helper_data_into_metrics_dashboard_response' into 'master'

Resolve "Embed: Add link to embedded panels to go to logs page"

Closes #201846

See merge request gitlab-org/gitlab!25111

app/controllers/concerns/metrics_dashboard.rb

@@ -5,6 +5,7 @@
 module MetricsDashboard
   include RenderServiceResults
   include ChecksCollaboration
+  include EnvironmentsHelper
 
   extend ActiveSupport::Concern
 
@@ -15,8 +16,9 @@ module MetricsDashboard
       metrics_dashboard_params.to_h.symbolize_keys
     )
 
-    if include_all_dashboards? && result
-      result[:all_dashboards] = all_dashboards
+    if result
+      result[:all_dashboards] = all_dashboards if include_all_dashboards?
+      result[:metrics_data] = metrics_data(project_for_dashboard, environment_for_dashboard) if project_for_dashboard && environment_for_dashboard
     end
 
     respond_to do |format|
@@ -76,10 +78,14 @@ module MetricsDashboard
     defined?(project) ? project : nil
   end
 
+  def environment_for_dashboard
+    defined?(environment) ? environment : nil
+  end
+
   def dashboard_success_response(result)
     {
       status: :ok,
-      json: result.slice(:all_dashboards, :dashboard, :status)
+      json: result.slice(:all_dashboards, :dashboard, :status, :metrics_data)
     }
   end
 

app/helpers/environments_helper.rb

 # frozen_string_literal: true
 
 module EnvironmentsHelper
+  include ActionView::Helpers::AssetUrlHelper
   prepend_if_ee('::EE::EnvironmentsHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
 
   def environments_list_data
@@ -21,7 +22,7 @@ module EnvironmentsHelper
     {
       "settings-path" => edit_project_service_path(project, 'prometheus'),
       "clusters-path" => project_clusters_path(project),
-      "current-environment-name": environment.name,
+      "current-environment-name" => environment.name,
       "documentation-path" => help_page_path('administration/monitoring/prometheus/index.md'),
       "empty-getting-started-svg-path" => image_path('illustrations/monitoring/getting_started.svg'),
       "empty-loading-svg-path" => image_path('illustrations/monitoring/loading.svg'),

spec/controllers/concerns/metrics_dashboard_spec.rb

@@ -45,6 +45,7 @@ describe MetricsDashboard do
       it 'returns the specified dashboard' do
         expect(json_response['dashboard']['dashboard']).to eq('Environment metrics')
         expect(json_response).not_to have_key('all_dashboards')
+        expect(json_response).not_to have_key('metrics_data')
       end
 
       context 'when the params are in an alternate format' do
@@ -53,6 +54,25 @@ describe MetricsDashboard do
         it 'returns the specified dashboard' do
           expect(json_response['dashboard']['dashboard']).to eq('Environment metrics')
           expect(json_response).not_to have_key('all_dashboards')
+          expect(json_response).not_to have_key('metrics_data')
+        end
+      end
+
+      context 'when environment for dashboard is available' do
+        let(:params) { { environment: environment } }
+
+        before do
+          allow(controller).to receive(:project).and_return(project)
+          allow(controller).to receive(:environment).and_return(environment)
+          allow(controller)
+            .to receive(:metrics_dashboard_params)
+                  .and_return(params)
+        end
+
+        it 'returns the specified dashboard' do
+          expect(json_response['dashboard']['dashboard']).to eq('Environment metrics')
+          expect(json_response).not_to have_key('all_dashboards')
+          expect(json_response).to have_key('metrics_data')
         end
       end
 

spec/controllers/projects/environments_controller_spec.rb

@@ -489,7 +489,7 @@ describe Projects::EnvironmentsController do
     end
 
     shared_examples_for '200 response' do
-      let(:expected_keys) { %w(dashboard status) }
+      let(:expected_keys) { %w(dashboard status metrics_data) }
 
       it_behaves_like 'correctly formatted response', :ok
     end

spec/helpers/environments_helper_spec.rb

@@ -20,7 +20,7 @@ describe EnvironmentsHelper do
       expect(metrics_data).to include(
         'settings-path' => edit_project_service_path(project, 'prometheus'),
         'clusters-path' => project_clusters_path(project),
-        'current-environment-name': environment.name,
+        'current-environment-name' => environment.name,
         'documentation-path' => help_page_path('administration/monitoring/prometheus/index.md'),
         'empty-getting-started-svg-path' => match_asset_path('/assets/illustrations/monitoring/getting_started.svg'),
         'empty-loading-svg-path' => match_asset_path('/assets/illustrations/monitoring/loading.svg'),