Merge pull request #193 from studycloud/bugfix_tree_resource_duplication

Maxwellfire · web-flow · commit 86e1fd84994e · 2020-04-26T00:18:10.000-04:00
Bugfix tree resource duplication
diff --git a/app/Http/Controllers/GetTree.php b/app/Http/Controllers/GetTree.php
@@ -80,30 +80,45 @@ public function __invoke(Request $request)
 			],
 			'levels_up' => 'nullable|integer|min:0',
 			'levels_down' => 'nullable|integer|min:0',
+			'ancestor_resources' => 'nullable|boolean'
 		]);
 
 		// now, retrieve the input
 		$node_id = $request->input('id');
 		$node_id = is_null($node_id) ? 0 : $node_id;
 		$up = $request->input('levels_up');
 		$down = $request->input('levels_down');
+		$ancestor_resources = $request->input('ancestor_resources');
+		$ancestor_resources = is_null($ancestor_resources) ? false : $ancestor_resources;
 
-		return $this->show($node_id, $up, $down);
+		return $this->show($node_id, $up, $down, $ancestor_resources);
 	}
 
 	/**
 	 * converts a portion of the tree to JSON for traversal by the JavaScript team
-	 * @param	integer		$node_id		the id of the current node in the tree; defaults to the root of the tree, which has an id of 0
-	 * @param	int|null	$levels_up		the number of ancestor levels of the tree to return; defaults to infinity
-	 * @param	int|null	$levels_down	the number of descendant levels of the tree to return; defaults to infinity
+	 * @param	integer		$node_id			the id of the current node in the tree; defaults to the root of the tree, which has an id of 0
+	 * @param	int|null	$levels_up			the number of ancestor levels of the tree to return; defaults to infinity
+	 * @param	int|null	$levels_down		the number of descendant levels of the tree to return; defaults to infinity
+	 * @param	bool|null	$ancestor_resources	whether to return the resources of the ancestors; defaults to true
 	 * @return	Collection					the nodes and connections of the target portion of the tree
 	 */
-	public function show($node_id = 0, int $levels_up = null, int $levels_down = null)
+	public function show($node_id = 0, int $levels_up = null, int $levels_down = null, bool $ancestor_resources = false)
 	{
-		// first, get the required data
-		$this->getNodes($node_id, $levels_up, $levels_down);
+		// first, get the required descendants (and the current node)
+		$this->getDescendantNodes($node_id, $levels_down);
+		// now, get the node_ids, since we'll need to get resources for them
+		$node_ids = $this->tree->pluck('id');
+		// next, get the ancestor nodes
+		$this->getAncestorNodes($node_id, $levels_up);
 		// then, convert the data to the nodes/connections format
-		$node_ids = $this->convertFormat();
+		if ($ancestor_resources)
+		{
+			$node_ids = $this->convertFormat();
+		}
+		else
+		{
+			$this->convertFormat();	
+		}
 
 		// get the converted resources of each node in the tree
 		$resources = $this->getResourceNodes($node_ids);
@@ -122,18 +137,34 @@ public function show($node_id = 0, int $levels_up = null, int $levels_down = nul
 	 * @param	int|null	$levels_up		the number of ancestor levels of the tree to return; defaults to infinity
 	 * @param	int|null	$levels_down	the number of descendant levels of the tree to return; defaults to infinity
 	 */
-	private function getNodes($node_id, $levels_up, $levels_down)
+	private function getAncestorNodes($node_id, $levels_up)
+	{
+		$root = $this->model_name::getRoot();
+		$node = null;
+		if ($node_id != 0)
+		{
+			$node = $this->model_name::find($node_id);
+		}
+		// get ancestors
+		$this->tree = (new $this->repo)->ancestors($node, $levels_up, $root)->merge($this->tree);
+	}
+
+	/**
+	 * get the raw nodes and connections data
+	 * @param	integer		$node_id		the id of the current node in the tree; defaults to the root of the tree, which has an id of 0
+	 * @param	int|null	$levels_up		the number of ancestor levels of the tree to return; defaults to infinity
+	 * @param	int|null	$levels_down	the number of descendant levels of the tree to return; defaults to infinity
+	 */
+	private function getDescendantNodes($node_id, $levels_down)
 	{
 		$root = $this->model_name::getRoot();
 		$node = null;
 		if ($node_id != 0)
 		{
 			$node = $this->model_name::find($node_id);
 		}
-		// get the ancestors and descendants of this node in a flat collection
-		$this->tree = (new $this->repo)->ancestors($node, $levels_up, $root)->merge(
-			(new $this->repo)->descendants($node, $levels_down, $root)
-		);
+		// get the descendants
+		$this->tree = (new $this->repo)->descendants($node, $levels_down, $root);
 		// add the current node to the data
 		// but use the root if the current node is null
 		$this->tree->prepend(collect(is_null($node) ? $root : $node));
diff --git a/public/js/Tree.js b/public/js/Tree.js
@@ -191,6 +191,11 @@ Tree.prototype.getNLevelIds = function(node_id, levels_num)
 
 Tree.prototype.getIDLevelMaps = function(node_id, levels_up_num, levels_down_num)
 {
+	//This functions returns maps from node_id to level for the tree. This essentially creates a labeled form of the tree.
+	//It returns levels_up_num straight up the tree (can only be non-resources)
+	//It return levels_down_num down the tree of nodes, and then one more level of resources. 
+	//	If you ask for 3 levels down, you get 3 levels of nodes, and 1 more level of only resources.
+
 	var self = this;
 
 	var ID_Level_Map = d3.map();
@@ -251,10 +256,31 @@ Tree.prototype.getIDLevelMapTraverseDown = function(IDLevelMap, node_id, levels_
 	IDLevelMap.set(node_id, levels_traversed);
 	
 	if (levels_down_num === 0)
+	{	
+		//now do one pass just for resources.
+		
+		//We are searching for children, so check if our current node is a parent of any nodes, and traverse downwards
+		self.links.data().forEach(function (link)
+		{
+			if (link.source.id === node_id && link.target.id[0] === 'r')
+			{
+				//We found a resource child!!
+				//A child is any node that has a link that originates at our node
+				self.getIDLevelMapTraverseDown(IDLevelMap, link.target.id, levels_down_num - 1, levels_traversed + 1);
+			}
+			}
+		);
+		
+		return;
+	}
+
+	if (levels_down_num === -1)
 	{
 		//there are no more children to find
 		return;
 	}
+
+
 	
 	//We are searching for children, so check if our current node is a parent of any nodes, and traverse downwards
 	self.links.data().forEach(function (link)
@@ -379,6 +405,8 @@ Tree.prototype.updateDataNodes = function(selection, data)
 				.on("click", function(){self.nodeClicked(this);})
 				.on('contextmenu', function(d, i){self.menuContextNodeOpen(this, d, i);});
 	
+	console.log("Added nodes: ", nodes_enter);
+
 	nodes_enter.append("rect");
 	nodes_enter.append("text");
 
@@ -402,8 +430,8 @@ Tree.prototype.updateDataNodes = function(selection, data)
 
 			var coordinates = 
 			{
-				x: 0,
-				y: 0,
+				x: self.frame.boundary.width/2,
+				y: self.frame.boundary.height/2,
 				fx: null,
 				fy: null,
 				x_new: null,
@@ -521,6 +549,7 @@ Tree.prototype.updateDataNLevels = function(node_id, levels_up_num, levels_down_
 
 	console.log("Updating data for N Levels with:", node_id, levels_up_num, levels_down_num, data);
 
+	self.simulation.stop();
 
 	var nodes_updated_map;
 
@@ -939,7 +968,7 @@ Tree.prototype.centerOnNode = function(node)
 	self.nodes_simulated = self.nodes.filter(function(d)
 		{
 			var style = self.locals.style.get(this);
-			return style.level !== undefined;
+			return (style.level >= -1 && style.level <= 2);
 		}	
 	);
 	self.links_simulated = self.links.filter(function(d)
diff --git a/public/js/topics.js b/public/js/topics.js
@@ -164,6 +164,19 @@ var data =
 	]
 };
 
+var data =
+{
+	"nodes": [
+		{
+			"name": "Topic Root",
+			"author_id": 1,
+			"created_at": "2017-11-02 21:02:03",
+			"updated_at": "2017-11-02 21:02:03",
+			"id": "t0"
+		}],
+	"connections": []
+}
+
 var connections = data.connections;
 var IDNodeMap = d3.map(data.nodes, function (d) { return d.id; });
 
