🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
add multi filtering
Bill Yang06901abea1db
diff --git a/client/package-lock.json b/client/package-lock.jsonindex 8aa7a0502..34fe76d36 100644--- a/client/package-lock.json+++ b/client/package-lock.json@@ -49,6 +49,7 @@"react-day-picker": "^8.10.1","react-dom": "^19.0.0","react-leaflet": "^5.0.0",+ "react-select": "^5.10.0","react-simple-maps": "^3.0.0","spinners-react": "^1.0.10","tailwind-merge": "^2.6.0",@@ -94,6 +95,41 @@"node": ">=6.9.0"}},+ "node_modules/@babel/generator": {+ "version": "7.26.9",+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",+ "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",+ "dependencies": {+ "@babel/parser": "^7.26.9",+ "@babel/types": "^7.26.9",+ "@jridgewell/gen-mapping": "^0.3.5",+ "@jridgewell/trace-mapping": "^0.3.25",+ "jsesc": "^3.0.2"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-module-imports": {+ "version": "7.25.9",+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",+ "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",+ "dependencies": {+ "@babel/traverse": "^7.25.9",+ "@babel/types": "^7.25.9"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-string-parser": {+ "version": "7.25.9",+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",+ "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",+ "engines": {+ "node": ">=6.9.0"+ }+ },"node_modules/@babel/helper-validator-identifier": {"version": "7.25.9","resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",@@ -102,6 +138,20 @@"node": ">=6.9.0"}},+ "node_modules/@babel/parser": {+ "version": "7.26.9",+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",+ "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",+ "dependencies": {+ "@babel/types": "^7.26.9"+ },+ "bin": {+ "parser": "bin/babel-parser.js"+ },+ "engines": {+ "node": ">=6.0.0"+ }+ },"node_modules/@babel/runtime": {"version": "7.26.9","resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",@@ -113,6 +163,48 @@"node": ">=6.9.0"}},+ "node_modules/@babel/template": {+ "version": "7.26.9",+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",+ "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",+ "dependencies": {+ "@babel/code-frame": "^7.26.2",+ "@babel/parser": "^7.26.9",+ "@babel/types": "^7.26.9"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/traverse": {+ "version": "7.26.9",+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",+ "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",+ "dependencies": {+ "@babel/code-frame": "^7.26.2",+ "@babel/generator": "^7.26.9",+ "@babel/parser": "^7.26.9",+ "@babel/template": "^7.26.9",+ "@babel/types": "^7.26.9",+ "debug": "^4.3.1",+ "globals": "^11.1.0"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/types": {+ "version": "7.26.9",+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",+ "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",+ "dependencies": {+ "@babel/helper-string-parser": "^7.25.9",+ "@babel/helper-validator-identifier": "^7.25.9"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },"node_modules/@better-auth/utils": {"version": "0.2.3","resolved": "https://registry.npmjs.org/@better-auth/utils/-/utils-0.2.3.tgz",@@ -141,6 +233,117 @@"tslib": "^2.4.0"}},+ "node_modules/@emotion/babel-plugin": {+ "version": "11.13.5",+ "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",+ "integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==",+ "dependencies": {+ "@babel/helper-module-imports": "^7.16.7",+ "@babel/runtime": "^7.18.3",+ "@emotion/hash": "^0.9.2",+ "@emotion/memoize": "^0.9.0",+ "@emotion/serialize": "^1.3.3",+ "babel-plugin-macros": "^3.1.0",+ "convert-source-map": "^1.5.0",+ "escape-string-regexp": "^4.0.0",+ "find-root": "^1.1.0",+ "source-map": "^0.5.7",+ "stylis": "4.2.0"+ }+ },+ "node_modules/@emotion/babel-plugin/node_modules/source-map": {+ "version": "0.5.7",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/@emotion/cache": {+ "version": "11.14.0",+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz",+ "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==",+ "dependencies": {+ "@emotion/memoize": "^0.9.0",+ "@emotion/sheet": "^1.4.0",+ "@emotion/utils": "^1.4.2",+ "@emotion/weak-memoize": "^0.4.0",+ "stylis": "4.2.0"+ }+ },+ "node_modules/@emotion/hash": {+ "version": "0.9.2",+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",+ "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g=="+ },+ "node_modules/@emotion/memoize": {+ "version": "0.9.0",+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",+ "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ=="+ },+ "node_modules/@emotion/react": {+ "version": "11.14.0",+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",+ "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",+ "dependencies": {+ "@babel/runtime": "^7.18.3",+ "@emotion/babel-plugin": "^11.13.5",+ "@emotion/cache": "^11.14.0",+ "@emotion/serialize": "^1.3.3",+ "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",+ "@emotion/utils": "^1.4.2",+ "@emotion/weak-memoize": "^0.4.0",+ "hoist-non-react-statics": "^3.3.1"+ },+ "peerDependencies": {+ "react": ">=16.8.0"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@emotion/serialize": {+ "version": "1.3.3",+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz",+ "integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==",+ "dependencies": {+ "@emotion/hash": "^0.9.2",+ "@emotion/memoize": "^0.9.0",+ "@emotion/unitless": "^0.10.0",+ "@emotion/utils": "^1.4.2",+ "csstype": "^3.0.2"+ }+ },+ "node_modules/@emotion/sheet": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz",+ "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg=="+ },+ "node_modules/@emotion/unitless": {+ "version": "0.10.0",+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz",+ "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg=="+ },+ "node_modules/@emotion/use-insertion-effect-with-fallbacks": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz",+ "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==",+ "peerDependencies": {+ "react": ">=16.8.0"+ }+ },+ "node_modules/@emotion/utils": {+ "version": "1.4.2",+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz",+ "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA=="+ },+ "node_modules/@emotion/weak-memoize": {+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",+ "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg=="+ },"node_modules/@esbuild-kit/core-utils": {"version": "3.3.2","resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz",@@ -1322,7 +1525,6 @@"version": "0.3.8","resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz","integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",- "dev": true,"dependencies": {"@jridgewell/set-array": "^1.2.1","@jridgewell/sourcemap-codec": "^1.4.10",@@ -1336,7 +1538,6 @@"version": "3.1.2","resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz","integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",- "dev": true,"engines": {"node": ">=6.0.0"}@@ -1345,7 +1546,6 @@"version": "1.2.1","resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz","integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",- "dev": true,"engines": {"node": ">=6.0.0"}@@ -1353,14 +1553,12 @@"node_modules/@jridgewell/sourcemap-codec": {"version": "1.5.0","resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",- "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",- "dev": true+ "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="},"node_modules/@jridgewell/trace-mapping": {"version": "0.3.25","resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz","integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",- "dev": true,"dependencies": {"@jridgewell/resolve-uri": "^3.1.0","@jridgewell/sourcemap-codec": "^1.4.14"@@ -3451,6 +3649,11 @@"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz","integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="},+ "node_modules/@types/parse-json": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",+ "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="+ },"node_modules/@types/prop-types": {"version": "15.7.14","resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",@@ -3474,6 +3677,14 @@"@types/react": "^19.0.0"}},+ "node_modules/@types/react-transition-group": {+ "version": "4.4.12",+ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",+ "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",+ "peerDependencies": {+ "@types/react": "*"+ }+ },"node_modules/@uidotdev/usehooks": {"version": "2.4.1","resolved": "https://registry.npmjs.org/@uidotdev/usehooks/-/usehooks-2.4.1.tgz",@@ -3587,6 +3798,20 @@"node": ">=8"}},+ "node_modules/babel-plugin-macros": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",+ "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",+ "dependencies": {+ "@babel/runtime": "^7.12.5",+ "cosmiconfig": "^7.0.0",+ "resolve": "^1.19.0"+ },+ "engines": {+ "node": ">=10",+ "npm": ">=6"+ }+ },"node_modules/balanced-match": {"version": "1.0.2","resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",@@ -3676,6 +3901,14 @@"node": ">=10.16.0"}},+ "node_modules/callsites": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",+ "engines": {+ "node": ">=6"+ }+ },"node_modules/camelcase-css": {"version": "2.0.1","resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",@@ -4300,6 +4533,34 @@"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz","integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="},+ "node_modules/convert-source-map": {+ "version": "1.9.0",+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="+ },+ "node_modules/cosmiconfig": {+ "version": "7.1.0",+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",+ "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",+ "dependencies": {+ "@types/parse-json": "^4.0.0",+ "import-fresh": "^3.2.1",+ "parse-json": "^5.0.0",+ "path-type": "^4.0.0",+ "yaml": "^1.10.0"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/cosmiconfig/node_modules/yaml": {+ "version": "1.10.2",+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",+ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",+ "engines": {+ "node": ">= 6"+ }+ },"node_modules/countries-list": {"version": "3.1.1","resolved": "https://registry.npmjs.org/countries-list/-/countries-list-3.1.1.tgz",@@ -4351,8 +4612,7 @@"node_modules/csstype": {"version": "3.1.3","resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",- "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",- "dev": true+ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="},"node_modules/d3-array": {"version": "3.2.4",@@ -4586,7 +4846,6 @@"version": "4.4.0","resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz","integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",- "dev": true,"dependencies": {"ms": "^2.1.3"},@@ -4687,6 +4946,15 @@"integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==","dev": true},+ "node_modules/dom-helpers": {+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",+ "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",+ "dependencies": {+ "@babel/runtime": "^7.8.7",+ "csstype": "^3.0.2"+ }+ },"node_modules/drizzle-kit": {"version": "0.30.2","resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.30.2.tgz",@@ -4785,6 +5053,17 @@"esbuild": ">=0.12 <1"}},+ "node_modules/escape-string-regexp": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/execa": {"version": "4.1.0","resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",@@ -4857,6 +5136,11 @@"node": ">=8"}},+ "node_modules/find-root": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",+ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="+ },"node_modules/foreground-child": {"version": "3.3.0","resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",@@ -4974,6 +5258,14 @@"node": ">=10.13.0"}},+ "node_modules/globals": {+ "version": "11.12.0",+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",+ "engines": {+ "node": ">=4"+ }+ },"node_modules/globby": {"version": "10.0.2","resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",@@ -5056,6 +5348,14 @@"node": ">= 0.4"}},+ "node_modules/hoist-non-react-statics": {+ "version": "3.3.2",+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",+ "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",+ "dependencies": {+ "react-is": "^16.7.0"+ }+ },"node_modules/hosted-git-info": {"version": "2.8.9","resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",@@ -5077,6 +5377,21 @@"node": ">= 4"}},+ "node_modules/import-fresh": {+ "version": "3.3.1",+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",+ "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",+ "dependencies": {+ "parent-module": "^1.0.0",+ "resolve-from": "^4.0.0"+ },+ "engines": {+ "node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/indent-string": {"version": "4.0.0","resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",@@ -5272,6 +5587,17 @@"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz","integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="},+ "node_modules/jsesc": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",+ "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",+ "bin": {+ "jsesc": "bin/jsesc"+ },+ "engines": {+ "node": ">=6"+ }+ },"node_modules/json-parse-even-better-errors": {"version": "2.3.1","resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",@@ -5350,6 +5676,11 @@"node": ">=12"}},+ "node_modules/memoize-one": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",+ "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="+ },"node_modules/merge-stream": {"version": "2.0.0","resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",@@ -5418,8 +5749,7 @@"node_modules/ms": {"version": "2.1.3","resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",- "dev": true+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="},"node_modules/mz": {"version": "2.7.0",@@ -5647,6 +5977,17 @@"integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==","dev": true},+ "node_modules/parent-module": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",+ "dependencies": {+ "callsites": "^3.0.0"+ },+ "engines": {+ "node": ">=6"+ }+ },"node_modules/parse-json": {"version": "5.2.0","resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",@@ -6117,6 +6458,26 @@}}},+ "node_modules/react-select": {+ "version": "5.10.0",+ "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.10.0.tgz",+ "integrity": "sha512-k96gw+i6N3ExgDwPIg0lUPmexl1ygPe6u5BdQFNBhkpbwroIgCNXdubtIzHfThYXYYTubwOBafoMnn7ruEP1xA==",+ "dependencies": {+ "@babel/runtime": "^7.12.0",+ "@emotion/cache": "^11.4.0",+ "@emotion/react": "^11.8.1",+ "@floating-ui/dom": "^1.0.1",+ "@types/react-transition-group": "^4.4.0",+ "memoize-one": "^6.0.0",+ "prop-types": "^15.6.0",+ "react-transition-group": "^4.3.0",+ "use-isomorphic-layout-effect": "^1.2.0"+ },+ "peerDependencies": {+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",+ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"+ }+ },"node_modules/react-simple-maps": {"version": "3.0.0","resolved": "https://registry.npmjs.org/react-simple-maps/-/react-simple-maps-3.0.0.tgz",@@ -6154,6 +6515,21 @@}}},+ "node_modules/react-transition-group": {+ "version": "4.4.5",+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",+ "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",+ "dependencies": {+ "@babel/runtime": "^7.5.5",+ "dom-helpers": "^5.0.1",+ "loose-envify": "^1.4.0",+ "prop-types": "^15.6.2"+ },+ "peerDependencies": {+ "react": ">=16.6.0",+ "react-dom": ">=16.6.0"+ }+ },"node_modules/read-cache": {"version": "1.0.0","resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",@@ -6213,6 +6589,14 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/resolve-from": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",+ "engines": {+ "node": ">=4"+ }+ },"node_modules/resolve-pkg-maps": {"version": "1.0.0","resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",@@ -6664,6 +7048,11 @@}}},+ "node_modules/stylis": {+ "version": "4.2.0",+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",+ "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="+ },"node_modules/sucrase": {"version": "3.35.0","resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",@@ -6921,6 +7310,19 @@}}},+ "node_modules/use-isomorphic-layout-effect": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz",+ "integrity": "sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==",+ "peerDependencies": {+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ }+ }+ },"node_modules/use-sidecar": {"version": "1.1.3","resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",diff --git a/client/package.json b/client/package.jsonindex 354359384..67ed2b3f4 100644--- a/client/package.json+++ b/client/package.json@@ -50,6 +50,7 @@"react-day-picker": "^8.10.1","react-dom": "^19.0.0","react-leaflet": "^5.0.0",+ "react-select": "^5.10.0","react-simple-maps": "^3.0.0","spinners-react": "^1.0.10","tailwind-merge": "^2.6.0",diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsxindex fb0a0fe5c..82b3cbfa7 100644--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx@@ -47,12 +47,19 @@ const filterTypeToLabel = (type: FilterType) => {};function getParameterValueLabel(filter: Filter) {- switch (filter.parameter) {- case "country":- return getCountryName(filter.value as string);- default:- return filter.value;+ const formatValue = (value: string) => {+ if (filter.parameter === "country") {+ return getCountryName(value);+ }+ return value;+ };++ if (filter.value.length === 1) {+ return formatValue(filter.value[0]);}++ // For multiple values, format them and join with commas+ return filter.value.map(formatValue).join(", ");}export function Filters() {diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsxindex 1019fd993..f092be81d 100644--- a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx@@ -26,6 +26,7 @@ import {import { FilterParameter, addFilter } from "../../../../../lib/store";import { useSingleCol } from "../../../../../hooks/api";+import { MultiSelect } from "../../../../../components/MultiSelect";interface ValueFilterProps {parameter: FilterParameter;@@ -42,9 +43,7 @@ export function ValueFilter({ parameter, type, onComplete }: ValueFilterProps) {useFilters: false,});- const [open, setOpen] = useState(false);-- const [value, setValue] = useState("");+ const [selectedValues, setSelectedValues] = useState<string[]>([]);const suggestions = useMemo(() => {return (@@ -66,19 +65,19 @@ export function ValueFilter({ parameter, type, onComplete }: ValueFilterProps) {);}, [data]);- const handleSelect = (currentValue: string) => {- setValue(currentValue);- setOpen(false);+ const handleChange = (selected: any) => {+ const values = selected.map((item: { value: string }) => item.value);+ setSelectedValues(values);};const handleApply = () => {- if (parameter && type && value.trim()) {+ if (parameter && type && selectedValues.length > 0) {addFilter({parameter,type,- value: value.trim(),+ value: selectedValues,});- setValue("");+ setSelectedValues([]);if (onComplete) {onComplete();}@@ -86,48 +85,19 @@ export function ValueFilter({ parameter, type, onComplete }: ValueFilterProps) {};return (- <div className="flex items-center gap-2">- <Popover open={open} onOpenChange={setOpen}>- <PopoverTrigger asChild>- <Button- variant="outline"- role="combobox"- aria-expanded={open}- className="min-w-[200px] justify-between text-left font-normal"- >- {value || "Select value..."}- <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />- </Button>- </PopoverTrigger>- <PopoverContent className="p-0" align="start">- <Command>- <CommandInput- placeholder="Search values..."- value={value}- onValueChange={setValue}- className="h-9"- />- <CommandList>- <CommandEmpty>No matching results</CommandEmpty>- <CommandGroup>- {suggestions.map((suggestion) => (- <CommandItem- key={suggestion.value}- value={suggestion.value}- onSelect={handleSelect}- >- {suggestion.label}- </CommandItem>- ))}- </CommandGroup>- </CommandList>- </Command>- </PopoverContent>- </Popover>-- <Button size="sm" onClick={handleApply}>- <Plus className="h-4 w-4 mr-1" />- Add+ <div className="flex flex-col gap-2">+ <MultiSelect+ options={suggestions}+ onChange={handleChange}+ placeholder="Select values..."+ isLoading={isLoading}+ />+ <Button+ onClick={handleApply}+ disabled={selectedValues.length === 0}+ className="mt-2"+ >+ Apply Filter</Button></div>);diff --git a/client/src/components/MultiSelect.tsx b/client/src/components/MultiSelect.tsxnew file mode 100644index 000000000..6353b62c5--- /dev/null+++ b/client/src/components/MultiSelect.tsx@@ -0,0 +1,76 @@+import { forwardRef } from "react";+import { Props as ReactSelectProps, GroupBase } from "react-select";++import Creatable from "react-select/creatable";++import { cn } from "@/lib/utils";++export type MultiSelectProps<+ Option,+ IsMulti extends boolean = true,+ Group extends GroupBase<Option> = GroupBase<Option>+> = Omit<ReactSelectProps<Option, IsMulti, Group>, "theme" | "classNames"> & {+ error?: boolean;+};++export const MultiSelect = forwardRef<any, MultiSelectProps<any>>(+ ({ className, error, ...props }, ref) => {+ return (+ <Creatable+ ref={ref}+ isMulti+ unstyled+ closeMenuOnSelect={false}+ className={className}+ classNames={{+ control: ({ isFocused }) =>+ cn(+ "flex w-[300px] min-h-[36px] rounded-md bg-neutral-900 px-3 py-[3px] text-sm shadow-sm transition-colors ",+ "placeholder:text-muted-foreground ",+ "disabled:cursor-not-allowed disabled:opacity-50",+ isFocused && "ring-1 ring-ring",+ error && "border-destructive ring-destructive"+ ),+ placeholder: () => "text-muted-foreground",+ input: () => "text-sm",+ menu: () =>+ "mt-2 rounded-md border-neutral-200 bg-neutral-900 text-neutral-50 shadow-md py-1",+ menuList: () => "text-sm",+ option: ({ isFocused, isSelected }) =>+ cn(+ "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 outline-none transition-colors",+ isSelected && "bg-primary text-primary-foreground",+ isFocused && !isSelected && "bg-accent text-accent-foreground",+ !isFocused &&+ !isSelected &&+ "text-popover-foreground hover:bg-accent hover:text-accent-foreground"+ ),+ multiValue: () =>+ "inline-flex items-center bg-secondary text-secondary-foreground mr-1",+ multiValueLabel: () => "px-2 text-xs leading-none",+ multiValueRemove: () =>+ cn(+ "flex items-center justify-center p-1",+ "hover:bg-destructive hover:text-destructive-foreground"+ ),+ valueContainer: () => "gap-1 flex flex-wrap items-center",+ clearIndicator: () =>+ "p-1 text-muted-foreground hover:text-foreground",+ dropdownIndicator: () =>+ "p-1 text-muted-foreground hover:text-foreground",+ indicatorSeparator: () => "bg-input mx-2 my-2 w-[1px]",+ noOptionsMessage: () => "text-muted-foreground p-2 text-sm",+ }}+ styles={{+ control: (base) => ({+ ...base,+ border: "1px solid hsl(var(--neutral-800))",+ }),+ }}+ {...props}+ />+ );+ }+);++MultiSelect.displayName = "MultiSelect";diff --git a/client/src/components/ui/dropdown-menu.tsx b/client/src/components/ui/dropdown-menu.tsxindex d67a1024a..85fa0e58d 100644--- a/client/src/components/ui/dropdown-menu.tsx+++ b/client/src/components/ui/dropdown-menu.tsx@@ -78,7 +78,7 @@ const DropdownMenuContent = React.forwardRef<ref={ref}sideOffset={sideOffset}className={cn(- "z-50 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50",+ "z-50 min-w-[8rem] rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50","data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",className)}diff --git a/client/src/lib/store.ts b/client/src/lib/store.tsindex 975db980b..01509df37 100644--- a/client/src/lib/store.ts+++ b/client/src/lib/store.ts@@ -81,7 +81,7 @@ export type FilterParameter =export type Filter = {parameter: FilterParameter;- value: string;+ value: string[];type: FilterType;};@@ -317,8 +317,8 @@ export const addFilter = (filter: Filter) => {const filterExists = filters.some((f) =>f.parameter === filter.parameter &&- f.value === filter.value &&- f.type === filter.type+ f.type === filter.type &&+ JSON.stringify(f.value) === JSON.stringify(filter.value));if (!filterExists) {setFilters([...filters, filter]);diff --git a/server/src/api/types.ts b/server/src/api/types.tsindex d2580ca4f..0f34daecc 100644--- a/server/src/api/types.ts+++ b/server/src/api/types.ts@@ -15,7 +15,7 @@ export type FilterParameter =export type Filter = {parameter: FilterParameter;- value: string;+ value: string[];type: FilterType;};diff --git a/server/src/api/utils.ts b/server/src/api/utils.tsindex 0409ee34b..6f8878005 100644--- a/server/src/api/utils.ts+++ b/server/src/api/utils.ts@@ -69,9 +69,20 @@ export function getFilterStatement(filters: string) {"AND " +filtersArray.map((filter: Filter) => {- return `${geSqlParam(filter.parameter)} ${filterTypeToOperator(- filter.type- )} '${filter.value}'`;+ if (filter.value.length === 1) {+ return `${geSqlParam(filter.parameter)} ${filterTypeToOperator(+ filter.type+ )} '${filter.value[0]}'`;+ }++ const valuesWithOperator = filter.value.map(+ (value) =>+ `${geSqlParam(filter.parameter)} ${filterTypeToOperator(+ filter.type+ )} '${value}'`+ );++ return `(${valuesWithOperator.join(" OR ")})`;}).join(" AND "));