Преглед на файлове

Merge pull request #15527 from grafana/15485-tab-in-url

fix: Remove tab param from url when leaving edit mode
Torkel Ödegaard преди 6 години
родител
ревизия
fb3463ba4f
променени са 2 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 1 1
      public/app/features/dashboard/components/DashNav/DashNav.tsx
  2. 2 0
      public/app/features/dashboard/services/DashboardSrv.ts

+ 1 - 1
public/app/features/dashboard/components/DashNav/DashNav.tsx

@@ -65,7 +65,7 @@ export class DashNav extends PureComponent<Props> {
       });
       });
     } else {
     } else {
       this.props.updateLocation({
       this.props.updateLocation({
-        query: { panelId: null, edit: null, fullscreen: null },
+        query: { panelId: null, edit: null, fullscreen: null, tab: null },
         partial: true,
         partial: true,
       });
       });
     }
     }

+ 2 - 0
public/app/features/dashboard/services/DashboardSrv.ts

@@ -43,6 +43,7 @@ export class DashboardSrv {
         delete urlParams.fullscreen;
         delete urlParams.fullscreen;
         delete urlParams.edit;
         delete urlParams.edit;
         delete urlParams.panelId;
         delete urlParams.panelId;
+        delete urlParams.tab;
         this.$location.search(urlParams);
         this.$location.search(urlParams);
         return;
         return;
       }
       }
@@ -58,6 +59,7 @@ export class DashboardSrv {
       urlParams.edit = true;
       urlParams.edit = true;
     } else {
     } else {
       delete urlParams.edit;
       delete urlParams.edit;
+      delete urlParams.tab;
     }
     }
 
 
     if (options.panelId || options.panelId === 0) {
     if (options.panelId || options.panelId === 0) {