From df4df815c7447256edf86f0fdf747f8911a36da8 Mon Sep 17 00:00:00 2001 From: Akbar Abdrakhmanov Date: Thu, 19 Oct 2023 17:04:58 +0600 Subject: [PATCH] [MM-54837] Convert LocalizedInput of 'permission_team_scheme_settings.tsx' to regular input component (#24988) --- ...mission_team_scheme_settings.test.tsx.snap | 32 +++---------------- .../permission_team_scheme_settings.test.tsx | 5 ++- .../permission_team_scheme_settings.tsx | 16 ++++++---- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/__snapshots__/permission_team_scheme_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/__snapshots__/permission_team_scheme_settings.test.tsx.snap index 129553691a..547f6c0dfe 100644 --- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/__snapshots__/permission_team_scheme_settings.test.tsx.snap +++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/__snapshots__/permission_team_scheme_settings.test.tsx.snap @@ -92,17 +92,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc id="admin.permissions.teamScheme.schemeNameLabel" /> - @@ -422,17 +416,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc id="admin.permissions.teamScheme.schemeNameLabel" /> - @@ -775,17 +763,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc id="admin.permissions.teamScheme.schemeNameLabel" /> - @@ -1196,17 +1178,11 @@ exports[`components/admin_console/permission_schemes_settings/permission_team_sc id="admin.permissions.teamScheme.schemeNameLabel" /> - diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx index be20f1f7e4..ae98bc27c2 100644 --- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx +++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx @@ -4,7 +4,7 @@ import {shallow} from 'enzyme'; 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', () => { const defaultProps = { @@ -90,6 +90,9 @@ describe('components/admin_console/permission_schemes_settings/permission_team_s }, teams: [ ], + intl: { + formatMessage: jest.fn(), + }, actions: { loadRolesIfNeeded: jest.fn().mockReturnValue(Promise.resolve()), loadRole: jest.fn(), diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.tsx index f9762c7ad6..5967b471d2 100644 --- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.tsx +++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.tsx @@ -2,7 +2,7 @@ // 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 {RouteComponentProps} from 'react-router-dom'; 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 FormError from 'components/form_error'; import LoadingScreen from 'components/loading_screen'; -import LocalizedInput from 'components/localized_input/localized_input'; import SaveButton from 'components/save_button'; import TeamSelectorModal from 'components/team_selector_modal'; import AdminHeader from 'components/widgets/admin_console/admin_header'; @@ -48,6 +47,7 @@ export type Props = { teams: Team[]; isDisabled: boolean; config: Partial; + intl: IntlShape; actions: { loadRolesIfNeeded: (roles: Iterable) => ActionFunc; loadScheme: (schemeId: string) => Promise; @@ -82,7 +82,7 @@ type State = { schemeDescription: string | undefined; }; -export default class PermissionTeamSchemeSettings extends React.PureComponent { +export class PermissionTeamSchemeSettings extends React.PureComponent { constructor(props: Props & RouteComponentProps) { super(props); this.state = { @@ -650,14 +650,14 @@ export default class PermissionTeamSchemeSettings extends React.PureComponent -
@@ -844,3 +844,5 @@ export default class PermissionTeamSchemeSettings extends React.PureComponent