Skip to content

fix: remove search federated #37031

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 2 commits into from
Sep 24, 2025
+7 −22
Merged

fix: remove search federated #37031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33e917d
fix: remove search federated
juliajforesti Sep 22, 2025
e2c46e6
chore: changeset
juliajforesti Sep 22, 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
5 changes: 5 additions & 0 deletions .changeset/bright-boats-speak.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Removes deprecated search federated rooms
12 changes: 1 addition & 11 deletions apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useCreateNewMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,16 @@ import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
import { useTranslation } from 'react-i18next';

import { useCreateNewItems } from './useCreateNewItems';
import { useMatrixFederationItems } from './useMatrixFederationItems';
import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
import { useIsFederationEnabled } from '../../../hooks/useIsFederationEnabled';

const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user'];

export const useCreateNewMenu = () => {
const { t } = useTranslation();
const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);

const { data } = useIsEnterprise();
const isMatrixEnabled = useIsFederationEnabled() && data?.isEnterprise;

const createRoomItems = useCreateNewItems();
const matrixFederationSearchItems = useMatrixFederationItems({ isMatrixEnabled });

const sections = [
{ title: t('Create_new'), items: createRoomItems, permission: showCreate },
{ title: t('Explore'), items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled },
];
const sections = [{ title: t('Create_new'), items: createRoomItems, permission: showCreate }];

return sections.filter((section) => section.permission);
};
12 changes: 1 addition & 11 deletions apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,16 @@ import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
import { useTranslation } from 'react-i18next';

import { useCreateRoomItems } from './useCreateRoomItems';
import { useMatrixFederationItems } from './useMatrixFederationItems';
import { useIsEnterprise } from '../../../../hooks/useIsEnterprise';
import { useIsFederationEnabled } from '../../../../hooks/useIsFederationEnabled';

const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user'];

export const useCreateRoom = () => {
const { t } = useTranslation();
const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);

const { data } = useIsEnterprise();
const isMatrixEnabled = useIsFederationEnabled() && data?.isEnterprise;

const createRoomItems = useCreateRoomItems();
const matrixFederationSearchItems = useMatrixFederationItems({ isMatrixEnabled });

const sections = [
{ title: t('Create_new'), items: createRoomItems, permission: showCreate },
{ title: t('Explore'), items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled },
];
const sections = [{ title: t('Create_new'), items: createRoomItems, permission: showCreate }];

return sections.filter((section) => section.permission);
};
Comment on lines +14 to 17
Copy link
Contributor

@coderabbitai coderabbitai bot Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

🧩 Analysis chain

LGTM — menu now only shows valid “Create new” actions.

Matches the goal to remove the federated search entry.

Quick check for leftovers:

🏁 Script executed:

#!/bin/bash
set -euo pipefail

rg -n -C2 --type=ts --type=tsx -S \
  -e 'useMatrixFederationItems' \
  -e 'useIsFederationEnabled' \
  -e '\bisMatrixEnabled\b' \
  -e 'Search[_ ]federated[_ ]rooms' \
  apps/meteor || true

Length of output: 27

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== show file (if exists) =="
sed -n '1,240p' apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx || true

echo
echo "== search for federation-related symbols =="
rg -n -C2 -S \
  -e 'useMatrixFederationItems' \
  -e 'useIsFederationEnabled' \
  -e '\bisMatrixEnabled\b' \
  -e 'Search[_ ]federated[_ ]rooms' \
  apps/meteor || true

echo
echo "== broader search for 'federat' occurrences =="
rg -n -C2 -S 'federat' apps/meteor || true

Length of output: 302103

LGTM — Create menu now filters correctly; leftover federated search items remain

useCreateRoomMenu.tsx correctly filters the Create_new section by permission. The Matrix federation search item still exists in:

  • apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.ts
  • apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useMatrixFederationItems.ts

Remove or gate those if the intent was to remove the federated search entry globally.

🤖 Prompt for AI Agents 
In apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx lines
14-17 you correctly filter the Create_new section by permission, but federated
search menu items still appear elsewhere; update
apps/meteor/client/sidebar/header/actions/hooks/useMatrixFederationItems.ts and
apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useMatrixFederationItems.ts
to either remove the Matrix federation search item or gate it behind the same
permission check used for Create_new (add a permission prop/flag, return [] when
not allowed), ensuring these hooks return no items when the user lacks the
permission so the federated search entry is removed globally.

Loading