Added a tooltip to the treemap that tells if a node will be traced.

Author: dylemma

codepulse/src/main/resources/toserve/pages/traces/traces.js

@@ -72,6 +72,17 @@ $(document).ready(function(){
 	})()
 
 
+	Trace.instrumentedPackages = {}
+	Trace.isInstrumentedNode = function isInstrumented(node){
+		if(!node) return false
+
+		if(Trace.instrumentedPackages.hasOwnProperty(node.id)){
+			return !!Trace.instrumentedPackages[node.id]
+		}
+
+		return isInstrumented(node.parent)
+	}
+
 	// When the `treemapColoringStateChanges` fires, use the current `legendData`
 	// to generate a new treemap coloring function, and update the treemap's colors
 	// with that.
@@ -105,10 +116,10 @@ $(document).ready(function(){
 			var activeRecordingIds = Trace.getActiveRecordingIds(),
 				allActivityId = Trace.allActivityRecordingId,
 				allActivityColor = colorLegend[allActivityId],
-				allActivityColorFaded = d3.interpolate('lightgray', allActivityColor)(.2)
+				allActivityColorFaded = d3.interpolate('lightgray', allActivityColor)(.2),
+				instrumentedPackages = Trace.instrumentedPackages
 
 			function countActiveCoverings(coverage){
-				// if(!coverage) return 0
 				var count = 0
 				coverage.forEach(function(id){
 					if(activeRecordingIds.has(id)){
@@ -118,9 +129,10 @@ $(document).ready(function(){
 				return count
 			}
 
-			return function(node){
+			var base = function(node){
 				if(ignoredKinds.has(node.kind)) return 'grey'
 
+
 				var coverage = Trace.coverageSets[node.id],
 					numCovered = countActiveCoverings(coverage)
 
@@ -140,6 +152,12 @@ $(document).ready(function(){
 
 				return entry? entry : 'yellow'
 			}
+
+			return function(node){
+				var baseColor = base(node)
+				if(Trace.isInstrumentedNode(node)) return baseColor
+				else return d3.interpolate('darkgray', baseColor)(.2)
+			}
 		}
 
 		treemapColoring.latest = coloringFunc
@@ -168,6 +186,11 @@ $(document).ready(function(){
 
 		var controller = new PackageController(Trace.fullTree, $('#packages'), $('#totals'), $('#clear-selections-button'))
 
+		controller.instrumentedWidgets.onValue(function(map){
+			Trace.instrumentedPackages = map
+			Trace.treemapColoringStateChanges.push('Instrumented Packages Changed')
+		})
+
 		/**
 		 * An Rx Property that represents the treemap's TreeData as it
 		 * changes due to the PackageWidgets' selection state. 
@@ -353,7 +376,21 @@ $(document).ready(function(){
 						return container
 					}
 
-					return padDiv.append(recurse(0))
+					var result = $('<div>')
+
+					// added the padded div that holds the ancestors list
+					result.append(padDiv.append(recurse(0)))
+
+					// if the node isn't "instrumented", add a div that says so
+					if(!Trace.isInstrumentedNode(node)){
+						var noTraceBadge = $('<div>')
+							.addClass('notrace-badge')
+							.text('This method is not marked for tracing')
+							.prepend('<i class="fa fa-times">')
+						result.append(noTraceBadge)
+					}
+
+					return result
 				}
 			}
 		})()

codepulse/src/main/resources/toserve/pages/traces/treemap-tooltip.css

@@ -3,6 +3,9 @@
 	border: none;
 	pointer-events: none;
 	max-width: initial;
+
+	font-size: 12px;
+	line-height: 14px;
 }
 
 .qtip.treemap-tooltip .qtip-titlebar {
@@ -15,6 +18,7 @@
 .qtip.treemap-tooltip .qtip-content {
 	color: white;
 	padding: 0;
+	overflow: visible;
 }
 
 .qtip.treemap-tooltip .content-padded {
@@ -47,4 +51,15 @@
 	margin-right: 5px;
 	padding: 0 4px;
 	border-radius: 5px;
+}
+
+.qtip.treemap-tooltip .notrace-badge {
+	position: absolute;
+	top: calc(100% + 2px);
+	width: 100%;
+	padding: 2px 4px;
+	box-sizing: border-box;
+
+	background-color: rgba(0,0,0,0.7);
+	color: #DBAF00;
 }