MM-39768 Rename ToggleModalButtonRedux to ToggleModalButton (mattermo…

…st#9887)

* MM-39876 Remove remaining usage of old ToggleModalButton

* MM-39768 Rename ToggleModalButtonRedux to ToggleModalButton

* Remove unused string ref

* Update snapshots

components/admin_console/system_roles/system_role/system_role_users/__snapshots__/system_role_users.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`admin_console/system_role_users should match snapshot 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -130,7 +130,7 @@ exports[`admin_console/system_role_users should match snapshot 1`] = `
  defaultMessage="Add People"
  id="admin.permissions.system_role_users.add_people"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="SystemRoleUsers"
@@ -406,7 +406,7 @@ exports[`admin_console/system_role_users should match snapshot 1`] = `
 exports[`admin_console/system_role_users should match snapshot with readOnly true 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -533,7 +533,7 @@ exports[`admin_console/system_role_users should match snapshot with readOnly tru
  defaultMessage="Add People"
  id="admin.permissions.system_role_users.add_people"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="SystemRoleUsers"

components/admin_console/system_roles/system_role/system_role_users/system_role_users.tsx

@@ -13,7 +13,7 @@ import {t} from 'utils/i18n';
 
 import AdminPanel from 'components/widgets/admin_console/admin_panel';
 import Badge from 'components/widgets/badges/badge';
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
+import ToggleModalButton from 'components/toggle_modal_button';
 import DataGrid from 'components/admin_console/data_grid/data_grid';
 import UserGridName from 'components/admin_console/user_grid/user_grid_name';
 import UserGridRemove from 'components/admin_console/user_grid/user_grid_remove';
@@ -254,7 +254,7 @@ export default class SystemRoleUsers extends React.PureComponent<Props, State> {
  subtitleId={t('admin.permissions.system_role_users.description')}
  subtitleDefault='List of people assigned to this system role.'
  button={
- <ToggleModalButtonRedux
+ <ToggleModalButton
  id='addRoleMembers'
  className='btn btn-primary'
  modalId={ModalIdentifiers.ADD_USER_TO_ROLE}
@@ -272,7 +272,7 @@ export default class SystemRoleUsers extends React.PureComponent<Props, State> {
  id='admin.permissions.system_role_users.add_people'
  defaultMessage='Add People'
  />
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  }
  >
  <DataGrid

components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_groups.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`admin_console/team_channel_settings/channel/ChannelGroups should match snapshot 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -43,7 +43,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelGroups should match
  defaultMessage="Add Group"
  id="admin.channel_settings.channel_details.add_group"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="channel_groups"

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

@@ -7,8 +7,8 @@ import {FormattedMessage} from 'react-intl';
 import {Channel} from 'mattermost-redux/types/channels';
 import {Group} from 'mattermost-redux/types/groups';
 
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
 import AddGroupsToChannelModal from 'components/add_groups_to_channel_modal';
+import ToggleModalButton from 'components/toggle_modal_button';
 import AdminPanel from 'components/widgets/admin_console/admin_panel';
 
 import {ModalIdentifiers} from 'utils/constants';
@@ -38,7 +38,7 @@ export const ChannelGroups: React.FunctionComponent<ChannelGroupsProps> = (props
  subtitleId={synced ? t('admin.channel_settings.channel_detail.syncedGroupsDescription') : t('admin.channel_settings.channel_detail.groupsDescription')}
  subtitleDefault={synced ? 'Add and remove channel members based on their group membership.' : 'Select groups to be added to this channel.'}
  button={
- <ToggleModalButtonRedux
+ <ToggleModalButton
  id='addGroupsToChannelToggle'
  className='btn btn-primary'
  modalId={ModalIdentifiers.ADD_GROUPS_TO_CHANNEL}
@@ -56,7 +56,7 @@ export const ChannelGroups: React.FunctionComponent<ChannelGroupsProps> = (props
  id='admin.channel_settings.channel_details.add_group'
  defaultMessage='Add Group'
  />
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  }
  >
  {channel.id && (

components/admin_console/team_channel_settings/channel/details/channel_members/__snapshots__/channel_members.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`admin_console/team_channel_settings/channel/ChannelMembers should match snapshot 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -48,7 +48,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
  defaultMessage="Add Members"
  id="admin.team_settings.team_details.add_members"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="channelMembers"
@@ -324,7 +324,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
 exports[`admin_console/team_channel_settings/channel/ChannelMembers should match snapshot loading no users 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -369,7 +369,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
  defaultMessage="Add Members"
  id="admin.team_settings.team_details.add_members"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="channelMembers"

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

@@ -18,7 +18,7 @@ import AdminPanel from 'components/widgets/admin_console/admin_panel';
 import UserGrid from 'components/admin_console/user_grid/user_grid';
 import {BaseMembership} from 'components/admin_console/user_grid/user_grid_role_dropdown';
 import ChannelInviteModal from 'components/channel_invite_modal';
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
+import ToggleModalButton from 'components/toggle_modal_button';
 import {FilterOptions} from 'components/admin_console/filter/filter';
 
 type Props = {
@@ -253,7 +253,7 @@ export default class ChannelMembers extends React.PureComponent<Props, State> {
  subtitleId={t('admin.channel_settings.channel_detail.membersDescription')}
  subtitleDefault='A list of users who are currently in the channel right now'
  button={
- <ToggleModalButtonRedux
+ <ToggleModalButton
  id='addChannelMembers'
  className='btn btn-primary'
  modalId={ModalIdentifiers.CHANNEL_INVITE}
@@ -273,7 +273,7 @@ export default class ChannelMembers extends React.PureComponent<Props, State> {
  id='admin.team_settings.team_details.add_members'
  defaultMessage='Add Members'
  />
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  }
  >
  <UserGrid

components/admin_console/team_channel_settings/errors.jsx

@@ -7,8 +7,7 @@ import {FormattedMessage} from 'react-intl';
 import * as PropTypes from 'prop-types';
 
 import FormError from 'components/form_error';
-
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
+import ToggleModalButton from 'components/toggle_modal_button';
 
 import {ModalIdentifiers} from 'utils/constants';
 
@@ -90,7 +89,7 @@ export class UsersWillBeRemovedError extends React.PureComponent {
  error={(
  <span>
  {error}
- <ToggleModalButtonRedux
+ <ToggleModalButton
  className='btn btn-link'
  modalId={ModalIdentifiers.USERS_TO_BE_REMOVED}
  dialogType={UsersToBeRemovedModal}
@@ -100,7 +99,7 @@ export class UsersWillBeRemovedError extends React.PureComponent {
  id='admin.team_channel_settings.view_removed_users'
  defaultMessage='View These Users'
  />
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  </span>
  )}
  />

components/admin_console/team_channel_settings/group/__snapshots__/group_row.test.tsx.snap

@@ -17,7 +17,7 @@ exports[`admin_console/team_channel_settings/group/GroupRow should match snapsho
  <span
  className="group-description row-content"
  >
- <Connect(injectIntl(ModalToggleButtonRedux))
+ <Connect(injectIntl(ToggleModalButton))
  className="color--link"
  dialogProps={
  Object {
@@ -41,7 +41,7 @@ exports[`admin_console/team_channel_settings/group/GroupRow should match snapsho
  }
  }
  />
- </Connect(injectIntl(ModalToggleButtonRedux))>
+ </Connect(injectIntl(ToggleModalButton))>
  </span>
  <div
  className="group-description row-content roles"

components/admin_console/team_channel_settings/group/group_row.tsx

@@ -7,7 +7,7 @@ import {FormattedMessage} from 'react-intl';
 
 import {Group} from 'mattermost-redux/types/groups';
 
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
+import ToggleModalButton from 'components/toggle_modal_button';
 import MenuWrapper from 'components/widgets/menu/menu_wrapper';
 import Menu from 'components/widgets/menu/menu';
 import GroupMembersModal from 'components/admin_console/team_channel_settings/group/group_members_modal';
@@ -90,7 +90,7 @@ export default class GroupRow extends React.PureComponent<GroupRowProps> {
  {group.display_name || group.name}
  </span>
  <span className='group-description row-content'>
- <ToggleModalButtonRedux
+ <ToggleModalButton
  id={`${group.display_name}MembersToggle`}
  className='color--link'
  modalId={ModalIdentifiers.GROUP_MEMBERS}
@@ -104,7 +104,7 @@ export default class GroupRow extends React.PureComponent<GroupRowProps> {
  defaultMessage='{memberCount, number} {memberCount, plural, one {member} other {members}}'
  values={{memberCount: group.member_count}}
  />
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  </span>
  <div className='group-description row-content roles'>
  <MenuWrapper

components/admin_console/team_channel_settings/team/details/__snapshots__/team_groups.test.jsx.snap

@@ -3,7 +3,7 @@
 exports[`admin_console/team_channel_settings/team/TeamGroups should match snapshot 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -42,7 +42,7 @@ exports[`admin_console/team_channel_settings/team/TeamGroups should match snapsh
  defaultMessage="Add Group"
  id="admin.team_settings.team_details.add_group"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="team_groups"

components/admin_console/team_channel_settings/team/details/team_groups.jsx

@@ -6,7 +6,7 @@ import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
 import AddGroupsToTeamModal from 'components/add_groups_to_team_modal';
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
+import ToggleModalButton from 'components/toggle_modal_button';
 import AdminPanel from 'components/widgets/admin_console/admin_panel';
 
 import {ModalIdentifiers} from 'utils/constants';
@@ -22,7 +22,7 @@ export const TeamGroups = ({onGroupRemoved, syncChecked, team, onAddCallback, to
  subtitleId={syncChecked ? t('admin.team_settings.team_detail.syncedGroupsDescription') : t('admin.team_settings.team_detail.groupsDescription')}
  subtitleDefault={syncChecked ? 'Add and remove team members based on their group membership.' : 'Group members will be added to the team.'}
  button={
- <ToggleModalButtonRedux
+ <ToggleModalButton
  id='addGroupsToTeamToggle'
  className='btn btn-primary'
  modalId={ModalIdentifiers.ADD_GROUPS_TO_TEAM}
@@ -40,7 +40,7 @@ export const TeamGroups = ({onGroupRemoved, syncChecked, team, onAddCallback, to
  id='admin.team_settings.team_details.add_group'
  defaultMessage='Add Group'
  />
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  }
  >
  <GroupList

components/admin_console/team_channel_settings/team/details/team_members/__snapshots__/team_members.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`admin_console/team_channel_settings/team/TeamMembers should match snapshot 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -47,7 +47,7 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
  defaultMessage="Add Members"
  id="admin.team_settings.team_details.add_members"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="teamMembers"
@@ -302,7 +302,7 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
 exports[`admin_console/team_channel_settings/team/TeamMembers should match snapshot loading no users 1`] = `
 <AdminPanel
  button={
- <Memo(Connect(injectIntl(ModalToggleButtonRedux)))
+ <Memo(Connect(injectIntl(ToggleModalButton)))
  className="btn btn-primary"
  dialogProps={
  Object {
@@ -346,7 +346,7 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
  defaultMessage="Add Members"
  id="admin.team_settings.team_details.add_members"
  />
- </Memo(Connect(injectIntl(ModalToggleButtonRedux)))>
+ </Memo(Connect(injectIntl(ToggleModalButton)))>
  }
  className=""
  id="teamMembers"

components/admin_console/team_channel_settings/team/details/team_members/team_members.tsx

@@ -18,7 +18,7 @@ import AdminPanel from 'components/widgets/admin_console/admin_panel';
 import UserGrid from 'components/admin_console/user_grid/user_grid';
 import {BaseMembership} from 'components/admin_console/user_grid/user_grid_role_dropdown';
 import AddUsersToTeamModal from 'components/add_users_to_team_modal';
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
+import ToggleModalButton from 'components/toggle_modal_button';
 import {FilterOptions} from 'components/admin_console/filter/filter';
 
 type Props = {
@@ -254,7 +254,7 @@ export default class TeamMembers extends React.PureComponent<Props, State> {
  subtitleId={t('admin.team_settings.team_detail.membersDescription')}
  subtitleDefault='A list of users who are currently in the team right now'
  button={
- <ToggleModalButtonRedux
+ <ToggleModalButton
  id='addTeamMembers'
  className='btn btn-primary'
  modalId={ModalIdentifiers.ADD_USER_TO_TEAM}
@@ -273,7 +273,7 @@ export default class TeamMembers extends React.PureComponent<Props, State> {
  id='admin.team_settings.team_details.add_members'
  defaultMessage='Add Members'
  />
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  }
  >
  <UserGrid

components/announcement_bar/default_announcement_bar/announcement_bar.tsx

@@ -13,7 +13,7 @@ import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import OverlayTrigger from 'components/overlay_trigger';
 import Tooltip from 'components/tooltip';
 import WarnMetricAckModal from 'components/warn_metric_ack_modal';
-import ToggleModalButtonRedux from 'components/toggle_modal_button_redux';
+import ToggleModalButton from 'components/toggle_modal_button';
 
 import {trackEvent} from 'actions/telemetry_actions.jsx';
 
@@ -145,7 +145,7 @@ export default class AnnouncementBar extends React.PureComponent<Props> {
  defaultMessage={this.props.modalButtonDefaultText}
  >
  {(linkmessage) => (
- <ToggleModalButtonRedux
+ <ToggleModalButton
  ariaLabel={linkmessage}
  className={'color--link--adminack'}
  dialogType={WarnMetricAckModal}
@@ -157,7 +157,7 @@ export default class AnnouncementBar extends React.PureComponent<Props> {
  }}
  >
  {linkmessage}
- </ToggleModalButtonRedux>
+ </ToggleModalButton>
  )}
  </FormattedMessage>
  }