From f2d9f0001302c548216b542867fa0ddf3ed483cc Mon Sep 17 00:00:00 2001
From: Erik Ritter <erik.ritter@airbnb.com>
Date: Wed, 2 Dec 2020 09:14:23 -0800
Subject: [PATCH] feat: allow user to view their profile again (#11816)

---
 superset-frontend/src/components/Menu/Menu.tsx  | 12 ++++++++++--
 superset/templates/appbuilder/navbar_right.html |  3 ++-
 superset/views/base.py                          |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/components/Menu/Menu.tsx b/superset-frontend/src/components/Menu/Menu.tsx
index bce2e2307e..28cb532ee0 100644
--- a/superset-frontend/src/components/Menu/Menu.tsx
+++ b/superset-frontend/src/components/Menu/Menu.tsx
@@ -46,6 +46,7 @@ interface NavBarProps {
   user_info_url: string;
   user_login_url: string;
   user_logout_url: string;
+  user_profile_url: string | null;
   locale: string;
 }
 
@@ -195,8 +196,15 @@ export function Menu({
                 {!navbarRight.user_is_anonymous && [
                   <DropdownMenu.Divider key="user-divider" />,
                   <DropdownMenu.ItemGroup key="user-section" title={t('User')}>
-                    <DropdownMenu.Item key="profile">
-                      <a href={navbarRight.user_info_url}>{t('Profile')}</a>
+                    {navbarRight.user_profile_url && (
+                      <DropdownMenu.Item key="profile">
+                        <a href={navbarRight.user_profile_url}>
+                          {t('Profile')}
+                        </a>
+                      </DropdownMenu.Item>
+                    )}
+                    <DropdownMenu.Item key="info">
+                      <a href={navbarRight.user_info_url}>{t('Info')}</a>
                     </DropdownMenu.Item>
                     <DropdownMenu.Item key="logout">
                       <a href={navbarRight.user_logout_url}>{t('Logout')}</a>
diff --git a/superset/templates/appbuilder/navbar_right.html b/superset/templates/appbuilder/navbar_right.html
index 881db00b79..334e7ea2ad 100644
--- a/superset/templates/appbuilder/navbar_right.html
+++ b/superset/templates/appbuilder/navbar_right.html
@@ -106,7 +106,8 @@
         <i class="fa fa-user"></i>&nbsp;<b class="caret"></b>
       </a>
         <ul class="dropdown-menu">
-            <li><a href="{{appbuilder.get_url_for_userinfo}}"><span class="fa fa-fw fa-user"></span>{{_("Profile")}}</a></li>
+            <li><a href="/superset/profile/{{g.user.username}}"><span class="fa fa-fw fa-user"></span>{{_("Profile")}}</a></li>
+            <li><a href="{{appbuilder.get_url_for_userinfo}}"><span class="fa fa-fw fa-user"></span>{{_("Info")}}</a></li>
             <li><a href="{{appbuilder.get_url_for_logout}}"><span class="fa fa-fw fa-sign-out"></span>{{_("Logout")}}</a></li>
             {% if version_string or version_sha %}
               <li class="fineprint">
diff --git a/superset/views/base.py b/superset/views/base.py
index 143f5a55f2..2f87a81f97 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -297,6 +297,9 @@ def menu_data() -> Dict[str, Any]:
             "user_info_url": appbuilder.get_url_for_userinfo,
             "user_logout_url": appbuilder.get_url_for_logout,
             "user_login_url": appbuilder.get_url_for_login,
+            "user_profile_url": None
+            if g.user.is_anonymous
+            else f"/superset/profile/{g.user.username}",
             "locale": session.get("locale", "en"),
         },
     }