You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jh...@apache.org on 2017/02/07 04:25:47 UTC
[03/23] hadoop git commit: YARN-5866. Fix few issues reported by
jshint in new YARN UI. Contributed by Akhil P B.
YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c6bae5a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c6bae5a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c6bae5a
Branch: refs/heads/YARN-5734
Commit: 4c6bae5a223f8e4f7ee302b506bbf4fcb67fb07b
Parents: 87852b6
Author: Sunil G <su...@apache.org>
Authored: Tue Jan 31 14:18:31 2017 +0530
Committer: Sunil G <su...@apache.org>
Committed: Tue Jan 31 14:18:31 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn-ui/src/main/webapp/.jshintrc | 5 ++-
.../src/main/webapp/app/adapters/abstract.js | 1 +
.../main/webapp/app/adapters/cluster-info.js | 4 +--
.../main/webapp/app/adapters/cluster-metric.js | 4 +--
.../webapp/app/adapters/yarn-app-attempt.js | 4 +--
.../src/main/webapp/app/adapters/yarn-app.js | 6 ++--
.../webapp/app/adapters/yarn-container-log.js | 4 +--
.../main/webapp/app/adapters/yarn-container.js | 12 +++----
.../src/main/webapp/app/adapters/yarn-node.js | 4 +--
.../src/main/webapp/app/adapters/yarn-queue.js | 4 +--
.../main/webapp/app/adapters/yarn-rm-node.js | 6 ++--
.../app/components/app-usage-donut-chart.js | 6 ++--
.../src/main/webapp/app/components/bar-chart.js | 36 +++++++++-----------
.../app/components/base-chart-component.js | 8 ++---
.../app/components/base-usage-donut-chart.js | 11 +++---
.../main/webapp/app/components/donut-chart.js | 10 +++---
.../main/webapp/app/components/nodes-heatmap.js | 21 ++++++------
...er-app-memusage-by-nodes-stacked-barchart.js | 4 +--
...app-ncontainers-by-nodes-stacked-barchart.js | 4 +--
.../app/components/queue-usage-donut-chart.js | 4 +--
.../main/webapp/app/components/queue-view.js | 11 +++---
.../main/webapp/app/components/simple-table.js | 6 ++--
.../webapp/app/components/stacked-barchart.js | 23 +++++++------
.../main/webapp/app/components/timeline-view.js | 25 ++++++++------
.../main/webapp/app/components/tree-selector.js | 33 +++++++++---------
.../main/webapp/app/controllers/application.js | 8 ++---
.../src/main/webapp/app/helpers/divide.js | 2 +-
.../main/webapp/app/helpers/log-files-comma.js | 5 ++-
.../src/main/webapp/app/helpers/node-link.js | 2 +-
.../src/main/webapp/app/helpers/node-menu.js | 10 +++---
.../src/main/webapp/app/helpers/node-name.js | 4 +--
.../src/main/webapp/app/initializers/loader.js | 8 +++--
.../main/webapp/app/models/yarn-app-attempt.js | 17 ++++-----
.../src/main/webapp/app/models/yarn-app.js | 8 ++---
.../src/main/webapp/app/models/yarn-node-app.js | 8 ++---
.../webapp/app/models/yarn-node-container.js | 12 +++----
.../src/main/webapp/app/models/yarn-queue.js | 14 ++++----
.../src/main/webapp/app/models/yarn-rm-node.js | 10 +++---
.../src/main/webapp/app/models/yarn-user.js | 2 +-
.../src/main/webapp/app/routes/application.js | 3 +-
.../main/webapp/app/routes/yarn-app-attempts.js | 2 --
.../src/main/webapp/app/routes/yarn-app.js | 2 +-
.../webapp/app/routes/yarn-container-log.js | 2 +-
.../main/webapp/app/routes/yarn-queues/index.js | 2 ++
.../webapp/app/serializers/yarn-app-attempt.js | 23 ++++++-------
.../src/main/webapp/app/serializers/yarn-app.js | 13 +++----
.../app/serializers/yarn-container-log.js | 3 +-
.../webapp/app/serializers/yarn-container.js | 22 +++++-------
.../webapp/app/serializers/yarn-node-app.js | 24 ++-----------
.../app/serializers/yarn-node-container.js | 7 ++--
.../main/webapp/app/serializers/yarn-node.js | 8 ++---
.../main/webapp/app/serializers/yarn-queue.js | 10 +++---
.../main/webapp/app/serializers/yarn-rm-node.js | 7 ++--
.../src/main/webapp/app/utils/color-utils.js | 6 ++--
.../src/main/webapp/app/utils/converter.js | 2 +-
.../main/webapp/app/utils/href-address-utils.js | 2 --
.../src/main/webapp/app/utils/mock.js | 4 +--
.../src/main/webapp/app/utils/sorter.js | 8 ++---
.../src/main/webapp/ember-cli-build.js | 2 +-
.../unit/models/yarn-container-log-test.js | 1 +
.../tests/unit/models/yarn-node-app-test.js | 1 +
.../unit/models/yarn-node-container-test.js | 1 +
.../webapp/tests/unit/models/yarn-node-test.js | 1 +
.../tests/unit/models/yarn-rm-node-test.js | 1 +
.../unit/routes/yarn-container-log-test.js | 24 ++++++-------
.../tests/unit/routes/yarn-node-app-test.js | 28 +++++++--------
.../tests/unit/routes/yarn-node-apps-test.js | 30 ++++++++--------
.../unit/routes/yarn-node-container-test.js | 28 +++++++--------
.../unit/routes/yarn-node-containers-test.js | 30 ++++++++--------
.../webapp/tests/unit/routes/yarn-node-test.js | 4 +--
.../webapp/tests/unit/routes/yarn-nodes-test.js | 2 +-
71 files changed, 313 insertions(+), 356 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
index 08096ef..63cfe40 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
@@ -2,7 +2,10 @@
"predef": [
"document",
"window",
- "-Promise"
+ "-Promise",
+ "d3",
+ "$",
+ "moment"
],
"browser": true,
"boss": true,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
index c7e5c36..0db27a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
@@ -16,6 +16,7 @@
* limitations under the License.
*/
import Ember from 'ember';
+import DS from 'ember-data';
export default DS.JSONAPIAdapter.extend({
address: null, //Must be set by inheriting classes
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
index f79df92..0665499 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
@@ -24,7 +24,7 @@ export default AbstractAdapter.extend({
serverName: "RM",
// Any cluster-info specific adapter changes must be added here
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return ''; // move to some common place, return path by modelname.
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
index 8325a4c..f431340 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
@@ -24,7 +24,7 @@ export default AbstractAdapter.extend({
serverName: "RM",
// Any cluster-metric specific adapter changes must be added here
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return ''; // move to some common place, return path by modelname.
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
index 78f5e02..2389f16 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
@@ -24,12 +24,12 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- urlForQuery(query, modelName) {
+ urlForQuery(query/*, modelName*/) {
var url = this._buildURL();
return url + '/apps/' + query.appId + "/appattempts";
},
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
return url + '/apps/' +
Converter.attemptIdToAppId(id) + "/appattempts/" + id;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
index 67a2847..b34c606 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
@@ -23,7 +23,7 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- urlForQuery(query, modelName) {
+ urlForQuery(query/*, modelName*/) {
var url = this._buildURL();
if (query.state) {
url = url + '/apps/?state=' + query.state;
@@ -31,13 +31,13 @@ export default AbstractAdapter.extend({
return url;
},
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
url = url + '/apps/' + id;
return url;
},
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return 'apps'; // move to some common place, return path by modelname.
},
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
index 9f2d5d7..8d1b12b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
@@ -37,7 +37,7 @@ export default DS.RESTAdapter.extend({
return this.get(`env.app.namespaces.node`);
}),
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var splits = Converter.splitForContainerLogs(id);
var nodeHttpAddr = splits[0];
var containerId = splits[1];
@@ -68,7 +68,7 @@ export default DS.RESTAdapter.extend({
hash.context = this;
var headers = Ember.get(this, 'headers');
- if (headers != undefined) {
+ if (headers !== undefined) {
hash.beforeSend = function (xhr) {
Object.keys(headers).forEach(function (key) {
return xhr.setRequestHeader(key, headers[key]);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
index fd6a6f8..348a805 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
@@ -25,14 +25,14 @@ export default DS.JSONAPIAdapter.extend({
},
host: function() {
- return undefined
+ return undefined;
}.property(),
namespace: function() {
- return undefined
+ return undefined;
}.property(),
- urlForQuery(query, modelName) {
+ urlForQuery(query/*, modelName*/) {
var rmHosts = this.get(`hosts.rmWebAddress`);
var tsHosts = this.get(`hosts.timelineWebAddress`);
var rmNamespaces = this.get(`env.app.namespaces.cluster`);
@@ -47,8 +47,8 @@ export default DS.JSONAPIAdapter.extend({
}
var url = this._buildURL();
- url = url + '/apps/' + Converter.attemptIdToAppId(query.app_attempt_id)
- + "/appattempts/" + query.app_attempt_id + "/containers";
+ url = url + '/apps/' + Converter.attemptIdToAppId(query.app_attempt_id) +
+ "/appattempts/" + query.app_attempt_id + "/containers";
console.log(url);
return url;
},
@@ -58,6 +58,6 @@ export default DS.JSONAPIAdapter.extend({
hash.crossDomain = true;
hash.xhrFields = {withCredentials: true};
hash.targetServer = "RM";
- return this._super(url, method, hash);
+ return this._super(url, method, hash);
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
index 5bcfc9a..1436bc1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
@@ -24,10 +24,10 @@ export default AbstractAdapter.extend({
restNameSpace: "node",
serverName: "NM",
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
url = url.replace("{nodeAddress}", id);
return url;
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
index 41cd442..f2017df 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
@@ -23,8 +23,8 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return 'scheduler'; // move to some common place, return path by modelname.
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
index a24c399..6783ded 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
@@ -23,14 +23,14 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return 'nodes';
},
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
url = url + "/nodes/" + id;
return url;
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
index 90f41fc..274c219 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
-import DonutChart from 'yarn-ui/components/donut-chart';
import BaseUsageDonutChart from 'yarn-ui/components/base-usage-donut-chart';
import ColorUtils from 'yarn-ui/utils/color-utils';
import HrefAddressUtils from 'yarn-ui/utils/href-address-utils';
@@ -52,11 +50,11 @@ export default BaseUsageDonutChart.extend({
usageByApps.push({
label: "Available",
value: avail.toFixed(4)
- })
+ });
this.colors = ColorUtils.getColors(usageByApps.length, ["others", "good"], true);
this.renderDonutChart(usageByApps, this.get("title"), this.get("showLabels"),
this.get("middleLabel"), "100%", "%");
},
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
index a5c49a9..05d78eb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
@@ -55,17 +55,15 @@ export default BaseChartComponent.extend({
.domain([0, maxValue])
.range([0, maxBarWidth]);
+ var getBarText = function(i) {
+ return data[i].label;
+ };
// show bar text
- for (var i = 0; i < data.length; i++) {
+ for (i = 0; i < data.length; i++) {
g.append("text")
- .text(
- function() {
- return data[i].label;
- })
- .attr("y", function() {
- return layout.y1 + singleBarHeight / 2 + layout.margin + (gap +
- singleBarHeight) * i + 30;
- })
+ .text(getBarText(i))
+ .attr("y", layout.y1 + singleBarHeight / 2 + layout.margin +
+ (gap + singleBarHeight) * i + 30)
.attr("x", layout.x1 + layout.margin);
}
@@ -96,17 +94,15 @@ export default BaseChartComponent.extend({
return w;
});
+ var getBarValue = function(i) {
+ return data[i].value;
+ };
// show bar value
- for (var i = 0; i < data.length; i++) {
+ for (i = 0; i < data.length; i++) {
g.append("text")
- .text(
- function() {
- return data[i].value;
- })
- .attr("y", function() {
- return layout.y1 + singleBarHeight / 2 + layout.margin + (gap +
- singleBarHeight) * i + 30;
- })
+ .text(getBarValue(i))
+ .attr("y", layout.y1 + singleBarHeight / 2 + layout.margin +
+ (gap + singleBarHeight) * i + 30)
.attr("x", layout.x1 + layout.margin + textWidth + 15 + xScaler(data[i].value));
}
},
@@ -123,5 +119,5 @@ export default BaseChartComponent.extend({
didInsertElement: function() {
this.initChart();
this.draw();
- },
-})
\ No newline at end of file
+ }
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
index d221488..d11a532 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
@@ -96,7 +96,7 @@ export default Ember.Component.extend({
},
bindTooltip: function(d) {
- d.on("mouseover", function(d) {
+ d.on("mouseover", function() {
this.tooltip
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
@@ -108,16 +108,16 @@ export default Ember.Component.extend({
data = d.data;
}
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
var value = data.value;
- if (this.get("type") == "memory") {
+ if (this.get("type") === "memory") {
value = Converter.memoryToSimpliedUnit(value);
}
this.tooltip.html(data.label + " = " + value)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}.bind(this))
- .on("mouseout", function(d) {
+ .on("mouseout", function() {
this.tooltip.style("opacity", 0);
}.bind(this));
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
index bec06c9..201ae6c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
import DonutChart from 'yarn-ui/components/donut-chart';
export default DonutChart.extend({
@@ -29,15 +28,15 @@ export default DonutChart.extend({
var others = {
label: "Used by others",
value: 0
- }
+ };
- for (var i = nItemsKept; i < usages.length; i++) {
+ for (i = nItemsKept; i < usages.length; i++) {
others.value += Number(usages[i].value);
}
others.value = others.value.toFixed(2);
- arr.push(others)
+ arr.push(others);
return arr;
- },
-})
\ No newline at end of file
+ }
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index a2a21b3..e5699b4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -41,7 +41,7 @@ export default BaseChartComponent.extend({
}
if (!middleValue) {
- if (this.get("type") == "memory") {
+ if (this.get("type") === "memory") {
middleValue = Converter.memoryToSimpliedUnit(total);
} else {
middleValue = total;
@@ -111,7 +111,7 @@ export default BaseChartComponent.extend({
if (allZero) {
return this.colors[i];
}
- }.bind(this))
+ }.bind(this));
this.bindTooltip(path);
path.on("click", function (d) {
var data = d.data;
@@ -119,7 +119,7 @@ export default BaseChartComponent.extend({
this.tooltip.remove();
document.location.href = data.link;
}
- }.bind(this))
+ }.bind(this));
// Show labels
if (showLabels) {
@@ -147,7 +147,7 @@ export default BaseChartComponent.extend({
})
.text(function(d) {
var value = d.value;
- if (this.get("type") == "memory") {
+ if (this.get("type") === "memory") {
value = Converter.memoryToSimpliedUnit(value);
}
return d.label + ' = ' + value + suffix;
@@ -190,4 +190,4 @@ export default BaseChartComponent.extend({
this.initChart();
this.draw();
},
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index af8ceb3..5652834 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -17,7 +17,6 @@
*/
import BaseChartComponent from 'yarn-ui/components/base-chart-component';
-import Mock from 'yarn-ui/utils/mock';
export default BaseChartComponent.extend({
CELL_WIDTH: 250,
@@ -39,7 +38,7 @@ export default BaseChartComponent.extend({
// Handle pie chart case
var text = element.attr("tooltiptext");
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
this.tooltip.html(text)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
@@ -82,10 +81,10 @@ export default BaseChartComponent.extend({
2 * this.CELL_MARGIN;
var sampleYOffset = layout.margin * 2;
- for (var i = 1; i <= 5; i++) {
+ for (i = 1; i <= 5; i++) {
var ratio = i * 0.2 - 0.1;
- var rect = g.append("rect")
+ g.append("rect")
.attr("x", sampleXOffset)
.attr("y", sampleYOffset)
.attr("fill", colorFunc(ratio))
@@ -101,14 +100,14 @@ export default BaseChartComponent.extend({
var chartXOffset = -1;
- for (var i = 0; i < racksArray.length; i++) {
+ for (i = 0; i < racksArray.length; i++) {
var text = g.append("text")
.text(racksArray[i])
.attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
.attr("x", layout.margin)
.attr("class", "heatmap-rack");
- if (-1 == chartXOffset) {
+ if (-1 === chartXOffset) {
chartXOffset = layout.margin + text.node().getComputedTextLength() + 30;
}
@@ -118,10 +117,10 @@ export default BaseChartComponent.extend({
var rack = data[j].get("rack");
var host = data[j].get("nodeHostName");
- if (rack == racksArray[i]) {
+ if (rack === racksArray[i]) {
if (!rack.includes(this.filter) && !host.includes(this.filter)) {
this.addNode(g, xOffset, yOffset, colorFunc, data[j], false);
- var text = g.append("text")
+ g.append("text")
.text(host)
.attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
.attr("x", xOffset + this.CELL_WIDTH / 2)
@@ -151,7 +150,7 @@ export default BaseChartComponent.extend({
xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
}
- if (xOffset != chartXOffset) {
+ if (xOffset !== chartXOffset) {
xOffset = chartXOffset;
yOffset += this.CELL_MARGIN + this.CELL_HEIGHT;
}
@@ -182,7 +181,7 @@ export default BaseChartComponent.extend({
},
addPlaceholderNode: function(g, xOffset, yOffset) {
- var rect = g.append("rect")
+ g.append("rect")
.attr("y", yOffset)
.attr("x", xOffset)
.attr("height", this.CELL_HEIGHT)
@@ -206,4 +205,4 @@ export default BaseChartComponent.extend({
this.didInsertElement();
}
}
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
index 7feb7bb..65cbaf5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
@@ -28,7 +28,7 @@ export default StackedBarchart.extend({
{
used: Number(n.get("usedMemoryMB")),
avail: Number(n.get("availMemoryMB"))
- }
+ };
});
containers.forEach(function(c) {
@@ -85,4 +85,4 @@ export default StackedBarchart.extend({
data, this.get("title"), ["Used by this app", "Used by other apps",
"Available"]);
},
-})
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
index 251f557..4e45052 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
@@ -29,7 +29,7 @@ export default StackedBarchart.extend({
containers.forEach(function(c) {
var nodeId = c.get("assignedNodeId");
var n = nodeToContainers[nodeId];
- if (undefined != n) {
+ if (undefined !== n) {
nodeToContainers[nodeId] += 1;
}
});
@@ -64,4 +64,4 @@ export default StackedBarchart.extend({
this.show(
data, this.get("title"), ["Running containers from this app"]);
},
-})
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
index f5e7574..c939aaf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
-import DonutChart from 'yarn-ui/components/donut-chart';
import BaseUsageDonutChart from 'yarn-ui/components/base-usage-donut-chart';
import ColorUtils from 'yarn-ui/utils/color-utils';
import HrefAddressUtils from 'yarn-ui/utils/href-address-utils';
@@ -66,4 +64,4 @@ export default BaseUsageDonutChart.extend({
this.initChart();
this.draw();
},
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
index adedf9a..f5fb68d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
@@ -92,7 +92,7 @@ export default Ember.Component.extend(ChartUtilsMixin, {
circle.on('mouseover', function () {
}.bind(this));
circle.on('mouseout', function () {
- if (circle != this.queues.selectedQueueCircle) {
+ if (circle !== this.queues.selectedQueueCircle) {
circle.style("fill", this.queueColors[0]);
}
}.bind(this));
@@ -143,7 +143,6 @@ export default Ember.Component.extend(ChartUtilsMixin, {
// render queues
this.queues.dataGroup = this.canvas.svg.append("g")
.attr("id", "queues-g");
- var rootQueue = undefined;
if (this.queues.data) {
this.renderQueue(this.queues.data['root'], 0, 0);
@@ -185,7 +184,7 @@ export default Ember.Component.extend(ChartUtilsMixin, {
/*
* data = [{label="xx", value=},{...}]
*/
- renderTable: function (data, title, layout) {
+ renderTable: function (data) {
d3.select("#main-svg")
.append('table')
.selectAll('tr')
@@ -254,7 +253,7 @@ export default Ember.Component.extend(ChartUtilsMixin, {
for (var queueName in this.queues.data) {
var q = this.queues.data[queueName];
if ((!q.get("children")) || q.get("children")
- .length == 0) {
+ .length === 0) {
// it's a leafqueue
leafQueueUsedCaps.push({
label: q.get("name"),
@@ -274,10 +273,10 @@ export default Ember.Component.extend(ChartUtilsMixin, {
var queue = this.queues.data[queueName];
var idx = 0;
- if (queue.get("name") == "root") {
+ if (queue.get("name") === "root") {
this.renderLeafQueueUsedCapacities(this.getLayout(idx++));
}
- if (queue.get("name") != "root") {
+ if (queue.get("name") !== "root") {
this.renderQueueCapacities(queue, this.getLayout(idx++));
}
if (queue.get("children") && queue.get("children")
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
index 359583d..c5dadc3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
@@ -48,11 +48,11 @@ export default Ember.Component.extend({
var cols = this.get("colsOrder").split(' ');
for (i = 0; i < cols.length; i++) {
var col = cols[i].split(',');
- if (col.length != 2) {
+ if (col.length !== 2) {
continue;
}
var order = col[1].trim();
- if (order != 'asc' && order != 'desc') {
+ if (order !== 'asc' && order !== 'desc') {
continue;
}
var colOrder = [];
@@ -61,7 +61,7 @@ export default Ember.Component.extend({
orderArr.push(colOrder);
}
}
- if (orderArr.length == 0) {
+ if (orderArr.length === 0) {
var defaultOrder = [0, 'asc'];
orderArr.push(defaultOrder);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
index 4a121fe..e57d747 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
@@ -17,7 +17,6 @@
*/
import BaseChartComponent from 'yarn-ui/components/base-chart-component';
-import Mock from 'yarn-ui/utils/mock';
export default BaseChartComponent.extend({
MAX_BAR_HEIGHT: 120,
@@ -37,7 +36,7 @@ export default BaseChartComponent.extend({
// Handle pie chart case
var text = element.attr("tooltiptext");
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
this.tooltip.html(text)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
@@ -99,9 +98,13 @@ export default BaseChartComponent.extend({
var maxValue = 0;
var maxN = 0;
- for (var i = 0; i < data.length; i++) {
+
+ var i = 0;
+ var j = 0;
+
+ for (i = 0; i < data.length; i++) {
var total = 0;
- for (var j = 0; j < data[i].length; j++) {
+ for (j = 0; j < data[i].length; j++) {
total += data[i][j].value;
}
@@ -121,14 +124,14 @@ export default BaseChartComponent.extend({
return b[0].value - a[0].value;
});
- for (var i = 0; i < data.length; i++) {
- if (i % nBarPerRow == 0) {
+ for (i = 0; i < data.length; i++) {
+ if (i % nBarPerRow === 0) {
xOffset = layout.margin;
yOffset += layout.margin + height;
}
var leftTopY = yOffset;
- for (var j = 0; j < data[i].length; j++) {
+ for (j = 0; j < data[i].length; j++) {
var dy = data[i][j].value * height / maxValue;
if (dy > 0) {
leftTopY = leftTopY - dy;
@@ -148,7 +151,7 @@ export default BaseChartComponent.extend({
}
}
- if (data[i].length == 1) {
+ if (data[i].length === 1) {
g.append("text")
.text(data[i][0].value)
.attr("y", leftTopY - 10)
@@ -165,7 +168,7 @@ export default BaseChartComponent.extend({
this.renderTitleAndBG(g, title, layout, false);
},
- draw: function(data, title, textWidth) {
+ draw: function() {
this.initChart(true);
//Mock.initMockNodesData(this);
@@ -195,4 +198,4 @@ export default BaseChartComponent.extend({
this.didInsertElement();
}
}
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
index 516b114..d730a43 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
@@ -41,13 +41,15 @@ export default Ember.Component.extend({
}.property(),
setSelected: function(d) {
- if (this._selected == d) {
+ var dom;
+
+ if (this._selected === d) {
return;
}
// restore color
if (this._selected) {
- var dom = d3.select("#timeline-bar-" + this._selected.get("id"));
+ dom = d3.select("#timeline-bar-" + this._selected.get("id"));
dom.attr("fill", this.colors[0]);
}
@@ -164,19 +166,19 @@ export default Ember.Component.extend({
.attr("y", function(d, i) {
return border + (gap + singleBarHeight) * i;
})
- .attr("x", function(d, i) {
+ .attr("x", function(d) {
return border + textWidth + xScaler(d.get("startTs"));
})
.attr("height", singleBarHeight)
- .attr("fill", function(d, i) {
+ .attr("fill", function() {
return this.colors[0];
}.bind(this))
- .attr("width", function(d, i) {
+ .attr("width", function(d) {
var finishedTs = xScaler(d.get("finishedTs"));
finishedTs = finishedTs > 0 ? finishedTs : xScaler(end);
return finishedTs - xScaler(d.get("startTs"));
})
- .attr("id", function(d, i) {
+ .attr("id", function(d) {
return "timeline-bar-" + d.get("id");
});
bar.on("click", function(d) {
@@ -198,18 +200,18 @@ export default Ember.Component.extend({
},
bindTooltip: function(d) {
- d.on("mouseover", function(d) {
+ d.on("mouseover", function() {
this.tooltip
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}.bind(this))
.on("mousemove", function(d) {
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
this.tooltip.html(d.get("tooltipLabel"))
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}.bind(this))
- .on("mouseout", function(d) {
+ .on("mouseout", function() {
this.tooltip.style("opacity", 0);
}.bind(this));
},
@@ -244,7 +246,7 @@ export default Ember.Component.extend({
}.bind(this));
}
- if(this.modelArr.length == 0) {
+ if(this.modelArr.length === 0) {
return;
}
@@ -254,8 +256,9 @@ export default Ember.Component.extend({
return tsA - tsB;
});
+ var begin = 0;
if (this.modelArr.length > 0) {
- var begin = this.modelArr[0].get("startTs");
+ begin = this.modelArr[0].get("startTs");
}
var end = 0;
for (var i = 0; i < this.modelArr.length; i++) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index 5e7cfa0..c9e735d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -51,7 +51,7 @@ export default Ember.Component.extend({
this.map[o.id] = o;
}.bind(this));
- var selected = this.get("selected");
+ // var selected = this.get("selected");
this.initQueue("root", 1, this.treeData);
},
@@ -125,9 +125,9 @@ export default Ember.Component.extend({
// Enter any new nodes at the parent's previous position.
var nodeEnter = node.enter().append("g")
.attr("class", "node")
- .attr("transform", function(d) { return "translate(" + source.y0 + "," + source.x0 + ")"; })
- .on("mouseover", function(d,i){
- if (d.queueData.get("name") != this.get("selected")) {
+ .attr("transform", function() { return "translate(" + source.y0 + "," + source.x0 + ")"; })
+ .on("mouseover", function(d){
+ if (d.queueData.get("name") !== this.get("selected")) {
document.location.href = "#/yarn-queues/" + d.queueData.get("name");
}
@@ -161,10 +161,10 @@ export default Ember.Component.extend({
// append percentage
nodeEnter.append("text")
- .attr("x", function(d) { return 0; })
+ .attr("x", function() { return 0; })
.attr("dy", ".35em")
.attr("fill", "white")
- .attr("text-anchor", function(d) { return "middle"; })
+ .attr("text-anchor", function() { return "middle"; })
.text(function(d) {
var usedCap = d.queueData.get("usedCapacity");
if (usedCap >= 100.0) {
@@ -195,14 +195,14 @@ export default Ember.Component.extend({
return "#/yarn-queues/" + d.queueData.get("name");
})
.style("stroke-width", function(d) {
- if (d.queueData.get("name") == this.get("selected")) {
+ if (d.queueData.get("name") === this.get("selected")) {
return 7;
} else {
return 2;
}
}.bind(this))
.style("stroke", function(d) {
- if (d.queueData.get("name") == this.get("selected")) {
+ if (d.queueData.get("name") === this.get("selected")) {
return "gray";
} else {
return "gray";
@@ -215,7 +215,7 @@ export default Ember.Component.extend({
// Transition exiting nodes to the parent's new position.
var nodeExit = node.exit().transition()
.duration(duration)
- .attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; })
+ .attr("transform", function() { return "translate(" + source.y + "," + source.x + ")"; })
.remove();
nodeExit.select("circle")
@@ -231,9 +231,9 @@ export default Ember.Component.extend({
// Enter any new links at the parent's previous position.
link.enter().insert("path", "g")
.attr("class", "link")
- .attr("d", function(d) {
- var o = {x: source.x0, y: source.y0};
- return diagonal({source: o, target: o});
+ .attr("d", function() {
+ var o = {x: source.x0, y: source.y0};
+ return diagonal({source: o, target: o});
});
// Transition links to their new position.
@@ -244,9 +244,9 @@ export default Ember.Component.extend({
// Transition exiting nodes to the parent's new position.
link.exit().transition()
.duration(duration)
- .attr("d", function(d) {
- var o = {x: source.x, y: source.y};
- return diagonal({source: o, target: o});
+ .attr("d", function() {
+ var o = {x: source.x, y: source.y};
+ return diagonal({source: o, target: o});
})
.remove();
@@ -265,7 +265,6 @@ export default Ember.Component.extend({
var treeHeight = this.numOfLeafQueue * INBETWEEN_HEIGHT;
var width = treeWidth + margin.left + margin.right;
var height = treeHeight + margin.top + margin.bottom;
- var layout = { };
if (this.mainSvg) {
this.mainSvg.remove();
@@ -287,7 +286,7 @@ export default Ember.Component.extend({
root.x0 = height / 2;
root.y0 = 0;
- d3.select(self.frameElement).style("height", height);
+ d3.select(window.frameElement).style("height", height);
this.update(root, root, tree, diagonal);
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
index 2effb13..08ca5a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
@@ -29,22 +29,22 @@ export default Ember.Controller.extend({
outputMainMenu: function(){
var path = this.get('currentPath');
var html = '<li';
- if (path == 'yarn-queue') {
+ if (path === 'yarn-queue') {
html = html + ' class="active"';
}
html = html + '><a href="yarn-queue/root">Queues<span class="sr-only">' +
'(current)</span></a></li><li';
- if (path.lastIndexOf('yarn-app', 0) == 0) {
+ if (path.lastIndexOf('yarn-app', 0) === 0) {
html = html + ' class="active"';
}
html = html + '><a href="yarn-apps">Applications<span class="sr-only">' +
'(current)</span></a></li><li';
- if (path == 'cluster-overview') {
+ if (path === 'cluster-overview') {
html = html + ' class="active"';
}
html = html + '><a href="cluster-overview">Cluster Overview<span class=' +
'"sr-only">(current)</span></a></li><li';
- if (path.lastIndexOf('yarn-node', 0) == 0) {
+ if (path.lastIndexOf('yarn-node', 0) === 0) {
html = html + ' class="active"';
}
html = html + '><a href="yarn-nodes">Nodes<span class="sr-only">' +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
index fcf64dd..437def8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
@@ -24,7 +24,7 @@ import Ember from 'ember';
export default Ember.Helper.helper(function(params,hash) {
var num = hash.num;
var den = hash.den;
- if (den == 0) {
+ if (den === 0) {
return 0;
}
return Math.floor(num/den);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
index 192e1ed..78dcf25 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
@@ -27,19 +27,18 @@ export default Ember.Helper.helper(function(params,hash) {
return "";
}
var logFilesLen = logFiles.length;
- if (logFilesLen == 0) {
+ if (logFilesLen === 0) {
return "";
}
var nodeId = hash.nodeId;
var nodeAddr = hash.nodeAddr;
var containerId = hash.containerId;
var html = '<td>';
- var logFilesCommaSeparated = "";
for (var i = 0; i < logFilesLen; i++) {
html = html + '<a href="#/yarn-container-log/' + nodeId + '/' +
nodeAddr + '/' + containerId + '/' + logFiles[i] + '">' + logFiles[i] +
'</a>';
- if (i != logFilesLen - 1) {
+ if (i !== logFilesLen - 1) {
html = html + ",";
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
index e524f08..d71ac77 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
@@ -26,7 +26,7 @@ export default Ember.Helper.helper(function(params,hash) {
var nodeHTTPAddress = hash.nodeHTTPAddress;
var nodeId = hash.nodeId;
var html = '<td>';
- if (nodeState == "SHUTDOWN" || nodeState == "LOST") {
+ if (nodeState === "SHUTDOWN" || nodeState === "LOST") {
html = html + nodeHTTPAddress;
} else {
html = html + '<a href="#/yarn-node/' + nodeId + "/" + nodeHTTPAddress + '">' +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
index d4a73a4..e1eba5a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
@@ -25,7 +25,7 @@ export default Ember.Helper.helper(function(params,hash) {
// Place a menu within a panel inside col-md-2 container.
var nodeIdSplitAtPort = hash.nodeId;
var portIndex = nodeIdSplitAtPort.indexOf(':');
- if (portIndex != -1) {
+ if (portIndex !== -1) {
nodeIdSplitAtPort = nodeIdSplitAtPort.substring(0, portIndex) +
':​' + nodeIdSplitAtPort.substring(portIndex + 1);
}
@@ -35,7 +35,7 @@ export default Ember.Helper.helper(function(params,hash) {
var len = splitsAlongDots.length;
for (var i = 0; i < len; i++) {
normalizedNodeId = normalizedNodeId + splitsAlongDots[i];
- if (i != len - 1) {
+ if (i !== len - 1) {
normalizedNodeId = normalizedNodeId + '.​';
}
}
@@ -47,17 +47,17 @@ export default Ember.Helper.helper(function(params,hash) {
'<div class="panel-heading"><h4>Node Manager<br>(' + normalizedNodeId + ')</h4></div>'+
'<div class="panel-body"><ul class="nav nav-pills nav-stacked" id="stacked-menu">' +
'<ul class="nav nav-pills nav-stacked collapse in"><li';
- if (hash.path == 'yarn-node') {
+ if (hash.path === 'yarn-node') {
html = html + ' class="active"';
}
html = html + '><a href="#/yarn-node/' + hash.nodeId + '/' + hash.nodeAddr +
'">Node Information</a></li><li';
- if (hash.path == 'yarn-node-apps') {
+ if (hash.path === 'yarn-node-apps') {
html = html + ' class="active"';
}
html = html + '><a href="#/yarn-node-apps/' + hash.nodeId + '/' + hash.nodeAddr +
'">List of Applications</a></li><li';
- if (hash.path == 'yarn-node-containers') {
+ if (hash.path === 'yarn-node-containers') {
html = html + ' class="active"';
}
html = html + '><a href="#/yarn-node-containers/' +hash.nodeId + '/' + hash.nodeAddr +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
index 56ce373..75bc017 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
@@ -23,7 +23,7 @@ export function nodeName(params/*, hash*/) {
console.log('nodes-uid', params[0]);
var nodeIdSplitAtPort = params[0];
var portIndex = nodeIdSplitAtPort.indexOf(':');
- if (portIndex != -1) {
+ if (portIndex !== -1) {
nodeIdSplitAtPort = nodeIdSplitAtPort.substring(0, portIndex) +
':​' + nodeIdSplitAtPort.substring(portIndex + 1);
}
@@ -33,7 +33,7 @@ export function nodeName(params/*, hash*/) {
var len = splitsAlongDots.length;
for (var i = 0; i < len; i++) {
normalizedNodeId = normalizedNodeId + splitsAlongDots[i];
- if (i != len - 1) {
+ if (i !== len - 1) {
normalizedNodeId = normalizedNodeId + '.​';
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index 08e4dbd..aa8fb07 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -16,8 +16,11 @@
* limitations under the License.
*/
+/* globals ENV: true */
-function getTimeLineURL(parameters) {
+import Ember from 'ember';
+
+function getTimeLineURL() {
return '/conf?name=yarn.timeline-service.webapp.address';
}
@@ -37,7 +40,6 @@ function updateConfigs(application) {
}
if(!ENV.hosts.timelineWebAddress) {
- var result = [];
var timelinehost = "";
$.ajax({
type: 'GET',
@@ -54,7 +56,7 @@ function updateConfigs(application) {
Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
- if(address == "0.0.0.0" || address == "localhost") {
+ if(address === "0.0.0.0" || address === "localhost") {
var updatedAddress = hostname + ":" + port;
/* Timeline v2 is not supporting CORS, so make as default*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
index f30d143..c83eb2e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import Ember from 'ember';
import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
@@ -45,8 +46,8 @@ export default DS.Model.extend({
attemptStartedTime: function() {
var startTime = this.get("startTime");
// If startTime variable is not present, get from startedTime
- if (startTime == undefined ||
- startTime == "Invalid date") {
+ if (startTime === undefined ||
+ startTime === "Invalid date") {
startTime = this.get("startedTime");
}
@@ -80,7 +81,7 @@ export default DS.Model.extend({
appMasterContainerId: function() {
var id = this.get("containerId");
// If containerId variable is not present, get from amContainerId
- if (id == undefined) {
+ if (id === undefined) {
id = this.get("amContainerId");
}
return id;
@@ -89,16 +90,16 @@ export default DS.Model.extend({
IsAmNodeUrl: function() {
var url = this.get("nodeHttpAddress");
// If nodeHttpAddress variable is not present, hardcode it.
- if (url == undefined) {
+ if (url === undefined) {
url = "Not Available";
}
- return url != "Not Available";
+ return url !== "Not Available";
}.property("nodeHttpAddress"),
amNodeId : function() {
var id = this.get("nodeId");
// If nodeId variable is not present, get from host
- if (id == undefined) {
+ if (id === undefined) {
id = this.get("hosts");
}
return id;
@@ -107,10 +108,10 @@ export default DS.Model.extend({
IsLinkAvailable: function() {
var url = this.get("logsLink");
// If logsLink variable is not present, hardcode its.
- if (url == undefined) {
+ if (url === undefined) {
url = "Not Available";
}
- return url != "Not Available";
+ return url !== "Not Available";
}.property("logsLink"),
elapsedTime: function() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index 4138a87..ea1334f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -54,7 +54,7 @@ export default DS.Model.extend({
applicationExpiryTime: DS.attr('string'),
isFailed: function() {
- return this.get('finalStatus') == "FAILED"
+ return this.get('finalStatus') == "FAILED";
}.property("finalStatus"),
validatedFinishedTs: function() {
@@ -91,11 +91,11 @@ export default DS.Model.extend({
var finalStatus = this.get("finalStatus");
var style = "";
- if (finalStatus == "KILLED") {
+ if (finalStatus === "KILLED") {
style = "warning";
- } else if (finalStatus == "FAILED") {
+ } else if (finalStatus === "FAILED") {
style = "danger";
- } else if (finalStatus == "SUCCEEDED") {
+ } else if (finalStatus === "SUCCEEDED") {
style = "success";
} else {
style = "default";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
index 6dc69ae..bc2447f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
@@ -27,16 +27,16 @@ export default DS.Model.extend({
* Indicates no rows were retrieved from backend
*/
isDummyApp: function() {
- return this.get('id') == "dummy";
+ return this.get('id') === "dummy";
}.property("id"),
appStateStyle: function() {
var style = "default";
var appState = this.get("state");
- if (appState == "RUNNING" || appState == "FINISHING_CONTAINERS_WAIT" ||
- appState == "APPLICATION_RESOURCES_CLEANINGUP") {
+ if (appState === "RUNNING" || appState === "FINISHING_CONTAINERS_WAIT" ||
+ appState === "APPLICATION_RESOURCES_CLEANINGUP") {
style = "primary";
- } else if (appState == "FINISHED") {
+ } else if (appState === "FINISHED") {
style = "success";
}
return "label label-" + style;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
index 3ba3216..40e8447 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
@@ -32,24 +32,24 @@ export default DS.Model.extend({
* Indicates that there was no container retrieved from backend.
*/
isDummyContainer: function() {
- return this.get('id') == "dummy";
+ return this.get('id') === "dummy";
}.property("id"),
containerStateStyle: function() {
var style = "primary";
var containerState = this.get('state');
var containerExitCode = this.get('exitCode');
- if (containerState == "DONE") {
- if (containerExitCode == "0") {
+ if (containerState === "DONE") {
+ if (parseInt(containerExitCode) === 0) {
style = "success";
- } else if (containerExitCode != "N/A") {
+ } else if (containerExitCode !== "N/A") {
style = "danger";
}
}
- if (containerState == "EXITED_WITH_SUCCESS") {
+ if (containerState === "EXITED_WITH_SUCCESS") {
style = "success";
}
- if (containerState == "EXITED_WITH_FAILURE") {
+ if (containerState === "EXITED_WITH_FAILURE") {
style = "danger";
}
return "label label-" + style;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
index 7de4ccc..27c48f7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
@@ -48,17 +48,17 @@ export default DS.Model.extend({
return [
{
label: "Absolute Capacity",
- value: this.get("name") == "root" ? 100 : this.get("absCapacity")
+ value: this.get("name") === "root" ? 100 : this.get("absCapacity")
},
{
label: "Absolute Used",
- value: this.get("name") == "root" ? this.get("usedCapacity") : this.get("absUsedCapacity")
+ value: this.get("name") === "root" ? this.get("usedCapacity") : this.get("absUsedCapacity")
},
{
label: "Absolute Max Capacity",
- value: this.get("name") == "root" ? 100 : this.get("absMaxCapacity")
+ value: this.get("name") === "root" ? 100 : this.get("absMaxCapacity")
}
- ]
+ ];
}.property("absCapacity", "absUsedCapacity", "absMaxCapacity"),
userUsagesDonutChartData: function() {
@@ -68,7 +68,7 @@ export default DS.Model.extend({
data.push({
label: o.get("name"),
value: o.get("usedMemoryMB")
- })
+ });
});
}
@@ -89,6 +89,6 @@ export default DS.Model.extend({
label: "Active Apps",
value: this.get("numActiveApplications") || 0
}
- ]
- }.property(),
+ ];
+ }.property()
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
index a15a20f..c7875b4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
@@ -47,18 +47,18 @@ export default DS.Model.extend({
* Indicates no rows were retrieved from backend
*/
isDummyNode: function() {
- return this.get('id') == "dummy";
+ return this.get('id') === "dummy";
}.property("id"),
nodeStateStyle: function() {
var style = "default";
var nodeState = this.get("state");
- if (nodeState == "REBOOTED") {
+ if (nodeState === "REBOOTED") {
style = "warning";
- } else if (nodeState == "UNHEALTHY" || nodeState == "DECOMMISSIONED" ||
- nodeState == "LOST" || nodeState == "SHUTDOWN") {
+ } else if (nodeState === "UNHEALTHY" || nodeState === "DECOMMISSIONED" ||
+ nodeState === "LOST" || nodeState === "SHUTDOWN") {
style = "danger";
- } else if (nodeState == "RUNNING") {
+ } else if (nodeState === "RUNNING") {
style = "success";
}
return "label label-" + style;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
index 7cfd182..84b0fab 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
@@ -23,4 +23,4 @@ export default DS.Model.extend({
queueName: DS.attr('string'),
usedMemoryMB: DS.attr('number'),
usedVCore: DS.attr('number')
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
index 07b3792..1fd11e6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
@@ -29,8 +29,7 @@ export default Ember.Route.extend({
error: function (error) {
Ember.Logger.log(error.stack);
- if (error && error.errors[0] &&
- error.errors[0].status == 404) {
+ if (error && error.errors[0] && parseInt(error.errors[0].status) === 404) {
this.intermediateTransitionTo('/notfound');
} else {
this.intermediateTransitionTo('/error');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
index 121debf..78ff1c9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
-
import AbstractRoute from './abstract';
export default AbstractRoute.extend({
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
index 000b02f..86d845c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
@@ -25,7 +25,7 @@ export default AbstractRoute.extend({
return Ember.RSVP.hash({
app: this.store.find('yarn-app', param.app_id),
- rmContainers: this.store.find('yarn-app', param.app_id).then(function(app) {
+ rmContainers: this.store.find('yarn-app', param.app_id).then(function() {
return this.store.query('yarn-app-attempt', {appId: param.app_id}).then(function (attempts) {
if (attempts && attempts.get('firstObject')) {
var appAttemptId = attempts.get('firstObject').get('appAttemptId');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
index 9e4c7d3..8562bf5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
@@ -49,7 +49,7 @@ export default AbstractRoute.extend({
afterModel(model) {
// Handle errors and redirect if promise is rejected.
if (model.errors && model.errors[0]) {
- if (model.errors[0].status == 404) {
+ if (parseInt(model.errors[0].status) === 404) {
this.replaceWith('/notfound');
} else {
this.replaceWith('/error');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
index 4ab5716..436c6d8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import Ember from 'ember';
+
export default Ember.Route.extend({
beforeModel() {
this.transitionTo('yarn-queues.root');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
index 3de377a..f8f598b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
@@ -20,13 +20,12 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
-
+ internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+
if (payload.appAttempt) {
- payload = payload.appAttempt;
+ payload = payload.appAttempt;
}
-
+
var fixedPayload = {
id: payload.appAttemptId,
type: primaryModelClass.modelName, // yarn-app
@@ -48,15 +47,13 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
- var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var p = this.internalNormalizeSingleResponse(store,
+ primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// return expected is { data: [ {}, {} ] }
var normalizedArrayResponse = {};
@@ -65,11 +62,11 @@ export default DS.JSONAPISerializer.extend({
// need some error handling for ex apps or app may not be defined.
normalizedArrayResponse.data = payload.appAttempts.appAttempt.map(singleApp => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
- singleApp, singleApp.id, requestType);
+ singleApp);
}, this);
} else {
normalizedArrayResponse.data = [];
}
return normalizedArrayResponse;
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
index fdba04a..7c82ec2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
@@ -20,8 +20,7 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
if (payload.app) {
payload = payload.app;
}
@@ -76,15 +75,13 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ primaryModelClass, payload, id);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// return expected is { data: [ {}, {} ] }
var normalizedArrayResponse = {};
@@ -93,7 +90,7 @@ export default DS.JSONAPISerializer.extend({
if(payload.apps && payload.apps.app) {
normalizedArrayResponse.data = payload.apps.app.map(singleApp => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
- singleApp, singleApp.id, requestType);
+ singleApp, singleApp.id);
}, this);
} else {
normalizedArrayResponse.data = [];
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
index 9e10615..2aacf72 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
@@ -20,8 +20,7 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
// Convert plain text response into JSON.
// ID is of the form nodeAddress!containerId!fileName
var splits = Converter.splitForContainerLogs(id);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
index b9b923d..8ccff07 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
@@ -20,9 +20,8 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
-
+ internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+
var fixedPayload = {
id: payload.containerId,
type: primaryModelClass.modelName, // yarn-app
@@ -44,15 +43,13 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
- var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var p = this.internalNormalizeSingleResponse(store,
+ primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// return expected is { data: [ {}, {} ] }
var normalizedArrayResponse = {};
@@ -62,12 +59,11 @@ export default DS.JSONAPISerializer.extend({
// need some error handling for ex apps or app may not be defined.
normalizedArrayResponse.data = payload.container.map(singleContainer => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
- singleContainer, singleContainer.id, requestType);
+ singleContainer);
}, this);
} else {
normalizedArrayResponse.data = [this.internalNormalizeSingleResponse(
- store, primaryModelClass, payload.container, payload.container.id,
- requestType)];
+ store, primaryModelClass, payload.container)];
}
return normalizedArrayResponse;
} else {
@@ -76,4 +72,4 @@ export default DS.JSONAPISerializer.extend({
return normalizedArrayResponse;
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
index 3dfd776..9f6c425 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
@@ -15,26 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * 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 DS from 'ember-data';
-import Ember from 'ember';
export default DS.JSONAPISerializer.extend({
internalNormalizeSingleResponse(store, primaryModelClass, payload) {
@@ -55,16 +37,14 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// payload is of the form {"app":{}}
var p = this.internalNormalizeSingleResponse(store,
primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// expected return response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
// payload is of the form { "apps" : { "app": [ {},{},{} ] } }
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
index bf19ad7..7e78987 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
@@ -17,7 +17,6 @@
*/
import DS from 'ember-data';
-import Ember from 'ember';
export default DS.JSONAPISerializer.extend({
internalNormalizeSingleResponse(store, primaryModelClass, payload) {
@@ -42,16 +41,14 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// payload is of the form {"container":{}}
var p = this.internalNormalizeSingleResponse(store,
primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// expected return response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
if (payload.containers && payload.containers.container) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c6bae5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
index 19308e2..0d9faec 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
@@ -20,8 +20,7 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
if (payload.nodeInfo) {
payload = payload.nodeInfo;
}
@@ -46,11 +45,10 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
// payload is of the form {"nodeInfo":{}}
var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ primaryModelClass, payload, id);
return { data: p };
},
});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org