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
Merge dev.
Mike Caobe1b2fc2725e
diff --cc package.jsonindex c7303a364,21f9be53f..2a95b68ae--- a/package.json+++ b/package.json@@@ -15,36 -15,36 +15,37 @@@"build": "npm-run-all check-env build-db check-db build-tracker build-geo build-app","start": "next start","build-docker": "npm-run-all build-db build-tracker build-geo build-app",- "start-docker": "npm-run-all check-db update-tracker start-server",- "start-env": "node scripts/start-env.js",+ "start-docker": "npm-run-all check-db update-tracker set-routes-manifest start-server",- "start-env": "node scripts/start-env.js",++ "start-env": "node scripts/start-env.mjs","start-server": "node server.js","build-app": "next build","build-components": "rollup -c rollup.components.config.mjs","build-tracker": "rollup -c rollup.tracker.config.mjs","build-db": "npm-run-all copy-db-files build-db-client","build-lang": "npm-run-all format-lang compile-lang clean-lang download-country-names download-language-names",-- "build-geo": "node scripts/build-geo.js",++ "build-geo": "node scripts/build-geo.mjs","build-db-schema": "prisma db pull","build-db-client": "prisma generate",- "set-routes-manifest": "node scripts/set-routes-manifest.js",- "update-tracker": "node scripts/update-tracker.js",+ "build-icons": "svgr ./src/assets --out-dir ./src/components/svg --typescript",- "update-tracker": "node scripts/update-tracker.js",++ "set-routes-manifest": "node scripts/set-routes-manifest.mjs",++ "update-tracker": "node scripts/update-tracker.mjs","update-db": "prisma migrate deploy",-- "check-db": "node scripts/check-db.js",-- "check-env": "node scripts/check-env.js",-- "copy-db-files": "node scripts/copy-db-files.js",++ "check-db": "node scripts/check-db.mjs",++ "check-env": "node scripts/check-env.mjs",++ "copy-db-files": "node scripts/copy-db-files.mjs","extract-messages": "formatjs extract \"src/components/messages.ts\" --out-file build/extracted-messages.json",-- "merge-messages": "node scripts/merge-messages.js",++ "merge-messages": "node scripts/merge-messages.mjs","generate-lang": "npm-run-all extract-messages merge-messages",-- "format-lang": "node scripts/format-lang.js",++ "format-lang": "node scripts/format-lang.mjs","compile-lang": "formatjs compile-folder --ast build/messages public/intl/messages","clean-lang": "prettier --write ./public/intl/messages/*.json",-- "check-lang": "node scripts/check-lang.js",-- "download-country-names": "node scripts/download-country-names.js",-- "download-language-names": "node scripts/download-language-names.js",++ "check-lang": "node scripts/check-lang.mjs",++ "download-country-names": "node scripts/download-country-names.mjs",++ "download-language-names": "node scripts/download-language-names.mjs","change-password": "node scripts/change-password.js","lint": "next lint --quiet","prepare": "node -e \"if (process.env.NODE_ENV !== 'production'){process.exit(1)} \" || husky install",-- "postbuild": "node scripts/postbuild.js",++ "postbuild": "node scripts/postbuild.mjs","test": "jest","cypress-open": "cypress open cypress run","cypress-run": "cypress run cypress run"@@@ -66,38 -66,35 +67,35 @@@".next/cache"],"dependencies": {- "@clickhouse/client": "^1.10.1",+ "@clickhouse/client": "^1.11.0","@date-fns/utc": "^1.2.0",- "@dicebear/collection": "^9.2.2",- "@dicebear/core": "^9.2.2",- "@fontsource/inter": "^5.2.5",- "@hello-pangea/dnd": "^18.0.1",- "@internationalized/date": "^3.7.0",- "@prisma/client": "6.5.0",+ "@dicebear/collection": "^9.2.1",+ "@dicebear/core": "^9.2.1",+ "@fontsource/inter": "^4.5.15",+ "@hello-pangea/dnd": "^17.0.0",+ "@prisma/client": "6.6.0","@prisma/extension-read-replicas": "^0.4.1",- "@react-spring/web": "^9.7.5",- "@tanstack/react-query": "^5.71.10",- "@umami/prisma-client": "^0.16.0",- "@umami/react-zen": "^0.87.0",- "@umami/redis-client": "^0.27.0",+ "@react-spring/web": "^9.7.3",+ "@tanstack/react-query": "^5.28.6",+ "@umami/redis-client": "^0.26.0","bcryptjs": "^2.4.3",- "chalk": "^4.1.2",- "chart.js": "^4.4.8",+ "chalk": "^4.1.1",+ "chart.js": "^4.4.9","chartjs-adapter-date-fns": "^3.0.0",- "classnames": "^2.5.1",- "colord": "^2.9.3",+ "classnames": "^2.3.1",+ "colord": "^2.9.2","cors": "^2.8.5",- "cross-spawn": "^7.0.6",- "date-fns": "^2.30.0",- "date-fns-tz": "^1.3.8",- "debug": "^4.4.0",- "del": "^6.1.1",- "detect-browser": "^5.3.0",+ "cross-spawn": "^7.0.3",+ "date-fns": "^2.23.0",+ "date-fns-tz": "^1.1.4",+ "debug": "^4.3.4",+ "del": "^6.0.0",+ "detect-browser": "^5.2.0","dotenv": "^10.0.0",- "eslint-plugin-promise": "^6.6.0",- "fs-extra": "^10.1.0",- "immer": "^9.0.21",- "ipaddr.js": "^2.2.0",+ "eslint-plugin-promise": "^6.1.1",+ "fs-extra": "^10.0.1",+ "immer": "^9.0.12",+ "ipaddr.js": "^2.0.1","is-ci": "^3.0.1","is-docker": "^3.0.0","is-localhost-ip": "^1.4.0",diff --cc scripts/build-geo.mjsindex d0fe04c77,d0fe04c77..27a2cb0d5--- a/scripts/build-geo.mjs+++ b/scripts/build-geo.mjs@@@ -1,11 -1,11 +1,10 @@@--/* eslint-disable @typescript-eslint/no-var-requires *//* eslint-disable no-console */--require('dotenv').config();--const fs = require('fs');--const path = require('path');--const https = require('https');--const zlib = require('zlib');--const tar = require('tar');++import 'dotenv/config';++import fs from 'node:fs';++import path from 'node:path';++import https from 'https';++import zlib from 'zlib';++import tar from 'tar';if (process.env.VERCEL) {console.log('Vercel environment detected. Skipping geo setup.');diff --cc scripts/check-db.mjsindex ca0fca31c,ca0fca31c..8e3818448--- a/scripts/check-db.mjs+++ b/scripts/check-db.mjs@@@ -1,9 -1,9 +1,10 @@@/* eslint-disable no-console */--require('dotenv').config();--const { PrismaClient } = require('@prisma/client');--const chalk = require('chalk');--const { execSync } = require('child_process');--const semver = require('semver');++import 'dotenv/config';++++import { PrismaClient } from '@prisma/client';++import chalk from 'chalk';++import { execSync } from 'child_process';++import semver from 'semver';if (process.env.SKIP_DB_CHECK) {console.log('Skipping database check.');diff --cc scripts/check-env.mjsindex e8c80a5da,e8c80a5da..21de9469b--- a/scripts/check-env.mjs+++ b/scripts/check-env.mjs@@@ -1,5 -1,5 +1,5 @@@/* eslint-disable no-console */--require('dotenv').config();++import 'dotenv/config';function checkMissing(vars) {const missing = vars.reduce((arr, key) => {diff --cc scripts/check-lang.mjsindex a1b604310,a1b604310..74a386c8e--- a/scripts/check-lang.mjs+++ b/scripts/check-lang.mjs@@@ -1,10 -1,10 +1,12 @@@/* eslint-disable no-console */--const fs = require('fs');--const path = require('path');--const chalk = require('chalk');++import fs from 'node:fs';++import path from 'node:path';++import chalk from 'chalk';++import { createRequire } from "module";++++const require = createRequire(import.meta.url);const messages = require('../src/lang/en-US.json');const ignore = require('../lang-ignore.json');--const dir = path.resolve(__dirname, '../lang');const files = fs.readdirSync(dir);const keys = Object.keys(messages).sort();diff --cc scripts/copy-db-files.mjsindex 15c34674f,15c34674f..d9418db62--- a/scripts/copy-db-files.mjs+++ b/scripts/copy-db-files.mjs@@@ -1,8 -1,8 +1,11 @@@/* eslint-disable no-console */--require('dotenv').config();--const fse = require('fs-extra');--const path = require('path');--const del = require('del');++import 'dotenv/config';++import fse from 'fs-extra';++import path from 'node:path';++import url from 'node:url';++import del from 'del';++++const __dirname = path.dirname(url.fileURLToPath(import.meta.url));function getDatabaseType(url = process.env.DATABASE_URL) {const type = process.env.DATABASE_TYPE || (url && url.split(':')[0]);diff --cc scripts/download-country-names.mjsindex 6dbbbbdcc,6dbbbbdcc..51fbafef5--- a/scripts/download-country-names.mjs+++ b/scripts/download-country-names.mjs@@@ -1,8 -1,8 +1,11 @@@--/* eslint-disable no-console, @typescript-eslint/no-var-requires */--const fs = require('fs-extra');--const path = require('path');--const https = require('https');--const chalk = require('chalk');++/* eslint-disable no-console */++import fs from 'fs-extra';++import path from 'node:path';++import https from 'https';++import chalk from 'chalk';++import url from "node:url";++++const __dirname = path.dirname(url.fileURLToPath(import.meta.url));const src = path.resolve(__dirname, '../src/lang');const dest = path.resolve(__dirname, '../public/intl/country');diff --cc scripts/download-language-names.mjsindex 5478fb8d0,5478fb8d0..a434bf01b--- a/scripts/download-language-names.mjs+++ b/scripts/download-language-names.mjs@@@ -1,8 -1,8 +1,11 @@@/* eslint-disable no-console */--const fs = require('fs-extra');--const path = require('path');--const https = require('https');--const chalk = require('chalk');++import fs from 'fs-extra';++import path from 'node:path';++import https from 'https';++import chalk from 'chalk';++import url from "node:url";++++const __dirname = path.dirname(url.fileURLToPath(import.meta.url));const src = path.resolve(__dirname, '../src/lang');const dest = path.resolve(__dirname, '../public/intl/language');diff --cc scripts/format-lang.mjsindex 593e296d2,593e296d2..587dd02a0--- a/scripts/format-lang.mjs+++ b/scripts/format-lang.mjs@@@ -1,8 -1,8 +1,13 @@@--const fs = require('fs-extra');--const path = require('path');--const del = require('del');--const prettier = require('prettier');++import path from 'node:path';++import url from 'node:url';++import fs from 'fs-extra';++import del from 'del';++import prettier from 'prettier';++import { createRequire } from 'module';++const __dirname = path.dirname(url.fileURLToPath(import.meta.url));++++const require = createRequire(import.meta.url);const src = path.resolve(__dirname, '../src/lang');const dest = path.resolve(__dirname, '../build/messages');const files = fs.readdirSync(src);diff --cc scripts/merge-messages.mjsindex 44ffb5c78,44ffb5c78..9225ab896--- a/scripts/merge-messages.mjs+++ b/scripts/merge-messages.mjs@@@ -1,9 -1,9 +1,11 @@@/* eslint-disable no-console */--const fs = require('fs');--const path = require('path');--const prettier = require('prettier');--const messages = require('../build/extracted-messages.json');++import fs from 'node:fs';++import path from 'node:path';++import prettier from 'prettier';++import messages from '../build/extracted-messages.json';++import { createRequire } from "module";++const require = createRequire(import.meta.url);const dest = path.resolve(__dirname, '../src/lang');const files = fs.readdirSync(dest);const keys = Object.keys(messages).sort();diff --cc scripts/postbuild.mjsindex 897480587,897480587..291d0a241--- a/scripts/postbuild.mjs+++ b/scripts/postbuild.mjs@@@ -1,5 -1,5 +1,5 @@@--require('dotenv').config();--const { sendTelemetry } = require('./telemetry');++import 'dotenv/config';++import { sendTelemetry } from './telemetry';async function run() {if (!process.env.DISABLE_TELEMETRY) {diff --cc scripts/set-routes-manifest.mjsindex 000000000,a3ac49562..ba1658087mode 000000,100644..100644--- a/scripts/set-routes-manifest.mjs+++ b/scripts/set-routes-manifest.mjs@@@ -1,0 -1,74 +1,74 @@@+ /* eslint-disable no-console */-require('dotenv').config();-const fs = require('fs');-const path = require('path');++import 'dotenv/config';++import fs from 'node:fs';++import path from 'node:path';++ const routesManifestPath = path.resolve(__dirname, '../.next/routes-manifest.json');+ const originalPath = path.resolve(__dirname, '../.next/routes-manifest-orig.json');+ const originalManifest = require(originalPath);++ const API_PATH = '/api/:path*';+ const TRACKER_SCRIPT = '/script.js';++ const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT;+ const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;++ const headers = [];+ const rewrites = [];++ if (collectApiEndpoint) {+ const apiRoute = originalManifest.headers.find(route => route.source === API_PATH);+ const routeRegex = new RegExp(apiRoute.regex);++ rewrites.push({+ source: collectApiEndpoint,+ destination: '/api/send',+ });++ if (!routeRegex.test(collectApiEndpoint)) {+ headers.push({+ source: collectApiEndpoint,+ headers: apiRoute.headers,+ });+ }+ }++ if (trackerScriptName) {+ const trackerRoute = originalManifest.headers.find(route => route.source === TRACKER_SCRIPT);++ const names = trackerScriptName?.split(',').map(name => name.trim());++ if (names) {+ names.forEach(name => {+ const normalizedSource = `/${name.replace(/^\/+/, '')}`;++ rewrites.push({+ source: normalizedSource,+ destination: TRACKER_SCRIPT,+ });++ headers.push({+ source: normalizedSource,+ headers: trackerRoute.headers,+ });+ });+ }+ }++ const routesManifest = { ...originalManifest };++ if (rewrites.length !== 0) {+ const { buildCustomRoute } = require('next/dist/lib/build-custom-route');++ const builtHeaders = headers.map(header => buildCustomRoute('header', header));+ const builtRewrites = rewrites.map(rewrite => buildCustomRoute('rewrite', rewrite));++ routesManifest.headers = [...originalManifest.headers, ...builtHeaders];+ routesManifest.rewrites = [...builtRewrites, ...originalManifest.rewrites];++ console.log('Using updated Next.js routes manifest');+ } else {+ console.log('Using original Next.js routes manifest');+ }++ fs.writeFileSync(routesManifestPath, JSON.stringify(routesManifest, null, 2));diff --cc scripts/start-env.mjsindex 264c4e92b,264c4e92b..970414ae3--- a/scripts/start-env.mjs+++ b/scripts/start-env.mjs@@@ -1,5 -1,5 +1,5 @@@--require('dotenv').config();--const cli = require('next/dist/cli/next-start');++import 'dotenv/config';++import cli from 'next/dist/cli/next-start';cli.nextStart({port: process.env.PORT || 3000,diff --cc scripts/telemetry.mjsindex 27110cd46,27110cd46..4cbc16363--- a/scripts/telemetry.mjs+++ b/scripts/telemetry.mjs@@@ -1,6 -1,6 +1,9 @@@--const os = require('os');--const isCI = require('is-ci');--const pkg = require('../package.json');++import os from 'node:os';++import isCI from 'is-ci';++import { createRequire } from 'module';++++const require = createRequire(import.meta.url);++const pkg = require('./package.json');const url = 'https://api.umami.is/v1/telemetry';diff --cc scripts/update-tracker.mjsindex 4dcbf2457,4dcbf2457..458ae4942--- a/scripts/update-tracker.mjs+++ b/scripts/update-tracker.mjs@@@ -1,7 -1,7 +1,10 @@@/* eslint-disable no-console */--require('dotenv').config();--const fs = require('fs');--const path = require('path');++import 'dotenv/config';++import fs from 'node:fs';++import path from 'node:path';++import url from "node:url";++++const __dirname = path.dirname(url.fileURLToPath(import.meta.url));const endPoint = process.env.COLLECT_API_ENDPOINT;diff --cc src/app/(main)/console/[[...websiteId]]/page.tsxindex efb793a44,6c504f1e6..b780c9596--- a/src/app/(main)/console/[[...websiteId]]/page.tsx+++ b/src/app/(main)/console/[[...websiteId]]/page.tsx@@@ -1,5 -1,5 +1,5 @@@import { Metadata } from 'next';- import { ConsolePage } from '../ConsolePage';-import TestConsole from '../TestConsole';++import { TestConsole } from '../TestConsole';async function getEnabled() {return !!process.env.ENABLE_TEST_CONSOLE;diff --cc src/app/(main)/reports/[reportId]/ReportPage.tsxindex a864d4edb,5e215cd28..11c80f5fc--- a/src/app/(main)/reports/[reportId]/ReportPage.tsx+++ b/src/app/(main)/reports/[reportId]/ReportPage.tsx@@@ -1,13 -1,14 +1,14 @@@'use client';-import { useReport } from '@/components/hooks';-import EventDataReport from '../event-data/EventDataReport';-import FunnelReport from '../funnel/FunnelReport';-import GoalReport from '../goals/GoalsReport';-import InsightsReport from '../insights/InsightsReport';-import JourneyReport from '../journey/JourneyReport';-import RetentionReport from '../retention/RetentionReport';-import RevenueReport from '../revenue/RevenueReport';-import UTMReport from '../utm/UTMReport';+import { useReportQuery } from '@/components/hooks';+import { EventDataReport } from '../event-data/EventDataReport';+import { FunnelReport } from '../funnel/FunnelReport';+import { GoalsReport } from '../goals/GoalsReport';+import { InsightsReport } from '../insights/InsightsReport';+import { JourneyReport } from '../journey/JourneyReport';+import { RetentionReport } from '../retention/RetentionReport';+import { UTMReport } from '../utm/UTMReport';+import { RevenueReport } from '../revenue/RevenueReport';+ import AttributionReport from '../attribution/AttributionReport';const reports = {funnel: FunnelReport,@@@ -15,13 -16,14 +16,14 @@@insights: InsightsReport,retention: RetentionReport,utm: UTMReport,- goals: GoalReport,+ goals: GoalsReport,journey: JourneyReport,revenue: RevenueReport,+ attribution: AttributionReport,};-export default function ReportPage({ reportId }: { reportId: string }) {- const { report } = useReport(reportId);+export function ReportPage({ reportId }: { reportId: string }) {+ const { report } = useReportQuery(reportId);if (!report) {return null;diff --cc src/app/(main)/reports/attribution/AttributionParameters.tsxindex 000000000,2763273d0..168621ffamode 000000,100644..100644--- a/src/app/(main)/reports/attribution/AttributionParameters.tsx+++ b/src/app/(main)/reports/attribution/AttributionParameters.tsx@@@ -1,0 -1,188 +1,174 @@@+ import { useMessages } from '@/components/hooks';-import Icons from '@/components/icons';++import { Icons } from '@/components/icons';+ import { useContext, useState } from 'react';+ import {+ Button,- Dropdown,++ Select,+ Form,+ FormButtons,- FormInput,- FormRow,++ FormField,+ Icon,- Item,- Popup,- PopupTrigger,- SubmitButton,++ ListItem,++ Popover,++ DialogTrigger,+ Toggle,-} from 'react-basics';-import BaseParameters from '../[reportId]/BaseParameters';-import ParameterList from '../[reportId]/ParameterList';-import PopupForm from '../[reportId]/PopupForm';++ FormSubmitButton,++} from '@umami/react-zen';++import { BaseParameters } from '../[reportId]/BaseParameters';++import { ParameterList } from '../[reportId]/ParameterList';+ import { ReportContext } from '../[reportId]/Report';-import FunnelStepAddForm from '../funnel/FunnelStepAddForm';-import styles from './AttributionParameters.module.css';-import AttributionStepAddForm from './AttributionStepAddForm';-import useRevenueValues from '@/components/hooks/queries/useRevenueValues';++import { FunnelStepAddForm } from '../funnel/FunnelStepAddForm';++import { AttributionStepAddForm } from './AttributionStepAddForm';++import { useRevenueValuesQuery } from '@/components/hooks/queries/useRevenueValuesQuery';++ export function AttributionParameters() {+ const { report, runReport, updateReport, isRunning } = useContext(ReportContext);+ const { formatMessage, labels } = useMessages();+ const { id, parameters } = report || {};+ const { websiteId, dateRange, steps } = parameters || {};+ const queryEnabled = websiteId && dateRange && steps.length > 0;+ const [model, setModel] = useState('');+ const [revenueMode, setRevenueMode] = useState(false);+- const { data: currencyValues = [] } = useRevenueValues(++ const { data: currencyValues = [] } = useRevenueValuesQuery(+ websiteId,+ dateRange?.startDate,+ dateRange?.endDate,+ );++ const handleSubmit = (data: any, e: any) => {+ if (revenueMode === false) {+ delete data.currency;+ }++ e.stopPropagation();+ e.preventDefault();+ runReport(data);+ };++ const handleCheck = () => {+ setRevenueMode(!revenueMode);+ };++ const handleAddStep = (step: { type: string; value: string }) => {+ if (step.type === 'url') {+ setRevenueMode(false);+ }+ updateReport({ parameters: { steps: parameters.steps.concat(step) } });+ };++ const handleUpdateStep = (+ close: () => void,+ index: number,+ step: { type: string; value: string },+ ) => {+ if (step.type === 'url') {+ setRevenueMode(false);+ }+ const steps = [...parameters.steps];+ steps[index] = step;+ updateReport({ parameters: { steps } });+ close();+ };++ const handleRemoveStep = (index: number) => {+ const steps = [...parameters.steps];+ delete steps[index];+ updateReport({ parameters: { steps: steps.filter(n => n) } });+ };++ const AddStepButton = () => {+ return (- <PopupTrigger disabled={steps.length > 0}>- <Button disabled={steps.length > 0}>++ <DialogTrigger>++ <Button isDisabled={steps.length > 0}>+ <Icon>+ <Icons.Plus />+ </Icon>+ </Button>- <Popup alignment="start">- <PopupForm>- <FunnelStepAddForm onChange={handleAddStep} />- </PopupForm>- </Popup>- </PopupTrigger>++ <Popover placement="right top">++ <FunnelStepAddForm onChange={handleAddStep} />++ </Popover>++ </DialogTrigger>+ );+ };++ const items = [- { label: 'First-Click', value: 'firstClick' },- { label: 'Last-Click', value: 'lastClick' },++ { id: 'first-click', label: 'First-Click', value: 'firstClick' },++ { id: 'last-click', label: 'Last-Click', value: 'lastClick' },+ ];+- const renderModelValue = (value: any) => {- return items.find(item => item.value === value)?.label;- };-+ const onModelChange = (value: any) => {+ setModel(value);+ updateReport({ parameters: { model } });+ };++ return (+ <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>+ <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />- <FormRow label={formatMessage(labels.model)}>- <FormInput name="model" rules={{ required: formatMessage(labels.required) }}>- <Dropdown- items={items}- value={model}- renderValue={renderModelValue}- onChange={onModelChange}- >- {({ value, label }) => {- return <Item key={value}>{label}</Item>;- }}- </Dropdown>- </FormInput>- </FormRow>- <FormRow label={formatMessage(labels.conversionStep)} action={<AddStepButton />}>++ <FormField++ name="model"++ rules={{ required: formatMessage(labels.required) }}++ label={formatMessage(labels.model)}++ >++ <Select items={items} value={model} onChange={onModelChange}>++ {({ value, label }: any) => {++ return <ListItem key={value}>{label}</ListItem>;++ }}++ </Select>++ </FormField>++ <FormField name="step" label={formatMessage(labels.conversionStep)}>+ <ParameterList>+ {steps.map((step: { type: string; value: string }, index: number) => {+ return (- <PopupTrigger key={index}>++ <DialogTrigger key={index}>+ <ParameterList.Item- className={styles.item}+ icon={step.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}+ onRemove={() => handleRemoveStep(index)}+ >- <div className={styles.value}>- <div>{step.value}</div>- </div>++ <div>{step.value}</div>+ </ParameterList.Item>- <Popup alignment="start">- {(close: () => void) => (- <PopupForm>- <AttributionStepAddForm- type={step.type}- value={step.value}- onChange={handleUpdateStep.bind(null, close, index)}- />- </PopupForm>- )}- </Popup>- </PopupTrigger>++ <Popover placement="right top">++ <AttributionStepAddForm++ type={step.type}++ value={step.value}++ onChange={handleUpdateStep.bind(null, close, index)}++ />++ </Popover>++ </DialogTrigger>+ );+ })}+ </ParameterList>- </FormRow>- <FormRow>- <Toggle- checked={revenueMode}- onChecked={handleCheck}- disabled={currencyValues.length === 0 || steps[0]?.type === 'url'}- >- <b>Revenue Mode</b>- </Toggle>- </FormRow>++ <AddStepButton />++ </FormField>++++ <Toggle++ isSelected={revenueMode}++ onClick={handleCheck}++ isDisabled={currencyValues.length === 0 || steps[0]?.type === 'url'}++ >++ <b>Revenue Mode</b>++ </Toggle>+++ {revenueMode && (- <FormRow label={formatMessage(labels.currency)}>- <FormInput name="currency" rules={{ required: formatMessage(labels.required) }}>- <Dropdown items={currencyValues.map(item => item.currency)}>- {item => <Item key={item}>{item}</Item>}- </Dropdown>- </FormInput>- </FormRow>++ <FormField++ name="currency"++ rules={{ required: formatMessage(labels.required) }}++ label={formatMessage(labels.currency)}++ >++ <Select items={currencyValues.map(item => ({ id: item.currency, value: item.currency }))}>++ {({ id, value }: any) => (++ <ListItem key={id} id={id}>++ {value}++ </ListItem>++ )}++ </Select>++ </FormField>+ )}+ <FormButtons>- <SubmitButton variant="primary" disabled={!queryEnabled} isLoading={isRunning}>++ <FormSubmitButton variant="primary" isDisabled={!queryEnabled} isLoading={isRunning}>+ {formatMessage(labels.runQuery)}- </SubmitButton>++ </FormSubmitButton>+ </FormButtons>+ </Form>+ );+ }--export default AttributionParameters;diff --cc src/app/(main)/reports/attribution/AttributionReport.tsxindex 000000000,c33a4195d..2508b0890mode 000000,100644..100644--- a/src/app/(main)/reports/attribution/AttributionReport.tsx+++ b/src/app/(main)/reports/attribution/AttributionReport.tsx@@@ -1,0 -1,27 +1,27 @@@-import Money from '@/assets/money.svg';++import { Icons } from '@/components/icons';+ import { REPORT_TYPES } from '@/lib/constants';-import Report from '../[reportId]/Report';-import ReportBody from '../[reportId]/ReportBody';-import ReportHeader from '../[reportId]/ReportHeader';-import ReportMenu from '../[reportId]/ReportMenu';-import AttributionParameters from './AttributionParameters';-import AttributionView from './AttributionView';++import { Report } from '../[reportId]/Report';++import { ReportBody } from '../[reportId]/ReportBody';++import { ReportHeader } from '../[reportId]/ReportHeader';++import { ReportMenu } from '../[reportId]/ReportMenu';++import { AttributionParameters } from './AttributionParameters';++import { AttributionView } from './AttributionView';++ const defaultParameters = {+ type: REPORT_TYPES.attribution,+ parameters: { model: 'firstClick', steps: [] },+ };++ export default function AttributionReport({ reportId }: { reportId?: string }) {+ return (+ <Report reportId={reportId} defaultParameters={defaultParameters}>- <ReportHeader icon={<Money />} />++ <ReportHeader icon={<Icons.Network />} />+ <ReportMenu>+ <AttributionParameters />+ </ReportMenu>+ <ReportBody>+ <AttributionView />+ </ReportBody>+ </Report>+ );+ }diff --cc src/app/(main)/reports/attribution/AttributionStepAddForm.tsxindex 000000000,d36b05914..8a81c06f8mode 000000,100644..100644--- a/src/app/(main)/reports/attribution/AttributionStepAddForm.tsx+++ b/src/app/(main)/reports/attribution/AttributionStepAddForm.tsx@@@ -1,0 -1,80 +1,77 @@@+ import { useState } from 'react';+ import { useMessages } from '@/components/hooks';-import { Button, FormRow, TextField, Flexbox, Dropdown, Item } from 'react-basics';-import styles from './AttributionStepAddForm.module.css';++import {++ Button,++ FormButtons,++ FormField,++ TextField,++ Row,++ Column,++ Select,++ ListItem,++} from '@umami/react-zen';++ export interface AttributionStepAddFormProps {+ type?: string;+ value?: string;+ onChange?: (step: { type: string; value: string }) => void;+ }++ export function AttributionStepAddForm({+ type: defaultType = 'url',+ value: defaultValue = '',+ onChange,+ }: AttributionStepAddFormProps) {+ const [type, setType] = useState(defaultType);+ const [value, setValue] = useState(defaultValue);+ const { formatMessage, labels } = useMessages();+ const items = [- { label: formatMessage(labels.url), value: 'url' },- { label: formatMessage(labels.event), value: 'event' },++ { id: 'url', label: formatMessage(labels.url), value: 'url' },++ { id: 'event', label: formatMessage(labels.event), value: 'event' },+ ];+ const isDisabled = !type || !value;++ const handleSave = () => {+ onChange({ type, value });+ setValue('');+ };++ const handleChange = e => {+ setValue(e.target.value);+ };++ const handleKeyDown = e => {+ if (e.key === 'Enter') {+ e.stopPropagation();+ handleSave();+ }+ };+- const renderTypeValue = (value: any) => {- return items.find(item => item.value === value)?.label;- };-+ return (- <Flexbox direction="column" gap={10}>- <FormRow label={formatMessage(defaultValue ? labels.update : labels.add)}>- <Flexbox gap={10}>- <Dropdown- className={styles.dropdown}- items={items}- value={type}- renderValue={renderTypeValue}- onChange={(value: any) => setType(value)}- >- {({ value, label }) => {- return <Item key={value}>{label}</Item>;++ <Column gap>++ <FormField name="steps" label={formatMessage(defaultValue ? labels.update : labels.add)}>++ <Row>++ <Select items={items} value={type} onChange={(value: any) => setType(value)}>++ {({ value, label }: any) => {++ return <ListItem key={value}>{label}</ListItem>;+ }}- </Dropdown>++ </Select>+ <TextField- className={styles.input}+ value={value}+ onChange={handleChange}+ autoFocus={true}+ autoComplete="off"+ onKeyDown={handleKeyDown}+ />- </Flexbox>- </FormRow>- <FormRow>- <Button variant="primary" onClick={handleSave} disabled={isDisabled}>++ </Row>++ </FormField>++ <FormButtons>++ <Button variant="primary" onClick={handleSave} isDisabled={isDisabled}>+ {formatMessage(defaultValue ? labels.update : labels.add)}+ </Button>- </FormRow>- </Flexbox>++ </FormButtons>++ </Column>+ );+ }++ export default AttributionStepAddForm;diff --cc src/app/(main)/reports/attribution/AttributionView.tsxindex 000000000,e5b224517..3e560f36emode 000000,100644..100644--- a/src/app/(main)/reports/attribution/AttributionView.tsx+++ b/src/app/(main)/reports/attribution/AttributionView.tsx@@@ -1,0 -1,134 +1,133 @@@-import PieChart from '@/components/charts/PieChart';++import { useContext } from 'react';++import { PieChart } from '@/components/charts/PieChart';+ import { useMessages } from '@/components/hooks';-import { Grid, GridRow } from '@/components/layout/Grid';-import ListTable from '@/components/metrics/ListTable';-import MetricCard from '@/components/metrics/MetricCard';-import MetricsBar from '@/components/metrics/MetricsBar';++import { GridRow } from '@/components/common/GridRow';++import { ListTable } from '@/components/metrics/ListTable';++import { MetricCard } from '@/components/metrics/MetricCard';++import { MetricsBar } from '@/components/metrics/MetricsBar';+ import { CHART_COLORS } from '@/lib/constants';+ import { formatLongNumber } from '@/lib/format';-import { useContext } from 'react';+ import { ReportContext } from '../[reportId]/Report';-import styles from './AttributionView.module.css';++ export interface AttributionViewProps {+ isLoading?: boolean;+ }++ export function AttributionView({ isLoading }: AttributionViewProps) {+ const { formatMessage, labels } = useMessages();+ const { report } = useContext(ReportContext);+ const {+ data,+ parameters: { currency },+ } = report || {};+ const ATTRIBUTION_PARAMS = [+ { value: 'referrer', label: formatMessage(labels.referrers) },+ { value: 'paidAds', label: formatMessage(labels.paidAds) },+ ];++ if (!data) {+ return null;+ }++ const { pageviews, visitors, visits } = data.total;++ const metrics = data+ ? [+ {+ value: pageviews,+ label: formatMessage(labels.views),+ formatValue: formatLongNumber,+ },+ {+ value: visits,+ label: formatMessage(labels.visits),+ formatValue: formatLongNumber,+ },+ {+ value: visitors,+ label: formatMessage(labels.visitors),+ formatValue: formatLongNumber,+ },+ ]+ : [];++ function UTMTable(UTMTableProps: { data: any; title: string; utm: string }) {+ const { data, title, utm } = UTMTableProps;+ const total = data[utm].reduce((sum, { value }) => {+ return +sum + +value;+ }, 0);++ return (+ <ListTable+ title={title}+ metric={formatMessage(currency ? labels.revenue : labels.visitors)}+ currency={currency}+ data={data[utm].map(({ name, value }) => ({+ x: name,+ y: Number(value),+ z: (value / total) * 100,+ }))}+ />+ );+ }++ return (- <div className={styles.container}>++ <div>+ <MetricsBar isFetched={data}>+ {metrics?.map(({ label, value, formatValue }) => {+ return <MetricCard key={label} value={value} label={label} formatValue={formatValue} />;+ })}+ </MetricsBar>+ {ATTRIBUTION_PARAMS.map(({ value, label }) => {+ const items = data[value];+ const total = items.reduce((sum, { value }) => {+ return +sum + +value;+ }, 0);++ const chartData = {+ labels: items.map(({ name }) => name),+ datasets: [+ {+ data: items.map(({ value }) => value),+ backgroundColor: CHART_COLORS,+ borderWidth: 0,+ },+ ],+ };++ return (- <div key={value} className={styles.row}>++ <div key={value}>+ <div>- <div className={styles.title}>{label}</div>++ <div>{label}</div>+ <ListTable+ metric={formatMessage(currency ? labels.revenue : labels.visitors)}+ currency={currency}+ data={items.map(({ name, value }) => ({+ x: name,+ y: Number(value),+ z: (value / total) * 100,+ }))}+ />+ </div>+ <div>+ <PieChart type="doughnut" data={chartData} isLoading={isLoading} />+ </div>+ </div>+ );+ })}- <Grid>++ <>+ <GridRow columns="two">+ <UTMTable data={data} title={formatMessage(labels.sources)} utm={'utm_source'} />+ <UTMTable data={data} title={formatMessage(labels.medium)} utm={'utm_medium'} />+ </GridRow>+ <GridRow columns="three">+ <UTMTable data={data} title={formatMessage(labels.campaigns)} utm={'utm_campaign'} />+ <UTMTable data={data} title={formatMessage(labels.content)} utm={'utm_content'} />+ <UTMTable data={data} title={formatMessage(labels.terms)} utm={'utm_term'} />+ </GridRow>- </Grid>++ </>+ </div>+ );+ }++ export default AttributionView;diff --cc src/app/(main)/reports/create/ReportTemplates.tsxindex 62a7bfcc0,292b7322e..3ec0df509--- a/src/app/(main)/reports/create/ReportTemplates.tsx+++ b/src/app/(main)/reports/create/ReportTemplates.tsx@@@ -49,8 -57,14 +49,14 @@@ export function ReportTemplates({ showHtitle: formatMessage(labels.revenue),description: formatMessage(labels.revenueDescription),url: renderTeamUrl('/reports/revenue'),- icon: <Money />,+ icon: <Icons.Money />,},+ {+ title: formatMessage(labels.attribution),+ description: formatMessage(labels.attributionDescription),+ url: renderTeamUrl('/reports/attribution'),- icon: <Network />,++ icon: <Icons.Network />,+ },];return (diff --cc src/app/(main)/reports/funnel/FunnelStepAddForm.tsxindex 8069dc0fd,d7917d7d9..ddd315b6a--- a/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx+++ b/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx@@@ -27,8 -18,8 +27,8 @@@ export function FunnelStepAddForm(const [value, setValue] = useState(defaultValue);const { formatMessage, labels } = useMessages();const items = [-- { label: formatMessage(labels.url), value: 'url' },-- { label: formatMessage(labels.event), value: 'event' },++ { id: 'url', label: formatMessage(labels.url), value: 'url' },++ { id: 'event', label: formatMessage(labels.event), value: 'event' },];const isDisabled = !type || !value;diff --cc src/app/(main)/websites/[websiteId]/events/EventsPage.tsxindex 1c15d24d9,285a230e8..fb93a8601--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@@ -1,53 -1,50 +1,70 @@@'use client';-import WebsiteHeader from '../WebsiteHeader';-import EventsDataTable from './EventsDataTable';-import EventsMetricsBar from './EventsMetricsBar';-import EventsChart from '@/components/metrics/EventsChart';-import { GridRow } from '@/components/layout/Grid';-import EventsTable from '@/components/metrics/EventsTable';-import { useMessages } from '@/components/hooks';-import { Item, Tabs } from 'react-basics';+import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';++import { EventsTable } from '@/components/metrics/EventsTable';import { useState } from 'react';-import EventProperties from './EventProperties';+import { WebsiteHeader } from '../WebsiteHeader';+import { EventsDataTable } from './EventsDataTable';+import { EventsMetricsBar } from './EventsMetricsBar';+import { Panel } from '@/components/common/Panel';+import { EventsChart } from '@/components/metrics/EventsChart';+import { GridRow } from '@/components/common/GridRow';+import { MetricsTable } from '@/components/metrics/MetricsTable';+import { useMessages } from '@/components/hooks';+import { EventProperties } from './EventProperties';-export default function EventsPage({ websiteId }) {+export function EventsPage({ websiteId }) {+ const [label, setLabel] = useState(null);const [tab, setTab] = useState('activity');const { formatMessage, labels } = useMessages();+ const handleLabelClick = (value: string) => {+ setLabel(value !== label ? value : '');+ };+return (- <>+ <Column gap="3"><WebsiteHeader websiteId={websiteId} />+ <Panel>+ <EventsMetricsBar websiteId={websiteId} />+ </Panel>+ <GridRow layout="two-one">+ <Panel gridColumn="span 2">+ <EventsChart websiteId={websiteId} />+ </Panel>+ <Panel>+ <MetricsTable+ websiteId={websiteId}+ type="event"+ title={formatMessage(labels.events)}+ metric={formatMessage(labels.actions)}+ />+ </Panel>+ </GridRow>+ <EventsMetricsBar websiteId={websiteId} />+ <GridRow columns="two-one">+ <EventsChart websiteId={websiteId} focusLabel={label} />+ <EventsTable+ websiteId={websiteId}+ type="event"+ title={formatMessage(labels.events)}+ metric={formatMessage(labels.actions)}+ onLabelClick={handleLabelClick}+ />+ </GridRow>- <div>- <Tabs- selectedKey={tab}- onSelect={(value: any) => setTab(value)}- style={{ marginBottom: 30 }}- >- <Item key="activity">{formatMessage(labels.activity)}</Item>- <Item key="properties">{formatMessage(labels.properties)}</Item>+ <Panel marginY="6">+ <Tabs selectedKey={tab} onSelectionChange={(value: any) => setTab(value)}>+ <TabList>+ <Tab id="activity">{formatMessage(labels.activity)}</Tab>+ <Tab id="properties">{formatMessage(labels.properties)}</Tab>+ </TabList>+ <TabPanel id="activity">+ <EventsDataTable websiteId={websiteId} />+ </TabPanel>+ <TabPanel id="properties">+ <EventProperties websiteId={websiteId} />+ </TabPanel></Tabs>- {tab === 'activity' && <EventsDataTable websiteId={websiteId} />}- {tab === 'properties' && <EventProperties websiteId={websiteId} />}- </div>- </>+ </Panel>+ </Column>);}diff --cc src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsxindex f87bb1dec,e6d8d2ab8..2a5f62e4e--- a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx@@@ -1,21 -1,19 +1,21 @@@'use client';import { firstBy } from 'thenby';-import { Grid, GridRow } from '@/components/layout/Grid';-import Page from '@/components/layout/Page';-import RealtimeChart from '@/components/metrics/RealtimeChart';-import WorldMap from '@/components/metrics/WorldMap';-import { useRealtime } from '@/components/hooks';-import RealtimeLog from './RealtimeLog';-import RealtimeHeader from './RealtimeHeader';-import RealtimeUrls from './RealtimeUrls';-import RealtimeCountries from './RealtimeCountries';-import WebsiteHeader from '../WebsiteHeader';+import { Grid } from '@umami/react-zen';+import { GridRow } from '@/components/common/GridRow';+import { Page } from '@/components/common/Page';+import { Panel } from '@/components/common/Panel';+import { RealtimeChart } from '@/components/metrics/RealtimeChart';+import { WorldMap } from '@/components/metrics/WorldMap';+import { useRealtimeQuery } from '@/components/hooks';+import { RealtimeLog } from './RealtimeLog';+import { RealtimeHeader } from './RealtimeHeader';+import { RealtimeUrls } from './RealtimeUrls';+import { RealtimeCountries } from './RealtimeCountries';+import { WebsiteHeader } from '../WebsiteHeader';import { percentFilter } from '@/lib/filters';- export function WebsiteRealtimePage({ websiteId }) {+ export function WebsiteRealtimePage({ websiteId }: { websiteId: string }) {- const { data, isLoading, error } = useRealtime(websiteId);+ const { data, isLoading, error } = useRealtimeQuery(websiteId);if (isLoading || error) {return <Page isLoading={isLoading} error={error} />;diff --cc src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsxindex c5594ea7d,0c7b96b89..ddb4318da--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx@@@ -11,43 -12,35 +11,43 @@@ export function SessionInfo({ data })const { getRegionName } = useRegionNames(locale);return (- <div className={styles.info}>- <dl>- <dt>ID</dt>- <dd>- {data?.id} <CopyIcon value={data?.id} />- </dd>+ <Column gap="6">+ <Box>+ <Label>ID</Label>+ <TextField value={data?.id} allowCopy />+ </Box>- <dt>{formatMessage(labels.lastSeen)}</dt>- <dd>{formatTimezoneDate(data?.lastAt, 'PPPPpp')}</dd>+ <Box>+ <Label>{formatMessage(labels.lastSeen)}</Label>+ <Row>{formatTimezoneDate(data?.lastAt, 'PPPPpp')}</Row>+ </Box>- <dt>{formatMessage(labels.firstSeen)}</dt>- <dd>{formatTimezoneDate(data?.firstAt, 'PPPPpp')}</dd>+ <Box>+ <Label>{formatMessage(labels.firstSeen)}</Label>+ <Row>{formatTimezoneDate(data?.firstAt, 'PPPPpp')}</Row>+ </Box>- <dt>{formatMessage(labels.country)}</dt>- <dd>+ <Box>+ <Label>{formatMessage(labels.country)}</Label>+ <Row gap="3"><TypeIcon type="country" value={data?.country} />- {formatValue(data?.country, 'country')}- </dd>+ <Text>{formatValue(data?.country, 'country')}</Text>+ </Row>+ </Box>- <Box>- <dt>{formatMessage(labels.region)}</dt>- <dd>++ <Row>+ <Label>{formatMessage(labels.region)}</Label>+ <Row gap="3"><Icon><Icons.Location /></Icon>- <Text>{getRegionName(data?.subdivision1)}</Text>+ {getRegionName(data?.region)}- </dd>+ </Row>- </Box>++ </Row>- <dt>{formatMessage(labels.city)}</dt>- <dd>+ <Box>+ <Label>{formatMessage(labels.city)}</Label>+ <Row gap="3"><Icon><Icons.Location /></Icon>diff --cc src/components/charts/Chart.tsxindex 9890b3ae5,a21086bf4..5cf621b99--- a/src/components/charts/Chart.tsx+++ b/src/components/charts/Chart.tsx@@@ -131,9 -132,19 +127,19 @@@ export function Chart(setLegendItems(chart.current.legend.legendItems);};+ useEffect(() => {+ if (data) {+ if (!chart.current) {+ createChart(data);+ } else {+ updateChart(data);+ }+ }+ }, [data, options]);+return (<>- <div className={classNames(styles.chart, className)}>+ <div {...props}>{isLoading && <Loading position="page" icon="dots" />}<canvas ref={canvas} /></div>diff --cc src/components/metrics/EventsChart.tsxindex 514b0e76c,594a69f7c..ed262b608--- a/src/components/metrics/EventsChart.tsx+++ b/src/components/metrics/EventsChart.tsx@@@ -1,9 -1,9 +1,9 @@@+ import { useMemo, useState, useEffect } from 'react';import { colord } from 'colord';-import BarChart from '@/components/charts/BarChart';-import { useDateRange, useLocale, useWebsiteEventsSeries } from '@/components/hooks';+import { BarChart } from '@/components/charts/BarChart';+import { useDateRange, useLocale, useWebsiteEventsSeriesQuery } from '@/components/hooks';import { renderDateLabels } from '@/lib/charts';import { CHART_COLORS } from '@/lib/constants';- import { useMemo } from 'react';export interface EventsChartProps {websiteId: string;@@@ -15,7 -16,8 +16,8 @@@ export function EventsChart({ websiteIddateRange: { startDate, endDate, unit, value },} = useDateRange(websiteId);const { locale } = useLocale();- const { data, isLoading } = useWebsiteEventsSeries(websiteId);+ const { data, isLoading } = useWebsiteEventsSeriesQuery(websiteId);+ const [label, setLabel] = useState<string>(focusLabel);const chartData = useMemo(() => {if (!data) return [];diff --cc src/components/metrics/EventsTable.tsxindex 9b6fa4860,45b810941..c80089227--- a/src/components/metrics/EventsTable.tsx+++ b/src/components/metrics/EventsTable.tsx@@@ -1,12 -1,28 +1,28 @@@-import MetricsTable, { MetricsTableProps } from './MetricsTable';+import { MetricsTable, MetricsTableProps } from './MetricsTable';import { useMessages } from '@/components/hooks';- export function EventsTable(props: MetricsTableProps) {+ export interface EventsTableProps extends MetricsTableProps {+ onLabelClick?: (value: string) => void;+ }++ export function EventsTable({ onLabelClick, ...props }: EventsTableProps) {const { formatMessage, labels } = useMessages();- function handleDataLoad(data: any) {+ const handleDataLoad = (data: any) => {props.onDataLoad?.(data);- }+ };++ const renderLabel = ({ x: label }) => {+ if (onLabelClick) {+ return (+ <div onClick={() => onLabelClick(label)} style={{ cursor: 'pointer' }}>+ {label}+ </div>+ );+ }++ return label;+ };return (<MetricsTablediff --cc src/components/metrics/ListTable.tsxindex fd89d868f,f5dbbee53..b718738ea--- a/src/components/metrics/ListTable.tsx+++ b/src/components/metrics/ListTable.tsx@@@ -1,11 -1,10 +1,11 @@@-import Empty from '@/components/common/Empty';-import { useMessages } from '@/components/hooks';-import { formatLongCurrency, formatLongNumber } from '@/lib/format';-import { animated, config, useSpring } from '@react-spring/web';-import classNames from 'classnames';import { ReactNode } from 'react';import { FixedSizeList } from 'react-window';+import { useSpring, config } from '@react-spring/web';+import classNames from 'classnames';+import { AnimatedDiv } from '@/components/common/AnimatedDiv';+import { Empty } from '@/components/common/Empty';- import { formatLongNumber } from '@/lib/format';+import { useMessages } from '@/components/hooks';++import { formatLongCurrency, formatLongNumber } from '@/lib/format';import styles from './ListTable.module.css';const ITEM_SIZE = 30;@@@ -95,9 -105,11 +106,11 @@@ const AnimatedRow = (<div className={styles.label}>{label}</div><div className={styles.value}>{change}- <animated.div className={styles.value} title={props?.y as any}>+ <AnimatedDiv className={styles.value} title={props?.y as any}>- {props.y?.to(formatLongNumber)}+ {currency+ ? props.y?.to(n => formatLongCurrency(n, currency))+ : props.y?.to(formatLongNumber)}- </animated.div>+ </AnimatedDiv></div>{showPercentage && (<div className={styles.percent}>diff --cc src/components/svg/index.tsindex 0076b6e70,000000000..77a36c837mode 100644,000000..100644--- a/src/components/svg/index.ts+++ b/src/components/svg/index.ts@@@ -1,41 -1,0 +1,42 @@@+export { default as AddUser } from './AddUser';+export { default as BarChart } from './BarChart';+export { default as Bars } from './Bars';+export { default as Bolt } from './Bolt';+export { default as Bookmark } from './Bookmark';+export { default as Calendar } from './Calendar';+export { default as Change } from './Change';+export { default as Clock } from './Clock';+export { default as Compare } from './Compare';+export { default as Dashboard } from './Dashboard';+export { default as Expand } from './Expand';+export { default as Eye } from './Eye';+export { default as Flag } from './Flag';+export { default as Funnel } from './Funnel';+export { default as Gear } from './Gear';+export { default as Globe } from './Globe';+export { default as Lightbulb } from './Lightbulb';+export { default as Lightning } from './Lightning';+export { default as Link } from './Link';+export { default as Location } from './Location';+export { default as Lock } from './Lock';+export { default as LogoWhite } from './LogoWhite';+export { default as Logo } from './Logo';+export { default as Magnet } from './Magnet';+export { default as Money } from './Money';+export { default as Moon } from './Moon';++export { default as Network } from './Network';+export { default as Nodes } from './Nodes';+export { default as Overview } from './Overview';+export { default as Path } from './Path';+export { default as Profile } from './Profile';+export { default as Pushpin } from './Pushpin';+export { default as Redo } from './Redo';+export { default as Reports } from './Reports';+export { default as Speaker } from './Speaker';+export { default as Sun } from './Sun';+export { default as Tag } from './Tag';+export { default as Target } from './Target';+export { default as User } from './User';+export { default as Users } from './Users';+export { default as Visitor } from './Visitor';+export { default as Website } from './Website';diff --cc src/declaration.d.tsindex 7dff68b86,7dff68b86..67c570c14--- a/src/declaration.d.ts+++ b/src/declaration.d.ts@@@ -2,5 -2,5 +2,7 @@@ declare module 'bcryptjs'declare module 'chartjs-adapter-date-fns';declare module 'cors';declare module 'debug';++declare module 'fs-extra';declare module 'jsonwebtoken';declare module 'md5';++declare module 'prettier';