diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js index cc3be2e526f..247c25bddd0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js @@ -36,8 +36,11 @@ export default Ember.Controller.extend({ searchType: 'manual', }), + showLoading: false, + init: function () { var that = this; + this.set('showLoading', true); this.get('store').query('yarn-conf', {}) .then(function(conf) { let coreProps = conf.filter(function(o) { @@ -52,6 +55,9 @@ export default Ember.Controller.extend({ return o.get('source') == 'yarn-default.xml'; }); that.set('rowsForYarnColumnsFromModel', yarnProps); + }) + .finally(function() { + that.set('showLoading', false); }); }, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js index a5e0eb5744b..c529aa64e66 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js @@ -19,6 +19,9 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - queryParams: ['filename'], - filename: null + + rmWebAddress: Ember.computed('hosts.rmWebAddress', function() { + return this.get('hosts.rmWebAddress'); + }) + }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js index a12c2803fb0..81ec0f497a5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js @@ -19,18 +19,9 @@ import Ember from 'ember'; export default Ember.Route.extend({ - queryParams: { - filename: { - refreshModel: true - } - }, - - model(param) { - if (param.filename == null) { - return Ember.RSVP.hash({logs: this.store.findAll('yarn-rm-log')}); - } else { - // TODO: Loading log file is disallowed for cross-origin requests that require preflight - window.open(this.get('hosts.rmWebAddress') + param.filename); - } + model() { + return Ember.RSVP.hash({ + logs: this.store.findAll('yarn-rm-log') + }); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss index 10607af4dc8..584d347beaa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss @@ -51,4 +51,8 @@ .top-3 { margin-top: 20px; +} + +.top-4 { + margin-top: 30px; } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs index 3efcf579741..6c649c95741 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs @@ -36,71 +36,25 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} -
-
- -
-
-
-

Tools

-
-
-
- -{{outlet}}