Fixed tomcat plugin to update web page asap when showing applications…

… and sessions pages.
hawtio · Mar 26, 2013 · e4ffc7d · e4ffc7d
1 parent ebe2c06
commit e4ffc7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 25 deletions.
diff --git a/hawtio-web/src/main/webapp/app/jboss/js/connectors.ts b/hawtio-web/src/main/webapp/app/jboss/js/connectors.ts
@@ -72,12 +72,6 @@ module JBoss {
           Core.$apply($scope);
         };
 
-        // function to trigger reloading page
-        $scope.onResponse = function (response) {
-          //console.log("got response: " + response);
-          loadData();
-        };
-
         $scope.$watch('workspace.tree', function () {
           // if the JMX tree is reloaded its probably because a new MBean has been added or removed
           // so lets reload, asynchronously just in case

diff --git a/hawtio-web/src/main/webapp/app/tomcat/js/sessions.ts b/hawtio-web/src/main/webapp/app/tomcat/js/sessions.ts
@@ -104,7 +104,6 @@ module Tomcat {
           response = Tomcat.filerTomcatOrCatalina(response);
 
           $scope.sessions = [];
-          $scope.mbeanIndex = {};
 
           function onAttributes(response) {
             var obj = response.value;
@@ -123,13 +122,8 @@ module Tomcat {
                   obj.path = "";
                 }
 
-                var idx = $scope.mbeanIndex[mbean];
-                if (angular.isDefined(idx)) {
-                  $scope.sessions[mbean] = obj;
-                } else {
-                  $scope.sessions[mbean] = $scope.sessions.length;
-                  $scope.sessions.push(obj);
-                }
+                $scope.sessions.push(obj);
+                Core.$apply($scope);
               }
             }
           }
@@ -143,17 +137,6 @@ module Tomcat {
           Core.$apply($scope);
         };
 
-        // function to trigger reloading page
-        $scope.onLastResponse = function (response) {
-          $scope.onResponse(response);
-          // we only want to force updating the data on the last response
-          loadData();
-        };
-
-        $scope.onResponse = function (response) {
-          //console.log("got response: " + response);
-        };
-
         $scope.$watch('workspace.tree', function () {
           // if the JMX tree is reloaded its probably because a new MBean has been added or removed
           // so lets reload, asynchronously just in case

diff --git a/hawtio-web/src/main/webapp/app/tomcat/js/tomcat.ts b/hawtio-web/src/main/webapp/app/tomcat/js/tomcat.ts
@@ -76,6 +76,9 @@ module Tomcat {
                   $scope.mbeanIndex[mbean] = $scope.webapps.length;
                   $scope.webapps.push(obj);
                 }
+
+                // ensure web page is updated
+                Core.$apply($scope);
               }
             }
           }