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
fix clickhouse filtering on event_name
Francis Cao00c0273500c6
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 616a54142..b538e3050 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -313,45 +313,6 @@ importers:specifier: ^6.0.3version: 6.0.3- 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.3.4- uuid:- specifier: ^11.1.0- version: 11.1.0-packages:'@ampproject/[email protected]':@@ -551,10 +512,6 @@ packages:peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==}- engines: {node: '>=6.9.0'}-'@babel/[email protected]':resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}engines: {node: '>=6.9.0'}@@ -608,28 +565,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==}@@ -1573,105 +1526,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==}@@ -1873,28 +1810,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==}@@ -1949,42 +1882,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==}@@ -2382,79 +2309,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==}@@ -2616,42 +2530,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==}@@ -2864,49 +2772,41 @@ packages:resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}cpu: [arm64]os: [linux]- libc: [glibc]'@unrs/[email protected]':resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}cpu: [arm64]os: [linux]- libc: [musl]'@unrs/[email protected]':resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}cpu: [ppc64]os: [linux]- libc: [glibc]'@unrs/[email protected]':resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}cpu: [riscv64]os: [linux]- libc: [glibc]'@unrs/[email protected]':resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}cpu: [riscv64]os: [linux]- libc: [musl]'@unrs/[email protected]':resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}cpu: [s390x]os: [linux]- libc: [glibc]'@unrs/[email protected]':resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}cpu: [x64]os: [linux]- libc: [glibc]'@unrs/[email protected]':resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}cpu: [x64]os: [linux]- libc: [musl]'@unrs/[email protected]':resolution: {integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==}@@ -4786,11 +4686,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:@@ -4831,9 +4726,6 @@ packages:resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}- resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==}-resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}engines: {node: '>= 0.10.0'}@@ -5843,13 +5735,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:@@ -5871,13 +5756,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:@@ -6083,10 +5961,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'}@@ -6401,9 +6275,6 @@ packages:resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}engines: {node: '>=8'}- resolution: {integrity: sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==}-resolution: {integrity: sha512-D+BkEl5MpeTbQ1Rz0io/TLZmwmYUAgvUpS1r2eKUvPicYOnpqzjZE6bVa7rSEYv189zkSM+CVc+hG5X7nVe9LQ==}@@ -6662,10 +6533,6 @@ packages:resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}- resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}- hasBin: true-resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}hasBin: true@@ -7063,8 +6930,6 @@ snapshots:'@babel/core': 7.29.0'@babel/helper-plugin-utils': 7.28.6- '@babel/[email protected]': {}-'@babel/[email protected]': {}'@babel/[email protected]':@@ -11409,10 +11274,6 @@ snapshots:- dependencies:- react: 19.2.5-dependencies:react: 19.2.5@@ -11448,8 +11309,6 @@ snapshots:- [email protected]: {}-@@ -12470,16 +12329,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@@ -12506,13 +12355,6 @@ snapshots:optionalDependencies:react-dom: 19.2.5([email protected])- dependencies:- '@babel/runtime': 7.28.3- memoize-one: 5.2.1- react: 19.2.5- react-dom: 19.2.5([email protected])-dependencies:react: 19.2.5@@ -12774,10 +12616,6 @@ snapshots:- dependencies:- type-fest: 4.41.0-dependencies:non-error: 0.1.0@@ -13142,8 +12980,6 @@ snapshots:glob: 7.2.3minimatch: 3.1.5- [email protected]: {}-@@ -13421,8 +13257,6 @@ snapshots:- [email protected]: {}-diff --git a/src/app/api/websites/[websiteId]/event-data/values/route.ts b/src/app/api/websites/[websiteId]/event-data/values/route.tsindex 4f1d8fc62..b0843427b 100644--- a/src/app/api/websites/[websiteId]/event-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/values/route.ts@@ -30,10 +30,10 @@ export async function GET(return unauthorized();}- const { propertyName, dataType } = query;+ const { event: eventName, propertyName, dataType } = query;const filters = await getQueryFilters(query, websiteId);- const data = await getEventDataValues(websiteId, {+ const data = await getEventDataValues(websiteId, eventName, {...filters,propertyName,dataType,diff --git a/src/queries/sql/events/getEventDataArraySeries.ts b/src/queries/sql/events/getEventDataArraySeries.tsindex 6d3e3989c..8e06e906c 100644--- a/src/queries/sql/events/getEventDataArraySeries.ts+++ b/src/queries/sql/events/getEventDataArraySeries.ts@@ -75,7 +75,11 @@ async function clickhouseQuery(): Promise<EventDataSeriesPoint[]> {const { timezone = 'UTC', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);return rawQuery(@@ -98,6 +102,7 @@ async function clickhouseQuery(${cohortQuery}where event_data.website_id = {websiteId:UUID}and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.event_name = {eventName:String}and event_data.data_key = {propertyName:String}and event_data.data_type = ${DATA_TYPE.array}${filterQuery}diff --git a/src/queries/sql/events/getEventDataDateSeries.ts b/src/queries/sql/events/getEventDataDateSeries.tsindex 26719dbc3..ac4ebff26 100644--- a/src/queries/sql/events/getEventDataDateSeries.ts+++ b/src/queries/sql/events/getEventDataDateSeries.ts@@ -27,7 +27,7 @@ async function relationalQuery(propertyName: string,filters: QueryFilters,eventFilters: EventPropertyFilter[] = [],-) : Promise<EventDataDateSeriesPoint[]> {+): Promise<EventDataDateSeriesPoint[]> {const { timezone = 'utc' } = filters;const { rawQuery, parseFilters, getDateStringSQL, getPropertyFilterQuery } = prisma;const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({@@ -73,7 +73,11 @@ async function clickhouseQuery(): Promise<EventDataDateSeriesPoint[]> {const { timezone = 'UTC' } = filters;const { rawQuery, parseFilters, getDateStringSQL, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);return rawQuery(@@ -95,6 +99,7 @@ async function clickhouseQuery(${cohortQuery}where event_data.website_id = {websiteId:UUID}and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.event_name = {eventName:String}and event_data.data_key = {propertyName:String}and event_data.data_type = ${DATA_TYPE.date}${filterQuery}diff --git a/src/queries/sql/events/getEventDataNumericSeries.ts b/src/queries/sql/events/getEventDataNumericSeries.tsindex 1fca6c0f6..d9df94f54 100644--- a/src/queries/sql/events/getEventDataNumericSeries.ts+++ b/src/queries/sql/events/getEventDataNumericSeries.ts@@ -38,9 +38,11 @@ async function relationalQuery(});const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);const aggSql =- metric === 'avg' ? 'avg(cast(event_data.number_value as decimal))' :- metric === 'count' ? 'count(*)' :- 'sum(cast(event_data.number_value as decimal))';+ metric === 'avg'+ ? 'avg(cast(event_data.number_value as decimal))'+ : metric === 'count'+ ? 'count(*)'+ : 'sum(cast(event_data.number_value as decimal))';return rawQuery(`@@ -79,12 +81,18 @@ async function clickhouseQuery(): Promise<{ t: string; y: number }[]> {const { timezone = 'UTC', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);const aggSql =- metric === 'avg' ? 'avg(event_data.number_value)' :- metric === 'count' ? 'count()' :- 'sum(event_data.number_value)';+ metric === 'avg'+ ? 'avg(event_data.number_value)'+ : metric === 'count'+ ? 'count()'+ : 'sum(event_data.number_value)';return rawQuery(`@@ -105,6 +113,7 @@ async function clickhouseQuery(${cohortQuery}where event_data.website_id = {websiteId:UUID}and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.event_name = {eventName:String}and event_data.data_key = {propertyName:String}and event_data.data_type = 2${filterQuery}diff --git a/src/queries/sql/events/getEventDataNumericStats.ts b/src/queries/sql/events/getEventDataNumericStats.tsindex 90896d989..5977ff3ac 100644--- a/src/queries/sql/events/getEventDataNumericStats.ts+++ b/src/queries/sql/events/getEventDataNumericStats.ts@@ -73,7 +73,11 @@ async function clickhouseQuery(): Promise<EventDataNumericStats[]> {const { timezone = 'UTC' } = filters;const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);return rawQuery(@@ -98,6 +102,7 @@ async function clickhouseQuery(${cohortQuery}where event_data.website_id = {websiteId:UUID}and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.event_name = {eventName:String}and event_data.data_key = {propertyName:String}and event_data.data_type = 2${filterQuery}diff --git a/src/queries/sql/events/getEventDataPivot.ts b/src/queries/sql/events/getEventDataPivot.tsindex 6f7551aed..8699d3269 100644--- a/src/queries/sql/events/getEventDataPivot.ts+++ b/src/queries/sql/events/getEventDataPivot.ts@@ -20,7 +20,12 @@ export async function getEventDataPivot(});}-async function relationalQuery(websiteId: string, eventName: string, filters: QueryFilters, eventFilters: EventPropertyFilter[] = []) {+async function relationalQuery(+ websiteId: string,+ eventName: string,+ filters: QueryFilters,+ eventFilters: EventPropertyFilter[] = [],+) {const { timezone = 'utc' } = filters;const { rawQuery, parseFilters, getPropertyFilterQuery, getDateStringSQL } = prisma;const { page = 1, pageSize } = filters;@@ -104,11 +109,27 @@ async function relationalQuery(websiteId: string, eventName: string, filters: Qu// Pivot flat rows into one record per eventconst eventMap = new Map<string,- { eventId: string; sessionId: string; eventName: string; urlPath: string; createdAt: Date; propertyKeys: string[]; propertyValues: string[] }+ {+ eventId: string;+ sessionId: string;+ eventName: string;+ urlPath: string;+ createdAt: Date;+ propertyKeys: string[];+ propertyValues: string[];+ }>();for (const { eventId, sessionId, eventName: name, urlPath, createdAt, dataKey, value } of rows) {if (!eventMap.has(eventId)) {- eventMap.set(eventId, { eventId, sessionId, eventName: name, urlPath, createdAt, propertyKeys: [], propertyValues: [] });+ eventMap.set(eventId, {+ eventId,+ sessionId,+ eventName: name,+ urlPath,+ createdAt,+ propertyKeys: [],+ propertyValues: [],+ });}const entry = eventMap.get(eventId);entry.propertyKeys.push(dataKey);@@ -118,14 +139,23 @@ async function relationalQuery(websiteId: string, eventName: string, filters: Qureturn { data: [...eventMap.values()], count, page: +page, pageSize: size };}-async function clickhouseQuery(websiteId: string, eventName: string, filters: QueryFilters, eventFilters: EventPropertyFilter[] = []) {+async function clickhouseQuery(+ websiteId: string,+ eventName: string,+ filters: QueryFilters,+ eventFilters: EventPropertyFilter[] = [],+) {const { timezone = 'UTC' } = filters;const { rawQuery, parseFilters, getPropertyFilterQuery, getDateStringSQL } = clickhouse;const { page = 1, pageSize } = filters;const size = +pageSize || DEFAULT_PAGE_SIZE;const offset = +size * (+page - 1);- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);const count = await rawQuery(@@ -145,6 +175,7 @@ async function clickhouseQuery(websiteId: string, eventName: string, filters: Qu${cohortQuery}where event_data_pivot.website_id = {websiteId:UUID}and event_data_pivot.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data_pivot.event_name = {eventName:String}${filterQuery}${pfSQL}`,@@ -183,6 +214,7 @@ async function clickhouseQuery(websiteId: string, eventName: string, filters: Qu${cohortQuery}where event_data_pivot.website_id = {websiteId:UUID}and event_data_pivot.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data_pivot.event_name = {eventName:String}${filterQuery}${pfSQL}group bydiff --git a/src/queries/sql/events/getEventDataPropertySeries.ts b/src/queries/sql/events/getEventDataPropertySeries.tsindex b2de7d379..7cc7071c6 100644--- a/src/queries/sql/events/getEventDataPropertySeries.ts+++ b/src/queries/sql/events/getEventDataPropertySeries.ts@@ -74,7 +74,11 @@ async function clickhouseQuery(): Promise<EventDataSeriesPoint[]> {const { timezone = 'UTC', unit = 'day' } = filters;const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;- const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ timezone,+ });const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);return rawQuery(@@ -97,6 +101,7 @@ async function clickhouseQuery(${cohortQuery}where event_data.website_id = {websiteId:UUID}and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.event_name = {eventName:String}and event_data.data_key = {propertyName:String}and event_data.data_type in (${DATA_TYPE.string}, ${DATA_TYPE.boolean})${filterQuery}diff --git a/src/queries/sql/events/getEventDataValues.ts b/src/queries/sql/events/getEventDataValues.tsindex 8196ff5ce..f4d0349bd 100644--- a/src/queries/sql/events/getEventDataValues.ts+++ b/src/queries/sql/events/getEventDataValues.ts@@ -12,7 +12,11 @@ interface WebsiteEventData {}export async function getEventDataValues(- ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string; dataType?: number }]+ ...args: [+ websiteId: string,+ eventName: string,+ filters: QueryFilters & { propertyName?: string; dataType?: number },+ ]): Promise<WebsiteEventData[]> {return runQuery({[PRISMA]: () => relationalQuery(...args),@@ -22,6 +26,7 @@ export async function getEventDataValues(async function relationalQuery(websiteId: string,+ eventName: string,filters: QueryFilters & { propertyName?: string; dataType?: number },) {const { rawQuery, parseFilters, getDateSQL } = prisma;@@ -41,6 +46,8 @@ async function relationalQuery(join website_event on website_event.event_id = event_data.website_event_idand website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}+ and website_event.event_type = 2+ and website_event.event_name = {{eventName}}cross join lateral jsonb_array_elements_text(coalesce(event_data.string_value, '[]')::jsonb) as array_item(value)${cohortQuery}${joinSessionQuery}@@ -53,7 +60,7 @@ async function relationalQuery(order by 2 desclimit 100`,- queryParams,+ { ...queryParams, eventName },FUNCTION_NAME,);}@@ -61,9 +68,9 @@ async function relationalQuery(return rawQuery(`select- case- when data_type = 2 then replace(string_value, '.0000', '')- when data_type = 4 then ${getDateSQL('date_value', 'hour')}+ case+ when data_type = 2 then replace(string_value, '.0000', '')+ when data_type = 4 then ${getDateSQL('date_value', 'hour')}else string_valueend as "value",count(*) as "total"@@ -71,6 +78,8 @@ async function relationalQuery(join website_event on website_event.event_id = event_data.website_event_idand website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}+ and website_event.event_type = 2+ and website_event.event_name = {eventName:String}${cohortQuery}${joinSessionQuery}where event_data.website_id = {{websiteId::uuid}}@@ -82,13 +91,14 @@ async function relationalQuery(order by 2 desclimit 100`,- queryParams,+ { ...queryParams, eventName },FUNCTION_NAME,);}async function clickhouseQuery(websiteId: string,+ eventName: string,filters: QueryFilters & { propertyName?: string; dataType?: number },): Promise<{ value: string; total: number }[]> {const { rawQuery, parseFilters } = clickhouse;@@ -101,19 +111,21 @@ async function clickhouseQuery(selectarrayJoin(JSONExtract(ifNull(event_data.string_value, '[]'), 'Array(String)')) as "value",count(*) as "total"- from event_data+ from event_dataany left join (- select *+ select *from website_eventwhere website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}- and event_type = 2) website_event+ and event_type = 2+ and event_name = {eventName:String}) website_eventon website_event.event_id = event_data.event_idand website_event.session_id = event_data.session_idand website_event.website_id = event_data.website_id${cohortQuery}where event_data.website_id = {websiteId:UUID}and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.event_name = {eventName:String}and event_data.data_key = {propertyName:String}and event_data.data_type = ${DATA_TYPE.array}${filterQuery}@@ -121,7 +133,7 @@ async function clickhouseQuery(order by 2 desclimit 100`,- queryParams,+ { ...queryParams, eventName },FUNCTION_NAME,);}@@ -133,19 +145,21 @@ async function clickhouseQuery(data_type = 4, toString(date_trunc('hour', date_value)),string_value) as "value",count(*) as "total"- from event_data+ from event_dataany left join (- select *+ select *from website_eventwhere website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}- and event_type = 2) website_event+ and event_type = 2+ and event_name = {eventName:String}) website_eventon website_event.event_id = event_data.event_idand website_event.session_id = event_data.session_idand website_event.website_id = event_data.website_id${cohortQuery}where event_data.website_id = {websiteId:UUID}and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.event_name = {eventName:String}and event_data.data_key = {propertyName:String}${dataType ? `and event_data.data_type = ${dataType}` : ''}${filterQuery}@@ -153,7 +167,7 @@ async function clickhouseQuery(order by 2 desclimit 100`,- queryParams,+ { ...queryParams, eventName },FUNCTION_NAME,);}