big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-7828. Clicking on yarn service should take to component tab. (Sunil G via wangda)

Browse Source 
Change-Id: Ib52d6727c863bed65de30b02bf60080255af11b8
This commit is contained in:
Wangda Tan 2018-01-31 21:43:08 +08:00
parent 64344c345d
commit 5ca4bf22dd
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
View File

@ -122,7 +122,7 @@ export default Ember.Controller.extend({
getCellContent: function(row) { getCellContent: function(row) {
return { return {
displayText: row.get('appName'), displayText: row.get('appName'),
href: `#/yarn-app/${row.id}/attempts?service=${row.get('appName')}` href: `#/yarn-app/${row.id}/components?service=${row.get('appName')}`
}; };
} }
}, { }, {

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
View File

@ -50,7 +50,7 @@ export default Ember.Controller.extend({
routeName: 'yarn-services' routeName: 'yarn-services'
}, { }, {
text: `${serviceName} [${appId}]`, text: `${serviceName} [${appId}]`,
href: `#/yarn-app/${appId}/info?service=${serviceName}` href: `#/yarn-app/${appId}/components?service=${serviceName}`
}, { }, {
text: "Attempts", text: "Attempts",
href: `#/yarn-app/${appId}/attempts?service=${serviceName}` href: `#/yarn-app/${appId}/attempts?service=${serviceName}`

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
View File

@ -102,7 +102,7 @@ export default Ember.Controller.extend({
routeName: 'yarn-services' routeName: 'yarn-services'
}, { }, {
text: `${serviceName} [${appId}]`, text: `${serviceName} [${appId}]`,
href: `#/yarn-app/${appId}/info?service=${serviceName}` href: `#/yarn-app/${appId}/components?service=${serviceName}`
}); });
} else { } else {
breadcrumbs.push({ breadcrumbs.push({

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js
View File

@ -43,13 +43,13 @@ export default Ember.Controller.extend({
if (appId && serviceName && componentName && instanceName) { if (appId && serviceName && componentName && instanceName) {
crumbs.push({ crumbs.push({
text: `${serviceName} [${appId}]`, text: `${serviceName} [${appId}]`,
href: `#/yarn-app/${appId}/info?service=${serviceName}` href: `#/yarn-app/${appId}/components?service=${serviceName}`
}, { }, {
text: 'Components', text: 'Components',
href: `#/yarn-app/${appId}/components?service=${serviceName}` href: `#/yarn-app/${appId}/components?service=${serviceName}`
}, { }, {
text: `${componentName}`, text: `${componentName}`,
href: `#/yarn-component-instances/${componentName}/info?service=${serviceName}&&appid=${appId}` href: `#/yarn-component-instances/${componentName}/components?service=${serviceName}&&appid=${appId}`
}, { }, {
text: `${instanceName}` text: `${instanceName}`
}); });

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js
View File

@ -42,7 +42,7 @@ export default Ember.Controller.extend({
if (appId && serviceName && componentName) { if (appId && serviceName && componentName) {
crumbs.push({ crumbs.push({
text: `${serviceName} [${appId}]`, text: `${serviceName} [${appId}]`,
href: `#/yarn-app/${appId}/info?service=${serviceName}` href: `#/yarn-app/${appId}/components?service=${serviceName}`
}, { }, {
text: 'Components', text: 'Components',
href: `#/yarn-app/${appId}/components?service=${serviceName}` href: `#/yarn-app/${appId}/components?service=${serviceName}`

12
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
View File

@ -108,12 +108,6 @@
<div class="clearfix"> <div class="clearfix">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<ul class="nav nav-pills collapse in"> <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}} {{#if model.serviceName}}
{{#link-to 'yarn-app.components' tagName="li" class=(if (eq target.currentPath 'yarn-app.components') "active")}} {{#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}} {{#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 &amp; Metrics{{/link-to}} {{#link-to 'yarn-app.configs' appId (query-params service=model.serviceName)}}Configurations &amp; Metrics{{/link-to}}
{{/link-to}} {{/link-to}}
{{/if}} {{/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' 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 'yarn-app.info' appId (query-params service=model.serviceName)}}Diagnostics{{/link-to}}
{{/link-to}} {{/link-to}}