IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-5038 Add Join another team in sidebar_right_menu (#4844)

Browse Source
This commit is contained in:
enahum
2016-12-20 11:33:52 -03:00
committed by Christopher Speller
parent 2da388d297
commit 927eb65978
1 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
webapp/components/sidebar_right_menu.jsx
View File

@@ -28,13 +28,12 @@ import {Link} from 'react-router/es6';
import {createMenuTip} from 'components/tutorial/tutorial_tip.jsx';
import React from 'react';
import PureRenderMixin from 'react-addons-pure-render-mixin';
export default class SidebarRightMenu extends React.Component {
constructor(props) {
super(props);
this.onPreferenceChange = this.onPreferenceChange.bind(this);
this.onChange = this.onChange.bind(this);
this.handleClick = this.handleClick.bind(this);
this.handleAboutModal = this.handleAboutModal.bind(this);
this.searchMentions = this.searchMentions.bind(this);
@@ -45,8 +44,6 @@ export default class SidebarRightMenu extends React.Component {
state.showUserSettingsModal = false;
state.showAboutModal = false;
this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
this.state = state;
}
@@ -72,11 +69,13 @@ export default class SidebarRightMenu extends React.Component {
}
componentDidMount() {
PreferenceStore.addChangeListener(this.onPreferenceChange);
TeamStore.addChangeListener(this.onChange);
PreferenceStore.addChangeListener(this.onChange);
}
componentWillUnmount() {
PreferenceStore.removeChangeListener(this.onPreferenceChange);
TeamStore.removeChangeListener(this.onChange);
PreferenceStore.removeChangeListener(this.onChange);
}
getStateFromStores() {
@@ -84,11 +83,13 @@ export default class SidebarRightMenu extends React.Component {
return {
currentUser: UserStore.getCurrentUser(),
teamMembers: TeamStore.getMyTeamMembers(),
teamListings: TeamStore.getTeamListings(),
showTutorialTip: tutorialStep === TutorialSteps.MENU_POPOVER && Utils.isMobile()
};
}
onPreferenceChange() {
onChange() {
this.setState(this.getStateFromStores());
}
@@ -141,14 +142,15 @@ export default class SidebarRightMenu extends React.Component {
}
render() {
var teamLink = '';
var inviteLink = '';
var teamSettingsLink = '';
var manageLink = '';
var consoleLink = '';
var currentUser = UserStore.getCurrentUser();
var isAdmin = false;
var isSystemAdmin = false;
const currentUser = UserStore.getCurrentUser();
let teamLink;
let inviteLink;
let teamSettingsLink;
let manageLink;
let consoleLink;
let joinAnotherTeamLink;
let isAdmin = false;
let isSystemAdmin = false;
if (currentUser != null) {
isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser();
@@ -195,6 +197,33 @@ export default class SidebarRightMenu extends React.Component {
inviteLink = null;
}
}
let moreTeams = false;
const isAlreadyMember = this.state.teamMembers.reduce((result, item) => {
result[item.team_id] = true;
return result;
}, {});
for (const id in this.state.teamListings) {
if (this.state.teamListings.hasOwnProperty(id) && !isAlreadyMember[id]) {
moreTeams = true;
break;
}
}
if (moreTeams) {
joinAnotherTeamLink = (
<li key='joinTeam_li'>
<Link to='/select_team'>
<i className='icon fa fa-plus-square'/>
<FormattedMessage
id='navbar_dropdown.join'
defaultMessage='Join Another Team'
/>
</Link>
</li>
);
}
}
manageLink = (
@@ -387,6 +416,7 @@ export default class SidebarRightMenu extends React.Component {
</li>
{inviteLink}
{teamLink}
{joinAnotherTeamLink}
<li className='divider'/>
{teamSettingsLink}
{manageLink}