diff options
author | Logan Hanks <logan@google.com> | 2018-11-13 11:54:30 -0800 |
---|---|---|
committer | Paladox <thomasmulhall410@yahoo.com> | 2018-11-13 23:00:22 +0000 |
commit | 10fa8e3af2c48501dbb07779277da5a821c65874 (patch) | |
tree | b98167d6866e5ffa4ef19664cda4946565e4e3a8 | |
parent | bc603abc2df2e566835d5390c44fcb9b40b9b8e8 (diff) |
Don't display user header above project dashboards
Bug: Issue 9903
Change-Id: I325d2062fb063076a70c51ce1bd007d101c4d3f5
3 files changed, 15 insertions, 8 deletions
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 99aa265008..b0ba8a2b92 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 @@ -87,7 +87,7 @@ limitations under the License. <div hidden$="[[_loading]]" hidden> <gr-user-header user-id="[[params.user]]" - class$="[[_computeUserHeaderClass(params.user)]]"></gr-user-header> + class$="[[_computeUserHeaderClass(params)]]"></gr-user-header> <gr-change-list show-star show-reviewed-state diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.js b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.js index 775c046e3a..56bc17cf77 100644 --- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.js +++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.js @@ -37,7 +37,7 @@ /** @type {{ selectedChangeIndex: number }} */ viewState: Object, - /** @type {{ user: string }} */ + /** @type {{ project: string, user: string }} */ params: { type: Object, }, @@ -217,8 +217,12 @@ }); }, - _computeUserHeaderClass(userParam) { - return userParam === 'self' ? 'hide' : ''; + _computeUserHeaderClass(params) { + if (!params || !!params.project || !params.user + || params.user === 'self') { + return 'hide'; + } + return ''; }, _handleToggleStar(e) { diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.html b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.html index de74218078..3a3454d362 100644 --- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.html +++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.html @@ -314,10 +314,13 @@ limitations under the License. }); test('_computeUserHeaderClass', () => { - assert.equal(element._computeUserHeaderClass(undefined), ''); - assert.equal(element._computeUserHeaderClass(''), ''); - assert.equal(element._computeUserHeaderClass('self'), 'hide'); - assert.equal(element._computeUserHeaderClass('user'), ''); + assert.equal(element._computeUserHeaderClass(undefined), 'hide'); + assert.equal(element._computeUserHeaderClass({}), 'hide'); + assert.equal(element._computeUserHeaderClass({user: 'self'}), 'hide'); + assert.equal(element._computeUserHeaderClass({user: 'user'}), ''); + assert.equal( + element._computeUserHeaderClass({project: 'p', user: 'user'}), + 'hide'); }); test('404 page', done => { |