diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { + var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); + if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; + } + return nodeHttpAddress; + }) +}); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..946a396 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,21 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); - if (amHostAddress.indexOf('http://') < 0) { + if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }), + + hasValidPriority: Ember.computed('model.app.priority', function() { + var priority = this.get('model.app.priority'); + return priority !== undefined || priority !== '' || priority !== null; + }), + + hasValidUnmanagedApp: Ember.computed('model.app.unmanagedApplication', function() { + var unmanaged = this.get('model.app.unmanagedApplication'); + return unmanaged !== undefined || unmanaged !== '' || unmanaged !== null; + }) }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs index 2b16f86..fcd076b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs @@ -33,7 +33,7 @@ {{#if attempt.IsAmNodeUrl}} AM Node Web UI - {{attempt.nodeHttpAddress}} + {{nodeHttpAddressFormatted}} {{/if}} @@ -43,7 +43,7 @@ {{#if attempt.IsLinkAvailable}} Log - link + Link {{/if}} {{#if attempt.attemptState}} @@ -59,4 +59,4 @@ {{/if}} - \ No newline at end of file + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs index 0736a69..586f128 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs @@ -36,7 +36,7 @@ Log - link + Link Exit Status @@ -48,7 +48,7 @@ NodeManager UI - {{container.nodeHttpAddress}} + {{container.nodeHttpAddress}} - \ No newline at end of file + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs index 578cc95..6e63900 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs @@ -69,9 +69,13 @@ Start Time Elapsed Time Finished Time - Priority + {{#if hasValidPriority}} + Priority + {{/if}} Progress - Is Unmanaged AM + {{#if hasValidUnmanagedApp}} + Is Unmanaged AM + {{/if}} @@ -90,7 +94,9 @@ {{model.app.startTime}} {{model.app.elapsedTime}} {{model.app.validatedFinishedTs}} - {{model.app.priority}} + {{#if hasValidPriority}} + {{model.app.priority}} + {{/if}}
- {{model.app.unmanagedApplication}} + {{#if hasValidUnmanagedApp}} + {{model.app.unmanagedApplication}} + {{/if}} @@ -165,14 +173,14 @@
-
App Master Info
+
Application Master Info
- +
Master Container Log Master NodeMaster Node Label ExprMaster Node Label Expression