diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js index 8a34f1a..1c7a7c3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js @@ -35,6 +35,7 @@ export default Ember.Controller.extend({ contentPath: 'id', cellComponentName: 'em-table-linked-cell', minWidth: "250px", + facetType: null, getCellContent: function(row) { return { displayText: row.id, @@ -69,6 +70,7 @@ export default Ember.Controller.extend({ headerTitle: 'Progress', contentPath: 'progress', cellComponentName: 'em-table-progress-cell', + facetType: null, cellDefinition: { valueMax: 100 } @@ -76,10 +78,12 @@ export default Ember.Controller.extend({ id: 'stTime', headerTitle: 'Start Time', contentPath: 'startTime', + facetType: null, }, { id: 'elTime', headerTitle: 'Elapsed Time', contentPath: 'elapsedTime', + facetType: null, cellDefinition: { type: "duration" } @@ -87,6 +91,7 @@ export default Ember.Controller.extend({ id: 'finishTime', headerTitle: 'Finished Time', contentPath: 'validatedFinishedTs', + facetType: null, observePath: true }, { id: 'priority', 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 fffaf17..a1b25ce 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 @@ -22,7 +22,9 @@ import AppTableController from '../app-table-columns'; export default AppTableController.extend({ queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'], - tableDefinition: TableDefinition.create(), + tableDefinition: TableDefinition.create({ + enableFaceting: true + }), 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/bower.json hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json index e1ab943..11fae3e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json @@ -21,6 +21,7 @@ "spin.js": "~2.3.2", "momentjs": "~2.10.6", "select2": "4.0.0", - "snippet-ss": "~1.11.0" + "snippet-ss": "~1.11.0", + "alasql": "^0.4.3" } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js index 3c478be..3ff3c02 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js @@ -38,7 +38,6 @@ module.exports = function(environment) { 'connect-src': "* 'self'", 'child-src': "'self' 'unsafe-inline'", 'style-src': "'self' 'unsafe-inline'", - 'script-src': "'self' 'unsafe-inline'" } }; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js index 4799f92..6af45fc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js @@ -49,6 +49,7 @@ module.exports = function(defaults) { app.import('bower_components/bootstrap/dist/css/bootstrap.css'); app.import('bower_components/bootstrap/dist/css/bootstrap-theme.css'); app.import('bower_components/bootstrap/dist/js/bootstrap.min.js'); + app.import('bower_components/alasql/dist/alasql.js'); // Use `app.import` to add additional libraries to the generated // output files. 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 2830be3..9b2c1e4 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 @@ -56,6 +56,6 @@ }, "dependencies": { "em-helpers": "^0.8.0", - "em-table": "^0.7.0" + "em-table": "0.11.3" } } 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 c63daea..dc45d7e 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 @@ -1402,9 +1402,9 @@ em-helpers@^0.8.0: optionalDependencies: phantomjs-prebuilt "2.1.13" -em-table@^0.7.0: - version "0.7.2" - resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.7.2.tgz#867ff734701df9765f2505e02acd74768edb0f71" +em-table@0.11.3: + version "0.11.3" + resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.11.3.tgz#20e605cc3814214e644199399a2383cee8d23eeb" dependencies: ember-cli-htmlbars "^1.0.1" ember-cli-less "^1.4.0"