You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2021/02/02 09:58:54 UTC
[superset] branch 1.0 updated: fix(menu): always show settings
dropdown (#12877)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 1.0
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/1.0 by this push:
new 98edd6a fix(menu): always show settings dropdown (#12877)
98edd6a is described below
commit 98edd6a0394d32220a8f4cb1ea0e87520a483ae9
Author: ʈᵃᵢ <td...@gmail.com>
AuthorDate: Tue Feb 2 01:17:15 2021 -0800
fix(menu): always show settings dropdown (#12877)
---
superset-frontend/src/components/Menu/Menu.tsx | 129 ++++++++++++-------------
1 file changed, 61 insertions(+), 68 deletions(-)
diff --git a/superset-frontend/src/components/Menu/Menu.tsx b/superset-frontend/src/components/Menu/Menu.tsx
index 18ead3c..7ad599a 100644
--- a/superset-frontend/src/components/Menu/Menu.tsx
+++ b/superset-frontend/src/components/Menu/Menu.tsx
@@ -174,76 +174,69 @@ export function Menu({
</Nav>
<Nav className="navbar-right">
{!navbarRight.user_is_anonymous && <NewMenu />}
- {settings && settings.length > 0 && (
- <NavDropdown
- id="settings-dropdown"
- title={t('Settings')}
- onMouseEnter={() => setDropdownOpen(true)}
- onMouseLeave={() => setDropdownOpen(false)}
- onToggle={value => setDropdownOpen(value)}
- open={dropdownOpen}
- >
- <DropdownMenu>
- {settings.map((section, index) => [
- <DropdownMenu.ItemGroup
- key={`${section.label}`}
- title={section.label}
- >
- {section.childs?.map(child => {
- if (typeof child !== 'string') {
- return (
- <DropdownMenu.Item key={`${child.label}`}>
- <a href={child.url}>{child.label}</a>
- </DropdownMenu.Item>
- );
- }
- return null;
- })}
- </DropdownMenu.ItemGroup>,
- index < settings.length - 1 && <DropdownMenu.Divider />,
- ])}
+ <NavDropdown
+ id="settings-dropdown"
+ title={t('Settings')}
+ onMouseEnter={() => setDropdownOpen(true)}
+ onMouseLeave={() => setDropdownOpen(false)}
+ onToggle={value => setDropdownOpen(value)}
+ open={dropdownOpen}
+ >
+ <DropdownMenu>
+ {settings.map((section, index) => [
+ <DropdownMenu.ItemGroup
+ key={`${section.label}`}
+ title={section.label}
+ >
+ {section.childs?.map(child => {
+ if (typeof child !== 'string') {
+ return (
+ <DropdownMenu.Item key={`${child.label}`}>
+ <a href={child.url}>{child.label}</a>
+ </DropdownMenu.Item>
+ );
+ }
+ return null;
+ })}
+ </DropdownMenu.ItemGroup>,
+ index < settings.length - 1 && <DropdownMenu.Divider />,
+ ])}
- {!navbarRight.user_is_anonymous && [
- <DropdownMenu.Divider key="user-divider" />,
- <DropdownMenu.ItemGroup key="user-section" title={t('User')}>
- {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>
+ {!navbarRight.user_is_anonymous && [
+ <DropdownMenu.Divider key="user-divider" />,
+ <DropdownMenu.ItemGroup key="user-section" title={t('User')}>
+ {navbarRight.user_profile_url && (
+ <DropdownMenu.Item key="profile">
+ <a href={navbarRight.user_profile_url}>{t('Profile')}</a>
</DropdownMenu.Item>
- </DropdownMenu.ItemGroup>,
- ]}
- {(navbarRight.version_string || navbarRight.version_sha) && [
- <DropdownMenu.Divider key="version-info-divider" />,
- <DropdownMenu.ItemGroup
- key="about-section"
- title={t('About')}
- >
- <div className="about-section">
- {navbarRight.version_string && (
- <li className="version-info">
- <span>Version: {navbarRight.version_string}</span>
- </li>
- )}
- {navbarRight.version_sha && (
- <li className="version-info">
- <span>SHA: {navbarRight.version_sha}</span>
- </li>
- )}
- </div>
- </DropdownMenu.ItemGroup>,
- ]}
- </DropdownMenu>
- </NavDropdown>
- )}
+ )}
+ <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>
+ </DropdownMenu.Item>
+ </DropdownMenu.ItemGroup>,
+ ]}
+ {(navbarRight.version_string || navbarRight.version_sha) && [
+ <DropdownMenu.Divider key="version-info-divider" />,
+ <DropdownMenu.ItemGroup key="about-section" title={t('About')}>
+ <div className="about-section">
+ {navbarRight.version_string && (
+ <li className="version-info">
+ <span>Version: {navbarRight.version_string}</span>
+ </li>
+ )}
+ {navbarRight.version_sha && (
+ <li className="version-info">
+ <span>SHA: {navbarRight.version_sha}</span>
+ </li>
+ )}
+ </div>
+ </DropdownMenu.ItemGroup>,
+ ]}
+ </DropdownMenu>
+ </NavDropdown>
{navbarRight.documentation_url && (
<NavItem
href={navbarRight.documentation_url}