HWKINVENT-38 second chunk of work

hawkular · May 14, 2015 · 55fed6c · 55fed6c
1 parent 05fb051
commit 55fed6c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 24 deletions.
diff --git a/dist/hawkular-ui-components-accounts.js b/dist/hawkular-ui-components-accounts.js
diff --git a/dist/hawkular-ui-components-alerts.js b/dist/hawkular-ui-components-alerts.js
diff --git a/dist/hawkular-ui-components-directives.js b/dist/hawkular-ui-components-directives.js
diff --git a/dist/hawkular-ui-components-inventory.js b/dist/hawkular-ui-components-inventory.js
diff --git a/dist/hawkular-ui-components-metrics.js b/dist/hawkular-ui-components-metrics.js
diff --git a/plugins/accounts/plugins/accounts/ts/accountsPlugin.ts b/plugins/accounts/plugins/accounts/ts/accountsPlugin.ts
@@ -17,7 +17,6 @@
 /// <reference path="accountsGlobals.ts"/>
 module HawkularAccounts {
     export var _module = angular.module(HawkularAccounts.pluginName, ['ui.bootstrap']);
-    export var userDetails:any = undefined;
     var accountsTab:any = undefined;
     var currentPersona:any = undefined;
 
@@ -39,7 +38,6 @@ module HawkularAccounts {
     _module.run(['$rootScope', '$log', '$modal', '$document', 'userDetails', 'HawtioNav', 'HawkularInventory', ($rootScope, $log, $modal, $document, userDetails, HawtioNav:HawtioMainNav.Registry, hawkularInventory) => {
         //HawtioNav.add(accountsTab);
         $rootScope.userDetails = userDetails;
-        HawkularAccounts.userDetails = userDetails;
 
         $rootScope.$on('IdleStart', () => {
             $('#idle').slideDown();
@@ -107,11 +105,13 @@ module HawkularAccounts {
 
         $rootScope.$on('CurrentPersonaLoaded', (e, persona) => {
             currentPersona = persona;
+            $rootScope.currentPersona = currentPersona;
             initializeInventory(currentPersona.id);
         });
 
         $rootScope.$on('SwitchedPersona', (e, persona) => {
             currentPersona = persona;
+            $rootScope.currentPersona = currentPersona;
             initializeInventory(currentPersona.id);
         });
     }]);

diff --git a/plugins/metrics/plugins/metrics/ts/addUrlPage.ts b/plugins/metrics/plugins/metrics/ts/addUrlPage.ts
@@ -22,7 +22,7 @@ module HawkularMetrics {
 
   export class AddUrlController {
     /// this is for minification purposes
-    public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager','HawkularErrorManager', 'HawkularAccounts', '$q', 'md5'];
+    public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager','HawkularErrorManager', '$q', 'md5'];
 
     private httpUriPart = 'http://';
     public addProgress: boolean = false;
@@ -33,7 +33,7 @@ module HawkularMetrics {
 
     constructor(private $location:ng.ILocationService,
                 private $scope:any,
-                private $rootScope:ng.IRootScopeService,
+                private $rootScope:any,
                 private $interval:ng.IIntervalService,
                 private $log:ng.ILogService,
                 private $filter:ng.IFilterService,
@@ -43,7 +43,6 @@ module HawkularMetrics {
                 private HawkularAlert:any,
                 private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
                 private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
-                private HawkularAccounts: any,
                 private $q: ng.IQService,
                 private md5: any,
                 public resourceUrl:string) {
@@ -53,7 +52,7 @@ module HawkularMetrics {
       this.autoRefresh(20);
     }
 
-    private currentTenantId = this.HawkularAccounts.currentPersona.id;
+    private currentTenantId = this.$rootScope.currentPersona.id;
 
     private autoRefreshPromise:ng.IPromise<number>;
 
@@ -87,7 +86,7 @@ module HawkularMetrics {
       this.$log.info('Adding new Resource Url to Hawkular-inventory: ' + url);
 
       var metricId: string;
-      var defaultEmail = this.HawkularAccounts.userDetails.email || 'myemail@company.com';
+      var defaultEmail = this.$rootScope.userDetails.email || 'myemail@company.com';
       var err = (error: any, msg: string): void => this.HawkularErrorManager.errorHandler(error, msg);
 
       /// Add the Resource and its metrics