Skip to content

fix: Allow room owners to edit retention policy #37319

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −4
Open

fix: Allow room owners to edit retention policy #37319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
const retentionIgnoreThreads = useId();

const showAdvancedSettings = canViewReadOnly || readOnly || canViewArchived || canViewJoinCode || canViewHideSysMes;
const showRetentionPolicy = canEditRoomRetentionPolicy && retentionPolicy?.enabled;
const showRetentionPolicy = canEditRoomRetentionPolicy && retentionPolicy !== undefined;

const showAccordion = showAdvancedSettings || showRetentionPolicy;

Expand Down
9 changes: 7 additions & 2 deletions apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useMemo } from 'react';

import { msToTimeUnit, TIMEUNIT } from '../../../../../lib/convertTimeUnit';
import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
import { useRoomSubscription } from '../../../contexts/RoomContext';
import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy';

export type EditRoomInfoFormData = {
Expand Down Expand Up @@ -33,7 +34,10 @@ export type EditRoomInfoFormData = {

export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy): Partial<EditRoomInfoFormData> => {
const retentionPolicy = useRetentionPolicy(room);
const canEditRoomRetentionPolicy = usePermission('edit-room-retention-policy', room._id);
const subscription = useRoomSubscription();
const hasRetentionPermission = usePermission('edit-room-retention-policy', room._id);
const isRoomOwner = Boolean(subscription?.roles?.includes('owner'));
const canEditRoomRetentionPolicy = hasRetentionPermission || isRoomOwner;

const { t, ro, archived, topic, description, announcement, joinCodeRequired, sysMes, encrypted, retention, reactWhenReadOnly } = room;

Expand All @@ -54,7 +58,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy): Partia
hideSysMes: Array.isArray(sysMes) ? !!sysMes?.length : !!sysMes,
encrypted,
...(canEditRoomRetentionPolicy &&
retentionPolicy?.enabled && {
retentionPolicy && {
retentionEnabled: retention?.enabled ?? retentionPolicy.isActive,
retentionOverrideGlobal: !!retention?.overrideGlobal,
retentionMaxAge: retention?.maxAge ?? msToTimeUnit(TIMEUNIT.days, retentionPolicy.maxAge),
Expand All @@ -78,6 +82,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy): Partia
encrypted,
reactWhenReadOnly,
canEditRoomRetentionPolicy,
subscription,
],
);
};
6 changes: 5 additions & 1 deletion apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomPermissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ import { useMemo } from 'react';
import { RoomSettingsEnum } from '../../../../../../definition/IRoomTypeConfig';
import { useTeamInfoQuery } from '../../../../../hooks/useTeamInfoQuery';
import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
import { useRoomSubscription } from '../../../contexts/RoomContext';

const getCanChangeType = (room: IRoom | IRoomWithRetentionPolicy, canCreateChannel: boolean, canCreateGroup: boolean, isAdmin: boolean) =>
(!room.default || isAdmin) && ((room.t === 'p' && canCreateChannel) || (room.t === 'c' && canCreateGroup));

export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) => {
const isAdmin = useRole('admin');
const subscription = useRoomSubscription();
const canCreateChannel = usePermission('create-c');
const canCreateGroup = usePermission('create-p');

Expand All @@ -28,7 +30,9 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
);
const canSetReadOnly = usePermission('set-readonly', room._id);
const canSetReactWhenReadOnly = usePermission('set-react-when-readonly', room._id);
const canEditRoomRetentionPolicy = usePermission('edit-room-retention-policy', room._id);
const hasRetentionPermission = usePermission('edit-room-retention-policy', room._id);
const isRoomOwner = Boolean(subscription?.roles?.includes('owner'));
const canEditRoomRetentionPolicy = hasRetentionPermission || isRoomOwner;
const canArchiveOrUnarchive = useAtLeastOnePermission(
useMemo(() => ['archive-room', 'unarchive-room'], []),
room._id,
Expand Down
Loading