Automatic merge of gitlab-org/gitlab master

app/helpers/users_helper.rb

@@ -129,7 +129,7 @@ module UsersHelper
     }
   end
 
-  def unblock_user_modal_data(user)
+  def user_unblock_data(user)
     {
       path: unblock_admin_user_path(user),
       method: 'put',
@@ -168,6 +168,19 @@ module UsersHelper
     }
   end
 
+  def user_activation_data(user)
+    {
+      path: activate_admin_user_path(user),
+      method: 'put',
+      modal_attributes: {
+        title: s_('AdminUsers|Activate user %{username}?') % { username: sanitize_name(user.name) },
+        message: s_('AdminUsers|You can always deactivate their account again if needed.'),
+        okVariant: 'info',
+        okTitle: s_('AdminUsers|Activate')
+      }.to_json
+    }
+  end
+
   def user_deactivation_effects
     header = tag.p s_('AdminUsers|Deactivating a user has the following effects:')
 

app/views/admin/users/_user.html.haml

@@ -40,7 +40,7 @@
                     %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_block_data(user, user_block_effects) }
                       = s_('AdminUsers|Block')
                   - else
-                    %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: unblock_user_modal_data(user) }
+                    %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_unblock_data(user) }
                       = s_('AdminUsers|Unblock')
                 - else
                   %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_block_data(user, user_block_effects) }
@@ -51,7 +51,8 @@
                     = s_('AdminUsers|Deactivate')
               - elsif user.deactivated?
                 %li
-                  = link_to _('Activate'), activate_admin_user_path(user), method: :put
+                  %button.btn.btn-default-tertiary.js-confirm-modal-button{ data: user_activation_data(user) }
+                    = s_('AdminUsers|Activate')
               - if user.access_locked?
                 %li
                   = link_to _('Unlock'), unlock_admin_user_path(user), method: :put, data: { confirm: _('Are you sure?') }

app/views/admin/users/show.html.haml

@@ -158,7 +158,8 @@
             .card-body
               = render partial: 'admin/users/user_activation_effects'
               %br
-              = link_to 'Activate user', activate_admin_user_path(@user), method: :put, class: "btn gl-button btn-info", data: { confirm: 'Are you sure?' }
+              %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: user_activation_data(@user) }
+                = s_('AdminUsers|Activate user')
         - elsif @user.can_be_deactivated?
           .card.border-warning
             .card-header.bg-warning.text-white
@@ -182,7 +183,7 @@
                 %li Log in
                 %li Access Git repositories
               %br
-              %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: unblock_user_modal_data(@user) }
+              %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: user_unblock_data(@user) }
                 = s_('AdminUsers|Unblock user')
       - elsif !@user.internal?
         = render 'admin/users/block_user', user: @user

changelogs/unreleased/267118-add-reactivate-user-admin-approval-modal-to-glmodal.yml

+---
+title: Add confirm modal to reactivate user
+merge_request: 48173
+author:
+type: added

doc/.vale/gitlab/spelling-exceptions.txt

@@ -224,6 +224,7 @@ Kibana
 Kinesis
 Knative
 Kramdown
+Kroki
 Kubecost
 kubectl
 Kubernetes

doc/administration/integration/kroki.md

-# Kroki diagrams **(CORE)**
+# Kroki diagrams **(CORE ONLY)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/241744) in GitLab 13.7.
 
@@ -10,7 +10,7 @@ GitLab you can use it to create diagrams in AsciiDoc and Markdown documents.
 When Kroki is enabled, GitLab sends diagrams to an instance of Kroki to display them as images.
 You can use the free public cloud instance `https://kroki.io` or you can [install Kroki](https://docs.kroki.io/kroki/setup/install/)
 on your own infrastructure.
-Once you've installed Kroki, make sure to update the server URL to point to your instance.
+After you've installed Kroki, make sure to update the server URL to point to your instance.
 
 ### Docker
 
@@ -38,12 +38,12 @@ The [`yuzutech/kroki`](https://hub.docker.com/r/yuzutech/kroki) image contains t
 - [WaveDrom](https://wavedrom.com/)
 
 If you want to use additional diagram libraries,
-read the [Kroki installation](https://docs.kroki.io/kroki/setup/install/#_images) to learn how to start Kroki companion containers. 
+read the [Kroki installation](https://docs.kroki.io/kroki/setup/install/#_images) to learn how to start Kroki companion containers.
 
-## Enable Kroki in GitLab **(CORE ONLY)**
+## Enable Kroki in GitLab
 
 You need to enable Kroki integration from Settings under Admin Area.
-To do that, log in with an Admin account and follow these steps:
+To do that, log in with an administrator account and follow these steps:
 
 1. Select the Admin Area (**{admin}**) icon.
 1. Navigate to **Settings > General**.

ee/app/assets/javascripts/security_dashboard/components/first_class_project_security_dashboard.vue

@@ -74,7 +74,7 @@ export default {
       <security-dashboard-layout>
         <template #header>
           <div class="gl-mt-6 gl-display-flex">
-            <h4 class="gl-flex-grow-1 gl-my-0">{{ __('Vulnerabilities') }}</h4>
+            <h4 class="gl-flex-grow-1 gl-my-0">{{ __('Vulnerability Report') }}</h4>
             <csv-export-button :vulnerabilities-export-endpoint="vulnerabilitiesExportEndpoint" />
           </div>
           <project-pipeline-status :pipeline="pipeline" />

ee/app/assets/javascripts/security_dashboard/components/project_pipeline_status.vue

@@ -40,7 +40,7 @@ export default {
   },
   i18n: {
     title: __(
-      'The Security Dashboard shows the results of the last successful pipeline run on the default branch.',
+      'The Vulnerability Report shows the results of the last successful pipeline run on the default branch.',
     ),
     lastUpdated: __('Last updated'),
     autoFixSolutions: s__('AutoRemediation|Auto-fix solutions'),

ee/app/views/projects/settings/_default_issue_template.html.haml

@@ -3,7 +3,7 @@
   %section.settings.issues-feature.no-animate#js-issue-settings{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:issues_access_level) == 0)] }
     .settings-header
       %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Default issue template')
-      %button.btn.btn-default.js-settings-toggle= expanded ? _('Collapse') : _('Expand')
+      %button.gl-button.btn.btn-default.js-settings-toggle= expanded ? _('Collapse') : _('Expand')
       %p= _('Set a default template for issue descriptions.')
 
     .settings-content
@@ -18,4 +18,4 @@
             .text-secondary
               - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/markdown') }
               = _('Description parsed with %{link_start}GitLab Flavored Markdown%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
-        = f.submit _('Save changes'), class: "btn btn-success"
+        = f.submit _('Save changes'), class: "gl-button btn btn-success"

ee/changelogs/unreleased/289933-update-text-on-vulnerability-report-page.yml

+---
+title: Update header text on project level vulnerability report page
+merge_request: 48872
+author:
+type: other

ee/spec/frontend/security_dashboard/components/first_class_project_security_dashboard_spec.js

 import { GlBanner } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
+import { within } from '@testing-library/dom';
 import Cookies from 'js-cookie';
 import AutoFixUserCallout from 'ee/security_dashboard/components/auto_fix_user_callout.vue';
 import CsvExportButton from 'ee/security_dashboard/components/csv_export_button.vue';
@@ -71,6 +72,12 @@ describe('First class Project Security Dashboard component', () => {
       });
     });
 
+    it('should render the header correctly', () => {
+      expect(
+        within(wrapper.element).getByRole('heading', { name: 'Vulnerability Report' }),
+      ).not.toBe(null);
+    });
+
     it('should render the vulnerabilities', () => {
       expect(findVulnerabilities().exists()).toBe(true);
     });

ee/spec/frontend/security_dashboard/components/project_pipeline_status_spec.js

 import { GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
+import { within } from '@testing-library/dom';
 import { merge } from 'lodash';
 import PipelineStatusBadge from 'ee/security_dashboard/components/pipeline_status_badge.vue';
 import ProjectPipelineStatus from 'ee/security_dashboard/components/project_pipeline_status.vue';
@@ -55,6 +56,15 @@ describe('Project Pipeline Status Component', () => {
       wrapper = createWrapper();
     });
 
+    it('should display the help message properly', () => {
+      expect(
+        within(wrapper.element).getByRole('heading', {
+          name:
+            'The Vulnerability Report shows the results of the last successful pipeline run on the default branch.',
+        }),
+      ).not.toBe(null);
+    });
+
     it('should show the timeAgoTooltip component', () => {
       const TimeComponent = findTimeAgoTooltip();
       expect(TimeComponent.exists()).toBeTruthy();

locale/gitlab.pot

@@ -1489,9 +1489,6 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-msgid "Activate"
-msgstr ""
-
 msgid "Activate Service Desk"
 msgstr ""
 
@@ -2070,6 +2067,15 @@ msgstr ""
 msgid "AdminUsers|Access the API"
 msgstr ""
 
+msgid "AdminUsers|Activate"
+msgstr ""
+
+msgid "AdminUsers|Activate user"
+msgstr ""
+
+msgid "AdminUsers|Activate user %{username}?"
+msgstr ""
+
 msgid "AdminUsers|Active"
 msgstr ""
 
@@ -2259,6 +2265,9 @@ msgstr ""
 msgid "AdminUsers|You can always block their account again if needed."
 msgstr ""
 
+msgid "AdminUsers|You can always deactivate their account again if needed."
+msgstr ""
+
 msgid "AdminUsers|You can always re-activate their account, their data will remain intact."
 msgstr ""
 
@@ -26931,9 +26940,6 @@ msgstr ""
 msgid "The Prometheus server responded with \"bad request\". Please check your queries are correct and are supported in your Prometheus version. %{documentationLink}"
 msgstr ""
 
-msgid "The Security Dashboard shows the results of the last successful pipeline run on the default branch."
-msgstr ""
-
 msgid "The URL defined on the primary node that secondary nodes should use to contact it."
 msgstr ""
 
@@ -26943,6 +26949,9 @@ msgstr ""
 msgid "The URL to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., \"http://localhost:9200, http://localhost:9201\")."
 msgstr ""
 
+msgid "The Vulnerability Report shows the results of the last successful pipeline run on the default branch."
+msgstr ""
+
 msgid "The X509 Certificate to use when mutual TLS is required to communicate with the external authorization service. If left blank, the server certificate is still validated when accessing over HTTPS."
 msgstr ""
 

spec/features/admin/users/user_spec.rb

@@ -77,8 +77,8 @@ RSpec.describe 'Admin::Users::User' do
       end
     end
 
-    context 'when deactivating the user' do
-      it 'shows confirmation and allows blocking', :js do
+    context 'when deactivating/re-activating the user' do
+      it 'shows confirmation and allows deactivating/re-activating', :js do
         visit admin_user_path(user)
 
         find('button', text: 'Deactivate user').click
@@ -94,6 +94,20 @@ RSpec.describe 'Admin::Users::User' do
 
         expect(page).to have_content('Successfully deactivated')
         expect(page).to have_content('Reactivate this user')
+
+        find('button', text: 'Activate user').click
+
+        wait_for_requests
+
+        expect(page).to have_content('Activate user')
+        expect(page).to have_content('You can always deactivate their account again if needed.')
+
+        find('.modal-footer button', text: 'Activate').click
+
+        wait_for_requests
+
+        expect(page).to have_content('Successfully activated')
+        expect(page).to have_content('Deactivate this user')
       end
     end
 

spec/features/admin/users/users_spec.rb

@@ -207,11 +207,7 @@ RSpec.describe 'Admin::Users' do
       it 'shows confirmation and allows blocking and unblocking', :js do
         expect(page).to have_content(user.email)
 
-        find("[data-testid='user-action-button-#{user.id}']").click
-
-        within find("[data-testid='user-action-dropdown-#{user.id}']") do
-          find('li button', text: 'Block').click
-        end
+        click_action_in_user_dropdown(user.id, 'Block')
 
         wait_for_requests
 
@@ -233,13 +229,7 @@ RSpec.describe 'Admin::Users' do
 
         expect(page).to have_content(user.email)
 
-        find("[data-testid='user-action-button-#{user.id}']").click
-
-        within find("[data-testid='user-action-dropdown-#{user.id}']") do
-          find('li button', text: 'Unblock').click
-        end
-
-        wait_for_requests
+        click_action_in_user_dropdown(user.id, 'Unblock')
 
         expect(page).to have_content('Unblock user')
         expect(page).to have_content('You can always block their account again if needed.')
@@ -253,17 +243,11 @@ RSpec.describe 'Admin::Users' do
       end
     end
 
-    context 'when deactivating a user' do
-      it 'shows confirmation and allows deactivating', :js do
+    context 'when deactivating/re-activating a user' do
+      it 'shows confirmation and allows deactivating and re-activating', :js do
         expect(page).to have_content(user.email)
 
-        find("[data-testid='user-action-button-#{user.id}']").click
-
-        within find("[data-testid='user-action-dropdown-#{user.id}']") do
-          find('li button', text: 'Deactivate').click
-        end
-
-        wait_for_requests
+        click_action_in_user_dropdown(user.id, 'Deactivate')
 
         expect(page).to have_content('Deactivate user')
         expect(page).to have_content('Deactivating a user has the following effects')
@@ -276,8 +260,36 @@ RSpec.describe 'Admin::Users' do
 
         expect(page).to have_content('Successfully deactivated')
         expect(page).not_to have_content(user.email)
+
+        click_link 'Deactivated'
+
+        wait_for_requests
+
+        expect(page).to have_content(user.email)
+
+        click_action_in_user_dropdown(user.id, 'Activate')
+
+        expect(page).to have_content('Activate user')
+        expect(page).to have_content('You can always deactivate their account again if needed.')
+
+        find('.modal-footer button', text: 'Activate').click
+
+        wait_for_requests
+
+        expect(page).to have_content('Successfully activated')
+        expect(page).not_to have_content(user.email)
       end
     end
+
+    def click_action_in_user_dropdown(user_id, action)
+      find("[data-testid='user-action-button-#{user_id}']").click
+
+      within find("[data-testid='user-action-dropdown-#{user_id}']") do
+        find('li button', text: action).click
+      end
+
+      wait_for_requests
+    end
   end
 
   describe 'GET /admin/users/new' do