diff options
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/access_history_modal.jsx | 12 | ||||
-rw-r--r-- | web/react/components/admin_console/admin_controller.jsx | 10 | ||||
-rw-r--r-- | web/react/components/command_list.jsx | 6 | ||||
-rw-r--r-- | web/react/components/msg_typing.jsx | 3 |
4 files changed, 22 insertions, 9 deletions
diff --git a/web/react/components/access_history_modal.jsx b/web/react/components/access_history_modal.jsx index 65b80dfb7..61504a968 100644 --- a/web/react/components/access_history_modal.jsx +++ b/web/react/components/access_history_modal.jsx @@ -106,7 +106,7 @@ export default class AccessHistoryModal extends React.Component { case '/channels/update_header': currentAuditDesc = 'Updated the ' + channelName + ' channel/group header'; break; - default: + default: { let userIdField = []; let userId = ''; let username = ''; @@ -130,11 +130,12 @@ export default class AccessHistoryModal extends React.Component { break; } + } } else if (currentActionURL.indexOf('/oauth') === 0) { const oauthInfo = currentAudit.extra_info.split(' '); switch (currentActionURL) { - case '/oauth/register': + case '/oauth/register': { const clientIdField = oauthInfo[0].split('='); if (clientIdField[0] === 'client_id') { @@ -142,6 +143,7 @@ export default class AccessHistoryModal extends React.Component { } break; + } case '/oauth/allow': if (oauthInfo[0] === 'attempt') { currentAuditDesc = 'Attempted to allow a new OAuth service access'; @@ -202,7 +204,7 @@ export default class AccessHistoryModal extends React.Component { } break; - case '/users/update_roles': + case '/users/update_roles': { const userRoles = userInfo[0].split('=')[1]; currentAuditDesc = 'Updated user role(s) to '; @@ -213,7 +215,8 @@ export default class AccessHistoryModal extends React.Component { } break; - case '/users/update_active': + } + case '/users/update_active': { const updateType = userInfo[0].split('=')[0]; const updateField = userInfo[0].split('=')[1]; @@ -240,6 +243,7 @@ export default class AccessHistoryModal extends React.Component { } break; + } case '/users/send_password_reset': currentAuditDesc = 'Sent an email to ' + userInfo[0].split('=')[1] + ' to reset your password'; break; diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx index 8e0ab0555..3c3f03f5a 100644 --- a/web/react/components/admin_console/admin_controller.jsx +++ b/web/react/components/admin_console/admin_controller.jsx @@ -189,4 +189,12 @@ export default class AdminController extends React.Component { </div> ); } -}
\ No newline at end of file +} + +AdminController.defaultProps = { +}; + +AdminController.propTypes = { + tab: React.PropTypes.string, + teamId: React.PropTypes.string +}; diff --git a/web/react/components/command_list.jsx b/web/react/components/command_list.jsx index a6d9d5d70..9b479b973 100644 --- a/web/react/components/command_list.jsx +++ b/web/react/components/command_list.jsx @@ -13,14 +13,14 @@ export default class CommandList extends React.Component { this.getSuggestedCommands = this.getSuggestedCommands.bind(this); this.state = { - suggestions: [ ], + suggestions: [], cmd: '' }; } handleClick(i) { this.props.addCommand(this.state.suggestions[i].suggestion); - this.setState({suggestions: [ ], cmd: ''}); + this.setState({suggestions: [], cmd: ''}); } addFirstCommand() { @@ -36,7 +36,7 @@ export default class CommandList extends React.Component { getSuggestedCommands(cmd) { if (!cmd || cmd.charAt(0) !== '/') { - this.setState({suggestions: [ ], cmd: ''}); + this.setState({suggestions: [], cmd: ''}); return; } diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx index ccf8a2445..eed85ade6 100644 --- a/web/react/components/msg_typing.jsx +++ b/web/react/components/msg_typing.jsx @@ -74,11 +74,12 @@ export default class MsgTyping extends React.Component { case 1: text = users[0] + ' is typing...'; break; - default: + default: { const last = users.pop(); text = users.join(', ') + ' and ' + last + ' are typing...'; break; } + } this.setState({text}); } |