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
Breakdown report.
Mike Caoe3cc19638c77
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prismaindex d39620cae..6733bca6a 100644--- a/db/postgresql/schema.prisma+++ b/db/postgresql/schema.prisma@@ -1,6 +1,6 @@generator client {provider = "prisma-client"- previewFeatures = ["queryCompiler", "driverAdapters"]+ previewFeatures = ["driverAdapters"]output = "../src/generated/prisma"moduleFormat = "esm"}diff --git a/package.json b/package.jsonindex df26f4609..6ef6f988c 100644--- a/package.json+++ b/package.json@@ -81,7 +81,7 @@"@react-spring/web": "^9.7.3","@svgr/cli": "^8.1.0","@tanstack/react-query": "^5.28.6",- "@umami/react-zen": "^0.136.0",+ "@umami/react-zen": "^0.137.0","@umami/redis-client": "^0.27.0","bcryptjs": "^2.4.3","chalk": "^4.1.1",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 571361ea5..8cf8f50a9 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -45,8 +45,8 @@ importers:specifier: ^5.28.6version: 5.77.2([email protected])'@umami/react-zen':- specifier: ^0.136.0- version: 0.136.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))+ specifier: ^0.137.0+ version: 0.137.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))'@umami/redis-client':specifier: ^0.27.0version: 0.27.0@@ -1031,8 +1031,8 @@ packages:'@fontsource/[email protected]':resolution: {integrity: sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==}- '@fontsource/[email protected]':- resolution: {integrity: sha512-TPZ9b/uq38RMdrlZZkl0RwN8Ju9JxuqMETrw76pUQFbGtE1QbwQaNsLlnUrACNNBNbd0NZRXiJJSkC8ajPgbew==}+ '@fontsource/[email protected]':+ resolution: {integrity: sha512-nz//dBr99hXZmHp10wgNI00qThWImkzRR5PQjvRM+rpmuHO5rYBJCqPPWufidCvmkkryXx/GOP/lgqsM3R3Org==}'@formatjs/[email protected]':resolution: {integrity: sha512-zZI8QYVl5CHaT6j9OHjS+0mMnWzopBVH0un4n5b4IhIJRzIKnxwFTkxBp5Ifqj6FntrwzIGqP+D6v8u7MPYsmw==}@@ -1555,26 +1555,26 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-c8Ipp7EoFXlPKpOUJne6JlG823KwtqMyFsTpU0LS0DE9IEfnAIKanc5X+kChNmooKHq4V8QNyUxTf8WyBKU9+Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-jybk2jy3m9KNmTpzJu87C0nkcMcGbZIyotgK1s8st8aUE2aJlxPZrvGuJTO8GUFZn9TKnCg3JjBC8qS9sizKQg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-iPlSR225CSOit+57SrDfEF3lDuQvjRBYj1HFyGsLk91HfV3vDRgkKiou8uhOHk+B3afGJRwot8/Sr9MvNOfeQg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-Xn7eTssaefNPUydogI1qDf7qQWPmb+hGoS1QiCNBodPlRpVDXxlZSIhOqQFnLWHv5+z5UL+vu+joqlSPYHqOFw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-RXVECPB3gP5SZvfKwlqLKCWEFzJh6AcDQQSRkArlyLyHRAHHcniKO3hW90pRWKmEUSVUAZdoCA6XkRL3dXGYXw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-1TAZADcWbfznXzo4oJEqFgX4IE1chZjWsTSJDWr03UEx3XqIJI8GXm+ylOQUiN4j8xqZ7tl4yNuuslKkzoSjMQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-5OHrrihjCNBRB93KysXfHZBLUSGh43fC3DTfH9LWDxfpo38//VkaDXZezA0zg+a43D3kTq6tOSNgHq3sUk/Q5Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-L64van+K2ZEmCpx/KeZGHoxdxQvVHgfusFRFYZbh3e7YEtDcShvUrTDVKmZkINqnmuhGTDolFDQq+E8fWEpcRg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1585,26 +1585,26 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-zGEptdwSCcLS/Z+LARmCyv4ptLIYtLIXHtgFSDAaF5ssY0whMOT0yAmOJz4T4ldnaWbBsLIz9O3PbUzNy83L2A==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-dWyK8a3kNii8Yuj1/CQivnVVxsgkV8em+sb0oA29w04t+CFRQywpE2OVV3wZTDzOIVaz3pXx7/X012WoF6d/eQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-RvIEz2JK6Ndi0VhhNPYzfHbvq6rj7o2SwhhrcN5cKPC0lGgTXgHJheTq2kMu7ctO/C+Yx/3d0LQC/fOnbKH8zA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-mg9RrOTjxQFPy0BQrlqdp5uUC2pLevIqhZit6OfndmOr7khQ32qepDjXoSwYeeSag/jrokc2cGfXfzOwrgAFaQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-VoVLqTSttvHE1h8nrF2L7r1SDN0VCv5UtIlYqUxK4Gk/5Z7Pboo7aY2OAhgpycm9ZUfWio/VVAtj6oMoWHjxQw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-TeV/yXEOQ2QOYMxvetWcWUcZN83evmnmG/uSruTdk93e2nZzs227Gg/M95tzgCYRRACCzSzrGujJhNs12Nh7mg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-X4KKf0OPHIje+68I0GRDkIcg+qsrBEQskl72aX7GQy6oNBta3ZTxQJrK2HTYdBDJnr1ADQdxYi+pZ5zPYDjODA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-Sp8LWQQYNxkLk2+L0bdWmAd9fz1YIrzvxbHXmAn9Tn6+/4SPnQhkOo+qQwtHFbjqe9fyS7cJZxegXd1RegIFew==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1615,32 +1615,32 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-kW8TE4MLiTZJWnXSH+/6HeEtCOP20S+3m0BpToOzZhlpETSWJj6WcTRrM9ygt86v+lD4Vb92aQPdB75NVCbSAg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-EWiFbRoWs0zBlBbdPvd7gPyA3B8TPUtMfSUnLBCjwc+N0YaUoizZxW2VYgpAkZYAlVrPYV6n2Gs+98PHKZ8rsg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-E9M/kPYvF1fBZpkRXsKqMhvBVEyTY7vmkHeXLJo6tInKQOjYyYs0VeWlnGnxBjQIAH7J7ZKAORfTFQQHyhoueQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-JpFtXmWQ0Oca7FcvkqgjSyo6xEP7v3oQOLUId6o0xTvm4AD5W0mU2r3lYrbhsJ+XxdUUX4AVR5473sZZ85kU4A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-d7Cic5OGBqI/OMUuHlPrPn6udSvjdpurrrwbnSYzrGlVhDmKLUdrLTtBL8O1MPzluAyW52azqJXSpsjwh288KA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-e4Ktc3NiNwV5dz82zVE7lspYmKwAnGoJfOHgc9MApS7Fy/BEAuVUuLgTjMo1x5me7dY+ADxqrIhbOpifscGGoQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-znYb6S97yS36nw0liNFYFPmMyhhiUGvhtSXvkPEEU+bxw94O6jbLNwyJKrlUUSNDW3XINasIIY7EhC66QMbSFw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-5oS6sLq0DishBvPVsWnxGcUdBRXyFXCj8/n02yJvjbID5Mpjn9JIHUSL4ZCZAO7QGCXpvO3PI40vB2F6QUs2VA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-tdcKDtzQcvT5U7mBbasiV/uHfwQmkYszyjKUZWigO54YNoz5Zp3RFfS14Mv6NAft2cse8Bj9oEyf8HMUT8KEZA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-mPGhW2+Jke66LJIPrYoAdL5BBiC8iZ9orjoan7TBTCX9Xk87EK1XLm1cTxAylRqGNjnLzy+vp05Zt2fHY4QduA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1651,8 +1651,8 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-BWyZXBT4P17b9C9HfOIT2glDFMH9nUCfQF7vZ5FEeXNBudH/8OcSbzyBUG4Dg3XPtkOem5LP59ocaizkl32Tvg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-J1bhlrNtjPS/fe5uJQ+0c7/jiXniwa4RQlP+Emjfc/iuqpW2RhbF9ou5vROcLzWIyaW8tVMZ468J68rAs/aZ5A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1669,14 +1669,14 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-LScn5bRlBrv7yt2y06Ul3vNo8BOYHwZXjk47XCJTdt/QWhuU15oG0sRjJ1OIWgZ96jtW7u6YZ1PQtwX55gl7Dw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-83gS9Bb+FMa4Tae2VQrOxWixqYhqj4MDt4Bn0i3gzsP/sPWr1bwo5DJmXfw16UAXMaccl1rUKSqqHdigqaealw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-6fIIr7KqJyS6+7FzRUT3TJozcImJG38kkPtzEpwhmPzWNDWEu307BOjIMw0AHs+m1pT7wspCzg3KOTppw8S4eg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-ZaYpBXiS+nUzxAmeCmXyvDcZECuZi1ZLn5y8uJ4ZFRVqSxqplVHodsQKwKqklmAM3+IVDyQx2WB4/HIKTGg2Bw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1684,8 +1684,8 @@ packages:'@react-aria/[email protected]':resolution: {integrity: sha512-nbBmx30tW53Vlbq3BbMxHGbHa7vGE9ItacI+1XAdH2UZDLtdZA5J6U9YC6lokKQCv+aEVO6Zl9YG4yp57YwnGw==}- '@react-aria/[email protected]':- resolution: {integrity: sha512-iLioNOnHhltIq7JtLkeSXA1bFt3rUdUwnc8j20LXlzhDgH/56Xi1sxOCzaGo33mDPT16ANJG4IolVzg0+tnb2g==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-mOQb4PcNvDdFhyqF7nxREwc1YUg+pPTiMNcSHlz/MKFkkUteIQBYfuJJa8i72ooiE55xfYEQhPLjmrLHAOIJ+g==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1696,14 +1696,14 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-iQuXWn6BGneSBZrRURkntfivY9noUiq/JLs9KjtaSm9V0X4THevB9xXQLL0qLJ+n5YHOM6skRyoCRaweYY5IhA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-AGk0BMdHXPP3gSy39UVropyvpNMxAElPGIcicjXXyD/tZdemsgLXUFT2zI4DwE0csFZS8BGgunLWT9VluMF4FQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-lWerY4caK2+AXzdPhUqAov3Di2mSfIKdaEEj+99iXeH85zzs2cbWZRvvCwwVGQ0GprypxETz1jb1Wq/55xDALw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-1hawsRI+QiM0TkPNwApNJ2+N49NQTP+48xq0JG8hdEUPChQLDoJ39cvT1sxdg0mnLDzLaAYkZrgfokq9sX6FLA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1714,26 +1714,26 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-kxML2cuI4/5AlSSzOAwXVXoouvrICxGdWbs0ze0IHaGkw6p3oKa5By6I6tT0+8/Kxy6ZFeCL+l/PU6K/ysAdAA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-6BjpeTupQnxetfvC2bqIxWUt6USMqNZoKOoOO7mUL7ESF6/Gp8ocutvQn0VnTxU+7OhdrZX5AACPg/qIQYumVw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-HLHT2xc6USM/SbqFYz2gbREq7IcWfO+845ao/GCxy6Rx8eGD3OV09jgd+JlcSNJb2WiTpKhkSeX3wf7VgzPw2g==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-fEhNOtOV5yRZ8hkWmFO5Mh8nq63/ePun2dUMLAiW1sCQXTUpN9Oo+T4vsEUabuZ25mHvqgVoCVhAFdMbvZ+W+A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-r/XU5PJY/V8LTklaiO7n3BDG9gVg/Dp3p7IwgGCYUbLuF9+8yMh858teOEJr3FYKLPr/nZLZQE08oJuADkCLEw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-b1PpanLblnXgrvIeYPkL9ELdeE3GQXwoRJLNv9DSKSAyBVx+pm6+4BtzngOBdBidRCcOGEBEYxuUW8hMXjFB8w==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-YIdCYe1yXXfbZ0snUMWrQpOxtJO0+eHHp3+PSqZ/dyvLqMlTlYnOv2j5lc36sN0r1YWfN8OEpxzK3jHdD4M6yA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-QznlHCUcjFgVALUIVBK4SWJd6osaU9lVaZgU4M8uemoIfOHqnBY3zThkQvEhcw/EJ2RpuYYLPOBYZBnk1knD5A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1744,8 +1744,8 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-ciRfI0ya89pm4R+2RE7vLhu5OjdsAQfzghVI5Eh5AHpwjajMJ41O4Vkyt2ci5KTcjwg80CFftAWmF02w2hKR5Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-eWu69KnQ7qCmpYBEkgGLjIuKfFqoHu2W6r9d7ys0ZmX81HPj9DhatGpEgHlnjRfCeSl9wL5h2FY9wnIio82cbg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1762,44 +1762,44 @@ packages:peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-6Ue6GXBGMPc5uNwu6A4XHOEK5n/3OmgW/kgCmFVi2dh4QqkASSdadaizS/2uENWfgKTlEpd0Wy3PSfpubL+hCg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-GV9rFYf4wRHAh9tkhptvm3uOflKcQHdgZh+eGpSAHyq2iTq0j2nEhlmtFordpcJgC4XWro7TXLNltfqUqVHtkw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-zhqrt6Uk66wrgaIHrPUv3nguVMGMnPtqUmp0K2gibhNucN0iJ6zILoaq8vMmFH+9PmUqoiPJXq18czs2CluT6Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-Q9HDr2EAhoah7HFIT6XxOOOv2fiAs0agwQQd3d1w6jqgyu9m20lM/jxcSwcCFj2O7FPKHfapSAijHDZZoc4Shg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-aXY83zqLStlf/v8vP2OvlrLsujCNWGqfL3hMVDF1PNqRJGllMejzkzbZNf4fUQDTX+e2zNDv6SH4IRJ4k9sKlw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-ddmGPikXW+27W2Rx0VuEwwGJVLTo68QkNbSl8R+TEM0EUIAJo3nwHzAlQhuo5Tcb1PdK7biTjO1dyI4pno2/0Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-oTEDqOejjltr64ADpgMA3eB/G4bJ2Y9TlQwW33l6XWAjtKKZScBhGrf9l10NTQphZf4QxMnucIHo8IV2eKSmjg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-xO33FU0bZSpZ3Bw7bnJz7+Me0daVLJrn5dAllf18Mmf9T2cEr63Gg4AL4nR+rj6NLSq0aH8QyDtRGNqXJjo5SQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-dcQQKVgH/zv3wExcmpH7yMA2d4oPO3JF9L1HdwNvPHScnfbr404ZVEKjrIlxEvzq7V5yKky5q8171jmp+YOPyw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-HFdvqd3Mdp6WP7uYAWD64gRrL1D4Khi+Fm3dIHBhm1ANV0QjYkphJm4DYNDq/MXCZF46+CZNiOWEbL/aeviykA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-oH1WZfwdaryiggqxu1r1Jq1/fF8n9AVD3euamkJmXq5/t9IJUYLzct4w54QqjQ0KhtbHp+7n55QvvhZ9cW3XEg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-uhwiZqPy6hqucBUL7z6uUZjAJ/ou3bNdTjZlXS+zbcm+T0dsjKDfzNkaebyZY7AX3cYkFCaRjc3N6omXwoAviw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-RwWyFiM+dBsiulT1ziGdG5+cy/F/7hFVb1Ddyc90HNLqRuX2sAX3ysm0YmiiNpnHwGQR/kPd1ulTSqQ+ps9wiQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-8+Evk/JVMQ25PNhbnHUvsAK99DAjnCWMdSBNswJ1sWseKCYQzBXsNkkF6Dl/FlSkfDBFAaRHkX9JUz02wehb9A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1810,20 +1810,20 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-YGLDOATMla9Y7Yk2P8qK3zcTrxQClf2ZLS8Wj14RY4le/r6F2rGJqkGhVFPyoNAtwsRr4bzD7CGERe4NUAPrqQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-P1fXhmTRBK4YvPQDzCY3XoZl+HiBADgvQ89jszxJ2jD4Qzs/E096ttCc+otZnbvRcoU27IxC2vWFInqK/bP31g==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-WwooDvXb64mGwZUZQj4tYcJEFSXLIxDywT97K9U4fLUhrNcQ8KdxdhPjyPOEXxscPfdJDyKKckhRiKl91UoKsg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-spGAuHHNkiqAfyOl4JWzKEK642KC1oQylioYg+LKCq2avUyaDqFlRx2JrC4a6nt3BV6E5/cJUMV9K7gMRApd5Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-GBg01P04fLY16ZHLYcP9nLGis2MGQSpiP8rMG0t5jqddJdx+v8IL28f9mcHw+NSRgZm28NHQThTkH31SUxXppQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-9LIe9unStA/9HHX6idHdbxMJLjebFP9mngIjoBgbWSNaYx3oH1X3Ei2Q9qHmimebtBagEZgSjxy7M+RcEqFhlw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1834,14 +1834,14 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-vV+XM45ZfTy0PAkAiPvkCm0tQGY1F7ur4p8KbkCznG7/hfJ+fVx1aJ1F4UmvDowmTmSMAk9JQtH9b2qNkMtn9Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-mUJAWuLANVd6mXd7SKbGl9+LqrHxgkH/bo9qQTKaRKDWR3PVqU4m/xdY/u2EDGcWPiiTMHLJaPdMQA5OZ8LtMg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-vhGhALs/PGdTs/7GD2hsy7CF1LBF9QlL57HkRSu8kfiuiA7rqRTqYg6q723OvaFsspj3DCxP2MLQhvvZSWe7Ng==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-9tRRFV1YMLuDId9E8PeUf0xy0KmQBoP8y/bm0PKWzXOqLOVmp/+kop9rwsjC7J6ppbBnlak7XCXTc7GoSFOCRA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -2588,8 +2588,8 @@ packages:resolution: {integrity: sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@umami/[email protected]':- resolution: {integrity: sha512-4dStzemPNxGB1nVdfnSxfkmYUnIXTRwqBqJpn4N9RvhmnQQeUfYQvJc4eqMSM0hrQToQcgGdvB/HucDpk30W7Q==}+ '@umami/[email protected]':+ resolution: {integrity: sha512-gjjqUTXJoh2DXB0ML4VAgK8xSdnMsZSQ5eBsRmX9iyjSP2iV5en38He+bpCTwVQcOT48Ask/12ILp/7t2f70vw==}'@umami/[email protected]':resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==}@@ -5974,8 +5974,8 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- resolution: {integrity: sha512-jg4aUQrsBTwgKitXlyLvEVSigzn79jNpgDP+mrrDIX8emzr+BBXx1x6WSVHDAESep72Xcp+zr9PbLmBCk3/nzQ==}+ resolution: {integrity: sha512-5mujwnW6/NHvONDecb7DiWkzI27dzBO1auKt4KkgNuW+Awud1LCaK/NOlHp4xZl3fSfh1ROpdAKERHCh7nvAAQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -7641,7 +7641,7 @@ snapshots:'@fontsource/[email protected]': {}- '@fontsource/[email protected]': {}+ '@fontsource/[email protected]': {}'@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:@@ -8254,13 +8254,13 @@ snapshots:dependencies:'@react-stately/autocomplete': 3.0.0-beta.1([email protected])'@react-stately/combobox': 3.10.6([email protected])@@ -8271,10 +8271,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-types/breadcrumbs': 3.7.14([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8282,10 +8282,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/toggle': 3.8.5([email protected])'@react-types/button': 3.12.2([email protected])@@ -8294,11 +8294,11 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@internationalized/date': 3.8.2'@react-aria/live-announcer': 3.4.3'@react-stately/calendar': 3.8.2([email protected])@@ -8309,12 +8309,12 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/checkbox': 3.6.15([email protected])'@react-stately/form': 3.1.5([email protected])@@ -8327,7 +8327,7 @@ snapshots:dependencies:'@react-aria/ssr': 3.9.9([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8336,16 +8336,16 @@ snapshots:react-dom: 19.1.0([email protected])use-sync-external-store: 1.5.0([email protected])dependencies:'@react-stately/color': 3.8.6([email protected])'@react-stately/form': 3.1.5([email protected])'@react-types/color': 3.0.6([email protected])@@ -8354,16 +8354,16 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-aria/live-announcer': 3.4.3'@react-stately/collections': 3.12.5([email protected])'@react-stately/combobox': 3.10.6([email protected])@@ -8375,15 +8375,15 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@internationalized/date': 3.8.2'@internationalized/number': 3.6.3'@internationalized/string': 3.2.7@@ -8398,10 +8398,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-types/dialog': 3.5.19([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8419,13 +8419,13 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@internationalized/string': 3.2.7'@react-aria/live-announcer': 3.4.3'@react-stately/collections': 3.12.5([email protected])'@react-stately/dnd': 3.6.0([email protected])@@ -8435,9 +8435,9 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17@@ -8445,9 +8445,9 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/form': 3.1.5([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8455,13 +8455,13 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-aria/live-announcer': 3.4.3'@react-stately/collections': 3.12.5([email protected])'@react-stately/grid': 3.11.3([email protected])@@ -8473,13 +8473,13 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/collections': 3.12.5([email protected])'@react-stately/list': 3.12.3([email protected])@@ -8502,7 +8502,7 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-aria/ssr': 3.9.9([email protected])@@ -8529,9 +8529,9 @@ snapshots:react-dom: 19.1.0([email protected])use-sync-external-store: 1.5.0([email protected])dependencies:'@react-types/link': 3.6.2([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8539,11 +8539,11 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/collections': 3.12.5([email protected])'@react-stately/list': 3.12.3([email protected])@@ -8557,13 +8557,13 @@ snapshots:dependencies:'@swc/helpers': 0.5.17dependencies:'@react-stately/collections': 3.12.5([email protected])'@react-stately/menu': 3.9.5([email protected])@@ -8585,12 +8585,12 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/form': 3.1.5([email protected])'@react-stately/numberfield': 3.9.13([email protected])@@ -8601,14 +8601,14 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-aria/ssr': 3.9.9([email protected])'@react-stately/overlays': 3.6.17([email protected])'@react-types/button': 3.12.2([email protected])'@react-types/overlays': 3.8.16([email protected])@@ -8628,12 +8628,12 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/radio': 3.10.14([email protected])@@ -8643,10 +8643,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/searchfield': 3.5.13([email protected])'@react-types/button': 3.12.2([email protected])@@ -8656,17 +8656,17 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/select': 3.6.14([email protected])'@react-types/button': 3.12.2([email protected])'@react-types/select': 3.9.13([email protected])@@ -8675,11 +8675,11 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/selection': 3.20.3([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8695,10 +8695,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/slider': 3.6.5([email protected])@@ -8724,9 +8724,9 @@ snapshots:'@swc/helpers': 0.5.17react: 19.1.0dependencies:'@react-stately/toggle': 3.8.5([email protected])'@react-types/shared': 3.30.0([email protected])'@react-types/switch': 3.5.12([email protected])@@ -8734,15 +8734,15 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-aria/live-announcer': 3.4.3'@react-stately/collections': 3.12.5([email protected])'@react-stately/flags': 3.1.2'@react-stately/table': 3.14.3([email protected])@@ -8754,11 +8754,11 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/tabs': 3.8.3([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8767,13 +8767,13 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/list': 3.12.3([email protected])'@react-types/button': 3.12.2([email protected])@@ -8782,10 +8782,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/form': 3.1.5([email protected])@@ -8796,10 +8796,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/toast': 3.1.1([email protected])@@ -8809,9 +8809,9 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/toggle': 3.8.5([email protected])'@react-types/checkbox': 3.9.5([email protected])@@ -8822,7 +8822,7 @@ snapshots:dependencies:'@react-types/shared': 3.30.0([email protected])@@ -8830,9 +8830,9 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-types/shared': 3.30.0([email protected])@@ -8840,9 +8840,9 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/tooltip': 3.5.5([email protected])'@react-types/shared': 3.30.0([email protected])@@ -8851,11 +8851,11 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-stately/tree': 3.9.0([email protected])'@react-types/button': 3.12.2([email protected])@@ -8875,10 +8875,10 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-types/shared': 3.30.0([email protected])@@ -8886,9 +8886,9 @@ snapshots:react: 19.1.0react-dom: 19.1.0([email protected])dependencies:'@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17@@ -9810,11 +9810,11 @@ snapshots:'@typescript-eslint/types': 8.32.1eslint-visitor-keys: 4.2.0- '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))':+ '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))':dependencies:- '@fontsource/jetbrains-mono': 5.2.5+ '@fontsource/jetbrains-mono': 5.2.6'@internationalized/date': 3.8.2classnames: 2.5.1glob: 10.4.5@@ -13663,15 +13663,15 @@ snapshots:'@internationalized/string': 3.2.7'@react-aria/live-announcer': 3.4.3'@react-aria/ssr': 3.9.9([email protected])'@react-stately/autocomplete': 3.0.0-beta.1([email protected])'@react-stately/selection': 3.20.3([email protected])@@ -13685,54 +13685,54 @@ snapshots:'@swc/helpers': 0.5.17client-only: 0.0.1react: 19.1.0react-dom: 19.1.0([email protected])react-stately: 3.39.0([email protected])use-sync-external-store: 1.5.0([email protected])dependencies:'@internationalized/string': 3.2.7'@react-aria/ssr': 3.9.9([email protected])'@react-types/shared': 3.30.0([email protected])react: 19.1.0react-dom: 19.1.0([email protected])diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsxindex cdc90cec6..9a8f2fd03 100644--- a/src/app/(main)/SideNav.tsx+++ b/src/app/(main)/SideNav.tsx@@ -7,6 +7,7 @@ import {Logo,Grid2X2,Settings,+ LockKeyhole,} from '@/components/icons';import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';@@ -41,6 +42,11 @@ export function SideNav(props: any) {href: renderTeamUrl('/settings'),icon: <Settings />,},+ {+ label: formatMessage(labels.admin),+ href: renderTeamUrl('/admin'),+ icon: <LockKeyhole />,+ },].filter(n => n);return (diff --git a/src/app/(main)/websites/[websiteId]/reports/ReportsLayout.tsx b/src/app/(main)/websites/[websiteId]/reports/ReportsLayout.tsxindex 11b743c17..70e33146f 100644--- a/src/app/(main)/websites/[websiteId]/reports/ReportsLayout.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/ReportsLayout.tsx@@ -5,7 +5,7 @@ import { ReportsNav } from './ReportsNav';export function ReportsLayout({ websiteId, children }: { websiteId: string; children: ReactNode }) {return (- <Grid columns="200px 1fr" gap="6">+ <Grid columns="180px 1fr" gap="6"><Column><ReportsNav websiteId={websiteId} /></Column>diff --git a/src/app/(main)/websites/[websiteId]/reports/ReportsNav.tsx b/src/app/(main)/websites/[websiteId]/reports/ReportsNav.tsxindex 51b4ed7ac..fa2b69b5d 100644--- a/src/app/(main)/websites/[websiteId]/reports/ReportsNav.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/ReportsNav.tsx@@ -1,6 +1,6 @@import { Row, NavMenu, NavMenuItem, Icon, Text } from '@umami/react-zen';import { useMessages, useNavigation } from '@/components/hooks';-import { Funnel, Lightbulb, Magnet, Money, Network, Path, Tag, Target } from '@/components/icons';+import { Funnel, Sheet, Magnet, Money, Network, Path, Tag, Target } from '@/components/icons';import Link from 'next/link';export function ReportsNav({ websiteId }: { websiteId: string }) {@@ -32,6 +32,12 @@ export function ReportsNav({ websiteId }: { websiteId: string }) {icon: <Magnet />,path: '/retention',},+ {+ id: 'breakdown',+ label: formatMessage(labels.breakdown),+ icon: <Sheet />,+ path: '/breakdown',+ },{id: 'utm',label: formatMessage(labels.utm),@@ -50,12 +56,6 @@ export function ReportsNav({ websiteId }: { websiteId: string }) {icon: <Network />,path: '/attribution',},- {- id: 'insights',- label: formatMessage(labels.insights),- icon: <Lightbulb />,- path: '/insights',- },];const selected = links.find(({ path }) => path && pathname.endsWith(path))?.id || 'goals';diff --git a/src/app/(main)/websites/[websiteId]/reports/attribution/Attribution.tsx b/src/app/(main)/websites/[websiteId]/reports/attribution/Attribution.tsxindex 82d8ec851..c93573510 100644--- a/src/app/(main)/websites/[websiteId]/reports/attribution/Attribution.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/attribution/Attribution.tsx@@ -1,4 +1,4 @@-import { Grid, Column, Heading } from '@umami/react-zen';+import { Grid, Column } from '@umami/react-zen';import { useMessages, useResultQuery } from '@/components/hooks';import { Panel } from '@/components/common/Panel';import { LoadingPanel } from '@/components/common/LoadingPanel';@@ -125,8 +125,7 @@ export function Attribution({};return (- <Panel key={value}>- <Heading>{label}</Heading>+ <Panel key={value} title={label}><Grid columns="1fr 1fr" gap><ListTablemetric={formatMessage(currency ? labels.revenue : labels.visitors)}@@ -142,25 +141,15 @@ export function Attribution({</Panel>);})}- <Grid gap>+ <Panel title="UTM"><Grid columns="1fr 1fr" gap>- <Panel>- <UTMTable data={data} title={formatMessage(labels.sources)} utm={'utm_source'} />- </Panel>- <Panel>- <UTMTable data={data} title={formatMessage(labels.medium)} utm={'utm_medium'} />- </Panel>- <Panel>- <UTMTable data={data} title={formatMessage(labels.campaigns)} utm={'utm_campaign'} />- </Panel>- <Panel>- <UTMTable data={data} title={formatMessage(labels.content)} utm={'utm_content'} />- </Panel>- <Panel>- <UTMTable data={data} title={formatMessage(labels.terms)} utm={'utm_term'} />- </Panel>+ <UTMTable data={data} title={formatMessage(labels.sources)} utm={'utm_source'} />+ <UTMTable data={data} title={formatMessage(labels.medium)} utm={'utm_medium'} />+ <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'} /></Grid>- </Grid>+ </Panel></Column></LoadingPanel>);diff --git a/src/app/(main)/websites/[websiteId]/reports/attribution/AttributionPage.tsx b/src/app/(main)/websites/[websiteId]/reports/attribution/AttributionPage.tsxindex f7058ca33..758c6b502 100644--- a/src/app/(main)/websites/[websiteId]/reports/attribution/AttributionPage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/attribution/AttributionPage.tsx@@ -8,7 +8,7 @@ import { useDateRange, useMessages } from '@/components/hooks';export function AttributionPage({ websiteId }: { websiteId: string }) {const [model, setModel] = useState('first-click');const [type, setType] = useState('page');- const [step, setStep] = useState('');+ const [step, setStep] = useState('/');const { formatMessage, labels } = useMessages();const {dateRange: { startDate, endDate },@@ -44,6 +44,7 @@ export function AttributionPage({ websiteId }: { websiteId: string }) {<SearchFieldlabel={formatMessage(labels.conversionStep)}value={step}+ defaultValue={step}onSearch={setStep}/></Column>diff --git a/src/app/(main)/websites/[websiteId]/reports/breakdown/Breakdown.tsx b/src/app/(main)/websites/[websiteId]/reports/breakdown/Breakdown.tsxnew file mode 100644index 000000000..4ff06631a--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/breakdown/Breakdown.tsx@@ -0,0 +1,73 @@+import { Text, DataTable, DataColumn } from '@umami/react-zen';+import { useMessages, useResultQuery, useFormat, useFields } from '@/components/hooks';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { formatShortTime } from '@/lib/format';++export interface BreakdownProps {+ websiteId: string;+ startDate: Date;+ endDate: Date;+ parameters: {+ fields: string[];+ };+}++export function Breakdown({ websiteId, parameters, startDate, endDate }: BreakdownProps) {+ const { formatMessage, labels } = useMessages();+ const { formatValue } = useFormat();+ const { fields } = useFields();+ const { data, error, isLoading } = useResultQuery<any>(+ 'breakdown',+ {+ websiteId,+ dateRange: {+ startDate,+ endDate,+ },+ parameters,+ },+ { enabled: !!parameters.fields.length },+ );++ return (+ <LoadingPanel isEmpty={!data?.length} isLoading={isLoading} error={error}>+ <DataTable data={data}>+ {parameters?.fields.map(field => {+ return (+ <DataColumn key={field} id={field} label={fields.find(f => f.name === field)?.label}>+ {row => {+ const value = formatValue(row[field], field);+ return (+ <Text truncate title={value}>+ {value}+ </Text>+ );+ }}+ </DataColumn>+ );+ })}+ <DataColumn id="views" label={formatMessage(labels.views)} align="end">+ {row => row?.['views']?.toLocaleString()}+ </DataColumn>+ <DataColumn id="visits" label={formatMessage(labels.visits)} align="end">+ {row => row?.['visits']?.toLocaleString()}+ </DataColumn>+ <DataColumn id="visitors" label={formatMessage(labels.visitors)} align="end">+ {row => row?.['visitors']?.toLocaleString()}+ </DataColumn>+ <DataColumn id="bounceRate" label={formatMessage(labels.bounceRate)} align="end">+ {row => {+ const n = (Math.min(row?.['visits'], row?.['bounces']) / row?.['visits']) * 100;+ return Math.round(+n) + '%';+ }}+ </DataColumn>+ <DataColumn id="visitDuration" label={formatMessage(labels.visitDuration)} align="end">+ {row => {+ const n = (row?.['totaltime'] / row?.['visits']) * 100;+ return `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`;+ }}+ </DataColumn>+ </DataTable>+ </LoadingPanel>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/reports/breakdown/BreakdownPage.tsx b/src/app/(main)/websites/[websiteId]/reports/breakdown/BreakdownPage.tsxnew file mode 100644index 000000000..27e1ed4de--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/reports/breakdown/BreakdownPage.tsx@@ -0,0 +1,97 @@+'use client';+import { useState } from 'react';+import {+ List,+ ListItem,+ Button,+ Column,+ Box,+ Grid,+ Text,+ Icon,+ Popover,+ DialogTrigger,+} from '@umami/react-zen';+import { useDateRange, useMessages, useFields } from '@/components/hooks';+import { SquarePlus, Chevron } from '@/components/icons';+import { Panel } from '@/components/common/Panel';+import { Breakdown } from './Breakdown';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';++export function BreakdownPage({ websiteId }: { websiteId: string }) {+ const {+ dateRange: { startDate, endDate },+ } = useDateRange(websiteId);+ const [fields, setFields] = useState([]);++ return (+ <Column gap>+ <WebsiteControls websiteId={websiteId} />+ <Box>+ <FieldsButton value={fields} onChange={setFields} />+ </Box>+ <Panel height="900px" overflow="auto" allowFullscreen>+ <Breakdown+ websiteId={websiteId}+ startDate={startDate}+ endDate={endDate}+ parameters={{ fields }}+ />+ </Panel>+ </Column>+ );+}++const FieldsButton = ({ value, onChange }) => {+ const [selected, setSelected] = useState(value);+ const [isOpen, setIsOpen] = useState(false);+ const { formatMessage, labels } = useMessages();+ const { fields } = useFields();++ const handleChange = value => {+ setSelected(value);+ };++ const handleApply = () => {+ setIsOpen(false);+ onChange?.(selected);+ };++ const handleClose = () => {+ setIsOpen(false);+ setSelected(value);+ };++ return (+ <DialogTrigger>+ <Button variant="quiet" onPress={() => setIsOpen(!isOpen)}>+ <Icon>+ <SquarePlus />+ </Icon>+ <Text>Fields</Text>+ <Icon rotate={90}>+ <Chevron />+ </Icon>+ </Button>+ <Popover placement="bottom start" isOpen={isOpen}>+ <Column width="300px" padding="2" border borderRadius shadow="3" backgroundColor gap>+ <List value={selected} onChange={handleChange} selectionMode="multiple">+ {fields.map(({ name, label }) => {+ return (+ <ListItem key={name} id={name}>+ {label}+ </ListItem>+ );+ })}+ </List>+ <Grid columns="1fr 1fr" gap>+ <Button onPress={handleClose}>{formatMessage(labels.cancel)}</Button>+ <Button onPress={handleApply} variant="primary">+ {formatMessage(labels.apply)}+ </Button>+ </Grid>+ </Column>+ </Popover>+ </DialogTrigger>+ );+};diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/page.tsx b/src/app/(main)/websites/[websiteId]/reports/breakdown/page.tsxsimilarity index 69%rename from src/app/(main)/websites/[websiteId]/reports/insights/page.tsxrename to src/app/(main)/websites/[websiteId]/reports/breakdown/page.tsxindex a4eee1f2e..89295b3d0 100644--- a/src/app/(main)/websites/[websiteId]/reports/insights/page.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/breakdown/page.tsx@@ -1,10 +1,10 @@import { Metadata } from 'next';-import { InsightsPage } from './InsightsPage';+import { BreakdownPage } from './BreakdownPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;- return <InsightsPage websiteId={websiteId} />;+ return <BreakdownPage websiteId={websiteId} />;}export const metadata: Metadata = {diff --git a/src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsxindex 0829e390c..01c91e0a4 100644--- a/src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/goals/GoalsPage.tsx@@ -24,7 +24,7 @@ export function GoalsPage({ websiteId }: { websiteId: string }) {<Grid columns="1fr 1fr" gap>{result?.data?.map((report: any) => (<Panel key={report.id}>- <Goal {...report} reportId={report.id} startDate={startDate} endDate={endDate} />+ <Goal {...report} startDate={startDate} endDate={endDate} /></Panel>))}</Grid>diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/Insights.tsx b/src/app/(main)/websites/[websiteId]/reports/insights/Insights.tsxdeleted file mode 100644index d0a084d7f..000000000--- a/src/app/(main)/websites/[websiteId]/reports/insights/Insights.tsx+++ /dev/null@@ -1,126 +0,0 @@-import { ReactNode } from 'react';-import { Grid, Row, Column, Text, Loading, Icon } from '@umami/react-zen';-import { Empty } from '@/components/common/Empty';-import { Users } from '@/components/icons';-import { useMessages, useLocale, useResultQuery } from '@/components/hooks';-import { formatDate } from '@/lib/date';-import { formatLongNumber } from '@/lib/format';-import { Panel } from '@/components/common/Panel';-import { LoadingPanel } from '@/components/common/LoadingPanel';--const DAYS = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];--export interface AttributionProps {- websiteId: string;- startDate: Date;- endDate: Date;- days?: number[];-}--export function Insights({ websiteId, days = DAYS, startDate, endDate }: AttributionProps) {- const { formatMessage, labels } = useMessages();- const { locale } = useLocale();- const { data, error, isLoading } = useResultQuery<any>('insights', {- websiteId,- dateRange: {- startDate,- endDate,- },- parameters: {- days,- },- });-- if (isLoading) {- return <Loading position="page" />;- }-- if (!data) {- return <Empty />;- }-- const rows = data.reduce((arr: any[], row: { date: any; visitors: any; day: any }) => {- const { date, visitors, day } = row;- if (day === 0) {- return arr.concat({- date,- visitors,- records: days- .reduce((arr, day) => {- arr[day] = data.find(x => x.date === date && x.day === day);- return arr;- }, [])- .filter(n => n),- });- }- return arr;- }, []);-- const totalDays = rows.length;-- return (- <LoadingPanel isEmpty={!data?.length} isLoading={isLoading} error={error}>- <Panel allowFullscreen height="900px">- <Column gap="1" width="100%" overflow="auto">- <Grid- columns="120px repeat(10, 100px)"- alignItems="center"- gap="1"- height="50px"- autoFlow="column"- >- <Column>- <Text weight="bold">{formatMessage(labels.cohort)}</Text>- </Column>- {days.map(n => (- <Column key={n}>- <Text weight="bold" align="center" wrap="nowrap">- {formatMessage(labels.day)} {n}- </Text>- </Column>- ))}- </Grid>- {rows.map(({ date, visitors, records }: any, rowIndex: number) => {- return (- <Grid key={rowIndex} columns="120px repeat(10, 100px)" gap="1" autoFlow="column">- <Column justifyContent="center" gap="1">- <Text weight="bold">{formatDate(date, 'PP', locale)}</Text>- <Row alignItems="center" gap>- <Icon>- <Users />- </Icon>- <Text>{formatLongNumber(visitors)}</Text>- </Row>- </Column>- {days.map(day => {- if (totalDays - rowIndex < day) {- return null;- }- const percentage = records.filter(a => a.day === day)[0]?.percentage;- return (- <Cell key={day}>{percentage ? `${Number(percentage).toFixed(2)}%` : ''}</Cell>- );- })}- </Grid>- );- })}- </Column>- </Panel>- </LoadingPanel>- );-}--const Cell = ({ children }: { children: ReactNode }) => {- return (- <Column- justifyContent="center"- alignItems="center"- width="100px"- height="100px"- backgroundColor="2"- borderRadius- >- {children}- </Column>- );-};diff --git a/src/app/(main)/websites/[websiteId]/reports/insights/InsightsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/insights/InsightsPage.tsxdeleted file mode 100644index 2972a6ef5..000000000--- a/src/app/(main)/websites/[websiteId]/reports/insights/InsightsPage.tsx+++ /dev/null@@ -1,18 +0,0 @@-'use client';-import { Column } from '@umami/react-zen';-import { Insights } from './Insights';-import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';-import { useDateRange } from '@/components/hooks';--export function InsightsPage({ websiteId }: { websiteId: string }) {- const {- dateRange: { startDate, endDate },- } = useDateRange(websiteId);-- return (- <Column gap>- <WebsiteControls websiteId={websiteId} />- <Insights websiteId={websiteId} startDate={startDate} endDate={endDate} />- </Column>- );-}diff --git a/src/app/api/reports/insights/route.ts b/src/app/api/reports/breakdown/route.tssimilarity index 67%rename from src/app/api/reports/insights/route.tsrename to src/app/api/reports/breakdown/route.tsindex a49db1fa2..55a073691 100644--- a/src/app/api/reports/insights/route.ts+++ b/src/app/api/reports/breakdown/route.ts@@ -1,7 +1,7 @@import { canViewWebsite } from '@/lib/auth';import { unauthorized, json } from '@/lib/response';import { parseRequest } from '@/lib/request';-import { getInsights } from '@/queries';+import { getBreakdown } from '@/queries';import { reportResultSchema } from '@/lib/schema';export async function POST(request: Request) {@@ -14,27 +14,17 @@ export async function POST(request: Request) {const {websiteId,dateRange: { startDate, endDate },- fields,- filters,+ parameters: { fields },} = body;if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}- const data = await getInsights(websiteId, fields, {- ...convertFilters(filters),+ const data = await getBreakdown(websiteId, fields, {startDate: new Date(startDate),endDate: new Date(endDate),});return json(data);}--function convertFilters(filters: any[]) {- return filters.reduce((obj, filter) => {- obj[filter.name] = filter;-- return obj;- }, {});-}diff --git a/src/components/common/Panel.tsx b/src/components/common/Panel.tsxindex d979bbca3..b96923d58 100644--- a/src/components/common/Panel.tsx+++ b/src/components/common/Panel.tsx@@ -7,11 +7,13 @@ import {Button,TooltipTrigger,Tooltip,+ Heading,} from '@umami/react-zen';import { Maximize, Close } from '@/components/icons';import { useMessages } from '@/components/hooks';export interface PanelProps extends ColumnProps {+ title?: string;allowFullscreen?: boolean;}@@ -25,7 +27,7 @@ const fullscreenStyles = {zIndex: 9999,} as any;-export function Panel({ allowFullscreen, style, children, ...props }: PanelProps) {+export function Panel({ title, allowFullscreen, style, children, ...props }: PanelProps) {const { formatMessage, labels } = useMessages();const [isFullscreen, setIsFullscreen] = useState(false);@@ -44,6 +46,7 @@ export function Panel({ allowFullscreen, style, children, ...props }: PanelProps{...props}style={{ ...style, ...(isFullscreen ? fullscreenStyles : {}) }}>+ {title && <Heading>{title}</Heading>}{allowFullscreen && (<Row justifyContent="flex-end" alignItems="center"><TooltipTrigger delay={0} isDisabled={isFullscreen}>diff --git a/src/components/icons.ts b/src/components/icons.tsindex 7d6f4a4c5..232a781d7 100644--- a/src/components/icons.ts+++ b/src/components/icons.ts@@ -5,8 +5,8 @@ export {ChartPie,ChevronRight as Chevron,Clock,- X as Close,Copy,+ Download,Edit,Ellipsis,Eye,@@ -29,11 +29,15 @@ export {RefreshCw as Refresh,Settings,Share,+ Sheet,Slash,SquarePen,+ SquarePlus,Sun,Trash,+ Upload,User,Users,+ X as Close,} from 'lucide-react';export * from '@/components/svg';diff --git a/src/components/messages.ts b/src/components/messages.tsindex e521d0dab..e9ae19d98 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -18,7 +18,7 @@ export const labels = defineMessages({user: { id: 'label.user', defaultMessage: 'User' },viewOnly: { id: 'label.view-only', defaultMessage: 'View only' },manage: { id: 'label.manage', defaultMessage: 'Manage' },- admin: { id: 'label.admin', defaultMessage: 'Administrator' },+ admin: { id: 'label.admin', defaultMessage: 'Admin' },confirm: { id: 'label.confirm', defaultMessage: 'Confirm' },details: { id: 'label.details', defaultMessage: 'Details' },website: { id: 'label.website', defaultMessage: 'Website' },@@ -215,6 +215,7 @@ export const labels = defineMessages({value: { id: 'label.value', defaultMessage: 'Value' },overview: { id: 'label.overview', defaultMessage: 'Overview' },totalRecords: { id: 'label.total-records', defaultMessage: 'Total records' },+ insight: { id: 'label.insight', defaultMessage: 'Insight' },insights: { id: 'label.insights', defaultMessage: 'Insights' },insightsDescription: {id: 'label.insights-description',diff --git a/src/lib/schema.ts b/src/lib/schema.tsindex 73d286600..afda5acc5 100644--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@ -54,15 +54,31 @@ export const urlOrPathParam = z.string().refine(},);+export const fieldsParam = z.enum([+ 'url',+ 'referrer',+ 'title',+ 'query',+ 'os',+ 'browser',+ 'device',+ 'country',+ 'region',+ 'city',+ 'tag',+ 'host',+ 'language',+]);+export const reportTypeParam = z.enum([+ 'attribution',+ 'breakdown','funnel',- 'insight',- 'retention',- 'utm','goal','journey',+ 'retention','revenue',- 'attribution',+ 'utm',]);export const reportParms = {@@ -141,8 +157,11 @@ export const attributionReportSchema = z.object({}),});-export const insightsReportSchema = z.object({- type: z.literal('insights'),+export const breakdownReportSchema = z.object({+ type: z.literal('breakdown'),+ parameters: z.object({+ fields: z.array(fieldsParam),+ }),});export const reportBaseSchema = z.object({@@ -160,7 +179,7 @@ export const reportTypeSchema = z.discriminatedUnion('type', [utmReportSchema,revenueReportSchema,attributionReportSchema,- insightsReportSchema,+ breakdownReportSchema,]);export const reportSchema = z.intersection(reportBaseSchema, reportTypeSchema);diff --git a/src/queries/index.ts b/src/queries/index.tsindex 2f7855282..76e0dc4f7 100644--- a/src/queries/index.ts+++ b/src/queries/index.ts@@ -16,7 +16,7 @@ export * from '@/queries/sql/events/saveEvent';export * from '@/queries/sql/reports/getFunnel';export * from '@/queries/sql/reports/getJourney';export * from '@/queries/sql/reports/getRetention';-export * from '@/queries/sql/reports/getInsights';+export * from '@/queries/sql/reports/getBreakdown';export * from '@/queries/sql/reports/getUTM';export * from '@/queries/sql/pageviews/getPageviewMetrics';export * from '@/queries/sql/pageviews/getPageviewStats';diff --git a/src/queries/sql/reports/getInsights.ts b/src/queries/sql/reports/getBreakdown.tssimilarity index 84%rename from src/queries/sql/reports/getInsights.tsrename to src/queries/sql/reports/getBreakdown.tsindex d7cdc283f..0965bf435 100644--- a/src/queries/sql/reports/getInsights.ts+++ b/src/queries/sql/reports/getBreakdown.ts@@ -4,8 +4,8 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { QueryFilters } from '@/lib/types';-export async function getInsights(- ...args: [websiteId: string, fields: { name: string; type?: string }[], filters: QueryFilters]+export async function getBreakdown(+ ...args: [websiteId: string, fields: string[], filters: QueryFilters]) {return runQuery({[PRISMA]: () => relationalQuery(...args),@@ -15,7 +15,7 @@ export async function getInsights(async function relationalQuery(websiteId: string,- fields: { name: string; type?: string }[],+ fields: string[],filters: QueryFilters,): Promise<{@@ -31,7 +31,7 @@ async function relationalQuery(eventType: EVENT_TYPE.pageView,},{- joinSession: !!fields.find(({ name }) => SESSION_COLUMNS.includes(name)),+ joinSession: !!fields.find(name => SESSION_COLUMNS.includes(name)),},);@@ -71,7 +71,7 @@ async function relationalQuery(async function clickhouseQuery(websiteId: string,- fields: { name: string; type?: string }[],+ fields: string[],filters: QueryFilters,): Promise<{@@ -118,10 +118,10 @@ async function clickhouseQuery();}-function parseFields(fields: { name: any }[]) {- return fields.map(({ name }) => `${FILTER_COLUMNS[name]} as "${name}"`).join(',');+function parseFields(fields: string[]) {+ return fields.map(name => `${FILTER_COLUMNS[name]} as "${name}"`).join(',');}-function parseFieldsByName(fields: { name: any }[]) {- return `${fields.map(({ name }) => name).join(',')}`;+function parseFieldsByName(fields: string[]) {+ return `${fields.map(name => name).join(',')}`;}