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
Added lookup for cloud account. Added SessionModal component.
Mike Caof733690d385f
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex df476e79b..bbbb06147 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@ -1,5 +1,14 @@import { Text } from '@umami/react-zen';-import { Eye, User, Clock, Ungroup, Tag, ChartPie, UserPlus, GitCompare } from '@/components/icons';+import {+ Eye,+ User,+ Clock,+ Sheet,+ Tag,+ ChartPie,+ UserPlus,+ AlignEndHorizontal,+} from '@/components/icons';import { Lightning, Path, Money, Target, Funnel, Magnet, Network } from '@/components/svg';import { useMessages, useNavigation } from '@/components/hooks';import { SideMenu } from '@/components/common/SideMenu';@@ -47,13 +56,13 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {{id: 'compare',label: formatMessage(labels.compare),- icon: <GitCompare />,+ icon: <AlignEndHorizontal />,path: renderPath('/compare'),},{id: 'breakdown',label: formatMessage(labels.breakdown),- icon: <Ungroup />,+ icon: <Sheet />,path: renderPath('/breakdown'),},],diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsxindex 48e8b0158..b918ec4df 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@ -9,6 +9,7 @@ import { useMessages } from '@/components/hooks';import { EventProperties } from './EventProperties';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { getItem, setItem } from '@/lib/storage';+import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';const KEY_NAME = 'umami.events.tab';@@ -52,6 +53,7 @@ export function EventsPage({ websiteId }) {</TabPanel></Tabs></Panel>+ <SessionModal websiteId={websiteId} /></Column>);}diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsxindex 31044982b..c36ee5e73 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx@@ -10,7 +10,7 @@ import { TypeIcon } from '@/components/common/TypeIcon';export function EventsTable({ data = [] }) {const { formatMessage, labels } = useMessages();- const { renderUrl } = useNavigation();+ const { updateParams } = useNavigation();const { formatValue } = useFormat();if (data.length === 0) {@@ -23,7 +23,7 @@ export function EventsTable({ data = [] }) {{(row: any) => {return (<Row alignItems="center" gap="2">- <Link href={renderUrl(`/websites/${row.websiteId}/sessions/${row.sessionId}`)}>+ <Link href={updateParams({ session: row.sessionId })}><Avatar seed={row.sessionId} size={32} /></Link><Icon>{row.eventName ? <Lightning /> : <Eye />}</Icon>diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsxnew file mode 100644index 000000000..d2240d84e--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx@@ -0,0 +1,49 @@+import { Dialog, Modal, ModalProps } from '@umami/react-zen';+import { SessionProfile } from '@/app/(main)/websites/[websiteId]/sessions/SessionProfile';+import { useNavigation } from '@/components/hooks';++export interface SessionModalProps extends ModalProps {+ websiteId: string;+}++export function SessionModal({ websiteId, ...props }: SessionModalProps) {+ const {+ router,+ query: { session },+ updateParams,+ } = useNavigation();++ const handleClose = (close: () => void) => {+ router.push(updateParams({ session: undefined }));+ close();+ };++ const handleOpenChange = (isOpen: boolean) => {+ if (!isOpen) {+ router.push(updateParams({ session: undefined }));+ }+ };++ return (+ <Modal isOpen={!!session} onOpenChange={handleOpenChange} isDismissable {...props}>+ <Dialog+ style={{+ maxWidth: 1320,+ width: '100vw',+ minHeight: '300px',+ height: 'calc(100vh - 40px)',+ }}+ >+ {({ close }) => {+ return (+ <SessionProfile+ websiteId={websiteId}+ sessionId={session}+ onClose={() => handleClose(close)}+ />+ );+ }}+ </Dialog>+ </Modal>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsxindex ae0d41043..8a096aa78 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx@@ -1,35 +1,19 @@'use client';import { Key, useState } from 'react';-import { TabList, Tab, Tabs, TabPanel, Column, Modal, Dialog } from '@umami/react-zen';+import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';import { SessionsDataTable } from './SessionsDataTable';import { SessionProperties } from './SessionProperties';-import { useMessages, useNavigation } from '@/components/hooks';+import { useMessages } from '@/components/hooks';import { Panel } from '@/components/common/Panel';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { getItem, setItem } from '@/lib/storage';-import { SessionProfile } from '@/app/(main)/websites/[websiteId]/sessions/SessionProfile';+import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';const KEY_NAME = 'umami.sessions.tab';export function SessionsPage({ websiteId }) {const [tab, setTab] = useState(getItem(KEY_NAME) || 'activity');const { formatMessage, labels } = useMessages();- const {- router,- query: { session },- updateParams,- } = useNavigation();-- const handleClose = (close: () => void) => {- router.push(updateParams({ session: undefined }));- close();- };-- const handleOpenChange = (isOpen: boolean) => {- if (!isOpen) {- router.push(updateParams({ session: undefined }));- }- };const handleSelect = (value: Key) => {setItem(KEY_NAME, value);@@ -53,26 +37,7 @@ export function SessionsPage({ websiteId }) {</TabPanel></Tabs></Panel>- <Modal isOpen={!!session} onOpenChange={handleOpenChange} isDismissable>- <Dialog- style={{- maxWidth: 1320,- width: '100vw',- minHeight: '300px',- height: 'calc(100vh - 40px)',- }}- >- {({ close }) => {- return (- <SessionProfile- websiteId={websiteId}- sessionId={session}- onClose={() => handleClose(close)}- />- );- }}- </Dialog>- </Modal>+ <SessionModal websiteId={websiteId} /></Column>);}diff --git a/src/app/api/websites/route.ts b/src/app/api/websites/route.tsindex 776f23b0a..994e22bd7 100644--- a/src/app/api/websites/route.ts+++ b/src/app/api/websites/route.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import redis from '@/lib/redis';import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';import { json, unauthorized } from '@/lib/response';import { uuid } from '@/lib/crypto';@@ -50,11 +51,15 @@ export async function POST(request: Request) {const { id, name, domain, shareId, teamId } = body;- if (process.env.CLOUD_MODE && !teamId && !auth.user.hasSubscription) {- const count = await getWebsiteCount(auth.user.id);+ if (process.env.CLOUD_MODE && !teamId) {+ const account = await redis.client.get(`account:${auth.user.id}`);- if (count >= CLOUD_WEBSITE_LIMIT) {- return unauthorized({ message: 'Website limit reached.' });+ if (!account?.hasSubscription) {+ const count = await getWebsiteCount(auth.user.id);++ if (count >= CLOUD_WEBSITE_LIMIT) {+ return unauthorized({ message: 'Website limit reached.' });+ }}}diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.tsindex 315dca038..1c84f527c 100644--- a/src/queries/prisma/website.ts+++ b/src/queries/prisma/website.ts@@ -208,6 +208,7 @@ export async function getWebsiteCount(userId: string) {return prisma.client.website.count({where: {userId,+ deletedAt: null,},});}