feat: Enhanced navigation filters #36049

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.

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 78 commits into develop from feat/sidebar-filters

Aug 15, 2025

.changeset/twenty-wasps-attend.md

-Original file line number
+Diff line change
@@ -0,0 +1,15 @@
+    ---
+    '@rocket.chat/mock-providers': minor
+    '@rocket.chat/core-services': minor
+    '@rocket.chat/model-typings': minor
+    '@rocket.chat/core-typings': minor
+    '@rocket.chat/rest-typings': minor
+    '@rocket.chat/ui-contexts': minor
+    '@rocket.chat/ui-client': minor
+    '@rocket.chat/models': minor
+    '@rocket.chat/i18n': minor
+    '@rocket.chat/meteor': minor
+    ---
+    Introduces the side navigation with a new filtering system. The update adds new filters for All, Mentions, Favorites, and Discussions, as well as dedicated filters for Omnichannel conversations and grouping by Teams, Channels, and DMs.
+    > This change is being tested under `Enhanced navigation experience` feature preview, in order to check it you need to enabled it

apps/meteor/app/api/server/v1/rooms.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -363,13 +363,8 @@ API.v1.addRoute( @@
     			}
     			await Promise.all(
-    				Object.keys(notifications as Notifications).map(async (notificationKey) =>
-    					saveNotificationSettingsMethod(
-    						this.userId,
-    						roomId,
-    						notificationKey as NotificationFieldType,
-    						notifications[notificationKey as keyof Notifications],
-    					),
+    				Object.entries(notifications as Notifications).map(async ([notificationKey, notificationValue]) =>
+    					saveNotificationSettingsMethod(this.userId, roomId, notificationKey as NotificationFieldType, notificationValue),
     				),
     			);
@@ Expand Down Expand Up / @@ -463,7 +458,7 @@ API.v1.addRoute( @@
     			const discussionParent =
     				room.prid &&
     				(await Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | 'prid' | 'u'>>(room.prid, {
-    					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1, sidepanel: 1 },
+    					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1 },
     				}));
     			const { team, parentRoom } = await Team.getRoomInfo(room);
     			const parent = discussionParent || parentRoom;
@@ Expand Down @@

apps/meteor/app/api/server/v1/teams.ts

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     import { Team } from '@rocket.chat/core-services';
     import type { ITeam, UserStatus } from '@rocket.chat/core-typings';
-    import { TEAM_TYPE, isValidSidepanel } from '@rocket.chat/core-typings';
+    import { TEAM_TYPE } from '@rocket.chat/core-typings';
     import { Users, Rooms } from '@rocket.chat/models';
     import {
     	isTeamsConvertToChannelProps,
@@ Expand Down Expand Up / @@ -78,11 +78,7 @@ API.v1.addRoute( @@
     				}),
     			);
-    			const { name, type, members, room, owner, sidepanel } = this.bodyParams;
-    			if (sidepanel?.items && !isValidSidepanel(sidepanel)) {
-    				throw new Error('error-invalid-sidepanel');
-    			}
+    			const { name, type, members, room, owner } = this.bodyParams;
     			const team = await Team.create(this.userId, {
     				team: {
@@ Expand All / @@ -92,7 +88,6 @@ API.v1.addRoute( @@
     				room,
     				members,
     				owner,
-    				sidepanel,
     			});
     			return API.v1.success({ team });
@@ Expand Down @@

apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     import { Team } from '@rocket.chat/core-services';
     import type { IRoom, IRoomWithRetentionPolicy, IUser, MessageTypesValues } from '@rocket.chat/core-typings';
-    import { TEAM_TYPE, isValidSidepanel } from '@rocket.chat/core-typings';
+    import { TEAM_TYPE } from '@rocket.chat/core-typings';
     import type { ServerMethods } from '@rocket.chat/ddp-client';
     import { Rooms, Users } from '@rocket.chat/models';
     import { Match } from 'meteor/check';
@@ Expand Down Expand Up / @@ -47,7 +47,6 @@ type RoomSettings = { @@
     		favorite: boolean;
     		defaultValue: boolean;
     	};
-    	sidepanel?: IRoom['sidepanel'];
     };
     type RoomSettingsValidators = {
@@ Expand Down Expand Up / @@ -79,23 +78,6 @@ const validators: RoomSettingsValidators = { @@
     			});
     		}
     	},
-    	async sidepanel({ room, userId, value }) {
-    		if (!room.teamMain) {
-    			throw new Meteor.Error('error-action-not-allowed', 'Invalid room', {
-    				method: 'saveRoomSettings',
-    			});
-    		}
-    		if (!(await hasPermissionAsync(userId, 'edit-team', room._id))) {
-    			throw new Meteor.Error('error-action-not-allowed', 'You do not have permission to change sidepanel items', {
-    				method: 'saveRoomSettings',
-    			});
-    		}
-    		if (!isValidSidepanel(value)) {
-    			throw new Meteor.Error('error-invalid-sidepanel');
-    		}
-    	},
     	async roomType({ userId, room, value }) {
     		if (value === room.t) {
@@ Expand Down Expand Up / @@ -249,11 +231,6 @@ const settingSavers: RoomSettingsSavers = { @@
     			await saveRoomTopic(rid, value, user);
     		}
     	},
-    	async sidepanel({ value, rid, room }) {
-    		if (JSON.stringify(value) !== JSON.stringify(room.sidepanel)) {
-    			await Rooms.setSidepanelById(rid, value);
-    		}
-    	},
     	async roomAnnouncement({ value, room, rid, user }) {
     		if (!value && !room.announcement) {
     			return;
@@ Expand Down Expand Up / @@ -376,7 +353,6 @@ const fields: (keyof RoomSettings)[] = [ @@
     	'retentionOverrideGlobal',
     	'encrypted',
     	'favorite',
-    	'sidepanel',
     ];
     const validate = <TRoomSetting extends keyof RoomSettings>(
@@ Expand Down @@

apps/meteor/app/lib/server/functions/createRoom.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -126,7 +126,6 @@ export const createRoom = async <T extends RoomType>( @@
     	readOnly?: boolean,
     	roomExtraData?: Partial<IRoom>,
     	options?: ICreateRoomParams['options'],
-    	sidepanel?: ICreateRoomParams['sidepanel'],
     ): Promise<
     	ICreatedRoom & {
     		rid: string;
@@ Expand Down Expand Up / @@ -202,7 +201,6 @@ export const createRoom = async <T extends RoomType>( @@
     		},
     		ts: now,
     		ro: readOnly === true,
-    		...(sidepanel && { sidepanel }),
     	};
     	if (teamId) {
@@ Expand Down @@

apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarItemSort.tsx

This file was deleted.

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ import NavBarItemCreateNew from './NavBarItemCreateNew'; @@
     import NavBarItemDirectoryPage from './NavBarItemDirectoryPage';
     import NavBarItemHomePage from './NavBarItemHomePage';
     import NavBarItemMarketPlaceMenu from './NavBarItemMarketPlaceMenu';
-    import NavBarItemSort from './NavBarItemSort';
     import NavBarPagesStackMenu from './NavBarPagesStackMenu';
     const NavBarPagesGroup = () => {
@@ Expand All / @@ -28,7 +27,6 @@ const NavBarPagesGroup = () => { @@
     			)}
     			{showMarketplace && !isMobile && <NavBarItemMarketPlaceMenu />}
     			<NavBarItemCreateNew />
-    			{!isMobile && <NavBarItemSort />}
     		</NavBarGroup>
     	);
     };
@@ Expand Down @@

apps/meteor/client/NavBarV2/NavBarPagesGroup/actions/CreateTeamModal.tsx

-Original file line number
+Diff line change
@@ -1,4 +1,3 @@
-    import type { SidepanelItem } from '@rocket.chat/core-typings';
     import {
     	Box,
     	Button,
@@ Expand All / @@ -15,15 +14,13 @@ import { @@
     	FieldHint,
     	Accordion,
     	AccordionItem,
-    	Divider,
     	ModalHeader,
     	ModalTitle,
     	ModalClose,
     	ModalContent,
     	ModalFooter,
     	ModalFooterControllers,
     } from '@rocket.chat/fuselage';
-    import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
     import {
     	useEndpoint,
     	usePermission,
@@ Expand All / @@ -49,8 +46,6 @@ type CreateTeamModalInputs = { @@
     	encrypted: boolean;
     	broadcast: boolean;
     	members?: string[];
-    	showDiscussions?: boolean;
-    	showChannels?: boolean;
     };
     type CreateTeamModalProps = { onClose: () => void };
@@ Expand Down Expand Up @@
     			encrypted: (e2eEnabledForPrivateByDefault as boolean) ?? false,
     			broadcast: false,
     			members: [],
-    			showChannels: true,
-    			showDiscussions: true,
     		},
     	});
@@ Expand Down Expand Up @@
     		topic,
     		broadcast,
     		encrypted,
-    		showChannels,
-    		showDiscussions,
     	}: CreateTeamModalInputs): Promise<void> => {
-    		const sidepanelItem = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [SidepanelItem, SidepanelItem?];
     		const params = {
     			name,
     			members,
@@ Expand All @@
     					encrypted,
     				},
     			},
-    			...((showChannels || showDiscussions) && { sidepanel: { items: sidepanelItem } }),
     		};
     		try {
@@ Expand All @@
     	const encryptedId = useId();
     	const broadcastId = useId();
     	const addMembersId = useId();
-    	const showChannelsId = useId();
-    	const showDiscussionsId = useId();
     	return (
     		<Modal
@@ Expand Down Expand Up @@
     				</FieldGroup>
     				<Accordion>
     					<AccordionItem title={t('Advanced_settings')}>
-    						<FeaturePreview feature='sidepanelNavigation'>
-    							<FeaturePreviewOff>{null}</FeaturePreviewOff>
-    							<FeaturePreviewOn>
-    								<FieldGroup>
-    									<Box is='h5' fontScale='h5' color='titles-labels'>
-    										{t('Navigation')}
-    									</Box>
-    									<Field>
-    										<FieldRow>
-    											<FieldLabel htmlFor={showChannelsId}>{t('Channels')}</FieldLabel>
-    											<Controller
-    												control={control}
-    												name='showChannels'
-    												render={({ field: { onChange, value, ref } }): ReactElement => (
-    													<ToggleSwitch
-    														aria-describedby={`${showChannelsId}-hint`}
-    														id={showChannelsId}
-    														onChange={onChange}
-    														checked={value}
-    														ref={ref}
-    													/>
-    												)}
-    											/>
-    										</FieldRow>
-    										<FieldDescription id={`${showChannelsId}-hint`}>{t('Show_channels_description')}</FieldDescription>
-    									</Field>
-    									<Field>
-    										<FieldRow>
-    											<FieldLabel htmlFor={showDiscussionsId}>{t('Discussions')}</FieldLabel>
-    											<Controller
-    												control={control}
-    												name='showDiscussions'
-    												render={({ field: { onChange, value, ref } }): ReactElement => (
-    													<ToggleSwitch
-    														aria-describedby={`${showDiscussionsId}-hint`}
-    														id={showDiscussionsId}
-    														onChange={onChange}
-    														checked={value}
-    														ref={ref}
-    													/>
-    												)}
-    											/>
-    										</FieldRow>
-    										<FieldDescription id={`${showDiscussionsId}-hint`}>{t('Show_discussions_description')}</FieldDescription>
-    									</Field>
-    								</FieldGroup>
-    								<Divider mb={36} />
-    							</FeaturePreviewOn>
-    						</FeaturePreview>
     						<FieldGroup>
     							<Box is='h5' fontScale='h5' color='titles-labels'>
     								{t('Security_and_permissions')}
@@ Expand Down @@

apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useGroupingListItems.spec.tsx

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Enhanced navigation filters #36049

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!