Merge "Fix more to support undefined behaviour"
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 d3cd940..d03316a 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
@@ -55,6 +55,9 @@ * @return {boolean} */ isColumnHidden(columnToCheck, columnsToDisplay) { + if ([columnsToDisplay, columnToCheck].some(arg => arg === undefined)) { + return false; + } return !columnsToDisplay.includes(columnToCheck); },
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 2d6b440..8fd4214 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
@@ -187,8 +187,13 @@ if (account) { this.showNumber = !!(preferences && preferences.legacycid_in_change_table); - this.visibleChangeTableColumns = preferences.change_table.length > 0 ? - this.getVisibleColumns(preferences.change_table) : this.columnNames; + if (preferences.change_table && + preferences.change_table.length > 0) { + this.visibleChangeTableColumns = + this.getVisibleColumns(preferences.change_table); + } else { + this.visibleChangeTableColumns = this.columnNames; + } } else { // Not logged in. this.showNumber = false;
diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js index d5eeee8..53c5ef5 100644 --- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js +++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
@@ -305,7 +305,8 @@ if (!account) { return; } this.$.restAPI.getPreferences().then(prefs => { - this._userLinks = prefs.my.map(this._fixCustomMenuItem); + this._userLinks = prefs && prefs.my ? + prefs.my.map(this._fixCustomMenuItem) : []; }); }