Skip to content

[FIX] Adding permission 'add-team-channel' for Team Channels Contextual bar #21591

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
ggazzo merged 6 commits into from
May 12, 2021
Merged

[FIX] Adding permission 'add-team-channel' for Team Channels Contextual bar #21591

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47bfa74
adding permission checks
yash-rajpal Apr 15, 2021
98e0247
removing extra space
yash-rajpal Apr 15, 2021
8b22fdf
resolving pr tests
yash-rajpal Apr 15, 2021
28615ff
Merge branch 'develop' into fix-team-add-permission
yash-rajpal Apr 18, 2021
a75c8e3
Merge branch 'develop' into fix-team-add-permission
yash-rajpal May 4, 2021
f963d3b
Merge branch 'develop' into fix-team-add-permission
yash-rajpal May 12, 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
6 changes: 4 additions & 2 deletions client/views/teams/contextualBar/channels/TeamsChannels.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -49,6 +50,7 @@ const TeamsChannels = ({ teamId }) => {
setText(event.currentTarget.value);
}, []);

const canAddExistingTeam = usePermission('add-team-channel');
const addExisting = useReactModal(AddExistingModal, { teamId, reload });
const createNew = useReactModal(CreateChannelWithData, { teamId, reload });

Expand Down Expand Up @@ -80,8 +82,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}
Expand Down