diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js index e23d991..65a8cb1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js @@ -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, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js index 812f1e6..5981eb5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js @@ -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'); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js index bfd6299..55d5a88 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js @@ -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 }), diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js index 0d1a4bb..44cfe17 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js @@ -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'); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js index 6ffd1ee..b72afc4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js @@ -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', diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js index 97b1e07..12e3c49 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js @@ -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')); }), diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js index 7aeae19..f6a6ee6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js @@ -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'), diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js index c10624e..1ce6306 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js @@ -22,6 +22,7 @@ import AppTableController from '../app-table-columns'; export default AppTableController.extend({ tableDefinition: TableDefinition.create({ + searchType: 'manual', enableFaceting: true, rowCount: 25 }), diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js index 0f7a330..1af915e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js @@ -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, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js index 86b4177..2984346 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js @@ -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', {}) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs index 13348b2..b7cdb59 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs @@ -57,7 +57,7 @@
- {{em-table columns=gridColumns rows=gridRows}} + {{em-table columns=gridColumns rows=gridRows definition=tableDefinition}}
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs index c5d406f..a137088 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs @@ -17,5 +17,5 @@ }}
- {{em-table columns=tableColumns rows=model.components}} + {{em-table columns=tableColumns rows=model.components definition=tableDefinition}}
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs index fb4dba2..0a4aafe 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs @@ -19,7 +19,7 @@

Component: {{model.componentName}}

- {{em-table columns=tableColumns rows=model.instances}} + {{em-table columns=tableColumns rows=model.instances definition=tableDefinition}}
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs index f7e726c..dac8fd9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs @@ -87,7 +87,7 @@

Applications

- {{em-table columns=columns rows=model.apps}} + {{em-table columns=columns rows=model.apps definition=tableDefinition}} {{#if (and cpuVCoresVizData.length vizWidgets.cpuVcores)}}
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs index 1863237..026c6e2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs @@ -20,15 +20,15 @@

GENERAL Metrics

-{{em-table columns=columns rows=generalConfigRows}} +{{em-table columns=columns rows=generalConfigRows definition=tableDefinition}} {{#if mapMetrics}}

MAP Metrics

- {{em-table columns=columns rows=mapConfigRows}} + {{em-table columns=columns rows=mapConfigRows definition=tableDefinition}} {{/if}} {{#if reduceMetrics}}

REDUCER Metrics

- {{em-table columns=columns rows=reduceConfigRows}} + {{em-table columns=columns rows=reduceConfigRows definition=tableDefinition}} {{/if}} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs index f4c799d..09a1410 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs @@ -17,12 +17,12 @@ }}

Core Configuration

-{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel rowCount=10}} +{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel rowCount=10 definition=tableDefinition}}

YARN Configuration

-{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel rowCount=10}} +{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel rowCount=10 definition=tableDefinition}}

MapReduce Configuration

-{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel rowCount=10}} +{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel rowCount=10 definition=tableDefinition}} {{outlet}} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json index 234d0f0..457ce47 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json @@ -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" } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock index fb35ea7..a9b3ab7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock @@ -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"