diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
index 274217afc68..81c3018dd52 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
@@ -18,72 +18,10 @@
{{breadcrumb-bar breadcrumbs=breadcrumbs}}
-
-
-
-
-
-
-
-
-
-
-
- Finished Services
-
-
- {{donut-chart data=getFinishedServicesDataForDonutChart
- showLabels=true
- parentId="finishedapps-donut-chart"
- ratio=0.6
- maxHeight=350
- colorTargets="good warn error"
- }}
-
-
-
-
-
-
-
- Running Services
-
-
- {{donut-chart data=getRunningServicesDataForDonutChart
- showLabels=true
- parentId="runningapps-donut-chart"
- ratio=0.6
- maxHeight=350
- colorTargets="warn good"
- }}
-
-
-
-
-
-
- {{#if model.apps}}
- {{em-table columns=serviceColumns rows=model.apps definition=tableDefinition}}
- {{else}}
-
Could not find any services from this cluster
- {{/if}}
-
-
+
+ {{#if model.apps}}
+ {{em-table columns=serviceColumns rows=model.apps definition=tableDefinition}}
+ {{else}}
+
Could not find any services from this cluster
+ {{/if}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
index e1ab943fc18..11fae3ea960 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
+++ b/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 a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js
index 3c478bee775..3ff3c02984a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js
+++ b/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 a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index 4799f9286f0..6af45fc9c35 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/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 a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json
index 875bb90cd69..c892e33be36 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json
@@ -2,5 +2,13 @@
"compilerOptions": {
"target": "ES6",
"module": "commonjs"
- }
+ },
+ "exclude": [
+ "node_modules",
+ "dist",
+ "bower_components",
+ "jspm_packages",
+ "tmp",
+ "temp"
+ ]
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index 2830be371c9..9b2c1e48987 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/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 a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-simple-status-cell-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-simple-status-cell-test.js
new file mode 100644
index 00000000000..5cc03ea9644
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-simple-status-cell-test.js
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('em-table-simple-status-cell', 'Integration | Component | em table simple status cell', {
+ integration: true
+});
+
+test('it renders', function(assert) {
+
+ // Set any properties with this.set('myProperty', 'value');
+ // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+
+ this.render(hbs`{{em-table-simple-status-cell}}`);
+
+ assert.equal(this.$().text().trim(), '');
+
+ // Template block usage:" + EOL +
+ this.render(hbs`
+ {{#em-table-simple-status-cell}}
+ template block text
+ {{/em-table-simple-status-cell}}
+ `);
+
+ assert.equal(this.$().text().trim(), 'template block text');
+});
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
index c63daea4c4e..dc45d7e5815 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
+++ b/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"