8000 fixed several bugs during the dashboard initialize process · thurt/arangodb@e649ea9 · GitHub
[go: up one dir, main page]
Skip to content

Commit e649ea9

Browse files
hkernbachhkernbach
committed
fixed several bugs during the dashboard initialize process
1 parent 2e10c89 commit e649ea9

File tree

2 files changed

+47
-3
lines changed

2 files changed

+47
-3
lines changed

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,15 @@
212212
tempColor = "#7da817";
213213
p = "+";
214214
}
215-
$("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '
216-
+ tempColor +';">' + p + v + '%</span>');
215+
if (self.history.hasOwnProperty(self.server) &&
216+
self.history[self.server].hasOwnProperty(a)) {
217+
$("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '
218+
+ tempColor +';">' + p + v + '%</span>');
219+
}
220+
else {
221+
$("#" + a).html('<br/><span class="dashboard-figurePer" style="color: '
222+
+ "#000" +';">' + "data not ready yet" + '</span>');
223+
}
217224
});
218225
},
219226

@@ -545,12 +552,26 @@
545552
);
546553
},
547554

555+
addEmptyDataLabels: function () {
556+
if ($('.dataNotReadyYet').length === 0) {
557+
$('#dataTransferDistribution').prepend('<p class="dataNotReadyYet"> data not ready yet </p>');
558+
$('#totalTimeDistribution').prepend('<p class="dataNotReadyYet"> data not ready yet </p>');
559+
$('.dashboard-bar-chart-title').prepend('<p class="dataNotReadyYet"> data not ready yet </p>');
560+
}
561+
},
562+
563+
removeEmptyDataLabels: function () {
564+
$('.dataNotReadyYet').remove();
565+
},
566+
548567
prepareResidentSize: function (update) {
568+
549569
var self = this;
550570

551571
var dimensions = this.getCurrentSize('#residentSizeChartContainer');
552572

553573
var current = self.history[self.server].residentSizeCurrent / 1024 / 1024;
574+
554575
var currentA = "";
555576

556577
if (current < 1025) {
@@ -563,6 +584,15 @@
563584
var currentP = fmtNumber(self.history[self.server].residentSizePercent * 100, 2);
564585
var data = [fmtNumber(self.history[self.server].physicalMemory / 1024 / 1024 / 1024, 0) + " GB"];
565586

587+
588+
if (self.history[self.server].residentSizeChart === undefined) {
589+
this.addEmptyDataLabels();
590+
return;
591+
}
592+
else {
593+
this.removeEmptyDataLabels();
594+
}
595+
566596
nv.addGraph(function () {
567597
var chart = nv.models.multiBarHorizontalChart()
568598
.x(function (d) {
@@ -624,7 +654,6 @@
624654

625655
prepareD3Charts: function (update) {
626656
var self = this;
627-
628657
var barCharts = {
629658
totalTimeDistribution: [
630659
"queueTimeDistributionPercent", "requestTimeDistributionPercent"],
@@ -638,11 +667,20 @@
638667
}
639668

640669
_.each(Object.keys(barCharts), function (k) {
670+
641671
var dimensions = self.getCurrentSize('#' + k
642672
+ 'Container .dashboard-interior-chart');
643673

644674
var selector = "#" + k + "Container svg";
645675

676+
if (self.history[self.server].residentSizeChart === undefined) {
677+
self.addEmptyDataLabels();
678+
return;
679+
}
680+
else {
681+
self.removeEmptyDataLabels();
682+
}
683+
646684
nv.addGraph(function () {
647685
var tickMarks = [0, 0.25, 0.5, 0.75, 1];
648686
var marginLeft = 75;

‎js/apps/system/_admin/aardvark/APP/frontend/scss/_newDashboard.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
@extend %clear-float;
3030
}
3131

32+
.dataNotReadyYet {
33+
font-family: 'Open Sans', sans-serif;
34+
font-size: 20px;
35+
font-weight: 100;
36+
text-align: center;
37+
}
3238

3339
.dashboard-sub-bar {
3440
@extend %clear-float;

0 commit comments

Comments
 (0)
0