From 8cb6db6a41d981f2af07d32c1386333e4ba19180 Mon Sep 17 00:00:00 2001
From: Martin Krulis <krulis@ksi.mff.cuni.cz>
Date: Fri, 20 Sep 2019 00:39:09 +0200
Subject: [PATCH] Updating logged-in user's badge.

---
 src/components/widgets/Badge/Badge.js | 29 ++++++++++++++++++---------
 src/locales/cs.json                   |  1 +
 src/locales/en.json                   |  1 +
 src/locales/whitelist_en.json         |  1 +
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/widgets/Badge/Badge.js b/src/components/widgets/Badge/Badge.js
index 1258c08d1..d950dbf7a 100644
--- a/src/components/widgets/Badge/Badge.js
+++ b/src/components/widgets/Badge/Badge.js
@@ -9,7 +9,7 @@ import EffectiveRoleSwitching from '../../Users/EffectiveRoleSwitching';
 import withLinks from '../../../helpers/withLinks';
 import Icon from '../../icons';
 import AvatarContainer from '../../../containers/AvatarContainer/AvatarContainer';
-import { isSuperadminRole } from '../../helpers/usersRoles';
+import { isSuperadminRole, UserRoleIcon, roleLabels } from '../../helpers/usersRoles';
 
 class Badge extends Component {
   state = { effectiveRoleDialogOpened: false, effectiveRoleUpdating: null };
@@ -87,15 +87,24 @@ class Badge extends Component {
             {small && <br />}
 
             {isSuperadminRole(user.privateData.role) && (
-              <a
-                href="#"
-                onClick={e => {
-                  e.preventDefault();
-                  this.openEffectiveRoleDialog();
-                }}>
-                <Icon icon="user" className="text-primary" largeGapLeft={!small} gapRight={!small} />
-                {!small && <FormattedMessage id="generic.role" defaultMessage="Role" />}
-              </a>
+              <OverlayTrigger
+                placement="right"
+                overlay={
+                  <Tooltip id="effectiveRole">
+                    <FormattedMessage id="generic.effectiveRole" defaultMessage="Effective Role" />:{' '}
+                    {roleLabels[effectiveRole]}
+                  </Tooltip>
+                }>
+                <a
+                  href="#"
+                  onClick={e => {
+                    e.preventDefault();
+                    this.openEffectiveRoleDialog();
+                  }}>
+                  <UserRoleIcon role={effectiveRole} className="text-primary" largeGapLeft={!small} gapRight={!small} />
+                  {!small && <FormattedMessage id="generic.role" defaultMessage="Role" />}
+                </a>
+              </OverlayTrigger>
             )}
           </div>
         </div>
diff --git a/src/locales/cs.json b/src/locales/cs.json
index 72d95d6fd..fe6f2cd89 100644
--- a/src/locales/cs.json
+++ b/src/locales/cs.json
@@ -1297,6 +1297,7 @@
   "generic.details": "Detaily",
   "generic.disable": "Zablokovat",
   "generic.edit": "Editovat",
+  "generic.effectiveRole": "Efektivní role",
   "generic.email": "Email",
   "generic.enable": "Povolit",
   "generic.filtersSet": "Filtry nastaveny",
diff --git a/src/locales/en.json b/src/locales/en.json
index 14749f73a..10c7d81e0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1297,6 +1297,7 @@
   "generic.details": "Details",
   "generic.disable": "Disable",
   "generic.edit": "Edit",
+  "generic.effectiveRole": "Effective Role",
   "generic.email": "Email",
   "generic.enable": "Enable",
   "generic.filtersSet": "Filters Set",
diff --git a/src/locales/whitelist_en.json b/src/locales/whitelist_en.json
index 5e2097c0c..3603467a4 100644
--- a/src/locales/whitelist_en.json
+++ b/src/locales/whitelist_en.json
@@ -1297,6 +1297,7 @@
   "generic.details",
   "generic.disable",
   "generic.edit",
+  "generic.effectiveRole",
   "generic.email",
   "generic.enable",
   "generic.filtersSet",