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
Add revenue chart cumulative mode.
Francis Caoc6ec8385c974
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 99351008a..743ebae88 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -328,45 +328,6 @@ importers:specifier: ^4.1.5version: 4.1.5(@types/[email protected])([email protected])([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))- dist:- dependencies:- chart.js:- specifier: ^4.5.0- version: 4.5.1- chartjs-adapter-date-fns:- specifier: ^3.0.0- version: 3.0.0([email protected])([email protected])- colord:- specifier: ^2.9.2- version: 2.9.3- jsonwebtoken:- specifier: ^9.0.2- version: 9.0.3- lucide-react:- specifier: ^0.542.0- version: 0.542.0([email protected])- pure-rand:- specifier: ^7.0.1- version: 7.0.1- react-simple-maps:- specifier: ^2.3.0- react-use-measure:- specifier: ^2.0.4- react-window:- specifier: ^1.8.6- serialize-error:- specifier: ^12.0.0- version: 12.0.0- thenby:- specifier: ^1.3.4- version: 1.4.0- uuid:- specifier: ^11.1.0- version: 11.1.1-packages:'@adobe/[email protected]':@@ -539,28 +500,24 @@ packages:engines: {node: '>=14.21.3'}cpu: [arm64]os: [linux]- libc: [musl]'@biomejs/[email protected]':resolution: {integrity: sha512-tOwuCuZZtKi1jVzbk/5nXmIsziOB6yqN8c9r9QM0EJYPU6DpQWf11uBOSCfFKKM4H3d9ZoarvlgMfbcuD051Pw==}engines: {node: '>=14.21.3'}cpu: [arm64]os: [linux]- libc: [glibc]'@biomejs/[email protected]':resolution: {integrity: sha512-dwTIgZrGutzhkQCuvHynCkyW6hJxUuyZqKKO0YNfaS2GUoRO+tOvxXZqZB6SkWAOdfZTzwaw8IEdUnIkHKHoew==}engines: {node: '>=14.21.3'}cpu: [x64]os: [linux]- libc: [musl]'@biomejs/[email protected]':resolution: {integrity: sha512-8pFeAnLU9QdW9jCIslB/v82bI0lhBmz2ZAKc8pVMFPO0t0wAHsoEkrUQUbMkIorTRIjbqyNZHA3lEXavsPWYSw==}engines: {node: '>=14.21.3'}cpu: [x64]os: [linux]- libc: [glibc]'@biomejs/[email protected]':resolution: {integrity: sha512-B0DLnx0vA9ya/3v7XyCaP+/lCpnbWbMOfUFFve+xb5OxyYvdHaS55YsSddr228Y+JAFk58agCuZTsqNiw2a6ig==}@@ -1518,105 +1475,89 @@ packages:resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}cpu: [arm64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}cpu: [arm]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}cpu: [ppc64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}cpu: [riscv64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}cpu: [s390x]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}cpu: [x64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}cpu: [arm64]os: [linux]- libc: [musl]'@img/[email protected]':resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}cpu: [x64]os: [linux]- libc: [musl]'@img/[email protected]':resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [arm64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [arm]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [ppc64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [riscv64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [s390x]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [x64]os: [linux]- libc: [glibc]'@img/[email protected]':resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [arm64]os: [linux]- libc: [musl]'@img/[email protected]':resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}cpu: [x64]os: [linux]- libc: [musl]'@img/[email protected]':resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}@@ -1758,28 +1699,24 @@ packages:engines: {node: '>= 10'}cpu: [arm64]os: [linux]- libc: [glibc]'@next/[email protected]':resolution: {integrity: sha512-iVMMp14514u7Nup2umQS03nT/bN9HurK8ufylC3FZNykrwjtx7V1A7+4kvhbDSCeonTVqV3Txnv0Lu+m2oDXNg==}engines: {node: '>= 10'}cpu: [arm64]os: [linux]- libc: [musl]'@next/[email protected]':resolution: {integrity: sha512-EZOvm1aQWgnI/N/xcWOlnS3RQBk0VtVav5Zo7n4p0A7UKyTDx047k8opDbXgBpHl4CulRqRfbw3QrX2w5UOXMQ==}engines: {node: '>= 10'}cpu: [x64]os: [linux]- libc: [glibc]'@next/[email protected]':resolution: {integrity: sha512-h9FxsngCm9cTBf71AR4fGznDEDx1hS7+kSEiIRjq5kO1oXWm07DxVGZjCvk0SGx7TSjlUqhI8oOyz7NfwAdPoA==}engines: {node: '>= 10'}cpu: [x64]os: [linux]- libc: [musl]'@next/[email protected]':resolution: {integrity: sha512-3NdJV5OXMSOeJYijX+bjaLge3mJBlh4ybydbT4GFoB/2hAojWHtMhl3CYlYoMrjPuodp0nzFVi4Tj2+WaMg+Ow==}@@ -1849,42 +1786,36 @@ packages:engines: {node: '>= 10.0.0'}cpu: [arm]os: [linux]- libc: [glibc]'@parcel/[email protected]':resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}engines: {node: '>= 10.0.0'}cpu: [arm]os: [linux]- libc: [musl]'@parcel/[email protected]':resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}engines: {node: '>= 10.0.0'}cpu: [arm64]os: [linux]- libc: [glibc]'@parcel/[email protected]':resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}engines: {node: '>= 10.0.0'}cpu: [arm64]os: [linux]- libc: [musl]'@parcel/[email protected]':resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}engines: {node: '>= 10.0.0'}cpu: [x64]os: [linux]- libc: [glibc]'@parcel/[email protected]':resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}engines: {node: '>= 10.0.0'}cpu: [x64]os: [linux]- libc: [musl]'@parcel/[email protected]':resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==}@@ -2199,42 +2130,36 @@ packages:engines: {node: ^20.19.0 || >=22.12.0}cpu: [arm64]os: [linux]- libc: [glibc]'@rolldown/[email protected]':resolution: {integrity: sha512-QWjdxN1HJCpBTAcZ5N5F7wju3gVPzRzSpmGzx7na0c/1qpN9CFil+xt+l9lV/1M6/gqHSNXCiqPfwhVJPeLnug==}engines: {node: ^20.19.0 || >=22.12.0}cpu: [arm64]os: [linux]- libc: [musl]'@rolldown/[email protected]':resolution: {integrity: sha512-ugCOyj7a4d9h3q9B+wXmf6g3a68UsjGh6dob5DHevHGMwDUbhsYNbSPxJsENcIttJZ9jv7qGM2UesLw5jqIhdg==}engines: {node: ^20.19.0 || >=22.12.0}cpu: [ppc64]os: [linux]- libc: [glibc]'@rolldown/[email protected]':resolution: {integrity: sha512-kKWRhbsotpXkGbcd5dllUWg5gEXcDAa8u5YnP9AV5DYNbvJHGzzuwv7dpmhc8NqKMJldl0a+x76IHbspEpEmdA==}engines: {node: ^20.19.0 || >=22.12.0}cpu: [s390x]os: [linux]- libc: [glibc]'@rolldown/[email protected]':resolution: {integrity: sha512-uCo8ElcCIAMyYAZyuIZ81oFkhTSIllNvUCHCAlbhlN4ji3uC28h7IIdlXyIvGO7HsuqnV9p3rD/bpH7XhIyhRw==}engines: {node: ^20.19.0 || >=22.12.0}cpu: [x64]os: [linux]- libc: [glibc]'@rolldown/[email protected]':resolution: {integrity: sha512-XNOQZtuE6yUIvx4rwGemwh8kpL1xvU41FXy/s9K7T/3JVcqGzo3NfKM2HrbrGgfPYGFW42f07Wk++aOC6B9NWA==}engines: {node: ^20.19.0 || >=22.12.0}cpu: [x64]os: [linux]- libc: [musl]'@rolldown/[email protected]':resolution: {integrity: sha512-tSn/kzrfa7tNOXr7sEacDBN4YsIqTyLqh45IO0nHDwtpKIDNDJr+VFojt+4klSpChxB29JLyduSsE0MKEwa65A==}@@ -2381,79 +2306,66 @@ packages:resolution: {integrity: sha512-L+34Qqil+v5uC0zEubW7uByo78WOCIrBvci69E7sFASRl0X7b/MB6Cqd1lky/CtcSVTydWa2WZwFuWexjS5o6g==}cpu: [arm]os: [linux]- libc: [glibc]'@rollup/[email protected]':resolution: {integrity: sha512-n83O8rt4v34hgFzlkb1ycniJh7IR5RCIqt6mz1VRJD6pmhRi0CXdmfnLu9dIUS6buzh60IvACM842Ffb3xd6Gg==}cpu: [arm]os: [linux]- libc: [musl]'@rollup/[email protected]':resolution: {integrity: sha512-Nql7sTeAzhTAja3QXeAI48+/+GjBJ+QmAH13snn0AJSNL50JsDqotyudHyMbO2RbJkskbMbFJfIJKWA6R1LCJQ==}cpu: [arm64]os: [linux]- libc: [glibc]'@rollup/[email protected]':resolution: {integrity: sha512-+pUymDhd0ys9GcKZPPWlFiZ67sTWV5UU6zOJat02M1+PiuSGDziyRuI/pPue3hoUwm2uGfxdL+trT6Z9rxnlMA==}cpu: [arm64]os: [linux]- libc: [musl]'@rollup/[email protected]':resolution: {integrity: sha512-VSvgvQeIcsEvY4bKDHEDWcpW4Yw7BtlKG1GUT4FzBUlEKQK0rWHYBqQt6Fm2taXS+1bXvJT6kICu5ZwqKCnvlQ==}cpu: [loong64]os: [linux]- libc: [glibc]'@rollup/[email protected]':resolution: {integrity: sha512-4LqhUomJqwe641gsPp6xLfhqWMbQV04KtPp7/dIp0nzPxAkNY1AbwL5W0MQpcalLYk07vaW9Kp1PBhdpZYYcEw==}cpu: [loong64]os: [linux]- libc: [musl]'@rollup/[email protected]':resolution: {integrity: sha512-tLQQ9aPvkBxOc/EUT6j3pyeMD6Hb8QF2BTBnCQWP/uu1lhc9AIrIjKnLYMEroIz/JvtGYgI9dF3AxHZNaEH0rw==}cpu: [ppc64]os: [linux]- libc: [glibc]'@rollup/[email protected]':resolution: {integrity: sha512-RMxFhJwc9fSXP6PqmAz4cbv3kAyvD1etJFjTx4ONqFP9DkTkXsAMU4v3Vyc5BgzC+anz7nS/9tp4obsKfqkDHg==}cpu: [ppc64]os: [linux]- libc: [musl]'@rollup/[email protected]':resolution: {integrity: sha512-QKgFl+Yc1eEk6MmOBfRHYF6lTxiiiV3/z/BRrbSiW2I7AFTXoBFvdMEyglohPj//2mZS4hDOqeB0H1ACh3sBbg==}cpu: [riscv64]os: [linux]- libc: [glibc]'@rollup/[email protected]':resolution: {integrity: sha512-RAjXjP/8c6ZtzatZcA1RaQr6O1TRhzC+adn8YZDnChliZHviqIjmvFwHcxi4JKPSDAt6Uhf/7vqcBzQJy0PDJg==}cpu: [riscv64]os: [linux]- libc: [musl]'@rollup/[email protected]':resolution: {integrity: sha512-wcuocpaOlaL1COBYiA89O6yfjlp3RwKDeTIA0hM7OpmhR1Bjo9j31G1uQVpDlTvwxGn2nQs65fBFL5UFd76FcQ==}cpu: [s390x]os: [linux]- libc: [glibc]'@rollup/[email protected]':resolution: {integrity: sha512-77PpsFQUCOiZR9+LQEFg9GClyfkNXj1MP6wRnzYs0EeWbPcHs02AXu4xuUbM1zhwn3wqaizle3AEYg5aeoohhg==}cpu: [x64]os: [linux]- libc: [glibc]'@rollup/[email protected]':resolution: {integrity: sha512-5cIATbk5vynAjqqmyBjlciMJl1+R/CwX9oLk/EyiFXDWd95KpHdrOJT//rnUl4cUcskrd0jCCw3wpZnhIHdD9w==}cpu: [x64]os: [linux]- libc: [musl]'@rollup/[email protected]':resolution: {integrity: sha512-cl0w09WsCi17mcmWqqglez9Gk8isgeWvoUZ3WiJFYSR3zjBQc2J5/ihSjpl+VLjPqjQ/1hJRcqBfLjssREQILw==}@@ -2606,42 +2518,36 @@ packages:engines: {node: '>=10'}cpu: [arm64]os: [linux]- libc: [glibc]'@swc/[email protected]':resolution: {integrity: sha512-iNlbvTIo425rkKzDLLWFJGnFXr3myETUdIDHcjuiPNZE8b0ogmcAuilC4yEJX7FSHGbnlsoJcCT2xf4b3VJmmQ==}engines: {node: '>=10'}cpu: [arm64]os: [linux]- libc: [musl]'@swc/[email protected]':resolution: {integrity: sha512-AuuEOtG+YXKIjIUup4RsxYNklx6XVB3WKWfhxG6hnfPrn7vp89RNOLbbyyprgj6Sk7k9ulwGVTJElEvmBNPSCA==}engines: {node: '>=10'}cpu: [ppc64]os: [linux]- libc: [glibc]'@swc/[email protected]':resolution: {integrity: sha512-JcMDWQvW1BchUyRg8E0jHiTx7CQYpUr5uDEL1dnPDECrEjBEGG2ynmJ3XX70sWXql0JagqR1t3VpANYFWdUnqA==}engines: {node: '>=10'}cpu: [s390x]os: [linux]- libc: [glibc]'@swc/[email protected]':resolution: {integrity: sha512-FW7V7Mbpq4+PA7BiAq76LJs8MdNuUSylyuRVfQRkhIyeWadFroZ+KOPgjku8Z/fXzngxBRvsk+PGGB0t8mGcjA==}engines: {node: '>=10'}cpu: [x64]os: [linux]- libc: [glibc]'@swc/[email protected]':resolution: {integrity: sha512-w8erqMHsVcdGwUfJxF6LaiTuPoKnyLOcUbhLcxiXrlLt5MLjtlgcIeUY/NWK/oPoyqkgH+/i8pOJnMTxvl83ZQ==}engines: {node: '>=10'}cpu: [x64]os: [linux]- libc: [musl]'@swc/[email protected]':resolution: {integrity: sha512-uDCWCNpUiqkbvPmsuPUTn/P7ag9SqNXD2JT/W3dUu7yZ2krzN+nmmoQ2xRX63/J6RYiHI7aT4jo7Z++lsljlPA==}@@ -4164,28 +4070,24 @@ packages:engines: {node: '>= 12.0.0'}cpu: [arm64]os: [linux]- libc: [glibc]resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}engines: {node: '>= 12.0.0'}cpu: [arm64]os: [linux]- libc: [musl]resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}engines: {node: '>= 12.0.0'}cpu: [x64]os: [linux]- libc: [glibc]resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}engines: {node: '>= 12.0.0'}cpu: [x64]os: [linux]- libc: [musl]resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}@@ -4280,11 +4182,6 @@ packages:resolution: {integrity: sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==}engines: {bun: '>=1.0.0', deno: '>=1.30.0', node: '>=8.0.0'}- resolution: {integrity: sha512-w3hD8/SQB7+lzU2r4VdFyzzOzKnUjTZIF/MQJGSSvni7Llewni4vuViRppfRAa2guOsY5k4jZyxw/i9DQHv+dw==}- peerDependencies:- react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-resolution: {integrity: sha512-D8FvHUGbxWBRQM90NZeIyhAvkFfsh3u9ekrMvJ30Z6gnpBHS6HC6ldLg7tL45hwiIz/u66eKDtdA23gwwGsAHA==}peerDependencies:@@ -4325,9 +4222,6 @@ packages:resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}- resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==}-resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}engines: {node: '>= 0.10.0'}@@ -5215,9 +5109,6 @@ packages:resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}- resolution: {integrity: sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==}-resolution: {integrity: sha512-IoM8YF/jY0hiugFo/wOWqfmarlE6J0wc6fDK1PhftMk7MGhVZl88sZimmqBBFomLOCSmcCCpsfj7wXASCpvK9A==}@@ -5282,13 +5173,6 @@ packages:react: ^18.0.0 || ^19.0.0react-dom: ^18.0.0 || ^19.0.0- resolution: {integrity: sha512-IZVeiPSRZKwD6I/2NvXpQ2uENYGDGZp8DvZjkapcxuJ/LQHTfl+Byb+KNgY7s+iatRA2ad8LnZ3AgqcjziCCsw==}- peerDependencies:- prop-types: ^15.7.2- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x-resolution: {integrity: sha512-vKNFrvpPG8Vyfdjnz5Ne1N56rZlDfHXv5THNXOVZMqbX1rWZA48zQuYT03mx6PAKanqarJu/PDLgshIZAfHHqw==}peerDependencies:@@ -5310,13 +5194,6 @@ packages:react-dom:optional: true- resolution: {integrity: sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==}- engines: {node: '>8.0.0'}- peerDependencies:- react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0- react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-resolution: {integrity: sha512-SH5nvfUQwGHYyriDUAOt7wfPsfG9Qxd6OdzQxl5oQ4dsSsUicqQvjV7dR+NqZ4coY0fUn3w1jnC5PwzIUWEg5w==}peerDependencies:@@ -5521,10 +5398,6 @@ packages:resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==}- resolution: {integrity: sha512-ZYkZLAvKTKQXWuh5XpBw7CdbSzagarX39WyZ2H07CDLC5/KfsRGlIXV8d4+tfqX1M7916mRqR1QfNHSij+c9Pw==}- engines: {node: '>=18'}-resolution: {integrity: sha512-bBZaRwLH9PN5HbLCjPId4dP5bNGEtumcErgOX952IsvOhVPrm3/AeK1y0UHA/QaPG701eg0yEnOKsCOC6X/kaA==}engines: {node: '>=20'}@@ -5921,10 +5794,6 @@ packages:engines: {node: '>=18.0.0'}hasBin: true- resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}- engines: {node: '>=16'}-resolution: {integrity: sha512-8ZiHFm91orbSAe2PSAiSVBVko18pbhbiB3U9GglSzF/zCGkR+rxpHx6sEMCUm4kxY4LjDIUGgCfUMtwfZfjfUA==}engines: {node: '>=20'}@@ -6007,10 +5876,6 @@ packages:resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}- resolution: {integrity: sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==}- hasBin: true-resolution: {integrity: sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==}hasBin: true@@ -9906,10 +9771,6 @@ snapshots:- dependencies:- react: 19.2.5-dependencies:react: 19.2.5@@ -9941,8 +9802,6 @@ snapshots:- [email protected]: {}-@@ -10867,8 +10726,6 @@ snapshots:- [email protected]: {}-@@ -10936,16 +10793,6 @@ snapshots:react: 19.2.5react-dom: 19.2.5([email protected])- dependencies:- d3-geo: 2.0.2- d3-selection: 2.0.0- d3-zoom: 2.0.0- prop-types: 15.8.1- react: 19.2.5- react-dom: 19.2.5([email protected])- topojson-client: 3.1.0-dependencies:d3-geo: 2.0.2@@ -10972,13 +10819,6 @@ snapshots:optionalDependencies:react-dom: 19.2.5([email protected])- dependencies:- '@babel/runtime': 7.29.2- memoize-one: 5.2.1- react: 19.2.5- react-dom: 19.2.5([email protected])-dependencies:react: 19.2.5@@ -11254,10 +11094,6 @@ snapshots:- dependencies:- type-fest: 4.41.0-dependencies:non-error: 0.1.0@@ -11699,8 +11535,6 @@ snapshots:optionalDependencies:fsevents: 2.3.3- [email protected]: {}-dependencies:tagged-tag: 1.0.0@@ -11793,8 +11627,6 @@ snapshots:- [email protected]: {}-diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.jsonindex 48a66f895..b62ed30a0 100644--- a/public/intl/messages/en-US.json+++ b/public/intl/messages/en-US.json@@ -71,6 +71,7 @@"created": "Created","created-by": "Created By","criteria": "Criteria",+ "cumulative": "Cumulative","currency": "Currency","current": "Current","current-password": "Current password",@@ -222,6 +223,7 @@"page-of": "Page {current} of {total}","page-views": "Page views","pageTitle": "Page title",+ "period": "Period","pages": "Pages","paid-ads": "Paid ads","paid-search": "Paid search",diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsxindex 6dce11d8c..e8892ad74 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx@@ -1,4 +1,4 @@-import { Column, Grid, Heading, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';+import { Column, Grid, Heading, ListItem, Row, Select, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';import { useMemo, useState } from 'react';import { DataGrid } from '@/components/common/DataGrid';import { GridRow } from '@/components/common/GridRow';@@ -53,16 +53,29 @@ export interface RevenueProps {unit: string;}+type RevenueChartMode = 'period' | 'cumulative';+export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {const [currency, setCurrency] = useState(getItem(CURRENCY_CONFIG) || process.env.defaultCurrency || DEFAULT_CURRENCY,);+ const {+ router,+ query: { revenueChart },+ updateParams,+ } = useNavigation();+ const revenueChartMode: RevenueChartMode =+ revenueChart === 'cumulative' ? 'cumulative' : 'period';const handleCurrencyChange = (value: string) => {setCurrency(value);setItem(CURRENCY_CONFIG, value);};+ const handleRevenueChartModeChange = (value: RevenueChartMode) => {+ router.push(updateParams({ revenueChart: value }));+ };+const { t, labels } = useMessages();const { compare, isAllTime } = useDateRange();const { data, error, isLoading } = useResultQuery<any>('revenue', {@@ -122,7 +135,16 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {formatValue: formatLongNumber,},] as any;- }, [data]);+ }, [+ data,+ currency,+ t,+ labels.total,+ labels.aov,+ labels.arpu,+ labels.orders,+ labels.uniqueCustomers,+ ]);const renderLabel = (type: string) => (data: any) => <MetricLabel type={type} data={data} />;@@ -150,8 +172,20 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {})}</MetricsBar><Panel>+ <Row justifyContent="end">+ <Select+ value={revenueChartMode}+ onChange={handleRevenueChartModeChange}+ popoverProps={{ placement: 'bottom right' }}+ style={{ width: 140 }}+ >+ <ListItem id="period">{t(labels.period)}</ListItem>+ <ListItem id="cumulative">{t(labels.cumulative)}</ListItem>+ </Select>+ </Row><RevenueChartdata={data.chart}+ mode={revenueChartMode}unit={unit}minDate={startDate}maxDate={endDate}diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsxindex 92d34db43..db0cc1b60 100644--- a/src/components/charts/BarChart.tsx+++ b/src/components/charts/BarChart.tsx@@ -1,5 +1,3 @@-import { useTheme } from '@umami/react-zen';-import { memo, useCallback, useMemo, useState } from 'react';import { Chart, type ChartProps } from '@/components/charts/Chart';import { ChartTooltip } from '@/components/charts/ChartTooltip';import { useLocale } from '@/components/hooks';@@ -7,6 +5,8 @@ import { renderNumberLabels } from '@/lib/charts';import { getThemeColors } from '@/lib/colors';import { DATE_FORMATS, formatDate } from '@/lib/date';import { formatLongCurrency, formatLongNumber } from '@/lib/format';+import { useTheme } from '@umami/react-zen';+import { memo, useCallback, useMemo, useState } from 'react';const MemoChart = memo(Chart);@@ -125,7 +125,7 @@ function BarChartComponent({dateFormats[unit],locale,),- color: labelColors?.[0]?.backgroundColor,+ color: labelColors?.[0]?.borderColor || labelColors?.[0]?.backgroundColor,value: currency? formatLongCurrency(dataPoints[0].raw.y, currency): `${formatLongNumber(dataPoints[0].raw.y)} ${dataPoints[0].dataset.label}`,diff --git a/src/components/messages.ts b/src/components/messages.tsindex e7fdad7e4..c2d42c890 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -256,6 +256,8 @@ export const labels: Record<string, string> = {month: 'label.month',date: 'label.date',pageOf: 'label.page-of',+ period: 'label.period',+ cumulative: 'label.cumulative',create: 'label.create',search: 'label.search',numberOfRecords: 'label.number-of-records',diff --git a/src/components/metrics/RevenueChart.tsx b/src/components/metrics/RevenueChart.tsxindex bed54706b..7b743a36b 100644--- a/src/components/metrics/RevenueChart.tsx+++ b/src/components/metrics/RevenueChart.tsx@@ -1,25 +1,106 @@import { colord } from 'colord';import { useCallback, useMemo } from 'react';import { BarChart } from '@/components/charts/BarChart';-import { useLocale } from '@/components/hooks';+import { useLocale, useMessages } from '@/components/hooks';import { renderDateLabels } from '@/lib/charts';import { CHART_COLORS } from '@/lib/constants';-import { generateTimeSeries } from '@/lib/date';+import { DATE_FORMATS, DATE_FUNCTIONS, formatDate, generateTimeSeries } from '@/lib/date';export interface RevenueChartProps {data: { x: string; t: string; y: number; count: number }[];+ mode?: 'period' | 'cumulative';unit: string;minDate: Date;maxDate: Date;currency: string;}-export function RevenueChart({ data, unit, minDate, maxDate, currency }: RevenueChartProps) {+export function RevenueChart({+ data,+ mode = 'period',+ unit,+ minDate,+ maxDate,+ currency,+}: RevenueChartProps) {+ const { t, labels } = useMessages();const { locale, dateLocale } = useLocale();+ const isCumulative = mode === 'cumulative';const chartData: any = useMemo(() => {if (!data?.length) return { datasets: [] };+ if (isCumulative) {+ const cumulativeMaxDate = maxDate > new Date() ? new Date() : maxDate;+ const cutoff = formatDate(cumulativeMaxDate, DATE_FORMATS[unit], dateLocale);+ const bucketDates = getBucketDates(minDate, maxDate, unit, dateLocale);+ const totals = data.reduce(+ (obj, { t, y }) => {+ obj[t] = (obj[t] || 0) + y;+ return obj;+ },+ {} as Record<string, number>,+ );++ let total = 0;+ const timeseries = generateTimeSeries(+ Object.entries(totals).map(([x, y]) => ({ x, y })),+ minDate,+ maxDate,+ unit,+ dateLocale,+ ).map(point => {+ const d = point.d ?? bucketDates.get(point.x);++ if (point.x > cutoff) {+ return {+ ...point,+ d,+ y: null,+ };+ }++ total += point.y || 0;++ return {+ ...point,+ d,+ y: total,+ };+ });++ const color = colord(CHART_COLORS[0]);++ return {+ datasets: [+ {+ type: 'line',+ label: t(labels.revenue),+ data: timeseries,+ backgroundColor: (context: any) => {+ const { chart } = context;+ const { ctx, chartArea } = chart;++ if (!chartArea) {+ return color.alpha(0.18).toRgbString();+ }++ const gradient = ctx.createLinearGradient(0, chartArea.top, 0, chartArea.bottom);+ gradient.addColorStop(0, color.alpha(0.22).toRgbString());+ gradient.addColorStop(1, color.alpha(0.02).toRgbString());++ return gradient;+ },+ borderColor: color.alpha(0.95).toRgbString(),+ borderWidth: 2,+ pointRadius: 2,+ tension: 0.25,+ fill: true,+ },+ ],+ };+ }+const map = data.reduce((obj, { x, t, y }) => {if (!obj[x]) obj[x] = [];@@ -41,7 +122,7 @@ export function RevenueChart({ data, unit, minDate, maxDate, currency }: Revenue};}),};- }, [data, minDate, maxDate, unit, dateLocale]);+ }, [data, minDate, maxDate, unit, dateLocale, isCumulative, t, labels.revenue]);const renderXLabel = useCallback(renderDateLabels(unit, locale), [unit, locale]);@@ -52,9 +133,26 @@ export function RevenueChart({ data, unit, minDate, maxDate, currency }: RevenueminDate={minDate}maxDate={maxDate}currency={currency}- stacked={true}+ stacked={!isCumulative}renderXLabel={renderXLabel}height="400px"/>);}++function getBucketDates(minDate: Date, maxDate: Date, unit: string, locale: string) {+ const add = DATE_FUNCTIONS[unit].add;+ const start = DATE_FUNCTIONS[unit].start;+ const fmt = DATE_FORMATS[unit];+ const dates = new Map<string, Date>();++ let current = start(minDate);+ const end = start(maxDate);++ while (current <= end) {+ dates.set(formatDate(current, fmt, locale), current);+ current = add(current, 1);+ }++ return dates;+}