Wired up the 'trace' column checkboxes to the backend.

On page-load, the checks are populated according to the 'traced' property on the tree nodes. When the checkboxes are interacted with, the client sends the changes to the server, which updates the 'traced' state on the backend.

Author: dylemma

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

@@ -31,14 +31,51 @@
 
 		var widgets = {}
 
+		function eligibleForWidget(node){
+			if(!node) return false
+
+			return node.kind == 'package' ||
+				node.kind == 'group' ||
+				node.kind == 'root'
+		}
+
+		// Get the partial selection state for the trace instrumentation flag, for nodes that
+		// would exist in the package list. Note that <self> nodes will take their original
+		// node's `id` and `traced` properties, and the original's `traced` will be set to
+		// undefined. This function sets a `partialTraceSelection` value on nodes recursively,
+		// with `1 = fully selected`, `0 = unselected`, and `undefined = partially selected`.
+		(function calculatePartialTraceSelections(node){
+			var isFullSelected = true,
+				isPartialSelected = false
+
+			if(node.traced == 0) isFullSelected = false
+
+			node.children.forEach(function(kid){
+				if(eligibleForWidget(kid)){
+					var kidSelection = calculatePartialTraceSelections(kid)
+					if(!kidSelection) isFullSelected = false
+					if(kidSelection || kidSelection == undefined) isPartialSelected = true
+				}
+			})
+
+			var selectionValue = isFullSelected ? 1 : isPartialSelected ? undefined : 0
+			node.partialTraceSelection = selectionValue
+			return selectionValue
+		})(treeData.root)
+
+		// special case: the root is never selected
+		treeData.root.partialTraceSelection = 0
+
 		// initialize the `stateTemplate` and `widgets` maps
 		// based on the package nodes in `treeData`
 		;(function setupTreeHierarchy(packageParentNode, node){
-			if(node.kind == 'package' || node.kind == 'group' || node.kind == 'root'){
+			if(eligibleForWidget(node)){
 
 				var pw = new PackageWidget()
 				widgets[node.id] = pw
 
+				pw.instrumentationSelected(node.partialTraceSelection)
+
 				pw.collapseChildren(/* collapsed = */true, /* animate = */false)
 
 				stateTemplate[node.id] = pw.selectedProp
@@ -60,6 +97,7 @@
 					pw.uiParts.main.appendTo($totalsContainer)
 					pw.abbreviatedLabel('Overall Coverage')
 					pw.selectable(false)
+					pw.instrumentationSelectable(false)
 				}
 
 				if(node.kind == 'group' || node.kind == 'package'){

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

@@ -260,7 +260,7 @@
 
 		this.selectionClicks = new Bacon.Bus()
 
-		this.instrumentationSelectedProp = _instrumentationSelectedBus.toProperty(_instrumentationSelected).skipDuplicates()
+		this.instrumentationSelectedProp = _instrumentationSelectedBus.toProperty(_instrumentationSelected).noLazy().skipDuplicates()
 
 		this.instrumentationSelectedClicks = new Bacon.Bus()
 

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

@@ -49,7 +49,7 @@
 	 * was successful, `data` will be defined and `error` will be null; otherwise, `data` will be
 	 * null and `error` will be defined.
 	 */
-	function ajaxCommand(path, type, params, callback){
+	function ajaxCommand(path, type, params, callback, opts){
 		type = type || 'GET'
 
 		// allow for calling `ajaxCommand(path, type, callback)` i.e. no params
@@ -59,12 +59,14 @@
 		}
 		callback = callback || function(){}
 
-		$.ajax(commandPath(path), {
+		var ajaxOpts = $.extend(opts || {}, {
 			data: params,
 			type: type,
 			error: function(xhr, status){ callback(null, status) },
 			success: function(data){ callback(data, null) }
 		})
+
+		$.ajax(commandPath(path), ajaxOpts)
 	}
 
 	/**
@@ -129,17 +131,21 @@
 	}
 
 	/* Shortcut for calling `ajax` with a type of 'POST' */
-	function postCommand(path, params, callback){
-		ajaxCommand(path, 'POST', params, callback)
+	function postCommand(path, params, callback, opts){
+		ajaxCommand(path, 'POST', params, callback, opts)
+	}
+
+	function putCommand(path, params, callback, opts){
+		ajaxCommand(path, 'PUT', params, callback, opts)
 	}
 
 	/* Shortcut for calling `ajax` with a type of 'GET' */
-	function getCommand(path, params, callback){
-		ajaxCommand(path, 'GET', params, callback)
+	function getCommand(path, params, callback, opts){
+		ajaxCommand(path, 'GET', params, callback, opts)
 	}
 
-	function deleteCommand(path, params, callback){
-		ajaxCommand(path, 'DELETE', params, callback)
+	function deleteCommand(path, params, callback, opts){
+		ajaxCommand(path, 'DELETE', params, callback, opts)
 	}
 
 	function requestStart(){ postCommand('/start') }
@@ -164,6 +170,10 @@
 			postCommand('/recording/' + id, {'color': color}, callback) 
 		},
 
+		'updateTreeInstrumentation': function(changesMap, callback){
+			putCommand('/tree-instrumentation', JSON.stringify(changesMap), callback, {contentType: 'application/json'})
+		},
+
 		'streamTraceCoverageCounts': function(loadParams, interval){ 
 			return repeatingGetCommand({ url: commandPath('/coverage'), getData: loadParams, interval: interval })
 		},

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

@@ -98,9 +98,11 @@
 				kind: 'package',
 				parent: node,
 				children: [],
+				traced: node.traced,
 				isSelfNode: true
 			}
 			node.id += '_original'
+			if(node.hasOwnProperty('traced')) node.traced = undefined
 			selfNode.parentId = node.id
 
 			// update the tree.nodes mapping based on the id changes

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

@@ -191,6 +191,24 @@ $(document).ready(function(){
 			Trace.treemapColoringStateChanges.push('Instrumented Packages Changed')
 		})
 
+		controller.instrumentedWidgets.slidingWindow(2,2).onValue(function(ab){
+			var before = ab[0], after = ab[1]
+			function check(key){
+				var oldV = before[key],
+					newV = after[key]
+				return oldV != newV
+			}
+			var changes = {}
+			function checkKeys(obj){
+				for(var key in obj){
+					if(check(key)) changes[key] = after[key]
+				}
+			}
+			checkKeys(before)
+			checkKeys(after)
+			TraceAPI.updateTreeInstrumentation(changes)
+		})
+
 		/**
 		 * An Rx Property that represents the treemap's TreeData as it
 		 * changes due to the PackageWidgets' selection state. 

codepulse/src/main/scala/com/secdec/codepulse/tracer/TraceAPIServer.scala

@@ -172,6 +172,8 @@ class TraceAPIServer(manager: TraceManager) extends RestHelper with Loggable {
 		/** /trace-api/<target.id>/treemap */
 		val Treemap = simpleTargetPath("treemap")
 
+		val TreeInstrumentation = simpleTargetPath("tree-instrumentation")
+
 		/** /trace-api/<target.id>/recordings */
 		val Recordings = simpleTargetPath("recordings")
 
@@ -288,6 +290,24 @@ class TraceAPIServer(manager: TraceManager) extends RestHelper with Loggable {
 		case Paths.Treemap(target) Get req =>
 			TreemapDataStreamer.streamTreemapData(target.traceData)
 
+		case Paths.TreeInstrumentation(target) Put req =>
+			def getBool(j: JValue) = j match {
+				case JInt(num) => Some(num > 0)
+				case JBool(b) => Some(b)
+				case _ => None
+			}
+
+			req.json.toOption match {
+				case Some(json: JObject) => {
+					for {
+						JField(AsInt(key), rawValue) <- json.obj
+						boolValue <- getBool(rawValue)
+					} target.traceData.treeNodeData.updateTraced(key, boolValue)
+				}
+				case _ => BadResponse()
+			}
+			OkResponse()
+
 		// GET a JSON listing of all of the custom recordings for a trace.
 		case Paths.Recordings(target) Get req =>
 			JsonResponse(target.traceData.recordings.all.map(_.toJson))