Skip to content

Commit

Permalink
Web console: LGTM alert squash + final fixes (#8351)
Browse files Browse the repository at this point in the history
* mv old console

* update dep

* reduce card size

* fix tuning configs for forceGuaranteedRollup

* fix tests

* revert console mv

* fix some old console issues

* revert build change
  • Loading branch information
vogievetsky authored and clintropolis committed Aug 21, 2019
1 parent e1f94a5 commit aa51668
Show file tree
Hide file tree
Showing 12 changed files with 773 additions and 705 deletions.
52 changes: 0 additions & 52 deletions web-console/old-console/index.html

This file was deleted.

4 changes: 2 additions & 2 deletions web-console/old-console/js/console-0.0.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var shutdownSupervisor = function(supervisorId) {

$(document).ready(function() {
var augment = function(data, showKill) {
for (i = 0 ; i < data.length ; i++) {
for (var i = 0 ; i < data.length ; i++) {
var taskId = encodeURIComponent(data[i].id)
data[i].more =
'<a href="/druid/indexer/v1/task/' + taskId + '">payload</a>' +
Expand All @@ -116,7 +116,7 @@ $(document).ready(function() {
$.get('/druid/indexer/v1/supervisor?full', function(dataList) {

var data = []
for (i = 0 ; i < dataList.length ; i++) {
for (var i = 0 ; i < dataList.length ; i++) {
var supervisorId = encodeURIComponent(dataList[i].id)
var supervisorSpec = dataList[i].spec;
var statusText = supervisorSpec && supervisorSpec.suspended ?
Expand Down
10 changes: 5 additions & 5 deletions web-console/old-console/js/init-0.0.2.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ $(document).ready(function() {
ret.push(100*(currSizes[i]/maxSizes[i]));
}
}

return ret;
}());
var avg = serverTable.getColTotal('Server percentUsed') / serverTable.getNumRows();
if (!isNaN(avg)) {
$('#avg_server_metric').html('Average Server Percent Used: ' + avg + '%');
}else{
$('.loading').html('Server is still starting...Please try after few minutes.');
$('.loading').show()
$('.loading').show();
}
serverTable.toHTMLTable($('#servers'));
segmentTable.toHTMLTable($('#segments'));
Expand Down Expand Up @@ -132,7 +132,7 @@ $(document).ready(function() {
if ($.isEmptyObject(CONSOLE.selected_segments)) {
alert("Please select at least one segment");
}
for (seg in CONSOLE.selected_segments) {
for (var seg in CONSOLE.selected_segments) {
data.push({
'segmentName' : seg,
'from' : CONSOLE.selected_segments[seg].children('.server_host').text(),
Expand All @@ -145,11 +145,11 @@ $(document).ready(function() {

$.get('/druid/coordinator/v1/servers?full', function(data) {
$('.loading').hide();

initTables(data);

var oTable = [];
initDataTable($('#servers'), oTable);
initDataTable($('#segments'), oTable);
});
});
});
2 changes: 1 addition & 1 deletion web-console/old-console/js/rules-0.0.2.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function makeRuleBody(rule) {
break;
}
}
retVal += "</span>"
retVal += "</span>";
return retVal;
}

Expand Down
Loading

0 comments on commit aa51668

Please sign in to comment.