From 0244544e2fc2953e08799c555c2d40a8cd2005a0 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Tue, 18 Jun 2019 13:32:40 +0200
Subject: [PATCH] Add username to token modal

---
 .../js/apps/users/components/TokensFormModal.tsx     | 12 +++++++++---
 .../__snapshots__/TokensFormModal-test.tsx.snap      | 12 +++++++++++-
 .../main/resources/org/sonar/l10n/core.properties    |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx b/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx
index 6c313fe85ad..567a143b99c 100644
--- a/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import { FormattedMessage } from 'react-intl';
 import TokensForm from './TokensForm';
 import Modal from '../../../components/controls/Modal';
 import { translate } from '../../../helpers/l10n';
@@ -30,11 +31,16 @@ interface Props {
 }
 
 export default function TokensFormModal(props: Props) {
-  const header = translate('users.tokens');
   return (
-    <Modal contentLabel={header} onRequestClose={props.onClose}>
+    <Modal contentLabel={translate('users.tokens')} onRequestClose={props.onClose}>
       <header className="modal-head">
-        <h2>{header}</h2>
+        <h2>
+          <FormattedMessage
+            defaultMessage={translate('users.user_X_tokens')}
+            id="users.user_X_tokens"
+            values={{ user: <em>{props.user.name}</em> }}
+          />
+        </h2>
       </header>
       <div className="modal-body modal-container">
         <TokensForm login={props.user.login} updateTokensCount={props.updateTokensCount} />
diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/TokensFormModal-test.tsx.snap b/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/TokensFormModal-test.tsx.snap
index f989b7c3d4c..77879640815 100644
--- a/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/TokensFormModal-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/__snapshots__/TokensFormModal-test.tsx.snap
@@ -9,7 +9,17 @@ exports[`should render correctly 1`] = `
     className="modal-head"
   >
     <h2>
-      users.tokens
+      <FormattedMessage
+        defaultMessage="users.user_X_tokens"
+        id="users.user_X_tokens"
+        values={
+          Object {
+            "user": <em>
+              John Doe
+            </em>,
+          }
+        }
+      />
     </h2>
   </header>
   <div
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 065d5e7e04b..a5dbd86a899 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3100,6 +3100,7 @@ users.update=Update users
 users.tokens=Tokens
 users.tokens.sure=Sure?
 users.tokens.revoke=Revoke
+users.user_X_tokens=Tokens of {user}
 users.no_tokens=No tokens
 users.generate=Generate
 users.generate_tokens=Generate Tokens
-- 
2.39.5