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
Refactored settings. Updated sidebar.
Mike Cao3c5c1e48e998
diff --git a/next.config.ts b/next.config.tsindex 278e7a6d4..a4ba1c36a 100644--- a/next.config.ts+++ b/next.config.ts@@ -97,12 +97,7 @@ const headers = [},];-const rewrites = [- {- source: '/teams/:id/settings/:path*',- destination: '/settings/:path*',- },-];+const rewrites = [];if (trackerScriptURL) {rewrites.push({@@ -134,6 +129,11 @@ const redirects = [destination: '/teams/:id/websites',permanent: true,},+ {+ source: '/teams/:id/settings',+ destination: '/teams/:id/settings/preferences',+ permanent: true,+ },{source: '/admin',destination: '/admin/users',@@ -205,7 +205,7 @@ export default {destination: '/api/scripts/telemetry',},{- source: '/teams/:teamId/:path((?!settings).*)*',+ source: '/teams/:teamId/:path*',destination: '/:path*',},];diff --git a/package.json b/package.jsonindex 9f41eded2..e62c41eca 100644--- a/package.json+++ b/package.json@@ -120,7 +120,6 @@"prisma": "6.14.0","pure-rand": "^7.0.1","react": "^19.1.1",- "react-basics": "^0.126.0","react-dom": "^19.1.1","react-error-boundary": "^4.0.4","react-intl": "^7.1.11",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex b5da37b39..c00d5f287 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -158,9 +158,6 @@ importers:react:specifier: ^19.1.1version: 19.1.1- react-basics:- specifier: ^0.126.0react-dom:specifier: ^19.1.1version: 19.1.1([email protected])@@ -6048,13 +6045,6 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- resolution: {integrity: sha512-TQtNZMeH5FtJjYxSN72rBmZWlIcs9jK3oVSCUUxfZq9LnFdoFSagTLCrihs3YCnX8vZEJXaJHQsp7lKEfyH5sw==}- engines: {node: '>= 14'}- peerDependencies:- react: ^18.2.0- react-dom: ^18.2.0-resolution: {integrity: sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==}peerDependencies:@@ -13881,16 +13871,6 @@ snapshots:react: 19.1.1react-dom: 19.1.1([email protected])- dependencies:- classnames: 2.5.1- date-fns: 2.30.0- react: 19.1.1- react-dom: 19.1.1([email protected])- react-hook-form: 7.62.0([email protected])-dependencies:react: 19.1.1diff --git a/prisma/migrations/14_add_link_and_pixel/migration.sql b/prisma/migrations/14_add_link_and_pixel/migration.sqlindex 9c08fc611..4feec4f46 100644--- a/prisma/migrations/14_add_link_and_pixel/migration.sql+++ b/prisma/migrations/14_add_link_and_pixel/migration.sql@@ -12,7 +12,7 @@ CREATE TABLE "link" ("link_id" UUID NOT NULL,"name" VARCHAR(100) NOT NULL,"url" VARCHAR(500) NOT NULL,- "slug" VARCHAR(100) NOT NULL,+ "slug" VARCHAR(100) UNIQUE NOT NULL,"user_id" UUID,"team_id" UUID,"created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,@@ -26,7 +26,7 @@ CREATE TABLE "link" (CREATE TABLE "pixel" ("pixel_id" UUID NOT NULL,"name" VARCHAR(100) NOT NULL,- "slug" VARCHAR(100) NOT NULL,+ "slug" VARCHAR(100) UNIQUE NOT NULL,"user_id" UUID,"team_id" UUID,"created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex 0434393be..7c45d5ffa 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -280,7 +280,7 @@ model Link {id String @id() @unique() @map("link_id") @db.Uuidname String @db.VarChar(100)url String @db.VarChar(500)- slug String @db.VarChar(100)+ slug String @unique() @db.VarChar(100)userId String? @map("user_id") @db.UuidteamId String? @map("team_id") @db.UuidcreatedAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)@@ -300,7 +300,7 @@ model Link {model Pixel {id String @id() @unique() @map("pixel_id") @db.Uuidname String @db.VarChar(100)- slug String @db.VarChar(100)+ slug String @unique() @db.VarChar(100)userId String? @map("user_id") @db.UuidteamId String? @map("team_id") @db.UuidcreatedAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsxindex 895c48cca..e360dae16 100644--- a/src/app/(main)/SideNav.tsx+++ b/src/app/(main)/SideNav.tsx@@ -6,6 +6,7 @@ import {SidebarHeader,Row,SidebarProps,+ ThemeButton,} from '@umami/react-zen';import {Globe,@@ -14,24 +15,19 @@ import {Logo,Grid2X2,Settings,- LockKeyhole,PanelLeft,} from '@/components/icons';import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';import { TeamsButton } from '@/components/input/TeamsButton';import { PanelButton } from '@/components/input/PanelButton';+import { ProfileButton } from '@/components/input/ProfileButton';export function SideNav(props: SidebarProps) {const { formatMessage, labels } = useMessages();const { pathname, renderUrl, websiteId } = useNavigation();const [isCollapsed, setIsCollapsed] = useGlobalState('sidenav-collapsed');- const hasNav = !!(- websiteId ||- pathname.startsWith('/admin') ||- pathname.startsWith('/settings') ||- pathname.endsWith('/settings')- );+ const hasNav = !!(websiteId || pathname.startsWith('/admin') || pathname.includes('/settings'));const links = [{@@ -64,15 +60,9 @@ export function SideNav(props: SidebarProps) {{id: 'settings',label: formatMessage(labels.settings),- path: '/settings',+ path: renderUrl('/settings'),icon: <Settings />,},- {- id: 'admin',- label: formatMessage(labels.admin),- path: '/admin',- icon: <LockKeyhole />,- },];return (@@ -99,10 +89,18 @@ export function SideNav(props: SidebarProps) {{bottomLinks.map(({ id, path, label, icon }) => {return (<Link key={id} href={path} role="button">- <SidebarItem label={label} icon={icon} isSelected={pathname.startsWith(path)} />+ <SidebarItem label={label} icon={icon} isSelected={pathname.includes(path)} /></Link>);})}+ <Row alignItems="center" justifyContent="space-between" height="40px">+ <ProfileButton />+ {!isCollapsed && !hasNav && (+ <Row>+ <ThemeButton />+ </Row>+ )}+ </Row></SidebarSection></Sidebar></Row>diff --git a/src/app/(main)/admin/AdminLayout.tsx b/src/app/(main)/admin/AdminLayout.tsxindex 87abd77b0..a33b745af 100644--- a/src/app/(main)/admin/AdminLayout.tsx+++ b/src/app/(main)/admin/AdminLayout.tsx@@ -17,7 +17,7 @@ export function AdminLayout({ children }: { children: ReactNode }) {const items = [{- label: formatMessage(labels.application),+ label: formatMessage(labels.manage),items: [{id: 'users',diff --git a/src/app/(main)/admin/teams/[teamId]/AdminTeamPage.tsx b/src/app/(main)/admin/teams/[teamId]/AdminTeamPage.tsxindex 07104c52b..a7851d78b 100644--- a/src/app/(main)/admin/teams/[teamId]/AdminTeamPage.tsx+++ b/src/app/(main)/admin/teams/[teamId]/AdminTeamPage.tsx@@ -1,11 +1,11 @@'use client';-import { TeamDetails } from '@/app/(main)/teams/[teamId]/TeamDetails';+import { TeamSettings } from '@/app/(main)/teams/[teamId]/TeamSettings';import { TeamProvider } from '@/app/(main)/teams/[teamId]/TeamProvider';export function AdminTeamPage({ teamId }: { teamId: string }) {return (<TeamProvider teamId={teamId}>- <TeamDetails teamId={teamId} />+ <TeamSettings teamId={teamId} /></TeamProvider>);}diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsxindex 9617049fd..b3cf7df0e 100644--- a/src/app/(main)/settings/SettingsLayout.tsx+++ b/src/app/(main)/settings/SettingsLayout.tsx@@ -20,12 +20,6 @@ export function SettingsLayout({ children }: { children: ReactNode }) {path: renderUrl('/settings/preferences'),icon: <Knobs />,},- {- id: 'teams',- label: formatMessage(labels.teams),- path: renderUrl('/settings/teams'),- icon: <Users />,- },],},{@@ -37,12 +31,18 @@ export function SettingsLayout({ children }: { children: ReactNode }) {path: renderUrl('/settings/profile'),icon: <UserCircle />,},+ {+ id: 'teams',+ label: formatMessage(labels.teams),+ path: renderUrl('/settings/teams'),+ icon: <Users />,+ },],},];const selectedKey =- items.flatMap(e => e.items)?.find(({ path }) => path && pathname.endsWith(path))?.id ||+ items.flatMap(e => e.items)?.find(({ path }) => path && pathname.includes(path))?.id ||'overview';return (diff --git a/src/app/(main)/settings/preferences/PreferencesPage.tsx b/src/app/(main)/settings/preferences/PreferencesPage.tsxindex 99289956f..4ddd3511a 100644--- a/src/app/(main)/settings/preferences/PreferencesPage.tsx+++ b/src/app/(main)/settings/preferences/PreferencesPage.tsx@@ -4,16 +4,19 @@ import { useMessages } from '@/components/hooks';import { Panel } from '@/components/common/Panel';import { PreferenceSettings } from './PreferenceSettings';import { PageHeader } from '@/components/common/PageHeader';+import { PageBody } from '@/components/common/PageBody';export function PreferencesPage() {const { formatMessage, labels } = useMessages();return (- <Column gap="6">- <PageHeader title={formatMessage(labels.preferences)} />- <Panel>- <PreferenceSettings />- </Panel>- </Column>+ <PageBody>+ <Column gap="6">+ <PageHeader title={formatMessage(labels.preferences)} />+ <Panel>+ <PreferenceSettings />+ </Panel>+ </Column>+ </PageBody>);}diff --git a/src/app/(main)/settings/profile/ProfilePage.tsx b/src/app/(main)/settings/profile/ProfilePage.tsxindex 2d1ce0d36..dab836dee 100644--- a/src/app/(main)/settings/profile/ProfilePage.tsx+++ b/src/app/(main)/settings/profile/ProfilePage.tsx@@ -4,16 +4,19 @@ import { useMessages } from '@/components/hooks';import { Panel } from '@/components/common/Panel';import { Column } from '@umami/react-zen';import { PageHeader } from '@/components/common/PageHeader';+import { PageBody } from '@/components/common/PageBody';export function ProfilePage() {const { formatMessage, labels } = useMessages();return (- <Column gap="6">- <PageHeader title={formatMessage(labels.profile)} />- <Panel>- <ProfileSettings />- </Panel>- </Column>+ <PageBody>+ <Column gap="6">+ <PageHeader title={formatMessage(labels.profile)} />+ <Panel>+ <ProfileSettings />+ </Panel>+ </Column>+ </PageBody>);}diff --git a/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsx b/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsxindex 4efa4ecdd..3736299d0 100644--- a/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsx+++ b/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsx@@ -1,11 +1,11 @@'use client';import { TeamProvider } from '@/app/(main)/teams/[teamId]/TeamProvider';-import { TeamDetails } from '@/app/(main)/teams/[teamId]/TeamDetails';+import { TeamSettings } from '@/app/(main)/teams/[teamId]/TeamSettings';export function TeamSettingsPage({ teamId }: { teamId: string }) {return (<TeamProvider teamId={teamId}>- <TeamDetails teamId={teamId} />+ <TeamSettings teamId={teamId} /></TeamProvider>);}diff --git a/src/app/(main)/teams/TeamsPage.tsx b/src/app/(main)/teams/TeamsPage.tsxnew file mode 100644index 000000000..3b0f57ea4--- /dev/null+++ b/src/app/(main)/teams/TeamsPage.tsx@@ -0,0 +1,19 @@+'use client';+import { TeamsDataTable } from '@/app/(main)/teams/TeamsDataTable';+import { TeamsHeader } from '@/app/(main)/teams/TeamsHeader';+import { Column } from '@umami/react-zen';+import { Panel } from '@/components/common/Panel';+import { PageBody } from '@/components/common/PageBody';++export function TeamsPage() {+ return (+ <PageBody>+ <Column gap="6">+ <TeamsHeader />+ <Panel>+ <TeamsDataTable />+ </Panel>+ </Column>+ </PageBody>+ );+}diff --git a/src/app/(main)/teams/TeamsTable.tsx b/src/app/(main)/teams/TeamsTable.tsxindex 7d6e890a7..d77ede111 100644--- a/src/app/(main)/teams/TeamsTable.tsx+++ b/src/app/(main)/teams/TeamsTable.tsx@@ -1,5 +1,5 @@import { DataColumn, DataTable, Icon, MenuItem, Text, Row } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';+import { useMessages, useNavigation } from '@/components/hooks';import { Eye, Edit } from '@/components/icons';import { ROLES } from '@/lib/constants';import { MenuButton } from '@/components/input/MenuButton';@@ -14,20 +14,21 @@ export function TeamsTable({showActions?: boolean;}) {const { formatMessage, labels } = useMessages();+ const { renderUrl } = useNavigation();return (<DataTable data={data}><DataColumn id="name" label={formatMessage(labels.name)}>- {(row: any) => <Link href={`/settings/teams/${row.id}`}>{row.name}</Link>}+ {(row: any) => <Link href={renderUrl(`/settings/teams/${row.id}`)}>{row.name}</Link>}</DataColumn><DataColumn id="owner" label={formatMessage(labels.owner)}>- {(row: any) => row.users.find(({ role }) => role === ROLES.teamOwner)?.user?.username}+ {(row: any) => row?.members?.find(({ role }) => role === ROLES.teamOwner)?.user?.username}</DataColumn><DataColumn id="websites" label={formatMessage(labels.websites)} align="end">- {(row: any) => row._count.websites}+ {(row: any) => row?._count?.websites}</DataColumn><DataColumn id="members" label={formatMessage(labels.members)} align="end">- {(row: any) => row._count.users}+ {(row: any) => row?._count?.members}</DataColumn>{showActions ? (<DataColumn id="action" label=" " align="end">diff --git a/src/app/(main)/teams/[teamId]/TeamDetails.tsx b/src/app/(main)/teams/[teamId]/TeamSettings.tsxsimilarity index 92%rename from src/app/(main)/teams/[teamId]/TeamDetails.tsxrename to src/app/(main)/teams/[teamId]/TeamSettings.tsxindex 7a923f015..acf1a9363 100644--- a/src/app/(main)/teams/[teamId]/TeamDetails.tsx+++ b/src/app/(main)/teams/[teamId]/TeamSettings.tsx@@ -13,7 +13,7 @@ import { TeamMembersDataTable } from './TeamMembersDataTable';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';-export function TeamDetails({ teamId }: { teamId: string }) {+export function TeamSettings({ teamId }: { teamId: string }) {const team = useContext(TeamContext);const { formatMessage, labels } = useMessages();const { user } = useLoginQuery();@@ -23,12 +23,12 @@ export function TeamDetails({ teamId }: { teamId: string }) {const isAdmin = pathname.includes('/admin');const isTeamOwner =- !!team?.teamUser?.find(({ userId, role }) => role === ROLES.teamOwner && userId === user.id) &&+ !!team?.members?.find(({ userId, role }) => role === ROLES.teamOwner && userId === user.id) &&user.role !== ROLES.viewOnly;const canEdit =user.isAdmin ||- (!!team?.teamUser?.find(+ (!!team?.members?.find(({ userId, role }) =>(role === ROLES.teamOwner || role === ROLES.teamManager) && userId === user.id,) &&diff --git a/src/app/(main)/teams/page.tsx b/src/app/(main)/teams/page.tsxnew file mode 100644index 000000000..ce3538955--- /dev/null+++ b/src/app/(main)/teams/page.tsx@@ -0,0 +1,10 @@+import { Metadata } from 'next';+import { TeamsPage } from './TeamsPage';++export default function () {+ return <TeamsPage />;+}++export const metadata: Metadata = {+ title: 'Teams',+};diff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex 74a9479bb..e2a6bc368 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@ -137,7 +137,7 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {return (<SideMenu items={items} selectedKey={selectedKey} allowMinimize={false}>- <WebsiteSelect buttonProps={{ variant: 'quiet' }} websiteId={websiteId} teamId={teamId} />+ <WebsiteSelect websiteId={websiteId} teamId={teamId} /></SideMenu>);}diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsxindex 73208c7df..b276da6e5 100644--- a/src/components/common/LoadingPanel.tsx+++ b/src/components/common/LoadingPanel.tsx@@ -43,7 +43,7 @@ export function LoadingPanel({{!error && !isLoading && !isFetching && empty && renderEmpty()}{/* Show main content when data exists */}- {!error && !empty && children}+ {!isLoading && !isFetching && !error && !empty && children}</>);}diff --git a/src/components/input/ProfileButton.tsx b/src/components/input/ProfileButton.tsxindex 5b890095c..9e1cbd3f5 100644--- a/src/components/input/ProfileButton.tsx+++ b/src/components/input/ProfileButton.tsx@@ -1,4 +1,4 @@-import { Key } from 'react';+import { Fragment } from 'react';import {Icon,Button,@@ -11,19 +11,37 @@ import {Text,Row,} from '@umami/react-zen';-import { useRouter } from 'next/navigation';-import { useMessages, useLoginQuery } from '@/components/hooks';-import { LogOut, Settings, UserCircle, LockKeyhole } from '@/components/icons';+import { useMessages, useLoginQuery, useNavigation } from '@/components/hooks';+import { LogOut, UserCircle, LockKeyhole } from '@/components/icons';export function ProfileButton() {const { formatMessage, labels } = useMessages();const { user } = useLoginQuery();- const router = useRouter();+ const { renderUrl } = useNavigation();const cloudMode = !!process.env.cloudMode;- const handleSelect = (key: Key) => {- router.push(`/${key}`);- };+ const items = [+ {+ id: 'profile',+ label: formatMessage(labels.profile),+ path: renderUrl('/settings/profile'),+ icon: <UserCircle />,+ },+ user.isAdmin &&+ !cloudMode && {+ id: 'admin',+ label: formatMessage(labels.admin),+ path: '/admin',+ icon: <LockKeyhole />,+ },+ {+ id: 'LogOut',+ label: formatMessage(labels.logout),+ path: '/logout',+ icon: <LogOut />,+ separator: true,+ },+ ].filter(n => n);return (<MenuTrigger>@@ -33,37 +51,22 @@ export function ProfileButton() {</Icon></Button><Popover placement="bottom end">- <Menu autoFocus="last" onAction={handleSelect}>+ <Menu autoFocus="last"><MenuSection title={user.username}><MenuSeparator />- <MenuItem id="settings">- <Row alignItems="center" gap>- <Icon>- <Settings />- </Icon>- <Text>{formatMessage(labels.settings)}</Text>- </Row>- </MenuItem>- {user.isAdmin && (- <MenuItem id="admin">- <Row alignItems="center" gap>- <Icon>- <LockKeyhole />- </Icon>- <Text>{formatMessage(labels.admin)}</Text>- </Row>- </MenuItem>- )}- {!cloudMode && (- <MenuItem data-test="item-logout" id="logout">- <Row alignItems="center" gap>- <Icon>- <LogOut />- </Icon>- <Text>{formatMessage(labels.logout)}</Text>- </Row>- </MenuItem>- )}+ {items.map(({ id, path, label, icon, separator }) => {+ return (+ <Fragment key={id}>+ {separator && <MenuSeparator />}+ <MenuItem id={id} href={path}>+ <Row alignItems="center" gap>+ <Icon>{icon}</Icon>+ <Text>{label}</Text>+ </Row>+ </MenuItem>+ </Fragment>+ );+ })}</MenuSection></Menu></Popover>diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsxindex 40e31a2f9..917c7d218 100644--- a/src/components/input/WebsiteSelect.tsx+++ b/src/components/input/WebsiteSelect.tsx@@ -1,17 +1,14 @@import { useState } from 'react';import { Select, SelectProps, ListItem, Text } from '@umami/react-zen';import { useUserWebsitesQuery, useWebsiteQuery, useNavigation } from '@/components/hooks';-import { ButtonProps } from 'react-basics';export function WebsiteSelect({websiteId,teamId,- buttonProps,...props}: {websiteId?: string;teamId?: string;- buttonProps?: ButtonProps;} & SelectProps) {const { router, renderUrl } = useNavigation();const [search, setSearch] = useState('');@@ -33,7 +30,7 @@ export function WebsiteSelect({items={data?.['data'] || []}value={websiteId}isLoading={isLoading}- buttonProps={{ ...buttonProps }}+ buttonProps={{ variant: 'outline' }}allowSearch={true}searchValue={search}onSearch={handleSearch}diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsxindex 2f88b4150..1db956ca8 100644--- a/src/components/metrics/MetricsTable.tsx+++ b/src/components/metrics/MetricsTable.tsx@@ -117,7 +117,7 @@ export function MetricsTable({return (<LoadingPanel data={data} isFetching={isFetching} isLoading={isLoading} error={error}>- <Grid rows="auto 1fr" height="100%" overflow="hidden" gap>+ <Grid rows="40px 1fr" height="100%" overflow="hidden" gap><Row alignItems="center">{allowSearch && <SearchField value={search} onSearch={setSearch} delay={300} />}<Row justifyContent="flex-end" flexGrow={1} gap>diff --git a/src/index.ts b/src/index.tsindex 6a8ebecf4..0c84624c0 100644--- a/src/index.ts+++ b/src/index.ts@@ -6,7 +6,7 @@ export * from '@/app/(main)/teams/[teamId]/TeamMemberRemoveButton';export * from '@/app/(main)/teams/[teamId]/TeamMembersDataTable';export * from '@/app/(main)/teams/[teamId]/TeamMembersTable';export * from '@/app/(main)/teams/[teamId]/TeamDeleteForm';-export * from '@/app/(main)/teams/[teamId]/TeamDetails';+export * from '@/app/(main)/teams/[teamId]/TeamSettings';export * from '@/app/(main)/teams/[teamId]/TeamEditForm';export * from '@/app/(main)/teams/[teamId]/TeamManage';export * from '@/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton';diff --git a/src/queries/prisma/link.ts b/src/queries/prisma/link.tsindex f7f5e1581..ea46023cb 100644--- a/src/queries/prisma/link.ts+++ b/src/queries/prisma/link.ts@@ -2,7 +2,7 @@ import { Prisma, Link } from '@/generated/prisma/client';import prisma from '@/lib/prisma';import { PageResult, QueryFilters } from '@/lib/types';-async function findLink(criteria: Prisma.LinkFindUniqueArgs): Promise<Link> {+export async function findLink(criteria: Prisma.LinkFindUniqueArgs): Promise<Link> {return prisma.client.link.findUnique(criteria);}diff --git a/src/queries/prisma/pixel.ts b/src/queries/prisma/pixel.tsindex db494fa85..a68c53001 100644--- a/src/queries/prisma/pixel.ts+++ b/src/queries/prisma/pixel.ts@@ -2,7 +2,7 @@ import { Prisma, Pixel } from '@/generated/prisma/client';import prisma from '@/lib/prisma';import { PageResult, QueryFilters } from '@/lib/types';-async function findPixel(criteria: Prisma.PixelFindUniqueArgs): Promise<Pixel> {+export async function findPixel(criteria: Prisma.PixelFindUniqueArgs): Promise<Pixel> {return prisma.client.pixel.findUnique(criteria);}@@ -22,7 +22,7 @@ export async function getPixels(const where: Prisma.PixelWhereInput = {...criteria.where,- ...prisma.getSearchParameters(search, [{ name: 'contains' }]),+ ...prisma.getSearchParameters(search, [{ name: 'contains' }, { slug: 'contains' }]),};return prisma.pagedQuery('pixel', { ...criteria, where }, filters);diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.tsindex 5bdf6862f..683aab0f2 100644--- a/src/queries/prisma/website.ts+++ b/src/queries/prisma/website.ts@@ -4,7 +4,7 @@ import prisma from '@/lib/prisma';import { PageResult, QueryFilters } from '@/lib/types';import { ROLES } from '@/lib/constants';-async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {+export async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {return prisma.client.website.findUnique(criteria);}diff --git a/src/queries/sql/events/saveEvent.ts b/src/queries/sql/events/saveEvent.tsindex 92056206e..c351b95c5 100644--- a/src/queries/sql/events/saveEvent.ts+++ b/src/queries/sql/events/saveEvent.ts@@ -12,6 +12,7 @@ export interface SaveEventArgs {sessionId: string;visitId: string;createdAt?: Date;+ eventType?: number;// PagepageTitle?: string;@@ -66,6 +67,7 @@ async function relationalQuery({sessionId,visitId,createdAt,+ eventType,pageTitle,tag,hostname,@@ -113,7 +115,7 @@ async function relationalQuery({ttclid,lifatid,twclid,- eventType: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,+ eventType: eventType || (eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView),eventName: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,tag,hostname,