Skip to content

fix: Administration settings not being listed after logout and login #37345

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
kodiakhq merged 12 commits into from
Nov 6, 2025
Merged

fix: Administration settings not being listed after logout and login #37345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
762b0bf
fix: settings cached collection keeping stale state after logout
aleksandernsilva Oct 30, 2025
dc9af1c
test: e2e tests for settings list
aleksandernsilva Oct 30, 2025
6346329
chore: changeset
aleksandernsilva Oct 30, 2025
4205d46
refactor: call init and listen together
aleksandernsilva Oct 31, 2025
004fce8
Merge branch 'develop' into fix/settings-not-loading-after-logout
dougfabris Nov 4, 2025
3dbc451
Merge branch 'develop' into fix/settings-not-loading-after-logout
kodiakhq[bot] Nov 5, 2025
9b00fb3
Merge branch 'develop' into fix/settings-not-loading-after-logout
kodiakhq[bot] Nov 5, 2025
ea5d3ff
Merge branch 'develop' into fix/settings-not-loading-after-logout
kodiakhq[bot] Nov 5, 2025
77bbc1d
Merge branch 'develop' into fix/settings-not-loading-after-logout
kodiakhq[bot] Nov 5, 2025
256a71c
Merge branch 'develop' into fix/settings-not-loading-after-logout
kodiakhq[bot] Nov 5, 2025
7778204
Merge branch 'develop' into fix/settings-not-loading-after-logout
kodiakhq[bot] Nov 5, 2025
9082481
Merge branch 'develop' into fix/settings-not-loading-after-logout
kodiakhq[bot] Nov 6, 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/stupid-cameras-nail.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes administration settings page not listing the settings after logging out and back into the workspace
7 changes: 2 additions & 5 deletions apps/meteor/client/providers/AuthorizationProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AuthorizationContext, useUserId } from '@rocket.chat/ui-contexts';
import type { ReactNode } from 'react';
import { useEffect, useMemo } from 'react';
import { useMemo } from 'react';

import { hasPermission, hasAtLeastOnePermission, hasAllPermission, hasRole } from '../../app/authorization/client';
import { PermissionsCachedStore } from '../cachedStores';
Expand All @@ -12,14 +12,11 @@ type AuthorizationProviderProps = {
};

const AuthorizationProvider = ({ children }: AuthorizationProviderProps) => {
useEffect(() => {
PermissionsCachedStore.listen();
}, []);

const isLoading = !PermissionsCachedStore.useReady();

if (isLoading) {
throw (async () => {
PermissionsCachedStore.listen();
await PermissionsCachedStore.init();
})();
}
Expand Down
5 changes: 5 additions & 0 deletions apps/meteor/client/providers/SettingsProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { ReactNode } from 'react';
import { useCallback, useMemo } from 'react';

import { PublicSettingsCachedStore, PrivateSettingsCachedStore } from '../cachedStores';
import { PrivateCachedStore } from '../lib/cachedStores/CachedStore';
import { applyQueryOptions } from '../lib/cachedStores/applyQueryOptions';

const settingsManagementPermissions = ['view-privileged-setting', 'edit-privileged-setting', 'manage-selected-settings'];
Expand All @@ -24,6 +25,10 @@ const SettingsProvider = ({ children }: SettingsProviderProps) => {

if (isLoading) {
throw (async () => {
if (cachedCollection instanceof PrivateCachedStore) {
cachedCollection.listen();
}

await cachedCollection.init();
})();
}
Expand Down
33 changes: 32 additions & 1 deletion apps/meteor/tests/e2e/administration-settings.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,46 @@
import { Users } from './fixtures/userStates';
import { AdminSettings } from './page-objects';
import { AdminSettings, AdminSectionsHref } from './page-objects';
import { HomeSidenav } from './page-objects/fragments';
import { LoginPage } from './page-objects/login';
import { getSettingValueById, setSettingValueById } from './utils';
import { test, expect } from './utils/test';

test.use({ storageState: Users.admin.state });

test.describe.parallel('administration-settings', () => {
let poAdminSettings: AdminSettings;
let poHomeSidenav: HomeSidenav;
let poLoginPage: LoginPage;

test.beforeEach(async ({ page }) => {
poAdminSettings = new AdminSettings(page);
poHomeSidenav = new HomeSidenav(page);
poLoginPage = new LoginPage(page);
});

test.describe('Settings Page', () => {
test.beforeEach(async ({ page }) => {
await page.goto('/admin/settings');
});

test('should display settings list', async ({ page }) => {
await test.step('should list settings on load', async () => {
await expect(page.getByText('No results found')).not.toBeVisible();
});

await test.step('should list settings after logout and login', async () => {
await poAdminSettings.sidebar.close();
await poHomeSidenav.logout();

await poLoginPage.loginByUserState(Users.admin);

await poHomeSidenav.openAdministrationByLabel('Workspace');
const settingsButton = await poAdminSettings.adminSectionButton(AdminSectionsHref.Settings);
await settingsButton.click();

await expect(page.getByText('No results found')).not.toBeVisible();
});
});
});

test.describe('General', () => {
Expand Down
Loading