Skip to content

Commit 3c6ca6a

Browse files
committed
fix web ui
1 parent 0d1c4ad commit 3c6ca6a

File tree

2 files changed

+49
-45
lines changed

2 files changed

+49
-45
lines changed

httpdbg/webapp/static/api.js

+32-30
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,39 @@ const global = {
1212
}
1313

1414
function save_request(request_id, request, session_id) {
15-
request.loaded = false;
16-
request.to_refresh = true;
17-
if (request.pin == undefined) {
18-
request.pin = "";
19-
}
20-
if (request.filter == undefined) {
21-
request.filter = "---";
22-
}
23-
request.session_id = session_id;
24-
request.initiator = global.initiators[request.initiator_id];
25-
26-
if (request.in_progress) {
27-
request.status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$" alt="loading"/>';
28-
} else {
29-
switch (request.status_code) {
30-
case 0:
31-
request.status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$/" alt="loading"/>';
32-
break;
33-
case -1:
34-
request.status_code_view = '<img class="icon" src="static/icons/math-multiplication-icon.svg-+-$**HTTPDBG_VERSION**$/" alt="load failed"/>';
35-
break;
36-
default:
37-
request.status_code_view = request.status_code;
38-
break;
15+
if (request.initiator_id in global.initiators) { // the initiator may be missing if the clean list is executed in parrallel
16+
request.loaded = false;
17+
request.to_refresh = true;
18+
if (request.pin == undefined) {
19+
request.pin = "";
3920
}
40-
}
41-
42-
global.requests[request_id] = request;
43-
44-
if (!request.pin) {
45-
get_request(request_id);
21+
if (request.filter == undefined) {
22+
request.filter = "---";
23+
}
24+
request.session_id = session_id;
25+
request.initiator = global.initiators[request.initiator_id];
26+
27+
if (request.in_progress) {
28+
request.status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$" alt="loading"/>';
29+
} else {
30+
switch (request.status_code) {
31+
case 0:
32+
request.status_code_view = '<img class="icon" src="static/icons/wait-sandclock-icon.svg-+-$**HTTPDBG_VERSION**$/" alt="loading"/>';
33+
break;
34+
case -1:
35+
request.status_code_view = '<img class="icon" src="static/icons/math-multiplication-icon.svg-+-$**HTTPDBG_VERSION**$/" alt="load failed"/>';
36+
break;
37+
default:
38+
request.status_code_view = request.status_code;
39+
break;
40+
}
41+
}
42+
43+
global.requests[request_id] = request;
44+
45+
if (!request.pin) {
46+
get_request(request_id);
47+
}
4648
}
4749
}
4850

httpdbg/webapp/static/render.js

+17-15
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,24 @@ async function refresh_resquests() {
2424

2525
let groupby = get_groupby(global.groupby, request);
2626

27-
request.groupby_id = groupby.id;
28-
29-
var rendered = Mustache.render(template_request, request);
30-
if (!elt) {
31-
var elt_group = document.getElementById("group-" + groupby.id);
32-
if (!elt_group) {
33-
var rendered_group = Mustache.render(template_group, groupby);
34-
ordered_insert(table, "tbody", groupby.tbegin, rendered_group);
35-
elt_group = document.getElementById("group-" + groupby.id);
27+
if(groupby) { // the group may be missing if the clean list is executed in parrallel
28+
request.groupby_id = groupby.id;
29+
30+
var rendered = Mustache.render(template_request, request);
31+
if (!elt) {
32+
var elt_group = document.getElementById("group-" + groupby.id);
33+
if (!elt_group) {
34+
var rendered_group = Mustache.render(template_group, groupby);
35+
ordered_insert(table, "tbody", groupby.tbegin, rendered_group);
36+
elt_group = document.getElementById("group-" + groupby.id);
37+
};
38+
ordered_insert(elt_group, "tr", request.tbegin, rendered);
39+
} else {
40+
elt.innerHTML = rendered;
3641
};
37-
ordered_insert(elt_group, "tr", request.tbegin, rendered);
38-
} else {
39-
elt.innerHTML = rendered;
40-
};
41-
42-
request.to_refresh = false;
42+
43+
request.to_refresh = false;
44+
}
4345
}
4446
};
4547
filter_requests_count();

0 commit comments

Comments
 (0)