This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 44e80e0 chore: Add home link to navbar (#11851)
44e80e0 is described below
commit 44e80e0175fe084e52453ac5f77ba472922935e9
Author: Agata Stawarz <[email protected]>
AuthorDate: Tue Dec 1 08:14:42 2020 +0100
chore: Add home link to navbar (#11851)
* Add Home link to Navbar
* Change test text for rendering elements in the main navbar
* Display Home link only when Logo Target Path is set
---
superset-frontend/spec/javascripts/components/Menu_spec.jsx | 11 +++++++++++
superset-frontend/src/components/Menu/Menu.tsx | 2 +-
superset/app.py | 4 ++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/superset-frontend/spec/javascripts/components/Menu_spec.jsx
b/superset-frontend/spec/javascripts/components/Menu_spec.jsx
index 4e4fbe8..99c9a52 100644
--- a/superset-frontend/spec/javascripts/components/Menu_spec.jsx
+++ b/superset-frontend/spec/javascripts/components/Menu_spec.jsx
@@ -24,11 +24,18 @@ import NavDropdown from 'src/components/NavDropdown';
import { supersetTheme, ThemeProvider } from '@superset-ui/core';
import { Menu } from 'src/components/Menu/Menu';
+import MenuObject from 'src/components/Menu/MenuObject';
const defaultProps = {
data: {
menu: [
{
+ name: 'Home',
+ icon: '',
+ label: 'Home',
+ url: '/superset/welcome',
+ },
+ {
name: 'Sources',
icon: 'fa-table',
label: 'Sources',
@@ -130,6 +137,10 @@ describe('Menu', () => {
expect(wrapper.find(Nav)).toHaveLength(2);
});
+ it('renders 4 elements in main Menu Nav for every user', () => {
+ expect(wrapper.find(MenuObject)).toHaveLength(4);
+ });
+
it('renders a logged out view', () => {
const loggedOutWrapper = getWrapper({
data: {
diff --git a/superset-frontend/src/components/Menu/Menu.tsx
b/superset-frontend/src/components/Menu/Menu.tsx
index fa8ab23..bce2e23 100644
--- a/superset-frontend/src/components/Menu/Menu.tsx
+++ b/superset-frontend/src/components/Menu/Menu.tsx
@@ -163,7 +163,7 @@ export function Menu({
</Navbar.Brand>
<Navbar.Toggle />
</Navbar.Header>
- <Nav>
+ <Nav data-test="navbar-top">
{menu.map((item, index) => (
<MenuObject {...item} key={item.label} index={index + 1} />
))}
diff --git a/superset/app.py b/superset/app.py
index acc2f26..da42c0a 100644
--- a/superset/app.py
+++ b/superset/app.py
@@ -214,6 +214,10 @@ class SupersetAppInitializer:
#
# Setup regular views
#
+ if appbuilder.app.config["LOGO_TARGET_PATH"]:
+ appbuilder.add_link(
+ "Home", label=__("Home"), href="/superset/welcome",
+ )
appbuilder.add_view(
AnnotationLayerModelView,
"Annotation Layers",