#754: Removed the 2 computer since values from Camel plugin.

hawtio · Nov 19, 2013 · c201072 · c201072
1 parent 73301f1
commit c201072
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/hawtio-web/src/main/webapp/app/camel/js/camelPlugin.ts b/hawtio-web/src/main/webapp/app/camel/js/camelPlugin.ts
@@ -25,8 +25,6 @@ module Camel {
                     when('/camel/properties', {templateUrl: 'app/camel/html/properties.html'});
           }).
           filter('camelIconClass', () => iconClass).
-          filter('lastExchangeCompletedSince', () => lastExchangeCompletedSince).
-          filter('lastExchangeFailedSince', () => lastExchangeFailedSince).
           run((workspace:Workspace, jolokia, viewRegistry, helpRegistry) => {
 
             viewRegistry['camel'] = 'app/camel/html/layoutCamelTree.html';
@@ -62,19 +60,16 @@ module Camel {
               resizable: false
             };
 
-            var sinceCompletedTemplate = '<div class="ngCellText">{{row.entity | lastExchangeCompletedSince}}</div>';
-            var sinceFailedTemplate = '<div class="ngCellText">{{row.entity | lastExchangeFailedSince}}</div>';
             var attributes = workspace.attributeColumnDefs;
             attributes[jmxDomain + "/context/folder"] = [
               stateColumn,
               {field: 'CamelId', displayName: 'Name'},
               {field: 'Uptime', displayName: 'Uptime', visible: false},
               {field: 'CamelVersion', displayName: 'Version', visible: false},
               {field: 'ExchangesCompleted', displayName: 'Completed #'},
-              {field: 'LastCompletedSince', displayName: 'Last Completed Since', cellTemplate: sinceCompletedTemplate},
+              {field: 'ExchangesFailed', displayName: 'Failed #'},
               {field: 'LastExchangeCompletedTimestamp', displayName: 'Last exchange completed timestamp', visible: false},
               {field: 'ExchangesFailed', displayName: 'Failed #'},
-              {field: 'LastFailedSince', displayName: 'Last Failed Since', cellTemplate: sinceFailedTemplate},
               {field: 'LastExchangeFailedTimestamp', displayName: 'Last exchange failed timestamp', visible: false},
               {field: 'InflightExchanges', displayName: 'Inflight #'},
               {field: 'MeanProcessingTime', displayName: 'Mean Time'},

diff --git a/hawtio-web/src/main/webapp/app/camel/js/helpers.ts b/hawtio-web/src/main/webapp/app/camel/js/helpers.ts
@@ -623,47 +623,6 @@ module Camel {
     return "orange icon-off";
   }
 
-  export function lastExchangeCompletedSince(entity) {
-    var answer = null;
-    if (entity && isState(entity, "started")) {
-      answer = entity.lastExchangeCompletedSince;
-      if (!answer) {
-        answer = sinceFromTimestamp(entity["LastExchangeCompletedTimestamp"]);
-        if (answer) {
-          entity.lastExchangeCompletedSince = answer;
-        }
-      }
-    }
-    return answer;
-  }
-
-  export function lastExchangeFailedSince(entity) {
-    var answer = null;
-    if (entity && isState(entity, "started")) {
-      answer = entity.lastExchangeFailedSince;
-      if (!answer) {
-        answer = sinceFromTimestamp(entity["LastExchangeFailedTimestamp"]);
-        if (answer) {
-          entity.lastExchangeFailedSince = answer;
-        }
-      }
-    }
-    return answer;
-  }
-
-  export function sinceFromTimestamp(timestamp:number) {
-    if (!timestamp) {
-      return null;
-    }
-
-    // convert from timestamp to delta since now
-    // 2013-04-26T145:01:17+0200
-    var time = new Date(timestamp);
-    var now = new Date();
-    var diff = now.getTime() - time.getTime();
-    return diff;
-  }
-
   export function getSelectedRouteId(workspace:Workspace, folder = null) {
     var selection = folder || workspace.selection;
     var selectedRouteId = null;