opendev/gerrit
Code Issues Proposed changes

Merge "Coalesce request for drafts with login check"

Browse Source
This commit is contained in:
Kasper Nilsson
2017-08-02 20:35:31 +00:00
committed by Gerrit Code Review
parent 720a114d16 c61ba25b11
commit 299ae16f0c
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.js
View File

@@ -51,11 +51,7 @@
.then(comments => { this._comments = comments; }));
promises.push(this.$.restAPI.getDiffRobotComments(changeNum)
.then(robotComments => { this._robotComments = robotComments; }));
promises.push(this.$.restAPI.getLoggedIn()
.then(loggedIn => {
if (!loggedIn) { return Promise.resolve({}); }
return this.$.restAPI.getDiffDrafts(changeNum);
})
promises.push(this.$.restAPI.getDiffDrafts(changeNum)
.then(drafts => { this._drafts = drafts; }));
return Promise.all(promises);

6
polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.html
View File

@@ -57,14 +57,16 @@ limitations under the License.
}));
sandbox.stub(element.$.restAPI, 'getDiffRobotComments')
.returns(Promise.resolve({'foo.c': [{id: '321', message: 'done'}]}));
sandbox.stub(element.$.restAPI, 'getDiffDrafts');
sandbox.stub(element.$.restAPI, 'getDiffDrafts')
.returns(Promise.resolve({}));
return element.loadAll(changeNum).then(() => {
assert.isTrue(element.$.restAPI.getDiffComments.calledWithExactly(
changeNum));
assert.isTrue(element.$.restAPI.getDiffRobotComments.calledWithExactly(
changeNum));
assert.isFalse(element.$.restAPI.getDiffDrafts.called);
assert.isTrue(element.$.restAPI.getDiffDrafts.calledWithExactly(
changeNum));
assert.isOk(element._comments);
assert.isOk(element._robotComments);
assert.deepEqual(element._drafts, {});

5
polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
View File

@@ -730,10 +730,7 @@
},
_getDiffDrafts() {
return this._getLoggedIn().then(loggedIn => {
if (!loggedIn) { return Promise.resolve({}); }
return this.$.restAPI.getDiffDrafts(this._changeNum);
});
return this.$.restAPI.getDiffDrafts(this._changeNum);
},
_computeCommentSkips(commentMap, fileList, path) {

18
polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
View File

@@ -940,9 +940,23 @@
patchNum, opt_path);
},
/**
* If the user is logged in, fetch the user's draft diff comments. If there
* is no logged in user, the request is not made and the promise yields an
* empty object.
*
* @param {number|string} changeNum
* @param {number|string} opt_basePatchNum
* @param {number|string} opt_patchNum
* @param {string} opt_path
* @return {Promise<Object>}
*/
getDiffDrafts(changeNum, opt_basePatchNum, opt_patchNum, opt_path) {
return this._getDiffComments(changeNum, '/drafts', opt_basePatchNum,
opt_patchNum, opt_path);
return this.getLoggedIn().then(loggedIn => {
if (!loggedIn) { return Promise.resolve({}); }
return this._getDiffComments(changeNum, '/drafts', opt_basePatchNum,
opt_patchNum, opt_path);
});
},
_setRange(comments, comment) {