azkaban-aplcache
Changes
src/less/project.less 2(+1 -1)
src/tl/flowsummary.tl 1(+0 -1)
src/web/js/azkaban/view/flow.js 4(+2 -2)
src/web/js/azkaban/view/job-details.js 10(+5 -5)
src/web/js/azkaban/view/time-graph.js 12(+10 -2)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 2fb3460..ddc9551 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -104,8 +104,7 @@
<div class="container-full" id="executionsView">
<div class="row">
<div class="col-xs-12">
- <div class="well well-clear well-sm">
- <div id="timeGraph"></div>
+ <div class="well well-clear well-sm" id="timeGraph">
</div>
<table class="table table-striped table-bordered table-condensed table-hover" id="execTable">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index 0a88c63..50858db 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -80,8 +80,8 @@
## Tabs
<ul class="nav nav-tabs" id="headertabs">
- <li id="jobSummaryViewLink"><a href="#jobsummary">Summary</a></li>
- <li id="jobLogViewLink"><a href="#joblog">Log</a></li>
+ <li id="jobLogViewLink"><a href="#logs">Job Logs</a></li>
+ <li id="jobSummaryViewLink"><a href="#summary">Summary</a></li>
<li><a href="${context}/pigvisualizer?execid=${execid}&jobid=${jobid}">Visualization</a></li>
</ul>
</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index 19fcac4..bdeca48 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -72,8 +72,7 @@
<div class="row">
<div class="col-xs-12">
- <div class="well well-clear well-sm">
- <div id="timeGraph"></div>
+ <div class="well well-clear well-sm" id="timeGraph">
</div>
<table id="all-jobs" class="table table-striped table-bordered table-condensed table-hover">
src/less/project.less 2(+1 -1)
diff --git a/src/less/project.less b/src/less/project.less
index 7875358..34f3ddf 100644
--- a/src/less/project.less
+++ b/src/less/project.less
@@ -1,6 +1,6 @@
#project-list {
padding: 0;
- margin: 0;
+ margin: 0px 0px 40px 0px;
li {
list-style: none;
src/tl/flowsummary.tl 1(+0 -1)
diff --git a/src/tl/flowsummary.tl b/src/tl/flowsummary.tl
index 1c9154f..30c50de 100644
--- a/src/tl/flowsummary.tl
+++ b/src/tl/flowsummary.tl
@@ -14,7 +14,6 @@
</table>
</div>
</div>
- <hr>
<div class="row">
<div class="col-xs-12">
src/web/js/azkaban/view/flow.js 4(+2 -2)
diff --git a/src/web/js/azkaban/view/flow.js b/src/web/js/azkaban/view/flow.js
index b8348d4..14ee620 100644
--- a/src/web/js/azkaban/view/flow.js
+++ b/src/web/js/azkaban/view/flow.js
@@ -291,7 +291,6 @@ azkaban.SummaryView = Backbone.View.extend({
this.fetchDetails();
this.fetchSchedule();
- this.fetchLastRun();
this.model.trigger('render');
},
@@ -314,7 +313,8 @@ azkaban.SummaryView = Backbone.View.extend({
};
$.get(requestURL, requestData, successHandler, 'json');
},
- fetchSchedule: function() {
+
+ fetchSchedule: function() {
var requestURL = contextURL + "/schedule"
var requestData = {
'ajax': 'fetchSchedule',
src/web/js/azkaban/view/job-details.js 10(+5 -5)
diff --git a/src/web/js/azkaban/view/job-details.js b/src/web/js/azkaban/view/job-details.js
index f191f37..e3fbd00 100644
--- a/src/web/js/azkaban/view/job-details.js
+++ b/src/web/js/azkaban/view/job-details.js
@@ -206,11 +206,11 @@ azkaban.JobTabView = Backbone.View.extend({
initialize: function(settings) {
var selectedView = settings.selectedView;
- if (selectedView == 'joblog') {
- this.handleJobLogViewLinkClick();
+ if (selectedView == 'summary') {
+ this.handleJobSummaryViewLinkClick();
}
else {
- this.handleJobSummaryViewLinkClick();
+ this.handleJobLogViewLinkClick();
}
},
@@ -266,10 +266,10 @@ $(function() {
if (window.location.hash) {
var hash = window.location.hash;
- if (hash == '#joblog') {
+ if (hash == '#logs') {
jobTabView.handleJobLogViewLinkClick();
}
- else if (hash == '#jobsummary') {
+ else if (hash == '#summary') {
jobTabView.handleJobSummaryViewLinkClick();
}
}
src/web/js/azkaban/view/time-graph.js 12(+10 -2)
diff --git a/src/web/js/azkaban/view/time-graph.js b/src/web/js/azkaban/view/time-graph.js
index 5f4fd62..c56a39f 100644
--- a/src/web/js/azkaban/view/time-graph.js
+++ b/src/web/js/azkaban/view/time-graph.js
@@ -24,7 +24,7 @@ azkaban.TimeGraphView = Backbone.View.extend({
this.model.bind('render', this.render, this);
this.model.bind('change:page', this.render, this);
this.modelField = settings.modelField;
- this.element = settings.el;
+ this.graphContainer = settings.el;
this.render();
},
@@ -59,6 +59,14 @@ azkaban.TimeGraphView = Backbone.View.extend({
indexMap[endTime.toString()] = i;
}
+ if (data.length == 0) {
+ $(this.graphContainer).hide();
+ return;
+ }
+
+ var graphDiv = document.createElement('div');
+ $(this.graphContainer).append(graphDiv);
+
var lineColorsCallback = function(row, sidx, type) {
if (type != 'point') {
return "#000000";
@@ -102,7 +110,7 @@ azkaban.TimeGraphView = Backbone.View.extend({
};
Morris.Line({
- element: this.element,
+ element: graphDiv,
data: data,
xkey: 'time',
ykeys: ['duration'],