Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 25 insertions, 6 deletions

diff --git a/app/controllers/projects/metrics_dashboard_controller.rb b/app/controllers/projects/metrics_dashboard_controller.rb
index 51307c3665c..bc0a701b9fd 100644
--- a/app/controllers/projects/metrics_dashboard_controller.rb
+++ b/app/controllers/projects/metrics_dashboard_controller.rb
@@ -6,6 +6,8 @@ module Projects
     # app/controllers/projects/environments_controller.rb
     # See https://gitlab.com/gitlab-org/gitlab/-/issues/226002 for more details.
 
+    include Gitlab::Utils::StrongMemoize
+
     before_action :authorize_metrics_dashboard!
     before_action do
       push_frontend_feature_flag(:prometheus_computed_alerts)
@@ -15,6 +17,15 @@ module Projects
     def show
       if environment
         render 'projects/environments/metrics'
+      elsif default_environment
+        redirect_to project_metrics_dashboard_path(
+          project,
+          # Reverse merge the query parameters so that a query parameter named dashboard_path doesn't
+          # override the dashboard_path path parameter.
+          **permitted_params.to_h.symbolize_keys
+            .merge(environment: default_environment.id)
+            .reverse_merge(request.query_parameters.symbolize_keys)
+        )
       else
         render 'projects/environments/empty_metrics'
       end
@@ -22,13 +33,21 @@ module Projects
 
     private
 
+    def permitted_params
+      @permitted_params ||= params.permit(:dashboard_path, :environment, :page)
+    end
+
     def environment
-      @environment ||=
-        if params[:environment]
-          project.environments.find(params[:environment])
-        else
-          project.default_environment
-        end
+      strong_memoize(:environment) do
+        env = permitted_params[:environment]
+        project.environments.find(env) if env
+      end
+    end
+
+    def default_environment
+      strong_memoize(:default_environment) do
+        project.default_environment
+      end
     end
   end
 end