IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where channel URL preview used incorrect team (#24705)

Browse Source
This commit is contained in:
Harshil Sharma 2023-10-06 01:09:12 +05:30 committed by GitHub
parent ff929e4a15
commit 510136a192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/channels/src/components/channel_name_form_field/channel_name_form_field.tsx
View File

@ -5,6 +5,8 @@ import React, {useCallback, useEffect, useRef, useState} from 'react';
import {useIntl} from 'react-intl'; import {useIntl} from 'react-intl';
import {useSelector} from 'react-redux'; import {useSelector} from 'react-redux';
import type {Team} from '@mattermost/types/teams';
import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams'; import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
import type {CustomMessageInputType} from 'components/widgets/inputs/input/input'; import type {CustomMessageInputType} from 'components/widgets/inputs/input/input';
@ -23,6 +25,7 @@ export type Props = {
onURLChange: (url: string) => void; onURLChange: (url: string) => void;
autoFocus?: boolean; autoFocus?: boolean;
onErrorStateChange?: (isError: boolean) => void; onErrorStateChange?: (isError: boolean) => void;
team?: Team;
} }
import './channel_name_form_field.scss'; import './channel_name_form_field.scss';
@ -58,6 +61,7 @@ const ChannelNameFormField = (props: Props): JSX.Element => {
const [inputCustomMessage, setInputCustomMessage] = useState<CustomMessageInputType | null>(null); const [inputCustomMessage, setInputCustomMessage] = useState<CustomMessageInputType | null>(null);
const {name: currentTeamName} = useSelector(getCurrentTeam); const {name: currentTeamName} = useSelector(getCurrentTeam);
const teamName = props.team ? props.team.name : currentTeamName;
const handleOnDisplayNameChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => { const handleOnDisplayNameChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
e.preventDefault(); e.preventDefault();
@ -131,7 +135,7 @@ const ChannelNameFormField = (props: Props): JSX.Element => {
<URLInput <URLInput
className='new-channel-modal__url' className='new-channel-modal__url'
base={getSiteURL()} base={getSiteURL()}
path={`${currentTeamName}/channels`} path={`${teamName}/channels`}
pathInfo={url} pathInfo={url}
limit={Constants.MAX_CHANNELNAME_LENGTH} limit={Constants.MAX_CHANNELNAME_LENGTH}
shortenLength={Constants.DEFAULT_CHANNELURL_SHORTEN_LENGTH} shortenLength={Constants.DEFAULT_CHANNELURL_SHORTEN_LENGTH}

15
webapp/channels/src/components/convert_gm_to_channel_modal/convert_gm_to_channel_modal.test.tsx
View File

@ -44,8 +44,8 @@ describe('component/ConvertGmToChannelModal', () => {
entities: { entities: {
teams: { teams: {
teams: { teams: {
team_id_1: {id: 'team_id_1', display_name: 'Team 1'} as Team, team_id_1: {id: 'team_id_1', display_name: 'Team 1', name: 'team_1'} as Team,
team_id_2: {id: 'team_id_2', display_name: 'Team 2'} as Team, team_id_2: {id: 'team_id_2', display_name: 'Team 2', name: 'team_2'} as Team,
}, },
currentTeamId: 'team_id_1', currentTeamId: 'team_id_1',
}, },
@ -57,8 +57,8 @@ describe('component/ConvertGmToChannelModal', () => {
nock(Client4.getBaseRoute()). nock(Client4.getBaseRoute()).
get('/channels/channel_id_1/common_teams'). get('/channels/channel_id_1/common_teams').
reply(200, [ reply(200, [
{id: 'team_id_1', display_name: 'Team 1'}, {id: 'team_id_1', display_name: 'Team 1', name: 'team_1'},
{id: 'team_id_2', display_name: 'Team 2'}, {id: 'team_id_2', display_name: 'Team 2', name: 'team_2'},
]); ]);
renderWithFullContext( renderWithFullContext(
@ -76,6 +76,7 @@ describe('component/ConvertGmToChannelModal', () => {
expect(screen.queryByText('Select Team')).toBeInTheDocument(); expect(screen.queryByText('Select Team')).toBeInTheDocument();
expect(screen.queryByPlaceholderText('Channel name')).toBeInTheDocument(); expect(screen.queryByPlaceholderText('Channel name')).toBeInTheDocument();
expect(screen.queryByText('Edit')).toBeInTheDocument(); expect(screen.queryByText('Edit')).toBeInTheDocument();
expect(screen.queryByText('URL: http://localhost:8065/team_1/channels/')).toBeInTheDocument();
}); });
test('members part of single common teams', async () => { test('members part of single common teams', async () => {
@ -83,7 +84,7 @@ describe('component/ConvertGmToChannelModal', () => {
nock(Client4.getBaseRoute()). nock(Client4.getBaseRoute()).
get('/channels/channel_id_1/common_teams'). get('/channels/channel_id_1/common_teams').
reply(200, [ reply(200, [
{id: 'team_id_1', display_name: 'Team 1'}, {id: 'team_id_1', display_name: 'Team 1', name: 'team_1'},
]); ]);
renderWithFullContext( renderWithFullContext(
@ -131,8 +132,8 @@ describe('component/ConvertGmToChannelModal', () => {
nock(Client4.getBaseRoute()). nock(Client4.getBaseRoute()).
get('/channels/channel_id_1/common_teams'). get('/channels/channel_id_1/common_teams').
reply(200, [ reply(200, [
{id: 'team_id_1', display_name: 'Team 1'}, {id: 'team_id_1', display_name: 'Team 1', name: 'team_1'},
{id: 'team_id_2', display_name: 'Team 2'}, {id: 'team_id_2', display_name: 'Team 2', name: 'team_2'},
]); ]);
baseProps.actions.convertGroupMessageToPrivateChannel.mockResolvedValueOnce({}); baseProps.actions.convertGroupMessageToPrivateChannel.mockResolvedValueOnce({});

1
webapp/channels/src/components/convert_gm_to_channel_modal/convert_gm_to_channel_modal.tsx
View File

@ -170,6 +170,7 @@ const ConvertGmToChannelModal = (props: Props) => {
onDisplayNameChange={setChannelName} onDisplayNameChange={setChannelName}
onURLChange={handleChannelURLChange} onURLChange={handleChannelURLChange}
onErrorStateChange={setNameError} onErrorStateChange={setNameError}
team={selectedTeamId ? commonTeamsById[selectedTeamId] : undefined}
/> />
{ {