Skip to content

Show the effective time zone in user details #502

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
Kerrycek merged 1 commit into from
Sep 24, 2026
+6 −3
Merged

Show the effective time zone in user details #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion e2e/specs/admin/user_detail_page.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ test('admin user detail: shows header and shortcut links', async ({ page }) => {
await bootstrapVpsAdminWindow(page);

await installHaveApiMock(page, {
user: { id: 1, login: 'admin', level: 100 },
user: { id: 1, login: 'admin', level: 100, time_zone: 'Asia/Tokyo' },
handlers: {
'GET users/42': () => ({
user: {
Expand All @@ -29,6 +29,7 @@ test('admin user detail: shows header and shortcut links', async ({ page }) => {

await expect(page.getByTestId('admin.user.page')).toBeVisible();
await expect(page.getByTestId('admin.user.header')).toBeVisible();
await expect(page.getByTestId('admin.user.time_zone')).toHaveText('Europe/Prague');

await expect(page.getByTestId('admin.user.action.vps')).toHaveAttribute('href', '/admin/vps?user=42');
await expect(page.getByTestId('admin.user.action.vps_count')).toHaveText('7');
Expand Down Expand Up @@ -142,6 +143,7 @@ test('admin user detail: edit drawer saves safe account fields', async ({ page }

await expect(page.getByTestId('admin.user.edit.drawer')).toHaveCount(0);
await expect(page.getByTestId('admin.user.details.card').getByText('Alice Renamed')).toBeVisible();
await expect(page.getByTestId('admin.user.time_zone')).toHaveText('UTC');
expect(updates).toEqual([
{
user: {
Expand Down
5 changes: 3 additions & 2 deletions src/pages/app/admin/user/AdminUserOverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useMutation, useQuery } from '@tanstack/react-query';
import { useAppMode } from '../../../../app/appMode';
import { useAuth } from '../../../../app/auth';
import { useI18n } from '../../../../app/i18n';
import { useAccountTimeZone } from '../../../../app/accountTimeZone';
import { resolveAccountTimeZone, useAccountTimeZone, useServerTimeZone } from '../../../../app/accountTimeZone';
import { useToasts } from '../../../../app/toasts';

import { Alert } from '../../../../components/ui/Alert';
Expand Down Expand Up @@ -99,6 +99,7 @@ export function AdminUserOverviewPage() {
const { basePath } = useAppMode();
const { t } = useI18n();
const accountTimeZone = useAccountTimeZone();
const serverTimeZone = useServerTimeZone();
const toasts = useToasts();
const { user: u, refetch } = useAdminUserContext();
const [editOpen, setEditOpen] = useState(false);
Expand Down Expand Up @@ -313,7 +314,7 @@ export function AdminUserOverviewPage() {
</div>
<div>
<div className="text-xs text-muted">{t('admin.user.edit.field.time_zone')}</div>
<div className="text-sm">{typeof u.time_zone === 'string' && u.time_zone.trim() ? u.time_zone : t('admin.user.edit.field.time_zone.default')}</div>
<div className="text-sm" data-testid="admin.user.time_zone">{resolveAccountTimeZone(u.time_zone, serverTimeZone)}</div>
</div>
<div>
<div className="text-xs text-muted">{t('admin.user.field.created')}</div>
Expand Down
Loading