Repository: tez Updated Branches: refs/heads/branch-0.6 c85563ef5 -> de8ef2ba9
TEZ-2399. Tez UI: add proper dependencies for computed properties (pramachandran) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/de8ef2ba Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/de8ef2ba Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/de8ef2ba Branch: refs/heads/branch-0.6 Commit: de8ef2ba945b593db66e4e25733c5cb53b217fda Parents: c85563e Author: Prakash Ramachandran <[email protected]> Authored: Fri May 1 21:30:02 2015 +0530 Committer: Prakash Ramachandran <[email protected]> Committed: Fri May 1 21:30:02 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../controllers/dag-task-attempts-controller.js | 4 ++-- .../app/scripts/controllers/dag-view-controller.js | 6 +++--- .../app/scripts/controllers/dag_index_controller.js | 8 ++++---- .../main/webapp/app/scripts/controllers/dag_tasks.js | 4 ++-- .../webapp/app/scripts/controllers/dag_vertices.js | 4 ++-- .../webapp/app/scripts/controllers/dags_controller.js | 4 ++-- .../controllers/task_task_attempts_controller.js | 6 +++--- .../app/scripts/controllers/tasks_controller.js | 4 ++-- .../scripts/controllers/tez-app-dags-controller.js | 4 ++-- .../controllers/vertex-additionals-controller.js | 4 ++-- .../scripts/controllers/vertex-inputs-controller.js | 4 ++-- .../scripts/controllers/vertex_index_controller.js | 14 +++++++------- .../controllers/vertex_task_attempts_controller.js | 4 ++-- .../scripts/controllers/vertex_tasks_controller.js | 4 ++-- 15 files changed, 38 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 33e0d34..f6a1d82 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.6.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2399. Tez UI: add proper dependencies for computed properties TEZ-1988. Tez UI: does not work when using file:// in a browser TEZ-2256. Avoid use of BufferTooSmallException to signal end of buffer in UnorderedPartitionedKVWriter. TEZ-2385. branch-0.6 compile failure caused by TEZ-2226. http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js index 6617c10..a3e441f 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js @@ -255,7 +255,7 @@ App.DagTaskAttemptsController = Em.ObjectController.extend(App.PaginatedContentM } } ]; - }.property(), + }.property('entities','controllers.dag.id'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -266,6 +266,6 @@ App.DagTaskAttemptsController = Em.ObjectController.extend(App.PaginatedContentM ) ) ); - }.property(), + }.property('entities','controllers.dag.id'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js index a748cdf..e930856 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js @@ -79,7 +79,7 @@ App.DagViewController = Em.ObjectController.extend(App.PaginatedContentMixin, Ap defaultColumnConfigs: function() { return this.get('controllers.dagVertices.defaultColumnConfigs'); - }.property(), + }.property('id', 'controllers.dagVertices.defaultColumnConfigs'), columnConfigs: function() { var configs = this.get('controllers.dagVertices.columnConfigs'); @@ -87,7 +87,7 @@ App.DagViewController = Em.ObjectController.extend(App.PaginatedContentMixin, Ap return (config.contentPath) || (config.getCellContent && !config.tableCellViewClass); }); - }.property(), + }.property('id', 'controllers.dagVertices.columnConfigs'), viewData: function () { var vertices = this.get('controllers.dag.vertices'), @@ -113,5 +113,5 @@ App.DagViewController = Em.ObjectController.extend(App.PaginatedContentMixin, Ap edges: this.get('controllers.dag.edges'), vertexGroups: this.get('controllers.dag.vertexGroups') }; - }.property('entities') + }.property('entities', 'controllers.dag.id') }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/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 7576149..5a45a4c 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 @@ -39,7 +39,7 @@ App.DagIndexController = Em.ObjectController.extend(App.ModelRefreshMixin, { taskIconStatus: function() { return App.Helpers.misc.getStatusClassForEntity(this.get('model.status')); - }.property('id', 'status', 'counterGroups'), + }.property('id', 'model.status'), progressStr: function() { var pct; @@ -47,7 +47,7 @@ App.DagIndexController = Em.ObjectController.extend(App.ModelRefreshMixin, { pct = App.Helpers.number.fractionToPercentage(this.get('progress')); } return pct; - }.property('id', 'status', 'progress'), + }.property('id', 'progress'), totalTasks: function() { return App.Helpers.misc.getCounterValueForDag(this.get('counterGroups'), @@ -71,10 +71,10 @@ App.DagIndexController = Em.ObjectController.extend(App.ModelRefreshMixin, { hasFailedTasks: function() { return this.get('failedTasks') > 0; - }.property('id', 'counterGroups'), + }.property('id', 'failedTasks'), failedTasksLink: function() { return '#tasks?status=FAILED&parentType=TEZ_DAG_ID&parentID=' + this.get('id'); - }.property() + }.property('id') }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js index 519f06d..2ffa6cd 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js @@ -262,7 +262,7 @@ App.DagTasksController = Em.ObjectController.extend(App.PaginatedContentMixin, A } } ]; - }.property(), + }.property('controllers.dag.id', 'entities'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -273,6 +273,6 @@ App.DagTasksController = Em.ObjectController.extend(App.PaginatedContentMixin, A ) ) ); - }.property(), + }.property('controllers.dag.id', 'entities'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js index 44ffd1a..7a3a4b2 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js @@ -237,7 +237,7 @@ App.DagVerticesController = Em.ObjectController.extend(App.PaginatedContentMixin } } ]; - }.property(), + }.property('entities', 'controllers.dag.id'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -248,6 +248,6 @@ App.DagVerticesController = Em.ObjectController.extend(App.PaginatedContentMixin ) ) ); - }.property(), + }.property('entities', 'controllers.dag.id'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js index 4515149..8f7a928 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js @@ -253,7 +253,7 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin, App.C } } ]; - }.property(), + }.property('entities'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -264,6 +264,6 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin, App.C ) ) ); - }.property(), + }.property('entities'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js index d30cb21..88f9c2c 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js @@ -238,7 +238,7 @@ App.TaskAttemptsController = Em.ObjectController.extend(App.PaginatedContentMixi } } ]; - }.property(), + }.property('entities'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -249,7 +249,7 @@ App.TaskAttemptsController = Em.ObjectController.extend(App.PaginatedContentMixi ) ) ); - }.property(), + }.property('entities'), }); @@ -263,6 +263,6 @@ App.TaskAttemptIndexController = Em.ObjectController.extend(App.ModelRefreshMixi taskAttemptIconStatus: function() { return App.Helpers.misc.getStatusClassForEntity(this.get('taskAttemptStatus')); - }.property('id', 'status', 'counterGroups'), + }.property('id', 'taskAttemptStatus'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js index 548b516..e148bb2 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js @@ -112,7 +112,7 @@ App.TasksController = Em.ObjectController.extend(App.PaginatedContentMixin, App. } ]; - }.property(), + }.property('entities'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -123,6 +123,6 @@ App.TasksController = Em.ObjectController.extend(App.PaginatedContentMixin, App. ) ) ); - }.property(), + }.property('entities'), }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js index b448ca8..e4dc682 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js @@ -205,7 +205,7 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, } } ]; - }.property(), + }.property('entities'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -216,6 +216,6 @@ App.TezAppDagsController = Em.ObjectController.extend(App.PaginatedContentMixin, ) ) ); - }.property(), + }.property('entities'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/vertex-additionals-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex-additionals-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex-additionals-controller.js index 61c2616..429bd70 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex-additionals-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex-additionals-controller.js @@ -70,7 +70,7 @@ App.VertexAdditionalsController = Em.ObjectController.extend({ } } ]); - }.property(), + }.property('controllers.vertex.id'), outputColumns: function() { return App.Helpers.misc.createColumnsFromConfigs([ @@ -103,6 +103,6 @@ App.VertexAdditionalsController = Em.ObjectController.extend({ } } ]); - }.property(), + }.property('controllers.vertex.id'), }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js index 9bc228c..1a1692f 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js @@ -78,7 +78,7 @@ App.VertexInputsController = Em.ObjectController.extend(App.PaginatedContentMixi ]; return [nameCol, classCol, initializerCol, configCol]; - }.property(), + }.property('controllers.vertex.id'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -89,6 +89,6 @@ App.VertexInputsController = Em.ObjectController.extend(App.PaginatedContentMixi ) ) ); - }.property(), + }.property('controllers.vertex.id'), }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/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 f104c11..0ba473d 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 @@ -38,7 +38,7 @@ App.VertexIndexController = Em.ObjectController.extend(App.ModelRefreshMixin, { //TODO: TEZ-1705 : Create a parent class and move this function there to avoid duplication. iconStatus: function() { return App.Helpers.misc.getStatusClassForEntity(this.get('model.status')); - }.property('id', 'status', 'counterGroups'), + }.property('id', 'model.status'), progressStr: function() { var pct; @@ -46,25 +46,25 @@ App.VertexIndexController = Em.ObjectController.extend(App.ModelRefreshMixin, { pct = App.Helpers.number.fractionToPercentage(this.get('progress')); } return pct; - }.property('id', 'status', 'progress'), + }.property('id', 'progress'), hasFailedTasks: function() { return this.get('failedTasks') > 0; - }.property('id', 'counterGroups'), + }.property('id', 'failedTasks'), failedTasksLink: function() { return '#tasks?status=FAILED&parentType=TEZ_VERTEX_ID&parentID=' + this.get('id'); - }.property(), + }.property('id'), hasFirstTaskStarted: function() { return !!this.get('firstTaskStartTime') && !!this.get('firstTasksToStart'); - }.property(), + }.property('firstTaskStartTime', 'firstTasksToStart'), hasLastTaskFinished: function() { return !!this.get('lastTaskFinishTime') && !!this.get('lastTasksToFinish'); - }.property(), + }.property('lastTaskFinishTime', 'lastTasksToFinish'), hasStats: function() { return !!this.get('avgTaskDuration') || !!this.get('minTaskDuration') || !!this.get('maxTaskDuration'); - }.property() + }.property('avgTaskDuration', 'minTaskDuration', 'maxTaskDuration') }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js index c335615..91bcbee 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js @@ -235,7 +235,7 @@ App.VertexTaskAttemptsController = Em.ObjectController.extend(App.PaginatedConte } } ]; - }.property(), + }.property('controllers.vertex.id', 'entities'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -246,6 +246,6 @@ App.VertexTaskAttemptsController = Em.ObjectController.extend(App.PaginatedConte ) ) ); - }.property(), + }.property('controllers.vertex.id', 'entities'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/de8ef2ba/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js index 912064a..d243185 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js @@ -238,7 +238,7 @@ App.VertexTasksController = Em.ObjectController.extend(App.PaginatedContentMixin } ]; - }.property(), + }.property('controllers.vertex.id', 'entities'), columnConfigs: function() { return this.get('defaultColumnConfigs').concat( @@ -249,6 +249,6 @@ App.VertexTasksController = Em.ObjectController.extend(App.PaginatedContentMixin ) ) ); - }.property(), + }.property('controllers.vertex.id', 'entities'), }); \ No newline at end of file
