diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoom.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoom.tsx index 55b0bde285aa5..4edcea27884d1 100644 --- a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoom.tsx +++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoom.tsx @@ -1,6 +1,5 @@ import type { ISubscription } from '@rocket.chat/core-typings'; import { isPrivateRoom } from '@rocket.chat/core-typings'; -import { useButtonPattern } from '@rocket.chat/fuselage-hooks'; import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator'; import SidePanelTag from '../SidePanelTag'; @@ -10,13 +9,8 @@ const SidePanelParentRoom = ({ subscription }: { subscription: ISubscription }) const icon = isPrivateRoom(subscription) ? 'hashtag-lock' : 'hashtag'; const roomName = roomCoordinator.getRoomName(subscription?.t, subscription); - const buttonProps = useButtonPattern((e) => { - e.preventDefault(); - roomCoordinator.openRouteLink(subscription.t, { ...subscription }); - }); - return ( - + {icon && } {roomName} diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentTeam.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentTeam.tsx index 70d2c94f6738a..eb319ac8b784c 100644 --- a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentTeam.tsx +++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentTeam.tsx @@ -1,4 +1,3 @@ -import { useButtonPattern } from '@rocket.chat/fuselage-hooks'; import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts'; import SidePanelTag from './SidePanelTag'; @@ -6,19 +5,14 @@ import SidePanelTagIcon from './SidePanelTagIcon'; import { useParentTeamData } from './useParentTeamData'; const SidePanelParentTeam = ({ room }: { room: SubscriptionWithRoom }) => { - const { redirectToMainRoom, teamName, shouldDisplayTeam, teamInfoError, isTeamPublic } = useParentTeamData(room.teamId); - - const buttonProps = useButtonPattern((e) => { - e.preventDefault(); - redirectToMainRoom(); - }); + const { teamName, shouldDisplayTeam, teamInfoError, isTeamPublic } = useParentTeamData(room.teamId); if (teamInfoError || !shouldDisplayTeam) { return null; } return ( - + {teamName} diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/useParentTeamData.ts b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/useParentTeamData.ts index 7dddf12ac6d8d..464ff7a5da5a9 100644 --- a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/useParentTeamData.ts +++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/useParentTeamData.ts @@ -3,7 +3,6 @@ import { TEAM_TYPE } from '@rocket.chat/core-typings'; import { useUserId } from '@rocket.chat/ui-contexts'; import { useTeamInfoQuery } from '../../../../hooks/useTeamInfoQuery'; -import { goToRoomById } from '../../../../lib/utils/goToRoomById'; import { useUserTeamsQuery } from '../../../room/hooks/useUserTeamsQuery'; type APIErrorResult = { success: boolean; error: string }; @@ -31,19 +30,9 @@ export const useParentTeamData = (teamId?: ITeam['_id']) => { const isTeamPublic = teamInfo?.type === TEAM_TYPE.PUBLIC; const shouldDisplayTeam = isTeamPublic || userBelongsToTeam; - const redirectToMainRoom = (): void => { - const rid = teamInfo?.roomId; - if (!rid) { - return; - } - - goToRoomById(rid); - }; - return { teamName: teamInfo?.name, isLoading: userTeamsLoading || teamInfoLoading, - redirectToMainRoom, teamInfoError, shouldDisplayTeam, isTeamPublic, diff --git a/apps/meteor/tests/e2e/feature-preview.spec.ts b/apps/meteor/tests/e2e/feature-preview.spec.ts index 2148d6039ec8b..c6279497d68ca 100644 --- a/apps/meteor/tests/e2e/feature-preview.spec.ts +++ b/apps/meteor/tests/e2e/feature-preview.spec.ts @@ -449,25 +449,6 @@ test.describe.serial('feature preview', () => { await expect(poHomeChannel.sidebar.favoritesTeamCollabFilter).toHaveAttribute('aria-selected', 'true'); }); - test('should open parent team when clicking button on sidepanel discussion item', async ({ page }) => { - await page.goto(`/group/${sidepanelTeam}`); - - const discussionName = faker.string.uuid(); - await poHomeChannel.content.btnMenuMoreActions.click(); - await page.getByRole('menuitem', { name: 'Discussion' }).click(); - await poHomeChannel.content.inputDiscussionName.fill(discussionName); - await poHomeChannel.content.btnCreateDiscussionModal.click(); - - await expect(page.getByRole('heading', { name: discussionName })).toBeVisible(); - - await expect(poHomeChannel.sidepanel.getItemByName(discussionName).getByRole('button', { name: sidepanelTeam })).toBeVisible(); - - await poHomeChannel.sidepanel.getItemByName(discussionName).getByRole('button', { name: sidepanelTeam }).click(); - - await expect(page).toHaveURL(`/group/${sidepanelTeam}`); - await expect(page.getByRole('heading', { name: sidepanelTeam })).toBeVisible(); - }); - test('should show all filters and tablist on sidepanel', async ({ page }) => { await page.goto('/home');