public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bookmarks: Store URLs instead of ids (#91121)

Browse Source
This commit is contained in:
Joao Silva
2024-07-31 13:56:39 +01:00
committed by GitHub
parent 562380079f
commit 85d0e17dc4
17 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/preference/prefimpl/pref.go
+4 -4
View File
@@ -71,8 +71,8 @@ func (s *Service) GetWithDefaults(ctx context.Context, query *pref.GetPreference
res.JSONData.QueryHistory.HomeTab = p.JSONData.QueryHistory.HomeTab
}
if p.JSONData.Navbar.BookmarkIds != nil {
res.JSONData.Navbar.BookmarkIds = p.JSONData.Navbar.BookmarkIds
if p.JSONData.Navbar.BookmarkUrls != nil {
res.JSONData.Navbar.BookmarkUrls = p.JSONData.Navbar.BookmarkUrls
}
if p.JSONData.CookiePreferences != nil {
@@ -174,11 +174,11 @@ func (s *Service) Patch(ctx context.Context, cmd *pref.PatchPreferenceCommand) e
preference.JSONData.Language = *cmd.Language
}
if cmd.Navbar != nil && cmd.Navbar.BookmarkIds != nil {
if cmd.Navbar != nil && cmd.Navbar.BookmarkUrls != nil {
if preference.JSONData == nil {
preference.JSONData = &pref.PreferenceJSONData{}
}
preference.JSONData.Navbar.BookmarkIds = cmd.Navbar.BookmarkIds
preference.JSONData.Navbar.BookmarkUrls = cmd.Navbar.BookmarkUrls
}
if cmd.QueryHistory != nil {