watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix reports permissions, long team overflow, language settings

Browse source
This commit is contained in:
Francis Cao 2025-10-22 16:09:31 -07:00
parent f5bf148b2b
commit d87ae84a29
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/app/(main)/settings/SettingsLayout.tsx
View file

@ -1,10 +1,10 @@
'use client'; 'use client';
import { ReactNode } from 'react';
import { Grid, Column } from '@umami/react-zen';
import { useMessages, useNavigation } from '@/components/hooks';
import { PageBody } from '@/components/common/PageBody'; import { PageBody } from '@/components/common/PageBody';
import { SideMenu } from '@/components/common/SideMenu'; import { SideMenu } from '@/components/common/SideMenu';
import { UserCircle, Users, Settings2 } from '@/components/icons'; import { useMessages, useNavigation } from '@/components/hooks';
import { Settings2, UserCircle, Users } from '@/components/icons';
import { Column, Grid } from '@umami/react-zen';
import { ReactNode } from 'react';
export function SettingsLayout({ children }: { children: ReactNode }) { export function SettingsLayout({ children }: { children: ReactNode }) {
const { formatMessage, labels } = useMessages(); const { formatMessage, labels } = useMessages();
@ -46,8 +46,15 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
.find(({ path }) => path && pathname.includes(path.split('?')[0]))?.id; .find(({ path }) => path && pathname.includes(path.split('?')[0]))?.id;
return ( return (
<Grid columns="auto 1fr" width="100%" height="100%"> <Grid columns={{ xs: '1fr', lg: 'auto 1fr' }} width="100%" height="100%">
<Column height="100%" border="right" backgroundColor> <Column
display={{ xs: 'none', lg: 'flex' }}
width="240px"
height="100%"
border="right"
backgroundColor
marginRight="2"
>
<SideMenu <SideMenu
items={items} items={items}
title={formatMessage(labels.settings)} title={formatMessage(labels.settings)}

10
src/app/api/reports/[reportId]/route.ts
View file

@ -1,8 +1,8 @@
import { parseRequest } from '@/lib/request'; import { parseRequest } from '@/lib/request';
import { deleteReport, getReport, updateReport } from '@/queries/prisma'; import { json, notFound, ok, unauthorized } from '@/lib/response';
import { canDeleteReport, canUpdateReport, canViewReport } from '@/permissions';
import { unauthorized, json, notFound, ok } from '@/lib/response';
import { reportSchema } from '@/lib/schema'; import { reportSchema } from '@/lib/schema';
import { canDeleteWebsite, canUpdateWebsite, canViewReport } from '@/permissions';
import { deleteReport, getReport, updateReport } from '@/queries/prisma';
export async function GET(request: Request, { params }: { params: Promise<{ reportId: string }> }) { export async function GET(request: Request, { params }: { params: Promise<{ reportId: string }> }) {
const { auth, error } = await parseRequest(request); const { auth, error } = await parseRequest(request);
@ -41,7 +41,7 @@ export async function POST(
return notFound(); return notFound();
} }
if (!(await canUpdateReport(auth, report))) { if (!(await canUpdateWebsite(auth, websiteId))) {
return unauthorized(); return unauthorized();
} }
@ -70,7 +70,7 @@ export async function DELETE(
const { reportId } = await params; const { reportId } = await params;
const report = await getReport(reportId); const report = await getReport(reportId);
if (!(await canDeleteReport(auth, report))) { if (!(await canDeleteWebsite(auth, report.websiteId))) {
return unauthorized(); return unauthorized();
} }

2
src/components/hooks/useLocale.ts
View file

@ -26,7 +26,7 @@ export function useLocale() {
} }
async function saveLocale(value: string) { async function saveLocale(value: string) {
if (!messages[value]) { if (!messages[value] && !process.env.cloudMode) {
await loadMessages(value); await loadMessages(value);
} }

2
src/components/input/NavButton.tsx
View file

@ -69,7 +69,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {
shadow="1" shadow="1"
maxHeight="40px" maxHeight="40px"
role="button" role="button"
style={{ cursor: 'pointer', textWrap: 'nowrap', outline: 'none' }} style={{ cursor: 'pointer', textWrap: 'nowrap', overflow: 'hidden', outline: 'none' }}
> >
<Row alignItems="center" position="relative" gap maxHeight="40px"> <Row alignItems="center" position="relative" gap maxHeight="40px">
<Icon>{teamId ? <Users /> : <User />}</Icon> <Icon>{teamId ? <Users /> : <User />}</Icon>