From 0937e982fdd65e37af12ce33db9340281e70e8e7 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 10 Jan 2019 08:57:48 +0100 Subject: [PATCH 1/2] Bump minimum bazel version to 0.22.0 Change-Id: I4e7c826914cd4da9043fb56e28523ea6b15be9c6 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index cabe11e6e1..1b53915c55 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -31,7 +31,7 @@ http_file( load("@bazel_skylib//lib:versions.bzl", "versions") -versions.check(minimum_bazel_version = "0.19.0") +versions.check(minimum_bazel_version = "0.22.0") load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories") From 056ccd071744c2aa4d374a9ae8e9b6265832dd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9da=20Housni=20Alaoui?= Date: Sat, 9 Feb 2019 19:53:05 +0100 Subject: [PATCH 2/2] Exclude WIP changes from changes needing review Since change I16b303e6e, WIP changes appear in 'Assigned reviews' dashboard categories and may appear as needing review. WIP changes should not appear as needing review. Bug: Issue 10155 Change-Id: I93f613ede8a4dd5f38b09c1cb6d7a931c165e629 (cherry picked from commit 3d7531d22fc00420e0382e3dcf77b2ec0c500dfe) --- .../change-list/gr-change-list/gr-change-list.js | 1 + .../gr-change-list/gr-change-list_test.html | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js index de97e62507..61c64ffe26 100644 --- a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js +++ b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js @@ -226,6 +226,7 @@ _computeItemNeedsReview(account, change, showReviewedState) { return showReviewedState && !change.reviewed && + !change.work_in_progress && this.changeIsOpen(change.status) && (!account || account._account_id != change.owner._account_id); }, diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.html b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.html index d20d40a9b3..d5b9aa96b3 100644 --- a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.html +++ b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.html @@ -231,11 +231,17 @@ limitations under the License. status: 'ABANDONED', owner: {_account_id: 0}, }, + { + _number: 4, + status: 'NEW', + work_in_progress: true, + owner: {_account_id: 0}, + }, ]; flushAsynchronousOperations(); let elementItems = Polymer.dom(element.root).querySelectorAll( 'gr-change-list-item'); - assert.equal(elementItems.length, 4); + assert.equal(elementItems.length, 5); for (let i = 0; i < elementItems.length; i++) { assert.isFalse(elementItems[i].hasAttribute('needs-review')); } @@ -243,20 +249,22 @@ limitations under the License. element.showReviewedState = true; elementItems = Polymer.dom(element.root).querySelectorAll( 'gr-change-list-item'); - assert.equal(elementItems.length, 4); + assert.equal(elementItems.length, 5); assert.isFalse(elementItems[0].hasAttribute('needs-review')); assert.isTrue(elementItems[1].hasAttribute('needs-review')); assert.isFalse(elementItems[2].hasAttribute('needs-review')); assert.isFalse(elementItems[3].hasAttribute('needs-review')); + assert.isFalse(elementItems[4].hasAttribute('needs-review')); element.account = {_account_id: 42}; elementItems = Polymer.dom(element.root).querySelectorAll( 'gr-change-list-item'); - assert.equal(elementItems.length, 4); + assert.equal(elementItems.length, 5); assert.isFalse(elementItems[0].hasAttribute('needs-review')); assert.isTrue(elementItems[1].hasAttribute('needs-review')); assert.isFalse(elementItems[2].hasAttribute('needs-review')); assert.isFalse(elementItems[3].hasAttribute('needs-review')); + assert.isFalse(elementItems[4].hasAttribute('needs-review')); }); test('no changes', () => {