phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[MM-36998] Ensure server key must be at least 0 (#1660)

Browse Source
This commit is contained in:
Devin Binnie
2021-07-19 11:29:38 -04:00
committed by GitHub
parent ccd515e50c
commit 29a049e8ae
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/components/MainPage.tsx
View File

@@ -103,7 +103,7 @@ export default class MainPage extends React.PureComponent<Props, State> {
this.threeDotMenu = React.createRef(); this.threeDotMenu = React.createRef();
this.state = { this.state = {
key: this.props.teams.findIndex((team) => team.order === 0), key: this.props.teams.length ? this.props.teams.findIndex((team) => team.order === 0) : 0,
sessionsExpired: {}, sessionsExpired: {},
unreadCounts: {}, unreadCounts: {},
mentionCounts: {}, mentionCounts: {},
@@ -259,7 +259,7 @@ export default class MainPage extends React.PureComponent<Props, State> {
} }
handleSetServerKey = (key: number) => { handleSetServerKey = (key: number) => {
const newKey = (this.props.teams.length + key) % this.props.teams.length; const newKey = ((this.props.teams.length + key) % this.props.teams.length) || 0;
this.setState({key: newKey}); this.setState({key: newKey});
} }
@@ -322,6 +322,10 @@ export default class MainPage extends React.PureComponent<Props, State> {
} }
render() { render() {
if (!this.props.teams.length) {
return null;
}
const tabsRow = ( const tabsRow = (
<TabBar <TabBar
id='tabBar' id='tabBar'