From 3ceaa42d207c6e8368d3c8929c9e7cbd47638f76 Mon Sep 17 00:00:00 2001 From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:32:38 +0000 Subject: [PATCH] Bookmarks: Do not show on navigation or button for unauthed users (#96836) --- pkg/services/navtree/navtreeimpl/navtree.go | 2 +- .../core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go index 255f3452e36..214bbe6bf8c 100644 --- a/pkg/services/navtree/navtreeimpl/navtree.go +++ b/pkg/services/navtree/navtreeimpl/navtree.go @@ -172,7 +172,7 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere treeRoot.RemoveSectionByID(navtree.NavIDCfg) } - if s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagPinNavItems) { + if s.features.IsEnabled(c.Req.Context(), featuremgmt.FlagPinNavItems) && c.IsSignedIn { treeRoot.AddSection(&navtree.NavLink{ Text: "Bookmarks", Id: navtree.NavIDBookmarks, diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx index 116d351a499..471450c7d23 100644 --- a/public/app/core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx +++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItemText.tsx @@ -6,6 +6,7 @@ import { selectors } from '@grafana/e2e-selectors'; import { config } from '@grafana/runtime'; import { Icon, IconButton, Link, useTheme2 } from '@grafana/ui'; import { t } from 'app/core/internationalization'; +import { contextSrv } from 'app/core/services/context_srv'; export interface Props { children: React.ReactNode; @@ -50,7 +51,7 @@ export function MegaMenuItemText({ children, isActive, onClick, target, url, onP > {linkContent} - {config.featureToggles.pinNavItems && url && url !== '/bookmarks' && ( + {config.featureToggles.pinNavItems && contextSrv.isSignedIn && url && url !== '/bookmarks' && (