IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 07:35:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Navigation: Add create icons to expanded menu (#48768)

Browse Source 
* add create icons to expanded menu

* update translations
This commit is contained in:
Ashley Harrison 2022-05-06 09:14:00 +01:00 committed by GitHub
parent ee8e125134
commit bcb0bfce3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/index.go
View File

@ -546,7 +546,7 @@ func (hs *HTTPServer) buildAlertNavLinks(c *models.ReqContext) []*dtos.NavLink {
}) })
alertChildNavs = append(alertChildNavs, &dtos.NavLink{ alertChildNavs = append(alertChildNavs, &dtos.NavLink{
Text: "Alert rule", SubTitle: "Create an alert rule", Id: "alert", Text: "New alert rule", SubTitle: "Create an alert rule", Id: "alert",
Icon: "plus", Url: hs.Cfg.AppSubURL + "/alerting/new", HideFromTabs: true, ShowIconInNavbar: true, Icon: "plus", Url: hs.Cfg.AppSubURL + "/alerting/new", HideFromTabs: true, ShowIconInNavbar: true,
}) })
} }
@ -595,7 +595,7 @@ func (hs *HTTPServer) buildCreateNavLinks(c *models.ReqContext) []*dtos.NavLink
if uaVisibleForOrg && hasAccess(ac.ReqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionAlertingRuleCreate), ac.EvalPermission(ac.ActionAlertingRuleExternalWrite))) { if uaVisibleForOrg && hasAccess(ac.ReqSignedIn, ac.EvalAny(ac.EvalPermission(ac.ActionAlertingRuleCreate), ac.EvalPermission(ac.ActionAlertingRuleExternalWrite))) {
children = append(children, &dtos.NavLink{ children = append(children, &dtos.NavLink{
Text: "Alert rule", SubTitle: "Create an alert rule", Id: "alert", Text: "New alert rule", SubTitle: "Create an alert rule", Id: "alert",
Icon: "bell", Url: hs.Cfg.AppSubURL + "/alerting/new", Icon: "bell", Url: hs.Cfg.AppSubURL + "/alerting/new",
}) })
} }

1
public/app/core/components/NavBar/Next/NavBarMenu.tsx
View File

@ -228,6 +228,7 @@ function NavItem({
key={`${link.text}-${childLink.text}`} key={`${link.text}-${childLink.text}`}
isActive={activeItem === childLink} isActive={activeItem === childLink}
isDivider={childLink.divider} isDivider={childLink.divider}
icon={childLink.showIconInNavbar ? (childLink.icon as IconName) : undefined}
onClick={() => { onClick={() => {
childLink.onClick?.(); childLink.onClick?.();
onClose(); onClose();

2
public/app/core/components/NavBar/navBarItem-translations.ts
View File

@ -13,7 +13,7 @@ const TRANSLATED_MENU_ITEMS: Record<string, MessageDescriptor> = {
'create-dashboard': defineMessage({ id: 'nav.create-dashboard', message: 'Dashboard' }), 'create-dashboard': defineMessage({ id: 'nav.create-dashboard', message: 'Dashboard' }),
folder: defineMessage({ id: 'nav.create-folder', message: 'Folder' }), folder: defineMessage({ id: 'nav.create-folder', message: 'Folder' }),
import: defineMessage({ id: 'nav.create-import', message: 'Import' }), import: defineMessage({ id: 'nav.create-import', message: 'Import' }),
alert: defineMessage({ id: 'nav.create-alert', message: 'Alert rule' }), alert: defineMessage({ id: 'nav.create-alert', message: 'New alert rule' }),
dashboards: defineMessage({ id: 'nav.dashboards', message: 'Dashboards' }), dashboards: defineMessage({ id: 'nav.dashboards', message: 'Dashboards' }),
'manage-dashboards': defineMessage({ id: 'nav.manage-dashboards', message: 'Browse' }), 'manage-dashboards': defineMessage({ id: 'nav.manage-dashboards', message: 'Browse' }),

2
public/locales/en/messages.po
View File

@ -68,7 +68,7 @@ msgstr "Create"
#: public/app/core/components/NavBar/navBarItem-translations.ts #: public/app/core/components/NavBar/navBarItem-translations.ts
msgid "nav.create-alert" msgid "nav.create-alert"
msgstr "Alert rule" msgstr "New alert rule"
#: public/app/core/components/NavBar/navBarItem-translations.ts #: public/app/core/components/NavBar/navBarItem-translations.ts
msgid "nav.create-dashboard" msgid "nav.create-dashboard"