Revert "PolyGerrit: Add support for showing or hiding the star from the change list"
Stars are not included by default, meaning they will disappear for
existing users without a schema migration. We can't add a schema
migration in a release branch, so we can't add this feature in
stable-2.15. In master, revert it to avoid breaking existing users
of googlesource.com.
This reverts commit f5f89beb70bb8b40be89971e253e0734d9dbf535.
Bug: Issue 7573
Change-Id: I2ba9d55600e9621e8d02c67389b519dc90899534
diff --git a/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior.html b/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior.html
index b851964..20568e6 100644
--- a/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior.html
+++ b/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior.html
@@ -25,7 +25,6 @@
columnNames: {
type: Array,
value: [
- 'Star',
'Subject',
'Status',
'Owner',
diff --git a/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior_test.html b/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior_test.html
index cabadf3..c265db87c 100644
--- a/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior_test.html
+++ b/polygerrit-ui/app/behaviors/gr-change-table-behavior/gr-change-table-behavior_test.html
@@ -58,7 +58,6 @@
test('getComplementColumns', () => {
let columns = [
- 'Star',
'Subject',
'Status',
'Owner',
@@ -71,7 +70,6 @@
assert.deepEqual(element.getComplementColumns(columns), []);
columns = [
- 'Star',
'Subject',
'Status',
'Assignee',
@@ -86,7 +84,6 @@
test('isColumnHidden', () => {
const columnToCheck = 'Project';
let columnsToDisplay = [
- 'Star',
'Subject',
'Status',
'Owner',
@@ -99,7 +96,6 @@
assert.isFalse(element.isColumnHidden(columnToCheck, columnsToDisplay));
columnsToDisplay = [
- 'Star',
'Subject',
'Status',
'Owner',
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html
index b3598ad..a2c7853 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html
@@ -109,8 +109,7 @@
<td class="cell keyboard">
<span class="positionIndicator">▶</span>
</td>
- <td class="cell star"
- hidden$="[[_computeHideStar(loggedIn, visibleChangeTableColumns)]]">
+ <td class="cell star" hidden$="[[!showStar]]" hidden>
<gr-change-star change="{{change}}"></gr-change-star>
</td>
<td class="cell number" hidden$="[[!showNumber]]" hidden>
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 67d01a6..79f06fe 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
@@ -29,8 +29,11 @@
type: String,
computed: '_computeChangeURL(change)',
},
+ showStar: {
+ type: Boolean,
+ value: false,
+ },
showNumber: Boolean,
- loggedIn: Boolean,
},
behaviors: [
@@ -112,10 +115,5 @@
if (!change.topic) { return ''; }
return Gerrit.Nav.getUrlForTopic(change.topic);
},
-
- _computeHideStar(loggedIn, visibleChangeTableColumns) {
- return !loggedIn ||
- this.isColumnHidden('Star', visibleChangeTableColumns) ? true : false;
- },
});
})();
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.html b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.html
index 7f1e23c..243a8ab 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.html
@@ -116,7 +116,6 @@
test('no hidden columns', () => {
element.visibleChangeTableColumns = [
- 'Star',
'Subject',
'Status',
'Owner',
@@ -137,7 +136,6 @@
test('no hidden columns', () => {
element.visibleChangeTableColumns = [
- 'Star',
'Subject',
'Status',
'Owner',
@@ -158,7 +156,6 @@
test('project column hidden', () => {
element.visibleChangeTableColumns = [
- 'Star',
'Subject',
'Status',
'Owner',
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
index 99bc6d2..d79dc69 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
@@ -64,7 +64,8 @@
class$="[[_computeUserHeaderClass(_userId)]]"></gr-user-header>
<gr-change-list
changes="{{_changes}}"
- selected-index="{{viewState.selectedChangeIndex}}"></gr-change-list>
+ selected-index="{{viewState.selectedChangeIndex}}"
+ show-star="[[loggedIn]]"></gr-change-list>
<nav>
<a id="prevArrow"
href$="[[_computeNavLink(_query, _offset, -1, _changesPerPage)]]"
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.html b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.html
index b1b0dc5..152ef3d 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.html
@@ -58,11 +58,10 @@
<table id="changeList">
<tr class="headerRow">
<th class="topHeader keyboard"></th>
- <th class="topHeader star"
- hidden$="[[_computeHideStar(_loggedIn, visibleChangeTableColumns)]]"></th>
+ <th class="topHeader star" hidden$="[[!showStar]]" hidden></th>
<th class="topHeader number" hidden$="[[!showNumber]]" hidden>#</th>
<template is="dom-repeat" items="[[changeTableColumns]]" as="item">
- <th class$="topHeader [[_lowerCase(item)]]"
+ <th class$="[[_lowerCase(item)]] topHeader"
hidden$="[[isColumnHidden(item, visibleChangeTableColumns)]]">
[[item]]
</th>
@@ -101,8 +100,8 @@
change="[[change]]"
visible-change-table-columns="[[visibleChangeTableColumns]]"
show-number="[[showNumber]]"
- label-names="[[labelNames]]"
- logged-in="[[_loggedIn]]"></gr-change-list-item>
+ show-star="[[showStar]]"
+ label-names="[[labelNames]]"></gr-change-list-item>
</template>
</template>
</table>
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 ca1f3a9..572695b 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
@@ -75,6 +75,10 @@
notify: true,
},
showNumber: Boolean, // No default value to prevent flickering.
+ showStar: {
+ type: Boolean,
+ value: false,
+ },
showReviewedState: {
type: Boolean,
value: false,
@@ -85,10 +89,6 @@
},
changeTableColumns: Array,
visibleChangeTableColumns: Array,
- _loggedIn: {
- type: Boolean,
- value: false,
- },
},
behaviors: [
@@ -137,11 +137,7 @@
_loadPreferences() {
return this._getLoggedIn().then(loggedIn => {
- this._loggedIn = loggedIn;
-
- this.changeTableColumns = this.columnNames.filter(column => {
- return column !== 'Star';
- });
+ this.changeTableColumns = this.columnNames;
if (!loggedIn) {
this.showNumber = false;
@@ -318,11 +314,6 @@
return null;
},
- _computeHideStar(loggedIn, visibleChangeTableColumns) {
- return !loggedIn ||
- this.isColumnHidden('Star', visibleChangeTableColumns) ? true : false;
- },
-
_getListItems() {
return Polymer.dom(this.root).querySelectorAll('gr-change-list-item');
},
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 cf0e58f..bded5f6 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
@@ -301,7 +301,6 @@
legacycid_in_change_table: true,
time_format: 'HHMM_12',
change_table: [
- 'Star',
'Subject',
'Status',
'Owner',
@@ -333,7 +332,6 @@
legacycid_in_change_table: true,
time_format: 'HHMM_12',
change_table: [
- 'Star',
'Subject',
'Status',
'Owner',
diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.html b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.html
index a96b6b0..f04b7c6 100644
--- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.html
+++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.html
@@ -43,6 +43,7 @@
<div class="loading" hidden$="[[!_loading]]">Loading...</div>
<div hidden$="[[_loading]]" hidden>
<gr-change-list
+ show-star
show-reviewed-state
account="[[account]]"
selected-index="{{viewState.selectedChangeIndex}}"
diff --git a/polygerrit-ui/app/elements/settings/gr-change-table-editor/gr-change-table-editor_test.html b/polygerrit-ui/app/elements/settings/gr-change-table-editor/gr-change-table-editor_test.html
index 74fb370..e1753ba 100644
--- a/polygerrit-ui/app/elements/settings/gr-change-table-editor/gr-change-table-editor_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-change-table-editor/gr-change-table-editor_test.html
@@ -42,7 +42,6 @@
sandbox = sinon.sandbox.create();
columns = [
- 'Star',
'Subject',
'Status',
'Owner',
@@ -148,7 +147,6 @@
let checked = false;
assert.deepEqual(element._updateDisplayedColumns(columns, name, checked),
[
- 'Star',
'Status',
'Owner',
'Assignee',
@@ -160,7 +158,6 @@
checked = true;
assert.deepEqual(element._updateDisplayedColumns(columns, name, checked),
[
- 'Star',
'Subject',
'Status',
'Owner',
