NavModel: Fixed page header ui tabs issues for some admin pages (#17444)

public/app/core/nav_model_srv.ts

@@ -15,7 +15,7 @@ export class NavModelSrv {
     return _.find(this.navItems, { id: 'cfg' });
     return _.find(this.navItems, { id: 'cfg' });
   }
   }
 
 
-  getNav(...args: string[]) {
+  getNav(...args: Array<string | number>) {
     let children = this.navItems;
     let children = this.navItems;
     const nav = {
     const nav = {
       breadcrumbs: [],
       breadcrumbs: [],

public/app/features/admin/AdminEditOrgCtrl.ts

@@ -5,7 +5,7 @@ export default class AdminEditOrgCtrl {
   /** @ngInject */
   /** @ngInject */
   constructor($scope: any, $routeParams: any, backendSrv: BackendSrv, $location: any, navModelSrv: NavModelSrv) {
   constructor($scope: any, $routeParams: any, backendSrv: BackendSrv, $location: any, navModelSrv: NavModelSrv) {
     $scope.init = () => {
     $scope.init = () => {
-      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs');
+      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs', 0);
 
 
       if ($routeParams.id) {
       if ($routeParams.id) {
         $scope.getOrg($routeParams.id);
         $scope.getOrg($routeParams.id);

public/app/features/admin/AdminEditUserCtrl.ts

@@ -9,7 +9,7 @@ export default class AdminEditUserCtrl {
     $scope.user = {};
     $scope.user = {};
     $scope.newOrg = { name: '', role: 'Editor' };
     $scope.newOrg = { name: '', role: 'Editor' };
     $scope.permissions = {};
     $scope.permissions = {};
-    $scope.navModel = navModelSrv.getNav('admin', 'global-users');
+    $scope.navModel = navModelSrv.getNav('admin', 'global-users', 0);
 
 
     $scope.init = () => {
     $scope.init = () => {
       if ($routeParams.id) {
       if ($routeParams.id) {

public/app/features/admin/AdminListOrgsCtrl.ts

@@ -5,7 +5,7 @@ export default class AdminListOrgsCtrl {
   /** @ngInject */
   /** @ngInject */
   constructor($scope: any, backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
   constructor($scope: any, backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
     $scope.init = () => {
     $scope.init = () => {
-      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs');
+      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs', 0);
       $scope.getOrgs();
       $scope.getOrgs();
     };
     };
 
 

public/app/features/admin/AdminListUsersCtrl.ts

@@ -13,7 +13,7 @@ export default class AdminListUsersCtrl {
 
 
   /** @ngInject */
   /** @ngInject */
   constructor(private $scope: any, private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
   constructor(private $scope: any, private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 'global-users');
+    this.navModel = navModelSrv.getNav('admin', 'global-users', 0);
     this.query = '';
     this.query = '';
     this.getUsers();
     this.getUsers();
   }
   }

public/app/features/admin/StyleGuideCtrl.ts

@@ -11,7 +11,7 @@ export default class StyleGuideCtrl {
 
 
   /** @ngInject */
   /** @ngInject */
   constructor(private $routeParams: any, private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
   constructor(private $routeParams: any, private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 'styleguide');
+    this.navModel = navModelSrv.getNav('admin', 'styleguide', 0);
     this.theme = config.bootData.user.lightTheme ? 'light' : 'dark';
     this.theme = config.bootData.user.lightTheme ? 'light' : 'dark';
   }
   }
 
 

public/app/features/admin/index.ts

@@ -13,7 +13,7 @@ class AdminSettingsCtrl {
 
 
   /** @ngInject */
   /** @ngInject */
   constructor($scope: any, backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
   constructor($scope: any, backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 'server-settings');
+    this.navModel = navModelSrv.getNav('admin', 'server-settings', 0);
 
 
     backendSrv.get('/api/admin/settings').then((settings: any) => {
     backendSrv.get('/api/admin/settings').then((settings: any) => {
       $scope.settings = settings;
       $scope.settings = settings;

public/app/features/alerting/NotificationsEditCtrl.ts

@@ -32,7 +32,7 @@ export class AlertNotificationEditCtrl {
     private $templateCache: any,
     private $templateCache: any,
     navModelSrv: NavModelSrv
     navModelSrv: NavModelSrv
   ) {
   ) {
-    this.navModel = navModelSrv.getNav('alerting', 'channels');
+    this.navModel = navModelSrv.getNav('alerting', 'channels', 0);
     this.isNew = !this.$routeParams.id;
     this.isNew = !this.$routeParams.id;
 
 
     this.getFrequencySuggestion = () => {
     this.getFrequencySuggestion = () => {

public/app/features/alerting/NotificationsListCtrl.ts

@@ -8,7 +8,7 @@ export class AlertNotificationsListCtrl {
   /** @ngInject */
   /** @ngInject */
   constructor(private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
   constructor(private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
     this.loadNotifications();
     this.loadNotifications();
-    this.navModel = navModelSrv.getNav('alerting', 'channels');
+    this.navModel = navModelSrv.getNav('alerting', 'channels', 0);
   }
   }
 
 
   loadNotifications() {
   loadNotifications() {