admin/Kae7in-perfview
1
0
Fork 0
mirror of https://github.com/Kae7in/perfview synced 2026-08-09 12:09:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Select focus node in Callers tab working, but some weird UI stuff is happening

Browse Source
This commit is contained in:
Kaelin Hooper
2016-08-08 09:10:01 -07:00
parent c1b5570004
commit 341197bb74
2 changed files with 73 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/HtmlJs/PerfDataService/Views/js/stackDelegate.js
+28 -9
View File
@@ -46,42 +46,61 @@ function StackDelegate(domain, filename, stackType, summaryStackData) {
}
self.getCallersData = function getCallersData(nodeName, path, includeSearch, callback) {
self.getCallersData = function getCallersData(callback, options={}) {
if (self.focusNode == null && !("overrideFocusNode" in options)) {
throw "Focus node not selected";
}
var nodeString = "overrideFocusNode" in options ? options["overrideFocusNode"] : self.focusNode.id;
console.log(self.focusNode);
var nameAndPath = nodeString.split(/\/(.+)?/); // Split on FIRST occurrence of '/'
var name = nameAndPath[0];
var path = nameAndPath.length > 1 ? nameAndPath[1] : "";
var url = self.domain + "/api/data/stackviewer/callertree?filename=" + self.filename
+ "&name=" + nodeName
+ "&name=" + name
+ "&stacktype=" + self.stackType
+ "&path=" + path
+ "&" + self.filters;
if (includeSearch) { url = url + "&find=" + $("#callers .find").val(); }
if ("includeSearch" in options) { url = url + "&find=" + $("#callers .find").val(); }
path = path != "" && path != undefined ? "/" + path : path;
self.log("Fetching Callers Data for " + nodeName + path);
self.log("Fetching Callers Data for " + name + path);
$.get(url, function (response, status) {
json = JSON.parse(response);
self.log("Completed: Get Callers for " + nodeName + path);
self.log("Completed: Get Callers for " + name + path);
callback(json, status);
});
}
self.getCalleesData = function getCalleesData(nodeName, path, callback) {
self.getCalleesData = function getCalleesData(callback, options={}) {
if (self.focusNode == null && !("overrideFocusNode" in options)) {
throw "Focus node not selected";
}
var nodeString = "overrideFocusNode" in options ? options["overrideFocusNode"] : self.focusNode.id;
var nameAndPath = nodeString.split(/\/(.+)?/); // Split on FIRST occurrence of '/'
var name = nameAndPath[0];
var path = nameAndPath.length > 1 ? nameAndPath[1] : "";
var url = self.domain + "/api/data/stackviewer/calleetree?filename=" + self.filename
+ "&name=" + nodeName
+ "&name=" + name
+ "&stacktype=" + self.stackType
+ "&path=" + path
+ "&" + self.filters
+ "&find=" + $(".tabs-panel.is-active .find").val();
path = path != "" && path != undefined ? "/" + path : path;
self.log("Fetching Callees Data for " + nodeName + path);
self.log("Fetching Callees Data for " + name + path);
$.get(url, function (response, status) {
json = JSON.parse(response);
self.log("Completed: Get Callees for " + nodeName + path);
self.log("Completed: Get Callees for " + name + path);
callback(json, status);
});
src/HtmlJs/PerfDataService/Views/static/stackviewer.html
+45 -46
View File
@@ -250,6 +250,18 @@
loadAndDisplayData(["callersTree", "calleesTree"], false);
});
/* by-name-list click event */
$(document).on("dblclick", "#callersTree tbody tr td:first-child", function (row) {
//var focusNode = row.currentTarget.innerText.trim(); // Get the name of the clicked node
var clickedNodeId = row.currentTarget.parentElement.getAttribute("data-tt-id");
//var clickedNodeId = row.currentTarget.innerText.trim();
stackDelegate.focusNode = $("#callersTree").treetable("node", clickedNodeId);;
$('#tabs').foundation('selectTab', $("#callers")); // Switch to Callers tab
loadAndDisplayData(["callersTree", "calleesTree"], false);
});
function loadAndDisplayData(treesToUpdate, includeSearch=true) {
@@ -272,17 +284,19 @@
// Place root node in tree
updateTreeTableHtml("#call-treeTree", null, [nodeData]);
stackDelegate.getCalleesData("ROOT", "", function (callTreeStackData, status) {
var options = {"overrideFocusNode" : "ROOT"};
stackDelegate.getCalleesData(function (callTreeStackData, status) {
// Place data in CallTree tab
var parentNode = $("#call-treeTree").treetable("node", "ROOT");
updateTreeTableHtml("#call-treeTree", parentNode, callTreeStackData);
});
}, options);
});
}
// DISPLAY CALLERS DATA
if ((treesToUpdate == null || treesToUpdate.includes("callersTree")) && stackDelegate.focusNode != null) {
stackDelegate.getCallersData(stackDelegate.focusNode.id, "", includeSearch, function (callersStackData, status) {
var options = {"includeSearch" : true};
stackDelegate.getCallersData(function (callersStackData, status) {
$("#callersTree tbody").empty();
var focusNodeHtml = "<tr data-tt-id=\"" + stackDelegate.focusNode.id
@@ -296,12 +310,12 @@
// Place data in Callers tab
updateTreeTableHtml("#callersTree", parentNode, callersStackData);
});
}, options);
}
// DISPLAY CALLEES DATA
if ((treesToUpdate == null || treesToUpdate.includes("calleesTree")) && stackDelegate.focusNode != null) {
stackDelegate.getCalleesData(stackDelegate.focusNode.id, "", function (calleesStackData, status) {
stackDelegate.getCalleesData(function (calleesStackData, status) {
$("#calleesTree tbody").empty();
var focusNodeHtml = "<tr data-tt-id=\"" + stackDelegate.focusNode.id
@@ -326,51 +340,36 @@
function onTreeNodeExpand(node, treeName) {
if (node.children.length > 0) { return; }
// Split the name from the path
var nameAndPath = node.id.split("/");
var name = nameAndPath[0];
var options = {"overrideFocusNode" : node.id };
// Get the path, if there is one
var path = "";
// Check if there is actually a path component
if (nameAndPath.length > 1) {
// There is, so let's reconstruct it
for (var i = 1; i < nameAndPath.length - 1; ++i) {
path += nameAndPath[i] + "/";
}
path += nameAndPath[nameAndPath.length - 1];
}
if (treeName == "#callersTree") {
// TODO: Fix so that find is not included in this
stackDelegate.getCallersData(function (callersStackData, status) {
if (status == "success") {
node.row[0].setAttribute("direct-children-loaded", "true");
if (name !== undefined) {
if (treeName == "#callersTree") {
// TODO: Fix so that find is not included in this
stackDelegate.getCallersData(name, path, false, function (callersStackData, status) {
if (status == "success") {
node.row[0].setAttribute("direct-children-loaded", "true");
// Place data under clicked node
updateTreeTableHtml(treeName, node, callersStackData);
}
}, options);
} else if (treeName == "#calleesTree") {
stackDelegate.getCalleesData(function (calleesStackData, status) {
if (status == "success") {
node.row[0].setAttribute("direct-children-loaded", "true");
// Place data under clicked node
updateTreeTableHtml(treeName, node, callersStackData);
}
});
} else if (treeName == "#calleesTree") {
stackDelegate.getCalleesData(name, path, function (calleesStackData, status) {
if (status == "success") {
node.row[0].setAttribute("direct-children-loaded", "true");
// Place data under clicked node
updateTreeTableHtml(treeName, node, calleesStackData);
}
}, options);
} else if (treeName == "#call-treeTree") {
stackDelegate.getCalleesData(function (calleesStackData, status) {
if (status == "success") {
node.row[0].setAttribute("direct-children-loaded", "true");
// Place data under clicked node
updateTreeTableHtml(treeName, node, calleesStackData);
}
});
} else if (treeName == "#call-treeTree") {
stackDelegate.getCalleesData(name, path, function (calleesStackData, status) {
if (status == "success") {
node.row[0].setAttribute("direct-children-loaded", "true");
// Place data under clicked node
updateTreeTableHtml(treeName, node, calleesStackData);
}
});
}
// Place data under clicked node
updateTreeTableHtml(treeName, node, calleesStackData);
}
}, options);
}
}