Merge changes I9671b135,I0650d47b
* changes:
Fix the ReviewInput format for attention set changes
Filter owner from list of reviewers on dashboard
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js
index d8101c8..95a1554 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js
@@ -228,7 +228,9 @@
*/
_computeReviewers(change) {
if (!change || !change.reviewers || !change.reviewers.REVIEWER) return [];
- const reviewers = [...change.reviewers.REVIEWER];
+ const reviewers = [...change.reviewers.REVIEWER].filter(r =>
+ !change.owner || change.owner._account_id !== r._account_id
+ );
reviewers.sort((r1, r2) => {
if (this.account) {
if (r1._account_id === this.account._account_id) return -1;
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js
index 4b9424b..7a66100 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js
@@ -158,6 +158,9 @@
userId, reviewerIds, reviewerNames, attSetIds, expected) {
element.account = userId ? {_account_id: userId} : null;
element.change = {
+ owner: {
+ _account_id: 99,
+ },
reviewers: {
REVIEWER: [],
},
@@ -179,6 +182,8 @@
test('compute reviewers', () => {
checkComputeReviewers(null, [], [], [], []);
checkComputeReviewers(1, [], [], [], []);
+ checkComputeReviewers(1, [2], ['a'], [], [2]);
+ checkComputeReviewers(1, [99], ['owner'], [], []);
checkComputeReviewers(
1, [2, 3, 4, 5], ['b', 'a', 'd', 'c'], [3, 4], [3, 4, 2, 5]);
checkComputeReviewers(
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js
index f3c31aa..24bc142 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js
@@ -546,13 +546,19 @@
reviewInput.add_to_attention_set = [];
for (const user of this._newAttentionSet) {
if (!this._currentAttentionSet.has(user)) {
- reviewInput.add_to_attention_set.push(user);
+ reviewInput.add_to_attention_set.push({
+ user,
+ reason: 'manually added in reply dialog',
+ });
}
}
reviewInput.remove_from_attention_set = [];
for (const user of this._currentAttentionSet) {
if (!this._newAttentionSet.has(user)) {
- reviewInput.remove_from_attention_set.push(user);
+ reviewInput.remove_from_attention_set.push({
+ user,
+ reason: 'manually removed in reply dialog',
+ });
}
}
}
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js
index 4c65298..456adb5 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js
@@ -181,13 +181,17 @@
});
test('modified attention set', done => {
+ element._newAttentionSet = new Set([314]);
const buttonEl = element.shadowRoot.querySelector('.edit-attention-button');
MockInteractions.tap(buttonEl);
flushAsynchronousOperations();
stubSaveReview(review => {
assert.isTrue(review.ignore_default_attention_set_rules);
- assert.deepEqual(review.add_to_attention_set, []);
+ assert.deepEqual(review.add_to_attention_set, [{
+ user: 314,
+ reason: 'manually added in reply dialog',
+ }]);
assert.deepEqual(review.remove_from_attention_set, []);
done();
});