Delegate to metrics settings for simplicity

3 files changed, 3 insertions, 2 deletions

diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 7e0fecacb94..8002eb08ada 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -31,7 +31,7 @@ module EnvironmentsHelper
       "project-path" => project_path(project),
       "tags-path" => project_tags_path(project),
       "has-metrics" => "#{environment.has_metrics?}",
-      "external-dashboard-url" => project.metrics_setting&.external_dashboard_url
+      "external-dashboard-url" => project.metrics_setting_external_dashboard_url
     }
   end
 end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 45cdf3eb0e4..30ad35d6ca4 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -344,7 +344,7 @@ module ProjectsHelper
   end
     
   def metrics_external_dashboard_url
-    @project.metrics_setting&.external_dashboard_url
+    @project.metrics_setting_external_dashboard_url
   end
 
   private
diff --git a/app/models/project.rb b/app/models/project.rb
index ab4da61dcf8..20895923d3b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -309,6 +309,7 @@ class Project < ApplicationRecord
   delegate :group_clusters_enabled?, to: :group, allow_nil: true
   delegate :root_ancestor, to: :namespace, allow_nil: true
   delegate :last_pipeline, to: :commit, allow_nil: true
+  delegate :external_dashboard_url, to: :metrics_setting, allow_nil: true, prefix: true
 
   # Validations
   validates :creator, presence: true, on: :create