Skip to content

Commit e9ac002

Browse files
committed
update data
1 parent e0a6a93 commit e9ac002

File tree

5 files changed

+50
-21
lines changed

5 files changed

+50
-21
lines changed

NetAgnostics/src/data/nocona_2023-06-14T12-00-00.00Z-2023-06-21T12-00-00.00Z.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

NetAgnostics/src/js/NetAgnostics.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ let NetAgnostics = function () {
7272
graphicopt.width = $(graphicopt.maindiv).width();
7373

7474

75-
// TODO highlight
76-
// $('#search').on('input', searchHandler); // register for oninput
77-
// $('#search').on('propertychange', searchHandler); // for IE8
78-
7975
contentCollections.axistime_svg = d3.select('#axisTime')
8076
.attr("width", graphicopt.width)
8177
.attr("height", graphicopt.margin.top)
@@ -139,20 +135,6 @@ let NetAgnostics = function () {
139135
return master;
140136
}
141137

142-
function searchHandler(e) {
143-
// if (e.target.value !== "") {
144-
// // let results = datain.filter(h => h.name.includes(e.target.value)).map(h => ({index: path[h.name][0].index}));
145-
// let target = data.root_nodes.find(d => d.id.includes(e.target.value));
146-
// if (target) {
147-
// let resultIndex = target.timeArr.findIndex(d => d);
148-
// if (resultIndex !== -1) {
149-
// return highlightNode([{index: target.timeArr[resultIndex]._index, netIndex: resultIndex}]);
150-
// }
151-
// }
152-
// }
153-
// return highlightNode([]);
154-
}
155-
156138
master.draw = function() {
157139
const {colorNet}=graphicopt;
158140
const {time}=data;

NetAgnostics/src/js/graphic.js

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,51 @@ function drawGantt() {
919919
metrics:Layout.tsnedata,
920920
dimensions:serviceFullList,
921921
time:Layout.time_stamp
922-
})
922+
});
923+
924+
let _byUser=undefined;
925+
$('#search').on('input', searchHandler); // register for oninput
926+
$('#search').on('propertychange', searchHandler); // for IE8
927+
function searchHandler(e) {
928+
if (e.target.value !== "") {
929+
const byUser = Layout.users[e.target.value]?e.target.value:undefined;
930+
// let results = datain.filter(h => h.name.includes(e.target.value)).map(h => ({index: path[h.name][0].index}));
931+
const dimensions = serviceFullList;
932+
if(dimensions) {
933+
if (!byUser) {
934+
if (_byUser!==byUser) {
935+
Layout.nodeFilter = {...Layout.computers};
936+
drawObject.data({node: Layout.nodeFilter}).draw();
937+
}
938+
} else {
939+
const nodes = {};
940+
[byUser].forEach(u=>{
941+
debugger
942+
Layout.users[u].node.forEach(n=>{
943+
nodes[n] = {};
944+
dimensions.forEach(d=>{
945+
if (Layout.computers[n][d.text]){
946+
nodes[n][d.text] = Layout.computers[n][d.text].map(()=>null);
947+
nodes[n][d.text].sudden = Layout.computers[n][d.text].sudden;
948+
}
949+
})
950+
Layout.computers[n].users.forEach((t,i)=>{
951+
if (t.indexOf(u)){
952+
dimensions.forEach(d=>{
953+
if (Layout.computers[n][d.text]){
954+
nodes[n][d.text][i] = Layout.computers[n][d.text][i];
955+
}
956+
})
957+
}
958+
})
959+
})
960+
})
961+
drawObject.data({node:nodes}).draw();
962+
}
963+
}
964+
_byUser = byUser
965+
}
966+
}
923967
}
924968

925969
// setting

NetAgnostics/src/js/handleData.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ let currentDraw = (_serviceSelected) => {
126126
return initColorFunc
127127
})();
128128
drawObject.graphicopt({colorNet})
129+
.data({serviceSelected:selectedSer})
129130
.draw()
130131
};
131132
let tsnedata = {};
@@ -442,7 +443,8 @@ function handleRankingData(data) {
442443
Object.keys(r).forEach(k=>{
443444
Layout[k] = r[k]
444445
})
445-
Layout.nodeFilter = r.computers;
446+
Layout.computers = r.computers;
447+
Layout.nodeFilter = {...r.computers};
446448
Layout.usersStatic = r.users;
447449
summaryInTime.data = data;
448450
// userPie.data(Layout.usersStatic).draw();

NetAgnostics/src/js/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $(document).ready(function(){
3737
// set up ui
3838
d3.select('#navMode').selectAll('li').classed('active',false);
3939
d3.select('#navMode').select('li.demo a').classed('active',true);
40-
let url = 'src/data/nocona_2023-04-13-2023-04-14.json';
40+
let url = 'src/data/nocona_2023-06-14T12-00-00.00Z-2023-06-21T12-00-00.00Z.json';
4141
// let url = '../HiperView/data/814_821_2020.json';
4242
// let url = '../jobviewer/src/data/922020-932020-145000.json';
4343
if (command.timeStart!==undefined&&command.timeEnd!==undefined){// `2020-02-14T12:00:00-05:00`

0 commit comments

Comments
 (0)