Merge branch '24088-make-logs-directly-available-off-the-operations-tab' into 'master'

Add new link to "Pod logs" in sidebar and create empty state page when no environment is available

See merge request gitlab-org/gitlab!19471

app/controllers/projects/environments_controller.rb

@@ -133,7 +133,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     if environment
       redirect_to environment_metrics_path(environment)
     else
-      render :empty
+      render :empty_metrics
     end
   end
 

app/views/layouts/nav/sidebar/_project.html.haml

@@ -247,6 +247,8 @@
                   %span
                     = _('Serverless')
 
+            = render_if_exists 'layouts/nav/sidebar/pod_logs_link' # EE-specific
+
             - if project_nav_tab? :clusters
               - show_cluster_hint = show_gke_cluster_integration_callout?(@project)
               = nav_link(controller: [:clusters, :user, :gcp]) do

app/views/projects/environments/empty_logs.html.haml

+- page_title _('Pod logs')
+
+.row.empty-state
+  .col-sm-12
+    .svg-content
+      = image_tag 'illustrations/operations_log_pods_empty.svg'
+  .col-12
+    .text-content
+      %h4.text-center
+        = s_('Environments|No deployed environments')
+      %p.state-description.text-center
+        = s_('Logs|To see the pod logs, deploy your code to an environment.')
+      .text-center
+        = link_to s_('Environments|Learn about environments'), help_page_path('ci/environments'), class: 'btn btn-success'

app/views/projects/environments/empty.html.haml → app/views/projects/environments/empty_metrics.html.haml

@@ -7,8 +7,8 @@
   .col-12
     .text-content
       %h4.text-center
-        = s_('Metrics|No deployed environments')
+        = s_('Environments|No deployed environments')
       %p.state-description
         = s_('Metrics|Check out the CI/CD documentation on deploying to an environment')
       .text-center
-        = link_to s_("Metrics|Learn about environments"), help_page_path('ci/environments'), class: 'btn btn-success'
+        = link_to s_("Environments|Learn about environments"), help_page_path('ci/environments'), class: 'btn btn-success'

config/routes/project.rb

@@ -441,6 +441,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           get :metrics, action: :metrics_redirect
           get :folder, path: 'folders/*id', constraints: { format: /(html|json)/ }
           get :search
+
+          Gitlab.ee do
+            get :logs, action: :logs_redirect
+          end
         end
 
         resources :deployments, only: [:index] do

ee/app/controllers/ee/projects/environments_controller.rb

@@ -14,6 +14,19 @@ module EE
         end
       end
 
+      def logs_redirect
+        environment = project.default_environment
+
+        if environment
+          redirect_to logs_project_environment_path(project, environment)
+        else
+          render :empty_logs
+        end
+      end
+
+      def logs
+      end
+
       def k8s_pod_logs
         respond_to do |format|
           format.json do
@@ -33,9 +46,6 @@ module EE
         end
       end
 
-      def logs
-      end
-
       private
 
       def environment_ee

ee/app/views/layouts/nav/sidebar/_pod_logs_link.html.haml

+- return unless project_nav_tab?(:environments)
+
+= nav_link(controller: :environments, action: [:logs, :logs_redirect]) do
+  = link_to logs_project_environments_path(@project), title: _('Pod logs') do
+    %span
+      = _('Pod logs')

ee/changelogs/unreleased/24088-make-logs-directly-available-off-the-operations-tab.yml

+---
+title: Add logs menu item to the sidebar
+merge_request: 19471
+author:
+type: added

ee/spec/controllers/projects/environments_controller_spec.rb

@@ -76,6 +76,25 @@ describe Projects::EnvironmentsController do
     end
   end
 
+  describe 'GET #logs_redirect' do
+    let(:project) { create(:project) }
+
+    it 'redirects to environment if it exists' do
+      environment = create(:environment, name: 'production', project: project)
+
+      get :logs_redirect, params: { namespace_id: project.namespace, project_id: project }
+
+      expect(response).to redirect_to(logs_project_environment_path(project, environment))
+    end
+
+    it 'renders empty logs page if no environment exists' do
+      get :logs_redirect, params: { namespace_id: project.namespace, project_id: project }
+
+      expect(response).to be_ok
+      expect(response).to render_template 'empty_logs'
+    end
+  end
+
   describe 'GET logs' do
     let(:pod_name) { "foo" }
 

locale/gitlab.pot

@@ -6409,12 +6409,18 @@ msgstr ""
 msgid "Environments|Job"
 msgstr ""
 
+msgid "Environments|Learn about environments"
+msgstr ""
+
 msgid "Environments|Learn more about stopping environments"
 msgstr ""
 
 msgid "Environments|New environment"
 msgstr ""
 
+msgid "Environments|No deployed environments"
+msgstr ""
+
 msgid "Environments|No deployments yet"
 msgstr ""
 
@@ -10183,6 +10189,9 @@ msgstr ""
 msgid "Logs"
 msgstr ""
 
+msgid "Logs|To see the pod logs, deploy your code to an environment."
+msgstr ""
+
 msgid "MD5"
 msgstr ""
 
@@ -10684,9 +10693,6 @@ msgstr ""
 msgid "Metrics|Label of the y-axis (usually the unit). The x-axis always represents time."
 msgstr ""
 
-msgid "Metrics|Learn about environments"
-msgstr ""
-
 msgid "Metrics|Legend label (optional)"
 msgstr ""
 
@@ -10702,9 +10708,6 @@ msgstr ""
 msgid "Metrics|New metric"
 msgstr ""
 
-msgid "Metrics|No deployed environments"
-msgstr ""
-
 msgid "Metrics|PromQL query is valid"
 msgstr ""
 
@@ -12361,6 +12364,9 @@ msgstr ""
 msgid "Please wait while we import the repository for you. Refresh at will."
 msgstr ""
 
+msgid "Pod logs"
+msgstr ""
+
 msgid "Pod not found"
 msgstr ""
 

spec/controllers/projects/environments_controller_spec.rb

@@ -330,11 +330,11 @@ describe Projects::EnvironmentsController do
       expect(response).to redirect_to(environment_metrics_path(environment))
     end
 
-    it 'redirects to empty page if no environment exists' do
+    it 'redirects to empty metrics page if no environment exists' do
       get :metrics_redirect, params: { namespace_id: project.namespace, project_id: project }
 
       expect(response).to be_ok
-      expect(response).to render_template 'empty'
+      expect(response).to render_template 'empty_metrics'
     end
   end