Change order of fields in add server modal to match the one in mobile v2 (#2230)
This commit is contained in:
parent
172025f037
commit
7e414bdf5a
|
@ -34,7 +34,7 @@ type State = {
|
||||||
|
|
||||||
class NewTeamModal extends React.PureComponent<Props, State> {
|
class NewTeamModal extends React.PureComponent<Props, State> {
|
||||||
wasShown?: boolean;
|
wasShown?: boolean;
|
||||||
teamNameInputRef?: HTMLInputElement;
|
teamUrlInputRef?: HTMLInputElement;
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
restoreFocus: true,
|
restoreFocus: true,
|
||||||
|
@ -262,7 +262,7 @@ class NewTeamModal extends React.PureComponent<Props, State> {
|
||||||
show={this.props.show}
|
show={this.props.show}
|
||||||
id='newServerModal'
|
id='newServerModal'
|
||||||
enforceFocus={true}
|
enforceFocus={true}
|
||||||
onEntered={() => this.teamNameInputRef?.focus()}
|
onEntered={() => this.teamUrlInputRef?.focus()}
|
||||||
onHide={this.props.onClose}
|
onHide={this.props.onClose}
|
||||||
restoreFocus={this.props.restoreFocus}
|
restoreFocus={this.props.restoreFocus}
|
||||||
onKeyDown={(e: React.KeyboardEvent) => {
|
onKeyDown={(e: React.KeyboardEvent) => {
|
||||||
|
@ -287,41 +287,6 @@ class NewTeamModal extends React.PureComponent<Props, State> {
|
||||||
<Modal.Body>
|
<Modal.Body>
|
||||||
<form>
|
<form>
|
||||||
<FormGroup>
|
<FormGroup>
|
||||||
<FormLabel>
|
|
||||||
<FormattedMessage
|
|
||||||
id='renderer.components.newTeamModal.serverDisplayName'
|
|
||||||
defaultMessage='Server Display Name'
|
|
||||||
/>
|
|
||||||
</FormLabel>
|
|
||||||
<FormControl
|
|
||||||
id='teamNameInput'
|
|
||||||
type='text'
|
|
||||||
value={this.state.teamName}
|
|
||||||
placeholder={this.props.intl.formatMessage({id: 'renderer.components.newTeamModal.serverDisplayName', defaultMessage: 'Server Display Name'})}
|
|
||||||
onChange={this.handleTeamNameChange}
|
|
||||||
ref={(ref: HTMLInputElement) => {
|
|
||||||
this.teamNameInputRef = ref;
|
|
||||||
if (this.props.setInputRef) {
|
|
||||||
this.props.setInputRef(ref);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
onClick={(e: React.MouseEvent<HTMLInputElement>) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
}}
|
|
||||||
autoFocus={true}
|
|
||||||
isInvalid={Boolean(this.getTeamNameValidationState())}
|
|
||||||
/>
|
|
||||||
<FormControl.Feedback/>
|
|
||||||
<FormText>
|
|
||||||
<FormattedMessage
|
|
||||||
id='renderer.components.newTeamModal.serverDisplayName.description'
|
|
||||||
defaultMessage='The name of the server displayed on your desktop app tab bar.'
|
|
||||||
/>
|
|
||||||
</FormText>
|
|
||||||
</FormGroup>
|
|
||||||
<FormGroup
|
|
||||||
className='NewTeamModal-noBottomSpace'
|
|
||||||
>
|
|
||||||
<FormLabel>
|
<FormLabel>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='renderer.components.newTeamModal.serverURL'
|
id='renderer.components.newTeamModal.serverURL'
|
||||||
|
@ -337,13 +302,46 @@ class NewTeamModal extends React.PureComponent<Props, State> {
|
||||||
onClick={(e: React.MouseEvent<HTMLInputElement>) => {
|
onClick={(e: React.MouseEvent<HTMLInputElement>) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
}}
|
}}
|
||||||
|
ref={(ref: HTMLInputElement) => {
|
||||||
|
this.teamUrlInputRef = ref;
|
||||||
|
if (this.props.setInputRef) {
|
||||||
|
this.props.setInputRef(ref);
|
||||||
|
}
|
||||||
|
}}
|
||||||
isInvalid={Boolean(this.getTeamUrlValidationState())}
|
isInvalid={Boolean(this.getTeamUrlValidationState())}
|
||||||
|
autoFocus={true}
|
||||||
|
/>
|
||||||
|
<FormControl.Feedback/>
|
||||||
|
<FormText>
|
||||||
|
<FormattedMessage
|
||||||
|
id='renderer.components.newTeamModal.serverURL.description'
|
||||||
|
defaultMessage='The URL of your Mattermost server. Must start with http:// or https://.'
|
||||||
|
/>
|
||||||
|
</FormText>
|
||||||
|
</FormGroup>
|
||||||
|
<FormGroup className='NewTeamModal-noBottomSpace'>
|
||||||
|
<FormLabel>
|
||||||
|
<FormattedMessage
|
||||||
|
id='renderer.components.newTeamModal.serverDisplayName'
|
||||||
|
defaultMessage='Server Display Name'
|
||||||
|
/>
|
||||||
|
</FormLabel>
|
||||||
|
<FormControl
|
||||||
|
id='teamNameInput'
|
||||||
|
type='text'
|
||||||
|
value={this.state.teamName}
|
||||||
|
placeholder={this.props.intl.formatMessage({id: 'renderer.components.newTeamModal.serverDisplayName', defaultMessage: 'Server Display Name'})}
|
||||||
|
onChange={this.handleTeamNameChange}
|
||||||
|
onClick={(e: React.MouseEvent<HTMLInputElement>) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
}}
|
||||||
|
isInvalid={Boolean(this.getTeamNameValidationState())}
|
||||||
/>
|
/>
|
||||||
<FormControl.Feedback/>
|
<FormControl.Feedback/>
|
||||||
<FormText className='NewTeamModal-noBottomSpace'>
|
<FormText className='NewTeamModal-noBottomSpace'>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='renderer.components.newTeamModal.serverURL.description'
|
id='renderer.components.newTeamModal.serverDisplayName.description'
|
||||||
defaultMessage='The URL of your Mattermost server. Must start with http:// or https://.'
|
defaultMessage='The name of the server displayed on your desktop app tab bar.'
|
||||||
/>
|
/>
|
||||||
</FormText>
|
</FormText>
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
|
|
Loading…
Reference in a new issue