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

YARN-7802. [UI2] Application regex search did not work properly with app name. Contributed by Sreenath Somarajapuram.

Browse Source
This commit is contained in:
Sunil G 2018-01-31 17:40:36 +05:30
parent 5206b2c7ca
commit 64344c345d
18 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
View File

@ -19,8 +19,13 @@
import Ember from 'ember';
import Converter from 'yarn-ui/utils/converter';
import ColumnDef from 'em-table/utils/column-definition';
import TableDefinition from 'em-table/utils/table-definition';
export default Ember.Component.extend({
tableDefinition: TableDefinition.create({
searchType: 'manual',
}),
canvas: {
svg: undefined,
h: 0,

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

@ -18,11 +18,16 @@
import Ember from 'ember';
import ColumnDef from 'em-table/utils/column-definition';
import TableDefinition from 'em-table/utils/table-definition';
export default Ember.Controller.extend({
queryParams: ["service"],
service: undefined,
tableDefinition: TableDefinition.create({
searchType: 'manual',
}),
tableColumns: Ember.computed('model.appId', 'model.serviceName', function() {
var cols = [];
var service = this.get('model.serviceName');

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

@ -23,6 +23,7 @@ import AppTableController from '../app-table-columns';
export default AppTableController.extend({
queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
tableDefinition: TableDefinition.create({
searchType: 'manual',
enableFaceting: true,
rowCount: 25
}),

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

@ -18,12 +18,17 @@
import Ember from 'ember';
import ColumnDef from 'em-table/utils/column-definition';
import TableDefinition from 'em-table/utils/table-definition';
export default Ember.Controller.extend({
queryParams: ["service", "appid"],
appid: undefined,
service: undefined,
tableDefinition: TableDefinition.create({
searchType: 'manual',
}),
tableColumns: Ember.computed('model.appId', 'model.serviceName', function() {
var cols = [];
var appId = this.get('model.appId');

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
View File

@ -19,10 +19,15 @@
import Ember from 'ember';
import ColumnDef from 'em-table/utils/column-definition';
import Converter from 'yarn-ui/utils/converter';
import TableDefinition from 'em-table/utils/table-definition';
function createColumn() {
var columns = [];
tableDefinition: TableDefinition.create({
searchType: 'manual',
}),
// Generate columns
columns.push({
id: 'appId',

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js
View File

@ -18,6 +18,7 @@
import Ember from 'ember';
import ColumnDef from 'em-table/utils/column-definition';
import TableDefinition from 'em-table/utils/table-definition';
function _createColumns() {
var columns = [];
@ -50,6 +51,10 @@ export default Ember.Controller.extend({
reduceMetrics: null,
generalMetrics: null,
tableDefinition: TableDefinition.create({
searchType: 'manual',
}),
columns: Ember.computed(function() {
return _createColumns(this.get('model.flowrun_uid'));
}),

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

@ -23,7 +23,9 @@ import TableDefinition from 'em-table/utils/table-definition';
export default Ember.Controller.extend({
queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
tableDefinition: TableDefinition.create(),
tableDefinition: TableDefinition.create({
searchType: 'manual',
}),
searchText: Ember.computed.alias('tableDefinition.searchText'),
sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js
View File

@ -22,6 +22,7 @@ import AppTableController from '../app-table-columns';
export default AppTableController.extend({
tableDefinition: TableDefinition.create({
searchType: 'manual',
enableFaceting: true,
rowCount: 25
}),

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

@ -23,6 +23,7 @@ import TableDefinition from 'em-table/utils/table-definition';
export default AppTableController.extend({
queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
tableDefinition: TableDefinition.create({
searchType: 'manual',
sortColumnId: 'stTime',
sortOrder: 'desc',
rowCount: 25,

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

@ -24,6 +24,10 @@ import ColumnDef from 'em-table/utils/column-definition';
import YarnConf from '../../models/yarn-conf';
export default Ember.Controller.extend({
tableDefinition: TableDef.create({
searchType: 'manual',
}),
init: function () {
var that = this;
this.get('store').query('yarn-conf', {})

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
View File

@ -57,7 +57,7 @@
</div>
</div>
<div role="tabpanel" class="tab-pane" id="gridViewTab">
{{em-table columns=gridColumns rows=gridRows}}
{{em-table columns=gridColumns rows=gridRows definition=tableDefinition}}
</div>
</div>
</div>

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

@ -17,5 +17,5 @@
}}
<div class="col-md-12 yarn-applications-container">
{{em-table columns=tableColumns rows=model.components}}
{{em-table columns=tableColumns rows=model.components definition=tableDefinition}}
</div>

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs
View File

@ -19,7 +19,7 @@
<div class="row">
<div class="col-md-12">
<h3>Component: {{model.componentName}}</h3>
{{em-table columns=tableColumns rows=model.instances}}
{{em-table columns=tableColumns rows=model.instances definition=tableDefinition}}
</div>
</div>

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs
View File

@ -87,7 +87,7 @@
<!-- Flowrun aggregated data -->
<h3>Applications</h3>
{{em-table columns=columns rows=model.apps}}
{{em-table columns=columns rows=model.apps definition=tableDefinition}}
{{#if (and cpuVCoresVizData.length vizWidgets.cpuVcores)}}
<div class="panel panel-default">

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs
View File

@ -20,15 +20,15 @@
<hr>
<h3>GENERAL Metrics</h3>
{{em-table columns=columns rows=generalConfigRows}}
{{em-table columns=columns rows=generalConfigRows definition=tableDefinition}}
{{#if mapMetrics}}
<hr>
<h3>MAP Metrics</h3>
{{em-table columns=columns rows=mapConfigRows}}
{{em-table columns=columns rows=mapConfigRows definition=tableDefinition}}
{{/if}}
{{#if reduceMetrics}}
<h3>REDUCER Metrics</h3>
{{em-table columns=columns rows=reduceConfigRows}}
{{em-table columns=columns rows=reduceConfigRows definition=tableDefinition}}
{{/if}}

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
View File

@ -17,12 +17,12 @@
}}
<h1>Core Configuration</h1>
{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel rowCount=10}}
{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel rowCount=10 definition=tableDefinition}}
<h1>YARN Configuration</h1>
{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel rowCount=10}}
{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel rowCount=10 definition=tableDefinition}}
<h1>MapReduce Configuration</h1>
{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel rowCount=10}}
{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel rowCount=10 definition=tableDefinition}}
{{outlet}}

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
View File

@ -40,6 +40,7 @@
"ember-cli-numeral": "^0.2.0",
"ember-cli-qunit": "1.2.1",
"ember-cli-release": "0.2.8",
"ember-cli-sass": "=7.0.0",
"ember-cli-sri": "1.2.1",
"ember-cli-uglify": "1.2.0",
"ember-d3": "0.1.0",
@ -52,11 +53,10 @@
"ember-truth-helpers": "1.3.0",
"loader.js": "4.2.3",
"select2": "4.0.0",
"testem": "0.9.11",
"ember-cli-sass": "=7.0.0"
"testem": "0.9.11"
},
"dependencies": {
"em-helpers": "^0.8.0",
"em-table": "0.11.3"
"em-table": "0.12.0"
}
}

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
View File

@ -1534,9 +1534,9 @@ em-helpers@^0.8.0:
optionalDependencies:
phantomjs-prebuilt "2.1.13"
em-table@0.11.3:
version "0.11.3"
resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.11.3.tgz#20e605cc3814214e644199399a2383cee8d23eeb"
em-table@0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.12.0.tgz#a47c63ab2a4a02a0d4a728ec3857bfa870fff08c"
dependencies:
ember-cli-htmlbars "^1.0.1"
ember-cli-less "^1.4.0"