Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Pixel/links development. New validations folder. More refactoring.
Mike Cao247e14646b84
diff --git a/src/app/(main)/admin/teams/AdminTeamsTable.tsx b/src/app/(main)/admin/teams/AdminTeamsTable.tsxindex bacb7de87..d7c99a267 100644--- a/src/app/(main)/admin/teams/AdminTeamsTable.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsTable.tsx@@ -20,23 +20,25 @@ export function AdminTeamsTable({return (<><DataTable data={data}>- <DataColumn id="name" label={formatMessage(labels.name)} width="2fr">+ <DataColumn id="name" label={formatMessage(labels.name)} width="1fr">{(row: any) => <Link href={`/admin/teams/${row.id}`}>{row.name}</Link>}</DataColumn>- <DataColumn id="websites" label={formatMessage(labels.members)}>- {(row: any) => row?._count?.teamUser}+ <DataColumn id="websites" label={formatMessage(labels.members)} width="140px">+ {(row: any) => row?._count?.members}</DataColumn>- <DataColumn id="members" label={formatMessage(labels.websites)}>- {(row: any) => row?._count?.website}+ <DataColumn id="members" label={formatMessage(labels.websites)} width="140px">+ {(row: any) => row?._count?.websites}</DataColumn>- <DataColumn id="owner" label={formatMessage(labels.owner)} width="200px">- {(row: any) => (- <Text title={row?.teamUser?.[0]?.user?.username} truncate>- <Link href={`/admin/users/${row?.teamUser?.[0]?.user?.id}`}>- {row?.teamUser?.[0]?.user?.username}- </Link>- </Text>- )}+ <DataColumn id="owner" label={formatMessage(labels.owner)}>+ {(row: any) => {+ const name = row?.members?.[0]?.user?.username;++ return (+ <Text title={name} truncate>+ <Link href={`/admin/users/${row?.members?.[0]?.user?.id}`}>{name}</Link>+ </Text>+ );+ }}</DataColumn><DataColumn id="created" label={formatMessage(labels.created)} width="160px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}diff --git a/src/app/(main)/admin/users/UsersTable.tsx b/src/app/(main)/admin/users/UsersTable.tsxindex a78e66f26..6b365691c 100644--- a/src/app/(main)/admin/users/UsersTable.tsx+++ b/src/app/(main)/admin/users/UsersTable.tsx@@ -33,7 +33,7 @@ export function UsersTable({}</DataColumn><DataColumn id="websites" label={formatMessage(labels.websites)}>- {(row: any) => row._count.websiteUser}+ {(row: any) => row._count.websites}</DataColumn><DataColumn id="created" label={formatMessage(labels.created)}>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}diff --git a/src/app/(main)/links/LinkDeleteButton.tsx b/src/app/(main)/links/LinkDeleteButton.tsxindex 015af0014..58d9c1f62 100644--- a/src/app/(main)/links/LinkDeleteButton.tsx+++ b/src/app/(main)/links/LinkDeleteButton.tsx@@ -34,7 +34,7 @@ export function LinkDeleteButton({};return (- <ActionButton tooltip={formatMessage(labels.delete)} icon={<Trash />}>+ <ActionButton title={formatMessage(labels.delete)} icon={<Trash />}><Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>{({ close }) => (<ConfirmationFormdiff --git a/src/app/(main)/links/LinkEditButton.tsx b/src/app/(main)/links/LinkEditButton.tsxindex e7c0bfbe0..e676e6ae1 100644--- a/src/app/(main)/links/LinkEditButton.tsx+++ b/src/app/(main)/links/LinkEditButton.tsx@@ -8,7 +8,7 @@ export function LinkEditButton({ linkId }: { linkId: string }) {const { formatMessage, labels } = useMessages();return (- <ActionButton tooltip={formatMessage(labels.edit)} icon={<Edit />}>+ <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}><Dialog title={formatMessage(labels.link)} style={{ width: 800 }}>{({ close }) => {return <LinkEditForm linkId={linkId} onClose={close} />;diff --git a/src/app/(main)/links/LinksTable.tsx b/src/app/(main)/links/LinksTable.tsxindex e06e25374..0b41342e8 100644--- a/src/app/(main)/links/LinksTable.tsx+++ b/src/app/(main)/links/LinksTable.tsx@@ -1,13 +1,16 @@import { DataTable, DataColumn, Row } from '@umami/react-zen';-import { useMessages, useNavigation } from '@/components/hooks';+import { useConfig, useMessages, useNavigation } from '@/components/hooks';import { Empty } from '@/components/common/Empty';import { DateDistance } from '@/components/common/DateDistance';+import { ExternalLink } from '@/components/common/ExternalLink';import { LinkEditButton } from './LinkEditButton';import { LinkDeleteButton } from './LinkDeleteButton';export function LinksTable({ data = [] }) {const { formatMessage, labels } = useMessages();const { websiteId } = useNavigation();+ const { linksUrl } = useConfig();+ const hostUrl = linksUrl || `${window.location.origin}/x`;if (data.length === 0) {return <Empty />;@@ -16,14 +19,22 @@ export function LinksTable({ data = [] }) {return (<DataTable data={data}><DataColumn id="name" label={formatMessage(labels.name)} />- <DataColumn id="url" label={formatMessage(labels.destinationUrl)} />- <DataColumn id="created" label={formatMessage(labels.created)}>+ <DataColumn id="slug" label={formatMessage(labels.link)}>+ {({ slug }: any) => {+ const url = `${hostUrl}/${slug}`;+ return <ExternalLink href={url}>{url}</ExternalLink>;+ }}+ </DataColumn>+ <DataColumn id="url" label={formatMessage(labels.destinationUrl)}>+ {({ url }: any) => {+ return <ExternalLink href={url}>{url}</ExternalLink>;+ }}+ </DataColumn>+ <DataColumn id="created" label={formatMessage(labels.created)} width="200px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn><DataColumn id="action" align="end" width="100px">- {(row: any) => {- const { id, name } = row;-+ {({ id, name }: any) => {return (<Row><LinkEditButton linkId={id} />diff --git a/src/app/(main)/links/[linkId]/route.ts b/src/app/(main)/links/[linkId]/route.tsnew file mode 100644index 000000000..e69de29bbdiff --git a/src/app/(main)/pixels/PixelAddButton.tsx b/src/app/(main)/pixels/PixelAddButton.tsxindex a74a455ec..0958ff0e6 100644--- a/src/app/(main)/pixels/PixelAddButton.tsx+++ b/src/app/(main)/pixels/PixelAddButton.tsx@@ -1,17 +1,16 @@-import { useMessages, useModified, useNavigation } from '@/components/hooks';+import { useMessages, useModified } from '@/components/hooks';import { Button, Icon, Modal, Dialog, DialogTrigger, Text, useToast } from '@umami/react-zen';import { Plus } from '@/components/icons';-import { PixelAddForm } from './PixelAddForm';+import { PixelEditForm } from './PixelEditForm';-export function PixelAddButton() {+export function PixelAddButton({ teamId }: { teamId?: string }) {const { formatMessage, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();- const { teamId } = useNavigation();const handleSave = async () => {toast(formatMessage(messages.saved));- touch('boards');+ touch('pixels');};return (@@ -23,8 +22,8 @@ export function PixelAddButton() {<Text>{formatMessage(labels.addPixel)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.addPixel)} style={{ width: 400 }}>- {({ close }) => <PixelAddForm teamId={teamId} onSave={handleSave} onClose={close} />}+ <Dialog title={formatMessage(labels.addPixel)} style={{ width: 600 }}>+ {({ close }) => <PixelEditForm teamId={teamId} onSave={handleSave} onClose={close} />}</Dialog></Modal></DialogTrigger>diff --git a/src/app/(main)/pixels/PixelAddForm.tsx b/src/app/(main)/pixels/PixelAddForm.tsxdeleted file mode 100644index 56ce44b1f..000000000--- a/src/app/(main)/pixels/PixelAddForm.tsx+++ /dev/null@@ -1,62 +0,0 @@-import { Form, FormField, FormSubmitButton, Row, TextField, Button } from '@umami/react-zen';-import { useApi } from '@/components/hooks';-import { DOMAIN_REGEX } from '@/lib/constants';-import { useMessages } from '@/components/hooks';--export function PixelAddForm({- teamId,- onSave,- onClose,-}: {- teamId?: string;- onSave?: () => void;- onClose?: () => void;-}) {- const { formatMessage, labels, messages } = useMessages();- const { post, useMutation } = useApi();- const { mutate, error, isPending } = useMutation({- mutationFn: (data: any) => post('/pixels', { ...data, teamId }),- });-- const handleSubmit = async (data: any) => {- mutate(data, {- onSuccess: async () => {- onSave?.();- onClose?.();- },- });- };-- return (- <Form onSubmit={handleSubmit} error={error?.message}>- <FormField- label={formatMessage(labels.name)}- name="name"- rules={{ required: formatMessage(labels.required) }}- >- <TextField autoComplete="off" />- </FormField>-- <FormField- label={formatMessage(labels.domain)}- name="domain"- rules={{- required: formatMessage(labels.required),- pattern: { value: DOMAIN_REGEX, message: formatMessage(messages.invalidDomain) },- }}- >- <TextField autoComplete="off" />- </FormField>- <Row justifyContent="flex-end" paddingTop="3" gap="3">- {onClose && (- <Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}- </Button>- )}- <FormSubmitButton data-test="button-submit" isDisabled={false}>- {formatMessage(labels.save)}- </FormSubmitButton>- </Row>- </Form>- );-}diff --git a/src/app/(main)/pixels/PixelDeleteButton.tsx b/src/app/(main)/pixels/PixelDeleteButton.tsxnew file mode 100644index 000000000..3e5bf7fcf--- /dev/null+++ b/src/app/(main)/pixels/PixelDeleteButton.tsx@@ -0,0 +1,55 @@+import { Dialog } from '@umami/react-zen';+import { ActionButton } from '@/components/input/ActionButton';+import { Trash } from '@/components/icons';+import { ConfirmationForm } from '@/components/common/ConfirmationForm';+import { messages } from '@/components/messages';+import { useApi, useMessages, useModified } from '@/components/hooks';++export function PixelDeleteButton({+ pixelId,+ websiteId,+ name,+ onSave,+}: {+ pixelId: string;+ websiteId: string;+ name: string;+ onSave?: () => void;+}) {+ const { formatMessage, labels } = useMessages();+ const { del, useMutation } = useApi();+ const { mutate, isPending, error } = useMutation({+ mutationFn: () => del(`/websites/${websiteId}/pixels/${pixelId}`),+ });+ const { touch } = useModified();++ const handleConfirm = (close: () => void) => {+ mutate(null, {+ onSuccess: () => {+ touch('pixels');+ onSave?.();+ close();+ },+ });+ };++ return (+ <ActionButton title={formatMessage(labels.delete)} icon={<Trash />}>+ <Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>+ {({ close }) => (+ <ConfirmationForm+ message={formatMessage(messages.confirmRemove, {+ target: name,+ })}+ isLoading={isPending}+ error={error}+ onConfirm={handleConfirm.bind(null, close)}+ onClose={close}+ buttonLabel={formatMessage(labels.delete)}+ buttonVariant="danger"+ />+ )}+ </Dialog>+ </ActionButton>+ );+}diff --git a/src/app/(main)/pixels/PixelEditButton.tsx b/src/app/(main)/pixels/PixelEditButton.tsxnew file mode 100644index 000000000..289e4a908--- /dev/null+++ b/src/app/(main)/pixels/PixelEditButton.tsx@@ -0,0 +1,19 @@+import { ActionButton } from '@/components/input/ActionButton';+import { Edit } from '@/components/icons';+import { Dialog } from '@umami/react-zen';+import { PixelEditForm } from './PixelEditForm';+import { useMessages } from '@/components/hooks';++export function PixelEditButton({ pixelId }: { pixelId: string }) {+ const { formatMessage, labels } = useMessages();++ return (+ <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}>+ <Dialog title={formatMessage(labels.pixel)} style={{ width: 800 }}>+ {({ close }) => {+ return <PixelEditForm pixelId={pixelId} onClose={close} />;+ }}+ </Dialog>+ </ActionButton>+ );+}diff --git a/src/app/(main)/pixels/PixelEditForm.tsx b/src/app/(main)/pixels/PixelEditForm.tsxnew file mode 100644index 000000000..a622d0189--- /dev/null+++ b/src/app/(main)/pixels/PixelEditForm.tsx@@ -0,0 +1,105 @@+import {+ Form,+ FormField,+ FormSubmitButton,+ Row,+ TextField,+ Button,+ Text,+ Label,+ Column,+ Icon,+ Loading,+} from '@umami/react-zen';+import { useConfig, usePixelQuery } from '@/components/hooks';+import { useMessages } from '@/components/hooks';+import { Refresh } from '@/components/icons';+import { getRandomChars } from '@/lib/crypto';+import { useUpdateQuery } from '@/components/hooks/queries/useUpdateQuery';++const generateId = () => getRandomChars(9);++export function PixelEditForm({+ pixelId,+ teamId,+ onSave,+ onClose,+}: {+ pixelId?: string;+ teamId?: string;+ onSave?: () => void;+ onClose?: () => void;+}) {+ const { formatMessage, labels } = useMessages();+ const { mutate, error, isPending } = useUpdateQuery('/pixels', { id: pixelId, teamId });+ const { pixelDomain } = useConfig();+ const { data, isLoading } = usePixelQuery(pixelId);++ const handleSubmit = async (data: any) => {+ mutate(data, {+ onSuccess: async () => {+ onSave?.();+ onClose?.();+ },+ });+ };++ if (pixelId && !isLoading) {+ return <Loading position="page" />;+ }++ return (+ <Form+ onSubmit={handleSubmit}+ error={error?.message}+ defaultValues={{ slug: generateId(), ...data }}+ >+ {({ setValue }) => {+ return (+ <>+ <FormField+ label={formatMessage(labels.name)}+ name="name"+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField autoComplete="off" />+ </FormField>++ <Column>+ <Label>{formatMessage(labels.pixel)}</Label>+ <Row alignItems="center" gap>+ <Text>{pixelDomain || window.location.origin}/</Text>+ <FormField+ name="slug"+ rules={{+ required: formatMessage(labels.required),+ }}+ style={{ width: '100%' }}+ >+ <TextField autoComplete="off" isReadOnly />+ </FormField>+ <Button+ variant="quiet"+ onPress={() => setValue('slug', generateId(), { shouldDirty: true })}+ >+ <Icon>+ <Refresh />+ </Icon>+ </Button>+ </Row>+ </Column>++ <Row justifyContent="flex-end" paddingTop="3" gap="3">+ {onClose && (+ <Button isDisabled={isPending} onPress={onClose}>+ {formatMessage(labels.cancel)}+ </Button>+ )}+ <FormSubmitButton isDisabled={false}>{formatMessage(labels.save)}</FormSubmitButton>+ </Row>+ </>+ );+ }}+ </Form>+ );+}diff --git a/src/app/(main)/pixels/PixelsDataTable.tsx b/src/app/(main)/pixels/PixelsDataTable.tsxnew file mode 100644index 000000000..6a1eb982b--- /dev/null+++ b/src/app/(main)/pixels/PixelsDataTable.tsx@@ -0,0 +1,14 @@+import { usePixelsQuery, useNavigation } from '@/components/hooks';+import { PixelsTable } from './PixelsTable';+import { DataGrid } from '@/components/common/DataGrid';++export function PixelsDataTable() {+ const { teamId } = useNavigation();+ const query = usePixelsQuery({ teamId });++ return (+ <DataGrid query={query} allowSearch={true} autoFocus={false} allowPaging={true}>+ {({ data }) => <PixelsTable data={data} />}+ </DataGrid>+ );+}diff --git a/src/app/(main)/pixels/PixelsPage.tsx b/src/app/(main)/pixels/PixelsPage.tsxindex a7a9e13a1..58ccb7d1d 100644--- a/src/app/(main)/pixels/PixelsPage.tsx+++ b/src/app/(main)/pixels/PixelsPage.tsx@@ -3,17 +3,23 @@ import { PageBody } from '@/components/common/PageBody';import { Column } from '@umami/react-zen';import { PageHeader } from '@/components/common/PageHeader';import { PixelAddButton } from './PixelAddButton';-import { useMessages } from '@/components/hooks';+import { useMessages, useNavigation } from '@/components/hooks';+import { PixelsDataTable } from './PixelsDataTable';+import { Panel } from '@/components/common/Panel';export function PixelsPage() {const { formatMessage, labels } = useMessages();+ const { teamId } = useNavigation();return (<PageBody>- <Column>+ <Column gap="6"><PageHeader title={formatMessage(labels.pixels)}>- <PixelAddButton />+ <PixelAddButton teamId={teamId} /></PageHeader>+ <Panel>+ <PixelsDataTable />+ </Panel></Column></PageBody>);diff --git a/src/app/(main)/pixels/PixelsTable.tsx b/src/app/(main)/pixels/PixelsTable.tsxnew file mode 100644index 000000000..fff7f2f78--- /dev/null+++ b/src/app/(main)/pixels/PixelsTable.tsx@@ -0,0 +1,45 @@+import { DataTable, DataColumn, Row } from '@umami/react-zen';+import { useConfig, useMessages, useNavigation } from '@/components/hooks';+import { Empty } from '@/components/common/Empty';+import { DateDistance } from '@/components/common/DateDistance';+import { PixelEditButton } from './PixelEditButton';+import { PixelDeleteButton } from './PixelDeleteButton';+import Link from 'next/link';++export function PixelsTable({ data = [] }) {+ const { formatMessage, labels } = useMessages();+ const { websiteId } = useNavigation();+ const { pixelsUrl } = useConfig();+ const defaultUrl = `${window.location.origin}/p`;++ if (data.length === 0) {+ return <Empty />;+ }++ return (+ <DataTable data={data}>+ <DataColumn id="name" label={formatMessage(labels.name)} />+ <DataColumn id="url" label="URL">+ {({ slug }: any) => {+ const url = `${pixelsUrl || defaultUrl}/${slug}`;+ return <Link href={url}>{url}</Link>;+ }}+ </DataColumn>+ <DataColumn id="created" label={formatMessage(labels.created)}>+ {(row: any) => <DateDistance date={new Date(row.createdAt)} />}+ </DataColumn>+ <DataColumn id="action" align="end" width="100px">+ {(row: any) => {+ const { id, name } = row;++ return (+ <Row>+ <PixelEditButton pixelId={id} />+ <PixelDeleteButton pixelId={id} websiteId={websiteId} name={name} />+ </Row>+ );+ }}+ </DataColumn>+ </DataTable>+ );+}diff --git a/src/app/(main)/pixels/[pixelId]/route.ts b/src/app/(main)/pixels/[pixelId]/route.tsnew file mode 100644index 000000000..e69de29bbdiff --git a/src/app/(main)/settings/teams/[teamId]/TeamMemberEditButton.tsx b/src/app/(main)/settings/teams/[teamId]/TeamMemberEditButton.tsxindex a92164395..6db7e1478 100644--- a/src/app/(main)/settings/teams/[teamId]/TeamMemberEditButton.tsx+++ b/src/app/(main)/settings/teams/[teamId]/TeamMemberEditButton.tsx@@ -26,7 +26,7 @@ export function TeamMemberEditButton({};return (- <ActionButton tooltip={formatMessage(labels.edit)} icon={<Edit />}>+ <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}><Dialog title={formatMessage(labels.editMember)} style={{ width: 400 }}>{({ close }) => (<TeamMemberEditFormdiff --git a/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx b/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsxindex 5b1d323f2..db2a1894d 100644--- a/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx+++ b/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx@@ -35,7 +35,7 @@ export function TeamMemberRemoveButton({};return (- <ActionButton tooltip={formatMessage(labels.delete)} icon={<Trash />}>+ <ActionButton title={formatMessage(labels.delete)} icon={<Trash />}><Dialog title={formatMessage(labels.removeMember)} style={{ width: 400 }}>{({ close }) => (<ConfirmationFormdiff --git a/src/app/(main)/settings/websites/Websites.module.css b/src/app/(main)/settings/websites/Websites.module.cssdeleted file mode 100644index 2a7cc6e79..000000000--- a/src/app/(main)/settings/websites/Websites.module.css+++ /dev/null@@ -1,11 +0,0 @@-.website {- padding-bottom: 30px;- border-bottom: 1px solid var(--base300);- margin-bottom: 30px;- align-self: stretch;-}--.website:last-child {- border-bottom: 0;- margin-bottom: 20px;-}diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsxindex 1c1f4a9e5..c9c42558b 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx@@ -23,8 +23,8 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:const canTransferWebsite =((!teamId &&- teams?.data?.filter(({ teamUser }) =>- teamUser.find(+ teams?.data?.filter(({ members }) =>+ members.find(({ role, userId }) =>[ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,),@@ -34,7 +34,7 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:(teamId &&!!teams?.data?.find(({ id }) => id === teamId)- ?.teamUser.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id));+ ?.members.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id));const handleSave = () => {touch('websites');diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsxindex fedcc2459..baf59452d 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx@@ -6,7 +6,6 @@ import { WebsiteShareForm } from './WebsiteShareForm';import { WebsiteTrackingCode } from './WebsiteTrackingCode';import { WebsiteData } from './WebsiteData';import { WebsiteEditForm } from './WebsiteEditForm';-import { SegmentsDataTable } from '@/app/(main)/websites/[websiteId]/segments/SegmentsDataTable';export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal?: boolean }) {const website = useContext(WebsiteContext);@@ -18,7 +17,6 @@ export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal<Tab id="details">{formatMessage(labels.details)}</Tab><Tab id="tracking">{formatMessage(labels.trackingCode)}</Tab><Tab id="share"> {formatMessage(labels.shareUrl)}</Tab>- <Tab id="segments"> {formatMessage(labels.segments)}</Tab><Tab id="manage">{formatMessage(labels.manage)}</Tab></TabList><TabPanel id="details" style={{ width: 500 }}>@@ -30,9 +28,6 @@ export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal<TabPanel id="share" style={{ width: 500 }}><WebsiteShareForm websiteId={websiteId} shareId={website.shareId} /></TabPanel>- <TabPanel id="segments">- <SegmentsDataTable websiteId={websiteId} />- </TabPanel><TabPanel id="manage"><WebsiteData websiteId={websiteId} /></TabPanel>diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/teams/TeamsDataTable.tsxsimilarity index 89%rename from src/app/(main)/settings/teams/TeamsDataTable.tsxrename to src/app/(main)/teams/TeamsDataTable.tsxindex 5c6aa8875..7700627c1 100644--- a/src/app/(main)/settings/teams/TeamsDataTable.tsx+++ b/src/app/(main)/teams/TeamsDataTable.tsx@@ -1,5 +1,5 @@import { DataGrid } from '@/components/common/DataGrid';-import { TeamsTable } from '@/app/(main)/settings/teams/TeamsTable';+import { TeamsTable } from './TeamsTable';import { useLoginQuery, useUserTeamsQuery } from '@/components/hooks';import { ReactNode } from 'react';diff --git a/src/app/(main)/settings/teams/TeamsTable.tsx b/src/app/(main)/teams/TeamsTable.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/TeamsTable.tsxrename to src/app/(main)/teams/TeamsTable.tsxdiff --git a/src/app/(main)/settings/websites/WebsiteAddButton.tsx b/src/app/(main)/websites/WebsiteAddButton.tsxsimilarity index 100%rename from src/app/(main)/settings/websites/WebsiteAddButton.tsxrename to src/app/(main)/websites/WebsiteAddButton.tsxdiff --git a/src/app/(main)/settings/websites/WebsiteAddForm.tsx b/src/app/(main)/websites/WebsiteAddForm.tsxsimilarity index 100%rename from src/app/(main)/settings/websites/WebsiteAddForm.tsxrename to src/app/(main)/websites/WebsiteAddForm.tsxdiff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/websites/WebsitesDataTable.tsxsimilarity index 100%rename from src/app/(main)/settings/websites/WebsitesDataTable.tsxrename to src/app/(main)/websites/WebsitesDataTable.tsxdiff --git a/src/app/(main)/settings/websites/WebsitesHeader.tsx b/src/app/(main)/websites/WebsitesHeader.tsxsimilarity index 100%rename from src/app/(main)/settings/websites/WebsitesHeader.tsxrename to src/app/(main)/websites/WebsitesHeader.tsxdiff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsxindex d07192dcc..db563147f 100644--- a/src/app/(main)/websites/WebsitesPage.tsx+++ b/src/app/(main)/websites/WebsitesPage.tsx@@ -1,9 +1,9 @@'use client';-import { WebsitesDataTable } from '@/app/(main)/settings/websites/WebsitesDataTable';+import { WebsitesDataTable } from './WebsitesDataTable';+import { WebsiteAddButton } from './WebsiteAddButton';import { useMessages, useNavigation } from '@/components/hooks';import { Column } from '@umami/react-zen';import { PageHeader } from '@/components/common/PageHeader';-import { WebsiteAddButton } from '@/app/(main)/settings/websites/WebsiteAddButton';import { Panel } from '@/components/common/Panel';import { PageBody } from '@/components/common/PageBody';diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/websites/WebsitesTable.tsxsimilarity index 100%rename from src/app/(main)/settings/websites/WebsitesTable.tsxrename to src/app/(main)/websites/WebsitesTable.tsxdiff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex 799ba76c8..74a9479bb 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@ -11,6 +11,8 @@ import {Tag,Money,Network,+ ChartPie,+ UserPlus,} from '@/components/icons';import { useMessages, useNavigation } from '@/components/hooks';import { SideMenu } from '@/components/common/SideMenu';@@ -87,6 +89,23 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {},],},+ {+ label: formatMessage(labels.audience),+ items: [+ {+ id: 'segments',+ label: formatMessage(labels.segments),+ icon: <ChartPie />,+ path: renderPath('/segments'),+ },+ {+ id: 'cohorts',+ label: formatMessage(labels.cohorts),+ icon: <UserPlus />,+ path: renderPath('/cohorts'),+ },+ ],+ },{label: formatMessage(labels.growth),items: [diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsxnew file mode 100644index 000000000..4ddc3c558--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx@@ -0,0 +1,26 @@+import { Button, DialogTrigger, Modal, Text, Icon, Dialog } from '@umami/react-zen';+import { useMessages } from '@/components/hooks';+import { Plus } from '@/components/icons';+import { CohortEditForm } from './CohortEditForm';++export function CohortAddButton({ websiteId }: { websiteId: string }) {+ const { formatMessage, labels } = useMessages();++ return (+ <DialogTrigger>+ <Button variant="primary">+ <Icon>+ <Plus />+ </Icon>+ <Text>{formatMessage(labels.cohort)}</Text>+ </Button>+ <Modal>+ <Dialog title={formatMessage(labels.cohort)} style={{ width: 800 }}>+ {({ close }) => {+ return <CohortEditForm websiteId={websiteId} onClose={close} />;+ }}+ </Dialog>+ </Modal>+ </DialogTrigger>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsxnew file mode 100644index 000000000..c7e6d679e--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx@@ -0,0 +1,55 @@+import { Dialog } from '@umami/react-zen';+import { ActionButton } from '@/components/input/ActionButton';+import { Trash } from '@/components/icons';+import { ConfirmationForm } from '@/components/common/ConfirmationForm';+import { messages } from '@/components/messages';+import { useApi, useMessages, useModified } from '@/components/hooks';++export function CohortDeleteButton({+ cohortId,+ websiteId,+ name,+ onSave,+}: {+ cohortId: string;+ websiteId: string;+ name: string;+ onSave?: () => void;+}) {+ const { formatMessage, labels } = useMessages();+ const { del, useMutation } = useApi();+ const { mutate, isPending, error } = useMutation({+ mutationFn: () => del(`/websites/${websiteId}/cohorts/${cohortId}`),+ });+ const { touch } = useModified();++ const handleConfirm = (close: () => void) => {+ mutate(null, {+ onSuccess: () => {+ touch('cohorts');+ onSave?.();+ close();+ },+ });+ };++ return (+ <ActionButton title={formatMessage(labels.delete)} icon={<Trash />}>+ <Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>+ {({ close }) => (+ <ConfirmationForm+ message={formatMessage(messages.confirmRemove, {+ target: name,+ })}+ isLoading={isPending}+ error={error}+ onConfirm={handleConfirm.bind(null, close)}+ onClose={close}+ buttonLabel={formatMessage(labels.delete)}+ buttonVariant="danger"+ />+ )}+ </Dialog>+ </ActionButton>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsxnew file mode 100644index 000000000..51ac8505d--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx@@ -0,0 +1,34 @@+import { ActionButton } from '@/components/input/ActionButton';+import { Edit } from '@/components/icons';+import { Dialog } from '@umami/react-zen';+import { CohortEditForm } from '@/app/(main)/websites/[websiteId]/cohorts/CohortEditForm';+import { useMessages } from '@/components/hooks';++export function CohortEditButton({+ cohortId,+ websiteId,+ filters,+}: {+ cohortId: string;+ websiteId: string;+ filters: any[];+}) {+ const { formatMessage, labels } = useMessages();++ return (+ <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}>+ <Dialog title={formatMessage(labels.cohort)} style={{ width: 800 }}>+ {({ close }) => {+ return (+ <CohortEditForm+ cohortId={cohortId}+ websiteId={websiteId}+ filters={filters}+ onClose={close}+ />+ );+ }}+ </Dialog>+ </ActionButton>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsxnew file mode 100644index 000000000..6b16a4708--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx@@ -0,0 +1,100 @@+import {+ Button,+ Form,+ FormButtons,+ FormField,+ FormSubmitButton,+ TextField,+ Label,+ Loading,+} from '@umami/react-zen';+import { subMonths, endOfDay } from 'date-fns';+import { FieldFilters } from '@/components/input/FieldFilters';+import { useState } from 'react';+import { useApi, useMessages, useModified, useWebsiteCohortQuery } from '@/components/hooks';+import { filtersArrayToObject } from '@/lib/params';++export function CohortEditForm({+ cohortId,+ websiteId,+ filters = [],+ showFilters = true,+ onSave,+ onClose,+}: {+ cohortId?: string;+ websiteId: string;+ filters?: any[];+ showFilters?: boolean;+ onSave?: () => void;+ onClose?: () => void;+}) {+ const { data } = useWebsiteCohortQuery(websiteId, cohortId);+ const { formatMessage, labels } = useMessages();+ const [currentFilters, setCurrentFilters] = useState(filters);+ const { touch } = useModified();+ const startDate = subMonths(endOfDay(new Date()), 6);+ const endDate = endOfDay(new Date());++ const { post, useMutation } = useApi();+ const { mutate, error, isPending } = useMutation({+ mutationFn: (data: any) =>+ post(`/websites/${websiteId}/cohorts${cohortId ? `/${cohortId}` : ''}`, {+ ...data,+ type: 'cohort',+ }),+ });++ const handleSubmit = async (data: any) => {+ mutate(+ { ...data, parameters: filtersArrayToObject(currentFilters) },+ {+ onSuccess: async () => {+ touch('cohorts');+ onSave?.();+ onClose?.();+ },+ },+ );+ };++ if (cohortId && !data) {+ return <Loading position="page" />;+ }++ return (+ <Form error={error} onSubmit={handleSubmit} defaultValues={data}>+ <FormField+ name="name"+ label={formatMessage(labels.name)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField autoFocus />+ </FormField>+ {showFilters && (+ <>+ <Label>{formatMessage(labels.filters)}</Label>+ <FieldFilters+ websiteId={websiteId}+ filters={currentFilters}+ startDate={startDate}+ endDate={endDate}+ onSave={setCurrentFilters}+ />+ </>+ )}+ <FormButtons>+ <Button isDisabled={isPending} onPress={onClose}>+ {formatMessage(labels.cancel)}+ </Button>+ <FormSubmitButton+ variant="primary"+ data-test="button-submit"+ isDisabled={isPending || currentFilters.length === 0}+ >+ {formatMessage(labels.save)}+ </FormSubmitButton>+ </FormButtons>+ </Form>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsDataTable.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsDataTable.tsxnew file mode 100644index 000000000..5944d4152--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsDataTable.tsx@@ -0,0 +1,24 @@+import { CohortAddButton } from './CohortAddButton';+import { useWebsiteCohortsQuery } from '@/components/hooks';+import { CohortsTable } from './CohortsTable';+import { DataGrid } from '@/components/common/DataGrid';++export function CohortsDataTable({ websiteId }: { websiteId?: string }) {+ const query = useWebsiteCohortsQuery(websiteId, { type: 'cohort' });++ const renderActions = () => {+ return <CohortAddButton websiteId={websiteId} />;+ };++ return (+ <DataGrid+ query={query}+ allowSearch={true}+ autoFocus={false}+ allowPaging={true}+ renderActions={renderActions}+ >+ {({ data }) => <CohortsTable data={data} />}+ </DataGrid>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsPage.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsPage.tsxnew file mode 100644index 000000000..211e25263--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsPage.tsx@@ -0,0 +1,16 @@+'use client';+import { Column } from '@umami/react-zen';+import { CohortsDataTable } from './CohortsDataTable';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';+import { Panel } from '@/components/common/Panel';++export function CohortsPage({ websiteId }) {+ return (+ <Column gap="3">+ <WebsiteControls websiteId={websiteId} allowFilter={false} allowDateFilter={false} />+ <Panel>+ <CohortsDataTable websiteId={websiteId} />+ </Panel>+ </Column>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsxnew file mode 100644index 000000000..578c4fc63--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx@@ -0,0 +1,41 @@+import { DataTable, DataColumn, Row } from '@umami/react-zen';+import { useMessages, useNavigation } from '@/components/hooks';+import { Empty } from '@/components/common/Empty';+import { DateDistance } from '@/components/common/DateDistance';+import { filtersObjectToArray } from '@/lib/params';+import { CohortEditButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortEditButton';+import { CohortDeleteButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton';++export function CohortsTable({ data = [] }) {+ const { formatMessage, labels } = useMessages();+ const { websiteId } = useNavigation();++ if (data.length === 0) {+ return <Empty />;+ }++ return (+ <DataTable data={data}>+ <DataColumn id="name" label={formatMessage(labels.name)} />+ <DataColumn id="created" label={formatMessage(labels.created)}>+ {(row: any) => <DateDistance date={new Date(row.createdAt)} />}+ </DataColumn>+ <DataColumn id="action" align="end" width="100px">+ {(row: any) => {+ const { id, name, parameters } = row;++ return (+ <Row>+ <CohortEditButton+ cohortId={id}+ websiteId={websiteId}+ filters={filtersObjectToArray(parameters)}+ />+ <CohortDeleteButton cohortId={id} websiteId={websiteId} name={name} />+ </Row>+ );+ }}+ </DataColumn>+ </DataTable>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/page.tsx b/src/app/(main)/websites/[websiteId]/cohorts/page.tsxnew file mode 100644index 000000000..a9519c2cd--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/cohorts/page.tsx@@ -0,0 +1,12 @@+import { Metadata } from 'next';+import { CohortsPage } from './CohortsPage';++export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {+ const { websiteId } = await params;++ return <CohortsPage websiteId={websiteId} />;+}++export const metadata: Metadata = {+ title: 'Cohorts',+};diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsxindex fc86e78f0..3561af850 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx@@ -34,7 +34,7 @@ export function SegmentDeleteButton({};return (- <ActionButton tooltip={formatMessage(labels.delete)} icon={<Trash />}>+ <ActionButton title={formatMessage(labels.delete)} icon={<Trash />}><Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>{({ close }) => (<ConfirmationFormdiff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsxindex c7041f7aa..817477e3b 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx@@ -16,7 +16,7 @@ export function SegmentEditButton({const { formatMessage, labels } = useMessages();return (- <ActionButton tooltip={formatMessage(labels.edit)} icon={<Edit />}>+ <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}><Dialog title={formatMessage(labels.segment)} style={{ width: 800 }}>{({ close }) => {return (diff --git a/src/app/actions/getConfig.ts b/src/app/actions/getConfig.tsindex 44823379d..9c26354ab 100644--- a/src/app/actions/getConfig.ts+++ b/src/app/actions/getConfig.ts@@ -6,8 +6,8 @@ export type Config = {telemetryDisabled: boolean;trackerScriptName?: string;updatesDisabled: boolean;- linkDomain?: string;- pixelDomain?: string;+ linksUrl?: string;+ pixelsUrl?: string;};export async function getConfig(): Promise<Config> {@@ -17,7 +17,7 @@ export async function getConfig(): Promise<Config> {telemetryDisabled: !!process.env.DISABLE_TELEMETRY,trackerScriptName: process.env.TRACKER_SCRIPT_NAME,updatesDisabled: !!process.env.DISABLE_UPDATES,- linkDomain: process.env.LINK_DOMAIN,- pixelDomain: process.env.PIXEL_DOMAIN,+ linksUrl: process.env.LINKS_URL,+ pixelsUrl: process.env.PIXELS_URL,};}diff --git a/src/app/api/admin/teams/route.ts b/src/app/api/admin/teams/route.tsindex 6b162050b..a47930b85 100644--- a/src/app/api/admin/teams/route.ts+++ b/src/app/api/admin/teams/route.ts@@ -2,7 +2,7 @@ import { z } from 'zod';import { parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';-import { canViewAllTeams } from '@/lib/auth';+import { canViewAllTeams } from '@/validations';import { getTeams } from '@/queries/prisma/team';export async function GET(request: Request) {@@ -26,11 +26,11 @@ export async function GET(request: Request) {include: {_count: {select: {- teamUser: true,- website: true,+ members: true,+ websites: true,},},- teamUser: {+ members: {select: {user: {omit: {diff --git a/src/app/api/admin/users/route.ts b/src/app/api/admin/users/route.tsindex d0d3fcbd7..ec074e019 100644--- a/src/app/api/admin/users/route.ts+++ b/src/app/api/admin/users/route.ts@@ -2,7 +2,7 @@ import { z } from 'zod';import { parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';-import { canViewUsers } from '@/lib/auth';+import { canViewUsers } from '@/validations';import { getUsers } from '@/queries/prisma/user';export async function GET(request: Request) {@@ -26,7 +26,7 @@ export async function GET(request: Request) {include: {_count: {select: {- websiteUser: {+ websites: {where: { deletedAt: null },},},diff --git a/src/app/api/admin/websites/route.ts b/src/app/api/admin/websites/route.tsindex 2b82fbe86..fda98a47a 100644--- a/src/app/api/admin/websites/route.ts+++ b/src/app/api/admin/websites/route.ts@@ -2,7 +2,7 @@ import { z } from 'zod';import { parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';-import { canViewAllWebsites } from '@/lib/auth';+import { canViewAllWebsites } from '@/validations';import { getWebsites } from '@/queries/prisma/website';import { ROLES } from '@/lib/constants';@@ -39,7 +39,7 @@ export async function GET(request: Request) {deletedAt: null,},include: {- teamUser: {+ members: {where: {role: ROLES.teamOwner,},diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.tsindex 042f21435..f70cfc8ea 100644--- a/src/app/api/auth/login/route.ts+++ b/src/app/api/auth/login/route.ts@@ -1,11 +1,10 @@import { z } from 'zod';-import { checkPassword } from '@/lib/auth';import { createSecureToken } from '@/lib/jwt';import redis from '@/lib/redis';import { getUserByUsername } from '@/queries';import { json, unauthorized } from '@/lib/response';import { parseRequest } from '@/lib/request';-import { saveAuth } from '@/lib/auth';+import { saveAuth, checkPassword } from '@/lib/auth';import { secret } from '@/lib/crypto';import { ROLES } from '@/lib/constants';diff --git a/src/app/api/links/[linkId]/route.ts b/src/app/api/links/[linkId]/route.tsindex 4f8763b56..daeaff9bd 100644--- a/src/app/api/links/[linkId]/route.ts+++ b/src/app/api/links/[linkId]/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';-import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/lib/auth';+import { canUpdateLink, canDeleteLink, canViewLink } from '@/validations';import { SHARE_ID_REGEX } from '@/lib/constants';import { parseRequest } from '@/lib/request';import { ok, json, unauthorized, serverError } from '@/lib/response';-import { deleteWebsite, getWebsite, updateWebsite } from '@/queries';+import { deleteLink, getLink, updateLink } from '@/queries';export async function GET(request: Request,@@ -17,11 +17,11 @@ export async function GET(const { websiteId } = await params;- if (!(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewLink(auth, websiteId))) {return unauthorized();}- const website = await getWebsite(websiteId);+ const website = await getLink(websiteId);return json(website);}@@ -45,12 +45,12 @@ export async function POST(const { websiteId } = await params;const { name, domain, shareId } = body;- if (!(await canUpdateWebsite(auth, websiteId))) {+ if (!(await canUpdateLink(auth, websiteId))) {return unauthorized();}try {- const website = await updateWebsite(websiteId, { name, domain, shareId });+ const website = await updateLink(websiteId, { name, domain, shareId });return Response.json(website);} catch (e: any) {@@ -74,11 +74,11 @@ export async function DELETE(const { websiteId } = await params;- if (!(await canDeleteWebsite(auth, websiteId))) {+ if (!(await canDeleteLink(auth, websiteId))) {return unauthorized();}- await deleteWebsite(websiteId);+ await deleteLink(websiteId);return ok();}diff --git a/src/app/api/links/route.ts b/src/app/api/links/route.tsindex 8dfd76552..2ab561b6f 100644--- a/src/app/api/links/route.ts+++ b/src/app/api/links/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { canCreateTeamWebsite, canCreateWebsite } from '@/lib/auth';+import { canCreateTeamWebsite, canCreateWebsite } from '@/validations';import { json, unauthorized } from '@/lib/response';import { uuid } from '@/lib/crypto';import { getQueryFilters, parseRequest } from '@/lib/request';@@ -20,9 +20,9 @@ export async function GET(request: Request) {const filters = await getQueryFilters(query);- const result = await getUserLinks(auth.user.id, filters);+ const links = await getUserLinks(auth.user.id, filters);- return json(result);+ return json(links);}export async function POST(request: Request) {diff --git a/src/app/api/pixels/[pixelId]/route.ts b/src/app/api/pixels/[pixelId]/route.tsindex e69de29bb..e57a90b0e 100644--- a/src/app/api/pixels/[pixelId]/route.ts+++ b/src/app/api/pixels/[pixelId]/route.ts@@ -0,0 +1,84 @@+import { z } from 'zod';+import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/validations';+import { SHARE_ID_REGEX } from '@/lib/constants';+import { parseRequest } from '@/lib/request';+import { ok, json, unauthorized, serverError } from '@/lib/response';+import { deleteWebsite, getWebsite, updateWebsite } from '@/queries';++export async function GET(+ request: Request,+ { params }: { params: Promise<{ websiteId: string }> },+) {+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }++ const { websiteId } = await params;++ if (!(await canViewWebsite(auth, websiteId))) {+ return unauthorized();+ }++ const website = await getWebsite(websiteId);++ return json(website);+}++export async function POST(+ request: Request,+ { params }: { params: Promise<{ websiteId: string }> },+) {+ const schema = z.object({+ name: z.string().optional(),+ domain: z.string().optional(),+ shareId: z.string().regex(SHARE_ID_REGEX).nullable().optional(),+ });++ const { auth, body, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const { websiteId } = await params;+ const { name, domain, shareId } = body;++ if (!(await canUpdateWebsite(auth, websiteId))) {+ return unauthorized();+ }++ try {+ const website = await updateWebsite(websiteId, { name, domain, shareId });++ return Response.json(website);+ } catch (e: any) {+ if (e.message.includes('Unique constraint') && e.message.includes('share_id')) {+ return serverError(new Error('That share ID is already taken.'));+ }++ return serverError(e);+ }+}++export async function DELETE(+ request: Request,+ { params }: { params: Promise<{ websiteId: string }> },+) {+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }++ const { websiteId } = await params;++ if (!(await canDeleteWebsite(auth, websiteId))) {+ return unauthorized();+ }++ await deleteWebsite(websiteId);++ return ok();+}diff --git a/src/app/api/pixels/route.ts b/src/app/api/pixels/route.tsindex e69de29bb..f2730196f 100644--- a/src/app/api/pixels/route.ts+++ b/src/app/api/pixels/route.ts@@ -0,0 +1,62 @@+import { z } from 'zod';+import { canCreateTeamWebsite, canCreateWebsite } from '@/validations';+import { json, unauthorized } from '@/lib/response';+import { uuid } from '@/lib/crypto';+import { getQueryFilters, parseRequest } from '@/lib/request';+import { pagingParams, searchParams } from '@/lib/schema';+import { createPixel, getUserLinks } from '@/queries';++export async function GET(request: Request) {+ const schema = z.object({+ ...pagingParams,+ ...searchParams,+ });++ const { auth, query, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const filters = await getQueryFilters(query);++ const inks = await getUserLinks(auth.user.id, filters);++ return json(inks);+}++export async function POST(request: Request) {+ const schema = z.object({+ name: z.string().max(100),+ slug: z.string().max(100),+ teamId: z.string().nullable().optional(),+ id: z.string().uuid().nullable().optional(),+ });++ const { auth, body, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const { id, name, slug, teamId } = body;++ if ((teamId && !(await canCreateTeamWebsite(auth, teamId))) || !(await canCreateWebsite(auth))) {+ return unauthorized();+ }++ const data: any = {+ id: id ?? uuid(),+ name,+ slug,+ teamId,+ };++ if (!teamId) {+ data.userId = auth.user.id;+ }++ const result = await createPixel(data);++ return json(result);+}diff --git a/src/app/api/realtime/[websiteId]/route.ts b/src/app/api/realtime/[websiteId]/route.tsindex d06d460a8..baca763dc 100644--- a/src/app/api/realtime/[websiteId]/route.ts+++ b/src/app/api/realtime/[websiteId]/route.ts@@ -1,6 +1,6 @@import { json, unauthorized } from '@/lib/response';import { getRealtimeData } from '@/queries';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { startOfMinute, subMinutes } from 'date-fns';import { REALTIME_RANGE } from '@/lib/constants';import { parseRequest, getQueryFilters } from '@/lib/request';diff --git a/src/app/api/reports/[reportId]/route.ts b/src/app/api/reports/[reportId]/route.tsindex c35c1eb06..5cb7074b1 100644--- a/src/app/api/reports/[reportId]/route.ts+++ b/src/app/api/reports/[reportId]/route.ts@@ -1,6 +1,6 @@import { parseRequest } from '@/lib/request';import { deleteReport, getReport, updateReport } from '@/queries';-import { canDeleteReport, canUpdateReport, canViewReport } from '@/lib/auth';+import { canDeleteReport, canUpdateReport, canViewReport } from '@/validations';import { unauthorized, json, notFound, ok } from '@/lib/response';import { reportSchema } from '@/lib/schema';diff --git a/src/app/api/reports/attribution/route.ts b/src/app/api/reports/attribution/route.tsindex 689c64008..d80322458 100644--- a/src/app/api/reports/attribution/route.ts+++ b/src/app/api/reports/attribution/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';diff --git a/src/app/api/reports/breakdown/route.ts b/src/app/api/reports/breakdown/route.tsindex f948051d7..7db9f9234 100644--- a/src/app/api/reports/breakdown/route.ts+++ b/src/app/api/reports/breakdown/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';import { BreakdownParameters, getBreakdown } from '@/queries';diff --git a/src/app/api/reports/funnel/route.ts b/src/app/api/reports/funnel/route.tsindex 0acab5c90..d3e386ccb 100644--- a/src/app/api/reports/funnel/route.ts+++ b/src/app/api/reports/funnel/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';import { FunnelParameters, getFunnel } from '@/queries';diff --git a/src/app/api/reports/goal/route.ts b/src/app/api/reports/goal/route.tsindex 86c80a0e8..47e5ba918 100644--- a/src/app/api/reports/goal/route.ts+++ b/src/app/api/reports/goal/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';import { getGoal, GoalParameters } from '@/queries/sql/reports/getGoal';diff --git a/src/app/api/reports/journey/route.ts b/src/app/api/reports/journey/route.tsindex 4b31216e8..37a470f4e 100644--- a/src/app/api/reports/journey/route.ts+++ b/src/app/api/reports/journey/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { getQueryFilters, parseRequest } from '@/lib/request';import { getJourney } from '@/queries';diff --git a/src/app/api/reports/retention/route.ts b/src/app/api/reports/retention/route.tsindex 9367ab70f..7297d7441 100644--- a/src/app/api/reports/retention/route.ts+++ b/src/app/api/reports/retention/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';import { getRetention, RetentionParameters } from '@/queries';diff --git a/src/app/api/reports/revenue/route.ts b/src/app/api/reports/revenue/route.tsindex b8a6ae4cd..7e1137bc6 100644--- a/src/app/api/reports/revenue/route.ts+++ b/src/app/api/reports/revenue/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';import { reportResultSchema } from '@/lib/schema';diff --git a/src/app/api/reports/route.ts b/src/app/api/reports/route.tsindex c68c083ee..ce7ba50c0 100644--- a/src/app/api/reports/route.ts+++ b/src/app/api/reports/route.ts@@ -2,7 +2,7 @@ import { z } from 'zod';import { uuid } from '@/lib/crypto';import { pagingParams, reportSchema } from '@/lib/schema';import { parseRequest } from '@/lib/request';-import { canViewWebsite, canUpdateWebsite } from '@/lib/auth';+import { canViewWebsite, canUpdateWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { getReports, createReport } from '@/queries';diff --git a/src/app/api/reports/utm/route.ts b/src/app/api/reports/utm/route.tsindex 150773f79..8a4a17479 100644--- a/src/app/api/reports/utm/route.ts+++ b/src/app/api/reports/utm/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { unauthorized, json } from '@/lib/response';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';import { getUTM, UTMParameters } from '@/queries';diff --git a/src/app/api/teams/[teamId]/links/route.ts b/src/app/api/teams/[teamId]/links/route.tsindex a0b0dd2c5..b3be8a5cc 100644--- a/src/app/api/teams/[teamId]/links/route.ts+++ b/src/app/api/teams/[teamId]/links/route.ts@@ -1,6 +1,6 @@import { z } from 'zod';import { unauthorized, json } from '@/lib/response';-import { canViewTeam } from '@/lib/auth';+import { canViewTeam } from '@/validations';import { getQueryFilters, parseRequest } from '@/lib/request';import { pagingParams, searchParams } from '@/lib/schema';import { getTeamLinks } from '@/queries';@@ -23,7 +23,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ teamconst filters = await getQueryFilters(query);- const websites = await getTeamLinks(teamId, filters);+ const links = await getTeamLinks(teamId, filters);- return json(websites);+ return json(links);}diff --git a/src/app/api/teams/[teamId]/pixels/pixels.ts b/src/app/api/teams/[teamId]/pixels/route.tssimilarity index 94%rename from src/app/api/teams/[teamId]/pixels/pixels.tsrename to src/app/api/teams/[teamId]/pixels/route.tsindex 872b4a791..41d9ce0fd 100644--- a/src/app/api/teams/[teamId]/pixels/pixels.ts+++ b/src/app/api/teams/[teamId]/pixels/route.ts@@ -1,6 +1,6 @@import { z } from 'zod';import { unauthorized, json } from '@/lib/response';-import { canViewTeam } from '@/lib/auth';+import { canViewTeam } from '@/validations';import { getQueryFilters, parseRequest } from '@/lib/request';import { pagingParams, searchParams } from '@/lib/schema';import { getTeamPixels } from '@/queries';diff --git a/src/app/api/teams/[teamId]/route.ts b/src/app/api/teams/[teamId]/route.tsindex 194e7bbb1..caa167e31 100644--- a/src/app/api/teams/[teamId]/route.ts+++ b/src/app/api/teams/[teamId]/route.ts@@ -1,6 +1,6 @@import { z } from 'zod';import { unauthorized, json, notFound, ok } from '@/lib/response';-import { canDeleteTeam, canUpdateTeam, canViewTeam } from '@/lib/auth';+import { canDeleteTeam, canUpdateTeam, canViewTeam } from '@/validations';import { parseRequest } from '@/lib/request';import { deleteTeam, getTeam, updateTeam } from '@/queries';diff --git a/src/app/api/teams/[teamId]/users/[userId]/route.ts b/src/app/api/teams/[teamId]/users/[userId]/route.tsindex bf5f4d364..62e0a32c7 100644--- a/src/app/api/teams/[teamId]/users/[userId]/route.ts+++ b/src/app/api/teams/[teamId]/users/[userId]/route.ts@@ -1,4 +1,4 @@-import { canDeleteTeamUser, canUpdateTeam } from '@/lib/auth';+import { canDeleteTeamUser, canUpdateTeam } from '@/validations';import { parseRequest } from '@/lib/request';import { badRequest, json, ok, unauthorized } from '@/lib/response';import { deleteTeamUser, getTeamUser, updateTeamUser } from '@/queries';diff --git a/src/app/api/teams/[teamId]/users/route.ts b/src/app/api/teams/[teamId]/users/route.tsindex 6fde0c66f..93e41f603 100644--- a/src/app/api/teams/[teamId]/users/route.ts+++ b/src/app/api/teams/[teamId]/users/route.ts@@ -1,6 +1,6 @@import { z } from 'zod';import { unauthorized, json, badRequest } from '@/lib/response';-import { canAddUserToTeam, canViewTeam } from '@/lib/auth';+import { canAddUserToTeam, canViewTeam } from '@/validations';import { getQueryFilters, parseRequest } from '@/lib/request';import { pagingParams, teamRoleParam, searchParams } from '@/lib/schema';import { createTeamUser, getTeamUser, getTeamUsers } from '@/queries';diff --git a/src/app/api/teams/[teamId]/websites/route.ts b/src/app/api/teams/[teamId]/websites/route.tsindex f3acde380..594416fa5 100644--- a/src/app/api/teams/[teamId]/websites/route.ts+++ b/src/app/api/teams/[teamId]/websites/route.ts@@ -1,6 +1,6 @@import { z } from 'zod';import { unauthorized, json } from '@/lib/response';-import { canViewTeam } from '@/lib/auth';+import { canViewTeam } from '@/validations';import { getQueryFilters, parseRequest } from '@/lib/request';import { pagingParams, searchParams } from '@/lib/schema';import { getTeamWebsites } from '@/queries';diff --git a/src/app/api/teams/join/route.ts b/src/app/api/teams/join/route.tsindex 3464054cf..b17a2c087 100644--- a/src/app/api/teams/join/route.ts+++ b/src/app/api/teams/join/route.ts@@ -1,6 +1,6 @@import { z } from 'zod';import { unauthorized, json, badRequest, notFound } from '@/lib/response';-import { canCreateTeam } from '@/lib/auth';+import { canCreateTeam } from '@/validations';import { parseRequest } from '@/lib/request';import { ROLES } from '@/lib/constants';import { createTeamUser, findTeam, getTeamUser } from '@/queries';diff --git a/src/app/api/teams/route.ts b/src/app/api/teams/route.tsindex d319d87b8..b6121532b 100644--- a/src/app/api/teams/route.ts+++ b/src/app/api/teams/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getRandomChars } from '@/lib/crypto';import { unauthorized, json } from '@/lib/response';-import { canCreateTeam } from '@/lib/auth';+import { canCreateTeam } from '@/validations';import { uuid } from '@/lib/crypto';import { parseRequest } from '@/lib/request';import { createTeam } from '@/queries';diff --git a/src/app/api/users/[userId]/route.ts b/src/app/api/users/[userId]/route.tsindex 20ce5f23d..2a822e1d0 100644--- a/src/app/api/users/[userId]/route.ts+++ b/src/app/api/users/[userId]/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { canUpdateUser, canViewUser, canDeleteUser } from '@/lib/auth';+import { canUpdateUser, canViewUser, canDeleteUser } from '@/validations';import { getUser, getUserByUsername, updateUser, deleteUser } from '@/queries';import { json, unauthorized, badRequest, ok } from '@/lib/response';import { hashPassword } from '@/lib/auth';diff --git a/src/app/api/users/route.ts b/src/app/api/users/route.tsindex c5896f892..4b7f4d49b 100644--- a/src/app/api/users/route.ts+++ b/src/app/api/users/route.ts@@ -1,5 +1,6 @@import { z } from 'zod';-import { hashPassword, canCreateUser } from '@/lib/auth';+import { hashPassword } from '@/lib/auth';+import { canCreateUser } from '@/validations';import { ROLES } from '@/lib/constants';import { uuid } from '@/lib/crypto';import { parseRequest } from '@/lib/request';diff --git a/src/app/api/websites/[websiteId]/active/route.ts b/src/app/api/websites/[websiteId]/active/route.tsindex 88c0fd178..c30ce910e 100644--- a/src/app/api/websites/[websiteId]/active/route.ts+++ b/src/app/api/websites/[websiteId]/active/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { json, unauthorized } from '@/lib/response';import { getActiveVisitors } from '@/queries';import { parseRequest } from '@/lib/request';@@ -19,7 +19,7 @@ export async function GET(return unauthorized();}- const result = await getActiveVisitors(websiteId);+ const visitors = await getActiveVisitors(websiteId);- return json(result);+ return json(visitors);}diff --git a/src/app/api/websites/[websiteId]/daterange/route.ts b/src/app/api/websites/[websiteId]/daterange/route.tsindex ea2d10d2c..7c208308a 100644--- a/src/app/api/websites/[websiteId]/daterange/route.ts+++ b/src/app/api/websites/[websiteId]/daterange/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getWebsiteDateRange } from '@/queries';import { json, unauthorized } from '@/lib/response';import { parseRequest } from '@/lib/request';@@ -19,7 +19,7 @@ export async function GET(return unauthorized();}- const result = await getWebsiteDateRange(websiteId);+ const dateRange = await getWebsiteDateRange(websiteId);- return json(result);+ return json(dateRange);}diff --git a/src/app/api/websites/[websiteId]/event-data/[eventId]/route.ts b/src/app/api/websites/[websiteId]/event-data/[eventId]/route.tsindex 8eeb71714..01258bb4d 100644--- a/src/app/api/websites/[websiteId]/event-data/[eventId]/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/[eventId]/route.ts@@ -1,6 +1,6 @@import { parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getEventData } from '@/queries/sql/events/getEventData';export async function GET(diff --git a/src/app/api/websites/[websiteId]/event-data/events/route.ts b/src/app/api/websites/[websiteId]/event-data/events/route.tsindex 2f1de5d32..9511d0d10 100644--- a/src/app/api/websites/[websiteId]/event-data/events/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/events/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getEventDataEvents } from '@/queries/sql/events/getEventDataEvents';export async function GET(diff --git a/src/app/api/websites/[websiteId]/event-data/fields/route.ts b/src/app/api/websites/[websiteId]/event-data/fields/route.tsindex 1d97a4bab..371d8ec46 100644--- a/src/app/api/websites/[websiteId]/event-data/fields/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/fields/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getEventDataFields } from '@/queries';export async function GET(diff --git a/src/app/api/websites/[websiteId]/event-data/properties/route.ts b/src/app/api/websites/[websiteId]/event-data/properties/route.tsindex 5043e272d..001d5b61e 100644--- a/src/app/api/websites/[websiteId]/event-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/properties/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getEventDataProperties } from '@/queries';export async function GET(diff --git a/src/app/api/websites/[websiteId]/event-data/stats/route.ts b/src/app/api/websites/[websiteId]/event-data/stats/route.tsindex 9b7fe357b..5b7991539 100644--- a/src/app/api/websites/[websiteId]/event-data/stats/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/stats/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getEventDataStats } from '@/queries';export async function GET(diff --git a/src/app/api/websites/[websiteId]/event-data/values/route.ts b/src/app/api/websites/[websiteId]/event-data/values/route.tsindex 6210de849..1d8438b76 100644--- a/src/app/api/websites/[websiteId]/event-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/values/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getEventDataValues } from '@/queries';export async function GET(diff --git a/src/app/api/websites/[websiteId]/events/route.ts b/src/app/api/websites/[websiteId]/events/route.tsindex 2a57ad07a..b863fa9c0 100644--- a/src/app/api/websites/[websiteId]/events/route.ts+++ b/src/app/api/websites/[websiteId]/events/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { dateRangeParams, pagingParams, filterParams, searchParams } from '@/lib/schema';import { getWebsiteEvents } from '@/queries';diff --git a/src/app/api/websites/[websiteId]/events/series/route.ts b/src/app/api/websites/[websiteId]/events/series/route.tsindex f85f24a52..542fe07b1 100644--- a/src/app/api/websites/[websiteId]/events/series/route.ts+++ b/src/app/api/websites/[websiteId]/events/series/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { parseRequest, getQueryFilters } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { filterParams, timezoneParam, unitParam } from '@/lib/schema';import { getEventStats } from '@/queries';diff --git a/src/app/api/websites/[websiteId]/export/route.ts b/src/app/api/websites/[websiteId]/export/route.tsindex ab9fdd126..4247da7d6 100644--- a/src/app/api/websites/[websiteId]/export/route.ts+++ b/src/app/api/websites/[websiteId]/export/route.ts@@ -3,7 +3,7 @@ import JSZip from 'jszip';import Papa from 'papaparse';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { pagingParams, dateRangeParams } from '@/lib/schema';import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries';diff --git a/src/app/api/websites/[websiteId]/metrics/expanded/route.ts b/src/app/api/websites/[websiteId]/metrics/expanded/route.tsindex a327bd0b0..245d144ac 100644--- a/src/app/api/websites/[websiteId]/metrics/expanded/route.ts+++ b/src/app/api/websites/[websiteId]/metrics/expanded/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { EVENT_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';diff --git a/src/app/api/websites/[websiteId]/metrics/route.ts b/src/app/api/websites/[websiteId]/metrics/route.tsindex bc295d790..ea76b4e84 100644--- a/src/app/api/websites/[websiteId]/metrics/route.ts+++ b/src/app/api/websites/[websiteId]/metrics/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { EVENT_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';diff --git a/src/app/api/websites/[websiteId]/pageviews/route.ts b/src/app/api/websites/[websiteId]/pageviews/route.tsindex 83175d0e0..bfcc8f071 100644--- a/src/app/api/websites/[websiteId]/pageviews/route.ts+++ b/src/app/api/websites/[websiteId]/pageviews/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getQueryFilters, parseRequest } from '@/lib/request';import { dateRangeParams, filterParams } from '@/lib/schema';import { getCompareDate } from '@/lib/date';diff --git a/src/app/api/websites/[websiteId]/reports/route.ts b/src/app/api/websites/[websiteId]/reports/route.tsindex 88455685e..60e9b2d9f 100644--- a/src/app/api/websites/[websiteId]/reports/route.ts+++ b/src/app/api/websites/[websiteId]/reports/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getReports } from '@/queries';import { filterParams, pagingParams } from '@/lib/schema';import { parseRequest } from '@/lib/request';diff --git a/src/app/api/websites/[websiteId]/reset/route.ts b/src/app/api/websites/[websiteId]/reset/route.tsindex 62edceeae..36732205c 100644--- a/src/app/api/websites/[websiteId]/reset/route.ts+++ b/src/app/api/websites/[websiteId]/reset/route.ts@@ -1,4 +1,4 @@-import { canUpdateWebsite } from '@/lib/auth';+import { canUpdateWebsite } from '@/validations';import { resetWebsite } from '@/queries';import { unauthorized, ok } from '@/lib/response';import { parseRequest } from '@/lib/request';diff --git a/src/app/api/websites/[websiteId]/route.ts b/src/app/api/websites/[websiteId]/route.tsindex 4f8763b56..e57a90b0e 100644--- a/src/app/api/websites/[websiteId]/route.ts+++ b/src/app/api/websites/[websiteId]/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/lib/auth';+import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/validations';import { SHARE_ID_REGEX } from '@/lib/constants';import { parseRequest } from '@/lib/request';import { ok, json, unauthorized, serverError } from '@/lib/response';diff --git a/src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts b/src/app/api/websites/[websiteId]/segments/[segmentId]/route.tsindex fd2442cbc..588a4cac9 100644--- a/src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts+++ b/src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts@@ -1,4 +1,4 @@-import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/lib/auth';+import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/validations';import { parseRequest } from '@/lib/request';import { json, notFound, ok, unauthorized } from '@/lib/response';import { segmentTypeParam } from '@/lib/schema';diff --git a/src/app/api/websites/[websiteId]/segments/route.ts b/src/app/api/websites/[websiteId]/segments/route.tsindex 5bbcceeda..ed89e55f9 100644--- a/src/app/api/websites/[websiteId]/segments/route.ts+++ b/src/app/api/websites/[websiteId]/segments/route.ts@@ -1,4 +1,4 @@-import { canUpdateWebsite, canViewWebsite } from '@/lib/auth';+import { canUpdateWebsite, canViewWebsite } from '@/validations';import { uuid } from '@/lib/crypto';import { parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';diff --git a/src/app/api/websites/[websiteId]/session-data/properties/route.ts b/src/app/api/websites/[websiteId]/session-data/properties/route.tsindex b51f1c2f9..5c7e2c478 100644--- a/src/app/api/websites/[websiteId]/session-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/session-data/properties/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getSessionDataProperties } from '@/queries';export async function GET(diff --git a/src/app/api/websites/[websiteId]/session-data/values/route.ts b/src/app/api/websites/[websiteId]/session-data/values/route.tsindex 858aa5e31..27e952510 100644--- a/src/app/api/websites/[websiteId]/session-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/session-data/values/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { getSessionDataValues } from '@/queries';diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.tsindex 268e7bf8d..ca2261202 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { parseRequest, getQueryFilters } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getSessionActivity } from '@/queries';export async function GET(diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.tsindex 9c389c827..216634626 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts@@ -1,5 +1,5 @@import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getSessionData } from '@/queries';import { parseRequest } from '@/lib/request';diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.tsindex c4621ef42..d110ebeb6 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts@@ -1,5 +1,5 @@import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { getWebsiteSession } from '@/queries';import { parseRequest } from '@/lib/request';diff --git a/src/app/api/websites/[websiteId]/sessions/route.ts b/src/app/api/websites/[websiteId]/sessions/route.tsindex 5f81e14c8..6a8c071ba 100644--- a/src/app/api/websites/[websiteId]/sessions/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { dateRangeParams, filterParams, pagingParams, searchParams } from '@/lib/schema';import { getWebsiteSessions } from '@/queries';diff --git a/src/app/api/websites/[websiteId]/sessions/stats/route.ts b/src/app/api/websites/[websiteId]/sessions/stats/route.tsindex d78be8527..619a05ad1 100644--- a/src/app/api/websites/[websiteId]/sessions/stats/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/stats/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { parseRequest, getQueryFilters } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { filterParams } from '@/lib/schema';import { getWebsiteSessionStats } from '@/queries';diff --git a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts b/src/app/api/websites/[websiteId]/sessions/weekly/route.tsindex 2c7b227f1..5494b5a98 100644--- a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/weekly/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { pagingParams, timezoneParam } from '@/lib/schema';import { getWebsiteSessionsWeekly } from '@/queries';diff --git a/src/app/api/websites/[websiteId]/stats/route.ts b/src/app/api/websites/[websiteId]/stats/route.tsindex 924d189e4..302346c21 100644--- a/src/app/api/websites/[websiteId]/stats/route.ts+++ b/src/app/api/websites/[websiteId]/stats/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { parseRequest, getQueryFilters } from '@/lib/request';import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { dateRangeParams, filterParams } from '@/lib/schema';import { getWebsiteStats } from '@/queries';import { getCompareDate } from '@/lib/date';diff --git a/src/app/api/websites/[websiteId]/transfer/route.ts b/src/app/api/websites/[websiteId]/transfer/route.tsindex 03c0ae7f4..2a2826ae5 100644--- a/src/app/api/websites/[websiteId]/transfer/route.ts+++ b/src/app/api/websites/[websiteId]/transfer/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { canTransferWebsiteToTeam, canTransferWebsiteToUser } from '@/lib/auth';+import { canTransferWebsiteToTeam, canTransferWebsiteToUser } from '@/validations';import { updateWebsite } from '@/queries';import { parseRequest } from '@/lib/request';import { badRequest, unauthorized, json } from '@/lib/response';diff --git a/src/app/api/websites/[websiteId]/values/route.ts b/src/app/api/websites/[websiteId]/values/route.tsindex e4140e14f..91870bd5a 100644--- a/src/app/api/websites/[websiteId]/values/route.ts+++ b/src/app/api/websites/[websiteId]/values/route.ts@@ -1,4 +1,4 @@-import { canViewWebsite } from '@/lib/auth';+import { canViewWebsite } from '@/validations';import { EVENT_COLUMNS, FILTER_COLUMNS, FILTER_GROUPS, SESSION_COLUMNS } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';diff --git a/src/app/api/websites/route.ts b/src/app/api/websites/route.tsindex 96c453330..963f85312 100644--- a/src/app/api/websites/route.ts+++ b/src/app/api/websites/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { canCreateTeamWebsite, canCreateWebsite } from '@/lib/auth';+import { canCreateTeamWebsite, canCreateWebsite } from '@/validations';import { json, unauthorized } from '@/lib/response';import { uuid } from '@/lib/crypto';import { parseRequest } from '@/lib/request';diff --git a/src/components/common/DateDistance.tsx b/src/components/common/DateDistance.tsxindex 43056b0c1..b305f857f 100644--- a/src/components/common/DateDistance.tsx+++ b/src/components/common/DateDistance.tsx@@ -1,4 +1,4 @@-import { Tooltip, TooltipTrigger, Text, Focusable } from '@umami/react-zen';+import { Text } from '@umami/react-zen';import { formatDistanceToNow } from 'date-fns';import { useLocale, useTimezone } from '@/components/hooks';@@ -7,11 +7,8 @@ export function DateDistance({ date }: { date: Date }) {const { dateLocale } = useLocale();return (- <TooltipTrigger delay={0}>- <Focusable>- <Text>{formatDistanceToNow(date, { addSuffix: true, locale: dateLocale })}</Text>- </Focusable>- <Tooltip>{formatTimezoneDate(date.toISOString(), 'PPPpp')}</Tooltip>- </TooltipTrigger>+ <Text title={formatTimezoneDate(date.toISOString(), 'PPPpp')}>+ {formatDistanceToNow(date, { addSuffix: true, locale: dateLocale })}+ </Text>);}diff --git a/src/components/common/ExternalLink.tsx b/src/components/common/ExternalLink.tsxnew file mode 100644index 000000000..b3cea3604--- /dev/null+++ b/src/components/common/ExternalLink.tsx@@ -0,0 +1,18 @@+import Link from 'next/link';+import { Icon, Row, Text } from '@umami/react-zen';+import { ExternalLink as LinkIcon } from '@/components/icons';++export function ExternalLink({ href, children, ...props }: Icon) {+ return (+ <Row alignItems="center" overflow="hidden" gap>+ <Text title={href} truncate>+ <Link {...props} href={href} target="_blank">+ {children}+ </Link>+ </Text>+ <Icon size="sm" strokeColor="muted">+ <LinkIcon />+ </Icon>+ </Row>+ );+}diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.tsindex bead3b42f..8505f29da 100644--- a/src/components/hooks/index.ts+++ b/src/components/hooks/index.ts@@ -1,8 +1,11 @@'use client';++// Query hooksexport * from './queries/useActiveUsersQuery';-export * from './queries/useEventDataQuery';+export * from './queries/useDeleteQuery';export * from './queries/useEventDataEventsQuery';export * from './queries/useEventDataPropertiesQuery';+export * from './queries/useEventDataQuery';export * from './queries/useEventDataValuesQuery';export * from './queries/useLinkQuery';export * from './queries/useLinksQuery';@@ -10,41 +13,51 @@ export * from './queries/useLoginQuery';export * from './queries/usePixelQuery';export * from './queries/usePixelsQuery';export * from './queries/useRealtimeQuery';-export * from './queries/useResultQuery';export * from './queries/useReportQuery';export * from './queries/useReportsQuery';+export * from './queries/useResultQuery';export * from './queries/useSessionActivityQuery';-export * from './queries/useSessionDataQuery';export * from './queries/useSessionDataPropertiesQuery';+export * from './queries/useSessionDataQuery';export * from './queries/useSessionDataValuesQuery';-export * from './queries/useWebsiteSessionQuery';-export * from './queries/useWebsiteSessionsQuery';-export * from './queries/useWebsiteSessionsWeeklyQuery';export * from './queries/useShareTokenQuery';+export * from './queries/useTeamMembersQuery';export * from './queries/useTeamQuery';+export * from './queries/useTeamWebsitesQuery';export * from './queries/useTeamsQuery';+export * from './queries/useUpdateQuery';+export * from './queries/useUserQuery';export * from './queries/useUserTeamsQuery';export * from './queries/useUserWebsitesQuery';-export * from './queries/useTeamWebsitesQuery';-export * from './queries/useTeamMembersQuery';-export * from './queries/useUserQuery';export * from './queries/useUsersQuery';-export * from './queries/useWebsiteQuery';-export * from './queries/useWebsiteSegmentQuery';-export * from './queries/useWebsiteSegmentsQuery';-export * from './queries/useWebsitesQuery';+export * from './queries/useWebsiteCohortQuery';+export * from './queries/useWebsiteCohortsQuery';export * from './queries/useWebsiteEventsQuery';export * from './queries/useWebsiteEventsSeriesQuery';-export * from './queries/useWebsiteMetricsQuery';export * from './queries/useWebsiteExpandedMetricsQuery';+export * from './queries/useWebsiteMetricsQuery';+export * from './queries/useWebsitePageviewsQuery';+export * from './queries/useWebsiteQuery';+export * from './queries/useWebsiteSegmentQuery';+export * from './queries/useWebsiteSegmentsQuery';+export * from './queries/useWebsiteSessionQuery';+export * from './queries/useWebsiteSessionStatsQuery';+export * from './queries/useWebsiteSessionsQuery';+export * from './queries/useWebsiteSessionsWeeklyQuery';+export * from './queries/useWebsiteStatsQuery';export * from './queries/useWebsiteValuesQuery';+export * from './queries/useWebsitesQuery';++// Regular hooksexport * from './useApi';export * from './useConfig';export * from './useCountryNames';+export * from './useDateParameters';export * from './useDateRange';export * from './useDocumentClick';export * from './useEscapeKey';export * from './useFields';+export * from './useFilterParameters';export * from './useFilters';export * from './useForceUpdate';export * from './useFormat';@@ -55,6 +68,7 @@ export * from './useMessages';export * from './useModified';export * from './useNavigation';export * from './usePagedQuery';+export * from './usePageParameters';export * from './useRegionNames';export * from './useSticky';export * from './useTeam';diff --git a/src/components/hooks/queries/useActiveUsersQuery.ts b/src/components/hooks/queries/useActiveUsersQuery.tsindex 9335b75a8..d0538dc7a 100644--- a/src/components/hooks/queries/useActiveUsersQuery.ts+++ b/src/components/hooks/queries/useActiveUsersQuery.ts@@ -1,7 +1,7 @@import { useApi } from '../useApi';import { ReactQueryOptions } from '@/lib/types';-export function useActyiveUsersQuery(websiteId: string, options?: ReactQueryOptions<any>) {+export function useActyiveUsersQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();return useQuery<any>({queryKey: ['websites:active', websiteId],diff --git a/src/components/hooks/queries/useEventDataEventsQuery.ts b/src/components/hooks/queries/useEventDataEventsQuery.tsindex 41d34f743..5273181e5 100644--- a/src/components/hooks/queries/useEventDataEventsQuery.ts+++ b/src/components/hooks/queries/useEventDataEventsQuery.ts@@ -3,7 +3,7 @@ import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';import { ReactQueryOptions } from '@/lib/types';-export function useEventDataEventsQuery(websiteId: string, options?: ReactQueryOptions<any>) {+export function useEventDataEventsQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const date = useDateParameters(websiteId);const filters = useFilterParameters();diff --git a/src/components/hooks/queries/useEventDataPropertiesQuery.ts b/src/components/hooks/queries/useEventDataPropertiesQuery.tsindex 316189405..26929700b 100644--- a/src/components/hooks/queries/useEventDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useEventDataPropertiesQuery.ts@@ -3,7 +3,7 @@ import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';import { ReactQueryOptions } from '@/lib/types';-export function useEventDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions<any>) {+export function useEventDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const date = useDateParameters(websiteId);const filters = useFilterParameters();diff --git a/src/components/hooks/queries/useEventDataQuery.ts b/src/components/hooks/queries/useEventDataQuery.tsindex 05b095f39..00f5d14de 100644--- a/src/components/hooks/queries/useEventDataQuery.ts+++ b/src/components/hooks/queries/useEventDataQuery.ts@@ -3,11 +3,7 @@ import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';import { ReactQueryOptions } from '@/lib/types';-export function useEventDataQuery(- websiteId: string,- eventId: string,- options?: ReactQueryOptions<any>,-) {+export function useEventDataQuery(websiteId: string, eventId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const date = useDateParameters(websiteId);const params = useFilterParameters();diff --git a/src/components/hooks/queries/useEventDataValuesQuery.ts b/src/components/hooks/queries/useEventDataValuesQuery.tsindex 0bf87f862..4b56e5537 100644--- a/src/components/hooks/queries/useEventDataValuesQuery.ts+++ b/src/components/hooks/queries/useEventDataValuesQuery.ts@@ -7,7 +7,7 @@ export function useEventDataValuesQuery(websiteId: string,eventName: string,propertyName: string,- options?: ReactQueryOptions<any>,+ options?: ReactQueryOptions,) {const { get, useQuery } = useApi();const date = useDateParameters(websiteId);diff --git a/src/components/hooks/queries/useLinksQuery.ts b/src/components/hooks/queries/useLinksQuery.tsindex 447afb7f0..93de47dc3 100644--- a/src/components/hooks/queries/useLinksQuery.ts+++ b/src/components/hooks/queries/useLinksQuery.ts@@ -3,13 +3,15 @@ import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';import { ReactQueryOptions } from '@/lib/types';-export function useLinksQuery({ teamId }: { teamId?: string }, options?: ReactQueryOptions<any>) {+export function useLinksQuery({ teamId }: { teamId?: string }, options?: ReactQueryOptions) {const { modified } = useModified('links');const { get } = useApi();return usePagedQuery({queryKey: ['links', { teamId, modified }],- queryFn: async () => get(teamId ? `/teams/${teamId}/links` : '/links'),+ queryFn: pageParams => {+ return get(teamId ? `/teams/${teamId}/links` : '/links', pageParams);+ },...options,});}diff --git a/src/components/hooks/queries/usePixelsQuery.ts b/src/components/hooks/queries/usePixelsQuery.tsindex f1451873b..466b13d06 100644--- a/src/components/hooks/queries/usePixelsQuery.ts+++ b/src/components/hooks/queries/usePixelsQuery.ts@@ -3,17 +3,15 @@ import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';import { ReactQueryOptions } from '@/lib/types';-export function usePixelsQuery(- { websiteId, type }: { websiteId: string; type?: string },- options?: ReactQueryOptions<any>,-) {- const { modified } = useModified(`pixels:${type}`);+export function usePixelsQuery({ teamId }: { teamId?: string }, options?: ReactQueryOptions) {+ const { modified } = useModified('pixels');const { get } = useApi();return usePagedQuery({- queryKey: ['pixels', { websiteId, type, modified }],- queryFn: async () => get('/pixels', { websiteId, type }),- enabled: !!websiteId && !!type,+ queryKey: ['pixels', { teamId, modified }],+ queryFn: pageParams => {+ return get(teamId ? `/teams/${teamId}/pixels` : '/pixels', pageParams);+ },...options,});}diff --git a/src/components/hooks/queries/useReportsQuery.ts b/src/components/hooks/queries/useReportsQuery.tsindex 8c05794fe..fed150140 100644--- a/src/components/hooks/queries/useReportsQuery.ts+++ b/src/components/hooks/queries/useReportsQuery.ts@@ -5,7 +5,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useReportsQuery({ websiteId, type }: { websiteId: string; type?: string },- options?: ReactQueryOptions<any>,+ options?: ReactQueryOptions,) {const { modified } = useModified(`reports:${type}`);const { get } = useApi();diff --git a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts b/src/components/hooks/queries/useSessionDataPropertiesQuery.tsindex 6c54638ce..633a6ff83 100644--- a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useSessionDataPropertiesQuery.ts@@ -3,7 +3,7 @@ import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';import { ReactQueryOptions } from '@/lib/types';-export function useSessionDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions<any>) {+export function useSessionDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const date = useDateParameters(websiteId);const filters = useFilterParameters();diff --git a/src/components/hooks/queries/useSessionDataValuesQuery.ts b/src/components/hooks/queries/useSessionDataValuesQuery.tsindex 212d76288..bf7a8cef7 100644--- a/src/components/hooks/queries/useSessionDataValuesQuery.ts+++ b/src/components/hooks/queries/useSessionDataValuesQuery.ts@@ -6,7 +6,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useSessionDataValuesQuery(websiteId: string,propertyName: string,- options?: ReactQueryOptions<any>,+ options?: ReactQueryOptions,) {const { get, useQuery } = useApi();const date = useDateParameters(websiteId);diff --git a/src/components/hooks/queries/useTeamQuery.ts b/src/components/hooks/queries/useTeamQuery.tsindex f471172b6..497e3b363 100644--- a/src/components/hooks/queries/useTeamQuery.ts+++ b/src/components/hooks/queries/useTeamQuery.ts@@ -3,7 +3,7 @@ import { useModified } from '@/components/hooks';import { keepPreviousData } from '@tanstack/react-query';import { ReactQueryOptions } from '@/lib/types';-export function useTeamQuery(teamId: string, options?: ReactQueryOptions<any>) {+export function useTeamQuery(teamId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const { modified } = useModified(`teams:${teamId}`);diff --git a/src/components/hooks/queries/useUserQuery.ts b/src/components/hooks/queries/useUserQuery.tsindex 6fb476d54..3b687f396 100644--- a/src/components/hooks/queries/useUserQuery.ts+++ b/src/components/hooks/queries/useUserQuery.ts@@ -3,7 +3,7 @@ import { useModified } from '@/components/hooks';import { keepPreviousData } from '@tanstack/react-query';import { ReactQueryOptions } from '@/lib/types';-export function useUserQuery(userId: string, options?: ReactQueryOptions<any>) {+export function useUserQuery(userId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const { modified } = useModified(`user:${userId}`);diff --git a/src/components/hooks/queries/useUserWebsitesQuery.ts b/src/components/hooks/queries/useUserWebsitesQuery.tsindex 16c285183..c63127000 100644--- a/src/components/hooks/queries/useUserWebsitesQuery.ts+++ b/src/components/hooks/queries/useUserWebsitesQuery.ts@@ -1,6 +1,5 @@import { useApi } from '../useApi';import { usePagedQuery } from '../usePagedQuery';-import { useLoginQuery } from './useLoginQuery';import { useModified } from '../useModified';import { ReactQueryOptions } from '@/lib/types';@@ -10,16 +9,22 @@ export function useUserWebsitesQuery(options?: ReactQueryOptions,) {const { get } = useApi();- const { user } = useLoginQuery();const { modified } = useModified(`websites`);return usePagedQuery({queryKey: ['websites', { userId, teamId, modified, ...params }],queryFn: pageParams => {- return get(teamId ? `/teams/${teamId}/websites` : `/users/${userId || user.id}/websites`, {- ...pageParams,- ...params,- });+ return get(+ teamId+ ? `/teams/${teamId}/websites`+ : userId+ ? `/users/${userId}/websites`+ : '/me/websites',+ {+ ...pageParams,+ ...params,+ },+ );},...options,});diff --git a/src/components/hooks/queries/useWebsiteCohortQuery.ts b/src/components/hooks/queries/useWebsiteCohortQuery.tsnew file mode 100644index 000000000..489f3c2bf--- /dev/null+++ b/src/components/hooks/queries/useWebsiteCohortQuery.ts@@ -0,0 +1,21 @@+import { useApi } from '../useApi';+import { useModified } from '@/components/hooks';+import { keepPreviousData } from '@tanstack/react-query';+import { ReactQueryOptions } from '@/lib/types';++export function useWebsiteCohortQuery(+ websiteId: string,+ cohortId: string,+ options?: ReactQueryOptions,+) {+ const { get, useQuery } = useApi();+ const { modified } = useModified(`cohorts`);++ return useQuery({+ queryKey: ['website:cohorts', { websiteId, cohortId, modified }],+ queryFn: () => get(`/websites/${websiteId}/cohorts/${cohortId}`),+ enabled: !!(websiteId && cohortId),+ placeholderData: keepPreviousData,+ ...options,+ });+}diff --git a/src/components/hooks/queries/useWebsiteCohortsQuery.ts b/src/components/hooks/queries/useWebsiteCohortsQuery.tsnew file mode 100644index 000000000..d20d44658--- /dev/null+++ b/src/components/hooks/queries/useWebsiteCohortsQuery.ts@@ -0,0 +1,25 @@+import { useApi } from '../useApi';+import { useModified } from '@/components/hooks';+import { keepPreviousData } from '@tanstack/react-query';+import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '@/components/hooks/useFilterParameters';++export function useWebsiteCohortsQuery(+ websiteId: string,+ params?: Record<string, string>,+ options?: ReactQueryOptions,+) {+ const { get, useQuery } = useApi();+ const { modified } = useModified(`cohorts`);+ const filters = useFilterParameters();++ return useQuery({+ queryKey: ['website:cohorts', { websiteId, modified, ...filters, ...params }],+ queryFn: pageParams => {+ return get(`/websites/${websiteId}/cohorts`, { ...pageParams, ...filters, ...params });+ },+ enabled: !!websiteId,+ placeholderData: keepPreviousData,+ ...options,+ });+}diff --git a/src/components/hooks/queries/useWebsiteEventsQuery.ts b/src/components/hooks/queries/useWebsiteEventsQuery.tsindex 6a21f6df1..0798524ce 100644--- a/src/components/hooks/queries/useWebsiteEventsQuery.ts+++ b/src/components/hooks/queries/useWebsiteEventsQuery.ts@@ -12,7 +12,7 @@ const EVENT_TYPES = {export function useWebsiteEventsQuery(websiteId: string,params?: Record<string, any>,- options?: ReactQueryOptions<any>,+ options?: ReactQueryOptions,) {const { get } = useApi();const date = useDateParameters(websiteId);diff --git a/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts b/src/components/hooks/queries/useWebsiteEventsSeriesQuery.tsindex 8d03b7ac5..86fbe428d 100644--- a/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts+++ b/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts@@ -3,7 +3,7 @@ import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';import { ReactQueryOptions } from '@/lib/types';-export function useWebsiteEventsSeriesQuery(websiteId: string, options?: ReactQueryOptions<any>) {+export function useWebsiteEventsSeriesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const date = useDateParameters(websiteId);const filters = useFilterParameters();diff --git a/src/components/hooks/queries/useWebsiteQuery.ts b/src/components/hooks/queries/useWebsiteQuery.tsindex 8faaaa262..a11835935 100644--- a/src/components/hooks/queries/useWebsiteQuery.ts+++ b/src/components/hooks/queries/useWebsiteQuery.ts@@ -3,7 +3,7 @@ import { useModified } from '@/components/hooks';import { keepPreviousData } from '@tanstack/react-query';import { ReactQueryOptions } from '@/lib/types';-export function useWebsiteQuery(websiteId: string, options?: ReactQueryOptions<any>) {+export function useWebsiteQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();const { modified } = useModified(`website:${websiteId}`);diff --git a/src/components/hooks/queries/useWebsiteSegmentQuery.ts b/src/components/hooks/queries/useWebsiteSegmentQuery.tsindex 5ac6fae99..95a4eb2de 100644--- a/src/components/hooks/queries/useWebsiteSegmentQuery.ts+++ b/src/components/hooks/queries/useWebsiteSegmentQuery.ts@@ -6,7 +6,7 @@ import { ReactQueryOptions } from '@/lib/types';export function useWebsiteSegmentQuery(websiteId: string,segmentId: string,- options?: ReactQueryOptions<any>,+ options?: ReactQueryOptions,) {const { get, useQuery } = useApi();const { modified } = useModified(`segments`);diff --git a/src/components/hooks/queries/useWebsiteSegmentsQuery.ts b/src/components/hooks/queries/useWebsiteSegmentsQuery.tsindex f64b6c2f0..6b4f2bc40 100644--- a/src/components/hooks/queries/useWebsiteSegmentsQuery.ts+++ b/src/components/hooks/queries/useWebsiteSegmentsQuery.ts@@ -7,7 +7,7 @@ import { useFilterParameters } from '@/components/hooks/useFilterParameters';export function useWebsiteSegmentsQuery(websiteId: string,params?: Record<string, string>,- options?: ReactQueryOptions<any>,+ options?: ReactQueryOptions,) {const { get, useQuery } = useApi();const { modified } = useModified(`segments`);diff --git a/src/components/hooks/uesPageParameters.ts b/src/components/hooks/usePageParameters.tssimilarity index 100%rename from src/components/hooks/uesPageParameters.tsrename to src/components/hooks/usePageParameters.tsdiff --git a/src/components/input/ActionButton.tsx b/src/components/input/ActionButton.tsxindex 7798aa48e..ed20fc084 100644--- a/src/components/input/ActionButton.tsx+++ b/src/components/input/ActionButton.tsx@@ -1,25 +1,24 @@import { ReactNode } from 'react';-import { Button, Icon, Modal, DialogTrigger, TooltipTrigger, Tooltip } from '@umami/react-zen';+import { Button, Icon, Modal, Text, DialogTrigger } from '@umami/react-zen';export function ActionButton({onClick,icon,- tooltip,+ title,children,}: {onSave?: () => void;icon?: ReactNode;- tooltip?: string;- children?: React.ReactNode;+ title?: string;+ children?: ReactNode;}) {return (<DialogTrigger>- <TooltipTrigger delay={0}>+ <Text title={title}><Button variant="quiet" onPress={onClick}><Icon>{icon}</Icon></Button>- <Tooltip>{tooltip}</Tooltip>- </TooltipTrigger>+ </Text><Modal>{children}</Modal></DialogTrigger>);diff --git a/src/components/messages.ts b/src/components/messages.tsindex d034a3d5c..30055f616 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -352,6 +352,7 @@ export const labels = defineMessages({saveCohort: { id: 'label.save-cohort', defaultMessage: 'Save as cohort' },analysis: { id: 'label.analysis', defaultMessage: 'Analysis' },destinationUrl: { id: 'label.destination-url', defaultMessage: 'Destination URL' },+ audience: { id: 'label.audience', defaultMessage: 'Audience' },});export const messages = defineMessages({diff --git a/src/lib/auth.ts b/src/lib/auth.tsindex b30c254e5..947db0981 100644--- a/src/lib/auth.ts+++ b/src/lib/auth.ts@@ -1,16 +1,13 @@import bcrypt from 'bcryptjs';-import { Report } from '@prisma/client';import redis from '@/lib/redis';import debug from 'debug';-import { PERMISSIONS, ROLE_PERMISSIONS, ROLES, SHARE_TOKEN_HEADER } from '@/lib/constants';+import { ROLE_PERMISSIONS, ROLES, SHARE_TOKEN_HEADER } from '@/lib/constants';import { secret, getRandomChars } from '@/lib/crypto';import { createSecureToken, parseSecureToken, parseToken } from '@/lib/jwt';import { ensureArray } from '@/lib/utils';-import { getTeamUser, getUser, getWebsite } from '@/queries';-import { Auth } from './types';+import { getUser } from '@/queries';const log = debug('umami:auth');-const cloudMode = process.env.CLOUD_MODE;const SALT_ROUNDS = 10;export function hashPassword(password: string, rounds = SALT_ROUNDS) {@@ -75,6 +72,10 @@ export async function saveAuth(data: any, expire = 0) {return createSecureToken({ authKey }, secret());}+export async function hasPermission(role: string, permission: string | string[]) {+ return ensureArray(permission).some(e => ROLE_PERMISSIONS[role]?.includes(e));+}+export function parseShareToken(headers: Headers) {try {return parseToken(headers.get(SHARE_TOKEN_HEADER), secret());@@ -83,243 +84,3 @@ export function parseShareToken(headers: Headers) {return null;}}--export async function canViewWebsite({ user, shareToken }: Auth, websiteId: string) {- if (user?.isAdmin) {- return true;- }-- if (shareToken?.websiteId === websiteId) {- return true;- }-- const website = await getWebsite(websiteId);-- if (website.userId) {- return user.id === website.userId;- }-- if (website.teamId) {- const teamUser = await getTeamUser(website.teamId, user.id);-- return !!teamUser;- }-- return false;-}--export async function canViewAllWebsites({ user }: Auth) {- return user.isAdmin;-}--export async function canCreateWebsite({ user, grant }: Auth) {- if (cloudMode) {- return !!grant?.find(a => a === PERMISSIONS.websiteCreate);- }-- if (user.isAdmin) {- return true;- }-- return hasPermission(user.role, PERMISSIONS.websiteCreate);-}--export async function canUpdateWebsite({ user }: Auth, websiteId: string) {- if (user.isAdmin) {- return true;- }-- const website = await getWebsite(websiteId);-- if (website.userId) {- return user.id === website.userId;- }-- if (website.teamId) {- const teamUser = await getTeamUser(website.teamId, user.id);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteUpdate);- }-- return false;-}--export async function canTransferWebsiteToUser({ user }: Auth, websiteId: string, userId: string) {- const website = await getWebsite(websiteId);-- if (website.teamId && user.id === userId) {- const teamUser = await getTeamUser(website.teamId, userId);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToUser);- }-- return false;-}--export async function canTransferWebsiteToTeam({ user }: Auth, websiteId: string, teamId: string) {- const website = await getWebsite(websiteId);-- if (website.userId && website.userId === user.id) {- const teamUser = await getTeamUser(teamId, user.id);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToTeam);- }-- return false;-}--export async function canDeleteWebsite({ user }: Auth, websiteId: string) {- if (user.isAdmin) {- return true;- }-- const website = await getWebsite(websiteId);-- if (website.userId) {- return user.id === website.userId;- }-- if (website.teamId) {- const teamUser = await getTeamUser(website.teamId, user.id);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteDelete);- }-- return false;-}--export async function canViewReport(auth: Auth, report: Report) {- if (auth.user.isAdmin) {- return true;- }-- if (auth.user.id == report.userId) {- return true;- }-- return !!(await canViewWebsite(auth, report.websiteId));-}--export async function canUpdateReport({ user }: Auth, report: Report) {- if (user.isAdmin) {- return true;- }-- return user.id == report.userId;-}--export async function canDeleteReport(auth: Auth, report: Report) {- return canUpdateReport(auth, report);-}--export async function canCreateTeam({ user, grant }: Auth) {- if (cloudMode) {- return !!grant?.find(a => a === PERMISSIONS.teamCreate);- }-- if (user.isAdmin) {- return true;- }-- return !!user;-}--export async function canViewTeam({ user }: Auth, teamId: string) {- if (user.isAdmin) {- return true;- }-- return getTeamUser(teamId, user.id);-}--export async function canUpdateTeam({ user, grant }: Auth, teamId: string) {- if (user.isAdmin) {- return true;- }-- if (cloudMode) {- return !!grant?.find(a => a === PERMISSIONS.teamUpdate);- }-- const teamUser = await getTeamUser(teamId, user.id);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.teamUpdate);-}--export async function canAddUserToTeam({ user, grant }: Auth) {- if (cloudMode) {- return !!grant?.find(a => a === PERMISSIONS.teamUpdate);- }-- return user.isAdmin;-}--export async function canDeleteTeam({ user }: Auth, teamId: string) {- if (user.isAdmin) {- return true;- }-- const teamUser = await getTeamUser(teamId, user.id);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.teamDelete);-}--export async function canDeleteTeamUser({ user }: Auth, teamId: string, removeUserId: string) {- if (user.isAdmin) {- return true;- }-- if (removeUserId === user.id) {- return true;- }-- const teamUser = await getTeamUser(teamId, user.id);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.teamUpdate);-}--export async function canCreateTeamWebsite({ user }: Auth, teamId: string) {- if (user.isAdmin) {- return true;- }-- const teamUser = await getTeamUser(teamId, user.id);-- return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteCreate);-}--export async function canViewAllTeams({ user }: Auth) {- return user.isAdmin;-}--export async function canCreateUser({ user }: Auth) {- return user.isAdmin;-}--export async function canViewUser({ user }: Auth, viewedUserId: string) {- if (user.isAdmin) {- return true;- }-- return user.id === viewedUserId;-}--export async function canViewUsers({ user }: Auth) {- return user.isAdmin;-}--export async function canUpdateUser({ user }: Auth, viewedUserId: string) {- if (user.isAdmin) {- return true;- }-- return user.id === viewedUserId;-}--export async function canDeleteUser({ user }: Auth) {- return user.isAdmin;-}--export async function hasPermission(role: string, permission: string | string[]) {- return ensureArray(permission).some(e => ROLE_PERMISSIONS[role]?.includes(e));-}diff --git a/src/queries/prisma/link.ts b/src/queries/prisma/link.tsindex 0d887900d..5f9ffcfa0 100644--- a/src/queries/prisma/link.ts+++ b/src/queries/prisma/link.ts@@ -19,13 +19,18 @@ export async function getLinks(filters: QueryFilters = {},): Promise<PageResult<Link[]>> {const { search } = filters;+ const { getSearchParameters, pagedQuery } = prisma;const where: Prisma.LinkWhereInput = {...criteria.where,- ...prisma.getSearchParameters(search, [{ name: 'contains' }]),+ ...getSearchParameters(search, [+ { name: 'contains' },+ { url: 'contains' },+ { slug: 'contains' },+ ]),};- return prisma.pagedQuery('link', { ...criteria, where }, filters);+ return pagedQuery('link', { ...criteria, where }, filters);}export async function getUserLinks(@@ -51,7 +56,6 @@ export async function getTeamLinks({where: {teamId,- deletedAt: null,},},filters,diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.tsindex 118ec7719..9d9843825 100644--- a/src/queries/prisma/website.ts+++ b/src/queries/prisma/website.ts@@ -30,10 +30,11 @@ export async function getWebsites(filters: QueryFilters,): Promise<PageResult<Website[]>> {const { search } = filters;+ const { getSearchParameters, pagedQuery } = prisma;const where: Prisma.WebsiteWhereInput = {...criteria.where,- ...prisma.getSearchParameters(search, [+ ...getSearchParameters(search, [{name: 'contains',},@@ -42,7 +43,7 @@ export async function getWebsites(deletedAt: null,};- return prisma.pagedQuery('website', { ...criteria, where }, filters);+ return pagedQuery('website', { ...criteria, where }, filters);}export async function getAllWebsites(userId: string) {diff --git a/src/validations/index.ts b/src/validations/index.tsnew file mode 100644index 000000000..d0f6b53de--- /dev/null+++ b/src/validations/index.ts@@ -0,0 +1,6 @@+export * from './link';+export * from './pixel';+export * from './report';+export * from './team';+export * from './website';+export * from './user';diff --git a/src/validations/link.ts b/src/validations/link.tsnew file mode 100644index 000000000..ecead4208--- /dev/null+++ b/src/validations/link.ts@@ -0,0 +1,64 @@+import { Auth } from '@/lib/types';+import { getLink, getTeamUser } from '@/queries';+import { hasPermission } from '@/lib/auth';+import { PERMISSIONS } from '@/lib/constants';++export async function canViewLink({ user }: Auth, linkId: string) {+ if (user?.isAdmin) {+ return true;+ }++ const link = await getLink(linkId);++ if (link.userId) {+ return user.id === link.userId;+ }++ if (link.teamId) {+ const teamUser = await getTeamUser(link.teamId, user.id);++ return !!teamUser;+ }++ return false;+}++export async function canUpdateLink({ user }: Auth, linkId: string) {+ if (user.isAdmin) {+ return true;+ }++ const link = await getLink(linkId);++ if (link.userId) {+ return user.id === link.userId;+ }++ if (link.teamId) {+ const teamUser = await getTeamUser(link.teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteUpdate);+ }++ return false;+}++export async function canDeleteLink({ user }: Auth, linkId: string) {+ if (user.isAdmin) {+ return true;+ }++ const link = await getLink(linkId);++ if (link.userId) {+ return user.id === link.userId;+ }++ if (link.teamId) {+ const teamUser = await getTeamUser(link.teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteDelete);+ }++ return false;+}diff --git a/src/validations/pixel.ts b/src/validations/pixel.tsnew file mode 100644index 000000000..4932bdfae--- /dev/null+++ b/src/validations/pixel.ts@@ -0,0 +1,64 @@+import { Auth } from '@/lib/types';+import { getPixel, getTeamUser } from '@/queries';+import { hasPermission } from '@/lib/auth';+import { PERMISSIONS } from '@/lib/constants';++export async function canViewPixel({ user }: Auth, pixelId: string) {+ if (user?.isAdmin) {+ return true;+ }++ const pixel = await getPixel(pixelId);++ if (pixel.userId) {+ return user.id === pixel.userId;+ }++ if (pixel.teamId) {+ const teamUser = await getTeamUser(pixel.teamId, user.id);++ return !!teamUser;+ }++ return false;+}++export async function canUpdatePixel({ user }: Auth, pixelId: string) {+ if (user.isAdmin) {+ return true;+ }++ const pixel = await getPixel(pixelId);++ if (pixel.userId) {+ return user.id === pixel.userId;+ }++ if (pixel.teamId) {+ const teamUser = await getTeamUser(pixel.teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteUpdate);+ }++ return false;+}++export async function canDeletePixel({ user }: Auth, pixelId: string) {+ if (user.isAdmin) {+ return true;+ }++ const pixel = await getPixel(pixelId);++ if (pixel.userId) {+ return user.id === pixel.userId;+ }++ if (pixel.teamId) {+ const teamUser = await getTeamUser(pixel.teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteDelete);+ }++ return false;+}diff --git a/src/validations/report.ts b/src/validations/report.tsnew file mode 100644index 000000000..5895f2fcb--- /dev/null+++ b/src/validations/report.ts@@ -0,0 +1,27 @@+import { Auth } from '@/lib/types';+import { Report } from '@prisma/client';+import { canViewWebsite } from './website';++export async function canViewReport(auth: Auth, report: Report) {+ if (auth.user.isAdmin) {+ return true;+ }++ if (auth.user.id == report.userId) {+ return true;+ }++ return !!(await canViewWebsite(auth, report.websiteId));+}++export async function canUpdateReport({ user }: Auth, report: Report) {+ if (user.isAdmin) {+ return true;+ }++ return user.id == report.userId;+}++export async function canDeleteReport(auth: Auth, report: Report) {+ return canUpdateReport(auth, report);+}diff --git a/src/validations/team.ts b/src/validations/team.tsnew file mode 100644index 000000000..97a02b9fd--- /dev/null+++ b/src/validations/team.ts@@ -0,0 +1,86 @@+import { Auth } from '@/lib/types';+import { PERMISSIONS } from '@/lib/constants';+import { getTeamUser } from '@/queries';+import { hasPermission } from '@/lib/auth';++const cloudMode = !!process.env.CLOUD_MODE;++export async function canViewTeam({ user }: Auth, teamId: string) {+ if (user.isAdmin) {+ return true;+ }++ return getTeamUser(teamId, user.id);+}++export async function canCreateTeam({ user, grant }: Auth) {+ if (cloudMode) {+ return !!grant?.find(a => a === PERMISSIONS.teamCreate);+ }++ if (user.isAdmin) {+ return true;+ }++ return !!user;+}++export async function canUpdateTeam({ user, grant }: Auth, teamId: string) {+ if (user.isAdmin) {+ return true;+ }++ if (cloudMode) {+ return !!grant?.find(a => a === PERMISSIONS.teamUpdate);+ }++ const teamUser = await getTeamUser(teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.teamUpdate);+}++export async function canDeleteTeam({ user }: Auth, teamId: string) {+ if (user.isAdmin) {+ return true;+ }++ const teamUser = await getTeamUser(teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.teamDelete);+}++export async function canAddUserToTeam({ user, grant }: Auth) {+ if (cloudMode) {+ return !!grant?.find(a => a === PERMISSIONS.teamUpdate);+ }++ return user.isAdmin;+}++export async function canDeleteTeamUser({ user }: Auth, teamId: string, removeUserId: string) {+ if (user.isAdmin) {+ return true;+ }++ if (removeUserId === user.id) {+ return true;+ }++ const teamUser = await getTeamUser(teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.teamUpdate);+}++export async function canCreateTeamWebsite({ user }: Auth, teamId: string) {+ if (user.isAdmin) {+ return true;+ }++ const teamUser = await getTeamUser(teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteCreate);+}++export async function canViewAllTeams({ user }: Auth) {+ return user.isAdmin;+}diff --git a/src/validations/user.ts b/src/validations/user.tsnew file mode 100644index 000000000..c9a9a5f5d--- /dev/null+++ b/src/validations/user.ts@@ -0,0 +1,29 @@+import { Auth } from '@/lib/types';++export async function canCreateUser({ user }: Auth) {+ return user.isAdmin;+}++export async function canViewUser({ user }: Auth, viewedUserId: string) {+ if (user.isAdmin) {+ return true;+ }++ return user.id === viewedUserId;+}++export async function canViewUsers({ user }: Auth) {+ return user.isAdmin;+}++export async function canUpdateUser({ user }: Auth, viewedUserId: string) {+ if (user.isAdmin) {+ return true;+ }++ return user.id === viewedUserId;+}++export async function canDeleteUser({ user }: Auth) {+ return user.isAdmin;+}diff --git a/src/validations/website.ts b/src/validations/website.tsnew file mode 100644index 000000000..9f871b1c9--- /dev/null+++ b/src/validations/website.ts@@ -0,0 +1,110 @@+import { Auth } from '@/lib/types';+import { PERMISSIONS } from '@/lib/constants';+import { hasPermission } from '@/lib/auth';+import { getTeamUser, getWebsite } from '@/queries';++const cloudMode = !!process.env.CLOUD_MODE;++export async function canViewWebsite({ user, shareToken }: Auth, websiteId: string) {+ if (user?.isAdmin) {+ return true;+ }++ if (shareToken?.websiteId === websiteId) {+ return true;+ }++ const website = await getWebsite(websiteId);++ if (website.userId) {+ return user.id === website.userId;+ }++ if (website.teamId) {+ const teamUser = await getTeamUser(website.teamId, user.id);++ return !!teamUser;+ }++ return false;+}++export async function canViewAllWebsites({ user }: Auth) {+ return user.isAdmin;+}++export async function canCreateWebsite({ user, grant }: Auth) {+ if (cloudMode) {+ return !!grant?.find(a => a === PERMISSIONS.websiteCreate);+ }++ if (user.isAdmin) {+ return true;+ }++ return hasPermission(user.role, PERMISSIONS.websiteCreate);+}++export async function canUpdateWebsite({ user }: Auth, websiteId: string) {+ if (user.isAdmin) {+ return true;+ }++ const website = await getWebsite(websiteId);++ if (website.userId) {+ return user.id === website.userId;+ }++ if (website.teamId) {+ const teamUser = await getTeamUser(website.teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteUpdate);+ }++ return false;+}++export async function canDeleteWebsite({ user }: Auth, websiteId: string) {+ if (user.isAdmin) {+ return true;+ }++ const website = await getWebsite(websiteId);++ if (website.userId) {+ return user.id === website.userId;+ }++ if (website.teamId) {+ const teamUser = await getTeamUser(website.teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteDelete);+ }++ return false;+}++export async function canTransferWebsiteToUser({ user }: Auth, websiteId: string, userId: string) {+ const website = await getWebsite(websiteId);++ if (website.teamId && user.id === userId) {+ const teamUser = await getTeamUser(website.teamId, userId);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToUser);+ }++ return false;+}++export async function canTransferWebsiteToTeam({ user }: Auth, websiteId: string, teamId: string) {+ const website = await getWebsite(websiteId);++ if (website.userId && website.userId === user.id) {+ const teamUser = await getTeamUser(teamId, user.id);++ return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToTeam);+ }++ return false;+}