YARN-7828. Clicking on yarn service should take to component tab. (Sunil G via wangda)
Change-Id: Ib52d6727c863bed65de30b02bf60080255af11b8 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5ca4bf22 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5ca4bf22 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5ca4bf22 Branch: refs/heads/YARN-6592 Commit: 5ca4bf22dd45d9ac1328c74204413d90725d1405 Parents: 64344c3 Author: Wangda Tan <wan...@apache.org> Authored: Wed Jan 31 21:43:08 2018 +0800 Committer: Wangda Tan <wan...@apache.org> Committed: Wed Jan 31 21:43:08 2018 +0800 ---------------------------------------------------------------------- .../main/webapp/app/controllers/app-table-columns.js | 2 +- .../src/main/webapp/app/controllers/yarn-app-attempt.js | 2 +- .../src/main/webapp/app/controllers/yarn-app.js | 2 +- .../webapp/app/controllers/yarn-component-instance.js | 4 ++-- .../webapp/app/controllers/yarn-component-instances.js | 2 +- .../src/main/webapp/app/templates/yarn-app.hbs | 12 ++++++------ 6 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ca4bf22/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js ---------------------------------------------------------------------- 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 fb002f9..33e3bb7 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')}` }; } }, { http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ca4bf22/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js ---------------------------------------------------------------------- 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 504b66e..4c8b8a1 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}` http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ca4bf22/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js ---------------------------------------------------------------------- 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 b84f328..b2b99b1 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({ http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ca4bf22/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js ---------------------------------------------------------------------- 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 4b8dbf4..358c6b1 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}` }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ca4bf22/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js ---------------------------------------------------------------------- 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 965631c..073d043 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}` http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ca4bf22/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs ---------------------------------------------------------------------- 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 992b979..d29ec4d 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 @@ <div class="clearfix"> <ul class="nav nav-pills"> <ul class="nav nav-pills collapse in"> - {{#link-to 'yarn-app.attempts' tagName="li" class=(if (eq target.currentPath 'yarn-app.attempts') "active")}} - {{#link-to 'yarn-app.attempts' appId (query-params service=model.serviceName)}}Attempts List{{/link-to}} - {{/link-to}} - {{#link-to 'yarn-app.charts' tagName="li" class=(if (eq target.currentPath 'yarn-app.charts') "active")}} - {{#link-to 'yarn-app.charts' appId (query-params service=model.serviceName)}}Resource Usage{{/link-to}} - {{/link-to}} {{#if model.serviceName}} {{#link-to 'yarn-app.components' tagName="li" class=(if (eq target.currentPath 'yarn-app.components') "active")}} {{#link-to 'yarn-app.components' appId (query-params service=model.serviceName)}}Components{{/link-to}} @@ -122,6 +116,12 @@ {{#link-to 'yarn-app.configs' appId (query-params service=model.serviceName)}}Configurations & Metrics{{/link-to}} {{/link-to}} {{/if}} + {{#link-to 'yarn-app.attempts' tagName="li" class=(if (eq target.currentPath 'yarn-app.attempts') "active")}} + {{#link-to 'yarn-app.attempts' appId (query-params service=model.serviceName)}}Attempts List{{/link-to}} + {{/link-to}} + {{#link-to 'yarn-app.charts' tagName="li" class=(if (eq target.currentPath 'yarn-app.charts') "active")}} + {{#link-to 'yarn-app.charts' appId (query-params service=model.serviceName)}}Resource Usage{{/link-to}} + {{/link-to}} {{#link-to 'yarn-app.info' tagName="li" class=(if (eq target.currentPath 'yarn-app.info') "active")}} {{#link-to 'yarn-app.info' appId (query-params service=model.serviceName)}}Diagnostics{{/link-to}} {{/link-to}} --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
