From 44e80e0175fe084e52453ac5f77ba472922935e9 Mon Sep 17 00:00:00 2001 From: Agata Stawarz <47450693+agatapst@users.noreply.github.com> Date: Tue, 1 Dec 2020 08:14:42 +0100 Subject: [PATCH] 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 --- .../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 4e4fbe8b6a..99c9a5291a 100644 --- a/superset-frontend/spec/javascripts/components/Menu_spec.jsx +++ b/superset-frontend/spec/javascripts/components/Menu_spec.jsx @@ -24,10 +24,17 @@ 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', @@ -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 fa8ab2369d..bce2e2307e 100644 --- a/superset-frontend/src/components/Menu/Menu.tsx +++ b/superset-frontend/src/components/Menu/Menu.tsx @@ -163,7 +163,7 @@ export function Menu({ -