From 75d2d0fdb1737926fcbe180c01aa8eb5058e3adc Mon Sep 17 00:00:00 2001 From: Sunil G Date: Tue, 18 Sep 2018 12:44:21 +0530 Subject: [PATCH] YARN-8652. [UI2] YARN UI2 breaks if getUserInfo REST API is not available in older versions. Contributed by Akhil PB. (cherry picked from commit bbeca0107e247ae14cfe96761f9e5fbb1f02e53d) --- .../src/main/webapp/app/controllers/application.js | 5 ++++- .../hadoop-yarn-ui/src/main/webapp/app/routes/application.js | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js index 75b072adf17..3e8fcceedd5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js @@ -65,6 +65,9 @@ export default Ember.Controller.extend({ }.property('model.clusterInfo'), userInfo: function() { - return this.model.userInfo.get('firstObject'); + if (this.model.userInfo) { + return this.model.userInfo.get('firstObject'); + } + return null; }.property('model.userInfo'), }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js index e30baaa2938..60d1efd6a79 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js @@ -23,7 +23,9 @@ export default AbstractRoute.extend({ model() { return Ember.RSVP.hash({ clusterInfo: this.store.findAll('ClusterInfo', {reload: true}), - userInfo: this.store.findAll('cluster-user-info', {reload: true}) + userInfo: this.store.findAll('cluster-user-info', {reload: true}).catch(function() { + return null; + }) }); },