erge branch 'master' into MM-32087

.eslintrc.json

@@ -11,7 +11,8 @@
  "import",
  "cypress",
  "jquery",
- "no-only-tests"
+ "no-only-tests",
+ "@typescript-eslint"
  ],
  "parser": "@typescript-eslint/parser",
  "env": {
@@ -47,6 +48,7 @@
  }
  ],
  "no-undefined": 0,
+ "no-use-before-define": 0,
  "react/jsx-filename-extension": 0,
  "react/prop-types": [
  2,
@@ -71,8 +73,9 @@
  "plugin:@typescript-eslint/recommended"
  ],
  "rules": {
- "import/no-unresolved": 0, // ts handles this better
  "camelcase": 0,
+ "no-shadow": 0,
+ "import/no-unresolved": 0, // ts handles this better
  "@typescript-eslint/naming-convention": [
  2,
  {
@@ -119,8 +122,7 @@
  "functions": false,
  "variables": false
  }
- ],
- "react/jsx-filename-extension": 0
+ ]
  }
  },
  {
@@ -139,12 +141,9 @@
  {
  "files": ["e2e/**"],
  "rules": {
+ "babel/no-unused-expressions": 0,
  "func-names": 0,
  "import/no-unresolved": 0,
- "max-nested-callbacks": 0,
- "no-process-env": 0,
- "babel/no-unused-expressions": 0,
- "no-unused-expressions": 0,
  "jquery/no-ajax": 0,
  "jquery/no-ajax-events": 0,
  "jquery/no-animate": 0,
@@ -193,7 +192,10 @@
  "jquery/no-trim": 0,
  "jquery/no-val": 0,
  "jquery/no-when": 0,
- "jquery/no-wrap": 0
+ "jquery/no-wrap": 0,
+ "max-nested-callbacks": 0,
+ "no-process-env": 0,
+ "no-unused-expressions": 0
  }
  }
  ]

Makefile

@@ -92,10 +92,7 @@ stop: ## Stops webpack
 ifeq ($(OS),Windows_NT)
  wmic process where "Caption='node.exe' and CommandLine like '%webpack%'" call terminate
 else
- @for PROCID in $$(ps -ef | grep "[n]ode.*[w]ebpack" | awk '{ print $$2 }'); do \
- echo stopping webpack watch $$PROCID; \
- kill $$PROCID; \
- done
+ @pkill -fl webpack || true
 endif
 
 restart: | stop run ## Restarts the app

actions/cloud.tsx

@@ -1,6 +1,6 @@
-
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
+
 import {Stripe} from '@stripe/stripe-js';
 import {getCode} from 'country-list';
 

actions/views/create_comment.test.jsx

@@ -308,7 +308,7 @@ describe('rhs view actions', () => {
 
  jest.resetModules();
 
- const {submitCommand: remockedSubmitCommand} = require('actions/views/create_comment');
+ const {submitCommand: remockedSubmitCommand} = require('actions/views/create_comment'); // eslint-disable-like @typescript-eslint/no-var-requires
 
  await store.dispatch(remockedSubmitCommand(channelId, rootId, draft));
 

components/admin_console/admin_definition.test.jsx

@@ -18,7 +18,9 @@ const baseShape = {
 const fieldShape = {
  ...baseShape,
  key: yup.string().required(),
- help_text: yup.string(),
+
+ // help_text: yup.string(), // Commented out since this doesn't work when help_text is a ReactNode
+
  help_text_default: yup.string(),
  help_text_html: yup.boolean(),
  help_text_values: yup.object(),

components/admin_console/admin_settings.tsx

@@ -28,8 +28,6 @@ export type BaseState = {
  errorTooltip: boolean;
 }
 
-type StateKeys = keyof BaseState;
-
 // Placeholder type until ClientError is exported from redux.
 // TODO: remove ClientErrorPlaceholder and change the return type of updateConfig
 type ClientErrorPlaceholder = {

components/admin_console/filter/team_filter_dropdown/team_filter_checkbox.tsx

@@ -18,7 +18,13 @@ class TeamFilterCheckbox extends React.PureComponent<Props> {
  }
 
  render() {
- const {id, checked, label} = this.props;
+ const {
+ checked,
+ id,
+ label,
+ name,
+ } = this.props;
+
  return (
  <div className='TeamFilterDropdown_checkbox'>
  <label>

components/admin_console/group_settings/groups_list/groups_list.tsx

@@ -268,8 +268,6 @@ export default class GroupsList extends React.PureComponent<Props, State> {
  let {searchString} = this.state;
 
  const newState = {...this.state};
- delete newState.page;
- delete newState.checked;
 
  let q = searchString;
  let opts = {q: ''};

components/admin_console/plugin_management/plugin_management.tsx

@@ -387,18 +387,6 @@ const PluginItem = ({
  );
 };
 
-interface PluginSettings {
- Enable: boolean;
- EnableUploads: boolean;
- AllowInsecureDownloadUrl: boolean;
- EnableMarketplace: boolean;
- EnableRemoteMarketplace: boolean;
- AutomaticPrepackagedPlugins: boolean;
- MarketplaceUrl: string;
- RequirePluginSignature: boolean;
- isDisabled: boolean;
-}
-
 type Props = BaseProps & {
  config: DeepPartial<AdminConfig>;
  pluginStatuses: Record<string, PluginStatus>;

components/admin_console/system_roles/system_role/add_users_to_role_modal/add_users_to_role_modal.tsx

@@ -1,4 +1,3 @@
-
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 

components/admin_console/system_user_detail/team_list/abstract_list.tsx

@@ -71,12 +71,9 @@ export default class AbstractList extends React.PureComponent<Props, State> {
  }
 
  private performSearch = (): void => {
- const newState = {...this.state};
  const userId = this.props.userId;
- delete newState.page;
 
- newState.loading = true;
- this.setState(newState);
+ this.setState({loading: true});
 
  this.props.actions.getTeamsData(userId).then!(() => {
  if (this.props.onPageChangedCallback) {

components/admin_console/team_channel_settings/abstract_list.jsx

@@ -88,11 +88,7 @@ export default class AbstractList extends React.PureComponent {
  }
 
  performSearch = (page) => {
- const newState = {...this.state};
- delete newState.page;
-
- newState.loading = true;
- this.setState(newState);
+ this.setState({loading: true});
 
  this.props.actions.getData(page, PAGE_SIZE, '', false, true).then((response) => {
  if (this.props.onPageChangedCallback) {

components/admin_console/team_channel_settings/channel/details/channel_details.tsx

@@ -707,7 +707,7 @@ export default class ChannelDetails extends React.PureComponent<ChannelDetailsPr
  channelPermissions={channelPermissions}
  onChannelPermissionsChanged={this.channelPermissionsChanged}
  teamSchemeID={teamScheme?.id}
- teamSchemeDisplayName={teamScheme?.['display_name']}
+ teamSchemeDisplayName={teamScheme?.display_name}
  guestAccountsEnabled={this.props.guestAccountsEnabled}
  isPublic={this.props.channel.type === Constants.OPEN_CHANNEL}
  readOnly={this.props.isDisabled}

components/admin_console/team_channel_settings/channel/details/channel_moderation.test.tsx

@@ -51,8 +51,8 @@ describe('admin_console/team_channel_settings/channel/ChannelModeration', () =>
  <ChannelModerationTableRow
  key={channelPermissions[0].name}
  name={channelPermissions[0].name}
- guests={channelPermissions[0].roles.guests?.['value']}
- guestsDisabled={!channelPermissions[0].roles.guests?.['enabled']}
+ guests={channelPermissions[0].roles.guests?.value}
+ guestsDisabled={!channelPermissions[0].roles.guests?.enabled}
  members={channelPermissions[0].roles.members.value}
  membersDisabled={!channelPermissions[0].roles.members.enabled}
  onClick={onChannelPermissionsChanged}
@@ -287,8 +287,8 @@ describe('admin_console/team_channel_settings/channel/ChannelModeration', () =>
  <ChannelModerationTableRow
  key={channelPermissions[0].name}
  name={channelPermissions[0].name}
- guests={channelPermissions[0].roles.guests?.['value']}
- guestsDisabled={!channelPermissions[0].roles.guests?.['enabled']}
+ guests={channelPermissions[0].roles.guests?.value}
+ guestsDisabled={!channelPermissions[0].roles.guests?.enabled}
  members={channelPermissions[0].roles.members.value}
  membersDisabled={!channelPermissions[0].roles.members.enabled}
  onClick={onChannelPermissionsChanged}

components/channel_groups_manage_modal/channel_groups_manage_modal.tsx

@@ -29,7 +29,7 @@ type Props = {
  channel: Channel;
  intl: IntlShape;
  actions: {
- getGroupsAssociatedToChannel: (channelId: string, searchTerm: string, pageNumber: number, DEFAULT_NUM_PER_PAGE: number) => any;
+ getGroupsAssociatedToChannel: (channelId: string, searchTerm: string, pageNumber: number, perPage: number) => any;
  unlinkGroupSyncable: (itemId: string, channelId: string, groupsSyncableTypeChannel: string) => any;
  patchGroupSyncable: (itemId: string, channelId: string, groupsSyncableTypeChannel: string, params: {scheme_admin: boolean}) => any;
  getMyChannelMember: (channelId: string) => any;

components/channel_invite_modal/channel_invite_modal.test.tsx

@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
-import {shallow, ShallowWrapper} from 'enzyme';
+import {shallow} from 'enzyme';
 import {Modal} from 'react-bootstrap';
 import {UserProfile} from 'mattermost-redux/types/users';
 import {Channel} from 'mattermost-redux/types/channels';
@@ -105,7 +105,7 @@ describe('components/channel_invite_modal', () => {
  });
 
  test('should match state when onHide is called', () => {
- const wrapper: ShallowWrapper<any, any, ChannelInviteModal<UserProfileValue>> = shallow(
+ const wrapper = shallow<ChannelInviteModal>(
  <ChannelInviteModal {...baseProps}/>,
  );
 
@@ -125,7 +125,7 @@ describe('components/channel_invite_modal', () => {
  });
 
  test('should fail to add users on handleSubmit', (done) => {
- const wrapper: ShallowWrapper<any, any, ChannelInviteModal<UserProfileValue>> = shallow(
+ const wrapper = shallow<ChannelInviteModal>(
  <ChannelInviteModal
  {...baseProps}
  />,
@@ -154,7 +154,7 @@ describe('components/channel_invite_modal', () => {
  },
  };
 
- const wrapper: ShallowWrapper<any, any, ChannelInviteModal<UserProfileValue>> = shallow(
+ const wrapper = shallow<ChannelInviteModal>(
  <ChannelInviteModal
  {...props}
  />,
@@ -180,7 +180,7 @@ describe('components/channel_invite_modal', () => {
  onAddCallback,
  };
 
- const wrapper: ShallowWrapper<any, any, ChannelInviteModal<UserProfileValue>> = shallow(
+ const wrapper = shallow<ChannelInviteModal>(
  <ChannelInviteModal
  {...props}
  />,
@@ -193,7 +193,7 @@ describe('components/channel_invite_modal', () => {
  });
 
  test('should trim the search term', () => {
- const wrapper: ShallowWrapper<any, any, ChannelInviteModal<UserProfileValue>> = shallow(
+ const wrapper = shallow<ChannelInviteModal>(
  <ChannelInviteModal {...baseProps}/>,
  );
 

components/channel_invite_modal/channel_invite_modal.tsx

@@ -59,7 +59,7 @@ type State = {
  inviteError?: string;
 }
 
-export default class ChannelInviteModal<T extends Value> extends React.PureComponent<Props, State> {
+export default class ChannelInviteModal extends React.PureComponent<Props, State> {
  private searchTimeoutId = 0;
  private selectedItemRef = React.createRef<HTMLDivElement>();
 

components/favicon_title_handler/index.ts

@@ -1,4 +1,3 @@
-
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 

components/integrations/installed_oauth_app/installed_oauth_app.test.tsx

@@ -68,7 +68,7 @@ describe('components/integrations/InstalledOAuthApp', () => {
  test('should call onRegenerateSecret function', () => {
  const newOnRegenerateSecret = jest.fn().mockImplementation(
  () => {
- return new Promise((resolve) => {
+ return new Promise<void>((resolve) => {
  process.nextTick(() => resolve());
  });
  },
@@ -114,7 +114,7 @@ describe('components/integrations/InstalledOAuthApp', () => {
  test('should match on handleRegenerate', () => {
  const newOnRegenerateSecret = jest.fn().mockImplementation(
  () => {
- return new Promise((resolve) => {
+ return new Promise<void>((resolve) => {
  process.nextTick(() => resolve());
  });
  },