[FIX] Remove team's related actions inside of discussion #22470

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
pull/22512/head^2
Douglas Fabris 4 years ago committed by GitHub
parent e135a29461
commit ca0266c51d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      app/discussion/client/tabBar.ts
  2. 9
      client/views/room/contextualBar/Info/RoomInfo/RoomInfoWithData.js

@ -5,10 +5,10 @@ import { useSetting } from '../../../client/contexts/SettingsContext';
const template = lazy(() => import('../../../client/views/room/contextualBar/Discussions'));
addAction('discussions', () => {
addAction('discussions', ({ room: { prid } }) => {
const discussionEnabled = useSetting('Discussion_enabled');
return useMemo(() => (discussionEnabled ? {
return useMemo(() => (discussionEnabled && !prid ? {
groups: ['channel', 'group', 'direct', 'direct_multiple', 'team'],
id: 'discussions',
title: 'Discussions',
@ -16,5 +16,5 @@ addAction('discussions', () => {
template,
full: true,
order: 3,
} : null), [discussionEnabled]);
} : null), [discussionEnabled, prid]);
});

@ -38,7 +38,8 @@ const RoomInfoWithData = ({ rid, openEditing, onClickBack, onEnterRoom, resetSta
const room = useUserRoom(rid);
room.type = room.t;
room.rid = rid;
const { type, fname, broadcast, archived, joined = true } = room; // TODO implement joined
const { type, fname, prid, broadcast, archived, joined = true } = room; // TODO implement joined
const retentionPolicyEnabled = useSetting('RetentionPolicy_Enabled');
const retentionPolicy = {
@ -207,8 +208,10 @@ const RoomInfoWithData = ({ rid, openEditing, onClickBack, onEnterRoom, resetSta
onClickDelete={canDelete && handleDelete}
onClickLeave={canLeave && handleLeave}
onClickHide={joined && handleHide}
onClickMoveToTeam={!room.teamId && canEdit && onMoveToTeam}
onClickConvertToTeam={!room.teamId && canConvertRoomToTeam && canEdit && onConvertToTeam}
onClickMoveToTeam={!room.teamId && !prid && canEdit && onMoveToTeam}
onClickConvertToTeam={
!room.teamId && !prid && canConvertRoomToTeam && canEdit && onConvertToTeam
}
onClickEnterRoom={onEnterRoom && onClickEnterRoom}
{...room}
announcement={

Loading…
Cancel
Save