Skip to content

Commit 898d8b8

Browse files
fix: remove search federated (RocketChat#37031)
1 parent 3cbb7da commit 898d8b8

3 files changed

Lines changed: 7 additions & 22 deletions

File tree

.changeset/bright-boats-speak.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@rocket.chat/meteor': patch
3+
---
4+
5+
Removes deprecated search federated rooms

apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useCreateNewMenu.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,16 @@ import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
22
import { useTranslation } from 'react-i18next';
33

44
import { useCreateNewItems } from './useCreateNewItems';
5-
import { useMatrixFederationItems } from './useMatrixFederationItems';
6-
import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
7-
import { useIsFederationEnabled } from '../../../hooks/useIsFederationEnabled';
85

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

118
export const useCreateNewMenu = () => {
129
const { t } = useTranslation();
1310
const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);
1411

15-
const { data } = useIsEnterprise();
16-
const isMatrixEnabled = useIsFederationEnabled() && data?.isEnterprise;
17-
1812
const createRoomItems = useCreateNewItems();
19-
const matrixFederationSearchItems = useMatrixFederationItems({ isMatrixEnabled });
2013

21-
const sections = [
22-
{ title: t('Create_new'), items: createRoomItems, permission: showCreate },
23-
{ title: t('Explore'), items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled },
24-
];
14+
const sections = [{ title: t('Create_new'), items: createRoomItems, permission: showCreate }];
2515

2616
return sections.filter((section) => section.permission);
2717
};

apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,16 @@ import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
22
import { useTranslation } from 'react-i18next';
33

44
import { useCreateRoomItems } from './useCreateRoomItems';
5-
import { useMatrixFederationItems } from './useMatrixFederationItems';
6-
import { useIsEnterprise } from '../../../../hooks/useIsEnterprise';
7-
import { useIsFederationEnabled } from '../../../../hooks/useIsFederationEnabled';
85

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

118
export const useCreateRoom = () => {
129
const { t } = useTranslation();
1310
const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);
1411

15-
const { data } = useIsEnterprise();
16-
const isMatrixEnabled = useIsFederationEnabled() && data?.isEnterprise;
17-
1812
const createRoomItems = useCreateRoomItems();
19-
const matrixFederationSearchItems = useMatrixFederationItems({ isMatrixEnabled });
2013

21-
const sections = [
22-
{ title: t('Create_new'), items: createRoomItems, permission: showCreate },
23-
{ title: t('Explore'), items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled },
24-
];
14+
const sections = [{ title: t('Create_new'), items: createRoomItems, permission: showCreate }];
2515

2616
return sections.filter((section) => section.permission);
2717
};

0 commit comments

Comments
 (0)