You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by sr...@apache.org on 2017/02/02 08:29:29 UTC
tez git commit: TEZ-3592. Tez UI: Search issues (sree)
Repository: tez
Updated Branches:
refs/heads/master 34fc31029 -> 9b158ee68
TEZ-3592. Tez UI: Search issues (sree)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9b158ee6
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9b158ee6
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9b158ee6
Branch: refs/heads/master
Commit: 9b158ee6815bd8fc96aefe163b903125eaaf8007
Parents: 34fc310
Author: Sreenath Somarajapuram <sr...@apache.org>
Authored: Thu Feb 2 13:56:59 2017 +0530
Committer: Sreenath Somarajapuram <sr...@apache.org>
Committed: Thu Feb 2 13:56:59 2017 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
tez-ui/src/main/webapp/app/controllers/dag/tasks.js | 1 +
tez-ui/src/main/webapp/app/controllers/vertex/tasks.js | 1 +
.../webapp/app/templates/components/queries-page-search.hbs | 2 +-
.../tests/integration/components/queries-page-search-test.js | 2 +-
tez-ui/src/main/webapp/tests/unit/controllers/dag/tasks-test.js | 5 ++++-
.../src/main/webapp/tests/unit/controllers/vertex/tasks-test.js | 5 ++++-
7 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/9b158ee6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 65a2247..7d3e1db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -182,6 +182,7 @@ ALL CHANGES:
TEZ-3494. Support relative url for tez-ui.history-url.base config
TEZ-3554. Add a link to get to all logs from Tez UI while job is running
TEZ-3591. Tez UI: Logs url in all DAGs doesn't open in a new window
+ TEZ-3592. Tez UI: Search issues
Release 0.8.5: Unreleased
http://git-wip-us.apache.org/repos/asf/tez/blob/9b158ee6/tez-ui/src/main/webapp/app/controllers/dag/tasks.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/controllers/dag/tasks.js b/tez-ui/src/main/webapp/app/controllers/dag/tasks.js
index 4ab2360..a742644 100644
--- a/tez-ui/src/main/webapp/app/controllers/dag/tasks.js
+++ b/tez-ui/src/main/webapp/app/controllers/dag/tasks.js
@@ -82,6 +82,7 @@ export default MultiTableController.extend({
id: 'log',
headerTitle: 'Successful/Last Attempt Log',
cellComponentName: 'em-table-tasks-log-link-cell',
+ enableSearch: false,
getCellContent: function (row) {
var attemptID = row.get("successfulAttemptID");
if(!attemptID) {
http://git-wip-us.apache.org/repos/asf/tez/blob/9b158ee6/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js b/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js
index 94f5cc9..86261fd 100644
--- a/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js
+++ b/tez-ui/src/main/webapp/app/controllers/vertex/tasks.js
@@ -72,6 +72,7 @@ export default MultiTableController.extend(AutoCounterColumn, {
id: 'log',
headerTitle: 'Successful/Last Attempt Log',
cellComponentName: 'em-table-tasks-log-link-cell',
+ enableSearch: false,
getCellContent: function (row) {
var attemptID = row.get("successfulAttemptID");
if(!attemptID) {
http://git-wip-us.apache.org/repos/asf/tez/blob/9b158ee6/tez-ui/src/main/webapp/app/templates/components/queries-page-search.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/components/queries-page-search.hbs b/tez-ui/src/main/webapp/app/templates/components/queries-page-search.hbs
index 1fe2dc8..9938f89 100644
--- a/tez-ui/src/main/webapp/app/templates/components/queries-page-search.hbs
+++ b/tez-ui/src/main/webapp/app/templates/components/queries-page-search.hbs
@@ -27,7 +27,7 @@
}}
</div><div class="search-element">
<label for="pwd">User:</label>
- {{input value=user
+ {{input value=requestUser
type="text"
class="form-control input-sm"
placeholder="Search..."
http://git-wip-us.apache.org/repos/asf/tez/blob/9b158ee6/tez-ui/src/main/webapp/tests/integration/components/queries-page-search-test.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/tests/integration/components/queries-page-search-test.js b/tez-ui/src/main/webapp/tests/integration/components/queries-page-search-test.js
index 1390371..1477b27 100644
--- a/tez-ui/src/main/webapp/tests/integration/components/queries-page-search-test.js
+++ b/tez-ui/src/main/webapp/tests/integration/components/queries-page-search-test.js
@@ -51,7 +51,7 @@ test('tableDefinition test', function(assert) {
this.set("tableDefinition", Ember.Object.create({
queryID: testQueryID,
- user: testUser,
+ requestUser: testUser,
tablesRead: testTablesRead,
tablesWritten: testTablesWritten,
appID: testAppID,
http://git-wip-us.apache.org/repos/asf/tez/blob/9b158ee6/tez-ui/src/main/webapp/tests/unit/controllers/dag/tasks-test.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/tests/unit/controllers/dag/tasks-test.js b/tez-ui/src/main/webapp/tests/unit/controllers/dag/tasks-test.js
index 3dbf78f..2f30127 100644
--- a/tez-ui/src/main/webapp/tests/unit/controllers/dag/tasks-test.js
+++ b/tez-ui/src/main/webapp/tests/unit/controllers/dag/tasks-test.js
@@ -52,7 +52,8 @@ test('Log column test', function(assert) {
}),
testAttemptID = "attempt_1";
- var getLogCellContent = controller.get("columns").findBy("id", "log").getCellContent;
+ var columnDef = controller.get("columns").findBy("id", "log"),
+ getLogCellContent = columnDef.getCellContent;
assert.equal(getLogCellContent(Ember.Object.create()), undefined);
@@ -63,4 +64,6 @@ test('Log column test', function(assert) {
assert.equal(getLogCellContent(Ember.Object.create({
attemptIDs: ["1", "2", testAttemptID]
})), testAttemptID);
+
+ assert.equal(columnDef.get("enableSearch"), false);
});
http://git-wip-us.apache.org/repos/asf/tez/blob/9b158ee6/tez-ui/src/main/webapp/tests/unit/controllers/vertex/tasks-test.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/tests/unit/controllers/vertex/tasks-test.js b/tez-ui/src/main/webapp/tests/unit/controllers/vertex/tasks-test.js
index 00703da..8000c9c 100644
--- a/tez-ui/src/main/webapp/tests/unit/controllers/vertex/tasks-test.js
+++ b/tez-ui/src/main/webapp/tests/unit/controllers/vertex/tasks-test.js
@@ -52,7 +52,8 @@ test('Log column test', function(assert) {
}),
testAttemptID = "attempt_1";
- var getLogCellContent = controller.get("columns").findBy("id", "log").getCellContent;
+ var columnDef = controller.get("columns").findBy("id", "log"),
+ getLogCellContent = columnDef.getCellContent;
assert.equal(getLogCellContent(Ember.Object.create()), undefined);
@@ -63,4 +64,6 @@ test('Log column test', function(assert) {
assert.equal(getLogCellContent(Ember.Object.create({
attemptIDs: ["1", "2", testAttemptID]
})), testAttemptID);
+
+ assert.equal(columnDef.get("enableSearch"), false);
});
\ No newline at end of file