From 53fa2e2b67fa1c7acb5e6d8aa80b5ec3042a0235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Sanz=20Garc=C3=ADa?= Date: Sat, 10 Sep 2022 13:37:29 +0200 Subject: [PATCH 1/5] Add bot badge in user list for admins Added Bot account badge in the user avatar that is displayed in the **Admin > Overview > Users** list. Changelog: changed --- app/helpers/users_helper.rb | 1 + locale/gitlab.pot | 3 +++ spec/helpers/users_helper_spec.rb | 28 +++++++++++++++++++--------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index fb0f739934e983..990bf87a5d16a6 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -94,6 +94,7 @@ def user_badges_in_admin_section(user) [].tap do |badges| badges << blocked_user_badge(user) if user.blocked? badges << { text: s_('AdminUsers|Admin'), variant: 'success' } if user.admin? + badges << { text: s_('AdminUsers|Bot account'), variant: 'muted' } if user.bot? badges << { text: s_('AdminUsers|External'), variant: 'secondary' } if user.external? badges << { text: s_("AdminUsers|It's you!"), variant: 'muted' } if current_user == user badges << { text: s_("AdminUsers|Locked"), variant: 'warning' } if user.access_locked? diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 732436619690b9..abb258793e99b1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3084,6 +3084,9 @@ msgstr "" msgid "AdminUsers|Blocking user has the following effects:" msgstr "" +msgid "AdminUsers|Bot account" +msgstr "" + msgid "AdminUsers|Can create group" msgstr "" diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index 91e6305ea99b32..93cc76adc5db55 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -136,7 +136,7 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(blocked_user) - expect(filter_ee_badges(badges)).to match_array([text: "Blocked", variant: "danger"]) + expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|Blocked"), variant: "danger"]) end end @@ -146,7 +146,7 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(blocked_pending_approval_user) - expect(filter_ee_badges(badges)).to match_array([text: 'Pending approval', variant: 'info']) + expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Pending approval'), variant: 'info']) end end @@ -156,7 +156,7 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(banned_user) - expect(filter_ee_badges(badges)).to match_array([text: 'Banned', variant: 'danger']) + expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Banned'), variant: 'danger']) end end @@ -166,7 +166,17 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(admin_user) - expect(filter_ee_badges(badges)).to match_array([text: "Admin", variant: "success"]) + expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|Admin"), variant: "success"]) + end + end + + context 'with a bot' do + it "returns the bot badge" do + bot = create(:user, :bot) + + badges = helper.user_badges_in_admin_section(bot) + + expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Bot account'), variant: "muted"]) end end @@ -176,7 +186,7 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(external_user) - expect(filter_ee_badges(badges)).to match_array([text: "External", variant: "secondary"]) + expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|External"), variant: "secondary"]) end end @@ -184,7 +194,7 @@ def filter_ee_badges(badges) it 'returns the "It\'s You" badge' do badges = helper.user_badges_in_admin_section(user) - expect(filter_ee_badges(badges)).to match_array([text: "It's you!", variant: "muted"]) + expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|It's you!"), variant: "muted"]) end end @@ -195,9 +205,9 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(user) expect(badges).to match_array([ - { text: "Blocked", variant: "danger" }, - { text: "Admin", variant: "success" }, - { text: "External", variant: "secondary" } + { text: s_("AdminUsers|Blocked"), variant: "danger" }, + { text: s_("AdminUsers|Admin"), variant: "success" }, + { text: s_("AdminUsers|External"), variant: "secondary" } ]) end end -- GitLab From 14676f285e9a588f9a01577f09cf92b05577ab47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Sanz=20Garc=C3=ADa?= Date: Mon, 12 Sep 2022 17:01:16 +0200 Subject: [PATCH 2/5] Add documentation --- doc/development/internal_users.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/development/internal_users.md b/doc/development/internal_users.md index 95ca593e31e4ad..4bb3587b541caf 100644 --- a/doc/development/internal_users.md +++ b/doc/development/internal_users.md @@ -8,6 +8,8 @@ info: "See the Technical Writers assigned to Development Guidelines: https://abo # Internal users +> [Bots display a badge on users listings](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97584) in GitLab 15.4. + GitLab uses internal users (sometimes referred to as "bots") to perform actions or functions that cannot be attributed to a regular user. -- GitLab From 4c105fe39fa0a635a78a1ffdb78421b9af477ca9 Mon Sep 17 00:00:00 2001 From: Evan Read Date: Tue, 13 Sep 2022 04:57:30 +0000 Subject: [PATCH 3/5] Apply suggestion for documentation --- doc/development/internal_users.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/development/internal_users.md b/doc/development/internal_users.md index 4bb3587b541caf..4ce0460f3f550f 100644 --- a/doc/development/internal_users.md +++ b/doc/development/internal_users.md @@ -8,7 +8,7 @@ info: "See the Technical Writers assigned to Development Guidelines: https://abo # Internal users -> [Bots display a badge on users listings](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97584) in GitLab 15.4. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97584) in GitLab 15.4, internal users are indicated with a badge in user listings. GitLab uses internal users (sometimes referred to as "bots") to perform actions or functions that cannot be attributed to a regular user. -- GitLab From 9da42bd19c803d9e6f2602ec677181401c0db26b Mon Sep 17 00:00:00 2001 From: Evan Read Date: Tue, 13 Sep 2022 09:44:29 +0000 Subject: [PATCH 4/5] Rename 'Bot account' to 'Bot' --- app/helpers/users_helper.rb | 2 +- doc/development/internal_users.md | 2 +- locale/gitlab.pot | 2 +- spec/helpers/users_helper_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 990bf87a5d16a6..271fa47dd97a1a 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -94,7 +94,7 @@ def user_badges_in_admin_section(user) [].tap do |badges| badges << blocked_user_badge(user) if user.blocked? badges << { text: s_('AdminUsers|Admin'), variant: 'success' } if user.admin? - badges << { text: s_('AdminUsers|Bot account'), variant: 'muted' } if user.bot? + badges << { text: s_('AdminUsers|Bot'), variant: 'muted' } if user.bot? badges << { text: s_('AdminUsers|External'), variant: 'secondary' } if user.external? badges << { text: s_("AdminUsers|It's you!"), variant: 'muted' } if current_user == user badges << { text: s_("AdminUsers|Locked"), variant: 'warning' } if user.access_locked? diff --git a/doc/development/internal_users.md b/doc/development/internal_users.md index 4ce0460f3f550f..24785c0cf48589 100644 --- a/doc/development/internal_users.md +++ b/doc/development/internal_users.md @@ -8,7 +8,7 @@ info: "See the Technical Writers assigned to Development Guidelines: https://abo # Internal users -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97584) in GitLab 15.4, internal users are indicated with a badge in user listings. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97584) in GitLab 15.4, bots are indicated with a badge in user listings. GitLab uses internal users (sometimes referred to as "bots") to perform actions or functions that cannot be attributed to a regular user. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index abb258793e99b1..e0a62b6082110f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3084,7 +3084,7 @@ msgstr "" msgid "AdminUsers|Blocking user has the following effects:" msgstr "" -msgid "AdminUsers|Bot account" +msgid "AdminUsers|Bot" msgstr "" msgid "AdminUsers|Can create group" diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index 93cc76adc5db55..9b5abfec01b859 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -176,7 +176,7 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(bot) - expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Bot account'), variant: "muted"]) + expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Bot'), variant: "muted"]) end end -- GitLab From 00c322adf3103da302f0ead6789fa80f0a1388c1 Mon Sep 17 00:00:00 2001 From: Terri Chu Date: Wed, 14 Sep 2022 04:30:16 +0000 Subject: [PATCH 5/5] Apply suggestions from code reviewer --- spec/helpers/users_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index 9b5abfec01b859..617a796781e58b 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -218,7 +218,7 @@ def filter_ee_badges(badges) badges = helper.user_badges_in_admin_section(locked_user) - expect(filter_ee_badges(badges)).to match_array([text: "Locked", variant: "warning"]) + expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|Locked"), variant: "warning"]) end end -- GitLab