Skip to content

regression: Avoid room filters redirect when opening a room #36846

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 1, 2025
Merged

regression: Avoid room filters redirect when opening a room #36846

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
2e37ea5
fix: avoid room filter redirect
dougfabris Sep 1, 2025
bbdf47f
test: fix e2e tests
dougfabris Sep 1, 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
4 changes: 4 additions & 0 deletions apps/meteor/client/views/navigation/providers/RoomsNavigationProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ const RoomsNavigationContextProvider = ({ children }: { children: ReactNode }) =
return;
}

if (!['teams', 'channels', 'directMessages'].includes(currentFilter)) {
return;
}

if (isTeamRoom(room)) {
setFilter('teams', unread, rid);
return;
Expand Down
18 changes: 14 additions & 4 deletions apps/meteor/tests/e2e/feature-preview.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,20 @@ test.describe.serial('feature preview', () => {
await user1Page.close();
});

test('sidepanel should open the respective parent room filter after opening a room through navbar search', async ({ page }) => {
await page.goto('/home');
test('sidepanel should open the respective parent room filter if its a room filter', async ({ page }) => {
await page.goto(`/channel/${targetChannel}`);
await poHomeChannel.sidenav.waitForHome();
await poHomeChannel.sidebar.getSearchRoomByName(sidepanelTeam).click();
await poHomeChannel.content.waitForChannel();

await expect(page).toHaveURL(`/group/${sidepanelTeam}`);
await expect(poHomeChannel.sidepanel.getSidepanelHeader(sidepanelTeam)).toBeVisible();
await expect(poHomeChannel.sidenav.getSidebarItemByName(sidepanelTeam)).toHaveAttribute('aria-selected', 'true');
});

test('sidepanel should not open the respective parent room filter if its not a room filter', async ({ page }) => {
await page.goto('/home');
await poHomeChannel.sidenav.waitForHome();
await poHomeChannel.sidebar.favoritesTeamCollabFilter.click();

await expect(poHomeChannel.sidepanel.getSidepanelHeader('Favorites')).toBeVisible();
Expand All @@ -453,8 +463,8 @@ test.describe.serial('feature preview', () => {
await poHomeChannel.content.waitForChannel();

await expect(page).toHaveURL(`/group/${sidepanelTeam}`);
await expect(poHomeChannel.sidepanel.getSidepanelHeader(sidepanelTeam)).toBeVisible();
await expect(poHomeChannel.sidenav.getSidebarItemByName(sidepanelTeam)).toHaveAttribute('aria-selected', 'true');
await expect(poHomeChannel.sidepanel.getSidepanelHeader('Favorites')).toBeVisible();
await expect(poHomeChannel.sidebar.favoritesTeamCollabFilter).toHaveAttribute('aria-selected', 'true');
});

test('should show all filters and tablist on sidepanel', async ({ page }) => {
Expand Down
Loading