PLT-4167 Team Sidebar (#4569)
* PLT-4167 Team Sidebar * Address feedback from PM * change route from my_members to members * bug fixes * Updating styles for teams sidebar (#4681) * Added PM changes * Fix corner cases * Addressing feedback * use two different endpoints * Bug fixes * Rename model and client functions, using preferences to store last team and channel viewed * Fix mobile notification count and closing the team sidebar * unit test, fixed bad merge and retrieve from cached when available * bug fixes * use id for last channel in preferences, query optimization * Updating multi team css (#4830)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
3ce2ce9dc8
Коммит
999d1553e1
@@ -50,13 +50,14 @@ export default class AdminNavbarDropdown extends React.Component {
|
||||
}
|
||||
|
||||
render() {
|
||||
var teams = [];
|
||||
const teams = [];
|
||||
let switchTeams;
|
||||
|
||||
if (this.state.teamMembers && this.state.teamMembers.length > 0) {
|
||||
for (var index in this.state.teamMembers) {
|
||||
for (const index in this.state.teamMembers) {
|
||||
if (this.state.teamMembers.hasOwnProperty(index)) {
|
||||
var teamMember = this.state.teamMembers[index];
|
||||
var team = this.state.teams[teamMember.team_id];
|
||||
const teamMember = this.state.teamMembers[index];
|
||||
const team = this.state.teams[teamMember.team_id];
|
||||
teams.push(
|
||||
<li key={'team_' + team.name}>
|
||||
<Link
|
||||
@@ -79,6 +80,20 @@ export default class AdminNavbarDropdown extends React.Component {
|
||||
className='divider'
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
switchTeams = (
|
||||
<li>
|
||||
<Link
|
||||
to={'/select_team'}
|
||||
>
|
||||
<i className='fa fa-exchange'/>
|
||||
<FormattedMessage
|
||||
id='admin.nav.switch'
|
||||
defaultMessage='Team Selection'
|
||||
/>
|
||||
</Link>
|
||||
</li>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -104,17 +119,7 @@ export default class AdminNavbarDropdown extends React.Component {
|
||||
role='menu'
|
||||
>
|
||||
{teams}
|
||||
<li>
|
||||
<Link
|
||||
to={'/select_team'}
|
||||
>
|
||||
<i className='fa fa-exchange'/>
|
||||
<FormattedMessage
|
||||
id='admin.nav.switch'
|
||||
defaultMessage='Team Selection'
|
||||
/>
|
||||
</Link>
|
||||
</li>
|
||||
{switchTeams}
|
||||
<li
|
||||
key='teamDiv'
|
||||
className='divider'
|
||||
|
||||
Ссылка в новой задаче
Block a user