From 5ca4bf22dd45d9ac1328c74204413d90725d1405 Mon Sep 17 00:00:00 2001 From: Wangda Tan Date: Wed, 31 Jan 2018 21:43:08 +0800 Subject: [PATCH] YARN-7828. Clicking on yarn service should take to component tab. (Sunil G via wangda) Change-Id: Ib52d6727c863bed65de30b02bf60080255af11b8 --- .../main/webapp/app/controllers/app-table-columns.js | 2 +- .../main/webapp/app/controllers/yarn-app-attempt.js | 2 +- .../src/main/webapp/app/controllers/yarn-app.js | 2 +- .../app/controllers/yarn-component-instance.js | 4 ++-- .../app/controllers/yarn-component-instances.js | 2 +- .../src/main/webapp/app/templates/yarn-app.hbs | 12 ++++++------ 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js index fb002f9d25c..33e3bb70e14 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js @@ -122,7 +122,7 @@ export default Ember.Controller.extend({ getCellContent: function(row) { return { displayText: row.get('appName'), - href: `#/yarn-app/${row.id}/attempts?service=${row.get('appName')}` + href: `#/yarn-app/${row.id}/components?service=${row.get('appName')}` }; } }, { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js index 504b66e004d..4c8b8a1cd25 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js @@ -50,7 +50,7 @@ export default Ember.Controller.extend({ routeName: 'yarn-services' }, { text: `${serviceName} [${appId}]`, - href: `#/yarn-app/${appId}/info?service=${serviceName}` + href: `#/yarn-app/${appId}/components?service=${serviceName}` }, { text: "Attempts", href: `#/yarn-app/${appId}/attempts?service=${serviceName}` 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 b84f328a81f..b2b99b14f85 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 @@ -102,7 +102,7 @@ export default Ember.Controller.extend({ routeName: 'yarn-services' }, { text: `${serviceName} [${appId}]`, - href: `#/yarn-app/${appId}/info?service=${serviceName}` + href: `#/yarn-app/${appId}/components?service=${serviceName}` }); } else { breadcrumbs.push({ 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 4b8dbf404e8..358c6b13960 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 @@ -43,13 +43,13 @@ export default Ember.Controller.extend({ if (appId && serviceName && componentName && instanceName) { crumbs.push({ text: `${serviceName} [${appId}]`, - href: `#/yarn-app/${appId}/info?service=${serviceName}` + href: `#/yarn-app/${appId}/components?service=${serviceName}` }, { text: 'Components', href: `#/yarn-app/${appId}/components?service=${serviceName}` }, { text: `${componentName}`, - href: `#/yarn-component-instances/${componentName}/info?service=${serviceName}&&appid=${appId}` + href: `#/yarn-component-instances/${componentName}/components?service=${serviceName}&&appid=${appId}` }, { text: `${instanceName}` }); 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 965631cdae8..073d043e4a2 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 @@ -42,7 +42,7 @@ export default Ember.Controller.extend({ if (appId && serviceName && componentName) { crumbs.push({ text: `${serviceName} [${appId}]`, - href: `#/yarn-app/${appId}/info?service=${serviceName}` + href: `#/yarn-app/${appId}/components?service=${serviceName}` }, { text: 'Components', href: `#/yarn-app/${appId}/components?service=${serviceName}` 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 992b979b431..d29ec4dbf36 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 @@ -108,12 +108,6 @@