From 80d62013b2fb1ccf40efb0f5b4efcc3fea32c0ad Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Fri, 7 Dec 2018 11:27:46 +0100 Subject: [PATCH 1/2] Remove Explore > "New tab" from sidebar - we don't support tabs yet, might as well remove the entry --- pkg/api/index.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/api/index.go b/pkg/api/index.go index 253fa9c17af..2980d8a5c6b 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -147,9 +147,6 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er SubTitle: "Explore your data", Icon: "fa fa-rocket", Url: setting.AppSubUrl + "/explore", - Children: []*dtos.NavLink{ - {Text: "New tab", Icon: "gicon gicon-dashboard-new", Url: setting.AppSubUrl + "/explore"}, - }, }) } From 30c2cc4b5c223d688b1d00625b69e3ac5964a296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 7 Dec 2018 11:14:32 -0800 Subject: [PATCH 2/2] allow sidemenu sections without children still have a hover menu/header --- public/app/core/components/sidemenu/TopSectionItem.tsx | 2 +- .../sidemenu/__snapshots__/TopSectionItem.test.tsx.snap | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/app/core/components/sidemenu/TopSectionItem.tsx b/public/app/core/components/sidemenu/TopSectionItem.tsx index 4a207cc0df9..7b3bf96dce8 100644 --- a/public/app/core/components/sidemenu/TopSectionItem.tsx +++ b/public/app/core/components/sidemenu/TopSectionItem.tsx @@ -15,7 +15,7 @@ const TopSectionItem: SFC = props => { {link.img && } - {link.children && } + ); }; diff --git a/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap index f7ff56bff6b..d79e9171581 100644 --- a/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap +++ b/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap @@ -13,5 +13,8 @@ exports[`Render should render component 1`] = ` + `;