diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx index 8a65e5d13..bc57e0da7 100644 --- a/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx +++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx @@ -1,10 +1,11 @@ import { + Button, Column, - Form, - FormButtons, - FormField, - FormSubmitButton, Label, + ListItem, + Row, + Select, + Slider, Switch, TextField, } from '@umami/react-zen'; @@ -16,27 +17,30 @@ interface ReplayConfig { maskLevel?: string; maxDuration?: number; blockSelector?: string; - retentionDays?: number; } export function WebsiteReplaySettings({ websiteId }: { websiteId: string }) { const website = useWebsite(); const { t, labels, messages } = useMessages(); - const { mutateAsync, touch, toast } = useUpdateQuery(`/websites/${websiteId}`); + const { mutateAsync, touch, toast, isPending } = useUpdateQuery(`/websites/${websiteId}`); const [enabled, setEnabled] = useState(website?.replayEnabled ?? false); const config = (website?.replayConfig as ReplayConfig) || {}; - const handleSubmit = async (data: any) => { + const [sampleRate, setSampleRate] = useState(config.sampleRate ?? 0.15); + const [maskLevel, setMaskLevel] = useState(config.maskLevel ?? 'strict'); + const [maxDuration, setMaxDuration] = useState(String(config.maxDuration ?? 300000)); + const [blockSelector, setBlockSelector] = useState(config.blockSelector ?? ''); + + const handleSave = async () => { await mutateAsync( { replayEnabled: enabled, replayConfig: { - sampleRate: parseFloat(data.sampleRate) || 1, - maskLevel: data.maskLevel || 'moderate', - maxDuration: parseInt(data.maxDuration, 10) || 600000, - blockSelector: data.blockSelector || '', - retentionDays: parseInt(data.retentionDays, 10) || 30, + sampleRate, + maskLevel, + maxDuration: parseInt(maxDuration, 10) || 300000, + ...(blockSelector && { blockSelector }), }, }, { @@ -50,47 +54,51 @@ export function WebsiteReplaySettings({ websiteId }: { websiteId: string }) { }; return ( -
- - - - {t(labels.replayEnabled)} - - {enabled && ( - <> - - - - - - - - - - - - - - - - - )} - - - {t(labels.save)} - -
+ + + + {t(labels.replayEnabled)} + + {enabled && ( + <> + setSampleRate(Array.isArray(v) ? v[0] : v)} + showValue + formatOptions={{ style: 'percent', maximumFractionDigits: 0 }} + style={{ maxWidth: '360px' }} + /> + + + + + + + + + + + + + + )} + + + + ); } diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx index 85152e22c..a5f202faa 100644 --- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx +++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx @@ -34,7 +34,16 @@ export function WebsiteTrackingCode({ if (website?.replayEnabled) { const recorderUrl = getUrl(RECORDER_NAME); - code += `\n`; + const replayConfig = (website.replayConfig as any) || {}; + let recorderAttrs = `data-website-id="${websiteId}"`; + if (replayConfig.sampleRate !== undefined) + recorderAttrs += ` data-sample-rate="${replayConfig.sampleRate}"`; + if (replayConfig.maskLevel) recorderAttrs += ` data-mask-level="${replayConfig.maskLevel}"`; + if (replayConfig.maxDuration !== undefined) + recorderAttrs += ` data-max-duration="${replayConfig.maxDuration}"`; + if (replayConfig.blockSelector) + recorderAttrs += ` data-block-selector="${replayConfig.blockSelector}"`; + code += `\n`; } return ( diff --git a/src/app/api/websites/[websiteId]/route.ts b/src/app/api/websites/[websiteId]/route.ts index 80850f443..c74d018a3 100644 --- a/src/app/api/websites/[websiteId]/route.ts +++ b/src/app/api/websites/[websiteId]/route.ts @@ -46,10 +46,9 @@ export async function POST( replayConfig: z .object({ sampleRate: z.number().min(0).max(1).optional(), - maskLevel: z.enum(['strict', 'moderate', 'relaxed']).optional(), + maskLevel: z.enum(['strict', 'moderate']).optional(), maxDuration: z.number().int().positive().optional(), blockSelector: z.string().optional(), - retentionDays: z.number().int().positive().optional(), }) .nullable() .optional(), diff --git a/src/recorder/index.js b/src/recorder/index.js index 7e7db03cc..3d47af472 100644 --- a/src/recorder/index.js +++ b/src/recorder/index.js @@ -10,9 +10,9 @@ import { record } from 'rrweb'; const website = attr(`${_data}website-id`); const hostUrl = attr(`${_data}host-url`); - const sampleRate = parseFloat(attr(`${_data}sample-rate`) || '1'); - const maskLevel = attr(`${_data}mask-level`) || 'moderate'; - const maxDuration = parseInt(attr(`${_data}max-duration`) || '600000', 10); + const sampleRate = parseFloat(attr(`${_data}sample-rate`) || '0.15'); + const maskLevel = attr(`${_data}mask-level`) || 'strict'; + const maxDuration = parseInt(attr(`${_data}max-duration`) || '300000', 10); const blockSelector = attr(`${_data}block-selector`) || ''; if (!website) return; @@ -85,20 +85,11 @@ import { record } from 'rrweb'; case 'strict': return { maskAllInputs: true, - maskTextContent: true, - maskAllText: true, + maskTextSelector: '*', }; - case 'relaxed': + default: // moderate return { maskAllInputs: true, - maskTextContent: false, - maskAllText: false, - }; - default: - return { - maskAllInputs: true, - maskTextContent: false, - maskAllText: false, }; } };