[MM-20582] Migrate 'components/admin_console/team_channel_settings/ch… (

mattermost#6840)
pvev · Nov 24, 2020 · 15f3b12 · 15f3b12
1 parent 7e1aa5b
commit 15f3b12
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/...napshots__/channel_settings.test.jsx.snap → ...napshots__/channel_settings.test.tsx.snap b/...napshots__/channel_settings.test.jsx.snap → ...napshots__/channel_settings.test.tsx.snap
@@ -38,9 +38,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelSettings should matc
         titleDefault="Channels"
         titleId="admin.channel_settings.title"
       >
-        <Connect(ChannelList)
-          onPageChangedCallback={[Function]}
-        />
+        <Connect(ChannelList) />
       </AdminPanel>
     </div>
   </div>

diff --git a/...ettings/channel/channel_settings.test.jsx → ...ettings/channel/channel_settings.test.tsx b/...ettings/channel/channel_settings.test.jsx → ...ettings/channel/channel_settings.test.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import {ChannelsSettings} from './channel_settings.jsx';
+import {ChannelsSettings} from './channel_settings';
 
 describe('admin_console/team_channel_settings/channel/ChannelSettings', () => {
     test('should match snapshot', () => {

diff --git a/...nel_settings/channel/channel_settings.jsx → ...nel_settings/channel/channel_settings.tsx b/...nel_settings/channel/channel_settings.jsx → ...nel_settings/channel/channel_settings.tsx
@@ -2,19 +2,24 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import {FormattedMessage} from 'react-intl';
 
 import {t} from 'utils/i18n';
 import ChannelsList from 'components/admin_console/team_channel_settings/channel/list';
 import AdminPanel from 'components/widgets/admin_console/admin_panel';
 
-export class ChannelsSettings extends React.PureComponent {
-    static propTypes = {
-        siteName: PropTypes.string.isRequired,
-    };
+interface Props {
+    siteName?: string,
+}
+
+export interface ChannelSettingsState {
+    startCount: number,
+    endCount: number,
+    total: number,
+}
 
-    constructor(props) {
+export class ChannelsSettings extends React.PureComponent<Props> {
+    constructor(props: Props) {
         super(props);
         this.state = {
             startCount: 0,
@@ -23,10 +28,6 @@ export class ChannelsSettings extends React.PureComponent {
         };
     }
 
-    onPageChangedCallback = ({startCount, endCount, total}) => {
-        this.setState({startCount, endCount, total});
-    }
-
     render = () => {
         return (
             <div className='wrapper--fixed'>
@@ -48,9 +49,7 @@ export class ChannelsSettings extends React.PureComponent {
                             subtitleDefault={'Manage channel settings.'}
                             subtitleValues={{...this.state}}
                         >
-                            <ChannelsList
-                                onPageChangedCallback={this.onPageChangedCallback}
-                            />
+                            <ChannelsList/>
                         </AdminPanel>
                     </div>
                 </div>

diff --git a/...le/team_channel_settings/channel/index.js → ...le/team_channel_settings/channel/index.ts b/...le/team_channel_settings/channel/index.js → ...le/team_channel_settings/channel/index.ts
@@ -4,9 +4,11 @@
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {connect} from 'react-redux';
 
+import {GlobalState} from 'mattermost-redux/types/store';
+
 import {ChannelsSettings} from './channel_settings';
 
-function mapStateToProps(state) {
+function mapStateToProps(state: GlobalState) {
     const config = getConfig(state);
     const siteName = config.SiteName;
 

diff --git a/components/admin_console/team_channel_settings/channel/list/channel_list.tsx b/components/admin_console/team_channel_settings/channel/list/channel_list.tsx
@@ -31,7 +31,6 @@ interface ChannelListProps {
     data: ChannelWithTeamData[];
     total: number;
     removeGroup?: () => void;
-    onPageChangedCallback?: () => void;
     emptyListTextId?: string;
     emptyListTextDefaultMessage?: string;
     isDisabled?: boolean;