From a11ce19f47bbca4ccb00b32b3ccbda5316a01ae0 Mon Sep 17 00:00:00 2001 From: Sunil G Date: Fri, 20 Apr 2018 22:28:36 +0530 Subject: [PATCH] YARN-7956. [UI2] Avoid duplicating Components link under Services//Components. Contributed by Yesha Vora. --- .../src/main/webapp/app/controllers/yarn-component-instance.js | 3 +-- .../main/webapp/app/controllers/yarn-component-instances.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js index 358c6b1396..8d28c22ec1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js @@ -45,8 +45,7 @@ export default Ember.Controller.extend({ text: `${serviceName} [${appId}]`, href: `#/yarn-app/${appId}/components?service=${serviceName}` }, { - text: 'Components', - href: `#/yarn-app/${appId}/components?service=${serviceName}` + text: 'Components' }, { text: `${componentName}`, href: `#/yarn-component-instances/${componentName}/components?service=${serviceName}&&appid=${appId}` diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js index 073d043e4a..fbd034ab78 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js @@ -44,8 +44,7 @@ export default Ember.Controller.extend({ text: `${serviceName} [${appId}]`, href: `#/yarn-app/${appId}/components?service=${serviceName}` }, { - text: 'Components', - href: `#/yarn-app/${appId}/components?service=${serviceName}` + text: 'Components' }, { text: `${componentName}`, href: `#/yarn-component-instances/${componentName}/info?service=${serviceName}&&appid=${appId}`