From ee1d4ce0e2dc465c2213f8242cfb26dfb5ebe9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 10 Oct 2018 09:26:17 +0200
Subject: [PATCH] fix tab switching

---
 public/app/core/reducers/location.ts                  | 11 +++++++++--
 .../app/features/dashboard/dashgrid/PanelEditor.tsx   |  1 +
 public/app/types/location.ts                          |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/app/core/reducers/location.ts b/public/app/core/reducers/location.ts
index 2089cfe9f59..7c7dffd04b9 100644
--- a/public/app/core/reducers/location.ts
+++ b/public/app/core/reducers/location.ts
@@ -1,6 +1,7 @@
 import { Action } from 'app/core/actions/location';
 import { LocationState } from 'app/types';
 import { renderUrl } from 'app/core/utils/url';
+import _ from 'lodash';
 
 export const initialState: LocationState = {
   url: '',
@@ -12,11 +13,17 @@ export const initialState: LocationState = {
 export const locationReducer = (state = initialState, action: Action): LocationState => {
   switch (action.type) {
     case 'UPDATE_LOCATION': {
-      const { path, query, routeParams } = action.payload;
+      const { path, routeParams } = action.payload;
+      let query = action.payload.query || state.query;
+
+      if (action.payload.partial) {
+        query = _.defaults(query, state.query);
+      }
+
       return {
         url: renderUrl(path || state.path, query),
         path: path || state.path,
-        query: query || state.query,
+        query: query,
         routeParams: routeParams || state.routeParams,
       };
     }
diff --git a/public/app/features/dashboard/dashgrid/PanelEditor.tsx b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
index 2a6228217ed..26ac8b7d2c1 100644
--- a/public/app/features/dashboard/dashgrid/PanelEditor.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
@@ -67,6 +67,7 @@ export class PanelEditor extends React.Component<PanelEditorProps, any> {
     store.dispatch(
       updateLocation({
         query: { tab: tab.id },
+        partial: true,
       })
     );
   };
diff --git a/public/app/types/location.ts b/public/app/types/location.ts
index 4a7f51523a7..7dcf57f7e02 100644
--- a/public/app/types/location.ts
+++ b/public/app/types/location.ts
@@ -2,6 +2,7 @@ export interface LocationUpdate {
   path?: string;
   query?: UrlQueryMap;
   routeParams?: UrlQueryMap;
+  partial?: boolean;
 }
 
 export interface LocationState {