From 47bfa745f95fd289321d40e19ab193cae581dd8d Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Thu, 15 Apr 2021 23:01:05 +0530 Subject: [PATCH 1/3] adding permission checks --- client/views/teams/contextualBar/channels/TeamsChannels.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/views/teams/contextualBar/channels/TeamsChannels.js b/client/views/teams/contextualBar/channels/TeamsChannels.js index 54ee393054212..3a45c98dc298d 100644 --- a/client/views/teams/contextualBar/channels/TeamsChannels.js +++ b/client/views/teams/contextualBar/channels/TeamsChannels.js @@ -15,6 +15,8 @@ import { useTabBarClose } from '../../../room/providers/ToolboxProvider'; import AddExistingModal from './AddExistingModal'; import BaseTeamsChannels from './BaseTeamsChannels'; import { useTeamsChannelList } from './hooks/useTeamsChannelList'; +import { usePermission } from '../../../../contexts/AuthorizationContext'; + const useReactModal = (Component, props) => { const setModal = useSetModal(); @@ -49,6 +51,7 @@ const TeamsChannels = ({ teamId }) => { setText(event.currentTarget.value); }, []); + const canAddExistingTeam = usePermission('add-team-channel'); const addExisting = useReactModal(AddExistingModal, { teamId, reload }); const createNew = useReactModal(CreateChannel, { teamId, reload }); @@ -80,8 +83,8 @@ const TeamsChannels = ({ teamId }) => { channels={items} total={total} onClickClose={onClickClose} - onClickAddExisting={addExisting} - onClickCreateNew={createNew} + onClickAddExisting={canAddExistingTeam && addExisting} + onClickCreateNew={canAddExistingTeam && createNew} onClickView={viewRoom} loadMoreItems={loadMoreItems} reload={reload} From 98e024758e0d392c1b32502085272dbb4ceb9640 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Thu, 15 Apr 2021 23:11:27 +0530 Subject: [PATCH 2/3] removing extra space --- client/views/teams/contextualBar/channels/TeamsChannels.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/views/teams/contextualBar/channels/TeamsChannels.js b/client/views/teams/contextualBar/channels/TeamsChannels.js index 3a45c98dc298d..0bc80f385f69b 100644 --- a/client/views/teams/contextualBar/channels/TeamsChannels.js +++ b/client/views/teams/contextualBar/channels/TeamsChannels.js @@ -17,7 +17,6 @@ import BaseTeamsChannels from './BaseTeamsChannels'; import { useTeamsChannelList } from './hooks/useTeamsChannelList'; import { usePermission } from '../../../../contexts/AuthorizationContext'; - const useReactModal = (Component, props) => { const setModal = useSetModal(); From 8b22fdf5ca5be547421cae767175704a9b5262db Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Thu, 15 Apr 2021 23:25:28 +0530 Subject: [PATCH 3/3] resolving pr tests --- client/views/teams/contextualBar/channels/TeamsChannels.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/views/teams/contextualBar/channels/TeamsChannels.js b/client/views/teams/contextualBar/channels/TeamsChannels.js index 0bc80f385f69b..0f4d4680e1c9d 100644 --- a/client/views/teams/contextualBar/channels/TeamsChannels.js +++ b/client/views/teams/contextualBar/channels/TeamsChannels.js @@ -6,6 +6,7 @@ import { import React, { useCallback, useMemo, useState } from 'react'; import { roomTypes } from '../../../../../app/utils/client'; +import { usePermission } from '../../../../contexts/AuthorizationContext'; import { useSetModal } from '../../../../contexts/ModalContext'; import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../lib/asyncState'; @@ -15,7 +16,6 @@ import { useTabBarClose } from '../../../room/providers/ToolboxProvider'; import AddExistingModal from './AddExistingModal'; import BaseTeamsChannels from './BaseTeamsChannels'; import { useTeamsChannelList } from './hooks/useTeamsChannelList'; -import { usePermission } from '../../../../contexts/AuthorizationContext'; const useReactModal = (Component, props) => { const setModal = useSetModal();