PLT-2057 User as a first class object (#2648)
* Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding client side unit test * Cleaning up the clint side tests * Fixing msg * Adding more client side unit tests * Adding more using tests * Adding last bit of client side unit tests and adding make cmd * Fixing bad merge * Fixing libraries * Updating to new client side API * Fixing borken unit test * Fixing unit tests * ugg...trying to beat gofmt * ugg...trying to beat gofmt * Cleaning up remainder of the server side routes * Adding inital load api * Increased coverage of webhook unit tests (#2660) * Adding loading ... to root html * Fixing bad merge * Removing explicit content type so superagent will guess corectly (#2685) * Fixing merge and unit tests * Adding create team UI * Fixing signup flows * Adding LDAP unit tests and enterprise unit test helper (#2702) * Add the ability to reset MFA from the commandline (#2706) * Fixing compliance unit tests * Fixing client side tests * Adding open server to system console * Moving websocket connection * Fixing unit test * Fixing unit tests * Fixing unit tests * Adding nickname and more LDAP unit tests (#2717) * Adding join open teams * Cleaning up all TODOs in the code * Fixing web sockets * Removing unused webockets file * PLT-2533 Add the ability to reset a user's MFA from the system console (#2715) * Add the ability to reset a user's MFA from the system console * Add client side unit test for adminResetMfa * Reorganizing authentication to fix LDAP error message (#2723) * Fixing failing unit test * Initial upgrade db code * Adding upgrade script * Fixing upgrade script after running on core * Update OAuth and Claim routes to work with user model changes (#2739) * Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740) * Fixing team invite ldap login call (#2741) * Fixing bluebar and some img stuff * Fix all the different file upload web utils (#2743) * Fixing invalid session redirect (#2744) * Redirect on bad channel name (#2746) * Fixing a bunch of issue and removing dead code * Patch to fix error message on leave channel (#2747) * Setting EnableOpenServer to false by default * Fixing config * Fixing upgrade * Fixing reported bugs * Bug fixes for PLT-2057 * PLT-2563 Redo password recovery to use a database table (#2745) * Redo password recovery to use a database table * Update reset password audits * Split out admin and user reset password APIs to be separate * Delete password recovery when user is permanently deleted * Consolidate password resetting into a single function * Removed private channels as an option for outgoing webhooks (#2752) * PLT-2577/PLT-2552 Fixes for backstage (#2753) * Added URL to incoming webhook list * Fixed client functions for adding/removing integrations * Disallowed slash commands without trigger words * Fixed clientside handling of errors on AddCommand page * Minor auth cleanup (#2758) * Changed EditPostModal to just close if you save without making any changes (#2759) * Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756) * Fixed url in channel info modal (#2755) * Fixing reported issues * Moving to version 3 of the apis * Fixing command unit tests (#2760) * Adding team admins * Fixing DM issue * Fixing eslint error * Properly set EditPostModal's originalText state in all cases (#2762) * Update client config check to assume features is defined if server is licensed (#2772) * Fixing url link * Fixing issue with websocket crashing when sending messages to different teams
Этот коммит содержится в:
Corey Hulen
@@ -5,7 +5,7 @@ import $ from 'jquery';
|
||||
import SettingItemMin from './setting_item_min.jsx';
|
||||
import SettingItemMax from './setting_item_max.jsx';
|
||||
|
||||
import * as Client from 'utils/client.jsx';
|
||||
import Client from 'utils/web_client.jsx';
|
||||
import * as Utils from 'utils/utils.jsx';
|
||||
import TeamStore from 'stores/team_store.jsx';
|
||||
|
||||
@@ -42,7 +42,7 @@ const holders = defineMessages({
|
||||
},
|
||||
openInviteTitle: {
|
||||
id: 'general_tab.openInviteTitle',
|
||||
defaultMessage: 'Allow anyone to sign-up from login page'
|
||||
defaultMessage: 'Allow anyone to join this team'
|
||||
},
|
||||
codeTitle: {
|
||||
id: 'general_tab.codeTitle',
|
||||
@@ -68,7 +68,6 @@ class GeneralTab extends React.Component {
|
||||
this.handleNameSubmit = this.handleNameSubmit.bind(this);
|
||||
this.handleInviteIdSubmit = this.handleInviteIdSubmit.bind(this);
|
||||
this.handleOpenInviteSubmit = this.handleOpenInviteSubmit.bind(this);
|
||||
this.handleTeamListingSubmit = this.handleTeamListingSubmit.bind(this);
|
||||
this.handleClose = this.handleClose.bind(this);
|
||||
this.onUpdateNameSection = this.onUpdateNameSection.bind(this);
|
||||
this.updateName = this.updateName.bind(this);
|
||||
@@ -76,8 +75,6 @@ class GeneralTab extends React.Component {
|
||||
this.updateInviteId = this.updateInviteId.bind(this);
|
||||
this.onUpdateOpenInviteSection = this.onUpdateOpenInviteSection.bind(this);
|
||||
this.handleOpenInviteRadio = this.handleOpenInviteRadio.bind(this);
|
||||
this.onUpdateTeamListingSection = this.onUpdateTeamListingSection.bind(this);
|
||||
this.handleTeamListingRadio = this.handleTeamListingRadio.bind(this);
|
||||
this.handleGenerateInviteId = this.handleGenerateInviteId.bind(this);
|
||||
|
||||
this.state = this.setupInitialState(props);
|
||||
@@ -96,12 +93,19 @@ class GeneralTab extends React.Component {
|
||||
name: team.display_name,
|
||||
invite_id: team.invite_id,
|
||||
allow_open_invite: team.allow_open_invite,
|
||||
allow_team_listing: team.allow_team_listing,
|
||||
serverError: '',
|
||||
clientError: ''
|
||||
};
|
||||
}
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
this.setState({
|
||||
name: nextProps.team.display_name,
|
||||
invite_id: nextProps.team.invite_id,
|
||||
allow_open_invite: nextProps.team.allow_open_invite
|
||||
});
|
||||
}
|
||||
|
||||
handleGenerateInviteId(e) {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -117,14 +121,6 @@ class GeneralTab extends React.Component {
|
||||
this.setState({allow_open_invite: openInvite});
|
||||
}
|
||||
|
||||
handleTeamListingRadio(listing) {
|
||||
if (global.window.mm_config.EnableTeamListing !== 'true' && listing) {
|
||||
this.setState({clientError: this.props.intl.formatMessage(holders.dirDisabled)});
|
||||
} else {
|
||||
this.setState({allow_team_listing: listing});
|
||||
}
|
||||
}
|
||||
|
||||
handleOpenInviteSubmit(e) {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -145,26 +141,6 @@ class GeneralTab extends React.Component {
|
||||
);
|
||||
}
|
||||
|
||||
handleTeamListingSubmit(e) {
|
||||
e.preventDefault();
|
||||
|
||||
var state = {serverError: '', clientError: ''};
|
||||
|
||||
var data = this.props.team;
|
||||
data.allow_team_listing = this.state.allow_team_listing;
|
||||
Client.updateTeam(data,
|
||||
(team) => {
|
||||
TeamStore.saveTeam(team);
|
||||
TeamStore.emitChange();
|
||||
this.updateSection('');
|
||||
},
|
||||
(err) => {
|
||||
state.serverError = err.message;
|
||||
this.setState(state);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
handleNameSubmit(e) {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -239,12 +215,6 @@ class GeneralTab extends React.Component {
|
||||
);
|
||||
}
|
||||
|
||||
componentWillReceiveProps(newProps) {
|
||||
if (newProps.team && newProps.teamDisplayName) {
|
||||
this.setState({name: newProps.teamDisplayName});
|
||||
}
|
||||
}
|
||||
|
||||
handleClose() {
|
||||
this.updateSection('');
|
||||
}
|
||||
@@ -284,15 +254,6 @@ class GeneralTab extends React.Component {
|
||||
}
|
||||
}
|
||||
|
||||
onUpdateTeamListingSection(e) {
|
||||
e.preventDefault();
|
||||
if (this.props.activeSection === 'team_listing') {
|
||||
this.updateSection('');
|
||||
} else {
|
||||
this.updateSection('team_listing');
|
||||
}
|
||||
}
|
||||
|
||||
updateName(e) {
|
||||
e.preventDefault();
|
||||
this.setState({name: e.target.value});
|
||||
@@ -313,105 +274,8 @@ class GeneralTab extends React.Component {
|
||||
serverError = this.state.serverError;
|
||||
}
|
||||
|
||||
const enableTeamListing = global.window.mm_config.EnableTeamListing === 'true';
|
||||
const {formatMessage} = this.props.intl;
|
||||
|
||||
let teamListingSection;
|
||||
if (this.props.activeSection === 'team_listing') {
|
||||
const inputs = [];
|
||||
let submitHandle = null;
|
||||
|
||||
if (enableTeamListing) {
|
||||
submitHandle = this.handleTeamListingSubmit;
|
||||
|
||||
inputs.push(
|
||||
<div key='userTeamListingOptions'>
|
||||
<div className='radio'>
|
||||
<label>
|
||||
<input
|
||||
name='userTeamListingOptions'
|
||||
type='radio'
|
||||
defaultChecked={this.state.allow_team_listing}
|
||||
onChange={this.handleTeamListingRadio.bind(this, true)}
|
||||
/>
|
||||
<FormattedMessage
|
||||
id='general_tab.yes'
|
||||
defaultMessage='Yes'
|
||||
/>
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
<div className='radio'>
|
||||
<label>
|
||||
<input
|
||||
ref='teamListingRadioNo'
|
||||
name='userTeamListingOptions'
|
||||
type='radio'
|
||||
defaultChecked={!this.state.allow_team_listing}
|
||||
onChange={this.handleTeamListingRadio.bind(this, false)}
|
||||
/>
|
||||
<FormattedMessage
|
||||
id='general_tab.no'
|
||||
defaultMessage='No'
|
||||
/>
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
<div>
|
||||
<br/>
|
||||
<FormattedMessage
|
||||
id='general_tab.includeDirDesc'
|
||||
defaultMessage='Including this team will display the team name from the Team Directory section of the Home Page, and provide a link to the sign-in page.'
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
inputs.push(
|
||||
<div key='userTeamListingOptions'>
|
||||
<div>
|
||||
<br/>
|
||||
<FormattedMessage
|
||||
id='general_tab.dirContact'
|
||||
defaultMessage='Contact your system administrator to turn on the team directory on the system home page.'
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
teamListingSection = (
|
||||
<SettingItemMax
|
||||
title={formatMessage(holders.includeDirTitle)}
|
||||
inputs={inputs}
|
||||
submit={submitHandle}
|
||||
server_error={serverError}
|
||||
client_error={clientError}
|
||||
updateSection={this.onUpdateTeamListingSection}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
let describe = '';
|
||||
|
||||
if (enableTeamListing) {
|
||||
if (this.state.allow_team_listing === true) {
|
||||
describe = formatMessage(holders.yes);
|
||||
} else {
|
||||
describe = formatMessage(holders.no);
|
||||
}
|
||||
} else {
|
||||
describe = formatMessage(holders.dirOff);
|
||||
}
|
||||
|
||||
teamListingSection = (
|
||||
<SettingItemMin
|
||||
title={formatMessage(holders.includeDirTitle)}
|
||||
describe={describe}
|
||||
updateSection={this.onUpdateTeamListingSection}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
let openInviteSection;
|
||||
if (this.props.activeSection === 'open_invite') {
|
||||
const inputs = [
|
||||
@@ -450,7 +314,7 @@ class GeneralTab extends React.Component {
|
||||
<br/>
|
||||
<FormattedMessage
|
||||
id='general_tab.openInviteDesc'
|
||||
defaultMessage='When allowed, a link to account creation will be included on the sign-in page of this team and allow any visitor to sign-up.'
|
||||
defaultMessage='When allowed, a link to this team will be including on the landing page allowing anyone with an account to join this team.'
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -639,8 +503,6 @@ class GeneralTab extends React.Component {
|
||||
<div className='divider-light'/>
|
||||
{openInviteSection}
|
||||
<div className='divider-light'/>
|
||||
{teamListingSection}
|
||||
<div className='divider-light'/>
|
||||
{inviteSection}
|
||||
<div className='divider-dark'/>
|
||||
</div>
|
||||
|
||||
Ссылка в новой задаче
Block a user