Skip to content

Regression: View Channels button in Team info #21289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tassoevan merged 3 commits into from
Mar 24, 2021
Merged

Regression: View Channels button in Team info #21289

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5ef9c1
Add onclick
gabriellsh Mar 24, 2021
3e90c75
fix lint
Mar 24, 2021
5029413
Merge branch 'develop' into fix/view_teams
tassoevan Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions client/views/teams/info/TeamsInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useMemo } from 'react';
import React, { useMemo, useCallback } from 'react';
import { Box, Button, Callout, Option, Menu } from '@rocket.chat/fuselage';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';

Expand All @@ -9,7 +9,7 @@ import DeleteTeamModal from './Delete';
import LeaveTeamModal from './Leave';
import InfoPanel, { RetentionPolicyCallout } from '../../InfoPanel';
import { roomTypes, UiTextContext } from '../../../../app/utils';
import { useTabBarClose } from '../../room/providers/ToolboxProvider';
import { useTabBarClose, useTabBarOpen } from '../../room/providers/ToolboxProvider';
import { useEndpointActionExperimental } from '../../../hooks/useEndpointAction';
import { GenericModalDoNotAskAgain } from '../../../components/GenericModal';
import { useTranslation } from '../../../contexts/TranslationContext';
Expand Down Expand Up @@ -50,6 +50,7 @@ export const TeamsInfo = ({
onClickLeave,
onClickEdit,
onClickDelete,
onClickViewChannels,
}) => {
const t = useTranslation();

Expand Down Expand Up @@ -159,12 +160,12 @@ export const TeamsInfo = ({
<InfoPanel.Text withTruncatedText={false}>{topic}</InfoPanel.Text>
</InfoPanel.Field>}

<InfoPanel.Field>
{onClickViewChannels && <InfoPanel.Field>
<InfoPanel.Label>{t('Teams_channels')}</InfoPanel.Label>
<InfoPanel.Text>
<Button small>{t('View_channels')}</Button>
<Button onClick={onClickViewChannels} small>{t('View_channels')}</Button>
</InfoPanel.Text>
</InfoPanel.Field>
</InfoPanel.Field>}

{retentionPolicyEnabled && (
<RetentionPolicyCallout filesOnlyDefault={filesOnlyDefault} excludePinnedDefault={excludePinnedDefault} maxAgeDefault={maxAgeDefault} />
Expand All @@ -182,6 +183,7 @@ export default function TeamsInfoWithLogic({
openEditing,
}) {
const onClickClose = useTabBarClose();
const openTabbar = useTabBarOpen();
const t = useTranslation();

room.type = room.t;
Expand Down Expand Up @@ -273,6 +275,8 @@ export default function TeamsInfoWithLogic({
</ GenericModalDoNotAskAgain>);
});

const onClickViewChannels = useCallback(() => openTabbar('team-channels'), [openTabbar]);

return (
<TeamsInfo
archived={archived}
Expand All @@ -284,6 +288,7 @@ export default function TeamsInfoWithLogic({
onClickDelete={canDelete && onClickDelete}
onClickLeave={/* canLeave && */onClickLeave}
onClickHide={/* joined && */handleHide}
onClickViewChannels={onClickViewChannels}
{...room}
announcement={room.announcement && <MarkdownText content={room.announcement}/>}
description={room.description && <MarkdownText content={room.description}/>}
Expand Down