From 292705acdf6a86df4b2089e7f9dafb2e05c5f836 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 6 Jul 2016 12:28:15 -0400 Subject: Add channel management permissions to mobile channel dropdown and clean up logic a bit (#3505) --- webapp/components/navbar.jsx | 296 ++++++++++++++++++++++++++----------------- 1 file changed, 180 insertions(+), 116 deletions(-) diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index bd151dffa..44730f4e2 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -64,6 +64,7 @@ export default class Navbar extends React.Component { state.showChannelSwitchModal = false; this.state = state; } + getStateFromStores() { return { channel: ChannelStore.getCurrent(), @@ -73,9 +74,11 @@ export default class Navbar extends React.Component { currentUser: UserStore.getCurrentUser() }; } + isStateValid() { return this.state.channel && this.state.member && this.state.users && this.state.currentUser; } + componentDidMount() { ChannelStore.addChangeListener(this.onChange); ChannelStore.addExtraInfoChangeListener(this.onChange); @@ -83,15 +86,18 @@ export default class Navbar extends React.Component { $('.inner-wrap').click(this.hideSidebars); document.addEventListener('keydown', this.showChannelSwitchModal); } + componentWillUnmount() { ChannelStore.removeChangeListener(this.onChange); ChannelStore.removeExtraInfoChangeListener(this.onChange); UserStore.removeStatusesChangeListener(this.onChange); document.removeEventListener('keydown', this.showChannelSwitchModal); } + handleSubmit(e) { e.preventDefault(); } + handleLeave() { Client.leaveChannel(this.state.channel.id, () => { @@ -103,6 +109,7 @@ export default class Navbar extends React.Component { } ); } + hideSidebars(e) { var windowWidth = $(window).outerWidth(); if (windowWidth <= 768) { @@ -124,22 +131,27 @@ export default class Navbar extends React.Component { } } } + toggleLeftSidebar() { $('.app__body .inner-wrap').toggleClass('move--right'); $('.app__body .sidebar--left').toggleClass('move--right'); } + toggleRightSidebar() { $('.app__body .inner-wrap').toggleClass('move--left-small'); $('.app__body .sidebar--menu').toggleClass('move--left'); } + showSearch() { AppDispatcher.handleServerAction({ type: ActionTypes.SHOW_SEARCH }); } + onChange() { this.setState(this.getStateFromStores()); } + showEditChannelHeaderModal() { // this can't be done using a ToggleModalButton because we can't use one inside an OverlayTrigger if (this.refs.headerOverlay) { @@ -150,6 +162,7 @@ export default class Navbar extends React.Component { showEditChannelHeaderModal: true }); } + showRenameChannelModal(e) { e.preventDefault(); @@ -157,11 +170,13 @@ export default class Navbar extends React.Component { showRenameChannelModal: true }); } + hideRenameChannelModal() { this.setState({ showRenameChannelModal: false }); } + showChannelSwitchModal(e) { if (Utils.cmdOrCtrlPressed(e) && e.keyCode === Constants.KeyCodes.K) { e.preventDefault(); @@ -170,12 +185,38 @@ export default class Navbar extends React.Component { }); } } + hideChannelSwitchModal() { this.setState({ showChannelSwitchModal: false }); } - createDropdown(channel, channelTitle, isAdmin, isDirect, popoverContent) { + + showManagementOptions(channel, isAdmin, isSystemAdmin) { + if (global.window.mm_license.IsLicensed !== 'true') { + return true; + } + + if (channel.type === Constants.OPEN_CHANNEL) { + if (global.window.mm_config.RestrictPublicChannelManagement === Constants.PERMISSIONS_SYSTEM_ADMIN && !isSystemAdmin) { + return false; + } + if (global.window.mm_config.RestrictPublicChannelManagement === Constants.PERMISSIONS_TEAM_ADMIN && !isAdmin) { + return false; + } + } else if (channel.type === Constants.PRIVATE_CHANNEL) { + if (global.window.mm_config.RestrictPrivateChannelManagement === Constants.PERMISSIONS_SYSTEM_ADMIN && !isSystemAdmin) { + return false; + } + if (global.window.mm_config.RestrictPrivateChannelManagement === Constants.PERMISSIONS_TEAM_ADMIN && !isAdmin) { + return false; + } + } + + return true; + } + + createDropdown(channel, channelTitle, isAdmin, isSystemAdmin, isDirect, popoverContent) { if (channel) { let channelTerm = ( - - - - - ); - - var setChannelHeaderOption = ( -
  • - - - -
    • - ); - - var setChannelPurposeOption = null; - if (!isDirect) { - setChannelPurposeOption = ( + let viewInfoOption; + let addMembersOption; + let manageMembersOption; + let setChannelHeaderOption; + let setChannelPurposeOption; + let notificationPreferenceOption; + let renameChannelOption; + let deleteChannelOption; + let leaveChannelOption; + + if (isDirect) { + setChannelHeaderOption = (
  • this.setState({showEditChannelPurposeModal: true})} + onClick={this.showEditChannelHeaderModal} >
    • ); - } + } else { + viewInfoOption = ( +
  • + + + +
    • + ); + + if (!ChannelStore.isDefault(channel)) { + addMembersOption = ( +
  • + + + +
    • + ); - var addMembersOption; - var leaveChannelOption; - if (!isDirect && !ChannelStore.isDefault(channel)) { - addMembersOption = ( + if (isAdmin) { + manageMembersOption = ( +
  • + this.setState({showMembersModal: true})} + > + + +
    • + ); + } + } + + notificationPreferenceOption = (
    • ); - const canLeave = channel.type === Constants.PRIVATE_CHANNEL ? this.state.userCount > 1 : true; - if (canLeave) { - leaveChannelOption = ( + if (this.showManagementOptions(channel, isAdmin, isSystemAdmin)) { + setChannelHeaderOption = (
    • ); - } - } - var manageMembersOption; - var renameChannelOption; - var deleteChannelOption; - if (!isDirect && isAdmin) { - if (!ChannelStore.isDefault(channel)) { - manageMembersOption = ( + setChannelPurposeOption = (
  • this.setState({showMembersModal: true})} + onClick={() => this.setState({showEditChannelPurposeModal: true})} >
    • ); - deleteChannelOption = ( + renameChannelOption = (
  • - - +
    • ); } - renameChannelOption = ( -
  • - - - -
    • - ); - } + if (this.showManagementOptions(channel, isAdmin, isSystemAdmin) || this.state.userCount === 1) { + if (!ChannelStore.isDefault(channel)) { + deleteChannelOption = ( +
  • + + + +
    • + ); + } + } - var notificationPreferenceOption; - if (!isDirect) { - notificationPreferenceOption = ( -
  • - - - -
    • - ); + const canLeave = channel.type === Constants.PRIVATE_CHANNEL ? this.state.userCount > 1 : true; + if (!ChannelStore.isDefault(channel) && canLeave) { + leaveChannelOption = ( +
  • + + + +
    • + ); + } } return ( @@ -419,6 +480,7 @@ export default class Navbar extends React.Component { ); } + createCollapseButtons(currentId) { var buttons = []; if (currentId == null) { @@ -505,6 +567,7 @@ export default class Navbar extends React.Component { var channelTitle = this.props.teamDisplayName; var popoverContent; var isAdmin = false; + var isSystemAdmin = false; var isDirect = false; var editChannelHeaderModal = null; @@ -527,7 +590,8 @@ export default class Navbar extends React.Component { ); - isAdmin = Utils.isAdmin(this.state.member.roles) || TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser(); + isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser(); + isSystemAdmin = UserStore.isSystemAdminForCurrentUser(); if (channel.type === 'O') { channelTitle = channel.display_name; @@ -632,7 +696,7 @@ export default class Navbar extends React.Component { ); - var channelMenuDropdown = this.createDropdown(channel, channelTitle, isAdmin, isDirect, popoverContent); + var channelMenuDropdown = this.createDropdown(channel, channelTitle, isAdmin, isSystemAdmin, isDirect, popoverContent); return (
    -- cgit v1.2.3-1-g7c22