Don't bold outgoing reviews in the dashboard
+ Also change property to needs-review since ‘unreviewed’ was kinda bleh. Change-Id: Ia779e7d50c57315a108777774908b485d856fbce
This commit is contained in:
@@ -126,6 +126,7 @@ limitations under the License.
|
|||||||
</template>
|
</template>
|
||||||
<template is="dom-if" if="{{_showDashboardView}}" restamp="true">
|
<template is="dom-if" if="{{_showDashboardView}}" restamp="true">
|
||||||
<gr-dashboard-view
|
<gr-dashboard-view
|
||||||
|
account="[[account]]"
|
||||||
params="[[params]]"
|
params="[[params]]"
|
||||||
view-state="{{_viewState.dashboardView}}"></gr-dashboard-view>
|
view-state="{{_viewState.dashboardView}}"></gr-dashboard-view>
|
||||||
</template>
|
</template>
|
||||||
|
@@ -31,7 +31,7 @@ limitations under the License.
|
|||||||
:host([selected]) {
|
:host([selected]) {
|
||||||
background-color: #ebf5fb;
|
background-color: #ebf5fb;
|
||||||
}
|
}
|
||||||
:host([unreviewed]) {
|
:host([needs-review]) {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.cell {
|
.cell {
|
||||||
@@ -98,7 +98,7 @@ limitations under the License.
|
|||||||
value: false,
|
value: false,
|
||||||
reflectToAttribute: true,
|
reflectToAttribute: true,
|
||||||
},
|
},
|
||||||
unreviewed: {
|
needsReview: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
value: false,
|
value: false,
|
||||||
reflectToAttribute: true,
|
reflectToAttribute: true,
|
||||||
|
@@ -55,7 +55,7 @@ limitations under the License.
|
|||||||
<template is="dom-repeat" items="[[changeGroup]]" as="change">
|
<template is="dom-repeat" items="[[changeGroup]]" as="change">
|
||||||
<gr-change-list-item
|
<gr-change-list-item
|
||||||
selected$="[[_computeItemSelected(index, groupIndex, selectedIndex)]]"
|
selected$="[[_computeItemSelected(index, groupIndex, selectedIndex)]]"
|
||||||
unreviewed="[[_computeItemUnreviewed(change, showReviewedState)]]"
|
needs-review="[[_computeItemNeedsReview(account, change, showReviewedState)]]"
|
||||||
change="[[change]]"
|
change="[[change]]"
|
||||||
show-star="[[showStar]]"
|
show-star="[[showStar]]"
|
||||||
label-names="[[labelNames]]"></gr-change-list-item>
|
label-names="[[labelNames]]"></gr-change-list-item>
|
||||||
@@ -75,6 +75,14 @@ limitations under the License.
|
|||||||
},
|
},
|
||||||
|
|
||||||
properties: {
|
properties: {
|
||||||
|
/**
|
||||||
|
* The logged-in user's account, or an empty object if no user is logged
|
||||||
|
* in.
|
||||||
|
*/
|
||||||
|
account: {
|
||||||
|
type: Object,
|
||||||
|
value: function() { return {}; },
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* An array of ChangeInfo objects to render.
|
* An array of ChangeInfo objects to render.
|
||||||
* https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#change-info
|
* https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#change-info
|
||||||
@@ -162,9 +170,10 @@ limitations under the License.
|
|||||||
return idx == selectedIndex;
|
return idx == selectedIndex;
|
||||||
},
|
},
|
||||||
|
|
||||||
_computeItemUnreviewed: function(change, showReviewedState) {
|
_computeItemNeedsReview: function(account, change, showReviewedState) {
|
||||||
return showReviewedState && !change.reviewed &&
|
return showReviewedState && !change.reviewed &&
|
||||||
change.status != this.ChangeStatus.MERGED;
|
change.status != this.ChangeStatus.MERGED &&
|
||||||
|
account._account_id != change.owner._account_id;
|
||||||
},
|
},
|
||||||
|
|
||||||
_handleKey: function(e) {
|
_handleKey: function(e) {
|
||||||
|
@@ -54,6 +54,7 @@ limitations under the License.
|
|||||||
<gr-change-list
|
<gr-change-list
|
||||||
show-star
|
show-star
|
||||||
show-reviewed-state
|
show-reviewed-state
|
||||||
|
account="[[account]]"
|
||||||
selected-index="{{viewState.selectedChangeIndex}}"
|
selected-index="{{viewState.selectedChangeIndex}}"
|
||||||
groups="{{_results}}"
|
groups="{{_results}}"
|
||||||
group-titles="[[_groupTitles]]"></gr-change-list>
|
group-titles="[[_groupTitles]]"></gr-change-list>
|
||||||
@@ -73,6 +74,10 @@ limitations under the License.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
properties: {
|
properties: {
|
||||||
|
account: {
|
||||||
|
type: Object,
|
||||||
|
value: function() { return {}; },
|
||||||
|
},
|
||||||
viewState: Object,
|
viewState: Object,
|
||||||
|
|
||||||
_results: Array,
|
_results: Array,
|
||||||
|
@@ -105,35 +105,52 @@ limitations under the License.
|
|||||||
}, 1);
|
}, 1);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('unreviewed changes', function() {
|
test('changes needing review', function() {
|
||||||
element.changes = [
|
element.changes = [
|
||||||
{
|
{
|
||||||
_number: 0,
|
_number: 0,
|
||||||
reviewed: true,
|
reviewed: true,
|
||||||
|
owner: { _account_id: 0 },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
_number: 1,
|
_number: 1,
|
||||||
|
owner: { _account_id: 0 },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
_number: 2,
|
_number: 2,
|
||||||
status: 'MERGED',
|
status: 'MERGED',
|
||||||
|
owner: { _account_id: 0 },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
_number: 3,
|
||||||
|
owner: { _account_id: 42 },
|
||||||
|
}
|
||||||
];
|
];
|
||||||
flushAsynchronousOperations();
|
flushAsynchronousOperations();
|
||||||
var elementItems = Polymer.dom(element.root).querySelectorAll(
|
var elementItems = Polymer.dom(element.root).querySelectorAll(
|
||||||
'gr-change-list-item');
|
'gr-change-list-item');
|
||||||
assert.equal(elementItems.length, 3);
|
assert.equal(elementItems.length, 4);
|
||||||
for (var i = 0; i < elementItems.length; i++) {
|
for (var i = 0; i < elementItems.length; i++) {
|
||||||
assert.isFalse(elementItems[i].hasAttribute('unreviewed'));
|
assert.isFalse(elementItems[i].hasAttribute('needs-review'));
|
||||||
}
|
}
|
||||||
|
|
||||||
element.showReviewedState = true;
|
element.showReviewedState = true;
|
||||||
var elementItems = Polymer.dom(element.root).querySelectorAll(
|
var elementItems = Polymer.dom(element.root).querySelectorAll(
|
||||||
'gr-change-list-item');
|
'gr-change-list-item');
|
||||||
assert.equal(elementItems.length, 3);
|
assert.equal(elementItems.length, 4);
|
||||||
assert.isFalse(elementItems[0].hasAttribute('unreviewed'));
|
assert.isFalse(elementItems[0].hasAttribute('needs-review'));
|
||||||
assert.isTrue(elementItems[1].hasAttribute('unreviewed'));
|
assert.isTrue(elementItems[1].hasAttribute('needs-review'));
|
||||||
assert.isFalse(elementItems[2].hasAttribute('unreviewed'));
|
assert.isFalse(elementItems[2].hasAttribute('needs-review'));
|
||||||
|
assert.isTrue(elementItems[3].hasAttribute('needs-review'));
|
||||||
|
|
||||||
|
element.account = { _account_id: 42 };
|
||||||
|
var elementItems = Polymer.dom(element.root).querySelectorAll(
|
||||||
|
'gr-change-list-item');
|
||||||
|
assert.equal(elementItems.length, 4);
|
||||||
|
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'));
|
||||||
});
|
});
|
||||||
|
|
||||||
test('no changes', function() {
|
test('no changes', function() {
|
||||||
|
Reference in New Issue
Block a user