SONAR-18876 Fix missing label in admin users page, on token modal opener button

diff --git a/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx b/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx
index 41da69c5f46ea601e575785020cb094bf437c565..4d7ed05085f927a564804449fc7e3251e56756f1 100644 (file)
--- a/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx
@@ -22,7 +22,7 @@ import { ButtonIcon } from '../../../components/controls/buttons';
 import BulletListIcon from '../../../components/icons/BulletListIcon';
 import DateFromNow from '../../../components/intl/DateFromNow';
 import Avatar from '../../../components/ui/Avatar';
-import { translate } from '../../../helpers/l10n';
+import { translateWithParameters } from '../../../helpers/l10n';
 import { IdentityProvider } from '../../../types/types';
 import { User } from '../../../types/users';
 import TokensFormModal from './TokensFormModal';
@@ -81,7 +81,8 @@ export default function UserListItem(props: UserListItemProps) {
         <ButtonIcon
           className="js-user-tokens spacer-left button-small"
           onClick={() => setOpenTokenForm(true)}
-          tooltip={translate('users.update_tokens')}
+          tooltip={translateWithParameters('users.update_tokens')}
+          aria-label={translateWithParameters('users.update_tokens_for_x', user.name ?? user.login)}
         >
           <BulletListIcon />
         </ButtonIcon>

diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/UserListItem-test.tsx.snap b/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/UserListItem-test.tsx.snap
index 5970d8c387170035f3c7746c90a9c2c57e224f54..513b7808d29c3b7700cad173ad70098adb774d94 100644 (file)
--- a/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/UserListItem-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/UserListItem-test.tsx.snap
@@ -61,6 +61,7 @@ exports[`should render correctly 1`] = `
     className="thin nowrap text-middle"
   >
     <ButtonIcon
+      aria-label="users.update_tokens_for_x.One"
       className="js-user-tokens spacer-left button-small"
       onClick={[Function]}
       tooltip="users.update_tokens"
@@ -151,6 +152,7 @@ exports[`should render correctly without last connection date 1`] = `
     className="thin nowrap text-middle"
   >
     <ButtonIcon
+      aria-label="users.update_tokens_for_x.One"
       className="js-user-tokens spacer-left button-small"
       onClick={[Function]}
       tooltip="users.update_tokens"

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 344ee8777adc25903f5d7dbd91f7702d4acdc431..27776147d2118d88504ebf9a032656d443a71907 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -4369,7 +4369,8 @@ users.last_connection=Last connection
 users.update_users_groups=Update {0}'s group membership
 users.update_groups=Update Groups
 users.manage_user=Update {0}
-users.update_tokens=Update Tokens
+users.update_tokens=Update tokens
+users.update_tokens_for_x=Update tokens for user {0}
 users.add=Add user
 users.remove=Remove user
 users.search_description=Search users by login or name