IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-54832] Convert LocalizedInput of 'password_reset_send_link.tsx' to regular input component (#25018)

Browse Source
This commit is contained in:
Akbar Abdrakhmanov 2023-10-20 17:46:22 +06:00 committed by GitHub
parent 342b20ba54
commit 745e5252ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/channels/src/components/password_reset_send_link/__snapshots__/password_reset_send_link.test.tsx.snap
View File

@ -28,17 +28,11 @@ exports[`components/PasswordResetSendLink should match snapshot 1`] = `
<div
className="form-group"
>
<LocalizedInput
<input
autoFocus={true}
className="form-control"
id="passwordResetEmailInput"
name="email"
placeholder={
Object {
"defaultMessage": "Email",
"id": "password_send.email",
}
}
spellCheck="false"
type="email"
/>

7
webapp/channels/src/components/password_reset_send_link/password_reset_send_link.test.tsx
View File

@ -5,15 +5,18 @@ import {shallow} from 'enzyme';
import React from 'react';
import {MemoryRouter} from 'react-router-dom';
import {mountWithIntl} from 'tests/helpers/intl-test-helper';
import {mountWithIntl, type MockIntl} from 'tests/helpers/intl-test-helper';
import PasswordResetSendLink from './password_reset_send_link';
import {PasswordResetSendLink} from './password_reset_send_link';
describe('components/PasswordResetSendLink', () => {
const baseProps = {
actions: {
sendPasswordResetEmail: jest.fn().mockResolvedValue({data: true}),
},
intl: {
formatMessage: jest.fn(),
} as MockIntl,
};
it('should match snapshot', () => {

18
webapp/channels/src/components/password_reset_send_link/password_reset_send_link.tsx
View File

@ -2,21 +2,19 @@
// See LICENSE.txt for license information.
import React from 'react';
import {FormattedMessage} from 'react-intl';
import {FormattedMessage, injectIntl, type IntlShape} from 'react-intl';
import type {ServerError} from '@mattermost/types/errors';
import {isEmail} from 'mattermost-redux/utils/helpers';
import BackButton from 'components/common/back_button';
import LocalizedInput from 'components/localized_input/localized_input';
import {t} from 'utils/i18n';
interface Props {
actions: {
sendPasswordResetEmail: (email: string) => Promise<{data: any; error: ServerError}>;
};
intl: IntlShape;
}
interface State {
@ -24,7 +22,7 @@ interface State {
updateText: React.ReactNode;
}
export default class PasswordResetSendLink extends React.PureComponent<Props, State> {
export class PasswordResetSendLink extends React.PureComponent<Props, State> {
state = {
error: null,
updateText: null,
@ -123,15 +121,15 @@ export default class PasswordResetSendLink extends React.PureComponent<Props, St
/>
</p>
<div className={formClass}>
<LocalizedInput
<input
id='passwordResetEmailInput'
type='email'
className='form-control'
name='email'
placeholder={{
id: t('password_send.email'),
placeholder={this.props.intl.formatMessage({
id: 'password_send.email',
defaultMessage: 'Email',
}}
})}
ref={this.emailInput}
spellCheck='false'
autoFocus={true}
@ -155,3 +153,5 @@ export default class PasswordResetSendLink extends React.PureComponent<Props, St
);
}
}
export default injectIntl(PasswordResetSendLink);

4
webapp/channels/src/tests/helpers/intl-test-helper.tsx
View File

@ -114,3 +114,7 @@ export function mountWithIntl<T extends ReactElement | IntlInjectedElement>(elem
},
);
}
export interface MockIntl extends IntlShape {
formatMessage: jest.Mock;
}