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
New share URL form.
Mike Cao6d1603fa2853
diff --git a/package.json b/package.jsonindex 269860831..71960f914 100644--- a/package.json+++ b/package.json@@ -80,7 +80,7 @@"@react-spring/web": "^9.7.3","@svgr/cli": "^8.1.0","@tanstack/react-query": "^5.80.10",- "@umami/react-zen": "^0.138.0",+ "@umami/react-zen": "^0.139.0","@umami/redis-client": "^0.27.0","bcryptjs": "^2.4.3","chalk": "^4.1.1",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex ec0aee2b7..ff4f606ac 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -45,8 +45,8 @@ importers:specifier: ^5.80.10version: 5.80.10([email protected])'@umami/react-zen':- specifier: ^0.138.0- version: 0.138.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))+ specifier: ^0.139.0+ version: 0.139.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))'@umami/redis-client':specifier: ^0.27.0version: 0.27.0@@ -2549,8 +2549,8 @@ packages:resolution: {integrity: sha512-xoh5rJ+tgsRKoXnkBPFRLZ7rjKM0AfVbC68UZ/ECXoDbfggb9RbEySN359acY1vS3qZ0jVTVWzbtfapwm5ztxw==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@umami/[email protected]':- resolution: {integrity: sha512-MlrLu21/WjmzPnYRQgQTofb7o+1fvL8XF7EbCjZFKjW+VHz5Cg6nOZWiFBxGWWCIAWfIVZpvczvK+thi4hHigg==}+ '@umami/[email protected]':+ resolution: {integrity: sha512-NRf27+05z78DLFxK3aQUBfhZW7covl6qtS4OcaBUbZ71VZ7eeRVg7SU7Cn3NvkXlcI16t6bbLXGW4HjvfBhXsw==}'@umami/[email protected]':resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==}@@ -9733,7 +9733,7 @@ snapshots:'@typescript-eslint/types': 8.34.1eslint-visitor-keys: 4.2.1- '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))':+ '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))':dependencies:'@fontsource/jetbrains-mono': 5.2.6'@internationalized/date': 3.8.2diff --git a/src/app/(main)/settings/teams/TeamLeaveButton.tsx b/src/app/(main)/settings/teams/TeamLeaveButton.tsxindex 618372462..18a5c8213 100644--- a/src/app/(main)/settings/teams/TeamLeaveButton.tsx+++ b/src/app/(main)/settings/teams/TeamLeaveButton.tsx@@ -17,7 +17,7 @@ export function TeamLeaveButton({ teamId, teamName }: { teamId: string; teamNamereturn (<DialogTrigger>- <Button variant="secondary">+ <Button><Icon><LogOut /></Icon>diff --git a/src/app/(main)/settings/teams/TeamsJoinButton.tsx b/src/app/(main)/settings/teams/TeamsJoinButton.tsxindex fcba91a25..42ae5c3aa 100644--- a/src/app/(main)/settings/teams/TeamsJoinButton.tsx+++ b/src/app/(main)/settings/teams/TeamsJoinButton.tsx@@ -15,7 +15,7 @@ export function TeamsJoinButton() {return (<DialogTrigger>- <Button variant="secondary">+ <Button><Icon><AddUser /></Icon>diff --git a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsxdeleted file mode 100644index 71e61327d..000000000--- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx+++ /dev/null@@ -1,90 +0,0 @@-import {- Form,- FormField,- FormButtons,- TextField,- Button,- Switch,- FormSubmitButton,- Box,- useToast,-} from '@umami/react-zen';-import { useContext, useState } from 'react';-import { getRandomChars } from '@/lib/crypto';-import { useApi, useMessages, useModified } from '@/components/hooks';-import { WebsiteContext } from '@/app/(main)/websites/[websiteId]/WebsiteProvider';--const generateId = () => getRandomChars(16);--export function ShareUrl({ hostUrl, onSave }: { hostUrl?: string; onSave?: () => void }) {- const website = useContext(WebsiteContext);- const { domain, shareId } = website;- const { formatMessage, labels, messages } = useMessages();- const [id, setId] = useState(shareId);- const { post, useMutation } = useApi();- const { mutate, error, isPending } = useMutation({- mutationFn: (data: any) => post(`/websites/${website.id}`, data),- });- const { touch } = useModified();- const { toast } = useToast();-- const url = `${hostUrl || window?.location.origin || ''}${- process.env.basePath || ''- }/share/${id}/${domain}`;-- const handleGenerate = () => {- setId(generateId());- };-- const handleSwitch = (checked: boolean) => {- const data = {- name: website.name,- domain: website.domain,- shareId: checked ? generateId() : null,- };- mutate(data, {- onSuccess: async () => {- toast(formatMessage(messages.saved));- touch(`website:${website.id}`);- onSave?.();- },- });- setId(data.shareId);- };-- const handleSave = () => {- mutate(- { name: website.name, domain: website.domain, shareId: id },- {- onSuccess: async () => {- toast(formatMessage(messages.saved));- touch(`website:${website.id}`);- onSave?.();- },- },- );- };-- return (- <>- <Box marginBottom="6">- <Switch defaultSelected={!!id} isSelected={!!id} onChange={handleSwitch}>- {formatMessage(labels.enableShareUrl)}- </Switch>- </Box>- {id && (- <Form onSubmit={handleSave} error={error} values={{ id, url }}>- <FormField label={formatMessage(messages.shareUrl)} name="url">- <TextField isReadOnly allowCopy />- </FormField>- <FormButtons justifyContent="space-between">- <Button onPress={handleGenerate}>{formatMessage(labels.regenerate)}</Button>- <FormSubmitButton variant="primary" isDisabled={id === shareId} isLoading={isPending}>- {formatMessage(labels.save)}- </FormSubmitButton>- </FormButtons>- </Form>- )}- </>- );-}diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsxindex 2394983ff..83d74d104 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx@@ -52,9 +52,7 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:description={formatMessage(messages.transferWebsite)}><DialogTrigger>- <Button variant="secondary" isDisabled={!canTransferWebsite}>- {formatMessage(labels.transfer)}- </Button>+ <Button isDisabled={!canTransferWebsite}>{formatMessage(labels.transfer)}</Button><Modal><Dialog title={formatMessage(labels.transferWebsite)}>{({ close }) => (@@ -70,7 +68,7 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:description={formatMessage(messages.resetWebsiteWarning)}><DialogTrigger>- <Button variant="secondary">{formatMessage(labels.reset)}</Button>+ <Button>{formatMessage(labels.reset)}</Button><Modal><Dialog title={formatMessage(labels.resetWebsite)}>{({ close }) => (diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsxindex 8762070d0..6a0b164ec 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx@@ -4,7 +4,7 @@ import { WebsiteContext } from '@/app/(main)/websites/[websiteId]/WebsiteProvideimport { useMessages } from '@/components/hooks';import { Globe, Arrow } from '@/components/icons';import { SectionHeader } from '@/components/common/SectionHeader';-import { ShareUrl } from './ShareUrl';+import { WebsiteShareForm } from './WebsiteShareForm';import { TrackingCode } from './TrackingCode';import { WebsiteData } from './WebsiteData';import { WebsiteEditForm } from './WebsiteEditForm';@@ -48,7 +48,7 @@ export function WebsiteSettings({<TrackingCode websiteId={websiteId} /></TabPanel><TabPanel id="share">- <ShareUrl />+ <WebsiteShareForm /></TabPanel><TabPanel id="data"><WebsiteData websiteId={websiteId} />diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteShareForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteShareForm.tsxnew file mode 100644index 000000000..60c71e22d--- /dev/null+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteShareForm.tsx@@ -0,0 +1,95 @@+import {+ Form,+ FormButtons,+ TextField,+ Button,+ Switch,+ FormSubmitButton,+ Column,+ Icon,+ Grid,+ Label,+ useToast,+ TooltipTrigger,+ Tooltip,+} from '@umami/react-zen';+import { useState } from 'react';+import { getRandomChars } from '@/lib/crypto';+import { useApi, useMessages, useModified } from '@/components/hooks';+import { Refresh } from '@/components/icons';++const generateId = () => getRandomChars(16);++export interface WebsiteShareFormProps {+ websiteId: string;+ shareId: string;+ onSave?: () => void;+ onClose?: () => void;+}++export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: WebsiteShareFormProps) {+ const { formatMessage, labels, messages } = useMessages();+ const [id, setId] = useState(shareId);+ const { post, useMutation } = useApi();+ const { mutate, error, isPending } = useMutation({+ mutationFn: (data: any) => post(`/websites/${websiteId}`, data),+ });+ const { touch } = useModified();+ const { toast } = useToast();++ const url = `${window?.location.origin || ''}${process.env.basePath || ''}/share/${id}`;++ const handleGenerate = () => {+ setId(generateId());+ };++ const handleSwitch = () => {+ setId(id ? null : generateId());+ };++ const handleSave = () => {+ const data = {+ shareId: id,+ };+ mutate(data, {+ onSuccess: async () => {+ toast(formatMessage(messages.saved));+ touch(`website:${websiteId}`);+ onSave?.();+ onClose?.();+ },+ });+ };++ return (+ <Form onSubmit={handleSave} error={error} values={{ url }}>+ <Column gap>+ <Switch isSelected={!!id} onChange={handleSwitch}>+ {formatMessage(labels.enableShareUrl)}+ </Switch>+ {id && (+ <Column>+ <Label>{formatMessage(labels.shareUrl)}</Label>+ <Grid columns="1fr auto" gap>+ <TextField value={url} isReadOnly allowCopy />+ <TooltipTrigger>+ <Button onPress={handleGenerate} variant="quiet" size="sm">+ <Icon>+ <Refresh />+ </Icon>+ </Button>+ <Tooltip>{formatMessage(labels.regenerate)}</Tooltip>+ </TooltipTrigger>+ </Grid>+ </Column>+ )}+ <FormButtons>+ <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>+ <FormSubmitButton isDisabled={false} isLoading={isPending}>+ {formatMessage(labels.save)}+ </FormSubmitButton>+ </FormButtons>+ </Column>+ </Form>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsxindex 8c9741897..444f0524e 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx@@ -1,9 +1,11 @@-import { Button, Icon, Text, Row } from '@umami/react-zen';+import { Button, Icon, Text, Row, DialogTrigger, Dialog, Modal } from '@umami/react-zen';import { PageHeader } from '@/components/common/PageHeader';import { useWebsite } from '@/components/hooks/useWebsite';import { Share, Edit } from '@/components/icons';import { Favicon } from '@/components/common/Favicon';import { ActiveUsers } from '@/components/metrics/ActiveUsers';+import { WebsiteShareForm } from '@/app/(main)/settings/websites/[websiteId]/WebsiteShareForm';+import { useMessages } from '@/components/hooks';export function WebsiteHeader() {const website = useWebsite();@@ -12,12 +14,7 @@ export function WebsiteHeader() {<PageHeader title={website.name} icon={<Favicon domain={website.domain} />} showBorder={false}><Row alignItems="center" gap><ActiveUsers websiteId={website.id} />- <Button>- <Icon>- <Share />- </Icon>- <Text>Share</Text>- </Button>+ <ShareButton websiteId={website.id} shareId={website.shareId} /><Button><Icon><Edit />@@ -28,3 +25,25 @@ export function WebsiteHeader() {</PageHeader>);}++const ShareButton = ({ websiteId, shareId }) => {+ const { formatMessage, labels } = useMessages();++ return (+ <DialogTrigger>+ <Button>+ <Icon>+ <Share />+ </Icon>+ <Text>Share</Text>+ </Button>+ <Modal>+ <Dialog title={formatMessage(labels.share)} style={{ width: 600 }}>+ {({ close }) => {+ return <WebsiteShareForm websiteId={websiteId} shareId={shareId} onClose={close} />;+ }}+ </Dialog>+ </Modal>+ </DialogTrigger>+ );+};diff --git a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsxindex 27cbe3866..ea0a8bbe5 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx@@ -2,8 +2,9 @@import { createContext, ReactNode, useEffect } from 'react';import { useModified, useWebsiteQuery } from '@/components/hooks';import { Loading } from '@umami/react-zen';+import { Website } from '@/generated/prisma/client';-export const WebsiteContext = createContext(null);+export const WebsiteContext = createContext<Website>(null);export function WebsiteProvider({websiteId,diff --git a/src/app/api/websites/[websiteId]/route.ts b/src/app/api/websites/[websiteId]/route.tsindex 346e58569..4f8763b56 100644--- a/src/app/api/websites/[websiteId]/route.ts+++ b/src/app/api/websites/[websiteId]/route.ts@@ -31,8 +31,8 @@ export async function POST({ params }: { params: Promise<{ websiteId: string }> },) {const schema = z.object({- name: z.string(),- domain: z.string(),+ name: z.string().optional(),+ domain: z.string().optional(),shareId: z.string().regex(SHARE_ID_REGEX).nullable().optional(),});diff --git a/src/index.ts b/src/index.tsindex f6663e469..6988166b5 100644--- a/src/index.ts+++ b/src/index.ts@@ -26,7 +26,7 @@ export * from '@/app/(main)/settings/teams/TeamsJoinButton';export * from '@/app/(main)/settings/teams/TeamsTable';export * from '@/app/(main)/settings/teams/WebsiteTags';-export * from '@/app/(main)/settings/websites/[websiteId]/ShareUrl';+export * from '@/app/(main)/settings/websites/[websiteId]/WebsiteShareForm';export * from '@/app/(main)/settings/websites/[websiteId]/TrackingCode';export * from '@/app/(main)/settings/websites/[websiteId]/WebsiteData';export * from '@/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm';diff --git a/src/lib/constants.ts b/src/lib/constants.tsindex 0ab6ae2e8..19006492c 100644--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@ -198,7 +198,7 @@ export const CHART_COLORS = [export const DOMAIN_REGEX =/^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-_]{1,63}\.)(xn--)?[a-z0-9-_]+(-[a-z0-9-_]+)*\.)+(xn--)?[a-z0-9-_]{2,63})$/;-export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{8,16}$/;+export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{8,50}$/;export const DATETIME_REGEX =/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]{3}(Z|\+[0-9]{2}:[0-9]{2})?)?$/;diff --git a/src/styles/global.css b/src/styles/global.cssindex 37b16c335..f342f8fdc 100644--- a/src/styles/global.css+++ b/src/styles/global.css@@ -6,6 +6,11 @@ body {background-color: var(--background-color);width: 100%;min-height: 100vh;+ overflow: hidden;+}++html[style*='padding-right'] {+ padding-right: 0 !important;}a,