Merge branch 'add_tooltip_to_guests_in_users_statistics' into 'master'

Add tooltip to guests count in Users Statistics

See merge request gitlab-org/gitlab!25433

ee/app/views/admin/dashboard/stats.html.haml

@@ -16,5 +16,8 @@
           = s_('AdminArea|Users with highest role')
           %strong
             = row['kind']
+          - if row['kind'] == 'guest' && License.current&.exclude_guests_from_active_count?
+            %span.has-tooltip{ data: { container: 'body' }, title: s_('AdminArea|Included Free in license') }
+              = sprite_icon('question', size: 16)
         %td
           = row['amount']

ee/changelogs/unreleased/add_tooltip_to_guests_in_users_statistics.yml

+---
+title: Add tooltip to guests count in Users Statistics
+merge_request: 25433
+author:
+type: added

ee/spec/features/admin/admin_dashboard_spec.rb

@@ -21,6 +21,48 @@ describe 'Admin Dashboard' do
     end
 
     describe 'Roles stats' do
+      context 'for tooltip' do
+        let(:create_guest) { false }
+
+        before do
+          allow(License).to receive(:current).and_return(license)
+
+          if create_guest
+            project = create(:project_empty_repo)
+            guest_user = create(:user)
+            project.add_guest(guest_user)
+          end
+
+          visit admin_dashboard_stats_path
+        end
+
+        context 'when license is empty' do
+          let(:license) { nil }
+
+          it { expect(page).not_to have_css('span.has-tooltip') }
+        end
+
+        context 'when license is on a plan Ultimate' do
+          let(:license) { create(:license, plan: License::ULTIMATE_PLAN) }
+
+          context 'when guests do not exist' do
+            it { expect(page).not_to have_css('span.has-tooltip') }
+          end
+
+          context 'when guests exist' do
+            let(:create_guest) { true }
+
+            it { expect(page).to have_css('span.has-tooltip') }
+          end
+        end
+
+        context 'when license is on a plan other than Ultimate' do
+          let(:license) { create(:license, plan: License::PREMIUM_PLAN) }
+
+          it { expect(page).not_to have_css('span.has-tooltip') }
+        end
+      end
+
       it 'show correct amount of users per role' do
         visit admin_dashboard_stats_path
 

locale/gitlab.pot

@@ -1281,6 +1281,9 @@ msgstr ""
 msgid "Admin notes"
 msgstr ""
 
+msgid "AdminArea|Included Free in license"
+msgstr ""
+
 msgid "AdminArea|Stop all jobs"
 msgstr ""