Regression: Missing room scope on teams channels permission (#22137)

pull/22154/head
Douglas Fabris 4 years ago committed by GitHub
parent d6f510b9c6
commit 5a6475eb4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      client/views/room/MemberListRouter.js
  2. 4
      client/views/teams/contextualBar/channels/RoomActions.js
  3. 4
      client/views/teams/contextualBar/channels/TeamsChannelItem.js

@ -7,15 +7,15 @@ import UserInfo from './contextualBar/UserInfo';
import { useTab, useTabBarClose, useTabContext } from './providers/ToolboxProvider';
const getUid = (room, ownUserId) => {
if (room.uids.length === 1) {
if (room.uids?.length === 1) {
return room.uids[0];
}
const uid = room.uids.filter((uid) => uid !== ownUserId).shift();
const uid = room.uids?.filter((uid) => uid !== ownUserId).shift();
// Self DMs used to be created with the userId duplicated.
// Sometimes rooms can have 2 equal uids, but it's a self DM.
return uid ?? room.uids[0];
return uid ? room.uids[0] : undefined;
};
const MemberListRouter = ({ rid }) => {

@ -30,8 +30,8 @@ const RoomActions = ({ room, reload }) => {
const dispatchToastMessage = useToastMessageDispatch();
const canDeleteTeamChannel = usePermission(type === 'c' ? 'delete-c' : 'delete-p', rid);
const canEditTeamChannel = usePermission('edit-team-channel');
const canRemoveTeamChannel = usePermission('remove-team-channel');
const canEditTeamChannel = usePermission('edit-team-channel', rid);
const canRemoveTeamChannel = usePermission('remove-team-channel', rid);
const updateRoomEndpoint = useEndpointActionExperimental('POST', 'teams.updateRoom');
const removeRoomEndpoint = useEndpointActionExperimental(

@ -16,8 +16,8 @@ const TeamsChannelItem = ({ room, onClickView, reload }) => {
const [showButton, setShowButton] = useState();
const canRemoveTeamChannel = usePermission('remove-team-channel');
const canEditTeamChannel = usePermission('edit-team-channel');
const canRemoveTeamChannel = usePermission('remove-team-channel', rid);
const canEditTeamChannel = usePermission('edit-team-channel', rid);
const canDeleteTeamChannel = usePermission(type === 'c' ? 'delete-c' : 'delete-p', rid);
const isReduceMotionEnabled = usePrefersReducedMotion();

Loading…
Cancel
Save