aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Change order of fields in add server modal to match the one in mobile v2 (#2230)

Browse source
This commit is contained in:
Pantelis Vratsalis 2022-09-02 19:30:20 +03:00 committed by GitHub
parent 172025f037
commit 7e414bdf5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/renderer/components/NewTeamModal.tsx
View file

@ -34,7 +34,7 @@ type State = {
class NewTeamModal extends React.PureComponent<Props, State> {
wasShown?: boolean;
teamNameInputRef?: HTMLInputElement;
teamUrlInputRef?: HTMLInputElement;
static defaultProps = {
restoreFocus: true,
@ -262,7 +262,7 @@ class NewTeamModal extends React.PureComponent<Props, State> {
show={this.props.show}
id='newServerModal'
enforceFocus={true}
onEntered={() => this.teamNameInputRef?.focus()}
onEntered={() => this.teamUrlInputRef?.focus()}
onHide={this.props.onClose}
restoreFocus={this.props.restoreFocus}
onKeyDown={(e: React.KeyboardEvent) => {
@ -287,41 +287,6 @@ class NewTeamModal extends React.PureComponent<Props, State> {
<Modal.Body>
<form>
<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>
<FormattedMessage
id='renderer.components.newTeamModal.serverURL'
@ -337,13 +302,46 @@ class NewTeamModal extends React.PureComponent<Props, State> {
onClick={(e: React.MouseEvent<HTMLInputElement>) => {
e.stopPropagation();
}}
ref={(ref: HTMLInputElement) => {
this.teamUrlInputRef = ref;
if (this.props.setInputRef) {
this.props.setInputRef(ref);
}
}}
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/>
<FormText className='NewTeamModal-noBottomSpace'>
<FormattedMessage
id='renderer.components.newTeamModal.serverURL.description'
defaultMessage='The URL of your Mattermost server. Must start with http:// or https://.'
id='renderer.components.newTeamModal.serverDisplayName.description'
defaultMessage='The name of the server displayed on your desktop app tab bar.'
/>
</FormText>
</FormGroup>