[MM-54837] Convert LocalizedInput of 'permission_team_scheme_settings.tsx' to regular input component (#24988)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f62634622f
Коммит
df4df815c7
@@ -92,17 +92,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
|
|||||||
id="admin.permissions.teamScheme.schemeNameLabel"
|
id="admin.permissions.teamScheme.schemeNameLabel"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<LocalizedInput
|
<input
|
||||||
className="form-control"
|
className="form-control"
|
||||||
disabled={false}
|
disabled={false}
|
||||||
id="scheme-name"
|
id="scheme-name"
|
||||||
onChange={[Function]}
|
onChange={[Function]}
|
||||||
placeholder={
|
|
||||||
Object {
|
|
||||||
"defaultMessage": "Scheme Name",
|
|
||||||
"id": "admin.permissions.teamScheme.schemeNamePlaceholder",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type="text"
|
type="text"
|
||||||
value="Test scheme"
|
value="Test scheme"
|
||||||
/>
|
/>
|
||||||
@@ -422,17 +416,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
|
|||||||
id="admin.permissions.teamScheme.schemeNameLabel"
|
id="admin.permissions.teamScheme.schemeNameLabel"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<LocalizedInput
|
<input
|
||||||
className="form-control"
|
className="form-control"
|
||||||
disabled={false}
|
disabled={false}
|
||||||
id="scheme-name"
|
id="scheme-name"
|
||||||
onChange={[Function]}
|
onChange={[Function]}
|
||||||
placeholder={
|
|
||||||
Object {
|
|
||||||
"defaultMessage": "Scheme Name",
|
|
||||||
"id": "admin.permissions.teamScheme.schemeNamePlaceholder",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type="text"
|
type="text"
|
||||||
value="Test scheme"
|
value="Test scheme"
|
||||||
/>
|
/>
|
||||||
@@ -775,17 +763,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
|
|||||||
id="admin.permissions.teamScheme.schemeNameLabel"
|
id="admin.permissions.teamScheme.schemeNameLabel"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<LocalizedInput
|
<input
|
||||||
className="form-control"
|
className="form-control"
|
||||||
disabled={false}
|
disabled={false}
|
||||||
id="scheme-name"
|
id="scheme-name"
|
||||||
onChange={[Function]}
|
onChange={[Function]}
|
||||||
placeholder={
|
|
||||||
Object {
|
|
||||||
"defaultMessage": "Scheme Name",
|
|
||||||
"id": "admin.permissions.teamScheme.schemeNamePlaceholder",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type="text"
|
type="text"
|
||||||
value="Test scheme"
|
value="Test scheme"
|
||||||
/>
|
/>
|
||||||
@@ -1196,17 +1178,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc
|
|||||||
id="admin.permissions.teamScheme.schemeNameLabel"
|
id="admin.permissions.teamScheme.schemeNameLabel"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<LocalizedInput
|
<input
|
||||||
className="form-control"
|
className="form-control"
|
||||||
disabled={false}
|
disabled={false}
|
||||||
id="scheme-name"
|
id="scheme-name"
|
||||||
onChange={[Function]}
|
onChange={[Function]}
|
||||||
placeholder={
|
|
||||||
Object {
|
|
||||||
"defaultMessage": "Scheme Name",
|
|
||||||
"id": "admin.permissions.teamScheme.schemeNamePlaceholder",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type="text"
|
type="text"
|
||||||
value=""
|
value=""
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
import {shallow} from 'enzyme';
|
import {shallow} from 'enzyme';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import PermissionTeamSchemeSettings from 'components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings';
|
import {PermissionTeamSchemeSettings} from 'components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings';
|
||||||
|
|
||||||
describe('components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings', () => {
|
describe('components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings', () => {
|
||||||
const defaultProps = {
|
const defaultProps = {
|
||||||
@@ -90,6 +90,9 @@ describe('components/admin_console/permission_schemes_settings/permission_team_s
|
|||||||
},
|
},
|
||||||
teams: [
|
teams: [
|
||||||
],
|
],
|
||||||
|
intl: {
|
||||||
|
formatMessage: jest.fn(),
|
||||||
|
},
|
||||||
actions: {
|
actions: {
|
||||||
loadRolesIfNeeded: jest.fn().mockReturnValue(Promise.resolve()),
|
loadRolesIfNeeded: jest.fn().mockReturnValue(Promise.resolve()),
|
||||||
loadRole: jest.fn(),
|
loadRole: jest.fn(),
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// See LICENSE.txt for license information.
|
// See LICENSE.txt for license information.
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import {FormattedMessage} from 'react-intl';
|
import {FormattedMessage, injectIntl, type IntlShape} from 'react-intl';
|
||||||
import type {RouteComponentProps} from 'react-router-dom';
|
import type {RouteComponentProps} from 'react-router-dom';
|
||||||
|
|
||||||
import type {ClientConfig, ClientLicense} from '@mattermost/types/config';
|
import type {ClientConfig, ClientLicense} from '@mattermost/types/config';
|
||||||
@@ -18,7 +18,6 @@ import BlockableLink from 'components/admin_console/blockable_link';
|
|||||||
import ExternalLink from 'components/external_link';
|
import ExternalLink from 'components/external_link';
|
||||||
import FormError from 'components/form_error';
|
import FormError from 'components/form_error';
|
||||||
import LoadingScreen from 'components/loading_screen';
|
import LoadingScreen from 'components/loading_screen';
|
||||||
import LocalizedInput from 'components/localized_input/localized_input';
|
|
||||||
import SaveButton from 'components/save_button';
|
import SaveButton from 'components/save_button';
|
||||||
import TeamSelectorModal from 'components/team_selector_modal';
|
import TeamSelectorModal from 'components/team_selector_modal';
|
||||||
import AdminHeader from 'components/widgets/admin_console/admin_header';
|
import AdminHeader from 'components/widgets/admin_console/admin_header';
|
||||||
@@ -48,6 +47,7 @@ export type Props = {
|
|||||||
teams: Team[];
|
teams: Team[];
|
||||||
isDisabled: boolean;
|
isDisabled: boolean;
|
||||||
config: Partial<ClientConfig>;
|
config: Partial<ClientConfig>;
|
||||||
|
intl: IntlShape;
|
||||||
actions: {
|
actions: {
|
||||||
loadRolesIfNeeded: (roles: Iterable<string>) => ActionFunc;
|
loadRolesIfNeeded: (roles: Iterable<string>) => ActionFunc;
|
||||||
loadScheme: (schemeId: string) => Promise<ActionResult>;
|
loadScheme: (schemeId: string) => Promise<ActionResult>;
|
||||||
@@ -82,7 +82,7 @@ type State = {
|
|||||||
schemeDescription: string | undefined;
|
schemeDescription: string | undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default class PermissionTeamSchemeSettings extends React.PureComponent<Props & RouteComponentProps, State> {
|
export class PermissionTeamSchemeSettings extends React.PureComponent<Props & RouteComponentProps, State> {
|
||||||
constructor(props: Props & RouteComponentProps) {
|
constructor(props: Props & RouteComponentProps) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
@@ -650,14 +650,14 @@ export default class PermissionTeamSchemeSettings extends React.PureComponent<Pr
|
|||||||
defaultMessage='Scheme Name:'
|
defaultMessage='Scheme Name:'
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<LocalizedInput
|
<input
|
||||||
id='scheme-name'
|
|
||||||
className='form-control'
|
className='form-control'
|
||||||
|
disabled={this.props.isDisabled}
|
||||||
|
id='scheme-name'
|
||||||
|
placeholder={this.props.intl.formatMessage({id: 'admin.permissions.teamScheme.schemeNamePlaceholder', defaultMessage: 'Scheme Name'})}
|
||||||
type='text'
|
type='text'
|
||||||
value={schemeName}
|
value={schemeName}
|
||||||
placeholder={{id: t('admin.permissions.teamScheme.schemeNamePlaceholder'), defaultMessage: 'Scheme Name'}}
|
|
||||||
onChange={this.handleNameChange}
|
onChange={this.handleNameChange}
|
||||||
disabled={this.props.isDisabled}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className='form-group'>
|
<div className='form-group'>
|
||||||
@@ -844,3 +844,5 @@ export default class PermissionTeamSchemeSettings extends React.PureComponent<Pr
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(PermissionTeamSchemeSettings);
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user