You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by rb...@apache.org on 2014/11/19 13:16:16 UTC
tez git commit: TEZ-1791. breadcrumbs for moving between pages.
(Prakash Ramachandran via Rajesh Balamohan)
Repository: tez
Updated Branches:
refs/heads/TEZ-8 7f8198f11 -> 8f3ceaa9f
TEZ-1791. breadcrumbs for moving between pages. (Prakash Ramachandran via Rajesh Balamohan)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/8f3ceaa9
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/8f3ceaa9
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/8f3ceaa9
Branch: refs/heads/TEZ-8
Commit: 8f3ceaa9f9cf555f567fbfbc9cea3cab883dfbc0
Parents: 7f8198f
Author: Rajesh Balamohan <rb...@hortonworks.com>
Authored: Wed Nov 19 17:46:04 2014 +0530
Committer: Rajesh Balamohan <rb...@hortonworks.com>
Committed: Wed Nov 19 17:46:04 2014 +0530
----------------------------------------------------------------------
.../scripts/controllers/dag_index_controller.js | 2 +-
.../controllers/vertex_index_controller.js | 2 +-
.../app/scripts/models/TimelineRestAdapter.js | 1 +
.../webapp/app/scripts/models/task_attempt.js | 4 +-
tez-ui/src/main/webapp/app/scripts/router.js | 45 ++++++++++++--------
tez-ui/src/main/webapp/app/styles/main.less | 11 +++++
tez-ui/src/main/webapp/app/templates/dag.hbs | 5 +++
tez-ui/src/main/webapp/app/templates/task.hbs | 11 ++++-
.../main/webapp/app/templates/task_attempt.hbs | 23 ++++++++--
tez-ui/src/main/webapp/app/templates/vertex.hbs | 9 +++-
10 files changed, 84 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/scripts/controllers/dag_index_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_index_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_index_controller.js
index 14a54ea..5549a84 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_index_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_index_controller.js
@@ -49,7 +49,7 @@ App.DagIndexController = Em.ObjectController.extend({
}.property('id', 'counterGroups'),
failedTasksLink: function() {
- return '/#tasks?status=FAILED&parentType=TEZ_DAG_ID&parentID=' + this.get('id');
+ return '#tasks?status=FAILED&parentType=TEZ_DAG_ID&parentID=' + this.get('id');
}.property(),
actions: {
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/scripts/controllers/vertex_index_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_index_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_index_controller.js
index a4252d1..cec39c4 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_index_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_index_controller.js
@@ -29,6 +29,6 @@ App.VertexIndexController = Em.ObjectController.extend({
}.property('id', 'counterGroups'),
failedTasksLink: function() {
- return '/#tasks?status=FAILED&parentType=TEZ_VERTEX_ID&parentID=' + this.get('id');
+ return '#tasks?status=FAILED&parentType=TEZ_VERTEX_ID&parentID=' + this.get('id');
}.property(),
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js b/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
index 34644f8..6463bac 100644
--- a/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
+++ b/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
@@ -165,6 +165,7 @@ var timelineJsonToTaskAttemptMap = {
inProgressLog: 'otherinfo.inProgressLogsURL',
completedLog: 'otherinfo.completedLogsURL',
+ taskID: 'primaryfilters.TEZ_TASK_ID.0',
vertexID: 'primaryfilters.TEZ_VERTEX_ID.0',
dagID: 'primaryfilters.TEZ_DAG_ID.0',
containerId: 'otherinfo.containerId',
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js b/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
index d7acbe1..e526224 100644
--- a/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
+++ b/tez-ui/src/main/webapp/app/scripts/models/task_attempt.js
@@ -25,8 +25,6 @@ App.TaskAttempt = App.AbstractEntity.extend({
entityType: App.EntityType.TASK_ATTEMPT,
- // dagId
- dagId: DS.attr('string'),
// container
containerId: DS.attr('string'),
@@ -35,8 +33,8 @@ App.TaskAttempt = App.AbstractEntity.extend({
// status of the task attempt
status: DS.attr('string'),
+ taskID: DS.attr('string'),
vertexID: DS.attr('string'),
-
dagID: DS.attr('string'),
inProgressLog: DS.attr('string'),
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/scripts/router.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/router.js b/tez-ui/src/main/webapp/app/scripts/router.js
index 43deef0..7810670 100644
--- a/tez-ui/src/main/webapp/app/scripts/router.js
+++ b/tez-ui/src/main/webapp/app/scripts/router.js
@@ -88,19 +88,21 @@ App.DagsRoute = Em.Route.extend({
},
setupController: function(controller, model) {
+ $(document).attr('title', 'All Dags');
this._super(controller, model);
controller.loadData();
},
});
App.DagRoute = Em.Route.extend({
- model: function(params) {
- return this.store.find('dag', params.dag_id);
- },
+ model: function(params) {
+ return this.store.find('dag', params.dag_id);
+ },
- setupController: function(controller, model) {
- this._super(controller, model);
- }
+ setupController: function(controller, model) {
+ $(document).attr('title', 'Dag: %@ (%@)'.fmt(model.get('name'), model.id));
+ this._super(controller, model);
+ }
});
App.DagSwimlaneRoute = Em.Route.extend({
@@ -131,23 +133,25 @@ App.TasksRoute = Em.Route.extend({
});
App.TaskRoute = Em.Route.extend({
- model: function(params) {
- return this.store.find('task', params.task_id);
- },
+ model: function(params) {
+ return this.store.find('task', params.task_id);
+ },
- setupController: function(controller, model) {
- this._super(controller, model);
- }
+ setupController: function(controller, model) {
+ $(document).attr('title', 'Task: %@'.fmt(model.id));
+ this._super(controller, model);
+ }
});
App.VertexRoute = Em.Route.extend({
- model: function(params) {
- return this.store.find('vertex', params.vertex_id);
- },
+ model: function(params) {
+ return this.store.find('vertex', params.vertex_id);
+ },
- setupController: function(controller, model) {
- this._super(controller, model);
- }
+ setupController: function(controller, model) {
+ $(document).attr('title', 'Vertex: %@ (%@)'.fmt(model.get('name'), model.id));
+ this._super(controller, model);
+ }
});
App.VertexSwimlaneRoute = Em.Route.extend({
@@ -210,6 +214,7 @@ App.TaskAttemptsRoute = Em.Route.extend({
},
setupController: function(controller, model) {
+ $(document).attr('title', 'Task Attempt: %@'.fmt(model.id));
this._super(controller, model);
controller.loadData();
}
@@ -242,6 +247,10 @@ App.TezAppRoute = Em.Route.extend({
});
});
},
+ setupController: function(controller, model) {
+ $(document).attr('title', 'Application: %@'.fmt(model.id));
+ this._super(controller, model);
+ }
});
App.TezAppDagsRoute = Em.Route.extend({
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/styles/main.less
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/styles/main.less b/tez-ui/src/main/webapp/app/styles/main.less
index 2a6bd91..790c309 100644
--- a/tez-ui/src/main/webapp/app/styles/main.less
+++ b/tez-ui/src/main/webapp/app/styles/main.less
@@ -176,6 +176,17 @@ div.indent {
}
}
+.breadcrumb-container {
+ .margin-small;
+
+ margin-left: 0px;
+
+ i {
+ .fa;
+ .fa-icon(angle-double-right);
+ }
+}
+
.kv-table {
width: 100%;
margin-top: 10px;
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/templates/dag.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dag.hbs b/tez-ui/src/main/webapp/app/templates/dag.hbs
index 35ea965..1487aef 100644
--- a/tez-ui/src/main/webapp/app/templates/dag.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dag.hbs
@@ -1,4 +1,9 @@
{{partial "utils/pageHeader"}}
+
+<div class='breakcrumb-container'>
+ {{#link-to 'dags'}}All Dags{{/link-to}}
+</div>
+
{{#unless loading}}
<div class='type-table fill-full margin-small'>
<div class='align-left'>
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/templates/task.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/task.hbs b/tez-ui/src/main/webapp/app/templates/task.hbs
index 112dc92..cf6a80b 100644
--- a/tez-ui/src/main/webapp/app/templates/task.hbs
+++ b/tez-ui/src/main/webapp/app/templates/task.hbs
@@ -17,6 +17,15 @@
}}
{{partial "utils/pageHeader"}}
+
+<div class='breadcrumb-container'>
+ {{#link-to 'dags'}}All Dags{{/link-to}}
+ <i></i>
+ {{#link-to 'dag.vertices' dagID}}Dag{{/link-to}}
+ <i></i>
+ {{#link-to 'vertex.tasks' vertexID}}Vertex{{/link-to}}
+</div>
+
{{#unless loading}}
{{!--
<div class='margin-small-horizontal'>
@@ -34,7 +43,7 @@
<table class='detail-list'>
<tbody>
<tr>
- <td>{{t common.id}}</td>
+ <td>Task ID</td>
<td>{{id}}</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/task_attempt.hbs b/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
index d09f28d..dc7c386 100644
--- a/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
+++ b/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
@@ -17,15 +17,30 @@
}}
{{partial "utils/pageHeader"}}
+
+<div class='breadcrumb-container'>
+ {{#link-to 'dags'}}All Dags{{/link-to}}
+ <i></i>
+ {{#link-to 'dag.vertices' dagID}}Dag{{/link-to}}
+ <i></i>
+ {{#link-to 'vertex.tasks' vertexID}}Vertex{{/link-to}}
+ <i></i>
+ {{#link-to 'task.attempts' taskID}}Task{{/link-to}}
+</div>
+
{{#unless loading}}
<div class='type-table fill-full '>
<div class='align-left'>
<table class='detail-list'>
<tbody>
- <tr>
- <td>{{t common.id}}</td>
- <td>{{id}}</td>
- </tr>
+ <tr>
+ <td>Task Attempt ID</td>
+ <td>{{id}}</td>
+ </tr>
+ <tr>
+ <td>Task ID</td>
+ <td>{{taskID}}</td>
+ </tr>
<tr>
<td>Vertex ID</td>
<td>{{vertexID}}</td>
http://git-wip-us.apache.org/repos/asf/tez/blob/8f3ceaa9/tez-ui/src/main/webapp/app/templates/vertex.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/vertex.hbs b/tez-ui/src/main/webapp/app/templates/vertex.hbs
index 54d41fb..848b0c6 100644
--- a/tez-ui/src/main/webapp/app/templates/vertex.hbs
+++ b/tez-ui/src/main/webapp/app/templates/vertex.hbs
@@ -17,13 +17,20 @@
}}
{{partial "utils/pageHeader"}}
+
+<div class='breadcrumb-container'>
+ {{#link-to 'dags'}}All Dags{{/link-to}}
+ <i></i>
+ {{#link-to 'dag.vertices' dagID}}Dag{{/link-to}}
+</div>
+
{{#unless loading}}
<div class='type-table fill-full '>
<div class='align-left'>
<table class='detail-list'>
<tbody>
<tr>
- <td>{{t common.id}}</td>
+ <td>Vertex ID</td>
<td>{{id}}</td>
</tr>
<tr>