ES6ify /gr-related-changes-list/*
Bug: Issue 6179
Change-Id: I674a733685b8a371a1ea0dac984ad4a7ffbd5cf2
diff --git a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js
index 8501b20..fe35c7f 100644
--- a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js
+++ b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.js
@@ -41,23 +41,23 @@
},
_relatedResponse: {
type: Object,
- value: function() { return {changes: []}; },
+ value() { return {changes: []}; },
},
_submittedTogether: {
type: Array,
- value: function() { return []; },
+ value() { return []; },
},
_conflicts: {
type: Array,
- value: function() { return []; },
+ value() { return []; },
},
_cherryPicks: {
type: Array,
- value: function() { return []; },
+ value() { return []; },
},
_sameTopic: {
type: Array,
- value: function() { return []; },
+ value() { return []; },
},
},
@@ -71,53 +71,52 @@
'_conflicts, _cherryPicks, _sameTopic)',
],
- clear: function() {
+ clear() {
this.loading = true;
this.hidden = true;
},
- reload: function() {
+ reload() {
if (!this.change || !this.patchNum) {
return Promise.resolve();
}
this.loading = true;
- var promises = [
- this._getRelatedChanges().then(function(response) {
+ const promises = [
+ this._getRelatedChanges().then(response => {
this._relatedResponse = response;
this.hasParent = this._calculateHasParent(this.change.change_id,
response.changes);
-
- }.bind(this)),
- this._getSubmittedTogether().then(function(response) {
+ }),
+ this._getSubmittedTogether().then(response => {
this._submittedTogether = response;
- }.bind(this)),
- this._getCherryPicks().then(function(response) {
+ }),
+ this._getCherryPicks().then(response => {
this._cherryPicks = response;
- }.bind(this)),
+ }),
];
// Get conflicts if change is open and is mergeable.
if (this.changeIsOpen(this.change.status) && this.change.mergeable) {
- promises.push(this._getConflicts().then(function(response) {
+ promises.push(this._getConflicts().then(response => {
this._conflicts = response;
- }.bind(this)));
+ }));
}
- promises.push(this._getServerConfig().then(function(config) {
+ promises.push(this._getServerConfig().then(config => {
if (this.change.topic && !config.change.submit_whole_topic) {
- return this._getChangesWithSameTopic().then(function(response) {
+ return this._getChangesWithSameTopic().then(response => {
this._sameTopic = response;
- }.bind(this));
+ });
} else {
this._sameTopic = [];
}
return this._sameTopic;
- }.bind(this)));
+ }));
- return Promise.all(promises).then(function() {
+ return Promise.all(promises).then(() => {
this.loading = false;
- }.bind(this));
+ });
},
/**
@@ -128,62 +127,62 @@
* @param {Array} relatedChanges
* @return {Boolean}
*/
- _calculateHasParent: function(currentChangeId, relatedChanges) {
+ _calculateHasParent(currentChangeId, relatedChanges) {
return relatedChanges.length > 0 &&
relatedChanges[relatedChanges.length - 1].change_id !==
currentChangeId;
},
- _getRelatedChanges: function() {
+ _getRelatedChanges() {
return this.$.restAPI.getRelatedChanges(this.change._number,
this.patchNum);
},
- _getSubmittedTogether: function() {
+ _getSubmittedTogether() {
return this.$.restAPI.getChangesSubmittedTogether(this.change._number);
},
- _getServerConfig: function() {
+ _getServerConfig() {
return this.$.restAPI.getConfig();
},
- _getConflicts: function() {
+ _getConflicts() {
return this.$.restAPI.getChangeConflicts(this.change._number);
},
- _getCherryPicks: function() {
+ _getCherryPicks() {
return this.$.restAPI.getChangeCherryPicks(this.change.project,
this.change.change_id, this.change._number);
},
- _getChangesWithSameTopic: function() {
+ _getChangesWithSameTopic() {
return this.$.restAPI.getChangesWithSameTopic(this.change.topic);
},
- _computeChangeURL: function(changeNum, patchNum) {
- var urlStr = this.getBaseUrl() + '/c/' + changeNum;
+ _computeChangeURL(changeNum, patchNum) {
+ let urlStr = this.getBaseUrl() + '/c/' + changeNum;
if (patchNum != null) {
urlStr += '/' + patchNum;
}
return urlStr;
},
- _computeChangeContainerClass: function(currentChange, relatedChange) {
- var classes = ['changeContainer'];
+ _computeChangeContainerClass(currentChange, relatedChange) {
+ const classes = ['changeContainer'];
if (relatedChange.change_id === currentChange.change_id) {
classes.push('thisChange');
}
return classes.join(' ');
},
- _computeLinkClass: function(change) {
+ _computeLinkClass(change) {
if (change.status == this.ChangeStatus.ABANDONED) {
return 'strikethrough';
}
},
- _computeChangeStatusClass: function(change) {
- var classes = ['status'];
+ _computeChangeStatusClass(change) {
+ const classes = ['status'];
if (change._revision_number != change._current_revision_number) {
classes.push('notCurrent');
} else if (this._isIndirectAncestor(change)) {
@@ -196,7 +195,7 @@
return classes.join(' ');
},
- _computeChangeStatus: function(change) {
+ _computeChangeStatus(change) {
switch (change.status) {
case this.ChangeStatus.MERGED:
return 'Merged';
@@ -215,16 +214,16 @@
return '';
},
- _resultsChanged: function(related, submittedTogether, conflicts,
+ _resultsChanged(related, submittedTogether, conflicts,
cherryPicks, sameTopic) {
- var results = [
+ const results = [
related,
submittedTogether,
conflicts,
cherryPicks,
sameTopic,
];
- for (var i = 0; i < results.length; i++) {
+ for (let i = 0; i < results.length; i++) {
if (results[i].length > 0) {
this.hidden = false;
this.fire('update', null, {bubbles: false});
@@ -234,23 +233,23 @@
this.hidden = true;
},
- _isIndirectAncestor: function(change) {
- return this._connectedRevisions.indexOf(change.commit.commit) == -1;
+ _isIndirectAncestor(change) {
+ return !this._connectedRevisions.includes(change.commit.commit);
},
- _computeConnectedRevisions: function(change, patchNum, relatedChanges) {
- var connected = [];
- var changeRevision;
- for (var rev in change.revisions) {
+ _computeConnectedRevisions(change, patchNum, relatedChanges) {
+ const connected = [];
+ let changeRevision;
+ for (const rev in change.revisions) {
if (change.revisions[rev]._number == patchNum) {
changeRevision = rev;
}
}
- var commits = relatedChanges.map(function(c) { return c.commit; });
- var pos = commits.length - 1;
+ const commits = relatedChanges.map(c => { return c.commit; });
+ let pos = commits.length - 1;
while (pos >= 0) {
- var commit = commits[pos].commit;
+ const commit = commits[pos].commit;
connected.push(commit);
if (commit == changeRevision) {
break;
@@ -258,8 +257,8 @@
pos--;
}
while (pos >= 0) {
- for (var i = 0; i < commits[pos].parents.length; i++) {
- if (connected.indexOf(commits[pos].parents[i].commit) != -1) {
+ for (let i = 0; i < commits[pos].parents.length; i++) {
+ if (connected.includes(commits[pos].parents[i].commit)) {
connected.push(commits[pos].commit);
break;
}
diff --git a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_test.html b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_test.html
index 171f758..4a25405 100644
--- a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_test.html
+++ b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_test.html
@@ -33,21 +33,21 @@
</test-fixture>
<script>
- suite('gr-related-changes-list tests', function() {
- var element;
- var sandbox;
+ suite('gr-related-changes-list tests', () => {
+ let element;
+ let sandbox;
- setup(function() {
+ setup(() => {
element = fixture('basic');
sandbox = sinon.sandbox.create();
});
- teardown(function() {
+ teardown(() => {
sandbox.restore();
});
- test('connected revisions', function() {
- var change = {
+ test('connected revisions', () => {
+ const change = {
revisions: {
'e3c6d60783bfdec9ebae7dcfec4662360433449e': {
_number: 1,
@@ -72,8 +72,8 @@
},
},
};
- var patchNum = 7;
- var relatedChanges = [
+ let patchNum = 7;
+ let relatedChanges = [
{
commit: {
commit: '2cebeedfb1e80f4b872d0a13ade529e70652c0c8',
@@ -136,7 +136,7 @@
},
];
- var connectedChanges =
+ let connectedChanges =
element._computeConnectedRevisions(change, patchNum, relatedChanges);
assert.deepEqual(connectedChanges, [
'613bc4f81741a559c6667ac08d71dcc3348f73ce',
@@ -222,9 +222,9 @@
]);
});
- test('_computeChangeContainerClass', function() {
- var change1 = {change_id: 123};
- var change2 = {change_id: 456};
+ test('_computeChangeContainerClass', () => {
+ const change1 = {change_id: 123};
+ const change2 = {change_id: 456};
assert.notEqual(element._computeChangeContainerClass(
change1, change1).indexOf('thisChange'), -1);
@@ -232,26 +232,25 @@
change1, change2).indexOf('thisChange'), -1);
});
- suite('get conflicts tests', function() {
- var element;
- var conflictsStub;
+ suite('get conflicts tests', () => {
+ let element;
+ let conflictsStub;
- setup(function() {
+ setup(() => {
element = fixture('basic');
- sandbox.stub(element, '_getRelatedChanges',
- function() {
- return Promise.resolve({changes: []});
- });
+ sandbox.stub(element, '_getRelatedChanges', () => {
+ return Promise.resolve({changes: []});
+ });
sandbox.stub(element, '_getSubmittedTogether',
- function() { return Promise.resolve(); });
+ () => { return Promise.resolve(); });
sandbox.stub(element, '_getCherryPicks',
- function() { return Promise.resolve(); });
+ () => { return Promise.resolve(); });
conflictsStub = sandbox.stub(element, '_getConflicts',
- function() { return Promise.resolve(['test data']); });
+ () => { return Promise.resolve(['test data']); });
});
- test('request conflicts if open and mergeable', function() {
+ test('request conflicts if open and mergeable', () => {
element.patchNum = 7;
element.change = {
change_id: 123,
@@ -262,7 +261,7 @@
assert.isTrue(conflictsStub.called);
});
- test('does not request conflicts if closed and mergeable', function() {
+ test('does not request conflicts if closed and mergeable', () => {
element.patchNum = 7;
element.change = {
change_id: 123,
@@ -273,7 +272,7 @@
assert.isFalse(conflictsStub.called);
});
- test('does not request conflicts if open and not mergeable', function() {
+ test('does not request conflicts if open and not mergeable', () => {
element.patchNum = 7;
element.change = {
change_id: 123,
@@ -284,7 +283,7 @@
assert.isFalse(conflictsStub.called);
});
- test('doesnt request conflicts if closed and not mergeable', function() {
+ test('doesnt request conflicts if closed and not mergeable', () => {
element.patchNum = 7;
element.change = {
change_id: 123,
@@ -296,9 +295,9 @@
});
});
- test('_calculateHasParent', function() {
- var changeId = 123;
- var relatedChanges = [];
+ test('_calculateHasParent', () => {
+ const changeId = 123;
+ const relatedChanges = [];
assert.equal(element._calculateHasParent(changeId, relatedChanges),
false);
@@ -310,10 +309,9 @@
relatedChanges.push({change_id: 234});
assert.equal(element._calculateHasParent(changeId, relatedChanges),
true);
-
});
- test('clear hides', function() {
+ test('clear hides', () => {
element.loading = false;
element.hidden = false;
element.clear();
@@ -321,8 +319,8 @@
assert.isTrue(element.hidden);
});
- test('update fires', function() {
- var updateHandler = sandbox.stub();
+ test('update fires', () => {
+ const updateHandler = sandbox.stub();
element.addEventListener('update', updateHandler);
element._resultsChanged([], [], [], [], []);
