From 0231873d70d0714e79f5dc79031faa2a24984f20 Mon Sep 17 00:00:00 2001 From: Michael Mandrus <41969079+mmandrus@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:16:43 -0400 Subject: [PATCH] Feature Management: Link to grafana.com docs from feature toggle admin page (#77302) * add link to gcom * re-add subtitle on backend so it displays in the high level administration view --- pkg/services/navtree/navtreeimpl/admin.go | 6 +++++- .../features/admin/AdminFeatureTogglesPage.tsx | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go index c3d5602e8e4..695f56082b9 100644 --- a/pkg/services/navtree/navtreeimpl/admin.go +++ b/pkg/services/navtree/navtreeimpl/admin.go @@ -103,7 +103,11 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink if s.features.IsEnabled(featuremgmt.FlagFeatureToggleAdminPage) && hasAccess(ac.EvalPermission(ac.ActionFeatureManagementRead)) { configNodes = append(configNodes, &navtree.NavLink{ - Text: "Feature Toggles", SubTitle: "View and edit feature toggles", Id: "feature-toggles", Url: s.cfg.AppSubURL + "/admin/featuretoggles", Icon: "toggle-on", + Text: "Feature Toggles", + SubTitle: "View and edit feature toggles", + Id: "feature-toggles", + Url: s.cfg.AppSubURL + "/admin/featuretoggles", + Icon: "toggle-on", }) } diff --git a/public/app/features/admin/AdminFeatureTogglesPage.tsx b/public/app/features/admin/AdminFeatureTogglesPage.tsx index 4d962d8b67e..7c7fde06c5f 100644 --- a/public/app/features/admin/AdminFeatureTogglesPage.tsx +++ b/public/app/features/admin/AdminFeatureTogglesPage.tsx @@ -38,8 +38,22 @@ export default function AdminFeatureTogglesPage() { ); }; + const subTitle = ( +
+ View and edit feature toggles. Read more about feature toggles at{' '} + + grafana.com + + . +
+ ); + return ( - + <> {isError && getErrorMessage()}