refactor: rename ISidebarCustomCategory to ISidebarCategory and update related code

- Updated type imports and usages from ISidebarCustomCategory to ISidebarCategory across multiple files.
- Adjusted user preferences and API endpoints to reflect the new category structure.
- Removed unused hooks and functions related to custom categories.
- Modified tests to align with the new category naming conventions.

Author: dougfabris

apps/meteor/client/sidebar/RoomList/RoomList.tsx

@@ -11,9 +11,9 @@ import RoomListRow from './RoomListRow';
 import RoomListRowWrapper from './RoomListRowWrapper';
 import RoomListWrapper from './RoomListWrapper';
 import { useOpenedRoom } from '../../lib/RoomManager';
-import { useAllGroupsOrder } from '../hooks/useAllGroupsOrder';
 import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import { useCollapsedGroups } from '../hooks/useCollapsedGroups';
+import { useCustomCategories } from '../hooks/useCustomCategories';
 import { usePreventDefault } from '../hooks/usePreventDefault';
 import { useRoomList } from '../hooks/useRoomList';
 import { useShortcutOpenMenu } from '../hooks/useShortcutOpenMenu';
@@ -26,7 +26,7 @@ const RoomList = () => {
 
 	const { collapsedGroups, handleClick, handleKeyDown } = useCollapsedGroups();
 	const { groups, groupsCount, totalCount } = useRoomList({ collapsedGroups });
-	const { move: moveGroup } = useAllGroupsOrder();
+	const { move: moveGroup } = useCustomCategories();
 	const avatarTemplate = useAvatarTemplate();
 	const sideBarItemTemplate = useTemplateByViewMode();
 	const { ref } = useResizeObserver<HTMLElement>({ debounceDelay: 100 });

apps/meteor/client/sidebar/RoomMenu.spec.tsx

@@ -112,7 +112,7 @@ const enterpriseCategoryRenderOptions = {
 		.withJohnDoe()
 		.withQueryClient(buildEnterpriseQueryClient())
 		.withSubscription(createFakeSubscription({ rid: 'roomId', f: false, t: 'c' }))
-		.withUserPreference('sidebarCustomCategories', [{ _id: 'cat-design', name: 'Design', rooms: ['roomId'], showUnreads: true }])
+		.withUserPreference('sidebarCategories', [{ _id: 'cat-design', name: 'Design', showUnreads: true }])
 		.build(),
 };
 

apps/meteor/client/sidebar/categories/CategoryMenu.tsx

@@ -1,4 +1,4 @@
-import type { ISidebarCustomCategory } from '@rocket.chat/core-typings';
+import type { ISidebarCategory } from '@rocket.chat/core-typings';
 import { Menu, MenuItem, MenuItemContent, MenuItemIcon, MenuSection, MenuSubmenuTrigger, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
@@ -9,11 +9,9 @@ import { useTranslation } from 'react-i18next';
 import { useCategoryModals } from './useCategoryModals';
 import { useCreateNewItems } from '../../navbar/NavBarPagesGroup/hooks/useCreateNewItems';
 import { useCustomCategories } from '../hooks/useCustomCategories';
-import { useKeepUnreadsOnTopGroups } from '../hooks/useKeepUnreadsOnTopGroups';
-import { useShowUnreadsGroups } from '../hooks/useShowUnreadsGroups';
 
 type CategoryMenuProps = {
-	category?: ISidebarCustomCategory;
+	category?: ISidebarCategory;
 	groupKey: string;
 	showUnreads: boolean;
 	keepUnreadsOnTop: boolean;
@@ -38,13 +36,7 @@ const CategoryMenu = ({
 	const close = () => toggleOpen(false);
 
 	const { openManage, openDelete } = useCategoryModals();
-	const {
-		toggleShowUnreads: toggleCustomShowUnreads,
-		toggleKeepUnreadsOnTop: toggleCustomKeepUnreadsOnTop,
-		moveRoom,
-	} = useCustomCategories();
-	const { toggleShowUnreads: toggleSystemShowUnreads } = useShowUnreadsGroups();
-	const { toggleKeepUnreadsOnTop: toggleSystemKeepUnreadsOnTop } = useKeepUnreadsOnTopGroups();
+	const { toggleShowUnreads, toggleKeepUnreadsOnTop, moveRoom } = useCustomCategories();
 	const sidebarShowUnread = useUserPreference<boolean>('sidebarShowUnread', false);
 	const disableAlwaysDisplay = Boolean(sidebarShowUnread) && groupKey !== 'Unread';
 
@@ -59,9 +51,8 @@ const CategoryMenu = ({
 	const rawCreateItems = useCreateNewItems({ onCreateSuccess });
 	const createItems = category ? rawCreateItems : [];
 
-	const handleToggleShowUnreads = () => (category ? toggleCustomShowUnreads(category._id) : toggleSystemShowUnreads(groupKey));
-	const handleToggleKeepUnreadsOnTop = () =>
-		category ? toggleCustomKeepUnreadsOnTop(category._id) : toggleSystemKeepUnreadsOnTop(groupKey);
+	const handleToggleShowUnreads = () => toggleShowUnreads(category?._id ?? groupKey);
+	const handleToggleKeepUnreadsOnTop = () => toggleKeepUnreadsOnTop(category?._id ?? groupKey);
 
 	const orderItems: GenericMenuItemProps[] = [
 		{

apps/meteor/client/sidebar/categories/DeleteCategoryModal.tsx

@@ -1,4 +1,4 @@
-import type { ISidebarCustomCategory } from '@rocket.chat/core-typings';
+import type { ISidebarCategory } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { GenericModal } from '@rocket.chat/ui-client';
 import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { useCustomCategories } from '../hooks/useCustomCategories';
 
 type DeleteCategoryModalProps = {
-	category: ISidebarCustomCategory;
+	category: ISidebarCategory;
 	onClose: () => void;
 };
 

apps/meteor/client/sidebar/categories/ManageCategoryModal.tsx

@@ -1,4 +1,4 @@
-import type { ISidebarCustomCategory } from '@rocket.chat/core-typings';
+import type { ISidebarCategory } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { Field, FieldError, FieldGroup, FieldLabel, FieldRow, TextInput } from '@rocket.chat/fuselage-forms';
 import { GenericModal } from '@rocket.chat/ui-client';
@@ -13,7 +13,7 @@ import { MAX_CATEGORY_NAME_LENGTH, useCustomCategories } from '../hooks/useCusto
 const OPEN_QUERY = { open: { $ne: false } } as const;
 
 type ManageCategoryModalProps = {
-	category: ISidebarCustomCategory;
+	category: ISidebarCategory;
 	onClose: () => void;
 };
 
@@ -22,11 +22,9 @@ const ManageCategoryModal = ({ category, onClose }: ManageCategoryModalProps) =>
 	const dispatchToastMessage = useToastMessageDispatch();
 	const { updateCategory, validateName } = useCustomCategories();
 
-	// Load the rooms currently assigned to this category from subscriptions.
 	const categorySubscriptions = useUserSubscriptions(OPEN_QUERY, {});
 	const initialRoomIds = useMemo(
 		() => categorySubscriptions.filter((s) => s.category === category._id).map((s) => s.rid),
-		// Intentionally computed once on mount — category._id is stable for a given modal instance.
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[],
 	);

apps/meteor/client/sidebar/categories/useCategoryModals.tsx

@@ -1,4 +1,4 @@
-import type { ISidebarCustomCategory } from '@rocket.chat/core-typings';
+import type { ISidebarCategory } from '@rocket.chat/core-typings';
 import { useSetModal } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
@@ -30,8 +30,8 @@ export const useCategoryModals = () => {
 
 		return {
 			openCreate: (room?: MovableRoom) => setModal(<CreateCategoryModal room={room} onClose={onClose} />),
-			openManage: (category: ISidebarCustomCategory) => setModal(<ManageCategoryModal category={category} onClose={onClose} />),
-			openDelete: (category: ISidebarCustomCategory) => setModal(<DeleteCategoryModal category={category} onClose={onClose} />),
+			openManage: (category: ISidebarCategory) => setModal(<ManageCategoryModal category={category} onClose={onClose} />),
+			openDelete: (category: ISidebarCategory) => setModal(<DeleteCategoryModal category={category} onClose={onClose} />),
 		};
 	}, [handleManageSubscription, setModal, shouldShowUpsell]);
 };

apps/meteor/client/sidebar/categories/useRoomCategoryItems.spec.tsx

@@ -20,7 +20,6 @@ const makeCategories = () =>
 		categories: [catA, catB],
 		moveRoom: jest.fn(),
 		removeRoom: jest.fn(),
-		getRoomCategory: jest.fn(() => undefined),
 		validateName: jest.fn(),
 		createCategory: jest.fn(),
 		createCategoryAndMoveRoom: jest.fn(),