From 6f7aa9f8d35a7aad505fa3bad7e2ddeaddb4c527 Mon Sep 17 00:00:00 2001 From: Ivana Huckova Date: Thu, 26 May 2022 13:02:10 +0200 Subject: [PATCH] Use models defined in preference package in preferences --- pkg/services/preference/model.go | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkg/services/preference/model.go b/pkg/services/preference/model.go index f3f9d2c233c..cc0a6300929 100644 --- a/pkg/services/preference/model.go +++ b/pkg/services/preference/model.go @@ -5,8 +5,11 @@ import ( "encoding/json" "errors" "time" + + pref "github.com/grafana/grafana/pkg/services/preference" ) + var ErrPrefNotFound = errors.New("preference not found") type Preference struct { @@ -47,8 +50,8 @@ type SavePreferenceCommand struct { Timezone string `json:"timezone,omitempty"` WeekStart string `json:"weekStart,omitempty"` Theme string `json:"theme,omitempty"` - Navbar *NavbarPreference `json:"navbar,omitempty"` - QueryHistory *QueryHistoryPreference `json:"queryHistory,omitempty"` + Navbar *pref.NavbarPreference `json:"navbar,omitempty"` + QueryHistory *pref.QueryHistoryPreference `json:"queryHistory,omitempty"` } type PatchPreferenceCommand struct { @@ -61,8 +64,8 @@ type PatchPreferenceCommand struct { Timezone *string `json:"timezone,omitempty"` WeekStart *string `json:"weekStart,omitempty"` Theme *string `json:"theme,omitempty"` - Navbar *NavbarPreference `json:"navbar,omitempty"` - QueryHistory *QueryHistoryPreference `json:"queryHistory,omitempty"` + Navbar *pref.NavbarPreference `json:"navbar,omitempty"` + QueryHistory *pref.QueryHistoryPreference `json:"queryHistory,omitempty"` } type NavLink struct { @@ -72,18 +75,11 @@ type NavLink struct { Target string `json:"target,omitempty"` } -type NavbarPreference struct { - SavedItems []NavLink `json:"savedItems"` -} - type PreferenceJSONData struct { - Navbar NavbarPreference `json:"navbar"` - QueryHistory QueryHistoryPreference `json:"queryHistory"` + Navbar pref.NavbarPreference `json:"navbar"` + QueryHistory pref.QueryHistoryPreference `json:"queryHistory"` } -type QueryHistoryPreference struct { - HomeTab string `json:"homeTab"` -} func (j *PreferenceJSONData) FromDB(data []byte) error { dec := json.NewDecoder(bytes.NewBuffer(data))