Skip to content

refactor: better isRoomFederated usage #36952

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 9 commits into from
Sep 16, 2025
Merged

refactor: better isRoomFederated usage #36952

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
956755e
chore
ggazzo Sep 16, 2025
2e6c442
chore
ggazzo Sep 16, 2025
d71d2f3
chore
ggazzo Sep 16, 2025
74ff279
chore
ggazzo Sep 16, 2025
84ea1bb
chore
ggazzo Sep 16, 2025
3df1c5b
chore
ggazzo Sep 16, 2025
0741ca2
chore
ggazzo Sep 16, 2025
cae29f6
Update apps/meteor/client/views/admin/rooms/EditRoom.tsx
ggazzo Sep 16, 2025
6c43041
fix: lint
dougfabris Sep 16, 2025
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
24 changes: 13 additions & 11 deletions apps/meteor/client/views/admin/rooms/EditRoom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings';
import { isRoomFederated } from '@rocket.chat/core-typings';
import { isRoomFederated, isRoomFederated } from '@rocket.chat/core-typings';
Comment thread
ggazzo marked this conversation as resolved.
Outdated
import {
Box,
Button,
Expand Down Expand Up @@ -135,6 +135,8 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
const favoriteField = useId();
const featuredField = useId();

const roomIsFederated = isRoomFederated(room);

return (
<>
<ContextualbarScrollableContent id={formId} is='form' onSubmit={handleSubmit(handleSave)}>
Expand All @@ -144,7 +146,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
name='roomAvatar'
control={control}
render={({ field: { value, onChange } }) => (
<RoomAvatarEditor disabled={isRoomFederated(room)} roomAvatar={value} room={room} onChangeAvatar={onChange} />
<RoomAvatarEditor disabled={roomIsFederated} roomAvatar={value} room={room} onChangeAvatar={onChange} />
)}
/>
</Box>
Expand Down Expand Up @@ -194,7 +196,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
name='roomDescription'
control={control}
render={({ field }) => (
<TextAreaInput id={roomDescription} {...field} rows={4} disabled={isDeleting || isRoomFederated(room)} />
<TextAreaInput id={roomDescription} {...field} rows={4} disabled={isDeleting || roomIsFederated} />
)}
/>
</FieldRow>
Expand All @@ -208,7 +210,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
name='roomAnnouncement'
control={control}
render={({ field }) => (
<TextAreaInput id={roomAnnouncement} {...field} rows={4} disabled={isDeleting || isRoomFederated(room)} />
<TextAreaInput id={roomAnnouncement} {...field} rows={4} disabled={isDeleting || roomIsFederated} />
)}
/>
</FieldRow>
Expand Down Expand Up @@ -237,7 +239,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
<ToggleSwitch
{...field}
id={roomTypeField}
disabled={isDeleting || isRoomFederated(room)}
disabled={isDeleting || roomIsFederated}
checked={roomType === 'p'}
onChange={() => onChange(value === 'p' ? 'c' : 'p')}
aria-describedby={`${roomTypeField}-hint`}
Expand All @@ -259,7 +261,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
<ToggleSwitch
id={readOnlyField}
{...field}
disabled={isDeleting || isRoomFederated(room)}
disabled={isDeleting || roomIsFederated}
checked={value}
aria-describedby={`${readOnlyField}-hint`}
/>
Expand All @@ -280,7 +282,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
<ToggleSwitch
id={reactWhenReadOnly}
{...field}
checked={value || isRoomFederated(room)}
checked={value || roomIsFederated}
aria-describedby={`${reactWhenReadOnly}-hint`}
/>
)}
Expand All @@ -297,7 +299,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
name='archived'
control={control}
render={({ field: { value, ...field } }) => (
<ToggleSwitch id={archivedField} {...field} disabled={isDeleting || isRoomFederated(room)} checked={value} />
<ToggleSwitch id={archivedField} {...field} disabled={isDeleting || roomIsFederated} checked={value} />
)}
/>
</FieldRow>
Expand All @@ -312,7 +314,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
name='isDefault'
control={control}
render={({ field: { value, ...field } }) => (
<ToggleSwitch id={isDefaultField} {...field} disabled={isDeleting || isRoomFederated(room)} checked={value} />
<ToggleSwitch id={isDefaultField} {...field} disabled={isDeleting || roomIsFederated} checked={value} />
)}
/>
</FieldRow>
Expand All @@ -336,7 +338,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
name='featured'
control={control}
render={({ field: { value, ...field } }) => (
<ToggleSwitch id={featuredField} {...field} disabled={isDeleting || isRoomFederated(room)} checked={value} />
<ToggleSwitch id={featuredField} {...field} disabled={isDeleting || roomIsFederated} checked={value} />
)}
/>
</FieldRow>
Expand All @@ -353,7 +355,7 @@ const EditRoom = ({ room, onChange, onDelete, onClose }: EditRoomProps) => {
</ButtonGroup>
<Box mbs={8}>
<ButtonGroup stretch>
<Button icon='trash' danger loading={isDeleting} disabled={!canDeleteRoom || isRoomFederated(room)} onClick={handleDelete}>
<Button icon='trash' danger loading={isDeleting} disabled={!canDeleteRoom || roomIsFederated} onClick={handleDelete}>
{t('Delete')}
</Button>
</ButtonGroup>
Expand Down
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 @@ -79,7 +79,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
const query = useQueryClient();
const t = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();
const isFederated = useMemo(() => isRoomFederated(room), [room]);
const isFederated = isRoomFederated(room);
// eslint-disable-next-line no-nested-ternary
const roomType = 'prid' in room ? 'discussion' : room.teamMain ? 'team' : 'channel';

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersWithData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ const RoomMembersWithData = ({ rid }: { rid: IRoom['_id'] }): ReactElement => {
setState({ tab: ROOM_MEMBERS_TABS.ADD });
});

const handleBack = useCallback(() => {
const handleBack = useEffectEvent(() => {
setState({ tab: ROOM_MEMBERS_TABS.LIST });
}, [setState]);
});

if (state.tab === ROOM_MEMBERS_TABS.INFO && state.userId) {
return <UserInfoWithData rid={rid} uid={state.userId} onClose={closeTab} onClickBack={handleBack} />;
Expand Down
4 changes: 3 additions & 1 deletion apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useAddUserAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ export const useAddUserAction = (
rid,
);

const roomIsFederated = isRoomFederated(room);

const userCanAdd =
room && user && isRoomFederated(room)
room && user && roomIsFederated
? Federation.isEditableByTheUser(currentUser || undefined, room, subscription)
: hasPermissionToAddUsers;

Expand Down
8 changes: 6 additions & 2 deletions apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,21 @@ export const useChangeModeratorAction = (user: Pick<IUser, '_id' | 'username'>,

const changeModeratorAction = useEffectEvent(() => handleChangeModerator({ userId: uid }));


const roomIsFederated = isRoomFederated(room);


const changeModeratorOption = useMemo(
() =>
(isRoomFederated(room) && roomCanSetModerator) || (!isRoomFederated(room) && roomCanSetModerator && userCanSetModerator)
(roomIsFederated && roomCanSetModerator) || (!roomIsFederated && roomCanSetModerator && userCanSetModerator)
? {
content: t(isModerator ? 'Remove_as_moderator' : 'Set_as_moderator'),
icon: 'shield-blank' as const,
onClick: changeModeratorAction,
type: 'privileges' as UserInfoActionType,
}
: undefined,
[changeModeratorAction, isModerator, roomCanSetModerator, t, userCanSetModerator, room],
[changeModeratorAction, isModerator, roomCanSetModerator, t, userCanSetModerator, roomIsFederated],
);

return changeModeratorOption;
Expand Down
6 changes: 4 additions & 2 deletions apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,19 @@ export const useChangeOwnerAction = (user: Pick<IUser, '_id' | 'username'>, rid:

const changeOwnerAction = useEffectEvent(async () => handleChangeOwner());

const roomIsFederated = isRoomFederated(room);

const changeOwnerOption = useMemo(
() =>
(isRoomFederated(room) && roomCanSetOwner) || (!isRoomFederated(room) && roomCanSetOwner && userCanSetOwner)
(roomIsFederated && roomCanSetOwner) || (!roomIsFederated && roomCanSetOwner && userCanSetOwner)
? {
content: t(isOwner ? 'Remove_as_owner' : 'Set_as_owner'),
icon: 'shield-check' as const,
onClick: changeOwnerAction,
type: 'privileges' as UserInfoActionType,
}
: undefined,
[changeOwnerAction, roomCanSetOwner, userCanSetOwner, isOwner, t, room],
[changeOwnerAction, roomCanSetOwner, userCanSetOwner, isOwner, t, roomIsFederated],
);

return changeOwnerOption;
Expand Down
6 changes: 5 additions & 1 deletion apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ export const useRemoveUserAction = (
const { _id: uid } = user;

const hasPermissionToRemove = usePermission('remove-user', rid);
const userCanRemove = isRoomFederated(room)


const roomIsFederated = isRoomFederated(room);

const userCanRemove = roomIsFederated
? Federation.isEditableByTheUser(currentUser || undefined, room, subscription)
: hasPermissionToRemove;
const setModal = useSetModal();
Expand Down
Loading