Fix #514

hawtio · Oct 29, 2013 · 1cb4f13 · 1cb4f13
1 parent b377812
commit 1cb4f13
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 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
@@ -133,8 +133,10 @@ module Fabric {
 
     $scope.$watch('selectedVersion', (newValue, oldValue) => {
       if (oldValue !== newValue) {
-        $scope.selectedVersionId = $scope.selectedVersion.id;
-        $location.search('versionId', $scope.selectedVersionId);
+        if (newValue && 'id' in newValue) {
+          $scope.selectedVersionId = newValue['id'];
+          $location.search('versionId', $scope.selectedVersionId);
+        }
       }
     }, true);
 
@@ -147,7 +149,7 @@ module Fabric {
 
     $scope.$watch('selectedProfiles', (newValue, oldValue) => {
       if (oldValue !== newValue) {
-        console.log("selectedProfiles: ", $scope.selectedProfiles);
+        log.debug("selectedProfiles: ", $scope.selectedProfiles);
         $scope.selectedProfileIds = $scope.selectedProfiles.map((p) => { return p.id; }).join(',');
       }
     }, true);
@@ -211,7 +213,9 @@ module Fabric {
 
       var versionId = $location.search()['versionId'];
       if (versionId) {
-        $scope.selectedVersionId = versionId;
+        $scope.selectedVersion = {
+          id: versionId
+        };
       }
 
       var profileIds = $location.search()['profileIds'];

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricView.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricView.ts
@@ -13,6 +13,9 @@ module Fabric {
       var activeVersionId = $location.search()['cv'];
       if (activeVersionId) {
         $scope.activeVersionId = activeVersionId;
+        $scope.activeVersion = {
+          id: $scope.activeVersionId
+        };
       }
 
       var profiles = $location.search()['sp'];

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/versionSelectorDirective.ts b/hawtio-web/src/main/webapp/app/fabric/js/versionSelectorDirective.ts
@@ -15,17 +15,23 @@ module Fabric {
     public controller = ($scope, $element, $attrs, jolokia) => {
       $scope.versions = [];
       $scope.responseJson = '';
-      $scope.selectedVersionId = '';
 
+      $scope.$watch('selectedVersion', (newValue, oldValue) => {
+        if (newValue !== oldValue) {
+          if (newValue && 'id' in newValue) {
+            $scope.selectedVersion = $scope.versions.find((version) => { return version.id === newValue['id']; } );
+          } else {
+            $scope.selectedVersion = $scope.versions.find((version) => { return version.defaultVersion; });
+          }
+        }
+      });
 
       $scope.$watch('versions', (newValue, oldValue) => {
         if (newValue !== oldValue) {
-          if (!$scope.selectedVersion || Object.equal($scope.selectedVersion, {})) {
-            if ($scope.selectedVersionId === '') {
-              $scope.selectedVersion = $scope.versions.find((version) => { return version.defaultVersion; });
-            } else {
-              $scope.selectedVersion = $scope.versions.find((version) => { return version.id === $scope.selectedVersion.id; } );
-            }
+          if ($scope.selectedVersion && 'id' in $scope.selectedVersion) {
+            $scope.selectedVersion = $scope.versions.find((version) => { return version.id === $scope.selectedVersion['id']; } );
+          } else {
+            $scope.selectedVersion = $scope.versions.find((version) => { return version.defaultVersion; });
           }
         }
       }, true);