From e25a49ff49ca0207f557ed1b508125c0a96b938b Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Thu, 26 May 2022 14:39:57 +0200
Subject: [PATCH] Preferences: Fix updating of preferences for Navbar and Query
 History (#49677)

* Preferences: Fix PUT for Navbar and Query History

* Update linting

* Fix linting

* Use models defined in preference package in preferences

* Remove white space

* Revert "Use models defined in preference package in preferences"

This reverts commit 6f7aa9f8d35a7aad505fa3bad7e2ddeaddb4c527.
---
 pkg/api/dtos/prefs.go  | 9 ++++-----
 pkg/api/preferences.go | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/api/dtos/prefs.go b/pkg/api/dtos/prefs.go
index 18dc1f9ca94..134f48fba11 100644
--- a/pkg/api/dtos/prefs.go
+++ b/pkg/api/dtos/prefs.go
@@ -1,7 +1,6 @@
 package dtos
 
 import (
-	"github.com/grafana/grafana/pkg/models"
 	pref "github.com/grafana/grafana/pkg/services/preference"
 )
 
@@ -24,10 +23,10 @@ type UpdatePrefsCmd struct {
 	HomeDashboardID  int64   `json:"homeDashboardId"`
 	HomeDashboardUID *string `json:"homeDashboardUID,omitempty"`
 	// Enum: utc,browser
-	Timezone     string                         `json:"timezone"`
-	WeekStart    string                         `json:"weekStart"`
-	Navbar       *models.NavbarPreference       `json:"navbar,omitempty"`
-	QueryHistory *models.QueryHistoryPreference `json:"queryHistory,omitempty"`
+	Timezone     string                       `json:"timezone"`
+	WeekStart    string                       `json:"weekStart"`
+	Navbar       *pref.NavbarPreference       `json:"navbar,omitempty"`
+	QueryHistory *pref.QueryHistoryPreference `json:"queryHistory,omitempty"`
 }
 
 // swagger:model
diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go
index 483de3408af..47d54b58117 100644
--- a/pkg/api/preferences.go
+++ b/pkg/api/preferences.go
@@ -120,6 +120,8 @@ func (hs *HTTPServer) updatePreferencesFor(ctx context.Context, orgID, userID, t
 		Timezone:        dtoCmd.Timezone,
 		WeekStart:       dtoCmd.WeekStart,
 		HomeDashboardID: dtoCmd.HomeDashboardID,
+		QueryHistory:    dtoCmd.QueryHistory,
+		Navbar:          dtoCmd.Navbar,
 	}
 
 	if err := hs.preferenceService.Save(ctx, &saveCmd); err != nil {