Fix #501

hawtio · Aug 30, 2013 · 41f0f85 · 41f0f85
1 parent ce9af7b
commit 41f0f85
Showing 1 changed file with 56 additions and 50 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/js/createContainer.ts b/hawtio-web/src/main/webapp/app/fabric/js/createContainer.ts
@@ -4,25 +4,42 @@ module Fabric {
 
     $scope.versionsOp = 'versions()';
 
+    $scope.entity = {
+      number: 1
+    };
+
     $scope.providers = Fabric.registeredProviders(jolokia);
+    console.log("providers: ", $scope.providers);
     $scope.selectedProvider = $scope.providers[Object.extended($scope.providers).keys().first()];
     $scope.schema = {};
 
-    $scope.entity = {
-      number: 1
-    };
+    $scope.response = {};
+
+    $scope.versions = [];
+    $scope.profiles = [];
+
+    $scope.selectedVersion = {};
+
+    $scope.selectedProfiles = [];
+    $scope.selectedProfileIds = '';
+    $scope.selectedVersionId = '';
+    $scope.profileIdFilter = '';
+
+    // holds all the form objects from nested child scopes
+    $scope.forms = {};
+
+    $scope.showAddProfileDialog = false;
 
     $scope.$watch('selectedProvider', (newValue, oldValue) => {
-      if (newValue) {
-        console.log("Selected provider: ", $scope.selectedProvider);
+      if ($scope.selectedProvider) {
         Fabric.getSchema($scope.selectedProvider.id, $scope.selectedProvider.className, jolokia, (schema) => {
           $scope.schema = schema;
           Core.$apply($scope);
         });
       }
-
     }, true);
 
+
     $scope.$watch('schema', (newValue, oldValue) => {
       if (newValue !== oldValue) {
 
@@ -45,49 +62,6 @@ module Fabric {
       }
     }, true);
 
-    $scope.response = {};
-
-    $scope.versions = [];
-    $scope.profiles = [];
-
-    $scope.selectedVersion = {};
-
-    $scope.selectedProfiles = [];
-    $scope.selectedProfileIds = '';
-    $scope.selectedVersionId = '';
-    $scope.profileIdFilter = '';
-
-    // holds all the form objects from nested child scopes
-    $scope.forms = {};
-
-    $scope.showAddProfileDialog = false;
-
-    $scope.init = () => {
-
-      var tab = $location.search()['tab'];
-      $scope.selectedProvider = $scope.providers[tab];
-
-      var parentId = $location.search()['parentId'];
-      if (parentId) {
-        $scope.entity['parent'] = parentId;
-      }
-
-      var versionId = $location.search()['versionId'];
-      if (versionId) {
-        $scope.selectedVersionId = versionId;
-      }
-
-      var profileIds = $location.search()['profileIds'];
-      if (profileIds) {
-        $scope.selectedProfileIds = profileIds;
-      }
-
-    }
-
-    $scope.init();
-
-
-    $scope.$on('$routeUpdate', $scope.init);
 
     $scope.$watch('versions', (newValue, oldValue) => {
       if (newValue !== oldValue) {
@@ -118,10 +92,42 @@ module Fabric {
 
 
     $scope.$watch('selectedProfileIds', (newValue, oldValue) => {
-      $location.search('profileIds', $scope.selectedProfileIds);
+      if (newValue !== oldValue) {
+        $location.search('profileIds', $scope.selectedProfileIds);
+      }
     });
 
 
+    $scope.init = () => {
+
+      var tab = $location.search()['tab'];
+      if (tab) {
+        $scope.selectedProvider = $scope.providers[tab];
+      }
+
+      var parentId = $location.search()['parentId'];
+      if (parentId) {
+        $scope.entity['parent'] = parentId;
+      }
+
+      var versionId = $location.search()['versionId'];
+      if (versionId) {
+        $scope.selectedVersionId = versionId;
+      }
+
+      var profileIds = $location.search()['profileIds'];
+      if (profileIds) {
+        $scope.selectedProfileIds = profileIds;
+      }
+
+    }
+
+    $scope.init();
+
+
+    $scope.$on('$routeUpdate', $scope.init);
+
+
     $scope.onSubmit = (json, form) => {
 
       if (json.saveJmxCredentials) {