mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

PLT-2863 adding remove user from team (#3429)

Просмотр исходного кода 
* PLT-2863 adding remove user from team

* PLT-2863 adding the client side UI

* Fixing trailing space

* Fixing reported issues

* Adding documentatino

* Switching to final javascript driver
Этот коммит содержится в:
Corey Hulen
2016-07-06 13:40:59 -08:00
коммит произвёл GitHub
родитель 3eee51f74e
Коммит d5f243dad6
24 изменённых файлов: 572 добавлений и 19 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
webapp/actions/global_actions.jsx
Просмотреть файл

@@ -288,6 +288,13 @@ export function showInviteMemberModal() {
});
}
export function showLeaveTeamModal() {
AppDispatcher.handleViewAction({
type: ActionTypes.TOGGLE_LEAVE_TEAM_MODAL,
value: true
});
}
export function showRegisterAppModal() {
AppDispatcher.handleViewAction({
type: ActionTypes.TOGGLE_REGISTER_APP_MODAL,

17
webapp/actions/websocket_actions.jsx
Просмотреть файл

@@ -135,6 +135,10 @@ function handleMessage(msg) {
handleNewUserEvent();
break;
case SocketEvents.LEAVE_TEAM:
handleLeaveTeamEvent(msg);
break;
case SocketEvents.USER_ADDED:
handleUserAddedEvent(msg);
break;
@@ -219,6 +223,19 @@ function handleNewUserEvent() {
AsyncClient.getChannelExtraInfo();
}
function handleLeaveTeamEvent(msg) {
if (UserStore.getCurrentId() === msg.user_id) {
TeamStore.removeTeamMember(msg.team_id);
// if the are on the team begin removed redirect them to the root
if (TeamStore.getCurrentId() === msg.team_id) {
browserHistory.push('/');
}
} else if (TeamStore.getCurrentId() === msg.team_id) {
GlobalActions.emitProfilesForDmList();
}
}
function handleDirectAddedEvent(msg) {
AsyncClient.getChannel(msg.channel_id);
AsyncClient.getDirectProfiles();

4
webapp/components/admin_console/team_users.jsx
Просмотреть файл

@@ -186,6 +186,10 @@ export default class UserList extends React.Component {
var memberList = this.state.users.map((user) => {
var teamMember = this.getTeamMemberForUser(user.id);
if (teamMember.delete_at > 0) {
return null;
}
return (
<UserItem
team={this.state.team}

35
webapp/components/admin_console/user_item.jsx
Просмотреть файл

@@ -18,6 +18,7 @@ export default class UserItem extends React.Component {
super(props);
this.handleMakeMember = this.handleMakeMember.bind(this);
this.handleRemoveFromTeam = this.handleRemoveFromTeam.bind(this);
this.handleMakeActive = this.handleMakeActive.bind(this);
this.handleMakeNotActive = this.handleMakeNotActive.bind(this);
this.handleMakeAdmin = this.handleMakeAdmin.bind(this);
@@ -56,6 +57,19 @@ export default class UserItem extends React.Component {
}
}
handleRemoveFromTeam() {
Client.removeUserFromTeam(
this.props.team.id,
this.props.user.id,
() => {
this.props.refreshProfiles();
},
(err) => {
this.setState({serverError: err.message});
}
);
}
handleMakeActive(e) {
e.preventDefault();
Client.updateActive(this.props.user.id, true,
@@ -222,6 +236,7 @@ export default class UserItem extends React.Component {
);
}
const me = UserStore.getCurrentUser();
const email = user.email;
let showMakeMember = teamMember.roles === 'admin' || user.roles === 'system_admin';
let showMakeAdmin = teamMember.roles === '' && user.roles !== 'system_admin';
@@ -299,6 +314,24 @@ export default class UserItem extends React.Component {
);
}
let removeFromTeam = null;
if (this.props.user.id !== me.id) {
removeFromTeam = (
<li role='presentation'>
<a
role='menuitem'
href='#'
onClick={this.handleRemoveFromTeam}
>
<FormattedMessage
id='team_members_dropdown.leave_team'
defaultMessage='Remove From Team'
/>
</a>
</li>
);
}
let makeActive = null;
if (showMakeActive) {
makeActive = (
@@ -428,7 +461,6 @@ export default class UserItem extends React.Component {
passwordReset = null;
}
const me = UserStore.getCurrentUser();
let makeDemoteModal = null;
if (this.props.user.id === me.id) {
const title = (
@@ -511,6 +543,7 @@ export default class UserItem extends React.Component {
className='dropdown-menu member-menu'
role='menu'
>
{removeFromTeam}
{makeAdmin}
{makeMember}
{makeActive}

15
webapp/components/filtered_user_list.jsx
Просмотреть файл

@@ -39,17 +39,24 @@ class FilteredUserList extends React.Component {
this.state = {
filter: '',
users: this.filterUsers(props.teamMembers, props.users),
selected: 'team'
selected: 'team',
teamMembers: props.teamMembers
};
}
componentWillUpdate(nextProps) {
componentWillReceiveProps(nextProps) {
// assume the user list is immutable
if (this.props.users !== nextProps.users) {
this.setState({
users: this.filterUsers(nextProps.teamMembers, nextProps.users)
});
}
if (this.props.teamMembers !== nextProps.teamMembers) {
this.setState({
users: this.filterUsers(nextProps.teamMembers, nextProps.users)
});
}
}
componentDidMount() {
@@ -70,6 +77,10 @@ class FilteredUserList extends React.Component {
var filteredUsers = users.filter((user) => {
for (const index in teamMembers) {
if (teamMembers.hasOwnProperty(index) && teamMembers[index].user_id === user.id) {
if (teamMembers[index].delete_at > 0) {
return false;
}
return true;
}
}

115
webapp/components/leave_team_modal.jsx Обычный файл
Просмотреть файл

@@ -0,0 +1,115 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
import * as GlobalActions from 'actions/global_actions.jsx';
import ModalStore from 'stores/modal_store.jsx';
import UserStore from 'stores/user_store.jsx';
import {intlShape, injectIntl, FormattedMessage} from 'react-intl';
import {Modal} from 'react-bootstrap';
import React from 'react';
class LeaveTeamModal extends React.Component {
constructor(props) {
super(props);
this.handleToggle = this.handleToggle.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
this.handleHide = this.handleHide.bind(this);
this.state = {
show: false
};
}
componentDidMount() {
ModalStore.addModalListener(ActionTypes.TOGGLE_LEAVE_TEAM_MODAL, this.handleToggle);
}
componentWillUnmount() {
ModalStore.removeModalListener(ActionTypes.TOGGLE_LEAVE_TEAM_MODAL, this.handleToggle);
}
handleToggle(value) {
this.setState({
show: value
});
}
handleSubmit() {
GlobalActions.emitLeaveTeam();
this.setState({
show: false
});
}
handleHide() {
this.setState({
show: false
});
}
render() {
var currentUser = UserStore.getCurrentUser();
if (currentUser != null) {
return (
<Modal
className='modal-confirm'
show={this.state.show}
onHide={this.handleHide}
>
<Modal.Header closeButton={false}>
<Modal.Title>
<FormattedMessage
id='leave_team_modal.title'
defaultMessage='Leave the team?'
/>
</Modal.Title>
</Modal.Header>
<Modal.Body>
<FormattedMessage
id='leave_team_modal.desc'
defaultMessage='You will be removed from all public channels and private groups. If the team is private you will not be able to rejoin the team. Are you sure?'
/>
</Modal.Body>
<Modal.Footer>
<button
type='button'
className='btn btn-default'
onClick={this.handleHide}
>
<FormattedMessage
id='leave_team_modal.no'
defaultMessage='No'
/>
</button>
<button
type='button'
className='btn btn-danger'
onClick={this.handleSubmit}
>
<FormattedMessage
id='leave_team_modal.yes'
defaultMessage='Yes'
/>
</button>
</Modal.Footer>
</Modal>
);
}
return null;
}
}
LeaveTeamModal.propTypes = {
intl: intlShape.isRequired
};
export default injectIntl(LeaveTeamModal);

14
webapp/components/navbar_dropdown.jsx
Просмотреть файл

@@ -236,6 +236,20 @@ export default class NavbarDropdown extends React.Component {
);
}
teams.push(
<li key='leaveTeam_li'>
<a
href='#'
onClick={GlobalActions.showLeaveTeamModal}
>
<FormattedMessage
id='navbar_dropdown.leave'
defaultMessage='Leave Team'
/>
</a>
</li>
);
if (this.state.teamMembers && this.state.teamMembers.length > 1) {
teams.push(
<li

2
webapp/components/needs_team.jsx
Просмотреть файл

@@ -34,6 +34,7 @@ import RemovedFromChannelModal from 'components/removed_from_channel_modal.jsx';
import RegisterAppModal from 'components/register_app_modal.jsx';
import ImportThemeModal from 'components/user_settings/import_theme_modal.jsx';
import InviteMemberModal from 'components/invite_member_modal.jsx';
import LeaveTeamModal from 'components/leave_team_modal.jsx';
import SelectTeamModal from 'components/admin_console/select_team_modal.jsx';
export default class NeedsTeam extends React.Component {
@@ -129,6 +130,7 @@ export default class NeedsTeam extends React.Component {
<GetPublicLinkModal/>
<GetTeamInviteLinkModal/>
<InviteMemberModal/>
<LeaveTeamModal/>
<ImportThemeModal/>
<TeamSettingsModal/>
<MoreChannelsModal/>

36
webapp/components/team_members_dropdown.jsx
Просмотреть файл

@@ -19,6 +19,7 @@ export default class TeamMembersDropdown extends React.Component {
super(props);
this.handleMakeMember = this.handleMakeMember.bind(this);
this.handleRemoveFromTeam = this.handleRemoveFromTeam.bind(this);
this.handleMakeActive = this.handleMakeActive.bind(this);
this.handleMakeNotActive = this.handleMakeNotActive.bind(this);
this.handleMakeAdmin = this.handleMakeAdmin.bind(this);
@@ -52,6 +53,19 @@ export default class TeamMembersDropdown extends React.Component {
);
}
}
handleRemoveFromTeam() {
Client.removeUserFromTeam(
'',
this.props.user.id,
() => {
AsyncClient.getTeamMembers(TeamStore.getCurrentId());
AsyncClient.getProfiles();
},
(err) => {
this.setState({serverError: err.message});
}
);
}
handleMakeActive() {
Client.updateActive(this.props.user.id, true,
() => {
@@ -171,6 +185,7 @@ export default class TeamMembersDropdown extends React.Component {
);
}
const me = UserStore.getCurrentUser();
let showMakeMember = teamMember.roles === 'admin' || user.roles === 'system_admin';
let showMakeAdmin = teamMember.roles === '' && user.roles !== 'system_admin';
let showMakeActive = false;
@@ -225,6 +240,24 @@ export default class TeamMembersDropdown extends React.Component {
);
}
let removeFromTeam = null;
if (this.props.user.id !== me.id) {
removeFromTeam = (
<li role='presentation'>
<a
role='menuitem'
href='#'
onClick={this.handleRemoveFromTeam}
>
<FormattedMessage
id='team_members_dropdown.leave_team'
defaultMessage='Remove From Team'
/>
</a>
</li>
);
}
let makeActive = null;
if (showMakeActive) {
// makeActive = (
@@ -260,7 +293,7 @@ export default class TeamMembersDropdown extends React.Component {
// </li>
// );
}
const me = UserStore.getCurrentUser();
let makeDemoteModal = null;
if (this.props.user.id === me.id) {
const title = (
@@ -321,6 +354,7 @@ export default class TeamMembersDropdown extends React.Component {
className='dropdown-menu member-menu'
role='menu'
>
{removeFromTeam}
{makeAdmin}
{makeMember}
{makeActive}

2
webapp/i18n/en.json
Просмотреть файл

@@ -1202,6 +1202,7 @@
"navbar_dropdown.accountSettings": "Account Settings",
"navbar_dropdown.console": "System Console",
"navbar_dropdown.create": "Create a New Team",
"navbar_dropdown.leave": "Leave Team",
"navbar_dropdown.emoji": "Custom Emoji",
"navbar_dropdown.help": "Help",
"navbar_dropdown.integrations": "Integrations",
@@ -1414,6 +1415,7 @@
"team_members_dropdown.makeAdmin": "Make Team Admin",
"team_members_dropdown.makeInactive": "Make Inactive",
"team_members_dropdown.makeMember": "Make Member",
"team_members_dropdown.leave_team": "Remove From Team",
"team_members_dropdown.member": "Member",
"team_members_dropdown.systemAdmin": "System Admin",
"team_members_dropdown.teamAdmin": "Team Admin",

2
webapp/package.json
Просмотреть файл

@@ -18,7 +18,7 @@
"keymirror": "0.1.1",
"marked": "mattermost/marked#12d2be4cdf54d4ec95fead934e18840b6a2c1a7b",
"match-at": "0.1.0",
"mattermost": "mattermost/mattermost-javascript#18527e6c4a9aea69aa7845a62d9618b357faa4e7",
"mattermost": "mattermost/mattermost-javascript#c72a75ca4ac135e2d476fc048ef7adc450e6739f",
"object-assign": "4.1.0",
"perfect-scrollbar": "0.6.11",
"react": "15.0.2",

1
webapp/stores/modal_store.jsx
Просмотреть файл

@@ -33,6 +33,7 @@ class ModalStoreClass extends EventEmitter {
switch (type) {
case ActionTypes.TOGGLE_IMPORT_THEME_MODAL:
case ActionTypes.TOGGLE_INVITE_MEMBER_MODAL:
case ActionTypes.TOGGLE_LEAVE_TEAM_MODAL:
case ActionTypes.TOGGLE_DELETE_POST_MODAL:
case ActionTypes.TOGGLE_GET_POST_LINK_MODAL:
case ActionTypes.TOGGLE_GET_TEAM_INVITE_LINK_MODAL:

10
webapp/stores/team_store.jsx
Просмотреть файл

@@ -139,6 +139,16 @@ class TeamStoreClass extends EventEmitter {
this.team_members.push(member);
}
removeTeamMember(teamId) {
for (var index in this.team_members) {
if (this.team_members.hasOwnProperty(index)) {
if (this.team_members[index].team_id === teamId) {
Reflect.deleteProperty(this.team_members, index);
}
}
}
}
getTeamMembers() {
return this.team_members;
}

2
webapp/utils/constants.jsx
Просмотреть файл

@@ -113,6 +113,7 @@ export default {
TOGGLE_IMPORT_THEME_MODAL: null,
TOGGLE_INVITE_MEMBER_MODAL: null,
TOGGLE_LEAVE_TEAM_MODAL: null,
TOGGLE_DELETE_POST_MODAL: null,
TOGGLE_GET_POST_LINK_MODAL: null,
TOGGLE_GET_TEAM_INVITE_LINK_MODAL: null,
@@ -160,6 +161,7 @@ export default {
CHANNEL_VIEWED: 'channel_viewed',
DIRECT_ADDED: 'direct_added',
NEW_USER: 'new_user',
LEAVE_TEAM: 'leave_team',
USER_ADDED: 'user_added',
USER_REMOVED: 'user_removed',
TYPING: 'typing',