Merge branch 'mg-env-approval-cta-20230719' into 'master'

Link to environment detail page for deployment approvals

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126981



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Approved-by: Carla Drago <cdrago@gitlab.com>
Co-authored-by: Manuel Grabowski <mgrabowski@gitlab.com>

ee/lib/ee/gitlab/ci/status/build/waiting_for_approval.rb

@@ -12,9 +12,10 @@ def illustration
               {
                 image: 'illustrations/manual_action.svg',
                 size: 'svg-394',
-                title: _('Waiting for approval'),
+                title: _('Waiting for approvals'),
                 content: format(
-                  _("This job deploys to the protected environment \"%{environment}\" which requires approvals."),
+                  _("This job deploys to the protected environment \"%{environment}\", which requires approvals. " \
+                    "You can approve or reject the deployment on the environment details page."),
                   environment: subject.deployment&.environment&.name
                 )
               }
@@ -33,11 +34,11 @@ def action_title
             end
 
             def action_button_title
-              _('Go to environments page to approve or reject')
+              _('View environment details page')
             end
 
             def action_path
-              project_environments_path(subject.project)
+              project_environment_path(subject.project, subject.deployment&.environment)
             end
 
             def action_method

ee/spec/features/projects/jobs/blocked_deployment_job_page_spec.rb

@@ -6,11 +6,11 @@
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:build) { create(:ci_build, :manual, environment: 'production', project: project) }
+  let(:environment) { create(:environment, name: 'production', project: project) }
 
   before do
     stub_licensed_features(protected_environments: true)
 
-    environment = create(:environment, name: 'production', project: project)
     create(:protected_environment, project: project, name: 'production', required_approval_count: 1)
     create(:deployment, :blocked, project: project, environment: environment, deployable: build)
 
@@ -21,11 +21,11 @@
   end
 
   it 'displays a button linking to the environments page' do
-    expect(page).to have_text('Waiting for approval')
-    expect(page).to have_link('Go to environments page to approve or reject', href: project_environments_path(project))
+    expect(page).to have_text('Waiting for approvals')
+    expect(page).to have_link('View environment details page', href: project_environment_path(project, environment))
 
     find("[data-testid='job-empty-state-action']").click
 
-    expect(page).to have_current_path(project_environments_path(project))
+    expect(page).to have_current_path(project_environment_path(project, environment))
   end
 end

ee/spec/lib/ee/gitlab/ci/status/build/waiting_for_approval_spec.rb

@@ -43,7 +43,7 @@
     end
 
     it { expect(subject.illustration).to include(:image, :size) }
-    it { expect(subject.illustration[:title]).to eq('Waiting for approval') }
+    it { expect(subject.illustration[:title]).to eq('Waiting for approvals') }
 
     it do
       expect(subject.illustration[:content]).to include('This job deploys to the protected environment "production"')
@@ -63,10 +63,15 @@
   end
 
   describe '#action_button_title' do
-    it { expect(subject.action_button_title).to eq('Go to environments page to approve or reject') }
+    it { expect(subject.action_button_title).to eq('View environment details page') }
   end
 
   describe '#action_path' do
+    before do
+      environment = create(:environment, name: 'production', project: project)
+      create(:deployment, :blocked, project: project, environment: environment, deployable: build)
+    end
+
     it { expect(subject.action_path).to include('environments') }
   end
 

locale/gitlab.pot

@@ -21361,9 +21361,6 @@ msgstr ""
 msgid "Go to environments"
 msgstr ""
-msgid "Go to environments page to approve or reject"
-msgstr ""
-
 msgid "Go to epic"
 msgstr ""
@@ -47429,7 +47426,7 @@ msgstr ""
 msgid "This job depends on upstream jobs that need to succeed in order for this job to be triggered"
 msgstr ""
-msgid "This job deploys to the protected environment \"%{environment}\" which requires approvals."
+msgid "This job deploys to the protected environment \"%{environment}\", which requires approvals. You can approve or reject the deployment on the environment details page."
 msgstr ""
 msgid "This job does not have a trace."
@@ -50807,6 +50804,9 @@ msgstr ""
 msgid "View documentation"
 msgstr ""
+msgid "View environment details page"
+msgstr ""
+
 msgid "View exposed artifact"
 msgid_plural "View %d exposed artifacts"
 msgstr[0] ""
@@ -51468,7 +51468,7 @@ msgstr ""
 msgid "Wait for the file to load to copy its contents"
 msgstr ""
-msgid "Waiting for approval"
+msgid "Waiting for approvals"
 msgstr ""
 msgid "Waiting for merge (open and assigned)"