Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Metrics Explorer (#68961)

Aleksandr Lesnenko4897452a0888
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index d26456b5404..7a0f857a5f2 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -787,6 +787,16 @@
settings
util}}
+ lib-metric
+ {:team "UX West"
+ :api #{metabase.lib-metric.core
+ metabase.lib-metric.schema}
+ :uses #{lib
+ lib-be
+ settings
+ types
+ util}}
+
llm
{:team "Metabot"
:api #{metabase.llm.api
@@ -836,12 +846,29 @@
events
lib
lib-be
+ metrics
models
permissions
remote-sync
search
util}}
+ metrics
+ {:team "UX West"
+ :api #{metabase.metrics.api
+ metabase.metrics.core}
+ :uses #{api
+ collections
+ lib
+ lib-be
+ lib-metric
+ models
+ parameters
+ query-processor
+ request
+ server
+ util}}
+
model-persistence
{:team "Querying"
:api #{metabase.model-persistence.api
@@ -1115,6 +1142,7 @@
events
lib
lib-be
+ metrics
models
parameters
permissions
diff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png
index 33345d3f0a2..2cac1b90913 100644
Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differ
diff --git a/bun.lock b/bun.lock
index 044294b901b..faa4af5a836 100644
--- a/bun.lock
+++ b/bun.lock
@@ -369,7 +369,7 @@
"react-refresh": "^0.14.2",
"reg-cli": "^0.17.7",
"semver": "^7.6.3",
- "shadow-cljs": "^2.28.20",
+ "shadow-cljs": "^3.3.5",
"source-map-loader": "^4.0.1",
"storybook": "^8.6.15",
"storybook-addon-pseudo-states": "^4.0.2",
@@ -3498,7 +3498,7 @@
"isarray": ["[email protected]", "", {}, "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="],
- "isexe": ["[email protected]", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
+ "isexe": ["[email protected]", "", {}, "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w=="],
"isobject": ["[email protected]", "", {}, "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="],
@@ -4022,8 +4022,6 @@
"node-int64": ["[email protected]", "", {}, "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="],
- "node-libs-browser": ["[email protected]", "", { "dependencies": { "assert": "^1.1.1", "browserify-zlib": "^0.2.0", "buffer": "^4.3.0", "console-browserify": "^1.1.0", "constants-browserify": "^1.0.0", "crypto-browserify": "^3.11.0", "domain-browser": "^1.1.1", "events": "^3.0.0", "https-browserify": "^1.0.0", "os-browserify": "^0.3.0", "path-browserify": "0.0.1", "process": "^0.11.10", "punycode": "^1.2.4", "querystring-es3": "^0.2.0", "readable-stream": "^2.3.3", "stream-browserify": "^2.0.1", "stream-http": "^2.7.2", "string_decoder": "^1.0.0", "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", "url": "^0.11.0", "util": "^0.11.0", "vm-browserify": "^1.0.1" } }, "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="],
-
"node-notifier": ["[email protected]", "", { "dependencies": { "growly": "^1.3.0", "is-wsl": "^2.2.0", "semver": "^7.3.2", "shellwords": "^0.1.1", "uuid": "^8.3.0", "which": "^2.0.2" } }, "sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="],
"node-polyfill-webpack-plugin": ["[email protected]", "", { "dependencies": { "assert": "^2.1.0", "browserify-zlib": "^0.2.0", "buffer": "^6.0.3", "console-browserify": "^1.2.0", "constants-browserify": "^1.0.0", "crypto-browserify": "^3.12.0", "domain-browser": "^5.7.0", "events": "^3.3.0", "https-browserify": "^1.0.0", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", "process": "^0.11.10", "punycode": "^2.3.1", "querystring-es3": "^0.2.1", "readable-stream": "^4.5.2", "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "string_decoder": "^1.3.0", "timers-browserify": "^2.0.12", "tty-browserify": "^0.0.1", "type-fest": "^4.18.2", "url": "^0.11.3", "util": "^0.12.5", "vm-browserify": "^1.1.2" } }, "sha512-WLk77vLpbcpmTekRj6s6vYxk30XoyaY5MDZ4+9g8OaKoG3Ij+TjOqhpQjVUlfDZBPBgpNATDltaQkzuXSnnkwg=="],
@@ -4782,7 +4780,7 @@
"sha1": ["[email protected]", "", { "dependencies": { "charenc": ">= 0.0.1", "crypt": ">= 0.0.1" } }, "sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg="],
- "shadow-cljs": ["[email protected]", "", { "dependencies": { "node-libs-browser": "^2.2.1", "readline-sync": "^1.4.7", "shadow-cljs-jar": "1.3.4", "source-map-support": "^0.4.15", "which": "^1.3.1", "ws": "^7.4.6" }, "bin": { "shadow-cljs": "cli/runner.js" } }, "sha512-Q9N+aw2suSUZ6vmWhZupl0rkyjoYrnpU1WbMrNrbuUiKE6XjvT1vcBkTUrqkMJEPraV7u+H9b5d/RcKnj8nbhg=="],
+ "shadow-cljs": ["[email protected]", "", { "dependencies": { "buffer": "^6.0.3", "process": "^0.11.10", "readline-sync": "^1.4.10", "shadow-cljs-jar": "1.3.4", "source-map-support": "^0.5.21", "which": "^5.0.0", "ws": "^8.18.1" }, "bin": { "shadow-cljs": "cli/runner.js" } }, "sha512-t5TBJmy77abwlkAY7UOXa1s9H/28nTHeDVckgzEVS8ONYtDvbNCHEuBYfS7wwV9wVZVybRNb7dILWNXISJL1Nw=="],
"shadow-cljs-jar": ["[email protected]", "", {}, "sha512-cZB2pzVXBnhpJ6PQdsjO+j/MksR28mv4QD/hP/2y1fsIa9Z9RutYgh3N34FZ8Ktl4puAXaIGlct+gMCJ5BmwmA=="],
@@ -4848,7 +4846,7 @@
"source-map-loader": ["[email protected]", "", { "dependencies": { "abab": "^2.0.6", "iconv-lite": "^0.6.3", "source-map-js": "^1.0.2" } }, "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA=="],
- "source-map-support": ["[email protected]", "", { "dependencies": { "source-map": "^0.5.6" } }, "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="],
+ "source-map-support": ["[email protected]", "", { "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" } }, "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="],
"sourcemap-codec": ["[email protected]", "", {}, "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="],
@@ -5076,8 +5074,6 @@
"tmpl": ["[email protected]", "", {}, "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="],
- "to-arraybuffer": ["[email protected]", "", {}, "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="],
-
"to-buffer": ["[email protected]", "", { "dependencies": { "isarray": "^2.0.5", "safe-buffer": "^5.2.1", "typed-array-buffer": "^1.0.3" } }, "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ=="],
"to-camel-case": ["[email protected]", "", { "dependencies": { "to-space-case": "^1.0.0" } }, "sha512-nD8pQi5H34kyu1QDMFjzEIYqk0xa9Alt6ZfrdEMuHCFOfTLhDG5pgTu/aAM9Wt9lXILwlXmWP43b8sav0GNE8Q=="],
@@ -5344,7 +5340,7 @@
"whatwg-url": ["[email protected]", "", { "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, "sha1-lmRU6HZUYuN2RNNib2dCzotwll0="],
- "which": ["[email protected]", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "which": "./bin/which" } }, "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="],
+ "which": ["[email protected]", "", { "dependencies": { "isexe": "^3.1.1" }, "bin": { "node-which": "bin/which.js" } }, "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ=="],
"which-boxed-primitive": ["[email protected]", "", { "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", "is-number-object": "^1.0.4", "is-string": "^1.0.5", "is-symbol": "^1.0.3" } }, "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="],
@@ -5374,7 +5370,7 @@
"write-file-atomic": ["[email protected]", "", { "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^4.0.1" } }, "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw=="],
- "ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+ "ws": ["[email protected]", "", {}, "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg=="],
"wsl-utils": ["[email protected]", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],
@@ -5608,6 +5604,8 @@
"@loki/target-native-android-emulator/tempy": ["[email protected]", "", { "dependencies": { "del": "^6.0.0", "is-stream": "^2.0.0", "temp-dir": "^2.0.0", "type-fest": "^0.16.0", "unique-string": "^2.0.0" } }, "sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="],
+ "@loki/target-native-core/ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+
"@loki/target-native-ios-simulator/tempy": ["[email protected]", "", { "dependencies": { "del": "^6.0.0", "is-stream": "^2.0.0", "temp-dir": "^2.0.0", "type-fest": "^0.16.0", "unique-string": "^2.0.0" } }, "sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="],
"@mantine/core/type-fest": ["[email protected]", "", {}, "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA=="],
@@ -5984,6 +5982,8 @@
"chrome-remote-interface/commander": ["[email protected]", "", {}, "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="],
+ "chrome-remote-interface/ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+
"cipher-base/safe-buffer": ["[email protected]", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="],
"citty/consola": ["[email protected]", "", {}, "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA=="],
@@ -6274,6 +6274,8 @@
"global-prefix/ini": ["[email protected]", "", {}, "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="],
+ "global-prefix/which": ["[email protected]", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "which": "./bin/which" } }, "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="],
+
"globby/ignore": ["[email protected]", "", {}, "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="],
"globby/slash": ["[email protected]", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="],
@@ -6344,6 +6346,8 @@
"ink/wrap-ansi": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="],
+ "ink/ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+
"inquirer-file-selector/chalk": ["[email protected]", "", {}, "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w=="],
"inquirer-toggle/@inquirer/core": ["@inquirer/[email protected]", "", { "dependencies": { "@inquirer/figures": "^1.0.3", "@inquirer/type": "^1.3.3", "@types/mute-stream": "^0.0.4", "@types/node": "^20.14.9", "@types/wrap-ansi": "^3.0.0", "ansi-escapes": "^4.3.2", "cli-spinners": "^2.9.2", "cli-width": "^4.1.0", "mute-stream": "^1.0.0", "picocolors": "^1.0.1", "signal-exit": "^4.1.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^6.2.0" } }, "sha512-7vsXSfxtrrbwMTirfaKwPcjqJy7pzeuF/bP62yo1NQrRJ5HjmMlrhZml/Ljm9ODc1RnbhJlTeSnCkjtFddKjwA=="],
@@ -6468,8 +6472,6 @@
"jsdom/whatwg-url": ["[email protected]", "", { "dependencies": { "tr46": "^5.1.0", "webidl-conversions": "^7.0.0" } }, "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw=="],
- "jsdom/ws": ["[email protected]", "", {}, "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg=="],
-
"json-schema-to-ts/@types/json-schema": ["@types/[email protected]", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
"json-stable-stringify/call-bind": ["[email protected]", "", { "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "set-function-length": "^1.2.1" } }, "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="],
@@ -6602,32 +6604,6 @@
"node-environment-flags/semver": ["[email protected]", "", { "bin": { "semver": "./bin/semver" } }, "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="],
- "node-libs-browser/assert": ["[email protected]", "", { "dependencies": { "object-assign": "^4.1.1", "util": "0.10.3" } }, "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="],
-
- "node-libs-browser/buffer": ["[email protected]", "", { "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", "isarray": "^1.0.0" } }, "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="],
-
- "node-libs-browser/domain-browser": ["[email protected]", "", {}, "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="],
-
- "node-libs-browser/events": ["[email protected]", "", {}, "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="],
-
- "node-libs-browser/path-browserify": ["[email protected]", "", {}, "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="],
-
- "node-libs-browser/punycode": ["[email protected]", "", {}, "sha1-wNWmOycYgArY4esPpSachN1BhF4="],
-
- "node-libs-browser/readable-stream": ["[email protected]", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="],
-
- "node-libs-browser/stream-browserify": ["[email protected]", "", { "dependencies": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" } }, "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="],
-
- "node-libs-browser/stream-http": ["[email protected]", "", { "dependencies": { "builtin-status-codes": "^3.0.0", "inherits": "^2.0.1", "readable-stream": "^2.3.6", "to-arraybuffer": "^1.0.0", "xtend": "^4.0.0" } }, "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="],
-
- "node-libs-browser/timers-browserify": ["[email protected]", "", { "dependencies": { "setimmediate": "^1.0.4" } }, "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="],
-
- "node-libs-browser/tty-browserify": ["[email protected]", "", {}, "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="],
-
- "node-libs-browser/url": ["[email protected]", "", { "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" } }, "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE="],
-
- "node-libs-browser/util": ["[email protected]", "", { "dependencies": { "inherits": "2.0.3" } }, "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="],
-
"node-notifier/is-wsl": ["[email protected]", "", { "dependencies": { "is-docker": "^2.0.0" } }, "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="],
"node-notifier/semver": ["[email protected]", "", { "dependencies": { "lru-cache": "^6.0.0" }, "bin": { "semver": "bin/semver.js" } }, "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="],
@@ -6768,6 +6744,8 @@
"rc/strip-json-comments": ["[email protected]", "", {}, "sha1-PFMZQukIwml8DsNEhYwobHygpgo="],
+ "react-devtools-core/ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+
"react-dnd/dnd-core": ["[email protected]", "", { "dependencies": { "asap": "^2.0.6", "invariant": "^2.2.4", "lodash": "^4.17.10", "redux": "^4.0.0" } }, "sha512-GSyGmfGom9oyTFJ4Ll/95Dn3ZDvPkrgINwfeOd+gTI0RGIN1TcTGChrHnIHF3A3e1PymyEKZg+3ouN3w2uIJGQ=="],
"react-dnd/hoist-non-react-statics": ["[email protected]", "", {}, "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="],
@@ -6882,10 +6860,14 @@
"simple-websocket/readable-stream": ["[email protected]", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
+ "simple-websocket/ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+
"snake-case/tslib": ["[email protected]", "", {}, "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="],
"sockjs/uuid": ["[email protected]", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="],
+ "source-map-support/source-map": ["[email protected]", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
+
"spdy-transport/readable-stream": ["[email protected]", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
"sql-formatter/get-stdin": ["[email protected]", "", {}, "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="],
@@ -7072,6 +7054,8 @@
"webpack-bundle-analyzer/commander": ["[email protected]", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="],
+ "webpack-bundle-analyzer/ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+
"webpack-cli/@discoveryjs/json-ext": ["@discoveryjs/[email protected]", "", {}, "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="],
"webpack-cli/colorette": ["[email protected]", "", {}, "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="],
@@ -7174,6 +7158,8 @@
"@ferocia-oss/osnap/execa/strip-final-newline": ["[email protected]", "", {}, "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="],
+ "@ferocia-oss/osnap/which/isexe": ["[email protected]", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
+
"@inquirer/checkbox/ansi-escapes/type-fest": ["[email protected]", "", {}, "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="],
"@inquirer/core/ansi-escapes/type-fest": ["[email protected]", "", {}, "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="],
@@ -7278,6 +7264,8 @@
"@rspack/cli/webpack-bundle-analyzer/commander": ["[email protected]", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="],
+ "@rspack/cli/webpack-bundle-analyzer/ws": ["[email protected]", "", {}, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
+
"@rspack/cli/yargs/cliui": ["[email protected]", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],
"@rspack/cli/yargs/yargs-parser": ["[email protected]", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],
@@ -7500,6 +7488,8 @@
"configstore/unique-string/crypto-random-string": ["[email protected]", "", {}, "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="],
+ "cross-spawn/which/isexe": ["[email protected]", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
+
"css-loader/semver/lru-cache": ["[email protected]", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
"csso/css-tree/mdn-data": ["[email protected]", "", {}, "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g=="],
@@ -7626,6 +7616,8 @@
"fork-ts-checker-webpack-plugin/semver/lru-cache": ["[email protected]", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
+ "global-prefix/which/isexe": ["[email protected]", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
+
"hpack.js/readable-stream/isarray": ["[email protected]", "", {}, "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="],
"hpack.js/readable-stream/string_decoder": ["[email protected]", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],
@@ -7906,26 +7898,12 @@
"nano-css/css-tree/source-map": ["[email protected]", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
- "node-libs-browser/assert/util": ["[email protected]", "", { "dependencies": { "inherits": "2.0.1" } }, "sha1-evsa/lCAUkZInj23/g7TeTNqwPk="],
-
- "node-libs-browser/buffer/base64-js": ["[email protected]", "", {}, "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="],
-
- "node-libs-browser/buffer/ieee754": ["[email protected]", "", {}, "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="],
-
- "node-libs-browser/buffer/isarray": ["[email protected]", "", {}, "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="],
-
- "node-libs-browser/readable-stream/isarray": ["[email protected]", "", {}, "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="],
-
- "node-libs-browser/readable-stream/string_decoder": ["[email protected]", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],
-
- "node-libs-browser/url/punycode": ["[email protected]", "", {}, "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="],
-
- "node-libs-browser/util/inherits": ["[email protected]", "", {}, "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="],
-
"node-notifier/is-wsl/is-docker": ["[email protected]", "", { "bin": { "is-docker": "cli.js" } }, "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="],
"node-notifier/semver/lru-cache": ["[email protected]", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
+ "node-notifier/which/isexe": ["[email protected]", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
+
"oas-resolver/yargs/cliui": ["[email protected]", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],
"oas-resolver/yargs/yargs-parser": ["[email protected]", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],
@@ -8704,8 +8682,6 @@
"msw/@inquirer/confirm/@inquirer/core/wrap-ansi": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="],
- "node-libs-browser/assert/util/inherits": ["[email protected]", "", {}, "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="],
-
"node-notifier/semver/lru-cache/yallist": ["[email protected]", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
"object-is/call-bind/get-intrinsic/has-proto": ["[email protected]", "", {}, "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="],
diff --git a/deps.edn b/deps.edn
index c1de58da76c..f5aaff07116 100644
--- a/deps.edn
+++ b/deps.edn
@@ -448,9 +448,10 @@
com.lambdaisland/glogi {:mvn/version "1.3.169"}
io.github.metabase/hawk {:mvn/version "1.0.13"}
org.clojars.mmb90/cljs-cache {:mvn/version "0.1.4"}
+ org.clojure/clojurescript {:mvn/version "1.12.134"}
refactor-nrepl/refactor-nrepl {:mvn/version "3.11.0"}
;; keep it in sync with package.json
- thheller/shadow-cljs {:mvn/version "3.2.1"}}}
+ thheller/shadow-cljs {:mvn/version "3.3.5"}}}
;; for local dev -- include the drivers locally with :dev:drivers
:drivers
diff --git a/e2e/support/helpers/e2e-metrics-viewer-helpers.ts b/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
new file mode 100644
index 00000000000..94b52f37c61
--- /dev/null
+++ b/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
@@ -0,0 +1,47 @@
+export const MetricsViewer = {
+ goToViewer: () => cy.visit("/explore"),
+ searchInput: () => cy.findByTestId("metrics-viewer-search-input"),
+ searchBarPills: () => cy.findAllByTestId("metrics-viewer-search-pill"),
+ searchResults: () => cy.findByTestId("metrics-search-results"),
+ breakoutLegend: () => cy.findByTestId("metrics-viewer-breakout-legend"),
+ getFilterButton: () => cy.findByRole("button", { name: /Filter/ }),
+ getAllFilterPills: () => cy.findAllByTestId("metrics-viewer-filter-pill"),
+ getDimensionPillContainer: () =>
+ cy.findByTestId("metrics-viewer-dimension-pill-container"),
+ tablist: () => cy.findByRole("tablist"),
+ getTab: (tab: string) =>
+ MetricsViewer.tablist().findByRole("tab", { name: tab }),
+ tabsShouldBe: (tabs: string[]) => {
+ tabs.forEach((tab) =>
+ MetricsViewer.tablist().findByRole("tab", { name: tab }).should("exist"),
+ );
+ },
+ getMetricVisualization: () => cy.findByTestId("visualization-root"),
+ getMetricVisualizationDataPoints: () =>
+ MetricsViewer.getMetricVisualization().get(
+ "path[fill='hsla(0, 0%, 100%, 1.00)']",
+ ),
+ getAllMetricVisualizations: () => cy.findAllByTestId("visualization-root"),
+
+ assertVizType: (displayType: string) =>
+ MetricsViewer.getMetricVisualization().should(
+ "have.attr",
+ "data-viz-ui-name",
+ displayType,
+ ),
+ getMerticControls: () => cy.findByTestId("metrics-viewer-controls"),
+ changeVizType: (display: string) =>
+ MetricsViewer.getMerticControls()
+ .findByRole("button", { name: display })
+ .click(),
+ getLayoutControls: () => cy.findByTestId("metrics-viewer-layout-controls"),
+ getAllCards: () => cy.findAllByTestId("metrics-viewer-card"),
+ getAddDimensionButton: () =>
+ cy.findByRole("button", { name: "Add dimension tab" }),
+ getRemoveTabButton: (tabLabel: string) =>
+ cy.findByRole("button", { name: `Remove ${tabLabel} tab` }),
+ openMetricHomePage: (metricName: string) => {
+ MetricsViewer.searchBarPills().contains(metricName).rightclick();
+ cy.findByText(/Go to metric home page/).click();
+ },
+};
diff --git a/e2e/support/helpers/e2e-visual-tests-helpers.js b/e2e/support/helpers/e2e-visual-tests-helpers.js
index c904a2e1509..4699f665f3d 100644
--- a/e2e/support/helpers/e2e-visual-tests-helpers.js
+++ b/e2e/support/helpers/e2e-visual-tests-helpers.js
@@ -276,3 +276,10 @@ export const BoxPlot = {
return echartsContainer().find(`path[d="${DIAMOND_PATH}"]`);
},
};
+
+export function applyBrush(left, right) {
+ echartsContainer()
+ .trigger("mousedown", left, 100)
+ .trigger("mousemove", left, 100)
+ .trigger("mouseup", right, 100);
+}
diff --git a/e2e/support/helpers/index.ts b/e2e/support/helpers/index.ts
index 64237614d2a..b8588620b8a 100644
--- a/e2e/support/helpers/index.ts
+++ b/e2e/support/helpers/index.ts
@@ -33,6 +33,7 @@ export * from "./e2e-enterprise-helpers";
export * from "./e2e-filter-helpers";
export * from "./e2e-ldap-helpers";
export * from "./e2e-metabot-helpers";
+export * from "./e2e-metrics-viewer-helpers";
export * from "./e2e-misc-helpers";
export * from "./e2e-mock-app-settings-helpers";
export * from "./e2e-models-metadata-helpers";
diff --git a/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts b/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts
index 9bf53d9e716..f088c01bcfc 100644
--- a/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts
+++ b/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts
@@ -217,13 +217,13 @@ describe("scenarios > dashboard > visualizer > drillthrough", () => {
"have.length",
2,
);
- applyBrush(200, 300);
+ H.applyBrush(200, 300);
cy.get("@dataset.all").should("have.length", 0);
});
H.getDashboardCard(3).within(() => {
cy.findByText(PRODUCTS_COUNT_BY_CREATED_AT.name).should("exist");
- applyBrush(200, 300);
+ H.applyBrush(200, 300);
cy.wait("@dataset");
});
@@ -239,10 +239,3 @@ describe("scenarios > dashboard > visualizer > drillthrough", () => {
});
});
});
-
-function applyBrush(left: number, right: number) {
- H.echartsContainer()
- .trigger("mousedown", left, 100)
- .trigger("mousemove", left, 100)
- .trigger("mouseup", right, 100);
-}
diff --git a/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
index 8b9f0e2d04e..bf5ac3bc011 100644
--- a/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
@@ -234,6 +234,9 @@ describe("scenarios > data studio > library > metrics", () => {
cy.log("Restore the metric");
cy.findByRole("table").findByText("Trusted Orders Metric").click();
+
+ H.MetricsViewer.openMetricHomePage("Trusted Orders Metric");
+
cy.findByTestId("archive-banner").should("be.visible");
cy.findByTestId("archive-banner").findByText("Restore").click();
cy.wait("@updateCard");
@@ -266,7 +269,7 @@ describe("scenarios > data studio > library > metrics", () => {
.closest("a")
.should("have.attr", "target", "_blank")
.should("have.attr", "href")
- .and("match", /\/metric\/\d+/);
+ .and("match", /\/explore\?metricId=\d+/);
});
it("should duplicate metric via more menu", () => {
diff --git a/e2e/test/scenarios/metrics/browse.cy.spec.ts b/e2e/test/scenarios/metrics/browse.cy.spec.ts
index b315ad7c749..0a82dc79cdd 100644
--- a/e2e/test/scenarios/metrics/browse.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/browse.cy.spec.ts
@@ -169,6 +169,8 @@ describe("scenarios > browse > metrics", () => {
createMetrics([ORDERS_SCALAR_METRIC]);
cy.visit("/browse/metrics");
findMetric(ORDERS_SCALAR_METRIC.name).should("be.visible").click();
+ cy.location("pathname").should("match", /^\/explore/);
+ H.MetricsViewer.openMetricHomePage("Count of orders");
cy.location("pathname").should("match", /^\/metric\/\d+-.*$/);
});
@@ -198,7 +200,7 @@ describe("scenarios > browse > metrics", () => {
cy.get("@open").should("have.been.calledOnce");
cy.get("@open").should(
"have.been.calledWithMatch",
- /^\/metric\/\d+-.*$/,
+ /^\/explore/,
"_blank",
);
@@ -385,7 +387,7 @@ describe("scenarios > browse > metrics", () => {
});
it("should not show the verified metrics filter when there are no verified metrics", () => {
- createMetrics();
+ createMetrics(ALL_METRICS);
cy.visit("/browse/metrics");
cy.findByLabelText("Table of metrics").should("be.visible");
@@ -468,12 +470,6 @@ describe("scenarios > browse > metrics", () => {
});
});
-function createMetrics(
- metrics: StructuredQuestionDetailsWithName[] = ALL_METRICS,
-) {
- metrics.forEach((metric) => H.createQuestion(metric));
-}
-
function metricsTable() {
return cy.findByLabelText("Table of metrics").should("be.visible");
}
@@ -499,10 +495,12 @@ function shouldNotHaveBookmark(name: string) {
function verifyMetric(metric: StructuredQuestionDetailsWithName) {
metricsTable().findByText(metric.name).should("be.visible").click();
+ H.MetricsViewer.openMetricHomePage(metric.name);
cy.findByLabelText("Move, trash, and more…").click();
H.popover().findByText("Verify this metric").click();
+ H.openNavigationSidebar();
H.navigationSidebar()
.findByRole("listitem", { name: "Browse metrics" })
.click();
@@ -510,10 +508,12 @@ function verifyMetric(metric: StructuredQuestionDetailsWithName) {
function unverifyMetric(metric: StructuredQuestionDetailsWithName) {
metricsTable().findByText(metric.name).should("be.visible").click();
+ H.MetricsViewer.openMetricHomePage(metric.name);
cy.findByLabelText("Move, trash, and more…").click();
H.popover().findByText("Remove verification").click();
+ H.openNavigationSidebar();
H.navigationSidebar()
.findByRole("listitem", { name: "Browse metrics" })
.click();
@@ -522,3 +522,7 @@ function unverifyMetric(metric: StructuredQuestionDetailsWithName) {
function toggleVerifiedMetricsFilter() {
cy.findByLabelText(/show.*verified.*metrics/i).click();
}
+
+function createMetrics(metrics: StructuredQuestionDetailsWithName[]) {
+ metrics.forEach((metric) => H.createQuestion(metric));
+}
diff --git a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
new file mode 100644
index 00000000000..e5f7b6245c1
--- /dev/null
+++ b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
@@ -0,0 +1,895 @@
+const { H } = cy;
+import { SAMPLE_DB_ID, WRITABLE_DB_ID } from "e2e/support/cypress_data";
+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
+import {
+ FIRST_COLLECTION_ID,
+ ORDERS_MODEL_ID,
+} from "e2e/support/cypress_sample_instance_data";
+import type { StructuredQuestionDetails } from "e2e/support/helpers";
+
+const { ORDERS_ID, ORDERS, PRODUCTS_ID, PRODUCTS, ACCOUNTS_ID, FEEDBACK_ID } =
+ SAMPLE_DATABASE;
+
+type StructuredQuestionDetailsWithName = StructuredQuestionDetails & {
+ name: string;
+};
+
+const ORDERS_SCALAR_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Count of orders",
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ },
+ display: "scalar",
+};
+
+const ACCOUNTS_SCALAR_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Count of accounts",
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": ACCOUNTS_ID,
+ aggregation: [["count"]],
+ },
+ display: "scalar",
+};
+
+const FEEDBACK_SCALAR_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Count of feedback",
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": FEEDBACK_ID,
+ aggregation: [["count"]],
+ },
+ display: "scalar",
+};
+
+const ORDERS_SCALAR_MODEL_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Orders model metric",
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": `card__${ORDERS_MODEL_ID}`,
+ aggregation: [["count"]],
+ },
+ display: "scalar",
+ collection_id: FIRST_COLLECTION_ID as number,
+};
+
+const ORDERS_TIMESERIES_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Count of orders over time",
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ breakout: [
+ [
+ "field",
+ ORDERS.CREATED_AT,
+ { "base-type": "type/DateTime", "temporal-unit": "month" },
+ ],
+ ],
+ },
+ display: "line",
+};
+
+const PRODUCTS_SCALAR_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Count of products",
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": PRODUCTS_ID,
+ aggregation: [["count"]],
+ },
+ display: "scalar",
+};
+
+const NON_NUMERIC_METRIC: StructuredQuestionDetailsWithName = {
+ name: "Max of product category",
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": PRODUCTS_ID,
+ aggregation: [["max", ["field", PRODUCTS.CATEGORY, null]]],
+ },
+ display: "scalar",
+};
+
+const ALL_MODELS = [
+ ACCOUNTS_SCALAR_METRIC,
+ FEEDBACK_SCALAR_METRIC,
+ NON_NUMERIC_METRIC,
+ ORDERS_SCALAR_METRIC,
+ ORDERS_SCALAR_MODEL_METRIC,
+ ORDERS_TIMESERIES_METRIC,
+ PRODUCTS_SCALAR_METRIC,
+];
+
+const SNAPSHOT_NAME = "metrics-explorer-snapshot";
+
+describe("scenarios > metrics > explorer", () => {
+ before(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ createMetrics(ALL_MODELS);
+ createTestMeasure();
+ H.snapshot(SNAPSHOT_NAME);
+ });
+ beforeEach(() => {
+ H.restore(SNAPSHOT_NAME as any);
+ cy.signInAsAdmin();
+ });
+
+ // ============================================================================
+ // Test Helpers
+ // ============================================================================
+
+ /**
+ * Add a metric or measure to the explorer via the search panel
+ */
+ const addMetric = (name: string) => {
+ H.MetricsViewer.searchInput().clear().type(name);
+ H.MetricsViewer.searchResults().findByText(name).click();
+ };
+
+ /**
+ * Select a breakout dimension
+ */
+ const selectBreakout = (
+ cardname: string,
+ dimensionName: string,
+ index = 0,
+ binning?: string,
+ ) => {
+ H.MetricsViewer.searchBarPills().contains(cardname).rightclick();
+ H.popover().findByText("Break out").click();
+ const breakout = H.popover()
+ .findAllByText(dimensionName)
+ .should("have.length.at.least", index)
+ .eq(index)
+ .closest("[role=option]");
+
+ if (binning) {
+ breakout.findByTestId("dimension-list-item-binning").realHover().click();
+ H.popover().findByRole("menuitem", { name: binning }).click();
+ } else {
+ breakout.click();
+ }
+ };
+
+ /**
+ * Intercept and wait for dataset query
+ */
+ const intercedptDatasetQuery = () => {
+ cy.intercept("POST", "/api/metric/dataset").as("dataset");
+ };
+
+ /**
+ * Verify the grid displays the correct number of metric cards
+ */
+ const verifyMetricCount = (count: number) => {
+ H.MetricsViewer.searchBarPills().should("have.length", count);
+ };
+
+ /**
+ * Switch to a specific tab
+ */
+ const switchToTab = (tabName: string) => {
+ H.MetricsViewer.getTab(tabName).click();
+ };
+
+ // ============================================================================
+ // Entry Points
+ // ============================================================================
+
+ describe("Entry points", () => {
+ it("should show empty state on first load", () => {
+ H.MetricsViewer.goToViewer();
+ cy.url().should("include", "/explore");
+ cy.findByRole("heading", { name: "Start exploring" }).should("exist");
+
+ addMetric("Count of products");
+
+ cy.log("should persist state in url");
+
+ cy.reload();
+ verifyMetricCount(1);
+
+ cy.log("should navigate to data studio via right-click context menu");
+ cy.window().then((win) => {
+ cy.stub(win, "open").as("windowOpen");
+ });
+
+ H.MetricsViewer.searchBarPills()
+ .contains("Count of products")
+ .rightclick();
+ H.popover().findByText("Edit in Data Studio").click();
+
+ cy.get("@windowOpen").should(
+ "have.been.calledWith",
+ Cypress.sinon.match(/\/data-studio\/library\/metrics\/\d+/),
+ "_blank",
+ );
+ });
+
+ it("should not show Edit in Data Studio for users without data studio access", () => {
+ cy.signInAsNormalUser();
+ H.MetricsViewer.goToViewer();
+ addMetric("Count of orders");
+
+ H.MetricsViewer.searchBarPills().contains("Count of orders").rightclick();
+ H.popover().should("not.contain", "Edit in Data Studio");
+ });
+
+ it("should handle breakout with no results gracefully", () => {
+ createMetrics([
+ {
+ name: "Empty Metric",
+ query: {
+ "source-table": 1,
+ aggregation: [["count"]],
+ filter: ["=", ["field", 2, null], null],
+ },
+ type: "metric",
+ },
+ ]);
+ H.MetricsViewer.goToViewer();
+ addMetric("Empty Metric");
+
+ H.MetricsViewer.getMetricVisualization()
+ .findByText(/No dice/)
+ .should("exist");
+ });
+ });
+
+ // ============================================================================
+ // Adding Metrics and Measures
+ // ============================================================================
+
+ describe("Adding metrics and measures", () => {
+ beforeEach(() => {
+ intercedptDatasetQuery();
+ });
+
+ it("should add multiple metrics", () => {
+ H.MetricsViewer.goToViewer();
+ addMetric("Count of products");
+ cy.wait("@dataset");
+ addMetric("Count of orders");
+ cy.wait("@dataset");
+ verifyMetricCount(2);
+
+ cy.log("no results");
+ H.MetricsViewer.searchInput().type("xyznonexistent");
+ H.MetricsViewer.searchResults().should(
+ "contain.text",
+ "No results found",
+ );
+
+ cy.log("does not allow duplicates");
+ H.MetricsViewer.searchInput().clear().type("Count of products");
+ H.MetricsViewer.searchResults().should(
+ "contain.text",
+ "No results found",
+ );
+
+ cy.log("Should allow me to add measures");
+ H.MetricsViewer.searchInput().clear();
+ addMetric("Test Measure");
+ });
+
+ it("Should not show me metrics that live in collections I do not have permissions to see", () => {
+ cy.signIn("nocollection");
+ H.MetricsViewer.goToViewer();
+ H.MetricsViewer.searchInput().type("Count of");
+ H.MetricsViewer.searchResults().should(
+ "contain.text",
+ "No results found",
+ );
+
+ H.MetricsViewer.searchInput().clear().type("Test Measure");
+ H.MetricsViewer.searchResults().should("contain.text", "Test Measure");
+ });
+
+ it("Should not show me measures that live in tables I do not have permissions to see", () => {
+ cy.signIn("nodata");
+ H.MetricsViewer.goToViewer();
+ H.MetricsViewer.searchInput().type("Test Measure");
+ H.MetricsViewer.searchResults().should(
+ "contain.text",
+ "No results found",
+ );
+
+ addMetric("Count of orders");
+ cy.log(
+ "even though we can see the metric, we don't have permissions to run the query",
+ );
+ cy.findByRole("heading", {
+ name: /You do not have permissions to run this query/i,
+ }).should("be.visible");
+ });
+ });
+
+ // ============================================================================
+ // Breakouts
+ // ============================================================================
+
+ describe("Breakouts", () => {
+ beforeEach(() => {
+ intercedptDatasetQuery();
+ H.MetricsViewer.goToViewer();
+ addMetric("Count of orders");
+ cy.wait("@dataset");
+ });
+
+ it("should add a temporal breakout dimension", () => {
+ selectBreakout("Count of orders", "Created At", 0, "Year");
+ cy.wait("@dataset");
+ H.MetricsViewer.breakoutLegend().within(() => {
+ cy.findByRole("heading", { name: "Created At" }).should("be.visible");
+ cy.findByText("2022").should("be.visible");
+ cy.findByText("2023").should("be.visible");
+ cy.findByText("2024").should("be.visible");
+ cy.findByText("2025").should("be.visible");
+ cy.findByText("2026").should("be.visible");
+ });
+
+ H.MetricsViewer.searchBarPills()
+ .contains("[data-testid=metrics-viewer-search-pill]", "Count of orders")
+ .findByTestId("color-indicator-container")
+ .children()
+ .should("have.length", 5);
+
+ H.MetricsViewer.searchBarPills().contains("Count of orders").rightclick();
+ H.popover().findByText("Change breakout").click();
+ H.popover().findByText("Category").click();
+
+ H.MetricsViewer.breakoutLegend()
+ .findByRole("heading", { name: /Category/ })
+ .should("be.visible");
+
+ H.MetricsViewer.searchBarPills().contains("Count of orders").rightclick();
+ H.popover().findByText("Remove breakout").click();
+ H.MetricsViewer.breakoutLegend().should("not.exist");
+ });
+
+ it("should add a categorical breakout dimension", () => {
+ selectBreakout("Count of orders", "Source");
+ cy.wait("@dataset");
+ H.MetricsViewer.breakoutLegend()
+ .findByRole("heading", { name: /Source/ })
+ .should("be.visible");
+
+ H.MetricsViewer.breakoutLegend().within(() => {
+ cy.findByRole("heading", { name: /Source/ }).should("be.visible");
+ cy.findByText("Twitter").should("be.visible");
+ cy.findByText("Facebook").should("be.visible");
+ cy.findByText("Organic").should("be.visible");
+ cy.findByText("Google").should("be.visible");
+ cy.findByText("Affiliate").should("be.visible");
+ });
+ });
+
+ it("should add a numeric breakout dimension with default binning", () => {
+ selectBreakout("Count of orders", "Total");
+ cy.wait("@dataset");
+ H.MetricsViewer.breakoutLegend().within(() => {
+ cy.findByRole("heading", { name: "Total" }).should("be.visible");
+
+ cy.findByText("-60 – -40").should("be.visible");
+ cy.findByText("0 – 20").should("be.visible");
+ cy.findByText("20 – 40").should("be.visible");
+ cy.findByText("40 – 60").should("be.visible");
+ cy.findByText("60 – 80").should("be.visible");
+ cy.findByText("80 – 100").should("be.visible");
+ cy.findByText("100 – 120").should("be.visible");
+ cy.findByText("120 – 140").should("be.visible");
+ cy.findByText("140 – 160").should("be.visible");
+ });
+
+ cy.log("Search pill should cap at 6 color indicators");
+ H.MetricsViewer.searchBarPills()
+ .contains("[data-testid=metrics-viewer-search-pill]", "Count of orders")
+ .findByTestId("color-indicator-container")
+ .children()
+ .should("have.length", 6);
+ });
+ });
+
+ // ============================================================================
+ // Tabs
+ // ============================================================================
+
+ describe("Tabs", () => {
+ beforeEach(() => {
+ intercedptDatasetQuery();
+ H.MetricsViewer.goToViewer();
+ addMetric("Count of orders");
+ cy.wait("@dataset");
+ });
+
+ it("should switch between tabs", () => {
+ H.MetricsViewer.tabsShouldBe([
+ "Created At",
+ "State",
+ "Title",
+ "Category",
+ ]);
+ H.MetricsViewer.assertVizType("Line");
+
+ switchToTab("State");
+ H.MetricsViewer.assertVizType("Map");
+
+ switchToTab("Category");
+ H.MetricsViewer.assertVizType("Bar");
+
+ cy.log("should allow changing display types");
+ H.MetricsViewer.changeVizType("line");
+ H.MetricsViewer.assertVizType("Line");
+ });
+
+ it("should add a dimension tab and remove it", () => {
+ addMetric("Count of feedback");
+ H.MetricsViewer.tabsShouldBe([
+ "Created At",
+ "State",
+ "Title",
+ "Category",
+ ]);
+
+ cy.log("assert that both feedback and order dimensions are available");
+ H.MetricsViewer.getAddDimensionButton().click();
+ H.popover().within(() => {
+ cy.findAllByText(/count of orders/i).should("have.length", 3);
+ cy.findAllByText(/count of feedback/i).should("have.length", 2);
+ cy.log("add a new dimension tab");
+
+ cy.findByPlaceholderText(/Find/).should("be.visible");
+ cy.findAllByText("Source").should("have.length", 2).eq(0).click();
+ });
+ cy.wait("@dataset");
+
+ H.MetricsViewer.tabsShouldBe([
+ "Created At",
+ "State",
+ "Title",
+ "Category",
+ "Source",
+ ]);
+
+ cy.log("new tab should be selected and show correct viz type");
+ H.MetricsViewer.tablist()
+ .findByRole("tab", { name: "Source" })
+ .should("have.attr", "aria-selected", "true");
+ H.MetricsViewer.assertVizType("Bar");
+
+ cy.log("should only show me metrics that share the dimension of the tab");
+ H.MetricsViewer.getMetricVisualization().within(() => {
+ cy.findByText("Affiliate").should("exist");
+ cy.findByText("Facebook").should("exist");
+ cy.findByText("Google").should("exist");
+ cy.findByText("Organic").should("exist");
+ cy.findByText("Twitter").should("exist");
+ cy.findByText("Basic").should("not.exist");
+ cy.findByText("Business").should("not.exist");
+ cy.findByText("Premium").should("not.exist");
+ });
+ H.MetricsViewer.getDimensionPillContainer().within(() => {
+ cy.findByText("User → Source").should("exist");
+ cy.findByText("Select a dimension").click();
+ });
+
+ H.popover().findByText("Plan").click();
+
+ H.MetricsViewer.getMetricVisualization().within(() => {
+ cy.findByText("Affiliate").should("exist");
+ cy.findByText("Facebook").should("exist");
+ cy.findByText("Google").should("exist");
+ cy.findByText("Organic").should("exist");
+ cy.findByText("Twitter").should("exist");
+ cy.findByText("Basic").should("exist");
+ cy.findByText("Business").should("exist");
+ cy.findByText("Premium").should("exist");
+ });
+
+ cy.log("shared dimensions should automatically be added to tabs");
+ switchToTab("Created At");
+
+ H.MetricsViewer.getDimensionPillContainer().within(() => {
+ cy.findByText("Created At").should("exist");
+ cy.findByText("Account → Created At").click();
+ });
+
+ H.popover().findByText("Canceled At").click();
+ H.MetricsViewer.getDimensionPillContainer()
+ .findByText("Account → Canceled At")
+ .should("exist");
+
+ cy.log("remove the added tab");
+
+ // Need to hover the tab so that the remove button is accessible
+ H.MetricsViewer.tablist()
+ .findByRole("tab", { name: "Source" })
+ .realHover();
+ H.MetricsViewer.getRemoveTabButton("Source").click();
+ H.MetricsViewer.tablist()
+ .findByRole("tab", { name: "Source" })
+ .should("not.exist");
+ H.MetricsViewer.tabsShouldBe([
+ "Created At",
+ "State",
+ "Title",
+ "Category",
+ ]);
+
+ cy.log("navigating back should undo changes");
+
+ cy.go("back");
+ H.MetricsViewer.tabsShouldBe([
+ "Created At",
+ "State",
+ "Title",
+ "Category",
+ "Source",
+ ]);
+ cy.go("back");
+ H.MetricsViewer.getDimensionPillContainer().within(() => {
+ cy.findByText("Created At").should("exist");
+ cy.findByText("Account → Created At").should("exist");
+ });
+ });
+ });
+
+ // ============================================================================
+ // Automatic Split View
+ // ============================================================================
+
+ describe("Automatic split view", () => {
+ beforeEach(() => {
+ intercedptDatasetQuery();
+ H.MetricsViewer.goToViewer();
+ addMetric("Count of orders");
+ cy.wait("@dataset");
+ });
+
+ it("should show unified view for display types that support multiple series", () => {
+ addMetric("Count of products");
+ cy.wait("@dataset");
+
+ cy.log("line charts support multiple series, so should be unified");
+ H.MetricsViewer.assertVizType("Line");
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 1);
+
+ cy.log("bar charts also support multiple series");
+ switchToTab("Category");
+ H.MetricsViewer.assertVizType("Bar");
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 1);
+ });
+
+ it("should automatically split for display types that do not support multiple series", () => {
+ cy.log("with a single series, map shows one visualization");
+ switchToTab("State");
+ H.MetricsViewer.assertVizType("Map");
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 1);
+
+ cy.log("add a breakout to create multiple series");
+ switchToTab("Created At");
+ selectBreakout("Count of orders", "Source");
+ cy.wait("@dataset");
+
+ cy.log("line supports multiple series, so should remain unified");
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 1);
+
+ cy.log("map does not support multiple series, so should auto-split");
+ switchToTab("State");
+ H.MetricsViewer.getAllMetricVisualizations().should(
+ "have.length.greaterThan",
+ 1,
+ );
+ });
+ });
+
+ // ============================================================================
+ // Filters
+ // ============================================================================
+
+ describe("Filters", () => {
+ beforeEach(() => {
+ intercedptDatasetQuery();
+ H.MetricsViewer.goToViewer();
+ addMetric("Count of orders");
+ cy.wait("@dataset");
+ });
+
+ it("should apply a categorical filter to a metric", () => {
+ selectBreakout("Count of orders", "Category");
+ H.MetricsViewer.breakoutLegend()
+ .should("contain.text", "Doohickey")
+ .should("contain.text", "Gadget")
+ .should("contain.text", "Gizmo")
+ .should("contain.text", "Widget");
+
+ H.MetricsViewer.getFilterButton().click();
+ H.popover().findByText("Category").click();
+
+ H.popover().findByText("Doohickey").click();
+ H.popover().findByText("Gadget").click();
+ H.popover().findByRole("button", { name: "Add filter" }).click();
+
+ H.MetricsViewer.getAllFilterPills()
+ .should("have.length", 1)
+ .should("contain.text", "Doohickey")
+ .should("contain.text", "Gadget")
+ .should("contain.text", "Category");
+
+ H.MetricsViewer.breakoutLegend()
+ .should("contain.text", "Doohickey")
+ .should("contain.text", "Gadget");
+
+ switchToTab("Category");
+ H.MetricsViewer.getMetricVisualization().should(
+ "contain.text",
+ "Doohickey",
+ );
+
+ cy.log("filter on a per tab level");
+
+ H.MetricsViewer.getMerticControls()
+ .findByRole("button", { name: /All values/ })
+ .click();
+
+ H.popover().findByText("Doohickey").click();
+
+ H.popover().findByRole("button", { name: "Update filter" }).click();
+ H.MetricsViewer.getMetricVisualization().should(
+ "not.contain.text",
+ "Doohickey",
+ );
+
+ cy.log("remove filter");
+ switchToTab("State");
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 2);
+
+ H.MetricsViewer.getAllFilterPills()
+ .should("have.length", 1)
+ .eq(0)
+ .findByRole("button", { name: "Remove" })
+ .click();
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 4);
+
+ cy.log("navigating back should undo changes");
+ cy.go("back");
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 2);
+ cy.go("back");
+ H.MetricsViewer.getTab("Category").should(
+ "have.attr",
+ "aria-selected",
+ "true",
+ );
+ cy.go("back");
+ H.MetricsViewer.getMetricVisualization().should(
+ "contain.text",
+ "Doohickey",
+ );
+
+ cy.log("navigating forward should re-apply changes");
+ cy.go("forward");
+
+ H.MetricsViewer.getMetricVisualization().should(
+ "not.contain.text",
+ "Doohickey",
+ );
+ cy.go("forward");
+ H.MetricsViewer.getTab("State").should(
+ "have.attr",
+ "aria-selected",
+ "true",
+ );
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 2);
+ cy.go("forward");
+ H.MetricsViewer.getAllMetricVisualizations().should("have.length", 4);
+ });
+
+ it("Should allow me to apply filters to each metric individually", () => {
+ addMetric("Count of products");
+ switchToTab("Category");
+ H.MetricsViewer.changeVizType("line");
+ H.MetricsViewer.getMetricVisualizationDataPoints().should(
+ "have.length",
+ 8,
+ );
+
+ H.MetricsViewer.getFilterButton().click();
+ H.popover().within(() => {
+ cy.button(/count of orders/i).should("be.visible");
+ cy.button(/count of products/i).click();
+ cy.findByText("Category").click();
+ });
+ H.popover().within(() => {
+ cy.findByText("Doohickey").click();
+ cy.findByText("Gadget").click();
+ cy.button("Add filter").click();
+ });
+
+ H.MetricsViewer.getMetricVisualizationDataPoints().should(
+ "have.length",
+ 6,
+ );
+
+ cy.log(
+ "Should allow me to change time granularity and range on time based tabs",
+ );
+ switchToTab("Created At");
+
+ H.MetricsViewer.getMetricVisualizationDataPoints().should(
+ "have.length",
+ 85,
+ );
+ H.MetricsViewer.getMerticControls()
+ .findByRole("button", { name: /by month/i })
+ .click();
+ H.popover().findByText("Year").click();
+ H.MetricsViewer.getMetricVisualizationDataPoints().should(
+ "have.length",
+ 9,
+ );
+ H.MetricsViewer.getMerticControls()
+ .findByRole("button", { name: /by year/i })
+ .click();
+ H.popover().findByText("Month").click();
+
+ H.MetricsViewer.getMerticControls()
+ .findByRole("button", { name: /All time/i })
+ .click();
+
+ H.popover()
+ .findByText(/Fixed date/)
+ .click();
+ H.popover().within(() => {
+ cy.findByRole("textbox", { name: "Start date" })
+ .clear()
+ .type("February 7, 2024");
+ cy.findByRole("textbox", { name: "End date" })
+ .clear()
+ .type("July 7, 2024");
+ cy.button("Add filter").click();
+ });
+
+ H.MetricsViewer.getMetricVisualizationDataPoints().should(
+ "have.length",
+ 10,
+ );
+
+ H.MetricsViewer.getMerticControls()
+ .findByRole("button", { name: /February/i })
+ .click();
+ H.popover().findByRole("button", { name: "Clear" }).click();
+ H.MetricsViewer.getMetricVisualizationDataPoints().should(
+ "have.length",
+ 85,
+ );
+ });
+ });
+
+ // ============================================================================
+ // Drill Through
+ // ============================================================================
+
+ describe("Drill through", () => {
+ beforeEach(() => {
+ intercedptDatasetQuery();
+ H.MetricsViewer.goToViewer();
+ addMetric("Count of orders");
+ cy.wait("@dataset");
+ });
+
+ it("should drill into more graual time dimensions on timeseries chart", () => {
+ H.MetricsViewer.getMerticControls()
+ .findByRole("button", { name: /by month/ })
+ .should("exist");
+ H.MetricsViewer.getMetricVisualizationDataPoints().eq(4).click();
+ H.popover().findByText("See this month by week").click();
+
+ H.MetricsViewer.getMerticControls()
+ .findByRole("button", { name: /by week/ })
+ .should("exist");
+ H.MetricsViewer.getMetricVisualizationDataPoints().should(
+ "have.length",
+ 5,
+ );
+ });
+
+ it("should allow me to do brush style time range filtering", () => {
+ H.applyBrush(100, 250);
+ H.MetricsViewer.getMetricVisualization().within(() => {
+ cy.findByText(/June/).should("be.visible");
+ cy.findByText(/July/).should("be.visible");
+ cy.findByText(/August/).should("be.visible");
+ cy.findByText(/September/).should("be.visible");
+ cy.findByText(/October/).should("be.visible");
+ cy.findByText(/November/).should("be.visible");
+ cy.findByText(/December/).should("be.visible");
+ });
+ });
+ });
+});
+
+describe("scenarios > metrics > explorer > BigInt filters", () => {
+ it("should filter on BigInt values", () => {
+ const DECIMAL_PK_TABLE_NAME = "decimal_pk_table";
+ const METRIC_NAME = "Count of decimal_pk_table";
+
+ H.restore("postgres-writable");
+ cy.signInAsAdmin();
+ H.resetTestTable({ type: "postgres", table: DECIMAL_PK_TABLE_NAME });
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID });
+
+ H.getTableId({ name: DECIMAL_PK_TABLE_NAME }).then((tableId) => {
+ const BIGINT_METRIC: StructuredQuestionDetailsWithName = {
+ name: METRIC_NAME,
+ type: "metric",
+ description: "A metric",
+ query: {
+ "source-table": tableId,
+ aggregation: [["count"]],
+ },
+ database: WRITABLE_DB_ID,
+ display: "scalar",
+ };
+ H.createQuestion(BIGINT_METRIC);
+ H.MetricsViewer.goToViewer();
+ H.MetricsViewer.searchInput().type(METRIC_NAME);
+ H.MetricsViewer.searchResults().findByText(METRIC_NAME).click();
+ H.MetricsViewer.getFilterButton().click();
+ H.popover().findByText("ID").click();
+ H.popover().within(() => {
+ cy.findByPlaceholderText("Enter an ID").type("9223372036854775808");
+ cy.button("Add filter").click();
+ });
+ H.MetricsViewer.getMetricVisualization()
+ .should("contain.text", "Positive")
+ .should("not.contain.text", "Negative")
+ .should("not.contain.text", "Zero");
+ });
+ });
+});
+
+function createMetrics(metrics: StructuredQuestionDetailsWithName[]) {
+ metrics.forEach((metric) => H.createQuestion(metric));
+}
+
+function createTestMeasure(
+ opts: {
+ name?: string;
+ description?: string;
+ tableId?: number;
+ aggregation?: unknown[];
+ } = {},
+) {
+ const {
+ name = "Test Measure",
+ description,
+ tableId = ORDERS_ID,
+ aggregation = ["sum", ["field", ORDERS.TOTAL, null]],
+ } = opts;
+
+ H.createMeasure({
+ name,
+ description,
+ table_id: tableId,
+ definition: {
+ type: "query",
+ database: SAMPLE_DB_ID,
+ query: {
+ "source-table": tableId,
+ aggregation: [aggregation],
+ },
+ },
+ }).then(({ body }) => {
+ cy.wrap(body.id).as("measureId");
+ });
+}
diff --git a/e2e/test/scenarios/metrics/metrics-search.cy.spec.js b/e2e/test/scenarios/metrics/metrics-search.cy.spec.js
index c9d1b0c1d56..cc14e8dcff3 100644
--- a/e2e/test/scenarios/metrics/metrics-search.cy.spec.js
+++ b/e2e/test/scenarios/metrics/metrics-search.cy.spec.js
@@ -18,6 +18,7 @@ describe("scenarios > metrics > search", () => {
H.restore();
cy.signInAsNormalUser();
cy.intercept("POST", "/api/dataset").as("dataset");
+ cy.intercept("POST", "/api/metric/dataset").as("metricDataset");
cy.intercept("GET", "/api/search?q=*").as("search");
});
@@ -28,8 +29,10 @@ describe("scenarios > metrics > search", () => {
H.commandPalette()
.findByRole("option", { name: ORDERS_SCALAR_METRIC.name })
.click();
- cy.wait("@dataset");
- cy.findByTestId("scalar-container").should("be.visible");
+ cy.wait("@metricDataset");
+ H.MetricsViewer.searchBarPills()
+ .contains("Count of orders")
+ .should("be.visible");
});
it("should be able to search for metrics on the search page", () => {
@@ -50,8 +53,10 @@ describe("scenarios > metrics > search", () => {
cy.findByText("1 result").should("be.visible");
cy.findByText(ORDERS_SCALAR_METRIC.name).click();
});
- cy.wait("@dataset");
- cy.findByTestId("scalar-container").should("be.visible");
+ cy.wait("@metricDataset");
+ H.MetricsViewer.searchBarPills()
+ .contains("Count of orders")
+ .should("be.visible");
});
it("should see metrics in recent items in global search", () => {
@@ -64,7 +69,9 @@ describe("scenarios > metrics > search", () => {
H.commandPalette()
.findByRole("option", { name: ORDERS_SCALAR_METRIC.name })
.click();
- cy.wait("@dataset");
- cy.findByTestId("scalar-container").should("be.visible");
+ cy.wait("@metricDataset");
+ H.MetricsViewer.searchBarPills()
+ .contains("Count of orders")
+ .should("be.visible");
});
});
diff --git a/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts b/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
index b177f18f7cc..6109e3c86a7 100644
--- a/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
@@ -175,6 +175,9 @@ describe("issue 32037", () => {
it("should show unsaved changes modal and allow to discard changes when editing a metric (metabase#32037)", () => {
cy.visit("/browse/metrics");
cy.findByLabelText("Metric 32037").click();
+
+ H.MetricsViewer.openMetricHomePage("Metric 32037");
+
H.cartesianChartCircle().should("be.visible");
cy.location("pathname").as("metricPathname");
H.openQuestionActions("Edit metric definition");
diff --git a/e2e/test/scenarios/question/native-query-drill.cy.spec.ts b/e2e/test/scenarios/question/native-query-drill.cy.spec.ts
index d947b58a8c3..3dfc796889f 100644
--- a/e2e/test/scenarios/question/native-query-drill.cy.spec.ts
+++ b/e2e/test/scenarios/question/native-query-drill.cy.spec.ts
@@ -443,10 +443,7 @@ function applyBrushFilter({ left, right }: { left: number; right: number }) {
H.ensureEchartsContainerHasSvg();
cy.wait(100); // wait to avoid grabbing the svg before the chart redraws
- H.echartsContainer()
- .trigger("mousedown", left, 100)
- .trigger("mousemove", left, 100)
- .trigger("mouseup", right, 100);
+ H.applyBrush(left, right);
}
function applyBoxFilter({
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
index 6e780969acb..12f84e30d6e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
@@ -52,7 +52,7 @@ function MetricMenu({ card, onOpenModal }: MetricMenuProps) {
key="view"
leftSection={<Icon name="external" />}
component={ForwardRefLink}
- to={Urls.question(card)}
+ to={Urls.exploreMetric(card.id)}
target="_blank"
>
{c("A verb, not a noun").t`View`}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts
index ce1aba5a918..b5b95d17105 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/context/types.ts
@@ -10,9 +10,9 @@ import type {
SdkQuestionId,
SqlParameterValues,
} from "embedding-sdk-bundle/types/question";
-import type { Mode } from "metabase/visualizations/click-actions/Mode";
import type {
ClickActionModeGetter,
+ ClickActionsMode,
QueryClickActionsMode,
} from "metabase/visualizations/types";
import type Question from "metabase-lib/v1/Question";
@@ -161,7 +161,7 @@ export type SdkQuestionContextType = Omit<
| "onVisualizationChange"
> & {
plugins: SdkQuestionConfig["componentPlugins"] | null;
- mode: QueryClickActionsMode | Mode | null | undefined;
+ mode: QueryClickActionsMode | ClickActionsMode | null | undefined;
originalId: SdkQuestionId | null;
token: EntityToken | null | undefined;
resetQuestion: () => void;
diff --git a/frontend/src/metabase-lib/common/index.ts b/frontend/src/metabase-lib/common/index.ts
new file mode 100644
index 00000000000..eea524d6557
--- /dev/null
+++ b/frontend/src/metabase-lib/common/index.ts
@@ -0,0 +1 @@
+export * from "./types";
diff --git a/frontend/src/metabase-lib/common/types.ts b/frontend/src/metabase-lib/common/types.ts
new file mode 100644
index 00000000000..5936258b54c
--- /dev/null
+++ b/frontend/src/metabase-lib/common/types.ts
@@ -0,0 +1,74 @@
+export type FilterOperator =
+ | StringFilterOperator
+ | NumberFilterOperator
+ | CoordinateFilterOperator
+ | SpecificDateFilterOperator
+ | ExcludeDateFilterOperator
+ | TimeFilterOperator
+ | DefaultFilterOperator;
+
+export type StringFilterOperator =
+ | "="
+ | "!="
+ | "contains"
+ | "does-not-contain"
+ | "is-empty"
+ | "not-empty"
+ | "starts-with"
+ | "ends-with";
+
+export type NumberFilterOperator =
+ | "="
+ | "!="
+ | ">"
+ | "<"
+ | "between"
+ | ">="
+ | "<="
+ | "is-null"
+ | "not-null";
+
+export type CoordinateFilterOperator =
+ | "="
+ | "!="
+ | "inside"
+ | ">"
+ | "<"
+ | "between"
+ | ">="
+ | "<=";
+
+export type BooleanFilterOperator = "=" | "is-null" | "not-null";
+
+export type SpecificDateFilterOperator = "=" | ">" | "<" | "between";
+
+export type ExcludeDateFilterOperator = "!=" | "is-null" | "not-null";
+
+export type TimeFilterOperator = ">" | "<" | "between" | "is-null" | "not-null";
+
+export type DefaultFilterOperator = "is-null" | "not-null";
+
+export type RelativeDateFilterUnit =
+ | "minute"
+ | "hour"
+ | "day"
+ | "week"
+ | "month"
+ | "quarter"
+ | "year";
+
+export type ExcludeDateFilterUnit =
+ | "hour-of-day"
+ | "day-of-week"
+ | "month-of-year"
+ | "quarter-of-year";
+
+export type NumberFilterValue = number | bigint;
+
+export type StringFilterOptions = {
+ caseSensitive?: boolean;
+};
+
+export type RelativeDateFilterOptions = {
+ includeCurrent?: boolean;
+};
diff --git a/frontend/src/metabase-lib/index.ts b/frontend/src/metabase-lib/index.ts
index 3cf24c279f1..2ba10df075f 100644
--- a/frontend/src/metabase-lib/index.ts
+++ b/frontend/src/metabase-lib/index.ts
@@ -1,27 +1,4 @@
-// Note: only metabase-lib v2 exports should be added here
-
-export * from "./aggregation";
-export * from "./binning";
-export * from "./breakout";
-export * from "./buckets";
-export * from "./column_types";
-export * from "./comparison";
-export * from "./database";
-export * from "./display_name";
-export * from "./drills";
-export * from "./expression";
-export * from "./extractions";
-export * from "./fields";
-export * from "./filter";
-export * from "./join";
-export * from "./limit";
-export * from "./metadata";
-export * from "./measures";
-export * from "./metrics";
-export * from "./native";
-export * from "./order_by";
+export * from "./common";
export * from "./query";
-export * from "./segments";
-export * from "./temporal_bucket";
-export * from "./types";
-export * from "./viz";
+export * from "./display_name";
+export type { DimensionValuesInfo } from "./metric";
diff --git a/frontend/src/metabase-lib/metric/core.ts b/frontend/src/metabase-lib/metric/core.ts
new file mode 100644
index 00000000000..5de1c2789c3
--- /dev/null
+++ b/frontend/src/metabase-lib/metric/core.ts
@@ -0,0 +1,712 @@
+import dayjs, { type Dayjs } from "dayjs";
+
+import * as LibMetric from "cljs/metabase.lib_metric.js";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type {
+ ConcreteTableId,
+ JsMetricDefinition,
+ MeasureId,
+ MetricId,
+} from "metabase-types/api";
+
+import type {
+ BinningStrategy,
+ BinningStrategyDisplayInfo,
+ BooleanFilterParts,
+ Clause,
+ ClauseDisplayInfo,
+ CoordinateFilterParts,
+ DefaultFilterParts,
+ DimensionDisplayInfo,
+ DimensionMetadata,
+ DimensionValuesInfo,
+ DisplayInfo,
+ Displayable,
+ ExcludeDateFilterParts,
+ FilterClause,
+ FilterParts,
+ MeasureDisplayInfo,
+ MeasureMetadata,
+ MetadataProvider,
+ MetadataProviderable,
+ MetricDefinition,
+ MetricDisplayInfo,
+ MetricMetadata,
+ NumberFilterParts,
+ ProjectionClause,
+ RelativeDateFilterParts,
+ SourceInstance,
+ SpecificDateFilterParts,
+ StringFilterParts,
+ TemporalBucket,
+ TemporalBucketDisplayInfo,
+ TimeFilterParts,
+} from "./types";
+
+export function metadataProvider(jsMetadata: Metadata): MetadataProvider {
+ return LibMetric.metadataProvider(jsMetadata) as MetadataProvider;
+}
+
+export function metricMetadata(
+ metadataProvider: MetadataProviderable,
+ metricId: MetricId,
+): MetricMetadata | null {
+ return LibMetric.metricMetadata(
+ metadataProvider,
+ metricId,
+ ) as MetricMetadata | null;
+}
+
+export function measureMetadata(
+ metadataProvider: MetadataProviderable,
+ measureId: MeasureId,
+): MeasureMetadata | null {
+ return LibMetric.measureMetadata(
+ metadataProvider,
+ measureId,
+ ) as MeasureMetadata | null;
+}
+
+export function fromMetricMetadata(
+ metadataProvider: MetadataProviderable,
+ metricMetadata: MetricMetadata,
+): MetricDefinition {
+ return LibMetric.fromMetricMetadata(
+ metadataProvider,
+ metricMetadata,
+ ) as MetricDefinition;
+}
+
+export function fromMeasureMetadata(
+ metadataProvider: MetadataProviderable,
+ measureMetadata: MeasureMetadata,
+): MetricDefinition {
+ return LibMetric.fromMeasureMetadata(
+ metadataProvider,
+ measureMetadata,
+ ) as MetricDefinition;
+}
+
+export function fromJsMetricDefinition(
+ metadataProvider: MetadataProviderable,
+ jsDefinition: JsMetricDefinition,
+): MetricDefinition {
+ return LibMetric.fromJsMetricDefinition(
+ metadataProvider,
+ jsDefinition,
+ ) as MetricDefinition;
+}
+
+export function toJsMetricDefinition(
+ definition: MetricDefinition,
+): JsMetricDefinition {
+ return LibMetric.toJsMetricDefinition(definition) as JsMetricDefinition;
+}
+
+export function sourceMetricId(definition: MetricDefinition): MetricId | null {
+ return LibMetric.sourceMetricId(definition) as MetricId | null;
+}
+
+export function sourceMetricMetadata(
+ definition: MetricDefinition,
+): MetricMetadata | null {
+ const metricId = sourceMetricId(definition);
+ return metricId != null ? metricMetadata(definition, metricId) : null;
+}
+
+export function sourceMeasureId(
+ definition: MetricDefinition,
+): MeasureId | null {
+ return LibMetric.sourceMeasureId(definition) as MeasureId | null;
+}
+
+export function sourceMeasureTableId(
+ definition: MetricDefinition,
+): ConcreteTableId | null {
+ return LibMetric.sourceMeasureTableId(definition) as ConcreteTableId | null;
+}
+
+export function sourceMeasureMetadata(
+ definition: MetricDefinition,
+): MeasureMetadata | null {
+ const measureId = sourceMeasureId(definition);
+ return measureId != null ? measureMetadata(definition, measureId) : null;
+}
+
+export function sourceMetricOrMeasureMetadata(
+ definition: MetricDefinition,
+): MetricMetadata | MeasureMetadata | null {
+ return sourceMetricMetadata(definition) ?? sourceMeasureMetadata(definition);
+}
+
+export function sourceInstances(
+ definition: MetricDefinition,
+): SourceInstance[] {
+ return LibMetric.sourceInstances(definition) as SourceInstance[];
+}
+
+export function filters(definition: MetricDefinition): FilterClause[];
+export function filters(
+ definition: MetricDefinition,
+ sourceInstance: SourceInstance,
+): FilterClause[];
+export function filters(
+ definition: MetricDefinition,
+ sourceInstance?: SourceInstance,
+): FilterClause[] {
+ if (sourceInstance !== undefined) {
+ return LibMetric.filters(definition, sourceInstance) as FilterClause[];
+ }
+ return LibMetric.filters(definition) as FilterClause[];
+}
+
+export function filterableDimensions(
+ definition: MetricDefinition,
+): DimensionMetadata[];
+export function filterableDimensions(
+ definition: MetricDefinition,
+ sourceInstance: SourceInstance,
+): DimensionMetadata[];
+export function filterableDimensions(
+ definition: MetricDefinition,
+ sourceInstance?: SourceInstance,
+): DimensionMetadata[] {
+ if (sourceInstance !== undefined) {
+ return LibMetric.filterableDimensions(
+ definition,
+ sourceInstance,
+ ) as DimensionMetadata[];
+ }
+ return LibMetric.filterableDimensions(definition) as DimensionMetadata[];
+}
+
+export function filter(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): MetricDefinition;
+export function filter(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+ sourceInstance: SourceInstance,
+): MetricDefinition;
+export function filter(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+ sourceInstance?: SourceInstance,
+): MetricDefinition {
+ if (sourceInstance !== undefined) {
+ return LibMetric.filter(
+ definition,
+ filterClause,
+ sourceInstance,
+ ) as MetricDefinition;
+ }
+ return LibMetric.filter(definition, filterClause) as MetricDefinition;
+}
+
+export function stringFilterClause(parts: StringFilterParts): FilterClause {
+ return LibMetric.stringFilterClause(parts) as FilterClause;
+}
+
+export function stringFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): StringFilterParts | null {
+ return LibMetric.stringFilterParts(
+ definition,
+ filterClause,
+ ) as StringFilterParts | null;
+}
+
+export function numberFilterClause(parts: NumberFilterParts): FilterClause {
+ return LibMetric.numberFilterClause(parts) as FilterClause;
+}
+
+export function numberFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): NumberFilterParts | null {
+ return LibMetric.numberFilterParts(
+ definition,
+ filterClause,
+ ) as NumberFilterParts | null;
+}
+
+export function coordinateFilterClause(
+ parts: CoordinateFilterParts,
+): FilterClause {
+ return LibMetric.coordinateFilterClause(parts) as FilterClause;
+}
+
+export function coordinateFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): CoordinateFilterParts | null {
+ return LibMetric.coordinateFilterParts(
+ definition,
+ filterClause,
+ ) as CoordinateFilterParts | null;
+}
+
+export function booleanFilterClause(parts: BooleanFilterParts): FilterClause {
+ return LibMetric.booleanFilterClause(parts) as FilterClause;
+}
+
+export function booleanFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): BooleanFilterParts | null {
+ return LibMetric.booleanFilterParts(
+ definition,
+ filterClause,
+ ) as BooleanFilterParts | null;
+}
+
+export function specificDateFilterClause(
+ parts: SpecificDateFilterParts,
+): FilterClause {
+ return LibMetric.specificDateFilterClause(parts) as FilterClause;
+}
+
+export function specificDateFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): SpecificDateFilterParts | null {
+ return LibMetric.specificDateFilterParts(
+ definition,
+ filterClause,
+ ) as SpecificDateFilterParts | null;
+}
+
+export function relativeDateFilterClause(
+ parts: RelativeDateFilterParts,
+): FilterClause {
+ return LibMetric.relativeDateFilterClause(parts) as FilterClause;
+}
+
+export function relativeDateFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): RelativeDateFilterParts | null {
+ return LibMetric.relativeDateFilterParts(
+ definition,
+ filterClause,
+ ) as RelativeDateFilterParts | null;
+}
+
+export function excludeDateFilterClause(
+ parts: ExcludeDateFilterParts,
+): FilterClause {
+ return LibMetric.excludeDateFilterClause(parts) as FilterClause;
+}
+
+export function excludeDateFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): ExcludeDateFilterParts | null {
+ return LibMetric.excludeDateFilterParts(
+ definition,
+ filterClause,
+ ) as ExcludeDateFilterParts | null;
+}
+
+export function timeFilterClause(parts: TimeFilterParts): FilterClause {
+ return LibMetric.timeFilterClause({
+ ...parts,
+ values: parts.values.map((value) => dayjs(value)),
+ }) as FilterClause;
+}
+
+export function timeFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): TimeFilterParts | null {
+ const filterParts = LibMetric.timeFilterParts(definition, filterClause);
+ if (!filterParts) {
+ return null;
+ }
+ return {
+ ...filterParts,
+ values: filterParts.values.map((value: Dayjs) => value.toDate()),
+ };
+}
+
+export function defaultFilterClause(parts: DefaultFilterParts): FilterClause {
+ return LibMetric.defaultFilterClause(parts) as FilterClause;
+}
+
+export function defaultFilterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): DefaultFilterParts | null {
+ return LibMetric.defaultFilterParts(
+ definition,
+ filterClause,
+ ) as DefaultFilterParts | null;
+}
+
+export function filterParts(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): FilterParts | null {
+ return (
+ stringFilterParts(definition, filterClause) ??
+ numberFilterParts(definition, filterClause) ??
+ coordinateFilterParts(definition, filterClause) ??
+ booleanFilterParts(definition, filterClause) ??
+ specificDateFilterParts(definition, filterClause) ??
+ relativeDateFilterParts(definition, filterClause) ??
+ excludeDateFilterParts(definition, filterClause) ??
+ timeFilterParts(definition, filterClause) ??
+ defaultFilterParts(definition, filterClause)
+ );
+}
+
+export function projections(definition: MetricDefinition): ProjectionClause[];
+export function projections(
+ definition: MetricDefinition,
+ sourceMeta: MetricMetadata | MeasureMetadata,
+): ProjectionClause[];
+export function projections(
+ definition: MetricDefinition,
+ sourceMeta?: MetricMetadata | MeasureMetadata,
+): ProjectionClause[] {
+ if (sourceMeta !== undefined) {
+ return LibMetric.projections(definition, sourceMeta) as ProjectionClause[];
+ }
+ return LibMetric.projections(definition) as ProjectionClause[];
+}
+
+export function defaultBreakoutDimensions(
+ definition: MetricDefinition,
+): DimensionMetadata[] {
+ return LibMetric.defaultBreakoutDimensions(definition) as DimensionMetadata[];
+}
+
+export function projectionableDimensions(
+ definition: MetricDefinition,
+): DimensionMetadata[];
+export function projectionableDimensions(
+ definition: MetricDefinition,
+ sourceMeta: MetricMetadata | MeasureMetadata,
+): DimensionMetadata[];
+export function projectionableDimensions(
+ definition: MetricDefinition,
+ sourceMeta?: MetricMetadata | MeasureMetadata,
+): DimensionMetadata[] {
+ if (sourceMeta !== undefined) {
+ return LibMetric.projectionableDimensions(
+ definition,
+ sourceMeta,
+ ) as DimensionMetadata[];
+ }
+ return LibMetric.projectionableDimensions(definition) as DimensionMetadata[];
+}
+
+export function dimensionReference(
+ dimension: DimensionMetadata,
+): ProjectionClause {
+ return LibMetric.dimensionReference(dimension) as ProjectionClause;
+}
+
+export function project(
+ definition: MetricDefinition,
+ dimensionRef: ProjectionClause,
+): MetricDefinition;
+export function project(
+ definition: MetricDefinition,
+ dimensionRef: ProjectionClause,
+ sourceMeta: MetricMetadata | MeasureMetadata,
+): MetricDefinition;
+export function project(
+ definition: MetricDefinition,
+ dimensionRef: ProjectionClause,
+ sourceMeta?: MetricMetadata | MeasureMetadata,
+): MetricDefinition {
+ if (sourceMeta !== undefined) {
+ return LibMetric.project(
+ definition,
+ dimensionRef,
+ sourceMeta,
+ ) as MetricDefinition;
+ }
+ return LibMetric.project(definition, dimensionRef) as MetricDefinition;
+}
+
+export function projectionDimension(
+ definition: MetricDefinition,
+ dimension: ProjectionClause | DimensionMetadata,
+): DimensionMetadata | null {
+ return LibMetric.projectionDimension(
+ definition,
+ dimension,
+ ) as DimensionMetadata | null;
+}
+
+export function replaceClause(
+ definition: MetricDefinition,
+ targetClause: Clause,
+ newClause: Clause,
+): MetricDefinition {
+ return LibMetric.replaceClause(
+ definition,
+ targetClause,
+ newClause,
+ ) as MetricDefinition;
+}
+
+export function removeClause(
+ definition: MetricDefinition,
+ clause: Clause,
+): MetricDefinition {
+ return LibMetric.removeClause(definition, clause) as MetricDefinition;
+}
+
+export function swapClauses(
+ definition: MetricDefinition,
+ sourceClause: Clause,
+ targetClause: Clause,
+): MetricDefinition {
+ return LibMetric.swapClauses(
+ definition,
+ sourceClause,
+ targetClause,
+ ) as MetricDefinition;
+}
+
+export function temporalBucket(
+ projection: Clause | DimensionMetadata,
+): TemporalBucket | null {
+ return LibMetric.temporalBucket(projection) as TemporalBucket | null;
+}
+
+export function availableTemporalBuckets(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): TemporalBucket[] {
+ return LibMetric.availableTemporalBuckets(
+ definition,
+ dimension,
+ ) as TemporalBucket[];
+}
+
+export function isTemporalBucketable(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): boolean {
+ return availableTemporalBuckets(definition, dimension).length > 0;
+}
+
+export function withTemporalBucket(
+ projection: Clause | DimensionMetadata,
+ bucket: TemporalBucket | null,
+): ProjectionClause {
+ return LibMetric.withTemporalBucket(projection, bucket) as ProjectionClause;
+}
+
+export function withDefaultTemporalBucket(
+ definition: MetricDefinition,
+ projection: ProjectionClause,
+): ProjectionClause {
+ const dimension = projectionDimension(definition, projection);
+ if (!dimension) {
+ return projection;
+ }
+ const bucket = defaultTemporalBucket(definition, dimension);
+ return bucket ? withTemporalBucket(projection, bucket) : projection;
+}
+
+export function defaultTemporalBucket(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): TemporalBucket | null {
+ const buckets = availableTemporalBuckets(definition, dimension);
+ const bucket = buckets.find((b) => displayInfo(definition, b).default);
+
+ return bucket ?? null;
+}
+
+export function binning(
+ projection: Clause | DimensionMetadata,
+): BinningStrategy | null {
+ return LibMetric.binning(projection) as BinningStrategy | null;
+}
+
+export function availableBinningStrategies(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): BinningStrategy[] {
+ return LibMetric.availableBinningStrategies(
+ definition,
+ dimension,
+ ) as BinningStrategy[];
+}
+
+export function isBinnable(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): boolean {
+ return availableBinningStrategies(definition, dimension).length > 0;
+}
+
+export function withBinning(
+ projection: Clause | DimensionMetadata,
+ binningStrategy: BinningStrategy | null,
+): ProjectionClause {
+ return LibMetric.withBinning(projection, binningStrategy) as ProjectionClause;
+}
+
+export function withDefaultBinning(
+ definition: MetricDefinition,
+ projection: ProjectionClause,
+): ProjectionClause {
+ const dimension = projectionDimension(definition, projection);
+ if (!dimension) {
+ return projection;
+ }
+ const strategies = availableBinningStrategies(definition, dimension);
+ const defaultStrategy = strategies.find(
+ (strategy) => displayInfo(definition, strategy).default,
+ );
+ return defaultStrategy
+ ? withBinning(projection, defaultStrategy)
+ : projection;
+}
+
+type TypeFn = (dimension: DimensionMetadata) => boolean;
+
+export const isBoolean: TypeFn = (dimension) => {
+ return LibMetric.isBoolean(dimension) as boolean;
+};
+
+export const isCoordinate: TypeFn = (dimension) => {
+ return LibMetric.isCoordinate(dimension) as boolean;
+};
+
+export const isTemporal: TypeFn = (dimension) => {
+ return LibMetric.isTemporal(dimension) as boolean;
+};
+
+export const isDateOrDateTime: TypeFn = (dimension) => {
+ return LibMetric.isDateOrDateTime(dimension) as boolean;
+};
+
+export const isForeignKey: TypeFn = (dimension) => {
+ return LibMetric.isForeignKey(dimension) as boolean;
+};
+
+export const isLocation: TypeFn = (dimension) => {
+ return LibMetric.isLocation(dimension) as boolean;
+};
+
+export const isLatitude: TypeFn = (dimension) => {
+ return LibMetric.isLatitude(dimension) as boolean;
+};
+
+export const isLongitude: TypeFn = (dimension) => {
+ return LibMetric.isLongitude(dimension) as boolean;
+};
+
+export const isNumeric: TypeFn = (dimension) => {
+ return LibMetric.isNumeric(dimension) as boolean;
+};
+
+export const isPrimaryKey: TypeFn = (dimension) => {
+ return LibMetric.isPrimaryKey(dimension) as boolean;
+};
+
+export const isStringLike: TypeFn = (dimension) => {
+ return LibMetric.isStringLike(dimension) as boolean;
+};
+
+export const isStringOrStringLike: TypeFn = (dimension) => {
+ return LibMetric.isStringOrStringLike(dimension) as boolean;
+};
+
+export const isTime: TypeFn = (dimension) => {
+ return LibMetric.isTime(dimension) as boolean;
+};
+
+export const isCategory: TypeFn = (dimension) => {
+ return LibMetric.isCategory(dimension) as boolean;
+};
+
+export const isID: TypeFn = (dimension) => {
+ return LibMetric.isID(dimension) as boolean;
+};
+
+export const isURL: TypeFn = (dimension) => {
+ return LibMetric.isURL(dimension) as boolean;
+};
+
+export const isEntityName: TypeFn = (dimension) => {
+ return LibMetric.isEntityName(dimension) as boolean;
+};
+
+export const isTitle: TypeFn = (dimension) => {
+ return LibMetric.isTitle(dimension) as boolean;
+};
+
+export const isState: TypeFn = (dimension) => {
+ return LibMetric.isState(dimension) as boolean;
+};
+
+export const isCountry: TypeFn = (dimension) => {
+ return LibMetric.isCountry(dimension) as boolean;
+};
+
+export const isCity: TypeFn = (dimension) => {
+ return LibMetric.isCity(dimension) as boolean;
+};
+
+export function displayInfo(
+ definition: MetricDefinition,
+ metric: MetricMetadata,
+): MetricDisplayInfo;
+export function displayInfo(
+ definition: MetricDefinition,
+ measure: MeasureMetadata,
+): MeasureDisplayInfo;
+export function displayInfo(
+ definition: MetricDefinition,
+ clause: Clause,
+): ClauseDisplayInfo;
+export function displayInfo(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): DimensionDisplayInfo;
+export function displayInfo(
+ definition: MetricDefinition,
+ temporalBucket: TemporalBucket,
+): TemporalBucketDisplayInfo;
+export function displayInfo(
+ definition: MetricDefinition,
+ binningStrategy: BinningStrategy,
+): BinningStrategyDisplayInfo;
+export function displayInfo(
+ definition: MetricDefinition,
+ filterParts: Displayable,
+): DisplayInfo;
+export function displayInfo(
+ definition: MetricDefinition,
+ source: Displayable,
+): DisplayInfo {
+ return LibMetric.displayInfo(definition, source) as DisplayInfo;
+}
+
+export function dimensionValuesInfo(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): DimensionValuesInfo {
+ return LibMetric.dimensionValuesInfo(
+ definition,
+ dimension,
+ ) as DimensionValuesInfo;
+}
+
+export function isSameSource(
+ dimension1: DimensionMetadata,
+ dimension2: DimensionMetadata,
+): boolean {
+ return LibMetric.isSameSource(dimension1, dimension2) as boolean;
+}
diff --git a/frontend/src/metabase-lib/metric/core.unit.spec.ts b/frontend/src/metabase-lib/metric/core.unit.spec.ts
new file mode 100644
index 00000000000..a73ae6acf39
--- /dev/null
+++ b/frontend/src/metabase-lib/metric/core.unit.spec.ts
@@ -0,0 +1,2076 @@
+import Metadata from "metabase-lib/v1/metadata/Metadata";
+import Metric from "metabase-lib/v1/metadata/Metric";
+import type { JsMetricDefinition } from "metabase-types/api";
+import {
+ createMockMetric,
+ createMockMetricDimension,
+} from "metabase-types/api/mocks/metric";
+
+import * as LibMetric from "./core";
+import type {
+ MetadataProvider,
+ MetricDefinition,
+ MetricMetadata,
+} from "./types";
+
+const SAMPLE_METRIC = createMockMetric({
+ id: 1,
+ name: "Revenue",
+ description: "Total revenue",
+ dimensions: [
+ createMockMetricDimension({
+ id: "dim-1",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: "type/CreationTimestamp",
+ }),
+ createMockMetricDimension({
+ id: "dim-2",
+ display_name: "Category",
+ effective_type: "type/Text",
+ semantic_type: "type/Category",
+ }),
+ {
+ ...createMockMetricDimension({
+ id: "dim-3",
+ display_name: "Amount",
+ effective_type: "type/Float",
+ semantic_type: "type/Currency",
+ }),
+ sources: [{ type: "field", "field-id": 5 }],
+ } as any,
+ createMockMetricDimension({
+ id: "dim-4",
+ display_name: "Is Active",
+ effective_type: "type/Boolean",
+ semantic_type: null,
+ }),
+ createMockMetricDimension({
+ id: "dim-5",
+ display_name: "Latitude",
+ effective_type: "type/Float",
+ semantic_type: "type/Latitude",
+ }),
+ createMockMetricDimension({
+ id: "dim-6",
+ display_name: "Longitude",
+ effective_type: "type/Float",
+ semantic_type: "type/Longitude",
+ }),
+ createMockMetricDimension({
+ id: "dim-7",
+ display_name: "Event Time",
+ effective_type: "type/Time",
+ semantic_type: null,
+ }),
+ ],
+});
+
+// Dimension indices for easy reference
+const DIM_IDX = {
+ DATE_TIME: 0, // Created At - type/DateTime
+ STRING: 1, // Category - type/Text
+ NUMBER: 2, // Amount - type/Float
+ BOOLEAN: 3, // Is Active - type/Boolean
+ LATITUDE: 4, // Latitude - type/Float with type/Latitude semantic
+ LONGITUDE: 5, // Longitude - type/Float with type/Longitude semantic
+ TIME: 6, // Event Time - type/Time
+};
+
+function createSampleMetadata(): Metadata {
+ const metadata = new Metadata();
+
+ // Add the metric to the metadata object
+ const metricInstance = new Metric(SAMPLE_METRIC as any);
+ metricInstance.metadata = metadata;
+ metadata.metrics = {
+ [SAMPLE_METRIC.id]: metricInstance,
+ };
+
+ return metadata;
+}
+
+/**
+ * Helper to set up a definition from SAMPLE_METRIC.
+ * Returns provider, metricMeta, and definition.
+ */
+function setupDefinition(): {
+ provider: MetadataProvider;
+ metricMeta: MetricMetadata;
+ definition: MetricDefinition;
+} {
+ const metadata = createSampleMetadata();
+ const provider = LibMetric.metadataProvider(metadata);
+ const metricMeta = LibMetric.metricMetadata(provider, SAMPLE_METRIC.id);
+ expect(metricMeta).not.toBeNull();
+ const definition = LibMetric.fromMetricMetadata(provider, metricMeta!);
+ return { provider, metricMeta: metricMeta!, definition };
+}
+
+describe("metabase-lib/metric/core", () => {
+ describe("metadataProvider", () => {
+ it("should create a metadata provider from JS metadata", () => {
+ const metadata = createSampleMetadata();
+ const provider = LibMetric.metadataProvider(metadata);
+ expect(provider).toBeDefined();
+ });
+ });
+
+ describe("metricMetadata", () => {
+ it("should return metric metadata for a valid metric ID", () => {
+ const metadata = createSampleMetadata();
+ const provider = LibMetric.metadataProvider(metadata);
+ const metricMeta = LibMetric.metricMetadata(provider, SAMPLE_METRIC.id);
+
+ expect(metricMeta).not.toBeNull();
+ });
+
+ it("should return null for an invalid metric ID", () => {
+ const metadata = createSampleMetadata();
+ const provider = LibMetric.metadataProvider(metadata);
+ const metricMeta = LibMetric.metricMetadata(provider, 999);
+
+ expect(metricMeta).toBeNull();
+ });
+ });
+
+ describe("fromMetricMetadata", () => {
+ it("should create a MetricDefinition from metric metadata", () => {
+ const { definition } = setupDefinition();
+ expect(definition).toBeDefined();
+ });
+ });
+
+ describe("sourceMetricId", () => {
+ it("should return the source metric ID for a metric-based definition", () => {
+ const { definition } = setupDefinition();
+ const sourceId = LibMetric.sourceMetricId(definition);
+ expect(sourceId).toBe(SAMPLE_METRIC.id);
+ });
+ });
+
+ describe("sourceMeasureId", () => {
+ it("should return null for a metric-based definition", () => {
+ const { definition } = setupDefinition();
+ const sourceId = LibMetric.sourceMeasureId(definition);
+ expect(sourceId).toBeNull();
+ });
+ });
+
+ describe("sourceMeasureTableId", () => {
+ it("should return null for a metric-based definition", () => {
+ const { definition } = setupDefinition();
+ const tableId = LibMetric.sourceMeasureTableId(definition);
+ expect(tableId).toBeNull();
+ });
+ });
+
+ describe("filters", () => {
+ it("should return filters for a new definition (empty by default)", () => {
+ const { definition } = setupDefinition();
+ const filterClauses = LibMetric.filters(definition);
+
+ expect(filterClauses).toBeDefined();
+ expect(filterClauses.length).toBe(0);
+ });
+ });
+
+ describe("projections", () => {
+ it("should return projections for a new definition (empty by default)", () => {
+ const { definition } = setupDefinition();
+ const projectionClauses = LibMetric.projections(definition);
+
+ expect(projectionClauses).toBeDefined();
+ expect(projectionClauses.length).toBe(0);
+ });
+ });
+
+ describe("filterableDimensions", () => {
+ it("should return filterable dimensions for a definition", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions).toBeDefined();
+ expect(typeof dimensions.length).toBe("number");
+ });
+
+ it("should return dimensions matching the metric's dimensions", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ // The metric has 2 dimensions defined
+ expect(dimensions.length).toBe(SAMPLE_METRIC.dimensions!.length);
+ });
+
+ it("should include filter-positions in dimension display info", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ const info = LibMetric.displayInfo(definition, dimensions[0]);
+
+ // filterPositions should be an array (empty for a new definition with no filters)
+ expect(info.filterPositions).toBeDefined();
+ expect(Array.isArray(info.filterPositions)).toBe(true);
+ expect(info.filterPositions).toEqual([]);
+ });
+
+ it("should return empty filter-positions for a definition with no filters", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ // All dimensions should have empty filter-positions since no filters are applied
+ dimensions.forEach((dimension) => {
+ const info = LibMetric.displayInfo(definition, dimension);
+ expect(info.filterPositions).toEqual([]);
+ });
+ });
+ });
+
+ describe("projectionableDimensions", () => {
+ it("should return projectionable dimensions for a definition", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+
+ expect(dimensions).toBeDefined();
+ expect(typeof dimensions.length).toBe("number");
+ });
+ });
+
+ describe("project", () => {
+ it("should add a projection to the definition", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ expect(dimensions.length).toBeGreaterThan(0);
+
+ const updatedDefinition = LibMetric.project(
+ definition,
+ LibMetric.dimensionReference(dimensions[0]),
+ );
+ const projectionClauses = LibMetric.projections(updatedDefinition);
+
+ expect(projectionClauses.length).toBe(1);
+ });
+
+ it("should allow adding multiple projections", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ expect(dimensions.length).toBeGreaterThan(1);
+
+ let updatedDefinition = LibMetric.project(
+ definition,
+ LibMetric.dimensionReference(dimensions[0]),
+ );
+ updatedDefinition = LibMetric.project(
+ updatedDefinition,
+ LibMetric.dimensionReference(dimensions[1]),
+ );
+ const projectionClauses = LibMetric.projections(updatedDefinition);
+
+ expect(projectionClauses.length).toBe(2);
+ });
+ });
+
+ describe("projectionDimension", () => {
+ it("should return the dimension for a projection clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ expect(dimensions.length).toBeGreaterThan(0);
+
+ const updatedDefinition = LibMetric.project(
+ definition,
+ LibMetric.dimensionReference(dimensions[0]),
+ );
+ const projectionClauses = LibMetric.projections(updatedDefinition);
+ expect(projectionClauses.length).toBe(1);
+
+ const dimension = LibMetric.projectionDimension(
+ updatedDefinition,
+ projectionClauses[0],
+ );
+ expect(dimension).not.toBeNull();
+
+ // Verify it's the same dimension we projected
+ const info = LibMetric.displayInfo(updatedDefinition, dimension!);
+ const originalInfo = LibMetric.displayInfo(
+ updatedDefinition,
+ dimensions[0],
+ );
+ expect(info.displayName).toBe(originalInfo.displayName);
+ });
+ });
+
+ describe("displayInfo", () => {
+ it("should return display info for metric metadata", () => {
+ const { definition, metricMeta } = setupDefinition();
+ const info = LibMetric.displayInfo(definition, metricMeta);
+
+ expect(info).toBeDefined();
+ expect(info.displayName).toBeDefined();
+ });
+
+ it("should return display info with filterPositions for dimensions", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ const info = LibMetric.displayInfo(definition, dimensions[0]);
+
+ expect(info).toBeDefined();
+ expect(info.displayName).toBeDefined();
+ expect(info.filterPositions).toBeDefined();
+ expect(info.projectionPositions).toBeDefined();
+ });
+ });
+
+ describe("availableTemporalBuckets", () => {
+ it("should return available temporal buckets for a dimension", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ const buckets = LibMetric.availableTemporalBuckets(
+ definition,
+ dimensions[0],
+ );
+ expect(buckets).toBeDefined();
+ expect(typeof buckets.length).toBe("number");
+ });
+ });
+
+ describe("isTemporalBucketable", () => {
+ it("should check if a dimension can have temporal buckets applied", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ const result = LibMetric.isTemporalBucketable(definition, dimensions[0]);
+ expect(typeof result).toBe("boolean");
+ });
+ });
+
+ describe("withTemporalBucket", () => {
+ it("should apply a temporal bucket to a projection clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dateDimension = dimensions[DIM_IDX.DATE_TIME];
+
+ const updatedDefinition = LibMetric.project(
+ definition,
+ LibMetric.dimensionReference(dateDimension),
+ );
+ const projections = LibMetric.projections(updatedDefinition);
+ expect(projections.length).toBe(1);
+
+ const buckets = LibMetric.availableTemporalBuckets(
+ updatedDefinition,
+ dateDimension,
+ );
+ expect(buckets.length).toBeGreaterThan(0);
+
+ const bucketed = LibMetric.withTemporalBucket(projections[0], buckets[0]);
+ expect(bucketed).toBeDefined();
+
+ const bucketInfo = LibMetric.temporalBucket(bucketed);
+ expect(bucketInfo).not.toBeNull();
+ });
+
+ it("should accept a dimension metadata directly (not just projection clause)", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dateDimension = dimensions[DIM_IDX.DATE_TIME];
+
+ const buckets = LibMetric.availableTemporalBuckets(
+ definition,
+ dateDimension,
+ );
+ expect(buckets.length).toBeGreaterThan(0);
+
+ // Pass dimension metadata directly instead of a projection clause
+ const bucketed = LibMetric.withTemporalBucket(dateDimension, buckets[0]);
+ expect(bucketed).toBeDefined();
+
+ const bucketInfo = LibMetric.temporalBucket(bucketed);
+ expect(bucketInfo).not.toBeNull();
+ });
+
+ it("should remove temporal bucket when passed null", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dateDimension = dimensions[DIM_IDX.DATE_TIME];
+
+ const buckets = LibMetric.availableTemporalBuckets(
+ definition,
+ dateDimension,
+ );
+ expect(buckets.length).toBeGreaterThan(0);
+
+ const bucketed = LibMetric.withTemporalBucket(dateDimension, buckets[0]);
+ const unbucketed = LibMetric.withTemporalBucket(bucketed, null);
+
+ const bucketInfo = LibMetric.temporalBucket(unbucketed);
+ expect(bucketInfo).toBeNull();
+ });
+ });
+
+ describe("availableBinningStrategies", () => {
+ it("should return available binning strategies for a dimension", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ const strategies = LibMetric.availableBinningStrategies(
+ definition,
+ dimensions[0],
+ );
+ expect(strategies).toBeDefined();
+ expect(typeof strategies.length).toBe("number");
+ });
+ });
+
+ describe("isBinnable", () => {
+ it("should check if a dimension can have binning applied", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ const result = LibMetric.isBinnable(definition, dimensions[0]);
+ expect(typeof result).toBe("boolean");
+ });
+ });
+
+ describe("withBinning", () => {
+ it("should apply binning to a projection clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const updatedDefinition = LibMetric.project(
+ definition,
+ LibMetric.dimensionReference(numericDimension),
+ );
+ const projectionClauses = LibMetric.projections(updatedDefinition);
+ expect(projectionClauses.length).toBe(1);
+
+ const strategies = LibMetric.availableBinningStrategies(
+ updatedDefinition,
+ numericDimension,
+ );
+ expect(strategies.length).toBeGreaterThan(0);
+
+ const binned = LibMetric.withBinning(projectionClauses[0], strategies[0]);
+ expect(binned).toBeDefined();
+ expect(LibMetric.binning(binned)).not.toBeNull();
+ });
+
+ it("should accept a dimension metadata directly (not just projection clause)", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const strategies = LibMetric.availableBinningStrategies(
+ definition,
+ numericDimension,
+ );
+ expect(strategies.length).toBeGreaterThan(0);
+
+ // Pass dimension metadata directly instead of a projection clause
+ const binned = LibMetric.withBinning(numericDimension, strategies[0]);
+ expect(binned).toBeDefined();
+ expect(LibMetric.binning(binned)).not.toBeNull();
+ });
+
+ it("should remove binning when passed null", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const strategies = LibMetric.availableBinningStrategies(
+ definition,
+ numericDimension,
+ );
+ expect(strategies.length).toBeGreaterThan(0);
+
+ const binned = LibMetric.withBinning(numericDimension, strategies[0]);
+ const unbinned = LibMetric.withBinning(binned, null);
+ expect(LibMetric.binning(unbinned)).toBeNull();
+ });
+ });
+
+ describe("type checking functions", () => {
+ it("isBoolean should return a boolean", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ expect(typeof LibMetric.isBoolean(dimensions[0])).toBe("boolean");
+ });
+
+ it("isNumeric should return a boolean", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ expect(typeof LibMetric.isNumeric(dimensions[0])).toBe("boolean");
+ });
+
+ it("isTemporal should return a boolean", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ expect(typeof LibMetric.isTemporal(dimensions[0])).toBe("boolean");
+ });
+
+ it("isStringLike should return a boolean", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ expect(typeof LibMetric.isStringLike(dimensions[0])).toBe("boolean");
+ });
+ });
+
+ describe("toJsMetricDefinition and fromJsMetricDefinition", () => {
+ it("should round-trip a metric definition through JS format", () => {
+ const { provider, definition } = setupDefinition();
+ const jsDefinition = LibMetric.toJsMetricDefinition(definition);
+
+ expect(jsDefinition).toBeDefined();
+ // New format uses expression instead of source-metric
+ const jsObj = jsDefinition as Record<string, unknown>;
+ expect(jsObj["expression"]).toBeDefined();
+ const expression = jsObj["expression"] as unknown[];
+ expect(expression[0]).toBe("metric");
+ expect(expression[2]).toBe(SAMPLE_METRIC.id);
+
+ const roundTripped = LibMetric.fromJsMetricDefinition(
+ provider,
+ jsDefinition,
+ );
+ expect(LibMetric.sourceMetricId(roundTripped)).toBe(SAMPLE_METRIC.id);
+ });
+ });
+
+ describe("filterParts", () => {
+ it("should return null for clauses that do not match any filter type", () => {
+ const { definition } = setupDefinition();
+ const filterClauses = LibMetric.filters(definition);
+
+ // New definition has no filters
+ expect(filterClauses).toBeDefined();
+ expect(filterClauses.length).toBe(0);
+ });
+ });
+
+ describe("stringFilterClause", () => {
+ it("should create a string filter clause from parts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ expect(dimensions.length).toBeGreaterThan(0);
+
+ // Use the second dimension which is the Category (type/Text)
+ const stringDimension = dimensions[1];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: stringDimension!,
+ values: ["Electronics", "Clothing"],
+ options: {},
+ };
+
+ const clause = LibMetric.stringFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+
+ it("should create contains filter with options", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const parts = {
+ operator: "contains" as const,
+ dimension: stringDimension!,
+ values: ["search term"],
+ options: { caseSensitive: false },
+ };
+
+ const clause = LibMetric.stringFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("numberFilterClause", () => {
+ it("should create a number filter clause from parts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ // Use any dimension for the test - actual type checking happens in CLJS
+ const dimension = dimensions[0];
+ expect(dimension).toBeDefined();
+
+ const parts = {
+ operator: "between" as const,
+ dimension: dimension!,
+ values: [10, 100],
+ };
+
+ const clause = LibMetric.numberFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+
+ it("should create comparison filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: ">" as const,
+ dimension: dimension!,
+ values: [50],
+ };
+
+ const clause = LibMetric.numberFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("booleanFilterClause", () => {
+ it("should create a boolean filter clause from parts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: dimension!,
+ values: [true],
+ };
+
+ const clause = LibMetric.booleanFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+
+ it("should create null check clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "is-null" as const,
+ dimension: dimension!,
+ values: [],
+ };
+
+ const clause = LibMetric.booleanFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("defaultFilterClause", () => {
+ it("should create an is-null filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "is-null" as const,
+ dimension: dimension!,
+ };
+
+ const clause = LibMetric.defaultFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+
+ it("should create a not-null filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "not-null" as const,
+ dimension: dimension!,
+ };
+
+ const clause = LibMetric.defaultFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("specificDateFilterClause", () => {
+ it("should create a date filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ expect(dimensions.length).toBeGreaterThan(0);
+
+ // Use the first dimension which is Created At (type/DateTime)
+ const dateDimension = dimensions[0];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: dateDimension!,
+ values: [new Date("2024-01-15")],
+ hasTime: false,
+ };
+
+ const clause = LibMetric.specificDateFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+
+ it("should create a between date filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const parts = {
+ operator: "between" as const,
+ dimension: dateDimension!,
+ values: [new Date("2024-01-01"), new Date("2024-12-31")],
+ hasTime: false,
+ };
+
+ const clause = LibMetric.specificDateFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("relativeDateFilterClause", () => {
+ it("should create a relative date filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ // Use first dimension (Created At - datetime)
+ const dateDimension = dimensions[0];
+
+ const parts = {
+ dimension: dateDimension!,
+ unit: "day" as const,
+ value: -30,
+ offsetUnit: null,
+ offsetValue: null,
+ options: {},
+ };
+
+ const clause = LibMetric.relativeDateFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+
+ it("should create a relative date filter with offset", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const parts = {
+ dimension: dateDimension!,
+ unit: "day" as const,
+ value: -7,
+ offsetUnit: "week" as const,
+ offsetValue: -1,
+ options: { includeCurrent: true },
+ };
+
+ const clause = LibMetric.relativeDateFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("timeFilterClause", () => {
+ it("should create a time filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: ">" as const,
+ dimension: dimension!,
+ values: [new Date("1970-01-01T09:00:00")],
+ };
+
+ const clause = LibMetric.timeFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+
+ it("should create a between time filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "between" as const,
+ dimension: dimension!,
+ values: [
+ new Date("1970-01-01T09:00:00"),
+ new Date("1970-01-01T17:00:00"),
+ ],
+ };
+
+ const clause = LibMetric.timeFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("coordinateFilterClause", () => {
+ it("should create a coordinate filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: dimension!,
+ longitudeDimension: null,
+ values: [40.7128],
+ };
+
+ const clause = LibMetric.coordinateFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("excludeDateFilterClause", () => {
+ it("should create an exclude date filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ // Use first dimension (Created At - datetime)
+ const dateDimension = dimensions[0];
+
+ const parts = {
+ operator: "!=" as const,
+ dimension: dateDimension!,
+ unit: "day-of-week" as const,
+ values: [1, 7], // Exclude Sunday and Saturday
+ };
+
+ const clause = LibMetric.excludeDateFilterClause(parts);
+ expect(clause).toBeDefined();
+ });
+ });
+
+ describe("filter function integration", () => {
+ it("should add a filter clause to a definition", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ // Use second dimension (Category - text)
+ const stringDimension = dimensions[1];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: stringDimension!,
+ values: ["Electronics"],
+ options: {},
+ };
+
+ const clause = LibMetric.stringFilterClause(parts);
+ const updatedDefinition = LibMetric.filter(definition, clause);
+
+ const filterClauses = LibMetric.filters(updatedDefinition);
+ expect(filterClauses.length).toBe(1);
+ });
+
+ it("should allow adding multiple filters", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const clause1 = LibMetric.defaultFilterClause({
+ operator: "not-null" as const,
+ dimension: dimension!,
+ });
+
+ const clause2 = LibMetric.defaultFilterClause({
+ operator: "not-null" as const,
+ dimension: dimensions[1]!,
+ });
+
+ let updatedDefinition = LibMetric.filter(definition, clause1);
+ updatedDefinition = LibMetric.filter(updatedDefinition, clause2);
+
+ const filterClauses = LibMetric.filters(updatedDefinition);
+ expect(filterClauses.length).toBe(2);
+ });
+ });
+
+ describe("dimensionValuesInfo", () => {
+ it("should return dimension values info for a dimension", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ expect(dimensions.length).toBeGreaterThan(0);
+ const info = LibMetric.dimensionValuesInfo(definition, dimensions[0]);
+ expect(info).toBeDefined();
+ expect(info.canListValues !== undefined).toBe(true);
+ expect(info.canSearchValues !== undefined).toBe(true);
+ expect(info.canRemapValues !== undefined).toBe(true);
+ });
+ });
+
+ describe("MetadataProviderable - using MetricDefinition as provider", () => {
+ it("metricMetadata should accept a MetricDefinition", () => {
+ const { definition } = setupDefinition();
+
+ // Use the definition as MetadataProviderable to look up the same metric
+ const metricMetaFromDefinition = LibMetric.metricMetadata(
+ definition,
+ SAMPLE_METRIC.id,
+ );
+
+ expect(metricMetaFromDefinition).not.toBeNull();
+ });
+
+ it("fromMetricMetadata should accept a MetricDefinition", () => {
+ const { definition, metricMeta } = setupDefinition();
+
+ // Create a new definition using the existing definition as MetadataProviderable
+ const newDefinition = LibMetric.fromMetricMetadata(
+ definition,
+ metricMeta,
+ );
+
+ expect(newDefinition).toBeDefined();
+ expect(LibMetric.sourceMetricId(newDefinition)).toBe(SAMPLE_METRIC.id);
+ });
+
+ it("fromJsMetricDefinition should accept a MetricDefinition", () => {
+ const { definition } = setupDefinition();
+
+ // Create a new definition from expression format using the existing definition as MetadataProviderable
+ const jsDefinition = {
+ expression: [
+ "metric",
+ { "lib/uuid": "test-uuid-1234" },
+ SAMPLE_METRIC.id,
+ ],
+ } as unknown as JsMetricDefinition;
+ const newDefinition = LibMetric.fromJsMetricDefinition(
+ definition,
+ jsDefinition,
+ );
+
+ expect(newDefinition).toBeDefined();
+ expect(LibMetric.sourceMetricId(newDefinition)).toBe(SAMPLE_METRIC.id);
+ });
+ });
+
+ // ============================================================================
+ // FilterParts Extraction Tests
+ // ============================================================================
+
+ describe("stringFilterParts", () => {
+ it("should extract parts from equals filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1]; // Category - type/Text
+
+ const parts = {
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["Electronics", "Clothing"],
+ options: {},
+ };
+
+ const clause = LibMetric.stringFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.stringFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("=");
+ expect(extractedParts?.values).toEqual(["Electronics", "Clothing"]);
+ });
+
+ it("should extract parts from contains filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const parts = {
+ operator: "contains" as const,
+ dimension: stringDimension,
+ values: ["search term"],
+ options: {},
+ };
+
+ const clause = LibMetric.stringFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.stringFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("contains");
+ expect(extractedParts?.values).toEqual(["search term"]);
+ });
+
+ it("should extract parts from is-empty filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const parts = {
+ operator: "is-empty" as const,
+ dimension: stringDimension,
+ values: [],
+ options: {},
+ };
+
+ const clause = LibMetric.stringFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.stringFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("is-empty");
+ expect(extractedParts?.values).toEqual([]);
+ });
+
+ it("should return null for non-string dimension filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0]; // DateTime dimension
+
+ // Create a default filter on a non-string dimension
+ const clause = LibMetric.defaultFilterClause({
+ operator: "not-null" as const,
+ dimension: dateDimension,
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+
+ // stringFilterParts should return null for non-string filters
+ const extractedParts = LibMetric.stringFilterParts(updatedDef, clause);
+ expect(extractedParts).toBeNull();
+ });
+ });
+
+ describe("defaultFilterParts", () => {
+ it("should extract is-null parts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "is-null" as const,
+ dimension: dimension,
+ };
+
+ const clause = LibMetric.defaultFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.defaultFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("is-null");
+ });
+
+ it("should extract not-null parts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const parts = {
+ operator: "not-null" as const,
+ dimension: dimension,
+ };
+
+ const clause = LibMetric.defaultFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.defaultFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("not-null");
+ });
+ });
+
+ describe("relativeDateFilterParts", () => {
+ it("should extract parts from simple time-interval", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0]; // DateTime dimension
+
+ const parts = {
+ dimension: dateDimension,
+ unit: "day" as const,
+ value: -30,
+ offsetUnit: null,
+ offsetValue: null,
+ options: {},
+ };
+
+ const clause = LibMetric.relativeDateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.relativeDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.unit).toBe("day");
+ expect(extractedParts?.value).toBe(-30);
+ });
+
+ it("should extract offset values when present", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const parts = {
+ dimension: dateDimension,
+ unit: "day" as const,
+ value: -7,
+ offsetUnit: "week" as const,
+ offsetValue: -1,
+ options: {},
+ };
+
+ const clause = LibMetric.relativeDateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.relativeDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.offsetUnit).toBe("week");
+ expect(extractedParts?.offsetValue).toBe(-1);
+ });
+ });
+
+ describe("excludeDateFilterParts", () => {
+ it("should extract day-of-week exclusion parts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const parts = {
+ operator: "!=" as const,
+ dimension: dateDimension,
+ unit: "day-of-week" as const,
+ values: [1, 7], // Exclude Sunday and Saturday
+ };
+
+ const clause = LibMetric.excludeDateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.excludeDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("!=");
+ expect(extractedParts?.unit).toBe("day-of-week");
+ expect(extractedParts?.values).toEqual([1, 7]);
+ });
+ });
+
+ describe("numberFilterParts", () => {
+ it("should extract parts from between filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const parts = {
+ operator: "between" as const,
+ dimension: numericDimension,
+ values: [10, 100],
+ };
+
+ const clause = LibMetric.numberFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.numberFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("between");
+ expect(extractedParts?.values).toEqual([10, 100]);
+ });
+
+ it("should extract parts from greater than filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const parts = {
+ operator: ">" as const,
+ dimension: numericDimension,
+ values: [50],
+ };
+
+ const clause = LibMetric.numberFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.numberFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe(">");
+ expect(extractedParts?.values).toEqual([50]);
+ });
+
+ it("should extract parts from less than filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const parts = {
+ operator: "<" as const,
+ dimension: numericDimension,
+ values: [25],
+ };
+
+ const clause = LibMetric.numberFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.numberFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("<");
+ expect(extractedParts?.values).toEqual([25]);
+ });
+
+ it("should extract parts from equals filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: numericDimension,
+ values: [42],
+ };
+
+ const clause = LibMetric.numberFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.numberFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("=");
+ expect(extractedParts?.values).toEqual([42]);
+ });
+
+ it("should return null for non-number filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["test"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.numberFilterParts(updatedDef, clause);
+
+ expect(extractedParts).toBeNull();
+ });
+ });
+
+ describe("booleanFilterParts", () => {
+ it("should extract parts from true equality filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const booleanDimension = dimensions[DIM_IDX.BOOLEAN];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: booleanDimension,
+ values: [true],
+ };
+
+ const clause = LibMetric.booleanFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.booleanFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("=");
+ expect(extractedParts?.values).toEqual([true]);
+ });
+
+ it("should extract parts from false equality filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const booleanDimension = dimensions[DIM_IDX.BOOLEAN];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: booleanDimension,
+ values: [false],
+ };
+
+ const clause = LibMetric.booleanFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.booleanFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("=");
+ expect(extractedParts?.values).toEqual([false]);
+ });
+
+ it("should return null for non-boolean filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["test"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.booleanFilterParts(updatedDef, clause);
+
+ expect(extractedParts).toBeNull();
+ });
+ });
+
+ describe("coordinateFilterParts", () => {
+ it("should extract parts from equals coordinate filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const latitudeDimension = dimensions[DIM_IDX.LATITUDE];
+
+ const parts = {
+ operator: "=" as const,
+ dimension: latitudeDimension,
+ longitudeDimension: null,
+ values: [40.7128],
+ };
+
+ const clause = LibMetric.coordinateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.coordinateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("=");
+ expect(extractedParts?.values).toEqual([40.7128]);
+ });
+
+ it("should extract parts from inside coordinate filter (bounding box)", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const latitudeDimension = dimensions[DIM_IDX.LATITUDE];
+ const longitudeDimension = dimensions[DIM_IDX.LONGITUDE];
+
+ const parts = {
+ operator: "inside" as const,
+ dimension: latitudeDimension,
+ longitudeDimension: longitudeDimension,
+ values: [40.9, 40.5, -73.7, -74.1], // north, south, east, west
+ };
+
+ const clause = LibMetric.coordinateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.coordinateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("inside");
+ expect(extractedParts?.values).toEqual([40.9, 40.5, -73.7, -74.1]);
+ });
+
+ it("should return null for non-coordinate filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["test"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.coordinateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).toBeNull();
+ });
+ });
+
+ describe("specificDateFilterParts", () => {
+ it("should extract parts from equals date filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0]; // DateTime dimension
+
+ const testDate = new Date("2024-01-15");
+ const parts = {
+ operator: "=" as const,
+ dimension: dateDimension,
+ values: [testDate],
+ hasTime: false,
+ };
+
+ const clause = LibMetric.specificDateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.specificDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("=");
+ expect(extractedParts?.hasTime).toBe(false);
+ expect(extractedParts?.values.length).toBe(1);
+ });
+
+ it("should extract parts from between date filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const startDate = new Date("2024-01-01");
+ const endDate = new Date("2024-12-31");
+ const parts = {
+ operator: "between" as const,
+ dimension: dateDimension,
+ values: [startDate, endDate],
+ hasTime: false,
+ };
+
+ const clause = LibMetric.specificDateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.specificDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("between");
+ expect(extractedParts?.values.length).toBe(2);
+ });
+
+ it("should extract parts from greater than date filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const testDate = new Date("2024-06-01");
+ const parts = {
+ operator: ">" as const,
+ dimension: dateDimension,
+ values: [testDate],
+ hasTime: false,
+ };
+
+ const clause = LibMetric.specificDateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.specificDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe(">");
+ });
+
+ it("should preserve hasTime flag when true", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const testDateTime = new Date("2024-01-15T14:30:00");
+ const parts = {
+ operator: "=" as const,
+ dimension: dateDimension,
+ values: [testDateTime],
+ hasTime: true,
+ };
+
+ const clause = LibMetric.specificDateFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.specificDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.hasTime).toBe(true);
+ });
+
+ it("should return null for non-date filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["test"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.specificDateFilterParts(
+ updatedDef,
+ clause,
+ );
+
+ expect(extractedParts).toBeNull();
+ });
+ });
+
+ describe("timeFilterParts", () => {
+ it("should extract parts from greater than time filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const timeDimension = dimensions[DIM_IDX.TIME];
+
+ const testTime = new Date("1970-01-01T09:00:00");
+ const parts = {
+ operator: ">" as const,
+ dimension: timeDimension,
+ values: [testTime],
+ };
+
+ const clause = LibMetric.timeFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.timeFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe(">");
+ expect(extractedParts?.values.length).toBe(1);
+ });
+
+ it("should extract parts from between time filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const timeDimension = dimensions[DIM_IDX.TIME];
+
+ const startTime = new Date("1970-01-01T09:00:00");
+ const endTime = new Date("1970-01-01T17:00:00");
+ const parts = {
+ operator: "between" as const,
+ dimension: timeDimension,
+ values: [startTime, endTime],
+ };
+
+ const clause = LibMetric.timeFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.timeFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("between");
+ expect(extractedParts?.values.length).toBe(2);
+ });
+
+ it("should extract parts from less than time filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const timeDimension = dimensions[DIM_IDX.TIME];
+
+ const testTime = new Date("1970-01-01T12:00:00");
+ const parts = {
+ operator: "<" as const,
+ dimension: timeDimension,
+ values: [testTime],
+ };
+
+ const clause = LibMetric.timeFilterClause(parts);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.timeFilterParts(updatedDef, clause);
+
+ expect(extractedParts).not.toBeNull();
+ expect(extractedParts?.operator).toBe("<");
+ });
+
+ it("should return null for non-time filter clause", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["test"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extractedParts = LibMetric.timeFilterParts(updatedDef, clause);
+
+ expect(extractedParts).toBeNull();
+ });
+ });
+
+ // ============================================================================
+ // filterParts Type Discrimination Tests
+ // ============================================================================
+
+ describe("filterParts type discrimination", () => {
+ it("should identify string filter and return StringFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1]; // Category - type/Text
+
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["Electronics"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ // StringFilterParts has an options property
+ expect(parts).toHaveProperty("options");
+ expect((parts as { operator: string }).operator).toBe("=");
+ });
+
+ it("should identify default filter and return DefaultFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const clause = LibMetric.defaultFilterClause({
+ operator: "is-null" as const,
+ dimension: dimension,
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ expect((parts as { operator: string }).operator).toBe("is-null");
+ });
+
+ it("should identify relative date filter and return RelativeDateFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const clause = LibMetric.relativeDateFilterClause({
+ dimension: dateDimension,
+ unit: "day" as const,
+ value: -30,
+ offsetUnit: null,
+ offsetValue: null,
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ // RelativeDateFilterParts has unit and value properties
+ expect(parts).toHaveProperty("unit");
+ expect(parts).toHaveProperty("value");
+ expect((parts as { unit: string }).unit).toBe("day");
+ expect((parts as { value: number }).value).toBe(-30);
+ });
+
+ it("should identify number filter and return NumberFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const clause = LibMetric.numberFilterClause({
+ operator: "between" as const,
+ dimension: numericDimension,
+ values: [10, 100],
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ expect((parts as { operator: string }).operator).toBe("between");
+ expect((parts as { values: number[] }).values).toEqual([10, 100]);
+ });
+
+ it("should identify boolean filter and return BooleanFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const booleanDimension = dimensions[DIM_IDX.BOOLEAN];
+
+ const clause = LibMetric.booleanFilterClause({
+ operator: "=" as const,
+ dimension: booleanDimension,
+ values: [true],
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ expect((parts as { operator: string }).operator).toBe("=");
+ expect((parts as { values: boolean[] }).values).toEqual([true]);
+ });
+
+ it("should identify coordinate filter and return CoordinateFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const latitudeDimension = dimensions[DIM_IDX.LATITUDE];
+
+ const clause = LibMetric.coordinateFilterClause({
+ operator: "=" as const,
+ dimension: latitudeDimension,
+ longitudeDimension: null,
+ values: [40.7128],
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ expect((parts as { operator: string }).operator).toBe("=");
+ // CoordinateFilterParts has longitudeDimension property
+ expect(parts).toHaveProperty("longitudeDimension");
+ });
+
+ it("should identify specific date filter and return SpecificDateFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const clause = LibMetric.specificDateFilterClause({
+ operator: "=" as const,
+ dimension: dateDimension,
+ values: [new Date("2024-01-15")],
+ hasTime: false,
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ expect((parts as { operator: string }).operator).toBe("=");
+ // SpecificDateFilterParts has hasTime property
+ expect(parts).toHaveProperty("hasTime");
+ expect((parts as { hasTime: boolean }).hasTime).toBe(false);
+ });
+
+ it("should identify time filter and return TimeFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const timeDimension = dimensions[DIM_IDX.TIME];
+
+ const clause = LibMetric.timeFilterClause({
+ operator: ">" as const,
+ dimension: timeDimension,
+ values: [new Date("1970-01-01T09:00:00")],
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ expect((parts as { operator: string }).operator).toBe(">");
+ });
+
+ it("should identify exclude date filter and return ExcludeDateFilterParts", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const clause = LibMetric.excludeDateFilterClause({
+ operator: "!=" as const,
+ dimension: dateDimension,
+ unit: "day-of-week" as const,
+ values: [1, 7],
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const parts = LibMetric.filterParts(updatedDef, clause);
+
+ expect(parts).not.toBeNull();
+ expect((parts as { operator: string }).operator).toBe("!=");
+ // ExcludeDateFilterParts has unit property
+ expect(parts).toHaveProperty("unit");
+ expect((parts as { unit: string }).unit).toBe("day-of-week");
+ });
+ });
+
+ // ============================================================================
+ // Round-Trip Invariant Tests
+ // ============================================================================
+
+ describe("filter round-trip invariants", () => {
+ it("string filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ const original = {
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["value1", "value2"],
+ options: {},
+ };
+
+ const clause = LibMetric.stringFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.stringFilterParts(updatedDef, clause);
+
+ expect(extracted?.operator).toBe(original.operator);
+ expect(extracted?.values).toEqual(original.values);
+ });
+
+ it("default filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions[0];
+
+ const original = {
+ operator: "not-null" as const,
+ dimension: dimension,
+ };
+
+ const clause = LibMetric.defaultFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.defaultFilterParts(updatedDef, clause);
+
+ expect(extracted?.operator).toBe(original.operator);
+ });
+
+ it("relative date filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const original = {
+ dimension: dateDimension,
+ unit: "week" as const,
+ value: -4,
+ offsetUnit: null,
+ offsetValue: null,
+ options: {},
+ };
+
+ const clause = LibMetric.relativeDateFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.relativeDateFilterParts(updatedDef, clause);
+
+ expect(extracted?.unit).toBe(original.unit);
+ expect(extracted?.value).toBe(original.value);
+ });
+
+ it("exclude date filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dateDimension = dimensions[0];
+
+ const original = {
+ operator: "!=" as const,
+ dimension: dateDimension,
+ unit: "day-of-week" as const,
+ values: [1, 7],
+ };
+
+ const clause = LibMetric.excludeDateFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.excludeDateFilterParts(updatedDef, clause);
+
+ expect(extracted?.operator).toBe(original.operator);
+ expect(extracted?.unit).toBe(original.unit);
+ expect(extracted?.values).toEqual(original.values);
+ });
+
+ it("number filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const numericDimension = dimensions[DIM_IDX.NUMBER];
+
+ const original = {
+ operator: "between" as const,
+ dimension: numericDimension,
+ values: [10, 100],
+ };
+
+ const clause = LibMetric.numberFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.numberFilterParts(updatedDef, clause);
+
+ expect(extracted?.operator).toBe(original.operator);
+ expect(extracted?.values).toEqual(original.values);
+ });
+
+ it("boolean filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const booleanDimension = dimensions[DIM_IDX.BOOLEAN];
+
+ const original = {
+ operator: "=" as const,
+ dimension: booleanDimension,
+ values: [true],
+ };
+
+ const clause = LibMetric.booleanFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.booleanFilterParts(updatedDef, clause);
+
+ expect(extracted?.operator).toBe(original.operator);
+ expect(extracted?.values).toEqual(original.values);
+ });
+
+ it("coordinate filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const latitudeDimension = dimensions[DIM_IDX.LATITUDE];
+
+ const original = {
+ operator: "=" as const,
+ dimension: latitudeDimension,
+ longitudeDimension: null,
+ values: [40.7128],
+ };
+
+ const clause = LibMetric.coordinateFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.coordinateFilterParts(updatedDef, clause);
+
+ expect(extracted?.operator).toBe(original.operator);
+ expect(extracted?.values).toEqual(original.values);
+ });
+
+ it("time filter: parts -> clause -> parts preserves data", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const timeDimension = dimensions[DIM_IDX.TIME];
+
+ const startTime = new Date("1970-01-01T09:00:00");
+ const endTime = new Date("1970-01-01T17:00:00");
+ const original = {
+ operator: "between" as const,
+ dimension: timeDimension,
+ values: [startTime, endTime],
+ };
+
+ const clause = LibMetric.timeFilterClause(original);
+ const updatedDef = LibMetric.filter(definition, clause);
+ const extracted = LibMetric.timeFilterParts(updatedDef, clause);
+
+ expect(extracted?.operator).toBe(original.operator);
+ expect(extracted?.values.length).toBe(original.values.length);
+ });
+ });
+
+ // ============================================================================
+ // sourceInstances Tests
+ // ============================================================================
+
+ describe("sourceInstances", () => {
+ it("should return array with one entry for single-source definition", () => {
+ const { definition } = setupDefinition();
+ const instances = LibMetric.sourceInstances(definition);
+
+ expect(instances).toBeDefined();
+ expect(instances.length).toBe(1);
+ });
+ });
+
+ // ============================================================================
+ // Multi-arity filters Tests
+ // ============================================================================
+
+ describe("filters (1-arity returns flat array)", () => {
+ it("should return flat MBQL clauses after adding filter", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[DIM_IDX.STRING];
+
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["Electronics"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+ const filterClauses = LibMetric.filters(updatedDef);
+
+ expect(filterClauses.length).toBe(1);
+ // Should be a flat filter clause, not a wrapper
+ expect(filterClauses[0]).toBeDefined();
+ });
+ });
+
+ // ============================================================================
+ // Multi-arity projections Tests
+ // ============================================================================
+
+ describe("projections (1-arity returns flat array)", () => {
+ it("should return flat dimension refs after projecting", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ expect(dimensions.length).toBeGreaterThan(0);
+
+ const updatedDef = LibMetric.project(
+ definition,
+ LibMetric.dimensionReference(dimensions[0]),
+ );
+ const projectionClauses = LibMetric.projections(updatedDef);
+
+ expect(projectionClauses.length).toBe(1);
+ expect(projectionClauses[0]).toBeDefined();
+ });
+ });
+
+ // ============================================================================
+ // Filter Position Tracking Tests
+ // ============================================================================
+
+ describe("filter position tracking", () => {
+ it("should track filter positions after adding filters", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ // Add a filter on the string dimension
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["Electronics"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+
+ // Get dimensions from the updated definition
+ const updatedDimensions = LibMetric.filterableDimensions(updatedDef);
+ const updatedStringDim = updatedDimensions[1];
+
+ const info = LibMetric.displayInfo(updatedDef, updatedStringDim);
+ // The string dimension should now have a filter at position 0
+ expect(info.filterPositions).toEqual([0]);
+ });
+
+ it("should track multiple filter positions on same dimension", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ // Add two filters on the same dimension
+ const clause1 = LibMetric.stringFilterClause({
+ operator: "!=" as const,
+ dimension: stringDimension,
+ values: ["Excluded"],
+ options: {},
+ });
+ let updatedDef = LibMetric.filter(definition, clause1);
+
+ const clause2 = LibMetric.stringFilterClause({
+ operator: "contains" as const,
+ dimension: stringDimension,
+ values: ["search"],
+ options: {},
+ });
+ updatedDef = LibMetric.filter(updatedDef, clause2);
+
+ const updatedDimensions = LibMetric.filterableDimensions(updatedDef);
+ const updatedStringDim = updatedDimensions[1];
+
+ const info = LibMetric.displayInfo(updatedDef, updatedStringDim);
+ expect(info.filterPositions).toEqual([0, 1]);
+ });
+
+ it("should not affect other dimensions filter positions", () => {
+ const { definition } = setupDefinition();
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const stringDimension = dimensions[1];
+
+ // Add a filter only on the string dimension
+ const clause = LibMetric.stringFilterClause({
+ operator: "=" as const,
+ dimension: stringDimension,
+ values: ["Electronics"],
+ options: {},
+ });
+ const updatedDef = LibMetric.filter(definition, clause);
+
+ const updatedDimensions = LibMetric.filterableDimensions(updatedDef);
+ const updatedDateDim = updatedDimensions[0];
+
+ const info = LibMetric.displayInfo(updatedDef, updatedDateDim);
+ // The date dimension should have no filters
+ expect(info.filterPositions).toEqual([]);
+ });
+ });
+});
diff --git a/frontend/src/metabase-lib/metric/index.ts b/frontend/src/metabase-lib/metric/index.ts
new file mode 100644
index 00000000000..d778e12df16
--- /dev/null
+++ b/frontend/src/metabase-lib/metric/index.ts
@@ -0,0 +1,2 @@
+export * from "./core";
+export * from "./types";
diff --git a/frontend/src/metabase-lib/metric/types.ts b/frontend/src/metabase-lib/metric/types.ts
new file mode 100644
index 00000000000..03db4258168
--- /dev/null
+++ b/frontend/src/metabase-lib/metric/types.ts
@@ -0,0 +1,211 @@
+import type { DimensionId, TemporalUnit } from "metabase-types/api";
+
+import type {
+ BooleanFilterOperator,
+ CoordinateFilterOperator,
+ DefaultFilterOperator,
+ ExcludeDateFilterOperator,
+ ExcludeDateFilterUnit,
+ NumberFilterOperator,
+ NumberFilterValue,
+ RelativeDateFilterOptions,
+ RelativeDateFilterUnit,
+ SpecificDateFilterOperator,
+ StringFilterOperator,
+ StringFilterOptions,
+ TimeFilterOperator,
+} from "../common";
+
+declare const _MetadataProviderSymbol: unique symbol;
+declare const _MetricMetadataSymbol: unique symbol;
+declare const _MeasureMetadataSymbol: unique symbol;
+declare const _MetricDefinitionSymbol: unique symbol;
+declare const _DimensionMetadataSymbol: unique symbol;
+declare const _FilterClauseSymbol: unique symbol;
+declare const _ProjectionClauseSymbol: unique symbol;
+declare const _TemporalBucketSymbol: unique symbol;
+declare const _BinningStrategySymbol: unique symbol;
+declare const _SourceInstanceSymbol: unique symbol;
+
+export type MetadataProvider = unknown & {
+ _opaque: typeof _MetadataProviderSymbol;
+};
+
+export type MetricMetadata = unknown & {
+ _opaque: typeof _MetricMetadataSymbol;
+};
+
+export type MeasureMetadata = unknown & {
+ _opaque: typeof _MeasureMetadataSymbol;
+};
+
+export type MetricDefinition = unknown & {
+ _opaque: typeof _MetricDefinitionSymbol;
+};
+
+export type DimensionMetadata = unknown & {
+ _opaque: typeof _DimensionMetadataSymbol;
+};
+
+export type FilterClause = unknown & {
+ _opaque: typeof _FilterClauseSymbol;
+};
+
+export type ProjectionClause = unknown & {
+ _opaque: typeof _ProjectionClauseSymbol;
+};
+
+export type TemporalBucket = unknown & {
+ _opaque: typeof _TemporalBucketSymbol;
+};
+
+export type BinningStrategy = unknown & {
+ _opaque: typeof _BinningStrategySymbol;
+};
+
+export type SourceInstance = unknown & {
+ _opaque: typeof _SourceInstanceSymbol;
+};
+
+export type MetadataProviderable = MetadataProvider | MetricDefinition;
+
+export type Clause = FilterClause | ProjectionClause;
+
+export type MetricDisplayInfo = {
+ displayName: string;
+ columnName?: string;
+};
+
+export type MeasureDisplayInfo = {
+ displayName: string;
+ columnName?: string;
+};
+
+export type ClauseDisplayInfo = {
+ displayName: string;
+};
+
+export type DimensionGroup = {
+ id: string;
+ type: "main" | "connection";
+ displayName: string;
+};
+
+export type DimensionDisplayInfo = {
+ name?: string;
+ displayName: string;
+ longDisplayName: string;
+ group?: DimensionGroup;
+ isFromJoin?: boolean;
+ isImplicitlyJoinable?: boolean;
+ filterPositions?: number[];
+ projectionPositions?: number[];
+};
+
+export type TemporalBucketDisplayInfo = {
+ shortName: TemporalUnit;
+ displayName: string;
+ default?: boolean;
+ selected?: boolean;
+ isTemporalExtraction?: boolean;
+};
+
+export type BinningStrategyDisplayInfo = {
+ displayName: string;
+ default?: boolean;
+ selected?: boolean;
+};
+
+export type Displayable =
+ | MetricMetadata
+ | MeasureMetadata
+ | Clause
+ | DimensionMetadata
+ | TemporalBucket
+ | BinningStrategy;
+
+export type DisplayInfo =
+ | MetricDisplayInfo
+ | MeasureDisplayInfo
+ | ClauseDisplayInfo
+ | DimensionDisplayInfo
+ | TemporalBucketDisplayInfo
+ | BinningStrategyDisplayInfo;
+
+export type FilterParts =
+ | StringFilterParts
+ | NumberFilterParts
+ | CoordinateFilterParts
+ | BooleanFilterParts
+ | SpecificDateFilterParts
+ | RelativeDateFilterParts
+ | ExcludeDateFilterParts
+ | TimeFilterParts
+ | DefaultFilterParts;
+
+export type StringFilterParts = {
+ operator: StringFilterOperator;
+ dimension: DimensionMetadata;
+ values: string[];
+ options: StringFilterOptions;
+};
+
+export type NumberFilterParts = {
+ operator: NumberFilterOperator;
+ dimension: DimensionMetadata;
+ values: NumberFilterValue[];
+};
+
+export type CoordinateFilterParts = {
+ operator: CoordinateFilterOperator;
+ dimension: DimensionMetadata;
+ longitudeDimension: DimensionMetadata | null;
+ values: NumberFilterValue[];
+};
+
+export type BooleanFilterParts = {
+ operator: BooleanFilterOperator;
+ dimension: DimensionMetadata;
+ values: boolean[];
+};
+
+export type SpecificDateFilterParts = {
+ operator: SpecificDateFilterOperator;
+ dimension: DimensionMetadata;
+ values: Date[];
+ hasTime: boolean;
+};
+
+export type RelativeDateFilterParts = {
+ dimension: DimensionMetadata;
+ unit: RelativeDateFilterUnit;
+ value: number;
+ offsetUnit: RelativeDateFilterUnit | null;
+ offsetValue: number | null;
+ options: RelativeDateFilterOptions;
+};
+
+export type ExcludeDateFilterParts = {
+ operator: ExcludeDateFilterOperator;
+ dimension: DimensionMetadata;
+ unit: ExcludeDateFilterUnit | null;
+ values: number[];
+};
+
+export type TimeFilterParts = {
+ operator: TimeFilterOperator;
+ dimension: DimensionMetadata;
+ values: Date[];
+};
+
+export type DefaultFilterParts = {
+ operator: DefaultFilterOperator;
+ dimension: DimensionMetadata;
+};
+
+export type DimensionValuesInfo = {
+ id: DimensionId;
+ canListValues: boolean;
+ canSearchValues: boolean;
+ canRemapValues: boolean;
+};
diff --git a/frontend/src/metabase-lib/metric/types.unit.spec.ts b/frontend/src/metabase-lib/metric/types.unit.spec.ts
new file mode 100644
index 00000000000..5ee4b412557
--- /dev/null
+++ b/frontend/src/metabase-lib/metric/types.unit.spec.ts
@@ -0,0 +1,329 @@
+import Metadata from "metabase-lib/v1/metadata/Metadata";
+import Metric from "metabase-lib/v1/metadata/Metric";
+import {
+ createMockMetric,
+ createMockMetricDimension,
+} from "metabase-types/api/mocks/metric";
+
+import * as LibMetric from "./core";
+import type {
+ DimensionMetadata,
+ MetadataProvider,
+ MetricDefinition,
+} from "./types";
+
+/**
+ * Creates test metrics with dimensions of specific types for testing type predicates.
+ */
+function createTestMetadata(): Metadata {
+ const metadata = new Metadata();
+
+ // Create a metric with various dimension types
+ const testMetric = createMockMetric({
+ id: 1,
+ name: "Test Metric",
+ dimensions: [
+ createMockMetricDimension({
+ id: "dim-boolean",
+ display_name: "Is Active",
+ effective_type: "type/Boolean",
+ semantic_type: null,
+ }),
+ createMockMetricDimension({
+ id: "dim-integer",
+ display_name: "Count",
+ effective_type: "type/Integer",
+ semantic_type: null,
+ }),
+ createMockMetricDimension({
+ id: "dim-float",
+ display_name: "Amount",
+ effective_type: "type/Float",
+ semantic_type: null,
+ }),
+ createMockMetricDimension({
+ id: "dim-string",
+ display_name: "Name",
+ effective_type: "type/Text",
+ semantic_type: null,
+ }),
+ createMockMetricDimension({
+ id: "dim-datetime",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: null,
+ }),
+ createMockMetricDimension({
+ id: "dim-date",
+ display_name: "Birth Date",
+ effective_type: "type/Date",
+ semantic_type: null,
+ }),
+ createMockMetricDimension({
+ id: "dim-time",
+ display_name: "Start Time",
+ effective_type: "type/Time",
+ semantic_type: null,
+ }),
+ // Semantic type based dimensions
+ createMockMetricDimension({
+ id: "dim-coordinate",
+ display_name: "Location Coord",
+ effective_type: "type/Float",
+ semantic_type: "type/Coordinate",
+ }),
+ createMockMetricDimension({
+ id: "dim-latitude",
+ display_name: "Latitude",
+ effective_type: "type/Float",
+ semantic_type: "type/Latitude",
+ }),
+ createMockMetricDimension({
+ id: "dim-longitude",
+ display_name: "Longitude",
+ effective_type: "type/Float",
+ semantic_type: "type/Longitude",
+ }),
+ createMockMetricDimension({
+ id: "dim-address",
+ display_name: "Address",
+ effective_type: "type/Text",
+ semantic_type: "type/Address",
+ }),
+ createMockMetricDimension({
+ id: "dim-fk",
+ display_name: "User ID",
+ effective_type: "type/Integer",
+ semantic_type: "type/FK",
+ }),
+ createMockMetricDimension({
+ id: "dim-pk",
+ display_name: "ID",
+ effective_type: "type/Integer",
+ semantic_type: "type/PK",
+ }),
+ ],
+ });
+
+ const metricInstance = new Metric(testMetric as any);
+ metricInstance.metadata = metadata;
+ metadata.metrics = {
+ [testMetric.id]: metricInstance,
+ };
+
+ return metadata;
+}
+
+function setupDefinition(): {
+ provider: MetadataProvider;
+ definition: MetricDefinition;
+ dimensions: DimensionMetadata[];
+} {
+ const metadata = createTestMetadata();
+ const provider = LibMetric.metadataProvider(metadata);
+ const metricMeta = LibMetric.metricMetadata(provider, 1);
+ expect(metricMeta).not.toBeNull();
+ const definition = LibMetric.fromMetricMetadata(provider, metricMeta!);
+ const dimensions = LibMetric.filterableDimensions(definition);
+ return { provider, definition, dimensions };
+}
+
+describe("metabase-lib/metric/types", () => {
+ describe("effective-type predicates", () => {
+ describe("isBoolean", () => {
+ it("returns true for boolean dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const boolDim = dimensions.find((d) => LibMetric.isBoolean(d));
+ expect(boolDim).toBeDefined();
+ expect(LibMetric.isBoolean(boolDim!)).toBe(true);
+ });
+
+ it("returns false for non-boolean dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const nonBoolDims = dimensions.filter((d) => !LibMetric.isBoolean(d));
+ expect(nonBoolDims.length).toBeGreaterThan(0);
+ nonBoolDims.forEach((d) => {
+ expect(LibMetric.isBoolean(d)).toBe(false);
+ });
+ });
+ });
+
+ describe("isNumeric", () => {
+ it("returns true for numeric dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const numericDims = dimensions.filter((d) => LibMetric.isNumeric(d));
+ // Should have integer, float, and all coordinate-based dimensions (which are floats)
+ // Also FK/PK are integers
+ expect(numericDims.length).toBeGreaterThan(0);
+ });
+
+ it("returns false for string dimensions", () => {
+ const { dimensions } = setupDefinition();
+ // Find a pure string dimension (no semantic type like Address)
+ const stringDim = dimensions.find(
+ (d) => LibMetric.isStringOrStringLike(d) && !LibMetric.isLocation(d),
+ );
+ expect(stringDim).toBeDefined();
+ expect(LibMetric.isNumeric(stringDim!)).toBe(false);
+ });
+ });
+
+ describe("isTemporal", () => {
+ it("returns true for temporal dimensions (datetime, date, time)", () => {
+ const { dimensions } = setupDefinition();
+ const temporalDims = dimensions.filter((d) => LibMetric.isTemporal(d));
+ // Should have datetime, date, and time dimensions
+ expect(temporalDims.length).toBe(3);
+ });
+
+ it("returns false for non-temporal dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const boolDim = dimensions.find((d) => LibMetric.isBoolean(d));
+ expect(boolDim).toBeDefined();
+ expect(LibMetric.isTemporal(boolDim!)).toBe(false);
+ });
+ });
+
+ describe("isTime", () => {
+ it("returns true for time-only dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const timeDims = dimensions.filter((d) => LibMetric.isTime(d));
+ expect(timeDims.length).toBe(1);
+ });
+
+ it("returns false for date/datetime dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const temporalNonTime = dimensions.filter(
+ (d) => LibMetric.isTemporal(d) && !LibMetric.isTime(d),
+ );
+ expect(temporalNonTime.length).toBe(2); // datetime and date
+ temporalNonTime.forEach((d) => {
+ expect(LibMetric.isTime(d)).toBe(false);
+ });
+ });
+ });
+
+ describe("isDateOrDateTime", () => {
+ it("returns true for date and datetime dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const dateOrDatetimeDims = dimensions.filter((d) =>
+ LibMetric.isDateOrDateTime(d),
+ );
+ // Should have datetime and date (but not time)
+ expect(dateOrDatetimeDims.length).toBe(2);
+ });
+
+ it("returns false for time-only dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const timeDim = dimensions.find((d) => LibMetric.isTime(d));
+ expect(timeDim).toBeDefined();
+ expect(LibMetric.isDateOrDateTime(timeDim!)).toBe(false);
+ });
+ });
+
+ describe("isStringOrStringLike", () => {
+ it("returns true for string dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const stringDims = dimensions.filter((d) =>
+ LibMetric.isStringOrStringLike(d),
+ );
+ // Should have Name and Address dimensions
+ expect(stringDims.length).toBeGreaterThan(0);
+ });
+ });
+ });
+
+ describe("semantic-type predicates", () => {
+ describe("isCoordinate", () => {
+ it("returns true for coordinate dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const coordDims = dimensions.filter((d) => LibMetric.isCoordinate(d));
+ // Should have coordinate, latitude, and longitude
+ expect(coordDims.length).toBe(3);
+ });
+
+ it("latitude and longitude are also coordinates", () => {
+ const { dimensions } = setupDefinition();
+ const latDims = dimensions.filter((d) => LibMetric.isLatitude(d));
+ const lonDims = dimensions.filter((d) => LibMetric.isLongitude(d));
+
+ latDims.forEach((d) => expect(LibMetric.isCoordinate(d)).toBe(true));
+ lonDims.forEach((d) => expect(LibMetric.isCoordinate(d)).toBe(true));
+ });
+ });
+
+ describe("isLatitude", () => {
+ it("returns true only for latitude dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const latDims = dimensions.filter((d) => LibMetric.isLatitude(d));
+ expect(latDims.length).toBe(1);
+ });
+ });
+
+ describe("isLongitude", () => {
+ it("returns true only for longitude dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const lonDims = dimensions.filter((d) => LibMetric.isLongitude(d));
+ expect(lonDims.length).toBe(1);
+ });
+ });
+
+ describe("isLocation", () => {
+ it("returns true for address/location dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const locationDims = dimensions.filter((d) => LibMetric.isLocation(d));
+ expect(locationDims.length).toBe(1);
+ });
+ });
+
+ describe("isForeignKey", () => {
+ it("returns true for FK dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const fkDims = dimensions.filter((d) => LibMetric.isForeignKey(d));
+ expect(fkDims.length).toBe(1);
+ });
+
+ it("returns false for PK dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const pkDims = dimensions.filter((d) => LibMetric.isPrimaryKey(d));
+ pkDims.forEach((d) => expect(LibMetric.isForeignKey(d)).toBe(false));
+ });
+ });
+
+ describe("isPrimaryKey", () => {
+ it("returns true for PK dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const pkDims = dimensions.filter((d) => LibMetric.isPrimaryKey(d));
+ expect(pkDims.length).toBe(1);
+ });
+
+ it("returns false for FK dimensions", () => {
+ const { dimensions } = setupDefinition();
+ const fkDims = dimensions.filter((d) => LibMetric.isForeignKey(d));
+ fkDims.forEach((d) => expect(LibMetric.isPrimaryKey(d)).toBe(false));
+ });
+ });
+ });
+
+ describe("type predicates return boolean", () => {
+ it("all predicates return boolean type", () => {
+ const { dimensions } = setupDefinition();
+ expect(dimensions.length).toBeGreaterThan(0);
+ const dim = dimensions[0];
+
+ expect(typeof LibMetric.isBoolean(dim)).toBe("boolean");
+ expect(typeof LibMetric.isNumeric(dim)).toBe("boolean");
+ expect(typeof LibMetric.isTemporal(dim)).toBe("boolean");
+ expect(typeof LibMetric.isTime(dim)).toBe("boolean");
+ expect(typeof LibMetric.isDateOrDateTime(dim)).toBe("boolean");
+ expect(typeof LibMetric.isStringLike(dim)).toBe("boolean");
+ expect(typeof LibMetric.isStringOrStringLike(dim)).toBe("boolean");
+ expect(typeof LibMetric.isCoordinate(dim)).toBe("boolean");
+ expect(typeof LibMetric.isLatitude(dim)).toBe("boolean");
+ expect(typeof LibMetric.isLongitude(dim)).toBe("boolean");
+ expect(typeof LibMetric.isLocation(dim)).toBe("boolean");
+ expect(typeof LibMetric.isForeignKey(dim)).toBe("boolean");
+ expect(typeof LibMetric.isPrimaryKey(dim)).toBe("boolean");
+ });
+ });
+});
diff --git a/frontend/src/metabase-lib/aggregation.ts b/frontend/src/metabase-lib/query/aggregation.ts
similarity index 100%
rename from frontend/src/metabase-lib/aggregation.ts
rename to frontend/src/metabase-lib/query/aggregation.ts
diff --git a/frontend/src/metabase-lib/binning.ts b/frontend/src/metabase-lib/query/binning.ts
similarity index 100%
rename from frontend/src/metabase-lib/binning.ts
rename to frontend/src/metabase-lib/query/binning.ts
diff --git a/frontend/src/metabase-lib/breakout.ts b/frontend/src/metabase-lib/query/breakout.ts
similarity index 100%
rename from frontend/src/metabase-lib/breakout.ts
rename to frontend/src/metabase-lib/query/breakout.ts
diff --git a/frontend/src/metabase-lib/breakout.unit.spec.ts b/frontend/src/metabase-lib/query/breakout.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase-lib/breakout.unit.spec.ts
rename to frontend/src/metabase-lib/query/breakout.unit.spec.ts
diff --git a/frontend/src/metabase-lib/buckets.ts b/frontend/src/metabase-lib/query/buckets.ts
similarity index 100%
rename from frontend/src/metabase-lib/buckets.ts
rename to frontend/src/metabase-lib/query/buckets.ts
diff --git a/frontend/src/metabase-lib/column_types.ts b/frontend/src/metabase-lib/query/column_types.ts
similarity index 100%
rename from frontend/src/metabase-lib/column_types.ts
rename to frontend/src/metabase-lib/query/column_types.ts
diff --git a/frontend/src/metabase-lib/comparison.ts b/frontend/src/metabase-lib/query/comparison.ts
similarity index 100%
rename from frontend/src/metabase-lib/comparison.ts
rename to frontend/src/metabase-lib/query/comparison.ts
diff --git a/frontend/src/metabase-lib/comparison.unit.spec.ts b/frontend/src/metabase-lib/query/comparison.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase-lib/comparison.unit.spec.ts
rename to frontend/src/metabase-lib/query/comparison.unit.spec.ts
diff --git a/frontend/src/metabase-lib/database.ts b/frontend/src/metabase-lib/query/database.ts
similarity index 100%
rename from frontend/src/metabase-lib/database.ts
rename to frontend/src/metabase-lib/query/database.ts
diff --git a/frontend/src/metabase-lib/viz/display.ts b/frontend/src/metabase-lib/query/display.ts
similarity index 100%
rename from frontend/src/metabase-lib/viz/display.ts
rename to frontend/src/metabase-lib/query/display.ts
diff --git a/frontend/src/metabase-lib/viz/display.unit.spec.ts b/frontend/src/metabase-lib/query/display.unit.spec.ts
similarity index 99%
rename from frontend/src/metabase-lib/viz/display.unit.spec.ts
rename to frontend/src/metabase-lib/query/display.unit.spec.ts
index 6a40543a96a..6fa26a916b6 100644
--- a/frontend/src/metabase-lib/viz/display.unit.spec.ts
+++ b/frontend/src/metabase-lib/query/display.unit.spec.ts
@@ -6,13 +6,12 @@ import {
createSampleDatabase,
} from "metabase-types/api/mocks/presets";
+import { defaultDisplay } from "./display";
import {
DEFAULT_TEST_QUERY,
SAMPLE_PROVIDER,
createMetadataProvider,
-} from "../test-helpers";
-
-import { defaultDisplay } from "./display";
+} from "./test-helpers";
const DATABASE_ID = 1;
const ACCOUNTS_ID = 4;
diff --git a/frontend/src/metabase-lib/drills.ts b/frontend/src/metabase-lib/query/drills.ts
similarity index 100%
rename from frontend/src/metabase-lib/drills.ts
rename to frontend/src/metabase-lib/query/drills.ts
diff --git a/frontend/src/metabase-lib/expression.ts b/frontend/src/metabase-lib/query/expression.ts
similarity index 100%
rename from frontend/src/metabase-lib/expression.ts
rename to frontend/src/metabase-lib/query/expression.ts
diff --git a/frontend/src/metabase-lib/extractions.ts b/frontend/src/metabase-lib/query/extractions.ts
similarity index 100%
rename from frontend/src/metabase-lib/extractions.ts
rename to frontend/src/metabase-lib/query/extractions.ts
diff --git a/frontend/src/metabase-lib/fields.ts b/frontend/src/metabase-lib/query/fields.ts
similarity index 100%
rename from frontend/src/metabase-lib/fields.ts
rename to frontend/src/metabase-lib/query/fields.ts
diff --git a/frontend/src/metabase-lib/filter.ts b/frontend/src/metabase-lib/query/filter.ts
similarity index 100%
rename from frontend/src/metabase-lib/filter.ts
rename to frontend/src/metabase-lib/query/filter.ts
diff --git a/frontend/src/metabase-lib/query/index.ts b/frontend/src/metabase-lib/query/index.ts
new file mode 100644
index 00000000000..ec8d3bbc0fd
--- /dev/null
+++ b/frontend/src/metabase-lib/query/index.ts
@@ -0,0 +1,26 @@
+// Note: only metabase-lib v2 exports should be added here
+
+export * from "./aggregation";
+export * from "./binning";
+export * from "./breakout";
+export * from "./buckets";
+export * from "./column_types";
+export * from "./comparison";
+export * from "./database";
+export * from "./drills";
+export * from "./expression";
+export * from "./extractions";
+export * from "./fields";
+export * from "./filter";
+export * from "./join";
+export * from "./limit";
+export * from "./metadata";
+export * from "./measures";
+export * from "./metrics";
+export * from "./native";
+export * from "./order_by";
+export * from "./query";
+export * from "./segments";
+export * from "./temporal_bucket";
+export * from "./types";
+export * from "./display";
diff --git a/frontend/src/metabase-lib/join.ts b/frontend/src/metabase-lib/query/join.ts
similarity index 100%
rename from frontend/src/metabase-lib/join.ts
rename to frontend/src/metabase-lib/query/join.ts
diff --git a/frontend/src/metabase-lib/limit.ts b/frontend/src/metabase-lib/query/limit.ts
similarity index 100%
rename from frontend/src/metabase-lib/limit.ts
rename to frontend/src/metabase-lib/query/limit.ts
diff --git a/frontend/src/metabase-lib/measures.ts b/frontend/src/metabase-lib/query/measures.ts
similarity index 100%
rename from frontend/src/metabase-lib/measures.ts
rename to frontend/src/metabase-lib/query/measures.ts
diff --git a/frontend/src/metabase-lib/metadata.ts b/frontend/src/metabase-lib/query/metadata.ts
similarity index 98%
rename from frontend/src/metabase-lib/metadata.ts
rename to frontend/src/metabase-lib/query/metadata.ts
index 1ee437af17b..d926d4d5f69 100644
--- a/frontend/src/metabase-lib/metadata.ts
+++ b/frontend/src/metabase-lib/query/metadata.ts
@@ -9,6 +9,9 @@ import type {
TableId,
} from "metabase-types/api";
+import type Field from "../v1/metadata/Field";
+import type Metadata from "../v1/metadata/Metadata";
+
import type {
AggregationClause,
AggregationClauseDisplayInfo,
@@ -49,8 +52,6 @@ import type {
TableDisplayInfo,
TableMetadata,
} from "./types";
-import type Field from "./v1/metadata/Field";
-import type Metadata from "./v1/metadata/Metadata";
export function metadataProvider(
databaseId: DatabaseId | null,
diff --git a/frontend/src/metabase-lib/metadata.unit.spec.ts b/frontend/src/metabase-lib/query/metadata.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase-lib/metadata.unit.spec.ts
rename to frontend/src/metabase-lib/query/metadata.unit.spec.ts
diff --git a/frontend/src/metabase-lib/metrics.ts b/frontend/src/metabase-lib/query/metrics.ts
similarity index 100%
rename from frontend/src/metabase-lib/metrics.ts
rename to frontend/src/metabase-lib/query/metrics.ts
diff --git a/frontend/src/metabase-lib/native.ts b/frontend/src/metabase-lib/query/native.ts
similarity index 100%
rename from frontend/src/metabase-lib/native.ts
rename to frontend/src/metabase-lib/query/native.ts
diff --git a/frontend/src/metabase-lib/native.unit.spec.ts b/frontend/src/metabase-lib/query/native.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase-lib/native.unit.spec.ts
rename to frontend/src/metabase-lib/query/native.unit.spec.ts
diff --git a/frontend/src/metabase-lib/order_by.ts b/frontend/src/metabase-lib/query/order_by.ts
similarity index 100%
rename from frontend/src/metabase-lib/order_by.ts
rename to frontend/src/metabase-lib/query/order_by.ts
diff --git a/frontend/src/metabase-lib/order_by.unit.spec.ts b/frontend/src/metabase-lib/query/order_by.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase-lib/order_by.unit.spec.ts
rename to frontend/src/metabase-lib/query/order_by.unit.spec.ts
diff --git a/frontend/src/metabase-lib/query.ts b/frontend/src/metabase-lib/query/query.ts
similarity index 98%
rename from frontend/src/metabase-lib/query.ts
rename to frontend/src/metabase-lib/query/query.ts
index 6054bf9e209..fbcedce9f04 100644
--- a/frontend/src/metabase-lib/query.ts
+++ b/frontend/src/metabase-lib/query/query.ts
@@ -1,5 +1,5 @@
import * as ML from "cljs/metabase.lib.js";
-import { metadataProvider } from "metabase-lib/metadata";
+import { metadataProvider } from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
CardId,
diff --git a/frontend/src/metabase-lib/query.unit.spec.ts b/frontend/src/metabase-lib/query/query.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase-lib/query.unit.spec.ts
rename to frontend/src/metabase-lib/query/query.unit.spec.ts
diff --git a/frontend/src/metabase-lib/segments.ts b/frontend/src/metabase-lib/query/segments.ts
similarity index 100%
rename from frontend/src/metabase-lib/segments.ts
rename to frontend/src/metabase-lib/query/segments.ts
diff --git a/frontend/src/metabase-lib/temporal_bucket.ts b/frontend/src/metabase-lib/query/temporal_bucket.ts
similarity index 100%
rename from frontend/src/metabase-lib/temporal_bucket.ts
rename to frontend/src/metabase-lib/query/temporal_bucket.ts
diff --git a/frontend/src/metabase-lib/temporal_bucket.unit.spec.ts b/frontend/src/metabase-lib/query/temporal_bucket.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase-lib/temporal_bucket.unit.spec.ts
rename to frontend/src/metabase-lib/query/temporal_bucket.unit.spec.ts
diff --git a/frontend/src/metabase-lib/query/test-helpers.ts b/frontend/src/metabase-lib/query/test-helpers.ts
new file mode 100644
index 00000000000..b1097a5e430
--- /dev/null
+++ b/frontend/src/metabase-lib/query/test-helpers.ts
@@ -0,0 +1,185 @@
+/* istanbul ignore file */
+
+import { createMockMetadata } from "__support__/metadata";
+import * as Lib from "metabase-lib";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type {
+ DatabaseId,
+ DatasetColumn,
+ RowValue,
+ TestQuerySpec,
+} from "metabase-types/api";
+import {
+ ORDERS_ID,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
+
+const SAMPLE_DATABASE = createSampleDatabase();
+
+const SAMPLE_METADATA = createMockMetadata({ databases: [SAMPLE_DATABASE] });
+
+const SAMPLE_PROVIDER = createMetadataProvider();
+
+export { SAMPLE_DATABASE, SAMPLE_METADATA, SAMPLE_PROVIDER };
+
+type MetadataProviderOpts = {
+ databaseId?: DatabaseId;
+ metadata?: Metadata;
+};
+
+export function createMetadataProvider({
+ databaseId = SAMPLE_DATABASE.id,
+ metadata = SAMPLE_METADATA,
+}: MetadataProviderOpts = {}) {
+ return Lib.metadataProvider(databaseId, metadata);
+}
+
+export const DEFAULT_TEST_QUERY: TestQuerySpec = {
+ stages: [
+ {
+ source: { type: "table", id: ORDERS_ID },
+ },
+ ],
+};
+
+export const columnFinder =
+ (query: Lib.Query, columns: Lib.ColumnMetadata[]) =>
+ (
+ tableName: string | undefined | null,
+ columnName: string,
+ ): Lib.ColumnMetadata => {
+ const column = columns.find((column) => {
+ const displayInfo = Lib.displayInfo(query, 0, column);
+
+ // for non-table columns - aggregations, custom columns
+ if (!displayInfo.table || tableName == null) {
+ return displayInfo.name === columnName;
+ }
+
+ return (
+ displayInfo.table.name === tableName && displayInfo.name === columnName
+ );
+ });
+
+ if (!column) {
+ throw new Error(`Could not find ${tableName}.${columnName}`);
+ }
+
+ return column;
+ };
+
+export interface ExpressionClauseOpts {
+ name: string;
+ operator: Lib.ExpressionOperator;
+ args: (Lib.ExpressionArg | Lib.ExpressionClause)[];
+ options?: Lib.ExpressionOptions | null;
+}
+
+export const queryDrillThru = (
+ query: Lib.Query,
+ stageIndex: number,
+ clickObject: Lib.ClickObject,
+ drillType: Lib.DrillThruType,
+): Lib.DrillThru | null => {
+ const drills = Lib.availableDrillThrus(
+ query,
+ stageIndex,
+ undefined,
+ clickObject.column,
+ clickObject.value,
+ clickObject.data,
+ clickObject.dimensions,
+ );
+ const drill = drills.find((drill) => {
+ const drillInfo = Lib.displayInfo(query, stageIndex, drill);
+ return drillInfo.type === drillType;
+ });
+
+ return drill ?? null;
+};
+
+export const findDrillThru = (
+ query: Lib.Query,
+ stageIndex: number,
+ clickObject: Lib.ClickObject,
+ drillType: Lib.DrillThruType,
+) => {
+ const drill = queryDrillThru(query, stageIndex, clickObject, drillType);
+ if (!drill) {
+ throw new Error(`Could not find drill ${drillType}`);
+ }
+
+ const drillInfo = Lib.displayInfo(query, stageIndex, drill);
+ return { drill, drillInfo };
+};
+
+interface ColumnClickObjectOpts {
+ column: DatasetColumn;
+}
+
+export function createColumnClickObject({
+ column,
+}: ColumnClickObjectOpts): Lib.ClickObject {
+ return { column };
+}
+
+interface RawCellClickObjectOpts {
+ column: DatasetColumn;
+ value: RowValue;
+ data?: Lib.ClickObjectDataRow[];
+}
+
+export function createRawCellClickObject({
+ column,
+ value,
+ data = [{ col: column, value }],
+}: RawCellClickObjectOpts): Lib.ClickObject {
+ return { column, value, data };
+}
+
+interface AggregatedCellClickObjectOpts {
+ aggregation: Lib.ClickObjectDimension;
+ breakouts: Lib.ClickObjectDimension[];
+}
+
+export function createAggregatedCellClickObject({
+ aggregation,
+ breakouts,
+}: AggregatedCellClickObjectOpts): Lib.ClickObject {
+ const data = [...breakouts, aggregation].map(({ column, value }) => ({
+ key: column.name,
+ col: column,
+ value,
+ }));
+
+ return {
+ column: aggregation.column,
+ value: aggregation.value,
+ data,
+ dimensions: breakouts,
+ };
+}
+
+interface PivotCellClickObjectOpts {
+ aggregation: Lib.ClickObjectDimension;
+ breakouts: Lib.ClickObjectDimension[];
+}
+
+export function createPivotCellClickObject({
+ aggregation,
+ breakouts,
+}: PivotCellClickObjectOpts): Lib.ClickObject {
+ const data = [...breakouts, aggregation].map(({ column, value }) => ({
+ key: column.name,
+ col: column,
+ value,
+ }));
+
+ return { value: aggregation.value, data, dimensions: breakouts };
+}
+
+export function createLegendItemClickObject(
+ dimension: Lib.ClickObjectDimension,
+) {
+ return { dimensions: [dimension] };
+}
diff --git a/frontend/src/metabase-lib/types.ts b/frontend/src/metabase-lib/query/types.ts
similarity index 91%
rename from frontend/src/metabase-lib/types.ts
rename to frontend/src/metabase-lib/query/types.ts
index 063c1456c47..3347139291f 100644
--- a/frontend/src/metabase-lib/types.ts
+++ b/frontend/src/metabase-lib/query/types.ts
@@ -13,6 +13,23 @@ import type {
TemporalUnit,
} from "metabase-types/api";
+import type {
+ BooleanFilterOperator,
+ CoordinateFilterOperator,
+ DefaultFilterOperator,
+ ExcludeDateFilterOperator,
+ ExcludeDateFilterUnit,
+ FilterOperator,
+ NumberFilterOperator,
+ NumberFilterValue,
+ RelativeDateFilterOptions,
+ RelativeDateFilterUnit,
+ SpecificDateFilterOperator,
+ StringFilterOperator,
+ StringFilterOptions,
+ TimeFilterOperator,
+} from "../common";
+
import type { ColumnExtractionTag } from "./extractions";
/**
@@ -304,72 +321,10 @@ export type ExpressionOptions = {
mode?: DatetimeMode;
};
-export type FilterOperator =
- | StringFilterOperator
- | NumberFilterOperator
- | BooleanFilterOperator
- | SpecificDateFilterOperator
- | ExcludeDateFilterOperator
- | CoordinateFilterOperator;
+export type { FilterOperator };
export type FilterOperatorVariant = "default" | "number" | "temporal";
-export type StringFilterOperator =
- | "="
- | "!="
- | "contains"
- | "does-not-contain"
- | "is-empty"
- | "not-empty"
- | "starts-with"
- | "ends-with";
-
-export type NumberFilterOperator =
- | "="
- | "!="
- | ">"
- | "<"
- | "between"
- | ">="
- | "<="
- | "is-null"
- | "not-null";
-
-export type CoordinateFilterOperator =
- | "="
- | "!="
- | "inside"
- | ">"
- | "<"
- | "between"
- | ">="
- | "<=";
-
-export type BooleanFilterOperator = "=" | "is-null" | "not-null";
-
-export type SpecificDateFilterOperator = "=" | ">" | "<" | "between";
-
-export type ExcludeDateFilterOperator = "!=" | "is-null" | "not-null";
-
-export type TimeFilterOperator = ">" | "<" | "between" | "is-null" | "not-null";
-
-export type DefaultFilterOperator = "is-null" | "not-null";
-
-export type RelativeDateFilterUnit =
- | "minute"
- | "hour"
- | "day"
- | "week"
- | "month"
- | "quarter"
- | "year";
-
-export type ExcludeDateFilterUnit =
- | "hour-of-day"
- | "day-of-week"
- | "month-of-year"
- | "quarter-of-year";
-
export type DatetimeMode =
| "iso"
| "simple"
@@ -405,12 +360,6 @@ export type StringFilterParts = {
options: StringFilterOptions;
};
-export type StringFilterOptions = {
- caseSensitive?: boolean;
-};
-
-export type NumberFilterValue = number | bigint;
-
export type NumberFilterParts = {
operator: NumberFilterOperator;
column: ColumnMetadata;
@@ -446,10 +395,6 @@ export type RelativeDateFilterParts = {
options: RelativeDateFilterOptions;
};
-export type RelativeDateFilterOptions = {
- includeCurrent?: boolean;
-};
-
/*
* values depend on the bucket
* day-of-week => 1-7 (Monday-Sunday)
diff --git a/frontend/src/metabase-lib/test-helpers.ts b/frontend/src/metabase-lib/test-helpers.ts
index b1097a5e430..4d8b5cbde70 100644
--- a/frontend/src/metabase-lib/test-helpers.ts
+++ b/frontend/src/metabase-lib/test-helpers.ts
@@ -1,185 +1 @@
-/* istanbul ignore file */
-
-import { createMockMetadata } from "__support__/metadata";
-import * as Lib from "metabase-lib";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
-import type {
- DatabaseId,
- DatasetColumn,
- RowValue,
- TestQuerySpec,
-} from "metabase-types/api";
-import {
- ORDERS_ID,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-const SAMPLE_DATABASE = createSampleDatabase();
-
-const SAMPLE_METADATA = createMockMetadata({ databases: [SAMPLE_DATABASE] });
-
-const SAMPLE_PROVIDER = createMetadataProvider();
-
-export { SAMPLE_DATABASE, SAMPLE_METADATA, SAMPLE_PROVIDER };
-
-type MetadataProviderOpts = {
- databaseId?: DatabaseId;
- metadata?: Metadata;
-};
-
-export function createMetadataProvider({
- databaseId = SAMPLE_DATABASE.id,
- metadata = SAMPLE_METADATA,
-}: MetadataProviderOpts = {}) {
- return Lib.metadataProvider(databaseId, metadata);
-}
-
-export const DEFAULT_TEST_QUERY: TestQuerySpec = {
- stages: [
- {
- source: { type: "table", id: ORDERS_ID },
- },
- ],
-};
-
-export const columnFinder =
- (query: Lib.Query, columns: Lib.ColumnMetadata[]) =>
- (
- tableName: string | undefined | null,
- columnName: string,
- ): Lib.ColumnMetadata => {
- const column = columns.find((column) => {
- const displayInfo = Lib.displayInfo(query, 0, column);
-
- // for non-table columns - aggregations, custom columns
- if (!displayInfo.table || tableName == null) {
- return displayInfo.name === columnName;
- }
-
- return (
- displayInfo.table.name === tableName && displayInfo.name === columnName
- );
- });
-
- if (!column) {
- throw new Error(`Could not find ${tableName}.${columnName}`);
- }
-
- return column;
- };
-
-export interface ExpressionClauseOpts {
- name: string;
- operator: Lib.ExpressionOperator;
- args: (Lib.ExpressionArg | Lib.ExpressionClause)[];
- options?: Lib.ExpressionOptions | null;
-}
-
-export const queryDrillThru = (
- query: Lib.Query,
- stageIndex: number,
- clickObject: Lib.ClickObject,
- drillType: Lib.DrillThruType,
-): Lib.DrillThru | null => {
- const drills = Lib.availableDrillThrus(
- query,
- stageIndex,
- undefined,
- clickObject.column,
- clickObject.value,
- clickObject.data,
- clickObject.dimensions,
- );
- const drill = drills.find((drill) => {
- const drillInfo = Lib.displayInfo(query, stageIndex, drill);
- return drillInfo.type === drillType;
- });
-
- return drill ?? null;
-};
-
-export const findDrillThru = (
- query: Lib.Query,
- stageIndex: number,
- clickObject: Lib.ClickObject,
- drillType: Lib.DrillThruType,
-) => {
- const drill = queryDrillThru(query, stageIndex, clickObject, drillType);
- if (!drill) {
- throw new Error(`Could not find drill ${drillType}`);
- }
-
- const drillInfo = Lib.displayInfo(query, stageIndex, drill);
- return { drill, drillInfo };
-};
-
-interface ColumnClickObjectOpts {
- column: DatasetColumn;
-}
-
-export function createColumnClickObject({
- column,
-}: ColumnClickObjectOpts): Lib.ClickObject {
- return { column };
-}
-
-interface RawCellClickObjectOpts {
- column: DatasetColumn;
- value: RowValue;
- data?: Lib.ClickObjectDataRow[];
-}
-
-export function createRawCellClickObject({
- column,
- value,
- data = [{ col: column, value }],
-}: RawCellClickObjectOpts): Lib.ClickObject {
- return { column, value, data };
-}
-
-interface AggregatedCellClickObjectOpts {
- aggregation: Lib.ClickObjectDimension;
- breakouts: Lib.ClickObjectDimension[];
-}
-
-export function createAggregatedCellClickObject({
- aggregation,
- breakouts,
-}: AggregatedCellClickObjectOpts): Lib.ClickObject {
- const data = [...breakouts, aggregation].map(({ column, value }) => ({
- key: column.name,
- col: column,
- value,
- }));
-
- return {
- column: aggregation.column,
- value: aggregation.value,
- data,
- dimensions: breakouts,
- };
-}
-
-interface PivotCellClickObjectOpts {
- aggregation: Lib.ClickObjectDimension;
- breakouts: Lib.ClickObjectDimension[];
-}
-
-export function createPivotCellClickObject({
- aggregation,
- breakouts,
-}: PivotCellClickObjectOpts): Lib.ClickObject {
- const data = [...breakouts, aggregation].map(({ column, value }) => ({
- key: column.name,
- col: column,
- value,
- }));
-
- return { value: aggregation.value, data, dimensions: breakouts };
-}
-
-export function createLegendItemClickObject(
- dimension: Lib.ClickObjectDimension,
-) {
- return { dimensions: [dimension] };
-}
+export * from "./query/test-helpers";
diff --git a/frontend/src/metabase-lib/v1/Question.ts b/frontend/src/metabase-lib/v1/Question.ts
index 4fe2a3a9cf3..2086be1dec8 100644
--- a/frontend/src/metabase-lib/v1/Question.ts
+++ b/frontend/src/metabase-lib/v1/Question.ts
@@ -52,7 +52,7 @@ import type {
} from "metabase-types/api";
import { isDimensionTarget } from "metabase-types/guards";
-import type { Query } from "../types";
+import type { Query } from "../query/types";
export type QuestionCreatorOpts = {
cardType?: CardType;
diff --git a/frontend/src/metabase-lib/v1/metadata/Metadata.ts b/frontend/src/metabase-lib/v1/metadata/Metadata.ts
index b28c7d86f64..554ea9c0270 100644
--- a/frontend/src/metabase-lib/v1/metadata/Metadata.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Metadata.ts
@@ -6,6 +6,7 @@ import type {
FieldId,
FieldReference,
MeasureId,
+ MetricId,
NativeQuerySnippet,
SchemaId,
SegmentId,
@@ -19,6 +20,7 @@ import type Question from "../Question";
import type Database from "./Database";
import type Field from "./Field";
import type Measure from "./Measure";
+import type Metric from "./Metric";
import type Schema from "./Schema";
import type Segment from "./Segment";
import type Table from "./Table";
@@ -49,6 +51,7 @@ class Metadata {
fields: Record<string, Field> = {};
segments: Record<string, Segment> = {};
measures: Record<string, Measure> = {};
+ metrics: Record<string, Metric> = {};
questions: Record<string, Question> = {};
snippets: Record<string, NativeQuerySnippet> = {};
settings?: Settings;
@@ -110,6 +113,20 @@ class Metadata {
return (measureId != null && this.measures[measureId]) || null;
}
+ /**
+ * @deprecated load data via RTK Query - useListMetricsQuery
+ */
+ metricsList(): Metric[] {
+ return Object.values(this.metrics);
+ }
+
+ /**
+ * @deprecated load data via RTK Query - useGetMetricQuery
+ */
+ metric(metricId: MetricId | undefined | null): Metric | null {
+ return (metricId != null && this.metrics[metricId]) || null;
+ }
+
/**
* @deprecated load data via RTK Query - useGetDatabaseQuery
*/
diff --git a/frontend/src/metabase-lib/v1/metadata/Metric.ts b/frontend/src/metabase-lib/v1/metadata/Metric.ts
new file mode 100644
index 00000000000..9a304be76f5
--- /dev/null
+++ b/frontend/src/metabase-lib/v1/metadata/Metric.ts
@@ -0,0 +1,30 @@
+import type { NormalizedMetric } from "metabase-types/api";
+
+import type Metadata from "./Metadata";
+
+interface Metric extends Omit<NormalizedMetric, "collection"> {
+ metadata?: Metadata;
+}
+
+/**
+ * @deprecated use RTK Query endpoints and plain api objects from metabase-types/api
+ */
+class Metric {
+ private readonly _plainObject: NormalizedMetric;
+
+ constructor(metric: NormalizedMetric) {
+ this._plainObject = metric;
+ Object.assign(this, metric);
+ }
+
+ getPlainObject() {
+ return this._plainObject;
+ }
+
+ displayName() {
+ return this.name;
+ }
+}
+
+// eslint-disable-next-line import/no-default-export -- deprecated usage
+export default Metric;
diff --git a/frontend/src/metabase-lib/viz/index.ts b/frontend/src/metabase-lib/viz/index.ts
deleted file mode 100644
index b0d017bf195..00000000000
--- a/frontend/src/metabase-lib/viz/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./display";
diff --git a/frontend/src/metabase-types/analytics/search.ts b/frontend/src/metabase-types/analytics/search.ts
index e5f233d3413..b433eff5e1b 100644
--- a/frontend/src/metabase-types/analytics/search.ts
+++ b/frontend/src/metabase-types/analytics/search.ts
@@ -34,6 +34,7 @@ type SearchContentType =
| "card"
| "dataset"
| "segment"
+ | "measure"
| "metric"
| "collection"
| "database"
diff --git a/frontend/src/metabase-types/api/index.ts b/frontend/src/metabase-types/api/index.ts
index 8b06966bcae..f87694f7863 100644
--- a/frontend/src/metabase-types/api/index.ts
+++ b/frontend/src/metabase-types/api/index.ts
@@ -22,6 +22,7 @@ export * from "./document";
export * from "./email";
export * from "./entity-id";
export * from "./field";
+export * from "./metric";
export * from "./geojson";
export * from "./group";
export * from "./insight";
diff --git a/frontend/src/metabase-types/api/measure.ts b/frontend/src/metabase-types/api/measure.ts
index af83181c94b..a955667916a 100644
--- a/frontend/src/metabase-types/api/measure.ts
+++ b/frontend/src/metabase-types/api/measure.ts
@@ -1,8 +1,38 @@
+import type { FieldValue } from "./field";
import type { DatasetQuery, OpaqueDatasetQuery } from "./query";
import type { Table, TableId } from "./table";
import type { UserInfo } from "./user";
export type MeasureId = number;
+export type DimensionId = string;
+
+export type MetricDimensionGroup = {
+ id: string;
+ type: "main" | "connection";
+ display_name: string;
+};
+
+export type MetricDimensionSource = {
+ type: string;
+ "field-id": number;
+};
+
+export type MetricDimension = {
+ id: DimensionId;
+ display_name: string;
+ effective_type: string;
+ semantic_type: string | null;
+ group?: MetricDimensionGroup;
+ sources?: MetricDimensionSource[];
+};
+
+export type DimensionMappingTarget = ["field", Record<string, unknown>, number];
+
+export type DimensionMapping = {
+ dimension_id: DimensionId;
+ table_id: number;
+ target: DimensionMappingTarget;
+};
export interface Measure {
id: MeasureId;
@@ -18,6 +48,9 @@ export interface Measure {
creator_id: number;
creator?: UserInfo;
updated_at: string;
+ result_column_name?: string;
+ dimensions?: MetricDimension[];
+ dimension_mappings?: DimensionMapping[];
}
export interface CreateMeasureRequest {
@@ -35,3 +68,26 @@ export interface UpdateMeasureRequest {
archived?: boolean;
description?: string;
}
+
+export type GetMeasureDimensionValuesRequest = {
+ measureId: MeasureId;
+ dimensionId: DimensionId;
+};
+
+export type GetMeasureDimensionValuesResponse = {
+ values: FieldValue[];
+ has_more_values: boolean;
+};
+
+export type SearchMeasureDimensionValuesRequest = {
+ measureId: MeasureId;
+ dimensionId: DimensionId;
+ query: string;
+ limit: number;
+};
+
+export type GetRemappedMeasureDimensionValueRequest = {
+ measureId: MeasureId;
+ dimensionId: DimensionId;
+ value: string;
+};
diff --git a/frontend/src/metabase-types/api/metric.ts b/frontend/src/metabase-types/api/metric.ts
new file mode 100644
index 00000000000..43f90863585
--- /dev/null
+++ b/frontend/src/metabase-types/api/metric.ts
@@ -0,0 +1,81 @@
+import type { Collection, CollectionId } from "./collection";
+import type { DatasetColumn, RowValue } from "./dataset";
+import type { FieldValue } from "./field";
+import type { DimensionId, DimensionMapping, MetricDimension } from "./measure";
+
+export type {
+ DimensionMapping,
+ MetricDimension,
+ MetricDimensionGroup,
+ MetricDimensionSource,
+} from "./measure";
+
+export type MetricId = number;
+
+export type Metric = {
+ id: MetricId;
+ name: string;
+ description: string | null;
+ dimensions: MetricDimension[];
+ dimension_mappings?: DimensionMapping[];
+ collection_id: CollectionId | null;
+ collection: Collection | null;
+ result_column_name?: string;
+};
+
+export type ExpressionRef =
+ | ["metric", { "lib/uuid": string }, number]
+ | ["measure", { "lib/uuid": string }, number];
+
+export type InstanceFilter = {
+ "lib/uuid": string;
+ filter: unknown;
+};
+
+export type TypedProjection = {
+ type: "metric" | "measure";
+ id: number;
+ projection: unknown[];
+};
+
+export type JsMetricDefinition = {
+ expression: ExpressionRef | unknown[];
+ filters?: InstanceFilter[];
+ projections?: TypedProjection[];
+};
+
+export type MetricDatasetRequest = {
+ definition: JsMetricDefinition;
+};
+
+export type GetMetricDimensionValuesRequest = {
+ metricId: MetricId;
+ dimensionId: DimensionId;
+};
+
+export type GetMetricDimensionValuesResponse = {
+ values: FieldValue[];
+ has_more_values: boolean;
+};
+
+export type SearchMetricDimensionValuesRequest = {
+ metricId: MetricId;
+ dimensionId: DimensionId;
+ query: string;
+ limit: number;
+};
+
+export type MetricBreakoutValuesRequest = {
+ definition: JsMetricDefinition;
+};
+
+export type MetricBreakoutValuesResponse = {
+ values: RowValue[];
+ col: DatasetColumn;
+};
+
+export type GetRemappedMetricDimensionValueRequest = {
+ metricId: MetricId;
+ dimensionId: DimensionId;
+ value: string;
+};
diff --git a/frontend/src/metabase-types/api/mocks/index.ts b/frontend/src/metabase-types/api/mocks/index.ts
index e9691cbfbc7..24eecc0b710 100644
--- a/frontend/src/metabase-types/api/mocks/index.ts
+++ b/frontend/src/metabase-types/api/mocks/index.ts
@@ -17,6 +17,7 @@ export * from "./group";
export * from "./insight";
export * from "./logger";
export * from "./measure";
+export * from "./metric";
export * from "./metabot";
export * from "./modelIndexes";
export * from "./models";
diff --git a/frontend/src/metabase-types/api/mocks/measure.ts b/frontend/src/metabase-types/api/mocks/measure.ts
index be1bafdc4db..f708777d8a9 100644
--- a/frontend/src/metabase-types/api/mocks/measure.ts
+++ b/frontend/src/metabase-types/api/mocks/measure.ts
@@ -16,5 +16,7 @@ export const createMockMeasure = (opts?: Partial<Measure>): Measure => ({
created_at: "2021-01-01T00:00:00Z",
updated_at: "2021-01-01T00:00:00Z",
creator_id: 1,
+ dimensions: [],
+ dimension_mappings: [],
...opts,
});
diff --git a/frontend/src/metabase-types/api/mocks/metric.ts b/frontend/src/metabase-types/api/mocks/metric.ts
new file mode 100644
index 00000000000..5eb2dbe98d9
--- /dev/null
+++ b/frontend/src/metabase-types/api/mocks/metric.ts
@@ -0,0 +1,36 @@
+import type {
+ Metric,
+ MetricDimension,
+ NormalizedMetric,
+} from "metabase-types/api";
+
+export const createMockMetricDimension = (
+ opts?: Partial<MetricDimension>,
+): MetricDimension => ({
+ id: "1",
+ display_name: "Dimension",
+ effective_type: "type/Text",
+ semantic_type: null,
+ ...opts,
+});
+
+export const createMockMetric = (opts?: Partial<Metric>): Metric => ({
+ id: 1,
+ name: "Metric",
+ description: null,
+ dimensions: [createMockMetricDimension()],
+ collection_id: null,
+ collection: null,
+ ...opts,
+});
+
+export const createMockNormalizedMetric = (
+ opts?: Partial<NormalizedMetric>,
+): NormalizedMetric => ({
+ id: 1,
+ name: "Metric",
+ description: null,
+ dimensions: [createMockMetricDimension()],
+ collection_id: null,
+ ...opts,
+});
diff --git a/frontend/src/metabase-types/api/schema.ts b/frontend/src/metabase-types/api/schema.ts
index a6b12a0ae04..da44e1e2079 100644
--- a/frontend/src/metabase-types/api/schema.ts
+++ b/frontend/src/metabase-types/api/schema.ts
@@ -7,6 +7,7 @@ import type { Document } from "./document";
import type { Field, FieldDimension, FieldId } from "./field";
import type { Group } from "./group";
import type { Measure, MeasureId } from "./measure";
+import type { Metric } from "./metric";
import type { Segment, SegmentId } from "./segment";
import type { NativeQuerySnippet } from "./snippets";
import type {
@@ -81,6 +82,10 @@ export interface NormalizedMeasure extends Omit<Measure, "table"> {
table?: TableId;
}
+export interface NormalizedMetric extends Omit<Metric, "collection"> {
+ collection?: CollectionId;
+}
+
export interface NormalizedTimeline
extends Omit<Timeline, "collection" | "events"> {
collection?: CollectionId;
diff --git a/frontend/src/metabase-types/api/search.ts b/frontend/src/metabase-types/api/search.ts
index 0dd4363c765..328989f33ac 100644
--- a/frontend/src/metabase-types/api/search.ts
+++ b/frontend/src/metabase-types/api/search.ts
@@ -10,6 +10,7 @@ import type {
import type { Dashboard, DashboardId } from "./dashboard";
import type { DatabaseId, InitialSyncStatus } from "./database";
import type { Field } from "./field";
+import type { MeasureId } from "./measure";
import type { ModerationReviewStatus } from "./moderation";
import type { PaginationRequest, PaginationResponse } from "./pagination";
import type { FieldReference } from "./query";
@@ -22,6 +23,7 @@ const ENABLED_SEARCH_MODELS = [
"card",
"dataset",
"metric",
+ "measure",
"database",
"table",
"action",
@@ -68,7 +70,8 @@ export type SearchResultId =
| CardId
| DatabaseId
| TableId
- | DashboardId;
+ | DashboardId
+ | MeasureId;
export interface SearchResult<
Id extends SearchResultId = SearchResultId,
diff --git a/frontend/src/metabase-types/api/visualization.ts b/frontend/src/metabase-types/api/visualization.ts
index 4820f0d43d9..a9da2775190 100644
--- a/frontend/src/metabase-types/api/visualization.ts
+++ b/frontend/src/metabase-types/api/visualization.ts
@@ -45,3 +45,8 @@ export const isCardDisplayType = (value: unknown): value is CardDisplayType =>
export type CardDisplayType = (typeof cardDisplayTypes)[number];
export type VisualizationDisplay = VirtualCardDisplay | CardDisplayType;
+
+export type TimeseriesDisplayType = Extract<
+ CardDisplayType,
+ "line" | "area" | "bar"
+>;
diff --git a/frontend/src/metabase-types/store/entities.ts b/frontend/src/metabase-types/store/entities.ts
index 63492ad2aa5..9f19fe6edfa 100644
--- a/frontend/src/metabase-types/store/entities.ts
+++ b/frontend/src/metabase-types/store/entities.ts
@@ -8,6 +8,7 @@ import type {
NormalizedGroup,
NormalizedIndexedEntity,
NormalizedMeasure,
+ NormalizedMetric,
NormalizedNativeQuerySnippet,
NormalizedSchema,
NormalizedSegment,
@@ -26,6 +27,7 @@ export interface EntitiesState {
fields: Record<string, NormalizedField>;
segments: Record<string, NormalizedSegment>;
measures: Record<string, NormalizedMeasure>;
+ metrics: Record<string, NormalizedMetric>;
indexedEntities: Record<string, NormalizedIndexedEntity>;
snippets: Record<string, NormalizedNativeQuerySnippet>;
questions: Record<string, NormalizedCard>;
diff --git a/frontend/src/metabase-types/store/mocks/entities.ts b/frontend/src/metabase-types/store/mocks/entities.ts
index c8bb5472cd1..35861be0379 100644
--- a/frontend/src/metabase-types/store/mocks/entities.ts
+++ b/frontend/src/metabase-types/store/mocks/entities.ts
@@ -13,6 +13,7 @@ export const createMockNormalizedEntitiesState = (): EntitiesState => ({
fields: {},
segments: {},
measures: {},
+ metrics: {},
snippets: {},
questions: {},
indexedEntities: {},
diff --git a/frontend/src/metabase/api/card.ts b/frontend/src/metabase/api/card.ts
index cf814642a42..bad46cb7df3 100644
--- a/frontend/src/metabase/api/card.ts
+++ b/frontend/src/metabase/api/card.ts
@@ -335,6 +335,7 @@ export const {
useLazyGetCardQuery,
useGetCardQueryMetadataQuery,
useGetCardQueryQuery,
+ useLazyGetCardQueryQuery,
useGetRemappedCardParameterValueQuery,
useCreateCardMutation,
useUpdateCardMutation,
diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.ts
index d6b9cb6b120..0364048b078 100644
--- a/frontend/src/metabase/api/index.ts
+++ b/frontend/src/metabase/api/index.ts
@@ -23,6 +23,7 @@ export * from "./ldap";
export * from "./llm";
export * from "./login-history";
export * from "./measure";
+export * from "./metric";
export * from "./model-index";
export * from "./moderation";
export * from "./notification";
diff --git a/frontend/src/metabase/api/measure.ts b/frontend/src/metabase/api/measure.ts
index b19ad89d196..113834511e9 100644
--- a/frontend/src/metabase/api/measure.ts
+++ b/frontend/src/metabase/api/measure.ts
@@ -2,8 +2,13 @@ import { updateMetadata } from "metabase/lib/redux/metadata";
import { MeasureSchema } from "metabase/schema";
import type {
CreateMeasureRequest,
+ FieldValue,
+ GetMeasureDimensionValuesRequest,
+ GetMeasureDimensionValuesResponse,
+ GetRemappedMeasureDimensionValueRequest,
Measure,
MeasureId,
+ SearchMeasureDimensionValuesRequest,
UpdateMeasureRequest,
} from "metabase-types/api";
@@ -12,6 +17,7 @@ import {
idTag,
invalidateTags,
listTag,
+ provideMeasureDimensionValuesTags,
provideMeasureListTags,
provideMeasureTags,
tag,
@@ -42,6 +48,41 @@ export const measureApi = Api.injectEndpoints({
dispatch(updateMetadata(data, MeasureSchema)),
),
}),
+ getMeasureDimensionValues: builder.query<
+ GetMeasureDimensionValuesResponse,
+ GetMeasureDimensionValuesRequest
+ >({
+ query: ({ measureId, dimensionId }) => ({
+ method: "GET",
+ url: `/api/measure/${measureId}/dimension/${encodeURIComponent(dimensionId)}/values`,
+ }),
+ providesTags: (_, error, { measureId }) =>
+ provideMeasureDimensionValuesTags(measureId),
+ }),
+ searchMeasureDimensionValues: builder.query<
+ FieldValue[],
+ SearchMeasureDimensionValuesRequest
+ >({
+ query: ({ measureId, dimensionId, ...params }) => ({
+ method: "GET",
+ url: `/api/measure/${measureId}/dimension/${encodeURIComponent(dimensionId)}/search`,
+ params,
+ }),
+ providesTags: (_, error, { measureId }) =>
+ provideMeasureDimensionValuesTags(measureId),
+ }),
+ getRemappedMeasureDimensionValue: builder.query<
+ FieldValue,
+ GetRemappedMeasureDimensionValueRequest
+ >({
+ query: ({ measureId, dimensionId, value }) => ({
+ method: "GET",
+ url: `/api/measure/${measureId}/dimension/${encodeURIComponent(dimensionId)}/remapping`,
+ params: { value },
+ }),
+ providesTags: (_, error, { measureId }) =>
+ provideMeasureDimensionValuesTags(measureId),
+ }),
createMeasure: builder.mutation<Measure, CreateMeasureRequest>({
query: (body) => ({
method: "POST",
@@ -70,6 +111,10 @@ export const measureApi = Api.injectEndpoints({
export const {
useListMeasuresQuery,
useGetMeasureQuery,
+ useLazyGetMeasureQuery,
+ useGetMeasureDimensionValuesQuery,
+ useSearchMeasureDimensionValuesQuery,
+ useGetRemappedMeasureDimensionValueQuery,
useCreateMeasureMutation,
useUpdateMeasureMutation,
} = measureApi;
diff --git a/frontend/src/metabase/api/metric.ts b/frontend/src/metabase/api/metric.ts
new file mode 100644
index 00000000000..0359846bdfc
--- /dev/null
+++ b/frontend/src/metabase/api/metric.ts
@@ -0,0 +1,115 @@
+import { updateMetadata } from "metabase/lib/redux/metadata";
+import { MetricSchema } from "metabase/schema";
+import type {
+ Dataset,
+ FieldValue,
+ GetMetricDimensionValuesRequest,
+ GetMetricDimensionValuesResponse,
+ GetRemappedMetricDimensionValueRequest,
+ Metric,
+ MetricBreakoutValuesRequest,
+ MetricBreakoutValuesResponse,
+ MetricDatasetRequest,
+ MetricId,
+ SearchMetricDimensionValuesRequest,
+} from "metabase-types/api";
+
+import { Api } from "./api";
+import {
+ provideMetricDimensionValuesTags,
+ provideMetricListTags,
+ provideMetricTags,
+} from "./tags/utils";
+import { handleQueryFulfilled } from "./utils/lifecycle";
+
+export const metricApi = Api.injectEndpoints({
+ endpoints: (builder) => ({
+ listMetrics: builder.query<Metric[], void>({
+ query: () => ({
+ method: "GET",
+ url: "/api/metric",
+ }),
+ providesTags: (metrics = []) => provideMetricListTags(metrics),
+ onQueryStarted: (_, { queryFulfilled, dispatch }) =>
+ handleQueryFulfilled(queryFulfilled, (data) =>
+ dispatch(updateMetadata(data, [MetricSchema])),
+ ),
+ }),
+ getMetric: builder.query<Metric, MetricId>({
+ query: (id) => ({
+ method: "GET",
+ url: `/api/metric/${id}`,
+ }),
+ providesTags: (metric) => (metric ? provideMetricTags(metric) : []),
+ onQueryStarted: (_, { queryFulfilled, dispatch }) =>
+ handleQueryFulfilled(queryFulfilled, (data) =>
+ dispatch(updateMetadata(data, MetricSchema)),
+ ),
+ }),
+ getMetricDimensionValues: builder.query<
+ GetMetricDimensionValuesResponse,
+ GetMetricDimensionValuesRequest
+ >({
+ query: ({ metricId, dimensionId }) => ({
+ method: "GET",
+ url: `/api/metric/${metricId}/dimension/${encodeURIComponent(dimensionId)}/values`,
+ }),
+ providesTags: (_, error, { metricId }) =>
+ provideMetricDimensionValuesTags(metricId),
+ }),
+ searchMetricDimensionValues: builder.query<
+ FieldValue[],
+ SearchMetricDimensionValuesRequest
+ >({
+ query: ({ metricId, dimensionId, ...params }) => ({
+ method: "GET",
+ url: `/api/metric/${metricId}/dimension/${encodeURIComponent(dimensionId)}/search`,
+ params,
+ }),
+ providesTags: (_, error, { metricId }) =>
+ provideMetricDimensionValuesTags(metricId),
+ }),
+ getRemappedMetricDimensionValue: builder.query<
+ FieldValue,
+ GetRemappedMetricDimensionValueRequest
+ >({
+ query: ({ metricId, dimensionId, value }) => ({
+ method: "GET",
+ url: `/api/metric/${metricId}/dimension/${encodeURIComponent(dimensionId)}/remapping`,
+ params: { value },
+ }),
+ providesTags: (_, error, { metricId }) =>
+ provideMetricDimensionValuesTags(metricId),
+ }),
+ getMetricBreakoutValues: builder.query<
+ MetricBreakoutValuesResponse,
+ MetricBreakoutValuesRequest
+ >({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/metric/breakout-values",
+ body,
+ }),
+ keepUnusedDataFor: 30 * 60,
+ }),
+ getMetricDataset: builder.query<Dataset, MetricDatasetRequest>({
+ query: (body) => ({
+ method: "POST",
+ url: "/api/metric/dataset",
+ body,
+ }),
+ keepUnusedDataFor: 30 * 60,
+ }),
+ }),
+});
+
+export const {
+ useListMetricsQuery,
+ useGetMetricQuery,
+ useLazyGetMetricQuery,
+ useGetMetricDimensionValuesQuery,
+ useSearchMetricDimensionValuesQuery,
+ useGetRemappedMetricDimensionValueQuery,
+ useGetMetricBreakoutValuesQuery,
+ useGetMetricDatasetQuery,
+} = metricApi;
diff --git a/frontend/src/metabase/api/tags/utils.ts b/frontend/src/metabase/api/tags/utils.ts
index ec932038ff7..7db5c53a2d0 100644
--- a/frontend/src/metabase/api/tags/utils.ts
+++ b/frontend/src/metabase/api/tags/utils.ts
@@ -30,6 +30,9 @@ import type {
InspectorLens,
LoggerPreset,
Measure,
+ MeasureId,
+ Metric,
+ MetricId,
ModelCacheRefreshStatus,
ModelIndex,
NativeQuerySnippet,
@@ -571,6 +574,31 @@ export function provideMeasureTags(
];
}
+export function provideMeasureDimensionValuesTags(
+ measureId: MeasureId,
+): TagDescription<TagType>[] {
+ return [idTag("measure", measureId)];
+}
+
+export function provideMetricListTags(
+ metrics: Metric[],
+): TagDescription<TagType>[] {
+ return [listTag("card"), ...metrics.flatMap(provideMetricTags)];
+}
+
+export function provideMetricTags(metric: Metric): TagDescription<TagType>[] {
+ return [
+ idTag("card", metric.id),
+ ...(metric.collection ? provideCollectionTags(metric.collection) : []),
+ ];
+}
+
+export function provideMetricDimensionValuesTags(
+ metricId: MetricId,
+): TagDescription<TagType>[] {
+ return [idTag("card", metricId)];
+}
+
export function provideSnippetListTags(
snippets: NativeQuerySnippet[],
): TagDescription<TagType>[] {
diff --git a/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx b/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx
index e1caf053ec4..7c11741e29b 100644
--- a/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx
@@ -75,21 +75,23 @@ describe("BrowseMetrics (OSS)", () => {
).toHaveLength(3);
});
- it("should render links that point directly to /metric/{id}-{slug} (metabase#55166)", async () => {
+ it("should render links that point directly to metrics viewer /explore route (metabase#55166)", async () => {
const { history } = setup({ metricCount: 5 });
const table = await screen.findByRole("table", {
name: /Table of metrics/,
});
expect(
within(table).getByRole("link", { name: /Metric 1/ }),
- ).toHaveAttribute("href", "/metric/1-metric-1");
+ ).toHaveAttribute("href", "/explore?metricId=1");
expect(
within(table).getByRole("link", { name: /Metric 2/ }),
- ).toHaveAttribute("href", "/metric/2-metric-2");
+ ).toHaveAttribute("href", "/explore?metricId=2");
expect(screen.queryByTestId("metric-detail-page")).not.toBeInTheDocument();
await userEvent.click(within(table).getByText("Metric 1"));
expect(screen.getByTestId("metric-detail-page")).toBeInTheDocument();
- expect(history?.getCurrentLocation().pathname).toBe("/metric/1-metric-1");
+ const location = history?.getCurrentLocation();
+ expect(location?.pathname).toBe("/explore");
+ expect(location?.query).toEqual({ metricId: "1" });
});
});
diff --git a/frontend/src/metabase/browse/metrics/tests/setup.tsx b/frontend/src/metabase/browse/metrics/tests/setup.tsx
index 373a17ded86..e38c094db86 100644
--- a/frontend/src/metabase/browse/metrics/tests/setup.tsx
+++ b/frontend/src/metabase/browse/metrics/tests/setup.tsx
@@ -266,7 +266,7 @@ export function setup({
<>
<Route path="/" component={() => <BrowseMetrics />} />
<Route
- path="/metric/:slug"
+ path="/explore"
component={() => <div data-testid="metric-detail-page" />}
/>
</>,
diff --git a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.module.css b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.module.css
new file mode 100644
index 00000000000..b4072002fe4
--- /dev/null
+++ b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.module.css
@@ -0,0 +1,46 @@
+.triggerButton {
+ border-radius: 0;
+ visibility: hidden;
+ color: var(--mb-color-text-tertiary-inverse);
+ border-left: 2px solid var(--mb-color-border-subtle);
+}
+
+*:hover > .triggerButton {
+ visibility: visible;
+}
+
+.triggerButtonLabel {
+ display: flex;
+ gap: 0.5rem;
+}
+
+.chevronIcon {
+ color: var(--mb-color-text-primary-inverse);
+ flex: 0 0 auto;
+}
+
+.chevronDown {
+ flex: 0 0 auto;
+ width: 8px;
+ margin-left: 0.25em;
+ color: currentColor;
+ opacity: 0.75;
+}
+
+.selectListItem {
+ padding: 0.5rem 1rem;
+ font-weight: 400;
+}
+
+.selectListItem.selectListItem[aria-selected="true"],
+.selectListItem.selectListItem:hover {
+ background-color: var(--bucket-picker-active-color, var(--mb-color-brand));
+}
+
+.moreButton {
+ transition: none !important;
+}
+
+.moreButton:hover {
+ background-color: var(--mb-color-background-hover);
+}
diff --git a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx
new file mode 100644
index 00000000000..5a9dffea28f
--- /dev/null
+++ b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx
@@ -0,0 +1,172 @@
+import cx from "classnames";
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import { SelectList } from "metabase/common/components/SelectList";
+import type { ColorName } from "metabase/lib/colors/types";
+import { Button, Icon, Popover } from "metabase/ui";
+import { color } from "metabase/ui/utils/colors";
+
+import S from "./BucketPickerPopover.module.css";
+
+export type BucketItem = {
+ displayName: string;
+ isDefault?: boolean;
+ isSelected?: boolean;
+};
+
+export interface BucketPickerPopoverProps {
+ triggerLabel: string;
+ ariaLabel?: string;
+ items: BucketItem[];
+ onSelect: (item: BucketItem) => void;
+ initiallyVisibleItemsCount?: number;
+ color?: ColorName;
+ hasChevronDown?: boolean;
+ className?: string;
+ classNames?: { root?: string; chevronDown?: string };
+}
+
+export function BucketPickerPopover({
+ triggerLabel,
+ ariaLabel,
+ items,
+ onSelect,
+ initiallyVisibleItemsCount,
+ color: colorProp = "brand",
+ hasChevronDown,
+ className,
+ classNames = {},
+}: BucketPickerPopoverProps) {
+ const [isOpened, setIsOpened] = useState(false);
+
+ const canExpand =
+ initiallyVisibleItemsCount != null &&
+ items.length > initiallyVisibleItemsCount;
+
+ const shouldBeExpanded = useMemo(
+ () => shouldAutoExpand(items, canExpand, initiallyVisibleItemsCount),
+ [items, canExpand, initiallyVisibleItemsCount],
+ );
+
+ const [isExpanded, setIsExpanded] = useState(shouldBeExpanded);
+
+ const handleExpand = useCallback((event: React.MouseEvent) => {
+ event.stopPropagation();
+ setIsExpanded(true);
+ }, []);
+
+ const handleClose = useCallback(() => {
+ setIsExpanded(shouldBeExpanded);
+ setIsOpened(false);
+ }, [shouldBeExpanded]);
+
+ const hasMoreButton = canExpand && !isExpanded;
+ const visibleItems = hasMoreButton
+ ? items.slice(0, initiallyVisibleItemsCount)
+ : items;
+
+ const activeColor = color(colorProp);
+
+ return (
+ <Popover
+ opened={isOpened}
+ position="right"
+ onClose={handleClose}
+ withinPortal={false}
+ onChange={(opened) => !opened && handleClose()}
+ floatingStrategy="fixed"
+ >
+ <Popover.Target>
+ <Button
+ className={cx(S.triggerButton, classNames.root, className)}
+ data-bucket-trigger
+ aria-label={ariaLabel ?? triggerLabel}
+ data-testid="dimension-list-item-binning"
+ onClick={(event) => {
+ event.stopPropagation();
+ setIsOpened(!isOpened);
+ }}
+ px="sm"
+ miw="35%"
+ maw="50%"
+ h="auto"
+ py={0}
+ variant="subtle"
+ color="white"
+ classNames={{ label: S.triggerButtonLabel }}
+ >
+ <Ellipsified>{triggerLabel}</Ellipsified>
+ {!hasChevronDown && (
+ <Icon name="chevronright" className={S.chevronIcon} />
+ )}
+ {hasChevronDown && (
+ <Icon
+ name="chevrondown"
+ className={cx(S.chevronDown, classNames.chevronDown)}
+ />
+ )}
+ </Button>
+ </Popover.Target>
+ <Popover.Dropdown>
+ <SelectList
+ p="sm"
+ miw="10rem"
+ style={
+ {
+ "--bucket-picker-active-color": activeColor,
+ } as React.CSSProperties
+ }
+ >
+ {visibleItems.map((item) => (
+ <SelectList.Item
+ className={S.selectListItem}
+ id={item.displayName}
+ key={item.displayName}
+ name={item.displayName}
+ isSelected={item.isSelected}
+ onSelect={(_id, event) => {
+ event.stopPropagation();
+ onSelect(item);
+ handleClose();
+ }}
+ />
+ ))}
+ {hasMoreButton && (
+ <Button
+ className={S.moreButton}
+ onClick={handleExpand}
+ variant="subtle"
+ color="brand"
+ fullWidth
+ px="md"
+ py="sm"
+ styles={{
+ inner: { display: "flex", justifyContent: "flex-start" },
+ }}
+ >{t`More…`}</Button>
+ )}
+ </SelectList>
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
+
+function shouldAutoExpand(
+ items: BucketItem[],
+ canExpand: boolean,
+ initiallyVisibleItemsCount?: number,
+): boolean {
+ if (!canExpand || initiallyVisibleItemsCount == null) {
+ return false;
+ }
+
+ // only expand when a selected item in the hidden range is a "real" option,
+ // not the trailing unbucketed/"Don't bin" option (always last)
+ const selectedIndex = items.findIndex((item) => item.isSelected);
+ return (
+ selectedIndex >= initiallyVisibleItemsCount &&
+ selectedIndex < items.length - 1
+ );
+}
diff --git a/frontend/src/metabase/common/components/BucketPickerPopover/index.ts b/frontend/src/metabase/common/components/BucketPickerPopover/index.ts
new file mode 100644
index 00000000000..c877eb30120
--- /dev/null
+++ b/frontend/src/metabase/common/components/BucketPickerPopover/index.ts
@@ -0,0 +1,5 @@
+export { BucketPickerPopover } from "./BucketPickerPopover";
+export type {
+ BucketItem,
+ BucketPickerPopoverProps,
+} from "./BucketPickerPopover";
diff --git a/frontend/src/metabase/common/components/DimensionPill/DimensionPill.module.css b/frontend/src/metabase/common/components/DimensionPill/DimensionPill.module.css
new file mode 100644
index 00000000000..e7269770cd9
--- /dev/null
+++ b/frontend/src/metabase/common/components/DimensionPill/DimensionPill.module.css
@@ -0,0 +1,23 @@
+.pill {
+ background-color: var(--mb-color-background-primary);
+ border: 1px solid var(--mb-color-border);
+ border-radius: var(--border-radius-xl);
+ padding: 0.25rem 0.5rem;
+ user-select: none;
+
+ &.interactive {
+ cursor: pointer;
+
+ &:hover {
+ background-color: var(--mb-color-background-hover);
+ }
+ }
+}
+
+.dropdown {
+ overflow-y: auto;
+}
+
+.dimensionList {
+ color: var(--mb-color-brand);
+}
diff --git a/frontend/src/metabase/common/components/DimensionPill/DimensionPill.tsx b/frontend/src/metabase/common/components/DimensionPill/DimensionPill.tsx
new file mode 100644
index 00000000000..e7241d39712
--- /dev/null
+++ b/frontend/src/metabase/common/components/DimensionPill/DimensionPill.tsx
@@ -0,0 +1,168 @@
+import cx from "classnames";
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import {
+ AccordionList,
+ type Section,
+} from "metabase/common/components/AccordionList";
+import { SourceColorIndicator } from "metabase/common/components/SourceColorIndicator";
+import type { IconName } from "metabase/ui";
+import { Divider, Flex, Icon, Popover, Text } from "metabase/ui";
+import type { DimensionGroup, DimensionMetadata } from "metabase-lib/metric";
+
+import S from "./DimensionPill.module.css";
+import { groupIntoSections } from "./utils";
+
+export interface DimensionOption {
+ name: string;
+ displayName: string;
+ icon: IconName;
+ dimension: DimensionMetadata;
+ group?: DimensionGroup;
+ selected?: boolean;
+}
+
+export interface DimensionPillProps {
+ label?: string;
+ icon?: IconName;
+ colors?: string[];
+ options: DimensionOption[];
+ onSelect: (dimension: DimensionMetadata) => void;
+ onRemove?: () => void;
+ disabled?: boolean;
+}
+
+interface RemoveAction {
+ name: string;
+ displayName: string;
+ icon: IconName;
+}
+
+const REMOVE_ACTION: RemoveAction = {
+ name: "__remove__",
+ get displayName() {
+ return t`Remove dimension`;
+ },
+ icon: "close",
+};
+
+const REMOVE_SECTIONS: Section<RemoveAction>[] = [{ items: [REMOVE_ACTION] }];
+
+function renderItemName(item: DimensionOption | RemoveAction) {
+ return item.displayName;
+}
+
+function renderItemIcon(item: DimensionOption | RemoveAction) {
+ return <Icon name={item.icon} />;
+}
+
+function dimensionItemIsSelected(item: DimensionOption) {
+ return item.selected ?? false;
+}
+
+function removeItemIsSelected() {
+ return false;
+}
+
+export function DimensionPill({
+ label,
+ icon,
+ colors,
+ options,
+ onSelect,
+ onRemove,
+ disabled,
+}: DimensionPillProps) {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const isPlaceholder = !label;
+ const isEmpty = isPlaceholder && options.length === 0;
+ const hasMultipleOptions =
+ options.length > 1 || (isPlaceholder && options.length > 0);
+ const canRemove = !isPlaceholder && onRemove != null;
+ const canOpenPopover = hasMultipleOptions || canRemove;
+ const isInteractive = canOpenPopover && !disabled;
+
+ const handleSelect = useCallback(
+ (item: DimensionOption) => {
+ onSelect(item.dimension);
+ setIsOpen(false);
+ },
+ [onSelect],
+ );
+
+ const handleRemove = useCallback(() => {
+ onRemove?.();
+ setIsOpen(false);
+ }, [onRemove]);
+
+ let pillLabel: string;
+ if (isEmpty) {
+ pillLabel = t`No compatible dimensions`;
+ } else if (isPlaceholder) {
+ pillLabel = t`Select a dimension`;
+ } else {
+ pillLabel = label;
+ }
+
+ const sections: Section<DimensionOption>[] = useMemo(
+ () => groupIntoSections(options),
+ [options],
+ );
+
+ return (
+ <Popover
+ opened={isOpen}
+ onChange={setIsOpen}
+ position="top-start"
+ disabled={!canOpenPopover}
+ >
+ <Popover.Target>
+ <Flex
+ className={cx(S.pill, isInteractive && S.interactive)}
+ align="center"
+ gap="xs"
+ opacity={disabled || isEmpty ? 0.6 : undefined}
+ onClick={isInteractive ? () => setIsOpen(true) : undefined}
+ >
+ <SourceColorIndicator colors={colors} fallbackIcon={icon ?? "add"} />
+ <Text size="sm" lh={1} c={isEmpty ? "text-tertiary" : undefined}>
+ {pillLabel}
+ </Text>
+ </Flex>
+ </Popover.Target>
+ <Popover.Dropdown px={0} py="xs" mah={300} className={S.dropdown}>
+ {hasMultipleOptions && (
+ <AccordionList
+ className={S.dimensionList}
+ sections={sections}
+ onChange={handleSelect}
+ renderItemName={renderItemName}
+ renderItemIcon={renderItemIcon}
+ itemIsSelected={dimensionItemIsSelected}
+ alwaysExpanded
+ maxHeight={Infinity}
+ width={240}
+ />
+ )}
+ {canRemove && (
+ <>
+ {hasMultipleOptions && <Divider my="xs" />}
+ <AccordionList
+ className={S.dimensionList}
+ sections={REMOVE_SECTIONS}
+ onChange={handleRemove}
+ renderItemName={renderItemName}
+ renderItemIcon={renderItemIcon}
+ itemIsSelected={removeItemIsSelected}
+ alwaysExpanded
+ maxHeight={Infinity}
+ width={240}
+ />
+ </>
+ )}
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
diff --git a/frontend/src/metabase/common/components/DimensionPill/index.ts b/frontend/src/metabase/common/components/DimensionPill/index.ts
new file mode 100644
index 00000000000..2739f903abf
--- /dev/null
+++ b/frontend/src/metabase/common/components/DimensionPill/index.ts
@@ -0,0 +1,3 @@
+export { DimensionPill } from "./DimensionPill";
+export type { DimensionPillProps, DimensionOption } from "./DimensionPill";
+export { groupIntoSections } from "./utils";
diff --git a/frontend/src/metabase/common/components/DimensionPill/utils.ts b/frontend/src/metabase/common/components/DimensionPill/utils.ts
new file mode 100644
index 00000000000..850ae2a0a5e
--- /dev/null
+++ b/frontend/src/metabase/common/components/DimensionPill/utils.ts
@@ -0,0 +1,37 @@
+import type { Section } from "metabase/common/components/AccordionList";
+import type { DimensionGroup } from "metabase-lib/metric";
+
+interface Groupable {
+ group?: DimensionGroup;
+}
+
+export function groupIntoSections<T extends Groupable>(
+ items: T[],
+): Section<T>[] {
+ const groups = new Map<
+ string | undefined,
+ { groupName: string; items: T[] }
+ >();
+
+ for (const item of items) {
+ const groupId = item.group?.id;
+ const entry = groups.get(groupId);
+ if (entry) {
+ entry.items.push(item);
+ } else {
+ groups.set(groupId, {
+ groupName: item.group?.displayName ?? "",
+ items: [item],
+ });
+ }
+ }
+
+ if (groups.size <= 1) {
+ return [{ items }];
+ }
+
+ return [...groups.values()].map(({ groupName, items }) => ({
+ name: groupName,
+ items,
+ }));
+}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.module.css b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.module.css
deleted file mode 100644
index 6d43333ee13..00000000000
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.module.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.triggerButton {
- border-radius: 0;
- /** we hide the trigger button by default, and show it on hover */
- visibility: hidden;
- color: color-mix(
- in srgb,
- var(--mb-color-text-primary-inverse),
- transparent 40%
- );
- border-left: 2px solid
- color-mix(in srgb, var(--mb-color-border), transparent 80%);
-}
-
-*:hover > .triggerButton {
- visibility: visible;
-}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.styled.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.styled.tsx
deleted file mode 100644
index 65f93b72580..00000000000
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.styled.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { SelectList as BaseSelectList } from "metabase/common/components/SelectList";
-import type { ColorName } from "metabase/lib/colors/types";
-import { Button, type ButtonProps, Icon } from "metabase/ui";
-import { color } from "metabase/ui/utils/colors";
-
-export const TriggerIcon = styled(Icon)`
- color: var(--mb-color-text-primary-inverse) !important;
- flex: 0 0 auto;
-`;
-
-export const ChevronDown = styled(Icon)`
- flex: 0 0 auto;
- width: 8px;
- margin-left: 0.25em;
- color: currentColor;
- opacity: 0.75;
-`;
-
-export const SelectListItem = styled(BaseSelectList.Item)<{
- activeColor: ColorName;
-}>`
- padding: 0.5rem 1rem;
- font-weight: 400;
-
- &[aria-selected="true"] {
- background-color: ${(props) => color(props.activeColor)};
- }
-
- &:hover {
- background-color: ${(props) => color(props.activeColor)};
- }
-`;
-
-export const MoreButton = styled(Button)<ButtonProps>`
- transition: none !important;
-
- &:hover {
- background-color: var(--mb-color-background-hover) !important;
- }
-`;
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.tsx
deleted file mode 100644
index ca5525b4a66..00000000000
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.tsx
+++ /dev/null
@@ -1,233 +0,0 @@
-import cx from "classnames";
-import type { ReactNode, Ref } from "react";
-import { forwardRef, useCallback, useMemo, useState } from "react";
-import { t } from "ttag";
-
-import { Ellipsified } from "metabase/common/components/Ellipsified";
-import { SelectList } from "metabase/common/components/SelectList";
-import type { ColorName } from "metabase/lib/colors/types";
-import { Button, type ButtonProps, Popover } from "metabase/ui";
-import * as Lib from "metabase-lib";
-
-import S from "./BaseBucketPickerPopover.module.css";
-import {
- ChevronDown,
- MoreButton,
- SelectListItem,
- TriggerIcon,
-} from "./BaseBucketPickerPopover.styled";
-
-type NoBucket = null;
-
-export type BucketListItem = {
- displayName: string;
- bucket: Lib.Bucket | NoBucket;
- default?: boolean;
- selected?: boolean;
-};
-
-export interface BaseBucketPickerPopoverProps {
- query: Lib.Query;
- stageIndex: number;
- items: BucketListItem[];
- selectedBucket: Lib.Bucket | NoBucket;
- isEditing: boolean;
- triggerLabel?: string;
- hasArrowIcon?: boolean;
- hasChevronDown?: boolean;
- color?: ColorName;
- initiallyVisibleItemsCount: number;
- checkBucketIsSelected: (item: BucketListItem) => boolean;
- renderTriggerContent: (bucket?: Lib.BucketDisplayInfo) => ReactNode;
- onSelect: (column: Lib.Bucket | NoBucket) => void;
- className?: string;
- classNames?: {
- root?: string;
- chevronDown?: string;
- };
-}
-
-function BaseBucketPickerPopoverInner({
- query,
- stageIndex,
- items,
- selectedBucket,
- isEditing,
- triggerLabel,
- hasArrowIcon = true,
- color = "brand",
- initiallyVisibleItemsCount,
- checkBucketIsSelected,
- renderTriggerContent,
- onSelect,
- hasChevronDown,
- className,
- classNames = {},
-}: BaseBucketPickerPopoverProps) {
- const [isOpened, setIsOpened] = useState(false);
- const [isExpanded, setIsExpanded] = useState(
- isInitiallyExpanded(
- items,
- selectedBucket,
- initiallyVisibleItemsCount,
- checkBucketIsSelected,
- ),
- );
-
- const defaultBucket = useMemo(
- () => items.find((item) => item.default)?.bucket,
- [items],
- );
-
- const handleExpand = useCallback((evt: React.MouseEvent) => {
- evt.stopPropagation();
- setIsExpanded(true);
- }, []);
-
- const handlePopoverClose = useCallback(() => {
- const nextState = isInitiallyExpanded(
- items,
- selectedBucket,
- initiallyVisibleItemsCount,
- checkBucketIsSelected,
- );
- setIsExpanded(nextState);
- setIsOpened(false);
- }, [
- items,
- selectedBucket,
- initiallyVisibleItemsCount,
- checkBucketIsSelected,
- ]);
-
- const triggerContentBucket = isEditing ? selectedBucket : defaultBucket;
- const triggerContentBucketDisplayInfo = triggerContentBucket
- ? Lib.displayInfo(query, stageIndex, triggerContentBucket)
- : undefined;
-
- const canExpand = items.length > initiallyVisibleItemsCount;
- const hasMoreButton = canExpand && !isExpanded;
- const visibleItems = hasMoreButton
- ? items.slice(0, initiallyVisibleItemsCount)
- : items;
-
- return (
- <Popover
- opened={isOpened}
- position="right"
- onClose={handlePopoverClose}
- withinPortal={false}
- onChange={(v) => !v && handlePopoverClose()}
- floatingStrategy="fixed"
- >
- <Popover.Target>
- <TriggerButton
- className={cx(classNames.root, className)}
- aria-label={triggerLabel}
- data-testid="dimension-list-item-binning"
- onClick={(event) => {
- event.stopPropagation();
- setIsOpened(!isOpened);
- }}
- px="sm"
- miw="35%"
- maw="50%"
- h="auto"
- py={0}
- variant="subtle"
- color="white"
- styles={{ label: { display: "flex", gap: "0.5rem" } }}
- >
- <Ellipsified>
- {renderTriggerContent(triggerContentBucketDisplayInfo)}
- </Ellipsified>
- {hasArrowIcon && !hasChevronDown && (
- <TriggerIcon name="chevronright" />
- )}
- {hasChevronDown && (
- <ChevronDown
- className={classNames.chevronDown}
- name="chevrondown"
- />
- )}
- </TriggerButton>
- </Popover.Target>
- <Popover.Dropdown>
- <SelectList p="sm" miw="10rem">
- {visibleItems.map((item) => (
- <SelectListItem
- id={item.displayName}
- key={item.displayName}
- name={item.displayName}
- activeColor={color}
- isSelected={checkBucketIsSelected(item)}
- onSelect={(_id, event) => {
- event.stopPropagation();
- onSelect(item.bucket);
- handlePopoverClose();
- }}
- />
- ))}
- {hasMoreButton && (
- <MoreButton
- onClick={handleExpand}
- variant="subtle"
- color="brand"
- fullWidth
- px="md"
- py="sm"
- styles={{
- inner: { display: "flex", justifyContent: "flex-start" },
- }}
- >{t`More…`}</MoreButton>
- )}
- </SelectList>
- </Popover.Dropdown>
- </Popover>
- );
-}
-
-function isInitiallyExpanded(
- items: BucketListItem[],
- selectedBucket: Lib.Bucket | NoBucket,
- initiallyVisibleItemsCount: number,
- checkBucketIsSelected: (item: BucketListItem) => boolean,
-) {
- const canExpand = items.length > initiallyVisibleItemsCount;
- if (!canExpand || !selectedBucket) {
- return false;
- }
-
- return (
- items.findIndex((item) => checkBucketIsSelected(item)) >=
- initiallyVisibleItemsCount
- );
-}
-
-export function getBucketListItem(
- query: Lib.Query,
- stageIndex: number,
- bucket: Lib.Bucket,
-): BucketListItem {
- return {
- ...Lib.displayInfo(query, stageIndex, bucket),
- bucket,
- };
-}
-
-const TriggerButton = forwardRef(function TriggerButton(
- { className, ...props }: ButtonProps,
- ref: Ref<HTMLButtonElement>,
-) {
- return (
- <Button ref={ref} className={cx(S.triggerButton, className)} {...props} />
- );
-});
-
-export const BaseBucketPickerPopover = Object.assign(
- BaseBucketPickerPopoverInner,
- {
- displayName: "BucketPickerPopover",
- TriggerButton,
- },
-);
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BinningStrategyPickerPopover.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BinningStrategyPickerPopover.tsx
deleted file mode 100644
index 8e0887bdce6..00000000000
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BinningStrategyPickerPopover.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { t } from "ttag";
-
-import * as Lib from "metabase-lib";
-
-import type { BucketListItem } from "./BaseBucketPickerPopover";
-import {
- BaseBucketPickerPopover,
- getBucketListItem,
-} from "./BaseBucketPickerPopover";
-import type { CommonBucketPickerProps } from "./types";
-
-const INITIALLY_VISIBLE_ITEMS_COUNT = 5;
-
-export function BinningStrategyPickerPopover({
- query,
- stageIndex,
- column,
- buckets,
- isEditing,
- onSelect,
- ...props
-}: CommonBucketPickerProps) {
- const selectedBucket = useMemo(() => Lib.binning(column), [column]);
-
- const items = useMemo(
- () => [
- ...buckets.map((bucket) => getBucketListItem(query, stageIndex, bucket)),
- { displayName: t`Don't bin`, bucket: null },
- ],
- [query, stageIndex, buckets],
- );
-
- const handleBucketSelect = useCallback(
- (bucket: Lib.Bucket | null) => {
- onSelect(Lib.withBinning(column, bucket));
- },
- [column, onSelect],
- );
-
- const checkBucketIsSelected = useCallback(
- (item: BucketListItem) => {
- // `bucket: null` represents the "Don't bin" option
- // It's considered selected when editing an existing clause without a binning strategy
- if (item.bucket === null) {
- return !selectedBucket && isEditing;
- }
- return !!item.selected;
- },
- [selectedBucket, isEditing],
- );
-
- return (
- <BaseBucketPickerPopover
- {...props}
- query={query}
- stageIndex={stageIndex}
- items={items}
- selectedBucket={selectedBucket}
- isEditing={isEditing}
- triggerLabel={t`Binning strategy`}
- initiallyVisibleItemsCount={INITIALLY_VISIBLE_ITEMS_COUNT}
- checkBucketIsSelected={checkBucketIsSelected}
- renderTriggerContent={renderTriggerContent}
- onSelect={handleBucketSelect}
- />
- );
-}
-
-function renderTriggerContent(bucket?: Lib.BucketDisplayInfo) {
- return bucket ? bucket.displayName : t`Unbinned`;
-}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/TemporalBucketPickerPopover.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/TemporalBucketPickerPopover.tsx
deleted file mode 100644
index 8e329d9266e..00000000000
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/TemporalBucketPickerPopover.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { t } from "ttag";
-
-import * as Lib from "metabase-lib";
-
-import type { BucketListItem } from "./BaseBucketPickerPopover";
-import {
- BaseBucketPickerPopover,
- getBucketListItem,
-} from "./BaseBucketPickerPopover";
-import type { CommonBucketPickerProps } from "./types";
-
-export const INITIALLY_VISIBLE_ITEMS_COUNT = 7;
-
-function checkBucketIsSelected(item: BucketListItem) {
- return !!item.selected;
-}
-
-export function TemporalBucketPickerPopover({
- query,
- stageIndex,
- column,
- buckets,
- isEditing,
- onSelect,
- ...props
-}: CommonBucketPickerProps) {
- const selectedBucket = useMemo(() => Lib.temporalBucket(column), [column]);
-
- const items = useMemo(
- () => [
- ...buckets.map((bucket) => getBucketListItem(query, stageIndex, bucket)),
- {
- displayName: t`Don't bin`,
- bucket: null,
- selected: !selectedBucket && isEditing,
- },
- ],
- [buckets, selectedBucket, isEditing, query, stageIndex],
- );
-
- const handleBucketSelect = useCallback(
- (bucket: Lib.Bucket | null) => {
- onSelect(Lib.withTemporalBucket(column, bucket));
- },
- [column, onSelect],
- );
-
- return (
- <BaseBucketPickerPopover
- {...props}
- query={query}
- isEditing={isEditing}
- stageIndex={stageIndex}
- items={items}
- selectedBucket={selectedBucket}
- triggerLabel={t`Temporal bucket`}
- initiallyVisibleItemsCount={INITIALLY_VISIBLE_ITEMS_COUNT}
- checkBucketIsSelected={checkBucketIsSelected}
- renderTriggerContent={renderTriggerContent}
- onSelect={handleBucketSelect}
- />
- );
-}
-
-function renderTriggerContent(bucket?: Lib.BucketDisplayInfo) {
- return bucket ? t`by ${bucket.displayName.toLowerCase()}` : t`Unbinned`;
-}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/index.ts b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/index.ts
deleted file mode 100644
index 8b8bedca573..00000000000
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./BucketPickerPopover";
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/types.ts b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/types.ts
deleted file mode 100644
index 68030685dd4..00000000000
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/types.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type * as Lib from "metabase-lib";
-
-import type { BaseBucketPickerPopoverProps } from "./BaseBucketPickerPopover";
-
-type CommonProps = Pick<
- BaseBucketPickerPopoverProps,
- | "query"
- | "stageIndex"
- | "isEditing"
- | "color"
- | "hasArrowIcon"
- | "hasChevronDown"
->;
-
-export interface CommonBucketPickerProps extends CommonProps {
- column: Lib.ColumnMetadata;
- buckets: Lib.Bucket[];
- onSelect: (column: Lib.ColumnMetadata) => void;
-}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/BinningStrategyPickerPopover.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/BinningStrategyPickerPopover.tsx
new file mode 100644
index 00000000000..2da82637d10
--- /dev/null
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/BinningStrategyPickerPopover.tsx
@@ -0,0 +1,87 @@
+import { useCallback, useMemo } from "react";
+import { t } from "ttag";
+
+import {
+ type BucketItem,
+ BucketPickerPopover,
+} from "metabase/common/components/BucketPickerPopover";
+import * as Lib from "metabase-lib";
+
+import type { CommonBucketPickerProps } from "./types";
+
+const INITIALLY_VISIBLE_ITEMS_COUNT = 5;
+
+function getBucketItem(
+ query: Lib.Query,
+ stageIndex: number,
+ bucket: Lib.Bucket,
+): BucketItem {
+ const info = Lib.displayInfo(query, stageIndex, bucket);
+ return {
+ displayName: info.displayName,
+ isDefault: info.default,
+ isSelected: info.selected,
+ };
+}
+
+export function BinningStrategyPickerPopover({
+ query,
+ stageIndex,
+ column,
+ buckets,
+ isEditing,
+ onSelect,
+ hasChevronDown,
+ color,
+ className,
+ classNames,
+}: CommonBucketPickerProps) {
+ const selectedBucket = useMemo(() => Lib.binning(column), [column]);
+
+ const items: BucketItem[] = useMemo(
+ () => [
+ ...buckets.map((bucket) => getBucketItem(query, stageIndex, bucket)),
+ {
+ displayName: t`Don't bin`,
+ isSelected: !selectedBucket && isEditing,
+ },
+ ],
+ [query, stageIndex, buckets, selectedBucket, isEditing],
+ );
+
+ const triggerLabel = useMemo(() => {
+ const displayBucket = isEditing
+ ? selectedBucket
+ : buckets.find((bucket) => {
+ const info = Lib.displayInfo(query, stageIndex, bucket);
+ return info.default;
+ });
+ if (displayBucket) {
+ return Lib.displayInfo(query, stageIndex, displayBucket).displayName;
+ }
+ return t`Unbinned`;
+ }, [query, stageIndex, isEditing, selectedBucket, buckets]);
+
+ const handleSelect = useCallback(
+ (item: BucketItem) => {
+ const index = items.indexOf(item);
+ const bucket = buckets.at(index) ?? null;
+ onSelect(Lib.withBinning(column, bucket));
+ },
+ [column, items, buckets, onSelect],
+ );
+
+ return (
+ <BucketPickerPopover
+ triggerLabel={triggerLabel}
+ ariaLabel={t`Binning strategy`}
+ items={items}
+ onSelect={handleSelect}
+ initiallyVisibleItemsCount={INITIALLY_VISIBLE_ITEMS_COUNT}
+ color={color}
+ hasChevronDown={hasChevronDown}
+ className={className}
+ classNames={classNames}
+ />
+ );
+}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BucketPickerPopover.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.tsx
similarity index 78%
rename from frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BucketPickerPopover.tsx
rename to frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.tsx
index fa884913465..c3a782187a2 100644
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BucketPickerPopover.tsx
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.tsx
@@ -1,11 +1,10 @@
import * as Lib from "metabase-lib";
-import { BaseBucketPickerPopover } from "./BaseBucketPickerPopover";
import { BinningStrategyPickerPopover } from "./BinningStrategyPickerPopover";
import { TemporalBucketPickerPopover } from "./TemporalBucketPickerPopover";
import type { CommonBucketPickerProps } from "./types";
-interface BucketPickerPopoverProps
+interface ColumnBucketPickerPopoverProps
extends Omit<CommonBucketPickerProps, "buckets"> {
hasBinning?: boolean;
hasTemporalBucketing?: boolean;
@@ -16,14 +15,14 @@ interface BucketPickerPopoverProps
};
}
-function _BucketPickerPopover({
+export function ColumnBucketPickerPopover({
query,
stageIndex,
column,
hasBinning = false,
hasTemporalBucketing = false,
...props
-}: BucketPickerPopoverProps) {
+}: ColumnBucketPickerPopoverProps) {
if (hasBinning) {
const buckets = Lib.availableBinningStrategies(query, stageIndex, column);
@@ -58,8 +57,3 @@ function _BucketPickerPopover({
return null;
}
-
-export const BucketPickerPopover = Object.assign(_BucketPickerPopover, {
- displayName: "BucketPickerPopover",
- TriggerButton: BaseBucketPickerPopover.TriggerButton,
-});
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BucketPickerPopover.unit.spec.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.unit.spec.tsx
similarity index 97%
rename from frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BucketPickerPopover.unit.spec.tsx
rename to frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.unit.spec.tsx
index 574729a5603..961fb4f8eca 100644
--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BucketPickerPopover.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
columnFinder,
} from "metabase-lib/test-helpers";
-import { BucketPickerPopover } from "./BucketPickerPopover";
+import { ColumnBucketPickerPopover } from "./ColumnBucketPickerPopover";
const query = Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);
const findColumn = columnFinder(query, Lib.breakoutableColumns(query, 0));
@@ -20,7 +20,7 @@ function setup({ column }: { column: Lib.ColumnMetadata }) {
const onSelect = jest.fn();
render(
<div data-testid="container">
- <BucketPickerPopover
+ <ColumnBucketPickerPopover
query={query}
stageIndex={0}
column={column}
@@ -49,7 +49,7 @@ async function setupTemporalBucketPicker({
await screen.findByText("Year");
}
-describe("BucketPickerPopover", () => {
+describe("ColumnBucketPickerPopover", () => {
it("should collapse advanced temporal bucket options", async () => {
const buckets = Lib.availableTemporalBuckets(query, 0, dateColumn);
await setupTemporalBucketPicker({ column: dateColumn });
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/TemporalBucketPickerPopover.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/TemporalBucketPickerPopover.tsx
new file mode 100644
index 00000000000..efd5d5f5b89
--- /dev/null
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/TemporalBucketPickerPopover.tsx
@@ -0,0 +1,88 @@
+import { useCallback, useMemo } from "react";
+import { t } from "ttag";
+
+import {
+ type BucketItem,
+ BucketPickerPopover,
+} from "metabase/common/components/BucketPickerPopover";
+import * as Lib from "metabase-lib";
+
+import type { CommonBucketPickerProps } from "./types";
+
+export const INITIALLY_VISIBLE_ITEMS_COUNT = 7;
+
+function getBucketItem(
+ query: Lib.Query,
+ stageIndex: number,
+ bucket: Lib.Bucket,
+): BucketItem {
+ const info = Lib.displayInfo(query, stageIndex, bucket);
+ return {
+ displayName: info.displayName,
+ isDefault: info.default,
+ isSelected: info.selected,
+ };
+}
+
+export function TemporalBucketPickerPopover({
+ query,
+ stageIndex,
+ column,
+ buckets,
+ isEditing,
+ onSelect,
+ hasChevronDown,
+ color,
+ className,
+ classNames,
+}: CommonBucketPickerProps) {
+ const selectedBucket = useMemo(() => Lib.temporalBucket(column), [column]);
+
+ const items: BucketItem[] = useMemo(
+ () => [
+ ...buckets.map((bucket) => getBucketItem(query, stageIndex, bucket)),
+ {
+ displayName: t`Don't bin`,
+ isSelected: !selectedBucket && isEditing,
+ },
+ ],
+ [buckets, selectedBucket, isEditing, query, stageIndex],
+ );
+
+ const triggerLabel = useMemo(() => {
+ const displayBucket = isEditing
+ ? selectedBucket
+ : buckets.find((bucket) => {
+ const info = Lib.displayInfo(query, stageIndex, bucket);
+ return info.default;
+ });
+ if (displayBucket) {
+ const info = Lib.displayInfo(query, stageIndex, displayBucket);
+ return t`by ${info.displayName.toLowerCase()}`;
+ }
+ return t`Unbinned`;
+ }, [query, stageIndex, isEditing, selectedBucket, buckets]);
+
+ const handleSelect = useCallback(
+ (item: BucketItem) => {
+ const index = items.indexOf(item);
+ const bucket = buckets.at(index) ?? null;
+ onSelect(Lib.withTemporalBucket(column, bucket));
+ },
+ [column, items, buckets, onSelect],
+ );
+
+ return (
+ <BucketPickerPopover
+ triggerLabel={triggerLabel}
+ ariaLabel={t`Temporal bucket`}
+ items={items}
+ onSelect={handleSelect}
+ initiallyVisibleItemsCount={INITIALLY_VISIBLE_ITEMS_COUNT}
+ color={color}
+ hasChevronDown={hasChevronDown}
+ className={className}
+ classNames={classNames}
+ />
+ );
+}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/index.ts b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/index.ts
new file mode 100644
index 00000000000..cddba76cf82
--- /dev/null
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/index.ts
@@ -0,0 +1 @@
+export { ColumnBucketPickerPopover } from "./ColumnBucketPickerPopover";
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts
new file mode 100644
index 00000000000..b4a3022a947
--- /dev/null
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts
@@ -0,0 +1,18 @@
+import type { ColorName } from "metabase/lib/colors/types";
+import type * as Lib from "metabase-lib";
+
+export interface CommonBucketPickerProps {
+ query: Lib.Query;
+ stageIndex: number;
+ column: Lib.ColumnMetadata;
+ buckets: Lib.Bucket[];
+ isEditing: boolean;
+ onSelect: (column: Lib.ColumnMetadata) => void;
+ color?: ColorName;
+ hasChevronDown?: boolean;
+ className?: string;
+ classNames?: {
+ root?: string;
+ chevronDown?: string;
+ };
+}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
index 4ccfffb6756..484fb93f1d6 100644
--- a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
@@ -26,7 +26,7 @@ import { DelayGroup, Icon } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
import * as Lib from "metabase-lib";
-import { BucketPickerPopover } from "./BucketPickerPopover";
+import { ColumnBucketPickerPopover } from "./ColumnBucketPickerPopover";
import S from "./QueryColumnPicker.module.css";
const CUSTOM_EXPRESSION_SECTION_KEY = "custom-expression";
@@ -72,6 +72,8 @@ export interface QueryColumnPickerProps {
hasInitialFocus?: boolean;
alwaysExpanded?: boolean;
disableSearch?: boolean;
+ /** Hide section/group names (table names) in the picker */
+ hideSectionNames?: boolean;
}
const SEARCH_PROP = [
@@ -102,6 +104,7 @@ export function QueryColumnPicker({
hasInitialFocus = true,
alwaysExpanded,
disableSearch,
+ hideSectionNames = false,
}: QueryColumnPickerProps) {
const tc = useTranslateContent();
const { locale } = useLocale();
@@ -127,7 +130,7 @@ export function QueryColumnPicker({
});
return {
- name: tc(groupInfo.displayName),
+ name: hideSectionNames ? undefined : tc(groupInfo.displayName),
icon: getColumnGroupIcon(groupInfo),
items,
};
@@ -168,6 +171,7 @@ export function QueryColumnPicker({
expressionSectionIcon,
isSearching,
tc,
+ hideSectionNames,
]);
const handleSelectSection = useCallback(
@@ -264,7 +268,7 @@ export function QueryColumnPicker({
return (
(hasBinning || hasTemporalBucketing) && (
- <BucketPickerPopover
+ <ColumnBucketPickerPopover
classNames={{
root: S.itemWrapper,
/*
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx
index 947cb5256ab..26caf0666fb 100644
--- a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx
@@ -130,6 +130,24 @@ describe("QueryColumnPicker", () => {
});
describe("bucketing", () => {
+ it("should show binning picker for numeric columns", () => {
+ setup();
+
+ const total = screen.getByRole("option", { name: "Total" });
+ expect(
+ within(total).getByLabelText("Binning strategy"),
+ ).toBeInTheDocument();
+ });
+
+ it("should show temporal bucket picker for date columns", () => {
+ setup();
+
+ const createdAt = screen.getByRole("option", { name: "Created At" });
+ expect(
+ within(createdAt).getByLabelText("Temporal bucket"),
+ ).toBeInTheDocument();
+ });
+
it("shouldn't show bucketing options for non-bucketable columns", () => {
setup();
diff --git a/frontend/src/metabase/common/components/SourceColorIndicator/SourceColorIndicator.module.css b/frontend/src/metabase/common/components/SourceColorIndicator/SourceColorIndicator.module.css
new file mode 100644
index 00000000000..75e9eae85cb
--- /dev/null
+++ b/frontend/src/metabase/common/components/SourceColorIndicator/SourceColorIndicator.module.css
@@ -0,0 +1,5 @@
+.colorDot {
+ border-radius: 50%;
+ flex-shrink: 0;
+ border: 1px solid var(--mb-color-background-primary);
+}
diff --git a/frontend/src/metabase/common/components/SourceColorIndicator/SourceColorIndicator.tsx b/frontend/src/metabase/common/components/SourceColorIndicator/SourceColorIndicator.tsx
new file mode 100644
index 00000000000..bb44df05440
--- /dev/null
+++ b/frontend/src/metabase/common/components/SourceColorIndicator/SourceColorIndicator.tsx
@@ -0,0 +1,41 @@
+import type { IconName } from "metabase/ui";
+import { Box, Flex, Icon } from "metabase/ui";
+
+import S from "./SourceColorIndicator.module.css";
+
+type SourceColorIndicatorProps = {
+ colors?: string[];
+ fallbackIcon: IconName;
+ size?: number;
+ limit?: number;
+};
+
+export function SourceColorIndicator({
+ colors,
+ fallbackIcon,
+ size = 14,
+ limit = 6,
+}: SourceColorIndicatorProps) {
+ if (colors && colors.length > 1) {
+ const capped = colors.slice(0, limit);
+ const overlap = Math.round(size / 2.5);
+ return (
+ <Flex align="center" data-testid="color-indicator-container">
+ {capped.map((color, index) => (
+ <Box
+ key={index}
+ className={S.colorDot}
+ w={size}
+ h={size}
+ ml={index === 0 ? 0 : -overlap}
+ style={{ backgroundColor: color, zIndex: capped.length - index }}
+ />
+ ))}
+ </Flex>
+ );
+ }
+
+ return (
+ <Icon name={fallbackIcon} size={size} style={{ color: colors?.[0] }} />
+ );
+}
diff --git a/frontend/src/metabase/common/components/SourceColorIndicator/index.ts b/frontend/src/metabase/common/components/SourceColorIndicator/index.ts
new file mode 100644
index 00000000000..cfcf40984e0
--- /dev/null
+++ b/frontend/src/metabase/common/components/SourceColorIndicator/index.ts
@@ -0,0 +1 @@
+export { SourceColorIndicator } from "./SourceColorIndicator";
diff --git a/frontend/src/metabase/common/utils/model-names.ts b/frontend/src/metabase/common/utils/model-names.ts
index 42e99b61c92..101f23d2a2b 100644
--- a/frontend/src/metabase/common/utils/model-names.ts
+++ b/frontend/src/metabase/common/utils/model-names.ts
@@ -26,6 +26,9 @@ const TRANSLATED_NAME_BY_MODEL_TYPE: Record<ModelNames, string> = {
get "indexed-entity"() {
return t`Indexed record`;
},
+ get measure() {
+ return t`Measure`;
+ },
get metric() {
return t`Metric`;
},
diff --git a/frontend/src/metabase/dashboard/actions/tabs.ts b/frontend/src/metabase/dashboard/actions/tabs.ts
index 5fa28430bac..4746159e339 100644
--- a/frontend/src/metabase/dashboard/actions/tabs.ts
+++ b/frontend/src/metabase/dashboard/actions/tabs.ts
@@ -22,6 +22,7 @@ import type {
GetState,
SelectedTabId,
StoreDashboard,
+ StoreDashcard,
TabDeletionId,
} from "metabase-types/store";
@@ -219,11 +220,7 @@ export function getPrevDashAndTabs({
filterRemovedTabs?: boolean;
}) {
const dashId = state.dashboardId;
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore - possibly infinite type error
- const prevDash: StoreDashboard | null = dashId
- ? state.dashboards[dashId]
- : null;
+ const prevDash = dashId ? (state as DashboardState).dashboards[dashId] : null;
const prevTabs =
prevDash?.tabs?.filter((t) => !filterRemovedTabs || !t.isRemoved) ?? [];
@@ -371,7 +368,7 @@ export const tabsReducer = createReducer<DashboardState>(
};
// We don't have card (question) data for virtual dashcards (text, heading, link, action)
- if (isVirtualDashCard(sourceDashCard)) {
+ if (isVirtualDashCard(sourceDashCard as StoreDashcard)) {
return;
}
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index 29eee451001..738f523ccea 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -632,6 +632,7 @@ export function DashCardVisualization({
titleMenuItems={titleMenuItems}
errorMessageOverride={visualizerErrMsg}
enableEntityNavigation={enableEntityNavigation}
+ autoAdjustSettings
/>
</EmbeddingEntityContextProvider>
</div>
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
index dc7751df00a..3354261a077 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -301,7 +301,7 @@ const TableSectionBase = ({
>{t`Segments`}</Tabs.Tab>
<Tabs.Tab
value="measures"
- leftSection={<Icon name="sum" />}
+ leftSection={<Icon name="ruler" />}
>{t`Measures`}</Tabs.Tab>
</Tabs.List>
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx
index 9340157bd9f..cf2cc7784dc 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureItem.tsx
@@ -25,7 +25,7 @@ export function MeasureItem({ measure, href }: MeasureItemProps) {
>
<Stack gap="xs">
<Flex align="center" gap="sm">
- <Icon name="sum" c="brand" />
+ <Icon name="ruler" c="brand" />
<Ellipsified lines={1} tooltip={measure.name}>
<Text fw="bold">{measure.name}</Text>
</Ellipsified>
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
index fe8caf8dcd4..ea38a04ae83 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
@@ -61,7 +61,9 @@ export function MeasureList({ table }: MeasureListProps) {
<EmptyState
className={S.EmptyState}
spacing="sm"
- illustrationElement={<Icon name="sum" size={32} c="text-secondary" />}
+ illustrationElement={
+ <Icon name="ruler" size={32} c="text-secondary" />
+ }
title={t`No measures yet`}
message={t`Create a measure to define a reusable aggregation for this table.`}
/>
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
index 7662565f2c9..ee212e3cc79 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx
@@ -48,7 +48,7 @@ export function MeasureHeader({
readOnly={readOnly}
/>
}
- icon="sum"
+ icon="ruler"
menu={
<MeasureMoreMenu
previewUrl={previewUrl}
diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.ts
index eb829a7209f..bcb45038301 100644
--- a/frontend/src/metabase/entities/index.ts
+++ b/frontend/src/metabase/entities/index.ts
@@ -16,6 +16,7 @@ export { Tables as tables } from "./tables";
export { Fields as fields } from "./fields";
export { Segments as segments } from "./segments";
export { Measures as measures } from "./measures";
+export { Metrics as metrics } from "./metrics";
export { Transforms as transforms } from "./transforms";
export { Groups as groups } from "./groups";
diff --git a/frontend/src/metabase/entities/measures.js b/frontend/src/metabase/entities/measures.js
index 1368b04bff4..f266135a8ed 100644
--- a/frontend/src/metabase/entities/measures.js
+++ b/frontend/src/metabase/entities/measures.js
@@ -51,16 +51,6 @@ export const Measures = createEntity({
),
},
- objectActions: {
- setArchived: (
- { id },
- archived,
- { revision_message = archived ? "(Archive)" : "(Unarchive)" } = {},
- ) => Measures.actions.update({ id }, { archived, revision_message }),
-
- delete: null,
- },
-
selectors: {
getObject: (state, { entityId }) => getMetadata(state).measure(entityId),
},
diff --git a/frontend/src/metabase/entities/metrics.js b/frontend/src/metabase/entities/metrics.js
new file mode 100644
index 00000000000..274f42291be
--- /dev/null
+++ b/frontend/src/metabase/entities/metrics.js
@@ -0,0 +1,54 @@
+import {
+ metricApi,
+ useGetMetricQuery,
+ useListMetricsQuery,
+} from "metabase/api";
+import { color } from "metabase/lib/colors";
+import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
+import { MetricSchema } from "metabase/schema";
+import { getMetadata } from "metabase/selectors/metadata";
+
+/**
+ * @deprecated use "metabase/api" instead
+ */
+export const Metrics = createEntity({
+ name: "metrics",
+ nameOne: "metric",
+ path: "/api/metric",
+ schema: MetricSchema,
+
+ rtk: {
+ getUseGetQuery: () => ({
+ useGetQuery,
+ }),
+ useListQuery: useListMetricsQuery,
+ },
+
+ api: {
+ list: (entityQuery, dispatch) =>
+ entityCompatibleQuery(
+ entityQuery,
+ dispatch,
+ metricApi.endpoints.listMetrics,
+ ),
+ get: (entityQuery, options, dispatch) =>
+ entityCompatibleQuery(
+ entityQuery.id,
+ dispatch,
+ metricApi.endpoints.getMetric,
+ ),
+ },
+
+ selectors: {
+ getObject: (state, { entityId }) => getMetadata(state).metric(entityId),
+ },
+
+ objectSelectors: {
+ getName: (metric) => metric && metric.name,
+ getColor: () => color("summarize"),
+ },
+});
+
+const useGetQuery = ({ id }, options) => {
+ return useGetMetricQuery(id, options);
+};
diff --git a/frontend/src/metabase/lib/colors/constants/base-colors.ts b/frontend/src/metabase/lib/colors/constants/base-colors.ts
index febec63cda7..a0806d05d86 100644
--- a/frontend/src/metabase/lib/colors/constants/base-colors.ts
+++ b/frontend/src/metabase/lib/colors/constants/base-colors.ts
@@ -24,6 +24,20 @@ const baseColors = {
5: "color-mix(in srgb, var(--mb-color-brand), white 96%)",
},
+ filter: {
+ 100: "color-mix(in srgb, var(--mb-color-filter), black 86%)",
+ 90: "color-mix(in srgb, var(--mb-color-filter), black 75%)",
+ 80: "color-mix(in srgb, var(--mb-color-filter), black 62%)",
+ 70: "color-mix(in srgb, var(--mb-color-filter), black 47%)",
+ 60: "color-mix(in srgb, var(--mb-color-filter), black 28%)",
+ 50: "color-mix(in srgb, var(--mb-color-filter), black 12%)",
+ 40: "var(--mb-color-filter)", // This is the base filter color
+ 30: "color-mix(in srgb, var(--mb-color-filter), white 35%)",
+ 20: "color-mix(in srgb, var(--mb-color-filter), white 70%)",
+ 10: "color-mix(in srgb, var(--mb-color-filter), white 91%)",
+ 5: "color-mix(in srgb, var(--mb-color-filter), white 96%)",
+ },
+
// Deprecated Blue
blue: {
100: "hsla(208, 100%, 8%, 1.00)",
diff --git a/frontend/src/metabase/lib/colors/constants/themes/dark.ts b/frontend/src/metabase/lib/colors/constants/themes/dark.ts
index 3aba8f7cd47..181b9407c7a 100644
--- a/frontend/src/metabase/lib/colors/constants/themes/dark.ts
+++ b/frontend/src/metabase/lib/colors/constants/themes/dark.ts
@@ -16,6 +16,7 @@ export const METABASE_DARK_THEME: MetabaseThemeV2 = {
"admin-navbar-secondary": baseColors.octopus[60],
"admin-navbar-inverse": baseColors.octopus[60],
"background-brand": baseColors.brand[90],
+ "background-filter": baseColors.filter[90],
"background-disabled": baseColors.orionAlphaInverse[10],
"background-disabled-inverse": baseColors.orionAlpha[10],
"background-error-secondary": baseColors.lobster[90],
@@ -61,6 +62,7 @@ export const METABASE_DARK_THEME: MetabaseThemeV2 = {
"syntax-parameters-active": baseColors.mango[90],
"syntax-parameters": baseColors.mango[40],
"text-brand": baseColors.brand[40],
+ "text-filter": baseColors.filter[30],
"text-tertiary": baseColors.orionAlphaInverse[40],
"text-tertiary-inverse": baseColors.orionAlpha[40],
"text-hover": baseColors.brand[30],
@@ -81,6 +83,7 @@ export const METABASE_DARK_THEME: MetabaseThemeV2 = {
white: baseColors.orion[110],
border: baseColors.orionAlphaInverse[20],
"border-brand": baseColors.brand[80],
+ "border-filter": baseColors.filter[80],
"border-strong": baseColors.orionAlphaInverse[50],
"border-subtle": baseColors.orionAlphaInverse[10],
copper: "#B87333",
diff --git a/frontend/src/metabase/lib/colors/constants/themes/light.ts b/frontend/src/metabase/lib/colors/constants/themes/light.ts
index 3f7831428cf..9d9bb6d9d1e 100644
--- a/frontend/src/metabase/lib/colors/constants/themes/light.ts
+++ b/frontend/src/metabase/lib/colors/constants/themes/light.ts
@@ -16,6 +16,7 @@ export const METABASE_LIGHT_THEME: MetabaseThemeV2 = {
"admin-navbar-secondary": baseColors.octopus[40],
"admin-navbar-inverse": baseColors.octopus[80],
"background-brand": baseColors.brand[10],
+ "background-filter": baseColors.filter[5],
"background-disabled": baseColors.orionAlpha[10],
"background-disabled-inverse": baseColors.orionAlphaInverse[10],
"background-error-secondary": baseColors.lobster[5],
@@ -61,6 +62,7 @@ export const METABASE_LIGHT_THEME: MetabaseThemeV2 = {
"syntax-parameters-active": baseColors.mango[10],
"syntax-parameters": baseColors.mango[60],
"text-brand": baseColors.brand[50],
+ "text-filter": baseColors.filter[50],
"text-tertiary": baseColors.orionAlpha[40],
"text-tertiary-inverse": baseColors.orionAlphaInverse[40],
"text-hover": baseColors.brand[60],
@@ -83,6 +85,7 @@ export const METABASE_LIGHT_THEME: MetabaseThemeV2 = {
"border-brand": baseColors.brand[10],
"border-strong": baseColors.orionAlpha[50],
"border-subtle": baseColors.orionAlpha[10],
+ "border-filter": baseColors.filter[20],
copper: "#B87333",
bronze: "#CD7F32",
silver: "#C0C0C0",
diff --git a/frontend/src/metabase/lib/colors/types/color-keys.ts b/frontend/src/metabase/lib/colors/types/color-keys.ts
index 7092e4e6297..83e9632da9d 100644
--- a/frontend/src/metabase/lib/colors/types/color-keys.ts
+++ b/frontend/src/metabase/lib/colors/types/color-keys.ts
@@ -12,6 +12,7 @@ export type MetabaseColorKey =
| MetabaseAccentColorKey
| ProtectedColorKey
| "background-brand"
+ | "background-filter"
| "background-disabled"
| "background-disabled-inverse"
| "background-error"
@@ -30,6 +31,7 @@ export type MetabaseColorKey =
| "background-warning"
| "border"
| "border-brand"
+ | "border-filter"
| "border-strong"
| "border-subtle"
| "brand"
@@ -63,6 +65,7 @@ export type MetabaseColorKey =
| "syntax-parameters"
| "syntax-parameters-active"
| "text-brand"
+ | "text-filter"
| "text-hover"
| "text-primary"
| "text-primary-inverse"
diff --git a/frontend/src/metabase/lib/icon.ts b/frontend/src/metabase/lib/icon.ts
index 1b18b84732c..2d4fdbebd5f 100644
--- a/frontend/src/metabase/lib/icon.ts
+++ b/frontend/src/metabase/lib/icon.ts
@@ -54,6 +54,7 @@ export const modelIconMap: Record<IconModel, IconName> = {
model: "model",
card: "table2",
segment: "segment",
+ measure: "ruler",
metric: "metric",
snippet: "snippet",
nativequerysnippet: "snippet",
diff --git a/frontend/src/metabase/lib/objects.ts b/frontend/src/metabase/lib/objects.ts
index 53c8761c6ed..a76cc42d6c1 100644
--- a/frontend/src/metabase/lib/objects.ts
+++ b/frontend/src/metabase/lib/objects.ts
@@ -16,6 +16,12 @@ export const getObjectValues = <V>(obj: Record<string, V>): V[] => {
return Object.values(obj) as V[];
};
+export const objectFromEntries = <K extends string, V>(
+ entries: readonly (readonly [K, V])[],
+): Record<K, V> => {
+ return Object.fromEntries(entries) as Record<K, V>;
+};
+
// Stringify with sorted keys to ensure stable orders.
export const stableStringify = <T>(obj: T): string =>
JSON.stringify(sortObject(obj));
diff --git a/frontend/src/metabase/lib/urls/index.ts b/frontend/src/metabase/lib/urls/index.ts
index 8d242851db9..4dcfcdecfb4 100644
--- a/frontend/src/metabase/lib/urls/index.ts
+++ b/frontend/src/metabase/lib/urls/index.ts
@@ -9,6 +9,7 @@ export * from "./dashboards";
export * from "./dependencies";
export * from "./documents";
export * from "./indexed-entities";
+export * from "./metrics";
export * from "./modelToUrl";
export * from "./permissions";
export * from "./misc";
diff --git a/frontend/src/metabase/lib/urls/metrics.ts b/frontend/src/metabase/lib/urls/metrics.ts
new file mode 100644
index 00000000000..34bde45b350
--- /dev/null
+++ b/frontend/src/metabase/lib/urls/metrics.ts
@@ -0,0 +1,28 @@
+import type { CardOrSearchResult } from "./models";
+import { question } from "./questions";
+
+const METRICS_VIEWER_ROOT = "/explore";
+
+export function metricsViewer(hash?: string): string {
+ if (hash) {
+ return `${METRICS_VIEWER_ROOT}#${hash}`;
+ }
+ return METRICS_VIEWER_ROOT;
+}
+
+export function exploreMetric(metricId: number): string {
+ return `${METRICS_VIEWER_ROOT}?metricId=${metricId}`;
+}
+
+export function metric(card: CardOrSearchResult): string {
+ const id = card.card_id ?? card.id;
+ const numericId = typeof id === "number" ? id : parseInt(String(id), 10);
+ if (!isNaN(numericId)) {
+ return exploreMetric(numericId);
+ }
+ return question(card);
+}
+
+export function metricQuestionUrl(card: CardOrSearchResult): string {
+ return question({ ...card, type: "metric" });
+}
diff --git a/frontend/src/metabase/lib/urls/modelToUrl.ts b/frontend/src/metabase/lib/urls/modelToUrl.ts
index 27aee4679a2..43869efe0b5 100644
--- a/frontend/src/metabase/lib/urls/modelToUrl.ts
+++ b/frontend/src/metabase/lib/urls/modelToUrl.ts
@@ -13,7 +13,8 @@ import { dashboard } from "./dashboards";
import { dataStudioPublishedTableMeasure } from "./data-studio";
import { document } from "./documents";
import { indexedEntity } from "./indexed-entities";
-import { metric, model } from "./models";
+import { metric } from "./metrics";
+import { model } from "./models";
import { question, tableRowsQuery } from "./questions";
import { timeline } from "./timelines";
import { transform } from "./transforms";
diff --git a/frontend/src/metabase/lib/urls/models.ts b/frontend/src/metabase/lib/urls/models.ts
index 0ebc4794422..49e7d4d9d89 100644
--- a/frontend/src/metabase/lib/urls/models.ts
+++ b/frontend/src/metabase/lib/urls/models.ts
@@ -19,13 +19,6 @@ export function model(
return question(card, opts);
}
-export function metric(
- card: CardOrSearchResult,
- opts?: QuestionUrlBuilderParams,
-) {
- return question(card, opts);
-}
-
export function modelDetail(card: CardOrSearchResult, tab = "") {
const baseUrl = `${model({ ...card, type: "model" })}/detail`;
return tab ? `${baseUrl}/${tab}` : baseUrl;
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.module.css b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.module.css
new file mode 100644
index 00000000000..dd079fe4142
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.module.css
@@ -0,0 +1,11 @@
+.pickerContainer {
+ overflow-y: auto;
+}
+
+.dimensionList {
+ color: var(--mb-color-brand);
+}
+
+.itemWrapper:hover [data-bucket-trigger] {
+ visibility: visible;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
new file mode 100644
index 00000000000..f3345adbb7b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
@@ -0,0 +1,143 @@
+import type { ReactNode } from "react";
+import { useCallback, useMemo } from "react";
+
+import {
+ AccordionList,
+ type Section,
+} from "metabase/common/components/AccordionList";
+import {
+ type DimensionOption,
+ groupIntoSections,
+} from "metabase/common/components/DimensionPill";
+import { HoverParent } from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+import { Flex, Icon } from "metabase/ui";
+import type { MetricDefinition, ProjectionClause } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import { getDimensionsByType } from "../../utils/tabs";
+import { DimensionBinningPicker } from "../DimensionBinningPicker";
+import { DimensionTemporalUnitPicker } from "../DimensionTemporalUnitPicker";
+
+import S from "./BreakoutDimensionPicker.module.css";
+
+interface BreakoutDimensionPickerProps {
+ definition: MetricDefinition;
+ currentBreakoutDimension: ProjectionClause | undefined;
+ currentBreakoutDimensionName: string | null;
+ onSelect: (dimension: ProjectionClause | undefined) => void;
+ onClose: () => void;
+}
+
+export function BreakoutDimensionPicker({
+ definition,
+ currentBreakoutDimension,
+ currentBreakoutDimensionName,
+ onSelect,
+ onClose,
+}: BreakoutDimensionPickerProps) {
+ const dimensions = useMemo(
+ () => getDimensionsByType(definition),
+ [definition],
+ );
+
+ const sections: Section<DimensionOption>[] = useMemo(() => {
+ const items: DimensionOption[] = [...dimensions.values()].map((dim) => ({
+ ...dim,
+ selected: currentBreakoutDimensionName === dim.name,
+ }));
+
+ return groupIntoSections(items);
+ }, [dimensions, currentBreakoutDimensionName]);
+
+ const handleSelect = useCallback(
+ (dimension: ProjectionClause) => {
+ onSelect(dimension);
+ onClose();
+ },
+ [onSelect, onClose],
+ );
+
+ const handleChange = useCallback(
+ (item: DimensionOption) => {
+ handleSelect(LibMetric.dimensionReference(item.dimension));
+ },
+ [handleSelect],
+ );
+
+ const renderItemName = useCallback(
+ (item: DimensionOption) => item.displayName,
+ [],
+ );
+
+ const renderItemIcon = useCallback(
+ (item: DimensionOption) => <Icon name={item.icon} />,
+ [],
+ );
+
+ const itemIsSelected = useCallback(
+ (item: DimensionOption) => item.selected ?? false,
+ [],
+ );
+
+ const renderItemExtra = useCallback(
+ (item: DimensionOption, isSelected: boolean) => {
+ const isBinnable = LibMetric.isBinnable(definition, item.dimension);
+ const isTemporalBucketable = LibMetric.isTemporalBucketable(
+ definition,
+ item.dimension,
+ );
+
+ if (isTemporalBucketable) {
+ return (
+ <DimensionTemporalUnitPicker
+ definition={definition}
+ dimension={item.dimension}
+ activeDimension={isSelected ? currentBreakoutDimension : undefined}
+ isEditing={isSelected}
+ onSelect={handleSelect}
+ />
+ );
+ }
+
+ if (isBinnable) {
+ return (
+ <DimensionBinningPicker
+ definition={definition}
+ dimension={item.dimension}
+ activeDimension={isSelected ? currentBreakoutDimension : undefined}
+ isEditing={isSelected}
+ onSelect={handleSelect}
+ />
+ );
+ }
+
+ return null;
+ },
+ [definition, currentBreakoutDimension, handleSelect],
+ );
+
+ const renderItemWrapper = useCallback(
+ (content: ReactNode) => (
+ <HoverParent className={S.itemWrapper}>{content}</HoverParent>
+ ),
+ [],
+ );
+
+ return (
+ <Flex direction="column" mah="25rem" py="xs" className={S.pickerContainer}>
+ <AccordionList
+ className={S.dimensionList}
+ sections={sections}
+ onChange={handleChange}
+ renderItemName={renderItemName}
+ renderItemIcon={renderItemIcon}
+ renderItemExtra={renderItemExtra}
+ renderItemWrapper={renderItemWrapper}
+ itemIsSelected={itemIsSelected}
+ alwaysExpanded
+ maxHeight={Infinity}
+ width="16rem"
+ />
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/index.ts b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/index.ts
new file mode 100644
index 00000000000..baeeb164819
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/index.ts
@@ -0,0 +1 @@
+export { BreakoutDimensionPicker } from "./BreakoutDimensionPicker";
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutLegend/BreakoutLegend.module.css b/frontend/src/metabase/metrics-viewer/components/BreakoutLegend/BreakoutLegend.module.css
new file mode 100644
index 00000000000..4fe0d0dbb4b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutLegend/BreakoutLegend.module.css
@@ -0,0 +1,8 @@
+.root {
+ flex-shrink: 0;
+ overflow-y: auto;
+}
+
+.dot {
+ flex-shrink: 0;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutLegend/BreakoutLegend.tsx b/frontend/src/metabase/metrics-viewer/components/BreakoutLegend/BreakoutLegend.tsx
new file mode 100644
index 00000000000..a3e339e7d4f
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutLegend/BreakoutLegend.tsx
@@ -0,0 +1,80 @@
+import { useMemo } from "react";
+
+import { Box, Flex, Paper, Stack, Text, Title } from "metabase/ui";
+import type { MetricBreakoutValuesResponse } from "metabase-types/api";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ SourceColorMap,
+} from "../../types/viewer-state";
+import { buildLegendGroups } from "../../utils/legend";
+
+import S from "./BreakoutLegend.module.css";
+
+type BreakoutLegendProps = {
+ definitions: MetricsViewerDefinitionEntry[];
+ breakoutValuesBySourceId: Map<MetricSourceId, MetricBreakoutValuesResponse>;
+ sourceColors: SourceColorMap;
+};
+
+export function BreakoutLegend({
+ definitions,
+ breakoutValuesBySourceId,
+ sourceColors,
+}: BreakoutLegendProps) {
+ const groups = useMemo(
+ () =>
+ buildLegendGroups(definitions, breakoutValuesBySourceId, sourceColors),
+ [definitions, breakoutValuesBySourceId, sourceColors],
+ );
+
+ if (groups.length === 0) {
+ return null;
+ }
+
+ return (
+ <Box
+ className={S.root}
+ w="16rem"
+ pt="md"
+ pr="lg"
+ pb="md"
+ pl={0}
+ data-testid="metrics-viewer-breakout-legend"
+ >
+ <Paper withBorder radius="md" p="lg">
+ <Stack gap="lg">
+ {groups.map((group) => (
+ <Stack key={group.header} gap="sm">
+ <div>
+ <Title fw="bold" size="md" lh={1.3}>
+ {group.header}
+ </Title>
+ {group.subtitle && (
+ <Text size="sm" c="text-tertiary" lh={1.3}>
+ {group.subtitle}
+ </Text>
+ )}
+ </div>
+ {group.items.map((item) => (
+ <Flex key={item.label} align="center" gap="sm">
+ <Box
+ className={S.dot}
+ w="0.625rem"
+ h="0.625rem"
+ bdrs="50%"
+ style={{ background: item.color }}
+ />
+ <Text size="md" lh={1}>
+ {item.label}
+ </Text>
+ </Flex>
+ ))}
+ </Stack>
+ ))}
+ </Stack>
+ </Paper>
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/DimensionBinningPicker.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/DimensionBinningPicker.tsx
new file mode 100644
index 00000000000..e66ef4d9251
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/DimensionBinningPicker.tsx
@@ -0,0 +1,121 @@
+import { useCallback, useMemo } from "react";
+import { t } from "ttag";
+
+import {
+ type BucketItem,
+ BucketPickerPopover,
+} from "metabase/common/components/BucketPickerPopover";
+import type {
+ DimensionMetadata,
+ MetricDefinition,
+ ProjectionClause,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import { applyProjection } from "../../utils/definition-builder";
+
+interface DimensionBinningPickerProps {
+ definition: MetricDefinition;
+ dimension: DimensionMetadata;
+ activeDimension?: ProjectionClause;
+ isEditing: boolean;
+ onSelect: (dimension: ProjectionClause) => void;
+}
+
+export function DimensionBinningPicker({
+ definition,
+ dimension,
+ activeDimension,
+ isEditing,
+ onSelect,
+}: DimensionBinningPickerProps) {
+ const activeBucket = useMemo(() => {
+ if (!activeDimension) {
+ return null;
+ }
+ return LibMetric.binning(activeDimension);
+ }, [activeDimension]);
+
+ const hasExplicitBucket = activeBucket != null;
+
+ const activeBucketKey = useMemo(() => {
+ if (!activeBucket || !activeDimension) {
+ return null;
+ }
+ const tempDef = applyProjection(definition, activeDimension);
+ const strategies = LibMetric.availableBinningStrategies(tempDef, dimension);
+ for (const strategy of strategies) {
+ const info = LibMetric.displayInfo(tempDef, strategy);
+ if (info.selected) {
+ return info.displayName;
+ }
+ }
+ return null;
+ }, [definition, activeBucket, activeDimension, dimension]);
+
+ const strategies = useMemo(
+ () => LibMetric.availableBinningStrategies(definition, dimension),
+ [definition, dimension],
+ );
+
+ const items: BucketItem[] = useMemo(
+ () => [
+ ...strategies.map((strategy) => {
+ const info = LibMetric.displayInfo(definition, strategy);
+ const isSelected = isEditing
+ ? hasExplicitBucket
+ ? info.displayName === activeBucketKey
+ : (info.default ?? false)
+ : false;
+ return {
+ displayName: info.displayName,
+ isDefault: info.default,
+ isSelected,
+ };
+ }),
+ {
+ displayName: t`Don't bin`,
+ isSelected: false,
+ },
+ ],
+ [definition, strategies, hasExplicitBucket, activeBucketKey, isEditing],
+ );
+
+ const defaultBucket = useMemo(() => {
+ for (let i = 0; i < strategies.length; i++) {
+ const info = LibMetric.displayInfo(definition, strategies[i]);
+ if (info.default) {
+ return strategies[i];
+ }
+ }
+ return null;
+ }, [definition, strategies]);
+
+ const triggerLabel = useMemo(() => {
+ if (isEditing && activeBucketKey) {
+ return activeBucketKey;
+ }
+ if (defaultBucket) {
+ return LibMetric.displayInfo(definition, defaultBucket).displayName;
+ }
+ return t`Unbinned`;
+ }, [definition, activeBucketKey, defaultBucket, isEditing]);
+
+ const handleSelect = useCallback(
+ (item: BucketItem) => {
+ const index = items.indexOf(item);
+ const bucket = strategies.at(index) ?? null;
+ const newProjection = LibMetric.withBinning(dimension, bucket);
+ onSelect(newProjection);
+ },
+ [dimension, items, strategies, onSelect],
+ );
+
+ return (
+ <BucketPickerPopover
+ triggerLabel={triggerLabel}
+ items={items}
+ onSelect={handleSelect}
+ />
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/index.ts b/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/index.ts
new file mode 100644
index 00000000000..e4f3713b799
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/index.ts
@@ -0,0 +1 @@
+export { DimensionBinningPicker } from "./DimensionBinningPicker";
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/DimensionPillBar.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/DimensionPillBar.tsx
new file mode 100644
index 00000000000..2712f03000e
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/DimensionPillBar.tsx
@@ -0,0 +1,65 @@
+import type { DimensionOption } from "metabase/common/components/DimensionPill";
+import { DimensionPill } from "metabase/common/components/DimensionPill";
+import type { IconName } from "metabase/ui";
+import { Flex } from "metabase/ui";
+import type { DimensionMetadata } from "metabase-lib/metric";
+
+import type { MetricSourceId } from "../../types/viewer-state";
+
+export interface DimensionItem {
+ id: MetricSourceId;
+ label?: string;
+ icon?: IconName;
+ colors?: string[];
+ availableOptions: DimensionOption[];
+}
+
+export interface DimensionPillBarProps {
+ items: DimensionItem[];
+ onDimensionChange: (
+ itemId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) => void;
+ onDimensionRemove?: (itemId: MetricSourceId) => void;
+ disabled?: boolean;
+}
+
+export function DimensionPillBar({
+ items,
+ onDimensionChange,
+ onDimensionRemove,
+ disabled,
+}: DimensionPillBarProps) {
+ if (items.length === 0) {
+ return null;
+ }
+
+ return (
+ <Flex
+ bg="background-secondary"
+ p="sm"
+ bdrs="xl"
+ w="100%"
+ align="center"
+ justify="center"
+ gap="sm"
+ wrap="wrap"
+ data-testid="metrics-viewer-dimension-pill-container"
+ >
+ {items.map((item) => (
+ <DimensionPill
+ key={item.id}
+ label={item.label}
+ icon={item.icon}
+ colors={item.colors}
+ options={item.availableOptions}
+ onSelect={(dimension) => onDimensionChange(item.id, dimension)}
+ onRemove={
+ onDimensionRemove ? () => onDimensionRemove(item.id) : undefined
+ }
+ disabled={disabled}
+ />
+ ))}
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/index.ts b/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/index.ts
new file mode 100644
index 00000000000..24827e77ccf
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPillBar/index.ts
@@ -0,0 +1,2 @@
+export { DimensionPillBar } from "./DimensionPillBar";
+export type { DimensionPillBarProps, DimensionItem } from "./DimensionPillBar";
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/DimensionTemporalUnitPicker.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/DimensionTemporalUnitPicker.tsx
new file mode 100644
index 00000000000..561740186a1
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/DimensionTemporalUnitPicker.tsx
@@ -0,0 +1,130 @@
+import { useCallback, useMemo } from "react";
+import { t } from "ttag";
+
+import {
+ type BucketItem,
+ BucketPickerPopover,
+} from "metabase/common/components/BucketPickerPopover";
+import type {
+ DimensionMetadata,
+ MetricDefinition,
+ ProjectionClause,
+ TemporalBucketDisplayInfo,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+interface DimensionTemporalUnitPickerProps {
+ definition: MetricDefinition;
+ dimension: DimensionMetadata;
+ activeDimension?: ProjectionClause;
+ isEditing: boolean;
+ onSelect: (dimension: ProjectionClause) => void;
+}
+
+function isBucketSelected(
+ info: TemporalBucketDisplayInfo,
+ isEditing: boolean,
+ hasExplicitBucket: boolean,
+ activeBucketKey: string | null,
+): boolean {
+ if (!isEditing) {
+ return false;
+ }
+ if (hasExplicitBucket) {
+ return info.shortName === activeBucketKey;
+ }
+ return info.default ?? false;
+}
+
+export function DimensionTemporalUnitPicker({
+ definition,
+ dimension,
+ activeDimension,
+ isEditing,
+ onSelect,
+}: DimensionTemporalUnitPickerProps) {
+ const activeBucket = useMemo(() => {
+ if (!activeDimension) {
+ return null;
+ }
+ return LibMetric.temporalBucket(activeDimension);
+ }, [activeDimension]);
+
+ const hasExplicitBucket = activeBucket != null;
+
+ const activeBucketKey = useMemo(() => {
+ if (!activeBucket) {
+ return null;
+ }
+ return LibMetric.displayInfo(definition, activeBucket).shortName ?? null;
+ }, [definition, activeBucket]);
+
+ const buckets = useMemo(
+ () => LibMetric.availableTemporalBuckets(definition, dimension),
+ [definition, dimension],
+ );
+
+ const items: BucketItem[] = useMemo(
+ () => [
+ ...buckets.map((bucket) => {
+ const info = LibMetric.displayInfo(definition, bucket);
+ return {
+ displayName: info.displayName,
+ isDefault: info.default,
+ isSelected: isBucketSelected(
+ info,
+ isEditing,
+ hasExplicitBucket,
+ activeBucketKey,
+ ),
+ };
+ }),
+ {
+ displayName: t`Don't bin`,
+ isSelected: false,
+ },
+ ],
+ [definition, buckets, hasExplicitBucket, activeBucketKey, isEditing],
+ );
+
+ const defaultBucket = useMemo(
+ () =>
+ buckets.find(
+ (bucket) => LibMetric.displayInfo(definition, bucket).default,
+ ) ?? null,
+ [definition, buckets],
+ );
+
+ const triggerLabel = useMemo(() => {
+ if (isEditing && activeBucketKey) {
+ const displayBucket = activeBucket ?? defaultBucket;
+ if (displayBucket) {
+ const info = LibMetric.displayInfo(definition, displayBucket);
+ return t`by ${info.displayName.toLowerCase()}`;
+ }
+ }
+ if (defaultBucket) {
+ const info = LibMetric.displayInfo(definition, defaultBucket);
+ return t`by ${info.displayName.toLowerCase()}`;
+ }
+ return t`Unbinned`;
+ }, [definition, activeBucket, activeBucketKey, defaultBucket, isEditing]);
+
+ const handleSelect = useCallback(
+ (item: BucketItem) => {
+ const index = items.indexOf(item);
+ const bucket = buckets.at(index) ?? null;
+ const newProjection = LibMetric.withTemporalBucket(dimension, bucket);
+ onSelect(newProjection);
+ },
+ [dimension, items, buckets, onSelect],
+ );
+
+ return (
+ <BucketPickerPopover
+ triggerLabel={triggerLabel}
+ items={items}
+ onSelect={handleSelect}
+ />
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/index.ts b/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/index.ts
new file mode 100644
index 00000000000..d674407def5
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/index.ts
@@ -0,0 +1 @@
+export { DimensionTemporalUnitPicker } from "./DimensionTemporalUnitPicker";
diff --git a/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx b/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx
new file mode 100644
index 00000000000..b4cd4b2dfb8
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx
@@ -0,0 +1,53 @@
+import { t } from "ttag";
+
+import CS from "metabase/css/core/index.css";
+import { getSubpathSafeUrl } from "metabase/lib/urls";
+import { Box, Center, Stack, Text, Title } from "metabase/ui";
+
+function MetricsViewerEmptyStateLayout({
+ title,
+ description,
+}: {
+ title: string;
+ description: string;
+}): JSX.Element {
+ const imgSrc = getSubpathSafeUrl(
+ "app/assets/img/empty-states/visualizations/line.svg",
+ );
+
+ return (
+ <Center flex={1}>
+ <Stack>
+ <Box maw="20rem" mb="1.5rem">
+ <img
+ className={CS.pointerEventsNone}
+ src={imgSrc}
+ alt={t`Line chart illustration`}
+ />
+ </Box>
+ <Stack gap="0.5rem" maw="25rem" ta="center" align="center">
+ <Title order={4}>{title}</Title>
+ <Text c="text-secondary">{description}</Text>
+ </Stack>
+ </Stack>
+ </Center>
+ );
+}
+
+export function MetricsViewerEmptyState(): JSX.Element {
+ return (
+ <MetricsViewerEmptyStateLayout
+ title={t`Start exploring`}
+ description={t`Use the search above to find and select metrics.`}
+ />
+ );
+}
+
+export function MetricsViewerNoTabsEmptyState(): JSX.Element {
+ return (
+ <MetricsViewerEmptyStateLayout
+ title={t`Select a dimension to explore`}
+ description={t`Pick a dimension using the + button above to see how your metrics trend and break down.`}
+ />
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/EmptyState/index.ts b/frontend/src/metabase/metrics-viewer/components/EmptyState/index.ts
new file mode 100644
index 00000000000..cd8572dad54
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/EmptyState/index.ts
@@ -0,0 +1,4 @@
+export {
+ MetricsViewerEmptyState,
+ MetricsViewerNoTabsEmptyState,
+} from "./MetricViewerEmptyState";
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopover.module.css b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopover.module.css
new file mode 100644
index 00000000000..13ddd0f65a9
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopover.module.css
@@ -0,0 +1,45 @@
+.popoverTarget {
+ cursor: pointer;
+}
+
+.dropdown {
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+}
+
+.searchSection {
+ border-bottom: 1px solid var(--mb-color-border);
+}
+
+.listSection {
+ overflow-y: auto;
+}
+
+.dimensionList {
+ max-width: 100%;
+ color: var(--mb-color-brand);
+}
+
+.accordionItem {
+ &:not(:last-child) {
+ border-bottom: 1px solid var(--mb-color-border);
+ }
+}
+
+.accordionControl {
+ padding-block: 0.875rem;
+ cursor: pointer;
+}
+
+.accordionControlExpanded {
+ padding-bottom: 0.375rem;
+}
+
+.accordionHeader {
+ padding-block: 0.875rem;
+}
+
+.accordionHeaderExpanded {
+ padding-bottom: 0.375rem;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopover.tsx b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopover.tsx
new file mode 100644
index 00000000000..4d2f9d58c54
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopover.tsx
@@ -0,0 +1,73 @@
+import { useCallback, useState } from "react";
+
+import { Box, Popover } from "metabase/ui";
+import type { FilterClause, MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import type { MetricSourceId, SourceColorMap } from "../../types/viewer-state";
+
+import S from "./FilterPopover.module.css";
+import type { DefinitionSource } from "./FilterPopoverContent";
+import { FilterPopoverContent } from "./FilterPopoverContent";
+
+const POPOVER_MAX_HEIGHT = "37.5rem";
+
+interface FilterPopoverProps {
+ definitions: DefinitionSource[];
+ metricColors: SourceColorMap;
+ onUpdateDefinition: (
+ id: MetricSourceId,
+ definition: MetricDefinition,
+ ) => void;
+ children: React.ReactNode;
+}
+
+export function FilterPopover({
+ definitions,
+ metricColors,
+ onUpdateDefinition,
+ children,
+}: FilterPopoverProps) {
+ const [isOpen, setIsOpen] = useState(false);
+ const [contentKey, setContentKey] = useState(0);
+
+ const handleFilterApplied = useCallback(
+ (sourceId: MetricSourceId, filter: FilterClause) => {
+ const source = definitions.find(
+ (definition) => definition.id === sourceId,
+ );
+ if (!source) {
+ return;
+ }
+ const newDefinition = LibMetric.filter(source.definition, filter);
+ onUpdateDefinition(sourceId, newDefinition);
+ setIsOpen(false);
+ setContentKey((key) => key + 1);
+ },
+ [definitions, onUpdateDefinition],
+ );
+
+ const handleToggle = useCallback(() => {
+ setIsOpen((prev) => !prev);
+ }, []);
+
+ return (
+ <Popover position="bottom-end" opened={isOpen} onChange={setIsOpen}>
+ <Popover.Target>
+ <Box onClick={handleToggle} className={S.popoverTarget}>
+ {children}
+ </Box>
+ </Popover.Target>
+ <Popover.Dropdown p={0} mah={POPOVER_MAX_HEIGHT} className={S.dropdown}>
+ {definitions.length > 0 && (
+ <FilterPopoverContent
+ key={contentKey}
+ definitions={definitions}
+ metricColors={metricColors}
+ onFilterApplied={handleFilterApplied}
+ />
+ )}
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
new file mode 100644
index 00000000000..3b75c5e084b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
@@ -0,0 +1,281 @@
+import cx from "classnames";
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { AccordionList } from "metabase/common/components/AccordionList";
+import { SourceColorIndicator } from "metabase/common/components/SourceColorIndicator";
+import type {
+ DimensionListItem,
+ DimensionSection,
+} from "metabase/metrics/components/FilterPicker/FilterDimensionPicker/types";
+import { getMetricGroups } from "metabase/metrics/components/FilterPicker/FilterDimensionPicker/utils";
+import { FilterPickerBody } from "metabase/metrics/components/FilterPicker/FilterPickerBody";
+import { getDimensionIcon } from "metabase/metrics/utils/dimensions";
+import type { IconName } from "metabase/ui";
+import { Box, Flex, Icon, Text, TextInput, UnstyledButton } from "metabase/ui";
+import type {
+ DimensionMetadata,
+ FilterClause,
+ MetricDefinition,
+} from "metabase-lib/metric";
+
+import type { MetricSourceId, SourceColorMap } from "../../types/viewer-state";
+
+import S from "./FilterPopover.module.css";
+import { filterDisplayGroupsBySearch } from "./utils";
+
+const LIST_WIDTH = "20rem";
+const FILTER_WIDTH = "24rem";
+const DIMENSION_LIST_MAX_HEIGHT = Infinity;
+
+export type DefinitionSource = {
+ id: MetricSourceId;
+ definition: MetricDefinition;
+};
+
+type NavigationState =
+ | { view: "list" }
+ | { view: "filter"; definitionIndex: number; dimension: DimensionMetadata };
+
+type DisplayMetricGroup = {
+ id: MetricSourceId;
+ metricName: string;
+ icon: IconName;
+ colors: string[] | undefined;
+ sections: DimensionSection[];
+};
+
+interface FilterPopoverContentProps {
+ definitions: DefinitionSource[];
+ metricColors: SourceColorMap;
+ onFilterApplied: (id: MetricSourceId, filter: FilterClause) => void;
+}
+
+export function FilterPopoverContent({
+ definitions,
+ metricColors,
+ onFilterApplied,
+}: FilterPopoverContentProps) {
+ const [navState, setNavState] = useState<NavigationState>({ view: "list" });
+ const [expandedItems, setExpandedItems] = useState<string[]>([]);
+ const [searchText, setSearchText] = useState("");
+
+ const displayGroups = useMemo((): DisplayMetricGroup[] => {
+ const rawGroups = getMetricGroups(
+ definitions.map((definition) => definition.definition),
+ );
+ return rawGroups.map((group, index) => {
+ const sourceId = definitions[index].id;
+ return {
+ id: sourceId,
+ metricName: group.metricName,
+ icon: group.icon,
+ colors: metricColors[sourceId],
+ sections: group.sections,
+ };
+ });
+ }, [definitions, metricColors]);
+
+ const filteredDisplayGroups = useMemo(
+ () => filterDisplayGroupsBySearch(displayGroups, searchText),
+ [displayGroups, searchText],
+ );
+
+ const handleDimensionSelect = useCallback((item: DimensionListItem) => {
+ setNavState({
+ view: "filter",
+ definitionIndex: item.definitionIndex,
+ dimension: item.dimension,
+ });
+ }, []);
+
+ const handleBack = useCallback(() => {
+ setNavState({ view: "list" });
+ }, []);
+
+ const handleFilterSelect = useCallback(
+ (filter: FilterClause) => {
+ if (navState.view !== "filter") {
+ return;
+ }
+ const selected = definitions[navState.definitionIndex];
+ if (!selected) {
+ return;
+ }
+ onFilterApplied(selected.id, filter);
+ setNavState({ view: "list" });
+ },
+ [navState, definitions, onFilterApplied],
+ );
+
+ const toggleExpanded = useCallback((id: string) => {
+ setExpandedItems((prev) =>
+ prev.includes(id) ? prev.filter((item) => item !== id) : [...prev, id],
+ );
+ }, []);
+
+ const isSearching = filteredDisplayGroups !== null;
+ const visibleGroups = isSearching ? filteredDisplayGroups : displayGroups;
+ const hasNoResults = isSearching && visibleGroups.length === 0;
+ const showMetricHeaders = definitions.length > 1;
+
+ if (navState.view === "filter") {
+ const selected = definitions[navState.definitionIndex];
+ if (!selected) {
+ return null;
+ }
+ return (
+ <Box w={FILTER_WIDTH}>
+ <FilterPickerBody
+ definition={selected.definition}
+ dimension={navState.dimension}
+ isNew
+ onSelect={handleFilterSelect}
+ onBack={handleBack}
+ />
+ </Box>
+ );
+ }
+
+ return (
+ <>
+ <Box w={LIST_WIDTH} p="sm" className={S.searchSection}>
+ <TextInput
+ placeholder={t`Search dimensions...`}
+ value={searchText}
+ onChange={(event) => setSearchText(event.currentTarget.value)}
+ leftSection={<Icon name="search" size={16} />}
+ size="md"
+ radius="md"
+ />
+ </Box>
+
+ <Box w={LIST_WIDTH} className={S.listSection} flex={1} mih={0}>
+ {hasNoResults ? (
+ <Box p="xl">
+ <Text c="text-secondary" ta="center">
+ {t`No dimensions found`}
+ </Text>
+ </Box>
+ ) : showMetricHeaders ? (
+ <MetricGroupList
+ groups={visibleGroups}
+ expandedItems={expandedItems}
+ collapsible={!isSearching}
+ onToggleExpanded={toggleExpanded}
+ onDimensionSelect={handleDimensionSelect}
+ />
+ ) : (
+ <DimensionList
+ sections={visibleGroups[0]?.sections ?? []}
+ onSelect={handleDimensionSelect}
+ />
+ )}
+ </Box>
+ </>
+ );
+}
+
+function DimensionList({
+ sections,
+ onSelect,
+}: {
+ sections: DimensionSection[];
+ onSelect: (item: DimensionListItem) => void;
+}) {
+ const renderItemIcon = useCallback((item: DimensionListItem) => {
+ const icon = getDimensionIcon(item.dimension);
+ return <Icon name={icon} size={16} />;
+ }, []);
+
+ return (
+ <AccordionList<DimensionListItem, DimensionSection>
+ className={S.dimensionList}
+ sections={sections}
+ onChange={onSelect}
+ renderItemName={(item) => item.name}
+ renderItemIcon={renderItemIcon}
+ width="100%"
+ maxHeight={DIMENSION_LIST_MAX_HEIGHT}
+ searchable={false}
+ alwaysExpanded
+ />
+ );
+}
+
+function MetricGroupList({
+ groups,
+ expandedItems,
+ collapsible,
+ onToggleExpanded,
+ onDimensionSelect,
+}: {
+ groups: DisplayMetricGroup[];
+ expandedItems: string[];
+ collapsible: boolean;
+ onToggleExpanded: (id: string) => void;
+ onDimensionSelect: (item: DimensionListItem) => void;
+}) {
+ return (
+ <Box>
+ {groups.map((group) => {
+ const isExpanded = !collapsible || expandedItems.includes(group.id);
+ const hasDimensions = group.sections.some(
+ (section) => section.items && section.items.length > 0,
+ );
+ const showDimensions = isExpanded && hasDimensions;
+
+ return (
+ <Box key={group.id} className={S.accordionItem}>
+ {collapsible ? (
+ <UnstyledButton
+ className={cx(S.accordionControl, {
+ [S.accordionControlExpanded]: showDimensions,
+ })}
+ onClick={() => onToggleExpanded(group.id)}
+ w="100%"
+ >
+ <Flex align="center" gap="sm" px="md">
+ <SourceColorIndicator
+ colors={group.colors}
+ fallbackIcon={group.icon}
+ size={16}
+ />
+ <Box fw={700}>{group.metricName}</Box>
+ <Icon
+ name={isExpanded ? "chevronup" : "chevrondown"}
+ size={12}
+ />
+ </Flex>
+ </UnstyledButton>
+ ) : (
+ <Box
+ className={cx(S.accordionHeader, {
+ [S.accordionHeaderExpanded]: showDimensions,
+ })}
+ px="md"
+ >
+ <Flex align="center" gap="sm">
+ <SourceColorIndicator
+ colors={group.colors}
+ fallbackIcon={group.icon}
+ size={16}
+ />
+ <Box fw={700}>{group.metricName}</Box>
+ </Flex>
+ </Box>
+ )}
+ {showDimensions && (
+ <Box pb="sm">
+ <DimensionList
+ sections={group.sections}
+ onSelect={onDimensionSelect}
+ />
+ </Box>
+ )}
+ </Box>
+ );
+ })}
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/index.ts b/frontend/src/metabase/metrics-viewer/components/FilterPopover/index.ts
new file mode 100644
index 00000000000..1b4283a1b74
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/index.ts
@@ -0,0 +1 @@
+export { FilterPopover } from "./FilterPopover";
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/utils.ts b/frontend/src/metabase/metrics-viewer/components/FilterPopover/utils.ts
new file mode 100644
index 00000000000..0561d5eb441
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/utils.ts
@@ -0,0 +1,38 @@
+type NamedItem = { name: string };
+
+type SectionWithItems<TItem extends NamedItem> = {
+ items?: TItem[];
+ [key: string]: unknown;
+};
+
+type GroupWithSections<TItem extends NamedItem> = {
+ sections: SectionWithItems<TItem>[];
+ [key: string]: unknown;
+};
+
+export function filterDisplayGroupsBySearch<
+ TItem extends NamedItem,
+ TGroup extends GroupWithSections<TItem>,
+>(displayGroups: TGroup[], searchText: string): TGroup[] | null {
+ if (!searchText.trim()) {
+ return null;
+ }
+ const lowerSearch = searchText.toLowerCase();
+ return displayGroups
+ .map((group) => {
+ const filteredSections = group.sections
+ .map((section) => ({
+ ...section,
+ items: section.items?.filter((item) =>
+ item.name.toLowerCase().includes(lowerSearch),
+ ),
+ }))
+ .filter((section) => section.items && section.items.length > 0);
+
+ return {
+ ...group,
+ sections: filteredSections,
+ };
+ })
+ .filter((group) => group.sections.length > 0);
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/utils.unit.spec.ts b/frontend/src/metabase/metrics-viewer/components/FilterPopover/utils.unit.spec.ts
new file mode 100644
index 00000000000..ca5175a0d61
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/utils.unit.spec.ts
@@ -0,0 +1,95 @@
+import { filterDisplayGroupsBySearch } from "./utils";
+
+type TestItem = { name: string };
+
+type TestGroup = {
+ id: string;
+ sections: { name: string; items: TestItem[] }[];
+};
+
+function makeGroup(id: string, items: { name: string }[][]): TestGroup {
+ return {
+ id,
+ sections: items.map((sectionItems, index) => ({
+ name: `Section ${index}`,
+ items: sectionItems,
+ })),
+ };
+}
+
+describe("filterDisplayGroupsBySearch", () => {
+ const groups: TestGroup[] = [
+ makeGroup("revenue", [
+ [{ name: "Created At" }, { name: "Updated At" }],
+ [{ name: "Category" }, { name: "Region" }],
+ ]),
+ makeGroup("orders", [[{ name: "Order Date" }, { name: "Created At" }]]),
+ ];
+
+ it("returns null for empty search text", () => {
+ expect(filterDisplayGroupsBySearch(groups, "")).toBeNull();
+ });
+
+ it("returns null for whitespace-only search text", () => {
+ expect(filterDisplayGroupsBySearch(groups, " ")).toBeNull();
+ });
+
+ it("filters items with case-insensitive partial match", () => {
+ expect(filterDisplayGroupsBySearch(groups, "created")).toEqual([
+ {
+ id: "revenue",
+ sections: [{ name: "Section 0", items: [{ name: "Created At" }] }],
+ },
+ {
+ id: "orders",
+ sections: [{ name: "Section 0", items: [{ name: "Created At" }] }],
+ },
+ ]);
+ });
+
+ it("matches items across multiple sections in a group", () => {
+ expect(filterDisplayGroupsBySearch(groups, "at")).toEqual([
+ {
+ id: "revenue",
+ sections: [
+ {
+ name: "Section 0",
+ items: [{ name: "Created At" }, { name: "Updated At" }],
+ },
+ { name: "Section 1", items: [{ name: "Category" }] },
+ ],
+ },
+ {
+ id: "orders",
+ sections: [
+ {
+ name: "Section 0",
+ items: [{ name: "Order Date" }, { name: "Created At" }],
+ },
+ ],
+ },
+ ]);
+ });
+
+ it("returns empty array when nothing matches", () => {
+ expect(filterDisplayGroupsBySearch(groups, "zzzzz")).toEqual([]);
+ });
+
+ it("filters out groups with no matching sections", () => {
+ expect(filterDisplayGroupsBySearch(groups, "region")).toEqual([
+ {
+ id: "revenue",
+ sections: [{ name: "Section 1", items: [{ name: "Region" }] }],
+ },
+ ]);
+ });
+
+ it("filters out sections with no matching items", () => {
+ expect(filterDisplayGroupsBySearch(groups, "order date")).toEqual([
+ {
+ id: "orders",
+ sections: [{ name: "Section 0", items: [{ name: "Order Date" }] }],
+ },
+ ]);
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/BinningButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/BinningButton.tsx
new file mode 100644
index 00000000000..d4d9775bf0c
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/BinningButton.tsx
@@ -0,0 +1,108 @@
+import { useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { Box, Button, DefaultSelectItem, Icon, Popover } from "metabase/ui";
+import type {
+ DimensionMetadata,
+ MetricDefinition,
+ ProjectionClause,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import { UNBINNED } from "../../../constants";
+
+const MIN_WIDTH = "11.25rem";
+
+type BinningButtonProps = {
+ definition: MetricDefinition;
+ dimension: DimensionMetadata;
+ projection: ProjectionClause;
+ onBinningChange: (binningStrategy: string | undefined) => void;
+};
+
+export function BinningButton({
+ definition,
+ dimension,
+ projection,
+ onBinningChange,
+}: BinningButtonProps) {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const { hasBinning, availableStrategies, displayLabel } = useMemo(() => {
+ const binningVal = LibMetric.binning(projection);
+ const strategies = LibMetric.availableBinningStrategies(
+ definition,
+ dimension,
+ );
+
+ const items = strategies.map((strategy) => {
+ const info = LibMetric.displayInfo(definition, strategy);
+ return {
+ bucket: strategy,
+ displayName: info.displayName,
+ isSelected: info.selected ?? false,
+ isDefault: info.default ?? false,
+ };
+ });
+
+ const selectedItem = items.find((item) => item.isSelected);
+ const defaultItem = items.find((item) => item.isDefault);
+
+ let label: string;
+ if (binningVal) {
+ label =
+ selectedItem?.displayName ?? defaultItem?.displayName ?? t`Binned`;
+ } else {
+ label = t`Unbinned`;
+ }
+
+ return {
+ hasBinning: !!binningVal,
+ availableStrategies: items,
+ displayLabel: label,
+ };
+ }, [definition, dimension, projection]);
+
+ const handleSelect = (binningName: string) => {
+ onBinningChange(binningName);
+ setIsOpen(false);
+ };
+
+ return (
+ <Popover opened={isOpen} onChange={setIsOpen}>
+ <Popover.Target>
+ <Button
+ fw="bold"
+ py="xs"
+ px="sm"
+ variant="subtle"
+ color="text-primary"
+ rightSection={<Icon name="chevrondown" size={12} />}
+ onClick={() => setIsOpen(!isOpen)}
+ >
+ {displayLabel}
+ </Button>
+ </Popover.Target>
+ <Popover.Dropdown>
+ <Box p="sm" miw={MIN_WIDTH}>
+ {availableStrategies.map((item) => (
+ <DefaultSelectItem
+ key={item.displayName}
+ value={item.displayName}
+ label={item.displayName}
+ selected={item.isSelected}
+ onClick={() => handleSelect(item.displayName)}
+ role="option"
+ />
+ ))}
+ <DefaultSelectItem
+ value={t`Don't bin`}
+ selected={!hasBinning}
+ onClick={() => handleSelect(UNBINNED)}
+ role="option"
+ />
+ </Box>
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/index.ts
new file mode 100644
index 00000000000..e4334889950
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/BinningButton/index.ts
@@ -0,0 +1 @@
+export { BinningButton } from "./BinningButton";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx
new file mode 100644
index 00000000000..30b064e5e19
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/BucketButton.tsx
@@ -0,0 +1,81 @@
+import { useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { TemporalBucketPicker } from "metabase/metrics/components/TemporalBucketPicker";
+import type { DimensionWithDefinition } from "metabase/metrics/types";
+import { Button, Icon, Popover } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type {
+ DimensionMetadata,
+ MetricDefinition,
+ ProjectionClause,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { TemporalUnit } from "metabase-types/api";
+
+type BucketButtonProps = {
+ definition: MetricDefinition;
+ dimension: DimensionMetadata;
+ projection: ProjectionClause;
+ onChange: (unit: TemporalUnit | undefined) => void;
+};
+
+export function BucketButton({
+ definition,
+ dimension,
+ projection,
+ onChange,
+}: BucketButtonProps) {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const dimensions = useMemo<DimensionWithDefinition[]>(
+ () => [{ definition, dimension }],
+ [definition, dimension],
+ );
+
+ const currentUnit = useMemo(() => {
+ const bucket = LibMetric.temporalBucket(projection);
+ return bucket
+ ? LibMetric.displayInfo(definition, bucket).shortName
+ : undefined;
+ }, [definition, projection]);
+
+ const handleChange = (unit: TemporalUnit) => {
+ onChange(unit);
+ setIsOpen(false);
+ };
+
+ const handleRemove = () => {
+ onChange(undefined);
+ setIsOpen(false);
+ };
+
+ return (
+ <Popover opened={isOpen} onChange={setIsOpen}>
+ <Popover.Target>
+ <Button
+ fw="bold"
+ py="xs"
+ px="sm"
+ variant="subtle"
+ color="text-primary"
+ rightSection={<Icon name="chevrondown" size={12} />}
+ onClick={() => setIsOpen(!isOpen)}
+ >
+ {currentUnit
+ ? t`by ${Lib.describeTemporalUnit(currentUnit).toLowerCase()}`
+ : t`Unbinned`}
+ </Button>
+ </Popover.Target>
+ <Popover.Dropdown>
+ <TemporalBucketPicker
+ selectedUnit={currentUnit}
+ dimensions={dimensions}
+ canRemove
+ onSelect={handleChange}
+ onRemove={handleRemove}
+ />
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/index.ts
new file mode 100644
index 00000000000..6d101c77a3e
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/BucketButton/index.ts
@@ -0,0 +1 @@
+export { BucketButton } from "./BucketButton";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.module.css
new file mode 100644
index 00000000000..a1ac75000c6
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.module.css
@@ -0,0 +1,3 @@
+.selected {
+ box-shadow: 0 1px 2px var(--mb-color-shadow);
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.tsx
new file mode 100644
index 00000000000..bf34264ed3d
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/ChartTypePicker.tsx
@@ -0,0 +1,36 @@
+import { ActionIcon, Flex, Icon } from "metabase/ui";
+
+import type { MetricsViewerDisplayType } from "../../../types/viewer-state";
+import type { ChartTypeOption } from "../../../utils/tab-config";
+
+import S from "./ChartTypePicker.module.css";
+
+type ChartTypePickerProps = {
+ chartTypes: ChartTypeOption[];
+ value: MetricsViewerDisplayType;
+ onChange: (type: MetricsViewerDisplayType) => void;
+};
+
+export function ChartTypePicker({
+ chartTypes,
+ value,
+ onChange,
+}: ChartTypePickerProps) {
+ return (
+ <Flex gap="xs" bg="background-secondary" p="xs" bdrs="md">
+ {chartTypes.map(({ type, icon }) => (
+ <ActionIcon
+ w="2rem"
+ key={type}
+ variant={value === type ? "filled" : "subtle"}
+ bg={value === type ? "background-primary" : undefined}
+ onClick={() => onChange(type)}
+ aria-label={type}
+ className={value === type ? S.selected : undefined}
+ >
+ <Icon name={icon} c={value === type ? "brand" : "text-primary"} />
+ </ActionIcon>
+ ))}
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/index.ts
new file mode 100644
index 00000000000..b5e8208e8f2
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/ChartTypePicker/index.ts
@@ -0,0 +1 @@
+export { ChartTypePicker } from "./ChartTypePicker";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
new file mode 100644
index 00000000000..6d832e9c01e
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
@@ -0,0 +1,106 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { FilterPickerBody } from "metabase/metrics/components/FilterPicker/FilterPickerBody";
+import { Button, Icon, Popover } from "metabase/ui";
+import type {
+ DimensionMetadata,
+ FilterClause,
+ MetricDefinition,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import type { DimensionFilterValue } from "../../../utils/dimension-filters";
+import {
+ buildDimensionFilterClause,
+ parseFilter,
+} from "../../../utils/dimension-filters";
+
+import { getFilterDisplayName } from "./utils";
+
+type DimensionFilterButtonProps = {
+ definition: MetricDefinition;
+ filterDimension: DimensionMetadata;
+ filter?: FilterClause;
+ dimensionFilter?: DimensionFilterValue;
+ allFilterDimensions?: DimensionMetadata[];
+ onChange: (value: DimensionFilterValue | undefined) => void;
+};
+
+export function DimensionFilterButton({
+ definition,
+ filterDimension,
+ filter,
+ dimensionFilter,
+ allFilterDimensions,
+ onChange,
+}: DimensionFilterButtonProps) {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const reconstructedFilter = useMemo((): FilterClause | undefined => {
+ if (filter) {
+ return filter;
+ }
+ if (dimensionFilter) {
+ return buildDimensionFilterClause(filterDimension, dimensionFilter);
+ }
+ return undefined;
+ }, [filter, dimensionFilter, filterDimension]);
+
+ const isDateDimension = LibMetric.isDateOrDateTime(filterDimension);
+
+ const filterName = useMemo(() => {
+ if (dimensionFilter) {
+ return getFilterDisplayName(dimensionFilter);
+ }
+ if (isDateDimension) {
+ return t`All time`;
+ }
+ return t`All values`;
+ }, [dimensionFilter, isDateDimension]);
+
+ const handleSelect = useCallback(
+ (filterClause: FilterClause) => {
+ const parsed = parseFilter(definition, filterClause);
+ if (parsed) {
+ onChange(parsed.value);
+ }
+ setIsOpen(false);
+ },
+ [definition, onChange],
+ );
+
+ const handleClear = useCallback(() => {
+ onChange(undefined);
+ setIsOpen(false);
+ }, [onChange]);
+
+ return (
+ <Popover opened={isOpen} onChange={setIsOpen}>
+ <Popover.Target>
+ <Button
+ fw="bold"
+ py="xs"
+ px="sm"
+ variant="subtle"
+ color="text-primary"
+ rightSection={<Icon name="chevrondown" size={12} />}
+ onClick={() => setIsOpen(!isOpen)}
+ >
+ {filterName}
+ </Button>
+ </Popover.Target>
+ <Popover.Dropdown>
+ <FilterPickerBody
+ definition={definition}
+ dimension={filterDimension}
+ filter={reconstructedFilter}
+ isNew={!reconstructedFilter}
+ allFilterDimensions={allFilterDimensions}
+ onSelect={handleSelect}
+ onClear={reconstructedFilter ? handleClear : undefined}
+ />
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/index.ts
new file mode 100644
index 00000000000..7881c4223fd
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/index.ts
@@ -0,0 +1 @@
+export { DimensionFilterButton } from "./DimensionFilterButton";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/utils.ts
new file mode 100644
index 00000000000..db5fe38e1b9
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/utils.ts
@@ -0,0 +1,86 @@
+import { match } from "ts-pattern";
+import { t } from "ttag";
+
+import type { DatePickerValue } from "metabase/querying/common/types";
+import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";
+import * as Lib from "metabase-lib";
+
+import type { DimensionFilterValue } from "../../../utils/dimension-filters";
+
+function toDatePickerValue(
+ filter: Extract<
+ DimensionFilterValue,
+ { type: "specific-date" | "relative-date" | "exclude-date" }
+ >,
+): DatePickerValue {
+ switch (filter.type) {
+ case "specific-date":
+ return {
+ type: "specific",
+ operator: filter.operator,
+ values: filter.values,
+ hasTime: filter.hasTime,
+ };
+ case "relative-date":
+ return {
+ type: "relative",
+ unit: filter.unit,
+ value: filter.value,
+ offsetUnit: filter.offsetUnit ?? undefined,
+ offsetValue: filter.offsetValue ?? undefined,
+ options: filter.options,
+ };
+ case "exclude-date":
+ return {
+ type: "exclude",
+ operator: filter.operator,
+ unit: filter.unit ?? undefined,
+ values: filter.values,
+ };
+ }
+}
+
+export function getFilterDisplayName(
+ dimensionFilter: DimensionFilterValue,
+): string {
+ return match(dimensionFilter)
+ .with({ type: "boolean" }, (filter) => {
+ if (filter.operator === "=" && filter.values.length > 0) {
+ return filter.values[0] ? t`True` : t`False`;
+ }
+ return Lib.describeFilterOperator(filter.operator).toLowerCase();
+ })
+ .with({ type: "time" }, (filter) => {
+ const operator = Lib.describeFilterOperator(
+ filter.operator,
+ ).toLowerCase();
+ const formattedValues = filter.values
+ .map((date) => date.toLocaleTimeString())
+ .join(", ");
+ return `${operator} ${formattedValues}`;
+ })
+ .with(
+ { type: "string" },
+ { type: "number" },
+ { type: "coordinate" },
+ (filter) => {
+ const operator = Lib.describeFilterOperator(
+ filter.operator,
+ ).toLowerCase();
+ if (filter.values.length === 0) {
+ return operator;
+ }
+ return `${operator} ${filter.values.join(", ")}`;
+ },
+ )
+ .with(
+ { type: "specific-date" },
+ { type: "relative-date" },
+ { type: "exclude-date" },
+ (filter) => getDateFilterDisplayName(toDatePickerValue(filter)),
+ )
+ .with({ type: "default" }, (filter) =>
+ Lib.describeFilterOperator(filter.operator).toLowerCase(),
+ )
+ .exhaustive();
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css
new file mode 100644
index 00000000000..0f3c3f35753
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.module.css
@@ -0,0 +1,7 @@
+.container {
+ box-shadow: var(--mantine-shadow-sm);
+}
+
+.divider {
+ align-self: stretch;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
new file mode 100644
index 00000000000..d187f553af0
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
@@ -0,0 +1,130 @@
+import { useMemo } from "react";
+
+import { Divider, Flex } from "metabase/ui";
+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
+import type { TemporalUnit } from "metabase-types/api";
+
+import type {
+ MetricsViewerDisplayType,
+ MetricsViewerTabType,
+} from "../../types/viewer-state";
+import { getProjectionInfo } from "../../utils/definition-builder";
+import type { DimensionFilterValue } from "../../utils/dimension-filters";
+import { getTabConfig } from "../../utils/tab-config";
+
+import { BinningButton } from "./BinningButton";
+import { BucketButton } from "./BucketButton";
+import { ChartTypePicker } from "./ChartTypePicker";
+import { DimensionFilterButton } from "./DimensionFilterButton";
+import S from "./MetricControls.module.css";
+
+function isValidDisplayTypeForTab(
+ displayType: MetricsViewerDisplayType,
+ tabType: MetricsViewerTabType,
+): boolean {
+ const config = getTabConfig(tabType);
+ return config.availableDisplayTypes.some((t) => t.type === displayType);
+}
+
+type MetricControlsProps = {
+ definition: MetricDefinition;
+ displayType: MetricsViewerDisplayType;
+ tabType: MetricsViewerTabType;
+ dimensionFilter?: DimensionFilterValue;
+ allFilterDimensions?: DimensionMetadata[];
+ onDisplayTypeChange: (displayType: MetricsViewerDisplayType) => void;
+ onDimensionFilterChange: (value: DimensionFilterValue | undefined) => void;
+ onTemporalUnitChange: (unit: TemporalUnit | undefined) => void;
+ onBinningChange: (binningStrategy: string | undefined) => void;
+};
+
+export function MetricControls({
+ definition,
+ displayType,
+ tabType,
+ dimensionFilter,
+ allFilterDimensions,
+ onDisplayTypeChange,
+ onDimensionFilterChange,
+ onTemporalUnitChange,
+ onBinningChange,
+}: MetricControlsProps) {
+ const projectionInfo = useMemo(
+ () => getProjectionInfo(definition),
+ [definition],
+ );
+
+ const hasFilterControls =
+ projectionInfo.projection && projectionInfo.filterDimension;
+
+ const hasBucketControls =
+ hasFilterControls && projectionInfo.isTemporalBucketable;
+
+ const hasBinningControls =
+ !hasBucketControls &&
+ projectionInfo.projection &&
+ projectionInfo.projectionDimension &&
+ (projectionInfo.isBinnable || projectionInfo.hasBinning);
+
+ const config = getTabConfig(tabType);
+ const chartTypes = config.availableDisplayTypes;
+ const effectiveDisplayType = isValidDisplayTypeForTab(displayType, tabType)
+ ? displayType
+ : config.defaultDisplayType;
+
+ return (
+ <Flex
+ h="3rem"
+ className={S.container}
+ display="inline-flex"
+ bg="background-primary"
+ bd="1px solid var(--mb-color-border)"
+ bdrs="lg"
+ px="sm"
+ align="center"
+ gap="xs"
+ data-testid="metrics-viewer-controls"
+ >
+ <ChartTypePicker
+ chartTypes={chartTypes}
+ value={effectiveDisplayType}
+ onChange={onDisplayTypeChange}
+ />
+ {hasFilterControls && projectionInfo.filterDimension && (
+ <>
+ <Divider orientation="vertical" className={S.divider} mx="xs" />
+ <DimensionFilterButton
+ definition={definition}
+ filterDimension={projectionInfo.filterDimension}
+ filter={projectionInfo.filter}
+ dimensionFilter={dimensionFilter}
+ allFilterDimensions={allFilterDimensions}
+ onChange={onDimensionFilterChange}
+ />
+ </>
+ )}
+ {hasBucketControls && projectionInfo.projectionDimension && (
+ <>
+ <Divider orientation="vertical" className={S.divider} mx="xs" />
+ <BucketButton
+ definition={definition}
+ dimension={projectionInfo.projectionDimension}
+ projection={projectionInfo.projection!}
+ onChange={onTemporalUnitChange}
+ />
+ </>
+ )}
+ {hasBinningControls && projectionInfo.projectionDimension && (
+ <>
+ <Divider orientation="vertical" className={S.divider} mx="xs" />
+ <BinningButton
+ definition={definition}
+ dimension={projectionInfo.projectionDimension}
+ projection={projectionInfo.projection!}
+ onBinningChange={onBinningChange}
+ />
+ </>
+ )}
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricControls/index.ts
new file mode 100644
index 00000000000..f2eaf2cbeb4
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/index.ts
@@ -0,0 +1 @@
+export { MetricControls } from "./MetricControls";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.module.css
new file mode 100644
index 00000000000..1aa8fe63eb3
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.module.css
@@ -0,0 +1,15 @@
+.metricPill {
+ background-color: var(--mb-color-background-primary);
+ border-radius: var(--mantine-radius-md);
+ cursor: pointer;
+ transition: background-color 150ms ease;
+ box-shadow: var(--mantine-shadow-xs);
+}
+
+.metricPill:hover {
+ background-color: var(--mb-color-background-brand);
+}
+
+.menuTarget {
+ pointer-events: none;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
new file mode 100644
index 00000000000..a6839123f18
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
@@ -0,0 +1,293 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { SourceColorIndicator } from "metabase/common/components/SourceColorIndicator";
+import { canAccessDataStudio } from "metabase/data-studio/selectors";
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import {
+ dataStudioMetric,
+ dataStudioPublishedTableMeasure,
+} from "metabase/lib/urls/data-studio";
+import { Box, Flex, Icon, Menu, Pill, Popover, Skeleton } from "metabase/ui";
+import type { ProjectionClause } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import type {
+ MetricsViewerDefinitionEntry,
+ SelectedMetric,
+} from "../../../types/viewer-state";
+import { getEntryBreakout } from "../../../utils/definition-entries";
+import { getDimensionsByType } from "../../../utils/tabs";
+import { BreakoutDimensionPicker } from "../../BreakoutDimensionPicker";
+import { MetricSearchDropdown } from "../MetricSearchDropdown";
+
+import S from "./MetricPill.module.css";
+
+type PillPopoverState = "closed" | "swap" | "context-menu" | "breakout-picker";
+
+type MetricPillProps = {
+ metric: SelectedMetric;
+ colors?: string[];
+ definitionEntry: MetricsViewerDefinitionEntry;
+ selectedMetricIds: Set<number>;
+ selectedMeasureIds: Set<number>;
+ onSwap: (oldMetric: SelectedMetric, newMetric: SelectedMetric) => void;
+ onRemove: (metricId: number, sourceType: "metric" | "measure") => void;
+ onSetBreakout: (dimension: ProjectionClause | undefined) => void;
+ onOpen?: () => void;
+};
+
+export function MetricPill({
+ metric,
+ colors,
+ definitionEntry,
+ selectedMetricIds,
+ selectedMeasureIds,
+ onSwap,
+ onRemove,
+ onSetBreakout,
+ onOpen,
+}: MetricPillProps) {
+ const [popoverState, setPopoverState] = useState<PillPopoverState>("closed");
+ const hasDataStudioAccess = useSelector(canAccessDataStudio);
+
+ const dimensions = useMemo(
+ () =>
+ definitionEntry.definition
+ ? getDimensionsByType(definitionEntry.definition)
+ : new Map(),
+ [definitionEntry.definition],
+ );
+
+ const { definition } = definitionEntry;
+
+ const breakoutDimension = useMemo(
+ () => getEntryBreakout(definitionEntry),
+ [definitionEntry],
+ );
+
+ const breakoutDimensionName = useMemo(() => {
+ if (!breakoutDimension || !definition) {
+ return null;
+ }
+ const rawDim = LibMetric.projectionDimension(definition, breakoutDimension);
+ if (!rawDim) {
+ return null;
+ }
+ return LibMetric.displayInfo(definition, rawDim).name ?? null;
+ }, [breakoutDimension, definition]);
+
+ const handleSelect = useCallback(
+ (newMetric: SelectedMetric) => {
+ onSwap(metric, newMetric);
+ setPopoverState("closed");
+ },
+ [metric, onSwap],
+ );
+
+ const handleClose = useCallback(() => {
+ setPopoverState("closed");
+ }, []);
+
+ const handleOpen = useCallback(() => {
+ onOpen?.();
+ setPopoverState("swap");
+ }, [onOpen]);
+
+ const handleContextMenu = useCallback((e: React.MouseEvent) => {
+ e.preventDefault();
+ e.stopPropagation();
+ setPopoverState("context-menu");
+ }, []);
+
+ const handleEditInDataStudio = useCallback(() => {
+ if (metric.sourceType === "measure" && metric.tableId != null) {
+ window.open(
+ dataStudioPublishedTableMeasure(metric.tableId, metric.id),
+ "_blank",
+ );
+ } else {
+ window.open(dataStudioMetric(metric.id), "_blank");
+ }
+ setPopoverState("closed");
+ }, [metric]);
+
+ const handleOpenBreakoutPicker = useCallback(() => {
+ setPopoverState("breakout-picker");
+ }, []);
+
+ const handleRemoveBreakout = useCallback(() => {
+ onSetBreakout(undefined);
+ setPopoverState("closed");
+ }, [onSetBreakout]);
+
+ return (
+ <Box component="span" pos="relative" display="inline-flex">
+ <Popover
+ opened={popoverState === "swap"}
+ onChange={(opened) => {
+ if (!opened) {
+ setPopoverState("closed");
+ }
+ }}
+ position="bottom-start"
+ shadow="md"
+ withinPortal
+ trapFocus
+ >
+ <Popover.Target>
+ <Pill
+ className={S.metricPill}
+ c="text-primary"
+ h="2rem"
+ px="sm"
+ py="xs"
+ fw={600}
+ withRemoveButton
+ onRemove={() => {
+ onRemove(metric.id, metric.sourceType);
+ }}
+ onClick={(e) => {
+ e.stopPropagation();
+ handleOpen();
+ }}
+ onContextMenu={handleContextMenu}
+ removeButtonProps={{
+ mr: 0,
+ "aria-label": metric.name
+ ? t`Remove ${metric.name}`
+ : t`Remove metric`,
+ }}
+ data-testid="metrics-viewer-search-pill"
+ >
+ <Flex align="center" gap="xs">
+ {metric.isLoading ? (
+ <Skeleton mt="xs" w="4.5rem" h="1rem" />
+ ) : (
+ <>
+ <SourceColorIndicator
+ colors={colors}
+ fallbackIcon={
+ metric.sourceType === "measure" ? "ruler" : "metric"
+ }
+ />
+ <span>{metric.name}</span>
+ </>
+ )}
+ </Flex>
+ </Pill>
+ </Popover.Target>
+ <Popover.Dropdown p={0}>
+ <MetricSearchDropdown
+ selectedMetricIds={selectedMetricIds}
+ selectedMeasureIds={selectedMeasureIds}
+ onSelect={handleSelect}
+ onClose={handleClose}
+ excludeMetric={{
+ id: metric.id,
+ sourceType: metric.sourceType,
+ }}
+ showSearchInput
+ />
+ </Popover.Dropdown>
+ </Popover>
+ <Menu
+ opened={popoverState === "context-menu"}
+ onChange={(opened) => {
+ if (!opened) {
+ setPopoverState((prev) =>
+ prev === "context-menu" ? "closed" : prev,
+ );
+ }
+ }}
+ position="bottom-start"
+ withinPortal
+ >
+ <Menu.Target>
+ <Box
+ component="span"
+ pos="absolute"
+ inset={0}
+ className={S.menuTarget}
+ />
+ </Menu.Target>
+ <Menu.Dropdown>
+ {dimensions.size > 0 && definition && (
+ <>
+ {breakoutDimension && (
+ <Menu.Item
+ leftSection={<Icon name="close" />}
+ onClick={handleRemoveBreakout}
+ >
+ {t`Remove breakout`}
+ </Menu.Item>
+ )}
+ <Menu.Item
+ leftSection={<Icon name="arrow_split" />}
+ onClick={handleOpenBreakoutPicker}
+ >
+ {breakoutDimension ? t`Change breakout` : t`Break out`}
+ </Menu.Item>
+ <Menu.Divider />
+ </>
+ )}
+ {hasDataStudioAccess && (
+ <Menu.Item
+ leftSection={<Icon name="pencil" />}
+ rightSection={<Icon name="external" />}
+ onClick={handleEditInDataStudio}
+ >
+ {t`Edit in Data Studio`}
+ </Menu.Item>
+ )}
+ {metric.sourceType === "metric" && (
+ <Menu.Item
+ leftSection={<Icon name="info" />}
+ rightSection={<Icon name="external" />}
+ component={ForwardRefLink}
+ to={Urls.metricQuestionUrl({
+ id: metric.id,
+ name: metric.name ?? undefined,
+ })}
+ >
+ {t`Go to metric home page`}
+ </Menu.Item>
+ )}
+ </Menu.Dropdown>
+ </Menu>
+ {definition && (
+ <Popover
+ opened={popoverState === "breakout-picker"}
+ onChange={(opened) => {
+ if (!opened) {
+ setPopoverState("closed");
+ }
+ }}
+ position="bottom-start"
+ shadow="md"
+ withinPortal
+ >
+ <Popover.Target>
+ <Box
+ component="span"
+ pos="absolute"
+ inset={0}
+ className={S.menuTarget}
+ />
+ </Popover.Target>
+ <Popover.Dropdown p={0}>
+ <BreakoutDimensionPicker
+ definition={definition}
+ currentBreakoutDimension={breakoutDimension}
+ currentBreakoutDimensionName={breakoutDimensionName}
+ onSelect={onSetBreakout}
+ onClose={handleClose}
+ />
+ </Popover.Dropdown>
+ </Popover>
+ )}
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/index.ts
new file mode 100644
index 00000000000..b9d6fcf4fe4
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/index.ts
@@ -0,0 +1 @@
+export { MetricPill } from "./MetricPill";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.module.css
new file mode 100644
index 00000000000..97cdbb481a8
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.module.css
@@ -0,0 +1,13 @@
+.resultItem {
+ cursor: pointer;
+ border-radius: var(--mantine-radius-sm);
+}
+
+.resultItem:hover {
+ background-color: var(--mb-color-background-hover);
+}
+
+.resultItem[data-active] {
+ background-color: var(--mb-color-background-hover);
+ color: var(--mb-color-text-hover);
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.tsx
new file mode 100644
index 00000000000..9a6f2c831eb
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/MetricResultItem.tsx
@@ -0,0 +1,47 @@
+import { forwardRef } from "react";
+
+import type { IconName } from "metabase/ui";
+import { Flex, Icon, Text } from "metabase/ui";
+
+import S from "./MetricResultItem.module.css";
+
+type MetricResultItemProps = {
+ name: string;
+ slug?: string;
+ icon?: IconName;
+ active?: boolean;
+ onClick?: () => void;
+};
+
+export const MetricResultItem = forwardRef<
+ HTMLDivElement,
+ MetricResultItemProps
+>(function MetricResultItem(
+ { name, slug, icon = "metric", active = false, onClick },
+ ref,
+) {
+ return (
+ <Flex
+ ref={ref}
+ px="sm"
+ py="xs"
+ align="center"
+ gap="xs"
+ mih="2.25rem"
+ c="text-primary"
+ className={S.resultItem}
+ data-active={active || undefined}
+ onClick={onClick}
+ >
+ <Icon name={icon} c="text-tertiary" flex="0 0 auto" />
+ <Text lh="md" lineClamp={1} flex="1">
+ {name}
+ </Text>
+ {slug && (
+ <Text fz="xs" c="text-tertiary" flex="0 0 auto">
+ {slug}
+ </Text>
+ )}
+ </Flex>
+ );
+});
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/index.ts
new file mode 100644
index 00000000000..8445a4caf5b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricResultItem/index.ts
@@ -0,0 +1 @@
+export { MetricResultItem } from "./MetricResultItem";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.module.css
new file mode 100644
index 00000000000..b6cb462fff3
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.module.css
@@ -0,0 +1,7 @@
+.searchInputWrapper {
+ border-bottom: 1px solid var(--mb-color-border);
+}
+
+.resultsContainer {
+ overflow-y: auto;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
new file mode 100644
index 00000000000..48f0937addd
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
@@ -0,0 +1,140 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";
+import { Box, Flex, TextInput } from "metabase/ui";
+
+import {
+ type MetricOrMeasureResult,
+ useMetricMeasureSearch,
+} from "../../../hooks/use-metric-measure-search";
+import type { SelectedMetric } from "../../../types/viewer-state";
+import { MetricSearchResults } from "../MetricSearchResults";
+import { filterSearchResults } from "../utils";
+
+import S from "./MetricSearchDropdown.module.css";
+
+type ExcludeMetric = {
+ id: number;
+ sourceType: "metric" | "measure";
+};
+
+type MetricSearchDropdownProps = {
+ selectedMetricIds: Set<number>;
+ selectedMeasureIds: Set<number>;
+ onSelect: (metric: SelectedMetric) => void;
+ onClose?: () => void;
+ excludeMetric?: ExcludeMetric;
+ showSearchInput?: boolean;
+ externalSearchText?: string;
+};
+
+export function MetricSearchDropdown({
+ selectedMetricIds,
+ selectedMeasureIds,
+ onSelect,
+ onClose,
+ excludeMetric,
+ showSearchInput = false,
+ externalSearchText,
+}: MetricSearchDropdownProps) {
+ const [internalSearchText, setInternalSearchText] = useState("");
+ const searchText = showSearchInput
+ ? internalSearchText
+ : (externalSearchText ?? "");
+
+ const { results, isLoading } = useMetricMeasureSearch(searchText);
+
+ const filteredResults = useMemo(
+ () =>
+ filterSearchResults(
+ results,
+ selectedMetricIds,
+ selectedMeasureIds,
+ excludeMetric,
+ ),
+ [results, selectedMetricIds, selectedMeasureIds, excludeMetric],
+ );
+
+ const handleSelectResult = useCallback(
+ (id: number, model: "metric" | "measure") => {
+ const result = results?.find((r) => r.id === id && r.model === model);
+ if (result) {
+ onSelect({
+ id,
+ name: result.name,
+ sourceType: result.model,
+ tableId:
+ result.model === "measure" && typeof result.table_id === "number"
+ ? result.table_id
+ : undefined,
+ });
+ }
+ },
+ [results, onSelect],
+ );
+
+ const handleEnter = useCallback(
+ (item: (typeof filteredResults)[number]) => {
+ handleSelectResult(item.id, item.model);
+ },
+ [handleSelectResult],
+ );
+
+ const { cursorIndex, getRef } = useListKeyboardNavigation<
+ MetricOrMeasureResult,
+ HTMLDivElement
+ >({
+ list: filteredResults,
+ onEnter: handleEnter,
+ });
+
+ const handleKeyDown = useCallback(
+ (e: React.KeyboardEvent) => {
+ if (e.key === "Escape") {
+ onClose?.();
+ }
+ },
+ [onClose],
+ );
+
+ if (showSearchInput) {
+ return (
+ <Flex
+ direction="column"
+ w="22rem"
+ mah="25rem"
+ onClick={(e) => e.stopPropagation()}
+ >
+ <Box p="sm" className={S.searchInputWrapper}>
+ <TextInput
+ placeholder={t`Search for metrics...`}
+ value={internalSearchText}
+ onChange={(e) => setInternalSearchText(e.target.value)}
+ onKeyDown={handleKeyDown}
+ autoFocus
+ />
+ </Box>
+ <Box flex={1} className={S.resultsContainer}>
+ <MetricSearchResults
+ results={filteredResults}
+ isLoading={isLoading}
+ cursorIndex={cursorIndex}
+ getRef={getRef}
+ onSelectResult={handleSelectResult}
+ />
+ </Box>
+ </Flex>
+ );
+ }
+
+ return (
+ <MetricSearchResults
+ results={filteredResults}
+ isLoading={isLoading}
+ cursorIndex={cursorIndex}
+ getRef={getRef}
+ onSelectResult={handleSelectResult}
+ />
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/index.ts
new file mode 100644
index 00000000000..3b9bc8c964f
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/index.ts
@@ -0,0 +1 @@
+export { MetricSearchDropdown } from "./MetricSearchDropdown";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.module.css
new file mode 100644
index 00000000000..1eb7e2b58d8
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.module.css
@@ -0,0 +1,15 @@
+.inputWrapper {
+ cursor: text;
+}
+
+.inputField {
+ background: transparent;
+ border: none;
+ padding: 0;
+ height: auto;
+ min-height: unset;
+}
+
+.inputField::placeholder {
+ color: var(--mb-color-text-tertiary);
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
new file mode 100644
index 00000000000..641873ea236
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.tsx
@@ -0,0 +1,172 @@
+import { useCallback, useMemo, useRef, useState } from "react";
+import { t } from "ttag";
+
+import { Flex, Popover, TextInput } from "metabase/ui";
+import type { ProjectionClause } from "metabase-lib/metric";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ SelectedMetric,
+ SourceColorMap,
+} from "../../../types/viewer-state";
+import {
+ createMeasureSourceId,
+ createMetricSourceId,
+} from "../../../utils/source-ids";
+import { MetricPill } from "../MetricPill";
+import { MetricSearchDropdown } from "../MetricSearchDropdown";
+import { getSelectedMeasureIds, getSelectedMetricIds } from "../utils";
+
+import S from "./MetricSearchInput.module.css";
+
+type MetricSearchInputProps = {
+ selectedMetrics: SelectedMetric[];
+ metricColors: SourceColorMap;
+ definitions: MetricsViewerDefinitionEntry[];
+ onAddMetric: (metric: SelectedMetric) => void;
+ onRemoveMetric: (metricId: number, sourceType: "metric" | "measure") => void;
+ onSwapMetric: (oldMetric: SelectedMetric, newMetric: SelectedMetric) => void;
+ onSetBreakout: (
+ id: MetricSourceId,
+ dimension: ProjectionClause | undefined,
+ ) => void;
+};
+
+export function MetricSearchInput({
+ selectedMetrics,
+ metricColors,
+ definitions,
+ onAddMetric,
+ onRemoveMetric,
+ onSwapMetric,
+ onSetBreakout,
+}: MetricSearchInputProps) {
+ const [searchText, setSearchText] = useState("");
+ const [isOpen, setIsOpen] = useState(false);
+ const inputRef = useRef<HTMLInputElement>(null);
+
+ const selectedMetricIds = useMemo(
+ () => getSelectedMetricIds(selectedMetrics),
+ [selectedMetrics],
+ );
+
+ const selectedMeasureIds = useMemo(
+ () => getSelectedMeasureIds(selectedMetrics),
+ [selectedMetrics],
+ );
+
+ const definitionsBySourceId = useMemo(
+ () => new Map(definitions.map((entry) => [entry.id, entry] as const)),
+ [definitions],
+ );
+
+ const handleSelect = useCallback(
+ (metric: SelectedMetric) => {
+ onAddMetric(metric);
+ setSearchText("");
+ setIsOpen(false);
+ },
+ [onAddMetric],
+ );
+
+ const handleKeyDown = useCallback(
+ (event: React.KeyboardEvent) => {
+ if (
+ event.key === "Backspace" &&
+ searchText === "" &&
+ selectedMetrics.length > 0
+ ) {
+ const last = selectedMetrics[selectedMetrics.length - 1];
+ onRemoveMetric(last.id, last.sourceType);
+ }
+ },
+ [searchText, selectedMetrics, onRemoveMetric],
+ );
+
+ const handleContainerClick = useCallback(() => {
+ inputRef.current?.focus();
+ }, []);
+
+ const handleInputClick = useCallback(() => {
+ setIsOpen(true);
+ }, []);
+
+ return (
+ <Flex
+ className={S.inputWrapper}
+ bg="background-secondary"
+ align="center"
+ gap="sm"
+ px="sm"
+ py="xs"
+ onClick={handleContainerClick}
+ >
+ <Flex align="center" gap="sm" flex={1} wrap="wrap" mih="2.25rem">
+ {selectedMetrics.map((metric) => {
+ const sid =
+ metric.sourceType === "metric"
+ ? createMetricSourceId(metric.id)
+ : createMeasureSourceId(metric.id);
+ const entry = definitionsBySourceId.get(sid);
+ if (!entry) {
+ return null;
+ }
+ return (
+ <MetricPill
+ key={`${metric.sourceType}-${metric.id}`}
+ metric={metric}
+ colors={metricColors[sid]}
+ definitionEntry={entry}
+ selectedMetricIds={selectedMetricIds}
+ selectedMeasureIds={selectedMeasureIds}
+ onSwap={onSwapMetric}
+ onRemove={onRemoveMetric}
+ onSetBreakout={(dimension) => onSetBreakout(sid, dimension)}
+ onOpen={() => setIsOpen(false)}
+ />
+ );
+ })}
+ <Popover
+ opened={isOpen}
+ onChange={setIsOpen}
+ position="bottom-start"
+ shadow="md"
+ withinPortal
+ >
+ <Popover.Target>
+ <TextInput
+ ref={inputRef}
+ classNames={{ input: S.inputField }}
+ flex={1}
+ miw="7.5rem"
+ ml="xs"
+ variant="unstyled"
+ placeholder={
+ selectedMetrics.length === 0 ? t`Search for metrics...` : ""
+ }
+ value={searchText}
+ onChange={(event) => {
+ setSearchText(event.target.value);
+ setIsOpen(true);
+ }}
+ onClick={handleInputClick}
+ onKeyDown={handleKeyDown}
+ data-testid="metrics-viewer-search-input"
+ />
+ </Popover.Target>
+ <Popover.Dropdown p={0} miw="19rem" maw="25rem">
+ {isOpen && (
+ <MetricSearchDropdown
+ selectedMetricIds={selectedMetricIds}
+ selectedMeasureIds={selectedMeasureIds}
+ onSelect={handleSelect}
+ externalSearchText={searchText}
+ />
+ )}
+ </Popover.Dropdown>
+ </Popover>
+ </Flex>
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/index.ts
new file mode 100644
index 00000000000..18017cbc645
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/index.ts
@@ -0,0 +1 @@
+export { MetricSearchInput } from "./MetricSearchInput";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.module.css
new file mode 100644
index 00000000000..ff92e854c71
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.module.css
@@ -0,0 +1,3 @@
+.listbox {
+ overflow: auto;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx
new file mode 100644
index 00000000000..465665b5e4f
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx
@@ -0,0 +1,68 @@
+import type React from "react";
+import { t } from "ttag";
+
+import { Box, Repeat, Skeleton, Stack, Text } from "metabase/ui";
+
+import type { MetricOrMeasureResult } from "../../../hooks/use-metric-measure-search";
+import { MetricResultItem } from "../MetricResultItem";
+
+import S from "./MetricSearchResults.module.css";
+
+type MetricSearchResultsProps = {
+ results: MetricOrMeasureResult[];
+ isLoading: boolean;
+ cursorIndex: number | null;
+ getRef: (
+ item: MetricOrMeasureResult,
+ ) => React.RefObject<HTMLDivElement> | undefined;
+ onSelectResult: (id: number, model: "metric" | "measure") => void;
+};
+
+export function MetricSearchResults({
+ results,
+ isLoading,
+ cursorIndex,
+ getRef,
+ onSelectResult,
+}: MetricSearchResultsProps) {
+ if (isLoading) {
+ return (
+ <Stack gap="sm" p="sm">
+ <Repeat times={3}>
+ <Skeleton h="lg" natural radius="xs" />
+ </Repeat>
+ </Stack>
+ );
+ }
+
+ if (results.length === 0) {
+ return (
+ <Box p="xl" data-testid="metrics-search-results">
+ <Text c="text-secondary" ta="center">
+ {t`No results found`}
+ </Text>
+ </Box>
+ );
+ }
+
+ return (
+ <Box
+ mah="25rem"
+ p="sm"
+ className={S.listbox}
+ data-testid="metrics-search-results"
+ >
+ {results.map((item, index) => (
+ <MetricResultItem
+ key={`${item.model}-${item.id}`}
+ ref={getRef(item)}
+ name={item.name}
+ slug={item.table_name ?? undefined}
+ icon={item.model === "metric" ? "metric" : "sum"}
+ active={cursorIndex === index}
+ onClick={() => onSelectResult(item.id, item.model)}
+ />
+ ))}
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/index.ts
new file mode 100644
index 00000000000..9791dc45d5f
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/index.ts
@@ -0,0 +1 @@
+export { MetricSearchResults } from "./MetricSearchResults";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/index.ts
new file mode 100644
index 00000000000..6184bc2dfa4
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/index.ts
@@ -0,0 +1 @@
+export { MetricSearchInput as MetricSearch } from "./MetricSearchInput";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
new file mode 100644
index 00000000000..cbfe594c6b5
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
@@ -0,0 +1,48 @@
+import type { SelectedMetric } from "../../types/viewer-state";
+
+export function getSelectedMetricIds(
+ selectedMetrics: SelectedMetric[],
+): Set<number> {
+ return new Set(
+ selectedMetrics
+ .filter((metric) => metric.sourceType === "metric")
+ .map((metric) => metric.id),
+ );
+}
+
+export function getSelectedMeasureIds(
+ selectedMetrics: SelectedMetric[],
+): Set<number> {
+ return new Set(
+ selectedMetrics
+ .filter((metric) => metric.sourceType === "measure")
+ .map((metric) => metric.id),
+ );
+}
+
+type ExcludeMetric = {
+ id: number;
+ sourceType: "metric" | "measure";
+};
+
+type SearchResultLike = {
+ id: number;
+ model: "metric" | "measure";
+};
+
+export function filterSearchResults<T extends SearchResultLike>(
+ results: T[],
+ selectedMetricIds: Set<number>,
+ selectedMeasureIds: Set<number>,
+ excludeMetric?: ExcludeMetric,
+): T[] {
+ return results.filter(
+ (result) =>
+ (result.model === "metric"
+ ? !selectedMetricIds.has(result.id)
+ : !selectedMeasureIds.has(result.id)) &&
+ (!excludeMetric ||
+ result.id !== excludeMetric.id ||
+ result.model !== excludeMetric.sourceType),
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.unit.spec.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.unit.spec.ts
new file mode 100644
index 00000000000..4a5b1aabe77
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.unit.spec.ts
@@ -0,0 +1,125 @@
+import type { SelectedMetric } from "../../types/viewer-state";
+
+import {
+ filterSearchResults,
+ getSelectedMeasureIds,
+ getSelectedMetricIds,
+} from "./utils";
+
+function makeSelectedMetric(
+ overrides: Partial<SelectedMetric> &
+ Pick<SelectedMetric, "id" | "sourceType">,
+): SelectedMetric {
+ return { name: "Test", ...overrides };
+}
+
+function makeSearchResult(id: number, model: "metric" | "measure") {
+ return { id, model, name: `Result ${id}` };
+}
+
+describe("getSelectedMetricIds", () => {
+ it("returns Set of IDs for metrics only", () => {
+ const selected: SelectedMetric[] = [
+ makeSelectedMetric({ id: 1, sourceType: "metric" }),
+ makeSelectedMetric({ id: 2, sourceType: "measure" }),
+ makeSelectedMetric({ id: 3, sourceType: "metric" }),
+ ];
+ const result = getSelectedMetricIds(selected);
+ expect(result).toEqual(new Set([1, 3]));
+ });
+
+ it("returns empty Set for empty array", () => {
+ expect(getSelectedMetricIds([])).toEqual(new Set());
+ });
+
+ it("returns empty Set when no metrics exist", () => {
+ const selected: SelectedMetric[] = [
+ makeSelectedMetric({ id: 1, sourceType: "measure" }),
+ ];
+ expect(getSelectedMetricIds(selected)).toEqual(new Set());
+ });
+});
+
+describe("getSelectedMeasureIds", () => {
+ it("returns Set of IDs for measures only", () => {
+ const selected: SelectedMetric[] = [
+ makeSelectedMetric({ id: 1, sourceType: "metric" }),
+ makeSelectedMetric({ id: 2, sourceType: "measure" }),
+ makeSelectedMetric({ id: 5, sourceType: "measure" }),
+ ];
+ const result = getSelectedMeasureIds(selected);
+ expect(result).toEqual(new Set([2, 5]));
+ });
+
+ it("returns empty Set for empty array", () => {
+ expect(getSelectedMeasureIds([])).toEqual(new Set());
+ });
+
+ it("returns empty Set when no measures exist", () => {
+ const selected: SelectedMetric[] = [
+ makeSelectedMetric({ id: 1, sourceType: "metric" }),
+ ];
+ expect(getSelectedMeasureIds(selected)).toEqual(new Set());
+ });
+});
+
+describe("filterSearchResults", () => {
+ const results = [
+ makeSearchResult(1, "metric"),
+ makeSearchResult(2, "metric"),
+ makeSearchResult(10, "measure"),
+ makeSearchResult(20, "measure"),
+ ];
+
+ it("excludes already-selected metrics by ID", () => {
+ const filtered = filterSearchResults(results, new Set([1]), new Set());
+ expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
+ { id: 2, model: "metric" },
+ { id: 10, model: "measure" },
+ { id: 20, model: "measure" },
+ ]);
+ });
+
+ it("excludes already-selected measures by ID", () => {
+ const filtered = filterSearchResults(results, new Set(), new Set([10, 20]));
+ expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
+ { id: 1, model: "metric" },
+ { id: 2, model: "metric" },
+ ]);
+ });
+
+ it("excludes the excludeMetric param", () => {
+ const filtered = filterSearchResults(results, new Set(), new Set(), {
+ id: 2,
+ sourceType: "metric",
+ });
+ expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
+ { id: 1, model: "metric" },
+ { id: 10, model: "measure" },
+ { id: 20, model: "measure" },
+ ]);
+ });
+
+ it("excludeMetric only matches same model type", () => {
+ const filtered = filterSearchResults(results, new Set(), new Set(), {
+ id: 1,
+ sourceType: "measure",
+ });
+ expect(filtered).toHaveLength(4);
+ });
+
+ it("handles empty results", () => {
+ const filtered = filterSearchResults([], new Set([1]), new Set([2]));
+ expect(filtered).toEqual([]);
+ });
+
+ it("combines all exclusion criteria", () => {
+ const filtered = filterSearchResults(results, new Set([1]), new Set([10]), {
+ id: 2,
+ sourceType: "metric",
+ });
+ expect(filtered.map((r) => ({ id: r.id, model: r.model }))).toEqual([
+ { id: 20, model: "measure" },
+ ]);
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
new file mode 100644
index 00000000000..4c525827210
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.module.css
@@ -0,0 +1,24 @@
+.container {
+ border: 1px solid var(--mb-color-border);
+ border-radius: var(--mantine-radius-lg);
+ overflow: hidden;
+ background: var(--mb-color-background-primary);
+ transition: border-color 150ms ease;
+}
+
+.container:focus-within {
+ border-color: var(--mb-color-brand);
+}
+
+.filterPillsSection {
+ border-radius: 0 0 var(--mantine-radius-lg) var(--mantine-radius-lg);
+}
+
+.filterButtonWithCount {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+
+.filterButtonAttachment {
+ border-left: 1px solid var(--mb-color-border-filter);
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
new file mode 100644
index 00000000000..b9a08e4dc6b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/MetricSearchPanel.tsx
@@ -0,0 +1,151 @@
+import { useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { Box, Button, Flex, Icon, Stack, Text, Tooltip } from "metabase/ui";
+import type { MetricDefinition, ProjectionClause } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ SelectedMetric,
+ SourceColorMap,
+} from "../../types/viewer-state";
+import { FilterPopover } from "../FilterPopover";
+import type { DefinitionSource } from "../FilterPopover/FilterPopoverContent";
+import { MetricSearch } from "../MetricSearch";
+import { MetricsFilterPills } from "../MetricsFilterPills";
+
+import S from "./MetricSearchPanel.module.css";
+
+type MetricSearchPanelProps = {
+ selectedMetrics: SelectedMetric[];
+ metricColors: SourceColorMap;
+ definitions: MetricsViewerDefinitionEntry[];
+ onAddMetric: (metric: SelectedMetric) => void;
+ onRemoveMetric: (metricId: number, sourceType: "metric" | "measure") => void;
+ onSwapMetric: (oldMetric: SelectedMetric, newMetric: SelectedMetric) => void;
+ onSetBreakout: (
+ id: MetricSourceId,
+ dimension: ProjectionClause | undefined,
+ ) => void;
+ onUpdateDefinition: (
+ id: MetricSourceId,
+ definition: MetricDefinition,
+ ) => void;
+};
+
+export function MetricSearchPanel({
+ selectedMetrics,
+ metricColors,
+ definitions,
+ onAddMetric,
+ onRemoveMetric,
+ onSwapMetric,
+ onSetBreakout,
+ onUpdateDefinition,
+}: MetricSearchPanelProps) {
+ const [isFilterPillsExpanded, setIsFilterPillsExpanded] = useState(true);
+
+ const readyDefinitions = useMemo(
+ () =>
+ definitions.filter(
+ (definition): definition is DefinitionSource =>
+ definition.definition != null,
+ ),
+ [definitions],
+ );
+
+ const filterCount = useMemo(
+ () =>
+ readyDefinitions.reduce(
+ (count, definition) =>
+ count + LibMetric.filters(definition.definition).length,
+ 0,
+ ),
+ [readyDefinitions],
+ );
+
+ const hasDefinitions = readyDefinitions.length > 0;
+ const hasFilters = filterCount > 0;
+ const toggleLabel = isFilterPillsExpanded ? t`Hide filters` : t`Show filters`;
+
+ return (
+ <Stack gap="sm">
+ <Flex align="center" justify="space-between">
+ <Text fw={700} size="lg">{t`Explore`}</Text>
+ {hasDefinitions && (
+ <FilterPopover
+ definitions={readyDefinitions}
+ metricColors={metricColors}
+ onUpdateDefinition={onUpdateDefinition}
+ >
+ <Button.Group>
+ <Button
+ variant="light"
+ color="filter"
+ size="xs"
+ p="sm"
+ leftSection={
+ <Icon
+ name={hasFilters ? "filter_plus" : "filter"}
+ size={14}
+ />
+ }
+ className={hasFilters ? S.filterButtonWithCount : undefined}
+ >
+ {t`Filter`}
+ </Button>
+ {hasFilters && (
+ <Tooltip label={toggleLabel}>
+ <Button
+ variant="light"
+ color="filter"
+ size="xs"
+ py="sm"
+ px="md"
+ aria-label={toggleLabel}
+ onClick={(event) => {
+ event.stopPropagation();
+ setIsFilterPillsExpanded((prev) => !prev);
+ }}
+ className={S.filterButtonAttachment}
+ >
+ {filterCount}
+ </Button>
+ </Tooltip>
+ )}
+ </Button.Group>
+ </FilterPopover>
+ )}
+ </Flex>
+ <Box className={S.container}>
+ <Box>
+ <MetricSearch
+ selectedMetrics={selectedMetrics}
+ metricColors={metricColors}
+ definitions={definitions}
+ onAddMetric={onAddMetric}
+ onRemoveMetric={onRemoveMetric}
+ onSwapMetric={onSwapMetric}
+ onSetBreakout={onSetBreakout}
+ />
+ </Box>
+ {hasFilters && isFilterPillsExpanded && (
+ <Box
+ className={S.filterPillsSection}
+ px="sm"
+ py="xs"
+ bg="background-filter"
+ >
+ <MetricsFilterPills
+ definitions={readyDefinitions}
+ sourceColors={metricColors}
+ onUpdateDefinition={onUpdateDefinition}
+ />
+ </Box>
+ )}
+ </Box>
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/index.ts
new file mode 100644
index 00000000000..c07bce62b03
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearchPanel/index.ts
@@ -0,0 +1 @@
+export { MetricSearchPanel } from "./MetricSearchPanel";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.module.css
new file mode 100644
index 00000000000..1071eb0dae3
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.module.css
@@ -0,0 +1,6 @@
+.root {
+ cursor: pointer;
+ background-color: var(--mb-color-background-primary);
+ border: 1px solid var(--mb-color-border-filter);
+ border-radius: 0.75rem;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.tsx
new file mode 100644
index 00000000000..091a41be1c8
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.tsx
@@ -0,0 +1,63 @@
+import type { HTMLAttributes, MouseEvent, Ref } from "react";
+import { forwardRef } from "react";
+import { t } from "ttag";
+
+import { SourceColorIndicator } from "metabase/common/components/SourceColorIndicator";
+import type { IconName } from "metabase/ui";
+import { Flex, Icon, Text } from "metabase/ui";
+
+import S from "./MetricsFilterPill.module.css";
+
+interface MetricsFilterPillProps extends HTMLAttributes<HTMLDivElement> {
+ colors: string[];
+ fallbackIcon: IconName;
+ onRemoveClick?: () => void;
+}
+
+export const MetricsFilterPill = forwardRef(function MetricsFilterPill(
+ {
+ children,
+ colors,
+ fallbackIcon,
+ onRemoveClick,
+ ...props
+ }: MetricsFilterPillProps,
+ ref: Ref<HTMLDivElement>,
+) {
+ const handleRemoveClick = (event: MouseEvent) => {
+ event.stopPropagation();
+ onRemoveClick?.();
+ };
+
+ return (
+ <Flex
+ {...props}
+ ref={ref}
+ className={S.root}
+ align="center"
+ gap="xs"
+ px="sm"
+ h="lg"
+ data-testid="metrics-viewer-filter-pill"
+ >
+ <SourceColorIndicator
+ colors={colors}
+ fallbackIcon={fallbackIcon}
+ size={12}
+ />
+ <Text c="text-filter" fz="sm">
+ {children}
+ </Text>
+ {onRemoveClick && (
+ <Icon
+ c="text-filter"
+ name="close"
+ size={12}
+ role="button"
+ aria-label={t`Remove`}
+ onClick={handleRemoveClick}
+ />
+ )}
+ </Flex>
+ );
+});
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx
new file mode 100644
index 00000000000..c6d3ffd2f62
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx
@@ -0,0 +1,80 @@
+import { useState } from "react";
+
+import { FilterPickerBody } from "metabase/metrics/components/FilterPicker/FilterPickerBody";
+import type { IconName } from "metabase/ui";
+import { Popover, Text } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+import { MetricsFilterPill } from "./MetricsFilterPill";
+import { getFilterDisplayParts } from "./utils";
+
+interface MetricsFilterPillPopoverProps {
+ definition: LibMetric.MetricDefinition;
+ filter: LibMetric.FilterClause;
+ colors: string[];
+ icon: IconName;
+ onUpdate: (newFilter: LibMetric.FilterClause) => void;
+ onRemove: () => void;
+}
+
+export function MetricsFilterPillPopover({
+ definition,
+ filter,
+ colors,
+ icon,
+ onUpdate,
+ onRemove,
+}: MetricsFilterPillPopoverProps) {
+ const [isOpened, setIsOpened] = useState(false);
+
+ const displayParts = getFilterDisplayParts(definition, filter);
+
+ const filterParts = LibMetric.filterParts(definition, filter);
+ const dimension = filterParts?.dimension ?? null;
+
+ const handleSelect = (newFilter: LibMetric.FilterClause) => {
+ onUpdate(newFilter);
+ setIsOpened(false);
+ };
+
+ const handleRemove = () => {
+ onRemove();
+ setIsOpened(false);
+ };
+
+ return (
+ <Popover
+ opened={isOpened}
+ position="bottom-start"
+ transitionProps={{ duration: 0 }}
+ onChange={setIsOpened}
+ >
+ <Popover.Target>
+ <MetricsFilterPill
+ colors={colors}
+ fallbackIcon={icon}
+ onClick={() => setIsOpened((prev) => !prev)}
+ onRemoveClick={handleRemove}
+ >
+ {displayParts.label}
+ {displayParts.value && (
+ <Text component="span" fw={700} c="text-filter" fz="sm">
+ {" "}
+ {displayParts.value}
+ </Text>
+ )}
+ </MetricsFilterPill>
+ </Popover.Target>
+ <Popover.Dropdown>
+ {dimension && (
+ <FilterPickerBody
+ definition={definition}
+ dimension={dimension}
+ filter={filter}
+ onSelect={handleSelect}
+ />
+ )}
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPills.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPills.tsx
new file mode 100644
index 00000000000..0aaf9eff9a2
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPills.tsx
@@ -0,0 +1,108 @@
+import { useCallback, useMemo } from "react";
+
+import type { IconName } from "metabase/ui";
+import { Group } from "metabase/ui";
+import type { MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import type { MetricSourceId, SourceColorMap } from "../../types/viewer-state";
+import { getSourceIcon } from "../../utils/source-ids";
+import type { DefinitionSource } from "../FilterPopover/FilterPopoverContent";
+
+import { MetricsFilterPillPopover } from "./MetricsFilterPillPopover";
+
+interface MetricsFilterPillsProps {
+ definitions: DefinitionSource[];
+ sourceColors: SourceColorMap;
+ onUpdateDefinition: (
+ id: MetricSourceId,
+ definition: MetricDefinition,
+ ) => void;
+}
+
+type FlattenedFilter = {
+ entryId: MetricSourceId;
+ definition: MetricDefinition;
+ filter: LibMetric.FilterClause;
+ colors: string[];
+ icon: IconName;
+ key: string;
+};
+
+export function MetricsFilterPills({
+ definitions,
+ sourceColors,
+ onUpdateDefinition,
+}: MetricsFilterPillsProps) {
+ const flatFilters = useMemo(
+ () => getFlatFilters(definitions, sourceColors),
+ [definitions, sourceColors],
+ );
+
+ const handleUpdate = useCallback(
+ (
+ entryId: MetricSourceId,
+ definition: MetricDefinition,
+ oldFilter: LibMetric.FilterClause,
+ newFilter: LibMetric.FilterClause,
+ ) => {
+ const newDef = LibMetric.replaceClause(definition, oldFilter, newFilter);
+ onUpdateDefinition(entryId, newDef);
+ },
+ [onUpdateDefinition],
+ );
+
+ const handleRemove = useCallback(
+ (
+ entryId: MetricSourceId,
+ definition: MetricDefinition,
+ filter: LibMetric.FilterClause,
+ ) => {
+ const newDef = LibMetric.removeClause(definition, filter);
+ onUpdateDefinition(entryId, newDef);
+ },
+ [onUpdateDefinition],
+ );
+
+ if (flatFilters.length === 0) {
+ return null;
+ }
+
+ return (
+ <Group gap="sm">
+ {flatFilters.map((item) => (
+ <MetricsFilterPillPopover
+ key={item.key}
+ definition={item.definition}
+ filter={item.filter}
+ colors={item.colors}
+ icon={item.icon}
+ onUpdate={(newFilter) =>
+ handleUpdate(item.entryId, item.definition, item.filter, newFilter)
+ }
+ onRemove={() =>
+ handleRemove(item.entryId, item.definition, item.filter)
+ }
+ />
+ ))}
+ </Group>
+ );
+}
+
+function getFlatFilters(
+ definitions: DefinitionSource[],
+ sourceColors: SourceColorMap,
+): FlattenedFilter[] {
+ return definitions.flatMap((definition) => {
+ const colors = sourceColors[definition.id] ?? ["var(--mb-color-brand)"];
+ const icon = getSourceIcon(definition.id);
+ return LibMetric.filters(definition.definition).map((filter, index) => ({
+ entryId: definition.id,
+ definition: definition.definition,
+ filter,
+ colors,
+ icon,
+ key: `${definition.id}-${index}`,
+ }));
+ });
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/index.ts
new file mode 100644
index 00000000000..3fdc4077da4
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/index.ts
@@ -0,0 +1 @@
+export { MetricsFilterPills } from "./MetricsFilterPills";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/utils.ts
new file mode 100644
index 00000000000..89991c17b30
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/utils.ts
@@ -0,0 +1,102 @@
+import { t } from "ttag";
+
+import { getDatePickerValue } from "metabase/metrics/utils/dates";
+import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+export type FilterDisplayParts = {
+ label: string;
+ value: string | null;
+};
+
+export function getFilterDisplayParts(
+ definition: LibMetric.MetricDefinition,
+ filter: LibMetric.FilterClause,
+): FilterDisplayParts {
+ const stringParts = LibMetric.stringFilterParts(definition, filter);
+ if (stringParts) {
+ const dimName = LibMetric.displayInfo(
+ definition,
+ stringParts.dimension,
+ ).longDisplayName;
+ const op = Lib.describeFilterOperator(stringParts.operator).toLowerCase();
+ return { label: `${dimName} ${op}:`, value: stringParts.values.join(", ") };
+ }
+
+ const booleanParts = LibMetric.booleanFilterParts(definition, filter);
+ if (booleanParts) {
+ const dimName = LibMetric.displayInfo(
+ definition,
+ booleanParts.dimension,
+ ).longDisplayName;
+ if (booleanParts.operator === "=") {
+ return {
+ label: `${dimName}:`,
+ value: booleanParts.values[0] ? "true" : "false",
+ };
+ }
+ return {
+ label: `${dimName} ${Lib.describeFilterOperator(booleanParts.operator).toLowerCase()}`,
+ value: null,
+ };
+ }
+
+ const timeParts = LibMetric.timeFilterParts(definition, filter);
+ if (timeParts) {
+ const dimName = LibMetric.displayInfo(
+ definition,
+ timeParts.dimension,
+ ).longDisplayName;
+ const op = Lib.describeFilterOperator(timeParts.operator).toLowerCase();
+ const formattedValues = timeParts.values
+ .map((d) => d.toLocaleTimeString())
+ .join(", ");
+ return { label: `${dimName} ${op}:`, value: formattedValues };
+ }
+
+ const dateValue = getDatePickerValue(definition, filter);
+ if (dateValue) {
+ const dateParts = LibMetric.filterParts(definition, filter);
+ if (dateParts) {
+ const dimName = LibMetric.displayInfo(
+ definition,
+ dateParts.dimension,
+ ).longDisplayName;
+ return {
+ label: `${dimName}:`,
+ value: getDateFilterDisplayName(dateValue),
+ };
+ }
+ }
+
+ const numberParts = LibMetric.numberFilterParts(definition, filter);
+ if (numberParts) {
+ const dimName = LibMetric.displayInfo(
+ definition,
+ numberParts.dimension,
+ ).longDisplayName;
+ const op = Lib.describeFilterOperator(numberParts.operator).toLowerCase();
+ return { label: `${dimName} ${op}:`, value: numberParts.values.join(", ") };
+ }
+
+ const coordParts = LibMetric.coordinateFilterParts(definition, filter);
+ if (coordParts) {
+ const dimName = LibMetric.displayInfo(
+ definition,
+ coordParts.dimension,
+ ).longDisplayName;
+ const op = Lib.describeFilterOperator(coordParts.operator).toLowerCase();
+ return { label: `${dimName} ${op}:`, value: coordParts.values.join(", ") };
+ }
+
+ const parts = LibMetric.filterParts(definition, filter);
+ if (parts) {
+ return {
+ label: LibMetric.displayInfo(definition, parts.dimension).longDisplayName,
+ value: null,
+ };
+ }
+
+ return { label: t`Unknown filter`, value: null };
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.module.css
new file mode 100644
index 00000000000..a6d0d73a9ea
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.module.css
@@ -0,0 +1,12 @@
+.card {
+ overflow: hidden;
+ aspect-ratio: 8 / 5;
+}
+
+.visualization {
+ padding: 0.5rem;
+
+ & :global(.CardVisualization) {
+ padding: 0;
+ }
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.tsx
new file mode 100644
index 00000000000..7b715740b4e
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.tsx
@@ -0,0 +1,131 @@
+import { useMemo } from "react";
+
+import { isNotNull } from "metabase/lib/types";
+import { Paper, Stack, Text } from "metabase/ui";
+import type { DimensionMetadata } from "metabase-lib/metric";
+
+import { useDefinitionQueries } from "../../hooks/use-definition-queries";
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerTabState,
+ SourceColorMap,
+} from "../../types/viewer-state";
+import {
+ buildDimensionItemsFromDefinitions,
+ buildRawSeriesFromDefinitions,
+ computeSourceColors,
+} from "../../utils/series";
+import { getTabConfig } from "../../utils/tab-config";
+import { MetricsViewerVisualization } from "../MetricsViewerVisualization";
+
+import S from "./MetricsViewerCard.module.css";
+
+type MetricsViewerCardProps = {
+ definitions: MetricsViewerDefinitionEntry[];
+ tab: MetricsViewerTabState;
+ onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
+ onDimensionChange: (
+ definitionId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) => void;
+ onDimensionRemove: (definitionId: MetricSourceId) => void;
+ sourceColors: SourceColorMap;
+};
+
+export function MetricsViewerCard({
+ definitions,
+ tab,
+ onTabUpdate,
+ onDimensionChange,
+ onDimensionRemove,
+ sourceColors,
+}: MetricsViewerCardProps) {
+ const tabConfig = getTabConfig(tab.type);
+
+ const { resultsByDefinitionId, modifiedDefinitions } = useDefinitionQueries(
+ definitions,
+ tab,
+ );
+
+ const { series: rawSeries, cardIdToDimensionId } = useMemo(
+ () =>
+ buildRawSeriesFromDefinitions(
+ definitions,
+ tab.dimensionMapping,
+ tab.display,
+ resultsByDefinitionId,
+ modifiedDefinitions,
+ sourceColors,
+ ),
+ [
+ definitions,
+ tab.dimensionMapping,
+ tab.display,
+ resultsByDefinitionId,
+ modifiedDefinitions,
+ sourceColors,
+ ],
+ );
+
+ const cardColors = useMemo(
+ () => computeSourceColors(definitions),
+ [definitions],
+ );
+
+ const dimensionItems = useMemo(
+ () =>
+ buildDimensionItemsFromDefinitions(
+ definitions,
+ tab.dimensionMapping,
+ modifiedDefinitions,
+ cardColors,
+ tabConfig.dimensionPredicate,
+ ),
+ [
+ definitions,
+ tab.dimensionMapping,
+ modifiedDefinitions,
+ cardColors,
+ tabConfig.dimensionPredicate,
+ ],
+ );
+
+ const mappedDimensionCount = Object.values(tab.dimensionMapping).filter(
+ isNotNull,
+ ).length;
+ const dimensionRemoveHandler =
+ mappedDimensionCount > 1 ? onDimensionRemove : undefined;
+
+ if (rawSeries.length === 0) {
+ return null;
+ }
+
+ return (
+ <Paper
+ withBorder
+ shadow="none"
+ className={S.card}
+ data-testid="metrics-viewer-card"
+ >
+ <Stack h="100%">
+ {tab.label && (
+ <Text fw="bold" size="md" truncate="end" px="md" pt="sm">
+ {tab.label}
+ </Text>
+ )}
+ <MetricsViewerVisualization
+ className={S.visualization}
+ rawSeries={rawSeries}
+ dimensionItems={dimensionItems}
+ onDimensionChange={onDimensionChange}
+ onDimensionRemove={dimensionRemoveHandler}
+ definitions={definitions}
+ tab={tab}
+ onTabUpdate={onTabUpdate}
+ cardIdToDimensionId={cardIdToDimensionId}
+ />
+ </Stack>
+ </Paper>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/index.ts
new file mode 100644
index 00000000000..23c224f51c4
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/index.ts
@@ -0,0 +1 @@
+export { MetricsViewerCard } from "./MetricsViewerCard";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/MetricsViewerCardsGrid.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/MetricsViewerCardsGrid.tsx
new file mode 100644
index 00000000000..0e199e8a5bd
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/MetricsViewerCardsGrid.tsx
@@ -0,0 +1,50 @@
+import { SimpleGrid } from "metabase/ui";
+import type { DimensionMetadata } from "metabase-lib/metric";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerTabState,
+ SourceColorMap,
+} from "../../types/viewer-state";
+import { MetricsViewerCard } from "../MetricsViewerCard";
+
+type MetricsViewerCardsGridProps = {
+ definitions: MetricsViewerDefinitionEntry[];
+ tabs: MetricsViewerTabState[];
+ updateTab: (tabId: string, updates: Partial<MetricsViewerTabState>) => void;
+ onDimensionChange: (
+ tabId: string,
+ definitionId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) => void;
+ onDimensionRemove: (tabId: string, definitionId: MetricSourceId) => void;
+ sourceColors: SourceColorMap;
+};
+
+export function MetricsViewerCardsGrid({
+ definitions,
+ tabs,
+ updateTab,
+ onDimensionChange,
+ onDimensionRemove,
+ sourceColors,
+}: MetricsViewerCardsGridProps) {
+ return (
+ <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg">
+ {tabs.map((tab) => (
+ <MetricsViewerCard
+ key={tab.id}
+ definitions={definitions}
+ tab={tab}
+ onTabUpdate={(updates) => updateTab(tab.id, updates)}
+ onDimensionChange={(defId, dimension) =>
+ onDimensionChange(tab.id, defId, dimension)
+ }
+ onDimensionRemove={(defId) => onDimensionRemove(tab.id, defId)}
+ sourceColors={sourceColors}
+ />
+ ))}
+ </SimpleGrid>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/index.ts
new file mode 100644
index 00000000000..4aa543a726c
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/index.ts
@@ -0,0 +1 @@
+export { MetricsViewerCardsGrid } from "./MetricsViewerCardsGrid";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.module.css
new file mode 100644
index 00000000000..8b8fd2ad660
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.module.css
@@ -0,0 +1,11 @@
+.addButton {
+ align-self: center;
+}
+
+.dropdown {
+ overflow: hidden;
+}
+
+.dimensionPicker {
+ color: var(--mb-color-brand);
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.tsx
new file mode 100644
index 00000000000..93faf2a2cf2
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/AddDimensionPopover.tsx
@@ -0,0 +1,85 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { AccordionList } from "metabase/common/components/AccordionList";
+import { ActionIcon, Icon, Popover } from "metabase/ui";
+
+import type { MetricSourceId } from "../../../types/viewer-state";
+import type {
+ AvailableDimensionsResult,
+ DimensionPickerItem,
+ SourceDisplayInfo,
+} from "../../../utils/dimension-picker";
+import { buildDimensionPickerSections } from "../../../utils/dimension-picker";
+
+import S from "./AddDimensionPopover.module.css";
+
+type AddDimensionPopoverProps = {
+ availableDimensions: AvailableDimensionsResult;
+ sourceOrder: MetricSourceId[];
+ sourceDataById: Record<MetricSourceId, SourceDisplayInfo>;
+ hasMultipleSources: boolean;
+ onAddTab: (dimensionId: string) => void;
+};
+
+export function AddDimensionPopover({
+ availableDimensions,
+ sourceOrder,
+ sourceDataById,
+ hasMultipleSources,
+ onAddTab,
+}: AddDimensionPopoverProps) {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const sections = useMemo(
+ () =>
+ buildDimensionPickerSections({
+ availableDimensions,
+ sourceOrder,
+ sourceDataById,
+ hasMultipleSources,
+ }),
+ [availableDimensions, sourceOrder, sourceDataById, hasMultipleSources],
+ );
+
+ const handleSelect = useCallback(
+ (item: DimensionPickerItem) => {
+ onAddTab(item.dimensionId);
+ setIsOpen(false);
+ },
+ [onAddTab],
+ );
+
+ const renderItemIcon = useCallback(
+ (item: DimensionPickerItem) => <Icon name={item.icon} />,
+ [],
+ );
+
+ return (
+ <Popover opened={isOpen} onChange={setIsOpen} position="bottom-start">
+ <Popover.Target>
+ <ActionIcon
+ className={S.addButton}
+ ml="xs"
+ aria-label={t`Add dimension tab`}
+ onClick={() => setIsOpen(true)}
+ >
+ <Icon name="add" />
+ </ActionIcon>
+ </Popover.Target>
+ <Popover.Dropdown p={0} className={S.dropdown}>
+ <AccordionList
+ className={S.dimensionPicker}
+ sections={sections}
+ onChange={handleSelect}
+ renderItemIcon={renderItemIcon}
+ alwaysExpanded
+ globalSearch
+ searchable
+ maxHeight={300}
+ width="17.5rem"
+ />
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/index.ts
new file mode 100644
index 00000000000..0e3ac2d598c
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/AddDimensionPopover/index.ts
@@ -0,0 +1 @@
+export { AddDimensionPopover } from "./AddDimensionPopover";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx
new file mode 100644
index 00000000000..93be9765440
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx
@@ -0,0 +1,242 @@
+import { useCallback, useMemo } from "react";
+
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { getObjectKeys, getObjectValues } from "metabase/lib/objects";
+import { isNotNull } from "metabase/lib/types";
+import { Flex, Stack } from "metabase/ui";
+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { Dataset, TemporalUnit } from "metabase-types/api";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerDisplayType,
+ MetricsViewerTabProjectionConfig,
+ MetricsViewerTabState,
+ SourceColorMap,
+} from "../../../types/viewer-state";
+import { getProjectionInfo } from "../../../utils/definition-builder";
+import type { DimensionFilterValue } from "../../../utils/dimension-filters";
+import {
+ buildDimensionItemsFromDefinitions,
+ buildRawSeriesFromDefinitions,
+} from "../../../utils/series";
+import { getTabConfig } from "../../../utils/tab-config";
+import { MetricControls } from "../../MetricControls";
+import { MetricsViewerVisualization } from "../../MetricsViewerVisualization";
+
+type MetricsViewerTabContentProps = {
+ definitions: MetricsViewerDefinitionEntry[];
+ tab: MetricsViewerTabState;
+ resultsByDefinitionId: Map<MetricSourceId, Dataset>;
+ errorsByDefinitionId: Map<MetricSourceId, string>;
+ modifiedDefinitions: Map<MetricSourceId, MetricDefinition>;
+ sourceColors: SourceColorMap;
+ isExecuting: (id: MetricSourceId) => boolean;
+ onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
+ onDimensionChange: (
+ definitionId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) => void;
+ onDimensionRemove: (definitionId: MetricSourceId) => void;
+};
+
+export function MetricsViewerTabContent({
+ definitions,
+ tab,
+ resultsByDefinitionId,
+ errorsByDefinitionId,
+ modifiedDefinitions,
+ sourceColors,
+ isExecuting,
+ onTabUpdate,
+ onDimensionChange,
+ onDimensionRemove,
+}: MetricsViewerTabContentProps) {
+ const isLoading = useMemo(() => {
+ return getObjectKeys(tab.dimensionMapping).some(isExecuting);
+ }, [tab.dimensionMapping, isExecuting]);
+
+ const firstError = useMemo(() => {
+ for (const sourceId of getObjectKeys(tab.dimensionMapping)) {
+ const err = errorsByDefinitionId.get(sourceId);
+ if (err) {
+ return err;
+ }
+ }
+ return null;
+ }, [tab.dimensionMapping, errorsByDefinitionId]);
+
+ const dimensionFilter = getTabConfig(tab.type).dimensionPredicate;
+
+ const { series: rawSeries, cardIdToDimensionId } = useMemo(
+ () =>
+ buildRawSeriesFromDefinitions(
+ definitions,
+ tab.dimensionMapping,
+ tab.display,
+ resultsByDefinitionId,
+ modifiedDefinitions,
+ sourceColors,
+ ),
+ [
+ definitions,
+ tab.dimensionMapping,
+ tab.display,
+ resultsByDefinitionId,
+ modifiedDefinitions,
+ sourceColors,
+ ],
+ );
+
+ const dimensionItems = useMemo(
+ () =>
+ buildDimensionItemsFromDefinitions(
+ definitions,
+ tab.dimensionMapping,
+ modifiedDefinitions,
+ sourceColors,
+ dimensionFilter,
+ ),
+ [
+ definitions,
+ tab.dimensionMapping,
+ modifiedDefinitions,
+ sourceColors,
+ dimensionFilter,
+ ],
+ );
+
+ const definitionForControls = useMemo((): MetricDefinition | null => {
+ for (const sourceId of getObjectKeys(tab.dimensionMapping)) {
+ const entry = definitions.find((d) => d.id === sourceId);
+ if (!entry) {
+ continue;
+ }
+
+ const modDef = modifiedDefinitions.get(entry.id);
+ if (!modDef) {
+ continue;
+ }
+
+ const projs = LibMetric.projections(modDef);
+ if (projs.length > 0) {
+ return modDef;
+ }
+ }
+ return null;
+ }, [definitions, tab.dimensionMapping, modifiedDefinitions]);
+
+ const allFilterDimensions = useMemo(() => {
+ const filterDimensions: DimensionMetadata[] = [];
+ for (const sourceId of getObjectKeys(tab.dimensionMapping)) {
+ const modDef = modifiedDefinitions.get(sourceId);
+ if (!modDef) {
+ continue;
+ }
+ const projInfo = getProjectionInfo(modDef);
+ if (projInfo.filterDimension) {
+ filterDimensions.push(projInfo.filterDimension);
+ }
+ }
+ return filterDimensions;
+ }, [tab.dimensionMapping, modifiedDefinitions]);
+
+ const updateProjectionConfig = useCallback(
+ (updates: Partial<MetricsViewerTabProjectionConfig>) => {
+ onTabUpdate({
+ projectionConfig: { ...tab.projectionConfig, ...updates },
+ });
+ },
+ [onTabUpdate, tab.projectionConfig],
+ );
+
+ const handleDimensionFilterChange = useCallback(
+ (value: DimensionFilterValue | undefined) => {
+ updateProjectionConfig({ dimensionFilter: value });
+ },
+ [updateProjectionConfig],
+ );
+
+ const handleTemporalUnitChange = useCallback(
+ (unit: TemporalUnit | undefined) => {
+ updateProjectionConfig({ temporalUnit: unit });
+ },
+ [updateProjectionConfig],
+ );
+
+ const handleBinningChange = useCallback(
+ (binningStrategy: string | undefined) => {
+ updateProjectionConfig({ binningStrategy });
+ },
+ [updateProjectionConfig],
+ );
+
+ const handleDisplayTypeChange = useCallback(
+ (display: MetricsViewerDisplayType) => {
+ onTabUpdate({ display });
+ },
+ [onTabUpdate],
+ );
+
+ const handleBrush = useCallback(
+ ({ start, end }: { start: number; end: number }) => {
+ updateProjectionConfig({
+ dimensionFilter: {
+ type: "specific-date",
+ operator: "between",
+ values: [new Date(start), new Date(end)],
+ hasTime: true,
+ },
+ });
+ },
+ [updateProjectionConfig],
+ );
+
+ const isTimeTab = tab.type === "time";
+ const mappedDimensionCount = getObjectValues(tab.dimensionMapping).filter(
+ isNotNull,
+ ).length;
+ const dimensionRemoveHandler =
+ mappedDimensionCount > 1 ? onDimensionRemove : undefined;
+
+ if (isLoading || firstError) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={firstError} />;
+ }
+
+ if (rawSeries.length === 0) {
+ return null;
+ }
+
+ return (
+ <Stack flex="1 0 auto" gap="md">
+ <MetricsViewerVisualization
+ rawSeries={rawSeries}
+ dimensionItems={dimensionItems}
+ onDimensionChange={onDimensionChange}
+ onDimensionRemove={dimensionRemoveHandler}
+ onBrush={isTimeTab ? handleBrush : undefined}
+ definitions={definitions}
+ tab={tab}
+ onTabUpdate={onTabUpdate}
+ cardIdToDimensionId={cardIdToDimensionId}
+ />
+ {definitionForControls && (
+ <Flex justify="center" align="center">
+ <MetricControls
+ definition={definitionForControls}
+ displayType={tab.display}
+ tabType={tab.type}
+ dimensionFilter={tab.projectionConfig.dimensionFilter}
+ allFilterDimensions={allFilterDimensions}
+ onDisplayTypeChange={handleDisplayTypeChange}
+ onDimensionFilterChange={handleDimensionFilterChange}
+ onTemporalUnitChange={handleTemporalUnitChange}
+ onBinningChange={handleBinningChange}
+ />
+ </Flex>
+ )}
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/index.ts
new file mode 100644
index 00000000000..b7125158a7e
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/index.ts
@@ -0,0 +1 @@
+export { MetricsViewerTabContent } from "./MetricsViewerTabContent";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.module.css
new file mode 100644
index 00000000000..b57470a0ac6
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.module.css
@@ -0,0 +1,17 @@
+.list {
+ &::before {
+ display: none;
+ }
+}
+
+.allTab :global(.Icon) {
+ display: block;
+}
+
+.closeButton {
+ visibility: hidden;
+}
+
+.tab:hover .closeButton {
+ visibility: visible;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.tsx
new file mode 100644
index 00000000000..363136deead
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.tsx
@@ -0,0 +1,104 @@
+import { useCallback } from "react";
+import { t } from "ttag";
+
+import { ActionIcon, Icon, Skeleton, Tabs } from "metabase/ui";
+
+import type {
+ MetricSourceId,
+ MetricsViewerTabState,
+} from "../../types/viewer-state";
+import type {
+ AvailableDimensionsResult,
+ SourceDisplayInfo,
+} from "../../utils/dimension-picker";
+
+import { AddDimensionPopover } from "./AddDimensionPopover";
+import S from "./MetricsViewerTabs.module.css";
+
+type MetricsViewerTabsProps = {
+ tabs: MetricsViewerTabState[];
+ activeTabId: string | null;
+ isLoading?: boolean;
+ availableDimensions: AvailableDimensionsResult;
+ sourceOrder: MetricSourceId[];
+ sourceDataById: Record<MetricSourceId, SourceDisplayInfo>;
+ onTabChange: (tabId: string) => void;
+ onAddTab: (dimensionId: string) => void;
+ onRemoveTab: (tabId: string) => void;
+};
+
+export function MetricsViewerTabs({
+ tabs,
+ activeTabId,
+ isLoading,
+ availableDimensions,
+ sourceOrder,
+ sourceDataById,
+ onTabChange,
+ onAddTab,
+ onRemoveTab,
+}: MetricsViewerTabsProps) {
+ const handleRemoveTab = useCallback(
+ (e: React.MouseEvent, tabId: string) => {
+ e.stopPropagation();
+ onRemoveTab(tabId);
+ },
+ [onRemoveTab],
+ );
+
+ const hasSharedDimensions = availableDimensions.shared.length > 0;
+ const hasAnySourceDimensions = sourceOrder.some(
+ (sourceId) => (availableDimensions.bySource[sourceId]?.length ?? 0) > 0,
+ );
+ const hasAvailableDimensions = hasSharedDimensions || hasAnySourceDimensions;
+ const hasMultipleSources = sourceOrder.length > 1;
+
+ if (tabs.length <= 1 && !hasAvailableDimensions) {
+ return null;
+ }
+
+ return (
+ <Tabs
+ value={activeTabId}
+ onChange={(value) => value && onTabChange(value)}
+ w="auto"
+ >
+ <Tabs.List className={S.list} justify="flex-start">
+ {tabs.map((tab) => (
+ <Tabs.Tab
+ key={tab.id}
+ value={tab.id}
+ pl="lg"
+ aria-label={tab.label}
+ className={S.tab}
+ >
+ {isLoading ? (
+ <Skeleton display="inline-block" w="4.5rem" h="1em" />
+ ) : (
+ tab.label
+ )}
+ <ActionIcon
+ className={S.closeButton}
+ size="xs"
+ variant="subtle"
+ ml="xs"
+ aria-label={t`Remove ${tab.label} tab`}
+ onClick={(e) => handleRemoveTab(e, tab.id)}
+ >
+ <Icon name="close" size={10} />
+ </ActionIcon>
+ </Tabs.Tab>
+ ))}
+ {hasAvailableDimensions && (
+ <AddDimensionPopover
+ availableDimensions={availableDimensions}
+ sourceOrder={sourceOrder}
+ sourceDataById={sourceDataById}
+ hasMultipleSources={hasMultipleSources}
+ onAddTab={onAddTab}
+ />
+ )}
+ </Tabs.List>
+ </Tabs>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/index.ts
new file mode 100644
index 00000000000..0dbaefa7056
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/index.ts
@@ -0,0 +1,2 @@
+export { MetricsViewerTabContent } from "./MetricsViewerTabContent";
+export { MetricsViewerTabs } from "./MetricsViewerTabs";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.module.css
new file mode 100644
index 00000000000..3306df0469f
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.module.css
@@ -0,0 +1,9 @@
+.chartWrapper {
+ flex: 1;
+}
+
+.chart {
+ background-color: var(--mb-color-background-primary);
+ overflow: hidden;
+ height: 100%;
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx
new file mode 100644
index 00000000000..c7808332445
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx
@@ -0,0 +1,121 @@
+import { useMemo } from "react";
+import { noop } from "underscore";
+
+import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
+import type { DimensionItem } from "metabase/metrics-viewer/components/DimensionPillBar";
+import { DimensionPillBar } from "metabase/metrics-viewer/components/DimensionPillBar";
+import { DISPLAY_TYPE_REGISTRY } from "metabase/metrics-viewer/utils";
+import { MetricsViewerClickActionsMode } from "metabase/metrics-viewer/utils/MetricsViewerClickActionsMode";
+import { getGridColumns } from "metabase/metrics-viewer/utils/grid-columns";
+import { Flex, SimpleGrid, Stack, useElementSize } from "metabase/ui";
+import Visualization from "metabase/visualizations/components/Visualization";
+import type { DimensionMetadata } from "metabase-lib/metric";
+import type { CardId, SingleSeries } from "metabase-types/api";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerTabState,
+} from "../../types/viewer-state";
+
+import S from "./MetricsViewerVisualization.module.css";
+
+type MetricsViewerVisualizationProps = {
+ rawSeries: SingleSeries[];
+ dimensionItems: DimensionItem[];
+ onDimensionChange?: (
+ definitionId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) => void;
+ onDimensionRemove?: (definitionId: MetricSourceId) => void;
+ onBrush?: (range: { start: number; end: number }) => void;
+ className?: string;
+ definitions: MetricsViewerDefinitionEntry[];
+ tab: MetricsViewerTabState;
+ onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
+ cardIdToDimensionId: Record<CardId, MetricSourceId>;
+};
+
+export function MetricsViewerVisualization({
+ rawSeries,
+ dimensionItems,
+ onDimensionChange,
+ onDimensionRemove,
+ onBrush,
+ className,
+ definitions,
+ tab,
+ onTabUpdate,
+ cardIdToDimensionId,
+}: MetricsViewerVisualizationProps) {
+ const { ref, width } = useElementSize();
+ const cols = getGridColumns(width, rawSeries.length);
+
+ const clickActionsMode = useMemo(
+ () =>
+ new MetricsViewerClickActionsMode({
+ definitions,
+ tab,
+ onTabUpdate,
+ cardIdToDimensionId,
+ }),
+ [cardIdToDimensionId, definitions, onTabUpdate, tab],
+ );
+
+ return (
+ <Flex
+ ref={ref}
+ direction="column"
+ flex="1 0 auto"
+ gap="sm"
+ className={className}
+ >
+ {rawSeries.length > 1 &&
+ DISPLAY_TYPE_REGISTRY[tab.display].supportsMultipleSeries === false ? (
+ <SimpleGrid cols={cols} flex={1} spacing={0}>
+ {rawSeries.map((series, i) => (
+ <Stack
+ gap="sm"
+ className={className}
+ key={`series-${i}`}
+ data-in-grid
+ >
+ <DebouncedFrame className={S.chartWrapper}>
+ <Visualization
+ className={S.chart}
+ rawSeries={[series]}
+ isQueryBuilder={false}
+ hideLegend
+ onBrush={onBrush}
+ mode={clickActionsMode}
+ onChangeCardAndRun={noop}
+ autoAdjustSettings
+ />
+ </DebouncedFrame>
+ </Stack>
+ ))}
+ </SimpleGrid>
+ ) : (
+ <DebouncedFrame className={S.chartWrapper}>
+ <Visualization
+ className={S.chart}
+ rawSeries={rawSeries}
+ isQueryBuilder={false}
+ hideLegend
+ onBrush={onBrush}
+ mode={clickActionsMode}
+ onChangeCardAndRun={noop}
+ />
+ </DebouncedFrame>
+ )}
+
+ {dimensionItems.length > 0 && onDimensionChange && (
+ <DimensionPillBar
+ items={dimensionItems}
+ onDimensionChange={onDimensionChange}
+ onDimensionRemove={onDimensionRemove}
+ />
+ )}
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/index.ts
new file mode 100644
index 00000000000..00766c1bd35
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/index.ts
@@ -0,0 +1 @@
+export { MetricsViewerVisualization } from "./MetricsViewerVisualization";
diff --git a/frontend/src/metabase/metrics-viewer/constants.ts b/frontend/src/metabase/metrics-viewer/constants.ts
new file mode 100644
index 00000000000..68017697609
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/constants.ts
@@ -0,0 +1,3 @@
+export const UNBINNED = "__unbinned__" as const;
+
+export const MAX_AUTO_TABS = 4;
diff --git a/frontend/src/metabase/metrics-viewer/hooks/index.ts b/frontend/src/metabase/metrics-viewer/hooks/index.ts
new file mode 100644
index 00000000000..ecbd16febd4
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/hooks/index.ts
@@ -0,0 +1,2 @@
+export { useMetricMeasureSearch } from "./use-metric-measure-search";
+export { useMetricsViewer } from "./use-metrics-viewer";
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts b/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts
new file mode 100644
index 00000000000..6ae72aaa08b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts
@@ -0,0 +1,181 @@
+import { useEffect, useMemo } from "react";
+
+import { metricApi } from "metabase/api";
+import { getErrorMessage } from "metabase/api/utils/errors";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import type { MetricDefinition } from "metabase-lib/metric";
+import type { Dataset, MetricBreakoutValuesResponse } from "metabase-types/api";
+import type { State } from "metabase-types/store";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerTabState,
+} from "../types/viewer-state";
+import {
+ getModifiedDefinition,
+ toJsDefinition,
+} from "../utils/definition-cache";
+import { entryHasBreakout } from "../utils/definition-entries";
+
+export interface UseDefinitionQueriesResult {
+ resultsByDefinitionId: Map<MetricSourceId, Dataset>;
+ errorsByDefinitionId: Map<MetricSourceId, string>;
+ modifiedDefinitions: Map<MetricSourceId, MetricDefinition>;
+ breakoutValuesBySourceId: Map<MetricSourceId, MetricBreakoutValuesResponse>;
+ isExecuting: (id: MetricSourceId) => boolean;
+}
+
+export function useDefinitionQueries(
+ definitions: MetricsViewerDefinitionEntry[],
+ tab: MetricsViewerTabState | null,
+): UseDefinitionQueriesResult {
+ const dispatch = useDispatch();
+
+ const datasetRequests = useMemo(() => {
+ if (!tab) {
+ return [];
+ }
+
+ return definitions.flatMap((entry) => {
+ const dimensionId = tab.dimensionMapping[entry.id];
+ if (!dimensionId || !entry.definition) {
+ return [];
+ }
+
+ const modifiedDefinition = getModifiedDefinition(
+ entry.definition,
+ dimensionId,
+ tab.projectionConfig,
+ );
+
+ if (!modifiedDefinition) {
+ return [];
+ }
+
+ const jsDefinition = toJsDefinition(modifiedDefinition);
+
+ return [
+ {
+ sourceId: entry.id,
+ modifiedDefinition,
+ request: { definition: jsDefinition },
+ },
+ ];
+ });
+ }, [definitions, tab]);
+
+ const breakoutRequests = useMemo(() => {
+ return definitions.flatMap((entry) => {
+ if (!entry.definition || !entryHasBreakout(entry)) {
+ return [];
+ }
+
+ const jsDefinition = toJsDefinition(entry.definition);
+
+ return [
+ {
+ sourceId: entry.id,
+ request: { definition: jsDefinition },
+ },
+ ];
+ });
+ }, [definitions]);
+
+ const modifiedDefinitions = useMemo(() => {
+ const map = new Map<MetricSourceId, MetricDefinition>();
+ for (const { sourceId, modifiedDefinition } of datasetRequests) {
+ map.set(sourceId, modifiedDefinition);
+ }
+ return map;
+ }, [datasetRequests]);
+
+ useEffect(() => {
+ if (datasetRequests.length === 0) {
+ return;
+ }
+
+ const subscriptions = datasetRequests.map((query) =>
+ dispatch(metricApi.endpoints.getMetricDataset.initiate(query.request)),
+ );
+
+ return () => {
+ subscriptions.forEach((subscription) => subscription.unsubscribe());
+ };
+ }, [datasetRequests, dispatch]);
+
+ useEffect(() => {
+ if (breakoutRequests.length === 0) {
+ return;
+ }
+
+ const subscriptions = breakoutRequests.map((query) =>
+ dispatch(
+ metricApi.endpoints.getMetricBreakoutValues.initiate(query.request),
+ ),
+ );
+
+ return () => {
+ subscriptions.forEach((subscription) => subscription.unsubscribe());
+ };
+ }, [breakoutRequests, dispatch]);
+
+ const datasetResults = useSelector((state: State) =>
+ datasetRequests.map((query) => ({
+ sourceId: query.sourceId,
+ result: metricApi.endpoints.getMetricDataset.select(query.request)(state),
+ })),
+ );
+
+ const breakoutResults = useSelector((state: State) =>
+ breakoutRequests.map((query) => ({
+ sourceId: query.sourceId,
+ result: metricApi.endpoints.getMetricBreakoutValues.select(query.request)(
+ state,
+ ),
+ })),
+ );
+
+ const { resultsByDefinitionId, errorsByDefinitionId, isExecuting } =
+ useMemo(() => {
+ const results = new Map<MetricSourceId, Dataset>();
+ const errors = new Map<MetricSourceId, string>();
+ const executing = new Set<MetricSourceId>();
+
+ for (const { sourceId, result } of datasetResults) {
+ if (result.data) {
+ results.set(sourceId, result.data);
+ }
+ if (result.error) {
+ errors.set(sourceId, getErrorMessage(result.error));
+ }
+ if (result.isLoading || ("isFetching" in result && result.isFetching)) {
+ executing.add(sourceId);
+ }
+ }
+
+ return {
+ resultsByDefinitionId: results,
+ errorsByDefinitionId: errors,
+ isExecuting: (id: MetricSourceId) => executing.has(id),
+ };
+ }, [datasetResults]);
+
+ const breakoutValuesBySourceId = useMemo(() => {
+ const map = new Map<MetricSourceId, MetricBreakoutValuesResponse>();
+ for (const { sourceId, result } of breakoutResults) {
+ if (result.data) {
+ map.set(sourceId, result.data);
+ }
+ }
+ return map;
+ }, [breakoutResults]);
+
+ return {
+ resultsByDefinitionId,
+ errorsByDefinitionId,
+ modifiedDefinitions,
+ breakoutValuesBySourceId,
+ isExecuting,
+ };
+}
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-metric-measure-search.ts b/frontend/src/metabase/metrics-viewer/hooks/use-metric-measure-search.ts
new file mode 100644
index 00000000000..480f975f83e
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-metric-measure-search.ts
@@ -0,0 +1,36 @@
+import { useSearchQuery } from "metabase/api";
+import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
+import type { SearchResult } from "metabase-types/api";
+
+export type MetricOrMeasureResult = SearchResult<number, "metric" | "measure">;
+
+type UseMetricMeasureSearchResult = {
+ results: MetricOrMeasureResult[];
+ isLoading: boolean;
+ error: Error | null;
+};
+
+const SEARCH_DEBOUNCE_MS = 300;
+const SEARCH_RESULTS_LIMIT = 5;
+
+export function useMetricMeasureSearch(
+ searchText: string,
+): UseMetricMeasureSearchResult {
+ const trimmed = searchText.trim();
+ const debouncedSearchText = useDebouncedValue(trimmed, SEARCH_DEBOUNCE_MS);
+ const effectiveText = trimmed === "" ? "" : debouncedSearchText;
+
+ const { data, isLoading, error } = useSearchQuery({
+ ...(effectiveText ? { q: effectiveText } : {}),
+ models: ["metric", "measure"],
+ filter_items_in_personal_collection: "exclude",
+ model_ancestors: false,
+ limit: SEARCH_RESULTS_LIMIT,
+ });
+
+ return {
+ results: (data?.data ?? []) as MetricOrMeasureResult[],
+ isLoading,
+ error: error instanceof Error ? error : null,
+ };
+}
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
new file mode 100644
index 00000000000..2dd72affbc1
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
@@ -0,0 +1,396 @@
+import { useCallback, useMemo } from "react";
+
+import { getObjectEntries, objectFromEntries } from "metabase/lib/objects";
+import type {
+ DimensionMetadata,
+ MetricDefinition,
+ ProjectionClause,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { Dataset, MetricBreakoutValuesResponse } from "metabase-types/api";
+
+import type { MetricsViewerPageProps } from "../pages/MetricsViewerPage/MetricsViewerPage";
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerTabState,
+ SelectedMetric,
+ SourceColorMap,
+} from "../types/viewer-state";
+import {
+ applyProjection,
+ buildBinnedBreakoutDefinition,
+ getDefinitionName,
+} from "../utils/definition-builder";
+import { applyDimensionFilter } from "../utils/dimension-filters";
+import {
+ findBinningStrategy,
+ findDimensionById,
+ findFilterDimensionById,
+ findTemporalBucket,
+} from "../utils/dimension-lookup";
+import type {
+ AvailableDimensionsResult,
+ SourceDisplayInfo,
+} from "../utils/dimension-picker";
+import { getAvailableDimensionsForPicker } from "../utils/dimension-picker";
+import { computeSourceColors, getSelectedMetricsInfo } from "../utils/series";
+import {
+ createMeasureSourceId,
+ createMetricSourceId,
+ createSourceId,
+} from "../utils/source-ids";
+import {
+ createTabFromDimension,
+ getDimensionsByType,
+ resolveCommonTabLabel,
+} from "../utils/tabs";
+
+import { useDefinitionQueries } from "./use-definition-queries";
+import { useViewerState } from "./use-viewer-state";
+import { type LoadSourcesRequest, useViewerUrl } from "./use-viewer-url";
+
+export interface UseMetricsViewerResult {
+ definitions: MetricsViewerDefinitionEntry[];
+ tabs: MetricsViewerTabState[];
+ activeTab: MetricsViewerTabState | null;
+ activeTabId: string | null;
+
+ loadingIds: Set<MetricSourceId>;
+ resultsByDefinitionId: Map<MetricSourceId, Dataset>;
+ errorsByDefinitionId: Map<MetricSourceId, string>;
+ modifiedDefinitions: Map<MetricSourceId, MetricDefinition>;
+ isExecuting: (id: MetricSourceId) => boolean;
+
+ sourceColors: SourceColorMap;
+ breakoutValuesBySourceId: Map<MetricSourceId, MetricBreakoutValuesResponse>;
+ selectedMetrics: SelectedMetric[];
+ sourceOrder: MetricSourceId[];
+ sourceDataById: Record<MetricSourceId, SourceDisplayInfo>;
+ availableDimensions: AvailableDimensionsResult;
+
+ addMetric: (metric: SelectedMetric) => void;
+ swapMetric: (oldMetric: SelectedMetric, newMetric: SelectedMetric) => void;
+ removeMetric: (id: number, sourceType: "metric" | "measure") => void;
+ changeTab: (tabId: string) => void;
+ addAndSelectTab: (dimensionId: string) => void;
+ removeTab: (tabId: string) => void;
+ updateTab: (tabId: string, updates: Partial<MetricsViewerTabState>) => void;
+ updateActiveTab: (updates: Partial<MetricsViewerTabState>) => void;
+ changeTabDimension: (
+ tabId: string,
+ definitionId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) => void;
+ removeTabDimension: (tabId: string, definitionId: MetricSourceId) => void;
+ updateDefinition: (id: MetricSourceId, definition: MetricDefinition) => void;
+ setBreakoutDimension: (
+ id: MetricSourceId,
+ dimension: ProjectionClause | undefined,
+ ) => void;
+}
+
+function buildUrlRestoreTransform(
+ sourceId: MetricSourceId,
+ request: LoadSourcesRequest,
+): ((definition: MetricDefinition) => MetricDefinition) | undefined {
+ const breakoutInfo = request.breakoutBySourceId?.[sourceId];
+ const filters = request.filtersBySourceId?.[sourceId];
+
+ if (!breakoutInfo && (!filters || filters.length === 0)) {
+ return undefined;
+ }
+
+ return (definition: MetricDefinition): MetricDefinition => {
+ let result = definition;
+
+ if (breakoutInfo) {
+ const dimension = findDimensionById(result, breakoutInfo.dimensionId);
+ if (dimension) {
+ const dimensionRef = LibMetric.dimensionReference(dimension);
+
+ let modifiedRef: LibMetric.ProjectionClause | null = null;
+ if (breakoutInfo.temporalUnit) {
+ const bucket = findTemporalBucket(
+ result,
+ dimension,
+ breakoutInfo.temporalUnit,
+ );
+ if (bucket) {
+ modifiedRef = LibMetric.withTemporalBucket(dimensionRef, bucket);
+ }
+ } else if (breakoutInfo.binning) {
+ const strategy = findBinningStrategy(
+ result,
+ dimension,
+ breakoutInfo.binning,
+ );
+ if (strategy) {
+ modifiedRef = LibMetric.withBinning(dimensionRef, strategy);
+ }
+ }
+
+ result = modifiedRef
+ ? applyProjection(result, modifiedRef)
+ : buildBinnedBreakoutDefinition(result, dimensionRef);
+ }
+ }
+
+ if (filters) {
+ for (const filter of filters) {
+ const dimension = findFilterDimensionById(result, filter.dimensionId);
+ if (dimension) {
+ result = applyDimensionFilter(result, dimension, filter.value);
+ }
+ }
+ }
+
+ return result;
+ };
+}
+
+export function useMetricsViewer({
+ location,
+}: MetricsViewerPageProps): UseMetricsViewerResult {
+ const {
+ state,
+ loadingIds,
+ removeDefinition,
+ updateDefinition,
+ selectTab: changeTab,
+ addTab,
+ removeTab,
+ updateTab,
+ setDefinitionDimension: changeTabDimension,
+ removeDefinitionDimension: removeTabDimension,
+ setBreakoutDimension,
+ initialize,
+ loadAndAddMetric,
+ loadAndAddMeasure,
+ loadAndReplaceMetric,
+ loadAndReplaceMeasure,
+ } = useViewerState();
+
+ const handleLoadSources = useCallback(
+ (request: LoadSourcesRequest) => {
+ for (const metricId of request.metricIds) {
+ const sourceId = createMetricSourceId(metricId);
+ loadAndAddMetric(metricId, buildUrlRestoreTransform(sourceId, request));
+ }
+ for (const measureId of request.measureIds) {
+ const sourceId = createMeasureSourceId(measureId);
+ loadAndAddMeasure(
+ measureId,
+ buildUrlRestoreTransform(sourceId, request),
+ );
+ }
+ },
+ [loadAndAddMetric, loadAndAddMeasure],
+ );
+
+ useViewerUrl(state, initialize, handleLoadSources, location);
+
+ const activeTab = useMemo((): MetricsViewerTabState | null => {
+ if (state.tabs.length === 0) {
+ return null;
+ }
+ return (
+ state.tabs.find((tab) => tab.id === state.selectedTabId) ?? state.tabs[0]
+ );
+ }, [state.tabs, state.selectedTabId]);
+
+ const {
+ resultsByDefinitionId,
+ errorsByDefinitionId,
+ modifiedDefinitions,
+ breakoutValuesBySourceId,
+ isExecuting,
+ } = useDefinitionQueries(state.definitions, activeTab);
+
+ const selectedMetrics = useMemo(
+ () => getSelectedMetricsInfo(state.definitions, loadingIds),
+ [state.definitions, loadingIds],
+ );
+
+ const sourceColors = useMemo(
+ () => computeSourceColors(state.definitions, breakoutValuesBySourceId),
+ [state.definitions, breakoutValuesBySourceId],
+ );
+
+ const definitionsBySourceId = useMemo(
+ () =>
+ objectFromEntries(
+ state.definitions.map((entry) => [entry.id, entry.definition] as const),
+ ),
+ [state.definitions],
+ );
+
+ const sourceOrder = useMemo(
+ () => state.definitions.map((entry) => entry.id),
+ [state.definitions],
+ );
+
+ const sourceDataById = useMemo((): Record<
+ MetricSourceId,
+ SourceDisplayInfo
+ > => {
+ const result: Record<MetricSourceId, SourceDisplayInfo> = {};
+ for (const entry of state.definitions) {
+ const { definition } = entry;
+ if (!definition) {
+ continue;
+ }
+ const name = getDefinitionName(definition);
+ if (!name) {
+ continue;
+ }
+ if (LibMetric.sourceMetricId(definition) != null) {
+ result[entry.id] = { type: "metric", name };
+ } else if (LibMetric.sourceMeasureId(definition) != null) {
+ result[entry.id] = { type: "measure", name };
+ }
+ }
+ return result;
+ }, [state.definitions]);
+
+ const existingTabIds = useMemo(
+ () => new Set(state.tabs.map((tab) => tab.id)),
+ [state.tabs],
+ );
+
+ const effectiveTabs = useMemo(() => {
+ const dimsBySource = new Map(
+ state.definitions
+ .filter((entry) => entry.definition != null)
+ .map(
+ (entry) =>
+ [entry.id, getDimensionsByType(entry.definition!)] as const,
+ ),
+ );
+
+ return state.tabs.map((tab) => {
+ const names: string[] = [];
+ for (const [sourceId, dimensionId] of getObjectEntries(
+ tab.dimensionMapping,
+ )) {
+ if (dimensionId == null) {
+ continue;
+ }
+ const sourceDimensions = dimsBySource.get(sourceId);
+ const dimensionInfo = sourceDimensions?.get(dimensionId);
+ if (dimensionInfo) {
+ names.push(dimensionInfo.displayName);
+ }
+ }
+ const label = resolveCommonTabLabel(names, tab.label);
+ return label !== tab.label ? { ...tab, label } : tab;
+ });
+ }, [state.tabs, state.definitions]);
+
+ const availableDimensions = useMemo(
+ () =>
+ getAvailableDimensionsForPicker(
+ definitionsBySourceId,
+ sourceOrder,
+ existingTabIds,
+ ),
+ [definitionsBySourceId, sourceOrder, existingTabIds],
+ );
+
+ const addMetric = useCallback(
+ (metric: SelectedMetric) => {
+ const sourceId = createSourceId(metric.id, metric.sourceType);
+
+ if (state.definitions.some((entry) => entry.id === sourceId)) {
+ return;
+ }
+
+ if (metric.sourceType === "metric") {
+ loadAndAddMetric(metric.id);
+ } else {
+ loadAndAddMeasure(metric.id);
+ }
+ },
+ [state.definitions, loadAndAddMetric, loadAndAddMeasure],
+ );
+
+ const swapMetric = useCallback(
+ (oldMetric: SelectedMetric, newMetric: SelectedMetric) => {
+ const oldSourceId = createSourceId(oldMetric.id, oldMetric.sourceType);
+
+ if (newMetric.sourceType === "metric") {
+ loadAndReplaceMetric(oldSourceId, newMetric.id);
+ } else {
+ loadAndReplaceMeasure(oldSourceId, newMetric.id);
+ }
+ },
+ [loadAndReplaceMetric, loadAndReplaceMeasure],
+ );
+
+ const removeMetric = useCallback(
+ (id: number, sourceType: "metric" | "measure") => {
+ removeDefinition(createSourceId(id, sourceType));
+ },
+ [removeDefinition],
+ );
+
+ const addAndSelectTab = useCallback(
+ (dimensionId: string) => {
+ const newTab = createTabFromDimension(
+ dimensionId,
+ definitionsBySourceId,
+ sourceOrder,
+ );
+ if (!newTab) {
+ return;
+ }
+
+ addTab(newTab);
+ changeTab(newTab.id);
+ },
+ [definitionsBySourceId, sourceOrder, addTab, changeTab],
+ );
+
+ const updateActiveTab = useCallback(
+ (updates: Partial<MetricsViewerTabState>) => {
+ if (!activeTab) {
+ return;
+ }
+ updateTab(activeTab.id, updates);
+ },
+ [activeTab, updateTab],
+ );
+
+ return {
+ definitions: state.definitions,
+ tabs: effectiveTabs,
+ activeTab,
+ activeTabId: state.selectedTabId,
+
+ loadingIds,
+ resultsByDefinitionId,
+ errorsByDefinitionId,
+ modifiedDefinitions,
+ isExecuting,
+
+ sourceColors,
+ breakoutValuesBySourceId,
+ selectedMetrics,
+ sourceOrder,
+ sourceDataById,
+ availableDimensions,
+
+ addMetric,
+ swapMetric,
+ removeMetric,
+ changeTab,
+ addAndSelectTab,
+ removeTab,
+ updateTab,
+ updateActiveTab,
+ changeTabDimension,
+ removeTabDimension,
+ updateDefinition,
+ setBreakoutDimension,
+ };
+}
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
new file mode 100644
index 00000000000..6934144e6ed
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
@@ -0,0 +1,587 @@
+import { useCallback, useRef, useState } from "react";
+
+import { measureApi, metricApi } from "metabase/api";
+import { getObjectEntries, objectFromEntries } from "metabase/lib/objects";
+import { useDispatch, useStore } from "metabase/lib/redux";
+import { isNotNull } from "metabase/lib/types";
+import { getMetadata } from "metabase/selectors/metadata";
+import type {
+ DimensionMetadata,
+ MetricDefinition,
+ ProjectionClause,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { MeasureId } from "metabase-types/api";
+import type { MetricId } from "metabase-types/api/metric";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerPageState,
+ MetricsViewerTabState,
+ StoredMetricsViewerTab,
+} from "../types/viewer-state";
+import { getInitialMetricsViewerPageState } from "../types/viewer-state";
+import { buildBinnedBreakoutDefinition } from "../utils/definition-builder";
+import {
+ createMeasureSourceId,
+ createMetricSourceId,
+} from "../utils/source-ids";
+import { computeDefaultTabs, findMatchingDimensionForTab } from "../utils/tabs";
+
+async function loadMetricDefinition(
+ dispatch: ReturnType<typeof useDispatch>,
+ getState: ReturnType<typeof useStore>["getState"],
+ metricId: MetricId,
+): Promise<MetricDefinition> {
+ const result = await dispatch(
+ metricApi.endpoints.getMetric.initiate(metricId),
+ );
+ if (!result.data) {
+ throw new Error(`Failed to load metric ${metricId}`);
+ }
+ const provider = LibMetric.metadataProvider(getMetadata(getState()));
+ const meta = LibMetric.metricMetadata(provider, metricId);
+ if (!meta) {
+ throw new Error(`Metric ${metricId} not found in metadata`);
+ }
+ return LibMetric.fromMetricMetadata(provider, meta);
+}
+
+async function loadMeasureDefinition(
+ dispatch: ReturnType<typeof useDispatch>,
+ getState: ReturnType<typeof useStore>["getState"],
+ measureId: MeasureId,
+): Promise<MetricDefinition> {
+ const result = await dispatch(
+ measureApi.endpoints.getMeasure.initiate(measureId),
+ );
+ if (!result.data) {
+ throw new Error(`Failed to load measure ${measureId}`);
+ }
+ const provider = LibMetric.metadataProvider(getMetadata(getState()));
+ const meta = LibMetric.measureMetadata(provider, measureId);
+ if (!meta) {
+ throw new Error(`Measure ${measureId} not found in metadata`);
+ }
+ return LibMetric.fromMeasureMetadata(provider, meta);
+}
+
+function getValidSelectedTabId(
+ currentSelectedId: string | null,
+ newTabs: MetricsViewerTabState[],
+): string | null {
+ const selectedTabExists = newTabs.some((tab) => tab.id === currentSelectedId);
+
+ return selectedTabExists ? currentSelectedId : (newTabs[0]?.id ?? null);
+}
+
+function addDefinitionToTabs(
+ tabs: MetricsViewerTabState[],
+ definitionEntries: MetricsViewerDefinitionEntry[],
+ newDefId: MetricSourceId,
+ newDef: MetricDefinition,
+): MetricsViewerTabState[] {
+ const existingDefinitions = objectFromEntries(
+ definitionEntries
+ .filter((entry) => entry.id !== newDefId)
+ .map((entry) => [entry.id, entry.definition] as const),
+ );
+
+ return tabs.map((tab) => {
+ if (newDefId in tab.dimensionMapping) {
+ return tab;
+ }
+
+ const activeMappings = objectFromEntries(
+ getObjectEntries(tab.dimensionMapping).filter(
+ (entry): entry is [MetricSourceId, string] => entry[1] != null,
+ ),
+ );
+ const storedTab: StoredMetricsViewerTab = {
+ id: tab.id,
+ type: tab.type,
+ label: tab.label,
+ dimensionsBySource: activeMappings,
+ };
+
+ const matchingDimension = findMatchingDimensionForTab(
+ newDef,
+ storedTab,
+ existingDefinitions,
+ );
+
+ if (matchingDimension) {
+ return {
+ ...tab,
+ dimensionMapping: {
+ ...tab.dimensionMapping,
+ [newDefId]: matchingDimension,
+ },
+ };
+ }
+
+ return tab;
+ });
+}
+
+export interface UseViewerStateResult {
+ state: MetricsViewerPageState;
+ loadingIds: Set<MetricSourceId>;
+
+ removeDefinition: (id: MetricSourceId) => void;
+ updateDefinition: (id: MetricSourceId, definition: MetricDefinition) => void;
+
+ selectTab: (tabId: string) => void;
+ addTab: (tab: MetricsViewerTabState) => void;
+ removeTab: (tabId: string) => void;
+ updateTab: (tabId: string, updates: Partial<MetricsViewerTabState>) => void;
+ setDefinitionDimension: (
+ tabId: string,
+ definitionId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) => void;
+ removeDefinitionDimension: (
+ tabId: string,
+ definitionId: MetricSourceId,
+ ) => void;
+ setBreakoutDimension: (
+ id: MetricSourceId,
+ dimension: ProjectionClause | undefined,
+ ) => void;
+
+ initialize: (state: MetricsViewerPageState) => void;
+ loadAndAddMetric: (
+ metricId: MetricId,
+ transform?: (def: MetricDefinition) => MetricDefinition,
+ ) => void;
+ loadAndAddMeasure: (
+ measureId: MeasureId,
+ transform?: (def: MetricDefinition) => MetricDefinition,
+ ) => void;
+ loadAndReplaceMetric: (
+ oldSourceId: MetricSourceId,
+ metricId: MetricId,
+ ) => void;
+ loadAndReplaceMeasure: (
+ oldSourceId: MetricSourceId,
+ measureId: MeasureId,
+ ) => void;
+}
+
+export function useViewerState(): UseViewerStateResult {
+ const dispatch = useDispatch();
+ const store = useStore();
+
+ const [state, setState] = useState<MetricsViewerPageState>(
+ getInitialMetricsViewerPageState,
+ );
+ const stateRef = useRef(state);
+ stateRef.current = state;
+
+ const loadingRef = useRef<Set<MetricSourceId>>(new Set());
+ const [loadingIds, setLoadingIds] = useState<Set<MetricSourceId>>(new Set());
+
+ const initialize = useCallback(
+ (newState: MetricsViewerPageState) => setState(newState),
+ [],
+ );
+
+ const addDefinition = useCallback(
+ (entry: MetricsViewerDefinitionEntry) =>
+ setState((prev) => {
+ if (prev.definitions.some((existing) => existing.id === entry.id)) {
+ return prev;
+ }
+
+ const newDefinitions = [...prev.definitions, entry];
+
+ if (prev.tabs.length === 0 || !entry.definition) {
+ return { ...prev, definitions: newDefinitions };
+ }
+
+ return {
+ ...prev,
+ definitions: newDefinitions,
+ tabs: addDefinitionToTabs(
+ prev.tabs,
+ newDefinitions,
+ entry.id,
+ entry.definition,
+ ),
+ };
+ }),
+ [],
+ );
+
+ const removeDefinition = useCallback(
+ (id: MetricSourceId) =>
+ setState((prev) => {
+ const newDefinitions = prev.definitions.filter(
+ (entry) => entry.id !== id,
+ );
+ const newTabs = prev.tabs
+ .map((tab) => {
+ const { [id]: _, ...rest } = tab.dimensionMapping;
+ return { ...tab, dimensionMapping: rest };
+ })
+ .filter((tab) => Object.values(tab.dimensionMapping).some(isNotNull));
+
+ return {
+ ...prev,
+ definitions: newDefinitions,
+ tabs: newTabs,
+ selectedTabId: getValidSelectedTabId(prev.selectedTabId, newTabs),
+ };
+ }),
+ [],
+ );
+
+ const updateDefinition = useCallback(
+ (id: MetricSourceId, definition: MetricDefinition) =>
+ setState((prev) => {
+ const newDefinitions = prev.definitions.map((entry) =>
+ entry.id === id ? { ...entry, definition } : entry,
+ );
+
+ if (prev.tabs.length === 0) {
+ return { ...prev, definitions: newDefinitions };
+ }
+
+ const updatedTabs = addDefinitionToTabs(
+ prev.tabs,
+ newDefinitions,
+ id,
+ definition,
+ );
+
+ const newTabs = updatedTabs.filter((tab) =>
+ Object.values(tab.dimensionMapping).some(isNotNull),
+ );
+
+ return {
+ ...prev,
+ definitions: newDefinitions,
+ tabs: newTabs,
+ selectedTabId: getValidSelectedTabId(prev.selectedTabId, newTabs),
+ };
+ }),
+ [],
+ );
+
+ const replaceDefinition = useCallback(
+ (oldId: MetricSourceId, newEntry: MetricsViewerDefinitionEntry) =>
+ setState((prev) => {
+ const index = prev.definitions.findIndex((entry) => entry.id === oldId);
+ if (index === -1) {
+ return prev;
+ }
+
+ const newDefinitions = [...prev.definitions];
+ newDefinitions[index] = newEntry;
+
+ const newTabs = prev.tabs.map((tab) => {
+ if (!(oldId in tab.dimensionMapping)) {
+ return tab;
+ }
+ const { [oldId]: _, ...rest } = tab.dimensionMapping;
+ return { ...tab, dimensionMapping: rest };
+ });
+
+ return { ...prev, definitions: newDefinitions, tabs: newTabs };
+ }),
+ [],
+ );
+
+ const selectTab = useCallback(
+ (tabId: string) => setState((prev) => ({ ...prev, selectedTabId: tabId })),
+ [],
+ );
+
+ const addTab = useCallback(
+ (tab: MetricsViewerTabState) =>
+ setState((prev) => {
+ if (prev.tabs.some((existing) => existing.id === tab.id)) {
+ return prev;
+ }
+ return {
+ ...prev,
+ tabs: [...prev.tabs, tab],
+ selectedTabId:
+ prev.selectedTabId == null ? tab.id : prev.selectedTabId,
+ };
+ }),
+ [],
+ );
+
+ const removeTab = useCallback(
+ (tabId: string) =>
+ setState((prev) => {
+ const newTabs = prev.tabs.filter((tab) => tab.id !== tabId);
+ const needsTabSwitch = prev.selectedTabId === tabId;
+
+ return {
+ ...prev,
+ tabs: newTabs,
+ selectedTabId: needsTabSwitch
+ ? (newTabs[0]?.id ?? null)
+ : prev.selectedTabId,
+ };
+ }),
+ [],
+ );
+
+ const updateTab = useCallback(
+ (tabId: string, updates: Partial<MetricsViewerTabState>) =>
+ setState((prev) => ({
+ ...prev,
+ tabs: prev.tabs.map((tab) =>
+ tab.id === tabId ? { ...tab, ...updates } : tab,
+ ),
+ })),
+ [],
+ );
+
+ const setDefinitionDimension = useCallback(
+ (
+ tabId: string,
+ definitionId: MetricSourceId,
+ dimension: DimensionMetadata,
+ ) =>
+ setState((prev) => {
+ const entry = prev.definitions.find(
+ (defEntry) => defEntry.id === definitionId,
+ );
+ const def = entry?.definition;
+ const dimId = def
+ ? LibMetric.dimensionValuesInfo(def, dimension).id
+ : undefined;
+
+ if (!dimId) {
+ return prev;
+ }
+
+ return {
+ ...prev,
+ tabs: prev.tabs.map((tab) => {
+ if (tab.id !== tabId) {
+ return tab;
+ }
+ const previousDimId = tab.dimensionMapping[definitionId];
+ const dimensionChanged = previousDimId !== dimId;
+ return {
+ ...tab,
+ dimensionMapping: {
+ ...tab.dimensionMapping,
+ [definitionId]: dimId,
+ },
+ projectionConfig: dimensionChanged
+ ? {
+ ...tab.projectionConfig,
+ dimensionFilter: undefined,
+ }
+ : tab.projectionConfig,
+ };
+ }),
+ };
+ }),
+ [],
+ );
+
+ const removeDefinitionDimension = useCallback(
+ (tabId: string, definitionId: MetricSourceId) =>
+ setState((prev) => ({
+ ...prev,
+ tabs: prev.tabs.map((tab) => {
+ if (tab.id !== tabId) {
+ return tab;
+ }
+ return {
+ ...tab,
+ dimensionMapping: { ...tab.dimensionMapping, [definitionId]: null },
+ projectionConfig: {
+ ...tab.projectionConfig,
+ dimensionFilter: undefined,
+ },
+ };
+ }),
+ })),
+ [],
+ );
+
+ const setBreakoutDimension = useCallback(
+ (id: MetricSourceId, dimension: ProjectionClause | undefined) =>
+ setState((prev) => ({
+ ...prev,
+ definitions: prev.definitions.map((entry) => {
+ if (entry.id !== id || !entry.definition) {
+ return entry;
+ }
+
+ let newDefinition = entry.definition;
+ const existingProjections = LibMetric.projections(newDefinition);
+ for (const proj of existingProjections) {
+ newDefinition = LibMetric.removeClause(newDefinition, proj);
+ }
+
+ if (dimension) {
+ newDefinition = buildBinnedBreakoutDefinition(
+ newDefinition,
+ dimension,
+ );
+ }
+
+ return { ...entry, definition: newDefinition };
+ }),
+ })),
+ [],
+ );
+
+ const clearLoading = useCallback((id: MetricSourceId) => {
+ loadingRef.current.delete(id);
+ setLoadingIds((prev) => {
+ const next = new Set(prev);
+ next.delete(id);
+ return next;
+ });
+ }, []);
+
+ const loadDefinition = useCallback(
+ async (
+ id: MetricSourceId,
+ loader: () => Promise<MetricDefinition>,
+ transform?: (def: MetricDefinition) => MetricDefinition,
+ ) => {
+ if (loadingRef.current.has(id)) {
+ return;
+ }
+
+ loadingRef.current.add(id);
+ setLoadingIds((prev) => new Set(prev).add(id));
+ addDefinition({ id, definition: null });
+
+ try {
+ const rawDefinition = await loader();
+ // for some reason, React may run updateDefinition's state update before addDefinition's
+ // it then corrects itself and runs them in the correct order
+ // but the temporarily incorrect ordering breaks our handling of the browser's forward/back buttons
+ // so wrap updateDefinition in a setTimeout to ensure it runs after addDefinition
+ setTimeout(() => {
+ const definition = transform
+ ? transform(rawDefinition)
+ : rawDefinition;
+ updateDefinition(id, definition);
+
+ if (stateRef.current.tabs.length === 0) {
+ const definitions: Record<MetricSourceId, MetricDefinition | null> =
+ {
+ [id]: definition,
+ };
+ const tabs = computeDefaultTabs(definitions, [id]);
+ for (const tab of tabs) {
+ addTab(tab);
+ }
+ }
+ }, 0);
+ } catch {
+ removeDefinition(id);
+ } finally {
+ clearLoading(id);
+ }
+ },
+ [addDefinition, updateDefinition, removeDefinition, addTab, clearLoading],
+ );
+
+ const loadAndReplace = useCallback(
+ async (
+ oldSourceId: MetricSourceId,
+ newId: MetricSourceId,
+ loader: () => Promise<MetricDefinition>,
+ ) => {
+ if (loadingRef.current.has(newId)) {
+ return;
+ }
+
+ loadingRef.current.add(newId);
+ setLoadingIds((prev) => new Set(prev).add(newId));
+ replaceDefinition(oldSourceId, { id: newId, definition: null });
+
+ try {
+ const definition = await loader();
+ // see comment above setTimeout in loadDefinition
+ setTimeout(() => {
+ updateDefinition(newId, definition);
+ }, 0);
+ } catch {
+ removeDefinition(newId);
+ } finally {
+ clearLoading(newId);
+ }
+ },
+ [replaceDefinition, updateDefinition, removeDefinition, clearLoading],
+ );
+
+ const loadAndAddMetric = useCallback(
+ (
+ metricId: MetricId,
+ transform?: (def: MetricDefinition) => MetricDefinition,
+ ) =>
+ loadDefinition(
+ createMetricSourceId(metricId),
+ () => loadMetricDefinition(dispatch, store.getState, metricId),
+ transform,
+ ),
+ [loadDefinition, dispatch, store],
+ );
+
+ const loadAndAddMeasure = useCallback(
+ (
+ measureId: MeasureId,
+ transform?: (def: MetricDefinition) => MetricDefinition,
+ ) =>
+ loadDefinition(
+ createMeasureSourceId(measureId),
+ () => loadMeasureDefinition(dispatch, store.getState, measureId),
+ transform,
+ ),
+ [loadDefinition, dispatch, store],
+ );
+
+ const loadAndReplaceMetric = useCallback(
+ (oldSourceId: MetricSourceId, metricId: MetricId) =>
+ loadAndReplace(oldSourceId, createMetricSourceId(metricId), () =>
+ loadMetricDefinition(dispatch, store.getState, metricId),
+ ),
+ [loadAndReplace, dispatch, store],
+ );
+
+ const loadAndReplaceMeasure = useCallback(
+ (oldSourceId: MetricSourceId, measureId: MeasureId) =>
+ loadAndReplace(oldSourceId, createMeasureSourceId(measureId), () =>
+ loadMeasureDefinition(dispatch, store.getState, measureId),
+ ),
+ [loadAndReplace, dispatch, store],
+ );
+
+ return {
+ state,
+ loadingIds,
+
+ removeDefinition,
+ updateDefinition,
+
+ selectTab,
+ addTab,
+ removeTab,
+ updateTab,
+ setDefinitionDimension,
+ removeDefinitionDimension,
+ setBreakoutDimension,
+
+ initialize,
+ loadAndAddMetric,
+ loadAndAddMeasure,
+ loadAndReplaceMetric,
+ loadAndReplaceMeasure,
+ };
+}
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
new file mode 100644
index 00000000000..5d2fc365df6
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
@@ -0,0 +1,149 @@
+import type { Location } from "history";
+import { useEffect, useRef } from "react";
+import { push, replace } from "react-router-redux";
+
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import type { MeasureId, TemporalUnit } from "metabase-types/api";
+import type { MetricId } from "metabase-types/api/metric";
+
+import type {
+ MetricSourceId,
+ MetricsViewerPageState,
+ MetricsViewerTabState,
+} from "../types/viewer-state";
+import type { SourceFilter } from "../utils/dimension-filters";
+import { createSourceId } from "../utils/source-ids";
+import {
+ type SerializedMetricsViewerPageState,
+ decodeState,
+ deserializeTab,
+ encodeState,
+ stateToSerializedState,
+} from "../utils/url-serialization";
+
+export interface BreakoutInfo {
+ dimensionId: string;
+ temporalUnit?: TemporalUnit;
+ binning?: string;
+}
+
+export interface LoadSourcesRequest {
+ metricIds: MetricId[];
+ measureIds: MeasureId[];
+ breakoutBySourceId?: Record<MetricSourceId, BreakoutInfo>;
+ filtersBySourceId?: Record<MetricSourceId, SourceFilter[]>;
+}
+
+export function useViewerUrl(
+ state: MetricsViewerPageState,
+ initialize: (state: MetricsViewerPageState) => void,
+ onLoadSources: (request: LoadSourcesRequest) => void,
+ location: Location,
+): void {
+ const dispatch = useDispatch();
+ const lastHashRef = useRef<string | null>(null);
+
+ // sync URL to state
+ useEffect(() => {
+ let hash = location.hash.slice(1);
+ let serializedState: SerializedMetricsViewerPageState;
+
+ if (!hash) {
+ const params = new URLSearchParams(location.search);
+ const metricId = params.get("metricId");
+ if (metricId) {
+ serializedState = {
+ sources: [{ type: "metric", id: parseInt(metricId, 10) }],
+ tabs: [],
+ selectedTabId: null,
+ };
+ const encodedHash = encodeState(serializedState);
+ if (encodedHash === undefined) {
+ return;
+ }
+ hash = encodedHash;
+ } else {
+ serializedState = decodeState(hash);
+ }
+ } else {
+ serializedState = decodeState(hash);
+ }
+
+ if (hash === lastHashRef.current) {
+ return;
+ }
+ lastHashRef.current = hash;
+
+ const metricIds: MetricId[] = [];
+ const measureIds: MeasureId[] = [];
+ const breakoutBySourceId: Record<MetricSourceId, BreakoutInfo> = {};
+ const filtersBySourceId: Record<MetricSourceId, SourceFilter[]> = {};
+
+ for (const source of serializedState.sources) {
+ const sourceId = createSourceId(source.id, source.type);
+
+ if (source.type === "metric") {
+ metricIds.push(source.id);
+ } else if (source.type === "measure") {
+ measureIds.push(source.id);
+ }
+
+ if (source.breakout) {
+ breakoutBySourceId[sourceId] = {
+ dimensionId: source.breakout,
+ temporalUnit: source.breakoutTemporalUnit,
+ binning: source.breakoutBinning,
+ };
+ }
+
+ if (source.filters && source.filters.length > 0) {
+ filtersBySourceId[sourceId] = source.filters;
+ }
+ }
+
+ if (serializedState.tabs.length > 0) {
+ const tabs: MetricsViewerTabState[] =
+ serializedState.tabs.map(deserializeTab);
+
+ initialize({
+ definitions: [],
+ tabs,
+ selectedTabId: serializedState.selectedTabId,
+ });
+ }
+
+ if (metricIds.length > 0 || measureIds.length > 0) {
+ const hasBreakouts = Object.keys(breakoutBySourceId).length > 0;
+ const hasFilters = Object.keys(filtersBySourceId).length > 0;
+ onLoadSources({
+ metricIds,
+ measureIds,
+ breakoutBySourceId: hasBreakouts ? breakoutBySourceId : undefined,
+ filtersBySourceId: hasFilters ? filtersBySourceId : undefined,
+ });
+ }
+ }, [location, dispatch, initialize, onLoadSources]);
+
+ // sync state to URL
+ useEffect(() => {
+ if (
+ state.definitions.length === 0 ||
+ state.definitions.some((entry) => entry.definition === null)
+ ) {
+ return;
+ }
+
+ const serializedState = stateToSerializedState(state);
+ const hash = encodeState(serializedState);
+ if (hash !== undefined && hash !== lastHashRef.current) {
+ lastHashRef.current = hash;
+ const url = Urls.metricsViewer(hash);
+ if (!window.location.hash) {
+ dispatch(replace(url));
+ } else {
+ dispatch(push(url));
+ }
+ }
+ }, [state, dispatch]);
+}
diff --git a/frontend/src/metabase/metrics-viewer/index.ts b/frontend/src/metabase/metrics-viewer/index.ts
new file mode 100644
index 00000000000..3108b8c17d8
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/index.ts
@@ -0,0 +1 @@
+export { MetricsViewerPage } from "./pages/MetricsViewerPage/MetricsViewerPage";
diff --git a/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.module.css b/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.module.css
new file mode 100644
index 00000000000..a4bd99fb4e0
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.module.css
@@ -0,0 +1,13 @@
+.root {
+ overflow: hidden;
+}
+
+.tabsBar {
+ border-bottom: 1px solid var(--mb-color-border);
+}
+
+.content {
+ flex: 1 1 auto;
+ min-height: 0;
+ overflow-y: auto;
+}
diff --git a/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.tsx b/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.tsx
new file mode 100644
index 00000000000..4dc87a601c2
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/pages/MetricsViewerPage/MetricsViewerPage.tsx
@@ -0,0 +1,131 @@
+import type { Location } from "history";
+
+import { Box, Flex, Stack } from "metabase/ui";
+
+import { BreakoutLegend } from "../../components/BreakoutLegend/BreakoutLegend";
+import {
+ MetricsViewerEmptyState,
+ MetricsViewerNoTabsEmptyState,
+} from "../../components/EmptyState";
+import { MetricSearchPanel } from "../../components/MetricSearchPanel";
+import {
+ MetricsViewerTabContent,
+ MetricsViewerTabs,
+} from "../../components/MetricsViewerTabs";
+import { useMetricsViewer } from "../../hooks/use-metrics-viewer";
+
+import S from "./MetricsViewerPage.module.css";
+
+export type MetricsViewerPageProps = {
+ location: Location;
+};
+
+export function MetricsViewerPage(props: MetricsViewerPageProps) {
+ const {
+ definitions,
+ tabs,
+ activeTab,
+ activeTabId,
+ resultsByDefinitionId,
+ errorsByDefinitionId,
+ modifiedDefinitions,
+ sourceColors,
+ breakoutValuesBySourceId,
+ selectedMetrics,
+ sourceOrder,
+ sourceDataById,
+ availableDimensions,
+ isExecuting,
+ addMetric,
+ swapMetric,
+ removeMetric,
+ changeTab,
+ addAndSelectTab,
+ removeTab,
+ updateActiveTab,
+ changeTabDimension,
+ removeTabDimension,
+ updateDefinition,
+ setBreakoutDimension,
+ } = useMetricsViewer(props);
+
+ const hasDefinitions = definitions.length > 0;
+ const hasLoadedDefinitions = definitions.some(
+ (entry) => entry.definition != null,
+ );
+
+ return (
+ <Stack h="100%" gap={0} className={S.root}>
+ <Box px="lg" pt="md" flex="0 0 auto">
+ <MetricSearchPanel
+ selectedMetrics={selectedMetrics}
+ metricColors={sourceColors}
+ definitions={definitions}
+ onAddMetric={addMetric}
+ onRemoveMetric={removeMetric}
+ onSwapMetric={swapMetric}
+ onSetBreakout={setBreakoutDimension}
+ onUpdateDefinition={updateDefinition}
+ />
+ </Box>
+ <Flex flex="1 1 auto" mih={0}>
+ <Stack gap={0} flex={1} mih={0} miw={0}>
+ {hasDefinitions && (
+ <Box px="lg" pt="xs" flex="0 0 auto" className={S.tabsBar}>
+ <MetricsViewerTabs
+ tabs={tabs}
+ activeTabId={activeTabId}
+ isLoading={!hasLoadedDefinitions}
+ availableDimensions={availableDimensions}
+ sourceOrder={sourceOrder}
+ sourceDataById={sourceDataById}
+ onTabChange={changeTab}
+ onAddTab={addAndSelectTab}
+ onRemoveTab={removeTab}
+ />
+ </Box>
+ )}
+ <Flex flex="1 1 auto" mih={0}>
+ <Flex
+ direction="column"
+ px="lg"
+ pt="md"
+ pb="lg"
+ flex={1}
+ miw={0}
+ className={S.content}
+ >
+ {!hasDefinitions ? (
+ <MetricsViewerEmptyState />
+ ) : activeTab ? (
+ <MetricsViewerTabContent
+ definitions={definitions}
+ tab={activeTab}
+ resultsByDefinitionId={resultsByDefinitionId}
+ errorsByDefinitionId={errorsByDefinitionId}
+ modifiedDefinitions={modifiedDefinitions}
+ sourceColors={sourceColors}
+ isExecuting={isExecuting}
+ onTabUpdate={updateActiveTab}
+ onDimensionChange={(defId, dim) =>
+ changeTabDimension(activeTab.id, defId, dim)
+ }
+ onDimensionRemove={(defId) =>
+ removeTabDimension(activeTab.id, defId)
+ }
+ />
+ ) : hasLoadedDefinitions ? (
+ <MetricsViewerNoTabsEmptyState />
+ ) : null}
+ </Flex>
+ <BreakoutLegend
+ definitions={definitions}
+ breakoutValuesBySourceId={breakoutValuesBySourceId}
+ sourceColors={sourceColors}
+ />
+ </Flex>
+ </Stack>
+ </Flex>
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/types/index.ts b/frontend/src/metabase/metrics-viewer/types/index.ts
new file mode 100644
index 00000000000..eb743681cad
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/types/index.ts
@@ -0,0 +1 @@
+export * from "./viewer-state";
diff --git a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
new file mode 100644
index 00000000000..80a7bdaafdf
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
@@ -0,0 +1,96 @@
+import type { MetricDefinition } from "metabase-lib/metric";
+import type {
+ CardDisplayType,
+ ConcreteTableId,
+ DimensionId,
+ TemporalUnit,
+} from "metabase-types/api";
+
+import type { DimensionFilterValue } from "../utils/dimension-filters";
+
+// ── Core types ──
+
+export type MetricsViewerDisplayType = Extract<
+ CardDisplayType,
+ "line" | "area" | "bar" | "map" | "row" | "pie" | "scatter"
+>;
+
+export type MetricSourceId = `metric:${number}` | `measure:${number}`;
+
+export type MetricsViewerTabType =
+ | "time"
+ | "geo"
+ | "category"
+ | "boolean"
+ | "numeric";
+
+export interface StoredMetricsViewerTab {
+ id: string;
+ type: MetricsViewerTabType;
+ label: string;
+ dimensionsBySource: Record<MetricSourceId, DimensionId>;
+}
+
+// ── Definition types ──
+
+/**
+ * Represents a metric/measure definition entry in the viewer state.
+ *
+ * Breakout handling: When a user selects a breakout dimension, it is applied
+ * immediately to `definition` as a projection (via LibMetric.project).
+ * The entry's definition has 0-1 projections where that projection IS the breakout.
+ *
+ * This is different from the computed/modified definition (from getModifiedDefinition)
+ * which adds the tab's dimension as an additional projection.
+ */
+export interface MetricsViewerDefinitionEntry {
+ id: MetricSourceId;
+ definition: MetricDefinition | null;
+}
+
+// ── Tab state ──
+
+export interface MetricsViewerTabProjectionConfig {
+ temporalUnit?: TemporalUnit;
+ binningStrategy?: string;
+ dimensionFilter?: DimensionFilterValue;
+}
+
+export interface MetricsViewerTabState {
+ id: string;
+ type: MetricsViewerTabType;
+ label: string;
+ display: MetricsViewerDisplayType;
+ dimensionMapping: Record<MetricSourceId, DimensionId | null>;
+ projectionConfig: MetricsViewerTabProjectionConfig;
+}
+
+// ── Page state ──
+
+export interface MetricsViewerPageState {
+ definitions: MetricsViewerDefinitionEntry[];
+ tabs: MetricsViewerTabState[];
+ selectedTabId: string | null;
+}
+
+export function getInitialMetricsViewerPageState(): MetricsViewerPageState {
+ return {
+ definitions: [],
+ tabs: [],
+ selectedTabId: null,
+ };
+}
+
+// ── Color mapping ──
+
+export type SourceColorMap = Partial<Record<MetricSourceId, string[]>>;
+
+// ── Shared display types ──
+
+export type SelectedMetric = {
+ id: number;
+ name: string | null;
+ sourceType: "metric" | "measure";
+ tableId?: ConcreteTableId;
+ isLoading?: boolean;
+};
diff --git a/frontend/src/metabase/metrics-viewer/utils/MetricsViewerClickActionsMode.ts b/frontend/src/metabase/metrics-viewer/utils/MetricsViewerClickActionsMode.ts
new file mode 100644
index 00000000000..d5da681afea
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/MetricsViewerClickActionsMode.ts
@@ -0,0 +1,189 @@
+import dayjs from "dayjs";
+
+import type {
+ ClickAction,
+ ClickActionsMode,
+ ClickObject,
+} from "metabase/visualizations/types";
+import * as LibMetric from "metabase-lib/metric";
+import type { CardId, DatetimeUnit, TemporalUnit } from "metabase-types/api";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerTabState,
+} from "../types/viewer-state";
+
+import type { DimensionFilterValue } from "./dimension-filters";
+import { findDimensionById } from "./dimension-lookup";
+
+type MetricsViewerClickActionParams = {
+ definitions: MetricsViewerDefinitionEntry[];
+ tab: MetricsViewerTabState;
+ onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
+ cardIdToDimensionId: Record<CardId, MetricSourceId>;
+};
+
+export class MetricsViewerClickActionsMode implements ClickActionsMode {
+ private definitions: MetricsViewerDefinitionEntry[];
+ private tab: MetricsViewerTabState;
+ private onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
+ private cardIdToDimensionId: Record<CardId, MetricSourceId>;
+ constructor({
+ definitions,
+ tab,
+ onTabUpdate,
+ cardIdToDimensionId,
+ }: MetricsViewerClickActionParams) {
+ this.definitions = definitions;
+ this.tab = tab;
+ this.onTabUpdate = onTabUpdate;
+ this.cardIdToDimensionId = cardIdToDimensionId;
+ }
+ actionsForClick(clickObject: ClickObject): ClickAction[] {
+ const cardId = clickObject.cardId;
+ if (cardId == null) {
+ return [];
+ }
+ const definition = this.definitions.find(
+ (definition) => definition.id === this.cardIdToDimensionId[cardId],
+ );
+ const params = {
+ definitions: this.definitions,
+ definition,
+ tab: this.tab,
+ onTabUpdate: this.onTabUpdate,
+ clickObject,
+ };
+ return [getZoomInTimeSeriesAction(params)].filter(
+ (action) => action !== undefined,
+ );
+ }
+}
+
+type GetActionParams = {
+ definitions: MetricsViewerDefinitionEntry[];
+ definition: MetricsViewerDefinitionEntry | undefined; //definition that was clicked on
+ tab: MetricsViewerTabState;
+ onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
+ clickObject: ClickObject;
+};
+
+function getZoomInTimeSeriesAction({
+ definition,
+ tab,
+ onTabUpdate,
+ clickObject,
+}: GetActionParams): ClickAction | undefined {
+ if (!definition || !definition.definition) {
+ return;
+ }
+ const dimension = clickObject.dimensions?.[0];
+ if (!dimension) {
+ return;
+ }
+ const currentTemporalUnit = dimension.column.unit;
+ if (!isValidTemporalUnit(currentTemporalUnit)) {
+ return;
+ }
+ const nextTemporalUnit = getNextTemporalUnit(
+ definition,
+ tab,
+ currentTemporalUnit,
+ );
+ if (!nextTemporalUnit) {
+ return;
+ }
+ const dimensionValue = dimension.value;
+ if (typeof dimensionValue !== "string") {
+ return;
+ }
+ const dimensionFilter = getDimensionFilterForDateAndUnit(
+ dimensionValue,
+ currentTemporalUnit,
+ nextTemporalUnit,
+ );
+ if (!dimensionFilter) {
+ return;
+ }
+ return {
+ type: "custom",
+ name: "zoom-in.timeseries",
+ title: `See this ${currentTemporalUnit} by ${nextTemporalUnit}`,
+ section: "zoom",
+ icon: "zoom_in",
+ buttonType: "horizontal",
+ onClick: ({ closePopover }) => {
+ onTabUpdate({
+ projectionConfig: {
+ ...tab.projectionConfig,
+ temporalUnit: nextTemporalUnit,
+ dimensionFilter,
+ },
+ });
+ closePopover();
+ },
+ };
+}
+
+function isValidTemporalUnit(unit?: DatetimeUnit): unit is TemporalUnit {
+ if (unit == null) {
+ return false;
+ }
+ return ["year", "quarter", "month", "week", "day", "hour"].includes(unit);
+}
+
+function getDimensionFilterForDateAndUnit(
+ date: string,
+ unit: TemporalUnit,
+ nextUnit: TemporalUnit,
+): DimensionFilterValue | undefined {
+ const parsedDate = dayjs(date);
+ if (!parsedDate.isValid()) {
+ return undefined;
+ }
+ return {
+ type: "specific-date",
+ operator: "between",
+ values: [
+ parsedDate.startOf(unit).toDate(),
+ parsedDate.endOf(unit).toDate(),
+ ],
+ hasTime: nextUnit === "hour" || nextUnit === "minute",
+ };
+}
+
+const nextTemporalUnitMap: Partial<Record<TemporalUnit, TemporalUnit>> = {
+ year: "quarter",
+ quarter: "month",
+ month: "week",
+ week: "day",
+ day: "hour",
+ hour: "minute",
+};
+
+function getNextTemporalUnit(
+ entry: MetricsViewerDefinitionEntry,
+ tab: MetricsViewerTabState,
+ currentUnit: TemporalUnit,
+): TemporalUnit | undefined {
+ const definition = entry.definition;
+ const dimensionId = tab.dimensionMapping[entry.id];
+ if (!definition || !dimensionId) {
+ return undefined;
+ }
+ const dimension = findDimensionById(definition, dimensionId);
+ if (!dimension) {
+ return undefined;
+ }
+ const availableBuckets = LibMetric.availableTemporalBuckets(
+ definition,
+ dimension,
+ ).map((bucket) => LibMetric.displayInfo(definition, bucket).shortName);
+ const filteredNextTemporalUnitMap = Object.fromEntries(
+ Object.entries(nextTemporalUnitMap).filter(([_key, value]) =>
+ availableBuckets.includes(value),
+ ),
+ );
+ return filteredNextTemporalUnitMap[currentUnit];
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/__tests__/test-helpers.ts b/frontend/src/metabase/metrics-viewer/utils/__tests__/test-helpers.ts
new file mode 100644
index 00000000000..67a0184f974
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/__tests__/test-helpers.ts
@@ -0,0 +1,248 @@
+import { createMockMetadata } from "__support__/metadata";
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+import Metadata from "metabase-lib/v1/metadata/Metadata";
+import Metric from "metabase-lib/v1/metadata/Metric";
+import type { NormalizedMetric } from "metabase-types/api";
+import { createMockMeasure } from "metabase-types/api/mocks/measure";
+import {
+ createMockMetricDimension,
+ createMockNormalizedMetric,
+} from "metabase-types/api/mocks/metric";
+import {
+ ORDERS,
+ ORDERS_ID,
+ SAMPLE_DB_ID,
+ createOrdersTable,
+ createPeopleTable,
+ createProductsTable,
+ createReviewsTable,
+ createSampleDatabase,
+} from "metabase-types/api/mocks/presets";
+
+export { createMockNormalizedMetric, createMockMetricDimension };
+
+// ── Metric fixtures ──
+
+export const REVENUE_METRIC = createMockNormalizedMetric({
+ id: 1,
+ name: "Revenue",
+ dimensions: [
+ createMockMetricDimension({
+ id: "dim-created-at",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: "type/CreationTimestamp",
+ }),
+ createMockMetricDimension({
+ id: "dim-category",
+ display_name: "Category",
+ effective_type: "type/Text",
+ semantic_type: "type/Category",
+ }),
+ createMockMetricDimension({
+ id: "dim-amount",
+ display_name: "Amount",
+ effective_type: "type/Float",
+ semantic_type: "type/Currency",
+ sources: [{ type: "field", "field-id": 5 }],
+ }),
+ createMockMetricDimension({
+ id: "dim-active",
+ display_name: "Is Active",
+ effective_type: "type/Boolean",
+ semantic_type: null,
+ }),
+ ],
+});
+
+export const GEO_METRIC = createMockNormalizedMetric({
+ id: 2,
+ name: "Geo Revenue",
+ dimensions: [
+ createMockMetricDimension({
+ id: "dim-state",
+ display_name: "State",
+ effective_type: "type/Text",
+ semantic_type: "type/State",
+ }),
+ createMockMetricDimension({
+ id: "dim-country",
+ display_name: "Country",
+ effective_type: "type/Text",
+ semantic_type: "type/Country",
+ }),
+ createMockMetricDimension({
+ id: "dim-city",
+ display_name: "City",
+ effective_type: "type/Text",
+ semantic_type: "type/City",
+ }),
+ createMockMetricDimension({
+ id: "dim-latitude",
+ display_name: "Latitude",
+ effective_type: "type/Float",
+ semantic_type: "type/Latitude",
+ }),
+ createMockMetricDimension({
+ id: "dim-longitude",
+ display_name: "Longitude",
+ effective_type: "type/Float",
+ semantic_type: "type/Longitude",
+ }),
+ createMockMetricDimension({
+ id: "dim-created-at",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: "type/CreationTimestamp",
+ }),
+ ],
+});
+
+export function createMetricMetadata(metrics: NormalizedMetric[]): Metadata {
+ const metadata = new Metadata();
+ metadata.metrics = {};
+ for (const metric of metrics) {
+ const instance = new Metric(metric);
+ instance.metadata = metadata;
+ metadata.metrics[metric.id] = instance;
+ }
+ return metadata;
+}
+
+export function setupDefinition(
+ metadata: Metadata,
+ metricId: number,
+): LibMetric.MetricDefinition {
+ const provider = LibMetric.metadataProvider(metadata);
+ const metricMeta = LibMetric.metricMetadata(provider, metricId);
+ if (!metricMeta) {
+ throw new Error(`Metric ${metricId} not found`);
+ }
+ return LibMetric.fromMetricMetadata(provider, metricMeta);
+}
+
+export function setupDefinitionWithBreakout(
+ metadata: Metadata,
+ metricId: number,
+ dimensionIndex: number,
+): LibMetric.MetricDefinition {
+ const definition = setupDefinition(metadata, metricId);
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dimensionRef = LibMetric.dimensionReference(dimensions[dimensionIndex]);
+ return LibMetric.project(definition, dimensionRef);
+}
+
+// ── Measure fixtures ──
+
+const sampleDatabase = createSampleDatabase({
+ tables: [
+ createOrdersTable(),
+ createPeopleTable(),
+ createProductsTable(),
+ createReviewsTable(),
+ ],
+});
+
+const baseMeasureMetadata = createMockMetadata({
+ databases: [sampleDatabase],
+});
+
+const TOTAL_MEASURE_ID = 100;
+
+export const TOTAL_MEASURE = createMockMeasure({
+ id: TOTAL_MEASURE_ID,
+ name: "Total Revenue",
+ table_id: ORDERS_ID,
+ definition: Lib.toJsQuery(
+ Lib.createTestQuery(
+ Lib.metadataProvider(SAMPLE_DB_ID, baseMeasureMetadata),
+ {
+ stages: [
+ {
+ source: { type: "table", id: ORDERS_ID },
+ aggregations: [
+ {
+ type: "operator",
+ operator: "sum",
+ args: [
+ {
+ type: "column",
+ name: "TOTAL",
+ sourceName: "ORDERS",
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ),
+ ),
+ dimensions: [
+ createMockMetricDimension({
+ id: "measure-dim-created-at",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: "type/CreationTimestamp",
+ }),
+ createMockMetricDimension({
+ id: "measure-dim-quantity",
+ display_name: "Quantity",
+ effective_type: "type/Integer",
+ semantic_type: "type/Quantity",
+ }),
+ createMockMetricDimension({
+ id: "measure-dim-total",
+ display_name: "Total",
+ effective_type: "type/Float",
+ semantic_type: "type/Currency",
+ sources: [{ type: "field", "field-id": ORDERS.TOTAL }],
+ }),
+ ],
+ dimension_mappings: [
+ {
+ dimension_id: "measure-dim-created-at",
+ table_id: ORDERS_ID,
+ target: ["field", {}, ORDERS.CREATED_AT],
+ },
+ {
+ dimension_id: "measure-dim-quantity",
+ table_id: ORDERS_ID,
+ target: ["field", {}, ORDERS.QUANTITY],
+ },
+ {
+ dimension_id: "measure-dim-total",
+ table_id: ORDERS_ID,
+ target: ["field", {}, ORDERS.TOTAL],
+ },
+ ],
+});
+
+export const measureMetadata = createMockMetadata({
+ databases: [sampleDatabase],
+ measures: [TOTAL_MEASURE],
+});
+
+export function setupMeasureDefinition(
+ metadata: Metadata,
+ measureId: number,
+): LibMetric.MetricDefinition {
+ const provider = LibMetric.metadataProvider(metadata);
+ const measureMeta = LibMetric.measureMetadata(provider, measureId);
+ if (!measureMeta) {
+ throw new Error(`Measure ${measureId} not found`);
+ }
+ return LibMetric.fromMeasureMetadata(provider, measureMeta);
+}
+
+export function setupMeasureDefinitionWithBreakout(
+ metadata: Metadata,
+ measureId: number,
+ dimensionIndex: number,
+): LibMetric.MetricDefinition {
+ const definition = setupMeasureDefinition(metadata, measureId);
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dimensionRef = LibMetric.dimensionReference(dimensions[dimensionIndex]);
+ return LibMetric.project(definition, dimensionRef);
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/compact-schema.ts b/frontend/src/metabase/metrics-viewer/utils/compact-schema.ts
new file mode 100644
index 00000000000..5a3dc2683e0
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/compact-schema.ts
@@ -0,0 +1,170 @@
+type RequiredField = string;
+
+type RequiredKeyField = { key: string };
+
+type OptionalField = { key: string; optional: true };
+
+type DefaultField = { key: string; default: unknown };
+
+type NestedField = { key: string; schema: CompactSchema<unknown> };
+
+type NestedOptionalField = {
+ key: string;
+ schema: CompactSchema<unknown>;
+ optional: true;
+};
+
+type NestedDefaultField = {
+ key: string;
+ schema: CompactSchema<unknown>;
+ default: unknown[];
+};
+
+export type FieldDescriptor =
+ | RequiredField
+ | RequiredKeyField
+ | OptionalField
+ | DefaultField
+ | NestedField
+ | NestedOptionalField
+ | NestedDefaultField;
+
+export type SchemaConfig<T> = { [K in keyof T]-?: FieldDescriptor };
+
+export interface CompactSchema<T> {
+ compact(value: T): Record<string, unknown>;
+ expand(raw: unknown): T | null;
+}
+
+interface NormalizedField {
+ compactKey: string;
+ optional: boolean;
+ defaultValue: unknown;
+ hasDefault: boolean;
+ schema: CompactSchema<unknown> | null;
+}
+
+function isObjectDescriptor(
+ descriptor: FieldDescriptor,
+): descriptor is
+ | RequiredKeyField
+ | OptionalField
+ | DefaultField
+ | NestedField
+ | NestedOptionalField
+ | NestedDefaultField {
+ return typeof descriptor !== "string";
+}
+
+function hasDefaultValue(
+ descriptor: Exclude<FieldDescriptor, RequiredField>,
+): descriptor is DefaultField | NestedDefaultField {
+ return "default" in descriptor;
+}
+
+function hasNestedSchema(
+ descriptor: Exclude<FieldDescriptor, RequiredField>,
+): descriptor is NestedField | NestedOptionalField | NestedDefaultField {
+ return "schema" in descriptor;
+}
+
+function normalizeDescriptor(descriptor: FieldDescriptor): NormalizedField {
+ if (!isObjectDescriptor(descriptor)) {
+ return {
+ compactKey: descriptor,
+ optional: false,
+ defaultValue: undefined,
+ hasDefault: false,
+ schema: null,
+ };
+ }
+
+ return {
+ compactKey: descriptor.key,
+ optional: "optional" in descriptor && descriptor.optional === true,
+ defaultValue: hasDefaultValue(descriptor) ? descriptor.default : undefined,
+ hasDefault: "default" in descriptor,
+ schema: hasNestedSchema(descriptor) ? descriptor.schema : null,
+ };
+}
+
+export function defineCompactSchema<T>(
+ config: SchemaConfig<T>,
+): CompactSchema<T> {
+ const entries = Object.entries(config) as [string, FieldDescriptor][];
+ const normalized = entries.map(
+ ([fullKey, descriptor]) =>
+ [fullKey, normalizeDescriptor(descriptor)] as const,
+ );
+
+ return {
+ compact(value: T): Record<string, unknown> {
+ const result: Record<string, unknown> = {};
+
+ for (const [fullKey, field] of normalized) {
+ const val = (value as Record<string, unknown>)[fullKey];
+
+ if (field.optional && val === undefined) {
+ continue;
+ }
+
+ if (field.schema && Array.isArray(val)) {
+ result[field.compactKey] = val.map((item) =>
+ field.schema!.compact(item),
+ );
+ } else if (
+ field.schema &&
+ val != null &&
+ typeof val === "object" &&
+ !Array.isArray(val)
+ ) {
+ result[field.compactKey] = field.schema.compact(val);
+ } else {
+ result[field.compactKey] = val;
+ }
+ }
+
+ return result;
+ },
+
+ expand(raw: unknown): T | null {
+ if (!raw || typeof raw !== "object") {
+ return null;
+ }
+
+ const obj = raw as Record<string, unknown>;
+ const result: Record<string, unknown> = {};
+
+ for (const [fullKey, field] of normalized) {
+ const val = obj[field.compactKey];
+
+ if (val === undefined) {
+ if (field.optional) {
+ continue;
+ }
+ if (field.hasDefault) {
+ result[fullKey] = field.defaultValue;
+ continue;
+ }
+ return null;
+ }
+
+ if (field.schema) {
+ if (Array.isArray(val)) {
+ result[fullKey] = val
+ .map((item) => field.schema!.expand(item))
+ .filter((item): item is NonNullable<typeof item> => item != null);
+ } else if (val != null && typeof val === "object") {
+ result[fullKey] = field.schema.expand(val);
+ } else {
+ result[fullKey] = field.hasDefault ? field.defaultValue : [];
+ }
+ } else {
+ result[fullKey] = val;
+ }
+ }
+
+ return result as T;
+ },
+ };
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/compact-schema.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/compact-schema.unit.spec.ts
new file mode 100644
index 00000000000..4f3f1cd1389
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/compact-schema.unit.spec.ts
@@ -0,0 +1,344 @@
+import { defineCompactSchema } from "./compact-schema";
+
+describe("defineCompactSchema", () => {
+ describe("required fields", () => {
+ const schema = defineCompactSchema<{ name: string; age: number }>({
+ name: "n",
+ age: "a",
+ });
+
+ it("compacts required fields", () => {
+ expect(schema.compact({ name: "Alice", age: 30 })).toEqual({
+ n: "Alice",
+ a: 30,
+ });
+ });
+
+ it("expands required fields", () => {
+ expect(schema.expand({ n: "Alice", a: 30 })).toEqual({
+ name: "Alice",
+ age: 30,
+ });
+ });
+
+ it("returns null when a required field is missing on expand", () => {
+ expect(schema.expand({ n: "Alice" })).toBeNull();
+ expect(schema.expand({ a: 30 })).toBeNull();
+ expect(schema.expand({})).toBeNull();
+ });
+ });
+
+ describe("optional fields", () => {
+ const schema = defineCompactSchema<{ id: number; label?: string }>({
+ id: "i",
+ label: { key: "l", optional: true },
+ });
+
+ it("omits optional undefined fields on compact", () => {
+ expect(schema.compact({ id: 1 })).toEqual({ i: 1 });
+ });
+
+ it("includes optional fields when present on compact", () => {
+ expect(schema.compact({ id: 1, label: "test" })).toEqual({
+ i: 1,
+ l: "test",
+ });
+ });
+
+ it("omits optional fields from result when missing on expand", () => {
+ expect(schema.expand({ i: 1 })).toEqual({ id: 1 });
+ });
+
+ it("includes optional fields when present on expand", () => {
+ expect(schema.expand({ i: 1, l: "test" })).toEqual({
+ id: 1,
+ label: "test",
+ });
+ });
+
+ it("preserves null values for optional fields", () => {
+ expect(schema.compact({ id: 1, label: undefined })).toEqual({ i: 1 });
+ expect(schema.expand({ i: 1, l: null })).toEqual({
+ id: 1,
+ label: null,
+ });
+ });
+ });
+
+ describe("default fields", () => {
+ const schema = defineCompactSchema<{ id: number; label: string }>({
+ id: "i",
+ label: { key: "l", default: "" },
+ });
+
+ it("always writes default fields on compact", () => {
+ expect(schema.compact({ id: 1, label: "" })).toEqual({ i: 1, l: "" });
+ });
+
+ it("uses default when field is missing on expand", () => {
+ expect(schema.expand({ i: 1 })).toEqual({ id: 1, label: "" });
+ });
+
+ it("uses provided value when present on expand", () => {
+ expect(schema.expand({ i: 1, l: "hello" })).toEqual({
+ id: 1,
+ label: "hello",
+ });
+ });
+ });
+
+ describe("nested schema fields", () => {
+ const itemSchema = defineCompactSchema<{ id: number; name?: string }>({
+ id: "i",
+ name: { key: "n", optional: true },
+ });
+
+ const parentSchema = defineCompactSchema<{
+ items: Array<{ id: number; name?: string }>;
+ }>({
+ items: { key: "I", schema: itemSchema, default: [] },
+ });
+
+ it("compacts nested arrays through the child schema", () => {
+ expect(
+ parentSchema.compact({
+ items: [{ id: 1, name: "a" }, { id: 2 }],
+ }),
+ ).toEqual({
+ I: [{ i: 1, n: "a" }, { i: 2 }],
+ });
+ });
+
+ it("expands nested arrays through the child schema", () => {
+ expect(parentSchema.expand({ I: [{ i: 1, n: "a" }, { i: 2 }] })).toEqual({
+ items: [{ id: 1, name: "a" }, { id: 2 }],
+ });
+ });
+
+ it("filters out invalid items on expand", () => {
+ expect(parentSchema.expand({ I: [{ i: 1 }, {}, null] })).toEqual({
+ items: [{ id: 1 }],
+ });
+ });
+
+ it("uses default when nested array key is missing on expand", () => {
+ expect(parentSchema.expand({})).toEqual({ items: [] });
+ });
+ });
+
+ describe("round-trip integrity", () => {
+ const innerSchema = defineCompactSchema<{
+ definitionId: string;
+ dimensionId?: string;
+ }>({
+ definitionId: "i",
+ dimensionId: { key: "d", optional: true },
+ });
+
+ const outerSchema = defineCompactSchema<{
+ id: string;
+ type: string;
+ label: string;
+ display: string;
+ definitions: Array<{ definitionId: string; dimensionId?: string }>;
+ filter?: unknown;
+ temporalUnit?: string;
+ }>({
+ id: "i",
+ type: "t",
+ label: { key: "l", default: "" },
+ display: { key: "d", default: "line" },
+ definitions: { key: "D", schema: innerSchema, default: [] },
+ filter: { key: "f", optional: true },
+ temporalUnit: { key: "u", optional: true },
+ });
+
+ it("round-trips a complex object with all fields", () => {
+ const original = {
+ id: "tab-1",
+ type: "time",
+ label: "By Month",
+ display: "bar",
+ definitions: [
+ { definitionId: "metric:1", dimensionId: "dim-1" },
+ { definitionId: "metric:2" },
+ ],
+ filter: { type: "relative", value: -30, unit: "day" },
+ temporalUnit: "month",
+ };
+
+ const compacted = outerSchema.compact(original);
+ const expanded = outerSchema.expand(compacted);
+ expect(expanded).toEqual(original);
+ });
+
+ it("round-trips a minimal object with only required and default fields", () => {
+ const original = {
+ id: "tab-1",
+ type: "time",
+ label: "",
+ display: "line",
+ definitions: [],
+ };
+
+ const compacted = outerSchema.compact(original);
+ const expanded = outerSchema.expand(compacted);
+ expect(expanded).toEqual(original);
+ });
+ });
+
+ describe("non-array nested values", () => {
+ const itemSchema = defineCompactSchema<{ id: number }>({
+ id: "i",
+ });
+
+ const parentSchema = defineCompactSchema<{
+ items: Array<{ id: number }>;
+ }>({
+ items: { key: "I", schema: itemSchema, default: [] },
+ });
+
+ it("uses default when nested field is a non-array value on expand", () => {
+ expect(parentSchema.expand({ I: "not-an-array" })).toEqual({
+ items: [],
+ });
+ expect(parentSchema.expand({ I: 42 })).toEqual({ items: [] });
+ expect(parentSchema.expand({ I: null })).toEqual({ items: [] });
+ });
+
+ it("uses default for nested field without default when value is non-array", () => {
+ const schemaWithoutDefault = defineCompactSchema<{
+ items: Array<{ id: number }>;
+ }>({
+ items: { key: "I", schema: itemSchema },
+ });
+
+ expect(schemaWithoutDefault.expand({ I: "not-an-array" })).toEqual({
+ items: [],
+ });
+ });
+ });
+
+ describe("single-object nested schema fields", () => {
+ const configSchema = defineCompactSchema<{
+ filter: string;
+ unit: string;
+ }>({
+ filter: "f",
+ unit: "u",
+ });
+
+ const parentSchema = defineCompactSchema<{
+ id: string;
+ config: { filter: string; unit: string };
+ }>({
+ id: "i",
+ config: { key: "c", schema: configSchema },
+ });
+
+ it("compacts a single nested object through the child schema", () => {
+ expect(
+ parentSchema.compact({
+ id: "1",
+ config: { filter: "date", unit: "month" },
+ }),
+ ).toEqual({
+ i: "1",
+ c: { f: "date", u: "month" },
+ });
+ });
+
+ it("expands a single nested object through the child schema", () => {
+ expect(
+ parentSchema.expand({ i: "1", c: { f: "date", u: "month" } }),
+ ).toEqual({
+ id: "1",
+ config: { filter: "date", unit: "month" },
+ });
+ });
+
+ it("round-trips a single nested object", () => {
+ const original = { id: "1", config: { filter: "date", unit: "month" } };
+ const compacted = parentSchema.compact(original);
+ const expanded = parentSchema.expand(compacted);
+ expect(expanded).toEqual(original);
+ });
+ });
+
+ describe("falsy field values", () => {
+ const schema = defineCompactSchema<{
+ count: number;
+ label: string;
+ flag: boolean;
+ }>({
+ count: "c",
+ label: "l",
+ flag: "f",
+ });
+
+ it("preserves falsy values (0, empty string, false) on compact", () => {
+ expect(schema.compact({ count: 0, label: "", flag: false })).toEqual({
+ c: 0,
+ l: "",
+ f: false,
+ });
+ });
+
+ it("preserves falsy values on expand", () => {
+ expect(schema.expand({ c: 0, l: "", f: false })).toEqual({
+ count: 0,
+ label: "",
+ flag: false,
+ });
+ });
+ });
+
+ describe("null default values", () => {
+ const schema = defineCompactSchema<{
+ id: string;
+ selected: string | null;
+ }>({
+ id: "i",
+ selected: { key: "s", default: null },
+ });
+
+ it("uses null default on expand when key is missing", () => {
+ expect(schema.expand({ i: "test" })).toEqual({
+ id: "test",
+ selected: null,
+ });
+ });
+
+ it("preserves explicit null on expand", () => {
+ expect(schema.expand({ i: "test", s: null })).toEqual({
+ id: "test",
+ selected: null,
+ });
+ });
+
+ it("preserves non-null value on expand", () => {
+ expect(schema.expand({ i: "test", s: "value" })).toEqual({
+ id: "test",
+ selected: "value",
+ });
+ });
+ });
+
+ describe("invalid input handling", () => {
+ const schema = defineCompactSchema<{ id: number }>({ id: "i" });
+
+ it("returns null for null input", () => {
+ expect(schema.expand(null)).toBeNull();
+ });
+
+ it("returns null for undefined input", () => {
+ expect(schema.expand(undefined)).toBeNull();
+ });
+
+ it("returns null for non-object input", () => {
+ expect(schema.expand("string")).toBeNull();
+ expect(schema.expand(42)).toBeNull();
+ expect(schema.expand(true)).toBeNull();
+ });
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/definition-builder.ts b/frontend/src/metabase/metrics-viewer/utils/definition-builder.ts
new file mode 100644
index 00000000000..fbd04e223a8
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/definition-builder.ts
@@ -0,0 +1,320 @@
+import type {
+ DimensionMetadata,
+ FilterClause,
+ MeasureDisplayInfo,
+ MetricDefinition,
+ MetricDisplayInfo,
+ ProjectionClause,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { TemporalUnit } from "metabase-types/api";
+
+import { UNBINNED } from "../constants";
+
+import type { DimensionFilterValue } from "./dimension-filters";
+import { applyDimensionFilter } from "./dimension-filters";
+import { findBinningStrategy, findTemporalBucket } from "./dimension-lookup";
+
+// ── Projection application ──
+
+function applyBinnedProjection(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+ binningStrategy: string | undefined,
+): MetricDefinition {
+ const projections = LibMetric.projections(definition);
+
+ let newProjection: ProjectionClause;
+
+ const tempDef = LibMetric.project(
+ projections.reduce<MetricDefinition>(
+ (definition, projection) =>
+ LibMetric.removeClause(definition, projection),
+ definition,
+ ),
+ LibMetric.dimensionReference(dimension),
+ );
+ const tempProjections = LibMetric.projections(tempDef);
+ if (tempProjections.length === 0) {
+ return definition;
+ }
+ const baseProjection = tempProjections[tempProjections.length - 1];
+
+ if (binningStrategy === UNBINNED) {
+ newProjection = LibMetric.withBinning(baseProjection, null);
+ } else if (binningStrategy) {
+ const strategy = findBinningStrategy(
+ definition,
+ dimension,
+ binningStrategy,
+ );
+ newProjection = LibMetric.withBinning(baseProjection, strategy);
+ } else {
+ newProjection = LibMetric.withDefaultBinning(tempDef, baseProjection);
+ }
+
+ return LibMetric.replaceClause(tempDef, baseProjection, newProjection);
+}
+
+export function applyProjection(
+ definition: MetricDefinition,
+ dimension: ProjectionClause,
+): MetricDefinition {
+ let result = definition;
+ for (const proj of LibMetric.projections(definition)) {
+ result = LibMetric.removeClause(result, proj);
+ }
+
+ return LibMetric.project(result, dimension);
+}
+
+function applyTemporalUnit(
+ definition: MetricDefinition,
+ unit: TemporalUnit,
+): MetricDefinition {
+ const projections = LibMetric.projections(definition);
+ if (projections.length === 0) {
+ return definition;
+ }
+
+ const projection = projections[0];
+ const dimension = LibMetric.projectionDimension(definition, projection);
+ if (!dimension || !LibMetric.isDateOrDateTime(dimension)) {
+ return definition;
+ }
+
+ const bucket = findTemporalBucket(definition, dimension, unit);
+ if (!bucket) {
+ return definition;
+ }
+
+ const newProjection = LibMetric.withTemporalBucket(projection, bucket);
+ return LibMetric.replaceClause(definition, projection, newProjection);
+}
+
+// ── Breakout application ──
+
+export function buildBinnedBreakoutDefinition(
+ baseDef: MetricDefinition,
+ breakoutDimension: ProjectionClause,
+): MetricDefinition {
+ if (
+ LibMetric.temporalBucket(breakoutDimension) ||
+ LibMetric.binning(breakoutDimension)
+ ) {
+ return applyProjection(baseDef, breakoutDimension);
+ }
+
+ const definition = applyProjection(baseDef, breakoutDimension);
+ const projections = LibMetric.projections(definition);
+ if (projections.length === 0) {
+ return definition;
+ }
+
+ const projection = projections[projections.length - 1];
+ const dimension = LibMetric.projectionDimension(definition, projection);
+ if (!dimension) {
+ return definition;
+ }
+
+ if (LibMetric.isBinnable(definition, dimension)) {
+ return LibMetric.replaceClause(
+ definition,
+ projection,
+ LibMetric.withDefaultBinning(definition, projection),
+ );
+ }
+ if (LibMetric.isTemporalBucketable(definition, dimension)) {
+ return LibMetric.replaceClause(
+ definition,
+ projection,
+ LibMetric.withDefaultTemporalBucket(definition, projection),
+ );
+ }
+ return definition;
+}
+
+export function applyBreakoutDimension(
+ baseDefinition: MetricDefinition,
+ execDef: MetricDefinition,
+ breakoutDimension: ProjectionClause,
+): MetricDefinition {
+ if (
+ LibMetric.temporalBucket(breakoutDimension) ||
+ LibMetric.binning(breakoutDimension)
+ ) {
+ return LibMetric.project(execDef, breakoutDimension);
+ }
+
+ const binnedDefinition = buildBinnedBreakoutDefinition(
+ baseDefinition,
+ breakoutDimension,
+ );
+ const binnedProjection = LibMetric.projections(binnedDefinition);
+ if (binnedProjection.length === 0) {
+ return LibMetric.project(execDef, breakoutDimension);
+ }
+
+ const binnedProj = binnedProjection[binnedProjection.length - 1];
+ return LibMetric.project(execDef, binnedProj);
+}
+
+// ── Composite definition builder ──
+
+type ProjectionOptions = {
+ projectionTemporalUnit?: TemporalUnit;
+ binningStrategy?: string;
+ dimensionFilter?: DimensionFilterValue;
+};
+
+export function buildExecutableDefinition(
+ baseDefinition: MetricDefinition,
+ dimension: DimensionMetadata | undefined,
+ options: ProjectionOptions,
+): MetricDefinition | null {
+ if (!dimension) {
+ return null;
+ }
+
+ const { projectionTemporalUnit, binningStrategy, dimensionFilter } = options;
+ const dimensionReference = LibMetric.dimensionReference(dimension);
+
+ let definition = baseDefinition;
+
+ if (LibMetric.isTemporalBucketable(baseDefinition, dimension)) {
+ definition = applyProjection(definition, dimensionReference);
+
+ if (projectionTemporalUnit) {
+ definition = applyTemporalUnit(definition, projectionTemporalUnit);
+ } else {
+ const projections = LibMetric.projections(definition);
+ if (projections.length > 0) {
+ const defaultProj = LibMetric.withDefaultTemporalBucket(
+ definition,
+ projections[0],
+ );
+ definition = LibMetric.replaceClause(
+ definition,
+ projections[0],
+ defaultProj,
+ );
+ }
+ }
+ } else if (LibMetric.isBinnable(baseDefinition, dimension)) {
+ definition = applyBinnedProjection(definition, dimension, binningStrategy);
+ } else {
+ definition = applyProjection(definition, dimensionReference);
+ }
+
+ if (dimensionFilter) {
+ const projections = LibMetric.projections(definition);
+ if (projections.length > 0) {
+ const projectionDimension = LibMetric.projectionDimension(
+ definition,
+ projections[0],
+ );
+ if (projectionDimension) {
+ definition = applyDimensionFilter(
+ definition,
+ projectionDimension,
+ dimensionFilter,
+ );
+ }
+ }
+ }
+
+ return definition;
+}
+
+// ── Projection inspection ──
+
+export type ProjectionInfo = {
+ projection: ProjectionClause | undefined;
+ projectionDimension: DimensionMetadata | undefined;
+ filterDimension: DimensionMetadata | undefined;
+ filter: FilterClause | undefined;
+ isTemporalBucketable: boolean;
+ isBinnable: boolean;
+ hasBinning: boolean;
+};
+
+export function getProjectionInfo(
+ definition: MetricDefinition,
+): ProjectionInfo {
+ const allProjections = LibMetric.projections(definition);
+ const firstProjection = allProjections[0];
+
+ const projectionDimension = firstProjection
+ ? (LibMetric.projectionDimension(definition, firstProjection) ?? undefined)
+ : undefined;
+
+ const isTemporalBucketable = projectionDimension
+ ? LibMetric.isTemporalBucketable(definition, projectionDimension)
+ : false;
+ const isBinnable = projectionDimension
+ ? LibMetric.isBinnable(definition, projectionDimension)
+ : false;
+ const hasBinning = firstProjection
+ ? LibMetric.binning(firstProjection) !== null
+ : false;
+
+ let filterDimension: DimensionMetadata | undefined;
+ let filterClause: FilterClause | undefined;
+
+ if (projectionDimension) {
+ const dimensionInfo = LibMetric.displayInfo(
+ definition,
+ projectionDimension,
+ );
+ const filterableDims = LibMetric.filterableDimensions(definition);
+ filterDimension = filterableDims.find((candidate) => {
+ const info = LibMetric.displayInfo(definition, candidate);
+ return info.name === dimensionInfo.name;
+ });
+
+ if (filterDimension) {
+ const existingFilters = LibMetric.filters(definition);
+ for (const existingFilter of existingFilters) {
+ const parts = LibMetric.filterParts(definition, existingFilter);
+ if (parts) {
+ const filterDimensionInfo = LibMetric.displayInfo(
+ definition,
+ parts.dimension,
+ );
+ if (filterDimensionInfo.name === dimensionInfo.name) {
+ filterClause = existingFilter;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return {
+ projection: firstProjection,
+ projectionDimension: projectionDimension,
+ filterDimension,
+ filter: filterClause,
+ isTemporalBucketable,
+ isBinnable,
+ hasBinning,
+ };
+}
+
+// ── Definition display helpers ──
+
+export function getDefinitionName(def: MetricDefinition): string | null {
+ const meta = LibMetric.sourceMetricOrMeasureMetadata(def);
+ return meta ? LibMetric.displayInfo(def, meta).displayName : null;
+}
+
+export function getDefinitionColumnName(def: MetricDefinition): string | null {
+ const meta = LibMetric.sourceMetricOrMeasureMetadata(def);
+ if (!meta) {
+ return null;
+ }
+ const info = LibMetric.displayInfo(def, meta) as
+ | MetricDisplayInfo
+ | MeasureDisplayInfo;
+ return info.columnName ?? null;
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/definition-builder.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/definition-builder.unit.spec.ts
new file mode 100644
index 00000000000..fd1215e4851
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/definition-builder.unit.spec.ts
@@ -0,0 +1,358 @@
+import * as LibMetric from "metabase-lib/metric";
+
+import {
+ REVENUE_METRIC,
+ TOTAL_MEASURE,
+ createMetricMetadata,
+ measureMetadata,
+ setupDefinition,
+ setupDefinitionWithBreakout,
+ setupMeasureDefinition,
+ setupMeasureDefinitionWithBreakout,
+} from "./__tests__/test-helpers";
+import {
+ applyBreakoutDimension,
+ applyProjection,
+ buildBinnedBreakoutDefinition,
+ buildExecutableDefinition,
+ getDefinitionColumnName,
+ getDefinitionName,
+ getProjectionInfo,
+} from "./definition-builder";
+
+const metadata = createMetricMetadata([REVENUE_METRIC]);
+
+describe("getDefinitionName", () => {
+ it("returns metric name for metric-based definition", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ expect(getDefinitionName(definition)).toBe("Revenue");
+ });
+
+ it("returns measure name for measure-based definition", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ expect(getDefinitionName(definition)).toBe("Total Revenue");
+ });
+});
+
+describe("getDefinitionColumnName", () => {
+ it("returns column name for metric-based definition", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ expect(getDefinitionColumnName(definition)).toBe("revenue");
+ });
+
+ it("returns column name for measure-based definition", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ expect(getDefinitionColumnName(definition)).toBe("total_revenue");
+ });
+});
+
+describe("applyProjection", () => {
+ describe("metric", () => {
+ it("replaces all existing projections with the given dimension", () => {
+ const definition = setupDefinitionWithBreakout(
+ metadata,
+ REVENUE_METRIC.id,
+ 0,
+ );
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const categoryReference = LibMetric.dimensionReference(dimensions[1]);
+
+ const result = applyProjection(definition, categoryReference);
+ const resultProjections = LibMetric.projections(result);
+
+ expect(resultProjections).toHaveLength(1);
+ const projectedDimension = LibMetric.projectionDimension(
+ result,
+ resultProjections[0],
+ );
+ expect(
+ LibMetric.displayInfo(result, projectedDimension!).displayName,
+ ).toBe("Category");
+ });
+ });
+
+ describe("measure", () => {
+ it("replaces all existing projections with the given dimension", () => {
+ const definition = setupMeasureDefinitionWithBreakout(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ 0,
+ );
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const quantityReference = LibMetric.dimensionReference(dimensions[1]);
+
+ const result = applyProjection(definition, quantityReference);
+ const resultProjections = LibMetric.projections(result);
+
+ expect(resultProjections).toHaveLength(1);
+ const projectedDimension = LibMetric.projectionDimension(
+ result,
+ resultProjections[0],
+ );
+ expect(
+ LibMetric.displayInfo(result, projectedDimension!).displayName,
+ ).toBe("Quantity");
+ });
+ });
+});
+
+describe("getProjectionInfo", () => {
+ describe("metric", () => {
+ it("returns empty info for definition with no projections", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ expect(getProjectionInfo(definition)).toMatchObject({
+ projection: undefined,
+ projectionDimension: undefined,
+ isTemporalBucketable: false,
+ isBinnable: false,
+ hasBinning: false,
+ });
+ });
+
+ it("returns temporal info for definition projected on DateTime dimension", () => {
+ const definition = setupDefinitionWithBreakout(
+ metadata,
+ REVENUE_METRIC.id,
+ 0,
+ );
+ const info = getProjectionInfo(definition);
+
+ expect(
+ LibMetric.displayInfo(definition, info.projectionDimension!)
+ .displayName,
+ ).toBe("Created At");
+ expect(info.isTemporalBucketable).toBe(true);
+ expect(info.isBinnable).toBe(false);
+ expect(info.hasBinning).toBe(false);
+ });
+
+ it("returns binnable info with hasBinning for binned numeric dimension", () => {
+ const definition = setupDefinitionWithBreakout(
+ metadata,
+ REVENUE_METRIC.id,
+ 2,
+ );
+ const projections = LibMetric.projections(definition);
+ const binnedDefinition = LibMetric.replaceClause(
+ definition,
+ projections[0],
+ LibMetric.withDefaultBinning(definition, projections[0]),
+ );
+ const info = getProjectionInfo(binnedDefinition);
+
+ expect(
+ LibMetric.displayInfo(binnedDefinition, info.projectionDimension!)
+ .displayName,
+ ).toBe("Amount");
+ expect(info.isTemporalBucketable).toBe(false);
+ expect(info.isBinnable).toBe(true);
+ expect(info.hasBinning).toBe(true);
+ });
+ });
+
+ describe("measure", () => {
+ it("returns temporal info for definition projected on DateTime dimension", () => {
+ const definition = setupMeasureDefinitionWithBreakout(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ 0,
+ );
+ const info = getProjectionInfo(definition);
+
+ expect(
+ LibMetric.displayInfo(definition, info.projectionDimension!)
+ .displayName,
+ ).toBe("Created At");
+ expect(info.isTemporalBucketable).toBe(true);
+ expect(info.isBinnable).toBe(false);
+ });
+
+ it("returns binnable info for definition projected on numeric dimension", () => {
+ const definition = setupMeasureDefinitionWithBreakout(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ 2,
+ );
+ const info = getProjectionInfo(definition);
+
+ expect(
+ LibMetric.displayInfo(definition, info.projectionDimension!)
+ .displayName,
+ ).toBe("Total");
+ expect(info.isBinnable).toBe(true);
+ expect(info.isTemporalBucketable).toBe(false);
+ });
+ });
+});
+
+describe("buildExecutableDefinition", () => {
+ describe("metric", () => {
+ it("applies specified temporal unit for temporal dimension", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const result = buildExecutableDefinition(definition, dimensions[0], {
+ projectionTemporalUnit: "year",
+ })!;
+
+ const resultProjections = LibMetric.projections(result);
+ const bucket = LibMetric.temporalBucket(resultProjections[0]);
+ expect(LibMetric.displayInfo(result, bucket!).shortName).toBe("year");
+ });
+
+ it("applies default temporal bucket when no unit specified", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const result = buildExecutableDefinition(definition, dimensions[0], {})!;
+
+ const resultProjections = LibMetric.projections(result);
+ const bucket = LibMetric.temporalBucket(resultProjections[0]);
+ expect(LibMetric.displayInfo(result, bucket!).shortName).toBe("month");
+ });
+ });
+
+ describe("measure", () => {
+ it("applies specified temporal unit for temporal dimension", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const result = buildExecutableDefinition(definition, dimensions[0], {
+ projectionTemporalUnit: "year",
+ })!;
+
+ const resultProjections = LibMetric.projections(result);
+ const bucket = LibMetric.temporalBucket(resultProjections[0]);
+ expect(LibMetric.displayInfo(result, bucket!).shortName).toBe("year");
+ });
+ });
+});
+
+describe("buildBinnedBreakoutDefinition", () => {
+ describe("metric", () => {
+ it("applies default binning to a binnable dimension", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dimensionReference = LibMetric.dimensionReference(dimensions[2]);
+
+ const result = buildBinnedBreakoutDefinition(
+ definition,
+ dimensionReference,
+ );
+ const resultProjections = LibMetric.projections(result);
+ expect(resultProjections).toHaveLength(1);
+ expect(LibMetric.binning(resultProjections[0])).not.toBeNull();
+ });
+
+ it("preserves existing temporal bucket via early return", () => {
+ const definition = setupDefinitionWithBreakout(
+ metadata,
+ REVENUE_METRIC.id,
+ 0,
+ );
+ const projections = LibMetric.projections(definition);
+ const bucketedProjection = LibMetric.withDefaultTemporalBucket(
+ definition,
+ projections[0],
+ );
+
+ const result = buildBinnedBreakoutDefinition(
+ definition,
+ bucketedProjection,
+ );
+ const resultProjections = LibMetric.projections(result);
+ expect(LibMetric.temporalBucket(resultProjections[0])).not.toBeNull();
+ });
+ });
+
+ describe("measure", () => {
+ it("applies default binning to a binnable dimension", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dimensionReference = LibMetric.dimensionReference(dimensions[2]);
+
+ const result = buildBinnedBreakoutDefinition(
+ definition,
+ dimensionReference,
+ );
+ const resultProjections = LibMetric.projections(result);
+ expect(resultProjections).toHaveLength(1);
+ expect(LibMetric.binning(resultProjections[0])).not.toBeNull();
+ });
+ });
+});
+
+describe("applyBreakoutDimension", () => {
+ describe("metric", () => {
+ it("adds breakout dimension as additional projection", () => {
+ const baseDefinition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimensions = LibMetric.projectionableDimensions(baseDefinition);
+ const executableDefinition = setupDefinitionWithBreakout(
+ metadata,
+ REVENUE_METRIC.id,
+ 0,
+ );
+
+ const categoryReference = LibMetric.dimensionReference(dimensions[1]);
+ const result = applyBreakoutDimension(
+ baseDefinition,
+ executableDefinition,
+ categoryReference,
+ );
+ expect(LibMetric.projections(result)).toHaveLength(2);
+ });
+
+ it("applies default binning for binnable breakout dimension", () => {
+ const baseDefinition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimensions = LibMetric.projectionableDimensions(baseDefinition);
+ const executableDefinition = setupDefinitionWithBreakout(
+ metadata,
+ REVENUE_METRIC.id,
+ 0,
+ );
+
+ const amountReference = LibMetric.dimensionReference(dimensions[2]);
+ const result = applyBreakoutDimension(
+ baseDefinition,
+ executableDefinition,
+ amountReference,
+ );
+ const resultProjections = LibMetric.projections(result);
+ expect(
+ LibMetric.binning(resultProjections[resultProjections.length - 1]),
+ ).not.toBeNull();
+ });
+ });
+
+ describe("measure", () => {
+ it("adds breakout dimension as additional projection", () => {
+ const baseDefinition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimensions = LibMetric.projectionableDimensions(baseDefinition);
+ const executableDefinition = setupMeasureDefinitionWithBreakout(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ 0,
+ );
+
+ const quantityReference = LibMetric.dimensionReference(dimensions[1]);
+ const result = applyBreakoutDimension(
+ baseDefinition,
+ executableDefinition,
+ quantityReference,
+ );
+ expect(LibMetric.projections(result)).toHaveLength(2);
+ });
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/definition-cache.ts b/frontend/src/metabase/metrics-viewer/utils/definition-cache.ts
new file mode 100644
index 00000000000..93e54c86d92
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/definition-cache.ts
@@ -0,0 +1,101 @@
+import { createSelector, weakMapMemoize } from "@reduxjs/toolkit";
+
+import * as LibMetric from "metabase-lib/metric";
+import type { JsMetricDefinition } from "metabase-types/api";
+
+import type { MetricsViewerTabProjectionConfig } from "../types/viewer-state";
+
+import {
+ applyBreakoutDimension,
+ buildExecutableDefinition,
+} from "./definition-builder";
+import { findDimensionById } from "./dimension-lookup";
+
+export const getModifiedDefinition = createSelector(
+ (
+ definition: LibMetric.MetricDefinition,
+ _projectionDimensionId: string | undefined,
+ _projection: MetricsViewerTabProjectionConfig,
+ ) => definition,
+ (
+ _definition: LibMetric.MetricDefinition,
+ projectionDimensionId: string | undefined,
+ _projection: MetricsViewerTabProjectionConfig,
+ ) => projectionDimensionId,
+ (
+ _definition: LibMetric.MetricDefinition,
+ _projectionDimensionId: string | undefined,
+ projection: MetricsViewerTabProjectionConfig,
+ ) => projection,
+ (
+ definition,
+ projectionDimensionId,
+ projection,
+ ): LibMetric.MetricDefinition | null => {
+ const projections = LibMetric.projections(definition);
+ const breakoutProjection = projections[0];
+
+ let baseDefinition = definition;
+ if (breakoutProjection) {
+ baseDefinition = LibMetric.removeClause(definition, breakoutProjection);
+ }
+
+ const dimension = projectionDimensionId
+ ? findDimensionById(baseDefinition, projectionDimensionId)
+ : undefined;
+
+ let executableDefinition = buildExecutableDefinition(
+ baseDefinition,
+ dimension,
+ {
+ projectionTemporalUnit: projection.temporalUnit,
+ binningStrategy: projection.binningStrategy,
+ dimensionFilter: projection.dimensionFilter,
+ },
+ );
+
+ if (!executableDefinition) {
+ return null;
+ }
+
+ if (breakoutProjection) {
+ const breakoutDimensionMetadata = LibMetric.projectionDimension(
+ definition,
+ breakoutProjection,
+ );
+ const hasExplicitBucket =
+ LibMetric.temporalBucket(breakoutProjection) !== null ||
+ LibMetric.binning(breakoutProjection) !== null;
+ const isRedundant =
+ !hasExplicitBucket &&
+ dimension &&
+ breakoutDimensionMetadata &&
+ LibMetric.isSameSource(dimension, breakoutDimensionMetadata);
+
+ if (!isRedundant) {
+ executableDefinition = applyBreakoutDimension(
+ baseDefinition,
+ executableDefinition,
+ breakoutProjection,
+ );
+ }
+ }
+
+ return executableDefinition;
+ },
+ {
+ memoize: weakMapMemoize,
+ argsMemoize: weakMapMemoize,
+ },
+);
+
+export const toJsDefinition = createSelector(
+ (definition: LibMetric.MetricDefinition) => definition,
+ (definition): JsMetricDefinition => {
+ return LibMetric.toJsMetricDefinition(definition);
+ },
+ {
+ memoize: weakMapMemoize,
+ argsMemoize: weakMapMemoize,
+ },
+);
diff --git a/frontend/src/metabase/metrics-viewer/utils/definition-entries.ts b/frontend/src/metabase/metrics-viewer/utils/definition-entries.ts
new file mode 100644
index 00000000000..6ef73199dab
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/definition-entries.ts
@@ -0,0 +1,17 @@
+import * as LibMetric from "metabase-lib/metric";
+
+import type { MetricsViewerDefinitionEntry } from "../types/viewer-state";
+
+export function getEntryBreakout(
+ entry: MetricsViewerDefinitionEntry,
+): LibMetric.ProjectionClause | undefined {
+ if (!entry.definition) {
+ return undefined;
+ }
+ const projections = LibMetric.projections(entry.definition);
+ return projections[0];
+}
+
+export function entryHasBreakout(entry: MetricsViewerDefinitionEntry): boolean {
+ return getEntryBreakout(entry) !== undefined;
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/definition-entries.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/definition-entries.unit.spec.ts
new file mode 100644
index 00000000000..8750d7850e0
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/definition-entries.unit.spec.ts
@@ -0,0 +1,145 @@
+import * as LibMetric from "metabase-lib/metric";
+
+import type { MetricsViewerDefinitionEntry } from "../types/viewer-state";
+
+import {
+ REVENUE_METRIC,
+ TOTAL_MEASURE,
+ createMetricMetadata,
+ measureMetadata,
+ setupDefinition,
+ setupDefinitionWithBreakout,
+ setupMeasureDefinition,
+ setupMeasureDefinitionWithBreakout,
+} from "./__tests__/test-helpers";
+import { entryHasBreakout, getEntryBreakout } from "./definition-entries";
+
+const metricMeta = createMetricMetadata([REVENUE_METRIC]);
+
+describe("getEntryBreakout", () => {
+ it("returns undefined when entry.definition is null", () => {
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "metric:1",
+ definition: null,
+ };
+ expect(getEntryBreakout(entry)).toBeUndefined();
+ });
+
+ describe("metric", () => {
+ it("returns undefined for definition with no projections", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "metric:1",
+ definition,
+ };
+ expect(getEntryBreakout(entry)).toBeUndefined();
+ });
+
+ it("returns the first projection for definition with a breakout", () => {
+ const definition = setupDefinitionWithBreakout(
+ metricMeta,
+ REVENUE_METRIC.id,
+ 0,
+ );
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "metric:1",
+ definition,
+ };
+ const breakout = getEntryBreakout(entry)!;
+ const breakoutDimension = LibMetric.projectionDimension(
+ definition,
+ breakout,
+ );
+ expect(
+ LibMetric.displayInfo(definition, breakoutDimension!).displayName,
+ ).toBe("Created At");
+ });
+ });
+
+ describe("measure", () => {
+ it("returns undefined for definition with no projections", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "measure:100",
+ definition,
+ };
+ expect(getEntryBreakout(entry)).toBeUndefined();
+ });
+
+ it("returns the first projection for definition with a breakout", () => {
+ const definition = setupMeasureDefinitionWithBreakout(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ 0,
+ );
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "measure:100",
+ definition,
+ };
+ const breakout = getEntryBreakout(entry)!;
+ const breakoutDimension = LibMetric.projectionDimension(
+ definition,
+ breakout,
+ );
+ expect(
+ LibMetric.displayInfo(definition, breakoutDimension!).displayName,
+ ).toBe("Created At");
+ });
+ });
+});
+
+describe("entryHasBreakout", () => {
+ describe("metric", () => {
+ it("returns false for definition with no projections", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "metric:1",
+ definition,
+ };
+ expect(entryHasBreakout(entry)).toBe(false);
+ });
+
+ it("returns true for definition with a breakout", () => {
+ const definition = setupDefinitionWithBreakout(
+ metricMeta,
+ REVENUE_METRIC.id,
+ 0,
+ );
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "metric:1",
+ definition,
+ };
+ expect(entryHasBreakout(entry)).toBe(true);
+ });
+ });
+
+ describe("measure", () => {
+ it("returns false for definition with no projections", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "measure:100",
+ definition,
+ };
+ expect(entryHasBreakout(entry)).toBe(false);
+ });
+
+ it("returns true for definition with a breakout", () => {
+ const definition = setupMeasureDefinitionWithBreakout(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ 0,
+ );
+ const entry: MetricsViewerDefinitionEntry = {
+ id: "measure:100",
+ definition,
+ };
+ expect(entryHasBreakout(entry)).toBe(true);
+ });
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-filters.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.ts
new file mode 100644
index 00000000000..104bf2de311
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.ts
@@ -0,0 +1,318 @@
+import type {
+ BooleanFilterParts,
+ CoordinateFilterParts,
+ DefaultFilterParts,
+ DimensionMetadata,
+ ExcludeDateFilterParts,
+ FilterClause,
+ MetricDefinition,
+ NumberFilterParts,
+ RelativeDateFilterParts,
+ SpecificDateFilterParts,
+ StringFilterParts,
+ TimeFilterParts,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+// ── Dimension filter value (serializable, dimension-free) ──
+
+export type DimensionFilterValue =
+ | {
+ type: "string";
+ operator: StringFilterParts["operator"];
+ values: string[];
+ options: StringFilterParts["options"];
+ }
+ | {
+ type: "boolean";
+ operator: BooleanFilterParts["operator"];
+ values: boolean[];
+ }
+ | {
+ type: "number";
+ operator: NumberFilterParts["operator"];
+ values: NumberFilterParts["values"];
+ }
+ | {
+ type: "coordinate";
+ operator: CoordinateFilterParts["operator"];
+ values: CoordinateFilterParts["values"];
+ }
+ | {
+ type: "specific-date";
+ operator: SpecificDateFilterParts["operator"];
+ values: Date[];
+ hasTime: boolean;
+ }
+ | {
+ type: "relative-date";
+ unit: RelativeDateFilterParts["unit"];
+ value: number;
+ offsetUnit: RelativeDateFilterParts["offsetUnit"];
+ offsetValue: RelativeDateFilterParts["offsetValue"];
+ options: RelativeDateFilterParts["options"];
+ }
+ | {
+ type: "exclude-date";
+ operator: ExcludeDateFilterParts["operator"];
+ unit: ExcludeDateFilterParts["unit"];
+ values: number[];
+ }
+ | { type: "time"; operator: TimeFilterParts["operator"]; values: Date[] }
+ | { type: "default"; operator: DefaultFilterParts["operator"] };
+
+export type ParsedFilter = {
+ dimension: DimensionMetadata;
+ value: DimensionFilterValue;
+};
+
+export function parseFilter(
+ definition: MetricDefinition,
+ filterClause: FilterClause,
+): ParsedFilter | null {
+ const stringParts = LibMetric.stringFilterParts(definition, filterClause);
+ if (stringParts) {
+ return {
+ dimension: stringParts.dimension,
+ value: {
+ type: "string",
+ operator: stringParts.operator,
+ values: stringParts.values,
+ options: stringParts.options,
+ },
+ };
+ }
+
+ const booleanParts = LibMetric.booleanFilterParts(definition, filterClause);
+ if (booleanParts) {
+ return {
+ dimension: booleanParts.dimension,
+ value: {
+ type: "boolean",
+ operator: booleanParts.operator,
+ values: booleanParts.values,
+ },
+ };
+ }
+
+ const numberParts = LibMetric.numberFilterParts(definition, filterClause);
+ if (numberParts) {
+ return {
+ dimension: numberParts.dimension,
+ value: {
+ type: "number",
+ operator: numberParts.operator,
+ values: numberParts.values,
+ },
+ };
+ }
+
+ const coordParts = LibMetric.coordinateFilterParts(definition, filterClause);
+ if (coordParts) {
+ return {
+ dimension: coordParts.dimension,
+ value: {
+ type: "coordinate",
+ operator: coordParts.operator,
+ values: coordParts.values,
+ },
+ };
+ }
+
+ const specificParts = LibMetric.specificDateFilterParts(
+ definition,
+ filterClause,
+ );
+ if (specificParts) {
+ return {
+ dimension: specificParts.dimension,
+ value: {
+ type: "specific-date",
+ operator: specificParts.operator,
+ values: specificParts.values,
+ hasTime: specificParts.hasTime,
+ },
+ };
+ }
+
+ const relativeParts = LibMetric.relativeDateFilterParts(
+ definition,
+ filterClause,
+ );
+ if (relativeParts) {
+ return {
+ dimension: relativeParts.dimension,
+ value: {
+ type: "relative-date",
+ unit: relativeParts.unit,
+ value: relativeParts.value,
+ offsetUnit: relativeParts.offsetUnit,
+ offsetValue: relativeParts.offsetValue,
+ options: relativeParts.options,
+ },
+ };
+ }
+
+ const excludeParts = LibMetric.excludeDateFilterParts(
+ definition,
+ filterClause,
+ );
+ if (excludeParts) {
+ return {
+ dimension: excludeParts.dimension,
+ value: {
+ type: "exclude-date",
+ operator: excludeParts.operator,
+ unit: excludeParts.unit,
+ values: excludeParts.values,
+ },
+ };
+ }
+
+ const timeParts = LibMetric.timeFilterParts(definition, filterClause);
+ if (timeParts) {
+ return {
+ dimension: timeParts.dimension,
+ value: {
+ type: "time",
+ operator: timeParts.operator,
+ values: timeParts.values,
+ },
+ };
+ }
+
+ const defaultParts = LibMetric.defaultFilterParts(definition, filterClause);
+ if (defaultParts) {
+ return {
+ dimension: defaultParts.dimension,
+ value: {
+ type: "default",
+ operator: defaultParts.operator,
+ },
+ };
+ }
+
+ return null;
+}
+
+export function buildDimensionFilterClause(
+ dimension: DimensionMetadata,
+ filterValue: DimensionFilterValue,
+): FilterClause {
+ switch (filterValue.type) {
+ case "string":
+ return LibMetric.stringFilterClause({
+ operator: filterValue.operator,
+ dimension,
+ values: filterValue.values,
+ options: filterValue.options,
+ });
+ case "boolean":
+ return LibMetric.booleanFilterClause({
+ operator: filterValue.operator,
+ dimension,
+ values: filterValue.values,
+ });
+ case "number":
+ return LibMetric.numberFilterClause({
+ operator: filterValue.operator,
+ dimension,
+ values: filterValue.values,
+ });
+ case "coordinate":
+ return LibMetric.coordinateFilterClause({
+ operator: filterValue.operator,
+ dimension,
+ longitudeDimension: null,
+ values: filterValue.values,
+ });
+ case "specific-date":
+ return LibMetric.specificDateFilterClause({
+ operator: filterValue.operator,
+ dimension,
+ values: filterValue.values,
+ hasTime: filterValue.hasTime,
+ });
+ case "relative-date":
+ return LibMetric.relativeDateFilterClause({
+ dimension,
+ unit: filterValue.unit,
+ value: filterValue.value,
+ offsetUnit: filterValue.offsetUnit,
+ offsetValue: filterValue.offsetValue,
+ options: filterValue.options,
+ });
+ case "exclude-date":
+ return LibMetric.excludeDateFilterClause({
+ operator: filterValue.operator,
+ unit: filterValue.unit,
+ dimension,
+ values: filterValue.values,
+ });
+ case "time":
+ return LibMetric.timeFilterClause({
+ operator: filterValue.operator,
+ dimension,
+ values: filterValue.values,
+ });
+ case "default":
+ return LibMetric.defaultFilterClause({
+ operator: filterValue.operator,
+ dimension,
+ });
+ }
+}
+
+// ── Serialized source filter ──
+
+export type SourceFilter = {
+ dimensionId: string;
+ value: DimensionFilterValue;
+};
+
+export function extractDefinitionFilters(
+ definition: MetricDefinition,
+): SourceFilter[] {
+ const filters = LibMetric.filters(definition);
+ const result: SourceFilter[] = [];
+
+ for (const clause of filters) {
+ const parsed = parseFilter(definition, clause);
+ if (!parsed) {
+ continue;
+ }
+ const dimInfo = LibMetric.dimensionValuesInfo(definition, parsed.dimension);
+ result.push({ dimensionId: dimInfo.id, value: parsed.value });
+ }
+
+ return result;
+}
+
+// ── Filter application ──
+
+function removeFiltersOnDimension(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+): MetricDefinition {
+ const existingFilters = LibMetric.filters(def);
+
+ let result = def;
+ for (const filter of existingFilters) {
+ const parts = LibMetric.filterParts(def, filter);
+ if (parts && LibMetric.isSameSource(parts.dimension, dimension)) {
+ result = LibMetric.removeClause(result, filter);
+ }
+ }
+ return result;
+}
+
+export function applyDimensionFilter(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+ filterValue: DimensionFilterValue,
+): MetricDefinition {
+ let result = removeFiltersOnDimension(def, dimension);
+ const filterClause = buildDimensionFilterClause(dimension, filterValue);
+ result = LibMetric.filter(result, filterClause);
+ return result;
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-filters.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.unit.spec.ts
new file mode 100644
index 00000000000..26b4e97ca7c
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.unit.spec.ts
@@ -0,0 +1,358 @@
+import * as LibMetric from "metabase-lib/metric";
+
+import {
+ REVENUE_METRIC,
+ TOTAL_MEASURE,
+ createMetricMetadata,
+ measureMetadata,
+ setupDefinition,
+ setupMeasureDefinition,
+} from "./__tests__/test-helpers";
+import type { DimensionFilterValue } from "./dimension-filters";
+import {
+ applyDimensionFilter,
+ buildDimensionFilterClause,
+ extractDefinitionFilters,
+ parseFilter,
+} from "./dimension-filters";
+
+const metadata = createMetricMetadata([REVENUE_METRIC]);
+
+function getFilterableDimension(
+ definition: LibMetric.MetricDefinition,
+ displayName: string,
+) {
+ const dimensions = LibMetric.filterableDimensions(definition);
+ const dimension = dimensions.find(
+ (dimension) =>
+ LibMetric.displayInfo(definition, dimension).displayName === displayName,
+ );
+ if (!dimension) {
+ throw new Error(`Filterable dimension "${displayName}" not found`);
+ }
+ return dimension;
+}
+
+describe("extractDefinitionFilters", () => {
+ describe("metric", () => {
+ it("returns empty array for definition with no filters", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ expect(extractDefinitionFilters(definition)).toEqual([]);
+ });
+
+ it("returns serialized string filter after one is applied", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Category");
+
+ const filterValue: DimensionFilterValue = {
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ options: {},
+ };
+ const clause = buildDimensionFilterClause(dimension, filterValue);
+ const withFilter = LibMetric.filter(definition, clause);
+
+ const result = extractDefinitionFilters(withFilter);
+ expect(result).toMatchObject([
+ { value: { type: "string", operator: "=", values: ["Gadget"] } },
+ ]);
+ });
+
+ it("returns serialized number filter after one is applied", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Amount");
+
+ const filterValue: DimensionFilterValue = {
+ type: "number",
+ operator: "between",
+ values: [10, 100],
+ };
+ const clause = buildDimensionFilterClause(dimension, filterValue);
+ const withFilter = LibMetric.filter(definition, clause);
+
+ const result = extractDefinitionFilters(withFilter);
+ expect(result).toMatchObject([
+ { value: { type: "number", operator: "between", values: [10, 100] } },
+ ]);
+ });
+ });
+
+ describe("measure", () => {
+ it("returns empty array for definition with no filters", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ expect(extractDefinitionFilters(definition)).toEqual([]);
+ });
+
+ it("returns serialized number filter after one is applied", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = getFilterableDimension(definition, "Quantity");
+
+ const filterValue: DimensionFilterValue = {
+ type: "number",
+ operator: "between",
+ values: [1, 50],
+ };
+ const clause = buildDimensionFilterClause(dimension, filterValue);
+ const withFilter = LibMetric.filter(definition, clause);
+
+ const result = extractDefinitionFilters(withFilter);
+ expect(result).toMatchObject([
+ { value: { type: "number", operator: "between", values: [1, 50] } },
+ ]);
+ });
+ });
+});
+
+describe("parseFilter", () => {
+ describe("metric", () => {
+ it("parses string filter (= operator)", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Category");
+
+ const clause = buildDimensionFilterClause(dimension, {
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ options: {},
+ });
+
+ const parsed = parseFilter(definition, clause);
+ expect(parsed?.value).toMatchObject({
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ });
+ });
+
+ it("parses number filter (between operator)", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Amount");
+
+ const clause = buildDimensionFilterClause(dimension, {
+ type: "number",
+ operator: "between",
+ values: [10, 100],
+ });
+
+ const parsed = parseFilter(definition, clause);
+ expect(parsed?.value).toMatchObject({
+ type: "number",
+ operator: "between",
+ values: [10, 100],
+ });
+ });
+
+ it("parses boolean filter (= operator)", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Is Active");
+
+ const clause = buildDimensionFilterClause(dimension, {
+ type: "boolean",
+ operator: "=",
+ values: [true],
+ });
+
+ const parsed = parseFilter(definition, clause);
+ expect(parsed?.value).toMatchObject({
+ type: "boolean",
+ operator: "=",
+ values: [true],
+ });
+ });
+ });
+
+ describe("measure", () => {
+ it("parses number filter (between operator)", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = getFilterableDimension(definition, "Quantity");
+
+ const clause = buildDimensionFilterClause(dimension, {
+ type: "number",
+ operator: "between",
+ values: [1, 50],
+ });
+
+ const parsed = parseFilter(definition, clause);
+ expect(parsed?.value).toMatchObject({
+ type: "number",
+ operator: "between",
+ values: [1, 50],
+ });
+ });
+ });
+});
+
+describe("buildDimensionFilterClause", () => {
+ describe("metric", () => {
+ it("builds string filter clause", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Category");
+
+ const clause = buildDimensionFilterClause(dimension, {
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ options: {},
+ });
+
+ const parts = LibMetric.stringFilterParts(definition, clause);
+ expect(parts).toMatchObject({ operator: "=", values: ["Gadget"] });
+ });
+
+ it("builds number filter clause", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Amount");
+
+ const clause = buildDimensionFilterClause(dimension, {
+ type: "number",
+ operator: "between",
+ values: [10, 100],
+ });
+
+ const parts = LibMetric.numberFilterParts(definition, clause);
+ expect(parts).toMatchObject({ operator: "between", values: [10, 100] });
+ });
+
+ it("builds boolean filter clause", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Is Active");
+
+ const clause = buildDimensionFilterClause(dimension, {
+ type: "boolean",
+ operator: "=",
+ values: [true],
+ });
+
+ const parts = LibMetric.booleanFilterParts(definition, clause);
+ expect(parts).toMatchObject({ operator: "=", values: [true] });
+ });
+ });
+});
+
+describe("applyDimensionFilter", () => {
+ describe("metric", () => {
+ it("adds filter to definition with no existing filters", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Category");
+
+ const result = applyDimensionFilter(definition, dimension, {
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ options: {},
+ });
+
+ const resultFilters = LibMetric.filters(result);
+ expect(resultFilters).toHaveLength(1);
+ });
+
+ it("replaces existing filter on same dimension when dimension has sources", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimension = getFilterableDimension(definition, "Amount");
+
+ const withFirst = applyDimensionFilter(definition, dimension, {
+ type: "number",
+ operator: "between",
+ values: [10, 100],
+ });
+
+ const existingFilters = LibMetric.filters(withFirst);
+ const parsedFirst = parseFilter(withFirst, existingFilters[0]);
+
+ const withReplaced = applyDimensionFilter(
+ withFirst,
+ parsedFirst!.dimension,
+ {
+ type: "number",
+ operator: "between",
+ values: [50, 200],
+ },
+ );
+
+ const resultFilters = LibMetric.filters(withReplaced);
+ expect(resultFilters).toHaveLength(1);
+
+ const parsed = parseFilter(withReplaced, resultFilters[0]);
+ expect(parsed!.value).toMatchObject({
+ type: "number",
+ operator: "between",
+ values: [50, 200],
+ });
+ });
+
+ it("preserves filters on other dimensions", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const categoryDimension = getFilterableDimension(definition, "Category");
+ const amountDimension = getFilterableDimension(definition, "Amount");
+
+ const withCategory = applyDimensionFilter(definition, categoryDimension, {
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ options: {},
+ });
+
+ const withBoth = applyDimensionFilter(withCategory, amountDimension, {
+ type: "number",
+ operator: "between",
+ values: [10, 100],
+ });
+
+ const resultFilters = LibMetric.filters(withBoth);
+ expect(resultFilters).toHaveLength(2);
+ });
+ });
+
+ describe("measure", () => {
+ it("adds filter to definition with no existing filters", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = getFilterableDimension(definition, "Quantity");
+
+ const result = applyDimensionFilter(definition, dimension, {
+ type: "number",
+ operator: "between",
+ values: [1, 50],
+ });
+
+ const resultFilters = LibMetric.filters(result);
+ expect(resultFilters).toHaveLength(1);
+ });
+
+ it("preserves filters on other dimensions", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const quantityDimension = getFilterableDimension(definition, "Quantity");
+ const totalDimension = getFilterableDimension(definition, "Total");
+
+ const withQuantity = applyDimensionFilter(definition, quantityDimension, {
+ type: "number",
+ operator: "between",
+ values: [1, 50],
+ });
+
+ const withBoth = applyDimensionFilter(withQuantity, totalDimension, {
+ type: "number",
+ operator: ">",
+ values: [100],
+ });
+
+ const resultFilters = LibMetric.filters(withBoth);
+ expect(resultFilters).toHaveLength(2);
+ });
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-lookup.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-lookup.ts
new file mode 100644
index 00000000000..432f2dcc7ed
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-lookup.ts
@@ -0,0 +1,50 @@
+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { TemporalUnit } from "metabase-types/api";
+
+export function findDimensionById(
+ def: MetricDefinition,
+ dimensionId: string,
+): DimensionMetadata | undefined {
+ return LibMetric.projectionableDimensions(def).find((dimension) => {
+ const info = LibMetric.dimensionValuesInfo(def, dimension);
+ return info.id === dimensionId;
+ });
+}
+
+export function findFilterDimensionById(
+ def: MetricDefinition,
+ dimensionId: string,
+): DimensionMetadata | undefined {
+ return LibMetric.filterableDimensions(def).find((dimension) => {
+ const info = LibMetric.dimensionValuesInfo(def, dimension);
+ return info.id === dimensionId;
+ });
+}
+
+export function findTemporalBucket(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+ targetUnit: TemporalUnit,
+): LibMetric.TemporalBucket | null {
+ const buckets = LibMetric.availableTemporalBuckets(def, dimension);
+ const bucket = buckets.find((bucket) => {
+ const info = LibMetric.displayInfo(def, bucket);
+ return info.shortName === targetUnit;
+ });
+ return bucket ?? null;
+}
+
+export function findBinningStrategy(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+ strategyName: string,
+): LibMetric.BinningStrategy | null {
+ const strategies = LibMetric.availableBinningStrategies(def, dimension);
+ return (
+ strategies.find(
+ (strategy) =>
+ LibMetric.displayInfo(def, strategy).displayName === strategyName,
+ ) ?? null
+ );
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-lookup.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-lookup.unit.spec.ts
new file mode 100644
index 00000000000..f73b83a1dd2
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-lookup.unit.spec.ts
@@ -0,0 +1,196 @@
+import * as LibMetric from "metabase-lib/metric";
+
+import {
+ REVENUE_METRIC,
+ TOTAL_MEASURE,
+ createMetricMetadata,
+ measureMetadata,
+ setupDefinition,
+ setupMeasureDefinition,
+} from "./__tests__/test-helpers";
+import {
+ findBinningStrategy,
+ findDimensionById,
+ findFilterDimensionById,
+ findTemporalBucket,
+} from "./dimension-lookup";
+
+const metricMeta = createMetricMetadata([REVENUE_METRIC]);
+
+describe("findDimensionById", () => {
+ describe("metric", () => {
+ it("finds projectionable dimension by ID", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const dimension = findDimensionById(definition, "dim-created-at");
+ expect(LibMetric.displayInfo(definition, dimension!).displayName).toBe(
+ "Created At",
+ );
+ });
+
+ it("returns undefined for unknown dimension ID", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ expect(findDimensionById(definition, "nonexistent")).toBeUndefined();
+ });
+ });
+
+ describe("measure", () => {
+ it("finds projectionable dimension by ID", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = findDimensionById(definition, "measure-dim-created-at");
+ expect(LibMetric.displayInfo(definition, dimension!).displayName).toBe(
+ "Created At",
+ );
+ });
+
+ it("returns undefined for unknown dimension ID", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ expect(findDimensionById(definition, "nonexistent")).toBeUndefined();
+ });
+ });
+});
+
+describe("findFilterDimensionById", () => {
+ describe("metric", () => {
+ it("finds filterable dimension by ID", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const dimension = findFilterDimensionById(definition, "dim-created-at");
+ expect(LibMetric.displayInfo(definition, dimension!).displayName).toBe(
+ "Created At",
+ );
+ });
+
+ it("returns undefined for unknown dimension ID", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ expect(
+ findFilterDimensionById(definition, "nonexistent"),
+ ).toBeUndefined();
+ });
+ });
+
+ describe("measure", () => {
+ it("finds filterable dimension by ID", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = findFilterDimensionById(
+ definition,
+ "measure-dim-created-at",
+ );
+ expect(LibMetric.displayInfo(definition, dimension!).displayName).toBe(
+ "Created At",
+ );
+ });
+ });
+});
+
+describe("findTemporalBucket", () => {
+ describe("metric", () => {
+ it("finds temporal bucket by unit for DateTime dimension", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const dimension = findDimensionById(definition, "dim-created-at")!;
+ const bucket = findTemporalBucket(definition, dimension, "month");
+ expect(LibMetric.displayInfo(definition, bucket!).shortName).toBe(
+ "month",
+ );
+ });
+
+ it("returns null for non-temporal dimension", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const dimension = findDimensionById(definition, "dim-category")!;
+ expect(findTemporalBucket(definition, dimension, "month")).toBeNull();
+ });
+ });
+
+ describe("measure", () => {
+ it("finds temporal bucket by unit for DateTime dimension", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = findDimensionById(
+ definition,
+ "measure-dim-created-at",
+ )!;
+ const bucket = findTemporalBucket(definition, dimension, "month");
+ expect(LibMetric.displayInfo(definition, bucket!).shortName).toBe(
+ "month",
+ );
+ });
+
+ it("returns null for non-temporal dimension", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = findDimensionById(definition, "measure-dim-quantity")!;
+ expect(findTemporalBucket(definition, dimension, "month")).toBeNull();
+ });
+ });
+});
+
+describe("findBinningStrategy", () => {
+ describe("metric", () => {
+ it("finds binning strategy by display name for numeric dimension", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const dimension = findDimensionById(definition, "dim-amount")!;
+ const strategies = LibMetric.availableBinningStrategies(
+ definition,
+ dimension,
+ );
+ const targetName = LibMetric.displayInfo(
+ definition,
+ strategies[0],
+ ).displayName;
+
+ const result = findBinningStrategy(definition, dimension, targetName);
+ expect(LibMetric.displayInfo(definition, result!).displayName).toBe(
+ targetName,
+ );
+ });
+
+ it("returns null for non-binnable dimension", () => {
+ const definition = setupDefinition(metricMeta, REVENUE_METRIC.id);
+ const dimension = findDimensionById(definition, "dim-category")!;
+ expect(findBinningStrategy(definition, dimension, "10 bins")).toBeNull();
+ });
+ });
+
+ describe("measure", () => {
+ it("finds binning strategy by display name for numeric dimension", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = findDimensionById(definition, "measure-dim-total")!;
+ const strategies = LibMetric.availableBinningStrategies(
+ definition,
+ dimension,
+ );
+ const targetName = LibMetric.displayInfo(
+ definition,
+ strategies[0],
+ ).displayName;
+
+ const result = findBinningStrategy(definition, dimension, targetName);
+ expect(LibMetric.displayInfo(definition, result!).displayName).toBe(
+ targetName,
+ );
+ });
+
+ it("returns null for non-binnable dimension", () => {
+ const definition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+ const dimension = findDimensionById(definition, "measure-dim-quantity")!;
+ expect(findBinningStrategy(definition, dimension, "10 bins")).toBeNull();
+ });
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
new file mode 100644
index 00000000000..82630c799cf
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
@@ -0,0 +1,253 @@
+import { t } from "ttag";
+
+import type { IconName } from "metabase/ui";
+import type {
+ DimensionGroup,
+ DimensionMetadata,
+ MetricDefinition,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import type {
+ MetricSourceId,
+ MetricsViewerTabType,
+} from "../types/viewer-state";
+
+import { getDimensionIcon, getDimensionsByType } from "./tabs";
+
+// ── Dimension picker ──
+
+export interface AvailableDimension {
+ dimensionId: string;
+ label: string;
+ icon: IconName;
+ sourceIds: MetricSourceId[];
+ tabType: MetricsViewerTabType;
+ group?: DimensionGroup;
+}
+
+export interface AvailableDimensionsResult {
+ shared: AvailableDimension[];
+ bySource: Record<MetricSourceId, AvailableDimension[]>;
+}
+
+interface DimensionEntry {
+ dimension: DimensionMetadata;
+ id: string;
+ label: string;
+ icon: IconName;
+ tabType: MetricsViewerTabType;
+ group?: DimensionGroup;
+ sourceId: MetricSourceId;
+}
+
+function collectAllDimensionEntries(
+ sourceOrder: MetricSourceId[],
+ definitionsBySourceId: Record<MetricSourceId, MetricDefinition | null>,
+ existingTabIds: Set<string>,
+): DimensionEntry[] {
+ const entries: DimensionEntry[] = [];
+
+ for (const sourceId of sourceOrder) {
+ const def = definitionsBySourceId[sourceId];
+ if (!def) {
+ continue;
+ }
+
+ for (const [id, info] of getDimensionsByType(def)) {
+ if (existingTabIds.has(id)) {
+ continue;
+ }
+
+ entries.push({
+ dimension: info.dimension,
+ id,
+ label: info.displayName,
+ icon: getDimensionIcon(info.dimension),
+ tabType: info.type,
+ group: info.group,
+ sourceId,
+ });
+ }
+ }
+
+ return entries;
+}
+
+function groupBySource(entries: DimensionEntry[]): DimensionEntry[][] {
+ const groups: DimensionEntry[][] = [];
+
+ for (const entry of entries) {
+ const match = groups.find((group) =>
+ group.some((existing) =>
+ LibMetric.isSameSource(existing.dimension, entry.dimension),
+ ),
+ );
+ if (match) {
+ match.push(entry);
+ } else {
+ groups.push([entry]);
+ }
+ }
+
+ return groups;
+}
+
+export function getAvailableDimensionsForPicker(
+ definitionsBySourceId: Record<MetricSourceId, MetricDefinition | null>,
+ sourceOrder: MetricSourceId[],
+ existingTabIds: Set<string>,
+): AvailableDimensionsResult {
+ const result: AvailableDimensionsResult = { shared: [], bySource: {} };
+
+ if (sourceOrder.length === 0) {
+ return result;
+ }
+
+ const entries = collectAllDimensionEntries(
+ sourceOrder,
+ definitionsBySourceId,
+ existingTabIds,
+ );
+ const groups = groupBySource(entries);
+ const loadedSourceCount = new Set(entries.map((entry) => entry.sourceId))
+ .size;
+ const hasMultipleSources = loadedSourceCount > 1;
+
+ for (const group of groups) {
+ const uniqueSources = [...new Set(group.map((entry) => entry.sourceId))];
+ const first = group[0];
+
+ if (hasMultipleSources && uniqueSources.length >= 2) {
+ result.shared.push({
+ dimensionId: first.id,
+ label: first.label,
+ icon: first.icon,
+ tabType: first.tabType,
+ sourceIds: uniqueSources,
+ group: first.group,
+ });
+ } else {
+ for (const entry of group) {
+ const arr = (result.bySource[entry.sourceId] ??= []);
+ arr.push({
+ dimensionId: entry.id,
+ label: entry.label,
+ icon: entry.icon,
+ tabType: entry.tabType,
+ sourceIds: [entry.sourceId],
+ group: entry.group,
+ });
+ }
+ }
+ }
+
+ result.shared.sort((first, second) =>
+ first.label.localeCompare(second.label),
+ );
+ for (const sourceId of sourceOrder) {
+ result.bySource[sourceId]?.sort((first, second) =>
+ first.label.localeCompare(second.label),
+ );
+ }
+
+ return result;
+}
+
+// ── Display helpers ──
+
+export interface SourceDisplayInfo {
+ type: "metric" | "measure";
+ name: string;
+}
+
+export function getSourceDisplayName(
+ sourceId: MetricSourceId,
+ sourceDataById: Record<MetricSourceId, SourceDisplayInfo>,
+): string {
+ return sourceDataById[sourceId]?.name ?? sourceId;
+}
+
+// ── Dimension picker sections ──
+
+export type DimensionPickerItem = AvailableDimension & {
+ name: string;
+};
+
+export type DimensionPickerSection = {
+ name?: string;
+ items: DimensionPickerItem[];
+};
+
+export function buildDimensionPickerSections({
+ availableDimensions,
+ sourceOrder,
+ sourceDataById,
+ hasMultipleSources,
+}: {
+ availableDimensions: AvailableDimensionsResult;
+ sourceOrder: MetricSourceId[];
+ sourceDataById: Record<MetricSourceId, SourceDisplayInfo>;
+ hasMultipleSources: boolean;
+}): DimensionPickerSection[] {
+ const sections: DimensionPickerSection[] = [];
+
+ const splitByGroup = (
+ dimensions: AvailableDimension[],
+ sectionName?: string,
+ ) => {
+ const groups = new Map<string | undefined, AvailableDimension[]>();
+ for (const dimension of dimensions) {
+ const groupId = dimension.group?.id;
+ const existing = groups.get(groupId);
+ if (existing) {
+ existing.push(dimension);
+ } else {
+ groups.set(groupId, [dimension]);
+ }
+ }
+
+ if (groups.size <= 1) {
+ sections.push({
+ name: sectionName,
+ items: dimensions.map((dimension) => ({
+ ...dimension,
+ name: dimension.label,
+ })),
+ });
+ return;
+ }
+
+ for (const [, groupDimensions] of groups) {
+ const groupName = groupDimensions[0].group?.displayName;
+ const name = sectionName ? `${sectionName} · ${groupName}` : groupName;
+ sections.push({
+ name,
+ items: groupDimensions.map((dimension) => ({
+ ...dimension,
+ name: dimension.label,
+ })),
+ });
+ }
+ };
+
+ if (hasMultipleSources && availableDimensions.shared.length > 0) {
+ splitByGroup(availableDimensions.shared, t`Shared`);
+ }
+
+ for (const sourceId of sourceOrder) {
+ const sourceDimensions = availableDimensions.bySource[sourceId];
+ if (!sourceDimensions || sourceDimensions.length === 0) {
+ continue;
+ }
+
+ if (hasMultipleSources) {
+ const sourceName = getSourceDisplayName(sourceId, sourceDataById);
+ splitByGroup(sourceDimensions, sourceName);
+ } else {
+ splitByGroup(sourceDimensions);
+ }
+ }
+
+ return sections;
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.unit.spec.ts
new file mode 100644
index 00000000000..721c135098c
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.unit.spec.ts
@@ -0,0 +1,153 @@
+import type { MetricSourceId } from "../types/viewer-state";
+
+import {
+ REVENUE_METRIC,
+ createMetricMetadata,
+ createMockMetricDimension,
+ createMockNormalizedMetric,
+ setupDefinition,
+} from "./__tests__/test-helpers";
+import { getAvailableDimensionsForPicker } from "./dimension-picker";
+
+const ORDERS_METRIC = createMockNormalizedMetric({
+ id: 3,
+ name: "Orders",
+ dimensions: [
+ createMockMetricDimension({
+ id: "dim-created-at",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: "type/CreationTimestamp",
+ }),
+ createMockMetricDimension({
+ id: "dim-status",
+ display_name: "Status",
+ effective_type: "type/Text",
+ semantic_type: "type/Category",
+ }),
+ ],
+});
+
+const allMetadata = createMetricMetadata([REVENUE_METRIC, ORDERS_METRIC]);
+const revenueDefinition = setupDefinition(allMetadata, REVENUE_METRIC.id);
+const ordersDefinition = setupDefinition(allMetadata, ORDERS_METRIC.id);
+
+const REVENUE_SOURCE_ID: MetricSourceId = `metric:${REVENUE_METRIC.id}`;
+const ORDERS_SOURCE_ID: MetricSourceId = `metric:${ORDERS_METRIC.id}`;
+
+const REVENUE_DIMENSIONS = [
+ {
+ dimensionId: "dim-amount",
+ label: "Amount",
+ icon: "int",
+ tabType: "numeric",
+ sourceIds: [REVENUE_SOURCE_ID],
+ },
+ {
+ dimensionId: "dim-category",
+ label: "Category",
+ icon: "string",
+ tabType: "category",
+ sourceIds: [REVENUE_SOURCE_ID],
+ },
+ {
+ dimensionId: "dim-created-at",
+ label: "Created At",
+ icon: "calendar",
+ tabType: "time",
+ sourceIds: [REVENUE_SOURCE_ID],
+ },
+ {
+ dimensionId: "dim-active",
+ label: "Is Active",
+ icon: "io",
+ tabType: "boolean",
+ sourceIds: [REVENUE_SOURCE_ID],
+ },
+];
+
+const ORDERS_DIMENSIONS = [
+ {
+ dimensionId: "dim-created-at",
+ label: "Created At",
+ icon: "calendar",
+ tabType: "time",
+ sourceIds: [ORDERS_SOURCE_ID],
+ },
+ {
+ dimensionId: "dim-status",
+ label: "Status",
+ icon: "string",
+ tabType: "category",
+ sourceIds: [ORDERS_SOURCE_ID],
+ },
+];
+
+describe("getAvailableDimensionsForPicker", () => {
+ it("returns empty result for empty source order", () => {
+ const result = getAvailableDimensionsForPicker({}, [], new Set());
+
+ expect(result).toEqual({ shared: [], bySource: {} });
+ });
+
+ it("returns dimensions for a single metric source", () => {
+ const result = getAvailableDimensionsForPicker(
+ { [REVENUE_SOURCE_ID]: revenueDefinition },
+ [REVENUE_SOURCE_ID],
+ new Set(),
+ );
+
+ expect(result).toEqual({
+ shared: [],
+ bySource: {
+ [REVENUE_SOURCE_ID]: REVENUE_DIMENSIONS,
+ },
+ });
+ });
+
+ it("returns dimensions for a second metric source", () => {
+ const result = getAvailableDimensionsForPicker(
+ { [ORDERS_SOURCE_ID]: ordersDefinition },
+ [ORDERS_SOURCE_ID],
+ new Set(),
+ );
+
+ expect(result).toEqual({
+ shared: [],
+ bySource: {
+ [ORDERS_SOURCE_ID]: ORDERS_DIMENSIONS,
+ },
+ });
+ });
+
+ it("groups dimensions by source when multiple sources are provided", () => {
+ const result = getAvailableDimensionsForPicker(
+ {
+ [REVENUE_SOURCE_ID]: revenueDefinition,
+ [ORDERS_SOURCE_ID]: ordersDefinition,
+ },
+ [REVENUE_SOURCE_ID, ORDERS_SOURCE_ID],
+ new Set(),
+ );
+
+ expect(result).toEqual({
+ shared: [],
+ bySource: {
+ [REVENUE_SOURCE_ID]: REVENUE_DIMENSIONS,
+ [ORDERS_SOURCE_ID]: ORDERS_DIMENSIONS,
+ },
+ });
+ });
+
+ it("filters out dimensions whose id matches existingTabIds", () => {
+ const allIds = REVENUE_DIMENSIONS.map((dimension) => dimension.dimensionId);
+
+ const result = getAvailableDimensionsForPicker(
+ { [REVENUE_SOURCE_ID]: revenueDefinition },
+ [REVENUE_SOURCE_ID],
+ new Set(allIds),
+ );
+
+ expect(result).toEqual({ shared: [], bySource: {} });
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/geo-dimensions.ts b/frontend/src/metabase/metrics-viewer/utils/geo-dimensions.ts
new file mode 100644
index 00000000000..ac58959039b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/geo-dimensions.ts
@@ -0,0 +1,59 @@
+import type { DimensionMetadata } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+export function isGeoDimension(dimension: DimensionMetadata): boolean {
+ if (
+ LibMetric.isCoordinate(dimension) ||
+ LibMetric.isLatitude(dimension) ||
+ LibMetric.isLongitude(dimension)
+ ) {
+ return false;
+ }
+
+ return (
+ LibMetric.isState(dimension) ||
+ LibMetric.isCountry(dimension) ||
+ LibMetric.isCity(dimension)
+ );
+}
+
+export function getMapRegionForDimension(
+ dimension: DimensionMetadata,
+): string | null {
+ if (LibMetric.isState(dimension)) {
+ return "us_states";
+ }
+ if (LibMetric.isCountry(dimension)) {
+ return "world_countries";
+ }
+ if (LibMetric.isCity(dimension)) {
+ return "us_states";
+ }
+ return null;
+}
+
+export const GEO_SUBTYPE_PRIORITY: readonly GeoSubtype[] = [
+ "country",
+ "state",
+ "city",
+];
+
+export type GeoSubtype = "country" | "state" | "city";
+
+const GEO_SUBTYPE_PREDICATES: Array<{
+ subtype: GeoSubtype;
+ predicate: (dimension: DimensionMetadata) => boolean;
+}> = [
+ { subtype: "country", predicate: LibMetric.isCountry },
+ { subtype: "state", predicate: LibMetric.isState },
+ { subtype: "city", predicate: LibMetric.isCity },
+];
+
+export function getGeoSubtype(dimension: DimensionMetadata): GeoSubtype | null {
+ for (const { subtype, predicate } of GEO_SUBTYPE_PREDICATES) {
+ if (predicate(dimension)) {
+ return subtype;
+ }
+ }
+ return null;
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/grid-columns.ts b/frontend/src/metabase/metrics-viewer/utils/grid-columns.ts
new file mode 100644
index 00000000000..e6dca90b1d9
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/grid-columns.ts
@@ -0,0 +1,18 @@
+const MAX_COLUMNS = 8;
+const MIN_SERIES_WIDTH = 300;
+
+export function getGridColumns(
+ elementWidth: number,
+ seriesCount: number,
+): number {
+ // Determine how many columns can fit based on the available width,
+ // ensuring at least 1 column is always shown
+ const columnsByWidth = Math.max(
+ 1,
+ Math.floor(elementWidth / MIN_SERIES_WIDTH),
+ );
+
+ // Use the smallest of: columns that fit, number of series, and the max cap
+ // so we don't exceed the layout limit or create empty columns
+ return Math.min(columnsByWidth, seriesCount, MAX_COLUMNS);
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/grid-columns.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/grid-columns.unit.spec.ts
new file mode 100644
index 00000000000..fabdd2bf5ad
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/grid-columns.unit.spec.ts
@@ -0,0 +1,31 @@
+import { getGridColumns } from "./grid-columns";
+
+describe("getGridColumns", () => {
+ it("should return 1 column when width is less than MIN_SERIES_WIDTH", () => {
+ expect(getGridColumns(200, 5)).toBe(1);
+ });
+
+ it("should return 1 column when width is 0", () => {
+ expect(getGridColumns(0, 5)).toBe(1);
+ });
+
+ it("should calculate columns based on width", () => {
+ expect(getGridColumns(900, 10)).toBe(3);
+ });
+
+ it("should not exceed the series count", () => {
+ expect(getGridColumns(1200, 2)).toBe(2);
+ });
+
+ it("should not exceed MAX_COLUMNS (8)", () => {
+ expect(getGridColumns(5000, 20)).toBe(8);
+ });
+
+ it("should floor partial column fits", () => {
+ expect(getGridColumns(500, 10)).toBe(1);
+ });
+
+ it("should return exact fit when width is a multiple of MIN_SERIES_WIDTH", () => {
+ expect(getGridColumns(600, 10)).toBe(2);
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/index.ts b/frontend/src/metabase/metrics-viewer/utils/index.ts
new file mode 100644
index 00000000000..7ddd1650331
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/index.ts
@@ -0,0 +1,12 @@
+export * from "./source-ids";
+export * from "./dimension-filters";
+export * from "./geo-dimensions";
+export * from "./dimension-lookup";
+export * from "./definition-builder";
+export * from "./definition-entries";
+export * from "./tab-config";
+export * from "./series";
+export * from "./tabs";
+export * from "./dimension-picker";
+export * from "./compact-schema";
+export * from "./url-serialization";
diff --git a/frontend/src/metabase/metrics-viewer/utils/legend.ts b/frontend/src/metabase/metrics-viewer/utils/legend.ts
new file mode 100644
index 00000000000..0145c5d183c
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/legend.ts
@@ -0,0 +1,98 @@
+import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
+import { formatValue } from "metabase/lib/formatting";
+import { isEmpty } from "metabase/lib/validate";
+import * as LibMetric from "metabase-lib/metric";
+import type { MetricBreakoutValuesResponse } from "metabase-types/api";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ SourceColorMap,
+} from "../types/viewer-state";
+
+import { getDefinitionName } from "./definition-builder";
+import { entryHasBreakout, getEntryBreakout } from "./definition-entries";
+
+export interface LegendItem {
+ label: string;
+ color: string;
+}
+
+export interface LegendGroup {
+ header: string;
+ subtitle?: string;
+ items: LegendItem[];
+}
+
+export function buildLegendGroups(
+ definitions: MetricsViewerDefinitionEntry[],
+ breakoutValuesBySourceId: Map<MetricSourceId, MetricBreakoutValuesResponse>,
+ sourceColors: SourceColorMap,
+): LegendGroup[] {
+ const hasAnyBreakout = definitions.some((entry) => entryHasBreakout(entry));
+ if (!hasAnyBreakout) {
+ return [];
+ }
+
+ const groups: LegendGroup[] = [];
+
+ for (const entry of definitions) {
+ if (!entry.definition) {
+ continue;
+ }
+
+ const colors = sourceColors[entry.id];
+ if (!colors || colors.length === 0) {
+ continue;
+ }
+
+ const definitionName = getDefinitionName(entry.definition);
+ const breakoutProjection = getEntryBreakout(entry);
+
+ if (breakoutProjection) {
+ const response = breakoutValuesBySourceId.get(entry.id);
+ if (!response || response.values.length === 0) {
+ continue;
+ }
+
+ const rawDimension = LibMetric.projectionDimension(
+ entry.definition,
+ breakoutProjection,
+ );
+ const dimensionInfo = rawDimension
+ ? LibMetric.displayInfo(entry.definition, rawDimension)
+ : null;
+
+ const items: LegendItem[] = response.values.map((val, index) => ({
+ label: String(
+ formatValue(isEmpty(val) ? NULL_DISPLAY_VALUE : val, {
+ column: response.col,
+ }),
+ ),
+ color: colors[index] ?? colors[colors.length - 1],
+ }));
+
+ const header =
+ dimensionInfo?.longDisplayName ?? dimensionInfo?.displayName;
+ if (!header) {
+ continue;
+ }
+
+ groups.push({
+ header,
+ subtitle: definitionName ?? undefined,
+ items,
+ });
+ } else {
+ if (!definitionName) {
+ continue;
+ }
+ groups.push({
+ header: definitionName,
+ items: [{ label: definitionName, color: colors[0] }],
+ });
+ }
+ }
+
+ return groups;
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/legend.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/legend.unit.spec.ts
new file mode 100644
index 00000000000..5ccdefef34b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/legend.unit.spec.ts
@@ -0,0 +1,148 @@
+import * as LibMetric from "metabase-lib/metric";
+import Metadata from "metabase-lib/v1/metadata/Metadata";
+import Metric from "metabase-lib/v1/metadata/Metric";
+import type { MetricBreakoutValuesResponse } from "metabase-types/api";
+import {
+ createMockMetric,
+ createMockMetricDimension,
+} from "metabase-types/api/mocks/metric";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ SourceColorMap,
+} from "../types/viewer-state";
+
+import { buildLegendGroups } from "./legend";
+
+const REVENUE_METRIC = createMockMetric({
+ id: 1,
+ name: "Revenue",
+ dimensions: [
+ createMockMetricDimension({
+ id: "dim-1",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: "type/CreationTimestamp",
+ }),
+ createMockMetricDimension({
+ id: "dim-2",
+ display_name: "Category",
+ effective_type: "type/Text",
+ semantic_type: "type/Category",
+ }),
+ ],
+});
+
+const ORDERS_METRIC = createMockMetric({
+ id: 2,
+ name: "Orders",
+ dimensions: [
+ createMockMetricDimension({
+ id: "dim-3",
+ display_name: "Created At",
+ effective_type: "type/DateTime",
+ semantic_type: "type/CreationTimestamp",
+ }),
+ ],
+});
+
+function createMetadata(metrics: ReturnType<typeof createMockMetric>[]) {
+ const metadata = new Metadata();
+ metadata.metrics = {};
+ for (const metric of metrics) {
+ const instance = new Metric(metric as any);
+ instance.metadata = metadata;
+ metadata.metrics[metric.id] = instance;
+ }
+ return metadata;
+}
+
+function setupDefinition(
+ metadata: Metadata,
+ metricId: number,
+): LibMetric.MetricDefinition {
+ const provider = LibMetric.metadataProvider(metadata);
+ const metricMeta = LibMetric.metricMetadata(provider, metricId);
+ if (!metricMeta) {
+ throw new Error(`Metric ${metricId} not found`);
+ }
+ return LibMetric.fromMetricMetadata(provider, metricMeta);
+}
+
+function setupDefinitionWithBreakout(
+ metadata: Metadata,
+ metricId: number,
+ dimensionIndex: number,
+): LibMetric.MetricDefinition {
+ const definition = setupDefinition(metadata, metricId);
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const dimensionRef = LibMetric.dimensionReference(dimensions[dimensionIndex]);
+ return LibMetric.project(definition, dimensionRef);
+}
+
+describe("buildLegendGroups", () => {
+ it("returns empty array when no definitions have breakouts", () => {
+ const metadata = createMetadata([REVENUE_METRIC]);
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+
+ const definitions: MetricsViewerDefinitionEntry[] = [
+ { id: "metric:1", definition },
+ ];
+ const breakoutValues = new Map<
+ MetricSourceId,
+ MetricBreakoutValuesResponse
+ >();
+ const colors: SourceColorMap = { "metric:1": ["#509EE3"] };
+
+ expect(buildLegendGroups(definitions, breakoutValues, colors)).toEqual([]);
+ });
+
+ it("builds legend groups for definitions with and without breakouts", () => {
+ const metadata = createMetadata([REVENUE_METRIC, ORDERS_METRIC]);
+ const revenueDefinition = setupDefinitionWithBreakout(
+ metadata,
+ REVENUE_METRIC.id,
+ 1,
+ );
+ const ordersDefinition = setupDefinition(metadata, ORDERS_METRIC.id);
+
+ const definitions: MetricsViewerDefinitionEntry[] = [
+ { id: "metric:1", definition: revenueDefinition },
+ { id: "metric:2", definition: ordersDefinition },
+ ];
+
+ const breakoutValues = new Map<
+ MetricSourceId,
+ MetricBreakoutValuesResponse
+ >([
+ [
+ "metric:1",
+ {
+ values: ["Gadgets", "Widgets"],
+ col: { name: "CATEGORY" } as any,
+ },
+ ],
+ ]);
+
+ const colors: SourceColorMap = {
+ "metric:1": ["#509EE3", "#88BF4D"],
+ "metric:2": ["#A989C5"],
+ };
+
+ expect(buildLegendGroups(definitions, breakoutValues, colors)).toEqual([
+ {
+ header: "Category",
+ subtitle: "Revenue",
+ items: [
+ { label: "Gadgets", color: "#509EE3" },
+ { label: "Widgets", color: "#88BF4D" },
+ ],
+ },
+ {
+ header: "Orders",
+ items: [{ label: "Orders", color: "#A989C5" }],
+ },
+ ]);
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/series.ts b/frontend/src/metabase/metrics-viewer/utils/series.ts
new file mode 100644
index 00000000000..784cb9a2ac3
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/series.ts
@@ -0,0 +1,507 @@
+import type { DimensionOption } from "metabase/common/components/DimensionPill";
+import { getColorsForValues } from "metabase/lib/colors/charts";
+import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
+import { formatValue } from "metabase/lib/formatting";
+import { isEmpty } from "metabase/lib/validate";
+import type { DimensionItem } from "metabase/metrics-viewer/components/DimensionPillBar";
+import { getColorplethColorScale } from "metabase/visualizations/components/ChoroplethMap";
+import { getSeriesVizSettingsKey } from "metabase/visualizations/echarts/cartesian/model/series";
+import { MAX_SERIES } from "metabase/visualizations/lib/utils";
+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type {
+ Card,
+ CardId,
+ Dataset,
+ DimensionId,
+ MetricBreakoutValuesResponse,
+ RowValue,
+ RowValues,
+ SingleSeries,
+ VisualizationDisplay,
+ VisualizationSettings,
+} from "metabase-types/api";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDefinitionEntry,
+ MetricsViewerDisplayType,
+ SelectedMetric,
+ SourceColorMap,
+} from "../types/viewer-state";
+
+import {
+ getDefinitionColumnName,
+ getDefinitionName,
+} from "./definition-builder";
+import { entryHasBreakout, getEntryBreakout } from "./definition-entries";
+import { findDimensionById } from "./dimension-lookup";
+import { nextSyntheticCardId, parseSourceId } from "./source-ids";
+import { DISPLAY_TYPE_REGISTRY } from "./tab-config";
+import { getDimensionIcon } from "./tabs";
+
+function getDefinitionCardId(def: MetricDefinition): number | null {
+ const metricId = LibMetric.sourceMetricId(def);
+ if (metricId != null) {
+ return metricId;
+ }
+ const measureId = LibMetric.sourceMeasureId(def);
+ if (measureId != null) {
+ return nextSyntheticCardId();
+ }
+ return null;
+}
+
+/**
+ * Computes colors for each definition by building the same series key array
+ * that the chart pipeline would produce, then passing it to getColorsForValues.
+ *
+ * Chart key rules (from transformSeries → keyForSingleSeries):
+ * - First series key = col.name (slugified metric/measure card name)
+ * - Subsequent series keys = card.name (displayName or "displayName: breakoutValue")
+ */
+export function computeSourceColors(
+ definitions: MetricsViewerDefinitionEntry[],
+ breakoutValuesBySourceId?: Map<MetricSourceId, MetricBreakoutValuesResponse>,
+): SourceColorMap {
+ const entries: { sourceId: MetricSourceId; keys: string[] }[] = [];
+
+ for (const entry of definitions) {
+ if (!entry.definition) {
+ continue;
+ }
+ const displayName = getDefinitionName(entry.definition);
+ if (!displayName) {
+ continue;
+ }
+
+ const response = breakoutValuesBySourceId?.get(entry.id);
+ if (entryHasBreakout(entry) && response && response.values.length > 0) {
+ const keys = response.values.map((val) => {
+ const formatted = String(
+ formatValue(isEmpty(val) ? NULL_DISPLAY_VALUE : val, {
+ column: response.col,
+ }),
+ );
+ return definitions.length > 1
+ ? `${displayName}: ${formatted}`
+ : formatted;
+ });
+ entries.push({ sourceId: entry.id, keys });
+ } else {
+ entries.push({ sourceId: entry.id, keys: [displayName] });
+ }
+ }
+
+ if (entries.length === 0) {
+ return {};
+ }
+
+ const allKeys = entries.flatMap((entry) => entry.keys);
+
+ const firstDefinition = definitions.find(
+ (definition) => definition.id === entries[0].sourceId,
+ )?.definition;
+ if (firstDefinition) {
+ const columnName = getDefinitionColumnName(firstDefinition);
+ if (columnName) {
+ allKeys[0] = columnName;
+ }
+ }
+
+ const colorMapping = getColorsForValues(allKeys);
+
+ const result: SourceColorMap = {};
+ let idx = 0;
+ for (const entry of entries) {
+ result[entry.sourceId] = entry.keys.map(
+ (_, i) => colorMapping[allKeys[idx + i]],
+ );
+ idx += entry.keys.length;
+ }
+ return result;
+}
+
+// Column layout with breakout:
+// - 3 cols when dimension != breakout: [dimension, breakout, metric] → output: [dimension, metric]
+// - 2 cols when dimension == breakout: [breakout, metric] → output: [breakout, metric]
+export function splitByBreakout(
+ series: SingleSeries,
+ seriesCount: number,
+ sourceColors?: string[],
+): SingleSeries[] {
+ const { card, data } = series;
+ const { cols } = data;
+
+ const hasSeparateDimension = cols.length === 3;
+ const breakoutColumnIndex = hasSeparateDimension ? 1 : 0;
+ const metricColumnIndex = hasSeparateDimension ? 2 : 1;
+ const breakoutCol = cols[breakoutColumnIndex];
+ const metricCol = cols[metricColumnIndex];
+ const outputCols = [cols[0], metricCol];
+
+ const rowsByBreakoutValue = new Map<RowValue, RowValues[]>();
+
+ for (const row of data.rows) {
+ const breakoutValue = row[breakoutColumnIndex];
+ let groupedRows = rowsByBreakoutValue.get(breakoutValue);
+ if (!groupedRows) {
+ groupedRows = [];
+ rowsByBreakoutValue.set(breakoutValue, groupedRows);
+ if (rowsByBreakoutValue.size > MAX_SERIES) {
+ return [series];
+ }
+ }
+ groupedRows.push([row[0], row[metricColumnIndex]] as RowValues);
+ }
+
+ return Array.from(rowsByBreakoutValue.keys()).map((breakoutValue, i) => {
+ const name = [
+ seriesCount > 1 && card.name,
+ formatValue(isEmpty(breakoutValue) ? NULL_DISPLAY_VALUE : breakoutValue, {
+ column: breakoutCol,
+ }),
+ ]
+ .filter(Boolean)
+ .join(": ");
+
+ const seriesKey = getSeriesVizSettingsKey(
+ metricCol,
+ false,
+ true,
+ 1,
+ null,
+ name,
+ );
+
+ return {
+ ...series,
+ card: {
+ ...card,
+ id: nextSyntheticCardId(),
+ name,
+ visualization_settings: {
+ ...computeColorVizSettings({
+ displayType: card.display,
+ seriesKey,
+ color: sourceColors?.[i],
+ }),
+ },
+ },
+ data: {
+ ...data,
+ rows: rowsByBreakoutValue.get(breakoutValue)!,
+ cols: outputCols,
+ },
+ };
+ });
+}
+
+function createSeriesCard(
+ id: number,
+ name: string | null,
+ display: string,
+ vizSettings: VisualizationSettings,
+): Card {
+ return {
+ id,
+ name,
+ display,
+ visualization_settings: vizSettings,
+ } as Card;
+}
+
+export function buildRawSeriesFromDefinitions(
+ definitions: MetricsViewerDefinitionEntry[],
+ dimensionMapping: Record<MetricSourceId, DimensionId | null>,
+ display: MetricsViewerDisplayType,
+ resultsByDefinitionId: Map<MetricSourceId, Dataset>,
+ modifiedDefinitions: Map<MetricSourceId, MetricDefinition>,
+ sourceColors: SourceColorMap,
+): {
+ series: SingleSeries[];
+ cardIdToDimensionId: Record<CardId, MetricSourceId>;
+} {
+ const firstSettingsEntry = definitions.reduce<{
+ def: MetricDefinition;
+ dimension: DimensionMetadata;
+ } | null>((found, entry) => {
+ if (found) {
+ return found;
+ }
+ const dimensionId = dimensionMapping[entry.id];
+ if (!dimensionId || !entry.definition) {
+ return null;
+ }
+ const dimension = findDimensionById(entry.definition, dimensionId);
+ if (!dimension) {
+ return null;
+ }
+ const def = modifiedDefinitions.get(entry.id);
+ if (!def) {
+ return null;
+ }
+ return { def, dimension };
+ }, null);
+
+ if (!firstSettingsEntry) {
+ return { series: [], cardIdToDimensionId: {} };
+ }
+
+ const vizSettings = DISPLAY_TYPE_REGISTRY[display].getSettings(
+ firstSettingsEntry.def,
+ firstSettingsEntry.dimension,
+ );
+
+ const cardIdToDimensionId: Record<CardId, MetricSourceId> = {};
+
+ const series = definitions.flatMap((entry) => {
+ const dimensionId = dimensionMapping[entry.id];
+ if (!dimensionId || !entry.definition) {
+ return [];
+ }
+
+ const modDef = modifiedDefinitions.get(entry.id);
+ const result = resultsByDefinitionId.get(entry.id);
+ if (!modDef || !result?.data?.cols?.length) {
+ return [];
+ }
+
+ if (LibMetric.projections(modDef).length === 0) {
+ return [];
+ }
+
+ const cardId = getDefinitionCardId(entry.definition);
+ if (cardId == null) {
+ return [];
+ }
+
+ const name = getDefinitionName(entry.definition);
+
+ const seriesKey = getSeriesVizSettingsKey(
+ result.data.cols[1], // metric API returns [projection_cols..., aggregation_col]
+ false,
+ true,
+ 1,
+ null,
+ name ?? undefined,
+ );
+
+ const singleSeries: SingleSeries = {
+ card: createSeriesCard(cardId, name, display, {
+ ...vizSettings,
+ ...computeColorVizSettings({
+ displayType: display,
+ seriesKey,
+ color: sourceColors[entry.id]?.[0],
+ }),
+ }),
+ data: result.data,
+ };
+
+ let entrySeries: SingleSeries[];
+ if (!entryHasBreakout(entry)) {
+ entrySeries = [singleSeries];
+ } else {
+ entrySeries = splitByBreakout(
+ singleSeries,
+ definitions.length,
+ sourceColors[entry.id],
+ );
+ }
+
+ for (const s of entrySeries) {
+ cardIdToDimensionId[s.card.id] = entry.id;
+ }
+
+ return entrySeries;
+ });
+
+ return { series, cardIdToDimensionId };
+}
+
+function computeColorVizSettings({
+ displayType,
+ seriesKey,
+ color,
+}: {
+ displayType: VisualizationDisplay;
+ seriesKey: string;
+ color: string | undefined;
+}): Partial<Pick<VisualizationSettings, "series_settings" | "map.colors">> {
+ if (color == null) {
+ return {};
+ }
+ if (displayType === "map") {
+ return {
+ "map.colors": getColorplethColorScale(color),
+ };
+ } else {
+ return {
+ series_settings: {
+ [seriesKey]: {
+ color,
+ },
+ },
+ };
+ }
+}
+
+function computeAvailableOptions(
+ entry: MetricsViewerDefinitionEntry,
+ modifiedDefinition: MetricDefinition | undefined,
+ dimensionFilter?: (dimension: LibMetric.DimensionMetadata) => boolean,
+): DimensionOption[] {
+ if (!entry.definition) {
+ return [];
+ }
+ const definition = modifiedDefinition ?? entry.definition;
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const filtered = dimensionFilter
+ ? dimensions.filter(dimensionFilter)
+ : dimensions;
+
+ const breakoutProjection = getEntryBreakout(entry);
+ const breakoutRawDimension = breakoutProjection
+ ? LibMetric.projectionDimension(entry.definition, breakoutProjection)
+ : undefined;
+
+ return filtered.flatMap((dimension) => {
+ const info = LibMetric.displayInfo(definition, dimension);
+ if (!info.name) {
+ return [];
+ }
+ const isBreakout =
+ breakoutRawDimension != null &&
+ LibMetric.isSameSource(dimension, breakoutRawDimension);
+ return [
+ {
+ name: info.name,
+ displayName: info.displayName,
+ icon: getDimensionIcon(dimension),
+ dimension,
+ group: info.group,
+ selected: !isBreakout && (info.projectionPositions?.length ?? 0) > 0,
+ },
+ ];
+ });
+}
+
+export function buildDimensionItemsFromDefinitions(
+ definitions: MetricsViewerDefinitionEntry[],
+ dimensionMapping: Record<MetricSourceId, DimensionId | null>,
+ modifiedDefinitions: Map<MetricSourceId, MetricDefinition>,
+ sourceColors: SourceColorMap,
+ dimensionFilter?: (dimension: LibMetric.DimensionMetadata) => boolean,
+): DimensionItem[] {
+ return definitions.flatMap((entry): DimensionItem[] => {
+ if (!entry.definition) {
+ return [];
+ }
+
+ const dimensionId = dimensionMapping[entry.id];
+ const entryColors = sourceColors[entry.id];
+ const modifiedDefinition = modifiedDefinitions.get(entry.id);
+
+ if (dimensionId != null && modifiedDefinition) {
+ const projections = LibMetric.projections(modifiedDefinition);
+ if (projections.length === 0) {
+ return [];
+ }
+
+ const projectionDimension = LibMetric.projectionDimension(
+ modifiedDefinition,
+ projections[0],
+ );
+ if (!projectionDimension) {
+ return [];
+ }
+
+ const dimensionInfo = LibMetric.displayInfo(
+ modifiedDefinition,
+ projectionDimension,
+ );
+
+ return [
+ {
+ id: entry.id,
+ label: dimensionInfo.longDisplayName,
+ icon: getDimensionIcon(projectionDimension),
+ colors: entryColors,
+ availableOptions: computeAvailableOptions(
+ entry,
+ modifiedDefinition,
+ dimensionFilter,
+ ),
+ },
+ ];
+ }
+
+ const availableOptions = computeAvailableOptions(
+ entry,
+ undefined,
+ dimensionFilter,
+ );
+
+ return [
+ {
+ id: entry.id,
+ label: undefined,
+ icon: undefined,
+ colors: entryColors,
+ availableOptions,
+ },
+ ];
+ });
+}
+
+export function getSelectedMetricsInfo(
+ definitions: MetricsViewerDefinitionEntry[],
+ loadingIds: Set<MetricSourceId>,
+): SelectedMetric[] {
+ return definitions.flatMap((entry): SelectedMetric[] => {
+ const { definition } = entry;
+ const isLoading = loadingIds.has(entry.id);
+
+ if (!definition) {
+ const parsed = parseSourceId(entry.id);
+ return [
+ {
+ id: parsed.id,
+ sourceType: parsed.type,
+ name: null,
+ isLoading,
+ },
+ ];
+ }
+
+ const name = getDefinitionName(definition) ?? entry.id;
+ const metricId = LibMetric.sourceMetricId(definition);
+ if (metricId != null) {
+ return [
+ {
+ id: metricId,
+ sourceType: "metric",
+ name,
+ isLoading,
+ },
+ ];
+ }
+
+ const measureId = LibMetric.sourceMeasureId(definition);
+ if (measureId != null) {
+ const tableId = LibMetric.sourceMeasureTableId(definition);
+ return [
+ {
+ id: measureId,
+ sourceType: "measure",
+ name,
+ isLoading,
+ tableId: tableId ?? undefined,
+ },
+ ];
+ }
+
+ return [];
+ });
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/series.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/series.unit.spec.ts
new file mode 100644
index 00000000000..882c78bf777
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/series.unit.spec.ts
@@ -0,0 +1,308 @@
+import type { RowValues } from "metabase-types/api";
+import { createMockColumn } from "metabase-types/api/mocks";
+import { ORDERS_ID } from "metabase-types/api/mocks/presets";
+import { createMockSingleSeries } from "metabase-types/api/mocks/series";
+
+import type { MetricSourceId } from "../types/viewer-state";
+
+import {
+ REVENUE_METRIC,
+ TOTAL_MEASURE,
+ createMetricMetadata,
+ measureMetadata,
+ setupDefinition,
+ setupMeasureDefinition,
+} from "./__tests__/test-helpers";
+import { getSelectedMetricsInfo, splitByBreakout } from "./series";
+
+const dimensionCol = createMockColumn({
+ name: "CREATED_AT",
+ display_name: "Created At",
+ base_type: "type/DateTime",
+});
+
+const breakoutCol = createMockColumn({
+ name: "CATEGORY",
+ display_name: "Category",
+ base_type: "type/Text",
+});
+
+const metricCol = createMockColumn({
+ name: "COUNT",
+ display_name: "Count",
+ base_type: "type/Integer",
+});
+
+const CARD_OPTS = { id: 1, name: "Revenue", display: "line" } as const;
+
+describe("splitByBreakout", () => {
+ describe("3 columns: [dimension, breakout, metric]", () => {
+ it("splits rows by breakout value and strips breakout column", () => {
+ const series = createMockSingleSeries(CARD_OPTS, {
+ data: {
+ cols: [dimensionCol, breakoutCol, metricCol],
+ rows: [
+ ["2024-01", "Gadgets", 10],
+ ["2024-01", "Widgets", 20],
+ ["2024-02", "Gadgets", 30],
+ ["2024-02", "Widgets", 40],
+ ],
+ },
+ });
+
+ const result = splitByBreakout(series, 1);
+
+ expect(result).toHaveLength(2);
+
+ expect(result[0].data.cols).toEqual([dimensionCol, metricCol]);
+ expect(result[0].data.rows).toEqual([
+ ["2024-01", 10],
+ ["2024-02", 30],
+ ]);
+ expect(result[0].card.name).toBe("Gadgets");
+
+ expect(result[1].data.cols).toEqual([dimensionCol, metricCol]);
+ expect(result[1].data.rows).toEqual([
+ ["2024-01", 20],
+ ["2024-02", 40],
+ ]);
+ expect(result[1].card.name).toBe("Widgets");
+ });
+
+ it("prefixes breakout value with card name when seriesCount > 1", () => {
+ const series = createMockSingleSeries(CARD_OPTS, {
+ data: {
+ cols: [dimensionCol, breakoutCol, metricCol],
+ rows: [
+ ["2024-01", "Gadgets", 10],
+ ["2024-01", "Widgets", 20],
+ ],
+ },
+ });
+
+ const result = splitByBreakout(series, 2);
+
+ expect(result[0].card.name).toBe("Revenue: Gadgets");
+ expect(result[1].card.name).toBe("Revenue: Widgets");
+ });
+ });
+
+ describe("2 columns: [breakout, metric] (dimension == breakout)", () => {
+ it("splits rows by breakout value and keeps both columns", () => {
+ const series = createMockSingleSeries(CARD_OPTS, {
+ data: {
+ cols: [breakoutCol, metricCol],
+ rows: [
+ ["Gadgets", 10],
+ ["Widgets", 20],
+ ["Gadgets", 30],
+ ],
+ },
+ });
+
+ const result = splitByBreakout(series, 1);
+
+ expect(result).toHaveLength(2);
+
+ expect(result[0].data.cols).toEqual([breakoutCol, metricCol]);
+ expect(result[0].data.rows).toEqual([
+ ["Gadgets", 10],
+ ["Gadgets", 30],
+ ]);
+ expect(result[0].card.name).toBe("Gadgets");
+
+ expect(result[1].data.cols).toEqual([breakoutCol, metricCol]);
+ expect(result[1].data.rows).toEqual([["Widgets", 20]]);
+ expect(result[1].card.name).toBe("Widgets");
+ });
+ });
+
+ it("assigns unique card ids to each split series", () => {
+ const series = createMockSingleSeries(CARD_OPTS, {
+ data: {
+ cols: [dimensionCol, breakoutCol, metricCol],
+ rows: [
+ ["2024-01", "Gadgets", 10],
+ ["2024-01", "Widgets", 20],
+ ],
+ },
+ });
+
+ const result = splitByBreakout(series, 1);
+
+ const ids = result.map((s) => s.card.id);
+ expect(new Set(ids).size).toBe(ids.length);
+ });
+
+ it("applies source colors to series settings", () => {
+ const series = createMockSingleSeries(CARD_OPTS, {
+ data: {
+ cols: [dimensionCol, breakoutCol, metricCol],
+ rows: [
+ ["2024-01", "Gadgets", 10],
+ ["2024-01", "Widgets", 20],
+ ],
+ },
+ });
+
+ const result = splitByBreakout(series, 1, ["#509EE3", "#88BF4D"]);
+
+ expect(result[0].card.visualization_settings.series_settings).toBeDefined();
+ expect(result[1].card.visualization_settings.series_settings).toBeDefined();
+ });
+
+ it("returns original series when breakout values exceed MAX_SERIES", () => {
+ const rows: RowValues[] = Array.from({ length: 102 }, (_, i) => [
+ "2024-01",
+ `Value ${i}`,
+ i,
+ ]);
+ const series = createMockSingleSeries(CARD_OPTS, {
+ data: { cols: [dimensionCol, breakoutCol, metricCol], rows },
+ });
+
+ const result = splitByBreakout(series, 1);
+
+ expect(result).toHaveLength(1);
+ expect(result[0]).toBe(series);
+ });
+
+ it("shares the same cols reference across all split series", () => {
+ const series = createMockSingleSeries(CARD_OPTS, {
+ data: {
+ cols: [dimensionCol, breakoutCol, metricCol],
+ rows: [
+ ["2024-01", "Gadgets", 10],
+ ["2024-01", "Widgets", 20],
+ ],
+ },
+ });
+
+ const result = splitByBreakout(series, 1);
+
+ expect(result[0].data.cols).toBe(result[1].data.cols);
+ });
+});
+
+describe("getSelectedMetricsInfo", () => {
+ const metricMetadata = createMetricMetadata([REVENUE_METRIC]);
+ const metricDefinition = setupDefinition(metricMetadata, REVENUE_METRIC.id);
+ const measureDefinition = setupMeasureDefinition(
+ measureMetadata,
+ TOTAL_MEASURE.id,
+ );
+
+ describe("metric definition", () => {
+ it("extracts metric id, name, and sourceType", () => {
+ const sourceId: MetricSourceId = `metric:${REVENUE_METRIC.id}`;
+ const result = getSelectedMetricsInfo(
+ [{ id: sourceId, definition: metricDefinition }],
+ new Set(),
+ );
+
+ expect(result).toEqual([
+ {
+ id: REVENUE_METRIC.id,
+ sourceType: "metric",
+ name: "Revenue",
+ isLoading: false,
+ },
+ ]);
+ });
+
+ it("marks entry as loading when id is in loadingIds", () => {
+ const sourceId: MetricSourceId = `metric:${REVENUE_METRIC.id}`;
+ const result = getSelectedMetricsInfo(
+ [{ id: sourceId, definition: metricDefinition }],
+ new Set([sourceId]),
+ );
+
+ expect(result).toEqual([
+ {
+ id: REVENUE_METRIC.id,
+ sourceType: "metric",
+ name: "Revenue",
+ isLoading: true,
+ },
+ ]);
+ });
+ });
+
+ describe("measure definition", () => {
+ it("extracts measure id, name, tableId, and sourceType", () => {
+ const sourceId: MetricSourceId = `measure:${TOTAL_MEASURE.id}`;
+ const result = getSelectedMetricsInfo(
+ [{ id: sourceId, definition: measureDefinition }],
+ new Set(),
+ );
+
+ expect(result).toEqual([
+ {
+ id: TOTAL_MEASURE.id,
+ sourceType: "measure",
+ name: "Total Revenue",
+ isLoading: false,
+ tableId: ORDERS_ID,
+ },
+ ]);
+ });
+ });
+
+ it("handles multiple entries in order", () => {
+ const metricSourceId: MetricSourceId = `metric:${REVENUE_METRIC.id}`;
+ const measureSourceId: MetricSourceId = `measure:${TOTAL_MEASURE.id}`;
+
+ const result = getSelectedMetricsInfo(
+ [
+ { id: metricSourceId, definition: metricDefinition },
+ { id: measureSourceId, definition: measureDefinition },
+ ],
+ new Set(),
+ );
+
+ expect(result).toEqual([
+ {
+ id: REVENUE_METRIC.id,
+ sourceType: "metric",
+ name: "Revenue",
+ isLoading: false,
+ },
+ {
+ id: TOTAL_MEASURE.id,
+ sourceType: "measure",
+ name: "Total Revenue",
+ isLoading: false,
+ tableId: ORDERS_ID,
+ },
+ ]);
+ });
+
+ it("sets isLoading per entry based on loadingIds", () => {
+ const metricSourceId: MetricSourceId = `metric:${REVENUE_METRIC.id}`;
+ const measureSourceId: MetricSourceId = `measure:${TOTAL_MEASURE.id}`;
+
+ const result = getSelectedMetricsInfo(
+ [
+ { id: metricSourceId, definition: metricDefinition },
+ { id: measureSourceId, definition: measureDefinition },
+ ],
+ new Set([measureSourceId]),
+ );
+
+ expect(result).toEqual([
+ {
+ id: REVENUE_METRIC.id,
+ sourceType: "metric",
+ name: "Revenue",
+ isLoading: false,
+ },
+ {
+ id: TOTAL_MEASURE.id,
+ sourceType: "measure",
+ name: "Total Revenue",
+ isLoading: true,
+ tableId: ORDERS_ID,
+ },
+ ]);
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/source-ids.ts b/frontend/src/metabase/metrics-viewer/utils/source-ids.ts
new file mode 100644
index 00000000000..93247185abf
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/source-ids.ts
@@ -0,0 +1,45 @@
+import type { CardId, MeasureId } from "metabase-types/api";
+
+import type { MetricSourceId } from "../types/viewer-state";
+
+export function createMetricSourceId(cardId: CardId): MetricSourceId {
+ return `metric:${cardId}`;
+}
+
+export function createMeasureSourceId(measureId: MeasureId): MetricSourceId {
+ return `measure:${measureId}`;
+}
+
+export function createSourceId(
+ id: number,
+ sourceType: "metric" | "measure",
+): MetricSourceId {
+ return sourceType === "metric"
+ ? createMetricSourceId(id)
+ : createMeasureSourceId(id);
+}
+
+export function parseSourceId(sourceId: MetricSourceId): {
+ type: "metric" | "measure";
+ id: number;
+} {
+ const [type, idStr] = sourceId.split(":");
+ if (type !== "metric" && type !== "measure") {
+ throw new Error(`Invalid source ID format: ${sourceId}`);
+ }
+ const id = Number(idStr);
+ if (Number.isNaN(id)) {
+ throw new Error(`Invalid source ID format: ${sourceId}`);
+ }
+ return { type, id };
+}
+
+export function getSourceIcon(sourceId: MetricSourceId): "metric" | "ruler" {
+ return parseSourceId(sourceId).type === "metric" ? "metric" : "ruler";
+}
+
+let syntheticCardIdCounter = -1;
+
+export function nextSyntheticCardId(): number {
+ return --syntheticCardIdCounter;
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/source-ids.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/source-ids.unit.spec.ts
new file mode 100644
index 00000000000..50af731ba62
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/source-ids.unit.spec.ts
@@ -0,0 +1,61 @@
+import {
+ createMeasureSourceId,
+ createMetricSourceId,
+ createSourceId,
+ getSourceIcon,
+ nextSyntheticCardId,
+ parseSourceId,
+} from "./source-ids";
+
+describe("createMetricSourceId", () => {
+ it("creates a metric source ID", () => {
+ expect(createMetricSourceId(1)).toBe("metric:1");
+ expect(createMetricSourceId(42)).toBe("metric:42");
+ });
+});
+
+describe("createMeasureSourceId", () => {
+ it("creates a measure source ID", () => {
+ expect(createMeasureSourceId(5)).toBe("measure:5");
+ expect(createMeasureSourceId(100)).toBe("measure:100");
+ });
+});
+
+describe("createSourceId", () => {
+ it("delegates to createMetricSourceId for metric type", () => {
+ expect(createSourceId(1, "metric")).toBe("metric:1");
+ });
+
+ it("delegates to createMeasureSourceId for measure type", () => {
+ expect(createSourceId(5, "measure")).toBe("measure:5");
+ });
+});
+
+describe("parseSourceId", () => {
+ it("parses a metric source ID", () => {
+ expect(parseSourceId("metric:1")).toEqual({ type: "metric", id: 1 });
+ });
+
+ it("parses a measure source ID", () => {
+ expect(parseSourceId("measure:5")).toEqual({ type: "measure", id: 5 });
+ });
+});
+
+describe("getSourceIcon", () => {
+ it('returns "metric" icon for metric source IDs', () => {
+ expect(getSourceIcon("metric:1")).toBe("metric");
+ expect(getSourceIcon("metric:99")).toBe("metric");
+ });
+
+ it('returns "ruler" icon for measure source IDs', () => {
+ expect(getSourceIcon("measure:5")).toBe("ruler");
+ expect(getSourceIcon("measure:42")).toBe("ruler");
+ });
+});
+
+describe("nextSyntheticCardId", () => {
+ it("returns sequential negative IDs starting from -2", () => {
+ expect(nextSyntheticCardId()).toBe(-2);
+ expect(nextSyntheticCardId()).toBe(-3);
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/tab-config.ts b/frontend/src/metabase/metrics-viewer/utils/tab-config.ts
new file mode 100644
index 00000000000..31f1655e225
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/tab-config.ts
@@ -0,0 +1,218 @@
+import type { IconName } from "metabase/ui";
+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { VisualizationSettings } from "metabase-types/api";
+
+import type {
+ MetricsViewerDisplayType,
+ MetricsViewerTabType,
+} from "../types/viewer-state";
+
+import {
+ getGeoSubtype,
+ getMapRegionForDimension,
+ isGeoDimension,
+} from "./geo-dimensions";
+
+// ── Shared types ──
+
+export interface ChartTypeOption {
+ type: MetricsViewerDisplayType;
+ icon: IconName;
+}
+
+interface DisplayTypeDefinition {
+ supportsMultipleSeries: boolean;
+ getSettings: (
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+ ) => VisualizationSettings;
+}
+
+interface BaseTabTypeDefinition {
+ type: MetricsViewerTabType;
+ autoCreate: boolean;
+ dimensionPredicate: (dimension: DimensionMetadata) => boolean;
+ dimensionSubtype?: (dimension: DimensionMetadata) => string | null;
+ defaultDisplayType: MetricsViewerDisplayType;
+ availableDisplayTypes: ChartTypeOption[];
+}
+
+interface AggregateTabType extends BaseTabTypeDefinition {
+ matchMode: "aggregate";
+ fixedId: string;
+ fixedLabel: string;
+}
+
+interface ExactColumnTabType extends BaseTabTypeDefinition {
+ matchMode: "exact-column";
+}
+
+export type TabTypeDefinition = AggregateTabType | ExactColumnTabType;
+
+// ── Tab type registry ──
+
+const STANDARD_CHART_TYPES: ChartTypeOption[] = [
+ { type: "line", icon: "line" },
+ { type: "area", icon: "area" },
+ { type: "bar", icon: "bar" },
+];
+
+const GEO_CHART_TYPES: ChartTypeOption[] = [
+ { type: "map", icon: "pinmap" },
+ ...STANDARD_CHART_TYPES,
+];
+
+const NUMERIC_CHART_TYPES: ChartTypeOption[] = [
+ ...STANDARD_CHART_TYPES,
+ { type: "scatter", icon: "bubble" },
+];
+
+export const TAB_TYPE_REGISTRY: TabTypeDefinition[] = [
+ {
+ type: "time",
+ autoCreate: true,
+ matchMode: "aggregate",
+ fixedId: "time",
+ fixedLabel: "Time",
+ dimensionPredicate: LibMetric.isDateOrDateTime,
+ defaultDisplayType: "line",
+ availableDisplayTypes: STANDARD_CHART_TYPES,
+ },
+ {
+ type: "geo",
+ autoCreate: true,
+ matchMode: "aggregate",
+ fixedId: "geo",
+ fixedLabel: "Location",
+ dimensionPredicate: isGeoDimension,
+ dimensionSubtype: getGeoSubtype,
+ defaultDisplayType: "map",
+ availableDisplayTypes: GEO_CHART_TYPES,
+ },
+ {
+ type: "category",
+ autoCreate: true,
+ matchMode: "exact-column",
+ dimensionPredicate: (dimension) =>
+ LibMetric.isCategory(dimension) &&
+ !isGeoDimension(dimension) &&
+ !LibMetric.isBoolean(dimension),
+ defaultDisplayType: "bar",
+ availableDisplayTypes: STANDARD_CHART_TYPES,
+ },
+ {
+ type: "boolean",
+ autoCreate: true,
+ matchMode: "exact-column",
+ dimensionPredicate: LibMetric.isBoolean,
+ defaultDisplayType: "bar",
+ availableDisplayTypes: STANDARD_CHART_TYPES,
+ },
+ {
+ type: "numeric",
+ autoCreate: false,
+ matchMode: "exact-column",
+ dimensionPredicate: (dimension) =>
+ LibMetric.isNumeric(dimension) &&
+ !LibMetric.isID(dimension) &&
+ !LibMetric.isCoordinate(dimension),
+ defaultDisplayType: "bar",
+ availableDisplayTypes: NUMERIC_CHART_TYPES,
+ },
+];
+
+export function getTabConfig(type: MetricsViewerTabType): TabTypeDefinition {
+ const config = TAB_TYPE_REGISTRY.find((config) => config.type === type);
+ if (!config) {
+ throw new Error(`No tab config found for type: ${type}`);
+ }
+ return config;
+}
+
+// ── Display type registry ──
+
+function getDimensionsAndMetrics(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+): {
+ dimensions: string[];
+ metrics: string[];
+} {
+ const dimensions: string[] = [];
+ const name = LibMetric.displayInfo(def, dimension).name;
+ if (name) {
+ dimensions.push(name);
+ }
+
+ const meta = LibMetric.sourceMetricOrMeasureMetadata(def);
+ const metrics = meta ? [LibMetric.displayInfo(def, meta).displayName] : [];
+
+ return { dimensions, metrics };
+}
+
+function getChartSettings(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+): VisualizationSettings {
+ const { dimensions, metrics } = getDimensionsAndMetrics(def, dimension);
+
+ return {
+ "graph.x_axis.labels_enabled": false,
+ "graph.y_axis.labels_enabled": false,
+ "graph.dimensions": dimensions,
+ "graph.metrics": metrics,
+ };
+}
+
+function getPieSettings(
+ _def: MetricDefinition,
+ _dimension: DimensionMetadata,
+): VisualizationSettings {
+ return {};
+}
+
+function getScatterSettings(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+): VisualizationSettings {
+ return {
+ ...getChartSettings(def, dimension),
+ "scatter.bubble": undefined,
+ };
+}
+
+function getMapSettings(
+ def: MetricDefinition,
+ dimension: DimensionMetadata,
+): VisualizationSettings {
+ const mapRegion = getMapRegionForDimension(dimension);
+ if (!mapRegion) {
+ return {};
+ }
+
+ const { dimensions, metrics } = getDimensionsAndMetrics(def, dimension);
+ if (dimensions.length === 0 || metrics.length === 0) {
+ return {};
+ }
+
+ return {
+ "map.type": "region",
+ "map.region": mapRegion,
+ "map.dimension": dimensions[0],
+ "map.metric": metrics[0],
+ };
+}
+
+export const DISPLAY_TYPE_REGISTRY: Record<
+ MetricsViewerDisplayType,
+ DisplayTypeDefinition
+> = {
+ line: { supportsMultipleSeries: true, getSettings: getChartSettings },
+ area: { supportsMultipleSeries: true, getSettings: getChartSettings },
+ bar: { supportsMultipleSeries: true, getSettings: getChartSettings },
+ row: { supportsMultipleSeries: true, getSettings: getChartSettings },
+ scatter: { supportsMultipleSeries: true, getSettings: getScatterSettings },
+ map: { supportsMultipleSeries: false, getSettings: getMapSettings },
+ pie: { supportsMultipleSeries: false, getSettings: getPieSettings },
+};
diff --git a/frontend/src/metabase/metrics-viewer/utils/tab-config.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/tab-config.unit.spec.ts
new file mode 100644
index 00000000000..ece2ebce0e0
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/tab-config.unit.spec.ts
@@ -0,0 +1,209 @@
+import * as LibMetric from "metabase-lib/metric";
+
+import {
+ GEO_METRIC,
+ REVENUE_METRIC,
+ createMetricMetadata,
+ setupDefinition,
+} from "./__tests__/test-helpers";
+import { getTabConfig } from "./tab-config";
+
+const allMetadata = createMetricMetadata([REVENUE_METRIC, GEO_METRIC]);
+const revenueDefinition = setupDefinition(allMetadata, REVENUE_METRIC.id);
+const geoDefinition = setupDefinition(allMetadata, GEO_METRIC.id);
+const revenueDimensions = LibMetric.projectionableDimensions(revenueDefinition);
+const geoDimensions = LibMetric.projectionableDimensions(geoDefinition);
+
+const REV_DIM_IDX = {
+ DATE_TIME: 0,
+ CATEGORY: 1,
+ AMOUNT: 2,
+ BOOLEAN: 3,
+};
+
+const GEO_DIM_IDX = {
+ STATE: 0,
+ COUNTRY: 1,
+ CITY: 2,
+ LATITUDE: 3,
+ LONGITUDE: 4,
+ DATE_TIME: 5,
+};
+
+describe("getTabConfig", () => {
+ it("returns config for time tab", () => {
+ expect(getTabConfig("time")).toEqual(
+ expect.objectContaining({
+ type: "time",
+ autoCreate: true,
+ matchMode: "aggregate",
+ fixedId: "time",
+ fixedLabel: "Time",
+ defaultDisplayType: "line",
+ availableDisplayTypes: [
+ { type: "line", icon: "line" },
+ { type: "area", icon: "area" },
+ { type: "bar", icon: "bar" },
+ ],
+ }),
+ );
+ });
+
+ it("returns config for geo tab", () => {
+ expect(getTabConfig("geo")).toEqual(
+ expect.objectContaining({
+ type: "geo",
+ autoCreate: true,
+ matchMode: "aggregate",
+ fixedId: "geo",
+ fixedLabel: "Location",
+ defaultDisplayType: "map",
+ availableDisplayTypes: [
+ { type: "map", icon: "pinmap" },
+ { type: "line", icon: "line" },
+ { type: "area", icon: "area" },
+ { type: "bar", icon: "bar" },
+ ],
+ }),
+ );
+ });
+
+ it("returns config for category tab", () => {
+ expect(getTabConfig("category")).toEqual(
+ expect.objectContaining({
+ type: "category",
+ autoCreate: true,
+ matchMode: "exact-column",
+ defaultDisplayType: "bar",
+ availableDisplayTypes: [
+ { type: "line", icon: "line" },
+ { type: "area", icon: "area" },
+ { type: "bar", icon: "bar" },
+ ],
+ }),
+ );
+ });
+
+ it("returns config for boolean tab", () => {
+ expect(getTabConfig("boolean")).toEqual(
+ expect.objectContaining({
+ type: "boolean",
+ autoCreate: true,
+ matchMode: "exact-column",
+ defaultDisplayType: "bar",
+ availableDisplayTypes: [
+ { type: "line", icon: "line" },
+ { type: "area", icon: "area" },
+ { type: "bar", icon: "bar" },
+ ],
+ }),
+ );
+ });
+
+ it("returns config for numeric tab", () => {
+ expect(getTabConfig("numeric")).toEqual(
+ expect.objectContaining({
+ type: "numeric",
+ autoCreate: false,
+ matchMode: "exact-column",
+ defaultDisplayType: "bar",
+ availableDisplayTypes: [
+ { type: "line", icon: "line" },
+ { type: "area", icon: "area" },
+ { type: "bar", icon: "bar" },
+ { type: "scatter", icon: "bubble" },
+ ],
+ }),
+ );
+ });
+
+ it("throws for unknown tab type", () => {
+ expect(() => getTabConfig("unknown" as any)).toThrow(
+ "No tab config found for type: unknown",
+ );
+ });
+});
+
+describe("TAB_TYPE_REGISTRY", () => {
+ describe("dimension predicates", () => {
+ const timeConfig = getTabConfig("time");
+ const geoConfig = getTabConfig("geo");
+ const categoryConfig = getTabConfig("category");
+ const booleanConfig = getTabConfig("boolean");
+ const numericConfig = getTabConfig("numeric");
+
+ it("time predicate matches datetime dimensions", () => {
+ expect(
+ timeConfig.dimensionPredicate(revenueDimensions[REV_DIM_IDX.DATE_TIME]),
+ ).toBe(true);
+ });
+
+ it("time predicate rejects non-datetime dimensions", () => {
+ expect(
+ timeConfig.dimensionPredicate(revenueDimensions[REV_DIM_IDX.CATEGORY]),
+ ).toBe(false);
+ });
+
+ it("geo predicate matches state dimensions", () => {
+ expect(
+ geoConfig.dimensionPredicate(geoDimensions[GEO_DIM_IDX.STATE]),
+ ).toBe(true);
+ });
+
+ it("geo predicate matches country dimensions", () => {
+ expect(
+ geoConfig.dimensionPredicate(geoDimensions[GEO_DIM_IDX.COUNTRY]),
+ ).toBe(true);
+ });
+
+ it("geo predicate rejects latitude dimensions", () => {
+ expect(
+ geoConfig.dimensionPredicate(geoDimensions[GEO_DIM_IDX.LATITUDE]),
+ ).toBe(false);
+ });
+
+ it("category predicate matches category dimensions", () => {
+ expect(
+ categoryConfig.dimensionPredicate(
+ revenueDimensions[REV_DIM_IDX.CATEGORY],
+ ),
+ ).toBe(true);
+ });
+
+ it("category predicate rejects geo dimensions", () => {
+ expect(
+ categoryConfig.dimensionPredicate(geoDimensions[GEO_DIM_IDX.STATE]),
+ ).toBe(false);
+ });
+
+ it("category predicate rejects boolean dimensions", () => {
+ expect(
+ categoryConfig.dimensionPredicate(
+ revenueDimensions[REV_DIM_IDX.BOOLEAN],
+ ),
+ ).toBe(false);
+ });
+
+ it("boolean predicate matches boolean dimensions", () => {
+ expect(
+ booleanConfig.dimensionPredicate(
+ revenueDimensions[REV_DIM_IDX.BOOLEAN],
+ ),
+ ).toBe(true);
+ });
+
+ it("boolean predicate rejects non-boolean dimensions", () => {
+ expect(
+ booleanConfig.dimensionPredicate(
+ revenueDimensions[REV_DIM_IDX.CATEGORY],
+ ),
+ ).toBe(false);
+ });
+
+ it("numeric predicate rejects latitude (coordinate) dimensions", () => {
+ expect(
+ numericConfig.dimensionPredicate(geoDimensions[GEO_DIM_IDX.LATITUDE]),
+ ).toBe(false);
+ });
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/tabs.ts b/frontend/src/metabase/metrics-viewer/utils/tabs.ts
new file mode 100644
index 00000000000..a753b63ef76
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/tabs.ts
@@ -0,0 +1,726 @@
+import { getObjectEntries } from "metabase/lib/objects";
+import type { IconName } from "metabase/ui";
+import type {
+ DimensionGroup,
+ DimensionMetadata,
+ MetricDefinition,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import { MAX_AUTO_TABS } from "../constants";
+import type {
+ MetricSourceId,
+ MetricsViewerTabState,
+ MetricsViewerTabType,
+ StoredMetricsViewerTab,
+} from "../types/viewer-state";
+
+import { GEO_SUBTYPE_PRIORITY } from "./geo-dimensions";
+import type { TabTypeDefinition } from "./tab-config";
+import { TAB_TYPE_REGISTRY, getTabConfig } from "./tab-config";
+
+// ── Dimension classification ──
+
+export function getDimensionIcon(dimension: DimensionMetadata): IconName {
+ if (LibMetric.isPrimaryKey(dimension)) {
+ return "label";
+ }
+ if (LibMetric.isForeignKey(dimension)) {
+ return "connections";
+ }
+ if (LibMetric.isBoolean(dimension)) {
+ return "io";
+ }
+ if (LibMetric.isDateOrDateTime(dimension) || LibMetric.isTime(dimension)) {
+ return "calendar";
+ }
+ if (LibMetric.isCategory(dimension)) {
+ return "string";
+ }
+ if (LibMetric.isNumeric(dimension) || LibMetric.isCoordinate(dimension)) {
+ return "int";
+ }
+ if (
+ LibMetric.isState(dimension) ||
+ LibMetric.isCountry(dimension) ||
+ LibMetric.isCity(dimension) ||
+ LibMetric.isLocation(dimension)
+ ) {
+ return "location";
+ }
+ return "unknown";
+}
+
+function getDimensionType(
+ dimension: DimensionMetadata,
+): MetricsViewerTabType | null {
+ for (const config of TAB_TYPE_REGISTRY) {
+ if (config.dimensionPredicate(dimension)) {
+ return config.type;
+ }
+ }
+
+ return null;
+}
+
+export type ClassifiedDimension = {
+ dimension: DimensionMetadata;
+ id: string;
+ name: string;
+ displayName: string;
+ icon: IconName;
+ type: MetricsViewerTabType;
+ group?: DimensionGroup;
+ isDefault?: boolean;
+ canListValues?: boolean;
+};
+
+const dimensionsByTypeCache = new WeakMap<
+ MetricDefinition,
+ Map<string, ClassifiedDimension>
+>();
+
+export function getDimensionsByType(
+ def: MetricDefinition,
+): Map<string, ClassifiedDimension> {
+ const cached = dimensionsByTypeCache.get(def);
+ if (cached) {
+ return cached;
+ }
+
+ const result = new Map<string, ClassifiedDimension>();
+
+ const defaultDimensionIds = new Set(
+ LibMetric.defaultBreakoutDimensions(def)
+ .map((dimension) => LibMetric.dimensionValuesInfo(def, dimension).id)
+ .filter(Boolean),
+ );
+
+ for (const dimension of LibMetric.projectionableDimensions(def)) {
+ const type = getDimensionType(dimension);
+ if (!type) {
+ continue;
+ }
+
+ const valuesInfo = LibMetric.dimensionValuesInfo(def, dimension);
+ const displayInfo = LibMetric.displayInfo(def, dimension);
+ if (!valuesInfo.id || result.has(valuesInfo.id)) {
+ continue;
+ }
+
+ result.set(valuesInfo.id, {
+ dimension,
+ id: valuesInfo.id,
+ name: displayInfo.name ?? displayInfo.displayName,
+ displayName: displayInfo.displayName,
+ icon: getDimensionIcon(dimension),
+ type,
+ group: displayInfo.group,
+ isDefault: defaultDimensionIds.has(valuesInfo.id),
+ canListValues: valuesInfo.canListValues,
+ });
+ }
+
+ dimensionsByTypeCache.set(def, result);
+ return result;
+}
+
+export function resolveCommonTabLabel(
+ names: string[],
+ fallback: string,
+): string {
+ if (names.length === 0) {
+ return fallback;
+ }
+ if (names.length === 1 || names.every((name) => name === names[0])) {
+ return names[0];
+ }
+
+ const counts = new Map<string, number>();
+ for (const name of names) {
+ counts.set(name, (counts.get(name) ?? 0) + 1);
+ }
+
+ let bestName = names[0];
+ let bestCount = 0;
+ for (const [name, count] of counts) {
+ if (count > bestCount) {
+ bestCount = count;
+ bestName = name;
+ }
+ }
+
+ return bestName;
+}
+
+// ── Default tab computation ──
+
+function classifyDimensionsBySource(
+ definitionsBySourceId: Record<MetricSourceId, MetricDefinition | null>,
+ sourceOrder: MetricSourceId[],
+): Map<MetricSourceId, Map<string, ClassifiedDimension>> {
+ const result = new Map<MetricSourceId, Map<string, ClassifiedDimension>>();
+
+ for (const sourceId of sourceOrder) {
+ const def = definitionsBySourceId[sourceId];
+ if (def) {
+ result.set(sourceId, getDimensionsByType(def));
+ }
+ }
+
+ return result;
+}
+
+function resolveTabDimensionNames(
+ dimensionMapping: Record<MetricSourceId, string>,
+ dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+): string[] {
+ const names: string[] = [];
+
+ for (const [sourceId, dimensionId] of getObjectEntries(dimensionMapping)) {
+ const dimensionInfo = dimensionsBySource.get(sourceId)?.get(dimensionId);
+ if (dimensionInfo) {
+ names.push(dimensionInfo.displayName);
+ }
+ }
+
+ return names;
+}
+
+function findDimensionOfType(
+ dimensions: Map<string, ClassifiedDimension>,
+ type: MetricsViewerTabType,
+ requireDefault = false,
+): ClassifiedDimension | null {
+ for (const [, info] of dimensions) {
+ if (info.type === type && (!requireDefault || info.isDefault)) {
+ return info;
+ }
+ }
+ return null;
+}
+
+function findDimensionBySubtype(
+ dimensions: Map<string, ClassifiedDimension>,
+ type: MetricsViewerTabType,
+ getSubtype: (dimension: DimensionMetadata) => string | null,
+ targetSubtype: string,
+): ClassifiedDimension | null {
+ for (const [, info] of dimensions) {
+ if (info.type === type && getSubtype(info.dimension) === targetSubtype) {
+ return info;
+ }
+ }
+ return null;
+}
+
+function pickBestGeoSubtype(found: Set<string>): string | null {
+ for (const subtype of GEO_SUBTYPE_PRIORITY) {
+ if (found.has(subtype)) {
+ return subtype;
+ }
+ }
+ return found.size > 0 ? (found.values().next().value ?? null) : null;
+}
+
+function computeBestSubtypeAcrossSources(
+ dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ type: MetricsViewerTabType,
+ getSubtype: (dimension: DimensionMetadata) => string | null,
+): string | null {
+ const found = new Set<string>();
+
+ for (const [, dimensions] of dimensionsBySource) {
+ for (const [, info] of dimensions) {
+ if (info.type === type) {
+ const subtype = getSubtype(info.dimension);
+ if (subtype) {
+ found.add(subtype);
+ }
+ }
+ }
+ }
+
+ return pickBestGeoSubtype(found);
+}
+
+function findReferenceAcrossSources(
+ dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ sourceOrder: MetricSourceId[],
+ type: MetricsViewerTabType,
+): { sourceId: MetricSourceId; dimension: ClassifiedDimension } | null {
+ for (const sourceId of sourceOrder) {
+ const dimensions = dimensionsBySource.get(sourceId);
+ if (!dimensions) {
+ continue;
+ }
+ const defaultDimension = findDimensionOfType(dimensions, type, true);
+ if (defaultDimension) {
+ return { sourceId, dimension: defaultDimension };
+ }
+ }
+ return null;
+}
+
+function findSourceMatch(
+ dimensions: Map<string, ClassifiedDimension>,
+ type: MetricsViewerTabType,
+ reference: ClassifiedDimension,
+): ClassifiedDimension | null {
+ let nameMatch: ClassifiedDimension | null = null;
+ const referenceName = reference.name;
+
+ for (const [, info] of dimensions) {
+ if (info.type !== type) {
+ continue;
+ }
+ if (LibMetric.isSameSource(info.dimension, reference.dimension)) {
+ return info;
+ }
+ if (!nameMatch && referenceName && info.name === referenceName) {
+ nameMatch = info;
+ }
+ }
+
+ return nameMatch;
+}
+
+function resolveAggregateDimensionMapping(
+ dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ sourceOrder: MetricSourceId[],
+ config: TabTypeDefinition,
+): Record<MetricSourceId, string> {
+ const mapping: Record<MetricSourceId, string> = {};
+
+ if (config.dimensionSubtype) {
+ const targetSubtype = computeBestSubtypeAcrossSources(
+ dimensionsBySource,
+ config.type,
+ config.dimensionSubtype,
+ );
+ if (!targetSubtype) {
+ return mapping;
+ }
+
+ for (const sourceId of sourceOrder) {
+ const dimensions = dimensionsBySource.get(sourceId);
+ if (!dimensions) {
+ continue;
+ }
+ const match = findDimensionBySubtype(
+ dimensions,
+ config.type,
+ config.dimensionSubtype,
+ targetSubtype,
+ );
+ if (match) {
+ mapping[sourceId] = match.id;
+ }
+ }
+
+ return mapping;
+ }
+
+ const reference = findReferenceAcrossSources(
+ dimensionsBySource,
+ sourceOrder,
+ config.type,
+ );
+
+ if (reference) {
+ mapping[reference.sourceId] = reference.dimension.id;
+ }
+
+ for (const sourceId of sourceOrder) {
+ if (mapping[sourceId]) {
+ continue;
+ }
+
+ const dimensions = dimensionsBySource.get(sourceId);
+ if (!dimensions) {
+ continue;
+ }
+
+ const match =
+ findDimensionOfType(dimensions, config.type, true) ??
+ (reference
+ ? findSourceMatch(dimensions, config.type, reference.dimension)
+ : null) ??
+ findDimensionOfType(dimensions, config.type);
+
+ if (match) {
+ mapping[sourceId] = match.id;
+ }
+ }
+
+ return mapping;
+}
+
+function collectUniqueExactDimensions(
+ dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ sourceOrder: MetricSourceId[],
+ type: MetricsViewerTabType,
+): Map<
+ string,
+ { displayName: string; sourceIds: MetricSourceId[]; canListValues: boolean }
+> {
+ const unique = new Map<
+ string,
+ {
+ displayName: string;
+ sourceIds: MetricSourceId[];
+ canListValues: boolean;
+ }
+ >();
+
+ for (const sourceId of sourceOrder) {
+ const dimensions = dimensionsBySource.get(sourceId);
+ if (!dimensions) {
+ continue;
+ }
+
+ for (const [, info] of dimensions) {
+ if (info.type !== type) {
+ continue;
+ }
+
+ const existing = unique.get(info.id);
+ if (existing) {
+ existing.sourceIds.push(sourceId);
+ if (info.canListValues) {
+ existing.canListValues = true;
+ }
+ } else {
+ unique.set(info.id, {
+ displayName: info.displayName,
+ sourceIds: [sourceId],
+ canListValues: info.canListValues ?? false,
+ });
+ }
+ }
+ }
+
+ return unique;
+}
+
+export function computeDefaultTabs(
+ definitionsBySourceId: Record<MetricSourceId, MetricDefinition | null>,
+ sourceOrder: MetricSourceId[],
+): MetricsViewerTabState[] {
+ if (sourceOrder.length === 0) {
+ return [];
+ }
+
+ const dimensionsBySource = classifyDimensionsBySource(
+ definitionsBySourceId,
+ sourceOrder,
+ );
+ if (dimensionsBySource.size === 0) {
+ return [];
+ }
+
+ const tabs: MetricsViewerTabState[] = [];
+
+ for (const config of TAB_TYPE_REGISTRY) {
+ if (!config.autoCreate || tabs.length >= MAX_AUTO_TABS) {
+ continue;
+ }
+
+ if (config.matchMode === "aggregate") {
+ const mapping = resolveAggregateDimensionMapping(
+ dimensionsBySource,
+ sourceOrder,
+ config,
+ );
+ if (Object.keys(mapping).length === 0) {
+ continue;
+ }
+
+ const names = resolveTabDimensionNames(mapping, dimensionsBySource);
+ tabs.push({
+ id: config.fixedId,
+ type: config.type,
+ label: resolveCommonTabLabel(names, config.fixedLabel),
+ display: config.defaultDisplayType,
+ dimensionMapping: mapping,
+ projectionConfig: {},
+ });
+ continue;
+ }
+
+ const uniqueDimensions = collectUniqueExactDimensions(
+ dimensionsBySource,
+ sourceOrder,
+ config.type,
+ );
+
+ const sortedDimensions = [...uniqueDimensions.entries()].sort(
+ ([, infoA], [, infoB]) => {
+ if (infoA.canListValues === infoB.canListValues) {
+ return 0;
+ }
+ return infoA.canListValues ? -1 : 1;
+ },
+ );
+
+ for (const [dimensionId, { displayName, sourceIds }] of sortedDimensions) {
+ if (tabs.length >= MAX_AUTO_TABS) {
+ break;
+ }
+
+ const mapping: Record<MetricSourceId, string> = {};
+ for (const sourceId of sourceIds) {
+ mapping[sourceId] = dimensionId;
+ }
+
+ tabs.push({
+ id: dimensionId,
+ type: config.type,
+ label: displayName,
+ display: config.defaultDisplayType,
+ dimensionMapping: mapping,
+ projectionConfig: {},
+ });
+ }
+ }
+
+ return tabs;
+}
+
+// ── Manual tab creation ──
+
+export function createTabFromDimension(
+ dimensionId: string,
+ definitionsBySourceId: Record<MetricSourceId, MetricDefinition | null>,
+ sourceOrder: MetricSourceId[],
+): MetricsViewerTabState | null {
+ const mapping: Record<MetricSourceId, string> = {};
+ let tabType: MetricsViewerTabType = "category";
+ let displayName: string | null = null;
+
+ for (const sourceId of sourceOrder) {
+ const def = definitionsBySourceId[sourceId];
+ if (!def) {
+ continue;
+ }
+
+ const dimensionInfo = getDimensionsByType(def).get(dimensionId);
+ if (!dimensionInfo) {
+ continue;
+ }
+
+ mapping[sourceId] = dimensionId;
+ tabType = dimensionInfo.type;
+ displayName ??= dimensionInfo.displayName;
+ }
+
+ if (Object.keys(mapping).length === 0) {
+ return null;
+ }
+
+ const display = getTabConfig(tabType).defaultDisplayType;
+
+ return {
+ id: dimensionId,
+ type: tabType,
+ label: displayName ?? dimensionId,
+ display,
+ dimensionMapping: mapping,
+ projectionConfig: {},
+ };
+}
+
+// ── Tab dimension matching ──
+
+function findSubtypeFromExistingTab(
+ tab: StoredMetricsViewerTab,
+ getSubtype: (dimension: DimensionMetadata) => string | null,
+ baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
+): string | null {
+ if (!baseDefinitions) {
+ return null;
+ }
+
+ for (const [sourceId, dimensionName] of getObjectEntries(
+ tab.dimensionsBySource,
+ )) {
+ const def = baseDefinitions[sourceId];
+ if (!def) {
+ continue;
+ }
+ const dimensionInfo = getDimensionsByType(def).get(dimensionName);
+ if (dimensionInfo) {
+ return getSubtype(dimensionInfo.dimension);
+ }
+ }
+
+ return null;
+}
+
+function findBestSubtypeInDimensions(
+ dimensionsByType: Map<string, ClassifiedDimension>,
+ tabType: MetricsViewerTabType,
+ getSubtype: (dimension: DimensionMetadata) => string | null,
+): string | null {
+ const found = new Set<string>();
+
+ for (const [, info] of dimensionsByType) {
+ if (info.type === tabType) {
+ const subtype = getSubtype(info.dimension);
+ if (subtype) {
+ found.add(subtype);
+ }
+ }
+ }
+
+ return pickBestGeoSubtype(found);
+}
+
+function findReferenceFromTab(
+ tab: StoredMetricsViewerTab,
+ type: MetricsViewerTabType,
+ baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
+): ClassifiedDimension | null {
+ if (!baseDefinitions) {
+ return null;
+ }
+
+ for (const [sourceId, dimensionName] of getObjectEntries(
+ tab.dimensionsBySource,
+ )) {
+ const def = baseDefinitions[sourceId];
+ if (!def) {
+ continue;
+ }
+ const dimensionInfo = getDimensionsByType(def).get(dimensionName);
+ if (dimensionInfo && dimensionInfo.type === type) {
+ return dimensionInfo;
+ }
+ }
+
+ return null;
+}
+
+function findDimensionBySourceMatch(
+ dimensionsByType: Map<string, ClassifiedDimension>,
+ reference: ClassifiedDimension,
+ getSubtype?: (dimension: DimensionMetadata) => string | null,
+): string | null {
+ let nameMatch: ClassifiedDimension | null = null;
+
+ for (const [, info] of dimensionsByType) {
+ if (info.type !== reference.type) {
+ continue;
+ }
+ if (LibMetric.isSameSource(info.dimension, reference.dimension)) {
+ return info.id;
+ }
+ if (
+ !nameMatch &&
+ info.name.toLowerCase() === reference.name.toLowerCase()
+ ) {
+ if (
+ !getSubtype ||
+ getSubtype(info.dimension) === getSubtype(reference.dimension)
+ ) {
+ nameMatch = info;
+ }
+ }
+ }
+
+ return nameMatch?.id ?? null;
+}
+
+function resolveSubtypeFallback(
+ dimensionsByType: Map<string, ClassifiedDimension>,
+ tabType: MetricsViewerTabType,
+ getSubtype: (dimension: DimensionMetadata) => string | null,
+ tab: StoredMetricsViewerTab,
+ baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
+): string | null {
+ const targetSubtype =
+ findSubtypeFromExistingTab(tab, getSubtype, baseDefinitions) ??
+ findBestSubtypeInDimensions(dimensionsByType, tabType, getSubtype);
+
+ if (!targetSubtype) {
+ return null;
+ }
+
+ return (
+ findDimensionBySubtype(dimensionsByType, tabType, getSubtype, targetSubtype)
+ ?.id ?? null
+ );
+}
+
+function findExactColumnMatch(
+ dimensions: Map<string, ClassifiedDimension>,
+ tab: StoredMetricsViewerTab,
+ baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
+): string | null {
+ const exactMatch = dimensions.get(tab.id);
+ if (exactMatch?.type === tab.type) {
+ return exactMatch.id;
+ }
+
+ const reference = findReferenceFromTab(tab, tab.type, baseDefinitions);
+ if (reference) {
+ return findDimensionBySourceMatch(dimensions, reference);
+ }
+
+ return null;
+}
+
+function findAggregateMatch(
+ dimensions: Map<string, ClassifiedDimension>,
+ tab: StoredMetricsViewerTab,
+ config: TabTypeDefinition,
+ baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
+): string | null {
+ const reference = findReferenceFromTab(tab, config.type, baseDefinitions);
+
+ const defaultMatch = findDimensionOfType(dimensions, config.type, true);
+ if (defaultMatch) {
+ return defaultMatch.id;
+ }
+
+ if (reference) {
+ const sourceMatch = findDimensionBySourceMatch(
+ dimensions,
+ reference,
+ config.dimensionSubtype,
+ );
+ if (sourceMatch) {
+ return sourceMatch;
+ }
+ }
+
+ if (config.dimensionSubtype) {
+ const subtypeMatch = resolveSubtypeFallback(
+ dimensions,
+ config.type,
+ config.dimensionSubtype,
+ tab,
+ baseDefinitions,
+ );
+ if (subtypeMatch) {
+ return subtypeMatch;
+ }
+ }
+
+ return findDimensionOfType(dimensions, config.type)?.id ?? null;
+}
+
+export function findMatchingDimensionForTab(
+ def: MetricDefinition,
+ tab: StoredMetricsViewerTab,
+ baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
+): string | null {
+ const dimensions = getDimensionsByType(def);
+ const config = TAB_TYPE_REGISTRY.find((config) => config.type === tab.type);
+
+ if (config?.matchMode !== "aggregate") {
+ return findExactColumnMatch(dimensions, tab, baseDefinitions);
+ }
+
+ return findAggregateMatch(dimensions, tab, config, baseDefinitions);
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/tabs.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/tabs.unit.spec.ts
new file mode 100644
index 00000000000..ac2d1202e0b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/tabs.unit.spec.ts
@@ -0,0 +1,157 @@
+import type {
+ AvailableDimension,
+ AvailableDimensionsResult,
+} from "./dimension-picker";
+import { buildDimensionPickerSections } from "./dimension-picker";
+import { resolveCommonTabLabel } from "./tabs";
+
+describe("resolveCommonTabLabel", () => {
+ it("returns fallback for empty array", () => {
+ expect(resolveCommonTabLabel([], "Time")).toBe("Time");
+ });
+
+ it("returns the name when only one is provided", () => {
+ expect(resolveCommonTabLabel(["Created At"], "Time")).toBe("Created At");
+ });
+
+ it("returns the name when all names are identical", () => {
+ expect(resolveCommonTabLabel(["Created At", "Created At"], "Time")).toBe(
+ "Created At",
+ );
+ });
+
+ it("returns the most frequent name", () => {
+ expect(
+ resolveCommonTabLabel(["Created At", "Order Date", "Created At"], "Time"),
+ ).toBe("Created At");
+ });
+
+ it("returns the first name when tied", () => {
+ expect(resolveCommonTabLabel(["State", "Category"], "Location")).toBe(
+ "State",
+ );
+ });
+
+ it("returns the first name when two different names are tied", () => {
+ expect(resolveCommonTabLabel(["Created At", "Order Date"], "Time")).toBe(
+ "Created At",
+ );
+ });
+});
+
+function createMockAvailableDimension(
+ overrides: Partial<AvailableDimension> & { dimensionId: string },
+): AvailableDimension {
+ return {
+ label: overrides.dimensionId,
+ icon: "string",
+ sourceIds: [],
+ tabType: "category",
+ ...overrides,
+ };
+}
+
+describe("buildDimensionPickerSections", () => {
+ it("builds flat sections for a single source without groups", () => {
+ const dimensions: AvailableDimensionsResult = {
+ shared: [],
+ bySource: {
+ "metric:1": [
+ createMockAvailableDimension({
+ dimensionId: "category",
+ label: "Category",
+ }),
+ createMockAvailableDimension({
+ dimensionId: "state",
+ label: "State",
+ }),
+ ],
+ },
+ };
+
+ const sections = buildDimensionPickerSections({
+ availableDimensions: dimensions,
+ sourceOrder: ["metric:1"],
+ sourceDataById: {
+ "metric:1": { type: "metric", name: "Revenue" },
+ },
+ hasMultipleSources: false,
+ });
+
+ expect(sections).toEqual([
+ {
+ name: undefined,
+ items: [
+ expect.objectContaining({
+ name: "Category",
+ dimensionId: "category",
+ }),
+ expect.objectContaining({ name: "State", dimensionId: "state" }),
+ ],
+ },
+ ]);
+ });
+
+ it("splits by source and includes shared section for multiple sources", () => {
+ const sharedDimension = createMockAvailableDimension({
+ dimensionId: "created_at",
+ label: "Created At",
+ sourceIds: ["metric:1", "metric:2"],
+ });
+
+ const dimensions: AvailableDimensionsResult = {
+ shared: [sharedDimension],
+ bySource: {
+ "metric:1": [
+ createMockAvailableDimension({
+ dimensionId: "category",
+ label: "Category",
+ }),
+ ],
+ "metric:2": [
+ createMockAvailableDimension({
+ dimensionId: "status",
+ label: "Status",
+ }),
+ ],
+ },
+ };
+
+ const sections = buildDimensionPickerSections({
+ availableDimensions: dimensions,
+ sourceOrder: ["metric:1", "metric:2"],
+ sourceDataById: {
+ "metric:1": { type: "metric", name: "Revenue" },
+ "metric:2": { type: "metric", name: "Orders" },
+ },
+ hasMultipleSources: true,
+ });
+
+ expect(sections).toEqual([
+ {
+ name: "Shared",
+ items: [
+ expect.objectContaining({
+ name: "Created At",
+ dimensionId: "created_at",
+ }),
+ ],
+ },
+ {
+ name: "Revenue",
+ items: [
+ expect.objectContaining({
+ name: "Category",
+ dimensionId: "category",
+ }),
+ ],
+ },
+ {
+ name: "Orders",
+ items: [
+ expect.objectContaining({ name: "Status", dimensionId: "status" }),
+ ],
+ },
+ ]);
+ });
+});
diff --git a/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts b/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
new file mode 100644
index 00000000000..7bc84cd577b
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
@@ -0,0 +1,329 @@
+import { b64url_to_utf8, utf8_to_b64url } from "metabase/lib/encoding";
+import { getObjectEntries } from "metabase/lib/objects";
+import type { MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { TemporalUnit } from "metabase-types/api";
+
+import type {
+ MetricSourceId,
+ MetricsViewerDisplayType,
+ MetricsViewerPageState,
+ MetricsViewerTabState,
+ MetricsViewerTabType,
+} from "../types/viewer-state";
+
+import { defineCompactSchema } from "./compact-schema";
+import { getEntryBreakout } from "./definition-entries";
+import type { DimensionFilterValue } from "./dimension-filters";
+import { extractDefinitionFilters } from "./dimension-filters";
+
+function reviveFilter(filter: DimensionFilterValue): DimensionFilterValue {
+ if (filter.type === "specific-date" || filter.type === "time") {
+ return {
+ ...filter,
+ values: filter.values.map((value) =>
+ typeof value === "string" ? new Date(value) : value,
+ ),
+ };
+ } else if (filter.type === "number" || filter.type === "coordinate") {
+ return {
+ ...filter,
+ values: filter.values.map((value) =>
+ typeof value === "string" ? BigInt(value) : value,
+ ),
+ };
+ }
+ return filter;
+}
+
+// ── Serialized types (internal, URL-facing) ──
+
+interface SerializedUrlFilter {
+ dimensionId: string;
+ value: DimensionFilterValue;
+}
+
+interface SerializedSource {
+ type: "metric" | "measure";
+ id: number;
+ breakout?: string;
+ breakoutTemporalUnit?: TemporalUnit;
+ breakoutBinning?: string;
+ filters?: SerializedUrlFilter[];
+}
+
+interface SerializedTabDef {
+ definitionId: MetricSourceId;
+ dimensionId?: string;
+}
+
+interface SerializedProjectionConfig {
+ dimensionFilter?: DimensionFilterValue;
+ temporalUnit?: TemporalUnit;
+ binning?: string;
+}
+
+interface SerializedTab {
+ id: string;
+ type: MetricsViewerTabType;
+ label: string;
+ display: MetricsViewerDisplayType;
+ definitions: SerializedTabDef[];
+ projectionConfig?: SerializedProjectionConfig;
+}
+
+export interface SerializedMetricsViewerPageState {
+ sources: SerializedSource[];
+ tabs: SerializedTab[];
+ selectedTabId: string | null;
+}
+
+// ── Conversion functions ──
+
+function definitionToSource(def: MetricDefinition): SerializedSource | null {
+ const metricId = LibMetric.sourceMetricId(def);
+ if (metricId != null) {
+ return { type: "metric", id: metricId };
+ }
+ const measureId = LibMetric.sourceMeasureId(def);
+ if (measureId != null) {
+ return { type: "measure", id: measureId };
+ }
+ return null;
+}
+
+function tabToSerializedTab(tab: MetricsViewerTabState): SerializedTab {
+ const { dimensionFilter, temporalUnit, binningStrategy } =
+ tab.projectionConfig;
+ const hasProjectionConfig =
+ dimensionFilter !== undefined ||
+ temporalUnit !== undefined ||
+ binningStrategy;
+
+ return {
+ id: tab.id,
+ type: tab.type,
+ label: tab.label,
+ display: tab.display,
+ definitions: getObjectEntries(tab.dimensionMapping).map(
+ ([sourceId, dimensionId]) => ({
+ definitionId: sourceId,
+ ...(dimensionId != null ? { dimensionId } : {}),
+ }),
+ ),
+ projectionConfig: hasProjectionConfig
+ ? {
+ dimensionFilter,
+ temporalUnit,
+ binning: binningStrategy,
+ }
+ : undefined,
+ };
+}
+
+export function deserializeTab(
+ serializedTab: SerializedTab,
+): MetricsViewerTabState {
+ const dimensionMapping: Record<MetricSourceId, string | null> = {};
+ for (const serializedDefinition of serializedTab.definitions) {
+ dimensionMapping[serializedDefinition.definitionId] =
+ serializedDefinition.dimensionId ?? null;
+ }
+ return {
+ id: serializedTab.id,
+ type: serializedTab.type,
+ label: serializedTab.label,
+ display: serializedTab.display,
+ dimensionMapping,
+ projectionConfig: {
+ dimensionFilter: serializedTab.projectionConfig?.dimensionFilter,
+ temporalUnit: serializedTab.projectionConfig?.temporalUnit,
+ binningStrategy: serializedTab.projectionConfig?.binning,
+ },
+ };
+}
+
+export function stateToSerializedState(
+ state: MetricsViewerPageState,
+): SerializedMetricsViewerPageState {
+ return {
+ sources: state.definitions.flatMap((entry) => {
+ if (!entry.definition) {
+ return [];
+ }
+ const source = definitionToSource(entry.definition);
+ if (!source) {
+ return [];
+ }
+ const breakoutProjection = getEntryBreakout(entry);
+ if (breakoutProjection) {
+ const rawDim = LibMetric.projectionDimension(
+ entry.definition,
+ breakoutProjection,
+ );
+ if (rawDim) {
+ const dimInfo = LibMetric.dimensionValuesInfo(
+ entry.definition,
+ rawDim,
+ );
+ source.breakout = dimInfo.id;
+
+ if (LibMetric.temporalBucket(breakoutProjection)) {
+ const buckets = LibMetric.availableTemporalBuckets(
+ entry.definition,
+ rawDim,
+ );
+ for (const bucket of buckets) {
+ const info = LibMetric.displayInfo(entry.definition, bucket);
+ if (info.selected) {
+ source.breakoutTemporalUnit = info.shortName;
+ break;
+ }
+ }
+ }
+
+ if (LibMetric.binning(breakoutProjection)) {
+ const strategies = LibMetric.availableBinningStrategies(
+ entry.definition,
+ rawDim,
+ );
+ for (const strategy of strategies) {
+ const info = LibMetric.displayInfo(entry.definition, strategy);
+ if (info.selected) {
+ source.breakoutBinning = info.displayName;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ const definitionFilters = extractDefinitionFilters(entry.definition);
+ if (definitionFilters.length > 0) {
+ source.filters = definitionFilters.map((filter) => ({
+ dimensionId: filter.dimensionId,
+ value: filter.value,
+ }));
+ }
+
+ return [source];
+ }),
+ tabs: state.tabs.map(tabToSerializedTab),
+ selectedTabId: state.selectedTabId,
+ };
+}
+
+// ── Compact schemas ──
+
+const sourceFilterSchema = defineCompactSchema<SerializedUrlFilter>({
+ dimensionId: "d",
+ value: { key: "v" },
+});
+
+const sourceSchema = defineCompactSchema<SerializedSource>({
+ type: "t",
+ id: "i",
+ breakout: { key: "b", optional: true },
+ breakoutTemporalUnit: { key: "u", optional: true },
+ breakoutBinning: { key: "B", optional: true },
+ filters: { key: "F", schema: sourceFilterSchema, optional: true },
+});
+
+const tabDefSchema = defineCompactSchema<SerializedTabDef>({
+ definitionId: "i",
+ dimensionId: { key: "d", optional: true },
+});
+
+const projectionConfigSchema = defineCompactSchema<SerializedProjectionConfig>({
+ dimensionFilter: { key: "f", optional: true },
+ temporalUnit: { key: "u", optional: true },
+ binning: { key: "b", optional: true },
+});
+
+const tabSchema = defineCompactSchema<SerializedTab>({
+ id: "i",
+ type: "t",
+ label: { key: "l", default: "" },
+ display: { key: "d", default: "line" },
+ definitions: { key: "D", schema: tabDefSchema, default: [] },
+ projectionConfig: {
+ key: "p",
+ schema: projectionConfigSchema,
+ optional: true,
+ },
+});
+
+const rootSchema = defineCompactSchema<SerializedMetricsViewerPageState>({
+ sources: { key: "s", schema: sourceSchema, default: [] },
+ tabs: { key: "t", schema: tabSchema, default: [] },
+ selectedTabId: { key: "a", default: null },
+});
+
+// ── Encode / decode ──
+
+function emptyState(): SerializedMetricsViewerPageState {
+ return { sources: [], tabs: [], selectedTabId: null };
+}
+
+// After JSON.parse, Date values are ISO strings. Walk the decoded state and revive them.
+function reviveStateDates(
+ state: SerializedMetricsViewerPageState,
+): SerializedMetricsViewerPageState {
+ return {
+ ...state,
+ sources: state.sources.map((source) =>
+ source.filters
+ ? {
+ ...source,
+ filters: source.filters.map((filter) => ({
+ ...filter,
+ value: reviveFilter(filter.value),
+ })),
+ }
+ : source,
+ ),
+ tabs: state.tabs.map((tab) =>
+ tab.projectionConfig?.dimensionFilter
+ ? {
+ ...tab,
+ projectionConfig: {
+ ...tab.projectionConfig,
+ dimensionFilter: reviveFilter(
+ tab.projectionConfig.dimensionFilter,
+ ),
+ },
+ }
+ : tab,
+ ),
+ };
+}
+
+export function encodeState(
+ state: SerializedMetricsViewerPageState,
+): string | undefined {
+ try {
+ return utf8_to_b64url(
+ JSON.stringify(rootSchema.compact(state), (_, value) =>
+ typeof value === "bigint" ? String(value) : value,
+ ),
+ );
+ } catch (err) {
+ console.error("Failed to encode metrics viewer URL state:", err);
+ return undefined;
+ }
+}
+
+export function decodeState(hash: string): SerializedMetricsViewerPageState {
+ if (!hash) {
+ return emptyState();
+ }
+
+ try {
+ const state =
+ rootSchema.expand(JSON.parse(b64url_to_utf8(hash))) ?? emptyState();
+ return reviveStateDates(state);
+ } catch (err) {
+ console.warn("Failed to decode metrics viewer URL state:", err);
+ return emptyState();
+ }
+}
diff --git a/frontend/src/metabase/metrics-viewer/utils/url-serialization.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/url-serialization.unit.spec.ts
new file mode 100644
index 00000000000..649c017ee4f
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/utils/url-serialization.unit.spec.ts
@@ -0,0 +1,339 @@
+import type { DimensionFilterValue } from "./dimension-filters";
+import {
+ type SerializedMetricsViewerPageState,
+ decodeState,
+ encodeState,
+} from "./url-serialization";
+
+function encodeStateOrThrow(state: SerializedMetricsViewerPageState): string {
+ const result = encodeState(state);
+ if (result === undefined) {
+ throw new Error("encodeState returned undefined unexpectedly");
+ }
+ return result;
+}
+
+describe("url-serialization", () => {
+ describe("encodeState / decodeState round-trip", () => {
+ it("round-trips a state with sources and tabs", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [
+ { type: "metric", id: 1, breakout: "dim-1" },
+ { type: "measure", id: 42 },
+ ],
+ tabs: [
+ {
+ id: "tab-1",
+ type: "time",
+ label: "By Month",
+ display: "bar",
+ definitions: [
+ { definitionId: "metric:1", dimensionId: "created_at" },
+ ],
+ projectionConfig: {
+ temporalUnit: "month",
+ },
+ },
+ ],
+ selectedTabId: "tab-1",
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+
+ it("round-trips a source with breakoutTemporalUnit", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [
+ {
+ type: "metric",
+ id: 1,
+ breakout: "created_at",
+ breakoutTemporalUnit: "year",
+ },
+ ],
+ tabs: [],
+ selectedTabId: null,
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+
+ it("round-trips a source with breakoutBinning", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [
+ {
+ type: "metric",
+ id: 2,
+ breakout: "total",
+ breakoutBinning: "50 bins",
+ },
+ ],
+ tabs: [],
+ selectedTabId: null,
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+
+ it("round-trips a source with both breakoutTemporalUnit and breakoutBinning", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [
+ {
+ type: "metric",
+ id: 3,
+ breakout: "dim-1",
+ breakoutTemporalUnit: "quarter",
+ breakoutBinning: "Auto bin",
+ },
+ ],
+ tabs: [],
+ selectedTabId: null,
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+
+ it("round-trips an empty state", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [],
+ tabs: [],
+ selectedTabId: null,
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+
+ it("round-trips sources with filters", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [
+ {
+ type: "metric",
+ id: 5,
+ filters: [
+ {
+ dimensionId: "category",
+ value: {
+ type: "string",
+ operator: "=",
+ values: ["Gadget", "Widget"],
+ options: {},
+ },
+ },
+ ],
+ },
+ ],
+ tabs: [],
+ selectedTabId: null,
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+ });
+
+ describe("decodeState with empty/invalid input", () => {
+ it("returns empty state for empty string", () => {
+ expect(decodeState("")).toEqual({
+ sources: [],
+ tabs: [],
+ selectedTabId: null,
+ });
+ });
+
+ it("returns empty state for invalid base64", () => {
+ expect(decodeState("!!!not-valid-base64!!!")).toEqual({
+ sources: [],
+ tabs: [],
+ selectedTabId: null,
+ });
+ });
+
+ it("returns empty state for valid base64 but invalid JSON", () => {
+ const hash = btoa("not json");
+ expect(decodeState(hash)).toEqual({
+ sources: [],
+ tabs: [],
+ selectedTabId: null,
+ });
+ });
+
+ it("never returns null", () => {
+ const result = decodeState("");
+ expect(result).not.toBeNull();
+ expect(result).toBeDefined();
+ });
+ });
+
+ describe("Unicode round-trip", () => {
+ it("survives non-ASCII metric labels in tabs", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [{ type: "metric", id: 1 }],
+ tabs: [
+ {
+ id: "tab-1",
+ type: "time",
+ label: "Ré\u00e9venues par mois \u2014 \u00e9t\u00e9",
+ display: "line",
+ definitions: [],
+ },
+ ],
+ selectedTabId: "tab-1",
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+
+ it("survives CJK characters", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [{ type: "metric", id: 1 }],
+ tabs: [
+ {
+ id: "tab-1",
+ type: "category",
+ label: "\u6708\u5225\u58f2\u4e0a",
+ display: "bar",
+ definitions: [],
+ },
+ ],
+ selectedTabId: null,
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+
+ it("survives emoji characters", () => {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [{ type: "metric", id: 1 }],
+ tabs: [
+ {
+ id: "tab-1",
+ type: "time",
+ label: "\ud83d\udcc8 Revenue",
+ display: "line",
+ definitions: [],
+ },
+ ],
+ selectedTabId: null,
+ };
+
+ const hash = encodeStateOrThrow(state);
+ const decoded = decodeState(hash);
+ expect(decoded).toEqual(state);
+ });
+ });
+
+ describe("Date filter revival through encode/decode", () => {
+ function roundTripFilter(filter: DimensionFilterValue) {
+ const state: SerializedMetricsViewerPageState = {
+ sources: [
+ {
+ type: "metric",
+ id: 1,
+ filters: [{ dimensionId: "created_at", value: filter }],
+ },
+ ],
+ tabs: [],
+ selectedTabId: null,
+ };
+ return decodeState(encodeStateOrThrow(state)).sources[0].filters![0]
+ .value;
+ }
+
+ it("revives specific-date Date values after encode/decode", () => {
+ const filter: DimensionFilterValue = {
+ type: "specific-date",
+ operator: "between",
+ values: [
+ new Date("2024-01-01T00:00:00Z"),
+ new Date("2024-12-31T23:59:59Z"),
+ ],
+ hasTime: false,
+ };
+
+ expect(roundTripFilter(filter)).toEqual(filter);
+ });
+
+ it("revives time Date values after encode/decode", () => {
+ const filter: DimensionFilterValue = {
+ type: "time",
+ operator: ">",
+ values: [new Date("2024-06-15T10:30:00Z")],
+ };
+
+ expect(roundTripFilter(filter)).toEqual(filter);
+ });
+
+ it("passes through string filter unchanged", () => {
+ const filter: DimensionFilterValue = {
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ options: {},
+ };
+
+ expect(roundTripFilter(filter)).toEqual(filter);
+ });
+
+ it("passes through relative-date filter unchanged", () => {
+ const filter: DimensionFilterValue = {
+ type: "relative-date",
+ unit: "day",
+ value: -30,
+ offsetUnit: null,
+ offsetValue: null,
+ options: {},
+ };
+
+ expect(roundTripFilter(filter)).toEqual(filter);
+ });
+ });
+
+ describe("BigInt filter revival through encode/decode", () => {
+ it("revives BigInt values in number filters after encode/decode", () => {
+ const filter: DimensionFilterValue = {
+ type: "number",
+ operator: "=",
+ values: [BigInt("9007199254740993"), BigInt("-9007199254740993")],
+ };
+ const state: SerializedMetricsViewerPageState = {
+ sources: [
+ {
+ type: "metric",
+ id: 1,
+ filters: [{ dimensionId: "price", value: filter }],
+ },
+ ],
+ tabs: [],
+ selectedTabId: null,
+ };
+
+ const decoded = decodeState(encodeStateOrThrow(state));
+ expect(decoded.sources[0].filters![0].value).toEqual(filter);
+ });
+ });
+
+ describe("decodeState returns independent objects", () => {
+ it("returns distinct objects for separate calls", () => {
+ const first = decodeState("");
+ const second = decodeState("");
+ expect(first).not.toBe(second);
+ expect(first.sources).not.toBe(second.sources);
+ expect(first.tabs).not.toBe(second.tabs);
+ });
+ });
+});
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/BooleanFilterSection/BooleanFilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/BooleanFilterSection/BooleanFilterSection.tsx
new file mode 100644
index 00000000000..5df1cca842d
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/BooleanFilterSection/BooleanFilterSection.tsx
@@ -0,0 +1,48 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSectionLayout } from "../FilterSectionLayout";
+import type { FilterSectionWidgetProps } from "../types";
+
+export function BooleanFilterSection({
+ definition,
+ filter,
+ onRemove,
+}: FilterSectionWidgetProps) {
+ const filterInfo = useMemo(() => {
+ const filterParts = LibMetric.booleanFilterParts(definition, filter);
+ if (filterParts == null) {
+ return null;
+ }
+ const dimensionInfo = LibMetric.displayInfo(
+ definition,
+ filterParts.dimension,
+ );
+ return { filterParts, dimensionInfo };
+ }, [definition, filter]);
+
+ if (filterInfo == null) {
+ return null;
+ }
+
+ return (
+ <FilterSectionLayout
+ label={filterInfo.dimensionInfo.displayName}
+ onRemove={onRemove}
+ >
+ {getBooleanDisplayValue(filterInfo.filterParts)}
+ </FilterSectionLayout>
+ );
+}
+
+function getBooleanDisplayValue(
+ filterParts: LibMetric.BooleanFilterParts,
+): string {
+ if (filterParts.operator === "=") {
+ return filterParts.values[0] ? t`true` : t`false`;
+ }
+ return Lib.describeFilterOperator(filterParts.operator).toLowerCase();
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/BooleanFilterSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/BooleanFilterSection/index.ts
new file mode 100644
index 00000000000..d5bcbc1249e
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/BooleanFilterSection/index.ts
@@ -0,0 +1 @@
+export { BooleanFilterSection } from "./BooleanFilterSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/CoordinateFilterSection/CoordinateFilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/CoordinateFilterSection/CoordinateFilterSection.tsx
new file mode 100644
index 00000000000..88c21618915
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/CoordinateFilterSection/CoordinateFilterSection.tsx
@@ -0,0 +1,41 @@
+import { useMemo } from "react";
+
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSectionLayout } from "../FilterSectionLayout";
+import type { FilterSectionWidgetProps } from "../types";
+
+export function CoordinateFilterSection({
+ definition,
+ filter,
+ onRemove,
+}: FilterSectionWidgetProps) {
+ const filterInfo = useMemo(() => {
+ const filterParts = LibMetric.coordinateFilterParts(definition, filter);
+ if (filterParts == null) {
+ return null;
+ }
+ const dimensionInfo = LibMetric.displayInfo(
+ definition,
+ filterParts.dimension,
+ );
+ const operatorName = Lib.describeFilterOperator(
+ filterParts.operator,
+ ).toLowerCase();
+ return { filterParts, dimensionInfo, operatorName };
+ }, [definition, filter]);
+
+ if (filterInfo == null) {
+ return null;
+ }
+
+ return (
+ <FilterSectionLayout
+ label={`${filterInfo.dimensionInfo.displayName} ${filterInfo.operatorName}`}
+ onRemove={onRemove}
+ >
+ {filterInfo.filterParts.values.join(", ")}
+ </FilterSectionLayout>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/CoordinateFilterSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/CoordinateFilterSection/index.ts
new file mode 100644
index 00000000000..b3bfa1de6ae
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/CoordinateFilterSection/index.ts
@@ -0,0 +1 @@
+export { CoordinateFilterSection } from "./CoordinateFilterSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/DateFilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/DateFilterSection.tsx
new file mode 100644
index 00000000000..2f3b30ff86d
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/DateFilterSection.tsx
@@ -0,0 +1,40 @@
+import { useMemo } from "react";
+
+import { getDatePickerValue } from "metabase/metrics/utils/dates";
+import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSectionLayout } from "../FilterSectionLayout";
+import type { FilterSectionWidgetProps } from "../types";
+
+export function DateFilterSection({
+ definition,
+ filter,
+ onRemove,
+}: FilterSectionWidgetProps) {
+ const filterInfo = useMemo(() => {
+ const filterParts = LibMetric.filterParts(definition, filter);
+ const filterValue = getDatePickerValue(definition, filter);
+ if (filterParts == null || filterValue == null) {
+ return null;
+ }
+ const dimensionInfo = LibMetric.displayInfo(
+ definition,
+ filterParts.dimension,
+ );
+ return { dimensionInfo, filterValue };
+ }, [definition, filter]);
+
+ if (filterInfo == null) {
+ return null;
+ }
+
+ return (
+ <FilterSectionLayout
+ label={filterInfo.dimensionInfo.displayName}
+ onRemove={onRemove}
+ >
+ {getDateFilterDisplayName(filterInfo.filterValue)}
+ </FilterSectionLayout>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/index.ts
new file mode 100644
index 00000000000..3824b278108
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/DateFilterSection/index.ts
@@ -0,0 +1 @@
+export * from "./DateFilterSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/FilterPanel.tsx b/frontend/src/metabase/metrics/components/FilterPanel/FilterPanel.tsx
new file mode 100644
index 00000000000..63e79a155e8
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/FilterPanel.tsx
@@ -0,0 +1,27 @@
+import { Stack } from "metabase/ui";
+import type * as LibMetric from "metabase-lib/metric";
+
+import { MetricSection } from "./MetricSection";
+
+type FilterPanelProps = {
+ definitions: LibMetric.MetricDefinition[];
+ onRemove: (
+ definition: LibMetric.MetricDefinition,
+ definitionIndex: number,
+ filter: LibMetric.FilterClause,
+ ) => void;
+};
+
+export function FilterPanel({ definitions, onRemove }: FilterPanelProps) {
+ return (
+ <Stack>
+ {definitions.map((definition, definitionIndex) => (
+ <MetricSection
+ key={definitionIndex}
+ definition={definition}
+ onRemove={(filter) => onRemove(definition, definitionIndex, filter)}
+ />
+ ))}
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/FilterSection/FilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/FilterSection/FilterSection.tsx
new file mode 100644
index 00000000000..9e760f4fe83
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/FilterSection/FilterSection.tsx
@@ -0,0 +1,75 @@
+import { useMemo } from "react";
+
+import * as LibMetric from "metabase-lib/metric";
+
+import { BooleanFilterSection } from "../BooleanFilterSection";
+import { CoordinateFilterSection } from "../CoordinateFilterSection";
+import { DateFilterSection } from "../DateFilterSection";
+import { NumberFilterSection } from "../NumberFilterSection";
+import { StringFilterSection } from "../StringFilterSection";
+import { TimeFilterSection } from "../TimeFilterSection";
+
+type FilterSectionProps = {
+ definition: LibMetric.MetricDefinition;
+ filter: LibMetric.FilterClause;
+ onRemove: () => void;
+};
+
+export function FilterSection({
+ definition,
+ filter,
+ onRemove,
+}: FilterSectionProps) {
+ const FilterSectionWidget = useMemo(
+ () => getFilterSection(definition, filter),
+ [definition, filter],
+ );
+
+ if (FilterSectionWidget == null) {
+ return null;
+ }
+
+ return (
+ <FilterSectionWidget
+ definition={definition}
+ filter={filter}
+ onRemove={onRemove}
+ />
+ );
+}
+
+function getFilterSection(
+ definition: LibMetric.MetricDefinition,
+ filter: LibMetric.FilterClause,
+) {
+ const filterParts = LibMetric.filterParts(definition, filter);
+ if (filterParts == null) {
+ return null;
+ }
+
+ if (LibMetric.isStringOrStringLike(filterParts.dimension)) {
+ return StringFilterSection;
+ }
+
+ if (LibMetric.isDateOrDateTime(filterParts.dimension)) {
+ return DateFilterSection;
+ }
+
+ if (LibMetric.isNumeric(filterParts.dimension)) {
+ return NumberFilterSection;
+ }
+
+ if (LibMetric.isBoolean(filterParts.dimension)) {
+ return BooleanFilterSection;
+ }
+
+ if (LibMetric.isCoordinate(filterParts.dimension)) {
+ return CoordinateFilterSection;
+ }
+
+ if (LibMetric.isTime(filterParts.dimension)) {
+ return TimeFilterSection;
+ }
+
+ return null;
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/FilterSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/FilterSection/index.ts
new file mode 100644
index 00000000000..0911f4afab1
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/FilterSection/index.ts
@@ -0,0 +1 @@
+export * from "./FilterSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/FilterSectionLayout.tsx b/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/FilterSectionLayout.tsx
new file mode 100644
index 00000000000..d3837a88604
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/FilterSectionLayout.tsx
@@ -0,0 +1,36 @@
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import { ActionIcon, Box, FixedSizeIcon, Group, Stack } from "metabase/ui";
+
+type FilterSectionLayoutProps = {
+ label: string;
+ children?: ReactNode;
+ onRemove: () => void;
+};
+
+export function FilterSectionLayout({
+ label,
+ children,
+ onRemove,
+}: FilterSectionLayoutProps) {
+ return (
+ <Group
+ p="md"
+ bdrs="md"
+ bg="background-secondary"
+ justify="space-between"
+ wrap="nowrap"
+ >
+ <Stack gap="sm">
+ <Box c="text-secondary" fz="sm" fw="bold">
+ {label}
+ </Box>
+ {children}
+ </Stack>
+ <ActionIcon aria-label={t`Remove`} onClick={onRemove}>
+ <FixedSizeIcon name="close" />
+ </ActionIcon>
+ </Group>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/index.ts
new file mode 100644
index 00000000000..fdb05baa74c
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/index.ts
@@ -0,0 +1 @@
+export * from "./FilterSectionLayout";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/MetricSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/MetricSection.tsx
new file mode 100644
index 00000000000..b444aac28ec
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/MetricSection.tsx
@@ -0,0 +1,43 @@
+import { useMemo } from "react";
+
+import { FixedSizeIcon, Group, Stack } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSection } from "../FilterSection";
+
+import { getMetricIcon, getMetricLabel } from "./utils";
+
+type MetricSectionProps = {
+ definition: LibMetric.MetricDefinition;
+ onRemove: (filter: LibMetric.FilterClause) => void;
+};
+
+export function MetricSection({ definition, onRemove }: MetricSectionProps) {
+ const filters = useMemo(() => LibMetric.filters(definition), [definition]);
+
+ const label = useMemo(() => getMetricLabel(definition), [definition]);
+ const icon = useMemo(() => getMetricIcon(definition), [definition]);
+
+ if (filters.length === 0) {
+ return null;
+ }
+
+ return (
+ <Stack gap="md">
+ <Group>
+ <FixedSizeIcon c="brand" name={icon} />
+ {label}
+ </Group>
+ <Stack gap="sm">
+ {filters.map((filter, filterIndex) => (
+ <FilterSection
+ key={filterIndex}
+ definition={definition}
+ filter={filter}
+ onRemove={() => onRemove(filter)}
+ />
+ ))}
+ </Stack>
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/index.ts
new file mode 100644
index 00000000000..7857bdf59b6
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/index.ts
@@ -0,0 +1 @@
+export * from "./MetricSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/utils.ts b/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/utils.ts
new file mode 100644
index 00000000000..64cf2a4b877
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/MetricSection/utils.ts
@@ -0,0 +1,36 @@
+import type { IconName } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+export function getMetricLabel(
+ definition: LibMetric.MetricDefinition,
+): string | undefined {
+ const metricId = LibMetric.sourceMetricId(definition);
+ if (metricId != null) {
+ const metric = LibMetric.metricMetadata(definition, metricId);
+ const metricInfo =
+ metric != null ? LibMetric.displayInfo(definition, metric) : null;
+ return metricInfo?.displayName;
+ }
+
+ const measureId = LibMetric.sourceMeasureId(definition);
+ if (measureId != null) {
+ const measure = LibMetric.measureMetadata(definition, measureId);
+ const measureInfo =
+ measure != null ? LibMetric.displayInfo(definition, measure) : null;
+ return measureInfo?.displayName;
+ }
+}
+
+export function getMetricIcon(
+ definition: LibMetric.MetricDefinition,
+): IconName {
+ const metricId = LibMetric.sourceMetricId(definition);
+ if (metricId != null) {
+ return "metric";
+ }
+ const measureId = LibMetric.sourceMeasureId(definition);
+ if (measureId != null) {
+ return "ruler";
+ }
+ return "unknown";
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/NumberFilterSection/NumberFilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/NumberFilterSection/NumberFilterSection.tsx
new file mode 100644
index 00000000000..6ce6a604487
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/NumberFilterSection/NumberFilterSection.tsx
@@ -0,0 +1,41 @@
+import { useMemo } from "react";
+
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSectionLayout } from "../FilterSectionLayout";
+import type { FilterSectionWidgetProps } from "../types";
+
+export function NumberFilterSection({
+ definition,
+ filter,
+ onRemove,
+}: FilterSectionWidgetProps) {
+ const filterInfo = useMemo(() => {
+ const filterParts = LibMetric.numberFilterParts(definition, filter);
+ if (filterParts == null) {
+ return null;
+ }
+ const dimensionInfo = LibMetric.displayInfo(
+ definition,
+ filterParts.dimension,
+ );
+ const operatorName = Lib.describeFilterOperator(
+ filterParts.operator,
+ ).toLowerCase();
+ return { filterParts, dimensionInfo, operatorName };
+ }, [definition, filter]);
+
+ if (filterInfo == null) {
+ return null;
+ }
+
+ return (
+ <FilterSectionLayout
+ label={`${filterInfo.dimensionInfo.displayName} ${filterInfo.operatorName}`}
+ onRemove={onRemove}
+ >
+ {filterInfo.filterParts.values.join(", ")}
+ </FilterSectionLayout>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/NumberFilterSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/NumberFilterSection/index.ts
new file mode 100644
index 00000000000..edff565b5cf
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/NumberFilterSection/index.ts
@@ -0,0 +1 @@
+export { NumberFilterSection } from "./NumberFilterSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/StringFilterSection/StringFilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/StringFilterSection/StringFilterSection.tsx
new file mode 100644
index 00000000000..bdae602b5cb
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/StringFilterSection/StringFilterSection.tsx
@@ -0,0 +1,41 @@
+import { useMemo } from "react";
+
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSectionLayout } from "../FilterSectionLayout";
+import type { FilterSectionWidgetProps } from "../types";
+
+export function StringFilterSection({
+ definition,
+ filter,
+ onRemove,
+}: FilterSectionWidgetProps) {
+ const filterInfo = useMemo(() => {
+ const filterParts = LibMetric.stringFilterParts(definition, filter);
+ if (filterParts == null) {
+ return null;
+ }
+ const dimensionInfo = LibMetric.displayInfo(
+ definition,
+ filterParts.dimension,
+ );
+ const operatorName = Lib.describeFilterOperator(
+ filterParts.operator,
+ ).toLowerCase();
+ return { filterParts, dimensionInfo, operatorName };
+ }, [definition, filter]);
+
+ if (filterInfo == null) {
+ return null;
+ }
+
+ return (
+ <FilterSectionLayout
+ label={`${filterInfo.dimensionInfo.displayName} ${filterInfo.operatorName}`}
+ onRemove={onRemove}
+ >
+ {filterInfo.filterParts.values.join(", ")}
+ </FilterSectionLayout>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/StringFilterSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/StringFilterSection/index.ts
new file mode 100644
index 00000000000..be45ee2ebfe
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/StringFilterSection/index.ts
@@ -0,0 +1 @@
+export * from "./StringFilterSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/TimeFilterSection/TimeFilterSection.tsx b/frontend/src/metabase/metrics/components/FilterPanel/TimeFilterSection/TimeFilterSection.tsx
new file mode 100644
index 00000000000..c15fbc2749d
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/TimeFilterSection/TimeFilterSection.tsx
@@ -0,0 +1,44 @@
+import { useMemo } from "react";
+
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSectionLayout } from "../FilterSectionLayout";
+import type { FilterSectionWidgetProps } from "../types";
+
+export function TimeFilterSection({
+ definition,
+ filter,
+ onRemove,
+}: FilterSectionWidgetProps) {
+ const filterInfo = useMemo(() => {
+ const filterParts = LibMetric.timeFilterParts(definition, filter);
+ if (filterParts == null) {
+ return null;
+ }
+ const dimensionInfo = LibMetric.displayInfo(
+ definition,
+ filterParts.dimension,
+ );
+ const operatorName = Lib.describeFilterOperator(
+ filterParts.operator,
+ ).toLowerCase();
+ const formattedValues = filterParts.values
+ .map((date) => date.toLocaleTimeString())
+ .join(", ");
+ return { dimensionInfo, operatorName, formattedValues };
+ }, [definition, filter]);
+
+ if (filterInfo == null) {
+ return null;
+ }
+
+ return (
+ <FilterSectionLayout
+ label={`${filterInfo.dimensionInfo.displayName} ${filterInfo.operatorName}`}
+ onRemove={onRemove}
+ >
+ {filterInfo.formattedValues}
+ </FilterSectionLayout>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/TimeFilterSection/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/TimeFilterSection/index.ts
new file mode 100644
index 00000000000..7724642b37a
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/TimeFilterSection/index.ts
@@ -0,0 +1 @@
+export { TimeFilterSection } from "./TimeFilterSection";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/index.ts b/frontend/src/metabase/metrics/components/FilterPanel/index.ts
new file mode 100644
index 00000000000..298376e6e67
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/index.ts
@@ -0,0 +1 @@
+export * from "./FilterPanel";
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/types.ts b/frontend/src/metabase/metrics/components/FilterPanel/types.ts
new file mode 100644
index 00000000000..cd231ad2e80
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPanel/types.ts
@@ -0,0 +1,7 @@
+import type * as LibMetric from "metabase-lib/metric";
+
+export type FilterSectionWidgetProps = {
+ definition: LibMetric.MetricDefinition;
+ filter: LibMetric.FilterClause;
+ onRemove: () => void;
+};
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
new file mode 100644
index 00000000000..6abcccdce65
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
@@ -0,0 +1,59 @@
+import type { FormEvent } from "react";
+import { useMemo } from "react";
+
+import { BooleanPicker } from "metabase/querying/common/components/BooleanPicker";
+import { Box } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterPickerFooter } from "../FilterPickerFooter";
+import { FilterPickerHeader } from "../FilterPickerHeader";
+import { FILTER_PICKER_WIDTH } from "../constants";
+import type { FilterPickerWidgetProps } from "../types";
+
+import { useBooleanFilter } from "./hooks";
+
+export function BooleanFilterPicker({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ readOnly,
+ onSelect,
+ onBack,
+ onClear,
+}: FilterPickerWidgetProps) {
+ const dimensionInfo = useMemo(
+ () => LibMetric.displayInfo(definition, dimension),
+ [definition, dimension],
+ );
+
+ const { value, getFilterClause, setValue } = useBooleanFilter({
+ definition,
+ dimension,
+ filter,
+ });
+
+ const handleFormSubmit = (event: FormEvent) => {
+ event.preventDefault();
+ onSelect(getFilterClause());
+ };
+
+ return (
+ <Box
+ component="form"
+ miw={FILTER_PICKER_WIDTH}
+ data-testid="boolean-filter-picker"
+ onSubmit={handleFormSubmit}
+ >
+ {onBack && (
+ <FilterPickerHeader
+ dimensionName={dimensionInfo.displayName}
+ onBack={onBack}
+ readOnly={readOnly}
+ />
+ )}
+ <BooleanPicker value={value} withEmptyOptions onChange={setValue} />
+ <FilterPickerFooter isNew={isNew} isValid onClear={onClear} />
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/hooks.ts b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/hooks.ts
new file mode 100644
index 00000000000..daeb15dba94
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/hooks.ts
@@ -0,0 +1,25 @@
+import { useState } from "react";
+
+import type * as LibMetric from "metabase-lib/metric";
+
+import { getFilterClause, getFilterValue } from "./utils";
+
+interface UseBooleanFilterProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+}
+
+export function useBooleanFilter({
+ definition,
+ dimension,
+ filter,
+}: UseBooleanFilterProps) {
+ const [value, setValue] = useState(() => getFilterValue(definition, filter));
+
+ return {
+ value,
+ getFilterClause: () => getFilterClause(dimension, value),
+ setValue,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/index.ts
new file mode 100644
index 00000000000..8f6edf2b54c
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./BooleanFilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/utils.ts
new file mode 100644
index 00000000000..93e626dc4c8
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/BooleanFilterPicker/utils.ts
@@ -0,0 +1,54 @@
+import type { BooleanFilterValue } from "metabase/querying/common/types";
+import * as LibMetric from "metabase-lib/metric";
+
+export function getFilterValue(
+ definition: LibMetric.MetricDefinition,
+ filterClause?: LibMetric.FilterClause,
+): BooleanFilterValue {
+ if (!filterClause) {
+ return "true";
+ }
+
+ const filterParts = LibMetric.booleanFilterParts(definition, filterClause);
+ if (!filterParts) {
+ return "true";
+ }
+
+ if (filterParts.operator === "=") {
+ return filterParts.values[0] ? "true" : "false";
+ } else {
+ return filterParts.operator;
+ }
+}
+
+export function getFilterClause(
+ dimension: LibMetric.DimensionMetadata,
+ value: BooleanFilterValue,
+): LibMetric.FilterClause {
+ switch (value) {
+ case "true":
+ return LibMetric.booleanFilterClause({
+ operator: "=",
+ dimension,
+ values: [true],
+ });
+ case "false":
+ return LibMetric.booleanFilterClause({
+ operator: "=",
+ dimension,
+ values: [false],
+ });
+ case "is-null":
+ return LibMetric.booleanFilterClause({
+ operator: "is-null",
+ dimension,
+ values: [],
+ });
+ case "not-null":
+ return LibMetric.booleanFilterClause({
+ operator: "not-null",
+ dimension,
+ values: [],
+ });
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
new file mode 100644
index 00000000000..3831a1e09e4
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
@@ -0,0 +1,55 @@
+import { useMemo, useState } from "react";
+
+import { checkNotNull } from "metabase/lib/types";
+import { Select, Stack } from "metabase/ui";
+import type * as LibMetric from "metabase-lib/metric";
+
+import {
+ getDimensionOptions,
+ getDimensionPlaceholder,
+ getInitialOption,
+} from "./utils";
+
+interface CoordinateDimensionPickerProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ secondDimension: LibMetric.DimensionMetadata | undefined;
+ availableDimensions: LibMetric.DimensionMetadata[];
+ onSelect: (secondDimension: LibMetric.DimensionMetadata) => void;
+}
+
+export function CoordinateDimensionPicker({
+ definition,
+ dimension,
+ secondDimension,
+ availableDimensions,
+ onSelect,
+}: CoordinateDimensionPickerProps) {
+ const options = useMemo(() => {
+ return getDimensionOptions(definition, availableDimensions);
+ }, [definition, availableDimensions]);
+
+ const [value, setValue] = useState(() => {
+ const option = getInitialOption(definition, options, secondDimension);
+ return option?.value;
+ });
+
+ const handleChange = (value: string | null) => {
+ const option = checkNotNull(
+ options.find((option) => option.value === value),
+ );
+ setValue(option.value);
+ onSelect(option.dimension);
+ };
+
+ return (
+ <Stack p="md" gap="sm">
+ <Select
+ data={options}
+ value={value}
+ placeholder={getDimensionPlaceholder(dimension)}
+ onChange={handleChange}
+ />
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/index.ts
new file mode 100644
index 00000000000..8c9ac45b9b4
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/index.ts
@@ -0,0 +1 @@
+export * from "./CoordinateDimensionPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/types.ts
new file mode 100644
index 00000000000..4df5e3d9d3b
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/types.ts
@@ -0,0 +1,7 @@
+import type * as LibMetric from "metabase-lib/metric";
+
+export type DimensionOption = {
+ dimension: LibMetric.DimensionMetadata;
+ value: string;
+ label: string;
+};
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/utils.ts
new file mode 100644
index 00000000000..2acd64cd18a
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/utils.ts
@@ -0,0 +1,40 @@
+import { t } from "ttag";
+
+import * as LibMetric from "metabase-lib/metric";
+
+import type { DimensionOption } from "./types";
+
+export function getDimensionOptions(
+ definition: LibMetric.MetricDefinition,
+ dimensions: LibMetric.DimensionMetadata[],
+): DimensionOption[] {
+ return dimensions.map((dimension, dimensionIndex) => {
+ const dimensionInfo = LibMetric.displayInfo(definition, dimension);
+ return {
+ dimension,
+ value: String(dimensionIndex),
+ label: dimensionInfo.displayName,
+ };
+ });
+}
+
+export function getInitialOption(
+ definition: LibMetric.MetricDefinition,
+ options: DimensionOption[],
+ secondDimension?: LibMetric.DimensionMetadata,
+) {
+ if (!secondDimension) {
+ return undefined;
+ }
+
+ const dimensionInfo = LibMetric.displayInfo(definition, secondDimension);
+ return options.find((option) => option.label === dimensionInfo?.displayName);
+}
+
+export function getDimensionPlaceholder(
+ dimension: LibMetric.DimensionMetadata,
+) {
+ return LibMetric.isLatitude(dimension)
+ ? t`Select longitude column`
+ : t`Select latitude column`;
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
new file mode 100644
index 00000000000..6ef43f99679
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
@@ -0,0 +1,231 @@
+import type { FormEvent } from "react";
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import { isNotNull } from "metabase/lib/types";
+import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
+import { Box, Flex, Stack, Text } from "metabase/ui";
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterOperatorPicker } from "../FilterOperatorPicker";
+import { FilterPickerFooter } from "../FilterPickerFooter";
+import { FilterPickerHeader } from "../FilterPickerHeader";
+import { NumberFilterValuePicker } from "../FilterValuePicker";
+import { COMBOBOX_PROPS, FILTER_PICKER_WIDTH } from "../constants";
+import type { FilterPickerWidgetProps } from "../types";
+
+import { CoordinateDimensionPicker } from "./CoordinateDimensionPicker";
+import { useCoordinateFilter } from "./hooks";
+import type { NumberOrEmptyValue } from "./types";
+
+export function CoordinateFilterPicker({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ readOnly,
+ allFilterDimensions,
+ onSelect,
+ onBack,
+ onClear,
+}: FilterPickerWidgetProps) {
+ const dimensionInfo = useMemo(
+ () => LibMetric.displayInfo(definition, dimension),
+ [definition, dimension],
+ );
+
+ const {
+ operator,
+ availableOptions,
+ secondDimension,
+ availableDimensions,
+ canPickDimensions,
+ values,
+ valueCount,
+ hasMultipleValues,
+ isValid,
+ getDefaultValues,
+ getFilterClause,
+ setOperator,
+ setSecondDimension,
+ setValues,
+ } = useCoordinateFilter({
+ definition,
+ dimension,
+ filter,
+ });
+
+ const handleOperatorChange = (newOperator: Lib.CoordinateFilterOperator) => {
+ setOperator(newOperator);
+ setValues(getDefaultValues(newOperator, values));
+ };
+
+ const handleFormSubmit = (event: FormEvent) => {
+ event.preventDefault();
+ const filter = getFilterClause(operator, secondDimension, values);
+ if (filter) {
+ onSelect(filter);
+ } else {
+ console.warn(
+ `Missing filter clause for operator: ${operator} and values: ${values}`,
+ );
+ }
+ };
+
+ return (
+ <Box
+ component="form"
+ w={FILTER_PICKER_WIDTH}
+ data-testid="coordinate-filter-picker"
+ onSubmit={handleFormSubmit}
+ >
+ <FilterPickerHeader
+ dimensionName={dimensionInfo.displayName}
+ onBack={onBack}
+ readOnly={readOnly}
+ >
+ <FilterOperatorPicker
+ value={operator}
+ options={availableOptions}
+ onSelect={handleOperatorChange}
+ />
+ </FilterPickerHeader>
+ <Box>
+ {canPickDimensions && (
+ <CoordinateDimensionPicker
+ definition={definition}
+ dimension={dimension}
+ secondDimension={secondDimension}
+ availableDimensions={availableDimensions}
+ onSelect={setSecondDimension}
+ />
+ )}
+ <CoordinateValueInput
+ definition={definition}
+ dimension={dimension}
+ values={values}
+ valueCount={valueCount}
+ hasMultipleValues={hasMultipleValues}
+ allFilterDimensions={allFilterDimensions}
+ onChange={setValues}
+ />
+ <FilterPickerFooter isNew={isNew} isValid={isValid} onClear={onClear} />
+ </Box>
+ </Box>
+ );
+}
+
+interface CoordinateValueInputProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ values: NumberOrEmptyValue[];
+ valueCount: number;
+ hasMultipleValues?: boolean;
+ allFilterDimensions?: LibMetric.DimensionMetadata[];
+ onChange: (values: NumberOrEmptyValue[]) => void;
+}
+
+function CoordinateValueInput({
+ definition,
+ dimension,
+ values,
+ valueCount,
+ hasMultipleValues,
+ allFilterDimensions,
+ onChange,
+}: CoordinateValueInputProps) {
+ if (hasMultipleValues) {
+ return (
+ <Box p="md" mah="25vh" style={{ overflow: "auto" }}>
+ <NumberFilterValuePicker
+ definition={definition}
+ dimension={dimension}
+ values={values.filter(isNotNull)}
+ allFilterDimensions={allFilterDimensions}
+ autoFocus
+ comboboxProps={COMBOBOX_PROPS}
+ onChange={onChange}
+ />
+ </Box>
+ );
+ }
+
+ if (valueCount === 1) {
+ return (
+ <Flex p="md">
+ <BigIntNumberInput
+ value={values[0]}
+ placeholder={t`Enter a number`}
+ autoFocus
+ w="100%"
+ aria-label={t`Filter value`}
+ onChange={(newValue) => onChange([newValue])}
+ />
+ </Flex>
+ );
+ }
+
+ if (valueCount === 2) {
+ return (
+ <Flex align="center" justify="center" p="md">
+ <BigIntNumberInput
+ value={values[0]}
+ placeholder={t`Min`}
+ autoFocus
+ onChange={(newValue) => onChange([newValue, values[1]])}
+ />
+ <Text mx="sm">{t`and`}</Text>
+ <BigIntNumberInput
+ value={values[1]}
+ placeholder={t`Max`}
+ onChange={(newValue) => onChange([values[0], newValue])}
+ />
+ </Flex>
+ );
+ }
+
+ if (valueCount === 4) {
+ return (
+ <Stack align="center" justify="center" gap="sm" p="md">
+ <BigIntNumberInput
+ label={t`Upper latitude`}
+ value={values[0]}
+ placeholder="90"
+ autoFocus
+ onChange={(newValue) =>
+ onChange([newValue, values[1], values[2], values[3]])
+ }
+ />
+ <Flex align="center" justify="center" gap="sm">
+ <BigIntNumberInput
+ label={t`Left longitude`}
+ value={values[1]}
+ placeholder="-180"
+ onChange={(newValue) =>
+ onChange([values[0], newValue, values[2], values[3]])
+ }
+ />
+ <BigIntNumberInput
+ label={t`Right longitude`}
+ value={values[3]}
+ placeholder="180"
+ onChange={(newValue) =>
+ onChange([values[0], values[1], values[2], newValue])
+ }
+ />
+ </Flex>
+ <BigIntNumberInput
+ label={t`Lower latitude`}
+ value={values[2]}
+ placeholder="-90"
+ onChange={(newValue) =>
+ onChange([values[0], values[1], newValue, values[3]])
+ }
+ />
+ </Stack>
+ );
+ }
+
+ return null;
+}
diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/constants.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/constants.ts
rename to frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/hooks.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/hooks.ts
new file mode 100644
index 00000000000..305f74cb897
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/hooks.ts
@@ -0,0 +1,75 @@
+import { useMemo, useState } from "react";
+
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import type { NumberOrEmptyValue } from "./types";
+import {
+ canPickDimensions,
+ getAvailableDimensions,
+ getAvailableOptions,
+ getDefaultOperator,
+ getDefaultSecondDimension,
+ getDefaultValues,
+ getFilterClause,
+ getOptionByOperator,
+ isValidFilter,
+} from "./utils";
+
+interface UseCoordinateFilterProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+}
+
+export function useCoordinateFilter({
+ definition,
+ dimension,
+ filter,
+}: UseCoordinateFilterProps) {
+ const filterParts = useMemo(
+ () => (filter ? LibMetric.coordinateFilterParts(definition, filter) : null),
+ [definition, filter],
+ );
+
+ const availableOptions = useMemo(() => getAvailableOptions(), []);
+
+ const availableDimensions = useMemo(
+ () => getAvailableDimensions(definition, dimension),
+ [definition, dimension],
+ );
+
+ const [operator, setOperator] = useState(
+ filterParts ? filterParts.operator : getDefaultOperator(),
+ );
+ const [values, setValues] = useState(
+ getDefaultValues(operator, filterParts ? filterParts.values : []),
+ );
+ const [secondDimension, setSecondDimension] = useState(
+ getDefaultSecondDimension(availableDimensions, filterParts),
+ );
+
+ const { valueCount, hasMultipleValues } = getOptionByOperator(operator);
+ const isValid = isValidFilter(operator, dimension, secondDimension, values);
+
+ return {
+ operator,
+ availableOptions,
+ values,
+ valueCount,
+ hasMultipleValues,
+ availableDimensions,
+ secondDimension,
+ canPickDimensions: canPickDimensions(operator, availableDimensions),
+ isValid,
+ getDefaultValues,
+ getFilterClause: (
+ operator: Lib.CoordinateFilterOperator,
+ secondDimension: LibMetric.DimensionMetadata | undefined,
+ values: NumberOrEmptyValue[],
+ ) => getFilterClause(operator, dimension, secondDimension, values),
+ setOperator,
+ setValues,
+ setSecondDimension,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/index.ts
new file mode 100644
index 00000000000..2bd1f1a0344
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./CoordinateFilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/types.ts
new file mode 100644
index 00000000000..2b6ce744b22
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/types.ts
@@ -0,0 +1,24 @@
+import type * as Lib from "metabase-lib";
+
+import type { FilterOperatorOption } from "../types";
+
+export type CoordinatePickerOperator =
+ | "="
+ | "!="
+ | ">"
+ | "<"
+ | "between"
+ | "inside"
+ | ">="
+ | "<=";
+
+export type CoordinateFilterOperatorOption =
+ FilterOperatorOption<CoordinatePickerOperator>;
+
+export type CoordinateFilterOperatorInfo = {
+ operator: CoordinatePickerOperator;
+ valueCount: number;
+ hasMultipleValues?: boolean;
+};
+
+export type NumberOrEmptyValue = Lib.NumberFilterValue | null;
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
new file mode 100644
index 00000000000..cf4b9c84b90
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
@@ -0,0 +1,192 @@
+import { isNotNull } from "metabase/lib/types";
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { OPERATORS } from "./constants";
+import type {
+ CoordinateFilterOperatorOption,
+ NumberOrEmptyValue,
+} from "./types";
+
+export function getAvailableOptions(): CoordinateFilterOperatorOption[] {
+ return Object.values(OPERATORS).map(({ operator }) => ({
+ operator,
+ displayName: Lib.describeFilterOperator(operator),
+ }));
+}
+
+export function getOptionByOperator(operator: Lib.CoordinateFilterOperator) {
+ return OPERATORS[operator];
+}
+
+export function getDefaultOperator(): Lib.CoordinateFilterOperator {
+ return "between";
+}
+
+export function getAvailableDimensions(
+ definition: LibMetric.MetricDefinition,
+ dimension: LibMetric.DimensionMetadata,
+) {
+ const isLatitude = LibMetric.isLatitude(dimension);
+ const isLongitude = LibMetric.isLongitude(dimension);
+ return LibMetric.filterableDimensions(definition).filter(
+ (dim) =>
+ (isLatitude && LibMetric.isLongitude(dim)) ||
+ (isLongitude && LibMetric.isLatitude(dim)),
+ );
+}
+
+export function getDefaultSecondDimension(
+ dimensions: LibMetric.DimensionMetadata[],
+ filterParts: LibMetric.CoordinateFilterParts | null,
+): LibMetric.DimensionMetadata | undefined {
+ return filterParts?.longitudeDimension ?? dimensions[0];
+}
+
+export function canPickDimensions(
+ operator: Lib.CoordinateFilterOperator,
+ dimensions: LibMetric.DimensionMetadata[],
+) {
+ return operator === "inside" && dimensions.length > 1;
+}
+
+export function getDefaultValues(
+ operator: Lib.CoordinateFilterOperator,
+ values: NumberOrEmptyValue[],
+): NumberOrEmptyValue[] {
+ const { valueCount, hasMultipleValues } = OPERATORS[operator];
+ if (hasMultipleValues) {
+ return values.filter(isNotNull);
+ }
+
+ return Array(valueCount)
+ .fill(null)
+ .map((value, index) => values[index] ?? value);
+}
+
+export function isValidFilter(
+ operator: Lib.CoordinateFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ secondDimension: LibMetric.DimensionMetadata | undefined,
+ values: NumberOrEmptyValue[],
+) {
+ return getFilterParts(operator, dimension, secondDimension, values) != null;
+}
+
+export function getFilterClause(
+ operator: Lib.CoordinateFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ secondDimension: LibMetric.DimensionMetadata | undefined,
+ values: NumberOrEmptyValue[],
+) {
+ const filterParts = getFilterParts(
+ operator,
+ dimension,
+ secondDimension,
+ values,
+ );
+ return filterParts != null
+ ? LibMetric.coordinateFilterClause(filterParts)
+ : undefined;
+}
+
+function getFilterParts(
+ operator: Lib.CoordinateFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ secondDimension: LibMetric.DimensionMetadata | undefined,
+ values: NumberOrEmptyValue[],
+): LibMetric.CoordinateFilterParts | undefined {
+ switch (operator) {
+ case "between":
+ return getBetweenFilterParts(operator, dimension, values);
+ case "inside":
+ return getInsideFilterParts(operator, dimension, secondDimension, values);
+ default:
+ return getSimpleFilterParts(operator, dimension, values);
+ }
+}
+
+function getSimpleFilterParts(
+ operator: Lib.CoordinateFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: NumberOrEmptyValue[],
+): LibMetric.CoordinateFilterParts | undefined {
+ const { valueCount, hasMultipleValues } = getOptionByOperator(operator);
+ if (!values.every(isNotNull)) {
+ return undefined;
+ }
+ if (hasMultipleValues ? values.length === 0 : values.length !== valueCount) {
+ return undefined;
+ }
+
+ return {
+ operator,
+ dimension,
+ longitudeDimension: null,
+ values: values.filter(isNotNull),
+ };
+}
+
+function getBetweenFilterParts(
+ operator: Lib.CoordinateFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: NumberOrEmptyValue[],
+): LibMetric.CoordinateFilterParts | undefined {
+ const [startValue, endValue] = values;
+ if (isNotNull(startValue) && isNotNull(endValue)) {
+ const minValue = startValue < endValue ? startValue : endValue;
+ const maxValue = startValue < endValue ? endValue : startValue;
+
+ return {
+ operator,
+ dimension,
+ longitudeDimension: null,
+ values: [minValue, maxValue],
+ };
+ } else if (isNotNull(startValue)) {
+ return {
+ operator: ">=",
+ dimension,
+ longitudeDimension: null,
+ values: [startValue],
+ };
+ } else if (isNotNull(endValue)) {
+ return {
+ operator: "<=",
+ dimension,
+ longitudeDimension: null,
+ values: [endValue],
+ };
+ } else {
+ return undefined;
+ }
+}
+
+function getInsideFilterParts(
+ operator: Lib.CoordinateFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ secondDimension: LibMetric.DimensionMetadata | undefined,
+ values: NumberOrEmptyValue[],
+): LibMetric.CoordinateFilterParts | undefined {
+ if (!values.every(isNotNull)) {
+ return undefined;
+ }
+ if (secondDimension == null) {
+ return undefined;
+ }
+
+ const isLatitude = LibMetric.isLatitude(dimension);
+ const [upperLatitude, leftLongitude, lowerLatitude, rightLongitude] = values;
+
+ return {
+ operator,
+ dimension: isLatitude ? dimension : secondDimension,
+ longitudeDimension: isLatitude ? secondDimension : dimension,
+ values: [
+ lowerLatitude < upperLatitude ? upperLatitude : lowerLatitude,
+ leftLongitude < rightLongitude ? leftLongitude : rightLongitude,
+ lowerLatitude < upperLatitude ? lowerLatitude : upperLatitude,
+ leftLongitude < rightLongitude ? rightLongitude : leftLongitude,
+ ],
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
new file mode 100644
index 00000000000..637eeed7e08
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
@@ -0,0 +1,79 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import {
+ getDateFilterClause,
+ getDatePickerUnits,
+ getDatePickerValue,
+} from "metabase/metrics/utils/dates";
+import { DatePicker } from "metabase/querying/common/components/DatePicker";
+import type { DatePickerValue } from "metabase/querying/common/types";
+import { Button, Flex, PopoverBackButton } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterSubmitButton } from "../FilterSubmitButton";
+import type { FilterPickerWidgetProps } from "../types";
+
+export function DateFilterPicker({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ readOnly,
+ onSelect,
+ onBack,
+ onClear,
+}: FilterPickerWidgetProps) {
+ const value = useMemo(() => {
+ return filter ? getDatePickerValue(definition, filter) : undefined;
+ }, [definition, filter]);
+
+ const dimensionInfo = useMemo(() => {
+ return LibMetric.displayInfo(definition, dimension);
+ }, [definition, dimension]);
+
+ const availableUnits = useMemo(() => {
+ return getDatePickerUnits(definition, dimension);
+ }, [definition, dimension]);
+
+ const handleChange = (value: DatePickerValue) => {
+ onSelect(getDateFilterClause(dimension, value));
+ };
+
+ return (
+ <div data-testid="date-filter-picker">
+ <DatePicker
+ value={value}
+ availableUnits={availableUnits}
+ readOnly={readOnly}
+ renderSubmitButton={() => {
+ return (
+ <Flex justify="space-between" w="100%">
+ {onClear ? (
+ <Button variant="subtle" c="text-secondary" onClick={onClear}>
+ {t`Clear`}
+ </Button>
+ ) : (
+ <div />
+ )}
+ <FilterSubmitButton isNew={isNew} />
+ </Flex>
+ );
+ }}
+ renderBackButton={() =>
+ onBack ? (
+ <PopoverBackButton
+ p="sm"
+ onClick={onBack}
+ disabled={readOnly}
+ withArrow={!readOnly}
+ >
+ {dimensionInfo.displayName}
+ </PopoverBackButton>
+ ) : null
+ }
+ onChange={handleChange}
+ />
+ </div>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/index.ts
new file mode 100644
index 00000000000..b22111bdead
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/DateFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./DateFilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
new file mode 100644
index 00000000000..ee6d7820afc
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
@@ -0,0 +1,84 @@
+import type { FormEvent } from "react";
+import { useMemo } from "react";
+
+import { Box, Radio, Stack } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterPickerFooter } from "../FilterPickerFooter";
+import { FilterPickerHeader } from "../FilterPickerHeader";
+import { FILTER_PICKER_WIDTH } from "../constants";
+import type { FilterPickerWidgetProps } from "../types";
+
+import { useDefaultFilter } from "./hooks";
+
+export function DefaultFilterPicker({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ onBack,
+ onClear,
+ onSelect,
+ readOnly,
+}: FilterPickerWidgetProps) {
+ const dimensionInfo = useMemo(
+ () => LibMetric.displayInfo(definition, dimension),
+ [definition, dimension],
+ );
+
+ const { operator, availableOptions, getFilterClause, setOperator } =
+ useDefaultFilter({
+ definition,
+ dimension,
+ filter,
+ hasInitialOperator: true,
+ });
+
+ const handleOperatorChange = (operator: string) => {
+ const option = availableOptions.find(
+ (option) => option.operator === operator,
+ );
+ if (option) {
+ setOperator(option.operator);
+ }
+ };
+
+ const handleFormSubmit = (event: FormEvent) => {
+ event.preventDefault();
+ const filter = getFilterClause(operator);
+ if (filter) {
+ onSelect(filter);
+ }
+ };
+
+ return (
+ <Box
+ component="form"
+ miw={FILTER_PICKER_WIDTH}
+ data-testid="default-filter-picker"
+ onSubmit={handleFormSubmit}
+ >
+ <FilterPickerHeader
+ dimensionName={dimensionInfo.displayName}
+ onBack={onBack}
+ readOnly={readOnly}
+ />
+ <div>
+ <Radio.Group value={operator} onChange={handleOperatorChange}>
+ <Stack p="md" gap="sm">
+ {availableOptions.map((option) => (
+ <Radio
+ key={option.operator}
+ value={option.operator}
+ label={option.displayName}
+ pb={6}
+ size="xs"
+ />
+ ))}
+ </Stack>
+ </Radio.Group>
+ <FilterPickerFooter isNew={isNew} isValid onClear={onClear} />
+ </div>
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/constants.ts b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-default-filter/constants.ts
rename to frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/hooks.ts b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/hooks.ts
new file mode 100644
index 00000000000..97ee19847b0
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/hooks.ts
@@ -0,0 +1,43 @@
+import { useMemo, useState } from "react";
+
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import {
+ getAvailableOptions,
+ getDefaultOperator,
+ getFilterClause,
+} from "./utils";
+
+interface UseDefaultFilterProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+ hasInitialOperator?: boolean;
+}
+
+export function useDefaultFilter({
+ definition,
+ dimension,
+ filter,
+ hasInitialOperator = false,
+}: UseDefaultFilterProps) {
+ const filterParts = useMemo(
+ () => (filter ? LibMetric.defaultFilterParts(definition, filter) : null),
+ [definition, filter],
+ );
+
+ const availableOptions = useMemo(() => getAvailableOptions(), []);
+
+ const [operator, setOperator] = useState(
+ filterParts ? filterParts.operator : getDefaultOperator(hasInitialOperator),
+ );
+
+ return {
+ operator,
+ availableOptions,
+ getFilterClause: (operator: Lib.DefaultFilterOperator | undefined) =>
+ getFilterClause(operator, dimension),
+ setOperator,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/index.ts
new file mode 100644
index 00000000000..649af18af83
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./DefaultFilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/types.ts
new file mode 100644
index 00000000000..dd0fc260d67
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/types.ts
@@ -0,0 +1,10 @@
+import type * as Lib from "metabase-lib";
+
+import type { FilterOperatorOption } from "../types";
+
+export type DefaultFilterOperatorOption =
+ FilterOperatorOption<Lib.DefaultFilterOperator>;
+
+export type DefaultFilterOperatorInfo = {
+ operator: Lib.DefaultFilterOperator;
+};
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/utils.ts
new file mode 100644
index 00000000000..c26f6b24b4c
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/DefaultFilterPicker/utils.ts
@@ -0,0 +1,27 @@
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { OPERATORS } from "./constants";
+import type { DefaultFilterOperatorOption } from "./types";
+
+export function getAvailableOptions(): DefaultFilterOperatorOption[] {
+ return Object.values(OPERATORS).map(({ operator }) => ({
+ operator,
+ displayName: Lib.describeFilterOperator(operator),
+ }));
+}
+
+export function getDefaultOperator(
+ hasInitialOperator: boolean,
+): Lib.DefaultFilterOperator | undefined {
+ return hasInitialOperator ? "is-null" : undefined;
+}
+
+export function getFilterClause(
+ operator: Lib.DefaultFilterOperator | undefined,
+ dimension: LibMetric.DimensionMetadata,
+) {
+ if (operator) {
+ return LibMetric.defaultFilterClause({ operator, dimension });
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/FilterDimensionPicker.module.css b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/FilterDimensionPicker.module.css
new file mode 100644
index 00000000000..3bd7a2442fe
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/FilterDimensionPicker.module.css
@@ -0,0 +1,13 @@
+.dimensionList {
+ max-width: 100%;
+ color: var(--mb-color-brand);
+}
+
+.metricListItem {
+ cursor: pointer;
+ border-radius: var(--mantine-radius-sm);
+
+ &:hover {
+ background-color: var(--mb-color-background-hover);
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/FilterDimensionPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/FilterDimensionPicker.tsx
new file mode 100644
index 00000000000..5082da99cf6
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/FilterDimensionPicker.tsx
@@ -0,0 +1,132 @@
+import { useCallback, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import { AccordionList } from "metabase/common/components/AccordionList";
+import { getDimensionIcon } from "metabase/metrics/utils/dimensions";
+import {
+ Box,
+ Flex,
+ Icon,
+ PopoverBackButton,
+ Text,
+ UnstyledButton,
+} from "metabase/ui";
+import type * as LibMetric from "metabase-lib/metric";
+
+import { FILTER_PICKER_WIDTH } from "../constants";
+
+import S from "./FilterDimensionPicker.module.css";
+import type { DimensionListItem, DimensionSection } from "./types";
+import { getMetricGroups } from "./utils";
+
+interface FilterDimensionPickerProps {
+ definitions: LibMetric.MetricDefinition[];
+ onSelect: (
+ definition: LibMetric.MetricDefinition,
+ definitionIndex: number,
+ dimension: LibMetric.DimensionMetadata,
+ ) => void;
+}
+
+export function FilterDimensionPicker({
+ definitions,
+ onSelect,
+}: FilterDimensionPickerProps) {
+ const [selectedGroupIndex, setSelectedGroupIndex] = useState<number | null>(
+ null,
+ );
+
+ const metricGroups = useMemo(
+ () => getMetricGroups(definitions),
+ [definitions],
+ );
+
+ const handleSelect = useCallback(
+ (item: DimensionListItem) => {
+ onSelect(item.definition, item.definitionIndex, item.dimension);
+ },
+ [onSelect],
+ );
+
+ const renderItemIcon = useCallback((item: DimensionListItem) => {
+ const icon = getDimensionIcon(item.dimension);
+ return <Icon name={icon} size={18} />;
+ }, []);
+
+ if (definitions.length === 0) {
+ return null;
+ }
+
+ if (metricGroups.length === 1) {
+ const group = metricGroups[0];
+ return (
+ <AccordionList<DimensionListItem, DimensionSection>
+ className={S.dimensionList}
+ sections={group.sections}
+ onChange={handleSelect}
+ renderItemName={(item) => item.name}
+ renderItemDescription={() => undefined}
+ renderItemIcon={renderItemIcon}
+ width={FILTER_PICKER_WIDTH}
+ maxHeight={Infinity}
+ itemTestId="dimension-list-item"
+ alwaysExpanded
+ />
+ );
+ }
+
+ if (selectedGroupIndex != null) {
+ const group = metricGroups[selectedGroupIndex];
+ return (
+ <Box>
+ <Box px="md" py="sm">
+ <PopoverBackButton onClick={() => setSelectedGroupIndex(null)}>
+ {group.metricName}
+ </PopoverBackButton>
+ </Box>
+ <AccordionList<DimensionListItem, DimensionSection>
+ className={S.dimensionList}
+ sections={group.sections}
+ onChange={handleSelect}
+ renderItemName={(item) => item.name}
+ renderItemDescription={() => undefined}
+ renderItemIcon={renderItemIcon}
+ width={FILTER_PICKER_WIDTH}
+ maxHeight={Infinity}
+ itemTestId="dimension-list-item"
+ alwaysExpanded
+ />
+ </Box>
+ );
+ }
+
+ return (
+ <Box>
+ <Box px="md" pt="md" pb="sm">
+ <Text fw="bold" fz="lg" c="text-primary">
+ {t`Pick a metric to filter`}
+ </Text>
+ </Box>
+ {metricGroups.map((group, i) => (
+ <UnstyledButton
+ key={i}
+ className={S.metricListItem}
+ w="100%"
+ px="md"
+ py="sm"
+ onClick={() => setSelectedGroupIndex(i)}
+ >
+ <Flex align="center" justify="space-between">
+ <Flex align="center" gap="sm">
+ <Icon name={group.icon} c="brand" />
+ <Text fw="bold" fz="md">
+ {group.metricName}
+ </Text>
+ </Flex>
+ <Icon name="chevronright" c="text-tertiary" />
+ </Flex>
+ </UnstyledButton>
+ ))}
+ </Box>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/index.ts
new file mode 100644
index 00000000000..1c0f1ecda64
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/index.ts
@@ -0,0 +1 @@
+export * from "./FilterDimensionPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/types.ts
new file mode 100644
index 00000000000..b2dbd5dbdca
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/types.ts
@@ -0,0 +1,17 @@
+import type { Section as BaseSection } from "metabase/common/components/AccordionList";
+import type * as LibMetric from "metabase-lib/metric";
+
+export type DimensionListItem = {
+ name: string;
+ definition: LibMetric.MetricDefinition;
+ definitionIndex: number;
+ dimension: LibMetric.DimensionMetadata;
+};
+
+export type DimensionSection = BaseSection<DimensionListItem>;
+
+export type MetricGroup = {
+ metricName: string;
+ icon: "metric" | "ruler";
+ sections: DimensionSection[];
+};
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/utils.ts
new file mode 100644
index 00000000000..800402f9591
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterDimensionPicker/utils.ts
@@ -0,0 +1,69 @@
+import { t } from "ttag";
+
+import * as LibMetric from "metabase-lib/metric";
+
+import type { DimensionListItem, DimensionSection, MetricGroup } from "./types";
+
+export function getMetricGroups(
+ definitions: LibMetric.MetricDefinition[],
+): MetricGroup[] {
+ return definitions.map((definition, definitionIndex) => {
+ const dimensions = LibMetric.filterableDimensions(definition);
+
+ const byGroupId = new Map<
+ string,
+ { groupName: string; items: DimensionListItem[] }
+ >();
+
+ for (const dimension of dimensions) {
+ const info = LibMetric.displayInfo(definition, dimension);
+ const groupId = info.group?.id ?? "";
+ const groupName = info.group?.displayName ?? "";
+ const item: DimensionListItem = {
+ name: info.displayName,
+ definition,
+ definitionIndex,
+ dimension,
+ };
+
+ const entry = byGroupId.get(groupId);
+ if (entry) {
+ entry.items.push(item);
+ } else {
+ byGroupId.set(groupId, { groupName, items: [item] });
+ }
+ }
+
+ const sections: DimensionSection[] = [];
+ if (byGroupId.size <= 1) {
+ const allItems = [...byGroupId.values()].flatMap((g) => g.items);
+ sections.push({ items: allItems });
+ } else {
+ for (const [, { groupName, items }] of byGroupId) {
+ sections.push({ name: groupName, items });
+ }
+ }
+
+ return {
+ metricName: getSectionName(definition),
+ icon: getSectionIcon(definition),
+ sections,
+ };
+ });
+}
+
+export function getSectionName(definition: LibMetric.MetricDefinition): string {
+ const metric = LibMetric.sourceMetricOrMeasureMetadata(definition);
+ if (metric) {
+ const metricInfo = LibMetric.displayInfo(definition, metric);
+ return metricInfo.displayName;
+ }
+ return t`Unknown`;
+}
+
+export function getSectionIcon(
+ definition: LibMetric.MetricDefinition,
+): "metric" | "ruler" {
+ const metricId = LibMetric.sourceMetricId(definition);
+ return metricId != null ? "metric" : "ruler";
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css b/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css
new file mode 100644
index 00000000000..16887e6cfd3
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css
@@ -0,0 +1,3 @@
+.root {
+ flex-shrink: 0;
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
new file mode 100644
index 00000000000..450e99cb88b
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx
@@ -0,0 +1,44 @@
+import { t } from "ttag";
+
+import { Button, Icon, Menu } from "metabase/ui";
+import type * as Lib from "metabase-lib";
+
+import type { FilterOperatorOption } from "../types";
+
+import S from "./FilterOperatorPicker.module.css";
+
+interface FilterOperatorPickerProps<T extends Lib.FilterOperator> {
+ value: T;
+ options: FilterOperatorOption<T>[];
+ onSelect: (operator: T) => void;
+}
+
+export function FilterOperatorPicker<T extends Lib.FilterOperator>({
+ value,
+ options,
+ onSelect,
+}: FilterOperatorPickerProps<T>) {
+ const selectedOption = options.find((option) => option.operator === value);
+
+ return (
+ <Menu>
+ <Menu.Target>
+ <Button
+ fw="normal"
+ rightSection={<Icon name="chevrondown" />}
+ aria-label={t`Filter operator`}
+ className={S.root}
+ >
+ {selectedOption?.displayName ?? t`Select operator`}
+ </Button>
+ </Menu.Target>
+ <Menu.Dropdown>
+ {options.map((option, index) => (
+ <Menu.Item key={index} onClick={() => onSelect(option.operator)}>
+ {option.displayName}
+ </Menu.Item>
+ ))}
+ </Menu.Dropdown>
+ </Menu>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/index.ts
new file mode 100644
index 00000000000..97efa49b6de
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterOperatorPicker/index.ts
@@ -0,0 +1 @@
+export * from "./FilterOperatorPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterPicker.tsx
new file mode 100644
index 00000000000..ee60116010c
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPicker.tsx
@@ -0,0 +1,81 @@
+import { type Ref, forwardRef, useState } from "react";
+import { t } from "ttag";
+
+import { Button, Icon } from "metabase/ui";
+import type * as LibMetric from "metabase-lib/metric";
+
+import { FilterDimensionPicker } from "./FilterDimensionPicker";
+import { FilterPickerBody } from "./FilterPickerBody";
+
+type FilterPickerProps = {
+ definitions: LibMetric.MetricDefinition[];
+ onSelect: (
+ definition: LibMetric.MetricDefinition,
+ definitionIndex: number,
+ filter: LibMetric.FilterClause,
+ ) => void;
+};
+
+export function FilterPicker({ definitions, onSelect }: FilterPickerProps) {
+ const [definition, setDefinition] =
+ useState<LibMetric.MetricDefinition | null>(null);
+ const [definitionIndex, setDefinitionIndex] = useState<number | null>(null);
+ const [dimension, setDimension] =
+ useState<LibMetric.DimensionMetadata | null>(null);
+
+ const handleDimensionSelect = (
+ definition: LibMetric.MetricDefinition,
+ definitionIndex: number,
+ dimension: LibMetric.DimensionMetadata,
+ ) => {
+ setDefinition(definition);
+ setDefinitionIndex(definitionIndex);
+ setDimension(dimension);
+ };
+
+ const handleFilterSelect = (filter: LibMetric.FilterClause) => {
+ if (definition == null || definitionIndex == null) {
+ return;
+ }
+ onSelect(definition, definitionIndex, filter);
+ };
+
+ const handleBack = () => {
+ setDefinition(null);
+ setDimension(null);
+ };
+
+ if (!definition || !dimension) {
+ return (
+ <FilterDimensionPicker
+ definitions={definitions}
+ onSelect={handleDimensionSelect}
+ />
+ );
+ }
+
+ return (
+ <FilterPickerBody
+ definition={definition}
+ dimension={dimension}
+ isNew
+ onSelect={handleFilterSelect}
+ onBack={handleBack}
+ />
+ );
+}
+
+type FilterPickerButtonProps = {
+ onClick?: () => void;
+};
+
+export const FilterPickerButton = forwardRef(function FilterPickerButton(
+ { onClick }: FilterPickerButtonProps,
+ ref: Ref<HTMLButtonElement>,
+) {
+ return (
+ <Button ref={ref} leftSection={<Icon name="filter" />} onClick={onClick}>
+ {t`Filter`}
+ </Button>
+ );
+});
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/FilterPickerBody.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/FilterPickerBody.tsx
new file mode 100644
index 00000000000..518d0ea7185
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/FilterPickerBody.tsx
@@ -0,0 +1,76 @@
+import { Box } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+import { BooleanFilterPicker } from "../BooleanFilterPicker";
+import { CoordinateFilterPicker } from "../CoordinateFilterPicker";
+import { DateFilterPicker } from "../DateFilterPicker";
+import { DefaultFilterPicker } from "../DefaultFilterPicker";
+import { NumberFilterPicker } from "../NumberFilterPicker";
+import { StringFilterPicker } from "../StringFilterPicker";
+import { TimeFilterPicker } from "../TimeFilterPicker";
+
+interface FilterPickerBodyProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+ isNew?: boolean;
+ readOnly?: boolean;
+ allFilterDimensions?: LibMetric.DimensionMetadata[];
+ onSelect: (filter: LibMetric.FilterClause) => void;
+ onBack?: () => void;
+ onClear?: () => void;
+}
+
+export function FilterPickerBody({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ readOnly,
+ allFilterDimensions,
+ onSelect,
+ onBack,
+ onClear,
+}: FilterPickerBodyProps) {
+ const FilterWidget = getFilterWidget(dimension);
+ if (!FilterWidget) {
+ return null;
+ }
+
+ return (
+ <Box>
+ <FilterWidget
+ definition={definition}
+ dimension={dimension}
+ filter={filter}
+ isNew={isNew}
+ readOnly={readOnly}
+ allFilterDimensions={allFilterDimensions}
+ onSelect={onSelect}
+ onBack={onBack}
+ onClear={onClear}
+ />
+ </Box>
+ );
+}
+
+function getFilterWidget(dimension: LibMetric.DimensionMetadata) {
+ if (LibMetric.isBoolean(dimension)) {
+ return BooleanFilterPicker;
+ }
+ if (LibMetric.isTime(dimension)) {
+ return TimeFilterPicker;
+ }
+ if (LibMetric.isDateOrDateTime(dimension)) {
+ return DateFilterPicker;
+ }
+ if (LibMetric.isNumeric(dimension)) {
+ return LibMetric.isCoordinate(dimension)
+ ? CoordinateFilterPicker
+ : NumberFilterPicker;
+ }
+ if (LibMetric.isStringOrStringLike(dimension)) {
+ return StringFilterPicker;
+ }
+ return DefaultFilterPicker;
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/index.ts
new file mode 100644
index 00000000000..f9e6cb0bf98
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerBody/index.ts
@@ -0,0 +1 @@
+export * from "./FilterPickerBody";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.module.css b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.module.css
new file mode 100644
index 00000000000..13491293948
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.module.css
@@ -0,0 +1,5 @@
+.FilterFooterRoot {
+ &:not(:only-child) {
+ border-top: 1px solid var(--mb-color-border);
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
new file mode 100644
index 00000000000..4dcadaef1ac
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/FilterPickerFooter.tsx
@@ -0,0 +1,38 @@
+import type { ReactNode } from "react";
+import { isValidElement } from "react";
+import { t } from "ttag";
+
+import { Box, Button, Flex } from "metabase/ui";
+
+import { FilterSubmitButton } from "../FilterSubmitButton";
+
+import S from "./FilterPickerFooter.module.css";
+
+interface FilterPickerFooterProps {
+ isNew?: boolean;
+ isValid: boolean;
+ onClear?: () => void;
+ children?: ReactNode;
+}
+
+export function FilterPickerFooter({
+ isNew,
+ isValid,
+ onClear,
+ children,
+}: FilterPickerFooterProps) {
+ return (
+ <Flex className={S.FilterFooterRoot} p="md" justify="space-between">
+ {onClear ? (
+ <Button variant="subtle" c="text-secondary" onClick={onClear}>
+ {t`Clear`}
+ </Button>
+ ) : isValidElement(children) ? (
+ children
+ ) : (
+ <Box />
+ )}
+ <FilterSubmitButton isNew={isNew} isDisabled={!isValid} />
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/index.ts
new file mode 100644
index 00000000000..cdeacde586e
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerFooter/index.ts
@@ -0,0 +1 @@
+export * from "./FilterPickerFooter";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
new file mode 100644
index 00000000000..8b6ba44ea5f
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
@@ -0,0 +1,33 @@
+import type { ReactNode } from "react";
+
+import { Flex, PopoverBackButton } from "metabase/ui";
+
+interface FilterPickerHeaderProps {
+ dimensionName: string;
+ children?: ReactNode;
+ readOnly?: boolean;
+ onBack?: () => void;
+}
+
+export function FilterPickerHeader({
+ dimensionName,
+ children,
+ readOnly,
+ onBack,
+}: FilterPickerHeaderProps) {
+ return (
+ <Flex px="md" pt="md" justify="space-between">
+ {onBack && (
+ <PopoverBackButton
+ pr="md"
+ onClick={onBack}
+ disabled={readOnly}
+ withArrow={!readOnly}
+ >
+ {dimensionName}
+ </PopoverBackButton>
+ )}
+ {children}
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/index.ts
new file mode 100644
index 00000000000..79f092780c1
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterPickerHeader/index.ts
@@ -0,0 +1 @@
+export * from "./FilterPickerHeader";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
new file mode 100644
index 00000000000..f32d78e548c
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/FilterSubmitButton.tsx
@@ -0,0 +1,19 @@
+import { t } from "ttag";
+
+import { Button } from "metabase/ui";
+
+type FilterSubmitButtonProps = {
+ isNew?: boolean;
+ isDisabled?: boolean;
+};
+
+export function FilterSubmitButton({
+ isNew,
+ isDisabled,
+}: FilterSubmitButtonProps) {
+ return (
+ <Button type="submit" variant="filled" disabled={isDisabled}>
+ {isNew ? t`Add filter` : t`Update filter`}
+ </Button>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/index.ts
new file mode 100644
index 00000000000..9e670b90632
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterSubmitButton/index.ts
@@ -0,0 +1 @@
+export * from "./FilterSubmitButton";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
new file mode 100644
index 00000000000..18ab4c19cee
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
@@ -0,0 +1,180 @@
+import { skipToken } from "@reduxjs/toolkit/query/react";
+import { useMemo } from "react";
+
+import {
+ useGetMeasureDimensionValuesQuery,
+ useGetMetricDimensionValuesQuery,
+ useGetRemappedMeasureDimensionValueQuery,
+ useGetRemappedMetricDimensionValueQuery,
+ useSearchMeasureDimensionValuesQuery,
+ useSearchMetricDimensionValuesQuery,
+} from "metabase/api";
+import { parseNumber } from "metabase/lib/number";
+import {
+ FieldValuePicker,
+ type UseGetFieldValuesArgs,
+ type UseGetFieldValuesResult,
+ type UseGetRemappedFieldValueArgs,
+ type UseGetRemappedFieldValueResult,
+ type UseSearchFieldValuesArgs,
+ type UseSearchFieldValuesResult,
+} from "metabase/querying/common/components/FieldValuePicker";
+import type { ComboboxProps } from "metabase/ui";
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { canListAllFilterDimensions, getStaticPlaceholder } from "./utils";
+
+type FilterValuePickerProps<T> = {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ values: T[];
+ autoFocus?: boolean;
+ allFilterDimensions?: LibMetric.DimensionMetadata[];
+ comboboxProps?: ComboboxProps;
+ onChange: (newValues: T[]) => void;
+};
+
+type FilterValuePickerOwnProps = {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ values: string[];
+ autoFocus?: boolean;
+ allFilterDimensions?: LibMetric.DimensionMetadata[];
+ comboboxProps?: ComboboxProps;
+ parseValue?: (rawValue: string) => string | null;
+ onChange: (newValues: string[]) => void;
+};
+
+function FilterValuePicker({
+ definition,
+ dimension,
+ values,
+ autoFocus,
+ allFilterDimensions,
+ comboboxProps,
+ parseValue,
+ onChange,
+}: FilterValuePickerOwnProps) {
+ const metricId = LibMetric.sourceMetricId(definition);
+ const measureId = LibMetric.sourceMeasureId(definition);
+
+ const dimensionInfo = useMemo(
+ () => LibMetric.dimensionValuesInfo(definition, dimension),
+ [definition, dimension],
+ );
+
+ const canListValues = useMemo(
+ () =>
+ canListAllFilterDimensions(definition, dimension, allFilterDimensions),
+ [definition, dimension, allFilterDimensions],
+ );
+ const { canSearchValues, canRemapValues } = dimensionInfo;
+
+ const useGetFieldValues = ({
+ skip,
+ }: UseGetFieldValuesArgs): UseGetFieldValuesResult => {
+ const metricResult = useGetMetricDimensionValuesQuery(
+ metricId == null || skip
+ ? skipToken
+ : { metricId, dimensionId: dimensionInfo.id },
+ );
+
+ const measureResult = useGetMeasureDimensionValuesQuery(
+ measureId == null || metricId != null || skip
+ ? skipToken
+ : { measureId, dimensionId: dimensionInfo.id },
+ );
+
+ return metricId != null ? metricResult : measureResult;
+ };
+
+ const useSearchFieldValues = ({
+ value,
+ limit,
+ skip,
+ }: UseSearchFieldValuesArgs): UseSearchFieldValuesResult => {
+ const metricResult = useSearchMetricDimensionValuesQuery(
+ metricId == null || skip
+ ? skipToken
+ : { metricId, dimensionId: dimensionInfo.id, query: value, limit },
+ );
+
+ const measureResult = useSearchMeasureDimensionValuesQuery(
+ measureId == null || metricId != null || skip
+ ? skipToken
+ : { measureId, dimensionId: dimensionInfo.id, query: value, limit },
+ );
+
+ return metricId != null ? metricResult : measureResult;
+ };
+
+ const useGetRemappedFieldValue = ({
+ value,
+ skip,
+ }: UseGetRemappedFieldValueArgs): UseGetRemappedFieldValueResult => {
+ const metricResult = useGetRemappedMetricDimensionValueQuery(
+ metricId == null || skip
+ ? skipToken
+ : { metricId, dimensionId: dimensionInfo.id, value },
+ );
+
+ const measureResult = useGetRemappedMeasureDimensionValueQuery(
+ measureId == null || metricId != null || skip
+ ? skipToken
+ : { measureId, dimensionId: dimensionInfo.id, value },
+ );
+
+ return metricId != null ? metricResult : measureResult;
+ };
+
+ return (
+ <FieldValuePicker
+ values={values}
+ placeholder={getStaticPlaceholder(dimension)}
+ autoFocus={autoFocus}
+ canListValues={canListValues}
+ canSearchValues={canSearchValues}
+ canRemapValues={canRemapValues}
+ comboboxProps={comboboxProps}
+ parseValue={parseValue}
+ useGetFieldValues={useGetFieldValues}
+ useSearchFieldValues={useSearchFieldValues}
+ useGetRemappedFieldValue={useGetRemappedFieldValue}
+ onChange={onChange}
+ />
+ );
+}
+
+type StringFilterValuePickerProps = FilterValuePickerProps<string>;
+
+export function StringFilterValuePicker(props: StringFilterValuePickerProps) {
+ return <FilterValuePicker {...props} />;
+}
+
+type NumberFilterValuePickerProps =
+ FilterValuePickerProps<Lib.NumberFilterValue>;
+
+export function NumberFilterValuePicker({
+ values,
+ onChange,
+ ...props
+}: NumberFilterValuePickerProps) {
+ const parseValue = (rawValue: string) => {
+ const number = parseNumber(rawValue);
+ return number != null ? String(number) : null;
+ };
+
+ const handleChange = (newValues: string[]) => {
+ onChange(newValues.map(parseNumber).filter((value) => value != null));
+ };
+
+ return (
+ <FilterValuePicker
+ {...props}
+ values={values.map(String)}
+ parseValue={parseValue}
+ onChange={handleChange}
+ />
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/index.ts
new file mode 100644
index 00000000000..54da8031788
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/index.ts
@@ -0,0 +1 @@
+export * from "./FilterValuePicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/utils.ts
new file mode 100644
index 00000000000..bc579c55091
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/utils.ts
@@ -0,0 +1,53 @@
+import { t } from "ttag";
+
+import * as LibMetric from "metabase-lib/metric";
+
+export function getStaticPlaceholder(dimension: LibMetric.DimensionMetadata) {
+ const isID =
+ LibMetric.isPrimaryKey(dimension) || LibMetric.isForeignKey(dimension);
+ const isNumeric = LibMetric.isNumeric(dimension);
+
+ if (isID) {
+ return t`Enter an ID`;
+ } else if (isNumeric) {
+ return t`Enter a number`;
+ } else {
+ return t`Enter some text`;
+ }
+}
+
+export function getSearchPlaceholder(
+ dimension: LibMetric.DimensionMetadata,
+ searchColumnName: string,
+) {
+ const isID =
+ LibMetric.isPrimaryKey(dimension) || LibMetric.isForeignKey(dimension);
+
+ if (isID) {
+ return t`Search by ${searchColumnName} or enter an ID`;
+ } else {
+ return t`Search by ${searchColumnName}`;
+ }
+}
+
+export function getNothingFoundMessage(searchColumnName: string) {
+ return t`No matching ${searchColumnName} found.`;
+}
+
+export function canListAllFilterDimensions(
+ definition: LibMetric.MetricDefinition,
+ dimension: LibMetric.DimensionMetadata,
+ allFilterDimensions: LibMetric.DimensionMetadata[] | undefined,
+): boolean {
+ const ownInfo = LibMetric.dimensionValuesInfo(definition, dimension);
+ if (!ownInfo.canListValues) {
+ return false;
+ }
+ if (!allFilterDimensions || allFilterDimensions.length <= 1) {
+ return true;
+ }
+ const first = allFilterDimensions[0];
+ return allFilterDimensions.every((other) =>
+ LibMetric.isSameSource(first, other),
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
new file mode 100644
index 00000000000..1e85c6d237b
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
@@ -0,0 +1,171 @@
+import type { FormEvent } from "react";
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import { isNotNull } from "metabase/lib/types";
+import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
+import { Box, Flex, Text } from "metabase/ui";
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterOperatorPicker } from "../FilterOperatorPicker";
+import { FilterPickerFooter } from "../FilterPickerFooter";
+import { FilterPickerHeader } from "../FilterPickerHeader";
+import { NumberFilterValuePicker } from "../FilterValuePicker";
+import { COMBOBOX_PROPS, FILTER_PICKER_WIDTH } from "../constants";
+import type { FilterPickerWidgetProps } from "../types";
+
+import { useNumberFilter } from "./hooks";
+import type { NumberOrEmptyValue } from "./types";
+
+export function NumberFilterPicker({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ readOnly,
+ allFilterDimensions,
+ onSelect,
+ onBack,
+ onClear,
+}: FilterPickerWidgetProps) {
+ const dimensionInfo = useMemo(
+ () => LibMetric.displayInfo(definition, dimension),
+ [definition, dimension],
+ );
+
+ const {
+ operator,
+ availableOptions,
+ values,
+ valueCount,
+ hasMultipleValues,
+ isValid,
+ getDefaultValues,
+ getFilterClause,
+ setOperator,
+ setValues,
+ } = useNumberFilter({
+ definition,
+ dimension,
+ filter,
+ });
+
+ const handleOperatorChange = (newOperator: Lib.NumberFilterOperator) => {
+ setOperator(newOperator);
+ setValues(getDefaultValues(newOperator, values));
+ };
+
+ const handleFormSubmit = (event: FormEvent) => {
+ event.preventDefault();
+ const filter = getFilterClause(operator, values);
+ if (filter) {
+ onSelect(filter);
+ }
+ };
+
+ return (
+ <Box
+ component="form"
+ w={FILTER_PICKER_WIDTH}
+ data-testid="number-filter-picker"
+ onSubmit={handleFormSubmit}
+ >
+ <FilterPickerHeader
+ dimensionName={dimensionInfo.displayName}
+ onBack={onBack}
+ readOnly={readOnly}
+ >
+ <FilterOperatorPicker
+ value={operator}
+ options={availableOptions}
+ onSelect={handleOperatorChange}
+ />
+ </FilterPickerHeader>
+ <div>
+ <NumberValueInput
+ definition={definition}
+ dimension={dimension}
+ values={values}
+ valueCount={valueCount}
+ hasMultipleValues={hasMultipleValues}
+ allFilterDimensions={allFilterDimensions}
+ onChange={setValues}
+ />
+ <FilterPickerFooter isNew={isNew} isValid={isValid} onClear={onClear} />
+ </div>
+ </Box>
+ );
+}
+
+interface NumberValueInputProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ values: NumberOrEmptyValue[];
+ valueCount: number;
+ hasMultipleValues?: boolean;
+ allFilterDimensions?: LibMetric.DimensionMetadata[];
+ onChange: (values: NumberOrEmptyValue[]) => void;
+}
+
+function NumberValueInput({
+ definition,
+ dimension,
+ values,
+ valueCount,
+ hasMultipleValues,
+ allFilterDimensions,
+ onChange,
+}: NumberValueInputProps) {
+ if (hasMultipleValues) {
+ return (
+ <Box p="md" mah="25vh" style={{ overflow: "auto" }}>
+ <NumberFilterValuePicker
+ definition={definition}
+ dimension={dimension}
+ values={values.filter(isNotNull)}
+ allFilterDimensions={allFilterDimensions}
+ autoFocus
+ comboboxProps={COMBOBOX_PROPS}
+ onChange={onChange}
+ />
+ </Box>
+ );
+ }
+
+ if (valueCount === 1) {
+ return (
+ <Flex p="md">
+ <BigIntNumberInput
+ value={values[0]}
+ placeholder={t`Enter a number`}
+ autoFocus
+ w="100%"
+ aria-label={t`Filter value`}
+ onChange={(newValue) => onChange([newValue])}
+ />
+ </Flex>
+ );
+ }
+
+ if (valueCount === 2) {
+ return (
+ <Flex align="center" justify="center" p="md">
+ <BigIntNumberInput
+ value={values[0]}
+ placeholder={t`Min`}
+ autoFocus
+ onChange={(newValue) => onChange([newValue, values[1]])}
+ />
+ <Text mx="sm">{t`and`}</Text>
+ <BigIntNumberInput
+ value={values[1]}
+ placeholder={t`Max`}
+ onChange={(newValue) => onChange([values[0], newValue])}
+ />
+ </Flex>
+ );
+ }
+
+ return null;
+}
diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/constants.ts b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-number-filter/constants.ts
rename to frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/hooks.ts b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/hooks.ts
new file mode 100644
index 00000000000..6b9b8707af3
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/hooks.ts
@@ -0,0 +1,65 @@
+import { useMemo, useState } from "react";
+
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import type { NumberOrEmptyValue } from "./types";
+import {
+ getAvailableOptions,
+ getDefaultOperator,
+ getDefaultValues,
+ getFilterClause,
+ getOptionByOperator,
+ isValidFilter,
+} from "./utils";
+
+interface UseNumberFilterProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+}
+
+export function useNumberFilter({
+ definition,
+ dimension,
+ filter,
+}: UseNumberFilterProps) {
+ const filterParts = useMemo(
+ () => (filter ? LibMetric.numberFilterParts(definition, filter) : null),
+ [definition, filter],
+ );
+
+ const availableOptions = useMemo(
+ () => getAvailableOptions(dimension),
+ [dimension],
+ );
+
+ const [operator, setOperator] = useState(() =>
+ filterParts
+ ? filterParts.operator
+ : getDefaultOperator(definition, dimension),
+ );
+
+ const [values, setValues] = useState(() =>
+ getDefaultValues(operator, filterParts ? filterParts.values : []),
+ );
+
+ const { valueCount, hasMultipleValues } = getOptionByOperator(operator);
+ const isValid = isValidFilter(operator, dimension, values);
+
+ return {
+ operator,
+ availableOptions,
+ values,
+ valueCount,
+ hasMultipleValues,
+ isValid,
+ getDefaultValues,
+ getFilterClause: (
+ operator: Lib.NumberFilterOperator,
+ values: NumberOrEmptyValue[],
+ ) => getFilterClause(operator, dimension, values),
+ setOperator,
+ setValues,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/index.ts
new file mode 100644
index 00000000000..8b8179066dc
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./NumberFilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/types.ts
new file mode 100644
index 00000000000..816b34e8e55
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/types.ts
@@ -0,0 +1,14 @@
+import type * as Lib from "metabase-lib";
+
+import type { FilterOperatorOption } from "../types";
+
+export type NumberFilterOperatorOption =
+ FilterOperatorOption<Lib.NumberFilterOperator>;
+
+export type NumberFilterOperatorInfo = {
+ operator: Lib.NumberFilterOperator;
+ valueCount: number;
+ hasMultipleValues?: boolean;
+};
+
+export type NumberOrEmptyValue = Lib.NumberFilterValue | null;
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
new file mode 100644
index 00000000000..3d99870c6cf
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
@@ -0,0 +1,133 @@
+import { isNotNull } from "metabase/lib/types";
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { OPERATORS } from "./constants";
+import type { NumberFilterOperatorOption, NumberOrEmptyValue } from "./types";
+
+export function getAvailableOptions(
+ dimension: LibMetric.DimensionMetadata,
+): NumberFilterOperatorOption[] {
+ const isKey =
+ LibMetric.isPrimaryKey(dimension) || LibMetric.isForeignKey(dimension);
+ const variant = isKey ? "default" : "number";
+
+ return Object.values(OPERATORS).map(({ operator }) => ({
+ operator,
+ displayName: Lib.describeFilterOperator(operator, variant),
+ }));
+}
+
+export function getOptionByOperator(operator: Lib.NumberFilterOperator) {
+ return OPERATORS[operator];
+}
+
+export function getDefaultOperator(
+ definition: LibMetric.MetricDefinition,
+ dimension: LibMetric.DimensionMetadata,
+): Lib.NumberFilterOperator {
+ const dimensionInfo = LibMetric.dimensionValuesInfo(definition, dimension);
+
+ return LibMetric.isPrimaryKey(dimension) ||
+ LibMetric.isForeignKey(dimension) ||
+ dimensionInfo.canListValues ||
+ dimensionInfo.canSearchValues
+ ? "="
+ : "between";
+}
+
+export function getDefaultValues(
+ operator: Lib.NumberFilterOperator,
+ values: NumberOrEmptyValue[],
+): NumberOrEmptyValue[] {
+ const { valueCount, hasMultipleValues } = OPERATORS[operator];
+ if (hasMultipleValues) {
+ return values.filter(isNotNull);
+ }
+
+ return Array(valueCount)
+ .fill(null)
+ .map((value, index) => values[index] ?? value);
+}
+
+export function isValidFilter(
+ operator: Lib.NumberFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: NumberOrEmptyValue[],
+) {
+ return getFilterParts(operator, dimension, values) != null;
+}
+
+export function getFilterClause(
+ operator: Lib.NumberFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: NumberOrEmptyValue[],
+) {
+ const filterParts = getFilterParts(operator, dimension, values);
+ return filterParts != null
+ ? LibMetric.numberFilterClause(filterParts)
+ : undefined;
+}
+
+function getFilterParts(
+ operator: Lib.NumberFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: NumberOrEmptyValue[],
+): LibMetric.NumberFilterParts | undefined {
+ switch (operator) {
+ case "between":
+ return getBetweenFilterParts(operator, dimension, values);
+ default:
+ return getSimpleFilterParts(operator, dimension, values);
+ }
+}
+
+function getSimpleFilterParts(
+ operator: Lib.NumberFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: NumberOrEmptyValue[],
+): LibMetric.NumberFilterParts | undefined {
+ const { valueCount, hasMultipleValues } = getOptionByOperator(operator);
+ if (!values.every(isNotNull)) {
+ return undefined;
+ }
+ if (hasMultipleValues ? values.length === 0 : values.length !== valueCount) {
+ return undefined;
+ }
+
+ return {
+ operator,
+ dimension,
+ values: values.filter(isNotNull),
+ };
+}
+
+function getBetweenFilterParts(
+ operator: Lib.NumberFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: NumberOrEmptyValue[],
+): LibMetric.NumberFilterParts | undefined {
+ const [startValue, endValue] = values;
+ if (isNotNull(startValue) && isNotNull(endValue)) {
+ const minValue = startValue < endValue ? startValue : endValue;
+ const maxValue = startValue < endValue ? endValue : startValue;
+
+ return {
+ operator,
+ dimension,
+ values: [minValue, maxValue],
+ };
+ } else if (isNotNull(startValue)) {
+ return {
+ operator: ">=",
+ dimension,
+ values: [startValue],
+ };
+ } else if (isNotNull(endValue)) {
+ return {
+ operator: "<=",
+ dimension,
+ values: [endValue],
+ };
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
new file mode 100644
index 00000000000..cd6077ebbb7
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
@@ -0,0 +1,174 @@
+import type { FormEvent } from "react";
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import { Box, Checkbox, Flex, MultiAutocomplete } from "metabase/ui";
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterOperatorPicker } from "../FilterOperatorPicker";
+import { FilterPickerFooter } from "../FilterPickerFooter";
+import { FilterPickerHeader } from "../FilterPickerHeader";
+import { StringFilterValuePicker } from "../FilterValuePicker";
+import { COMBOBOX_PROPS, FILTER_PICKER_WIDTH } from "../constants";
+import type { FilterPickerWidgetProps } from "../types";
+
+import { useStringFilter } from "./hooks";
+import type { OperatorType } from "./types";
+
+export function StringFilterPicker({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ readOnly,
+ allFilterDimensions,
+ onSelect,
+ onBack,
+ onClear,
+}: FilterPickerWidgetProps) {
+ const dimensionInfo = useMemo(
+ () => LibMetric.displayInfo(definition, dimension),
+ [definition, dimension],
+ );
+
+ const {
+ type,
+ operator,
+ availableOptions,
+ values,
+ options,
+ isValid,
+ getDefaultValues,
+ getFilterClause,
+ setOperator,
+ setValues,
+ setOptions,
+ } = useStringFilter({
+ definition,
+ dimension,
+ filter,
+ });
+
+ const handleOperatorChange = (newOperator: Lib.StringFilterOperator) => {
+ setOperator(newOperator);
+ setValues(getDefaultValues(newOperator, values));
+ };
+
+ const handleFormSubmit = (event: FormEvent) => {
+ event.preventDefault();
+ const filter = getFilterClause(operator, values, options);
+ if (filter) {
+ onSelect(filter);
+ }
+ };
+
+ return (
+ <Box
+ component="form"
+ w={FILTER_PICKER_WIDTH}
+ data-testid="string-filter-picker"
+ onSubmit={handleFormSubmit}
+ >
+ <FilterPickerHeader
+ dimensionName={dimensionInfo.displayName}
+ onBack={onBack}
+ readOnly={readOnly}
+ >
+ <FilterOperatorPicker
+ value={operator}
+ options={availableOptions}
+ onSelect={handleOperatorChange}
+ />
+ </FilterPickerHeader>
+ <div>
+ <StringValueInput
+ definition={definition}
+ dimension={dimension}
+ values={values}
+ type={type}
+ allFilterDimensions={allFilterDimensions}
+ onChange={setValues}
+ />
+ <FilterPickerFooter isNew={isNew} isValid={isValid} onClear={onClear}>
+ {type === "partial" && (
+ <CaseSensitiveOption
+ value={options.caseSensitive ?? false}
+ onChange={(newValue) => setOptions({ caseSensitive: newValue })}
+ />
+ )}
+ </FilterPickerFooter>
+ </div>
+ </Box>
+ );
+}
+
+interface StringValueInputProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ values: string[];
+ type: OperatorType;
+ allFilterDimensions?: LibMetric.DimensionMetadata[];
+ onChange: (values: string[]) => void;
+}
+
+function StringValueInput({
+ definition,
+ dimension,
+ values,
+ type,
+ allFilterDimensions,
+ onChange,
+}: StringValueInputProps) {
+ if (type === "exact") {
+ return (
+ <Box p="md" pb={0} mah="25vh" style={{ overflow: "auto" }}>
+ <StringFilterValuePicker
+ definition={definition}
+ dimension={dimension}
+ values={values}
+ allFilterDimensions={allFilterDimensions}
+ comboboxProps={COMBOBOX_PROPS}
+ autoFocus
+ onChange={onChange}
+ />
+ <Box pt="md" />
+ </Box>
+ );
+ }
+
+ if (type === "partial") {
+ return (
+ <Box p="md" pb={0} mah="40vh" style={{ overflow: "auto" }}>
+ <MultiAutocomplete
+ value={values}
+ placeholder={t`Enter some text`}
+ comboboxProps={COMBOBOX_PROPS}
+ aria-label={t`Filter value`}
+ onChange={onChange}
+ />
+ <Box pt="md" />
+ </Box>
+ );
+ }
+
+ return null;
+}
+
+interface CaseSensitiveOptionProps {
+ value: boolean;
+ onChange: (value: boolean) => void;
+}
+
+function CaseSensitiveOption({ value, onChange }: CaseSensitiveOptionProps) {
+ return (
+ <Flex align="center" px="sm">
+ <Checkbox
+ size="xs"
+ label={t`Case sensitive`}
+ checked={value}
+ onChange={(e) => onChange(e.target.checked)}
+ />
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/constants.ts b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-string-filter/constants.ts
rename to frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/hooks.ts b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/hooks.ts
new file mode 100644
index 00000000000..7bb2958c537
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/hooks.ts
@@ -0,0 +1,70 @@
+import { useMemo, useState } from "react";
+
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import {
+ getAvailableOptions,
+ getDefaultOperator,
+ getDefaultValues,
+ getFilterClause,
+ getOptionByOperator,
+ isValidFilter,
+} from "./utils";
+
+interface UseStringFilterProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+}
+
+export function useStringFilter({
+ definition,
+ dimension,
+ filter,
+}: UseStringFilterProps) {
+ const filterParts = useMemo(
+ () => (filter ? LibMetric.stringFilterParts(definition, filter) : null),
+ [definition, filter],
+ );
+
+ const availableOptions = useMemo(
+ () => getAvailableOptions(dimension),
+ [dimension],
+ );
+
+ const [operator, setOperator] = useState(() =>
+ filterParts
+ ? filterParts.operator
+ : getDefaultOperator(definition, dimension),
+ );
+
+ const [values, setValues] = useState(() =>
+ getDefaultValues(operator, filterParts ? filterParts.values : []),
+ );
+
+ const [options, setOptions] = useState(
+ filterParts ? filterParts.options : { caseSensitive: false },
+ );
+
+ const { type } = getOptionByOperator(operator);
+ const isValid = isValidFilter(operator, dimension, values, options);
+
+ return {
+ type,
+ operator,
+ availableOptions,
+ values,
+ options,
+ isValid,
+ getDefaultValues,
+ getFilterClause: (
+ operator: Lib.StringFilterOperator,
+ values: string[],
+ options: Lib.StringFilterOptions,
+ ) => getFilterClause(operator, dimension, values, options),
+ setOperator,
+ setValues,
+ setOptions,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/index.ts
new file mode 100644
index 00000000000..d100d02eda6
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./StringFilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/types.ts
new file mode 100644
index 00000000000..543051228f6
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/types.ts
@@ -0,0 +1,13 @@
+import type * as Lib from "metabase-lib";
+
+import type { FilterOperatorOption } from "../types";
+
+export type OperatorType = "exact" | "partial" | "empty";
+
+export type StringFilterOperatorOption =
+ FilterOperatorOption<Lib.StringFilterOperator>;
+
+export type StringFilterOperatorInfo = {
+ operator: Lib.StringFilterOperator;
+ type: OperatorType;
+};
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/utils.ts
new file mode 100644
index 00000000000..bf09668579e
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/StringFilterPicker/utils.ts
@@ -0,0 +1,93 @@
+import * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { OPERATORS } from "./constants";
+import type { StringFilterOperatorOption } from "./types";
+
+function isNotEmpty(value: string) {
+ return value.length > 0;
+}
+
+export function getAvailableOptions(
+ dimension: LibMetric.DimensionMetadata,
+): StringFilterOperatorOption[] {
+ const isStringLike = LibMetric.isStringLike(dimension);
+
+ return Object.values(OPERATORS)
+ .filter(({ type }) => !isStringLike || type !== "partial")
+ .map(({ operator }) => ({
+ operator,
+ displayName: Lib.describeFilterOperator(operator),
+ }));
+}
+
+export function getOptionByOperator(operator: Lib.StringFilterOperator) {
+ return OPERATORS[operator];
+}
+
+export function getDefaultOperator(
+ definition: LibMetric.MetricDefinition,
+ dimension: LibMetric.DimensionMetadata,
+): Lib.StringFilterOperator {
+ const dimensionInfo = LibMetric.dimensionValuesInfo(definition, dimension);
+
+ if (
+ LibMetric.isPrimaryKey(dimension) ||
+ LibMetric.isForeignKey(dimension) ||
+ LibMetric.isStringLike(dimension) ||
+ dimensionInfo.canListValues ||
+ dimensionInfo.canSearchValues
+ ) {
+ return "=";
+ }
+
+ return "contains";
+}
+
+export function getDefaultValues(
+ operator: Lib.StringFilterOperator,
+ values: string[],
+): string[] {
+ const { type } = OPERATORS[operator];
+ return type !== "empty" ? values.filter(isNotEmpty) : [];
+}
+
+export function isValidFilter(
+ operator: Lib.StringFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: string[] = [],
+ options: Lib.StringFilterOptions,
+) {
+ return getFilterParts(operator, dimension, values, options) != null;
+}
+
+export function getFilterClause(
+ operator: Lib.StringFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: string[],
+ options: Lib.StringFilterOptions,
+) {
+ const filterParts = getFilterParts(operator, dimension, values, options);
+ return filterParts != null
+ ? LibMetric.stringFilterClause(filterParts)
+ : undefined;
+}
+
+function getFilterParts(
+ operator: Lib.StringFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: string[],
+ options: Lib.StringFilterOptions,
+): LibMetric.StringFilterParts | undefined {
+ const { type } = OPERATORS[operator];
+ if (values.length === 0 && type !== "empty") {
+ return undefined;
+ }
+
+ return {
+ operator,
+ dimension,
+ values,
+ options,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
new file mode 100644
index 00000000000..e1db9f7eb02
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
@@ -0,0 +1,140 @@
+import type { FormEvent } from "react";
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import { Box, Flex, Text, TimeInput } from "metabase/ui";
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { FilterOperatorPicker } from "../FilterOperatorPicker";
+import { FilterPickerFooter } from "../FilterPickerFooter";
+import { FilterPickerHeader } from "../FilterPickerHeader";
+import { FILTER_PICKER_WIDTH } from "../constants";
+import type { FilterPickerWidgetProps } from "../types";
+
+import { useTimeFilter } from "./hooks";
+import type { TimeValue } from "./types";
+
+export function TimeFilterPicker({
+ definition,
+ dimension,
+ filter,
+ isNew,
+ readOnly,
+ onSelect,
+ onBack,
+ onClear,
+}: FilterPickerWidgetProps) {
+ const dimensionInfo = useMemo(
+ () => LibMetric.displayInfo(definition, dimension),
+ [definition, dimension],
+ );
+
+ const {
+ operator,
+ values,
+ valueCount,
+ availableOptions,
+ isValid,
+ getDefaultValues,
+ getFilterClause,
+ setOperator,
+ setValues,
+ } = useTimeFilter({
+ definition,
+ dimension,
+ filter,
+ });
+
+ const handleOperatorChange = (newOperator: Lib.TimeFilterOperator) => {
+ setOperator(newOperator);
+ setValues(getDefaultValues(newOperator, values));
+ };
+
+ const handleFilterChange = () => {
+ const filter = getFilterClause(operator, values);
+ if (filter) {
+ onSelect(filter);
+ }
+ };
+
+ const handleFormSubmit = (event: FormEvent) => {
+ event.preventDefault();
+ handleFilterChange();
+ };
+
+ return (
+ <Box
+ component="form"
+ w={FILTER_PICKER_WIDTH}
+ data-testid="time-filter-picker"
+ onSubmit={handleFormSubmit}
+ >
+ <FilterPickerHeader
+ dimensionName={dimensionInfo.displayName}
+ onBack={onBack}
+ readOnly={readOnly}
+ >
+ <FilterOperatorPicker
+ value={operator}
+ options={availableOptions}
+ onSelect={handleOperatorChange}
+ />
+ </FilterPickerHeader>
+ <Box>
+ {valueCount > 0 && (
+ <Flex p="md">
+ <TimeValueInput
+ values={values}
+ valueCount={valueCount}
+ onChange={setValues}
+ />
+ </Flex>
+ )}
+ <FilterPickerFooter isNew={isNew} isValid={isValid} onClear={onClear} />
+ </Box>
+ </Box>
+ );
+}
+
+interface TimeValueInputProps {
+ values: TimeValue[];
+ valueCount: number;
+ onChange: (values: TimeValue[]) => void;
+}
+
+function TimeValueInput({ values, valueCount, onChange }: TimeValueInputProps) {
+ if (valueCount === 1) {
+ const [value] = values;
+ return (
+ <TimeInput
+ value={value}
+ w="100%"
+ autoFocus
+ onChange={(newValue) => onChange([newValue])}
+ />
+ );
+ }
+
+ if (valueCount === 2) {
+ const [value1, value2] = values;
+ return (
+ <Flex direction="row" align="center" gap="sm" w="100%">
+ <TimeInput
+ value={value1}
+ w="100%"
+ autoFocus
+ onChange={(newValue1) => onChange([newValue1, value2])}
+ />
+ <Text>{t`and`}</Text>
+ <TimeInput
+ value={value2}
+ w="100%"
+ onChange={(newValue2) => onChange([value1, newValue2])}
+ />
+ </Flex>
+ );
+ }
+
+ return null;
+}
diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/constants.ts b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/constants.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-time-filter/constants.ts
rename to frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/constants.ts
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/hooks.ts b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/hooks.ts
new file mode 100644
index 00000000000..0d23ac21c94
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/hooks.ts
@@ -0,0 +1,54 @@
+import { useMemo, useState } from "react";
+
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import type { TimeValue } from "./types";
+import {
+ getAvailableOptions,
+ getDefaultOperator,
+ getDefaultValues,
+ getFilterClause,
+ getOptionByOperator,
+ isValidFilter,
+} from "./utils";
+
+interface UseTimeFilterProps {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+}
+
+export function useTimeFilter({
+ definition,
+ dimension,
+ filter,
+}: UseTimeFilterProps) {
+ const filterParts = useMemo(() => {
+ return filter ? LibMetric.timeFilterParts(definition, filter) : null;
+ }, [definition, filter]);
+
+ const availableOptions = useMemo(() => getAvailableOptions(), []);
+
+ const [operator, setOperator] = useState(
+ filterParts ? filterParts.operator : getDefaultOperator(),
+ );
+ const [values, setValues] = useState(() =>
+ getDefaultValues(operator, filterParts ? filterParts.values : []),
+ );
+ const { valueCount } = getOptionByOperator(operator);
+ const isValid = isValidFilter(operator, dimension, values);
+
+ return {
+ operator,
+ values,
+ valueCount,
+ availableOptions,
+ isValid,
+ getDefaultValues,
+ getFilterClause: (operator: Lib.TimeFilterOperator, values: TimeValue[]) =>
+ getFilterClause(operator, dimension, values),
+ setOperator,
+ setValues,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/index.ts
new file mode 100644
index 00000000000..a4935cd1987
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./TimeFilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/types.ts
new file mode 100644
index 00000000000..c0b91ae0493
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/types.ts
@@ -0,0 +1,13 @@
+import type * as Lib from "metabase-lib";
+
+import type { FilterOperatorOption } from "../types";
+
+export type TimeFilterOperatorOption =
+ FilterOperatorOption<Lib.TimeFilterOperator>;
+
+export type TimeFilterOperatorInfo = {
+ operator: Lib.TimeFilterOperator;
+ valueCount: number;
+};
+
+export type TimeValue = Date | null;
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
new file mode 100644
index 00000000000..cd2b854502f
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
@@ -0,0 +1,102 @@
+import dayjs from "dayjs";
+import { t } from "ttag";
+
+import { isNotNull } from "metabase/lib/types";
+import type * as Lib from "metabase-lib";
+import * as LibMetric from "metabase-lib/metric";
+
+import { OPERATORS } from "./constants";
+import type { TimeFilterOperatorOption, TimeValue } from "./types";
+
+export function getAvailableOptions(): TimeFilterOperatorOption[] {
+ return Object.values(OPERATORS).map(({ operator }) => ({
+ operator,
+ displayName: getOperatorDisplayName(operator),
+ }));
+}
+
+export function getOptionByOperator(operator: Lib.TimeFilterOperator) {
+ return OPERATORS[operator];
+}
+
+export function getDefaultOperator(): Lib.TimeFilterOperator {
+ return "<";
+}
+
+function getDefaultValue() {
+ return dayjs().startOf("day").toDate(); // 00:00:00
+}
+
+export function getDefaultValues(
+ operator: Lib.TimeFilterOperator,
+ values: TimeValue[],
+): TimeValue[] {
+ const { valueCount } = OPERATORS[operator];
+
+ return Array(valueCount)
+ .fill(getDefaultValue())
+ .map((value, index) => values[index] ?? value);
+}
+
+export function isValidFilter(
+ operator: Lib.TimeFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: TimeValue[],
+) {
+ return getFilterParts(operator, dimension, values) != null;
+}
+
+export function getFilterClause(
+ operator: Lib.TimeFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: TimeValue[],
+) {
+ const filterParts = getFilterParts(operator, dimension, values);
+ if (filterParts == null) {
+ return undefined;
+ }
+
+ return LibMetric.timeFilterClause(filterParts);
+}
+
+function getFilterParts(
+ operator: Lib.TimeFilterOperator,
+ dimension: LibMetric.DimensionMetadata,
+ values: TimeValue[],
+): LibMetric.TimeFilterParts | undefined {
+ if (!values.every(isNotNull)) {
+ return undefined;
+ }
+
+ if (operator === "between") {
+ const [startTime, endTime] = values;
+ return {
+ operator,
+ dimension,
+ values: dayjs(endTime).isBefore(startTime)
+ ? [endTime, startTime]
+ : [startTime, endTime],
+ };
+ }
+
+ return {
+ operator,
+ dimension,
+ values,
+ };
+}
+
+function getOperatorDisplayName(operator: Lib.TimeFilterOperator): string {
+ switch (operator) {
+ case "<":
+ return t`Before`;
+ case ">":
+ return t`After`;
+ case "between":
+ return t`Between`;
+ case "is-null":
+ return t`Is empty`;
+ case "not-null":
+ return t`Not empty`;
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/constants.ts b/frontend/src/metabase/metrics/components/FilterPicker/constants.ts
new file mode 100644
index 00000000000..d716cbc5e42
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/constants.ts
@@ -0,0 +1,7 @@
+import type { ComboboxProps } from "metabase/ui";
+
+export const FILTER_PICKER_WIDTH = 380;
+export const COMBOBOX_PROPS: Partial<ComboboxProps> = {
+ width: 298,
+ position: "bottom-start",
+};
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/index.ts b/frontend/src/metabase/metrics/components/FilterPicker/index.ts
new file mode 100644
index 00000000000..24e7622d588
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./FilterPicker";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/types.ts b/frontend/src/metabase/metrics/components/FilterPicker/types.ts
new file mode 100644
index 00000000000..eacc33603b4
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/FilterPicker/types.ts
@@ -0,0 +1,19 @@
+import type * as Lib from "metabase-lib";
+import type * as LibMetric from "metabase-lib/metric";
+
+export type FilterOperatorOption<T extends Lib.FilterOperator> = {
+ operator: T;
+ displayName: string;
+};
+
+export type FilterPickerWidgetProps = {
+ definition: LibMetric.MetricDefinition;
+ dimension: LibMetric.DimensionMetadata;
+ filter?: LibMetric.FilterClause;
+ isNew?: boolean;
+ readOnly?: boolean;
+ allFilterDimensions?: LibMetric.DimensionMetadata[];
+ onSelect: (filter: LibMetric.FilterClause) => void;
+ onBack?: () => void;
+ onClear?: () => void;
+};
diff --git a/frontend/src/metabase/metrics/components/MetricPicker/MetricPicker.module.css b/frontend/src/metabase/metrics/components/MetricPicker/MetricPicker.module.css
new file mode 100644
index 00000000000..07b66e8493c
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricPicker/MetricPicker.module.css
@@ -0,0 +1,9 @@
+@supports (field-sizing: content) {
+ .field {
+ flex: 0 1 auto;
+ min-width: auto;
+ /* stylelint-disable-next-line property-no-unknown */
+ field-sizing: content;
+ max-width: 100%;
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/MetricPicker/MetricPicker.tsx b/frontend/src/metabase/metrics/components/MetricPicker/MetricPicker.tsx
new file mode 100644
index 00000000000..f0b546f4763
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricPicker/MetricPicker.tsx
@@ -0,0 +1,147 @@
+import { type KeyboardEvent, useMemo, useState } from "react";
+import { t } from "ttag";
+
+import {
+ useLazyGetMeasureQuery,
+ useLazyGetMetricQuery,
+ useListMeasuresQuery,
+ useListMetricsQuery,
+} from "metabase/api";
+import {
+ Combobox,
+ Group,
+ OptionsDropdown,
+ Pill,
+ PillsInput,
+ useCombobox,
+} from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+import S from "./MetricPicker.module.css";
+import type { MetricPickerItem } from "./types";
+import { getItems } from "./utils";
+
+type MetricPickerProps = {
+ definitions: LibMetric.MetricDefinition[];
+ onSelect: (item: MetricPickerItem) => void;
+ onRemove: (
+ definition: LibMetric.MetricDefinition,
+ definitionIndex: number,
+ ) => void;
+};
+
+export function MetricPicker({
+ definitions,
+ onSelect,
+ onRemove,
+}: MetricPickerProps) {
+ const [searchValue, setSearchValue] = useState("");
+ const { data: metrics = [] } = useListMetricsQuery();
+ const { data: measures = [] } = useListMeasuresQuery();
+ const [fetchMetric] = useLazyGetMetricQuery();
+ const [fetchMeasure] = useLazyGetMeasureQuery();
+
+ const items = useMemo(
+ () => getItems(definitions, metrics, measures),
+ [definitions, metrics, measures],
+ );
+
+ const combobox = useCombobox({
+ onDropdownClose: () => combobox.resetSelectedOption(),
+ onDropdownOpen: () => combobox.updateSelectedOptionIndex("active"),
+ });
+
+ const handleSelect = async (value: string) => {
+ const item = items.find((item) => item.value === value);
+ if (item == null) {
+ return;
+ }
+ if (item.type === "metric") {
+ await fetchMetric(item.data.id, true);
+ } else {
+ await fetchMeasure(item.data.id, true);
+ }
+ onSelect(item);
+ };
+
+ const handleRemove = (definitionIndex: number) => {
+ onRemove(definitions[definitionIndex], definitionIndex);
+ };
+
+ const handleKeyDown = (event: KeyboardEvent) => {
+ if (event.key === "Backspace" && definitions.length > 0) {
+ event.preventDefault();
+ handleRemove(definitions.length - 1);
+ }
+ };
+
+ return (
+ <Combobox store={combobox} onOptionSubmit={handleSelect}>
+ <Combobox.DropdownTarget>
+ <PillsInput onClick={() => combobox.toggleDropdown()}>
+ <Pill.Group>
+ {definitions.map((definition, index) => (
+ <MetricPill
+ key={index}
+ definition={definition}
+ onRemove={() => handleRemove(index)}
+ />
+ ))}
+
+ <Combobox.EventsTarget>
+ <PillsInput.Field
+ className={S.field}
+ value={searchValue}
+ placeholder={t`Pick a metric or a measure`}
+ role="combobox"
+ onChange={(e) => setSearchValue(e.target.value)}
+ onKeyDown={handleKeyDown}
+ onBlur={() => combobox.closeDropdown()}
+ />
+ </Combobox.EventsTarget>
+ </Pill.Group>
+ </PillsInput>
+ </Combobox.DropdownTarget>
+
+ <OptionsDropdown
+ data={items}
+ search={searchValue}
+ nothingFoundMessage={t`No metrics or measures found`}
+ renderOption={({ option }) => <MetricOption item={option} />}
+ filter={undefined}
+ limit={undefined}
+ unstyled={false}
+ labelId={undefined}
+ withScrollArea={false}
+ scrollAreaProps={undefined}
+ maxDropdownHeight={undefined}
+ aria-label={undefined}
+ />
+ </Combobox>
+ );
+}
+
+type MetricPillProps = {
+ definition: LibMetric.MetricDefinition;
+ onRemove: () => void;
+};
+
+function MetricPill({ definition, onRemove }: MetricPillProps) {
+ const metric = LibMetric.sourceMetricOrMeasureMetadata(definition);
+ const metricInfo =
+ metric != null ? LibMetric.displayInfo(definition, metric) : null;
+
+ return (
+ <Pill withRemoveButton onRemove={onRemove}>
+ {metricInfo != null ? metricInfo.displayName : t`Unknown`}
+ </Pill>
+ );
+}
+
+type MetricOptionProps = {
+ item: MetricPickerItem;
+};
+
+function MetricOption({ item }: MetricOptionProps) {
+ return <Group>{item.label}</Group>;
+}
diff --git a/frontend/src/metabase/metrics/components/MetricPicker/index.ts b/frontend/src/metabase/metrics/components/MetricPicker/index.ts
new file mode 100644
index 00000000000..5d37da3afa6
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricPicker/index.ts
@@ -0,0 +1,2 @@
+export * from "./MetricPicker";
+export * from "./types";
diff --git a/frontend/src/metabase/metrics/components/MetricPicker/types.ts b/frontend/src/metabase/metrics/components/MetricPicker/types.ts
new file mode 100644
index 00000000000..66aaa7918a9
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricPicker/types.ts
@@ -0,0 +1,18 @@
+import type { Measure, Metric } from "metabase-types/api";
+
+export type MetricOption = {
+ type: "metric";
+ data: Metric;
+ value: string;
+ label: string;
+};
+
+export type MeasureItem = {
+ type: "measure";
+ data: Measure;
+ value: string;
+ label: string;
+};
+
+export type MetricPickerItem = MetricOption | MeasureItem;
+export type MetricPickerItemType = MetricPickerItem["type"];
diff --git a/frontend/src/metabase/metrics/components/MetricPicker/utils.ts b/frontend/src/metabase/metrics/components/MetricPicker/utils.ts
new file mode 100644
index 00000000000..481b0c0faf8
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricPicker/utils.ts
@@ -0,0 +1,78 @@
+import * as LibMetric from "metabase-lib/metric";
+import type { Measure, MeasureId, Metric, MetricId } from "metabase-types/api";
+
+import type {
+ MeasureItem,
+ MetricOption,
+ MetricPickerItem,
+ MetricPickerItemType,
+} from "./types";
+
+function getItemId(
+ id: MetricId | MeasureId,
+ type: MetricPickerItemType,
+): string {
+ return `${type}:${id}`;
+}
+
+function getMeasureItem(measure: Measure): MeasureItem {
+ return {
+ type: "measure",
+ data: measure,
+ value: getItemId(measure.id, "measure"),
+ label: measure.name,
+ };
+}
+
+function getMetricItem(metric: Metric): MetricOption {
+ return {
+ type: "metric",
+ data: metric,
+ value: getItemId(metric.id, "metric"),
+ label: metric.name,
+ };
+}
+
+function getCombinedItems(
+ metrics: Metric[],
+ measures: Measure[],
+): MetricPickerItem[] {
+ const items = [
+ ...metrics.map(getMetricItem),
+ ...measures.map(getMeasureItem),
+ ];
+ items.sort((a, b) => a.label.localeCompare(b.label));
+ return items;
+}
+
+function getUnselectedItems(
+ items: MetricPickerItem[],
+ selectedItemIds: string[],
+): MetricPickerItem[] {
+ return items.filter((item) => !selectedItemIds.includes(item.value));
+}
+
+function getItemIdFromDefinition(
+ definition: LibMetric.MetricDefinition,
+): string {
+ const metricId = LibMetric.sourceMetricId(definition);
+ if (metricId != null) {
+ return getItemId(metricId, "metric");
+ }
+ const measureId = LibMetric.sourceMeasureId(definition);
+ if (measureId != null) {
+ return getItemId(measureId, "measure");
+ }
+ return "";
+}
+
+export function getItems(
+ definitions: LibMetric.MetricDefinition[],
+ metrics: Metric[],
+ measures: Measure[],
+): MetricPickerItem[] {
+ return getUnselectedItems(
+ getCombinedItems(metrics, measures),
+ definitions.map(getItemIdFromDefinition),
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx b/frontend/src/metabase/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx
new file mode 100644
index 00000000000..337f799b046
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/TemporalBucketPicker/TemporalBucketPicker.tsx
@@ -0,0 +1,63 @@
+import { type Ref, forwardRef } from "react";
+import { t } from "ttag";
+
+import type { DimensionWithDefinition } from "metabase/metrics/types";
+import { getCommonTemporalUnits } from "metabase/metrics/utils/dates";
+import { TemporalUnitPicker } from "metabase/querying/common/components/TemporalUnitPicker";
+import { Button } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { TemporalUnit } from "metabase-types/api";
+
+type TemporalBucketPickerProps = {
+ selectedUnit: TemporalUnit | undefined;
+ dimensions: DimensionWithDefinition[];
+ canRemove?: boolean;
+ onSelect: (unit: TemporalUnit) => void;
+ onRemove?: () => void;
+};
+
+export function TemporalBucketPicker({
+ selectedUnit,
+ dimensions,
+ canRemove,
+ onSelect,
+ onRemove,
+}: TemporalBucketPickerProps) {
+ const sharedUnits = getCommonTemporalUnits(dimensions);
+ const sharedUnitItems = sharedUnits.map((unit) => ({
+ value: unit,
+ label: Lib.describeTemporalUnit(unit),
+ }));
+
+ return (
+ <TemporalUnitPicker
+ value={selectedUnit}
+ availableItems={sharedUnitItems}
+ canRemove={canRemove}
+ onChange={onSelect}
+ onRemove={onRemove}
+ />
+ );
+}
+
+type TemporalBucketPickerButtonProps = {
+ selectedUnit: TemporalUnit | undefined;
+ onClick?: () => void;
+};
+
+export const TemporalBucketPickerButton = forwardRef(
+ function TemporalBucketPickerButton(
+ { selectedUnit, onClick }: TemporalBucketPickerButtonProps,
+ ref: Ref<HTMLButtonElement>,
+ ) {
+ const label = selectedUnit
+ ? Lib.describeTemporalUnit(selectedUnit)
+ : t`Unbinned`;
+
+ return (
+ <Button ref={ref} onClick={onClick}>
+ {label}
+ </Button>
+ );
+ },
+);
diff --git a/frontend/src/metabase/metrics/components/TemporalBucketPicker/index.ts b/frontend/src/metabase/metrics/components/TemporalBucketPicker/index.ts
new file mode 100644
index 00000000000..038b257ff69
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/TemporalBucketPicker/index.ts
@@ -0,0 +1 @@
+export * from "./TemporalBucketPicker";
diff --git a/frontend/src/metabase/metrics/components/TemporalFilterPicker/TemporalFilterPicker.tsx b/frontend/src/metabase/metrics/components/TemporalFilterPicker/TemporalFilterPicker.tsx
new file mode 100644
index 00000000000..e2d8eda0743
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/TemporalFilterPicker/TemporalFilterPicker.tsx
@@ -0,0 +1,57 @@
+import { type Ref, forwardRef } from "react";
+import { t } from "ttag";
+
+import type { DimensionWithDefinition } from "metabase/metrics/types";
+import {
+ getCommonTemporalUnits,
+ isDatePickerUnit,
+} from "metabase/metrics/utils/dates";
+import { SimpleDatePicker } from "metabase/querying/common/components/DatePicker/SimpleDatePicker";
+import type { DatePickerValue } from "metabase/querying/common/types";
+import { getDateFilterDisplayName } from "metabase/querying/filters/utils/dates";
+import { Button } from "metabase/ui";
+
+type TemporalFilterPickerProps = {
+ dimensions: DimensionWithDefinition[];
+ selectedFilter: DatePickerValue | undefined;
+ onSelect: (filter: DatePickerValue | undefined) => void;
+};
+
+export function TemporalFilterPicker({
+ dimensions,
+ selectedFilter,
+ onSelect,
+}: TemporalFilterPickerProps) {
+ const availableUnits =
+ getCommonTemporalUnits(dimensions).filter(isDatePickerUnit);
+
+ return (
+ <SimpleDatePicker
+ value={selectedFilter}
+ availableUnits={availableUnits}
+ onChange={onSelect}
+ />
+ );
+}
+
+type TemporalFilterPickerButtonProps = {
+ selectedFilter: DatePickerValue | undefined;
+ onClick?: () => void;
+};
+
+export const TemporalFilterPickerButton = forwardRef(
+ function TemporalFilterPickerButton(
+ { selectedFilter, onClick }: TemporalFilterPickerButtonProps,
+ ref: Ref<HTMLButtonElement>,
+ ) {
+ const label = selectedFilter
+ ? getDateFilterDisplayName(selectedFilter)
+ : t`All time`;
+
+ return (
+ <Button ref={ref} onClick={onClick}>
+ {label}
+ </Button>
+ );
+ },
+);
diff --git a/frontend/src/metabase/metrics/components/TemporalFilterPicker/index.ts b/frontend/src/metabase/metrics/components/TemporalFilterPicker/index.ts
new file mode 100644
index 00000000000..17e36edb322
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/TemporalFilterPicker/index.ts
@@ -0,0 +1 @@
+export * from "./TemporalFilterPicker";
diff --git a/frontend/src/metabase/metrics/types.ts b/frontend/src/metabase/metrics/types.ts
new file mode 100644
index 00000000000..3de12aa96b4
--- /dev/null
+++ b/frontend/src/metabase/metrics/types.ts
@@ -0,0 +1,6 @@
+import type * as LibMetric from "metabase-lib/metric";
+
+export type DimensionWithDefinition = {
+ dimension: LibMetric.DimensionMetadata;
+ definition: LibMetric.MetricDefinition;
+};
diff --git a/frontend/src/metabase/metrics/utils/dates.ts b/frontend/src/metabase/metrics/utils/dates.ts
new file mode 100644
index 00000000000..cce1ba7d976
--- /dev/null
+++ b/frontend/src/metabase/metrics/utils/dates.ts
@@ -0,0 +1,250 @@
+import dayjs from "dayjs";
+
+import {
+ DATE_PICKER_EXTRACTION_UNITS,
+ DATE_PICKER_TRUNCATION_UNITS,
+} from "metabase/querying/common/constants";
+import type {
+ DateFilterValue,
+ DatePickerExtractionUnit,
+ DatePickerTruncationUnit,
+ DatePickerUnit,
+ DatePickerValue,
+ ExcludeDatePickerValue,
+ MonthYearPickerValue,
+ QuarterYearPickerValue,
+ RelativeDatePickerValue,
+ SpecificDatePickerValue,
+} from "metabase/querying/common/types";
+import * as LibMetric from "metabase-lib/metric";
+import type { TemporalUnit } from "metabase-types/api";
+
+import type { DimensionWithDefinition } from "../types";
+
+export function isDatePickerUnit(unit: string): unit is DatePickerUnit {
+ return isDatePickerTruncationUnit(unit) || isDatePickerExtractionUnit(unit);
+}
+
+export function isDatePickerTruncationUnit(
+ unit: string,
+): unit is DatePickerTruncationUnit {
+ const units: ReadonlyArray<string> = DATE_PICKER_TRUNCATION_UNITS;
+ return units.includes(unit);
+}
+
+export function isDatePickerExtractionUnit(
+ unit: string,
+): unit is DatePickerExtractionUnit {
+ const units: ReadonlyArray<string> = DATE_PICKER_EXTRACTION_UNITS;
+ return units.includes(unit);
+}
+
+export function getDatePickerUnits(
+ definition: LibMetric.MetricDefinition,
+ dimension: LibMetric.DimensionMetadata,
+): DatePickerUnit[] {
+ return LibMetric.availableTemporalBuckets(definition, dimension)
+ .map((bucket) => LibMetric.displayInfo(definition, bucket).shortName)
+ .filter(isDatePickerUnit);
+}
+
+export function getDatePickerValue(
+ definition: LibMetric.MetricDefinition,
+ filterClause: LibMetric.FilterClause,
+): DatePickerValue | undefined {
+ return (
+ getSpecificDateValue(definition, filterClause) ??
+ getRelativeDateValue(definition, filterClause) ??
+ getExcludeDateValue(definition, filterClause)
+ );
+}
+
+function getSpecificDateValue(
+ definition: LibMetric.MetricDefinition,
+ filterClause: LibMetric.FilterClause,
+): SpecificDatePickerValue | undefined {
+ const filterParts = LibMetric.specificDateFilterParts(
+ definition,
+ filterClause,
+ );
+ if (filterParts == null) {
+ return undefined;
+ }
+
+ return {
+ type: "specific",
+ operator: filterParts.operator,
+ values: filterParts.values,
+ hasTime: filterParts.hasTime,
+ };
+}
+
+function getRelativeDateValue(
+ definition: LibMetric.MetricDefinition,
+ filterClause: LibMetric.FilterClause,
+): RelativeDatePickerValue | undefined {
+ const filterParts = LibMetric.relativeDateFilterParts(
+ definition,
+ filterClause,
+ );
+ if (filterParts == null) {
+ return undefined;
+ }
+
+ return {
+ type: "relative",
+ unit: filterParts.unit,
+ value: filterParts.value,
+ offsetUnit: filterParts.offsetUnit ?? undefined,
+ offsetValue: filterParts.offsetValue ?? undefined,
+ options: filterParts.options,
+ };
+}
+
+function getExcludeDateValue(
+ definition: LibMetric.MetricDefinition,
+ filterClause: LibMetric.FilterClause,
+): ExcludeDatePickerValue | undefined {
+ const filterParts = LibMetric.excludeDateFilterParts(
+ definition,
+ filterClause,
+ );
+ if (filterParts == null) {
+ return undefined;
+ }
+
+ return {
+ type: "exclude",
+ operator: filterParts.operator,
+ unit: filterParts.unit ?? undefined,
+ values: filterParts.values,
+ };
+}
+
+export function getDateFilterClause(
+ dimension: LibMetric.DimensionMetadata,
+ value: DateFilterValue,
+): LibMetric.FilterClause {
+ switch (value.type) {
+ case "specific":
+ return getSpecificFilterClause(dimension, value);
+ case "relative":
+ return getRelativeFilterClause(dimension, value);
+ case "exclude":
+ return getExcludeFilterClause(dimension, value);
+ case "month":
+ return getMonthYearFilterClause(dimension, value);
+ case "quarter":
+ return getQuarterYearFilterClause(dimension, value);
+ }
+}
+
+function getSpecificFilterClause(
+ dimension: LibMetric.DimensionMetadata,
+ value: SpecificDatePickerValue,
+): LibMetric.FilterClause {
+ return LibMetric.specificDateFilterClause({
+ operator: value.operator,
+ dimension,
+ values: value.values,
+ hasTime: value.hasTime,
+ });
+}
+
+function getRelativeFilterClause(
+ dimension: LibMetric.DimensionMetadata,
+ value: RelativeDatePickerValue,
+): LibMetric.FilterClause {
+ return LibMetric.relativeDateFilterClause({
+ dimension,
+ unit: value.unit,
+ value: value.value,
+ offsetUnit: value.offsetUnit ?? null,
+ offsetValue: value.offsetValue ?? null,
+ options: value.options ?? {},
+ });
+}
+
+function getExcludeFilterClause(
+ dimension: LibMetric.DimensionMetadata,
+ value: ExcludeDatePickerValue,
+): LibMetric.FilterClause {
+ return LibMetric.excludeDateFilterClause({
+ operator: value.operator,
+ unit: value.unit ?? null,
+ dimension,
+ values: value.values,
+ });
+}
+
+function getMonthYearFilterClause(
+ dimension: LibMetric.DimensionMetadata,
+ value: MonthYearPickerValue,
+): LibMetric.FilterClause {
+ const startOfMonth = dayjs()
+ .year(value.year)
+ .month(value.month - 1)
+ .startOf("month")
+ .toDate();
+ const endOfMonth = dayjs(startOfMonth).endOf("month").startOf("day").toDate();
+
+ return LibMetric.specificDateFilterClause({
+ operator: "between",
+ dimension,
+ values: [startOfMonth, endOfMonth],
+ hasTime: false,
+ });
+}
+
+function getQuarterYearFilterClause(
+ dimension: LibMetric.DimensionMetadata,
+ value: QuarterYearPickerValue,
+): LibMetric.FilterClause {
+ const startOfQuarter = dayjs()
+ .year(value.year)
+ .quarter(value.quarter)
+ .startOf("quarter")
+ .toDate();
+ const endOfQuarter = dayjs(startOfQuarter)
+ .endOf("quarter")
+ .startOf("day")
+ .toDate();
+
+ return LibMetric.specificDateFilterClause({
+ operator: "between",
+ dimension,
+ values: [startOfQuarter, endOfQuarter],
+ hasTime: false,
+ });
+}
+
+export function getTemporalUnits(
+ definition: LibMetric.MetricDefinition,
+ dimension: LibMetric.DimensionMetadata,
+): TemporalUnit[] {
+ return LibMetric.availableTemporalBuckets(definition, dimension).map(
+ (bucket) => {
+ const bucketInfo = LibMetric.displayInfo(definition, bucket);
+ return bucketInfo.shortName;
+ },
+ );
+}
+
+export function getCommonTemporalUnits(
+ dimensions: DimensionWithDefinition[],
+): TemporalUnit[] {
+ if (dimensions.length === 0) {
+ return [];
+ }
+
+ const initialUnits = getTemporalUnits(
+ dimensions[0].definition,
+ dimensions[0].dimension,
+ );
+ return dimensions.reduce((availableUnits, dimension) => {
+ const currentUnits = new Set(
+ getTemporalUnits(dimension.definition, dimension.dimension),
+ );
+ return availableUnits.filter((unit) => currentUnits.has(unit));
+ }, initialUnits);
+}
diff --git a/frontend/src/metabase/metrics/utils/dimensions.ts b/frontend/src/metabase/metrics/utils/dimensions.ts
new file mode 100644
index 00000000000..001a7f4a719
--- /dev/null
+++ b/frontend/src/metabase/metrics/utils/dimensions.ts
@@ -0,0 +1,37 @@
+import type { IconName } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+
+export function getDimensionIcon(
+ dimension: LibMetric.DimensionMetadata,
+): IconName {
+ // semantic type checks first
+ if (LibMetric.isPrimaryKey(dimension)) {
+ return "label";
+ }
+ if (LibMetric.isForeignKey(dimension)) {
+ return "connections";
+ }
+ if (
+ LibMetric.isLocation(dimension) ||
+ LibMetric.isLatitude(dimension) ||
+ LibMetric.isLongitude(dimension)
+ ) {
+ return "location";
+ }
+
+ // effective type checks next
+ if (LibMetric.isTemporal(dimension)) {
+ return "calendar";
+ }
+ if (LibMetric.isBoolean(dimension)) {
+ return "io";
+ }
+ if (LibMetric.isStringOrStringLike(dimension)) {
+ return "string";
+ }
+ if (LibMetric.isNumeric(dimension)) {
+ return "int";
+ }
+
+ return "list";
+}
diff --git a/frontend/src/metabase/query_builder/components/VisualizationResult.jsx b/frontend/src/metabase/query_builder/components/VisualizationResult.jsx
index 8c0032c4d35..82f0911479c 100644
--- a/frontend/src/metabase/query_builder/components/VisualizationResult.jsx
+++ b/frontend/src/metabase/query_builder/components/VisualizationResult.jsx
@@ -25,6 +25,8 @@ const ALLOWED_VISUALIZATION_PROPS = [
"mode",
"renderEmptyMessage",
"zoomedRowIndex",
+ // Legend
+ "hideLegend",
];
export class VisualizationResult extends Component {
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
index a8245aff583..79199cac67b 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
@@ -9,7 +9,7 @@ import {
HoverParent,
QueryColumnInfoIcon,
} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
-import { BucketPickerPopover } from "metabase/common/components/QueryColumnPicker/BucketPickerPopover";
+import { ColumnBucketPickerPopover } from "metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover";
import { useTranslateContent } from "metabase/i18n/hooks";
import { Tooltip } from "metabase/ui";
import { Box, type BoxProps, Flex } from "metabase/ui";
@@ -119,7 +119,7 @@ export function BreakoutColumnListItem({
{displayName}
</Box>
</Flex>
- <BucketPickerPopover
+ <ColumnBucketPickerPopover
className={BreakoutColumnListItemS.BucketTriggerButton}
query={query}
stageIndex={stageIndex}
diff --git a/frontend/src/metabase/query_builder/reducers-typed.ts b/frontend/src/metabase/query_builder/reducers-typed.ts
index 545a697a6ed..34efaf0c780 100644
--- a/frontend/src/metabase/query_builder/reducers-typed.ts
+++ b/frontend/src/metabase/query_builder/reducers-typed.ts
@@ -24,6 +24,7 @@ import {
// the card that is actively being worked on
export const card = createReducer<Card | null>(null, (builder) => {
+ // @ts-expect-error — Draft<Card> triggers TS2589 due to Card's recursive types (StructuredQuery, Field, etc.)
builder
.addCase(RESET_QB, () => null)
.addCase(CLOSE_QB, () => null)
diff --git a/frontend/src/metabase/querying/common/components/FieldValuePicker/types.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/types.ts
index f1f6da0d718..25fa0a3ddbd 100644
--- a/frontend/src/metabase/querying/common/components/FieldValuePicker/types.ts
+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/types.ts
@@ -11,6 +11,7 @@ export type UseGetFieldValuesArgs = {
export type UseGetFieldValuesResult = {
data?: FieldValuesResponse | undefined;
+ isFetching: boolean;
isLoading: boolean;
};
@@ -24,6 +25,7 @@ export type UseSearchFieldValuesResult = {
data?: FieldValue[];
error?: unknown;
isFetching: boolean;
+ isLoading: boolean;
};
export type UseGetRemappedFieldValueArgs = {
@@ -33,4 +35,6 @@ export type UseGetRemappedFieldValueArgs = {
export type UseGetRemappedFieldValueResult = {
data?: FieldValue | undefined;
+ isFetching: boolean;
+ isLoading: boolean;
};
diff --git a/frontend/src/metabase/querying/common/types.ts b/frontend/src/metabase/querying/common/types.ts
index b0a98a20168..92507d57ddd 100644
--- a/frontend/src/metabase/querying/common/types.ts
+++ b/frontend/src/metabase/querying/common/types.ts
@@ -1,3 +1,5 @@
+import type { DateFormattingSettings } from "metabase-types/api";
+
import type {
DATE_PICKER_DIRECTIONS,
DATE_PICKER_EXTRACTION_UNITS,
@@ -92,3 +94,8 @@ export type DateFilterValue =
| QuarterYearPickerValue;
export type BooleanFilterValue = "true" | "false" | "is-null" | "not-null";
+
+export type DateFilterDisplayOpts = {
+ withPrefix?: boolean;
+ formattingSettings?: DateFormattingSettings;
+};
diff --git a/frontend/src/metabase/querying/common/utils/dates.ts b/frontend/src/metabase/querying/common/utils/dates.ts
new file mode 100644
index 00000000000..c45de1f45f5
--- /dev/null
+++ b/frontend/src/metabase/querying/common/utils/dates.ts
@@ -0,0 +1,163 @@
+import dayjs from "dayjs";
+import { match } from "ts-pattern";
+import { c, msgid, ngettext, t } from "ttag";
+
+import { DEFAULT_TIME_STYLE } from "metabase/lib/formatting/datetime-utils";
+import type {
+ DateFilterDisplayOpts,
+ DateFilterValue,
+} from "metabase/querying/common/types";
+import type { ExcludeDateFilterUnit } from "metabase-lib";
+import * as Lib from "metabase-lib";
+import type { DateFormattingSettings } from "metabase-types/api";
+
+export type { DateFilterDisplayOpts } from "metabase/querying/common/types";
+
+export function getDateFilterDisplayName(
+ value: DateFilterValue,
+ { withPrefix, formattingSettings }: DateFilterDisplayOpts = {},
+) {
+ return match(value)
+ .with(
+ { type: "specific", operator: "=" },
+ ({ values: [date], hasTime }) => {
+ const dateText = formatDate(date, hasTime, formattingSettings);
+ return withPrefix
+ ? c("On a date. Example: On Jan 20.").t`On ${dateText}`
+ : dateText;
+ },
+ )
+ .with(
+ { type: "specific", operator: "<" },
+ ({ values: [date], hasTime }) => {
+ return c("Before a date. Example: Before Jan 20.")
+ .t`Before ${formatDate(date, hasTime, formattingSettings)}`;
+ },
+ )
+ .with(
+ { type: "specific", operator: ">" },
+ ({ values: [date], hasTime }) => {
+ return c("After a date. Example: After Jan 20.")
+ .t`After ${formatDate(date, hasTime, formattingSettings)}`;
+ },
+ )
+ .with(
+ { type: "specific", operator: "between" },
+ ({ values: [startDate, endDate], hasTime }) => {
+ return `${formatDate(startDate, hasTime, formattingSettings)} - ${formatDate(endDate, hasTime, formattingSettings)}`;
+ },
+ )
+ .with(
+ { type: "relative" },
+ ({ value, unit, offsetValue, offsetUnit, options }) => {
+ if (offsetValue != null && offsetUnit != null) {
+ const prefix = Lib.describeTemporalInterval(value, unit);
+ const suffix = Lib.describeRelativeDatetime(offsetValue, offsetUnit);
+ return `${prefix}, ${suffix}`;
+ } else {
+ return Lib.describeTemporalInterval(value, unit, {
+ "include-current": options?.includeCurrent,
+ });
+ }
+ },
+ )
+ .with({ type: "exclude", operator: "!=" }, ({ values, unit }) => {
+ if (values.length <= 2 && unit != null) {
+ const parts = values.map((value) => formatExcludeUnit(value, unit));
+ return t`Exclude ${parts.join(", ")}`;
+ } else {
+ const count = values.length;
+ return ngettext(
+ msgid`Exclude ${count} selection`,
+ `Exclude ${count} selections`,
+ count,
+ );
+ }
+ })
+ .with({ type: "exclude", operator: "is-null" }, () => {
+ return t`Is empty`;
+ })
+ .with({ type: "exclude", operator: "not-null" }, () => {
+ return t`Not empty`;
+ })
+ .with({ type: "month" }, ({ month, year }) => {
+ return formatMonth(month, year, formattingSettings);
+ })
+ .with({ type: "quarter" }, ({ quarter, year }) => {
+ return formatQuarter(quarter, year);
+ })
+ .exhaustive();
+}
+
+export function formatDate(
+ date: Date,
+ hasTime: boolean,
+ formattingSettings: DateFormattingSettings = {},
+) {
+ const format = formattingSettingsToFormatString(formattingSettings, hasTime);
+ return dayjs(date).format(format);
+}
+
+function formattingSettingsToFormatString(
+ formattingSettings: DateFormattingSettings = {},
+ hasTime: boolean = false,
+) {
+ const { date_style = "LL", time_style = DEFAULT_TIME_STYLE } =
+ formattingSettings;
+
+ const format = hasTime ? `${date_style} ${time_style}` : date_style;
+ return abbreviateFormat(format, formattingSettings);
+}
+
+function abbreviateFormat(
+ format: string,
+ formattingSettings: DateFormattingSettings = {},
+) {
+ if (!formattingSettings.date_abbreviate) {
+ return format;
+ }
+ return format.replace(/MMMM/, "MMM").replace(/dddd/, "ddd");
+}
+
+function formatMonth(
+ month: number,
+ year: number,
+ formattingSettings: DateFormattingSettings = {},
+) {
+ return dayjs()
+ .year(year)
+ .month(month - 1)
+ .format(abbreviateFormat("MMMM YYYY", formattingSettings));
+}
+
+function formatQuarter(quarter: number, year: number) {
+ return dayjs()
+ .year(year)
+ .quarter(quarter)
+ .format(
+ c(
+ 'This is a "dayjs" format string (https://day.js.org/docs/en/plugin/advanced-format). It should include "Q" for the quarter number, YYYY for the year, and raw text can be escaped by brackets. For example, "[Quarter] Q YYYY" will be rendered as "Quarter 1 2024".',
+ ).t`[Q]Q YYYY`,
+ );
+}
+
+function formatExcludeUnit(value: number, unit: ExcludeDateFilterUnit) {
+ switch (unit) {
+ case "hour-of-day":
+ return dayjs().hour(value).format("h A");
+ case "day-of-week":
+ return dayjs().isoWeekday(value).format("dddd");
+ case "month-of-year":
+ return dayjs()
+ .month(value - 1)
+ .format("MMMM");
+ case "quarter-of-year":
+ return dayjs()
+ .quarter(value)
+ .format(
+ c(
+ 'This is a "dayjs" format string (https://day.js.org/docs/en/plugin/advanced-format). It should include "Q" for the quarter number, and raw text can be escaped by brackets. For example, "[Quarter] Q" will be rendered as "Quarter 1".',
+ ).t`[Q]Q`,
+ );
+ }
+}
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
index 6c1199f17c1..495799c5af4 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx
@@ -2,7 +2,6 @@ import type { FormEvent } from "react";
import { useMemo } from "react";
import { BooleanPicker } from "metabase/querying/common/components/BooleanPicker";
-import { useBooleanFilter } from "metabase/querying/filters/hooks/use-boolean-filter";
import { Box } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -11,6 +10,8 @@ import { FilterPickerHeader } from "../FilterPickerHeader";
import { WIDTH } from "../constants";
import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";
+import { useBooleanFilter } from "./hooks";
+
export function BooleanFilterPicker({
query,
stageIndex,
diff --git a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-boolean-filter/utils.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/utils.ts
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
index b9579981291..331fd4b69dc 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
@@ -4,10 +4,6 @@ import { t } from "ttag";
import { isNotNull } from "metabase/lib/types";
import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
-import {
- type NumberOrEmptyValue,
- useCoordinateFilter,
-} from "metabase/querying/filters/hooks/use-coordinate-filter";
import { Box, Flex, Stack, Text } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -19,6 +15,8 @@ import { COMBOBOX_PROPS, WIDTH } from "../constants";
import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";
import { CoordinateColumnPicker } from "./CoordinateColumnPicker";
+import { useCoordinateFilter } from "./hooks";
+import type { NumberOrEmptyValue } from "./types";
export function CoordinateFilterPicker({
autoFocus,
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/constants.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/constants.ts
new file mode 100644
index 00000000000..fd72f518c63
--- /dev/null
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/constants.ts
@@ -0,0 +1,43 @@
+import type * as Lib from "metabase-lib";
+
+import type { CoordinateFilterOperatorInfo } from "./types";
+
+export const OPERATORS: Record<
+ Lib.CoordinateFilterOperator,
+ CoordinateFilterOperatorInfo
+> = {
+ "=": {
+ operator: "=",
+ valueCount: 1,
+ hasMultipleValues: true,
+ },
+ "!=": {
+ operator: "!=",
+ valueCount: 1,
+ hasMultipleValues: true,
+ },
+ inside: {
+ operator: "inside",
+ valueCount: 4,
+ },
+ ">": {
+ operator: ">",
+ valueCount: 1,
+ },
+ "<": {
+ operator: "<",
+ valueCount: 1,
+ },
+ between: {
+ operator: "between",
+ valueCount: 2,
+ },
+ ">=": {
+ operator: ">=",
+ valueCount: 1,
+ },
+ "<=": {
+ operator: "<=",
+ valueCount: 1,
+ },
+};
diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/types.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/types.ts
similarity index 92%
rename from frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/types.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/types.ts
index 892f64e665e..003f9eac5cc 100644
--- a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/types.ts
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/types.ts
@@ -1,7 +1,7 @@
import type { FilterOperatorOption } from "metabase/querying/filters/types";
import type * as Lib from "metabase-lib";
-type CoordinatePickerOperator =
+export type CoordinatePickerOperator =
| "="
| "!="
| ">"
diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/utils.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/utils.ts
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
index 97f7e7e98b2..10ccf00cecf 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx
@@ -4,14 +4,16 @@ import { useLocale } from "metabase/common/hooks";
import { useTranslateContent } from "metabase/i18n/hooks";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { DatePicker } from "metabase/querying/common/components/DatePicker";
+import { SimpleDatePicker } from "metabase/querying/common/components/DatePicker/SimpleDatePicker";
import type { DatePickerValue } from "metabase/querying/common/types";
-import { useDateFilter } from "metabase/querying/filters/hooks/use-date-filter";
import { PopoverBackButton } from "metabase/ui";
import * as Lib from "metabase-lib";
import { FilterSubmitButton } from "../FilterSubmitButton";
import type { FilterPickerWidgetProps } from "../types";
+import { useDateFilter } from "./hooks";
+
export function DateFilterPicker({
query,
stageIndex,
@@ -87,3 +89,44 @@ export function DateFilterPicker({
</div>
);
}
+
+interface SimpleDateFilterPickerProps {
+ query: Lib.Query;
+ stageIndex: number;
+ column: Lib.ColumnMetadata;
+ filter?: Lib.FilterClause;
+ onChange: (filter: Lib.ExpressionClause | undefined) => void;
+}
+
+export function SimpleDateFilterPicker({
+ query,
+ stageIndex,
+ column,
+ filter,
+ onChange,
+}: SimpleDateFilterPickerProps) {
+ const { value, availableUnits, getFilterClause } = useDateFilter({
+ query,
+ stageIndex,
+ column,
+ filter,
+ });
+
+ const handleChange = (value: DatePickerValue | undefined) => {
+ if (value) {
+ onChange(getFilterClause(value));
+ } else {
+ onChange(undefined);
+ }
+ };
+
+ return (
+ <div data-testid="date-filter-picker">
+ <SimpleDatePicker
+ value={value}
+ availableUnits={availableUnits}
+ onChange={handleChange}
+ />
+ </div>
+ );
+}
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/SimpleDateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/SimpleDateFilterPicker.tsx
deleted file mode 100644
index ab6fd3b4935..00000000000
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/SimpleDateFilterPicker.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { SimpleDatePicker } from "metabase/querying/common/components/DatePicker/SimpleDatePicker";
-import type { DatePickerValue } from "metabase/querying/common/types";
-import { useDateFilter } from "metabase/querying/filters/hooks/use-date-filter";
-import type * as Lib from "metabase-lib";
-
-interface SimpleDateFilterPickerProps {
- query: Lib.Query;
- stageIndex: number;
- column: Lib.ColumnMetadata;
- filter?: Lib.FilterClause;
- onChange: (filter: Lib.ExpressionClause | undefined) => void;
-}
-
-export function SimpleDateFilterPicker({
- query,
- stageIndex,
- column,
- filter,
- onChange,
-}: SimpleDateFilterPickerProps) {
- const { value, availableUnits, getFilterClause } = useDateFilter({
- query,
- stageIndex,
- column,
- filter,
- });
-
- const handleChange = (value: DatePickerValue | undefined) => {
- if (value) {
- onChange(getFilterClause(value));
- } else {
- onChange(undefined);
- }
- };
-
- return (
- <div data-testid="date-filter-picker">
- <SimpleDatePicker
- value={value}
- availableUnits={availableUnits}
- onChange={handleChange}
- />
- </div>
- );
-}
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/index.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/index.ts
deleted file mode 100644
index d9d2e8832e9..00000000000
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./SimpleDateFilterPicker";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
index f74df006660..61b3642d8fb 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx
@@ -1,7 +1,6 @@
import type { FormEvent } from "react";
import { useMemo } from "react";
-import { useDefaultFilter } from "metabase/querying/filters/hooks/use-default-filter";
import { Box, Radio, Stack } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -10,6 +9,8 @@ import { FilterPickerHeader } from "../FilterPickerHeader";
import { WIDTH } from "../constants";
import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";
+import { useDefaultFilter } from "./hooks";
+
export function DefaultFilterPicker({
query,
stageIndex,
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/constants.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/constants.ts
new file mode 100644
index 00000000000..827b1341ebf
--- /dev/null
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/constants.ts
@@ -0,0 +1,15 @@
+import type * as Lib from "metabase-lib";
+
+import type { DefaultFilterOperatorInfo } from "./types";
+
+export const OPERATORS: Record<
+ Lib.DefaultFilterOperator,
+ DefaultFilterOperatorInfo
+> = {
+ "is-null": {
+ operator: "is-null",
+ },
+ "not-null": {
+ operator: "not-null",
+ },
+};
diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/types.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-default-filter/types.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/types.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-default-filter/utils.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/utils.ts
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
index 5eff5913bb8..d31a0e89e78 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
@@ -4,10 +4,6 @@ import { t } from "ttag";
import { isNotNull } from "metabase/lib/types";
import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
-import {
- type NumberOrEmptyValue,
- useNumberFilter,
-} from "metabase/querying/filters/hooks/use-number-filter";
import { Box, Flex, Text } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -18,6 +14,8 @@ import { NumberFilterValuePicker } from "../FilterValuePicker";
import { COMBOBOX_PROPS, WIDTH } from "../constants";
import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";
+import { type NumberOrEmptyValue, useNumberFilter } from "./hooks";
+
export function NumberFilterPicker({
autoFocus,
query,
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/constants.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/constants.ts
new file mode 100644
index 00000000000..6141f3a8b97
--- /dev/null
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/constants.ts
@@ -0,0 +1,47 @@
+import type * as Lib from "metabase-lib";
+
+import type { NumberFilterOperatorInfo } from "./types";
+
+export const OPERATORS: Record<
+ Lib.NumberFilterOperator,
+ NumberFilterOperatorInfo
+> = {
+ "=": {
+ operator: "=",
+ valueCount: 1,
+ hasMultipleValues: true,
+ },
+ "!=": {
+ operator: "!=",
+ valueCount: 1,
+ hasMultipleValues: true,
+ },
+ ">": {
+ operator: ">",
+ valueCount: 1,
+ },
+ "<": {
+ operator: "<",
+ valueCount: 1,
+ },
+ between: {
+ operator: "between",
+ valueCount: 2,
+ },
+ ">=": {
+ operator: ">=",
+ valueCount: 1,
+ },
+ "<=": {
+ operator: "<=",
+ valueCount: 1,
+ },
+ "is-null": {
+ operator: "is-null",
+ valueCount: 0,
+ },
+ "not-null": {
+ operator: "not-null",
+ valueCount: 0,
+ },
+};
diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/hooks.ts
similarity index 96%
rename from frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/hooks.ts
index e6a4daef436..39907bdd8e8 100644
--- a/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.ts
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/hooks.ts
@@ -3,6 +3,7 @@ import { useMemo, useState } from "react";
import * as Lib from "metabase-lib";
import type { NumberOrEmptyValue } from "./types";
+export type { NumberOrEmptyValue } from "./types";
import {
getAvailableOptions,
getDefaultOperator,
diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/types.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-number-filter/types.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/types.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-number-filter/utils.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/utils.ts
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
index 0b944f9bb04..a9668637ca8 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx
@@ -2,10 +2,6 @@ import type { FormEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
-import {
- type OperatorType,
- useStringFilter,
-} from "metabase/querying/filters/hooks/use-string-filter";
import { Box, Checkbox, Flex, MultiAutocomplete } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -16,6 +12,9 @@ import { StringFilterValuePicker } from "../FilterValuePicker";
import { COMBOBOX_PROPS, WIDTH } from "../constants";
import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";
+import { useStringFilter } from "./hooks";
+import type { OperatorType } from "./types";
+
export function StringFilterPicker({
autoFocus,
query,
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/constants.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/constants.ts
new file mode 100644
index 00000000000..16e269eac8d
--- /dev/null
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/constants.ts
@@ -0,0 +1,41 @@
+import type * as Lib from "metabase-lib";
+
+import type { StringFilterOperatorInfo } from "./types";
+
+export const OPERATORS: Record<
+ Lib.StringFilterOperator,
+ StringFilterOperatorInfo
+> = {
+ "=": {
+ operator: "=",
+ type: "exact",
+ },
+ "!=": {
+ operator: "!=",
+ type: "exact",
+ },
+ contains: {
+ operator: "contains",
+ type: "partial",
+ },
+ "does-not-contain": {
+ operator: "does-not-contain",
+ type: "partial",
+ },
+ "starts-with": {
+ operator: "starts-with",
+ type: "partial",
+ },
+ "ends-with": {
+ operator: "ends-with",
+ type: "partial",
+ },
+ "is-empty": {
+ operator: "is-empty",
+ type: "empty",
+ },
+ "not-empty": {
+ operator: "not-empty",
+ type: "empty",
+ },
+};
diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/types.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-string-filter/types.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/types.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-string-filter/utils.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/utils.ts
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
index a4f91ad8173..097eee81ba1 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.tsx
@@ -2,10 +2,6 @@ import type { FormEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
-import {
- type TimeValue,
- useTimeFilter,
-} from "metabase/querying/filters/hooks/use-time-filter";
import { Box, Flex, Text, TimeInput } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -15,6 +11,9 @@ import { FilterPickerHeader } from "../FilterPickerHeader";
import { WIDTH } from "../constants";
import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";
+import { useTimeFilter } from "./hooks";
+import type { TimeValue } from "./types";
+
export function TimeFilterPicker({
autoFocus,
query,
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/constants.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/constants.ts
new file mode 100644
index 00000000000..ce2e3922668
--- /dev/null
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/constants.ts
@@ -0,0 +1,27 @@
+import type * as Lib from "metabase-lib";
+
+import type { TimeFilterOperatorInfo } from "./types";
+
+export const OPERATORS: Record<Lib.TimeFilterOperator, TimeFilterOperatorInfo> =
+ {
+ "<": {
+ operator: "<",
+ valueCount: 1,
+ },
+ ">": {
+ operator: ">",
+ valueCount: 1,
+ },
+ between: {
+ operator: "between",
+ valueCount: 2,
+ },
+ "is-null": {
+ operator: "is-null",
+ valueCount: 0,
+ },
+ "not-null": {
+ operator: "not-null",
+ valueCount: 0,
+ },
+ };
diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/hooks.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/hooks.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/types.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/types.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-time-filter/types.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/types.ts
diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/utils.ts
similarity index 100%
rename from frontend/src/metabase/querying/filters/hooks/use-time-filter/utils.ts
rename to frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/utils.ts
diff --git a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsx
index 16c82a987c9..b930b5c3732 100644
--- a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsx
@@ -1,7 +1,7 @@
import { useMemo, useState } from "react";
import { t } from "ttag";
-import { SimpleDateFilterPicker } from "metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker";
+import { SimpleDateFilterPicker } from "metabase/querying/filters/components/FilterPicker/DateFilterPicker";
import { Button, Icon, Popover } from "metabase/ui";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/index.ts b/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/index.ts
deleted file mode 100644
index 75349624077..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./use-boolean-filter";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.unit.spec.ts
deleted file mode 100644
index 6edfafc56de..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.unit.spec.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { act, renderHook } from "@testing-library/react";
-
-import { createMockMetadata } from "__support__/metadata";
-import type { BooleanFilterValue } from "metabase/querying/common/types";
-import * as Lib from "metabase-lib";
-import {
- DEFAULT_TEST_QUERY,
- columnFinder,
- createMetadataProvider,
-} from "metabase-lib/test-helpers";
-import { createMockField } from "metabase-types/api/mocks";
-import {
- ORDERS_ID,
- createOrdersIdField,
- createOrdersTable,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import { useBooleanFilter } from "./use-boolean-filter";
-
-interface CreateFilterCase {
- value: BooleanFilterValue;
- expectedDisplayName: string;
-}
-
-interface UpdateFilterCase {
- expression: Lib.ExpressionClause;
- value: BooleanFilterValue;
- expectedDisplayName: string;
-}
-
-const BOOLEAN_FIELD = createMockField({
- id: 102,
- table_id: ORDERS_ID,
- name: "IS_TRIAL",
- display_name: "Is trial",
- base_type: "type/Boolean",
- effective_type: "type/Boolean",
- semantic_type: "type/Category",
-});
-
-const METADATA = createMockMetadata({
- databases: [
- createSampleDatabase({
- tables: [
- createOrdersTable({
- fields: [createOrdersIdField(), BOOLEAN_FIELD],
- }),
- ],
- }),
- ],
-});
-
-const PROVIDER = createMetadataProvider({ metadata: METADATA });
-
-describe("useBooleanOptionFilter", () => {
- const defaultQuery = Lib.createTestQuery(PROVIDER, DEFAULT_TEST_QUERY);
- const stageIndex = 0;
- const availableColumns = Lib.filterableColumns(defaultQuery, stageIndex);
- const column = columnFinder(defaultQuery, availableColumns)(
- "ORDERS",
- BOOLEAN_FIELD.name,
- );
-
- it.each<CreateFilterCase>([
- { value: "true", expectedDisplayName: "Is trial is true" },
- { value: "false", expectedDisplayName: "Is trial is false" },
- { value: "is-null", expectedDisplayName: "Is trial is empty" },
- { value: "not-null", expectedDisplayName: "Is trial is not empty" },
- ])(
- 'should allow to create a filter for "$optionType"',
- ({ value, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useBooleanFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setValue } = result.current;
- setValue(value);
- });
-
- const { getFilterClause } = result.current;
- const newFilter = getFilterClause();
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<UpdateFilterCase>([
- {
- expression: Lib.booleanFilterClause({
- operator: "=",
- column,
- values: [true],
- }),
- value: "false",
- expectedDisplayName: "Is trial is false",
- },
- {
- expression: Lib.booleanFilterClause({
- operator: "=",
- column,
- values: [true],
- }),
- value: "is-null",
- expectedDisplayName: "Is trial is empty",
- },
- ])(
- 'should allow to update a filter for "$optionType"',
- ({ expression, value, expectedDisplayName }) => {
- const query = Lib.filter(defaultQuery, stageIndex, expression);
- const [filter] = Lib.filters(query, stageIndex);
-
- const { result } = renderHook(() =>
- useBooleanFilter({
- query: defaultQuery,
- stageIndex,
- column,
- filter,
- }),
- );
-
- act(() => {
- const { setValue } = result.current;
- setValue(value);
- });
-
- const { getFilterClause } = result.current;
- const newFilter = getFilterClause();
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-});
diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/index.ts b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/index.ts
deleted file mode 100644
index 65ca9123e4d..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./use-coordinate-filter";
-export * from "./types";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.unit.spec.ts
deleted file mode 100644
index 997bde5f24e..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.unit.spec.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-import { act, renderHook } from "@testing-library/react";
-
-import { checkNotNull } from "metabase/lib/types";
-import * as Lib from "metabase-lib";
-import { SAMPLE_PROVIDER, columnFinder } from "metabase-lib/test-helpers";
-import { PEOPLE_ID } from "metabase-types/api/mocks/presets";
-
-import type { NumberOrEmptyValue } from "./types";
-import { useCoordinateFilter } from "./use-coordinate-filter";
-
-interface CreateFilterCase {
- operator: Lib.CoordinateFilterOperator;
- values: number[];
- expectedDisplayName: string;
-}
-
-interface UpdateFilterCase {
- operator: Lib.CoordinateFilterOperator;
- expression: Lib.ExpressionClause;
- values: number[];
- expectedDisplayName: string;
-}
-
-interface CoerceFilterCase {
- operator: Lib.CoordinateFilterOperator;
- values: NumberOrEmptyValue[];
- expectedDisplayName: string;
-}
-
-interface ValidateFilterCase {
- operator: Lib.CoordinateFilterOperator;
- values: NumberOrEmptyValue[];
-}
-
-describe("useCoordinateFilter", () => {
- const defaultQuery = Lib.createTestQuery(SAMPLE_PROVIDER, {
- stages: [
- {
- source: {
- type: "table",
- id: PEOPLE_ID,
- },
- },
- ],
- });
- const stageIndex = 0;
- const availableColumns = Lib.filterableColumns(defaultQuery, stageIndex);
- const latitudeColumn = columnFinder(defaultQuery, availableColumns)(
- "PEOPLE",
- "LATITUDE",
- );
- const longitudeColumn = columnFinder(defaultQuery, availableColumns)(
- "PEOPLE",
- "LONGITUDE",
- );
-
- it.each<CreateFilterCase>([
- {
- operator: "=",
- values: [10, 20],
- expectedDisplayName: "Latitude is equal to 2 selections",
- },
- {
- operator: "!=",
- values: [10],
- expectedDisplayName: "Latitude is not equal to 10",
- },
- {
- operator: ">",
- values: [10],
- expectedDisplayName: "Latitude is greater than 10",
- },
- ])(
- 'should allow to create a filter for "$operator" operator',
- ({ operator: newOperator, values: newValues, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useCoordinateFilter({
- query: defaultQuery,
- stageIndex,
- column: latitudeColumn,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(
- getFilterClause(operator, longitudeColumn, values),
- );
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<UpdateFilterCase>([
- {
- expression: Lib.coordinateFilterClause({
- operator: "=",
- column: latitudeColumn,
- longitudeColumn,
- values: [10],
- }),
- operator: "=",
- values: [20],
- expectedDisplayName: "Latitude is equal to 20",
- },
- ])(
- 'should allow to update a filter for "$operator" operator',
- ({ expression, values: newValues, expectedDisplayName }) => {
- const query = Lib.filter(defaultQuery, stageIndex, expression);
- const [filter] = Lib.filters(query, stageIndex);
-
- const { result } = renderHook(() =>
- useCoordinateFilter({
- query,
- stageIndex,
- column: latitudeColumn,
- filter,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues(newValues);
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(
- getFilterClause(operator, longitudeColumn, values),
- );
- expect(Lib.displayInfo(query, stageIndex, newFilter)).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<CoerceFilterCase>([
- {
- operator: "between",
- values: [20, 10],
- expectedDisplayName: "Latitude is between 10 and 20",
- },
- {
- operator: "between",
- values: [10, null],
- expectedDisplayName: "Latitude is greater than or equal to 10",
- },
- {
- operator: "between",
- values: [null, 10],
- expectedDisplayName: "Latitude is less than or equal to 10",
- },
- {
- operator: "inside",
- values: [-90, 180, 90, -180],
- expectedDisplayName:
- "Latitude is between -90 and 90 and Longitude is between -180 and 180",
- },
- ])(
- 'should allow to coerce a filter for "$operator" operator',
- ({ operator, values, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useCoordinateFilter({
- query: defaultQuery,
- stageIndex,
- column: latitudeColumn,
- }),
- );
-
- const { getFilterClause } = result.current;
- const newFilter = checkNotNull(
- getFilterClause(operator, longitudeColumn, values),
- );
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<ValidateFilterCase>([
- {
- operator: "=",
- values: [],
- },
- {
- operator: ">",
- values: [null],
- },
- {
- operator: "between",
- values: [null, null],
- },
- {
- operator: "inside",
- values: [null, null, null, null],
- },
- ])(
- 'should validate values for "$operator" operator',
- ({ operator: newOperator, values: newValues }) => {
- const { result } = renderHook(() =>
- useCoordinateFilter({
- query: defaultQuery,
- stageIndex,
- column: latitudeColumn,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, isValid, getFilterClause } = result.current;
- expect(isValid).toBeFalsy();
- expect(
- getFilterClause(operator, longitudeColumn, values),
- ).toBeUndefined();
- },
- );
-
- it("should preserve values when switching operators", () => {
- const { result } = renderHook(() =>
- useCoordinateFilter({
- query: defaultQuery,
- stageIndex,
- column: latitudeColumn,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues([10]);
- });
-
- act(() => {
- const { values, getDefaultValues, setOperator, setValues } =
- result.current;
- const newOperator = "!=";
- setOperator(newOperator);
- setValues(getDefaultValues(newOperator, values));
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(
- getFilterClause(operator, longitudeColumn, values),
- );
- expect(Lib.displayInfo(defaultQuery, stageIndex, newFilter)).toMatchObject({
- displayName: "Latitude is not equal to 10",
- });
- });
-
- it('should use "between" operator for new filters', () => {
- const { result } = renderHook(() =>
- useCoordinateFilter({
- query: defaultQuery,
- stageIndex,
- column: latitudeColumn,
- }),
- );
-
- const { operator } = result.current;
- expect(operator).toBe("between");
- });
-});
diff --git a/frontend/src/metabase/querying/filters/hooks/use-date-filter/index.ts b/frontend/src/metabase/querying/filters/hooks/use-date-filter/index.ts
deleted file mode 100644
index d17d73e5dda..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-date-filter/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./use-date-filter";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.unit.spec.ts
deleted file mode 100644
index 74bdc3743d1..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.unit.spec.ts
+++ /dev/null
@@ -1,358 +0,0 @@
-import { renderHook } from "@testing-library/react";
-
-import type { DatePickerValue } from "metabase/querying/common/types";
-import * as Lib from "metabase-lib";
-import {
- DEFAULT_TEST_QUERY,
- SAMPLE_PROVIDER,
- columnFinder,
-} from "metabase-lib/test-helpers";
-import { ORDERS_ID } from "metabase-types/api/mocks/presets";
-
-import { useDateFilter } from "./use-date-filter";
-
-describe("useDateFilter", () => {
- const defaultQuery = Lib.createTestQuery(SAMPLE_PROVIDER, DEFAULT_TEST_QUERY);
- const stageIndex = 0;
- const availableColumns = Lib.filterableColumns(defaultQuery, stageIndex);
- const defaultColumn = columnFinder(defaultQuery, availableColumns)(
- "ORDERS",
- "CREATED_AT",
- );
- const testCases = getTestCases(defaultQuery, stageIndex, defaultColumn);
-
- it.each(testCases)(
- "should allow to create a filter: $expectedDisplayName",
- ({ value, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useDateFilter({
- query: defaultQuery,
- stageIndex,
- column: defaultColumn,
- }),
- );
-
- const { getFilterClause } = result.current;
- const newFilter = getFilterClause(value);
-
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each(testCases)(
- "should allow to update a filter: $expectedDisplayName",
- ({ value, expression }) => {
- const query = Lib.filter(defaultQuery, stageIndex, expression);
- const [filter] = Lib.filters(query, stageIndex);
-
- const { result } = renderHook(() =>
- useDateFilter({
- query,
- stageIndex,
- column: defaultColumn,
- filter,
- }),
- );
-
- expect(result.current.value).toEqual(value);
- },
- );
-
- it("should return available units for a regular column", () => {
- const { result } = renderHook(() =>
- useDateFilter({
- query: defaultQuery,
- stageIndex,
- column: defaultColumn,
- }),
- );
-
- const { availableUnits } = result.current;
- expect(availableUnits.length).toBeGreaterThan(0);
- });
-
- it("should return available units for a custom column", () => {
- const query = Lib.createTestQuery(SAMPLE_PROVIDER, {
- stages: [
- {
- source: { type: "table", id: ORDERS_ID },
- expressions: [
- {
- name: "CustomDate",
- value: {
- type: "operator",
- operator: "=",
- args: [
- { type: "column", name: "CREATED_AT", sourceName: "ORDERS" },
- ],
- },
- },
- ],
- },
- ],
- });
- const column = columnFinder(
- query,
- Lib.filterableColumns(query, stageIndex),
- )(null, "CustomDate");
-
- const { result } = renderHook(() =>
- useDateFilter({
- query,
- stageIndex,
- column,
- }),
- );
-
- const { availableUnits } = result.current;
- expect(availableUnits.length).toBe(0);
- });
-});
-
-interface TestCase {
- value: DatePickerValue;
- expression: Lib.ExpressionClause;
- expectedDisplayName: string;
-}
-
-function getTestCases(
- query: Lib.Query,
- stageIndex: number,
- column: Lib.ColumnMetadata,
-): TestCase[] {
- const date1 = new Date(2020, 0, 1);
- const date2 = new Date(2020, 2, 3);
-
- return [
- {
- value: {
- type: "specific",
- operator: "=",
- values: [date1],
- hasTime: false,
- },
- expression: Lib.specificDateFilterClause({
- operator: "=",
- column,
- values: [date1],
- hasTime: false,
- }),
- expectedDisplayName: "Created At is on Jan 1, 2020",
- },
- {
- value: {
- type: "specific",
- operator: "<",
- values: [date1],
- hasTime: false,
- },
- expression: Lib.specificDateFilterClause({
- operator: "<",
- column,
- values: [date1],
- hasTime: false,
- }),
- expectedDisplayName: "Created At is before Jan 1, 2020",
- },
- {
- value: {
- type: "specific",
- operator: ">",
- values: [date1],
- hasTime: false,
- },
- expression: Lib.specificDateFilterClause({
- operator: ">",
- column,
- values: [date1],
- hasTime: false,
- }),
- expectedDisplayName: "Created At is after Jan 1, 2020",
- },
- {
- value: {
- type: "specific",
- operator: "between",
- values: [date1, date2],
- hasTime: false,
- },
- expression: Lib.specificDateFilterClause({
- operator: "between",
- column,
- values: [date1, date2],
- hasTime: false,
- }),
- expectedDisplayName: "Created At is Jan 1 – Mar 3, 2020",
- },
- {
- value: {
- type: "relative",
- value: -10,
- unit: "month",
- offsetValue: undefined,
- offsetUnit: undefined,
- options: {},
- },
- expression: Lib.relativeDateFilterClause({
- column,
- value: -10,
- unit: "month",
- offsetValue: null,
- offsetUnit: null,
- options: {},
- }),
- expectedDisplayName: "Created At is in the previous 10 months",
- },
- {
- value: {
- type: "relative",
- value: 10,
- unit: "month",
- offsetValue: undefined,
- offsetUnit: undefined,
- options: {},
- },
- expression: Lib.relativeDateFilterClause({
- column,
- value: 10,
- unit: "month",
- offsetValue: null,
- offsetUnit: null,
- options: {},
- }),
- expectedDisplayName: "Created At is in the next 10 months",
- },
- {
- value: {
- type: "relative",
- value: -10,
- unit: "month",
- offsetValue: -2,
- offsetUnit: "year",
- options: {},
- },
- expression: Lib.relativeDateFilterClause({
- column,
- value: -10,
- unit: "month",
- offsetValue: -2,
- offsetUnit: "year",
- options: {},
- }),
- expectedDisplayName:
- "Created At is in the previous 10 months, starting 2 years ago",
- },
- {
- value: {
- type: "relative",
- value: 10,
- unit: "month",
- offsetValue: 2,
- offsetUnit: "year",
- options: {},
- },
- expression: Lib.relativeDateFilterClause({
- column,
- value: 10,
- unit: "month",
- offsetValue: 2,
- offsetUnit: "year",
- options: {},
- }),
- expectedDisplayName:
- "Created At is in the next 10 months, starting 2 years from now",
- },
- {
- value: {
- type: "exclude",
- operator: "!=",
- unit: "hour-of-day",
- values: [10],
- },
- expression: Lib.excludeDateFilterClause({
- operator: "!=",
- column,
- unit: "hour-of-day",
- values: [10],
- }),
- expectedDisplayName: "Created At excludes the hour of 10 AM",
- },
- {
- value: {
- type: "exclude",
- operator: "!=",
- unit: "day-of-week",
- values: [2],
- },
- expression: Lib.excludeDateFilterClause({
- operator: "!=",
- column,
- unit: "day-of-week",
- values: [2],
- }),
- expectedDisplayName: "Created At excludes Tuesdays",
- },
- {
- value: {
- type: "exclude",
- operator: "!=",
- unit: "month-of-year",
- values: [3],
- },
- expression: Lib.excludeDateFilterClause({
- operator: "!=",
- column,
- unit: "month-of-year",
- values: [3],
- }),
- expectedDisplayName: "Created At excludes each Mar",
- },
- {
- value: {
- type: "exclude",
- operator: "!=",
- unit: "quarter-of-year",
- values: [2],
- },
- expression: Lib.excludeDateFilterClause({
- operator: "!=",
- column,
- unit: "quarter-of-year",
- values: [2],
- }),
- expectedDisplayName: "Created At excludes Q2 each year",
- },
- {
- value: {
- type: "exclude",
- operator: "is-null",
- values: [],
- },
- expression: Lib.excludeDateFilterClause({
- operator: "is-null",
- column,
- unit: null,
- values: [],
- }),
- expectedDisplayName: "Created At is empty",
- },
- {
- value: {
- type: "exclude",
- operator: "not-null",
- values: [],
- },
- expression: Lib.excludeDateFilterClause({
- operator: "not-null",
- column,
- unit: null,
- values: [],
- }),
- expectedDisplayName: "Created At is not empty",
- },
- ];
-}
diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/index.ts b/frontend/src/metabase/querying/filters/hooks/use-default-filter/index.ts
deleted file mode 100644
index ca5039f5592..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-default-filter/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./use-default-filter";
-export * from "./types";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.unit.spec.ts
deleted file mode 100644
index 0c93cf1bcb0..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.unit.spec.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import { act, renderHook } from "@testing-library/react";
-
-import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
-import * as Lib from "metabase-lib";
-import {
- DEFAULT_TEST_QUERY,
- columnFinder,
- createMetadataProvider,
-} from "metabase-lib/test-helpers";
-import { createMockField } from "metabase-types/api/mocks";
-import {
- ORDERS_ID,
- createOrdersIdField,
- createOrdersTable,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import { useDefaultFilter } from "./use-default-filter";
-
-interface CreateFilterCase {
- operator: Lib.DefaultFilterOperator;
- expectedDisplayName: string;
-}
-
-interface UpdateFilterCase {
- expression: Lib.ExpressionClause;
- operator: Lib.DefaultFilterOperator;
- expectedDisplayName: string;
-}
-
-const UNKNOWN_FIELD = createMockField({
- id: 102,
- table_id: ORDERS_ID,
- name: "UNKNOWN",
- display_name: "Unknown",
- base_type: "type/*",
- effective_type: "type/*",
- semantic_type: null,
-});
-
-const METADATA = createMockMetadata({
- databases: [
- createSampleDatabase({
- tables: [
- createOrdersTable({
- fields: [createOrdersIdField(), UNKNOWN_FIELD],
- }),
- ],
- }),
- ],
-});
-
-const PROVIDER = createMetadataProvider({ metadata: METADATA });
-
-describe("useDefaultFilter", () => {
- const defaultQuery = Lib.createTestQuery(PROVIDER, DEFAULT_TEST_QUERY);
- const stageIndex = 0;
- const availableColumns = Lib.filterableColumns(defaultQuery, stageIndex);
- const column = columnFinder(defaultQuery, availableColumns)(
- "ORDERS",
- UNKNOWN_FIELD.name,
- );
-
- it.each<CreateFilterCase>([
- {
- operator: "is-null",
- expectedDisplayName: `${UNKNOWN_FIELD.display_name} is empty`,
- },
- {
- operator: "not-null",
- expectedDisplayName: `${UNKNOWN_FIELD.display_name} is not empty`,
- },
- ])(
- 'should allow to create a filter for "$operator" operator',
- ({ operator: newOperator, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useDefaultFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setOperator } = result.current;
- setOperator(newOperator);
- });
-
- const { operator, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator));
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<UpdateFilterCase>([
- {
- expression: Lib.defaultFilterClause({
- operator: "is-null",
- column,
- }),
- operator: "not-null",
- expectedDisplayName: `${UNKNOWN_FIELD.display_name} is not empty`,
- },
- ])(
- 'should allow to update a filter for "$operator" operator',
- ({ expression, operator: newOperator, expectedDisplayName }) => {
- const query = Lib.filter(defaultQuery, stageIndex, expression);
- const [filter] = Lib.filters(query, stageIndex);
-
- const { result } = renderHook(() =>
- useDefaultFilter({
- query,
- stageIndex,
- column,
- filter,
- }),
- );
-
- act(() => {
- const { setOperator } = result.current;
- setOperator(newOperator);
- });
-
- const { operator, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator));
- expect(Lib.displayInfo(query, stageIndex, newFilter)).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it("should be invalid if the initial operator is not set", () => {
- const { result } = renderHook(() =>
- useDefaultFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- const { operator, getFilterClause } = result.current;
- expect(getFilterClause(operator)).toBeUndefined();
- });
-
- it("should be valid if the initial operator is set", () => {
- const { result } = renderHook(() =>
- useDefaultFilter({
- query: defaultQuery,
- stageIndex,
- column,
- hasInitialOperator: true,
- }),
- );
-
- const { operator, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator));
- expect(Lib.displayInfo(defaultQuery, stageIndex, newFilter)).toMatchObject({
- displayName: `${UNKNOWN_FIELD.display_name} is empty`,
- });
- });
-});
diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/index.ts b/frontend/src/metabase/querying/filters/hooks/use-number-filter/index.ts
deleted file mode 100644
index 5590def6c69..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-number-filter/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./use-number-filter";
-export * from "./types";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.unit.spec.ts
deleted file mode 100644
index a2d6deb0034..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.unit.spec.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-import { act, renderHook } from "@testing-library/react";
-
-import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
-import * as Lib from "metabase-lib";
-import {
- DEFAULT_TEST_QUERY,
- columnFinder,
- createMetadataProvider,
-} from "metabase-lib/test-helpers";
-import {
- createOrdersIdField,
- createOrdersProductIdField,
- createOrdersQuantityField,
- createOrdersTable,
- createOrdersTotalField,
- createProductsTable,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import type { NumberOrEmptyValue } from "./types";
-import { useNumberFilter } from "./use-number-filter";
-
-interface CreateFilterCase {
- operator: Lib.NumberFilterOperator;
- values: number[];
- expectedDisplayName: string;
-}
-
-interface UpdateFilterCase {
- operator: Lib.NumberFilterOperator;
- expression: Lib.ExpressionClause;
- values: number[];
- expectedDisplayName: string;
-}
-
-interface CoerceFilterCase {
- operator: Lib.NumberFilterOperator;
- values: NumberOrEmptyValue[];
- expectedDisplayName: string;
-}
-
-interface ValidateFilterCase {
- operator: Lib.NumberFilterOperator;
- values: NumberOrEmptyValue[];
-}
-
-interface DefaultOperatorCase {
- title: string;
- column: Lib.ColumnMetadata;
- expectedOperator: Lib.NumberFilterOperator;
-}
-
-const METADATA = createMockMetadata({
- databases: [
- createSampleDatabase({
- tables: [
- createOrdersTable({
- fields: [
- createOrdersIdField(),
- createOrdersProductIdField(),
- createOrdersTotalField(),
- createOrdersQuantityField({
- semantic_type: null,
- }),
- ],
- }),
- createProductsTable(),
- ],
- }),
- ],
-});
-
-const PROVIDER = createMetadataProvider({ metadata: METADATA });
-
-describe("useNumberFilter", () => {
- const defaultQuery = Lib.createTestQuery(PROVIDER, DEFAULT_TEST_QUERY);
- const stageIndex = 0;
- const availableColumns = Lib.filterableColumns(defaultQuery, stageIndex);
- const findColumn = columnFinder(defaultQuery, availableColumns);
- const column = findColumn("ORDERS", "TOTAL");
-
- it.each<CreateFilterCase>([
- {
- operator: "=",
- values: [10, 20],
- expectedDisplayName: "Total is equal to 2 selections",
- },
- {
- operator: "!=",
- values: [10],
- expectedDisplayName: "Total is not equal to 10",
- },
- {
- operator: ">",
- values: [10],
- expectedDisplayName: "Total is greater than 10",
- },
- ])(
- 'should allow to create a filter for "$operator" operator',
- ({ operator: newOperator, values: newValues, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useNumberFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<UpdateFilterCase>([
- {
- operator: "=",
- expression: Lib.numberFilterClause({
- operator: "=",
- column,
- values: [10],
- }),
- values: [20],
- expectedDisplayName: "Total is equal to 20",
- },
- ])(
- 'should allow to update a filter for "$operator" operator',
- ({ expression, values: newValues, expectedDisplayName }) => {
- const query = Lib.filter(defaultQuery, stageIndex, expression);
- const [filter] = Lib.filters(query, stageIndex);
-
- const { result } = renderHook(() =>
- useNumberFilter({
- query,
- stageIndex,
- column,
- filter,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues(newValues);
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(Lib.displayInfo(query, stageIndex, newFilter)).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<CoerceFilterCase>([
- {
- operator: "between",
- values: [20, 10],
- expectedDisplayName: "Total is between 10 and 20",
- },
- {
- operator: "between",
- values: [10, null],
- expectedDisplayName: "Total is greater than or equal to 10",
- },
- {
- operator: "between",
- values: [null, 10],
- expectedDisplayName: "Total is less than or equal to 10",
- },
- ])(
- 'should allow to coerce a filter for "$operator" operator',
- ({ operator, values, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useNumberFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- const { getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<ValidateFilterCase>([
- {
- operator: "=",
- values: [],
- },
- {
- operator: ">",
- values: [null],
- },
- {
- operator: "between",
- values: [null, null],
- },
- ])(
- 'should validate values for "$operator" operator',
- ({ operator: newOperator, values: newValues }) => {
- const { result } = renderHook(() =>
- useNumberFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, isValid, getFilterClause } = result.current;
- expect(isValid).toBeFalsy();
- expect(getFilterClause(operator, values)).toBeUndefined();
- },
- );
-
- it("should preserve values when switching operators", () => {
- const { result } = renderHook(() =>
- useNumberFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues([10]);
- });
-
- act(() => {
- const { values, getDefaultValues, setOperator, setValues } =
- result.current;
- const newOperator = "!=";
- setOperator(newOperator);
- setValues(getDefaultValues(newOperator, values));
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(Lib.displayInfo(defaultQuery, stageIndex, newFilter)).toMatchObject({
- displayName: "Total is not equal to 10",
- });
- });
-
- it.each<DefaultOperatorCase>([
- {
- title: "PK column",
- column: findColumn("ORDERS", "ID"),
- expectedOperator: "=",
- },
- {
- title: "FK column",
- column: findColumn("ORDERS", "PRODUCT_ID"),
- expectedOperator: "=",
- },
- {
- title: "column with field values",
- column: findColumn("ORDERS", "QUANTITY"),
- expectedOperator: "=",
- },
- {
- title: "regular column",
- column: findColumn("ORDERS", "TOTAL"),
- expectedOperator: "between",
- },
- ])(
- 'should use "$expectedOperator" operator for $title',
- ({ column, expectedOperator }) => {
- const { result } = renderHook(() =>
- useNumberFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- const { operator } = result.current;
- expect(operator).toBe(expectedOperator);
- },
- );
-});
diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/index.ts b/frontend/src/metabase/querying/filters/hooks/use-string-filter/index.ts
deleted file mode 100644
index 6991e18bc02..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-string-filter/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./use-string-filter";
-export * from "./types";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.unit.spec.ts
deleted file mode 100644
index 48152fa0466..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.unit.spec.ts
+++ /dev/null
@@ -1,313 +0,0 @@
-import { act, renderHook } from "@testing-library/react";
-
-import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
-import * as Lib from "metabase-lib";
-import {
- DEFAULT_TEST_QUERY,
- columnFinder,
- createMetadataProvider,
-} from "metabase-lib/test-helpers";
-import {
- createOrdersIdField,
- createOrdersProductIdField,
- createOrdersTable,
- createOrdersUserIdField,
- createPeopleTable,
- createProductsCategoryField,
- createProductsEanField,
- createProductsIdField,
- createProductsTable,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import { useStringFilter } from "./use-string-filter";
-
-interface CreateFilterCase {
- operator: Lib.StringFilterOperator;
- values: string[];
- expectedDisplayName: string;
-}
-
-interface UpdateFilterCase {
- operator: Lib.StringFilterOperator;
- expression: Lib.ExpressionClause;
- values: string[];
- expectedDisplayName: string;
-}
-
-interface ValidateFilterCase {
- operator: Lib.StringFilterOperator;
- values: string[];
-}
-
-interface DefaultOperatorCase {
- title: string;
- column: Lib.ColumnMetadata;
- expectedOperator: Lib.StringFilterOperator;
-}
-
-const METADATA = createMockMetadata({
- databases: [
- createSampleDatabase({
- tables: [
- createOrdersTable({
- fields: [
- createOrdersIdField({
- base_type: "type/Text",
- effective_type: "type/Text",
- }),
- createOrdersProductIdField({
- base_type: "type/Text",
- effective_type: "type/Text",
- }),
- createOrdersUserIdField(),
- ],
- }),
- createProductsTable({
- fields: [
- createProductsIdField({
- base_type: "type/Text",
- effective_type: "type/Text",
- }),
- createProductsCategoryField({
- semantic_type: null,
- }),
- createProductsEanField(),
- ],
- }),
- createPeopleTable(),
- ],
- }),
- ],
-});
-
-const PROVIDER = createMetadataProvider({ metadata: METADATA });
-
-describe("useStringFilter", () => {
- const defaultQuery = Lib.createTestQuery(PROVIDER, DEFAULT_TEST_QUERY);
- const stageIndex = 0;
- const availableColumns = Lib.filterableColumns(defaultQuery, stageIndex);
- const findColumn = columnFinder(defaultQuery, availableColumns);
- const column = findColumn("PRODUCTS", "CATEGORY");
-
- it.each<CreateFilterCase>([
- {
- operator: "=",
- values: ["Gadget", "Widget"],
- expectedDisplayName: "Category is 2 selections",
- },
- {
- operator: "!=",
- values: ["Gadget"],
- expectedDisplayName: "Category is not Gadget",
- },
- {
- operator: "contains",
- values: ["get"],
- expectedDisplayName: "Category contains get",
- },
- {
- operator: "is-empty",
- values: [],
- expectedDisplayName: "Category is empty",
- },
- {
- operator: "not-empty",
- values: [],
- expectedDisplayName: "Category is not empty",
- },
- ])(
- 'should allow to create a filter for "$operator" operator',
- ({ operator: newOperator, values: newValues, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useStringFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, options, getFilterClause } = result.current;
- const newFilter = checkNotNull(
- getFilterClause(operator, values, options),
- );
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<UpdateFilterCase>([
- {
- operator: "=",
- expression: Lib.stringFilterClause({
- operator: "=",
- column,
- values: ["Gadget", "Gizmo"],
- options: {},
- }),
- values: ["Widget"],
- expectedDisplayName: "Category is Widget",
- },
- {
- operator: "starts-with",
- expression: Lib.stringFilterClause({
- operator: "starts-with",
- column,
- values: ["Ga"],
- options: {},
- }),
- values: ["Wi"],
- expectedDisplayName: "Category starts with Wi",
- },
- ])(
- 'should allow to update a filter for "$operator" operator',
- ({ expression, values: newValues, expectedDisplayName }) => {
- const query = Lib.filter(defaultQuery, stageIndex, expression);
- const [filter] = Lib.filters(query, stageIndex);
-
- const { result } = renderHook(() =>
- useStringFilter({
- query,
- stageIndex,
- column,
- filter,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues(newValues);
- });
-
- const { operator, values, options, getFilterClause } = result.current;
- const newFilter = checkNotNull(
- getFilterClause(operator, values, options),
- );
- expect(Lib.displayInfo(query, stageIndex, newFilter)).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<ValidateFilterCase>([
- {
- operator: "=",
- values: [],
- },
- {
- operator: "!=",
- values: [],
- },
- {
- operator: "starts-with",
- values: [],
- },
- {
- operator: "ends-with",
- values: [],
- },
- ])(
- 'should validate values for "$operator" operator',
- ({ operator: newOperator, values: newValues }) => {
- const { result } = renderHook(() =>
- useStringFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, options, isValid, getFilterClause } =
- result.current;
- expect(isValid).toBeFalsy();
- expect(getFilterClause(operator, values, options)).toBeUndefined();
- },
- );
-
- it("should preserve values when switching operators", () => {
- const { result } = renderHook(() =>
- useStringFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues(["Gadget"]);
- });
-
- act(() => {
- const { values, getDefaultValues, setOperator, setValues } =
- result.current;
- const newOperator = "!=";
- setOperator(newOperator);
- setValues(getDefaultValues(newOperator, values));
- });
-
- const { operator, values, options, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values, options));
- expect(Lib.displayInfo(defaultQuery, stageIndex, newFilter)).toMatchObject({
- displayName: "Category is not Gadget",
- });
- });
-
- it.each<DefaultOperatorCase>([
- {
- title: "PK column",
- column: findColumn("ORDERS", "ID"),
- expectedOperator: "=",
- },
- {
- title: "FK column",
- column: findColumn("ORDERS", "PRODUCT_ID"),
- expectedOperator: "=",
- },
- {
- title: "category column with field values",
- column: findColumn("PRODUCTS", "CATEGORY"),
- expectedOperator: "=",
- },
- {
- title: "non-category column with field values",
- column: findColumn("PRODUCTS", "EAN"),
- expectedOperator: "=",
- },
- {
- title: "regular column without field values",
- column: findColumn("PEOPLE", "PASSWORD"),
- expectedOperator: "contains",
- },
- ])(
- 'should use "$expectedOperator" operator for $title',
- ({ column, expectedOperator }) => {
- const { result } = renderHook(() =>
- useStringFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- const { operator } = result.current;
- expect(operator).toBe(expectedOperator);
- },
- );
-});
diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/index.ts b/frontend/src/metabase/querying/filters/hooks/use-time-filter/index.ts
deleted file mode 100644
index 200914c8a6d..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-time-filter/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./use-time-filter";
-export * from "./types";
diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.unit.spec.ts
deleted file mode 100644
index d61230f732e..00000000000
--- a/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.unit.spec.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-import { act, renderHook } from "@testing-library/react";
-
-import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
-import * as Lib from "metabase-lib";
-import {
- DEFAULT_TEST_QUERY,
- columnFinder,
- createMetadataProvider,
-} from "metabase-lib/test-helpers";
-import { createMockField } from "metabase-types/api/mocks";
-import {
- ORDERS_ID,
- createOrdersIdField,
- createOrdersTable,
- createSampleDatabase,
-} from "metabase-types/api/mocks/presets";
-
-import { useTimeFilter } from "./use-time-filter";
-
-interface CreateFilterCase {
- operator: Lib.TimeFilterOperator;
- values: Date[];
- expectedDisplayName: string;
-}
-
-interface UpdateFilterCase {
- expression: Lib.ExpressionClause;
- values: Date[];
- expectedDisplayName: string;
-}
-
-interface CoerceFilterCase {
- operator: Lib.TimeFilterOperator;
- values: Date[];
- expectedDisplayName: string;
-}
-
-interface ValidateFilterCase {
- operator: Lib.TimeFilterOperator;
- values: (Date | null)[];
-}
-
-const TIME_1 = new Date(2020, 0, 1, 10, 20);
-const TIME_2 = new Date(2020, 0, 1, 12, 45);
-const TIME_3 = new Date(2020, 0, 1, 20, 15);
-
-const TIME_FIELD = createMockField({
- id: 102,
- table_id: ORDERS_ID,
- name: "TIME",
- display_name: "Time",
- base_type: "type/Time",
- effective_type: "type/Time",
- semantic_type: null,
-});
-
-const METADATA = createMockMetadata({
- databases: [
- createSampleDatabase({
- tables: [
- createOrdersTable({
- fields: [createOrdersIdField(), TIME_FIELD],
- }),
- ],
- }),
- ],
-});
-
-const PROVIDER = createMetadataProvider({ metadata: METADATA });
-
-describe("useTimeFilter", () => {
- const defaultQuery = Lib.createTestQuery(PROVIDER, DEFAULT_TEST_QUERY);
- const stageIndex = 0;
- const availableColumns = Lib.filterableColumns(defaultQuery, stageIndex);
- const column = columnFinder(defaultQuery, availableColumns)(
- "ORDERS",
- TIME_FIELD.name,
- );
-
- it.each<CreateFilterCase>([
- {
- operator: "<",
- values: [TIME_1],
- expectedDisplayName: "Time is before 10:20 AM",
- },
- {
- operator: ">",
- values: [TIME_1],
- expectedDisplayName: "Time is after 10:20 AM",
- },
- {
- operator: "between",
- values: [TIME_1, TIME_3],
- expectedDisplayName: "Time is 10:20 AM – 8:15 PM",
- },
- {
- operator: "is-null",
- values: [],
- expectedDisplayName: "Time is empty",
- },
- {
- operator: "not-null",
- values: [],
- expectedDisplayName: "Time is not empty",
- },
- ])(
- 'should allow to create a filter for "$operator" operator',
- ({ operator: newOperator, values: newValues, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useTimeFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<UpdateFilterCase>([
- {
- expression: Lib.timeFilterClause({
- operator: "<",
- column,
- values: [TIME_1],
- }),
- values: [TIME_2],
- expectedDisplayName: "Time is before 12:45 PM",
- },
- {
- expression: Lib.timeFilterClause({
- operator: ">",
- column,
- values: [TIME_1],
- }),
- values: [TIME_2],
- expectedDisplayName: "Time is after 12:45 PM",
- },
- {
- expression: Lib.timeFilterClause({
- operator: "between",
- column,
- values: [TIME_1, TIME_2],
- }),
- values: [TIME_2, TIME_3],
- expectedDisplayName: "Time is 12:45 PM – 8:15 PM",
- },
- ])(
- 'should allow to update a filter for "$operator" operator',
- ({ expression, values: newValues, expectedDisplayName }) => {
- const query = Lib.filter(defaultQuery, stageIndex, expression);
- const [filter] = Lib.filters(query, stageIndex);
-
- const { result } = renderHook(() =>
- useTimeFilter({
- query,
- stageIndex,
- column,
- filter,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues(newValues);
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(Lib.displayInfo(query, stageIndex, newFilter)).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<CoerceFilterCase>([
- {
- operator: "between",
- values: [TIME_3, TIME_1],
- expectedDisplayName: "Time is 10:20 AM – 8:15 PM",
- },
- ])(
- "should allow to coerce a filter: $expectedDisplayName",
- ({ operator, values, expectedDisplayName }) => {
- const { result } = renderHook(() =>
- useTimeFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- const { getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(
- Lib.displayInfo(defaultQuery, stageIndex, newFilter),
- ).toMatchObject({
- displayName: expectedDisplayName,
- });
- },
- );
-
- it.each<ValidateFilterCase>([
- {
- operator: "<",
- values: [null],
- },
- {
- operator: ">",
- values: [null],
- },
- {
- operator: "between",
- values: [null, null],
- },
- ])(
- 'should validate values for "$operator" operator',
- ({ operator: newOperator, values: newValues }) => {
- const { result } = renderHook(() =>
- useTimeFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setOperator, setValues } = result.current;
- setOperator(newOperator);
- setValues(newValues);
- });
-
- const { operator, values, isValid, getFilterClause } = result.current;
- expect(isValid).toBeFalsy();
- expect(getFilterClause(operator, values)).toBeUndefined();
- },
- );
-
- it("should preserve values when switching operators", () => {
- const { result } = renderHook(() =>
- useTimeFilter({
- query: defaultQuery,
- stageIndex,
- column,
- }),
- );
-
- act(() => {
- const { setValues } = result.current;
- setValues([TIME_1]);
- });
-
- act(() => {
- const { values, getDefaultValues, setOperator, setValues } =
- result.current;
- const newOperator = ">";
- setOperator(newOperator);
- setValues(getDefaultValues(newOperator, values));
- });
-
- const { operator, values, getFilterClause } = result.current;
- const newFilter = checkNotNull(getFilterClause(operator, values));
- expect(Lib.displayInfo(defaultQuery, stageIndex, newFilter)).toMatchObject({
- displayName: "Time is after 10:20 AM",
- });
- });
-});
diff --git a/frontend/src/metabase/querying/filters/types.ts b/frontend/src/metabase/querying/filters/types.ts
index 9996d531b54..ed9a53ea0f9 100644
--- a/frontend/src/metabase/querying/filters/types.ts
+++ b/frontend/src/metabase/querying/filters/types.ts
@@ -1,13 +1,8 @@
import type * as Lib from "metabase-lib";
-import type { DateFormattingSettings } from "metabase-types/api";
export type FilterOperatorOption<T extends Lib.FilterOperator> = {
operator: T;
displayName: string;
};
-export type DateFilterDisplayOpts = {
- // whether to include `On` prefix for a single date filter
- withPrefix?: boolean;
- formattingSettings?: DateFormattingSettings;
-};
+export type { DateFilterDisplayOpts } from "metabase/querying/common/types";
diff --git a/frontend/src/metabase/querying/filters/utils/dates.ts b/frontend/src/metabase/querying/filters/utils/dates.ts
index cac9bcacd84..526d357cb6b 100644
--- a/frontend/src/metabase/querying/filters/utils/dates.ts
+++ b/frontend/src/metabase/querying/filters/utils/dates.ts
@@ -1,8 +1,5 @@
import dayjs from "dayjs";
-import { match } from "ts-pattern";
-import { c, msgid, ngettext, t } from "ttag";
-import { DEFAULT_TIME_STYLE } from "metabase/lib/formatting/datetime-utils";
import {
DATE_PICKER_EXTRACTION_UNITS,
DATE_PICKER_OPERATORS,
@@ -21,10 +18,13 @@ import type {
RelativeDatePickerValue,
SpecificDatePickerValue,
} from "metabase/querying/common/types";
-import type { DateFilterDisplayOpts } from "metabase/querying/filters/types";
-import type { ExcludeDateFilterUnit } from "metabase-lib";
import * as Lib from "metabase-lib";
-import type { DateFormattingSettings } from "metabase-types/api";
+
+export {
+ formatDate,
+ getDateFilterDisplayName,
+ type DateFilterDisplayOpts,
+} from "metabase/querying/common/utils/dates";
export function isDatePickerOperator(
operator: string,
@@ -237,152 +237,3 @@ function getQuarterYearFilterClause(
hasTime: false,
});
}
-
-export function getDateFilterDisplayName(
- value: DateFilterValue,
- { withPrefix, formattingSettings }: DateFilterDisplayOpts = {},
-) {
- return match(value)
- .with(
- { type: "specific", operator: "=" },
- ({ values: [date], hasTime }) => {
- const dateText = formatDate(date, hasTime, formattingSettings);
- return withPrefix
- ? c("On a date. Example: On Jan 20.").t`On ${dateText}`
- : dateText;
- },
- )
- .with(
- { type: "specific", operator: "<" },
- ({ values: [date], hasTime }) => {
- return c("Before a date. Example: Before Jan 20.")
- .t`Before ${formatDate(date, hasTime, formattingSettings)}`;
- },
- )
- .with(
- { type: "specific", operator: ">" },
- ({ values: [date], hasTime }) => {
- return c("After a date. Example: After Jan 20.")
- .t`After ${formatDate(date, hasTime, formattingSettings)}`;
- },
- )
- .with(
- { type: "specific", operator: "between" },
- ({ values: [startDate, endDate], hasTime }) => {
- return `${formatDate(startDate, hasTime, formattingSettings)} - ${formatDate(endDate, hasTime, formattingSettings)}`;
- },
- )
- .with(
- { type: "relative" },
- ({ value, unit, offsetValue, offsetUnit, options }) => {
- if (offsetValue != null && offsetUnit != null) {
- const prefix = Lib.describeTemporalInterval(value, unit);
- const suffix = Lib.describeRelativeDatetime(offsetValue, offsetUnit);
- return `${prefix}, ${suffix}`;
- } else {
- return Lib.describeTemporalInterval(value, unit, {
- "include-current": options?.includeCurrent,
- });
- }
- },
- )
- .with({ type: "exclude", operator: "!=" }, ({ values, unit }) => {
- if (values.length <= 2 && unit != null) {
- const parts = values.map((value) => formatExcludeUnit(value, unit));
- return t`Exclude ${parts.join(", ")}`;
- } else {
- const count = values.length;
- return ngettext(
- msgid`Exclude ${count} selection`,
- `Exclude ${count} selections`,
- count,
- );
- }
- })
- .with({ type: "exclude", operator: "is-null" }, () => {
- return t`Is empty`;
- })
- .with({ type: "exclude", operator: "not-null" }, () => {
- return t`Not empty`;
- })
- .with({ type: "month" }, ({ month, year }) => {
- return formatMonth(month, year, formattingSettings);
- })
- .with({ type: "quarter" }, ({ quarter, year }) => {
- return formatQuarter(quarter, year);
- })
- .exhaustive();
-}
-
-export function formatDate(
- date: Date,
- hasTime: boolean,
- formattingSettings: DateFormattingSettings = {},
-) {
- const format = formattingSettingsToFormatString(formattingSettings, hasTime);
- return dayjs(date).format(format);
-}
-
-function formattingSettingsToFormatString(
- formattingSettings: DateFormattingSettings = {},
- hasTime: boolean = false,
-) {
- const { date_style = "LL", time_style = DEFAULT_TIME_STYLE } =
- formattingSettings;
-
- const format = hasTime ? `${date_style} ${time_style}` : date_style;
- return abbreviateFormat(format, formattingSettings);
-}
-
-function abbreviateFormat(
- format: string,
- formattingSettings: DateFormattingSettings = {},
-) {
- if (!formattingSettings.date_abbreviate) {
- return format;
- }
- return format.replace(/MMMM/, "MMM").replace(/dddd/, "ddd");
-}
-
-function formatMonth(
- month: number,
- year: number,
- formattingSettings: DateFormattingSettings = {},
-) {
- return dayjs()
- .year(year)
- .month(month - 1)
- .format(abbreviateFormat("MMMM YYYY", formattingSettings));
-}
-
-function formatQuarter(quarter: number, year: number) {
- return dayjs()
- .year(year)
- .quarter(quarter)
- .format(
- c(
- 'This is a "dayjs" format string (https://day.js.org/docs/en/plugin/advanced-format). It should include "Q" for the quarter number, YYYY for the year, and raw text can be escaped by brackets. For example, "[Quarter] Q YYYY" will be rendered as "Quarter 1 2024".',
- ).t`[Q]Q YYYY`,
- );
-}
-
-function formatExcludeUnit(value: number, unit: ExcludeDateFilterUnit) {
- switch (unit) {
- case "hour-of-day":
- return dayjs().hour(value).format("h A");
- case "day-of-week":
- return dayjs().isoWeekday(value).format("dddd");
- case "month-of-year":
- return dayjs()
- .month(value - 1)
- .format("MMMM");
- case "quarter-of-year":
- return dayjs()
- .quarter(value)
- .format(
- c(
- 'This is a "dayjs" format string (https://day.js.org/docs/en/plugin/advanced-format). It should include "Q" for the quarter number, and raw text can be escaped by brackets. For example, "[Quarter] Q" will be rendered as "Quarter 1".',
- ).t`[Q]Q`,
- );
- }
-}
diff --git a/frontend/src/metabase/redux/app.ts b/frontend/src/metabase/redux/app.ts
index 05706e89a85..887f0ef4878 100644
--- a/frontend/src/metabase/redux/app.ts
+++ b/frontend/src/metabase/redux/app.ts
@@ -68,7 +68,7 @@ const errorPage = handleActions(
// regexr.com/7r89i
// A word boundary is added to /model so it doesn't match /browse/models
const PATH_WITH_COLLAPSED_NAVBAR =
- /\/(model\b|question|dashboard|metabot|document).*/;
+ /\/(model\b|question|dashboard|metabot|document|explore).*/;
export function isNavbarOpenForPathname(pathname: string, prevState: boolean) {
return (
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestionNew.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestionNew.tsx
index 422299d4ceb..e2634546773 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestionNew.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestionNew.tsx
@@ -99,7 +99,8 @@ const MetabotMentionSuggestionComponent = forwardRef<
model !== "database" &&
model !== "action" &&
model !== "segment" &&
- model !== "user",
+ model !== "user" &&
+ model !== "measure",
);
const shouldHide = useMemo(() => {
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
index 90acd21ca0e..0bdb68db939 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
@@ -430,6 +430,7 @@ export const useEntityData = (
};
}
case "indexed-entity":
+ case "measure":
case null:
return { entity: null, isLoading: false, error: null };
default:
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index 3c2c4582564..d1a4a2bb049 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -37,6 +37,7 @@ import { ModalRoute } from "metabase/hoc/ModalRoute";
import { HomePage } from "metabase/home/components/HomePage";
import { Onboarding } from "metabase/home/components/Onboarding";
import { trackPageView } from "metabase/lib/analytics";
+import { MetricsViewerPage } from "metabase/metrics-viewer";
import NewModelOptions from "metabase/models/containers/NewModelOptions";
import { getRoutes as getModelRoutes } from "metabase/models/routes";
import {
@@ -318,6 +319,8 @@ export const getRoutes = (store) => {
/>
</Route>
+ <Route path="explore" component={MetricsViewerPage} />
+
<Route path="table">
<Route path=":tableId/detail/:rowId" component={TableDetailPage} />
</Route>
diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.js
index f5d301eb217..06ad4a67fee 100644
--- a/frontend/src/metabase/schema.js
+++ b/frontend/src/metabase/schema.js
@@ -72,6 +72,7 @@ export const FieldSchema = new schema.Entity("fields", undefined, {
export const ForeignKeySchema = new schema.Entity("foreignKeys");
export const SegmentSchema = new schema.Entity("segments");
export const MeasureSchema = new schema.Entity("measures");
+export const MetricSchema = new schema.Entity("metrics");
export const PersistedModelSchema = new schema.Entity("persistedModels");
export const SnippetSchema = new schema.Entity("snippets");
export const SnippetCollectionSchema = new schema.Entity("snippetCollections");
@@ -138,6 +139,7 @@ export const ENTITIES_SCHEMA_MAP = {
collections: CollectionSchema,
segments: SegmentSchema,
measures: MeasureSchema,
+ metrics: MetricSchema,
snippets: SnippetSchema,
snippetCollections: SnippetCollectionSchema,
documents: DocumentSchema,
diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx
index 95043dc0413..e6e52823dad 100644
--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx
+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx
@@ -23,6 +23,7 @@ const MODEL_NAME: Record<EnabledSearchModel, string> = {
dashboard: "Dashboard",
database: "Database",
dataset: "Model",
+ measure: "Measure",
metric: "Metric",
table: "Table",
"indexed-entity": "Indexed record",
diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx
index a1d7947fc45..f7b01f6e06a 100644
--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx
+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterDisplay.unit.spec.tsx
@@ -11,6 +11,7 @@ const MODEL_TYPE_DISPLAY_NAMES: Record<EnabledSearchModel, string> = {
dashboard: "Dashboard",
database: "Database",
dataset: "Model",
+ measure: "Measure",
metric: "Metric",
table: "Table",
"indexed-entity": "Indexed record",
diff --git a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx
index d2044380ef1..bf801425e04 100644
--- a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx
+++ b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx
@@ -38,6 +38,7 @@ const TYPE_FILTER_LABELS: Record<EnabledSearchModel, string> = {
dataset: "Model",
table: "Table",
card: "Question",
+ measure: "Measure",
metric: "Metric",
action: "Action",
"indexed-entity": "Indexed record",
diff --git a/frontend/src/metabase/selectors/metadata.ts b/frontend/src/metabase/selectors/metadata.ts
index 3484aee93ad..6a1b8c076bb 100644
--- a/frontend/src/metabase/selectors/metadata.ts
+++ b/frontend/src/metabase/selectors/metadata.ts
@@ -8,6 +8,7 @@ import Field from "metabase-lib/v1/metadata/Field";
import ForeignKey from "metabase-lib/v1/metadata/ForeignKey";
import Measure from "metabase-lib/v1/metadata/Measure";
import Metadata from "metabase-lib/v1/metadata/Metadata";
+import Metric from "metabase-lib/v1/metadata/Metric";
import Schema from "metabase-lib/v1/metadata/Schema";
import Segment from "metabase-lib/v1/metadata/Segment";
import Table from "metabase-lib/v1/metadata/Table";
@@ -22,6 +23,7 @@ import type {
NormalizedField,
NormalizedForeignKey,
NormalizedMeasure,
+ NormalizedMetric,
NormalizedSchema,
NormalizedSegment,
NormalizedTable,
@@ -89,6 +91,7 @@ const getNormalizedFields = createSelector(
const getNormalizedSegments = (state: State) => state.entities.segments;
const getNormalizedMeasures = (state: State) => state.entities.measures ?? {};
+const getNormalizedMetrics = (state: State) => state.entities.metrics ?? {};
const getNormalizedQuestions = (state: State) => state.entities.questions;
const getNormalizedSnippets = (state: State) => state.entities.snippets;
@@ -97,6 +100,7 @@ export const getShallowTables = getNormalizedTables;
export const getShallowFields = getNormalizedFields;
export const getShallowSegments = getNormalizedSegments;
export const getShallowMeasures = getNormalizedMeasures;
+export const getShallowMetrics = getNormalizedMetrics;
export const getMetadata: (
state: State,
@@ -109,6 +113,7 @@ export const getMetadata: (
getNormalizedFields,
getNormalizedSegments,
getNormalizedMeasures,
+ getNormalizedMetrics,
getNormalizedQuestions,
getNormalizedSnippets,
getSettings,
@@ -120,6 +125,7 @@ export const getMetadata: (
fields,
segments,
measures,
+ metrics,
questions,
snippets,
settings,
@@ -146,6 +152,9 @@ export const getMetadata: (
metadata.measures = Object.fromEntries(
Object.values(measures).map((m) => [m.id, createMeasure(m, metadata)]),
);
+ metadata.metrics = Object.fromEntries(
+ Object.values(metrics).map((m) => [m.id, createMetric(m, metadata)]),
+ );
metadata.questions = Object.fromEntries(
Object.values(questions).map((c) => [c.id, createQuestion(c, metadata)]),
);
@@ -270,6 +279,12 @@ function createMeasure(
return instance;
}
+function createMetric(metric: NormalizedMetric, metadata: Metadata): Metric {
+ const instance = new Metric(metric);
+ instance.metadata = metadata;
+ return instance;
+}
+
function createQuestion(card: Card, metadata: Metadata): Question {
return new Question(card, metadata);
}
diff --git a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
index 9de1d11f0cd..84d5911d7bd 100644
--- a/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
@@ -7,8 +7,8 @@ import { getMetadata } from "metabase/selectors/metadata";
import { Box, Card, Loader, Stack } from "metabase/ui";
import Visualization from "metabase/visualizations/components/Visualization";
import * as Lib from "metabase-lib";
+import { defaultDisplay } from "metabase-lib/query/display";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
-import { defaultDisplay } from "metabase-lib/viz/display";
import type {
CardDisplayType,
Dataset,
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/grid_2x2.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/grid_2x2.svg
new file mode 100644
index 00000000000..d6eb49917b9
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/grid_2x2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.667 1.25C13.8173 1.25018 14.7498 2.18267 14.75 3.33301V12.667C14.7498 13.8173 13.8173 14.7498 12.667 14.75H3.33301C2.18267 14.7498 1.25018 13.8173 1.25 12.667V3.33301C1.25018 2.18267 2.18267 1.25018 3.33301 1.25H12.667ZM2.75 8.75V12.667C2.75018 12.9889 3.0111 13.2498 3.33301 13.25H7.25V8.75H2.75ZM8.75 8.75V13.25H12.667C12.9889 13.2498 13.2498 12.9889 13.25 12.667V8.75H8.75ZM3.33301 2.75C3.0111 2.75018 2.75018 3.0111 2.75 3.33301V7.25H7.25V2.75H3.33301ZM8.75 7.25H13.25V3.33301C13.2498 3.0111 12.9889 2.75018 12.667 2.75H8.75V7.25Z"/></svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
index 837baf4e38a..c0fc135ffaa 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -238,6 +238,8 @@ import grabber_component from "./grabber.svg?component";
import grabber_source from "./grabber.svg?source";
import grid_component from "./grid.svg?component";
import grid_source from "./grid.svg?source";
+import grid_2x2_component from "./grid_2x2.svg?component";
+import grid_2x2_source from "./grid_2x2.svg?source";
import group_component from "./group.svg?component";
import group_source from "./group.svg?source";
import history_component from "./history.svg?component";
@@ -1005,6 +1007,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: grid_component,
source: grid_source,
},
+ grid_2x2: {
+ component: grid_2x2_component,
+ source: grid_2x2_source,
+ },
group: {
component: group_component,
source: group_source,
@@ -1810,6 +1816,7 @@ export type IconName =
| "git_branch"
| "grabber"
| "grid"
+ | "grid_2x2"
| "group"
| "google"
| "google_drive"
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/layout_unified.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/layout_unified.svg
new file mode 100644
index 00000000000..357a2f60cd5
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/layout_unified.svg
@@ -0,0 +1,5 @@
+
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentcolor" xmlns="http://www.w3.org/2000/svg">
+<rect x="2" y="2" width="12" height="12" rx="2" stroke-width="1.5"/>
+<path d="M4 11H12" stroke-width="1.5"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/inputs/Combobox/index.ts b/frontend/src/metabase/ui/components/inputs/Combobox/index.ts
index b06a7bff9ae..46f9f061ab7 100644
--- a/frontend/src/metabase/ui/components/inputs/Combobox/index.ts
+++ b/frontend/src/metabase/ui/components/inputs/Combobox/index.ts
@@ -1,4 +1,4 @@
-export { Combobox } from "@mantine/core";
+export { Combobox, OptionsDropdown } from "@mantine/core";
export type {
ComboboxGroupProps,
ComboboxProps,
diff --git a/frontend/src/metabase/ui/components/inputs/Slider/Slider.config.ts b/frontend/src/metabase/ui/components/inputs/Slider/Slider.config.ts
new file mode 100644
index 00000000000..3afd0e2bf2b
--- /dev/null
+++ b/frontend/src/metabase/ui/components/inputs/Slider/Slider.config.ts
@@ -0,0 +1,17 @@
+import { Slider } from "@mantine/core";
+
+import S from "./Slider.module.css";
+
+export const sliderOverrides = {
+ Slider: Slider.extend({
+ defaultProps: {
+ classNames: {
+ mark: S.Mark,
+ },
+ __vars: {
+ "--track-bg": "var(--mb-color-border)",
+ "--slider-track-bg": "var(--mb-color-border)",
+ },
+ },
+ }),
+};
diff --git a/frontend/src/metabase/ui/components/inputs/Slider/Slider.module.css b/frontend/src/metabase/ui/components/inputs/Slider/Slider.module.css
new file mode 100644
index 00000000000..dd1fd346569
--- /dev/null
+++ b/frontend/src/metabase/ui/components/inputs/Slider/Slider.module.css
@@ -0,0 +1,3 @@
+.Mark:not([data-filled]) {
+ border-color: var(--mb-color-border);
+}
diff --git a/frontend/src/metabase/ui/components/inputs/Slider/index.ts b/frontend/src/metabase/ui/components/inputs/Slider/index.ts
new file mode 100644
index 00000000000..99e022700a1
--- /dev/null
+++ b/frontend/src/metabase/ui/components/inputs/Slider/index.ts
@@ -0,0 +1,3 @@
+export { type SliderProps, Slider } from "@mantine/core";
+
+export * from "./Slider.config";
diff --git a/frontend/src/metabase/ui/components/inputs/index.ts b/frontend/src/metabase/ui/components/inputs/index.ts
index 254bc6305e0..96e99f43959 100644
--- a/frontend/src/metabase/ui/components/inputs/index.ts
+++ b/frontend/src/metabase/ui/components/inputs/index.ts
@@ -19,6 +19,7 @@ export * from "./QuarterPicker";
export * from "./Radio";
export * from "./SegmentedControl";
export * from "./Select";
+export * from "./Slider";
export * from "./Switch";
export * from "./Textarea";
export * from "./TextareaBlurChange";
diff --git a/frontend/src/metabase/ui/index.ts b/frontend/src/metabase/ui/index.ts
index de6ad4ecfc4..6e0eb0fd634 100644
--- a/frontend/src/metabase/ui/index.ts
+++ b/frontend/src/metabase/ui/index.ts
@@ -11,6 +11,6 @@ export type {
PolymorphicComponentProps,
MantineColorsTuple,
} from "@mantine/core";
-export { useHover } from "@mantine/hooks";
+export { useHover, useElementSize } from "@mantine/hooks";
export * from "./components";
diff --git a/frontend/src/metabase/ui/theme.ts b/frontend/src/metabase/ui/theme.ts
index dc8e611fb15..9f313930855 100644
--- a/frontend/src/metabase/ui/theme.ts
+++ b/frontend/src/metabase/ui/theme.ts
@@ -49,6 +49,7 @@ import {
segmentedControlOverrides,
selectOverrides,
skeletonOverrides,
+ sliderOverrides,
switchOverrides,
tabsOverrides,
textInputOverrides,
@@ -85,6 +86,7 @@ export const getThemeOverrides = (
colorScheme,
},
shadows: {
+ xs: "0 0 0 0.5px var(--mb-color-border), 0 1px 2px 0 var(--mb-color-shadow)",
// eslint-disable-next-line metabase/no-color-literals
sm: "0px 1px 4px 2px rgba(0, 0, 0, 0.08)",
// eslint-disable-next-line metabase/no-color-literals
@@ -189,6 +191,7 @@ export const getThemeOverrides = (
...segmentedControlOverrides,
...skeletonOverrides,
...selectOverrides,
+ ...sliderOverrides,
...switchOverrides,
...tabsOverrides,
...textareaOverrides,
diff --git a/frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts b/frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts
index dd37a9c375b..6943c2703da 100644
--- a/frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts
+++ b/frontend/src/metabase/visualizations/click-actions/Mode/Mode.ts
@@ -6,11 +6,12 @@ import type Question from "metabase-lib/v1/Question";
import type {
ClickAction,
+ ClickActionsMode,
ClickObject,
QueryClickActionsMode,
} from "../../types";
-export class Mode {
+export class Mode implements ClickActionsMode {
_question: Question;
_queryMode: QueryClickActionsMode;
_plugins?: MetabasePluginsConfig;
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
index ef912c52076..bcb529d1b50 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
@@ -59,7 +59,7 @@ import type {
QueryClickActionsMode,
VisualizationProps,
} from "metabase/visualizations/types";
-import type { ClickObject, OrderByDirection } from "metabase-lib/types";
+import type { ClickObject, OrderByDirection } from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import { isFK, isID, isPK } from "metabase-lib/v1/types/utils/isa";
import type {
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 0eda4219664..e4ed4348dd7 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -49,6 +49,7 @@ import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settin
import { getCardKey, isSameSeries } from "metabase/visualizations/lib/utils";
import {
type ClickActionModeGetter,
+ type ClickActionsMode,
type ClickObject,
type HoveredObject,
type QueryClickActionsMode,
@@ -56,6 +57,7 @@ import {
type VisualizationGridSize,
type VisualizationPassThroughProps,
type Visualization as VisualizationType,
+ isClickActionsMode,
isRegularClickAction,
} from "metabase/visualizations/types";
import {
@@ -147,7 +149,7 @@ type VisualizationOwnProps = {
isVisualizer?: boolean;
renderLoadingView?: (props: LoadingViewProps) => JSX.Element | null;
metadata?: Metadata;
- mode?: ClickActionModeGetter | Mode | QueryClickActionsMode;
+ mode?: ClickActionModeGetter | ClickActionsMode | QueryClickActionsMode;
onEditSummary?: () => void;
rawSeries?: (
| SingleSeries
@@ -159,8 +161,10 @@ type VisualizationOwnProps = {
replacementContent?: JSX.Element | null;
selectedTimelineEventIds?: number[];
settings?: VisualizationSettings;
+ autoAdjustSettings?: boolean;
showTitle?: boolean;
showWarnings?: boolean;
+ hideLegend?: boolean;
style?: CSSProperties;
timelineEvents?: TimelineEvent[];
tc?: ContentTranslationFunction;
@@ -170,6 +174,7 @@ type VisualizationOwnProps = {
showSidebarTitle?: boolean;
}) => void;
onChangeCardAndRun?: ((opts: OnChangeCardAndRunOpts) => void) | null;
+ onBrush?: ((range: { start: number; end: number }) => void) | null;
onHeaderColumnReorder?: (columnName: string) => void;
onChangeLocation?: (location: Location) => void;
onUpdateQuestion?: () => void;
@@ -413,7 +418,11 @@ class Visualization extends PureComponent<
_getClickActionsCached(
clickedObject: ClickObject | null | undefined,
- mode: ClickActionModeGetter | Mode | QueryClickActionsMode | undefined,
+ mode:
+ | ClickActionModeGetter
+ | ClickActionsMode
+ | QueryClickActionsMode
+ | undefined,
computedSettings: Record<string, string>,
dashcard?: DashboardCard,
metadata?: Metadata,
@@ -467,7 +476,7 @@ class Visualization extends PureComponent<
private static getMode(
modeOrModeGetter:
| ClickActionModeGetter
- | Mode
+ | ClickActionsMode
| QueryClickActionsMode
| undefined,
question: Question | undefined,
@@ -479,7 +488,7 @@ class Visualization extends PureComponent<
: null
: modeOrModeGetter;
- if (modeOrQueryMode instanceof Mode) {
+ if (isClickActionsMode(modeOrQueryMode)) {
return modeOrQueryMode;
}
@@ -638,6 +647,7 @@ class Visualization extends PureComponent<
render() {
const {
actionButtons,
+ autoAdjustSettings,
canToggleSeriesVisibility,
className,
dashboard,
@@ -688,6 +698,7 @@ class Visualization extends PureComponent<
scrollToLastColumn,
selectedTimelineEventIds,
showAllLegendItems,
+ hideLegend,
showTitle,
style,
tableHeaderHeight,
@@ -946,7 +957,9 @@ class Visualization extends PureComponent<
selectedTimelineEventIds={selectedTimelineEventIds}
series={series}
settings={settings}
+ autoAdjustSettings={!!autoAdjustSettings}
showAllLegendItems={showAllLegendItems}
+ hideLegend={hideLegend}
showTitle={!!showTitle}
tableHeaderHeight={tableHeaderHeight}
timelineEvents={timelineEvents}
@@ -960,6 +973,7 @@ class Visualization extends PureComponent<
? this.handleOnChangeCardAndRun
: null
}
+ onBrush={this.props.onBrush}
onDeselectTimelineEvents={onDeselectTimelineEvents}
onHoverChange={this.handleHoverChange}
onOpenTimelines={onOpenTimelines}
diff --git a/frontend/src/metabase/visualizations/shared/settings-adjustments.ts b/frontend/src/metabase/visualizations/shared/settings-adjustments.ts
index 12efc49b047..d9a6e0aefb1 100644
--- a/frontend/src/metabase/visualizations/shared/settings-adjustments.ts
+++ b/frontend/src/metabase/visualizations/shared/settings-adjustments.ts
@@ -5,16 +5,17 @@ const HIDE_X_AXIS_LABEL_HEIGHT_THRESHOLD = 200;
const HIDE_Y_AXIS_HEIGHT_THRESHOLD = 150;
const INTERPOLATE_LINE_THRESHOLD = 150;
-export const getDashboardAdjustedSettings = (
- settings: ComputedVisualizationSettings,
- isDashboard: boolean,
- width: number,
- height: number,
-): ComputedVisualizationSettings => {
- if (!isDashboard) {
- return settings;
- }
+type getAdjustedSettingsProps = {
+ settings: ComputedVisualizationSettings;
+ width: number;
+ height: number;
+};
+export const getDashboardAdjustedSettings = ({
+ settings,
+ width,
+ height,
+}: getAdjustedSettingsProps): ComputedVisualizationSettings => {
const adjusted = { ...settings };
if (
diff --git a/frontend/src/metabase/visualizations/types/click-actions.ts b/frontend/src/metabase/visualizations/types/click-actions.ts
index 3d988d9b290..f5798127b94 100644
--- a/frontend/src/metabase/visualizations/types/click-actions.ts
+++ b/frontend/src/metabase/visualizations/types/click-actions.ts
@@ -1,16 +1,18 @@
import type React from "react";
import type { IconName } from "metabase/ui";
-import type { Mode } from "metabase/visualizations/click-actions/Mode";
import type * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
-import type { ClickActionProps } from "metabase-lib/v1/queries/drills/types";
+import type {
+ ClickActionProps,
+ ClickObject,
+} from "metabase-lib/v1/queries/drills/types";
import type { Card, Series, VisualizationSettings } from "metabase-types/api";
import type { Dispatch, GetState } from "metabase-types/store";
export type ClickActionModeGetter = (data: {
question: Question;
-}) => QueryClickActionsMode | Mode;
+}) => QueryClickActionsMode | ClickActionsMode;
export type {
ClickActionProps,
@@ -201,6 +203,23 @@ export type Drill<
applyDrill: (drill: Lib.DrillThru, ...args: any[]) => Question;
}) => ClickAction[];
+export interface ClickActionsMode {
+ actionsForClick(
+ clicked: ClickObject,
+ settings?: Record<string, any>,
+ extraData?: Record<string, any>,
+ ): ClickAction[];
+}
+
+export function isClickActionsMode(value: unknown): value is ClickActionsMode {
+ return (
+ value != null &&
+ typeof value === "object" &&
+ "actionsForClick" in value &&
+ typeof (value as any).actionsForClick === "function"
+ );
+}
+
export type QueryClickActionsMode = {
name: string;
clickActions: LegacyDrill[];
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 9aed92ef213..782be8f0f61 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -2,13 +2,13 @@ import type { ComponentType, ReactNode } from "react";
import type { OptionsType } from "metabase/lib/formatting/types";
import type { IconName, IconProps } from "metabase/ui";
-import type { Mode } from "metabase/visualizations/click-actions/Mode";
import type {
TextHeightMeasurer,
TextWidthMeasurer,
} from "metabase/visualizations/shared/types/measure-text";
import type {
ClickActionModeGetter,
+ ClickActionsMode,
ClickObject,
QueryClickActionsMode,
} from "metabase/visualizations/types";
@@ -134,6 +134,7 @@ export interface VisualizationProps {
rawSeries: RawSeries;
visualizerRawSeries?: RawSeries;
settings: ComputedVisualizationSettings;
+ autoAdjustSettings?: boolean;
hiddenSeries?: Set<string>;
headerIcon?: IconProps | null;
errorIcon?: IconName | null;
@@ -153,6 +154,7 @@ export interface VisualizationProps {
isMobile: boolean;
isSettings: boolean;
showAllLegendItems?: boolean;
+ hideLegend?: boolean;
isRawTable?: boolean;
scrollToLastColumn?: boolean;
hovered?: HoveredObject | null;
@@ -181,6 +183,7 @@ export interface VisualizationProps {
onRenderError: (error?: string) => void;
onActionDismissal: () => void;
onChangeCardAndRun?: OnChangeCardAndRun | null;
+ onBrush?: ((range: { start: number; end: number }) => void) | null;
onHoverChange: (hoverObject?: HoveredObject | null) => void;
onVisualizationClick: (clickObject: ClickObject | null) => void;
onUpdateVisualizationSettings: (
@@ -226,7 +229,7 @@ export type VisualizationPassThroughProps = {
index: number,
theme: unknown,
) => ReactNode;
- mode?: ClickActionModeGetter | Mode | QueryClickActionsMode;
+ mode?: ClickActionModeGetter | ClickActionsMode | QueryClickActionsMode;
renderEmptyMessage?: boolean;
// frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
index ffe7013e3c8..2ceedf2f7a2 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
@@ -34,6 +34,7 @@ import { useBoxPlotEvents } from "./events";
function BoxPlotInner({
rawSeries,
settings: originalSettings,
+ autoAdjustSettings,
fontFamily,
card,
width,
@@ -68,13 +69,14 @@ function BoxPlotInner({
const settings = useMemo(
() =>
- getDashboardAdjustedSettings(
- originalSettings,
- isDashboard ?? false,
- width,
- height,
- ),
- [originalSettings, isDashboard, width, height],
+ autoAdjustSettings
+ ? getDashboardAdjustedSettings({
+ settings: originalSettings,
+ height,
+ width,
+ })
+ : originalSettings,
+ [originalSettings, height, width, autoAdjustSettings],
);
const renderingContext = useBrowserRenderingContext({ fontFamily });
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
index 5469f53e9c9..52970c0f134 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
@@ -34,8 +34,10 @@ function CartesianChartInner(props: VisualizationProps) {
const {
showAllLegendItems,
+ hideLegend,
rawSeries,
settings: originalSettings,
+ autoAdjustSettings = false,
card,
getHref,
width: outerWidth,
@@ -58,13 +60,14 @@ function CartesianChartInner(props: VisualizationProps) {
const settings = useMemo(
() =>
- getDashboardAdjustedSettings(
- originalSettings,
- isDashboard ?? false,
- outerWidth,
- outerHeight,
- ),
- [originalSettings, isDashboard, outerWidth, outerHeight],
+ autoAdjustSettings
+ ? getDashboardAdjustedSettings?.({
+ settings: originalSettings,
+ height: outerHeight,
+ width: outerWidth,
+ })
+ : originalSettings,
+ [originalSettings, outerHeight, outerWidth, autoAdjustSettings],
);
const { chartModel, timelineEventsModel, option } = useModelsAndOption(
@@ -87,7 +90,7 @@ function CartesianChartInner(props: VisualizationProps) {
() => getLegendItems(chartModel.seriesModels, showAllLegendItems),
[chartModel, showAllLegendItems],
);
- const hasLegend = legendItems.length > 0;
+ const hasLegend = !hideLegend && legendItems.length > 0;
const handleInit = useCallback((chart: EChartsType) => {
chartRef.current = chart;
@@ -144,7 +147,10 @@ function CartesianChartInner(props: VisualizationProps) {
useCloseTooltipOnScroll(chartRef);
return (
- <CartesianChartRoot isQueryBuilder={isQueryBuilder}>
+ <CartesianChartRoot
+ isQueryBuilder={isQueryBuilder}
+ className="CardVisualization"
+ >
{showTitle && (
<LegendCaption
title={settings["card.title"] ?? card.name}
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
index 708221db4a3..e13dbffafa6 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
@@ -280,15 +280,23 @@ export const canBrush = (
series: RawSeries,
settings: ComputedVisualizationSettings,
onChangeCardAndRun?: OnChangeCardAndRun | null,
+ onBrush?: ((range: { start: number; end: number }) => void) | null,
) => {
- const hasCombinedCards = series.length > 1;
const hasBrushableDimension =
settings["graph.x_axis.scale"] != null &&
!["ordinal", "histogram"].includes(settings["graph.x_axis.scale"]);
+ if (!hasBrushableDimension) {
+ return false;
+ }
+
+ if (onBrush) {
+ return true;
+ }
+
+ const hasCombinedCards = series.length > 1;
return (
!!onChangeCardAndRun &&
- hasBrushableDimension &&
!hasCombinedCards &&
(!isNative(series[0].card) || isSavedCard(series[0].card)) &&
!isRemappedToString(series) &&
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
index 6a69bf6355a..ed9de123c0d 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
@@ -50,6 +50,7 @@ export const useChartEvents = (
settings,
visualizationIsClickable,
onChangeCardAndRun,
+ onBrush,
onVisualizationClick,
onHoverChange,
onOpenTimelines,
@@ -192,23 +193,28 @@ export const useChartEvents = (
{
eventName: "brushEnd",
handler: (event: EChartsSeriesBrushEndEvent) => {
- const eventData = getBrushData(
- isVisualizerCard ? visualizerRawSeries : rawSeries,
- metadata,
- chartModel,
- event,
- );
-
- if (eventData) {
- onChangeCardAndRun?.(eventData);
-
- // clear selected brush area after calling change handler
- chartRef.current?.dispatchAction({
- type: "brush",
- command: "clear",
- areas: [],
- });
+ if (onBrush) {
+ const range = event.areas[0]?.coordRange;
+ if (range) {
+ onBrush({ start: Number(range[0]), end: Number(range[1]) });
+ }
+ } else {
+ const eventData = getBrushData(
+ isVisualizerCard ? visualizerRawSeries : rawSeries,
+ metadata,
+ chartModel,
+ event,
+ );
+ if (eventData) {
+ onChangeCardAndRun?.(eventData);
+ }
}
+
+ chartRef.current?.dispatchAction({
+ type: "brush",
+ command: "clear",
+ areas: [],
+ });
},
},
],
@@ -231,6 +237,7 @@ export const useChartEvents = (
isVisualizerCard,
metadata,
onChangeCardAndRun,
+ onBrush,
],
);
@@ -311,7 +318,7 @@ export const useChartEvents = (
useEffect(
function toggleBrushing() {
const shouldEnableBrushing =
- canBrush(rawSeries, settings, onChangeCardAndRun) &&
+ canBrush(rawSeries, settings, onChangeCardAndRun, onBrush) &&
!hovered &&
!clicked;
@@ -336,6 +343,7 @@ export const useChartEvents = (
chartRef,
hovered,
onChangeCardAndRun,
+ onBrush,
option,
rawSeries,
settings,
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
index 6b8d9d1cf92..4741e6314d4 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
@@ -114,6 +114,7 @@ const RowChartVisualization = ({
width: outerWidth,
height: outerHeight,
getHref,
+ hideLegend,
}: VisualizationProps) => {
const formatColumnValue = useMemo(() => {
return getColumnValueFormatter();
@@ -272,7 +273,7 @@ const RowChartVisualization = ({
const hasBreakout =
settings["graph.dimensions"] && settings["graph.dimensions"]?.length > 1;
- const hasLegend = series.length > 1 || hasBreakout;
+ const hasLegend = !hideLegend && (series.length > 1 || hasBreakout);
return (
<RowVisualizationRoot className={className} isQueryBuilder={isQueryBuilder}>
diff --git a/frontend/test/__support__/server-mocks/index.ts b/frontend/test/__support__/server-mocks/index.ts
index bb84aa6e61c..4acf241b833 100644
--- a/frontend/test/__support__/server-mocks/index.ts
+++ b/frontend/test/__support__/server-mocks/index.ts
@@ -31,6 +31,7 @@ export * from "./library";
export * from "./llm";
export * from "./logger";
export * from "./measure";
+export * from "./metric";
export * from "./model-indexes";
export * from "./native-query-snippet";
export * from "./performance";
diff --git a/frontend/test/__support__/server-mocks/metric.ts b/frontend/test/__support__/server-mocks/metric.ts
new file mode 100644
index 00000000000..23e395b1bae
--- /dev/null
+++ b/frontend/test/__support__/server-mocks/metric.ts
@@ -0,0 +1,12 @@
+import fetchMock from "fetch-mock";
+
+import type { Metric } from "metabase-types/api";
+
+export function setupMetricEndpoint(metric: Metric) {
+ fetchMock.get(`path:/api/metric/${metric.id}`, metric);
+}
+
+export function setupMetricsEndpoints(metrics: Metric[]) {
+ fetchMock.get("path:/api/metric", metrics);
+ metrics.forEach((metric) => setupMetricEndpoint(metric));
+}
diff --git a/frontend/test/__support__/store.ts b/frontend/test/__support__/store.ts
index f10b4ac61fa..8ec0ea0e7d9 100644
--- a/frontend/test/__support__/store.ts
+++ b/frontend/test/__support__/store.ts
@@ -11,6 +11,7 @@ import {
GroupSchema,
IndexedEntitySchema,
MeasureSchema,
+ MetricSchema,
QuestionSchema,
SchemaSchema,
SegmentSchema,
@@ -61,6 +62,7 @@ const EntitiesSchema: Record<keyof EntitiesState, NormalizrSchema<any>> = {
fields: [FieldSchema],
segments: [SegmentSchema],
measures: [MeasureSchema],
+ metrics: [MetricSchema],
snippets: [SnippetSchema],
indexedEntities: [IndexedEntitySchema],
questions: [QuestionSchema],
diff --git a/package.json b/package.json
index 23b255e9b24..32fdc666b90 100644
--- a/package.json
+++ b/package.json
@@ -374,7 +374,7 @@
"react-refresh": "^0.14.2",
"reg-cli": "^0.17.7",
"semver": "^7.6.3",
- "shadow-cljs": "^2.28.20",
+ "shadow-cljs": "^3.3.5",
"source-map-loader": "^4.0.1",
"storybook": "^8.6.15",
"storybook-addon-pseudo-states": "^4.0.2",
diff --git a/resources/migrations/059_update_migrations.yaml b/resources/migrations/059_update_migrations.yaml
index a7b9d07c88f..0172a2d97c0 100644
--- a/resources/migrations/059_update_migrations.yaml
+++ b/resources/migrations/059_update_migrations.yaml
@@ -229,7 +229,6 @@ databaseChangeLog:
type: ${text.type}
remarks: An optional email address of the owner of this transform (for external owners), exclusive with owner_user_id
-
- changeSet:
id: v59.2026-01-06T10:00:02
author: gantoreno
@@ -281,7 +280,6 @@ databaseChangeLog:
type: int
remarks: The user ID who triggered this run (owner for scheduled runs, current user for manual runs)
-
- changeSet:
id: v59.2026-01-06T10:00:06
author: gantoreno
@@ -307,7 +305,6 @@ databaseChangeLog:
constraintName: fk_transform_run_user_id
onDelete: SET NULL
-
- changeSet:
id: v59.2026-01-07T00:00:01
author: bshepherdson
@@ -879,7 +876,6 @@ databaseChangeLog:
constraintName: fk_transform_run_transform_id
onDelete: SET NULL
-
- changeSet:
id: v59.2026-01-27T12:00:00
author: epaget
@@ -2873,7 +2869,6 @@ databaseChangeLog:
nullable: true
rollback:
-
- changeSet:
id: v59.2026-01-31T12:01:23
author: christruter
diff --git a/resources/migrations/060_update_migrations.yaml b/resources/migrations/060_update_migrations.yaml
new file mode 100644
index 00000000000..8983f08c4c6
--- /dev/null
+++ b/resources/migrations/060_update_migrations.yaml
@@ -0,0 +1,128 @@
+databaseChangeLog:
+ - objectQuotingStrategy: QUOTE_ALL_OBJECTS
+
+ - changeSet:
+ id: v60.2026-02-13T21:43:00
+ author: epaget
+ comment: Add dimensions column to measure table
+ changes:
+ - addColumn:
+ tableName: measure
+ columns:
+ - column:
+ name: dimensions
+ type: ${text.type}
+ remarks: JSON array of persisted dimension definitions (id, display-name, types)
+ constraints:
+ nullable: true
+ rollback:
+ - dropColumn:
+ tableName: measure
+ columnName: dimensions
+
+ - changeSet:
+ id: v60.2026-02-13T21:43:01
+ author: epaget
+ comment: Add dimension_mappings column to measure table
+ changes:
+ - addColumn:
+ tableName: measure
+ columns:
+ - column:
+ name: dimension_mappings
+ type: ${text.type}
+ remarks: JSON array of dimension-to-field mappings (dimension-id, target, table-id)
+ constraints:
+ nullable: true
+ rollback:
+ - dropColumn:
+ tableName: measure
+ columnName: dimension_mappings
+
+ - changeSet:
+ id: v60.2026-02-13T21:43:02
+ author: epaget
+ comment: Add dimensions column to report_card table for metrics
+ changes:
+ - addColumn:
+ tableName: report_card
+ columns:
+ - column:
+ name: dimensions
+ type: ${text.type}
+ remarks: JSON array of persisted dimension definitions (id, display-name, types)
+ constraints:
+ nullable: true
+ rollback:
+ - dropColumn:
+ tableName: report_card
+ columnName: dimensions
+
+ - changeSet:
+ id: v60.2026-02-13T21:43:03
+ author: epaget
+ comment: Add dimension_mappings column to report_card table for metrics
+ changes:
+ - addColumn:
+ tableName: report_card
+ columns:
+ - column:
+ name: dimension_mappings
+ type: ${text.type}
+ remarks: JSON array of dimension-to-field mappings (dimension-id, target, table-id)
+ constraints:
+ nullable: true
+ rollback:
+ - dropColumn:
+ tableName: report_card
+ columnName: dimension_mappings
+
+# >>>>>>>>>> DO NOT ADD NEW MIGRATIONS BELOW THIS LINE! ADD THEM ABOVE <<<<<<<<<<
+
+########################################################################################################################
+#
+# ADVICE:
+#
+# 1) Think through some of these points when writing a migration, learn from our past mistakes:
+# - Do you really need a migration? Could the feature work without it? Prefer not to if possible.
+# Data in the wild can be vastly different from what you expect, and it's hard to get right.
+# - Make sure your migration is backward compatible: it might not be possible to add a constraint back
+# if you drop it in a migration.
+# - Postgres, MySQL and H2 have their differences. Make sure your migration works for all.
+# - Database encryption is a major issue:
+# - Fields like `metabase_database.details` or `setting.value` can be encrypted, so you need to decrypt them in
+# your migration. See #42617, #44048.
+# - Database could be partially encrypted, see https://www.notion.so/72575933ef2a446bafd16909e05a7387
+# - Custom migrations:
+# - Prefer SQL migrations when possible.
+# - Never use application code: it can change and *will* break your migration.
+# - Do not use Toucan models - refer table names directly.
+# - If it's a big change, consider using Quartz, see #42279
+# - More in `metabase.app_db.custom_migrations` namespace doc.
+# - Never delete a migration: users won't be able to downgrade. If you really need to, see #44908
+# - Migration id (`vXX.<date>`) must match its earliest released version:
+# - Do not backport `v51....` to version 50, Metabase will try to downgrade it.
+# - Instead, write a migration with an oldest target you plan to backport to in mind.
+#
+# 2) Migrations should go in the ###_update_migrations.yaml file for the target version.
+#
+# 3) Run mage lint-migrations to run core.spec checks against any changes you make here. Liquibase is pretty
+# forgiving and won't complain if you accidentally mix up things like deleteCascade and onDelete: CASCADE. CI runs
+# this check but it's nicer to know now instead of waiting for CI.
+#
+# 3) Migration IDs should follow the format
+#
+# vMM.TIMESTAMP
+#
+# Where
+#
+# M = major version
+# TIMESTAMP = the current timestamp with format `yyyy-MM-dd'T'HH:mm:ss`
+# To get this timestamp, evaluate this in your REPL: `(dev/migration-timestamp)`
+#
+# E.g: You're adding a new migration for version 49, And it's 10:30:00AM on April 1, 2023 (UTC),
+# your migration id should be: `v49.2023-04-01T10:30:00`.
+#
+# PLEASE KEEP THIS MESSAGE AT THE BOTTOM OF THIS FILE!!!!! Add new migrations above the message.
+#
+########################################################################################################################
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index 2ab681b914e..a53bf75e802 100644
--- a/shadow-cljs.edn
+++ b/shadow-cljs.edn
@@ -24,6 +24,7 @@
metabase.lib.limit
metabase.transforms-inspector.js
metabase.lib.types.isa
+ metabase.lib-metric.js
metabase.parameters.shared
metabase.pivot.core
metabase.pivot.js
diff --git a/src/metabase/api_routes/routes.clj b/src/metabase/api_routes/routes.clj
index 12aad1b7447..52ab6067d90 100644
--- a/src/metabase/api_routes/routes.clj
+++ b/src/metabase/api_routes/routes.clj
@@ -31,6 +31,7 @@
[metabase.logger.api]
[metabase.login-history.api]
[metabase.measures.api]
+ [metabase.metrics.api]
[metabase.model-persistence.api]
[metabase.native-query-snippets.api]
[metabase.notification.api]
@@ -86,6 +87,7 @@
metabase.logger.api/keep-me
metabase.login-history.api/keep-me
metabase.measures.api/keep-me
+ metabase.metrics.api/keep-me
metabase.model-persistence.api/keep-me
metabase.native-query-snippets.api/keep-me
metabase.permissions-rest.api/keep-me
@@ -176,6 +178,7 @@
"/logger" (+auth 'metabase.logger.api)
"/login-history" (+auth 'metabase.login-history.api)
"/measure" (+auth 'metabase.measures.api)
+ "/metric" (+auth 'metabase.metrics.api)
"/model-index" (+auth 'metabase.indexed-entities.api)
"/native-query-snippet" (+auth 'metabase.native-query-snippets.api)
"/notification" metabase.notification.api/notification-routes
diff --git a/src/metabase/lib_be/metadata/jvm.clj b/src/metabase/lib_be/metadata/jvm.clj
index 305b968946c..bdc70151009 100644
--- a/src/metabase/lib_be/metadata/jvm.clj
+++ b/src/metabase/lib_be/metadata/jvm.clj
@@ -362,7 +362,9 @@
:measure/name
:measure/description
:measure/archived
- :measure/definition]
+ :measure/definition
+ :measure/dimensions
+ :measure/dimension_mappings]
:from [[(t2/table-name :model/Measure) :measure]]
:left-join [[(t2/table-name :model/Table) :table]
[:= :measure/table_id :table/id]]}))
diff --git a/src/metabase/lib_metric/ast/build.cljc b/src/metabase/lib_metric/ast/build.cljc
new file mode 100644
index 00000000000..088d54679c6
--- /dev/null
+++ b/src/metabase/lib_metric/ast/build.cljc
@@ -0,0 +1,399 @@
+(ns metabase.lib-metric.ast.build
+ "Functions for building AST nodes from MetricDefinitions."
+ (:require
+ [metabase.lib-metric.dimension :as lib-metric.dimension]
+ [metabase.lib-metric.operators :as operators]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.lib.util :as lib.util]
+ [metabase.util.performance :as perf]))
+
+;;; -------------------- Helper Functions --------------------
+
+(defn- ensure-pmbql
+ "Ensure query is in pMBQL format. Converts legacy MBQL if needed."
+ [metadata-provider mbql-query]
+ (lib/query metadata-provider mbql-query))
+
+;;; -------------------- Primitive Node Construction --------------------
+
+(defn table-node
+ "Create a table node."
+ ([id] (table-node id nil))
+ ([id name]
+ (cond-> {:node/type :ast/table
+ :id id}
+ name (assoc :name name))))
+
+(defn column-node
+ "Create a column node."
+ ([id] (column-node id nil nil))
+ ([id name] (column-node id name nil))
+ ([id name table-id]
+ (cond-> {:node/type :ast/column
+ :id id}
+ name (assoc :name name)
+ table-id (assoc :table-id table-id))))
+
+;;; -------------------- Dimension Construction --------------------
+
+(defn dimension-node
+ "Create a dimension node from a persisted dimension."
+ [{:keys [id name display-name effective-type semantic-type status]}]
+ (cond-> {:node/type :ast/dimension
+ :id id}
+ name (assoc :name name)
+ display-name (assoc :display-name display-name)
+ effective-type (assoc :effective-type effective-type)
+ semantic-type (assoc :semantic-type semantic-type)
+ status (assoc :status status)))
+
+(defn dimension-mapping-node
+ "Create a dimension mapping node from a persisted mapping."
+ [{:keys [dimension-id table-id target]}]
+ (let [[_field opts field-id] target
+ source-field (:source-field opts)]
+ {:node/type :ast/dimension-mapping
+ :dimension-id dimension-id
+ :table-id table-id
+ :column (cond-> (column-node field-id nil table-id)
+ source-field (assoc :source-field source-field))}))
+
+;;; -------------------- Dimension Reference Construction --------------------
+
+(defn- normalize-string-keys
+ "Recursively normalize string keys to keywords, and string values at the top level
+ that represent keywords (like temporal-unit) to keywords."
+ [opts]
+ (reduce-kv (fn [m k v]
+ (let [norm-key (keyword k)
+ norm-val (cond
+ ;; Recursively normalize nested maps
+ (map? v) (normalize-string-keys v)
+ ;; Only convert strings to keywords for specific known fields
+ (and (string? v) (contains? #{:temporal-unit :strategy} norm-key)) (keyword v)
+ :else v)]
+ (assoc m norm-key norm-val)))
+ {}
+ (or opts {})))
+
+(defn dimension-ref->ast-dimension-ref
+ "Convert a dimension reference [:dimension opts uuid] to AST dimension-ref node.
+ The opts map may contain temporal-unit, binning, etc."
+ [[_dimension opts dimension-id]]
+ (let [normalized-opts (normalize-string-keys opts)]
+ (cond-> {:node/type :ast/dimension-ref
+ :dimension-id dimension-id}
+ (seq normalized-opts) (assoc :options normalized-opts))))
+
+;;; -------------------- Dimension Expression Detection --------------------
+
+(defn- expression-wrapped-dimension?
+ "Returns true if clause is a temporal extraction expression wrapping a dimension ref."
+ [clause]
+ (and (sequential? clause)
+ (operators/temporal-extraction? (first clause))))
+
+(defn- dimension-ref-or-expression
+ "Convert a dimension ref or expression-wrapped dimension ref to an AST node.
+ If the clause is a temporal extraction expression, builds a :ast/dimension-expression node.
+ Otherwise delegates to dimension-ref->ast-dimension-ref."
+ [clause]
+ (if (expression-wrapped-dimension? clause)
+ (let [[expression-op _opts inner-dim & extra-args] clause]
+ (cond-> {:node/type :ast/dimension-expression
+ :expression-op expression-op
+ :dimension (dimension-ref->ast-dimension-ref inner-dim)}
+ (seq extra-args) (assoc :args (vec extra-args))))
+ (dimension-ref->ast-dimension-ref clause)))
+
+;;; -------------------- Filter Construction --------------------
+
+(defn mbql-filter->ast-filter
+ "Convert an MBQL filter clause to AST filter node.
+
+ Supported filter types:
+ - Comparison: [:= :!= :< :<= :> :>=] -> :filter/comparison
+ - Between: [:between] -> :filter/between
+ - String: [:contains :starts-with :ends-with :does-not-contain] -> :filter/string
+ - Null: [:is-null :not-null :is-empty :not-empty] -> :filter/null
+ - Multi-value: [:in :not-in] -> :filter/in
+ - Temporal: [:time-interval :relative-time-interval] -> :filter/temporal
+ - Compound: [:and :or :not] -> :filter/and :filter/or :filter/not"
+ [mbql-clause]
+ (when mbql-clause
+ (let [[op opts & args] mbql-clause
+ _ (when-not (keyword? op)
+ (throw (ex-info (str "Expected keyword operator in MBQL filter clause, got: " (pr-str op))
+ {:op op :clause mbql-clause})))
+ operator op]
+ (cond
+ ;; Compound filters
+ (= :and operator)
+ {:node/type :filter/and
+ :children (perf/mapv mbql-filter->ast-filter args)}
+
+ (= :or operator)
+ {:node/type :filter/or
+ :children (perf/mapv mbql-filter->ast-filter args)}
+
+ (= :not operator)
+ {:node/type :filter/not
+ :child (mbql-filter->ast-filter (first args))}
+
+ ;; Comparison filters
+ (operators/comparison? operator)
+ (let [[dimension-ref & values] args]
+ {:node/type :filter/comparison
+ :operator operator
+ :dimension (dimension-ref-or-expression dimension-ref)
+ :values (vec values)})
+
+ ;; Range filters (between, inside)
+ (operators/range? operator)
+ (case operator
+ :between (let [[dimension-ref min-val max-val] args]
+ {:node/type :filter/between
+ :dimension (dimension-ref-or-expression dimension-ref)
+ :min min-val
+ :max max-val})
+ :inside (let [[lat-ref lon-ref north east south west] args]
+ {:node/type :filter/inside
+ :lat-dimension (dimension-ref-or-expression lat-ref)
+ :lon-dimension (dimension-ref-or-expression lon-ref)
+ :north north
+ :east east
+ :south south
+ :west west}))
+
+ ;; String filters
+ (operators/string-op? operator)
+ (let [[dimension-ref value] args]
+ {:node/type :filter/string
+ :operator operator
+ :dimension (dimension-ref-or-expression dimension-ref)
+ :value value
+ :options (perf/select-keys opts [:case-sensitive])})
+
+ ;; Null filters
+ (operators/nullary? operator)
+ (let [[dimension-ref] args]
+ {:node/type :filter/null
+ :operator operator
+ :dimension (dimension-ref-or-expression dimension-ref)})
+
+ ;; In filters
+ (operators/multi-value? operator)
+ (let [[dimension-ref & values] args]
+ {:node/type :filter/in
+ :operator operator
+ :dimension (dimension-ref-or-expression dimension-ref)
+ :values (vec values)})
+
+ ;; Temporal filters
+ (operators/temporal? operator)
+ (let [[dimension-ref value unit pos-offset-value pos-offset-unit] args
+ offset-value (or pos-offset-value (:offset-value opts))
+ offset-unit (or pos-offset-unit (:offset-unit opts))]
+ (cond-> {:node/type :filter/temporal
+ :operator operator
+ :dimension (dimension-ref-or-expression dimension-ref)
+ :value value
+ :unit (keyword unit)}
+ offset-value (assoc :offset-value offset-value
+ :offset-unit (keyword offset-unit))))
+
+ :else
+ (throw (ex-info "Unsupported filter operator" {:operator operator :clause mbql-clause}))))))
+
+(defn mbql-filters->ast-filter
+ "Convert a sequence of MBQL filter clauses to a single AST filter node.
+ If multiple filters are provided, they are combined with :filter/and."
+ [filters]
+ (when (seq filters)
+ (if (= 1 (count filters))
+ (mbql-filter->ast-filter (first filters))
+ {:node/type :filter/and
+ :children (perf/mapv mbql-filter->ast-filter filters)})))
+
+;;; -------------------- Aggregation Construction --------------------
+
+(defn- simple-field-ref?
+ "Returns true if the argument is a simple [:field opts id] reference."
+ [arg]
+ (and (sequential? arg)
+ (= :field (first arg))
+ (pos-int? (nth arg 2 nil))))
+
+(def ^:private mbql-agg-hierarchy
+ "Hierarchy for dispatching on MBQL aggregation keywords."
+ (-> (make-hierarchy)
+ (derive :sum :column-agg)
+ (derive :avg :column-agg)
+ (derive :min :column-agg)
+ (derive :max :column-agg)
+ (derive :distinct :column-agg)))
+
+(defmulti ^:private mbql-aggregation->node*
+ "Convert MBQL aggregation clause to AST aggregation node.
+ Dispatches on the aggregation keyword."
+ {:arglists '([agg-type mbql-clause])}
+ (fn [agg-type _mbql-clause] agg-type)
+ :hierarchy #'mbql-agg-hierarchy)
+
+(defmethod mbql-aggregation->node* :count
+ [_ mbql-clause]
+ (let [[_agg-type _opts & args] mbql-clause
+ first-arg (first args)]
+ (if (nil? first-arg)
+ {:node/type :aggregation/count}
+ (if (simple-field-ref? first-arg)
+ {:node/type :aggregation/count
+ :column (let [[_field _opts field-id] first-arg]
+ (column-node field-id))}
+ {:node/type :aggregation/mbql
+ :clause mbql-clause}))))
+
+(defmethod mbql-aggregation->node* :column-agg
+ [agg-type mbql-clause]
+ (let [[_agg-type _opts & args] mbql-clause
+ first-arg (first args)]
+ (if (simple-field-ref? first-arg)
+ {:node/type (keyword "aggregation" (name agg-type))
+ :column (let [[_field _opts field-id] first-arg]
+ (column-node field-id))}
+ {:node/type :aggregation/mbql
+ :clause mbql-clause})))
+
+(defmethod mbql-aggregation->node* :default
+ [_ mbql-clause]
+ {:node/type :aggregation/mbql
+ :clause mbql-clause})
+
+(defn- mbql-aggregation->node
+ "Convert MBQL aggregation clause to AST aggregation node.
+ Simple aggregations over field references (e.g. sum(price)) produce typed nodes.
+ Complex aggregations (e.g. avg(case(...))) fall through to :aggregation/mbql."
+ [mbql-clause]
+ (when mbql-clause
+ (let [[agg-type] mbql-clause]
+ (mbql-aggregation->node* agg-type mbql-clause))))
+
+;;; -------------------- Source Construction --------------------
+
+(defn- mbql-clause->filter-mbql-node
+ "Wrap a raw MBQL filter clause as a passthrough AST node."
+ [mbql-clause]
+ {:node/type :filter/mbql
+ :clause mbql-clause})
+
+(defn- extract-source-filters
+ "Extract filters from pMBQL query and convert to AST filter node.
+ Returns nil if no filters, a single filter/mbql node if one filter,
+ or a filter/and node containing filter/mbql nodes if multiple."
+ [pmbql-query]
+ (when-let [filters (lib/filters pmbql-query 0)]
+ (if (= 1 (count filters))
+ (mbql-clause->filter-mbql-node (first filters))
+ {:node/type :filter/and
+ :children (perf/mapv mbql-clause->filter-mbql-node filters)})))
+
+(defn- extract-source-joins
+ "Extract joins from pMBQL query and convert to AST join nodes."
+ [pmbql-query]
+ (when-let [joins (lib/joins pmbql-query 0)]
+ (perf/mapv (fn [join]
+ {:node/type :ast/join
+ :mbql-join join})
+ joins)))
+
+(defn- pmbql-query->source-node
+ "Parse pMBQL query into source node structure using lib functions."
+ [source-type id metadata pmbql-query]
+ (let [table-id (lib.util/source-table-id pmbql-query)
+ aggregation (first (lib/aggregations pmbql-query 0))
+ source-filter (extract-source-filters pmbql-query)
+ source-joins (extract-source-joins pmbql-query)]
+ (cond-> {:node/type source-type
+ :id id
+ :name (:name metadata)
+ :aggregation (or (mbql-aggregation->node aggregation)
+ {:node/type :aggregation/count})
+ :base-table (table-node table-id)
+ :metadata metadata}
+ source-joins (assoc :joins source-joins)
+ source-filter (assoc :filters source-filter))))
+
+;;; -------------------- Main Construction --------------------
+
+(defn expression-leaf?
+ "Returns true if the expression is a single leaf node ([:metric opts id] or [:measure opts id])."
+ [expression]
+ (and (sequential? expression)
+ (= 3 (count expression))
+ (#{:metric :measure} (first expression))))
+
+(defn expression-leaf-type
+ "Returns :metric or :measure from an expression leaf."
+ [expression]
+ (when (expression-leaf? expression)
+ (first expression)))
+
+(defn expression-leaf-id
+ "Returns the source ID from an expression leaf."
+ [expression]
+ (when (expression-leaf? expression)
+ (nth expression 2)))
+
+(defn expression-leaf-uuid
+ "Returns the :lib/uuid from an expression leaf."
+ [expression]
+ (when (expression-leaf? expression)
+ (get (second expression) :lib/uuid)))
+
+(defn from-definition
+ "Create complete AST from MetricDefinition.
+ Converts legacy MBQL to pMBQL before processing.
+
+ Metadata is loaded from the provider using the expression leaf's type and ID.
+ Dimensions and dimension-mappings are loaded from the fetched metadata."
+ [definition]
+ (let [{:keys [expression metadata-provider filters projections]} definition
+ leaf-type (expression-leaf-type expression)
+ leaf-id (expression-leaf-id expression)
+ leaf-uuid (expression-leaf-uuid expression)
+ _ (when-not leaf-type
+ (throw (ex-info "Arithmetic metric math expressions are not yet supported in AST builder"
+ {:expression expression})))
+ ;; Load metadata from provider
+ source-type (case leaf-type :metric :source/metric :measure :source/measure)
+ metadata-type (case leaf-type :metric :metadata/metric :measure :metadata/measure)
+ metadata (first (lib.metadata.protocols/metadatas
+ metadata-provider
+ {:lib/type metadata-type :id #{leaf-id}}))
+ ;; Load dimensions/mappings from source metadata
+ dimensions (lib-metric.dimension/get-persisted-dimensions metadata)
+ dimension-mappings (lib-metric.dimension/get-persisted-dimension-mappings metadata)
+ raw-query (case leaf-type
+ :metric (:dataset-query metadata)
+ :measure (:definition metadata))
+ pmbql-query (ensure-pmbql metadata-provider raw-query)
+ ;; Extract flat filters for this leaf's UUID
+ leaf-filters (into []
+ (comp (filter #(= leaf-uuid (:lib/uuid %)))
+ (map :filter))
+ (or filters []))
+ ;; Extract flat projections for this leaf's type/id
+ leaf-projections (perf/some #(when (and (= leaf-type (:type %)) (= leaf-id (:id %)))
+ (:projection %))
+ (or projections []))
+ ;; Convert filters and projections to AST nodes
+ ast-filter (when (seq leaf-filters) (mbql-filters->ast-filter leaf-filters))
+ ast-group-by (when (seq leaf-projections) (perf/mapv dimension-ref->ast-dimension-ref leaf-projections))]
+ {:node/type :ast/root
+ :source (pmbql-query->source-node source-type leaf-id metadata pmbql-query)
+ :dimensions (perf/mapv dimension-node (or dimensions []))
+ :mappings (perf/mapv dimension-mapping-node (or dimension-mappings []))
+ :filter ast-filter
+ :group-by (or ast-group-by [])
+ :metadata-provider metadata-provider}))
diff --git a/src/metabase/lib_metric/ast/compile.cljc b/src/metabase/lib_metric/ast/compile.cljc
new file mode 100644
index 00000000000..302a95f4c01
--- /dev/null
+++ b/src/metabase/lib_metric/ast/compile.cljc
@@ -0,0 +1,311 @@
+(ns metabase.lib-metric.ast.compile
+ "Compile AST to MBQL queries."
+ (:require
+ [medley.core :as m]
+ [metabase.lib-metric.ast.schema :as ast.schema]
+ [metabase.lib-metric.ast.type :as ast.type]
+ [metabase.util.malli :as mu]
+ [metabase.util.performance :as perf]))
+
+;;; -------------------- Helper Functions --------------------
+
+(defn- random-uuid-str []
+ (str (random-uuid)))
+
+;;; -------------------- Resolution --------------------
+
+(defn- find-mapping
+ "Find dimension mapping by dimension ID."
+ [dimension-id mappings]
+ (m/find-first #(= dimension-id (:dimension-id %)) mappings))
+
+(defn- column-node->field-ref
+ "Convert column node to MBQL field reference."
+ [{:keys [id source-field]} options]
+ [:field (cond-> (merge {:lib/uuid (random-uuid-str)} options)
+ source-field (assoc :source-field source-field))
+ id])
+
+(defn- resolve-dimension-ref
+ "Resolve dimension ref node to MBQL field ref using mappings."
+ [{:keys [dimension-id options]} mappings]
+ (if-let [mapping (find-mapping dimension-id mappings)]
+ (column-node->field-ref (:column mapping) (or options {}))
+ (throw (ex-info "Unable to resolve dimension" {:dimension-id dimension-id}))))
+
+(defn- resolve-dimension-or-expression
+ "Resolve a dimension ref or dimension expression node to MBQL.
+ For :ast/dimension-ref nodes, delegates to resolve-dimension-ref.
+ For :ast/dimension-expression nodes, resolves the inner dimension ref
+ and wraps the result in the expression operator."
+ [node mappings]
+ (case (:node/type node)
+ :ast/dimension-ref (resolve-dimension-ref node mappings)
+ :ast/dimension-expression
+ (let [{:keys [expression-op dimension args]} node
+ resolved-field (resolve-dimension-ref dimension mappings)]
+ (into [expression-op {:lib/uuid (random-uuid-str)} resolved-field] args))))
+
+;;; -------------------- Filter Compilation --------------------
+
+(defmulti compile-filter-node
+ "Compile filter AST node to MBQL filter clause."
+ {:arglists '([node mappings])}
+ (fn [node _mappings] (:node/type node)))
+
+(defmethod compile-filter-node :filter/comparison
+ [{:keys [operator dimension values]} mappings]
+ (into [operator {:lib/uuid (random-uuid-str)}
+ (resolve-dimension-or-expression dimension mappings)]
+ values))
+
+(defmethod compile-filter-node :filter/between
+ [{:keys [dimension min max]} mappings]
+ [:between {:lib/uuid (random-uuid-str)}
+ (resolve-dimension-or-expression dimension mappings)
+ min max])
+
+(defmethod compile-filter-node :filter/string
+ [{:keys [operator dimension value options]} mappings]
+ [operator (merge {:lib/uuid (random-uuid-str)} options)
+ (resolve-dimension-or-expression dimension mappings)
+ value])
+
+(defmethod compile-filter-node :filter/null
+ [{:keys [operator dimension]} mappings]
+ [operator {:lib/uuid (random-uuid-str)}
+ (resolve-dimension-or-expression dimension mappings)])
+
+(defmethod compile-filter-node :filter/in
+ [{:keys [operator dimension values]} mappings]
+ (into [operator {:lib/uuid (random-uuid-str)}
+ (resolve-dimension-or-expression dimension mappings)]
+ values))
+
+(defmethod compile-filter-node :filter/inside
+ [{:keys [lat-dimension lon-dimension north east south west]} mappings]
+ [:inside {:lib/uuid (random-uuid-str)}
+ (resolve-dimension-or-expression lat-dimension mappings)
+ (resolve-dimension-or-expression lon-dimension mappings)
+ north east south west])
+
+(defmethod compile-filter-node :filter/temporal
+ [{:keys [operator dimension value unit offset-value offset-unit]} mappings]
+ (let [opts (cond-> {:lib/uuid (random-uuid-str)}
+ offset-value (assoc :offset-value offset-value)
+ offset-unit (assoc :offset-unit offset-unit))]
+ [operator opts (resolve-dimension-or-expression dimension mappings) value unit]))
+
+(defmethod compile-filter-node :filter/and
+ [{:keys [children]} mappings]
+ (into [:and {:lib/uuid (random-uuid-str)}]
+ (map #(compile-filter-node % mappings) children)))
+
+(defmethod compile-filter-node :filter/or
+ [{:keys [children]} mappings]
+ (into [:or {:lib/uuid (random-uuid-str)}]
+ (map #(compile-filter-node % mappings) children)))
+
+(defmethod compile-filter-node :filter/not
+ [{:keys [child]} mappings]
+ [:not {:lib/uuid (random-uuid-str)}
+ (compile-filter-node child mappings)])
+
+(defmethod compile-filter-node :filter/mbql
+ [{:keys [clause]} _mappings]
+ clause)
+
+;;; -------------------- Aggregation Compilation --------------------
+
+(defmulti compile-aggregation-node
+ "Compile aggregation node to MBQL aggregation clause."
+ {:arglists '([node])}
+ :node/type
+ :hierarchy #'ast.type/ast-hierarchy)
+
+(defmethod compile-aggregation-node :aggregation/count
+ [{:keys [column]}]
+ (if column
+ [:count {:lib/uuid (random-uuid-str)}
+ (column-node->field-ref column {})]
+ [:count {:lib/uuid (random-uuid-str)}]))
+
+(defmethod compile-aggregation-node :aggregation/column
+ [{:keys [column] :as node}]
+ (let [agg-kw (keyword (name (:node/type node)))]
+ [agg-kw {:lib/uuid (random-uuid-str)}
+ (column-node->field-ref column {})]))
+
+(defmethod compile-aggregation-node :aggregation/mbql
+ [{:keys [clause]}]
+ clause)
+
+;;; -------------------- Source Compilation --------------------
+
+(defn- compile-source-filters
+ "Compile source's built-in filters."
+ [source mappings]
+ (when-let [filters (:filters source)]
+ (compile-filter-node filters mappings)))
+
+(defn- get-database-id
+ "Extract database ID from source metadata."
+ [source]
+ (let [metadata (:metadata source)]
+ (or
+ ;; From metric dataset-query
+ (perf/get-in metadata [:dataset-query :database])
+ ;; From measure definition
+ (perf/get-in metadata [:definition :database])
+ (throw (ex-info "Cannot determine database ID for metric source"
+ {:source-metadata metadata})))))
+
+;;; -------------------- Join Compilation --------------------
+
+(defn- has-joins?
+ "Check if source has joins that require two-stage compilation."
+ [source]
+ (seq (:joins source)))
+
+(defn- compile-join-nodes
+ "Compile AST join nodes to pMBQL join clauses."
+ [join-nodes]
+ (perf/mapv :mbql-join join-nodes))
+
+;;; -------------------- Main Compilation --------------------
+
+(defn- compile-single-stage-query
+ "Compile AST to single-stage MBQL query (no joins)."
+ [{:keys [source mappings filter group-by]} {:keys [limit]}]
+ (let [;; Compile source filters + user filters
+ source-filters (compile-source-filters source mappings)
+ user-filters (when filter (compile-filter-node filter mappings))
+ all-filters (cond
+ (and source-filters user-filters)
+ [[:and {:lib/uuid (random-uuid-str)} source-filters user-filters]]
+ source-filters [source-filters]
+ user-filters [user-filters]
+ :else nil)
+
+ ;; Compile breakouts from group-by
+ breakouts (when (seq group-by)
+ (perf/mapv #(resolve-dimension-ref % mappings) group-by))
+
+ ;; Build stage
+ stage (cond-> {:lib/type :mbql.stage/mbql
+ :source-table (perf/get-in source [:base-table :id])
+ :aggregation [(compile-aggregation-node (:aggregation source))]}
+ (seq all-filters) (assoc :filters all-filters)
+ (seq breakouts) (assoc :breakout breakouts)
+ limit (assoc :limit limit))
+
+ ;; Get database ID from source
+ database-id (get-database-id source)]
+ {:lib/type :mbql/query
+ :database database-id
+ :stages [stage]}))
+
+(defn- compile-two-stage-query
+ "Compile AST to two-stage MBQL query when joins are present.
+
+ Stage 0: Data model - base table, joins, source filters
+ Stage 1: Analysis - user filters, breakouts, aggregation"
+ [{:keys [source mappings filter group-by]} {:keys [limit]}]
+ (let [;; Stage 0: Data model
+ stage-0 (cond-> {:lib/type :mbql.stage/mbql
+ :source-table (perf/get-in source [:base-table :id])
+ :joins (compile-join-nodes (:joins source))}
+ (:filters source)
+ (assoc :filters [(compile-filter-node (:filters source) mappings)]))
+
+ ;; Stage 1: Analysis
+ user-filters (when filter [(compile-filter-node filter mappings)])
+ breakouts (when (seq group-by)
+ (perf/mapv #(resolve-dimension-ref % mappings) group-by))
+ stage-1 (cond-> {:lib/type :mbql.stage/mbql
+ :aggregation [(compile-aggregation-node (:aggregation source))]}
+ (seq user-filters) (assoc :filters user-filters)
+ (seq breakouts) (assoc :breakout breakouts)
+ limit (assoc :limit limit))
+
+ database-id (get-database-id source)]
+ {:lib/type :mbql/query
+ :database database-id
+ :stages [stage-0 stage-1]}))
+
+(mu/defn compile-to-mbql
+ "Compile AST to MBQL query.
+
+ Generates a two-stage query when the source has joins:
+ - Stage 0: Data model (base table + joins + source filters)
+ - Stage 1: Analysis (user filters + breakouts + aggregation)
+
+ Options:
+ - :limit - add limit to query"
+ [{:keys [source] :as ast} :- ::ast.schema/ast
+ & {:as opts}]
+ (if (has-joins? source)
+ (compile-two-stage-query ast opts)
+ (compile-single-stage-query ast opts)))
+
+;;; -------------------- Values Query Compilation (no aggregation) --------------------
+
+(defn- compile-single-stage-values-query
+ "Compile AST to single-stage MBQL query for distinct values (no aggregation)."
+ [{:keys [source mappings filter group-by]} {:keys [limit]}]
+ (let [source-filters (compile-source-filters source mappings)
+ user-filters (when filter (compile-filter-node filter mappings))
+ all-filters (cond
+ (and source-filters user-filters)
+ [[:and {:lib/uuid (random-uuid-str)} source-filters user-filters]]
+ source-filters [source-filters]
+ user-filters [user-filters]
+ :else nil)
+ breakouts (when (seq group-by)
+ (perf/mapv #(resolve-dimension-ref % mappings) group-by))
+ stage (cond-> {:lib/type :mbql.stage/mbql
+ :source-table (perf/get-in source [:base-table :id])}
+ (seq all-filters) (assoc :filters all-filters)
+ (seq breakouts) (assoc :breakout breakouts)
+ limit (assoc :limit limit))
+ database-id (get-database-id source)]
+ {:lib/type :mbql/query
+ :database database-id
+ :stages [stage]}))
+
+(defn- compile-two-stage-values-query
+ "Compile AST to two-stage MBQL query for distinct values (no aggregation).
+
+ Stage 0: Data model - base table, joins, source filters
+ Stage 1: User filters, breakouts (no aggregation)"
+ [{:keys [source mappings filter group-by]} {:keys [limit]}]
+ (let [stage-0 (cond-> {:lib/type :mbql.stage/mbql
+ :source-table (perf/get-in source [:base-table :id])
+ :joins (compile-join-nodes (:joins source))}
+ (:filters source)
+ (assoc :filters [(compile-filter-node (:filters source) mappings)]))
+ user-filters (when filter [(compile-filter-node filter mappings)])
+ breakouts (when (seq group-by)
+ (perf/mapv #(resolve-dimension-ref % mappings) group-by))
+ stage-1 (cond-> {:lib/type :mbql.stage/mbql}
+ (seq user-filters) (assoc :filters user-filters)
+ (seq breakouts) (assoc :breakout breakouts)
+ limit (assoc :limit limit))
+ database-id (get-database-id source)]
+ {:lib/type :mbql/query
+ :database database-id
+ :stages [stage-0 stage-1]}))
+
+(mu/defn compile-to-values-query
+ "Compile AST to MBQL query for fetching distinct values (no aggregation).
+
+ Like [[compile-to-mbql]] but omits the aggregation clause, producing a query
+ that returns distinct breakout values instead of aggregated results.
+
+ Options:
+ - :limit - add limit to query"
+ [{:keys [source] :as ast} :- ::ast.schema/ast
+ & {:as opts}]
+ (if (has-joins? source)
+ (compile-two-stage-values-query ast opts)
+ (compile-single-stage-values-query ast opts)))
diff --git a/src/metabase/lib_metric/ast/schema.cljc b/src/metabase/lib_metric/ast/schema.cljc
new file mode 100644
index 00000000000..4240f74e8dc
--- /dev/null
+++ b/src/metabase/lib_metric/ast/schema.cljc
@@ -0,0 +1,259 @@
+(ns metabase.lib-metric.ast.schema
+ "Malli schemas for Metric AST nodes.
+ The AST provides an intermediate representation for metric definitions
+ that can be walked, transformed, and compiled to MBQL queries."
+ (:require
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.util.malli.registry :as mr]))
+
+;;; -------------------- Primitive Nodes --------------------
+
+(mr/def ::table-node
+ "Reference to a database table."
+ [:map
+ [:node/type [:= :ast/table]]
+ [:id pos-int?]
+ [:name {:optional true} [:maybe string?]]])
+
+(mr/def ::column-node
+ "Reference to a database column/field."
+ [:map
+ [:node/type [:= :ast/column]]
+ [:id pos-int?]
+ [:name {:optional true} [:maybe string?]]
+ [:table-id {:optional true} [:maybe pos-int?]]])
+
+;;; -------------------- Dimension Nodes --------------------
+
+(mr/def ::dimension-node
+ "A dimension definition - the abstract dimension."
+ [:map
+ [:node/type [:= :ast/dimension]]
+ [:id ::lib-metric.schema/dimension-id]
+ [:name {:optional true} [:maybe string?]]
+ [:display-name {:optional true} [:maybe string?]]
+ [:effective-type {:optional true} [:maybe keyword?]]
+ [:semantic-type {:optional true} [:maybe keyword?]]
+ [:status {:optional true} [:maybe [:enum :status/active :status/orphaned]]]])
+
+(mr/def ::dimension-ref-options
+ "Options for dimension references (bucketing, binning, etc.)."
+ [:map
+ [:temporal-unit {:optional true} [:maybe keyword?]]
+ [:binning {:optional true} [:maybe :map]]])
+
+(mr/def ::dimension-ref-node
+ "A reference to a dimension, used in filters and group-by."
+ [:map
+ [:node/type [:= :ast/dimension-ref]]
+ [:dimension-id ::lib-metric.schema/dimension-id]
+ [:options {:optional true} [:maybe ::dimension-ref-options]]])
+
+(mr/def ::dimension-expression-node
+ "A dimension reference wrapped in an expression (e.g. temporal extraction like :get-day-of-week)."
+ [:map
+ [:node/type [:= :ast/dimension-expression]]
+ [:expression-op keyword?]
+ [:dimension ::dimension-ref-node]
+ [:args {:optional true} [:maybe [:sequential :any]]]])
+
+(mr/def ::dimension-or-expression
+ "A dimension reference or an expression wrapping one."
+ [:or ::dimension-ref-node ::dimension-expression-node])
+
+(mr/def ::dimension-mapping-node
+ "Connects a dimension to a physical column."
+ [:map
+ [:node/type [:= :ast/dimension-mapping]]
+ [:dimension-id ::lib-metric.schema/dimension-id]
+ [:table-id {:optional true} [:maybe pos-int?]]
+ [:column ::column-node]])
+
+;;; -------------------- Aggregation Nodes --------------------
+
+(mr/def ::aggregation-count
+ [:map
+ [:node/type [:= :aggregation/count]]
+ [:column {:optional true} [:maybe ::column-node]]])
+
+(mr/def ::aggregation-sum
+ [:map
+ [:node/type [:= :aggregation/sum]]
+ [:column ::column-node]])
+
+(mr/def ::aggregation-avg
+ [:map
+ [:node/type [:= :aggregation/avg]]
+ [:column ::column-node]])
+
+(mr/def ::aggregation-min
+ [:map
+ [:node/type [:= :aggregation/min]]
+ [:column ::column-node]])
+
+(mr/def ::aggregation-max
+ [:map
+ [:node/type [:= :aggregation/max]]
+ [:column ::column-node]])
+
+(mr/def ::aggregation-distinct
+ [:map
+ [:node/type [:= :aggregation/distinct]]
+ [:column ::column-node]])
+
+(mr/def ::aggregation-mbql
+ "For complex/custom aggregations that don't fit standard types."
+ [:map
+ [:node/type [:= :aggregation/mbql]]
+ [:clause :any]])
+
+(mr/def ::aggregation-node
+ "Union of all aggregation node types."
+ [:or
+ ::aggregation-count
+ ::aggregation-sum
+ ::aggregation-avg
+ ::aggregation-min
+ ::aggregation-max
+ ::aggregation-distinct
+ ::aggregation-mbql])
+
+;;; -------------------- Filter Nodes --------------------
+
+(mr/def ::filter-comparison
+ "Comparison filter (=, !=, <, <=, >, >=)."
+ [:map
+ [:node/type [:= :filter/comparison]]
+ [:operator [:enum := :!= :< :<= :> :>=]]
+ [:dimension ::dimension-or-expression]
+ [:values [:sequential :any]]])
+
+(mr/def ::filter-between
+ "Between filter for range checks."
+ [:map
+ [:node/type [:= :filter/between]]
+ [:dimension ::dimension-or-expression]
+ [:min :any]
+ [:max :any]])
+
+(mr/def ::filter-string
+ "String filter operations."
+ [:map
+ [:node/type [:= :filter/string]]
+ [:operator [:enum :contains :starts-with :ends-with :does-not-contain]]
+ [:dimension ::dimension-or-expression]
+ [:value string?]
+ [:options {:optional true} [:map [:case-sensitive {:optional true} [:maybe boolean?]]]]])
+
+(mr/def ::filter-null
+ "Null/empty check filter."
+ [:map
+ [:node/type [:= :filter/null]]
+ [:operator [:enum :is-null :not-null :is-empty :not-empty]]
+ [:dimension ::dimension-or-expression]])
+
+(mr/def ::filter-in
+ "Multi-value filter (in, not-in)."
+ [:map
+ [:node/type [:= :filter/in]]
+ [:operator [:enum :in :not-in]]
+ [:dimension ::dimension-or-expression]
+ [:values [:sequential :any]]])
+
+(mr/def ::filter-inside
+ "Geographic bounding-box filter."
+ [:map
+ [:node/type [:= :filter/inside]]
+ [:lat-dimension ::dimension-or-expression]
+ [:lon-dimension ::dimension-or-expression]
+ [:north :any]
+ [:east :any]
+ [:south :any]
+ [:west :any]])
+
+(mr/def ::filter-temporal
+ "Temporal filter for time-based operations."
+ [:map
+ [:node/type [:= :filter/temporal]]
+ [:operator [:enum :time-interval :relative-time-interval]]
+ [:dimension ::dimension-or-expression]
+ [:value int?]
+ [:unit keyword?]
+ [:offset-value {:optional true} [:maybe int?]]
+ [:offset-unit {:optional true} [:maybe keyword?]]])
+
+(mr/def ::filter-mbql
+ "Raw MBQL filter clause passthrough for source filters."
+ [:map
+ [:node/type [:= :filter/mbql]]
+ [:clause :any]])
+
+;; Forward declare for recursive references
+(mr/def ::filter-node
+ "Union of all filter node types (including compound)."
+ [:or
+ ::filter-comparison
+ ::filter-between
+ ::filter-inside
+ ::filter-string
+ ::filter-null
+ ::filter-in
+ ::filter-temporal
+ ::filter-mbql
+ [:map
+ [:node/type [:= :filter/and]]
+ [:children [:sequential [:ref ::filter-node]]]]
+ [:map
+ [:node/type [:= :filter/or]]
+ [:children [:sequential [:ref ::filter-node]]]]
+ [:map
+ [:node/type [:= :filter/not]]
+ [:child [:ref ::filter-node]]]])
+
+;;; -------------------- Join Nodes --------------------
+
+(mr/def ::join-node
+ "A join from the source metric's query, preserved as raw pMBQL."
+ [:map
+ [:node/type [:= :ast/join]]
+ [:mbql-join :any]])
+
+;;; -------------------- Source Nodes --------------------
+
+(defn- source-node-schema
+ "Create a source node schema with the given node-type keyword."
+ [node-type]
+ [:map
+ [:node/type [:= node-type]]
+ [:id pos-int?]
+ [:name {:optional true} [:maybe string?]]
+ [:aggregation ::aggregation-node]
+ [:base-table ::table-node]
+ [:metadata {:optional true} [:maybe :map]]
+ [:joins {:optional true} [:maybe [:sequential ::join-node]]]
+ [:filters {:optional true} [:maybe [:ref ::filter-node]]]])
+
+(mr/def ::source-metric
+ "Metric source - contains the metric's query as AST."
+ (source-node-schema :source/metric))
+
+(mr/def ::source-measure
+ "Measure source - contains the measure's definition as AST."
+ (source-node-schema :source/measure))
+
+(mr/def ::source-node
+ "Union of source node types."
+ [:or ::source-metric ::source-measure])
+
+;;; -------------------- Root Node --------------------
+
+(mr/def ::ast
+ "Root AST node - the complete metric exploration."
+ [:map
+ [:node/type [:= :ast/root]]
+ [:source ::source-node]
+ [:dimensions [:sequential ::dimension-node]]
+ [:mappings [:sequential ::dimension-mapping-node]]
+ [:filter {:optional true} [:maybe ::filter-node]]
+ [:group-by {:optional true} [:maybe [:sequential ::dimension-ref-node]]]
+ [:metadata-provider {:optional true} [:maybe :some]]])
diff --git a/src/metabase/lib_metric/ast/type.cljc b/src/metabase/lib_metric/ast/type.cljc
new file mode 100644
index 00000000000..792a60176c4
--- /dev/null
+++ b/src/metabase/lib_metric/ast/type.cljc
@@ -0,0 +1,18 @@
+(ns metabase.lib-metric.ast.type
+ "Type hierarchy for multimethod dispatch on AST node types.")
+
+(def ast-hierarchy
+ "Hierarchy for multimethod dispatch on AST node types."
+ (-> (make-hierarchy)
+ ;; Aggregations that take a required column
+ (derive :aggregation/sum :aggregation/column)
+ (derive :aggregation/avg :aggregation/column)
+ (derive :aggregation/min :aggregation/column)
+ (derive :aggregation/max :aggregation/column)
+ (derive :aggregation/distinct :aggregation/column)
+ ;; Compound filters with :children
+ (derive :filter/and :filter/compound)
+ (derive :filter/or :filter/compound)
+ ;; Source nodes
+ (derive :source/metric :source/any)
+ (derive :source/measure :source/any)))
diff --git a/src/metabase/lib_metric/ast/walk.cljc b/src/metabase/lib_metric/ast/walk.cljc
new file mode 100644
index 00000000000..77bfceada72
--- /dev/null
+++ b/src/metabase/lib_metric/ast/walk.cljc
@@ -0,0 +1,185 @@
+(ns metabase.lib-metric.ast.walk
+ "Functions for walking and transforming AST nodes."
+ (:require
+ [metabase.lib-metric.ast.type :as ast.type]
+ [metabase.util.performance :as perf]))
+
+(defn node?
+ "Returns true if x is an AST node (map with :node/type key)."
+ [x]
+ (and (map? x) (contains? x :node/type)))
+
+(defn filter-node?
+ "Returns true if x is a filter AST node."
+ [x]
+ (and (node? x)
+ (when-let [ns (namespace (:node/type x))]
+ (= ns "filter"))))
+
+(defn source-node?
+ "Returns true if x is a source AST node (metric or measure)."
+ [x]
+ (and (node? x)
+ (when-let [ns (namespace (:node/type x))]
+ (= ns "source"))))
+
+(defn dimension-ref-node?
+ "Returns true if x is a dimension reference node."
+ [x]
+ (and (node? x) (= :ast/dimension-ref (:node/type x))))
+
+(defmulti walk-node
+ "Walk a single AST node, calling inner on child nodes.
+ Returns the walked node (before outer is applied)."
+ {:arglists '([inner node])}
+ (fn [_inner node] (:node/type node))
+ :hierarchy #'ast.type/ast-hierarchy)
+
+(defmethod walk-node :filter/compound
+ [inner ast]
+ (update ast :children #(perf/mapv inner %)))
+
+(defmethod walk-node :filter/not
+ [inner ast]
+ (update ast :child inner))
+
+(defmethod walk-node :filter/comparison [inner ast] (cond-> ast (:dimension ast) (update :dimension inner)))
+(defmethod walk-node :filter/between [inner ast] (cond-> ast (:dimension ast) (update :dimension inner)))
+(defmethod walk-node :filter/string [inner ast] (cond-> ast (:dimension ast) (update :dimension inner)))
+(defmethod walk-node :filter/null [inner ast] (cond-> ast (:dimension ast) (update :dimension inner)))
+(defmethod walk-node :filter/in [inner ast] (cond-> ast (:dimension ast) (update :dimension inner)))
+(defmethod walk-node :filter/temporal [inner ast] (cond-> ast (:dimension ast) (update :dimension inner)))
+
+(defmethod walk-node :ast/dimension-expression
+ [inner ast]
+ (update ast :dimension inner))
+
+(defmethod walk-node :filter/inside
+ [inner ast]
+ (cond-> ast
+ (:lat-dimension ast) (update :lat-dimension inner)
+ (:lon-dimension ast) (update :lon-dimension inner)))
+
+(defmethod walk-node :ast/root
+ [inner ast]
+ (cond-> ast
+ (:filter ast) (update :filter inner)
+ (:source ast) (update :source inner)
+ (:group-by ast) (update :group-by #(perf/mapv inner %))
+ (:dimensions ast) (update :dimensions #(perf/mapv inner %))
+ (:mappings ast) (update :mappings #(perf/mapv inner %))))
+
+(defmethod walk-node :source/any
+ [inner ast]
+ (cond-> ast
+ (:filters ast) (update :filters inner)))
+
+(defmethod walk-node :default
+ [_inner ast]
+ ast)
+
+(defn walk
+ "Walk AST, calling inner on child nodes and outer on the result.
+ Similar to clojure.walk/walk but AST-aware."
+ [inner outer ast]
+ (outer
+ (if (node? ast)
+ (walk-node inner ast)
+ ast)))
+
+(defn postwalk
+ "Walk AST depth-first, applying f to each node after recursing into children."
+ [f ast]
+ (walk (partial postwalk f) f ast))
+
+(defn prewalk
+ "Walk AST applying f to each node before recursing into children."
+ [f ast]
+ (walk (partial prewalk f) identity (f ast)))
+
+(defn collect
+ "Collect all nodes matching predicate, walking the entire AST."
+ [pred ast]
+ (let [results (atom [])]
+ (postwalk (fn [node]
+ (when (pred node)
+ (swap! results conj node))
+ node)
+ ast)
+ @results))
+
+(defn collect-dimension-refs
+ "Collect all dimension reference nodes in AST."
+ [ast]
+ (collect dimension-ref-node? ast))
+
+(defn collect-by-type
+ "Collect all nodes of a specific :node/type."
+ [node-type ast]
+ (collect #(= node-type (:node/type %)) ast))
+
+(defn transform
+ "Transform all nodes matching predicate using transform-fn.
+ Uses postwalk to ensure children are transformed before parents."
+ [pred transform-fn ast]
+ (postwalk (fn [node]
+ (if (pred node)
+ (transform-fn node)
+ node))
+ ast))
+
+(defn transform-by-type
+ "Transform all nodes of a specific :node/type using transform-fn."
+ [node-type transform-fn ast]
+ (transform #(= node-type (:node/type %)) transform-fn ast))
+
+(defn find-first
+ "Find the first node matching predicate, or nil if not found."
+ [pred ast]
+ (first (collect pred ast)))
+
+(defn count-nodes
+ "Count all nodes matching predicate."
+ [pred ast]
+ (count (collect pred ast)))
+
+(defn replace-node
+ "Replace nodes matching predicate with replacement value."
+ [pred replacement ast]
+ (transform pred (constantly replacement) ast))
+
+(defmulti ^:private remove-filters-node
+ "Remove matching filter children from a node. Returns the transformed node."
+ {:arglists '([pred node])}
+ (fn [_pred node] (:node/type node))
+ :hierarchy #'ast.type/ast-hierarchy)
+
+(defmethod remove-filters-node :filter/compound
+ [pred node]
+ (let [filtered-children (filterv #(and (some? %) (not (pred %))) (:children node))]
+ (case (count filtered-children)
+ 0 nil
+ 1 (first filtered-children)
+ (assoc node :children filtered-children))))
+
+(defmethod remove-filters-node :filter/not
+ [pred node]
+ (if (pred (:child node))
+ nil
+ node))
+
+(defmethod remove-filters-node :default
+ [_pred node]
+ node)
+
+(defn remove-filters
+ "Remove all filter nodes matching predicate from compound filters.
+ For :filter/and and :filter/or, filters out matching children.
+ For :filter/not, replaces with nil if child matches."
+ [pred ast]
+ (postwalk
+ (fn [node]
+ (if (node? node)
+ (remove-filters-node pred node)
+ node))
+ ast))
diff --git a/src/metabase/lib_metric/clause.cljc b/src/metabase/lib_metric/clause.cljc
new file mode 100644
index 00000000000..4d4c3644a25
--- /dev/null
+++ b/src/metabase/lib_metric/clause.cljc
@@ -0,0 +1,86 @@
+(ns metabase.lib-metric.clause
+ "Functions for manipulating clauses in MetricDefinitions.
+ Clauses are MBQL expressions stored in :filters (as instance-filter entries)
+ and :projections (as typed-projection entries with nested dimension references).
+ Each clause has a :lib/uuid in its options map for identification."
+ (:require
+ [metabase.lib.core :as lib]
+ [metabase.util.performance :as perf]))
+
+(defn- clause-uuid
+ "Get the :lib/uuid from a clause's options."
+ [clause]
+ (:lib/uuid (lib/options clause)))
+
+(defn- find-clause-location
+ "Find a clause by its UUID in the definition's :filters or :projections.
+ Searches instance-filter entries (checking :filter clause UUIDs) and
+ typed-projection entries (checking dimension reference UUIDs).
+ Returns [deep-path] or nil if not found.
+ For filters: [:filters idx :filter]
+ For projections: [:projections proj-idx :projection dim-idx]"
+ [definition target-uuid]
+ ;; Search filters: each entry is {:lib/uuid ... :filter <mbql-clause>}
+ (or (perf/some (fn [[idx entry]]
+ (when (= target-uuid (clause-uuid (:filter entry)))
+ [:filters idx :filter]))
+ (map-indexed vector (:filters definition)))
+ ;; Search projections: each entry is {:type ... :id ... :projection [dim-refs...]}
+ (perf/some (fn [[proj-idx tp]]
+ (perf/some (fn [[dim-idx dim-ref]]
+ (when (= target-uuid (clause-uuid dim-ref))
+ [:projections proj-idx :projection dim-idx]))
+ (map-indexed vector (:projection tp))))
+ (map-indexed vector (:projections definition)))))
+
+(defn replace-clause
+ "Replace a clause in the definition with a new clause.
+ Finds the target clause by its :lib/uuid and replaces it with new-clause.
+ Returns the definition unchanged if target clause is not found."
+ [definition target-clause new-clause]
+ (let [target-uuid (clause-uuid target-clause)]
+ (if-let [path (find-clause-location definition target-uuid)]
+ (assoc-in definition path new-clause)
+ definition)))
+
+(defn remove-clause
+ "Remove a clause from the definition.
+ Finds the clause by its :lib/uuid and removes it.
+ For filters: removes the entire instance-filter entry from :filters.
+ For projections: removes the dim-ref from the typed-projection's :projection vector.
+ Returns the definition unchanged if clause is not found."
+ [definition clause]
+ (let [target-uuid (clause-uuid clause)]
+ (if-let [path (find-clause-location definition target-uuid)]
+ (case (first path)
+ :filters
+ ;; Remove the entire instance-filter entry at [:filters idx]
+ (let [idx (second path)]
+ (update definition :filters
+ (fn [v]
+ (into (subvec v 0 idx) (subvec v (inc idx))))))
+ :projections
+ ;; Remove the dim-ref at [:projections proj-idx :projection dim-idx]
+ (let [proj-idx (nth path 1)
+ dim-idx (nth path 3)]
+ (update-in definition [:projections proj-idx :projection]
+ (fn [v]
+ (into (subvec v 0 dim-idx) (subvec v (inc dim-idx)))))))
+ definition)))
+
+(defn swap-clauses
+ "Swap two clauses in the definition.
+ Finds both clauses by their :lib/uuid and swaps their values at their respective paths.
+ Returns the definition unchanged if either clause is not found."
+ [definition source-clause target-clause]
+ (let [source-uuid (clause-uuid source-clause)
+ target-uuid (clause-uuid target-clause)]
+ (if-let [source-path (find-clause-location definition source-uuid)]
+ (if-let [target-path (find-clause-location definition target-uuid)]
+ (let [source-val (perf/get-in definition source-path)
+ target-val (perf/get-in definition target-path)]
+ (-> definition
+ (assoc-in source-path target-val)
+ (assoc-in target-path source-val)))
+ definition)
+ definition)))
diff --git a/src/metabase/lib_metric/core.cljc b/src/metabase/lib_metric/core.cljc
new file mode 100644
index 00000000000..b6a019e2f56
--- /dev/null
+++ b/src/metabase/lib_metric/core.cljc
@@ -0,0 +1,107 @@
+(ns metabase.lib-metric.core
+ "Library for constructing and manipulating metric definitions.
+
+ A MetricDefinition represents an exploration of a metric or measure, specifying:
+ - A source: either a metric (saved card) or measure (reusable aggregation)
+ - Filters: constraints on dimension values
+ - Projections: dimensions to group by (become MBQL breakouts)
+
+ Dimensions are UUID-referenced columns available for filtering and grouping.
+ They provide stable identifiers that survive query changes, unlike field refs
+ or column aliases. Dimension refs `[:dimension {} \"uuid\"]` are resolved to
+ concrete field refs when the definition is converted to an executable MBQL query."
+ (:require
+ #?@(:clj [[metabase.lib-metric.dimension.jvm :as lib-metric.dimension.jvm]
+ [metabase.lib-metric.metadata.jvm :as lib-metric.metadata.jvm]
+ [potemkin :as p]]
+ :cljs [[metabase.lib-metric.metadata.js :as lib-metric.metadata.js]])
+ [metabase.lib-metric.clause :as lib-metric.clause]
+ [metabase.lib-metric.definition :as lib-metric.definition]
+ [metabase.lib-metric.dimension :as lib-metric.dimension]
+ [metabase.lib-metric.measures :as lib-metric.measures]
+ [metabase.lib-metric.metadata.provider :as lib-metric.metadata.provider]
+ [metabase.lib-metric.metrics :as lib-metric.metrics]
+ [metabase.lib-metric.projection :as lib-metric.projection]))
+
+;; Ensure multimethod implementations are loaded
+(comment lib-metric.dimension/keep-me
+ lib-metric.measures/keep-me
+ lib-metric.metrics/keep-me
+ lib-metric.metadata.provider/keep-me
+ lib-metric.projection/keep-me
+ #?(:clj lib-metric.metadata.jvm/keep-me
+ :cljs lib-metric.metadata.js/keep-me))
+
+#?(:clj
+ (p/import-vars
+ [lib-metric.clause
+ remove-clause
+ replace-clause
+ swap-clauses]
+ [lib-metric.definition
+ expression-leaf-id
+ expression-leaf-type
+ expression-leaf-uuid
+ expression-leaves
+ filters
+ from-measure-metadata
+ from-metric-metadata
+ projections
+ source-measure-id
+ source-metric-id
+ ->mbql-query
+ ->values-query]
+ [lib-metric.dimension
+ dimension
+ dimensionable-query
+ dimensions-changed?
+ dimensions-for-measure
+ dimensions-for-metric
+ dimensions-for-table
+ extract-persisted-dimensions
+ get-persisted-dimension-mappings
+ get-persisted-dimensions
+ mappings-changed?
+ reconcile-dimensions-and-mappings
+ resolve-dimension-to-field-id]
+ [lib-metric.dimension.jvm
+ compute-dimension-pairs]
+ [lib-metric.metadata.provider
+ database-provider-for-table
+ metric-context-metadata-provider]
+ [lib-metric.metadata.jvm
+ metadata-provider]
+ [lib-metric.projection
+ add-projection-positions
+ default-breakout-dimensions
+ projectable-dimensions])
+
+ :cljs
+ (do
+ (def remove-clause "See [[lib-metric.clause/remove-clause]]." lib-metric.clause/remove-clause)
+ (def replace-clause "See [[lib-metric.clause/replace-clause]]." lib-metric.clause/replace-clause)
+ (def swap-clauses "See [[lib-metric.clause/swap-clauses]]." lib-metric.clause/swap-clauses)
+ (def expression-leaf-id "See [[lib-metric.definition/expression-leaf-id]]." lib-metric.definition/expression-leaf-id)
+ (def expression-leaf-type "See [[lib-metric.definition/expression-leaf-type]]." lib-metric.definition/expression-leaf-type)
+ (def expression-leaf-uuid "See [[lib-metric.definition/expression-leaf-uuid]]." lib-metric.definition/expression-leaf-uuid)
+ (def expression-leaves "See [[lib-metric.definition/expression-leaves]]." lib-metric.definition/expression-leaves)
+ (def filters "See [[lib-metric.definition/filters]]." lib-metric.definition/filters)
+ (def from-measure-metadata "See [[lib-metric.definition/from-measure-metadata]]." lib-metric.definition/from-measure-metadata)
+ (def from-metric-metadata "See [[lib-metric.definition/from-metric-metadata]]." lib-metric.definition/from-metric-metadata)
+ (def projections "See [[lib-metric.definition/projections]]." lib-metric.definition/projections)
+ (def source-measure-id "See [[lib-metric.definition/source-measure-id]]." lib-metric.definition/source-measure-id)
+ (def source-metric-id "See [[lib-metric.definition/source-metric-id]]." lib-metric.definition/source-metric-id)
+ (def dimension "See [[lib-metric.dimension/dimension]]." lib-metric.dimension/dimension)
+ (def dimensionable-query "See [[lib-metric.dimension/dimensionable-query]]." lib-metric.dimension/dimensionable-query)
+ (def dimensions-for-measure "See [[lib-metric.dimension/dimensions-for-measure]]." lib-metric.dimension/dimensions-for-measure)
+ (def dimensions-for-metric "See [[lib-metric.dimension/dimensions-for-metric]]." lib-metric.dimension/dimensions-for-metric)
+ (def dimensions-for-table "See [[lib-metric.dimension/dimensions-for-table]]." lib-metric.dimension/dimensions-for-table)
+ (def get-persisted-dimensions "See [[lib-metric.dimension/get-persisted-dimensions]]." lib-metric.dimension/get-persisted-dimensions)
+ (def get-persisted-dimension-mappings "See [[lib-metric.dimension/get-persisted-dimension-mappings]]." lib-metric.dimension/get-persisted-dimension-mappings)
+ (def resolve-dimension-to-field-id "See [[lib-metric.dimension/resolve-dimension-to-field-id]]." lib-metric.dimension/resolve-dimension-to-field-id)
+ (def database-provider-for-table "See [[lib-metric.metadata.provider/database-provider-for-table]]." lib-metric.metadata.provider/database-provider-for-table)
+ (def metric-context-metadata-provider "See [[lib-metric.metadata.provider/metric-context-metadata-provider]]." lib-metric.metadata.provider/metric-context-metadata-provider)
+ (def metadata-provider "See [[lib-metric.metadata.js/metadata-provider]]." lib-metric.metadata.js/metadata-provider)
+ (def add-projection-positions "See [[lib-metric.projection/add-projection-positions]]." lib-metric.projection/add-projection-positions)
+ (def default-breakout-dimensions "See [[lib-metric.projection/default-breakout-dimensions]]." lib-metric.projection/default-breakout-dimensions)
+ (def projectable-dimensions "See [[lib-metric.projection/projectable-dimensions]]." lib-metric.projection/projectable-dimensions)))
diff --git a/src/metabase/lib_metric/definition.cljc b/src/metabase/lib_metric/definition.cljc
new file mode 100644
index 00000000000..01f6b34edf1
--- /dev/null
+++ b/src/metabase/lib_metric/definition.cljc
@@ -0,0 +1,142 @@
+(ns metabase.lib-metric.definition
+ "Functions for creating and manipulating MetricDefinitions."
+ (:require
+ [metabase.lib-metric.ast.build :as ast.build]
+ [metabase.lib-metric.ast.compile :as ast.compile]
+ [metabase.lib-metric.ast.schema :as ast.schema]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.util.malli :as mu]))
+
+(comment ast.schema/keep-me)
+
+;;; -------------------------------------------------- Expression Helpers --------------------------------------------------
+
+(def expression-leaf?
+ "Returns true if the expression is a single leaf node ([:metric opts id] or [:measure opts id])."
+ ast.build/expression-leaf?)
+
+(def expression-leaf-type
+ "Returns the type keyword (:metric or :measure) from an expression leaf."
+ ast.build/expression-leaf-type)
+
+(def expression-leaf-id
+ "Returns the source ID (integer) from an expression leaf."
+ ast.build/expression-leaf-id)
+
+(def expression-leaf-uuid
+ "Returns the :lib/uuid from an expression leaf's options map."
+ ast.build/expression-leaf-uuid)
+
+(defn source-type-for-leaf
+ "Returns the source type keyword for an expression leaf.
+ :metric -> :source/metric, :measure -> :source/measure."
+ [expression]
+ (case (expression-leaf-type expression)
+ :metric :source/metric
+ :measure :source/measure
+ nil))
+
+(defn expression-leaves
+ "Recursively collect all leaf nodes from an expression tree.
+ Returns a vector of leaf nodes: [:metric opts id] or [:measure opts id]."
+ [expression]
+ (cond
+ (nil? expression) []
+ (expression-leaf? expression) [expression]
+ (and (sequential? expression)
+ (#{:+ :- :* :/} (first expression))
+ (>= (count expression) 4))
+ (into [] (mapcat expression-leaves) (drop 2 expression))
+ :else (throw (ex-info "Invalid expression: not a leaf or arithmetic node"
+ {:expression expression}))))
+
+(defn flat-projections
+ "Extract flat dimension-reference vectors from typed projections.
+ [{:type :metric :id 42 :projection [dim-ref-1 dim-ref-2]} ...]
+ => [dim-ref-1 dim-ref-2 ...]"
+ [typed-projections]
+ (into [] (mapcat :projection) typed-projections))
+
+;;; -------------------------------------------------- Constructors --------------------------------------------------
+
+(mu/defn from-metric-metadata :- ::lib-metric.schema/metric-definition
+ "Create a MetricDefinition from MetricMetadata.
+ Dimensions and dimension-mappings are derived from source metadata when building the AST."
+ [provider metric-metadata]
+ (let [uuid (str (random-uuid))]
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid uuid} (:id metric-metadata)]
+ :filters []
+ :projections []
+ :metadata-provider provider}))
+
+(mu/defn from-measure-metadata :- ::lib-metric.schema/metric-definition
+ "Create a MetricDefinition from MeasureMetadata.
+ Dimensions and dimension-mappings are derived from source metadata when building the AST."
+ [provider measure-metadata]
+ (let [uuid (str (random-uuid))]
+ {:lib/type :metric/definition
+ :expression [:measure {:lib/uuid uuid} (:id measure-metadata)]
+ :filters []
+ :projections []
+ :metadata-provider provider}))
+
+;;; -------------------------------------------------- Accessors --------------------------------------------------
+
+(mu/defn source-metric-id :- [:maybe pos-int?]
+ "Get the source metric ID if this definition is based on a metric."
+ [definition :- ::lib-metric.schema/metric-definition]
+ (let [expr (:expression definition)]
+ (when (= :metric (expression-leaf-type expr))
+ (expression-leaf-id expr))))
+
+(mu/defn source-measure-id :- [:maybe pos-int?]
+ "Get the source measure ID if this definition is based on a measure."
+ [definition :- ::lib-metric.schema/metric-definition]
+ (let [expr (:expression definition)]
+ (when (= :measure (expression-leaf-type expr))
+ (expression-leaf-id expr))))
+
+(defn filters
+ "Get the filter clauses from a metric definition.
+ Returns the instance-filters vector."
+ [definition]
+ (:filters definition))
+
+(defn projections
+ "Get the projection clauses from a metric definition.
+ Returns the typed-projections vector."
+ [definition]
+ (:projections definition))
+
+;;; -------------------------------------------------- AST Functions --------------------------------------------------
+
+(mu/defn ->ast :- ::ast.schema/ast
+ "Convert MetricDefinition to AST."
+ [definition :- ::lib-metric.schema/metric-definition]
+ (ast.build/from-definition definition))
+
+(mu/defn ->mbql-query
+ "Convert MetricDefinition to MBQL query via AST."
+ ([definition :- ::lib-metric.schema/metric-definition]
+ (->mbql-query definition {}))
+ ([definition :- ::lib-metric.schema/metric-definition
+ opts :- [:map
+ [:limit {:optional true} [:maybe pos-int?]]]]
+ (let [ast (->ast definition)]
+ (if (some? (:limit opts))
+ (ast.compile/compile-to-mbql ast :limit (:limit opts))
+ (ast.compile/compile-to-mbql ast)))))
+
+(mu/defn ->values-query
+ "Convert MetricDefinition to a values-only MBQL query via AST.
+ Like [[->mbql-query]] but omits aggregation, returning distinct breakout values."
+ ([definition :- ::lib-metric.schema/metric-definition]
+ (->values-query definition {}))
+ ([definition :- ::lib-metric.schema/metric-definition
+ opts :- [:map
+ [:limit {:optional true} [:maybe pos-int?]]]]
+ (let [ast (->ast definition)]
+ (if (some? (:limit opts))
+ (ast.compile/compile-to-values-query ast :limit (:limit opts))
+ (ast.compile/compile-to-values-query ast)))))
diff --git a/src/metabase/lib_metric/dimension.cljc b/src/metabase/lib_metric/dimension.cljc
new file mode 100644
index 00000000000..111682bae77
--- /dev/null
+++ b/src/metabase/lib_metric/dimension.cljc
@@ -0,0 +1,283 @@
+(ns metabase.lib-metric.dimension
+ "Core logic for computing and reconciling dimensions from dimensionable entities
+ (Measures, Metrics v2, future v3). Dimensions are computed from visible columns
+ and reconciled with persisted dimensions on each read."
+ (:require
+ [medley.core :as m]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.lib.schema.id :as lib.schema.id]
+ [metabase.util.i18n :as i18n]
+ [metabase.util.malli :as mu]
+ [metabase.util.performance :as perf]))
+
+;;; ------------------------------------------------- Target Comparison -------------------------------------------------
+
+(defn- normalize-target
+ "Normalize a target ref for comparison by removing transient options."
+ [[clause-type opts id-or-name]]
+ [clause-type
+ (dissoc opts :lib/uuid :effective-type :base-type)
+ id-or-name])
+
+(defn targets-equal?
+ "Compare two target refs for equality, ignoring transient options like :lib/uuid."
+ [target-a target-b]
+ (= (normalize-target target-a) (normalize-target target-b)))
+
+(defn- random-uuid-str []
+ (str (random-uuid)))
+
+;;; ------------------------------------------------- Dimension Normalization -------------------------------------------------
+
+(defn- normalize-dimension-source
+ "Normalize a dimension source entry after JSON round-trip.
+ JSON serialization converts keyword values to strings (e.g. :field → \"field\")."
+ [source]
+ (cond-> source
+ (string? (:type source)) (update :type keyword)))
+
+(defn normalize-persisted-dimension
+ "Normalize a persisted dimension after database read.
+ Handles JSON round-trip artifacts like string enum values in :sources and :status."
+ [dim]
+ (cond-> dim
+ (seq (:sources dim)) (update :sources #(perf/mapv normalize-dimension-source %))
+ (string? (:status dim)) (update :status keyword)
+ (string? (:has-field-values dim)) (update :has-field-values keyword)))
+
+;;; ------------------------------------------------- Dimension Reconciliation -------------------------------------------------
+
+(defn- orphaned-status-message
+ "Generate a human-readable status message for an orphaned dimension."
+ [dimension]
+ (i18n/tru "Column ''{0}'' no longer exists in the data source" (:name dimension)))
+
+(defn- find-persisted-by-target
+ "Find a persisted dimension by matching its mapping's target to the given target."
+ [target persisted-mappings persisted-dims-by-id]
+ (when-let [mapping (m/find-first #(targets-equal? target (:target %)) persisted-mappings)]
+ (get persisted-dims-by-id (:dimension-id mapping))))
+
+(defn- merge-persisted-modifications
+ "Merge user modifications from a persisted dimension into a computed dimension.
+ Status is already assigned by assign-ids-and-reconcile, so we only merge
+ user customizations and clear any stale status-message."
+ [computed-dim persisted-dim]
+ (if persisted-dim
+ (-> computed-dim
+ (merge (into {} (remove (comp nil? val)) (perf/select-keys persisted-dim [:display-name :semantic-type :effective-type])))
+ (dissoc :status-message))
+ computed-dim))
+
+(defn- assign-ids-and-reconcile
+ "Assign IDs to computed dimensions by matching targets to persisted mappings.
+ Returns vector of {:dimension ... :mapping ...} with IDs assigned.
+ All active dimensions are assigned :status/active so they will be persisted."
+ [computed-pairs persisted-dims persisted-mappings]
+ (let [persisted-dims-by-id (m/index-by :id persisted-dims)]
+ (perf/mapv (fn [{:keys [dimension mapping]}]
+ (let [persisted-dim (find-persisted-by-target (:target mapping)
+ persisted-mappings
+ persisted-dims-by-id)
+ dim-id (or (:id persisted-dim) (random-uuid-str))
+ merged-dim (-> dimension
+ (assoc :id dim-id)
+ (assoc :status :status/active)
+ (merge-persisted-modifications persisted-dim))]
+ {:dimension merged-dim
+ :mapping (assoc mapping :dimension-id dim-id)}))
+ computed-pairs)))
+
+(defn- find-orphaned-dimensions
+ "Find persisted dimensions whose targets no longer exist in computed pairs."
+ [computed-pairs persisted-dims persisted-mappings]
+ (let [computed-targets (set (map (comp normalize-target :target :mapping) computed-pairs))
+ persisted-dims-by-id (m/index-by :id persisted-dims)]
+ (->> persisted-mappings
+ (remove #(contains? computed-targets (normalize-target (:target %))))
+ (keep (fn [orphan-mapping]
+ (when-let [dim (get persisted-dims-by-id (:dimension-id orphan-mapping))]
+ (-> dim
+ (assoc :status :status/orphaned)
+ (assoc :status-message (orphaned-status-message dim)))))))))
+
+(mu/defn reconcile-dimensions-and-mappings :- [:map
+ [:dimensions [:sequential ::lib-metric.schema/persisted-dimension]]
+ [:dimension-mappings [:sequential ::lib-metric.schema/dimension-mapping]]]
+ "Reconcile computed dimension pairs with persisted data by matching on target.
+ Returns {:dimensions [...] :dimension-mappings [...]}."
+ [computed-pairs :- [:sequential ::lib-metric.schema/computed-pair]
+ persisted-dims :- [:maybe [:sequential ::lib-metric.schema/persisted-dimension]]
+ persisted-mappings :- [:maybe [:sequential ::lib-metric.schema/dimension-mapping]]]
+ (let [reconciled-pairs (assign-ids-and-reconcile computed-pairs
+ (or persisted-dims [])
+ (or persisted-mappings []))
+ active-dims (perf/mapv :dimension reconciled-pairs)
+ active-mappings (perf/mapv :mapping reconciled-pairs)
+ orphaned-dims (find-orphaned-dimensions computed-pairs
+ (or persisted-dims [])
+ (or persisted-mappings []))]
+ {:dimensions (into active-dims orphaned-dims)
+ :dimension-mappings active-mappings}))
+
+(mu/defn extract-persisted-dimensions :- [:sequential ::lib-metric.schema/persisted-dimension]
+ "Extract dimensions that should be persisted to the database.
+ A dimension should be persisted if it has a status (either active or orphaned)."
+ [dimensions :- [:sequential ::lib-metric.schema/persisted-dimension]]
+ (filterv :status dimensions))
+
+(mu/defn dimensions-changed? :- :boolean
+ "Check if the persisted dimensions have changed between old and new sets."
+ [old-persisted :- [:maybe [:sequential ::lib-metric.schema/persisted-dimension]]
+ new-persisted :- [:sequential ::lib-metric.schema/persisted-dimension]]
+ (let [persist-keys [:id :name :display-name :semantic-type :effective-type :has-field-values :status :status-message :sources :group]
+ normalize (fn [dims] (set (map #(perf/select-keys % persist-keys) dims)))]
+ (not= (normalize old-persisted) (normalize new-persisted))))
+
+(mu/defn mappings-changed? :- :boolean
+ "Check if the dimension mappings have changed between old and new sets."
+ [old-mappings :- [:maybe [:sequential ::lib-metric.schema/dimension-mapping]]
+ new-mappings :- [:sequential ::lib-metric.schema/dimension-mapping]]
+ (let [normalize (fn [mappings]
+ (set (map #(update % :target normalize-target) mappings)))]
+ (not= (normalize old-mappings) (normalize new-mappings))))
+
+;;; ------------------------------------------------- Entity Accessors -------------------------------------------------
+;;; These multimethods provide pure read access to dimensionable entities.
+;;; They dispatch on :lib/type and extract data without side effects.
+
+(defmulti dimensionable-query
+ "Returns the MBQL query for computing visible-columns for this entity.
+ Pure function - only reads data from the entity."
+ {:arglists '([entity])}
+ :lib/type)
+
+(defmulti get-persisted-dimensions
+ "Returns the currently persisted dimensions from the entity.
+ Pure function - only reads data from the entity.
+ Default implementation reads `:dimensions` and normalizes them."
+ {:arglists '([entity])}
+ :lib/type)
+
+(defmethod get-persisted-dimensions :default
+ [entity]
+ (some->> (:dimensions entity)
+ (perf/mapv normalize-persisted-dimension)))
+
+(defmulti get-persisted-dimension-mappings
+ "Returns the currently persisted dimension mappings from the entity.
+ Pure function - only reads data from the entity.
+ Default implementation reads `:dimension-mappings`."
+ {:arglists '([entity])}
+ :lib/type)
+
+(defmethod get-persisted-dimension-mappings :default
+ [entity]
+ (:dimension-mappings entity))
+
+;;; ------------------------------------------------- Public Dimension Fetching API -------------------------------------------------
+;;; These functions provide access to dimensions as first-class metadata entities
+;;; through the MetricContextMetadataProvider.
+
+(mu/defn dimension :- [:maybe ::lib-metric.schema/metadata-dimension]
+ "Fetch a single dimension by UUID from the metadata provider.
+ Returns nil if not found."
+ [metadata-provider :- ::lib.metadata.protocols/metadata-provider
+ dimension-id :- ::lib-metric.schema/dimension-id]
+ (first (lib.metadata.protocols/metadatas
+ metadata-provider
+ {:lib/type :metadata/dimension :id #{dimension-id}})))
+
+(mu/defn dimensions-for-metric :- [:sequential ::lib-metric.schema/metadata-dimension]
+ "Fetch all dimensions for a metric by metric ID."
+ [metadata-provider :- ::lib.metadata.protocols/metadata-provider
+ metric-id :- pos-int?]
+ (lib.metadata.protocols/metadatas
+ metadata-provider
+ {:lib/type :metadata/dimension :metric-id metric-id}))
+
+(mu/defn dimensions-for-measure :- [:sequential ::lib-metric.schema/metadata-dimension]
+ "Fetch all dimensions for a measure by measure ID."
+ [metadata-provider :- ::lib.metadata.protocols/metadata-provider
+ measure-id :- pos-int?]
+ (lib.metadata.protocols/metadatas
+ metadata-provider
+ {:lib/type :metadata/dimension :measure-id measure-id}))
+
+(mu/defn dimensions-for-table :- [:sequential ::lib-metric.schema/metadata-dimension]
+ "Fetch all dimensions mapped to a table by table ID.
+ This returns dimensions from both metrics and measures that have mappings to the table."
+ [metadata-provider :- ::lib.metadata.protocols/metadata-provider
+ table-id :- pos-int?]
+ (lib.metadata.protocols/metadatas
+ metadata-provider
+ {:lib/type :metadata/dimension :table-id table-id}))
+
+;;; ------------------------------------------------- Dimension Resolution -------------------------------------------------
+;;; Functions for resolving dimension UUIDs to field IDs through dimension mappings.
+
+(mu/defn get-dimension-or-throw :- :map
+ "Find a dimension by its UUID from a list of dimensions.
+ Throws 400 if not found."
+ [dimensions :- [:maybe [:sequential :map]]
+ dimension-id :- :string]
+ (or (m/find-first #(= (:id %) dimension-id) dimensions)
+ (throw (ex-info (i18n/tru "Dimension not found: {0}" dimension-id)
+ {:status-code 400
+ :dimension-id dimension-id}))))
+
+(mu/defn get-dimension-mapping-or-throw :- :map
+ "Find a dimension mapping by dimension UUID from a list of mappings.
+ Throws 400 if not found."
+ [dimension-mappings :- [:maybe [:sequential :map]]
+ dimension-id :- :string]
+ (or (m/find-first #(= (:dimension-id %) dimension-id) dimension-mappings)
+ (throw (ex-info (i18n/tru "Dimension mapping not found for dimension: {0}" dimension-id)
+ {:status-code 400
+ :dimension-id dimension-id}))))
+
+(defn dimension-target->field-id
+ "Extract the field ID from a dimension mapping target.
+ Returns nil if the target cannot be resolved to a field ID (e.g., uses a name instead).
+ Handles both valid and invalid field refs gracefully."
+ [target]
+ (when (and (vector? target)
+ (= :field (first target))
+ (>= (count target) 3))
+ (let [id-or-name (nth target 2)]
+ (when (pos-int? id-or-name)
+ id-or-name))))
+
+(mu/defn resolve-dimension-to-field-id :- ::lib.schema.id/field
+ "Resolve a dimension UUID to a field ID through the dimension and mapping.
+ Validates that the dimension is active (not orphaned) and has a valid mapping.
+
+ Returns the field ID or throws an exception with appropriate error message."
+ [dimensions :- [:maybe [:sequential :map]]
+ dimension-mappings :- [:maybe [:sequential :map]]
+ dimension-id :- :string]
+ (let [dimension (get-dimension-or-throw dimensions dimension-id)]
+ ;; Check for orphaned dimensions
+ (when (= (:status dimension) :status/orphaned)
+ (throw (ex-info (i18n/tru "Cannot use orphaned dimension: {0}" dimension-id)
+ {:status-code 400
+ :dimension-id dimension-id
+ :dimension-status (:status dimension)})))
+ (let [mapping (get-dimension-mapping-or-throw dimension-mappings dimension-id)
+ target (:target mapping)
+ field-id (dimension-target->field-id target)]
+ (when-not field-id
+ (throw (ex-info (i18n/tru "Cannot resolve dimension target to field ID: {0}" dimension-id)
+ {:status-code 400
+ :dimension-id dimension-id
+ :target target})))
+ field-id)))
+
+(mu/defn reference :- ::lib-metric.schema/dimension-reference
+ "Constructs a reference to the dimension passed in. If it is already a reference, returns it as-is."
+ [dimension :- ::lib-metric.schema/dimension-or-reference]
+ (if (map? dimension)
+ (lib/ensure-uuid [:dimension {} (:id dimension)])
+ (lib/ensure-uuid dimension)))
diff --git a/src/metabase/lib_metric/dimension/jvm.clj b/src/metabase/lib_metric/dimension/jvm.clj
new file mode 100644
index 00000000000..b91fd890851
--- /dev/null
+++ b/src/metabase/lib_metric/dimension/jvm.clj
@@ -0,0 +1,111 @@
+(ns metabase.lib-metric.dimension.jvm
+ "JVM-only dimension computation. Moved from `dimension.cljc` so that
+ `compute-dimension-pairs` can enrich columns with `:has-field-values`
+ via a direct database lookup, which is only available on the JVM."
+ (:require
+ [metabase.lib-be.core :as lib-be]
+ [metabase.lib-metric.metadata.provider :as lib-metric.provider]
+ [metabase.lib.core :as lib]
+ [metabase.lib.util :as lib.util]
+ [metabase.util.performance :as perf]
+ [toucan2.core :as t2]))
+
+(set! *warn-on-reflection* true)
+
+(defn enrich-columns-with-has-field-values
+ "Batch-fetch `has_field_values` from Field and assoc `:has-field-values` onto each column."
+ [cols]
+ (if (perf/empty? cols)
+ cols
+ (let [col-ids (into #{} (keep :id) cols)
+ field-values-map (when (seq col-ids)
+ (into {}
+ (map (fn [field]
+ [(:id field)
+ (lib/infer-has-field-values
+ (lib-be/instance->metadata field :metadata/column))]))
+ (t2/select :model/Field :id [:in col-ids])))]
+ (perf/mapv (fn [col]
+ (if-let [hfv (get field-values-map (:id col))]
+ (assoc col :has-field-values hfv)
+ col))
+ cols))))
+
+(defn- column->computed-pair
+ "Convert a column to a dimension/mapping pair. IDs are nil until reconciliation.
+ The table-id is extracted from the column's metadata.
+ When `group` is provided, it is attached to the dimension."
+ ([column]
+ (column->computed-pair column nil))
+ ([column group]
+ (let [target (lib/ref column)
+ has-field-values (lib/infer-has-field-values column)]
+ {:dimension (cond-> {:id nil
+ :name (:name column)
+ :effective-type (or (:effective-type column)
+ (:base-type column))}
+ (:display-name column) (assoc :display-name (:display-name column))
+ (:semantic-type column) (assoc :semantic-type (:semantic-type column))
+ (:lib/source column) (assoc :lib/source (:lib/source column))
+ (pos-int? (:id column)) (assoc :sources [(cond-> {:type :field, :field-id (:id column)}
+ (let [fp (:fingerprint column)]
+ (and (perf/get-in fp [:type :type/Number :min])
+ (perf/get-in fp [:type :type/Number :max])))
+ (assoc :binning true))])
+ has-field-values (assoc :has-field-values has-field-values)
+ group (assoc :group group))
+ :mapping (cond-> {:type :table
+ :target target}
+ (:table-id column) (assoc :table-id (:table-id column)))})))
+
+(defn- db-provider-for-query
+ "When the metadata provider is a MetricContextMetadataProvider, return the
+ database-specific provider for the query's source table. The DB provider can
+ resolve column-by-ID lookups that the metric context provider cannot, which
+ is required for FK / implicitly-joinable column resolution."
+ [mp query-with-mp]
+ (when (satisfies? lib-metric.provider/MetricMetadataProvider mp)
+ (when-let [table-id (lib.util/source-table-id query-with-mp)]
+ (lib-metric.provider/database-provider-for-table mp table-id))))
+
+(defn- group-type->type
+ "Convert a column group's group-type to a dimension group type string."
+ [group-type]
+ (case group-type
+ :group-type/main "main"
+ (:group-type/join.explicit :group-type/join.implicit) "connection"))
+
+(defn compute-dimension-pairs
+ "Compute dimension/mapping pairs from visible columns. IDs not yet assigned.
+ Only includes actual database fields, not expressions.
+ Dimensions are annotated with their source group (main table vs connected tables).
+ Columns are enriched with `:has-field-values` from the database."
+ [metadata-providerable query]
+ (let [mp (lib/->metadata-provider metadata-providerable)
+ query-with-mp (lib/query mp query)
+ db-mp (db-provider-for-query mp query-with-mp)
+ vc-query (if db-mp (lib/query db-mp query) query-with-mp)
+ columns (cond-> (lib/visible-columns
+ vc-query
+ -1
+ {:include-implicitly-joinable? (boolean db-mp)
+ :include-implicitly-joinable-for-source-card? false})
+ true enrich-columns-with-has-field-values)
+ col-groups (lib/group-columns columns)]
+ (into []
+ (mapcat
+ (fn [col-group]
+ (let [group-info (lib/display-info vc-query -1 col-group)
+ group-type (cond
+ (:is-main-group group-info) :group-type/main
+ (:is-from-join group-info) :group-type/join.explicit
+ (:is-implicitly-joinable group-info) :group-type/join.implicit
+ :else :group-type/main)
+ group-desc {:id (str (random-uuid))
+ :type (group-type->type group-type)
+ :display-name (or (:display-name group-info) "Unknown")}
+ group-cols (lib/columns-group-columns col-group)]
+ (->> group-cols
+ (remove #(= :source/expressions (:lib/source %)))
+ (perf/mapv #(column->computed-pair % group-desc))))))
+ col-groups)))
diff --git a/src/metabase/lib_metric/display_info.cljc b/src/metabase/lib_metric/display_info.cljc
new file mode 100644
index 00000000000..cc685863e1a
--- /dev/null
+++ b/src/metabase/lib_metric/display_info.cljc
@@ -0,0 +1,300 @@
+(ns metabase.lib-metric.display-info
+ "Display info functions for lib_metric entities. Provides UI-friendly
+ information about metrics, measures, dimensions, temporal buckets, and
+ binning strategies.
+
+ Follows the same multimethod dispatch pattern as metabase.lib.metadata.calculation/display-info."
+ (:require
+ #?@(:cljs [[metabase.lib.cache :as lib.cache]])
+ [clojure.string :as str]
+ [metabase.lib-metric.hierarchy :as hierarchy]
+ [metabase.lib-metric.operators :as operators]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.lib.schema.temporal-bucketing :as lib.schema.temporal-bucketing]
+ [metabase.util :as u]
+ [metabase.util.i18n :as i18n]))
+
+;;; -------------------------------------------------- Multimethod --------------------------------------------------
+
+(defmulti display-info-method
+ "Implementation for [[display-info]]. Returns a map of UI-friendly information
+ for the given entity. Dispatches on `:lib/type` of `x`."
+ {:arglists '([definition x])}
+ (fn [_definition x]
+ (lib/dispatch-value x))
+ :hierarchy hierarchy/hierarchy)
+
+;;; -------------------------------------------------- Default Implementation --------------------------------------------------
+
+(defn default-display-info
+ "Default implementation that extracts common fields from an entity.
+ Used as the base for type-specific implementations."
+ [_definition x]
+ (let [display-name (or (:display-name x) (:name x))]
+ (cond-> {}
+ display-name (assoc :display-name display-name)
+ (:name x) (assoc :name (:name x))
+ (:effective-type x) (assoc :effective-type (:effective-type x))
+ (:semantic-type x) (assoc :semantic-type (:semantic-type x))
+ (:description x) (assoc :description (:description x))
+ ;; Support both :selected? (from lib/) and :selected (from lib-metric/) naming conventions
+ (some? (:selected? x)) (assoc :selected (:selected? x))
+ (some? (:selected x)) (assoc :selected (:selected x))
+ (some? (:default? x)) (assoc :default (:default? x))
+ (some? (:default x)) (assoc :default (:default x)))))
+
+(defmethod display-info-method :default
+ [definition x]
+ (default-display-info definition x))
+
+;;; Replicates the column-name slugification from metabase.lib.metadata.calculation
+;;; so that the frontend can predict the result column name without running a query.
+(defn- aggregation-column-name
+ [display-name]
+ (when (seq display-name)
+ (-> display-name
+ (str/replace #"[\(\)]" "")
+ (u/slugify {:unicode? true}))))
+
+;;; -------------------------------------------------- Metric --------------------------------------------------
+
+(defmethod display-info-method :metadata/metric
+ [definition metric]
+ (let [display-name (or (:display-name metric)
+ (:name metric))]
+ (merge (default-display-info definition metric)
+ {:display-name (or display-name (i18n/tru "Metric"))}
+ (when-let [col-name (or (:result-column-name metric)
+ (some-> display-name aggregation-column-name))]
+ {:column-name col-name}))))
+
+;;; -------------------------------------------------- Measure --------------------------------------------------
+
+(defmethod display-info-method :metadata/measure
+ [definition measure]
+ (let [display-name (or (:display-name measure)
+ (:name measure))]
+ (merge (default-display-info definition measure)
+ {:display-name (or display-name (i18n/tru "Measure"))}
+ (when-let [col-name (or (:result-column-name measure)
+ (some-> display-name aggregation-column-name))]
+ {:column-name col-name}))))
+
+;;; -------------------------------------------------- Dimension --------------------------------------------------
+
+(defmethod display-info-method :metadata/dimension
+ [definition dimension]
+ (let [display-name (or (:display-name dimension)
+ (:name dimension)
+ (i18n/tru "Dimension"))
+ group (:group dimension)
+ long-name (if (and group (not= "main" (:type group)))
+ (str (:display-name group) " → " display-name)
+ display-name)]
+ (merge (default-display-info definition dimension)
+ {:display-name display-name
+ :long-display-name long-name
+ :filter-positions (or (:filter-positions dimension) [])
+ :projection-positions (or (:projection-positions dimension) [])}
+ (when group
+ {:group group})
+ (when-let [source (:lib/source dimension)]
+ {:is-from-join (= source :source/joins)
+ :is-calculated (= source :source/expressions)
+ :is-implicitly-joinable (= source :source/implicitly-joinable)}))))
+
+;;; -------------------------------------------------- Temporal Bucket --------------------------------------------------
+
+(defn- temporal-bucket-display-info
+ [bucket]
+ (let [unit (:unit bucket)]
+ {:short-name (u/qualified-name unit)
+ :display-name (lib/describe-temporal-unit unit)
+ :default (boolean (:default bucket))
+ :selected (boolean (:selected bucket))
+ :is-temporal-extraction (and (contains? lib.schema.temporal-bucketing/datetime-extraction-units unit)
+ (not (contains? lib.schema.temporal-bucketing/datetime-truncation-units unit)))}))
+
+(defmethod display-info-method :temporal-bucket
+ [_definition bucket]
+ (temporal-bucket-display-info bucket))
+
+(defmethod display-info-method :option/temporal-bucketing
+ [_definition bucket]
+ (temporal-bucket-display-info bucket))
+
+;;; -------------------------------------------------- Binning Strategy --------------------------------------------------
+
+(defn- format-number-simple
+ "Format a number for display. Integers as whole numbers, decimals as-is."
+ [n]
+ (str (if (zero? (rem n 1))
+ (int n)
+ n)))
+
+(defn- binning-display-name
+ "Generate display name for binning options, given a dimension (or nil)."
+ [{:keys [bin-width num-bins strategy]} dimension]
+ (case strategy
+ :num-bins (i18n/trun "{0} bin" "{0} bins" num-bins)
+ :bin-width (str (format-number-simple bin-width)
+ (when (isa? (:semantic-type dimension) :type/Coordinate)
+ "\u00B0"))
+ :default (i18n/tru "Auto binned")))
+
+(defmethod display-info-method :binning-strategy
+ [_definition strategy]
+ {:display-name (binning-display-name strategy nil)
+ :default (boolean (:default strategy))
+ :selected (boolean (:selected strategy))})
+
+(defmethod display-info-method :option/binning
+ [_definition strategy]
+ {:display-name (:display-name strategy)
+ :default (boolean (:default strategy))
+ :selected (boolean (:selected strategy))})
+
+;;; -------------------------------------------------- MBQL Clauses (Filters) --------------------------------------------------
+
+;; Filter clauses are MBQL vectors like [:= {} [:dimension {} "uuid"] "value"].
+;; We look up dimension names from the metadata provider to generate readable descriptions.
+
+(defn- dimension-ref?
+ "Check if x is a dimension reference [:dimension opts uuid]."
+ [x]
+ (and (vector? x)
+ (= :dimension (first x))
+ (string? (nth x 2 nil))))
+
+(defn- dimension-uuid
+ "Extract UUID from a dimension reference [:dimension opts uuid]."
+ [dim-ref]
+ (nth dim-ref 2))
+
+(defn- lookup-dimension
+ "Look up a dimension by UUID from the metadata provider in the definition."
+ [definition dimension-id]
+ (when-let [mp (:metadata-provider definition)]
+ (first (lib.metadata.protocols/metadatas
+ mp
+ {:lib/type :metadata/dimension :id #{dimension-id}}))))
+
+(defn- dimension-display-name
+ "Get the display name for a dimension reference, falling back to UUID if not found."
+ [definition dim-ref]
+ (let [uuid (dimension-uuid dim-ref)]
+ (if-let [dim (lookup-dimension definition uuid)]
+ (or (:display-name dim) (:name dim) uuid)
+ uuid)))
+
+(defn- format-filter-value
+ "Format a filter value for display."
+ [v]
+ (cond
+ (string? v) v
+ (number? v) (str v)
+ (boolean? v) (str v)
+ (nil? v) "empty"
+ :else (str v)))
+
+(defn- operator-display-name
+ "Get a human-readable name for a filter operator."
+ [op]
+ (operators/display-name op))
+
+(defn- describe-temporal-interval
+ "Describe a temporal interval as human-readable text.
+ n can be :current, 0, a negative int (past), or a positive int (future)."
+ [n unit]
+ (let [unit-name (name unit)]
+ (cond
+ (or (= n :current) (= n 0))
+ (i18n/tru "the current {0}" unit-name)
+
+ (and (number? n) (neg? n))
+ (let [abs-n (abs n)]
+ (i18n/tru "in the last {0} {1}s" abs-n unit-name))
+
+ (and (number? n) (pos? n))
+ (i18n/tru "in the next {0} {1}s" n unit-name)
+
+ :else
+ (str n " " unit-name))))
+
+(defn- filter-clause-display-name
+ "Generate a display name for a filter clause."
+ [definition [op _opts & args]]
+ (let [first-arg (first args)
+ dim-name (when (dimension-ref? first-arg)
+ (dimension-display-name definition first-arg))
+ op-name (operator-display-name op)]
+ (case op
+ ;; Unary operators (no value)
+ (:is-null :not-null :is-empty :not-empty)
+ (if dim-name
+ (i18n/tru "{0} {1}" dim-name op-name)
+ op-name)
+
+ ;; Between operator (two values)
+ :between
+ (let [[_ v1 v2] args]
+ (if dim-name
+ (i18n/tru "{0} {1} {2} and {3}" dim-name op-name (format-filter-value v1) (format-filter-value v2))
+ (i18n/tru "{0} {1} and {2}" op-name (format-filter-value v1) (format-filter-value v2))))
+
+ ;; Relative date filters
+ :time-interval
+ (let [[dim-ref n unit] args
+ dim-name (when (dimension-ref? dim-ref)
+ (dimension-display-name definition dim-ref))
+ interval-desc (describe-temporal-interval n unit)]
+ (if dim-name
+ (i18n/tru "{0} is {1}" dim-name interval-desc)
+ interval-desc))
+
+ ;; Default: binary/varargs operators
+ (let [values (rest args)
+ formatted-values (map format-filter-value values)]
+ (if dim-name
+ (if (= 1 (count values))
+ (i18n/tru "{0} {1} {2}" dim-name op-name (first formatted-values))
+ (i18n/tru "{0} {1} {2} values" dim-name op-name (count values)))
+ (if (= 1 (count values))
+ (i18n/tru "{0} {1}" op-name (first formatted-values))
+ (i18n/tru "{0} {1} values" op-name (count values))))))))
+
+(defn- filter-clause-display-info
+ "Generate display info for an MBQL filter clause."
+ [definition clause]
+ {:display-name (filter-clause-display-name definition clause)})
+
+;; Filter operators derive from operators/::filter-operator via the shared hierarchy.
+;; The derivations are registered in metabase.lib-metric.operators when it loads.
+(defmethod display-info-method ::operators/filter-operator
+ [definition clause]
+ (filter-clause-display-info definition clause))
+
+;;; -------------------------------------------------- Public API --------------------------------------------------
+
+(defn display-info
+ "Get display info for a displayable item. Returns a map suitable for UI consumption.
+
+ Dispatches on `:lib/type` of `x` to return appropriate display info structure.
+ Results are cached in CLJS for performance."
+ [definition x]
+ (letfn [(display-info* [x]
+ (try
+ (display-info-method definition x)
+ (catch #?(:clj Throwable :cljs js/Error) e
+ (throw (ex-info (i18n/tru "Error calculating display info for {0}: {1}"
+ (lib/dispatch-value x)
+ (ex-message e))
+ {:definition definition :x x}
+ e)))))]
+ #?(:clj
+ (display-info* x)
+ :cljs
+ (lib.cache/side-channel-cache
+ :display-info x
+ display-info*))))
diff --git a/src/metabase/lib_metric/filter.cljc b/src/metabase/lib_metric/filter.cljc
new file mode 100644
index 00000000000..4ade8523ae5
--- /dev/null
+++ b/src/metabase/lib_metric/filter.cljc
@@ -0,0 +1,547 @@
+(ns metabase.lib-metric.filter
+ "Functions for computing filterable dimensions with filter positions and operators."
+ (:require
+ [metabase.lib-metric.definition :as definition]
+ [metabase.lib-metric.dimension :as dimension]
+ [metabase.lib-metric.operators :as operators]
+ [metabase.lib-metric.types.isa :as types.isa]
+ [metabase.lib.core :as lib]
+ [metabase.util.performance :as perf]
+ [metabase.util.time :as u.time]))
+
+(defn leading-dimension-ref
+ "Extract the dimension UUID from a filter clause's leading argument.
+ Filter clauses look like: [:operator opts [:dimension opts uuid] value ...]
+ Also handles expression-wrapped dimensions like:
+ [:!= opts [:get-day-of-week opts [:dimension opts uuid] :iso] 1 7]
+ Compound filters (:and, :or, :not) don't have a leading dimension ref.
+ Returns the UUID string or nil."
+ [filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)
+ third (nth filter-clause 2 nil)]
+ (when-not (#{:and :or :not} operator)
+ (when (vector? third)
+ (cond
+ ;; Direct dimension ref: [:dimension opts uuid]
+ (and (= :dimension (first third))
+ (>= (count third) 3))
+ (nth third 2)
+
+ ;; Expression-wrapped dimension: [:get-day-of-week opts [:dimension opts uuid] ...]
+ (operators/temporal-extraction? (first third))
+ (let [inner (nth third 2 nil)]
+ (when (and (vector? inner)
+ (= :dimension (first inner))
+ (>= (count inner) 3))
+ (nth inner 2)))))))))
+
+(defn build-filter-positions
+ "Build a map of {dimension-id -> [filter-indices]} from a sequence of filters.
+ Each dimension ID maps to a vector of zero-based indices where it appears."
+ [filters]
+ (reduce
+ (fn [acc [idx filter-clause]]
+ (if-let [dim-id (leading-dimension-ref filter-clause)]
+ (update acc dim-id (fnil conj []) idx)
+ acc))
+ {}
+ (map-indexed vector filters)))
+
+;;; -------------------------------------------------- Filter Operators --------------------------------------------------
+
+(defn operators-for-dimension
+ "Get available filter operators for a dimension based on its type.
+ Returns a vector of operator keywords.
+ Type checking follows the same hierarchy as metabase.lib, applied to dimension metadata."
+ [dimension]
+ (cond
+ (types.isa/string-or-string-like? dimension) (operators/operators-for-dimension-type :string)
+ (types.isa/coordinate? dimension) (operators/operators-for-dimension-type :coordinate)
+ (types.isa/boolean? dimension) (operators/operators-for-dimension-type :boolean)
+ (types.isa/time? dimension) (operators/operators-for-dimension-type :time)
+ (types.isa/temporal? dimension) (operators/operators-for-dimension-type :temporal)
+ (types.isa/numeric? dimension) (operators/operators-for-dimension-type :numeric)
+ :else (operators/operators-for-dimension-type :default)))
+
+(defn filterable-dimension-operators
+ "Get available filter operators for a dimension.
+ Returns a vector of operator keywords directly (e.g., [:= :!= :contains ...]).
+ Unlike metabase.lib which wraps operators in maps, this returns simple keywords."
+ [dimension]
+ (operators-for-dimension dimension))
+
+;;; -------------------------------------------------- Filterable Dimensions --------------------------------------------------
+
+(defn filterable-dimensions
+ "Get dimensions that can be used for filtering, with :filter-positions attached.
+ Each dimension will have a :filter-positions key containing a vector of indices
+ where that dimension is used in the definition's filters."
+ [definition]
+ (let [provider (:metadata-provider definition)
+ expression (:expression definition)
+ leaf-type (definition/expression-leaf-type expression)
+ leaf-id (definition/expression-leaf-id expression)
+ dimensions (case leaf-type
+ :metric (dimension/dimensions-for-metric provider leaf-id)
+ :measure (dimension/dimensions-for-measure provider leaf-id)
+ [])
+ inst-filters (definition/filters definition)
+ flat-filters (perf/mapv :filter inst-filters)
+ positions (build-filter-positions flat-filters)]
+ (perf/mapv
+ (fn [dim]
+ (assoc dim
+ :filter-positions (get positions (:id dim) [])
+ :operators (operators-for-dimension dim)))
+ dimensions)))
+
+(defn filterable-dimensions-for-instance
+ "Get filterable dimensions scoped to a specific source instance.
+ source-instance is an expression leaf: [:metric {:lib/uuid ...} id]."
+ [definition source-instance]
+ (let [provider (:metadata-provider definition)
+ leaf-type (definition/expression-leaf-type source-instance)
+ leaf-id (definition/expression-leaf-id source-instance)
+ leaf-uuid (definition/expression-leaf-uuid source-instance)
+ dimensions (case leaf-type
+ :metric (dimension/dimensions-for-metric provider leaf-id)
+ :measure (dimension/dimensions-for-measure provider leaf-id)
+ [])
+ inst-filters (filterv #(= (:lib/uuid %) leaf-uuid)
+ (definition/filters definition))
+ flat-filters (perf/mapv :filter inst-filters)
+ positions (build-filter-positions flat-filters)]
+ (perf/mapv
+ (fn [dim]
+ (assoc dim
+ :filter-positions (get positions (:id dim) [])
+ :operators (operators-for-dimension dim)))
+ dimensions)))
+
+;;; -------------------------------------------------- Add Filter --------------------------------------------------
+
+(defn add-filter
+ "Add a filter clause to a metric definition.
+ Wraps the clause in an instance-filter entry keyed by the expression leaf's :lib/uuid.
+ Returns a new definition with the filter added to the :filters vector."
+ ([definition filter-clause]
+ (let [leaf-uuid (definition/expression-leaf-uuid (:expression definition))]
+ (add-filter definition filter-clause leaf-uuid)))
+ ([definition filter-clause instance-uuid]
+ (let [inst-filter {:lib/uuid instance-uuid :filter filter-clause}]
+ (update definition :filters (fnil conj []) inst-filter))))
+
+;;; -------------------------------------------------- Filter Clause Helpers --------------------------------------------------
+
+(defn- dimension-ref
+ "Create a dimension reference from a dimension.
+ Returns [:dimension {} dimension-id]."
+ [dimension]
+ [:dimension {} (:id dimension)])
+
+(defn- find-dimension-by-id
+ "Find a dimension by ID across all expression sources."
+ [definition dimension-id]
+ (let [provider (:metadata-provider definition)
+ leaves (definition/expression-leaves (:expression definition))]
+ (perf/some (fn [leaf]
+ (let [dims (case (definition/expression-leaf-type leaf)
+ :metric (dimension/dimensions-for-metric
+ provider (definition/expression-leaf-id leaf))
+ :measure (dimension/dimensions-for-measure
+ provider (definition/expression-leaf-id leaf))
+ [])]
+ (perf/some #(when (= (:id %) dimension-id) %) dims)))
+ leaves)))
+
+;;; -------------------------------------------------- Default Filters (is-null/not-null) --------------------------------------------------
+
+(defn default-filter-clause
+ "Create a default filter clause (is-null or not-null) from parts.
+ Parts: {:operator :is-null/:not-null, :dimension dimension}"
+ [{:keys [operator dimension]}]
+ (lib/ensure-uuid [operator {} (dimension-ref dimension)]))
+
+(defn default-filter-parts
+ "Extract default filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension} or nil if not a default filter."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)]
+ (when (#{:is-null :not-null} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ {:operator operator
+ :dimension dimension}))))))
+
+;;; -------------------------------------------------- Boolean Filters --------------------------------------------------
+
+(defn boolean-filter-clause
+ "Create a boolean filter clause from parts.
+ Parts: {:operator := or :is-null/:not-null, :dimension dimension, :values [boolean]}"
+ [{:keys [operator dimension values]}]
+ (lib/ensure-uuid
+ (case operator
+ (:is-null :not-null) [operator {} (dimension-ref dimension)]
+ := [:= {} (dimension-ref dimension) (first values)])))
+
+(defn boolean-filter-parts
+ "Extract boolean filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension, :values [boolean]} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)]
+ (when (#{:= :is-null :not-null} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ ;; Check if this is actually a boolean filter by looking at dimension type
+ (when (types.isa/boolean? dimension)
+ (case operator
+ (:is-null :not-null) {:operator operator
+ :dimension dimension
+ :values []}
+ := (let [value (nth filter-clause 3 nil)]
+ (when (boolean? value)
+ {:operator operator
+ :dimension dimension
+ :values [value]}))))))))))
+
+;;; -------------------------------------------------- Number Filters --------------------------------------------------
+
+(defn number-filter-clause
+ "Create a number filter clause from parts.
+ Parts: {:operator :keyword, :dimension dimension, :values [number]}"
+ [{:keys [operator dimension values]}]
+ (lib/ensure-uuid
+ (case operator
+ (:is-null :not-null) [operator {} (dimension-ref dimension)]
+ :between [:between {} (dimension-ref dimension) (first values) (second values)]
+ ;; Standard comparison operators: =, !=, >, >=, <, <=
+ (into [operator {} (dimension-ref dimension)] values))))
+
+(defn number-filter-parts
+ "Extract number filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension, :values [number]} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)]
+ (when (#{:= :!= :> :>= :< :<= :between :is-null :not-null} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ ;; Check if this is actually a number filter by looking at dimension type
+ ;; Exclude coordinate dimensions - they should use coordinate-filter-parts
+ (when (and (types.isa/numeric? dimension)
+ (not (types.isa/coordinate? dimension)))
+ (case operator
+ (:is-null :not-null) {:operator operator
+ :dimension dimension
+ :values []}
+ :between {:operator operator
+ :dimension dimension
+ :values [(nth filter-clause 3) (nth filter-clause 4)]}
+ ;; Standard operators with values in positions 3+
+ {:operator operator
+ :dimension dimension
+ :values (vec (drop 3 filter-clause))}))))))))
+
+;;; -------------------------------------------------- String Filters --------------------------------------------------
+
+(defn string-filter-clause
+ "Create a string filter clause from parts.
+ Parts: {:operator :keyword, :dimension dimension, :values [string], :options map}"
+ [{:keys [operator dimension values options]}]
+ (lib/ensure-uuid
+ (case operator
+ (:is-empty :not-empty) [operator {} (dimension-ref dimension)]
+ ;; Operators that take a single value and may have options
+ (:contains :does-not-contain :starts-with :ends-with)
+ (if (seq options)
+ [operator options (dimension-ref dimension) (first values)]
+ [operator {} (dimension-ref dimension) (first values)])
+ ;; Equality operators can have multiple values
+ (:= :!=) (into [operator {} (dimension-ref dimension)] values))))
+
+(defn string-filter-parts
+ "Extract string filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension, :values [string], :options map} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)]
+ (when (#{:= :!= :contains :does-not-contain :starts-with :ends-with :is-empty :not-empty} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ ;; Check if this is actually a string filter by looking at dimension type
+ (when (types.isa/string-or-string-like? dimension)
+ (case operator
+ (:is-empty :not-empty) {:operator operator
+ :dimension dimension
+ :values []
+ :options {}}
+ (:contains :does-not-contain :starts-with :ends-with)
+ (let [opts (second filter-clause)
+ ;; Filter out :lib/uuid from options
+ clean-opts (dissoc opts :lib/uuid)]
+ {:operator operator
+ :dimension dimension
+ :values [(nth filter-clause 3)]
+ :options clean-opts})
+ ;; Equality operators
+ {:operator operator
+ :dimension dimension
+ :values (vec (drop 3 filter-clause))
+ :options {}}))))))))
+
+;;; -------------------------------------------------- Coordinate Filters --------------------------------------------------
+
+(defn coordinate-filter-clause
+ "Create a coordinate filter clause from parts.
+ Parts: {:operator :keyword, :dimension lat-dimension, :longitude-dimension lon-dimension, :values [number]}"
+ [{:keys [operator dimension longitude-dimension values]}]
+ (lib/ensure-uuid
+ (case operator
+ :inside [:inside {}
+ (dimension-ref dimension)
+ (dimension-ref longitude-dimension)
+ (nth values 0) (nth values 1) (nth values 2) (nth values 3)]
+ :between [:between {} (dimension-ref dimension) (first values) (second values)]
+ ;; Standard operators
+ (into [operator {} (dimension-ref dimension)] values))))
+
+(defn coordinate-filter-parts
+ "Extract coordinate filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension, :longitude-dimension dimension, :values [number]} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)]
+ (when (#{:= :!= :> :>= :< :<= :between :inside} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ ;; Check if this is actually a coordinate filter by looking at dimension type
+ (when (types.isa/coordinate? dimension)
+ (case operator
+ :inside (let [lon-ref (nth filter-clause 3 nil)
+ lon-id (when (and (vector? lon-ref) (= :dimension (first lon-ref)))
+ (nth lon-ref 2 nil))
+ lon-dim (when lon-id (find-dimension-by-id definition lon-id))]
+ {:operator operator
+ :dimension dimension
+ :longitude-dimension lon-dim
+ :values [(nth filter-clause 4)
+ (nth filter-clause 5)
+ (nth filter-clause 6)
+ (nth filter-clause 7)]})
+ :between {:operator operator
+ :dimension dimension
+ :longitude-dimension nil
+ :values [(nth filter-clause 3) (nth filter-clause 4)]}
+ ;; Standard operators
+ {:operator operator
+ :dimension dimension
+ :longitude-dimension nil
+ :values (vec (drop 3 filter-clause))}))))))))
+
+;;; -------------------------------------------------- Specific Date Filters --------------------------------------------------
+
+(defn specific-date-filter-clause
+ "Create a specific date filter clause from parts.
+ Parts: {:operator :keyword, :dimension dimension, :values [date-string], :has-time boolean}"
+ [{:keys [operator dimension values has-time]}]
+ (let [values (perf/mapv #(u.time/format-date-for-filter % has-time) values)]
+ (lib/ensure-uuid
+ (case operator
+ :between [:between {} (dimension-ref dimension) (first values) (second values)]
+ ;; Standard operators: =, >, <
+ [operator {} (dimension-ref dimension) (first values)]))))
+
+(defn- value-has-time?
+ "Check if a date value includes a time component.
+ Handles both string values (ISO 8601 format) and JS Date objects.
+ For Date objects, uses UTC methods to avoid timezone issues."
+ [v]
+ (cond
+ ;; String: check for ISO 8601 time marker or HH:MM pattern
+ (string? v)
+ (boolean (or (re-find #"T" v)
+ (re-find #"\d{2}:\d{2}" v)))
+
+ ;; Date object: check if any UTC time components are non-zero
+ ;; Using UTC methods to avoid timezone issues with midnight dates
+ #?(:cljs (instance? js/Date v)
+ :clj (instance? java.util.Date v))
+ #?(:cljs
+ (let [hours (.getUTCHours v)
+ minutes (.getUTCMinutes v)
+ seconds (.getUTCSeconds v)]
+ (or (pos? hours) (pos? minutes) (pos? seconds)))
+ :clj
+ (let [zdt (-> (.toInstant ^java.util.Date v)
+ (.atZone java.time.ZoneOffset/UTC))
+ hours (.getHour zdt)
+ minutes (.getMinute zdt)
+ seconds (.getSecond zdt)]
+ (or (pos? hours) (pos? minutes) (pos? seconds))))
+
+ :else false))
+
+(defn specific-date-filter-parts
+ "Extract specific date filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension, :values [date], :has-time boolean} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)]
+ (when (#{:= :> :< :between} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ ;; Check if this is a temporal (but not time-only) filter
+ (when (and (types.isa/temporal? dimension)
+ (not (types.isa/time? dimension)))
+ (let [values (case operator
+ :between [(nth filter-clause 3) (nth filter-clause 4)]
+ [(nth filter-clause 3)])
+ ;; Determine if values include time component
+ has-time (perf/some value-has-time? values)]
+ {:operator operator
+ :dimension dimension
+ :values values
+ :has-time (boolean has-time)}))))))))
+
+;;; -------------------------------------------------- Relative Date Filters --------------------------------------------------
+
+(defn relative-date-filter-clause
+ "Create a relative date filter clause from parts.
+ Parts: {:dimension dimension, :unit :day/:week/etc, :value int, :offset-unit unit, :offset-value int, :options map}"
+ [{:keys [dimension unit value offset-unit offset-value options]}]
+ (let [base-options (cond-> {}
+ (seq options) (merge options)
+ offset-unit (assoc :offset-unit offset-unit)
+ offset-value (assoc :offset-value offset-value))]
+ (lib/ensure-uuid
+ (if (seq base-options)
+ [:time-interval base-options (dimension-ref dimension) value unit]
+ [:time-interval {} (dimension-ref dimension) value unit]))))
+
+(defn relative-date-filter-parts
+ "Extract relative date filter parts from an MBQL clause.
+ Returns {:dimension dim, :unit unit, :value int, :offset-unit unit, :offset-value int, :options map} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (= :time-interval (first filter-clause))
+ (>= (count filter-clause) 5))
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ (let [opts (second filter-clause)
+ value (nth filter-clause 3)
+ unit (nth filter-clause 4)
+ offset-unit (:offset-unit opts)
+ offset-value (:offset-value opts)
+ ;; Remove internal keys from options
+ clean-opts (dissoc opts :lib/uuid :offset-unit :offset-value)]
+ {:dimension dimension
+ :unit unit
+ :value value
+ :offset-unit offset-unit
+ :offset-value offset-value
+ :options clean-opts})))))
+
+;;; -------------------------------------------------- Exclude Date Filters --------------------------------------------------
+
+(defn exclude-date-filter-clause
+ "Create an exclude date filter clause from parts.
+ Parts: {:operator :keyword, :dimension dimension, :unit :day-of-week/etc, :values [int]}"
+ [{:keys [operator dimension unit values]}]
+ (lib/ensure-uuid
+ (case operator
+ (:is-null :not-null) [operator {} (dimension-ref dimension)]
+ ;; For :!= with unit, we need to wrap the dimension in a temporal extraction
+ :!= (let [extraction-fn (case unit
+ :day-of-week :get-day-of-week
+ :month-of-year :get-month
+ :quarter-of-year :get-quarter
+ :hour-of-day :get-hour)]
+ (into [:!= {} [extraction-fn {} (dimension-ref dimension)]] values)))))
+
+(defn exclude-date-filter-parts
+ "Extract exclude date filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension, :unit unit, :values [int]} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)]
+ (cond
+ ;; Null checks
+ (#{:is-null :not-null} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ (when (types.isa/temporal? dimension)
+ {:operator operator
+ :dimension dimension
+ :unit nil
+ :values []})))
+
+ ;; Exclude with temporal extraction
+ (= :!= operator)
+ (let [third (nth filter-clause 2 nil)]
+ (when (and (vector? third)
+ (#{:get-day-of-week :get-month :get-quarter :get-hour} (first third)))
+ (let [extraction-fn (first third)
+ dim-ref (nth third 2 nil)
+ dim-id (when (and (vector? dim-ref) (= :dimension (first dim-ref)))
+ (nth dim-ref 2 nil))]
+ (when-let [dimension (when dim-id (find-dimension-by-id definition dim-id))]
+ (let [unit (case extraction-fn
+ :get-day-of-week :day-of-week
+ :get-month :month-of-year
+ :get-quarter :quarter-of-year
+ :get-hour :hour-of-day
+ nil)]
+ {:operator operator
+ :dimension dimension
+ :unit unit
+ :values (vec (drop 3 filter-clause))})))))))))
+
+;;; -------------------------------------------------- Time Filters --------------------------------------------------
+
+(defn time-filter-clause
+ "Create a time filter clause from parts.
+ Parts: {:operator :keyword, :dimension dimension, :values [time-string]}"
+ [{:keys [operator dimension values]}]
+ (let [values (perf/mapv #(u.time/format-for-base-type % :type/Time) values)]
+ (lib/ensure-uuid
+ (case operator
+ (:is-null :not-null) [operator {} (dimension-ref dimension)]
+ :between [:between {} (dimension-ref dimension) (first values) (second values)]
+ ;; Standard operators: >, <
+ [operator {} (dimension-ref dimension) (first values)]))))
+
+(defn time-filter-parts
+ "Extract time filter parts from an MBQL clause.
+ Returns {:operator :keyword, :dimension dimension, :values [time]} or nil."
+ [definition filter-clause]
+ (when (and (vector? filter-clause)
+ (>= (count filter-clause) 3))
+ (let [operator (first filter-clause)
+ parts (when (#{:> :< :between :is-null :not-null} operator)
+ (when-let [dim-id (leading-dimension-ref filter-clause)]
+ (when-let [dimension (find-dimension-by-id definition dim-id)]
+ ;; Check if this is specifically a time filter (not date/datetime)
+ (when (types.isa/time? dimension)
+ (case operator
+ (:is-null :not-null) {:operator operator
+ :dimension dimension
+ :values []}
+ :between {:operator operator
+ :dimension dimension
+ :values [(nth filter-clause 3) (nth filter-clause 4)]}
+ {:operator operator
+ :dimension dimension
+ :values [(nth filter-clause 3)]})))))]
+ (when parts
+ (update parts :values (fn [values] (perf/mapv u.time/coerce-to-time values)))))))
diff --git a/src/metabase/lib_metric/hierarchy.cljc b/src/metabase/lib_metric/hierarchy.cljc
new file mode 100644
index 00000000000..2ca97a359e2
--- /dev/null
+++ b/src/metabase/lib_metric/hierarchy.cljc
@@ -0,0 +1,19 @@
+(ns metabase.lib-metric.hierarchy
+ "Shared keyword hierarchy for lib-metric dispatch.
+ Provides a hierarchy that can be used for multimethod dispatch and
+ operator categorization throughout the lib-metric system."
+ (:refer-clojure :exclude [derive isa?]))
+
+(defonce ^{:doc "Hierarchy for lib-metric dispatch."} hierarchy
+ (atom (make-hierarchy)))
+
+(defn derive
+ "Like [[clojure.core/derive]], but affects the lib-metric [[hierarchy]]."
+ [tag parent]
+ (swap! hierarchy clojure.core/derive tag parent)
+ nil)
+
+(defn isa?
+ "Like [[clojure.core/isa?]], but uses the lib-metric [[hierarchy]]."
+ [tag parent]
+ (clojure.core/isa? @hierarchy tag parent))
diff --git a/src/metabase/lib_metric/js.cljs b/src/metabase/lib_metric/js.cljs
new file mode 100644
index 00000000000..39274d23f2d
--- /dev/null
+++ b/src/metabase/lib_metric/js.cljs
@@ -0,0 +1,845 @@
+(ns metabase.lib-metric.js
+ "JavaScript-facing API for lib-metric functions."
+ (:refer-clojure :exclude [filter])
+ (:require
+ [clojure.string :as str]
+ [goog.object :as gobject]
+ [metabase.lib-metric.clause :as lib-metric.clause]
+ [metabase.lib-metric.core :as lib-metric]
+ [metabase.lib-metric.definition :as lib-metric.definition]
+ [metabase.lib-metric.dimension :as lib-metric.dimension]
+ [metabase.lib-metric.display-info :as lib-metric.display-info]
+ [metabase.lib-metric.filter :as lib-metric.filter]
+ [metabase.lib-metric.metadata.js :as lib-metric.metadata.js]
+ [metabase.lib-metric.projection :as lib-metric.projection]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.lib-metric.types.isa :as types.isa]
+ [metabase.lib.field :as lib.field]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.util :as u]
+ [metabase.util.memoize :as memoize]
+ [metabase.util.number :as u.number]
+ [metabase.util.time :as u.time]))
+
+;; =============================================================================
+;; CLJS -> JS Conversion Utilities
+;; =============================================================================
+;; These conversion functions transform CLJS data structures to JS objects/arrays.
+;; Adapted from metabase.lib/js.cljs for consistent interop patterns.
+
+(declare ^:private display-info->js)
+
+(defn- cljs-key->js-key
+ "Converts idiomatic Clojure keys (`:kebab-case-keywords`) into idiomatic JavaScript keys (`\"camelCaseStrings\"`).
+
+ Namespaces are preserved. A `?` suffix in Clojure is replaced with an `\"is\"` prefix in JavaScript, eg.
+ `:many-pks?` becomes `isManyPks`."
+ [cljs-key]
+ (let [key-str (u/qualified-name cljs-key)
+ key-str (if (str/ends-with? key-str "?")
+ (str "is-" (str/replace key-str #"\?$" ""))
+ key-str)]
+ (u/->camelCaseEn key-str)))
+
+(defn- display-info-map->js* [x]
+ (reduce (fn [obj [cljs-key cljs-val]]
+ (let [js-key (cljs-key->js-key cljs-key)
+ js-val (display-info->js cljs-val)]
+ (gobject/set obj js-key js-val)
+ obj))
+ #js {}
+ x))
+
+(def ^:private display-info-map->js
+ (memoize/lru display-info-map->js* :lru/threshold 256))
+
+(defn- display-info-seq->js* [x]
+ (to-array (map display-info->js x)))
+
+(def ^:private display-info-seq->js
+ (memoize/lru display-info-seq->js* :lru/threshold 256))
+
+(defn- display-info->js
+ "Converts CLJS display info results into JS objects for the FE to consume.
+ Recursively converts CLJS maps and sequences into JS objects and arrays."
+ [x]
+ (cond
+ (nil? x) nil
+ (map? x) (display-info-map->js x)
+ (string? x) x
+ (seqable? x) (display-info-seq->js x)
+ (keyword? x) (u/qualified-name x)
+ :else x))
+
+;; Ensure all lib-metric code is loaded for any defmethod registrations
+(comment lib-metric/keep-me
+ lib-metric.display-info/keep-me
+ lib-metric.metadata.js/keep-me)
+
+(defn- object-get [obj k]
+ (when (and obj (js-in k obj))
+ (gobject/get obj k)))
+
+(defn- build-table->db-id
+ "Build a map of table-id -> database-id from the tables in metadata."
+ [metadata]
+ (let [tables (object-get metadata "tables")]
+ (when tables
+ (into {}
+ (keep (fn [k]
+ ;; Skip card__* virtual tables
+ (when-not (re-find #"^card__" k)
+ (when-let [table-id (parse-long k)]
+ (let [table (object-get tables k)
+ db-id (or (object-get table "db_id")
+ (object-get table "db-id"))]
+ (when db-id
+ [table-id db-id]))))))
+ (js-keys tables)))))
+
+(defn- ->metadata-provider
+ "Extract the metadata provider from a MetadataProviderable.
+ If passed a MetricDefinition, extracts its :metadata-provider.
+ Otherwise, assumes it's already a MetadataProvider and returns it."
+ [providerable]
+ (if (and (map? providerable)
+ (= :metric/definition (:lib/type providerable)))
+ (:metadata-provider providerable)
+ providerable))
+
+(defn- assert-single-source!
+ "Throw if expression is not a single leaf."
+ [definition]
+ (when-not (lib-metric.definition/expression-leaf? (:expression definition))
+ (throw (ex-info (str "This function requires a single-source definition. "
+ "Use the multi-arity form with a SourceInstance or source metadata.")
+ {:expression (:expression definition)}))))
+
+(defn- ->source-instance
+ "Convert JS array ['metric', {'lib/uuid': '...'}, id] to CLJS vector."
+ [js-array]
+ (let [tag (aget js-array 0)
+ opts (aget js-array 1)
+ id (aget js-array 2)
+ uuid (when opts (gobject/get opts "lib/uuid"))]
+ [(keyword tag) {:lib/uuid uuid} id]))
+
+(defn ^:export metadataProvider
+ "Create a MetricMetadataProvider from JS/Redux metadata.
+
+ This provider enables building metric queries that span multiple databases.
+ Unlike the standard Lib.metadataProvider which is scoped to a single database,
+ this provider has no single database context and routes requests based on
+ table-id.
+
+ Arguments:
+ - `metadata` - JS metadata object (same format as passed to Lib.metadataProvider)
+
+ Returns a MetadataProvider that:
+ - Returns nil for database() since there's no single database context
+ - Routes metric requests to metrics in the metadata
+ - Routes measure requests to measures in the metadata (if provided)
+ - Routes table/column requests to database-specific providers
+
+ Usage in TypeScript:
+ ```typescript
+ import { metadataProvider } from 'metabase-lib/metric';
+ const provider = metadataProvider(metadata);
+ ```"
+ [metadata]
+ (let [;; Extract metrics - they're stored under 'metrics' key
+ metrics-data (object-get metadata "metrics")
+ ;; Extract measures - they're stored under 'measures' key
+ measures-data (object-get metadata "measures")
+ ;; Build table-id -> db-id mapping from tables
+ table->db-id (build-table->db-id metadata)
+ ;; Settings are under 'settings' key
+ settings (object-get metadata "settings")]
+ (lib-metric.metadata.js/metadata-provider
+ metrics-data
+ measures-data
+ metadata
+ table->db-id
+ settings)))
+
+(defn ^:export metricMetadata
+ "Get metadata for the Metric with `metric-id`.
+ Accepts a MetadataProviderable (either a MetadataProvider or MetricDefinition).
+ Returns nil if not found."
+ [providerable metric-id]
+ (first (lib.metadata.protocols/metadatas
+ (->metadata-provider providerable)
+ {:lib/type :metadata/metric, :id #{metric-id}})))
+
+(defn ^:export measureMetadata
+ "Get metadata for the Measure with `measure-id`.
+ Accepts a MetadataProviderable (either a MetadataProvider or MetricDefinition).
+ Returns nil if not found."
+ [providerable measure-id]
+ (first (lib.metadata.protocols/metadatas
+ (->metadata-provider providerable)
+ {:lib/type :metadata/measure, :id #{measure-id}})))
+
+(defn ^:export fromMetricMetadata
+ "Create a MetricDefinition from metric metadata.
+ Accepts a MetadataProviderable (either a MetadataProvider or MetricDefinition).
+ Returns opaque CLJS data (no conversion needed for TypeScript's opaque type).
+ The metricMetadata should already be a CLJS data structure from the provider."
+ [providerable metric-metadata]
+ (lib-metric.definition/from-metric-metadata (->metadata-provider providerable) metric-metadata))
+
+(defn ^:export fromMeasureMetadata
+ "Create a MetricDefinition from measure metadata.
+ Accepts a MetadataProviderable (either a MetadataProvider or MetricDefinition).
+ Returns opaque CLJS data (no conversion needed for TypeScript's opaque type).
+ The measureMetadata should already be a CLJS data structure from the provider."
+ [providerable measure-metadata]
+ (lib-metric.definition/from-measure-metadata (->metadata-provider providerable) measure-metadata))
+
+(defn ^:export sourceMetricId
+ "Get the source metric ID from a definition, or null if measure-based."
+ [definition]
+ (lib-metric.definition/source-metric-id definition))
+
+(defn ^:export sourceMeasureId
+ "Get the source measure ID from a definition, or null if metric-based."
+ [definition]
+ (lib-metric.definition/source-measure-id definition))
+
+(defn ^:export sourceMeasureTableId
+ "Get the table ID of the source measure, or null if not measure-based."
+ [definition]
+ (when-let [measure-id (lib-metric.definition/source-measure-id definition)]
+ (:table-id (first (lib.metadata.protocols/metadatas
+ (->metadata-provider definition)
+ {:lib/type :metadata/measure, :id #{measure-id}})))))
+
+(defn ^:export sourceInstances
+ "Get expression leaf instances as JS arrays.
+ Returns a JS array of ['metric'|'measure', {'lib/uuid': '...'}, id] arrays."
+ [definition]
+ (to-array (map (fn [[tag opts id]]
+ #js [(name tag) #js {"lib/uuid" (:lib/uuid opts)} id])
+ (lib-metric.definition/expression-leaves
+ (:expression definition)))))
+
+(defn ^:export filters
+ "Get the filter clauses from a metric definition.
+ 1-arity: returns flat MBQL filter clauses (single-source only).
+ 2-arity: returns filter clauses scoped to a specific source instance."
+ ([definition]
+ (assert-single-source! definition)
+ (to-array (map :filter (lib-metric.definition/filters definition))))
+ ([definition source-instance]
+ (let [inst (->source-instance source-instance)
+ uuid (lib-metric.definition/expression-leaf-uuid inst)]
+ (to-array (map :filter (filterv #(= (:lib/uuid %) uuid)
+ (lib-metric.definition/filters definition)))))))
+
+(defn ^:export projections
+ "Get the projection clauses from a metric definition.
+ 1-arity: returns flat dimension-ref projections (single-source only).
+ 2-arity: returns projections scoped to a specific source metadata."
+ ([definition]
+ (assert-single-source! definition)
+ (to-array (lib-metric.definition/flat-projections
+ (lib-metric.definition/projections definition))))
+ ([definition source-metadata]
+ (let [dims (lib-metric.projection/projectable-dimensions-for-source definition source-metadata)]
+ (to-array (filterv :projection-positions dims)))))
+
+(defn ^:export fromJsMetricDefinition
+ "Convert a JS metric definition (from JSON) to a MetricDefinition.
+
+ The JS definition should match the format accepted by POST /api/metric/dataset:
+ - expression: a metric math expression tree
+ - filters (optional, per-instance filters)
+ - projections (optional, typed projections)
+
+ Also accepts legacy format with source-metric/source-measure for backwards compat.
+
+ Accepts a MetadataProviderable (either a MetadataProvider or MetricDefinition)."
+ [providerable js-definition]
+ (let [provider (->metadata-provider providerable)
+ definition (js->clj js-definition :keywordize-keys true)]
+ (if-let [expression (:expression definition)]
+ ;; New expression-based format
+ (let [norm-expression (lib-metric.schema/normalize-math-expression expression)
+ ;; Normalize instance filters
+ raw-filters (or (:filters definition) [])
+ norm-filters (into []
+ (keep (fn [inst-filter]
+ (when-let [f (lib-metric.schema/normalize-filter-clause (:filter inst-filter))]
+ {:lib/uuid (:lib/uuid inst-filter)
+ :filter f})))
+ raw-filters)
+ ;; Normalize typed projections
+ raw-projections (or (:projections definition) [])
+ norm-projections (mapv (fn [tp]
+ {:type (keyword (:type tp))
+ :id (:id tp)
+ :projection (into [] (keep lib-metric.schema/normalize-dimension-ref) (:projection tp))})
+ raw-projections)]
+ {:lib/type :metric/definition
+ :expression norm-expression
+ :filters norm-filters
+ :projections norm-projections
+ :metadata-provider provider})
+ ;; Legacy format: source-metric/source-measure
+ (let [source-metric (:source-metric definition)
+ source-measure (:source-measure definition)
+ [leaf-type source-id] (cond
+ source-metric [:metric source-metric]
+ source-measure [:measure source-measure]
+ :else (throw (ex-info "Definition must have expression or source-metric/source-measure"
+ {:definition definition})))
+ uuid (str (random-uuid))]
+ {:lib/type :metric/definition
+ :expression [leaf-type {:lib/uuid uuid} source-id]
+ :filters []
+ :projections []
+ :metadata-provider provider}))))
+
+(defn- expression->js
+ "Convert a CLJS expression tree to JS, preserving namespaced keys like :lib/uuid.
+ BigInts are wrapped in [:value opts string] clauses so the QP uses :type/BigInteger
+ for parsing rather than the column's own type (which may be :type/Integer)."
+ [expr]
+ (cond
+ (keyword? expr) (u/qualified-name expr)
+ (map? expr) (let [obj #js {}]
+ (doseq [[k v] expr]
+ (gobject/set obj (u/qualified-name k) (expression->js v)))
+ obj)
+ (vector? expr) (to-array (map expression->js expr))
+ (u.number/bigint? expr) (let [opts #js {}]
+ (gobject/set opts "base-type" "type/BigInteger")
+ (gobject/set opts "effective-type" "type/BigInteger")
+ (gobject/set opts "lib/uuid" (str (random-uuid)))
+ (to-array #js ["value" opts (str expr)]))
+ :else expr))
+
+(defn- instance-filter->js
+ "Convert an instance-filter map to JS, preserving :lib/uuid key."
+ [{:keys [lib/uuid filter]}]
+ (let [obj #js {}]
+ (gobject/set obj "lib/uuid" uuid)
+ (gobject/set obj "filter" (expression->js filter))
+ obj))
+
+(defn- typed-projection->js
+ "Convert a typed-projection map to JS."
+ [{:keys [type id projection]}]
+ (let [obj #js {}]
+ (gobject/set obj "type" (name type))
+ (gobject/set obj "id" id)
+ (gobject/set obj "projection" (to-array (map expression->js projection)))
+ obj))
+
+(defn ^:export toJsMetricDefinition
+ "Convert a MetricDefinition to a JS object for JSON serialization.
+
+ Produces format compatible with POST /api/metric/dataset:
+ - expression: metric math expression tree
+ - filters (array, omitted if empty)
+ - projections (array, omitted if empty)"
+ [definition]
+ (let [expression (:expression definition)
+ filters (:filters definition)
+ projections (:projections definition)
+ obj #js {}]
+ (gobject/set obj "expression" (expression->js expression))
+ (when (seq filters)
+ (gobject/set obj "filters" (to-array (map instance-filter->js filters))))
+ (when (seq projections)
+ (gobject/set obj "projections" (to-array (map typed-projection->js projections))))
+ obj))
+
+(defn ^:export filterableDimensions
+ "Get dimensions that can be used for filtering.
+ 1-arity: returns dimensions for single-source definition.
+ 2-arity: returns dimensions scoped to a specific source instance."
+ ([definition]
+ (assert-single-source! definition)
+ (to-array (lib-metric.filter/filterable-dimensions definition)))
+ ([definition source-instance]
+ (to-array (lib-metric.filter/filterable-dimensions-for-instance
+ definition (->source-instance source-instance)))))
+
+(defn ^:export filter
+ "Add a filter clause to a metric definition.
+ 2-arity: adds filter to single-source definition.
+ 3-arity: adds filter scoped to a specific source instance."
+ ([definition filter-clause]
+ (assert-single-source! definition)
+ (lib-metric.filter/add-filter definition filter-clause))
+ ([definition filter-clause source-instance]
+ (let [inst (->source-instance source-instance)
+ uuid (lib-metric.definition/expression-leaf-uuid inst)]
+ (lib-metric.filter/add-filter definition filter-clause uuid))))
+
+(defn ^:export filterableDimensionOperators
+ "Get available filter operators for a dimension.
+ Returns a JS array of operator keyword strings (e.g., ['=', '!=', 'contains', ...]).
+ Unlike metabase.lib which wraps operators in maps, this returns simple strings."
+ [dimension]
+ (to-array (map name (lib-metric.filter/filterable-dimension-operators dimension))))
+
+;;; -------------------------------------------------- Filter Parts JS Conversion --------------------------------------------------
+
+(defn- js-key->cljs-key
+ "Converts idiomatic JavaScript keys (`\"camelCaseStrings\"`) into idiomatic Clojure keys (`:kebab-case-keywords`).
+ Inverse of cljs-key->js-key."
+ [js-key]
+ (-> js-key
+ (str/replace #"([a-z])([A-Z])" "$1-$2")
+ u/lower-case-en
+ keyword))
+
+(defn- js-options->cljs-options
+ "Convert JS options object to CLJS map with kebab-case keys."
+ [js-options]
+ (when js-options
+ (reduce (fn [acc k]
+ (let [cljs-key (js-key->cljs-key k)
+ v (gobject/get js-options k)]
+ (assoc acc cljs-key v)))
+ {}
+ (js-keys js-options))))
+
+(defn- cljs-options->js-options
+ "Convert CLJS options map to JS object with camelCase keys."
+ [cljs-options]
+ (when (seq cljs-options)
+ (let [result #js {}]
+ (doseq [[k v] cljs-options]
+ (gobject/set result (cljs-key->js-key k) v))
+ result)))
+
+(defn- filter-parts-js->cljs
+ "Convert JS filter parts object to CLJS map.
+ Handles camelCase -> kebab-case key conversion."
+ [js-parts]
+ (when js-parts
+ (let [operator (some-> (gobject/get js-parts "operator") keyword)
+ dimension (gobject/get js-parts "dimension")
+ values (some-> (gobject/get js-parts "values") js->clj)
+ options (js-options->cljs-options (gobject/get js-parts "options"))
+ ;; For coordinate filters
+ longitude-dimension (gobject/get js-parts "longitudeDimension")
+ ;; For relative date filters
+ unit (some-> (gobject/get js-parts "unit") keyword)
+ value (gobject/get js-parts "value")
+ offset-unit (some-> (gobject/get js-parts "offsetUnit") keyword)
+ offset-value (gobject/get js-parts "offsetValue")
+ ;; For specific date filters
+ has-time (gobject/get js-parts "hasTime")]
+ (cond-> {}
+ operator (assoc :operator operator)
+ dimension (assoc :dimension dimension)
+ values (assoc :values values)
+ options (assoc :options options)
+ longitude-dimension (assoc :longitude-dimension longitude-dimension)
+ unit (assoc :unit unit)
+ (some? value) (assoc :value value)
+ offset-unit (assoc :offset-unit offset-unit)
+ (some? offset-value) (assoc :offset-value offset-value)
+ (some? has-time) (assoc :has-time has-time)))))
+
+(defn- filter-parts-cljs->js
+ "Convert CLJS filter parts map to JS object.
+ Handles kebab-case -> camelCase key conversion."
+ [cljs-parts]
+ (when cljs-parts
+ (let [result #js {}]
+ (when-let [operator (:operator cljs-parts)]
+ (gobject/set result "operator" (name operator)))
+ (when-let [dimension (:dimension cljs-parts)]
+ (gobject/set result "dimension" dimension))
+ (when-let [values (:values cljs-parts)]
+ (gobject/set result "values" (to-array values)))
+ (when-let [options (:options cljs-parts)]
+ (gobject/set result "options" (cljs-options->js-options options)))
+ (when (contains? cljs-parts :longitude-dimension)
+ (gobject/set result "longitudeDimension" (:longitude-dimension cljs-parts)))
+ (when-let [unit (:unit cljs-parts)]
+ (gobject/set result "unit" (name unit)))
+ (when (contains? cljs-parts :value)
+ (gobject/set result "value" (:value cljs-parts)))
+ (when-let [offset-unit (:offset-unit cljs-parts)]
+ (gobject/set result "offsetUnit" (name offset-unit)))
+ (when (contains? cljs-parts :offset-value)
+ (gobject/set result "offsetValue" (:offset-value cljs-parts)))
+ (when (contains? cljs-parts :has-time)
+ (gobject/set result "hasTime" (:has-time cljs-parts)))
+ result)))
+
+;;; -------------------------------------------------- Filter Clause/Parts Functions --------------------------------------------------
+
+(defn ^:export stringFilterClause
+ "Create a string filter clause from parts.
+ Parts: {operator, dimension, values, options}"
+ [parts]
+ (lib-metric.filter/string-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export stringFilterParts
+ "Extract string filter parts from a clause.
+ Returns {operator, dimension, values, options} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/string-filter-parts definition filter-clause)))
+
+(defn ^:export numberFilterClause
+ "Create a number filter clause from parts.
+ Parts: {operator, dimension, values}"
+ [parts]
+ (lib-metric.filter/number-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export numberFilterParts
+ "Extract number filter parts from a clause.
+ Returns {operator, dimension, values} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/number-filter-parts definition filter-clause)))
+
+(defn ^:export coordinateFilterClause
+ "Create a coordinate filter clause from parts.
+ Parts: {operator, dimension, longitudeDimension, values}"
+ [parts]
+ (lib-metric.filter/coordinate-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export coordinateFilterParts
+ "Extract coordinate filter parts from a clause.
+ Returns {operator, dimension, longitudeDimension, values} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/coordinate-filter-parts definition filter-clause)))
+
+(defn ^:export booleanFilterClause
+ "Create a boolean filter clause from parts.
+ Parts: {operator, dimension, values}"
+ [parts]
+ (lib-metric.filter/boolean-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export booleanFilterParts
+ "Extract boolean filter parts from a clause.
+ Returns {operator, dimension, values} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/boolean-filter-parts definition filter-clause)))
+
+(defn ^:export specificDateFilterClause
+ "Create a specific date filter clause from parts.
+ Parts: {operator, dimension, values, hasTime}"
+ [parts]
+ (lib-metric.filter/specific-date-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export specificDateFilterParts
+ "Extract specific date filter parts from a clause.
+ Returns {operator, dimension, values, hasTime} or null."
+ [definition filter-clause]
+ (some-> (lib-metric.filter/specific-date-filter-parts definition filter-clause)
+ (update :values (fn [values] (mapv (comp u.time/dayjs-utc->local-date u.time/coerce-to-timestamp) values)))
+ filter-parts-cljs->js))
+
+(defn ^:export relativeDateFilterClause
+ "Create a relative date filter clause from parts.
+ Parts: {dimension, unit, value, offsetUnit, offsetValue, options}"
+ [parts]
+ (lib-metric.filter/relative-date-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export relativeDateFilterParts
+ "Extract relative date filter parts from a clause.
+ Returns {dimension, unit, value, offsetUnit, offsetValue, options} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/relative-date-filter-parts definition filter-clause)))
+
+(defn ^:export excludeDateFilterClause
+ "Create an exclude date filter clause from parts.
+ Parts: {operator, dimension, unit, values}"
+ [parts]
+ (lib-metric.filter/exclude-date-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export excludeDateFilterParts
+ "Extract exclude date filter parts from a clause.
+ Returns {operator, dimension, unit, values} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/exclude-date-filter-parts definition filter-clause)))
+
+(defn ^:export timeFilterClause
+ "Create a time filter clause from parts.
+ Parts: {operator, dimension, values}"
+ [parts]
+ (lib-metric.filter/time-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export timeFilterParts
+ "Extract time filter parts from a clause.
+ Returns {operator, dimension, values} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/time-filter-parts definition filter-clause)))
+
+(defn ^:export defaultFilterClause
+ "Create a default filter clause from parts.
+ Parts: {operator, dimension}"
+ [parts]
+ (lib-metric.filter/default-filter-clause (filter-parts-js->cljs parts)))
+
+(defn ^:export defaultFilterParts
+ "Extract default filter parts from a clause.
+ Returns {operator, dimension} or null."
+ [definition filter-clause]
+ (filter-parts-cljs->js (lib-metric.filter/default-filter-parts definition filter-clause)))
+
+(defn ^:export projectionableDimensions
+ "Get dimensions that can be used for projections.
+ 1-arity: returns dimensions for single-source definition.
+ 2-arity: returns dimensions scoped to a specific source metadata."
+ ([definition]
+ (assert-single-source! definition)
+ (to-array (lib-metric.projection/projectable-dimensions definition)))
+ ([definition source-metadata]
+ (to-array (lib-metric.projection/projectable-dimensions-for-source
+ definition source-metadata))))
+
+(defn ^:export defaultBreakoutDimensions
+ "Get dimensions corresponding to the source metric's default breakout columns."
+ [definition]
+ (to-array (lib-metric.projection/default-breakout-dimensions definition)))
+
+(defn ^:export dimensionReference
+ "Convert a DimensionMetadata map to a bare dimension reference [:dimension {} uuid].
+ If already a reference, returns it as-is."
+ [dimension]
+ (lib-metric.dimension/reference dimension))
+
+(defn ^:export project
+ "Add a dimension reference projection to a metric definition.
+ The dimension-ref must be a dimension reference (from dimensionReference,
+ withTemporalBucket, or withBinning).
+ 2-arity: adds projection to single-source definition.
+ 3-arity: adds projection scoped to a specific source metadata."
+ ([definition dimension-ref]
+ (assert-single-source! definition)
+ (lib-metric.projection/project definition dimension-ref))
+ ([definition dimension source-metadata]
+ (lib-metric.projection/project-for-source definition dimension source-metadata)))
+
+(defn ^:export projectionDimension
+ "Get the dimension metadata for a projection clause.
+ Returns the dimension or null if not found."
+ [definition projection]
+ (lib-metric.projection/projection-dimension definition projection))
+
+(defn ^:export replaceClause
+ "Replace a clause in a metric definition.
+ Finds the target clause by its :lib/uuid and replaces it with the new clause.
+ Returns the definition unchanged if target clause is not found."
+ [definition target-clause new-clause]
+ (lib-metric.clause/replace-clause definition target-clause new-clause))
+
+(defn ^:export removeClause
+ "Remove a clause from a metric definition.
+ Finds the clause by its :lib/uuid and removes it from :filters or :projections.
+ Returns the definition unchanged if clause is not found."
+ [definition clause]
+ (lib-metric.clause/remove-clause definition clause))
+
+(defn ^:export swapClauses
+ "Swap two clauses in a metric definition.
+ Finds both clauses by their :lib/uuid and swaps their positions.
+ Works within the same vector (both filters, both projections) or across vectors.
+ Returns the definition unchanged if either clause is not found."
+ [definition source-clause target-clause]
+ (lib-metric.clause/swap-clauses definition source-clause target-clause))
+
+(defn ^:export temporalBucket
+ "Get the temporal bucket for a projection clause."
+ [projection]
+ (lib-metric.projection/temporal-bucket projection))
+
+(defn ^:export availableTemporalBuckets
+ "Get available temporal buckets for a dimension."
+ [definition dimension]
+ (to-array (lib-metric.projection/available-temporal-buckets definition dimension)))
+
+(defn ^:export withTemporalBucket
+ "Apply a temporal bucket to a projection."
+ [projection bucket]
+ (lib-metric.projection/with-temporal-bucket projection bucket))
+
+(defn ^:export binning
+ "Get the binning strategy for a projection clause."
+ [projection]
+ (lib-metric.projection/binning projection))
+
+(defn ^:export availableBinningStrategies
+ "Get available binning strategies for a dimension.
+ Returns an empty array if no strategies are available."
+ [definition dimension]
+ (-> (lib-metric.projection/available-binning-strategies definition dimension)
+ (or [])
+ to-array))
+
+(defn ^:export withBinning
+ "Apply a binning strategy to a projection."
+ [projection binning-strategy]
+ (lib-metric.projection/with-binning projection binning-strategy))
+
+(defn ^:export isBoolean
+ "Check if dimension is boolean type."
+ [dimension]
+ (types.isa/boolean? dimension))
+
+(defn ^:export isCoordinate
+ "Check if dimension is coordinate type."
+ [dimension]
+ (types.isa/coordinate? dimension))
+
+(defn ^:export isTemporal
+ "Check if dimension is temporal type."
+ [dimension]
+ (types.isa/temporal? dimension))
+
+(defn ^:export isDateOrDateTime
+ "Check if dimension is date or datetime type."
+ [dimension]
+ (types.isa/date-or-datetime? dimension))
+
+(defn ^:export isForeignKey
+ "Check if dimension is a foreign key."
+ [dimension]
+ (types.isa/foreign-key? dimension))
+
+(defn ^:export isLocation
+ "Check if dimension is a location type."
+ [dimension]
+ (types.isa/location? dimension))
+
+(defn ^:export isLatitude
+ "Check if dimension is a latitude."
+ [dimension]
+ (types.isa/latitude? dimension))
+
+(defn ^:export isLongitude
+ "Check if dimension is a longitude."
+ [dimension]
+ (types.isa/longitude? dimension))
+
+(defn ^:export isNumeric
+ "Check if dimension is numeric type."
+ [dimension]
+ (types.isa/numeric? dimension))
+
+(defn ^:export isPrimaryKey
+ "Check if dimension is a primary key."
+ [dimension]
+ (types.isa/primary-key? dimension))
+
+(defn ^:export isStringLike
+ "Check if dimension is string-like type."
+ [dimension]
+ (types.isa/string-like? dimension))
+
+(defn ^:export isStringOrStringLike
+ "Check if dimension is string or string-like type."
+ [dimension]
+ (types.isa/string-or-string-like? dimension))
+
+(defn ^:export isTime
+ "Check if dimension is time type."
+ [dimension]
+ (types.isa/time? dimension))
+
+(defn ^:export isCategory
+ "Check if dimension is a categorical type."
+ [dimension]
+ (types.isa/category? dimension))
+
+(defn ^:export isID
+ "Check if dimension is an ID (primary key or foreign key)."
+ [dimension]
+ (types.isa/id? dimension))
+
+(defn ^:export isURL
+ "Check if dimension is a URL."
+ [dimension]
+ (types.isa/URL? dimension))
+
+(defn ^:export isEntityName
+ "Check if dimension is an entity name."
+ [dimension]
+ (types.isa/entity-name? dimension))
+
+(defn ^:export isTitle
+ "Check if dimension is a title."
+ [dimension]
+ (types.isa/title? dimension))
+
+(defn ^:export isState
+ "Check if dimension is a state."
+ [dimension]
+ (types.isa/state? dimension))
+
+(defn ^:export isCountry
+ "Check if dimension is a country."
+ [dimension]
+ (types.isa/country? dimension))
+
+(defn ^:export isCity
+ "Check if dimension is a city."
+ [dimension]
+ (types.isa/city? dimension))
+
+(defn ^:export displayInfo
+ "Get display info for a displayable item.
+ Dispatches on :lib/type to return appropriate display info structure."
+ [definition source]
+ (display-info->js
+ (lib-metric.display-info/display-info definition source)))
+
+(defn- resolve-dimension-field
+ "Resolve a dimension to its underlying field metadata via dimension-mapping.
+ Returns the field column metadata or nil if resolution fails."
+ [metadata-provider dimension]
+ (let [mapping (:dimension-mapping dimension)
+ target (:target mapping)
+ table-id (:table-id mapping)
+ field-id (lib-metric.dimension/dimension-target->field-id target)]
+ (when (and metadata-provider field-id table-id)
+ (first (lib.metadata.protocols/metadatas
+ metadata-provider
+ {:lib/type :metadata/column
+ :table-id table-id
+ :id #{field-id}})))))
+
+(defn ^:export dimensionValuesInfo
+ "Get dimension values info. Prefers has-field-values stored directly on the
+ dimension (computed during sync). Falls back to resolving the underlying field
+ for backward compatibility with older dimensions that lack the key."
+ [definition dimension]
+ (let [raw-hfv (:has-field-values dimension)
+ dim-hfv (when raw-hfv (keyword raw-hfv))]
+ (if dim-hfv
+ (display-info->js
+ {:id (:id dimension)
+ :can-list-values (= :list dim-hfv)
+ :can-search-values (= :search dim-hfv)
+ :can-remap-values false})
+ (let [mp (:metadata-provider definition)
+ field (resolve-dimension-field mp dimension)
+ has-fv (when field
+ (lib.field/infer-has-field-values field))
+ can-remap (boolean
+ (when field
+ (get-in field [:lib/external-remap :field-id])))]
+ (display-info->js
+ {:id (:id dimension)
+ :can-list-values (= :list has-fv)
+ :can-search-values (= :search has-fv)
+ :can-remap-values can-remap})))))
+
+(defn ^:export isSameSource
+ "Check if two dimensions share at least one common source.
+ Returns false if either dimension has no sources."
+ [dimension1 dimension2]
+ (let [sources1 (:sources dimension1)
+ sources2 (:sources dimension2)]
+ (boolean
+ (when (and (seq sources1) (seq sources2))
+ (some (set sources1) sources2)))))
diff --git a/src/metabase/lib_metric/measures.cljc b/src/metabase/lib_metric/measures.cljc
new file mode 100644
index 00000000000..2c7a2dc21ed
--- /dev/null
+++ b/src/metabase/lib_metric/measures.cljc
@@ -0,0 +1,10 @@
+(ns metabase.lib-metric.measures
+ "Pure multimethod implementations for :metadata/measure entities.
+ These are accessors that read dimension-related data from measure metadata objects."
+ (:require
+ [metabase.lib-metric.dimension :as lib-metric.dimension]))
+
+(defmethod lib-metric.dimension/dimensionable-query :metadata/measure
+ [{:keys [definition]}]
+ (when (seq definition)
+ definition))
diff --git a/src/metabase/lib_metric/metadata/js.cljs b/src/metabase/lib_metric/metadata/js.cljs
new file mode 100644
index 00000000000..bb8df742100
--- /dev/null
+++ b/src/metabase/lib_metric/metadata/js.cljs
@@ -0,0 +1,195 @@
+(ns metabase.lib-metric.metadata.js
+ "JS/ClojureScript implementation of MetricMetadataProvider.
+
+ This provider enables building metric queries that span multiple databases
+ in the frontend. It takes pre-loaded metadata from Redux and routes requests
+ to database-specific providers as needed."
+ (:require
+ [goog.object :as gobject]
+ [metabase.lib-metric.dimension :as lib-metric.dimension]
+ [metabase.lib-metric.metadata.provider :as provider]
+ [metabase.lib.js.metadata :as js-metadata]
+ [metabase.util :as u]))
+
+(defn- object-get [obj k]
+ (when (and obj (js-in k obj))
+ (gobject/get obj k)))
+
+(defn- parse-metric
+ "Parse a single metric from JS object to Clojure map.
+ Expects metrics from the metrics API (metabase.metrics.api), not Card-based metrics."
+ [metric-obj]
+ (when metric-obj
+ (let [;; Check if this is a Metric class wrapper (has _plainObject) or a plain object
+ raw-obj (or (object-get metric-obj "_plainObject") metric-obj)
+ parsed (-> (js->clj raw-obj :keywordize-keys true)
+ (update-keys u/->kebab-case-en))]
+ (assoc parsed :lib/type :metadata/metric))))
+
+(defn- parse-metrics
+ "Parse all metrics from JS metadata object.
+ Returns a map of id -> metric."
+ [metrics-data]
+ (when metrics-data
+ (into {}
+ (keep (fn [k]
+ (when-let [id (parse-long k)]
+ (when-let [metric (parse-metric (object-get metrics-data k))]
+ [id metric]))))
+ (js-keys metrics-data))))
+
+(defn- filter-metrics
+ "Filter parsed metrics according to metadata-spec.
+ Works with metrics from the metrics API (metabase.metrics.api)."
+ [metrics {id-set :id, name-set :name, :as _metadata-spec}]
+ (into []
+ (comp
+ (if id-set
+ (filter #(contains? id-set (:id %)))
+ identity)
+ (if name-set
+ (filter #(contains? name-set (:name %)))
+ identity))
+ (vals metrics)))
+
+(defn- parse-measure
+ "Parse a single measure from JS object to Clojure map.
+ Expects measures from the measures API, not Card-based measures."
+ [measure-obj]
+ (when measure-obj
+ (let [;; Check if this is a Measure class wrapper (has _plainObject) or a plain object
+ raw-obj (or (object-get measure-obj "_plainObject") measure-obj)
+ parsed (-> (js->clj raw-obj :keywordize-keys true)
+ (update-keys u/->kebab-case-en))]
+ (assoc parsed :lib/type :metadata/measure))))
+
+(defn- parse-measures
+ "Parse all measures from JS metadata object.
+ Returns a map of id -> measure."
+ [measures-data]
+ (when measures-data
+ (into {}
+ (keep (fn [k]
+ (when-let [id (parse-long k)]
+ (when-let [measure (parse-measure (object-get measures-data k))]
+ [id measure]))))
+ (js-keys measures-data))))
+
+(defn- filter-measures
+ "Filter parsed measures according to metadata-spec."
+ [measures {id-set :id, name-set :name, :keys [table-id], :as _metadata-spec}]
+ (let [active-only? (not (or id-set name-set))]
+ (into []
+ (comp
+ (if id-set
+ (filter #(contains? id-set (:id %)))
+ identity)
+ (if name-set
+ (filter #(contains? name-set (:name %)))
+ identity)
+ (if table-id
+ (filter #(= (:table-id %) table-id))
+ identity)
+ (if active-only?
+ (filter #(not (:archived %)))
+ identity))
+ (vals measures))))
+
+;;; ------------------------------------------------- Dimension Fetching -------------------------------------------------
+
+(defn- parse-dimension
+ "Parse a single dimension, converting keys to kebab-case keywords and type values to keywords.
+ Similar to how metabase.lib.js.metadata parses fields."
+ [dim]
+ (let [converted (update-keys dim (comp keyword u/->kebab-case-en))]
+ (cond-> converted
+ (:effective-type converted) (update :effective-type keyword)
+ (:semantic-type converted) (update :semantic-type keyword)
+ (:base-type converted) (update :base-type keyword)
+ (:has-field-values converted) (update :has-field-values keyword)
+ (:sources converted) (update :sources (fn [srcs] (mapv #(update % :type keyword) srcs)))
+ (:group converted) (update :group u/normalize-map))))
+
+(defn- derive-sources-from-mapping
+ "Derive sources from a dimension mapping's target field ID.
+ Used as fallback when dimensions arrive without pre-computed sources."
+ [mapping]
+ (when-let [field-id (lib-metric.dimension/dimension-target->field-id (:target mapping))]
+ [{:type :field, :field-id field-id}]))
+
+(defn- extract-dimensions-from-entity
+ "Extract dimensions from a parsed metric or measure, annotating with source info."
+ [entity source-type]
+ (let [dims (:dimensions entity)
+ mappings (:dimension-mappings entity)
+ mappings-by-dim-id (into {} (map (juxt :dimension-id identity) mappings))]
+ (for [dim dims
+ :let [parsed-dim (parse-dimension dim)
+ mapping (get mappings-by-dim-id (:id parsed-dim))]]
+ (-> parsed-dim
+ (assoc :lib/type :metadata/dimension
+ :source-type source-type
+ :source-id (:id entity))
+ (cond->
+ mapping
+ (assoc :dimension-mapping mapping)
+ (and (not (seq (:sources parsed-dim))) mapping)
+ (assoc :sources (derive-sources-from-mapping mapping)))))))
+
+(defn- extract-all-dimensions
+ "Extract all dimensions from parsed metrics and measures."
+ [parsed-metrics parsed-measures]
+ (concat
+ (mapcat #(extract-dimensions-from-entity % :metric) (vals parsed-metrics))
+ (mapcat #(extract-dimensions-from-entity % :measure) (vals parsed-measures))))
+
+(defn- filter-dimensions
+ "Filter dimensions according to metadata-spec."
+ [dimensions {id-set :id, :keys [metric-id measure-id table-id]}]
+ (cond->> dimensions
+ id-set (filter #(contains? id-set (:id %)))
+ metric-id (filter #(and (= :metric (:source-type %))
+ (= metric-id (:source-id %))))
+ measure-id (filter #(and (= :measure (:source-type %))
+ (= measure-id (:source-id %))))
+ table-id (filter #(= table-id (get-in % [:dimension-mapping :table-id])))
+ true vec))
+
+(defn metadata-provider
+ "Create a MetricMetadataProvider from JS/Redux data.
+
+ Arguments:
+ - `metrics-data` - JS object with metric definitions
+ - `measures-data` - JS object with measure definitions (optional, can be nil)
+ - `metadata` - Full JS metadata object (passed to js-metadata/metadata-provider for each db)
+ - `table->db-id` - Clojure map of table-id -> database-id
+ - `settings` - JS object with Metabase settings
+
+ The returned provider:
+ - Returns nil for database() since there's no single database context
+ - Routes metric requests to the pre-loaded metrics data
+ - Routes measure requests to the pre-loaded measures data if provided
+ - Routes dimension requests to dimensions extracted from metrics/measures
+ - Routes table/column requests to database-specific providers"
+ [metrics-data measures-data metadata table->db-id settings]
+ (let [parsed-metrics (parse-metrics metrics-data)
+ parsed-measures (parse-measures measures-data)
+ all-dimensions (extract-all-dimensions parsed-metrics parsed-measures)
+ db-provider-cache (atom {})
+ db-provider-fn (fn [db-id]
+ (if-let [cached (get @db-provider-cache db-id)]
+ cached
+ ;; js-metadata/metadata-provider takes db-id and the full metadata object
+ (let [provider (js-metadata/metadata-provider db-id metadata)]
+ (swap! db-provider-cache assoc db-id provider)
+ provider)))
+ setting-fn (fn [setting-key]
+ (some-> settings (object-get (name setting-key))))]
+ (provider/metric-context-metadata-provider
+ (fn [spec] (filter-metrics parsed-metrics spec))
+ (when parsed-measures
+ (fn [spec] (filter-measures parsed-measures spec)))
+ (fn [spec] (filter-dimensions all-dimensions spec))
+ (fn [table-id] (get table->db-id table-id))
+ db-provider-fn
+ setting-fn)))
diff --git a/src/metabase/lib_metric/metadata/jvm.clj b/src/metabase/lib_metric/metadata/jvm.clj
new file mode 100644
index 00000000000..f17aec22034
--- /dev/null
+++ b/src/metabase/lib_metric/metadata/jvm.clj
@@ -0,0 +1,157 @@
+(ns metabase.lib-metric.metadata.jvm
+ "JVM implementation of MetricMetadataProvider.
+
+ This provider enables building metric queries that span multiple databases.
+ It fetches metrics from the Card table (type='metric') without database scoping,
+ and routes table/column metadata requests to database-specific providers."
+ (:require
+ [honey.sql.helpers :as sql.helpers]
+ [medley.core :as m]
+ [metabase.lib-be.core :as lib-be]
+ [metabase.lib-metric.dimension.jvm :as lib-metric.dimension.jvm]
+ [metabase.lib-metric.metadata.provider :as provider]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.settings.core :as setting]
+ [metabase.util.malli :as mu]
+ [metabase.util.memoize :as memoize]
+ [toucan2.core :as t2]))
+
+(set! *warn-on-reflection* true)
+
+(defn- table->database-id
+ "Memoized lookup of database-id for a table-id."
+ []
+ (memoize/lru
+ (fn [table-id]
+ (t2/select-one-fn :db_id :model/Table table-id))
+ :lru/threshold 1000))
+
+(defn- metric-spec->honey-sql
+ "Build HoneySQL WHERE clause for fetching metrics.
+ Metrics are Cards with type='metric' - not scoped to any database."
+ [{id-set :id, name-set :name, :keys [table-id card-id], :as _metadata-spec}]
+ (let [active-only? (not (or id-set name-set))
+ where-clauses (cond-> [[:= :type [:inline "metric"]]]
+ id-set (conj [:in :id id-set])
+ name-set (conj [:in :name name-set])
+ table-id (conj [:= :table_id table-id])
+ table-id (conj [:= :source_card_id nil])
+ card-id (conj [:= :source_card_id card-id])
+ active-only? (conj [:= :archived false]))]
+ (reduce sql.helpers/where {} where-clauses)))
+
+(defn- fetch-metrics
+ "Fetch metrics matching spec, not scoped to any database.
+ Returns metrics as metadata objects with :lib/type :metadata/metric."
+ [metadata-spec]
+ (let [query (metric-spec->honey-sql metadata-spec)]
+ (try
+ (t2/select :metadata/metric query)
+ (catch Throwable e
+ (throw (ex-info "Error fetching metrics with spec"
+ {:metadata-spec metadata-spec, :query query}
+ e))))))
+
+;;; ------------------------------------------------- Dimension Fetching -------------------------------------------------
+
+(defn- extract-dimensions-from-entity
+ "Extract dimensions from a metric or measure, annotating with source info.
+ Each dimension is enriched with its corresponding dimension-mapping if available."
+ [entity source-type]
+ (let [dims (:dimensions entity)
+ mappings (:dimension-mappings entity)
+ mappings-by-dim-id (m/index-by :dimension-id mappings)]
+ (for [dim dims]
+ (-> dim
+ (assoc :lib/type :metadata/dimension
+ :source-type source-type
+ :source-id (:id entity))
+ (cond->
+ (get mappings-by-dim-id (:id dim))
+ (assoc :dimension-mapping (get mappings-by-dim-id (:id dim))))))))
+
+(defn- measure-spec->honey-sql
+ "Build HoneySQL WHERE clause for fetching measures."
+ [{id-set :id, name-set :name, :keys [table-id], :as _metadata-spec}]
+ (let [active-only? (not (or id-set name-set))
+ where-clauses (cond-> []
+ id-set (conj [:in :measure/id id-set])
+ name-set (conj [:in :measure/name name-set])
+ table-id (conj [:= :measure/table_id table-id])
+ active-only? (conj [:= :measure/archived false]))]
+ (reduce sql.helpers/where {} where-clauses)))
+
+(defn- fetch-measures-for-dimensions
+ "Fetch measures matching spec for dimension extraction."
+ [metadata-spec]
+ (let [query (measure-spec->honey-sql metadata-spec)]
+ (try
+ (t2/select :metadata/measure query)
+ (catch Throwable e
+ (throw (ex-info "Error fetching measures for dimensions"
+ {:metadata-spec metadata-spec, :query query}
+ e))))))
+
+(defn- fetch-dimensions
+ "Fetch dimensions by aggregating from metrics and measures.
+ Dimensions are extracted from their parent entities and annotated with source info."
+ [{id-set :id, :keys [metric-id measure-id table-id]}]
+ (let [;; Fetch from metrics if not a measure-specific query
+ metric-dims (when-not measure-id
+ (let [metric-spec (cond-> {:lib/type :metadata/metric}
+ metric-id (assoc :id #{metric-id})
+ table-id (assoc :table-id table-id))
+ metrics (fetch-metrics metric-spec)]
+ (mapcat #(extract-dimensions-from-entity % :metric) metrics)))
+ ;; Fetch from measures if not a metric-specific query
+ measure-dims (when-not metric-id
+ (let [measure-spec (cond-> {:lib/type :metadata/measure}
+ measure-id (assoc :id #{measure-id})
+ table-id (assoc :table-id table-id))
+ measures (fetch-measures-for-dimensions measure-spec)]
+ (mapcat #(extract-dimensions-from-entity % :measure) measures)))
+ all-dims (concat metric-dims measure-dims)]
+ (cond->> all-dims
+ id-set (filter #(contains? id-set (:id %)))
+ true vec)))
+
+(mu/defn metadata-provider :- ::lib.metadata.protocols/metadata-provider
+ "Create a MetricMetadataProvider for the JVM.
+
+ This provider:
+ - Has no single database context (database returns nil)
+ - Fetches metrics from the Card table across all databases
+ - Fetches measures from the Measure table across all databases
+ - Fetches dimensions extracted from metrics and measures
+ - Routes table/column metadata to database-specific providers
+ - Uses global Metabase settings
+
+ Example usage:
+ ```clojure
+ (def mp (metadata-provider))
+
+ ;; Returns nil - no single database
+ (lib.metadata.protocols/database mp)
+
+ ;; Fetches metrics across all databases
+ (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric})
+
+ ;; Fetches dimensions from metrics/measures
+ (lib.metadata.protocols/metadatas mp {:lib/type :metadata/dimension :metric-id 1})
+
+ ;; Routes to correct database provider for table 1
+ (lib.metadata.protocols/metadatas mp {:lib/type :metadata/column :table-id 1})
+ ```"
+ []
+ (let [table->db (table->database-id)
+ db-provider-fn (memoize/lru
+ lib-be/application-database-metadata-provider
+ :lru/threshold 50)]
+ (provider/metric-context-metadata-provider
+ fetch-metrics
+ fetch-measures-for-dimensions ; measure-fetcher-fn - direct fetching by ID
+ fetch-dimensions ; dimension-fetcher-fn
+ table->db
+ db-provider-fn
+ setting/get
+ lib-metric.dimension.jvm/enrich-columns-with-has-field-values)))
diff --git a/src/metabase/lib_metric/metadata/provider.cljc b/src/metabase/lib_metric/metadata/provider.cljc
new file mode 100644
index 00000000000..99b57b99a24
--- /dev/null
+++ b/src/metabase/lib_metric/metadata/provider.cljc
@@ -0,0 +1,183 @@
+(ns metabase.lib-metric.metadata.provider
+ "MetadataProvider for metric-based queries with no single database context.
+
+ This provider enables building metric queries that can span multiple databases.
+ It has no single database context - instead, it routes metadata requests to
+ database-specific providers based on `table-id`.
+
+ The provider delegates to underlying database-specific providers for table/column
+ metadata, while managing metric metadata centrally."
+ (:require
+ #?@(:clj [[potemkin :as p]])
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.util.malli :as mu]))
+
+(#?(:clj p/defprotocol+ :cljs defprotocol) MetricMetadataProvider
+ "Protocol extension for metric-specific operations on a MetadataProvider."
+ (database-provider-for-table [this table-id]
+ "Get the database-specific MetadataProvider for a given table-id.
+ Returns nil if the table cannot be found."))
+
+(defn- route-table-metadata
+ "Route table metadata request to the appropriate database provider."
+ [table->db-fn db-provider-fn {id-set :id, :as metadata-spec}]
+ (if-not id-set
+ ;; Without specific table IDs, we can't route - return empty
+ []
+ ;; Group table IDs by their database and fetch from each
+ (let [tables-by-db (group-by table->db-fn id-set)]
+ (into []
+ (mapcat (fn [[db-id table-ids]]
+ (when-let [provider (db-provider-fn db-id)]
+ (lib.metadata.protocols/metadatas
+ provider
+ (assoc metadata-spec :id (set table-ids))))))
+ tables-by-db))))
+
+(defn- route-metadata-by-table
+ "Route a metadata request to the appropriate database provider based on table-id."
+ [table->db-fn db-provider-fn {:keys [table-id], :as metadata-spec}]
+ (when table-id
+ (when-let [db-id (table->db-fn table-id)]
+ (when-let [provider (db-provider-fn db-id)]
+ (lib.metadata.protocols/metadatas provider metadata-spec)))))
+
+(defn- route-card-metadata
+ "Route card metadata request. Cards can span databases, so we need to handle this specially."
+ [_table->db-fn _db-provider-fn {_id-set :id, :as _metadata-spec}]
+ ;; Cards are trickier - they have database_id, not table_id
+ ;; For now, if we have specific card IDs, try to fetch from each known database
+ ;; This is a limitation - we'd need a card->database mapping to do this efficiently
+ ;; Return empty for now - callers should use a database-specific provider for cards
+ [])
+
+;; The main provider type that routes requests to database-specific providers
+(deftype MetricContextMetadataProvider
+ [metric-fetcher-fn ;; (fn [metadata-spec] ...) returns metrics
+ measure-fetcher-fn ;; (fn [metadata-spec] ...) returns measures (optional, can be nil)
+ dimension-fetcher-fn ;; (fn [metadata-spec] ...) returns dimensions (optional, can be nil)
+ table->db-fn ;; (fn [table-id] ...) returns database-id
+ db-provider-fn ;; (fn [db-id] ...) returns MetadataProvider for that database
+ setting-fn ;; (fn [setting-key] ...) returns setting value
+ cache ;; atom for caching metric, measure, and dimension metadata
+ column-post-process-fn ;; (fn [cols] ...) optional post-processing for columns (can be nil)
+ ]
+ lib.metadata.protocols/MetadataProvider
+ (database [_this]
+ ;; No single database context for metric provider
+ nil)
+
+ (metadatas [_this {metadata-type :lib/type, :as metadata-spec}]
+ (case metadata-type
+ :metadata/metric
+ (metric-fetcher-fn metadata-spec)
+
+ :metadata/table
+ (route-table-metadata table->db-fn db-provider-fn metadata-spec)
+
+ :metadata/column
+ (let [cols (or (route-metadata-by-table table->db-fn db-provider-fn metadata-spec) [])]
+ (if column-post-process-fn
+ (column-post-process-fn cols)
+ cols))
+
+ :metadata/measure
+ (if measure-fetcher-fn
+ (measure-fetcher-fn metadata-spec)
+ (or (route-metadata-by-table table->db-fn db-provider-fn metadata-spec) []))
+
+ :metadata/dimension
+ (if dimension-fetcher-fn
+ (dimension-fetcher-fn metadata-spec)
+ [])
+
+ :metadata/segment
+ (or (route-metadata-by-table table->db-fn db-provider-fn metadata-spec) [])
+
+ :metadata/card
+ (route-card-metadata table->db-fn db-provider-fn metadata-spec)
+
+ ;; For other types (native-query-snippet, transform), return empty
+ []))
+
+ (setting [_this setting-key]
+ (setting-fn setting-key))
+
+ lib.metadata.protocols/CachedMetadataProvider
+ (cached-metadatas [_this metadata-type metadata-ids]
+ (when (#{:metadata/metric :metadata/measure :metadata/dimension} metadata-type)
+ (let [c @cache]
+ (into []
+ (keep #(get c [metadata-type %]))
+ metadata-ids))))
+
+ (store-metadata! [_this object]
+ (when-let [obj-type (:lib/type object)]
+ (when (#{:metadata/metric :metadata/measure :metadata/dimension} obj-type)
+ (swap! cache assoc [obj-type (:id object)] object)))
+ true)
+
+ (cached-value [_this k not-found]
+ (get @cache [::cached-value k] not-found))
+
+ (cache-value! [_this k v]
+ (swap! cache assoc [::cached-value k] v)
+ nil)
+
+ (has-cache? [_this]
+ true)
+
+ (clear-cache! [_this]
+ (reset! cache {})
+ nil)
+
+ MetricMetadataProvider
+ (database-provider-for-table [_this table-id]
+ (when-let [db-id (table->db-fn table-id)]
+ (db-provider-fn db-id)))
+
+ #?(:clj Object :cljs IEquiv)
+ (#?(:clj equals :cljs -equiv) [_this another]
+ (and (instance? MetricContextMetadataProvider another)
+ (= metric-fetcher-fn (.-metric-fetcher-fn ^MetricContextMetadataProvider another))
+ (= measure-fetcher-fn (.-measure-fetcher-fn ^MetricContextMetadataProvider another))
+ (= dimension-fetcher-fn (.-dimension-fetcher-fn ^MetricContextMetadataProvider another))
+ (= table->db-fn (.-table->db-fn ^MetricContextMetadataProvider another))
+ (= db-provider-fn (.-db-provider-fn ^MetricContextMetadataProvider another))
+ (= setting-fn (.-setting-fn ^MetricContextMetadataProvider another))
+ (= column-post-process-fn (.-column-post-process-fn ^MetricContextMetadataProvider another)))))
+
+(mu/defn metric-context-metadata-provider
+ "Create a MetricMetadataProvider for queries that span multiple databases.
+
+ Arguments:
+ - `metric-fetcher-fn` - `(fn [metadata-spec] ...)` returns metrics matching the spec
+ - `measure-fetcher-fn` (optional) - `(fn [metadata-spec] ...)` returns measures matching the spec
+ - `dimension-fetcher-fn` (optional) - `(fn [metadata-spec] ...)` returns dimensions matching the spec
+ - `table->db-fn` - `(fn [table-id] ...)` returns database-id for a table
+ - `db-provider-fn` - `(fn [db-id] ...)` returns MetadataProvider for that database
+ - `setting-fn` - `(fn [setting-key] ...)` returns setting value
+
+ The returned provider:
+ - Returns nil for `(database provider)` since there's no single database context
+ - Routes metric requests to the metric-fetcher-fn
+ - Routes measure requests to measure-fetcher-fn if provided, otherwise to database provider
+ - Routes dimension requests to dimension-fetcher-fn if provided
+ - Routes table/column/segment requests to the appropriate database provider
+ - Caches metric, measure, and dimension metadata internally"
+ ([metric-fetcher-fn table->db-fn db-provider-fn setting-fn]
+ (metric-context-metadata-provider metric-fetcher-fn nil nil table->db-fn db-provider-fn setting-fn nil))
+ ([metric-fetcher-fn measure-fetcher-fn table->db-fn db-provider-fn setting-fn]
+ (metric-context-metadata-provider metric-fetcher-fn measure-fetcher-fn nil table->db-fn db-provider-fn setting-fn nil))
+ ([metric-fetcher-fn measure-fetcher-fn dimension-fetcher-fn table->db-fn db-provider-fn setting-fn]
+ (metric-context-metadata-provider metric-fetcher-fn measure-fetcher-fn dimension-fetcher-fn table->db-fn db-provider-fn setting-fn nil))
+ ([metric-fetcher-fn measure-fetcher-fn dimension-fetcher-fn table->db-fn db-provider-fn setting-fn column-post-process-fn]
+ (->MetricContextMetadataProvider
+ metric-fetcher-fn
+ measure-fetcher-fn
+ dimension-fetcher-fn
+ table->db-fn
+ db-provider-fn
+ setting-fn
+ (atom {})
+ column-post-process-fn)))
diff --git a/src/metabase/lib_metric/metrics.cljc b/src/metabase/lib_metric/metrics.cljc
new file mode 100644
index 00000000000..57cb434bc7c
--- /dev/null
+++ b/src/metabase/lib_metric/metrics.cljc
@@ -0,0 +1,10 @@
+(ns metabase.lib-metric.metrics
+ "Pure multimethod implementations for :metadata/metric entities (Cards with type=metric).
+ These are accessors that read dimension-related data from metric metadata objects."
+ (:require
+ [metabase.lib-metric.dimension :as lib-metric.dimension]))
+
+(defmethod lib-metric.dimension/dimensionable-query :metadata/metric
+ [{:keys [dataset-query]}]
+ (when (seq dataset-query)
+ dataset-query))
diff --git a/src/metabase/lib_metric/operators.cljc b/src/metabase/lib_metric/operators.cljc
new file mode 100644
index 00000000000..4e0ec1f4f25
--- /dev/null
+++ b/src/metabase/lib_metric/operators.cljc
@@ -0,0 +1,166 @@
+(ns metabase.lib-metric.operators
+ "Unified operator definitions for lib-metric filters.
+ Uses lib-metric.hierarchy for category dispatch.
+
+ Operator categories:
+ - ::nullary - no value argument (:is-null, :not-null, :is-empty, :not-empty)
+ - ::comparison - single or variadic values (:=, :!=, :<, :<=, :>, :>=)
+ - ::string-op - string-specific operators (:contains, :does-not-contain, :starts-with, :ends-with)
+ - ::range - two boundary values (:between, :inside)
+ - ::temporal - temporal interval operators (:time-interval, :relative-time-interval)
+ - ::compound - logical operators (:and, :or, :not)
+ - ::multi-value - multi-value operators (:in, :not-in)
+
+ All categories derive from ::filter-operator for display-info compatibility."
+ (:require
+ [metabase.lib-metric.hierarchy :as hierarchy]
+ [metabase.util.performance :as perf]))
+
+;;; -------------------------------------------------- Operator Categories --------------------------------------------------
+
+;; Nullary operators (no value argument)
+(doseq [op [:is-null :not-null :is-empty :not-empty]]
+ (hierarchy/derive op ::nullary))
+
+;; Comparison operators (single or variadic values)
+(doseq [op [:= :!= :< :<= :> :>=]]
+ (hierarchy/derive op ::comparison))
+
+;; String-specific operators
+(doseq [op [:contains :does-not-contain :starts-with :ends-with]]
+ (hierarchy/derive op ::string-op))
+
+;; Range operators (two boundary values)
+(doseq [op [:between :inside]]
+ (hierarchy/derive op ::range))
+
+;; Temporal interval operators
+(doseq [op [:time-interval :relative-time-interval]]
+ (hierarchy/derive op ::temporal))
+
+;; Compound logical operators
+(doseq [op [:and :or :not]]
+ (hierarchy/derive op ::compound))
+
+;; Multi-value operators
+(doseq [op [:in :not-in]]
+ (hierarchy/derive op ::multi-value))
+
+;; Temporal extraction operators (wrap dimension refs in filters like exclude-date)
+(doseq [op [:get-day-of-week :get-month :get-hour :get-quarter]]
+ (hierarchy/derive op ::temporal-extraction))
+
+;; All operator categories are filter operators (for display-info compatibility)
+(doseq [cat [::nullary ::comparison ::string-op ::range ::temporal ::compound ::multi-value]]
+ (hierarchy/derive cat ::filter-operator))
+
+;;; -------------------------------------------------- Operator Metadata --------------------------------------------------
+
+(def ^:private operator-metadata
+ "Metadata for each filter operator."
+ {:is-null {:display-name "is empty" :arity 0 :ast-node-type :filter/null}
+ :not-null {:display-name "is not empty" :arity 0 :ast-node-type :filter/null}
+ :is-empty {:display-name "is empty" :arity 0 :ast-node-type :filter/null}
+ :not-empty {:display-name "is not empty" :arity 0 :ast-node-type :filter/null}
+ := {:display-name "is" :arity :variadic :ast-node-type :filter/comparison}
+ :!= {:display-name "is not" :arity :variadic :ast-node-type :filter/comparison}
+ :< {:display-name "is less than" :arity 1 :ast-node-type :filter/comparison}
+ :<= {:display-name "is at most" :arity 1 :ast-node-type :filter/comparison}
+ :> {:display-name "is greater than" :arity 1 :ast-node-type :filter/comparison}
+ :>= {:display-name "is at least" :arity 1 :ast-node-type :filter/comparison}
+ :between {:display-name "is between" :arity 2 :ast-node-type :filter/between}
+ :inside {:display-name "is inside" :arity 4 :ast-node-type :filter/inside}
+ :contains {:display-name "contains" :arity 1 :ast-node-type :filter/string}
+ :does-not-contain {:display-name "does not contain" :arity 1 :ast-node-type :filter/string}
+ :starts-with {:display-name "starts with" :arity 1 :ast-node-type :filter/string}
+ :ends-with {:display-name "ends with" :arity 1 :ast-node-type :filter/string}
+ :time-interval {:display-name "is" :arity 2 :ast-node-type :filter/temporal}
+ :relative-time-interval {:display-name "is" :arity 2 :ast-node-type :filter/temporal}
+ :in {:display-name "is" :arity :variadic :ast-node-type :filter/in}
+ :not-in {:display-name "is not" :arity :variadic :ast-node-type :filter/in}
+ :and {:display-name "and" :arity :variadic :ast-node-type nil}
+ :or {:display-name "or" :arity :variadic :ast-node-type nil}
+ :not {:display-name "not" :arity 1 :ast-node-type nil}})
+
+;;; -------------------------------------------------- Category Predicates --------------------------------------------------
+
+(defn nullary?
+ "Returns true if `op` is a nullary operator (no value argument)."
+ [op]
+ (hierarchy/isa? op ::nullary))
+
+(defn comparison?
+ "Returns true if `op` is a comparison operator."
+ [op]
+ (hierarchy/isa? op ::comparison))
+
+(defn string-op?
+ "Returns true if `op` is a string-specific operator."
+ [op]
+ (hierarchy/isa? op ::string-op))
+
+(defn range?
+ "Returns true if `op` is a range operator (two boundary values)."
+ [op]
+ (hierarchy/isa? op ::range))
+
+(defn temporal?
+ "Returns true if `op` is a temporal interval operator."
+ [op]
+ (hierarchy/isa? op ::temporal))
+
+(defn compound?
+ "Returns true if `op` is a compound logical operator."
+ [op]
+ (hierarchy/isa? op ::compound))
+
+(defn multi-value?
+ "Returns true if `op` is a multi-value operator."
+ [op]
+ (hierarchy/isa? op ::multi-value))
+
+(defn temporal-extraction?
+ "Returns true if `op` is a temporal extraction operator (e.g. :get-day-of-week)."
+ [op]
+ (hierarchy/isa? op ::temporal-extraction))
+
+(defn filter-operator?
+ "Returns true if `op` is any kind of filter operator."
+ [op]
+ (hierarchy/isa? op ::filter-operator))
+
+;;; -------------------------------------------------- Query Functions --------------------------------------------------
+
+(defn display-name
+ "Get the display name for an operator. Falls back to the operator name if not found."
+ [op]
+ (perf/get-in operator-metadata [op :display-name] (name op)))
+
+(defn arity
+ "Get the arity for an operator. Returns 1 as default if not found."
+ [op]
+ (perf/get-in operator-metadata [op :arity] 1))
+
+(defn ast-node-type
+ "Get the AST node type for an operator."
+ [op]
+ (perf/get-in operator-metadata [op :ast-node-type]))
+
+;;; -------------------------------------------------- Operators by Dimension Type --------------------------------------------------
+
+(def ^:private operators-by-dimension-type
+ "Operators available for each dimension type category."
+ {:string [:is-empty :not-empty := :!= :contains :does-not-contain :starts-with :ends-with]
+ :numeric [:is-null :not-null := :!= :> :>= :< :<= :between]
+ :boolean [:is-null :not-null :=]
+ :temporal [:is-null :not-null := :!= :> :< :between]
+ :time [:is-null :not-null :> :< :between]
+ :coordinate [:= :!= :> :>= :< :<= :between :inside]
+ :default [:is-null :not-null]})
+
+(defn operators-for-dimension-type
+ "Get operators available for a dimension type category.
+ Valid categories: :string, :numeric, :boolean, :temporal, :time, :coordinate.
+ Returns :default operators if category not found."
+ [dimension-type]
+ (get operators-by-dimension-type dimension-type (:default operators-by-dimension-type)))
diff --git a/src/metabase/lib_metric/projection.cljc b/src/metabase/lib_metric/projection.cljc
new file mode 100644
index 00000000000..a4f4085a7bc
--- /dev/null
+++ b/src/metabase/lib_metric/projection.cljc
@@ -0,0 +1,342 @@
+(ns metabase.lib-metric.projection
+ "Core logic for computing projectable dimensions and their positions in a MetricDefinition.
+ Projectable dimensions are dimensions that can be used for projections (breakouts)."
+ (:require
+ [metabase.lib-metric.definition :as lib-metric.definition]
+ [metabase.lib-metric.dimension :as lib-metric.dimension]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.lib.schema.temporal-bucketing :as lib.schema.temporal-bucketing]
+ [metabase.util.i18n :as i18n]
+ [metabase.util.malli :as mu]
+ [metabase.util.performance :as perf]))
+
+(defn- projection-dimension-id
+ "Extract the dimension ID from a projection clause [:dimension opts uuid]."
+ [[_tag _opts dimension-id]]
+ dimension-id)
+
+(defn- calculate-projection-positions
+ "Calculate projection positions for dimensions.
+ Returns a map of {dimension-id -> [positions]}."
+ [projections]
+ (->> projections
+ (map-indexed (fn [idx projection]
+ [(projection-dimension-id projection) idx]))
+ (reduce (fn [acc [dim-id idx]]
+ (update acc dim-id (fnil conj []) idx))
+ {})))
+
+(mu/defn add-projection-positions :- [:sequential ::lib-metric.schema/metadata-dimension]
+ "Add :projection-positions to each dimension based on current projections."
+ [dimensions :- [:sequential ::lib-metric.schema/metadata-dimension]
+ projections :- [:sequential ::lib-metric.schema/dimension-reference]]
+ (let [dim-id->positions (calculate-projection-positions projections)]
+ (perf/mapv (fn [dim]
+ (let [positions (get dim-id->positions (:id dim))]
+ (cond-> dim
+ positions (assoc :projection-positions (vec positions)))))
+ dimensions)))
+
+(mu/defn projectable-dimensions :- [:sequential ::lib-metric.schema/metadata-dimension]
+ "Get dimensions that can be used for projections.
+ Returns dimensions with :projection-positions indicating which are already used."
+ [definition :- ::lib-metric.schema/metric-definition]
+ (let [{:keys [expression projections metadata-provider]} definition
+ leaf-type (lib-metric.definition/expression-leaf-type expression)
+ leaf-id (lib-metric.definition/expression-leaf-id expression)
+ dimensions (case leaf-type
+ :metric (lib-metric.dimension/dimensions-for-metric metadata-provider leaf-id)
+ :measure (lib-metric.dimension/dimensions-for-measure metadata-provider leaf-id))
+ flat-projs (lib-metric.definition/flat-projections (or projections []))]
+ (add-projection-positions dimensions flat-projs)))
+
+(defn projectable-dimensions-for-source
+ "Get projectable dimensions for a specific source (MetricMetadata or MeasureMetadata).
+ Returns dimensions with :projection-positions scoped to that source's typed-projection."
+ [definition source-metadata]
+ (let [{:keys [projections metadata-provider]} definition
+ leaf-type (case (:lib/type source-metadata)
+ :metadata/metric :metric
+ :metadata/measure :measure)
+ source-id (:id source-metadata)
+ dimensions (case leaf-type
+ :metric (lib-metric.dimension/dimensions-for-metric metadata-provider source-id)
+ :measure (lib-metric.dimension/dimensions-for-measure metadata-provider source-id))
+ typed-proj (perf/some #(when (and (= (:type %) leaf-type) (= (:id %) source-id)) %)
+ (or projections []))
+ flat-projs (if typed-proj (:projection typed-proj) [])]
+ (add-projection-positions dimensions flat-projs)))
+
+(defn project-for-source
+ "Add a projection for a dimension to a specific source.
+ source-metadata is MetricMetadata or MeasureMetadata."
+ [definition dimension source-metadata]
+ (let [leaf-type (case (:lib/type source-metadata)
+ :metadata/metric :metric
+ :metadata/measure :measure)
+ source-id (:id source-metadata)
+ dimension-ref (lib/ensure-uuid [:dimension {} (:id dimension)])
+ projections (or (:projections definition) [])
+ existing-idx (perf/some (fn [[idx tp]]
+ (when (and (= (:type tp) leaf-type) (= (:id tp) source-id))
+ idx))
+ (map-indexed vector projections))]
+ (if existing-idx
+ (update-in definition [:projections existing-idx :projection] conj dimension-ref)
+ (update definition :projections (fnil conj [])
+ {:type leaf-type :id source-id :projection [dimension-ref]}))))
+
+(mu/defn project :- ::lib-metric.schema/metric-definition
+ "Add a projection for a dimension reference to a metric definition.
+ The dimension-ref must be a dimension reference vector [:dimension opts uuid],
+ e.g. from `dimensionReference`, `withTemporalBucket`, or `withBinning`.
+ Creates/reuses the typed-projection entry for the current source."
+ [definition :- ::lib-metric.schema/metric-definition
+ dimension-ref :- ::lib-metric.schema/dimension-reference]
+ (let [expression (:expression definition)
+ leaf-type (lib-metric.definition/expression-leaf-type expression)
+ leaf-id (lib-metric.definition/expression-leaf-id expression)
+ dimension-ref (lib/ensure-uuid dimension-ref)
+ projections (or (:projections definition) [])
+ ;; Find existing typed-projection entry for this source
+ existing-idx (perf/some (fn [[idx tp]]
+ (when (and (= leaf-type (:type tp)) (= leaf-id (:id tp)))
+ idx))
+ (map-indexed vector projections))]
+ (if existing-idx
+ ;; Append dim-ref to existing typed-projection's :projection vector
+ (update-in definition [:projections existing-idx :projection] conj dimension-ref)
+ ;; Create new typed-projection entry
+ (update definition :projections (fnil conj [])
+ {:type leaf-type :id leaf-id :projection [dimension-ref]}))))
+
+(mu/defn projection-dimension :- [:maybe ::lib-metric.schema/metadata-dimension]
+ "Get the dimension metadata for a projection clause.
+ The projection is a dimension-reference [:dimension opts uuid].
+ Returns the dimension metadata or nil if not found."
+ [definition :- ::lib-metric.schema/metric-definition
+ projection-or-reference :- ::lib-metric.schema/dimension-or-reference]
+ (let [dimensions (projectable-dimensions definition)
+ dimension-id (if (map? projection-or-reference)
+ (:id projection-or-reference)
+ (projection-dimension-id projection-or-reference))]
+ (perf/some #(when (= (:id %) dimension-id) %) dimensions)))
+
+;;; -------------------------------------------------- Temporal Bucket Functions --------------------------------------------------
+
+(def ^:private hidden-bucketing-options
+ #{:millisecond :second :second-of-minute :year-of-era})
+
+(def ^:private time-bucket-options
+ (into []
+ (comp (remove hidden-bucketing-options)
+ (map (fn [unit]
+ (cond-> {:lib/type :option/temporal-bucketing
+ :unit unit}
+ (= unit :hour) (assoc :default true)))))
+ lib.schema.temporal-bucketing/ordered-time-bucketing-units))
+
+(def ^:private date-bucket-options
+ (perf/mapv (fn [unit]
+ (cond-> {:lib/type :option/temporal-bucketing
+ :unit unit}
+ (= unit :day) (assoc :default true)))
+ lib.schema.temporal-bucketing/ordered-date-bucketing-units))
+
+(def ^:private datetime-bucket-options
+ (let [units (into [] (remove hidden-bucketing-options)
+ lib.schema.temporal-bucketing/ordered-datetime-bucketing-units)]
+ (perf/mapv (fn [unit]
+ (cond-> {:lib/type :option/temporal-bucketing
+ :unit unit}
+ (= unit :day) (assoc :default true)))
+ units)))
+
+(defn- mark-unit [options option-key unit]
+ (perf/mapv (fn [option]
+ (cond-> option
+ (:default option) (dissoc :default)
+ (= (:unit option) unit) (assoc option-key true)))
+ options))
+
+(defn- available-temporal-buckets-for-type
+ "Given a column type and nillable default-unit and selected-unit, return the appropriate bucket options."
+ [column-type default-unit selected-unit]
+ (let [options (cond
+ (isa? column-type :type/DateTime) datetime-bucket-options
+ (isa? column-type :type/Date) date-bucket-options
+ (isa? column-type :type/Time) time-bucket-options
+ :else [])
+ fallback-unit (if (isa? column-type :type/Time) :hour :month)
+ default-unit (or default-unit fallback-unit)]
+ (cond-> options
+ (= :inherited default-unit) (->> (perf/mapv #(dissoc % :default)))
+ default-unit (mark-unit :default default-unit)
+ selected-unit (mark-unit :selected selected-unit))))
+
+(mu/defn available-temporal-buckets :- [:sequential [:ref ::lib.schema.temporal-bucketing/option]]
+ "Get available temporal buckets for a dimension based on its effective-type."
+ [definition :- ::lib-metric.schema/metric-definition
+ dimension :- ::lib-metric.schema/metadata-dimension]
+ (let [effective-type (or (:effective-type dimension) (:base-type dimension))
+ flat-projs (lib-metric.definition/flat-projections (or (:projections definition) []))
+ selected-unit (perf/some (fn [proj]
+ (when (= (:id dimension) (projection-dimension-id proj))
+ (:temporal-unit (second proj))))
+ flat-projs)]
+ (if (isa? effective-type :type/Temporal)
+ (available-temporal-buckets-for-type effective-type :month selected-unit)
+ [])))
+
+(mu/defn temporal-bucket :- [:maybe ::lib.schema.temporal-bucketing/option]
+ "Get the current temporal bucket from a projection clause."
+ [projection :- ::lib-metric.schema/dimension-or-reference]
+ (when-let [unit (:temporal-unit (second (lib-metric.dimension/reference projection)))]
+ {:lib/type :option/temporal-bucketing
+ :unit unit}))
+
+(mu/defn with-temporal-bucket :- ::lib-metric.schema/dimension-reference
+ "Apply a temporal bucket to a projection. Pass nil to remove the bucket."
+ [projection :- ::lib-metric.schema/dimension-or-reference
+ bucket :- [:maybe [:or
+ ::lib.schema.temporal-bucketing/option
+ ::lib.schema.temporal-bucketing/unit]]]
+ (let [unit (cond
+ (nil? bucket) nil
+ (keyword? bucket) bucket
+ (map? bucket) (:unit bucket))]
+ (lib/update-options (lib-metric.dimension/reference projection)
+ (fn [opts]
+ (if unit
+ (assoc opts :temporal-unit unit)
+ (dissoc opts :temporal-unit))))))
+
+;;; -------------------------------------------------- Binning Functions --------------------------------------------------
+
+(defn- default-auto-bin []
+ {:lib/type :option/binning
+ :display-name (i18n/tru "Auto bin")
+ :default true
+ :mbql {:strategy :default}})
+
+(defn- numeric-binning-strategies []
+ (perf/mapv #(assoc % :lib/type :option/binning)
+ [(default-auto-bin)
+ {:display-name (i18n/tru "10 bins") :mbql {:strategy :num-bins :num-bins 10}}
+ {:display-name (i18n/tru "50 bins") :mbql {:strategy :num-bins :num-bins 50}}
+ {:display-name (i18n/tru "100 bins") :mbql {:strategy :num-bins :num-bins 100}}]))
+
+(defn- coordinate-binning-strategies []
+ (perf/mapv #(assoc % :lib/type :option/binning)
+ [(default-auto-bin)
+ {:display-name (i18n/tru "Bin every 0.1 degrees") :mbql {:strategy :bin-width :bin-width 0.1}}
+ {:display-name (i18n/tru "Bin every 1 degree") :mbql {:strategy :bin-width :bin-width 1.0}}
+ {:display-name (i18n/tru "Bin every 10 degrees") :mbql {:strategy :bin-width :bin-width 10.0}}
+ {:display-name (i18n/tru "Bin every 20 degrees") :mbql {:strategy :bin-width :bin-width 20.0}}
+ {:display-name (i18n/tru "Bin every 0.05 degrees") :mbql {:strategy :bin-width :bin-width 0.05}}
+ {:display-name (i18n/tru "Bin every 0.01 degrees") :mbql {:strategy :bin-width :bin-width 0.01}}
+ {:display-name (i18n/tru "Bin every 0.005 degrees") :mbql {:strategy :bin-width :bin-width 0.005}}]))
+
+(defn- binning=
+ "Given two binning values, check if they match."
+ [x y]
+ (let [binning-keys (case (:strategy x)
+ :num-bins [:strategy :num-bins]
+ :bin-width [:strategy :bin-width]
+ [:strategy])]
+ (= (perf/select-keys x binning-keys) (perf/select-keys y binning-keys))))
+
+(defn- strategy=
+ "Given a binning option and a column's current binning value, check if they match."
+ [binning-option column-binning]
+ (binning= (:mbql binning-option) column-binning))
+
+(mu/defn available-binning-strategies :- [:maybe [:sequential [:ref ::lib-metric.schema/binning-option]]]
+ "Get available binning strategies for a dimension based on its type and sources."
+ [definition :- ::lib-metric.schema/metric-definition
+ dimension :- ::lib-metric.schema/metadata-dimension]
+ (let [effective-type (:effective-type dimension)
+ semantic-type (:semantic-type dimension)
+ sources (:sources dimension)
+ has-binning? (and (seq sources) (perf/some :field-id sources))
+ flat-projs (lib-metric.definition/flat-projections (or (:projections definition) []))
+ existing (perf/some (fn [proj]
+ (when (= (:id dimension) (projection-dimension-id proj))
+ (:binning (second proj))))
+ flat-projs)
+ strategies (cond
+ (not has-binning?)
+ nil
+
+ (isa? semantic-type :type/Coordinate)
+ (coordinate-binning-strategies)
+
+ (and (isa? effective-type :type/Number)
+ (not (isa? semantic-type :Relation/*)))
+ (numeric-binning-strategies)
+
+ :else nil)]
+ (when strategies
+ (perf/mapv (fn [strategy]
+ (cond-> strategy
+ existing (dissoc :default)
+ (strategy= strategy existing) (assoc :selected true)))
+ strategies))))
+
+(mu/defn binning :- [:maybe ::lib-metric.schema/binning]
+ "Get the current binning from a projection clause."
+ [projection :- ::lib-metric.schema/dimension-or-reference]
+ (:binning (second (lib-metric.dimension/reference projection))))
+
+(mu/defn with-binning :- ::lib-metric.schema/dimension-reference
+ "Apply a binning strategy to a projection. Pass nil to remove binning."
+ [projection :- ::lib-metric.schema/dimension-or-reference
+ binning-option :- [:maybe [:or ::lib-metric.schema/binning
+ ::lib-metric.schema/binning-option]]]
+ (let [binning-val (cond
+ (nil? binning-option) nil
+ (contains? binning-option :mbql) (:mbql binning-option)
+ :else binning-option)]
+ (lib/update-options (lib-metric.dimension/reference projection)
+ (fn [opts]
+ (if binning-val
+ (assoc opts :binning binning-val)
+ (dissoc opts :binning))))))
+
+;;; -------------------------------------------------- Default Breakout Dimensions --------------------------------------------------
+
+(defn- dimension-has-field-id?
+ "Check if a dimension has a source matching any of the given field IDs."
+ [field-ids dimension]
+ (perf/some (fn [source]
+ (when-let [fid (:field-id source)]
+ (field-ids fid)))
+ (:sources dimension)))
+
+(mu/defn default-breakout-dimensions :- [:sequential ::lib-metric.schema/metadata-dimension]
+ "Get dimensions corresponding to the source metric's default breakout columns.
+ Returns DimensionMetadata objects matching the breakout field-ids in the dataset_query."
+ [definition :- ::lib-metric.schema/metric-definition]
+ (let [{:keys [expression metadata-provider]} definition
+ leaf-type (lib-metric.definition/expression-leaf-type expression)
+ leaf-id (lib-metric.definition/expression-leaf-id expression)]
+ (if-not leaf-type
+ []
+ (let [metadata-type (case leaf-type :metric :metadata/metric :measure :metadata/measure)
+ metadata (first (lib.metadata.protocols/metadatas
+ metadata-provider
+ {:lib/type metadata-type :id #{leaf-id}}))
+ raw-query (lib-metric.dimension/dimensionable-query metadata)]
+ (if-not raw-query
+ []
+ (let [pmbql-query (lib/query metadata-provider raw-query)
+ breakout-clauses (lib/breakouts pmbql-query)
+ breakout-field-ids (into #{}
+ (keep lib-metric.dimension/dimension-target->field-id)
+ breakout-clauses)]
+ (if (perf/empty? breakout-field-ids)
+ []
+ (filterv #(dimension-has-field-id? breakout-field-ids %)
+ (projectable-dimensions definition)))))))))
diff --git a/src/metabase/lib_metric/schema.cljc b/src/metabase/lib_metric/schema.cljc
new file mode 100644
index 00000000000..c1b911e8e31
--- /dev/null
+++ b/src/metabase/lib_metric/schema.cljc
@@ -0,0 +1,433 @@
+(ns metabase.lib-metric.schema
+ "Malli schemas for metric dimensions, dimension-mappings, and dimension-references."
+ (:refer-clojure :exclude [some])
+ (:require
+ [metabase.lib.schema.common :as lib.schema.common]
+ [metabase.lib.schema.id :as lib.schema.id]
+ [metabase.lib.schema.ref :as lib.schema.ref]
+ [metabase.lib.schema.temporal-bucketing :as lib.schema.temporal-bucketing]
+ [metabase.util.malli.registry :as mr]
+ [metabase.util.performance :refer [some]]))
+
+(comment lib.schema.ref/keep-me)
+
+;;; ------------------------------------------------- Binning -------------------------------------------------
+;;; Duplicated from metabase.lib.schema.binning because lib-metric is an independent implementation.
+
+(mr/def ::binning-strategy
+ [:enum
+ {:decode/normalize lib.schema.common/normalize-keyword}
+ :bin-width :default :num-bins])
+
+(mr/def ::binning
+ "Schema for `:binning` options passed to a `:dimension` clause."
+ [:and
+ [:map
+ {:decode/normalize lib.schema.common/normalize-map}
+ [:strategy [:ref ::binning-strategy]]]
+ [:multi {:dispatch (fn [x]
+ (keyword (some #(get x %) [:strategy "strategy"])))
+ :error/fn (fn [{:keys [value]} _]
+ (str "Invalid binning strategy" (pr-str value)))}
+ [:default [:map
+ [:strategy [:= :default]]]]
+ [:bin-width [:map
+ [:strategy [:= :bin-width]]
+ [:bin-width [:ref ::lib.schema.common/positive-number]]]]
+ [:num-bins [:map
+ [:strategy [:= :num-bins]]
+ [:num-bins pos-int?]]]]])
+
+(mr/def ::binning-option
+ "Schema for a binning option as presented to the UI."
+ [:map
+ [:lib/type [:= :option/binning]]
+ [:display-name :string]
+ [:mbql [:maybe ::binning]]
+ [:default {:optional true} :boolean]
+ [:selected {:optional true} :boolean]])
+
+;;; -----------------------------------------------------------------------------------------------------------------
+
+(mr/def ::dimension-id
+ "UUID string identifying a dimension."
+ ::lib.schema.common/uuid)
+
+(mr/def ::dimension-group
+ "Group descriptor for a dimension, indicating which table it belongs to."
+ [:map
+ [:id :string]
+ [:type [:enum "main" "connection"]]
+ [:display-name :string]])
+
+(mr/def ::dimension-source.type
+ [:enum :field])
+
+(mr/def ::dimension-source
+ [:map
+ [:type ::dimension-source.type]
+ [:field-id {:optional true} [:maybe ::lib.schema.id/field]]
+ [:binning {:optional true} [:maybe :boolean]]])
+
+(mr/def ::dimension
+ "Schema for a dimension definition."
+ [:map
+ [:id ::dimension-id]
+ [:display-name {:optional true} [:maybe ::lib.schema.common/non-blank-string]]
+ [:effective-type {:optional true} [:maybe ::lib.schema.common/base-type]]
+ [:semantic-type {:optional true} [:maybe ::lib.schema.common/semantic-or-relation-type]]
+ [:sources {:optional true} [:maybe [:sequential ::dimension-source]]]])
+
+(mr/def ::dimension-mapping.type
+ "Type of dimension mapping."
+ [:enum :table])
+
+(mr/def ::dimension-mapping.target
+ "Target field reference for a dimension mapping, e.g. [:field {:source-field 1} 2]."
+ [:ref :mbql.clause/field])
+
+(mr/def ::dimension-mapping
+ "Schema for a dimension mapping."
+ [:map
+ [:type ::dimension-mapping.type]
+ [:table-id {:optional true} [:maybe ::lib.schema.id/table]]
+ [:dimension-id ::dimension-id]
+ [:target ::dimension-mapping.target]])
+
+(mr/def ::dimension-reference.options
+ "Options map for dimension references."
+ [:map
+ {:decode/normalize lib.schema.common/normalize-options-map}
+ [:display-name {:optional true} [:maybe ::lib.schema.common/non-blank-string]]
+ [:effective-type {:optional true} [:maybe ::lib.schema.common/base-type]]
+ [:semantic-type {:optional true} [:maybe ::lib.schema.common/semantic-or-relation-type]]
+ [:temporal-unit {:optional true} [:maybe ::lib.schema.temporal-bucketing/unit]]
+ [:binning {:optional true} [:maybe ::binning]]])
+
+(mr/def ::dimension-reference
+ "Dimension reference clause [:dimension opts uuid].
+ Handles normalization from JSON where the tag arrives as a string."
+ [:tuple
+ {:decode/normalize (fn [x]
+ (when (and (sequential? x)
+ (= 3 (count x)))
+ (let [[_tag opts dimension-id] x]
+ [:dimension
+ (or opts {})
+ dimension-id])))}
+ [:= {:decode/normalize lib.schema.common/normalize-keyword} :dimension]
+ ::dimension-reference.options
+ ::dimension-id])
+
+(mr/def ::dimension-or-reference
+ "Dimension or a reference to a dimension."
+ [:or
+ ::dimension-reference
+ ::metadata-dimension])
+
+;;; ------------------------------------------------- Filter Clause Normalization -------------------------------------------------
+;;; Filter clauses from the API arrive with string operators and dimension refs that need normalization.
+
+(defn normalize-dimension-ref
+ "Normalize a dimension reference from API format to internal format."
+ [x]
+ (when (and (sequential? x)
+ (= 3 (count x))
+ (let [tag (first x)]
+ (or (= tag "dimension") (= tag :dimension))))
+ (let [[_tag opts dimension-id] x]
+ [:dimension
+ (lib.schema.common/normalize-options-map (or opts {}))
+ dimension-id])))
+
+(defn- normalize-value-clause
+ "Normalize a [:value opts literal] clause from API format."
+ [x]
+ (when (and (sequential? x)
+ (= 3 (count x))
+ (let [tag (first x)]
+ (or (= tag "value") (= tag :value))))
+ (let [[_tag opts literal] x
+ norm-opts (lib.schema.common/normalize-options-map (or opts {}))]
+ [:value
+ (cond-> norm-opts
+ (:base-type norm-opts) (update :base-type lib.schema.common/normalize-keyword)
+ (:effective-type norm-opts) (update :effective-type lib.schema.common/normalize-keyword))
+ literal])))
+
+(defn normalize-filter-clause
+ "Recursively normalize a filter clause from API format.
+ Converts string operators to keywords and normalizes dimension references
+ and value clauses."
+ [clause]
+ (when (sequential? clause)
+ (let [[op opts & args] clause
+ operator (lib.schema.common/normalize-keyword op)
+ norm-opts (lib.schema.common/normalize-options-map (or opts {}))]
+ (case operator
+ ;; Compound filters - recursively normalize children
+ (:and :or)
+ (into [operator norm-opts] (map normalize-filter-clause args))
+
+ :not
+ [operator norm-opts (normalize-filter-clause (first args))]
+
+ ;; All other filters - normalize dimension refs and value clauses in args
+ (into [operator norm-opts]
+ (map (fn [arg]
+ (or (normalize-dimension-ref arg)
+ (normalize-value-clause arg)
+ arg))
+ args))))))
+
+(mr/def ::filter-clause
+ "MBQL filter clause with normalization for API input.
+ Handles string operators and dimension references."
+ [:any {:decode/normalize normalize-filter-clause}])
+
+;;; ------------------------------------------------- Metric Math Expressions -------------------------------------------------
+;;; Expression schemas for metric math: combining multiple metrics/measures with arithmetic.
+
+(defn- normalize-expression-ref
+ "Normalize an expression ref from API format: [\"metric\" {\"lib/uuid\" \"...\"} id] -> [:metric {:lib/uuid \"...\"} id]."
+ [tag]
+ (fn [x]
+ (when (and (sequential? x)
+ (= 3 (count x)))
+ (let [[t opts id] x]
+ (when (or (= t tag) (= t (name tag)))
+ [tag
+ (lib.schema.common/normalize-options-map (or opts {}))
+ id])))))
+
+(def ^:private normalize-metric-ref (normalize-expression-ref :metric))
+(def ^:private normalize-measure-ref (normalize-expression-ref :measure))
+
+(mr/def ::metric-expression-ref
+ "A metric reference in an expression: [:metric {:lib/uuid uuid} card-id]."
+ [:tuple
+ {:decode/normalize normalize-metric-ref}
+ [:= {:decode/normalize lib.schema.common/normalize-keyword} :metric]
+ [:map {:decode/normalize lib.schema.common/normalize-options-map}
+ [:lib/uuid ::lib.schema.common/non-blank-string]]
+ pos-int?])
+
+(mr/def ::measure-expression-ref
+ "A measure reference in an expression: [:measure {:lib/uuid uuid} measure-id]."
+ [:tuple
+ {:decode/normalize normalize-measure-ref}
+ [:= {:decode/normalize lib.schema.common/normalize-keyword} :measure]
+ [:map {:decode/normalize lib.schema.common/normalize-options-map}
+ [:lib/uuid ::lib.schema.common/non-blank-string]]
+ pos-int?])
+
+(mr/def ::expression-leaf
+ "A leaf node in a metric math expression: either a metric or measure reference."
+ [:or ::metric-expression-ref ::measure-expression-ref])
+
+(mr/def ::arithmetic-operator
+ "Arithmetic operators for metric math."
+ [:enum {:decode/normalize lib.schema.common/normalize-keyword} :+ :- :* :/])
+
+(defn normalize-math-expression
+ "Recursively normalize a metric math expression from API format.
+ Handles string keys, string operators, and nested expressions."
+ [x]
+ (when (sequential? x)
+ (let [[first-el] x]
+ (if (and (>= (count x) 3)
+ (let [tag (lib.schema.common/normalize-keyword first-el)]
+ (or (= tag :metric) (= tag :measure))))
+ ;; It's a leaf ref - normalize it
+ ((normalize-expression-ref (lib.schema.common/normalize-keyword first-el)) x)
+ ;; It's an arithmetic expression: [op opts & exprs]
+ (when (>= (count x) 4)
+ (let [[op opts & exprs] x]
+ (into [(lib.schema.common/normalize-keyword op)
+ (lib.schema.common/normalize-options-map (or opts {}))]
+ (map normalize-math-expression exprs))))))))
+
+(mr/def ::metric-math-expression
+ "A recursive metric math expression tree.
+ Can be a leaf (metric/measure ref) or an arithmetic expression [op opts expr expr ...]
+ with at least 2 operands.
+ Note: uses :fn validator for arithmetic to avoid Malli's recursive seqex limitation."
+ [:schema
+ {:decode/normalize normalize-math-expression}
+ [:or
+ ::expression-leaf
+ [:and
+ vector?
+ [:fn {:error/message "must be arithmetic expression [op opts expr expr ...] with at least 2 operands"}
+ (fn [x]
+ (and (>= (count x) 4)
+ (#{:+ :- :* :/} (first x))
+ (map? (second x))))]]]])
+
+;;; ------------------------------------------------- Per-Instance Filters -------------------------------------------------
+;;; Filters keyed by lib/uuid from the expression, for independent filtering per instance.
+
+(mr/def ::instance-filter
+ "A filter associated with a specific expression instance via lib/uuid."
+ [:map
+ {:decode/normalize lib.schema.common/normalize-map}
+ [:lib/uuid ::lib.schema.common/non-blank-string]
+ [:filter ::filter-clause]])
+
+(mr/def ::instance-filters
+ "A sequence of per-instance filters."
+ [:sequential ::instance-filter])
+
+;;; ------------------------------------------------- Typed Projections -------------------------------------------------
+;;; Projections keyed by source type and ID.
+
+(mr/def ::typed-projection
+ "A projection associated with a specific source type and ID."
+ [:map
+ {:decode/normalize lib.schema.common/normalize-map}
+ [:type [:enum {:decode/normalize lib.schema.common/normalize-keyword} :metric :measure]]
+ [:id pos-int?]
+ [:projection [:sequential ::dimension-reference]]])
+
+(mr/def ::typed-projections
+ "A sequence of typed projections."
+ [:sequential ::typed-projection])
+
+;;; ------------------------------------------------- Persisted Dimensions -------------------------------------------------
+;;; These schemas are used for storage format in the database.
+
+(mr/def ::dimension-status
+ "Status of a dimension indicating whether it's active or has issues.
+ - :status/active - Column exists, dimension is usable
+ - :status/orphaned - Column was removed from schema, dimension preserved for reference"
+ [:enum :status/active :status/orphaned])
+
+(mr/def ::persisted-dimension
+ "Schema for a persisted dimension definition with status tracking.
+ Persisted dimensions include additional metadata about their status
+ and any issues that prevent them from being used.
+ Note: target field references are stored in dimension-mappings, not here."
+ [:map
+ [:id ::dimension-id]
+ [:name {:optional true} [:maybe :string]]
+ [:display-name {:optional true} [:maybe ::lib.schema.common/non-blank-string]]
+ [:effective-type {:optional true} [:maybe ::lib.schema.common/base-type]]
+ [:semantic-type {:optional true} [:maybe ::lib.schema.common/semantic-or-relation-type]]
+ [:has-field-values {:optional true} [:maybe [:enum :list :search :none]]]
+ [:status {:optional true} [:maybe ::dimension-status]]
+ [:status-message {:optional true} [:maybe :string]]
+ [:sources {:optional true} [:maybe [:sequential ::dimension-source]]]
+ [:group {:optional true} [:maybe ::dimension-group]]])
+
+(mr/def ::persisted-dimensions
+ "Schema for a sequence of persisted dimensions."
+ [:sequential ::persisted-dimension])
+
+;;; ------------------------------------------------- MetricDefinition -------------------------------------------------
+
+(mr/def ::metric-definition
+ "A MetricDefinition represents an exploration of a metric or measure.
+ - expression: a metric math expression tree (leaf ref or arithmetic)
+ - filters: per-instance filters keyed by :lib/uuid from the expression
+ - projections: typed projections keyed by source type and ID
+ - metadata-provider: for resolving additional metadata
+
+ Metadata is loaded lazily from the provider in the AST builder,
+ not stored in the definition."
+ [:map
+ [:lib/type [:= :metric/definition]]
+ [:expression ::metric-math-expression]
+ [:filters ::instance-filters]
+ [:projections ::typed-projections]
+ [:metadata-provider [:maybe :some]]])
+
+;;; ------------------------------------------------- Fetchable Dimension Metadata -------------------------------------------------
+;;; These schemas support dimensions as first-class metadata entities
+;;; fetchable through the MetricContextMetadataProvider.
+
+(mr/def ::dimension-source-type
+ "Source type indicating whether a dimension comes from a metric or measure."
+ [:enum :metric :measure])
+
+(mr/def ::metadata-dimension
+ "Schema for dimension metadata fetchable via metadata provider.
+ Dimensions are extracted from metrics/measures at fetch time, with source
+ tracking to identify their parent entity."
+ [:map
+ [:lib/type [:= :metadata/dimension]]
+ [:id ::dimension-id] ; UUID string
+ [:name {:optional true} [:maybe :string]]
+ [:display-name {:optional true} [:maybe ::lib.schema.common/non-blank-string]]
+ [:effective-type {:optional true} [:maybe ::lib.schema.common/base-type]]
+ [:semantic-type {:optional true} [:maybe ::lib.schema.common/semantic-or-relation-type]]
+ [:has-field-values {:optional true} [:maybe [:enum :list :search :none]]]
+ [:status {:optional true} [:maybe ::dimension-status]]
+ [:status-message {:optional true} [:maybe :string]]
+ [:sources {:optional true} [:maybe [:sequential ::dimension-source]]]
+ [:group {:optional true} [:maybe ::dimension-group]]
+ ;; Source tracking
+ [:source-type ::dimension-source-type]
+ [:source-id pos-int?]
+ ;; Optional mapping for field resolution
+ [:dimension-mapping {:optional true} [:maybe ::dimension-mapping]]])
+
+(mr/def ::dimension-spec
+ "Spec for fetching dimensions from metadata provider.
+ At least one filter should be provided for efficient querying."
+ [:map
+ [:lib/type [:= :metadata/dimension]]
+ [:id {:optional true} [:set {:min 1} ::lib.schema.common/uuid]]
+ [:metric-id {:optional true} pos-int?]
+ [:measure-id {:optional true} pos-int?]
+ [:table-id {:optional true} pos-int?]])
+
+;;; ------------------------------------------------- Computed Dimensions -------------------------------------------------
+;;; Schemas for computed dimensions during reconciliation.
+
+(mr/def ::computed-dimension
+ "A dimension computed from a visible column, before reconciliation.
+ The :id is nil until assigned during reconciliation."
+ [:map
+ [:id [:maybe ::dimension-id]]
+ [:name :string]
+ [:display-name {:optional true} [:maybe :string]]
+ [:effective-type {:optional true} [:maybe :keyword]]
+ [:semantic-type {:optional true} [:maybe :keyword]]
+ [:has-field-values {:optional true} [:maybe [:enum :list :search :none]]]
+ [:lib/source {:optional true} [:maybe :keyword]]
+ [:group {:optional true} [:maybe ::dimension-group]]])
+
+(mr/def ::computed-pair
+ "A computed dimension paired with its mapping (before ID assignment)."
+ [:map
+ [:dimension ::computed-dimension]
+ [:mapping [:map
+ [:type ::dimension-mapping.type]
+ [:table-id {:optional true} [:maybe ::lib.schema.id/table]]
+ [:target ::dimension-mapping.target]]]])
+
+;;; ------------------------------------------------- Display Info -------------------------------------------------
+
+(mr/def ::display-info
+ "Schema for display info returned by display-info function."
+ [:map
+ [:display-name {:optional true} :string]
+ [:name {:optional true} :string]
+ [:long-display-name {:optional true} :string]
+ [:effective-type {:optional true} :keyword]
+ [:semantic-type {:optional true} :keyword]
+ [:description {:optional true} [:maybe :string]]
+ [:selected {:optional true} :boolean]
+ [:default {:optional true} :boolean]
+ [:short-name {:optional true} :string]
+ ;; Position tracking for dimensions
+ [:filter-positions {:optional true} [:sequential :int]]
+ [:projection-positions {:optional true} [:sequential :int]]
+ ;; Dimension group
+ [:group {:optional true} [:maybe ::dimension-group]]
+ ;; Source indicators
+ [:is-from-join {:optional true} :boolean]
+ [:is-calculated {:optional true} :boolean]
+ [:is-implicitly-joinable {:optional true} :boolean]
+ ;; Temporal bucket specific
+ [:is-temporal-extraction {:optional true} :boolean]])
diff --git a/src/metabase/lib_metric/types/constants.cljc b/src/metabase/lib_metric/types/constants.cljc
new file mode 100644
index 00000000000..accccf49da0
--- /dev/null
+++ b/src/metabase/lib_metric/types/constants.cljc
@@ -0,0 +1,19 @@
+(ns metabase.lib-metric.types.constants
+ "Type hierarchy constants for lib-metric type predicates.
+ Simpler than metabase.lib.types.constants - no include/exclude complexity.")
+
+(def type-hierarchies
+ "Type hierarchy definitions for [[metabase.lib-metric.types.isa/field-type?]].
+ Each key maps to either :effective-type or :semantic-type with a vector of types."
+ {::temporal {:effective-type [:type/Temporal]}
+ ::number {:effective-type [:type/Number]}
+ ::boolean {:effective-type [:type/Boolean]}
+ ::string {:effective-type [:type/Text]}
+ ::string-like {:effective-type [:type/TextLike]}
+ ::coordinate {:semantic-type [:type/Coordinate]}
+ ::location {:semantic-type [:type/Address]}
+ ::foreign-key {:semantic-type [:type/FK]}
+ ::primary-key {:semantic-type [:type/PK]}
+ ::time {:effective-type [:type/Time]}
+ ::date {:effective-type [:type/HasDate]}
+ ::category {:semantic-type [:type/Category]}})
diff --git a/src/metabase/lib_metric/types/isa.cljc b/src/metabase/lib_metric/types/isa.cljc
new file mode 100644
index 00000000000..f8e734818af
--- /dev/null
+++ b/src/metabase/lib_metric/types/isa.cljc
@@ -0,0 +1,169 @@
+(ns metabase.lib-metric.types.isa
+ "Type predicate functions for lib-metric dimensions.
+ Simpler implementation than metabase.lib.types.isa.
+
+ Predicates fall into two categories:
+
+ 1. **Effective-type predicates** (`temporal?`, `numeric?`, `boolean?`, `string?`,
+ `string-like?`, `category?`): route through [[field-type?]] which checks
+ `:effective-type` (and optionally `:semantic-type`) via
+ [[constants/type-hierarchies]]. These answer \"what kind of data is in this column?\".
+
+ 2. **Semantic-type predicates** (`coordinate?`, `foreign-key?`, `primary-key?`,
+ `location?`, `URL?`, `entity-name?`, etc.): check `:semantic-type` directly
+ with `clojure.core/isa?`. These answer \"what does this column *mean*?\"."
+ (:refer-clojure :exclude [boolean? string?])
+ (:require
+ [metabase.lib-metric.types.constants :as constants]
+ [metabase.types.core]
+ [metabase.util.performance :as perf]))
+
+;; Ensure type hierarchy is loaded
+(comment metabase.types.core/keep-me)
+
+(defn column-type
+ "Returns the :effective-type of `column`, if set. Otherwise, returns the :base-type."
+ [column]
+ (or (:effective-type column) (:base-type column)))
+
+(defn field-type?
+ "Returns true if `column` matches the type definition for `category`.
+ The category is a key in [[constants/type-hierarchies]].
+ Returns false for nil column."
+ [category column]
+ (if (nil? column)
+ false
+ (let [type-definition (constants/type-hierarchies category)
+ col (cond-> column
+ (and (map? column)
+ (not (:effective-type column)))
+ (assoc :effective-type (:base-type column)))]
+ (clojure.core/boolean
+ (perf/some (fn [[type-key types]]
+ (and (#{:effective-type :semantic-type} type-key)
+ (perf/some #(clojure.core/isa? (type-key col) %) types)))
+ type-definition)))))
+
+(defn temporal?
+ "Is `column` of a temporal type?"
+ [column]
+ (field-type? ::constants/temporal column))
+
+(defn numeric?
+ "Is `column` of a numeric type?"
+ [column]
+ (field-type? ::constants/number column))
+
+(defn boolean?
+ "Is `column` of a boolean type?"
+ [column]
+ (field-type? ::constants/boolean column))
+
+(defn string?
+ "Is `column` of a string type?"
+ [column]
+ (field-type? ::constants/string column))
+
+(defn string-like?
+ "Is `column` of a string-like type (e.g., IP address, URL)?"
+ [column]
+ (field-type? ::constants/string-like column))
+
+(defn string-or-string-like?
+ "Is `column` a string or string-like type?"
+ [column]
+ (or (string? column) (string-like? column)))
+
+(defn coordinate?
+ "Is `column` a coordinate?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/Coordinate)))
+
+(defn latitude?
+ "Is `column` a latitude?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/Latitude)))
+
+(defn longitude?
+ "Is `column` a longitude?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/Longitude)))
+
+(defn location?
+ "Is `column` a location/address?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/Address)))
+
+(defn foreign-key?
+ "Is `column` a foreign key?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/FK)))
+
+(defn primary-key?
+ "Is `column` a primary key?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/PK)))
+
+(defn time?
+ "Is `column` a time (without date)?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (column-type column) :type/Time)))
+
+(defn date-or-datetime?
+ "Is `column` a date or datetime (has a date component)?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (column-type column) :type/HasDate)))
+
+(defn category?
+ "Is `column` of a categorical type?"
+ [column]
+ (field-type? ::constants/category column))
+
+(defn id?
+ "Is `column` an ID (primary key or foreign key)?"
+ [column]
+ (or (primary-key? column) (foreign-key? column)))
+
+(defn URL?
+ "Is `column` a URL?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/URL)))
+
+(defn entity-name?
+ "Is `column` an entity name?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/Name)))
+
+(defn title?
+ "Is `column` a title?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/Title)))
+
+(defn state?
+ "Is `column` a state?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/State)))
+
+(defn country?
+ "Is `column` a country?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/Country)))
+
+(defn city?
+ "Is `column` a city?"
+ [column]
+ (clojure.core/boolean
+ (clojure.core/isa? (:semantic-type column) :type/City)))
diff --git a/src/metabase/measures/api.clj b/src/metabase/measures/api.clj
index 7c7eda2549e..f3f26e26431 100644
--- a/src/metabase/measures/api.clj
+++ b/src/metabase/measures/api.clj
@@ -6,6 +6,7 @@
[metabase.events.core :as events]
[metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
+ [metabase.metrics.core :as metrics]
[metabase.models.interface :as mi]
[metabase.util :as u]
[metabase.util.malli :as mu]
@@ -16,17 +17,20 @@
(mr/def ::measure
"Schema for a Measure entity as returned from the API."
[:map
- [:id ms/PositiveInt]
- [:name ms/NonBlankString]
- [:table_id ms/PositiveInt]
- [:definition :map]
- [:description {:optional true} [:maybe :string]]
- [:archived :boolean]
- [:creator_id ms/PositiveInt]
- [:created_at :any]
- [:updated_at :any]
- [:entity_id {:optional true} [:maybe :string]]
- [:creator {:optional true} [:maybe :map]]])
+ [:id ms/PositiveInt]
+ [:name ms/NonBlankString]
+ [:table_id ms/PositiveInt]
+ [:definition :map]
+ [:description {:optional true} [:maybe :string]]
+ [:archived :boolean]
+ [:creator_id ms/PositiveInt]
+ [:created_at :any]
+ [:updated_at :any]
+ [:entity_id {:optional true} [:maybe :string]]
+ [:creator {:optional true} [:maybe :map]]
+ [:dimensions {:optional true} [:maybe [:sequential :map]]]
+ [:dimension_mappings {:optional true} [:maybe [:sequential :map]]]
+ [:result_column_name {:optional true} [:maybe :string]]])
(defn- normalize-input-definition
"Normalize measure definition from API input to MBQL5.
@@ -69,14 +73,16 @@
(t2/hydrate measure :creator)))
(mu/defn- hydrated-measure [id :- ms/PositiveInt]
- (-> (api/read-check (t2/select-one :model/Measure :id id))
- (t2/hydrate :creator)))
+ (api/read-check (t2/select-one :model/Measure :id id))
+ (metrics/sync-dimensions! :metadata/measure id)
+ (t2/hydrate (t2/select-one :model/Measure :id id) :creator))
(api.macros/defendpoint :get "/:id" :- ::measure
"Fetch `Measure` with ID."
[{:keys [id]} :- [:map
[:id ms/PositiveInt]]]
- (hydrated-measure id))
+ (let [measure (hydrated-measure id)]
+ (assoc measure :result_column_name (metrics/aggregation-column-name (:database (:definition measure)) (:definition measure)))))
(api.macros/defendpoint :get "/" :- [:sequential ::measure]
"Fetch *all* `Measures`."
@@ -120,3 +126,63 @@
[:archived {:optional true} [:maybe :boolean]]
[:description {:optional true} [:maybe :string]]]]
(write-check-and-update-measure! id body))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Dimension Value Endpoints |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(mr/def ::RemappedValueResponse
+ "Response schema for dimension remapping endpoint.
+ Returns [value] if no remapping, or [value, display-name] if remapped."
+ [:or
+ [:tuple :any]
+ [:tuple :any :string]])
+
+(api.macros/defendpoint :get "/:id/dimension/:dimension-key/values"
+ :- ms/FieldValuesResult
+ "Fetch values for a dimension of a measure.
+
+ Returns field values in the same format as the field values API:
+ - values: list of [value] or [value, display-name] tuples
+ - field_id: the underlying field ID
+ - has_more_values: boolean indicating if there are more values"
+ [{:keys [id dimension-key]} :- [:map
+ [:id ms/PositiveInt]
+ [:dimension-key ms/UUIDString]]]
+ (let [measure (hydrated-measure id)]
+ (metrics/dimension-values
+ (:dimensions measure)
+ (:dimension_mappings measure)
+ dimension-key)))
+
+(api.macros/defendpoint :get "/:id/dimension/:dimension-key/search"
+ :- [:sequential [:vector :string]]
+ "Search for values of a dimension that contain the query string.
+
+ Returns field values matching the search query in the same format as the field values API."
+ [{:keys [id dimension-key]} :- [:map
+ [:id ms/PositiveInt]
+ [:dimension-key ms/UUIDString]]
+ {:keys [query]} :- [:map [:query ms/NonBlankString]]]
+ (let [measure (hydrated-measure id)]
+ (metrics/dimension-search-values
+ (:dimensions measure)
+ (:dimension_mappings measure)
+ dimension-key
+ query)))
+
+(api.macros/defendpoint :get "/:id/dimension/:dimension-key/remapping"
+ :- ::RemappedValueResponse
+ "Fetch remapped value for a specific dimension value.
+
+ Returns a pair [value, display-name] if remapping exists, or [value] otherwise."
+ [{:keys [id dimension-key]} :- [:map
+ [:id ms/PositiveInt]
+ [:dimension-key ms/UUIDString]]
+ {:keys [value]} :- [:map [:value :string]]]
+ (let [measure (hydrated-measure id)]
+ (metrics/dimension-remapped-value
+ (:dimensions measure)
+ (:dimension_mappings measure)
+ dimension-key
+ value)))
diff --git a/src/metabase/measures/models/measure.clj b/src/metabase/measures/models/measure.clj
index 7d86ee7dea0..618cccef1ff 100644
--- a/src/metabase/measures/models/measure.clj
+++ b/src/metabase/measures/models/measure.clj
@@ -8,6 +8,7 @@
[metabase.lib.core :as lib]
[metabase.lib.schema.common :as lib.schema.common]
[metabase.lib.schema.measure :as lib.schema.measure]
+ [metabase.metrics.core :as metrics]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
[metabase.permissions.core :as perms]
@@ -42,7 +43,9 @@
:out mi/json-out-with-keywordization})
(t2/deftransforms :model/Measure
- {:definition transform-measure-definition})
+ {:definition transform-measure-definition
+ :dimensions metrics/transform-dimensions
+ :dimension_mappings metrics/transform-dimension-mappings})
(doto :model/Measure
(derive :metabase/model)
@@ -51,13 +54,9 @@
(defmethod mi/can-read? :model/Measure
([instance]
- (let [table (:table (t2/hydrate instance :table))]
- (perms/user-has-permission-for-table?
- api/*current-user-id*
- :perms/manage-table-metadata
- :yes
- (:db_id table)
- (u/the-id table))))
+ (let [table (or (:table instance)
+ (t2/select-one :model/Table :id (:table_id instance)))]
+ (mi/can-read? table)))
([model pk]
(mi/can-read? (t2/select-one model pk))))
@@ -208,7 +207,9 @@
(defmethod serdes/make-spec "Measure" [_model-name _opts]
{:copy [:name :archived :description :entity_id]
- :skip [:dependency_analysis_version]
+ :skip [:dependency_analysis_version
+ ;; dimensions are computed from the query and reconciled on read, not serialized
+ :dimensions :dimension_mappings]
:transform {:created_at (serdes/date)
:table_id (serdes/fk :model/Table)
:creator_id (serdes/fk :model/User)
@@ -220,9 +221,9 @@
{:model :model/Measure
:attrs {:archived true
:collection-id false
- :creator-id false
+ :creator-id true
:database-id :table.db_id
- :created-at false
+ :created-at true
:updated-at true}
:search-terms [:name :description]
:render-terms {:table-id :table_id
@@ -230,3 +231,12 @@
:table_name :table.name
:table_schema :table.schema}
:joins {:table [:model/Table [:= :table.id :this.table_id]]}})
+
+;;; ------------------------------------------------- Dimension Persistence --------------------------------------------------
+
+(defmethod metrics/save-dimensions! :metadata/measure
+ [measure dimensions dimension-mappings]
+ (when-let [measure-id (:id measure)]
+ (t2/update! :model/Measure measure-id
+ {:dimensions dimensions
+ :dimension_mappings dimension-mappings})))
diff --git a/src/metabase/metrics/api.clj b/src/metabase/metrics/api.clj
new file mode 100644
index 00000000000..1f4871b3dc5
--- /dev/null
+++ b/src/metabase/metrics/api.clj
@@ -0,0 +1,272 @@
+(ns metabase.metrics.api
+ "/api/metric endpoints."
+ (:require
+ [metabase.api.common :as api]
+ [metabase.api.macros :as api.macros]
+ [metabase.collections.models.collection :as collection]
+ [metabase.lib-metric.core :as lib-metric]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.metrics.core :as metrics]
+ [metabase.query-processor :as qp]
+ [metabase.query-processor.streaming :as qp.streaming]
+ [metabase.request.core :as request]
+ [metabase.server.core :as server]
+ [metabase.util.malli :as mu]
+ [metabase.util.malli.registry :as mr]
+ [metabase.util.malli.schema :as ms]
+ [toucan2.core :as t2]))
+
+(mr/def ::Metric
+ "Schema for a Metric in list responses (without hydrated dimensions)."
+ [:map
+ [:id ms/PositiveInt]
+ [:name :string]
+ [:description [:maybe :string]]
+ [:collection_id [:maybe ms/PositiveInt]]
+ [:collection {:optional true} [:maybe [:map
+ [:id [:maybe ms/PositiveInt]]
+ [:name :string]]]]])
+
+(mr/def ::MetricWithDimensions
+ "Schema for a Metric with hydrated dimensions (returned from GET /:id)."
+ [:merge
+ ::Metric
+ [:map
+ [:dimensions {:optional true} [:maybe [:sequential :map]]]
+ [:dimension_mappings {:optional true} [:maybe [:sequential :map]]]
+ [:dataset_query {:optional true} :map]
+ [:database_id {:optional true} [:maybe ms/PositiveInt]]
+ [:result_column_name {:optional true} [:maybe :string]]]])
+
+(def ^:private visibility-config
+ {:include-trash-collection? false
+ :include-archived-items :exclude
+ :permission-level :read})
+
+(defn- metrics-where-clause []
+ [:and
+ [:= :type "metric"]
+ [:= :archived false]
+ (collection/visible-collection-filter-clause :collection_id visibility-config)])
+
+(defn- count-metrics []
+ (t2/count :model/Card {:where (metrics-where-clause)}))
+
+(defn- select-metrics [limit offset]
+ (-> (t2/select [:model/Card :id :name :description :collection_id]
+ {:where (metrics-where-clause)
+ :order-by [[:name :asc]]
+ :limit limit
+ :offset offset})
+ (t2/hydrate :collection)))
+
+(api.macros/defendpoint :get "/"
+ :- [:map
+ [:total ms/IntGreaterThanOrEqualToZero]
+ [:limit ms/PositiveInt]
+ [:offset ms/IntGreaterThanOrEqualToZero]
+ [:data [:sequential ::Metric]]]
+ "Get a list of metrics.
+
+ Returns metrics (Cards with type='metric') that the current user has read access to,
+ filtered by collection visibility permissions."
+ []
+ (let [limit (or (request/limit) 500)
+ offset (or (request/offset) 0)
+ total (count-metrics)
+ metrics (->> (select-metrics limit offset)
+ (mapv #(select-keys % [:id :name :description :collection_id :collection])))]
+ {:total total
+ :limit limit
+ :offset offset
+ :data metrics}))
+
+(mu/defn- hydrated-metric [id :- ms/PositiveInt]
+ (api/read-check (t2/select-one :model/Card :id id :type "metric"))
+ (metrics/sync-dimensions! :metadata/metric id)
+ (t2/select-one :model/Card :id id :type "metric"))
+
+(api.macros/defendpoint :get "/:id" :- ::MetricWithDimensions
+ "Fetch a `Metric` with ID.
+
+ Returns the metric with hydrated dimensions and dimension mappings."
+ [{:keys [id]} :- [:map [:id ms/PositiveInt]]]
+ (let [metric (hydrated-metric id)]
+ (assoc metric :result_column_name (metrics/aggregation-column-name (:database_id metric) (:dataset_query metric)))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | POST /api/metric/dataset |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+;;; ------------------------------------------------- Expression Helpers --------------------------------------------------
+
+(defn- collect-expression-uuids
+ "Collect all :lib/uuid values from leaf nodes in an expression tree."
+ [expr]
+ (mapv lib-metric/expression-leaf-uuid (lib-metric/expression-leaves expr)))
+
+(defn- collect-expression-leaves
+ "Collect [type id] pairs from leaf nodes in an expression tree."
+ [expr]
+ (mapv (juxt lib-metric/expression-leaf-type lib-metric/expression-leaf-id)
+ (lib-metric/expression-leaves expr)))
+
+(mr/def ::Definition
+ "Schema for the definition object within a dataset request.
+ Uses expression-based contract for metric math support."
+ [:and
+ [:map
+ [:expression ::lib-metric.schema/metric-math-expression]
+ [:filters {:optional true} [:maybe ::lib-metric.schema/instance-filters]]
+ [:projections {:optional true} [:maybe ::lib-metric.schema/typed-projections]]]
+ [:fn {:error/message "All :lib/uuid values in expression must be unique"}
+ (fn [{:keys [expression]}]
+ (let [uuids (collect-expression-uuids expression)]
+ (= (count uuids) (count (set uuids)))))]
+ [:fn {:error/message "Filter :lib/uuid values must reference UUIDs from expression"}
+ (fn [{:keys [expression filters]}]
+ (let [expr-uuids (set (collect-expression-uuids expression))]
+ (every? #(contains? expr-uuids (:lib/uuid %)) (or filters []))))]
+ [:fn {:error/message "Projection type/id pairs must correspond to expression leaves"}
+ (fn [{:keys [expression projections]}]
+ (let [leaves (set (collect-expression-leaves expression))]
+ (every? #(contains? leaves [(:type %) (:id %)]) (or projections []))))]])
+
+(mr/def ::DatasetRequest
+ "Schema for POST /dataset request body."
+ [:map
+ [:definition ::Definition]])
+
+(mr/def ::RemappedValueResponse
+ "Response schema for dimension remapping endpoint.
+ Returns [value] if no remapping, or [value, display-name] if remapped."
+ [:or
+ [:tuple :any]
+ [:tuple :any :string]])
+
+(mr/def ::DatasetResponse
+ "Schema for POST /dataset response."
+ [:map
+ [:status [:enum :completed "completed"]]
+ [:data [:map
+ [:cols [:sequential :any]]
+ [:rows [:sequential :any]]]]
+ [:row_count ms/IntGreaterThanOrEqualToZero]])
+
+(defn- check-expression-permissions
+ "Collect all metric/measure leaves from the expression and verify query permissions for each."
+ [expression]
+ (doseq [[source-type source-id] (collect-expression-leaves expression)]
+ (case source-type
+ :metric (api/query-check (t2/select-one :model/Card :id source-id :type "metric"))
+ :measure (api/query-check (t2/select-one :model/Measure :id source-id)))))
+
+(defn- from-api-definition
+ "Create a MetricDefinition from API definition parameters.
+
+ The definition map is passed through directly as the internal MetricDefinition,
+ since the API format and internal format now match.
+
+ Permission checks are performed on all referenced entities in the expression."
+ [provider definition]
+ (let [{:keys [expression filters projections]} definition]
+ ;; Permission check all expression leaves
+ (check-expression-permissions expression)
+ ;; Build MetricDefinition — format matches directly
+ {:lib/type :metric/definition
+ :expression expression
+ :filters (or filters [])
+ :projections (or projections [])
+ :metadata-provider provider}))
+
+(api.macros/defendpoint :post "/dataset"
+ :- (server/streaming-response-schema ::DatasetResponse)
+ "Execute a metric or measure-based query and stream the results.
+
+ Request body requires a `definition` object containing:
+ - expression: A metric math expression tree (leaf reference or arithmetic)
+ Examples: [:metric {:lib/uuid \"a\"} 42], [:- {} [:metric {:lib/uuid \"a\"} 1] [:metric {:lib/uuid \"b\"} 2]]
+ - filters (optional): Per-instance filters keyed by :lib/uuid from the expression
+ - projections (optional): Typed projections keyed by source type and ID"
+ [_route-params
+ _query-params
+ {:keys [definition]} :- ::DatasetRequest]
+ (let [query (-> (lib-metric/metadata-provider)
+ (from-api-definition definition)
+ (lib-metric/->mbql-query {:limit 10000}))]
+ (qp.streaming/streaming-response [rff :api]
+ (qp/process-query (qp/userland-query query) rff))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Dimension Value Endpoints |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(mr/def ::BreakoutValuesResponse
+ [:map
+ [:values [:sequential :any]]
+ [:col :map]])
+
+(api.macros/defendpoint :post "/breakout-values" :- ::BreakoutValuesResponse
+ "Fetch distinct breakout dimension values for a metric or measure definition.
+ Accepts the same definition format as POST /dataset.
+ Returns extracted values and column metadata for the breakout dimension."
+ [_route-params
+ _query-params
+ {:keys [definition]} :- ::DatasetRequest]
+ (let [query (-> (lib-metric/metadata-provider)
+ (from-api-definition definition)
+ (lib-metric/->values-query {:limit 100}))
+ result (qp/process-query (qp/userland-query query))
+ col (first (get-in result [:data :cols]))
+ values (mapv first (get-in result [:data :rows]))]
+ {:values values
+ :col (or col {})}))
+
+(api.macros/defendpoint :get "/:id/dimension/:dimension-key/values"
+ :- ms/FieldValuesResult
+ "Fetch values for a dimension of a metric.
+
+ Returns field values in the same format as the field values API:
+ - values: list of [value] or [value, display-name] tuples
+ - field_id: the underlying field ID
+ - has_more_values: boolean indicating if there are more values"
+ [{:keys [id dimension-key]} :- [:map
+ [:id ms/PositiveInt]
+ [:dimension-key ms/UUIDString]]]
+ (let [metric (hydrated-metric id)]
+ (metrics/dimension-values
+ (:dimensions metric)
+ (:dimension_mappings metric)
+ dimension-key)))
+
+(api.macros/defendpoint :get "/:id/dimension/:dimension-key/search"
+ :- [:sequential [:vector :string]]
+ "Search for values of a dimension that contain the query string.
+
+ Returns field values matching the search query in the same format as the field values API."
+ [{:keys [id dimension-key]} :- [:map
+ [:id ms/PositiveInt]
+ [:dimension-key ms/UUIDString]]
+ {:keys [query]} :- [:map [:query ms/NonBlankString]]]
+ (let [metric (hydrated-metric id)]
+ (metrics/dimension-search-values
+ (:dimensions metric)
+ (:dimension_mappings metric)
+ dimension-key
+ query)))
+
+(api.macros/defendpoint :get "/:id/dimension/:dimension-key/remapping"
+ :- ::RemappedValueResponse
+ "Fetch remapped value for a specific dimension value.
+
+ Returns a pair [value, display-name] if remapping exists, or [value] otherwise."
+ [{:keys [id dimension-key]} :- [:map
+ [:id ms/PositiveInt]
+ [:dimension-key ms/UUIDString]]
+ {:keys [value]} :- [:map [:value :string]]]
+ (let [metric (hydrated-metric id)]
+ (metrics/dimension-remapped-value
+ (:dimensions metric)
+ (:dimension_mappings metric)
+ dimension-key
+ value)))
diff --git a/src/metabase/metrics/core.clj b/src/metabase/metrics/core.clj
new file mode 100644
index 00000000000..8d98bd709fe
--- /dev/null
+++ b/src/metabase/metrics/core.clj
@@ -0,0 +1,82 @@
+(ns metabase.metrics.core
+ "Core namespace for metrics functionality including dimension hydration.
+ Contains persistence multimethod and orchestration logic."
+ (:require
+ [metabase.lib-be.core :as lib-be]
+ [metabase.lib-metric.core :as lib-metric]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.metrics.dimension :as metrics.dimension]
+ [metabase.metrics.transforms :as metrics.transforms]
+ [metabase.util.namespaces :as shared.ns]))
+
+;;; ------------------------------------------------- Re-exports --------------------------------
+
+(shared.ns/import-fns
+ [metrics.dimension
+ dimension-values
+ dimension-search-values
+ dimension-remapped-value]
+ [metrics.transforms
+ normalize-dimension
+ normalize-target-ref
+ normalize-dimension-mapping
+ transform-dimensions
+ transform-dimension-mappings])
+
+;;; ------------------------------------------------- Query Utilities -------------------------------------------------
+
+(defn aggregation-column-name
+ "Extract the result column name for the first aggregation in a query.
+ `database-id` is the ID of the database, `query-map` is the dataset_query or definition."
+ [database-id query-map]
+ (try
+ (let [mp (lib-be/application-database-metadata-provider database-id)
+ query (lib/query mp query-map)
+ agg (->> (lib/returned-columns query)
+ (filter #(= (:lib/source %) :source/aggregations))
+ first)]
+ (:name agg))
+ (catch Exception _ nil)))
+
+;;; ------------------------------------------------- Persistence Multimethod -------------------------------------------------
+
+(defmulti save-dimensions!
+ "Persists dimensions and dimension-mappings to the entity's storage.
+ This is the only impure operation - it writes to the database."
+ {:arglists '([entity dimensions dimension-mappings])}
+ (fn [entity _dimensions _dimension-mappings] (:lib/type entity)))
+
+;;; ------------------------------------------------- Hydration -------------------------------------------------
+
+(defn sync-dimensions!
+ "Compute dimensions from visible-columns, reconcile with persisted data,
+ and persist to the database if changed.
+
+ Arguments:
+ - `metadata-type` - the metadata type, either `:metadata/metric` or `:metadata/measure`
+ - `id` - the entity ID
+
+ This function only handles the side-effect of syncing dimensions to the database.
+ Callers should fetch the entity separately after calling this function."
+ [metadata-type id]
+ (when-let [entity (first (lib.metadata.protocols/metadatas
+ (lib-metric/metadata-provider)
+ {:lib/type metadata-type :id #{id}}))]
+ (when-let [query (lib-metric/dimensionable-query entity)]
+ (let [mp (lib-metric/metadata-provider)
+ computed-pairs (lib-metric/compute-dimension-pairs mp query)
+ persisted-dims (lib-metric/get-persisted-dimensions entity)
+ persisted-mappings (lib-metric/get-persisted-dimension-mappings entity)
+
+ {:keys [dimensions dimension-mappings]}
+ (lib-metric/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+
+ old-persisted (lib-metric/extract-persisted-dimensions
+ (or persisted-dims []))
+ new-persisted (lib-metric/extract-persisted-dimensions
+ dimensions)]
+ (when (or (lib-metric/dimensions-changed? old-persisted new-persisted)
+ (lib-metric/mappings-changed? persisted-mappings dimension-mappings))
+ (save-dimensions! entity new-persisted dimension-mappings))))))
diff --git a/src/metabase/metrics/dimension.clj b/src/metabase/metrics/dimension.clj
new file mode 100644
index 00000000000..179d6b9826d
--- /dev/null
+++ b/src/metabase/metrics/dimension.clj
@@ -0,0 +1,44 @@
+(ns metabase.metrics.dimension
+ "API-layer functions for fetching dimension values from the metrics API endpoints."
+ (:require
+ [metabase.lib-metric.core :as lib-metric]
+ [metabase.parameters.core :as parameters]
+ [metabase.util.malli :as mu]
+ [metabase.util.malli.schema :as ms]
+ [toucan2.core :as t2]))
+
+(mu/defn dimension-values :- ms/FieldValuesResult
+ "Fetch values for a dimension given its UUID.
+ Uses the same logic as the field values API."
+ [dimensions :- [:maybe [:sequential :map]]
+ dimension-mappings :- [:maybe [:sequential :map]]
+ dimension-id :- :string]
+ (let [field-id (lib-metric/resolve-dimension-to-field-id dimensions dimension-mappings dimension-id)
+ field (t2/select-one :model/Field :id field-id)]
+ (parameters/field->values field)))
+
+(mu/defn dimension-search-values :- [:sequential [:vector :string]]
+ "Search for values of a dimension that contain the query string."
+ [dimensions :- [:maybe [:sequential :map]]
+ dimension-mappings :- [:maybe [:sequential :map]]
+ dimension-id :- :string
+ query-string :- ms/NonBlankString]
+ (let [field-id (lib-metric/resolve-dimension-to-field-id dimensions dimension-mappings dimension-id)]
+ (:values (parameters/search-values-from-field-id field-id query-string))))
+
+(mu/defn dimension-remapped-value :- [:or [:tuple :any] [:tuple :any :string]]
+ "Get the remapped value for a specific dimension value.
+ Returns a pair like [value display-name] if remapping exists, or just [value] otherwise."
+ [dimensions :- [:maybe [:sequential :map]]
+ dimension-mappings :- [:maybe [:sequential :map]]
+ dimension-id :- :string
+ value :- :string]
+ (let [field-id (lib-metric/resolve-dimension-to-field-id dimensions dimension-mappings dimension-id)
+ field (t2/select-one :model/Field :id field-id)
+ parsed-value (parameters/parse-query-param-value-for-field field value)
+ remapped-fid (parameters/remapped-field-id field-id)]
+ (if remapped-fid
+ (let [remapped-field (t2/select-one :model/Field :id remapped-fid)]
+ (parameters/remapped-value field remapped-field parsed-value))
+ ;; No remapping - return the value as-is
+ [parsed-value])))
diff --git a/src/metabase/metrics/transforms.clj b/src/metabase/metrics/transforms.clj
new file mode 100644
index 00000000000..93282c8787f
--- /dev/null
+++ b/src/metabase/metrics/transforms.clj
@@ -0,0 +1,46 @@
+(ns metabase.metrics.transforms
+ "Shared JSON transform functions for dimension and dimension-mapping columns
+ used by both Card and Measure models."
+ (:require
+ [metabase.models.interface :as mi]))
+
+(defn normalize-dimension
+ "Normalize a dimension after JSON parsing, converting string values to keywords."
+ [dim]
+ (cond-> dim
+ (:status dim) (update :status keyword)
+ (:effective-type dim) (update :effective-type keyword)
+ (:semantic-type dim) (update :semantic-type keyword)
+ (:sources dim) (update :sources (fn [srcs] (mapv #(update % :type keyword) srcs)))))
+
+(defn normalize-target-ref
+ "Normalize a target ref after JSON parsing. Converts [\"field\" {...} id] to [:field {...} id]."
+ [[clause-type opts & rest]]
+ (into [(keyword clause-type)
+ (cond-> opts
+ (:base-type opts) (update :base-type keyword)
+ (:effective-type opts) (update :effective-type keyword))]
+ rest))
+
+(defn normalize-dimension-mapping
+ "Normalize a dimension mapping after JSON parsing."
+ [mapping]
+ (-> mapping
+ (update :type keyword)
+ (update :target normalize-target-ref)))
+
+(def transform-dimensions
+ "Transform for dimensions column. Handles JSON serialization/deserialization."
+ {:in mi/json-in
+ :out (fn [dims]
+ (some->> dims
+ mi/json-out-with-keywordization
+ (mapv normalize-dimension)))})
+
+(def transform-dimension-mappings
+ "Transform for dimension_mappings column. Handles JSON serialization/deserialization."
+ {:in mi/json-in
+ :out (fn [mappings]
+ (some->> mappings
+ mi/json-out-with-keywordization
+ (mapv normalize-dimension-mapping)))})
diff --git a/src/metabase/parameters/core.clj b/src/metabase/parameters/core.clj
index 9a704621526..6b2db634d53 100644
--- a/src/metabase/parameters/core.clj
+++ b/src/metabase/parameters/core.clj
@@ -1,11 +1,23 @@
(ns metabase.parameters.core
(:require
+ [metabase.parameters.chain-filter]
+ [metabase.parameters.field]
[metabase.parameters.schema]
[potemkin :as p]))
-(comment metabase.parameters.schema/keep-me)
+(comment
+ metabase.parameters.chain-filter/keep-me
+ metabase.parameters.field/keep-me
+ metabase.parameters.schema/keep-me)
(p/import-vars
+ [metabase.parameters.chain-filter
+ remapped-field-id]
+ [metabase.parameters.field
+ field->values
+ parse-query-param-value-for-field
+ remapped-value
+ search-values-from-field-id]
[metabase.parameters.schema
normalize-parameter
normalize-parameter-mapping
diff --git a/src/metabase/parameters/field.clj b/src/metabase/parameters/field.clj
index 5a67dd28109..374f4725126 100644
--- a/src/metabase/parameters/field.clj
+++ b/src/metabase/parameters/field.clj
@@ -2,14 +2,22 @@
(:require
[clojure.string :as str]
[metabase.api.common :as api]
+ [metabase.lib-be.core :as lib-be]
+ [metabase.lib.core :as lib]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.parameters.chain-filter :as chain-filter]
[metabase.parameters.field-values :as params.field-values]
[metabase.parameters.field.search-values-query :as search-values-query]
+ [metabase.util :as u]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
[metabase.util.malli.schema :as ms]
- [toucan2.core :as t2]))
+ [metabase.warehouse-schema.metadata-from-qp :as warehouse-schema.metadata-from-qp]
+ [toucan2.core :as t2])
+ (:import
+ (java.text NumberFormat)))
+
+(set! *warn-on-reflection* true)
(defn follow-fks
"Automatically follow the target IDs in an FK `field` until we reach the PK it points to, and return that. For
@@ -86,3 +94,39 @@
;; assume there are more if doing a search, otherwise there are no more values
:has_more_values (not (str/blank? query-string))
:field_id field-id}))
+
+(defn parse-query-param-value-for-field
+ "Parse a `value` passed as a URL query param in a way appropriate for the `field` it belongs to. E.g. for text Fields
+ the value doesn't need to be parsed; for numeric Fields we should parse it as a number."
+ [field ^String value]
+ (if (isa? (:base_type field) :type/Number)
+ (.parse (NumberFormat/getInstance) value)
+ value))
+
+(defn remapped-value
+ "Search for one specific remapping where the value of `field` exactly matches `value`. Returns a pair like
+
+ [<value-of-field> <value-of-remapped-field>]
+
+ if a match is found.
+
+ For example, with the Sample Database, you could find the name of the Person with ID 20 as follows:
+
+ (remapped-value <PEOPLE.ID Field> <PEOPLE.NAME Field> 20)
+ ;; -> [20 \"Peter Watsica\"]"
+ [field remapped-field value]
+ (try
+ (let [field (follow-fks field)
+ field-col (lib-be/instance->metadata field :metadata/column)
+ remapped-col (lib-be/instance->metadata remapped-field :metadata/column)
+ query-xform (fn [query]
+ (-> query
+ (lib/filter (lib/= field-col value))
+ (lib/with-fields [field-col remapped-col])
+ (lib/limit 1)))]
+ (first (get-in (warehouse-schema.metadata-from-qp/table-query (u/the-id (:table_id field)) query-xform)
+ [:data :rows])))
+ ;; as with fn above this error can usually be safely ignored which is why log level is log/debug
+ (catch Throwable e
+ (log/debug e "Error searching for remapping")
+ nil)))
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 8894b3e13d3..bcfa2402599 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -24,6 +24,7 @@
[metabase.lib.schema.metadata :as lib.schema.metadata]
[metabase.lib.schema.template-tag :as lib.schema.template-tag]
[metabase.lib.types.isa :as lib.types]
+ [metabase.metrics.core :as metrics]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
[metabase.parameters.core :as parameters]
@@ -98,6 +99,17 @@
(fn [_card target-schema-version]
target-schema-version))
+;;; ------------------------------------------------- Dimension Transforms -------------------------------------------------
+
+;;; ------------------------------------------------- Metric Dimension Persistence --------------------------------------------------
+
+(defmethod metrics/save-dimensions! :metadata/metric
+ [metric dimensions dimension-mappings]
+ (when-let [metric-id (:id metric)]
+ (t2/update! :model/Card metric-id
+ {:dimensions dimensions
+ :dimension_mappings dimension-mappings})))
+
(t2/deftransforms :model/Card
{:dataset_query lib-be/transform-query
:display mi/transform-keyword
@@ -107,7 +119,9 @@
:visualization_settings mi/transform-visualization-settings
:parameters parameters/transform-parameters
:parameter_mappings parameters/transform-parameter-mappings
- :type mi/transform-keyword})
+ :type mi/transform-keyword
+ :dimensions metrics/transform-dimensions
+ :dimension_mappings metrics/transform-dimension-mappings})
(doto :model/Card
(derive :metabase/model)
@@ -1284,6 +1298,8 @@
:cache_ttl
;; dependencies aren't serialized, so the version of dependency analysis done shouldn't be serialized
:dependency_analysis_version
+ ;; dimensions are computed from the query and reconciled on read, not serialized
+ :dimensions :dimension_mappings
;; temporary column to power rollback from v57 to v56; we can remove it in v58
:legacy_query]
:transform
diff --git a/src/metabase/revisions/impl/card.clj b/src/metabase/revisions/impl/card.clj
index cf8312772ad..71abd96c737 100644
--- a/src/metabase/revisions/impl/card.clj
+++ b/src/metabase/revisions/impl/card.clj
@@ -7,6 +7,8 @@
#{:cache_invalidated_at
:created_at
:creator_id
+ :dimension_mappings
+ :dimensions
:document_id
:entity_id
:id
diff --git a/src/metabase/search/impl.clj b/src/metabase/search/impl.clj
index dd9e63edd2f..a89c0831685 100644
--- a/src/metabase/search/impl.clj
+++ b/src/metabase/search/impl.clj
@@ -89,6 +89,12 @@
(can-write? search-ctx instance)
(can-read? search-ctx instance)))
+(defmethod check-permissions-for-model :measure
+ [search-ctx instance]
+ (if (:archived? search-ctx)
+ (can-write? search-ctx instance)
+ (can-read? search-ctx instance)))
+
(defmethod check-permissions-for-model :database
[search-ctx instance]
(if (:archived? search-ctx)
diff --git a/src/metabase/search/in_place/filter.clj b/src/metabase/search/in_place/filter.clj
index 9cd8d6fedf1..037ecdc678b 100644
--- a/src/metabase/search/in_place/filter.clj
+++ b/src/metabase/search/in_place/filter.clj
@@ -111,7 +111,7 @@
[:= (search.config/column-with-model-alias model :creator_id) (first creator-ids)]
[:in (search.config/column-with-model-alias model :creator_id) creator-ids]))
-(doseq [model ["card" "dataset" "metric" "dashboard" "action" "document"]]
+(doseq [model ["card" "dataset" "metric" "dashboard" "action" "document" "measure"]]
(defmethod build-optional-filter-query [:created-by model]
[_filter model query creator-ids]
(sql.helpers/where query (default-created-by-filter-clause model creator-ids))))
@@ -184,7 +184,7 @@
[:and [:>= dt-col start] [:< dt-col end]])))
(doseq [model ["collection" "database" "table" "dashboard" "card" "dataset" "metric" "action" "document"
- "transform"]]
+ "transform" "measure"]]
(defmethod build-optional-filter-query [:created-at model]
[_filter model query created-at]
(sql.helpers/where query (date-range-filter-clause
@@ -300,7 +300,7 @@
(sql.helpers/where query false-clause)))
;; Things that don't belong to collections
-(doseq [model ["database" "action" "indexed-entity"]]
+(doseq [model ["database" "action" "indexed-entity" "measure" "segment"]]
(defmethod build-optional-filter-query [:collection model]
[_filter _model query _collection-id]
;; These models don't have collection_id, so they never match
@@ -326,7 +326,7 @@
(reduce (fn [acc [filter model]]
(update acc filter set/union #{model}))
{})))
- (update :collection disj "database")
+ (update :collection disj "database" "measure" "segment")
(update :collection conj "indexed-entity")))
;; ------------------------------------------------------------------------------------------------;;
diff --git a/src/metabase/search/in_place/legacy.clj b/src/metabase/search/in_place/legacy.clj
index efaefed9bb3..6be0ec20fae 100644
--- a/src/metabase/search/in_place/legacy.clj
+++ b/src/metabase/search/in_place/legacy.clj
@@ -448,9 +448,9 @@
(defmethod columns-for-model "measure"
[_]
- ;; Measure excludes created_at and creator_id from search (see search spec)
- [:id :name :description :archived :updated_at
+ [:id :name :description :archived :created_at :updated_at
:table_id
+ :creator_id
[:table.db_id :database_id]
[:table.schema :table_schema]
[:table.name :table_name]
diff --git a/src/metabase/util/time.cljc b/src/metabase/util/time.cljc
index 37166b6d484..82610c6a01e 100644
--- a/src/metabase/util/time.cljc
+++ b/src/metabase/util/time.cljc
@@ -26,6 +26,7 @@
zone-offset-part-regex]
[internal
valid?
+ same-time?
same-day?
same-month?
same-year?
diff --git a/src/metabase/util/time/impl.clj b/src/metabase/util/time/impl.clj
index ba1eb71d663..9b60c9e9dea 100644
--- a/src/metabase/util/time/impl.clj
+++ b/src/metabase/util/time/impl.clj
@@ -39,6 +39,11 @@
[value]
(t/offset-date-time value))
+(defn same-time?
+ "True if these two temporal values are equal."
+ [d1 d2]
+ (= d1 d2))
+
(defn same-day?
"Given two platform-specific datetimes, checks if they fall within the same day."
[d1 d2]
diff --git a/src/metabase/util/time/impl.cljs b/src/metabase/util/time/impl.cljs
index 4ef8be87376..e0d8fde9c56 100644
--- a/src/metabase/util/time/impl.cljs
+++ b/src/metabase/util/time/impl.cljs
@@ -90,6 +90,11 @@
[value]
value)
+(defn same-time?
+ "True if these two dayjs values represent the same millisecond."
+ [^dayjs d1 ^dayjs d2]
+ (.isSame d1 d2))
+
(defn same-day?
"Given two platform-specific datetimes, checks if they fall within the same day."
[^dayjs d1 ^dayjs d2]
diff --git a/src/metabase/warehouse_schema_rest/api/field.clj b/src/metabase/warehouse_schema_rest/api/field.clj
index 079a731ac0c..4793f77e319 100644
--- a/src/metabase/warehouse_schema_rest/api/field.clj
+++ b/src/metabase/warehouse_schema_rest/api/field.clj
@@ -8,13 +8,11 @@
[metabase.lib.schema.metadata :as lib.schema.metadata]
[metabase.models.interface :as mi]
[metabase.parameters.field :as parameters.field]
- [metabase.query-processor :as qp]
[metabase.request.core :as request]
[metabase.sync.core :as sync]
[metabase.types.core :as types]
[metabase.util :as u]
[metabase.util.i18n :as i18n]
- [metabase.util.log :as log]
[metabase.util.malli.schema :as ms]
[metabase.util.quick-task :as quick-task]
[metabase.warehouse-schema.field :as schema.field]
@@ -23,9 +21,7 @@
[metabase.warehouse-schema.models.field-user-settings :as schema.field-user-settings]
[metabase.warehouse-schema.models.field-values :as field-values]
[metabase.xrays.core :as xrays]
- [toucan2.core :as t2])
- (:import
- (java.text NumberFormat)))
+ [toucan2.core :as t2]))
(set! *warn-on-reflection* true)
@@ -338,12 +334,6 @@
;;; --------------------------------------------------- Searching ----------------------------------------------------
-(defn- table-id [field]
- (u/the-id (:table_id field)))
-
-(defn- db-id [field]
- (u/the-id (t2/select-one-fn :db_id :model/Table :id (table-id field))))
-
;; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to
;; use our API + we will need it when we make auto-TypeScript-signature generation happen
;;
@@ -364,43 +354,6 @@
(api/check-403 (mi/can-read? search-field))
(parameters.field/search-values field search-field value (request/limit))))
-(defn remapped-value
- "Search for one specific remapping where the value of `field` exactly matches `value`. Returns a pair like
-
- [<value-of-field> <value-of-remapped-field>]
-
- if a match is found.
-
- For example, with the Sample Database, you could find the name of the Person with ID 20 as follows:
-
- (remapped-value <PEOPLE.ID Field> <PEOPLE.NAME Field> 20)
- ;; -> [20 \"Peter Watsica\"]"
- [field remapped-field value]
- (try
- (let [field (parameters.field/follow-fks field)
- results (qp/process-query
- {:database (db-id field)
- :type :query
- :query {:source-table (table-id field)
- :filter [:= [:field (u/the-id field) nil] value]
- :fields [[:field (u/the-id field) nil]
- [:field (u/the-id remapped-field) nil]]
- :limit 1}})]
- ;; return first row if it exists
- (first (get-in results [:data :rows])))
- ;; as with fn above this error can usually be safely ignored which is why log level is log/debug
- (catch Throwable e
- (log/debug e "Error searching for remapping")
- nil)))
-
-(defn parse-query-param-value-for-field
- "Parse a `value` passed as a URL query param in a way appropriate for the `field` it belongs to. E.g. for text Fields
- the value doesn't need to be parsed; for numeric Fields we should parse it as a number."
- [field ^String value]
- (if (isa? (:base_type field) :type/Number)
- (.parse (NumberFormat/getInstance) value)
- value))
-
;; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to
;; use our API + we will need it when we make auto-TypeScript-signature generation happen
;;
@@ -414,8 +367,8 @@
[:value ms/NonBlankString]]]
(let [field (api/read-check :model/Field id)
remapped-field (api/read-check :model/Field remapped-id)
- value (parse-query-param-value-for-field field value)]
- (remapped-value field remapped-field value)))
+ value (parameters.field/parse-query-param-value-for-field field value)]
+ (parameters.field/remapped-value field remapped-field value)))
;; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers to
;; use our API + we will need it when we make auto-TypeScript-signature generation happen
diff --git a/test/metabase/lib_metric/ast/build_test.cljc b/test/metabase/lib_metric/ast/build_test.cljc
new file mode 100644
index 00000000000..c9bd0aeb81e
--- /dev/null
+++ b/test/metabase/lib_metric/ast/build_test.cljc
@@ -0,0 +1,445 @@
+(ns metabase.lib-metric.ast.build-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [malli.error :as me]
+ [metabase.lib-metric.ast.build :as ast.build]
+ [metabase.lib-metric.ast.schema :as ast.schema]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.lib.test-metadata :as meta]
+ [metabase.util.malli.registry :as mr]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+(def ^:private expr-uuid "550e8400-e29b-41d4-a716-446655440099")
+
+(defn- sample-dimensions []
+ [{:id uuid-1 :name "category" :display-name "Category" :status :status/active}
+ {:id uuid-2 :name "created_at" :display-name "Created At" :status :status/active}])
+
+(defn- sample-mappings []
+ (let [venues-id (meta/id :venues)]
+ [{:type :table :table-id venues-id :dimension-id uuid-1
+ :target [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} (meta/id :venues :category-id)]}
+ {:type :table :table-id venues-id :dimension-id uuid-2
+ :target [:field {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} (meta/id :venues :id)]}]))
+
+(defn- sample-metric-query []
+ (-> (lib/query meta/metadata-provider (meta/table-metadata :venues))
+ (lib/aggregate (lib/count))))
+
+(defn- sample-metric-metadata []
+ {:lib/type :metadata/metric
+ :id 42
+ :name "Total Revenue"
+ :dimensions (sample-dimensions)
+ :dimension-mappings (sample-mappings)
+ :dataset-query (sample-metric-query)})
+
+(defn- sample-measure-query []
+ (-> (lib/query meta/metadata-provider (meta/table-metadata :orders))
+ (lib/aggregate (lib/sum (meta/field-metadata :orders :total)))))
+
+(defn- sample-measure-metadata []
+ {:lib/type :metadata/measure
+ :id 99
+ :name "Order Count"
+ :dimensions (sample-dimensions)
+ :dimension-mappings (sample-mappings)
+ :definition (sample-measure-query)})
+
+;; A metadata provider that wraps meta/metadata-provider but also serves metric/measure metadata
+(defn- make-test-provider
+ "Create a metadata provider that delegates to meta/metadata-provider for table/column queries
+ and returns test metric/measure metadata for metric/measure queries."
+ [metric-metadata measure-metadata]
+ (reify lib.metadata.protocols/MetadataProvider
+ (metadatas [_this metadata-spec]
+ (case (:lib/type metadata-spec)
+ :metadata/metric
+ (if (contains? (:id metadata-spec) (:id metric-metadata))
+ [metric-metadata]
+ [])
+ :metadata/measure
+ (if (and measure-metadata (contains? (:id metadata-spec) (:id measure-metadata)))
+ [measure-metadata]
+ [])
+ ;; Delegate to base provider for everything else
+ (lib.metadata.protocols/metadatas meta/metadata-provider metadata-spec)))
+ (database [_this]
+ (lib.metadata.protocols/database meta/metadata-provider))
+ (setting [_this setting-key]
+ (lib.metadata.protocols/setting meta/metadata-provider setting-key))))
+
+(defn- sample-definition []
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid expr-uuid} 42]
+ :filters []
+ :projections []
+ :metadata-provider (make-test-provider (sample-metric-metadata) (sample-measure-metadata))})
+
+;;; -------------------------------------------------- Primitive Construction --------------------------------------------------
+
+(deftest ^:parallel table-node-test
+ (testing "creates valid table node with id only"
+ (let [node (ast.build/table-node 1)]
+ (is (= {:node/type :ast/table :id 1} node))
+ (is (nil? (me/humanize (mr/explain ::ast.schema/table-node node))))))
+
+ (testing "creates valid table node with name"
+ (let [node (ast.build/table-node 1 "orders")]
+ (is (= {:node/type :ast/table :id 1 :name "orders"} node))
+ (is (nil? (me/humanize (mr/explain ::ast.schema/table-node node)))))))
+
+(deftest ^:parallel column-node-test
+ (testing "creates valid column node with id only"
+ (let [node (ast.build/column-node 1)]
+ (is (= {:node/type :ast/column :id 1} node))
+ (is (nil? (me/humanize (mr/explain ::ast.schema/column-node node))))))
+
+ (testing "creates valid column node with all fields"
+ (let [node (ast.build/column-node 1 "category" 10)]
+ (is (= {:node/type :ast/column :id 1 :name "category" :table-id 10} node))
+ (is (nil? (me/humanize (mr/explain ::ast.schema/column-node node)))))))
+
+;;; -------------------------------------------------- Dimension Construction --------------------------------------------------
+
+(deftest ^:parallel dimension-node-test
+ (testing "creates valid dimension node from persisted dimension"
+ (let [node (ast.build/dimension-node (first (sample-dimensions)))]
+ (is (= {:node/type :ast/dimension
+ :id uuid-1
+ :name "category"
+ :display-name "Category"
+ :status :status/active}
+ node))
+ (is (nil? (me/humanize (mr/explain ::ast.schema/dimension-node node)))))))
+
+(deftest ^:parallel dimension-mapping-node-test
+ (testing "creates valid dimension mapping node"
+ (let [mappings (sample-mappings)
+ node (ast.build/dimension-mapping-node (first mappings))]
+ (is (= uuid-1 (:dimension-id node)))
+ (is (= (meta/id :venues) (:table-id node)))
+ (is (= :ast/dimension-mapping (:node/type node)))
+ (is (= (meta/id :venues :category-id) (get-in node [:column :id])))
+ (is (nil? (me/humanize (mr/explain ::ast.schema/dimension-mapping-node node)))))))
+
+;;; -------------------------------------------------- from-definition --------------------------------------------------
+
+(deftest ^:parallel from-definition-test
+ (let [ast (ast.build/from-definition (sample-definition))]
+
+ (testing "creates valid AST structure"
+ (is (nil? (me/humanize (mr/explain ::ast.schema/ast ast)))))
+
+ (testing "has correct root structure"
+ (is (= :ast/root (:node/type ast)))
+ (is (nil? (:filter ast)))
+ (is (= [] (:group-by ast)))
+ (is (some? (:metadata-provider ast))))
+
+ (testing "has correct source"
+ (let [source (:source ast)]
+ (is (= :source/metric (:node/type source)))
+ (is (= 42 (:id source)))
+ (is (= "Total Revenue" (:name source)))))
+
+ (testing "has dimensions as nodes"
+ (is (= 2 (count (:dimensions ast))))
+ (is (every? #(= :ast/dimension (:node/type %)) (:dimensions ast)))
+ (is (= uuid-1 (get-in ast [:dimensions 0 :id]))))
+
+ (testing "has mappings as nodes"
+ (is (= 2 (count (:mappings ast))))
+ (is (every? #(= :ast/dimension-mapping (:node/type %)) (:mappings ast))))))
+
+(deftest ^:parallel from-definition-measure-test
+ (let [measure-def {:lib/type :metric/definition
+ :expression [:measure {:lib/uuid expr-uuid} 99]
+ :filters []
+ :projections []
+ :metadata-provider (make-test-provider (sample-metric-metadata) (sample-measure-metadata))}
+ ast (ast.build/from-definition measure-def)]
+
+ (testing "creates valid AST for measure"
+ (is (nil? (me/humanize (mr/explain ::ast.schema/ast ast)))))
+
+ (testing "has measure source type"
+ (is (= :source/measure (get-in ast [:source :node/type]))))
+
+ (testing "extracts sum aggregation"
+ (is (= :aggregation/sum (get-in ast [:source :aggregation :node/type]))))))
+
+;;; -------------------------------------------------- Dimension Reference Conversion --------------------------------------------------
+
+(deftest ^:parallel dimension-ref->ast-dimension-ref-test
+ (testing "converts basic dimension reference"
+ (let [result (ast.build/dimension-ref->ast-dimension-ref [:dimension {} uuid-1])]
+ (is (= {:node/type :ast/dimension-ref
+ :dimension-id uuid-1}
+ result))
+ (is (nil? (me/humanize (mr/explain ::ast.schema/dimension-ref-node result))))))
+
+ (testing "converts dimension reference with temporal-unit option"
+ (let [result (ast.build/dimension-ref->ast-dimension-ref [:dimension {"temporal-unit" "year"} uuid-1])]
+ (is (= {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options {:temporal-unit :year}}
+ result))))
+
+ (testing "converts dimension reference with binning option"
+ (let [result (ast.build/dimension-ref->ast-dimension-ref [:dimension {"binning" {"strategy" "default"}} uuid-1])]
+ (is (= {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options {:binning {:strategy :default}}}
+ result))))
+
+ (testing "converts binning strategy string values to keywords"
+ (let [result (ast.build/dimension-ref->ast-dimension-ref
+ [:dimension {"binning" {"strategy" "num-bins" "num-bins" 10}} uuid-1])]
+ (is (= :num-bins (get-in result [:options :binning :strategy])))
+ (is (= 10 (get-in result [:options :binning :num-bins]))))))
+
+;;; -------------------------------------------------- Filter Conversion --------------------------------------------------
+
+(deftest ^:parallel mbql-filter->ast-filter-comparison-test
+ (testing "converts comparison filters"
+ (doseq [op [:= :!= :< :<= :> :>=]]
+ (let [result (ast.build/mbql-filter->ast-filter [op {} [:dimension {} uuid-1] 42])]
+ (is (= :filter/comparison (:node/type result)))
+ (is (= op (:operator result)))
+ (is (= uuid-1 (get-in result [:dimension :dimension-id])))
+ (is (= [42] (:values result)))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-between-test
+ (testing "converts between filter"
+ (let [result (ast.build/mbql-filter->ast-filter [:between {} [:dimension {} uuid-1] 10 100])]
+ (is (= :filter/between (:node/type result)))
+ (is (= uuid-1 (get-in result [:dimension :dimension-id])))
+ (is (= 10 (:min result)))
+ (is (= 100 (:max result))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-inside-test
+ (testing "converts inside filter"
+ (let [result (ast.build/mbql-filter->ast-filter
+ [:inside {} [:dimension {} uuid-1] [:dimension {} uuid-2] 40.0 -73.0 39.0 -74.0])]
+ (is (= :filter/inside (:node/type result)))
+ (is (= uuid-1 (get-in result [:lat-dimension :dimension-id])))
+ (is (= uuid-2 (get-in result [:lon-dimension :dimension-id])))
+ (is (= 40.0 (:north result)))
+ (is (= -73.0 (:east result)))
+ (is (= 39.0 (:south result)))
+ (is (= -74.0 (:west result))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-string-test
+ (testing "converts string filters"
+ (doseq [op [:contains :starts-with :ends-with :does-not-contain]]
+ (let [result (ast.build/mbql-filter->ast-filter [op {} [:dimension {} uuid-1] "test"])]
+ (is (= :filter/string (:node/type result)))
+ (is (= op (:operator result)))
+ (is (= "test" (:value result)))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-null-test
+ (testing "converts null filters"
+ (doseq [op [:is-null :not-null :is-empty :not-empty]]
+ (let [result (ast.build/mbql-filter->ast-filter [op {} [:dimension {} uuid-1]])]
+ (is (= :filter/null (:node/type result)))
+ (is (= op (:operator result)))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-in-test
+ (testing "converts in filters"
+ (let [result (ast.build/mbql-filter->ast-filter [:in {} [:dimension {} uuid-1] 1 2 3])]
+ (is (= :filter/in (:node/type result)))
+ (is (= :in (:operator result)))
+ (is (= [1 2 3] (:values result)))))
+
+ (testing "converts not-in filters"
+ (let [result (ast.build/mbql-filter->ast-filter [:not-in {} [:dimension {} uuid-1] "a" "b"])]
+ (is (= :filter/in (:node/type result)))
+ (is (= :not-in (:operator result)))
+ (is (= ["a" "b"] (:values result))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-temporal-test
+ (testing "converts time-interval filter"
+ (let [result (ast.build/mbql-filter->ast-filter [:time-interval {} [:dimension {} uuid-1] -30 "day"])]
+ (is (= :filter/temporal (:node/type result)))
+ (is (= :time-interval (:operator result)))
+ (is (= -30 (:value result)))
+ (is (= :day (:unit result)))
+ (is (nil? (:offset-value result)))))
+
+ (testing "converts relative-time-interval filter with positional offsets"
+ (let [result (ast.build/mbql-filter->ast-filter
+ [:relative-time-interval {} [:dimension {} uuid-1] -7 "day" -1 "month"])]
+ (is (= :filter/temporal (:node/type result)))
+ (is (= :relative-time-interval (:operator result)))
+ (is (= -7 (:value result)))
+ (is (= :day (:unit result)))
+ (is (= -1 (:offset-value result)))
+ (is (= :month (:offset-unit result)))))
+
+ (testing "converts time-interval filter with offsets in opts map"
+ (let [result (ast.build/mbql-filter->ast-filter
+ [:time-interval {:offset-value -1 :offset-unit :week} [:dimension {} uuid-1] -30 "day"])]
+ (is (= :filter/temporal (:node/type result)))
+ (is (= :time-interval (:operator result)))
+ (is (= -30 (:value result)))
+ (is (= :day (:unit result)))
+ (is (= -1 (:offset-value result)))
+ (is (= :week (:offset-unit result))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-compound-test
+ (testing "converts and filter"
+ (let [result (ast.build/mbql-filter->ast-filter [:and {}
+ [:= {} [:dimension {} uuid-1] 1]
+ [:= {} [:dimension {} uuid-2] 2]])]
+ (is (= :filter/and (:node/type result)))
+ (is (= 2 (count (:children result))))
+ (is (every? #(= :filter/comparison (:node/type %)) (:children result)))))
+
+ (testing "converts or filter"
+ (let [result (ast.build/mbql-filter->ast-filter [:or {}
+ [:= {} [:dimension {} uuid-1] 1]
+ [:= {} [:dimension {} uuid-2] 2]])]
+ (is (= :filter/or (:node/type result)))
+ (is (= 2 (count (:children result))))))
+
+ (testing "converts not filter"
+ (let [result (ast.build/mbql-filter->ast-filter [:not {} [:= {} [:dimension {} uuid-1] 1]])]
+ (is (= :filter/not (:node/type result)))
+ (is (= :filter/comparison (get-in result [:child :node/type]))))))
+
+(deftest ^:parallel mbql-filter->ast-filter-exclude-day-of-week-test
+ (let [;; Exclude Monday (1) and Sunday (7) using ISO day-of-week
+ ;; This is the pMBQL shape produced by lib/fe_util/exclude-date-filter-clause
+ result (ast.build/mbql-filter->ast-filter
+ [:!= {} [:get-day-of-week {} [:dimension {} uuid-2] :iso] 1 7])]
+ (is (some? result) "should produce an AST filter node")
+ (is (= :filter/comparison (:node/type result)))
+ (is (= :!= (:operator result)))
+ (is (= :ast/dimension-expression (get-in result [:dimension :node/type])))
+ (is (= :get-day-of-week (get-in result [:dimension :expression-op])))
+ (is (= uuid-2 (get-in result [:dimension :dimension :dimension-id])))
+ (is (= [:iso] (get-in result [:dimension :args])))
+ (is (= [1 7] (:values result)))))
+
+(deftest ^:parallel mbql-filter->ast-filter-exclude-month-test
+ (let [;; Exclude March (3) and December (12)
+ result (ast.build/mbql-filter->ast-filter
+ [:!= {} [:get-month {} [:dimension {} uuid-2]] 3 12])]
+ (is (some? result) "should produce an AST filter node")
+ (is (= :ast/dimension-expression (get-in result [:dimension :node/type])))
+ (is (= :get-month (get-in result [:dimension :expression-op])))
+ (is (= uuid-2 (get-in result [:dimension :dimension :dimension-id])))
+ (is (nil? (get-in result [:dimension :args])) "get-month has no extra args")
+ (is (= [3 12] (:values result)))))
+
+(deftest ^:parallel mbql-filter->ast-filter-exclude-hour-test
+ (let [;; Exclude hour 0 and hour 23
+ result (ast.build/mbql-filter->ast-filter
+ [:!= {} [:get-hour {} [:dimension {} uuid-2]] 0 23])]
+ (is (some? result) "should produce an AST filter node")
+ (is (= :ast/dimension-expression (get-in result [:dimension :node/type])))
+ (is (= :get-hour (get-in result [:dimension :expression-op])))
+ (is (= uuid-2 (get-in result [:dimension :dimension :dimension-id])))
+ (is (= [0 23] (:values result)))))
+
+(deftest ^:parallel mbql-filter->ast-filter-exclude-quarter-test
+ (let [;; Exclude Q2 and Q4
+ result (ast.build/mbql-filter->ast-filter
+ [:!= {} [:get-quarter {} [:dimension {} uuid-2]] 2 4])]
+ (is (some? result) "should produce an AST filter node")
+ (is (= :ast/dimension-expression (get-in result [:dimension :node/type])))
+ (is (= :get-quarter (get-in result [:dimension :expression-op])))
+ (is (= uuid-2 (get-in result [:dimension :dimension :dimension-id])))
+ (is (= [2 4] (:values result)))))
+
+(deftest ^:parallel mbql-filters->ast-filter-test
+ (testing "single filter returns that filter"
+ (let [result (ast.build/mbql-filters->ast-filter [[:= {} [:dimension {} uuid-1] 42]])]
+ (is (= :filter/comparison (:node/type result)))))
+
+ (testing "multiple filters combined with and"
+ (let [result (ast.build/mbql-filters->ast-filter [[:= {} [:dimension {} uuid-1] 1]
+ [:= {} [:dimension {} uuid-2] 2]])]
+ (is (= :filter/and (:node/type result)))
+ (is (= 2 (count (:children result))))))
+
+ (testing "empty filters returns nil"
+ (is (nil? (ast.build/mbql-filters->ast-filter [])))))
+
+;;; -------------------------------------------------- from-definition with filters/projections --------------------------------------------------
+
+(deftest ^:parallel from-definition-with-filters-test
+ (let [definition-with-filters (assoc (sample-definition)
+ :filters [{:lib/uuid expr-uuid
+ :filter [:= {} [:dimension {} uuid-1] 42]}])
+ ast (ast.build/from-definition definition-with-filters)]
+
+ (testing "creates valid AST structure with filter"
+ (is (nil? (me/humanize (mr/explain ::ast.schema/ast ast)))))
+
+ (testing "has filter node"
+ (is (some? (:filter ast)))
+ (is (= :filter/comparison (get-in ast [:filter :node/type])))
+ (is (= := (get-in ast [:filter :operator]))))))
+
+(deftest ^:parallel from-definition-with-projections-test
+ (let [definition-with-projections (assoc (sample-definition)
+ :projections [{:type :metric
+ :id 42
+ :projection [[:dimension {} uuid-1]
+ [:dimension {"temporal-unit" "year"} uuid-2]]}])
+ ast (ast.build/from-definition definition-with-projections)]
+
+ (testing "creates valid AST structure with group-by"
+ (is (nil? (me/humanize (mr/explain ::ast.schema/ast ast)))))
+
+ (testing "has group-by dimension refs"
+ (is (= 2 (count (:group-by ast))))
+ (is (every? #(= :ast/dimension-ref (:node/type %)) (:group-by ast)))
+ (is (= uuid-1 (get-in ast [:group-by 0 :dimension-id])))
+ (is (= {:temporal-unit :year} (get-in ast [:group-by 1 :options]))))))
+
+(deftest ^:parallel from-definition-loads-dimensions-from-provider-test
+ (testing "dimensions are loaded from metadata fetched via provider"
+ (let [definition (sample-definition)
+ ast (ast.build/from-definition definition)]
+ ;; Dimensions are loaded from provider -> sample-metric-metadata
+ (is (= 2 (count (:dimensions ast))))
+ (is (= 2 (count (:mappings ast)))))))
+
+;;; -------------------------------------------------- Multi-Stage Source Queries --------------------------------------------------
+
+(defn- sample-metric-query-with-join []
+ (-> (lib/query meta/metadata-provider (meta/table-metadata :venues))
+ (lib/join (lib/join-clause (meta/table-metadata :categories)
+ [(lib/= (meta/field-metadata :venues :category-id)
+ (meta/field-metadata :categories :id))]))
+ (lib/aggregate (lib/count))
+ (lib/append-stage)))
+
+(defn- sample-metric-metadata-with-join []
+ {:lib/type :metadata/metric
+ :id 42
+ :name "Total Revenue"
+ :dimensions (sample-dimensions)
+ :dimension-mappings (sample-mappings)
+ :dataset-query (sample-metric-query-with-join)})
+
+(deftest ^:parallel from-definition-multi-stage-extracts-from-stage-0-test
+ (testing "joins, filters, and aggregation are extracted from stage 0 of multi-stage queries"
+ (let [provider (make-test-provider (sample-metric-metadata-with-join) (sample-measure-metadata))
+ definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid expr-uuid} 42]
+ :filters []
+ :projections []
+ :metadata-provider provider}
+ ast (ast.build/from-definition definition)]
+ (testing "has joins extracted from stage 0"
+ (is (seq (get-in ast [:source :joins]))))
+ (testing "has aggregation extracted from stage 0"
+ (is (some? (get-in ast [:source :aggregation])))))))
diff --git a/test/metabase/lib_metric/ast/compile_test.cljc b/test/metabase/lib_metric/ast/compile_test.cljc
new file mode 100644
index 00000000000..53b9cfafd31
--- /dev/null
+++ b/test/metabase/lib_metric/ast/compile_test.cljc
@@ -0,0 +1,711 @@
+(ns metabase.lib-metric.ast.compile-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.ast.compile :as ast.compile]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+
+(def ^:private dim-ref-1 {:node/type :ast/dimension-ref :dimension-id uuid-1})
+(def ^:private dim-ref-2 {:node/type :ast/dimension-ref :dimension-id uuid-2 :options {:temporal-unit :month}})
+
+(def ^:private sample-ast
+ {:node/type :ast/root
+ :source {:node/type :source/metric
+ :id 42
+ :name "Test Metric"
+ :aggregation {:node/type :aggregation/count}
+ :base-table {:node/type :ast/table :id 100}
+ :metadata {:dataset-query {:database 1}}}
+ :dimensions [{:node/type :ast/dimension
+ :id uuid-1
+ :name "category"
+ :display-name "Category"}
+ {:node/type :ast/dimension
+ :id uuid-2
+ :name "created_at"
+ :display-name "Created At"}]
+ :mappings [{:node/type :ast/dimension-mapping
+ :dimension-id uuid-1
+ :table-id 100
+ :column {:node/type :ast/column :id 1}}
+ {:node/type :ast/dimension-mapping
+ :dimension-id uuid-2
+ :table-id 100
+ :column {:node/type :ast/column :id 2}}]
+ :filter nil
+ :group-by []
+ :metadata-provider :test-provider})
+
+;;; -------------------------------------------------- Basic Compilation --------------------------------------------------
+
+(deftest ^:parallel compile-to-mbql-basic-test
+ (let [result (ast.compile/compile-to-mbql sample-ast)]
+
+ (testing "produces valid MBQL structure"
+ (is (= :mbql/query (:lib/type result)))
+ (is (= 1 (:database result)))
+ (is (= 1 (count (:stages result)))))
+
+ (testing "has correct stage structure"
+ (let [stage (first (:stages result))]
+ (is (= :mbql.stage/mbql (:lib/type stage)))
+ (is (= 100 (:source-table stage)))
+ (is (= 1 (count (:aggregation stage))))))
+
+ (testing "compiles count aggregation"
+ (let [agg (first (get-in result [:stages 0 :aggregation]))]
+ (is (= :count (first agg)))
+ (is (string? (get-in agg [1 :lib/uuid])))))
+
+ (testing "has no filters when AST has none"
+ (is (nil? (get-in result [:stages 0 :filters]))))
+
+ (testing "has no breakout when AST has none"
+ (is (nil? (get-in result [:stages 0 :breakout]))))))
+
+;;; -------------------------------------------------- Database ID Resolution --------------------------------------------------
+
+(deftest ^:parallel compile-missing-database-id-throws-test
+ (let [ast-no-db (assoc-in sample-ast [:source :metadata] {:dataset-query {}})]
+ (testing "throws when metadata has no database ID"
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs ExceptionInfo)
+ #"Cannot determine database ID"
+ (ast.compile/compile-to-mbql ast-no-db))))))
+
+;;; -------------------------------------------------- Aggregation Compilation --------------------------------------------------
+
+(deftest ^:parallel compile-sum-aggregation-test
+ (let [ast-with-sum (assoc-in sample-ast [:source :aggregation]
+ {:node/type :aggregation/sum
+ :column {:node/type :ast/column :id 10}})
+ result (ast.compile/compile-to-mbql ast-with-sum)
+ agg (first (get-in result [:stages 0 :aggregation]))]
+ (is (= :sum (first agg)))
+ (is (= :field (first (nth agg 2))))
+ (is (= 10 (nth (nth agg 2) 2)))))
+
+(deftest ^:parallel compile-avg-aggregation-test
+ (let [ast-with-avg (assoc-in sample-ast [:source :aggregation]
+ {:node/type :aggregation/avg
+ :column {:node/type :ast/column :id 10}})
+ result (ast.compile/compile-to-mbql ast-with-avg)
+ agg (first (get-in result [:stages 0 :aggregation]))]
+ (is (= :avg (first agg)))))
+
+(deftest ^:parallel compile-min-aggregation-test
+ (let [ast-with-min (assoc-in sample-ast [:source :aggregation]
+ {:node/type :aggregation/min
+ :column {:node/type :ast/column :id 10}})
+ result (ast.compile/compile-to-mbql ast-with-min)
+ agg (first (get-in result [:stages 0 :aggregation]))]
+ (is (= :min (first agg)))
+ (is (= :field (first (nth agg 2))))
+ (is (= 10 (nth (nth agg 2) 2)))))
+
+(deftest ^:parallel compile-max-aggregation-test
+ (let [ast-with-max (assoc-in sample-ast [:source :aggregation]
+ {:node/type :aggregation/max
+ :column {:node/type :ast/column :id 10}})
+ result (ast.compile/compile-to-mbql ast-with-max)
+ agg (first (get-in result [:stages 0 :aggregation]))]
+ (is (= :max (first agg)))
+ (is (= :field (first (nth agg 2))))
+ (is (= 10 (nth (nth agg 2) 2)))))
+
+(deftest ^:parallel compile-distinct-aggregation-test
+ (let [ast-with-distinct (assoc-in sample-ast [:source :aggregation]
+ {:node/type :aggregation/distinct
+ :column {:node/type :ast/column :id 10}})
+ result (ast.compile/compile-to-mbql ast-with-distinct)
+ agg (first (get-in result [:stages 0 :aggregation]))]
+ (is (= :distinct (first agg)))
+ (is (= :field (first (nth agg 2))))
+ (is (= 10 (nth (nth agg 2) 2)))))
+
+(deftest ^:parallel compile-mbql-aggregation-test
+ (let [raw-clause [:custom-agg {} [:field {} 10]]
+ ast-with-mbql (assoc-in sample-ast [:source :aggregation]
+ {:node/type :aggregation/mbql
+ :clause raw-clause})
+ result (ast.compile/compile-to-mbql ast-with-mbql)
+ agg (first (get-in result [:stages 0 :aggregation]))]
+ (is (= raw-clause agg))))
+
+;;; -------------------------------------------------- Filter Compilation --------------------------------------------------
+
+(deftest ^:parallel compile-comparison-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/comparison
+ :operator :=
+ :dimension dim-ref-1
+ :values ["Electronics"]})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= := (first filter)))
+ (is (string? (get-in filter [1 :lib/uuid])))
+ (is (= :field (first (nth filter 2))))
+ (is (= 1 (nth (nth filter 2) 2))) ; field id from mapping
+ (is (= "Electronics" (nth filter 3)))))
+
+(deftest ^:parallel compile-between-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/between
+ :dimension dim-ref-1
+ :min 10
+ :max 100})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :between (first filter)))
+ (is (= 10 (nth filter 3)))
+ (is (= 100 (nth filter 4)))))
+
+(deftest ^:parallel compile-string-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/string
+ :operator :contains
+ :dimension dim-ref-1
+ :value "foo"
+ :options {:case-sensitive false}})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :contains (first filter)))
+ (is (= false (get-in filter [1 :case-sensitive])))
+ (is (= "foo" (nth filter 3)))))
+
+(deftest ^:parallel compile-null-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/null
+ :operator :is-null
+ :dimension dim-ref-1})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :is-null (first filter)))
+ (is (= :field (first (nth filter 2))))))
+
+(deftest ^:parallel compile-in-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/in
+ :operator :in
+ :dimension dim-ref-1
+ :values ["a" "b" "c"]})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :in (first filter)))
+ ;; field ref at index 2, then values
+ (is (= "a" (nth filter 3)))
+ (is (= "b" (nth filter 4)))
+ (is (= "c" (nth filter 5)))))
+
+(deftest ^:parallel compile-not-in-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/in
+ :operator :not-in
+ :dimension dim-ref-1
+ :values ["x" "y"]})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :not-in (first filter)))
+ (is (= :field (first (nth filter 2))))
+ (is (= "x" (nth filter 3)))
+ (is (= "y" (nth filter 4)))))
+
+(deftest ^:parallel compile-inside-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/inside
+ :lat-dimension dim-ref-1
+ :lon-dimension dim-ref-2
+ :north 40.0
+ :east -73.0
+ :south 39.0
+ :west -74.0})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :inside (first filter)))
+ (is (= :field (first (nth filter 2))))
+ (is (= :field (first (nth filter 3))))
+ (is (= 40.0 (nth filter 4)))
+ (is (= -73.0 (nth filter 5)))
+ (is (= 39.0 (nth filter 6)))
+ (is (= -74.0 (nth filter 7)))))
+
+(deftest ^:parallel compile-temporal-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/temporal
+ :operator :time-interval
+ :dimension dim-ref-1
+ :value -30
+ :unit :day})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter-clause (first (get-in result [:stages 0 :filters]))]
+ (is (= :time-interval (first filter-clause)))
+ (is (= -30 (nth filter-clause 3)))
+ (is (= :day (nth filter-clause 4)))
+ ;; No offset keys in opts when not specified
+ (is (not (contains? (nth filter-clause 1) :offset-value)))
+ (is (= 5 (count filter-clause)))))
+
+(deftest ^:parallel compile-relative-time-interval-filter-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/temporal
+ :operator :relative-time-interval
+ :dimension dim-ref-1
+ :value -7
+ :unit :day
+ :offset-value -1
+ :offset-unit :month})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter-clause (first (get-in result [:stages 0 :filters]))]
+ (is (= :relative-time-interval (first filter-clause)))
+ (is (= -1 (get-in filter-clause [1 :offset-value])))
+ (is (= :month (get-in filter-clause [1 :offset-unit])))
+ (is (= -7 (nth filter-clause 3)))
+ (is (= :day (nth filter-clause 4)))
+ ;; Offsets should be in opts map, not positional
+ (is (= 5 (count filter-clause)))))
+
+(deftest ^:parallel compile-and-filter-test
+ (let [filter-a {:node/type :filter/comparison :operator := :dimension dim-ref-1 :values ["a"]}
+ filter-b {:node/type :filter/comparison :operator :> :dimension dim-ref-2 :values [10]}
+ ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/and
+ :children [filter-a filter-b]})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :and (first filter)))
+ (is (= 2 (count (drop 2 filter)))) ; two children after tag and opts
+ (is (= := (first (nth filter 2))))
+ (is (= :> (first (nth filter 3))))))
+
+(deftest ^:parallel compile-or-filter-test
+ (let [filter-a {:node/type :filter/comparison :operator := :dimension dim-ref-1 :values ["a"]}
+ filter-b {:node/type :filter/comparison :operator := :dimension dim-ref-1 :values ["b"]}
+ ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/or
+ :children [filter-a filter-b]})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :or (first filter)))))
+
+(deftest ^:parallel compile-not-filter-test
+ (let [filter-a {:node/type :filter/comparison :operator := :dimension dim-ref-1 :values ["exclude"]}
+ ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/not
+ :child filter-a})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter (first (get-in result [:stages 0 :filters]))]
+ (is (= :not (first filter)))
+ (is (= := (first (nth filter 2))))))
+
+;;; -------------------------------------------------- Dimension Expression Compilation --------------------------------------------------
+
+(deftest ^:parallel compile-dimension-expression-filter-test
+ (testing "compiles filter with dimension-expression node (exclude day-of-week)"
+ (let [dim-expr {:node/type :ast/dimension-expression
+ :expression-op :get-day-of-week
+ :dimension dim-ref-2
+ :args [:iso]}
+ ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/comparison
+ :operator :!=
+ :dimension dim-expr
+ :values [1 7]})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter-clause (first (get-in result [:stages 0 :filters]))]
+ (is (= :!= (first filter-clause)))
+ (is (string? (get-in filter-clause [1 :lib/uuid])))
+ ;; The third element should be the expression wrapping the field
+ (let [expr (nth filter-clause 2)]
+ (is (= :get-day-of-week (first expr)))
+ (is (string? (get-in expr [1 :lib/uuid])))
+ ;; Inner field ref
+ (is (= :field (first (nth expr 2))))
+ (is (= 2 (nth (nth expr 2) 2))) ; field id from mapping
+ ;; Extra arg :iso
+ (is (= :iso (nth expr 3))))
+ ;; Values
+ (is (= 1 (nth filter-clause 3)))
+ (is (= 7 (nth filter-clause 4)))))
+
+ (testing "compiles filter with dimension-expression node without extra args"
+ (let [dim-expr {:node/type :ast/dimension-expression
+ :expression-op :get-month
+ :dimension dim-ref-2}
+ ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/comparison
+ :operator :!=
+ :dimension dim-expr
+ :values [3 12]})
+ result (ast.compile/compile-to-mbql ast-with-filter)
+ filter-clause (first (get-in result [:stages 0 :filters]))]
+ (is (= :!= (first filter-clause)))
+ (let [expr (nth filter-clause 2)]
+ (is (= :get-month (first expr)))
+ (is (= :field (first (nth expr 2))))
+ ;; No extra args beyond opts and field ref
+ (is (= 3 (count expr))))
+ (is (= 3 (nth filter-clause 3)))
+ (is (= 12 (nth filter-clause 4))))))
+
+;;; -------------------------------------------------- Group By / Breakout Compilation --------------------------------------------------
+
+(deftest ^:parallel compile-group-by-test
+ (let [ast-with-groupby (assoc sample-ast :group-by [dim-ref-1])
+ result (ast.compile/compile-to-mbql ast-with-groupby)
+ breakout (get-in result [:stages 0 :breakout])]
+ (is (= 1 (count breakout)))
+ (let [field-ref (first breakout)]
+ (is (= :field (first field-ref)))
+ (is (= 1 (nth field-ref 2))))))
+
+(deftest ^:parallel compile-group-by-with-temporal-unit-test
+ (let [ast-with-groupby (assoc sample-ast :group-by [dim-ref-2])
+ result (ast.compile/compile-to-mbql ast-with-groupby)
+ breakout (get-in result [:stages 0 :breakout])
+ field-ref (first breakout)]
+ (is (= :field (first field-ref)))
+ (is (= :month (get-in field-ref [1 :temporal-unit])))
+ (is (= 2 (nth field-ref 2)))))
+
+(deftest ^:parallel compile-multiple-group-by-test
+ (let [ast-with-groupby (assoc sample-ast :group-by [dim-ref-1 dim-ref-2])
+ result (ast.compile/compile-to-mbql ast-with-groupby)
+ breakout (get-in result [:stages 0 :breakout])]
+ (is (= 2 (count breakout)))))
+
+(deftest ^:parallel compile-group-by-with-binning-test
+ (testing "compiles group-by with binning strategy :default"
+ (let [dim-ref-with-binning {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options {:binning {:strategy :default}}}
+ ast-with-binning (assoc sample-ast :group-by [dim-ref-with-binning])
+ result (ast.compile/compile-to-mbql ast-with-binning)
+ breakout (get-in result [:stages 0 :breakout])
+ field-ref (first breakout)]
+ (is (= :field (first field-ref)))
+ (is (= {:strategy :default} (get-in field-ref [1 :binning])))))
+
+ (testing "compiles group-by with binning strategy :num-bins"
+ (let [dim-ref-with-binning {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options {:binning {:strategy :num-bins :num-bins 10}}}
+ ast-with-binning (assoc sample-ast :group-by [dim-ref-with-binning])
+ result (ast.compile/compile-to-mbql ast-with-binning)
+ breakout (get-in result [:stages 0 :breakout])
+ field-ref (first breakout)]
+ (is (= :field (first field-ref)))
+ (is (= {:strategy :num-bins :num-bins 10} (get-in field-ref [1 :binning])))))
+
+ (testing "compiles group-by with binning strategy :bin-width"
+ (let [dim-ref-with-binning {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options {:binning {:strategy :bin-width :bin-width 5}}}
+ ast-with-binning (assoc sample-ast :group-by [dim-ref-with-binning])
+ result (ast.compile/compile-to-mbql ast-with-binning)
+ breakout (get-in result [:stages 0 :breakout])
+ field-ref (first breakout)]
+ (is (= :field (first field-ref)))
+ (is (= {:strategy :bin-width :bin-width 5} (get-in field-ref [1 :binning]))))))
+
+;;; -------------------------------------------------- FK Dimension Compilation --------------------------------------------------
+
+(def ^:private uuid-fk "550e8400-e29b-41d4-a716-446655440003")
+
+(def ^:private fk-dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-fk})
+
+(def ^:private sample-ast-with-fk
+ (-> sample-ast
+ (update :dimensions conj {:node/type :ast/dimension
+ :id uuid-fk
+ :name "fk_category_name"
+ :display-name "Category Name"})
+ (update :mappings conj {:node/type :ast/dimension-mapping
+ :dimension-id uuid-fk
+ :table-id 200
+ :column {:node/type :ast/column
+ :id 123
+ :source-field 42
+ :table-id 200}})))
+
+(deftest ^:parallel compile-fk-dimension-breakout-test
+ (testing "FK dimension produces :source-field in breakout field ref"
+ (let [ast-with-fk-groupby (assoc sample-ast-with-fk :group-by [fk-dim-ref])
+ result (ast.compile/compile-to-mbql ast-with-fk-groupby)
+ breakout (get-in result [:stages 0 :breakout])
+ field-ref (first breakout)]
+ (is (= :field (first field-ref)))
+ (is (= 123 (nth field-ref 2)))
+ (is (= 42 (get-in field-ref [1 :source-field]))))))
+
+(deftest ^:parallel compile-fk-dimension-filter-test
+ (testing "FK dimension produces :source-field in filter field ref"
+ (let [ast-with-fk-filter (assoc sample-ast-with-fk :filter
+ {:node/type :filter/comparison
+ :operator :=
+ :dimension fk-dim-ref
+ :values ["Widgets"]})
+ result (ast.compile/compile-to-mbql ast-with-fk-filter)
+ filter-clause (first (get-in result [:stages 0 :filters]))
+ field-ref (nth filter-clause 2)]
+ (is (= :field (first field-ref)))
+ (is (= 123 (nth field-ref 2)))
+ (is (= 42 (get-in field-ref [1 :source-field]))))))
+
+;;; -------------------------------------------------- Options --------------------------------------------------
+
+(deftest ^:parallel compile-with-limit-test
+ (let [result (ast.compile/compile-to-mbql sample-ast :limit 10)]
+ (is (= 10 (get-in result [:stages 0 :limit])))))
+
+;;; -------------------------------------------------- Combined Filters and Group By --------------------------------------------------
+
+(deftest ^:parallel compile-full-exploration-test
+ (let [full-ast (-> sample-ast
+ (assoc :filter {:node/type :filter/and
+ :children [{:node/type :filter/comparison
+ :operator :=
+ :dimension dim-ref-1
+ :values ["Electronics"]}
+ {:node/type :filter/temporal
+ :operator :time-interval
+ :dimension dim-ref-2
+ :value -30
+ :unit :day}]})
+ (assoc :group-by [dim-ref-1 dim-ref-2]))
+ result (ast.compile/compile-to-mbql full-ast :limit 1000)
+ stage (first (:stages result))]
+
+ (testing "has filters"
+ (is (seq (:filters stage)))
+ ;; Should be wrapped in :and since we have compound filter
+ (let [filter (first (:filters stage))]
+ (is (= :and (first filter)))))
+
+ (testing "has breakouts"
+ (is (= 2 (count (:breakout stage)))))
+
+ (testing "has limit"
+ (is (= 1000 (:limit stage))))
+
+ (testing "has aggregation"
+ (is (= 1 (count (:aggregation stage)))))))
+
+;;; -------------------------------------------------- Dimension Resolution Errors --------------------------------------------------
+
+(def ^:private unknown-uuid "99999999-9999-9999-9999-999999999999")
+
+(deftest ^:parallel compile-unresolved-dimension-error-test
+ (let [unknown-dim-ref {:node/type :ast/dimension-ref :dimension-id unknown-uuid}
+ ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/comparison
+ :operator :=
+ :dimension unknown-dim-ref
+ :values ["value"]})]
+ (testing "throws when dimension cannot be resolved"
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs ExceptionInfo)
+ #"Unable to resolve dimension"
+ (ast.compile/compile-to-mbql ast-with-filter))))))
+
+;;; -------------------------------------------------- Source Filters --------------------------------------------------
+
+(deftest ^:parallel compile-with-source-filters-test
+ (let [source-filter {:node/type :filter/comparison
+ :operator :=
+ :dimension dim-ref-1
+ :values ["source-value"]}
+ ast-with-source-filter (assoc-in sample-ast [:source :filters] source-filter)
+ result (ast.compile/compile-to-mbql ast-with-source-filter)
+ filters (get-in result [:stages 0 :filters])]
+
+ (testing "includes source filters in output"
+ (is (= 1 (count filters)))
+ (is (= := (first (first filters)))))))
+
+(deftest ^:parallel compile-combines-source-and-user-filters-test
+ (let [source-filter {:node/type :filter/comparison
+ :operator :=
+ :dimension dim-ref-1
+ :values ["source-value"]}
+ user-filter {:node/type :filter/comparison
+ :operator :>
+ :dimension dim-ref-2
+ :values [100]}
+ ast (-> sample-ast
+ (assoc-in [:source :filters] source-filter)
+ (assoc :filter user-filter))
+ result (ast.compile/compile-to-mbql ast)
+ filters (get-in result [:stages 0 :filters])
+ filter (first filters)]
+
+ (testing "combines source and user filters with :and"
+ (is (= 1 (count filters)))
+ (is (= :and (first filter)))
+ ;; Should have source filter and user filter as children
+ (is (= 2 (count (drop 2 filter)))))))
+
+;;; -------------------------------------------------- Two-Stage Compilation (Joins) --------------------------------------------------
+
+(def ^:private sample-join
+ {:lib/type :mbql/join
+ :alias "Products"
+ :conditions [[:= {} [:field {} 10] [:field {:join-alias "Products"} 20]]]
+ :source-table 200
+ :fields :all})
+
+(def ^:private ast-with-joins
+ (-> sample-ast
+ (assoc-in [:source :joins]
+ [{:node/type :ast/join
+ :mbql-join sample-join}])))
+
+(deftest ^:parallel compile-two-stage-query-test
+ (let [result (ast.compile/compile-to-mbql ast-with-joins)]
+
+ (testing "produces two stages when joins present"
+ (is (= :mbql/query (:lib/type result)))
+ (is (= 2 (count (:stages result)))))
+
+ (testing "stage 0 has source-table and joins"
+ (let [stage-0 (first (:stages result))]
+ (is (= :mbql.stage/mbql (:lib/type stage-0)))
+ (is (= 100 (:source-table stage-0)))
+ (is (= 1 (count (:joins stage-0))))
+ (is (= sample-join (first (:joins stage-0))))))
+
+ (testing "stage 1 has aggregation"
+ (let [stage-1 (second (:stages result))]
+ (is (= :mbql.stage/mbql (:lib/type stage-1)))
+ (is (nil? (:source-table stage-1)))
+ (is (= 1 (count (:aggregation stage-1))))
+ (is (= :count (first (first (:aggregation stage-1)))))))))
+
+(deftest ^:parallel compile-two-stage-join-placement-test
+ (testing "joins appear only in stage 0"
+ (let [result (ast.compile/compile-to-mbql ast-with-joins)
+ stage-0 (first (:stages result))
+ stage-1 (second (:stages result))]
+ (is (seq (:joins stage-0)))
+ (is (nil? (:joins stage-1))))))
+
+(deftest ^:parallel compile-two-stage-filter-separation-test
+ (let [source-filter {:node/type :filter/mbql
+ :clause [:= {} [:field {} 30] "active"]}
+ user-filter {:node/type :filter/comparison
+ :operator :=
+ :dimension dim-ref-1
+ :values ["Electronics"]}
+ ast (-> ast-with-joins
+ (assoc-in [:source :filters] source-filter)
+ (assoc :filter user-filter))
+ result (ast.compile/compile-to-mbql ast)
+ stage-0 (first (:stages result))
+ stage-1 (second (:stages result))]
+
+ (testing "source filters go in stage 0"
+ (is (= 1 (count (:filters stage-0))))
+ (let [filter (first (:filters stage-0))]
+ (is (= := (first filter)))))
+
+ (testing "user filters go in stage 1"
+ (is (= 1 (count (:filters stage-1))))
+ (let [filter (first (:filters stage-1))]
+ (is (= := (first filter)))))))
+
+(deftest ^:parallel compile-two-stage-aggregation-placement-test
+ (testing "aggregation appears only in stage 1"
+ (let [result (ast.compile/compile-to-mbql ast-with-joins)
+ stage-0 (first (:stages result))
+ stage-1 (second (:stages result))]
+ (is (nil? (:aggregation stage-0)))
+ (is (= 1 (count (:aggregation stage-1)))))))
+
+(deftest ^:parallel compile-two-stage-breakout-placement-test
+ (let [ast-with-groupby (assoc ast-with-joins :group-by [dim-ref-1 dim-ref-2])
+ result (ast.compile/compile-to-mbql ast-with-groupby)
+ stage-0 (first (:stages result))
+ stage-1 (second (:stages result))]
+
+ (testing "breakouts appear only in stage 1"
+ (is (nil? (:breakout stage-0)))
+ (is (= 2 (count (:breakout stage-1)))))))
+
+(deftest ^:parallel compile-two-stage-limit-placement-test
+ (let [result (ast.compile/compile-to-mbql ast-with-joins :limit 100)
+ stage-0 (first (:stages result))
+ stage-1 (second (:stages result))]
+
+ (testing "limit appears only in stage 1"
+ (is (nil? (:limit stage-0)))
+ (is (= 100 (:limit stage-1))))))
+
+(deftest ^:parallel compile-single-stage-backward-compatibility-test
+ (testing "metrics without joins produce single-stage queries"
+ (let [result (ast.compile/compile-to-mbql sample-ast)]
+ (is (= 1 (count (:stages result))))
+ (is (nil? (:joins (first (:stages result))))))))
+
+;;; -------------------------------------------------- Values Query Compilation --------------------------------------------------
+
+(deftest ^:parallel compile-to-values-query-basic-test
+ (let [result (ast.compile/compile-to-values-query sample-ast)]
+ (testing "produces valid MBQL structure without aggregation"
+ (is (= :mbql/query (:lib/type result)))
+ (is (= 1 (:database result)))
+ (is (= 1 (count (:stages result)))))
+
+ (testing "stage has no :aggregation key"
+ (let [stage (first (:stages result))]
+ (is (= :mbql.stage/mbql (:lib/type stage)))
+ (is (= 100 (:source-table stage)))
+ (is (not (contains? stage :aggregation)))))))
+
+(deftest ^:parallel compile-to-values-query-with-breakout-test
+ (let [ast-with-groupby (assoc sample-ast :group-by [dim-ref-1])
+ result (ast.compile/compile-to-values-query ast-with-groupby)
+ stage (first (:stages result))]
+ (testing "produces breakout but no aggregation"
+ (is (= 1 (count (:breakout stage))))
+ (is (not (contains? stage :aggregation))))))
+
+(deftest ^:parallel compile-to-values-query-with-filters-test
+ (let [ast-with-filter (assoc sample-ast :filter
+ {:node/type :filter/comparison
+ :operator :=
+ :dimension dim-ref-1
+ :values ["Electronics"]})
+ result (ast.compile/compile-to-values-query ast-with-filter)
+ stage (first (:stages result))]
+ (testing "produces filters but no aggregation"
+ (is (seq (:filters stage)))
+ (is (not (contains? stage :aggregation))))))
+
+(deftest ^:parallel compile-to-values-query-with-limit-test
+ (let [result (ast.compile/compile-to-values-query sample-ast :limit 50)
+ stage (first (:stages result))]
+ (testing "limit flows through"
+ (is (= 50 (:limit stage)))
+ (is (not (contains? stage :aggregation))))))
+
+(deftest ^:parallel compile-to-values-query-two-stage-test
+ (let [result (ast.compile/compile-to-values-query ast-with-joins)]
+ (testing "produces two stages with no aggregation in either"
+ (is (= 2 (count (:stages result))))
+ (let [stage-0 (first (:stages result))
+ stage-1 (second (:stages result))]
+ (is (= 100 (:source-table stage-0)))
+ (is (seq (:joins stage-0)))
+ (is (not (contains? stage-0 :aggregation)))
+ (is (not (contains? stage-1 :aggregation)))))))
+
+(deftest ^:parallel compile-to-values-query-two-stage-with-breakout-test
+ (let [ast-with-groupby (assoc ast-with-joins :group-by [dim-ref-1 dim-ref-2])
+ result (ast.compile/compile-to-values-query ast-with-groupby)
+ stage-0 (first (:stages result))
+ stage-1 (second (:stages result))]
+ (testing "breakouts in stage 1, no aggregation anywhere"
+ (is (nil? (:breakout stage-0)))
+ (is (= 2 (count (:breakout stage-1))))
+ (is (not (contains? stage-0 :aggregation)))
+ (is (not (contains? stage-1 :aggregation))))))
diff --git a/test/metabase/lib_metric/ast/schema_test.cljc b/test/metabase/lib_metric/ast/schema_test.cljc
new file mode 100644
index 00000000000..450b2a55fae
--- /dev/null
+++ b/test/metabase/lib_metric/ast/schema_test.cljc
@@ -0,0 +1,317 @@
+(ns metabase.lib-metric.ast.schema-test
+ (:require
+ [clojure.test :refer [are deftest is testing]]
+ [malli.error :as me]
+ [metabase.lib-metric.ast.schema :as ast.schema]
+ [metabase.util.malli.registry :as mr]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+
+;;; -------------------------------------------------- Primitive Nodes --------------------------------------------------
+
+(deftest ^:parallel table-node-test
+ (testing "valid table nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/table-node node)))
+ {:node/type :ast/table :id 1}
+ {:node/type :ast/table :id 1 :name "orders"}
+ {:node/type :ast/table :id 100 :name nil}))
+ (testing "invalid table nodes"
+ (testing "missing id"
+ (is (some? (me/humanize (mr/explain ::ast.schema/table-node
+ {:node/type :ast/table})))))
+ (testing "invalid id"
+ (is (some? (me/humanize (mr/explain ::ast.schema/table-node
+ {:node/type :ast/table :id 0})))))
+ (testing "wrong node type"
+ (is (some? (me/humanize (mr/explain ::ast.schema/table-node
+ {:node/type :ast/column :id 1})))))))
+
+(deftest ^:parallel column-node-test
+ (testing "valid column nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/column-node node)))
+ {:node/type :ast/column :id 1}
+ {:node/type :ast/column :id 1 :name "category"}
+ {:node/type :ast/column :id 1 :name "price" :table-id 10}
+ {:node/type :ast/column :id 1 :name nil :table-id nil}))
+ (testing "invalid column nodes"
+ (testing "missing id"
+ (is (some? (me/humanize (mr/explain ::ast.schema/column-node
+ {:node/type :ast/column})))))
+ (testing "invalid table-id"
+ (is (some? (me/humanize (mr/explain ::ast.schema/column-node
+ {:node/type :ast/column :id 1 :table-id -1})))))))
+
+;;; -------------------------------------------------- Dimension Nodes --------------------------------------------------
+
+(deftest ^:parallel dimension-node-test
+ (testing "valid dimension nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/dimension-node node)))
+ {:node/type :ast/dimension :id uuid-1}
+ {:node/type :ast/dimension :id uuid-1 :name "category"}
+ {:node/type :ast/dimension
+ :id uuid-1
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type :type/Category
+ :status :status/active}
+ {:node/type :ast/dimension :id uuid-1 :status :status/orphaned}))
+ (testing "invalid dimension nodes"
+ (testing "invalid uuid"
+ (is (some? (me/humanize (mr/explain ::ast.schema/dimension-node
+ {:node/type :ast/dimension :id "not-a-uuid"})))))
+ (testing "invalid status"
+ (is (some? (me/humanize (mr/explain ::ast.schema/dimension-node
+ {:node/type :ast/dimension :id uuid-1 :status :invalid})))))))
+
+(deftest ^:parallel dimension-ref-node-test
+ (testing "valid dimension ref nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/dimension-ref-node node)))
+ {:node/type :ast/dimension-ref :dimension-id uuid-1}
+ {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options {:temporal-unit :month}}
+ {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options {:binning {:strategy :num-bins :num-bins 10}}}
+ {:node/type :ast/dimension-ref
+ :dimension-id uuid-1
+ :options nil}))
+ (testing "invalid dimension ref nodes"
+ (testing "missing dimension-id"
+ (is (some? (me/humanize (mr/explain ::ast.schema/dimension-ref-node
+ {:node/type :ast/dimension-ref})))))
+ (testing "invalid dimension-id"
+ (is (some? (me/humanize (mr/explain ::ast.schema/dimension-ref-node
+ {:node/type :ast/dimension-ref :dimension-id "not-a-uuid"})))))))
+
+(deftest ^:parallel dimension-mapping-node-test
+ (testing "valid dimension mapping nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/dimension-mapping-node node)))
+ {:node/type :ast/dimension-mapping
+ :dimension-id uuid-1
+ :column {:node/type :ast/column :id 1}}
+ {:node/type :ast/dimension-mapping
+ :dimension-id uuid-1
+ :table-id 10
+ :column {:node/type :ast/column :id 1 :name "category" :table-id 10}}))
+ (testing "invalid dimension mapping nodes"
+ (testing "missing column"
+ (is (some? (me/humanize (mr/explain ::ast.schema/dimension-mapping-node
+ {:node/type :ast/dimension-mapping :dimension-id uuid-1})))))))
+
+;;; -------------------------------------------------- Aggregation Nodes --------------------------------------------------
+
+(deftest ^:parallel aggregation-node-test
+ (testing "valid aggregation nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/aggregation-node node)))
+ {:node/type :aggregation/count}
+ {:node/type :aggregation/sum
+ :column {:node/type :ast/column :id 1}}
+ {:node/type :aggregation/avg
+ :column {:node/type :ast/column :id 1}}
+ {:node/type :aggregation/min
+ :column {:node/type :ast/column :id 1}}
+ {:node/type :aggregation/max
+ :column {:node/type :ast/column :id 1}}
+ {:node/type :aggregation/distinct
+ :column {:node/type :ast/column :id 1}}
+ {:node/type :aggregation/mbql
+ :clause [:sum {} [:field {} 1]]}))
+ (testing "invalid aggregation nodes"
+ (testing "sum without column"
+ (is (some? (me/humanize (mr/explain ::ast.schema/aggregation-node
+ {:node/type :aggregation/sum})))))))
+
+;;; -------------------------------------------------- Filter Nodes --------------------------------------------------
+
+(deftest ^:parallel filter-comparison-test
+ (let [dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-1}]
+ (testing "valid comparison filters"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/filter-comparison node)))
+ {:node/type :filter/comparison :operator := :dimension dim-ref :values ["Electronics"]}
+ {:node/type :filter/comparison :operator :!= :dimension dim-ref :values [100]}
+ {:node/type :filter/comparison :operator :< :dimension dim-ref :values [50]}
+ {:node/type :filter/comparison :operator :<= :dimension dim-ref :values [50]}
+ {:node/type :filter/comparison :operator :> :dimension dim-ref :values [0]}
+ {:node/type :filter/comparison :operator :>= :dimension dim-ref :values [0]}))
+ (testing "invalid comparison filters"
+ (testing "invalid operator"
+ (is (some? (me/humanize (mr/explain ::ast.schema/filter-comparison
+ {:node/type :filter/comparison
+ :operator :invalid
+ :dimension dim-ref
+ :values [1]}))))))))
+
+(deftest ^:parallel filter-between-test
+ (let [dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-1}]
+ (testing "valid between filters"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/filter-between node)))
+ {:node/type :filter/between :dimension dim-ref :min 0 :max 100}
+ {:node/type :filter/between :dimension dim-ref :min "2024-01-01" :max "2024-12-31"}))
+ (testing "invalid between filters"
+ (testing "missing min"
+ (is (some? (me/humanize (mr/explain ::ast.schema/filter-between
+ {:node/type :filter/between
+ :dimension dim-ref
+ :max 100}))))))))
+
+(deftest ^:parallel filter-inside-test
+ (let [dim-ref-a {:node/type :ast/dimension-ref :dimension-id uuid-1}
+ dim-ref-b {:node/type :ast/dimension-ref :dimension-id uuid-2}]
+ (testing "valid inside filter"
+ (is (nil? (me/humanize (mr/explain ::ast.schema/filter-inside
+ {:node/type :filter/inside
+ :lat-dimension dim-ref-a
+ :lon-dimension dim-ref-b
+ :north 40.0
+ :east -73.0
+ :south 39.0
+ :west -74.0})))))
+ (testing "invalid inside filter - missing lon-dimension"
+ (is (some? (me/humanize (mr/explain ::ast.schema/filter-inside
+ {:node/type :filter/inside
+ :lat-dimension dim-ref-a
+ :north 40.0
+ :east -73.0
+ :south 39.0
+ :west -74.0})))))))
+
+(deftest ^:parallel filter-string-test
+ (let [dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-1}]
+ (testing "valid string filters"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/filter-string node)))
+ {:node/type :filter/string :operator :contains :dimension dim-ref :value "foo"}
+ {:node/type :filter/string :operator :starts-with :dimension dim-ref :value "bar"}
+ {:node/type :filter/string :operator :ends-with :dimension dim-ref :value "baz"}
+ {:node/type :filter/string
+ :operator :does-not-contain
+ :dimension dim-ref
+ :value "qux"
+ :options {:case-sensitive false}}))
+ (testing "invalid string filters"
+ (testing "non-string value"
+ (is (some? (me/humanize (mr/explain ::ast.schema/filter-string
+ {:node/type :filter/string
+ :operator :contains
+ :dimension dim-ref
+ :value 123}))))))))
+
+(deftest ^:parallel filter-null-test
+ (let [dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-1}]
+ (testing "valid null filters"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/filter-null node)))
+ {:node/type :filter/null :operator :is-null :dimension dim-ref}
+ {:node/type :filter/null :operator :not-null :dimension dim-ref}
+ {:node/type :filter/null :operator :is-empty :dimension dim-ref}
+ {:node/type :filter/null :operator :not-empty :dimension dim-ref}))))
+
+(deftest ^:parallel filter-in-test
+ (let [dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-1}]
+ (testing "valid in filters"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/filter-in node)))
+ {:node/type :filter/in :operator :in :dimension dim-ref :values ["a" "b" "c"]}
+ {:node/type :filter/in :operator :not-in :dimension dim-ref :values [1 2 3]}
+ {:node/type :filter/in :operator :in :dimension dim-ref :values []}))))
+
+(deftest ^:parallel filter-temporal-test
+ (let [dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-1}]
+ (testing "valid temporal filters"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/filter-temporal node)))
+ {:node/type :filter/temporal
+ :operator :time-interval
+ :dimension dim-ref
+ :value -30
+ :unit :day}
+ {:node/type :filter/temporal
+ :operator :relative-time-interval
+ :dimension dim-ref
+ :value -7
+ :unit :day
+ :offset-value -1
+ :offset-unit :month}
+ {:node/type :filter/temporal
+ :operator :relative-time-interval
+ :dimension dim-ref
+ :value -7
+ :unit :week}))))
+
+(deftest ^:parallel filter-compound-test
+ (let [dim-ref {:node/type :ast/dimension-ref :dimension-id uuid-1}
+ filter-a {:node/type :filter/comparison :operator := :dimension dim-ref :values [1]}
+ filter-b {:node/type :filter/comparison :operator :> :dimension dim-ref :values [0]}]
+ (testing "valid compound filters"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/filter-node node)))
+ {:node/type :filter/and :children [filter-a filter-b]}
+ {:node/type :filter/or :children [filter-a filter-b]}
+ {:node/type :filter/not :child filter-a}
+ ;; Nested compound
+ {:node/type :filter/and
+ :children [{:node/type :filter/or :children [filter-a filter-b]}
+ {:node/type :filter/not :child filter-a}]}))))
+
+;;; -------------------------------------------------- Source Nodes --------------------------------------------------
+
+(deftest ^:parallel source-metric-test
+ (testing "valid source metric nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/source-metric node)))
+ {:node/type :source/metric
+ :id 1
+ :aggregation {:node/type :aggregation/count}
+ :base-table {:node/type :ast/table :id 1}}
+ {:node/type :source/metric
+ :id 1
+ :name "Revenue"
+ :aggregation {:node/type :aggregation/sum
+ :column {:node/type :ast/column :id 10}}
+ :base-table {:node/type :ast/table :id 1 :name "orders"}})))
+
+(deftest ^:parallel source-measure-test
+ (testing "valid source measure nodes"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/source-measure node)))
+ {:node/type :source/measure
+ :id 1
+ :aggregation {:node/type :aggregation/count}
+ :base-table {:node/type :ast/table :id 1}})))
+
+;;; -------------------------------------------------- Root Node --------------------------------------------------
+
+(deftest ^:parallel ast-root-test
+ (let [source {:node/type :source/metric
+ :id 1
+ :aggregation {:node/type :aggregation/count}
+ :base-table {:node/type :ast/table :id 1}}
+ dim {:node/type :ast/dimension :id uuid-1}
+ mapping {:node/type :ast/dimension-mapping
+ :dimension-id uuid-1
+ :column {:node/type :ast/column :id 1}}]
+ (testing "valid root AST"
+ (are [node] (nil? (me/humanize (mr/explain ::ast.schema/ast node)))
+ {:node/type :ast/root
+ :source source
+ :dimensions []
+ :mappings []}
+ {:node/type :ast/root
+ :source source
+ :dimensions [dim]
+ :mappings [mapping]
+ :filter nil
+ :group-by []}
+ {:node/type :ast/root
+ :source source
+ :dimensions [dim]
+ :mappings [mapping]
+ :filter {:node/type :filter/comparison
+ :operator :=
+ :dimension {:node/type :ast/dimension-ref :dimension-id uuid-1}
+ :values ["test"]}
+ :group-by [{:node/type :ast/dimension-ref :dimension-id uuid-1}]}))
+ (testing "invalid root AST"
+ (testing "missing source"
+ (is (some? (me/humanize (mr/explain ::ast.schema/ast
+ {:node/type :ast/root
+ :dimensions []
+ :mappings []}))))))))
diff --git a/test/metabase/lib_metric/ast/walk_test.cljc b/test/metabase/lib_metric/ast/walk_test.cljc
new file mode 100644
index 00000000000..d239e363114
--- /dev/null
+++ b/test/metabase/lib_metric/ast/walk_test.cljc
@@ -0,0 +1,308 @@
+(ns metabase.lib-metric.ast.walk-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.ast.walk :as ast.walk]))
+
+;;; -------------------------------------------------- Test Helpers --------------------------------------------------
+;;; These helpers construct AST nodes directly for testing purposes.
+
+(defn- dimension-ref
+ "Create an AST dimension-ref node for testing."
+ ([dimension-id] (dimension-ref dimension-id nil))
+ ([dimension-id options]
+ (cond-> {:node/type :ast/dimension-ref
+ :dimension-id dimension-id}
+ (seq options) (assoc :options options))))
+
+(defn- comparison-filter
+ "Create a comparison filter node for testing."
+ [operator dim-ref value]
+ {:node/type :filter/comparison
+ :operator operator
+ :dimension dim-ref
+ :values [value]})
+
+(defn- string-filter
+ "Create a string filter node for testing."
+ [operator dim-ref value]
+ {:node/type :filter/string
+ :operator operator
+ :dimension dim-ref
+ :value value})
+
+(defn- and-filter
+ "Create an AND filter node for testing."
+ [& children]
+ {:node/type :filter/and
+ :children (vec children)})
+
+(defn- or-filter
+ "Create an OR filter node for testing."
+ [& children]
+ {:node/type :filter/or
+ :children (vec children)})
+
+(defn- not-filter
+ "Create a NOT filter node for testing."
+ [child]
+ {:node/type :filter/not
+ :child child})
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+
+(def ^:private dim-ref-1 (dimension-ref uuid-1))
+(def ^:private dim-ref-2 (dimension-ref uuid-2))
+
+(def ^:private filter-a (comparison-filter := dim-ref-1 "a"))
+(def ^:private filter-b (comparison-filter :> dim-ref-2 10))
+(def ^:private filter-c (string-filter :contains dim-ref-1 "foo"))
+
+(def ^:private sample-ast
+ {:node/type :ast/root
+ :source {:node/type :source/metric
+ :id 1
+ :aggregation {:node/type :aggregation/count}
+ :base-table {:node/type :ast/table :id 1}}
+ :dimensions [{:node/type :ast/dimension :id uuid-1}
+ {:node/type :ast/dimension :id uuid-2}]
+ :mappings [{:node/type :ast/dimension-mapping
+ :dimension-id uuid-1
+ :column {:node/type :ast/column :id 1}}]
+ :filter (and-filter filter-a filter-b)
+ :group-by [dim-ref-1]})
+
+;;; -------------------------------------------------- Predicates --------------------------------------------------
+
+(deftest ^:parallel node?-test
+ (testing "returns true for AST nodes"
+ (is (ast.walk/node? {:node/type :ast/root}))
+ (is (ast.walk/node? {:node/type :filter/comparison :operator := :dimension dim-ref-1 :values [1]}))
+ (is (ast.walk/node? {:node/type :ast/column :id 1})))
+
+ (testing "returns false for non-nodes"
+ (is (not (ast.walk/node? {})))
+ (is (not (ast.walk/node? nil)))
+ (is (not (ast.walk/node? "string")))
+ (is (not (ast.walk/node? [:vector])))))
+
+(deftest ^:parallel filter-node?-test
+ (testing "returns true for filter nodes"
+ (is (ast.walk/filter-node? filter-a))
+ (is (ast.walk/filter-node? filter-b))
+ (is (ast.walk/filter-node? (and-filter filter-a filter-b)))
+ (is (ast.walk/filter-node? (not-filter filter-a))))
+
+ (testing "returns false for non-filter nodes"
+ (is (not (ast.walk/filter-node? {:node/type :ast/root})))
+ (is (not (ast.walk/filter-node? {:node/type :ast/column :id 1})))
+ (is (not (ast.walk/filter-node? dim-ref-1)))))
+
+(deftest ^:parallel source-node?-test
+ (testing "returns true for source nodes"
+ (is (ast.walk/source-node? {:node/type :source/metric :id 1}))
+ (is (ast.walk/source-node? {:node/type :source/measure :id 1})))
+
+ (testing "returns false for non-source nodes"
+ (is (not (ast.walk/source-node? {:node/type :ast/root})))
+ (is (not (ast.walk/source-node? filter-a)))))
+
+(deftest ^:parallel dimension-ref-node?-test
+ (testing "returns true for dimension ref nodes"
+ (is (ast.walk/dimension-ref-node? dim-ref-1))
+ (is (ast.walk/dimension-ref-node? (dimension-ref uuid-1 {:temporal-unit :month}))))
+
+ (testing "returns false for other nodes"
+ (is (not (ast.walk/dimension-ref-node? {:node/type :ast/dimension :id uuid-1})))
+ (is (not (ast.walk/dimension-ref-node? filter-a)))))
+
+;;; -------------------------------------------------- Walking --------------------------------------------------
+
+(deftest ^:parallel postwalk-test
+ (testing "visits all nodes depth-first"
+ (let [visited (atom [])
+ result (ast.walk/postwalk
+ (fn [node]
+ (when (ast.walk/node? node)
+ (swap! visited conj (:node/type node)))
+ node)
+ sample-ast)]
+ ;; Children should be visited before parents
+ (is (= result sample-ast))
+ ;; Should have visited filter nodes
+ (is (some #{:filter/comparison} @visited))
+ (is (some #{:filter/and} @visited))
+ ;; And root
+ (is (some #{:ast/root} @visited)))))
+
+(deftest ^:parallel prewalk-test
+ (testing "visits nodes before children"
+ (let [visited (atom [])]
+ (ast.walk/prewalk
+ (fn [node]
+ (when (ast.walk/node? node)
+ (swap! visited conj (:node/type node)))
+ node)
+ sample-ast)
+ ;; Root should be first
+ (is (= :ast/root (first @visited))))))
+
+;;; -------------------------------------------------- Collecting --------------------------------------------------
+
+(deftest ^:parallel collect-test
+ (testing "collects nodes matching predicate"
+ (let [filters (ast.walk/collect ast.walk/filter-node? sample-ast)]
+ (is (= 3 (count filters))) ; filter-a, filter-b, and the :filter/and
+ (is (every? ast.walk/filter-node? filters)))))
+
+(deftest ^:parallel collect-dimension-refs-test
+ (testing "collects all dimension refs"
+ (let [refs (ast.walk/collect-dimension-refs sample-ast)]
+ ;; dim-ref-1 in group-by, dim-ref-1 in filter-a, dim-ref-2 in filter-b
+ (is (= 3 (count refs)))
+ (is (every? ast.walk/dimension-ref-node? refs)))))
+
+(deftest ^:parallel collect-by-type-test
+ (testing "collects nodes by type"
+ (let [dims (ast.walk/collect-by-type :ast/dimension sample-ast)]
+ (is (= 2 (count dims)))
+ (is (every? #(= :ast/dimension (:node/type %)) dims)))))
+
+;;; -------------------------------------------------- Transforming --------------------------------------------------
+
+(deftest ^:parallel transform-test
+ (testing "transforms matching nodes"
+ (let [result (ast.walk/transform
+ #(= :filter/comparison (:node/type %))
+ #(assoc % :transformed true)
+ sample-ast)]
+ ;; Original filters in :filter/and children should be transformed
+ (is (every? :transformed (get-in result [:filter :children]))))))
+
+(deftest ^:parallel transform-by-type-test
+ (testing "transforms nodes by type"
+ (let [result (ast.walk/transform-by-type
+ :ast/dimension-ref
+ #(assoc % :marked true)
+ sample-ast)]
+ ;; All dimension refs should be marked
+ (is (every? :marked (ast.walk/collect-dimension-refs result))))))
+
+;;; -------------------------------------------------- Finding --------------------------------------------------
+
+(deftest ^:parallel find-first-test
+ (testing "finds first matching node"
+ (let [found (ast.walk/find-first
+ #(= :filter/comparison (:node/type %))
+ sample-ast)]
+ (is (= :filter/comparison (:node/type found)))))
+
+ (testing "returns nil when not found"
+ (let [found (ast.walk/find-first
+ #(= :nonexistent (:node/type %))
+ sample-ast)]
+ (is (nil? found)))))
+
+(deftest ^:parallel count-nodes-test
+ (testing "counts matching nodes"
+ (is (= 2 (ast.walk/count-nodes
+ #(= :filter/comparison (:node/type %))
+ sample-ast)))
+ (is (= 3 (ast.walk/count-nodes
+ ast.walk/dimension-ref-node?
+ sample-ast)))))
+
+;;; -------------------------------------------------- Replace/Remove --------------------------------------------------
+
+(deftest ^:parallel replace-node-test
+ (testing "replaces matching nodes with value"
+ (let [placeholder {:node/type :filter/comparison
+ :operator :=
+ :dimension dim-ref-1
+ :values ["REPLACED"]}
+ result (ast.walk/replace-node
+ #(and (= :filter/comparison (:node/type %))
+ (= := (:operator %)))
+ placeholder
+ sample-ast)]
+ ;; filter-a had := operator, should be replaced
+ (is (= ["REPLACED"] (get-in result [:filter :children 0 :values]))))))
+
+(deftest ^:parallel remove-filters-test
+ (testing "removes matching filters from and"
+ (let [result (ast.walk/remove-filters
+ #(= :> (:operator %))
+ sample-ast)]
+ ;; filter-b had :> operator, should be removed
+ ;; Since only one child remains, :filter/and should be unwrapped
+ (is (= :filter/comparison (get-in result [:filter :node/type])))
+ (is (= := (get-in result [:filter :operator])))))
+
+ (testing "removes all filters leaving nil"
+ (let [all-comparison (ast.walk/remove-filters
+ #(= :filter/comparison (:node/type %))
+ sample-ast)]
+ (is (nil? (:filter all-comparison)))))
+
+ (testing "handles nested compound filters"
+ (let [nested-ast (assoc sample-ast
+ :filter (and-filter
+ (or-filter filter-a filter-b)
+ filter-c))
+ result (ast.walk/remove-filters
+ #(= :> (:operator %))
+ nested-ast)]
+ ;; filter-b removed from inner :or, leaving just filter-a
+ ;; Inner :or should unwrap to just filter-a
+ (is (= :filter/and (get-in result [:filter :node/type])))
+ (is (= 2 (count (get-in result [:filter :children]))))))
+
+ (testing "handles nested compound where all inner children are removed"
+ (let [nested-ast (assoc sample-ast
+ :filter (and-filter
+ (or-filter filter-a filter-b)
+ filter-c))
+ ;; Remove all comparison filters — inner :or loses both children → nil
+ result (ast.walk/remove-filters
+ #(= :filter/comparison (:node/type %))
+ nested-ast)]
+ ;; Only filter-c (string filter) should remain, :and unwrapped
+ (is (= :filter/string (get-in result [:filter :node/type])))
+ (is (= :contains (get-in result [:filter :operator]))))))
+
+;;; -------------------------------------------------- Complex Transformations --------------------------------------------------
+
+(def ^:private audit-uuid "550e8400-e29b-41d4-a716-446655440099")
+
+(deftest ^:parallel complex-transformation-test
+ (testing "can inject audit filter into source"
+ (let [audit-filter (comparison-filter := (dimension-ref audit-uuid) 123)
+ result (ast.walk/transform
+ ast.walk/source-node?
+ (fn [source]
+ (update source :filters
+ (fn [existing]
+ (if existing
+ (and-filter existing audit-filter)
+ audit-filter))))
+ sample-ast)]
+ (is (= audit-filter (get-in result [:source :filters]))))))
+
+(deftest ^:parallel dimension-ref-collection-from-filters-test
+ (testing "can collect dimension refs from filters only"
+ (let [filter-only-ast {:node/type :ast/root
+ :source (:source sample-ast)
+ :dimensions []
+ :mappings []
+ :filter (and-filter
+ (comparison-filter := dim-ref-1 1)
+ (comparison-filter := dim-ref-2 2)
+ (or-filter
+ (comparison-filter := dim-ref-1 3)
+ (comparison-filter := dim-ref-2 4)))
+ :group-by []}
+ refs (ast.walk/collect-dimension-refs filter-only-ast)]
+ (is (= 4 (count refs)))
+ (is (= #{uuid-1 uuid-2} (set (map :dimension-id refs)))))))
diff --git a/test/metabase/lib_metric/binning_test.cljc b/test/metabase/lib_metric/binning_test.cljc
new file mode 100644
index 00000000000..4b34120d8e3
--- /dev/null
+++ b/test/metabase/lib_metric/binning_test.cljc
@@ -0,0 +1,251 @@
+(ns metabase.lib-metric.binning-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.metadata.provider :as lib-metric.metadata.provider]
+ [metabase.lib-metric.projection :as lib-metric.projection]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-numeric "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-latitude "550e8400-e29b-41d4-a716-446655440002")
+(def ^:private uuid-longitude "550e8400-e29b-41d4-a716-446655440003")
+(def ^:private uuid-no-fingerprint "550e8400-e29b-41d4-a716-446655440004")
+(def ^:private uuid-text "550e8400-e29b-41d4-a716-446655440005")
+(def ^:private uuid-fk "550e8400-e29b-41d4-a716-446655440006")
+
+(def ^:private numeric-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-numeric
+ :name "amount"
+ :display-name "Amount"
+ :effective-type :type/Number
+ :semantic-type nil
+ :sources [{:type :field, :field-id 1, :binning true}]
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private latitude-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-latitude
+ :name "latitude"
+ :display-name "Latitude"
+ :effective-type :type/Number
+ :semantic-type :type/Latitude
+ :sources [{:type :field, :field-id 2, :binning true}]
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private longitude-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-longitude
+ :name "longitude"
+ :display-name "Longitude"
+ :effective-type :type/Number
+ :semantic-type :type/Longitude
+ :sources [{:type :field, :field-id 3, :binning true}]
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private no-sources-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-no-fingerprint
+ :name "score"
+ :display-name "Score"
+ :effective-type :type/Number
+ :semantic-type nil
+ :sources []
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private text-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-text
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type :type/Category
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private fk-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-fk
+ :name "user_id"
+ :display-name "User ID"
+ :effective-type :type/Integer
+ :semantic-type :type/FK
+ :sources [{:type :field, :field-id 6, :binning true}]
+ :source-type :metric
+ :source-id 1})
+
+(defn- make-mock-provider
+ "Create a mock metadata provider that returns the given dimensions for metric-id queries."
+ [dimensions]
+ (lib-metric.metadata.provider/metric-context-metadata-provider
+ ;; metric-fetcher-fn
+ (fn [_metadata-spec] [])
+ ;; measure-fetcher-fn
+ nil
+ ;; dimension-fetcher-fn
+ (fn [{:keys [metric-id]}]
+ (if metric-id
+ (filterv #(and (= :metric (:source-type %))
+ (= metric-id (:source-id %)))
+ dimensions)
+ dimensions))
+ ;; table->db-fn
+ (constantly nil)
+ ;; db-provider-fn
+ (constantly nil)
+ ;; setting-fn
+ (constantly nil)))
+
+(def ^:private sample-dimensions
+ [numeric-dimension latitude-dimension longitude-dimension no-sources-dimension text-dimension fk-dimension])
+
+(def ^:private definition
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440099"} 1]
+ :filters []
+ :projections []
+ :metadata-provider (make-mock-provider sample-dimensions)})
+
+;;; -------------------------------------------------- available-binning-strategies --------------------------------------------------
+
+(deftest ^:parallel available-binning-strategies-numeric-test
+ (testing "Numeric dimension with binning sources returns numeric binning strategies"
+ (let [strategies (lib-metric.projection/available-binning-strategies definition numeric-dimension)]
+ (is (sequential? strategies))
+ (is (pos? (count strategies)))
+ ;; All strategies should have :lib/type and :display-name
+ (is (every? #(= :option/binning (:lib/type %)) strategies))
+ (is (every? #(contains? % :display-name) strategies))
+ ;; Should include auto bin and num-bins options
+ (is (some #(= :default (get-in % [:mbql :strategy])) strategies)))))
+
+(deftest ^:parallel available-binning-strategies-coordinate-test
+ (testing "Coordinate dimension returns coordinate binning strategies"
+ (let [lat-strategies (lib-metric.projection/available-binning-strategies definition latitude-dimension)
+ lon-strategies (lib-metric.projection/available-binning-strategies definition longitude-dimension)]
+ (is (sequential? lat-strategies))
+ (is (pos? (count lat-strategies)))
+ (is (sequential? lon-strategies))
+ (is (pos? (count lon-strategies)))
+ ;; Coordinate binning uses bin-width strategy
+ (is (some #(= :bin-width (get-in % [:mbql :strategy])) lat-strategies)))))
+
+(deftest ^:parallel available-binning-strategies-no-sources-test
+ (testing "Dimension without field-backed sources returns nil"
+ (let [strategies (lib-metric.projection/available-binning-strategies definition no-sources-dimension)]
+ (is (nil? strategies)))))
+
+(deftest ^:parallel available-binning-strategies-non-numeric-test
+ (testing "Non-numeric dimension returns nil"
+ (let [strategies (lib-metric.projection/available-binning-strategies definition text-dimension)]
+ (is (nil? strategies)))))
+
+(deftest ^:parallel available-binning-strategies-fk-test
+ (testing "Foreign key dimension returns nil despite being numeric"
+ (let [strategies (lib-metric.projection/available-binning-strategies definition fk-dimension)]
+ ;; FK is :Relation/* which should be excluded
+ (is (nil? strategies)))))
+
+(deftest ^:parallel available-binning-strategies-marks-selected-test
+ (testing "Selected binning is marked when projection has binning"
+ (let [binning {:strategy :num-bins :num-bins 10}
+ projection [:dimension {:binning binning} uuid-numeric]
+ def-with-proj (assoc definition :projections [{:type :metric :id 1 :projection [projection]}])
+ strategies (lib-metric.projection/available-binning-strategies def-with-proj numeric-dimension)]
+ ;; The matching strategy should be marked as selected
+ (is (some #(and (= 10 (get-in % [:mbql :num-bins])) (:selected %)) strategies)))))
+
+;;; -------------------------------------------------- binning --------------------------------------------------
+
+(deftest ^:parallel binning-extracts-binning-test
+ (testing "binning extracts binning options from projection"
+ (let [binning {:strategy :num-bins :num-bins 10}
+ projection [:dimension {:binning binning} uuid-numeric]
+ result (lib-metric.projection/binning projection)]
+ (is (= :num-bins (:strategy result)))
+ (is (= 10 (:num-bins result))))))
+
+(deftest ^:parallel binning-returns-nil-when-no-binning-test
+ (testing "binning returns nil when no binning in options"
+ (let [projection [:dimension {} uuid-numeric]
+ result (lib-metric.projection/binning projection)]
+ (is (nil? result)))))
+
+(deftest ^:parallel binning-handles-various-strategies-test
+ (testing "binning works with various binning strategies"
+ (doseq [binning [{:strategy :default}
+ {:strategy :num-bins :num-bins 10}
+ {:strategy :num-bins :num-bins 50}
+ {:strategy :bin-width :bin-width 1.0}]]
+ (let [projection [:dimension {:binning binning} uuid-numeric]
+ result (lib-metric.projection/binning projection)]
+ (is (= (:strategy binning) (:strategy result))
+ (str "Failed for strategy: " (:strategy binning)))))))
+
+;;; -------------------------------------------------- with-binning --------------------------------------------------
+
+(deftest ^:parallel with-binning-adds-binning-test
+ (testing "with-binning adds binning to projection"
+ (let [projection [:dimension {} uuid-numeric]
+ binning {:strategy :num-bins :num-bins 10}
+ result (lib-metric.projection/with-binning projection binning)]
+ (is (= :dimension (first result)))
+ (is (= binning (:binning (second result))))
+ (is (= uuid-numeric (nth result 2))))))
+
+(deftest ^:parallel with-binning-replaces-existing-binning-test
+ (testing "with-binning replaces existing binning"
+ (let [projection [:dimension {:binning {:strategy :num-bins :num-bins 10}} uuid-numeric]
+ new-binning {:strategy :num-bins :num-bins 50}
+ result (lib-metric.projection/with-binning projection new-binning)]
+ (is (= 50 (:num-bins (:binning (second result))))))))
+
+(deftest ^:parallel with-binning-removes-binning-with-nil-test
+ (testing "with-binning removes binning when passed nil"
+ (let [projection [:dimension {:binning {:strategy :num-bins :num-bins 10}} uuid-numeric]
+ result (lib-metric.projection/with-binning projection nil)]
+ (is (nil? (:binning (second result)))))))
+
+(deftest ^:parallel with-binning-accepts-binning-option-test
+ (testing "with-binning accepts binning option with :mbql key"
+ (let [projection [:dimension {} uuid-numeric]
+ binning-option {:lib/type :option/binning
+ :display-name "10 bins"
+ :mbql {:strategy :num-bins :num-bins 10}}
+ result (lib-metric.projection/with-binning projection binning-option)]
+ (is (= {:strategy :num-bins :num-bins 10} (:binning (second result)))))))
+
+(deftest ^:parallel with-binning-preserves-other-options-test
+ (testing "with-binning preserves other options"
+ (let [projection [:dimension {:lib/uuid "test-uuid" :display-name "Test"} uuid-numeric]
+ binning {:strategy :default}
+ result (lib-metric.projection/with-binning projection binning)]
+ (is (= "test-uuid" (:lib/uuid (second result))))
+ (is (= "Test" (:display-name (second result))))
+ (is (= binning (:binning (second result)))))))
+
+;;; -------------------------------------------------- DimensionMetadata acceptance --------------------------------------------------
+
+(deftest ^:parallel binning-accepts-dimension-metadata-test
+ (testing "binning accepts a DimensionMetadata map and returns nil (no binning on bare dimension)"
+ (is (nil? (lib-metric.projection/binning numeric-dimension)))))
+
+(deftest ^:parallel with-binning-accepts-dimension-metadata-test
+ (testing "with-binning accepts a DimensionMetadata map and produces a properly formed dimension reference"
+ (let [binning {:strategy :num-bins :num-bins 10}
+ result (lib-metric.projection/with-binning numeric-dimension binning)]
+ (is (= :dimension (first result)))
+ (is (= uuid-numeric (nth result 2)))
+ (is (= binning (:binning (second result)))))))
+
+(deftest ^:parallel with-binning-dimension-metadata-roundtrip-test
+ (testing "apply binning to a dimension metadata, then extract it back"
+ (let [binning {:strategy :num-bins :num-bins 10}
+ result (lib-metric.projection/with-binning numeric-dimension binning)
+ extracted (lib-metric.projection/binning result)]
+ (is (= :num-bins (:strategy extracted)))
+ (is (= 10 (:num-bins extracted))))))
diff --git a/test/metabase/lib_metric/clause_test.cljc b/test/metabase/lib_metric/clause_test.cljc
new file mode 100644
index 00000000000..6aff0897b63
--- /dev/null
+++ b/test/metabase/lib_metric/clause_test.cljc
@@ -0,0 +1,190 @@
+(ns metabase.lib-metric.clause-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.clause :as lib-metric.clause]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+(def ^:private uuid-3 "550e8400-e29b-41d4-a716-446655440003")
+(def ^:private uuid-4 "550e8400-e29b-41d4-a716-446655440004")
+
+(def ^:private expr-uuid "550e8400-e29b-41d4-a716-446655440000")
+
+(def ^:private filter-1 [:= {:lib/uuid uuid-1} [:dimension {} "dim-a"] "value-a"])
+(def ^:private filter-2 [:> {:lib/uuid uuid-2} [:dimension {} "dim-b"] 100])
+(def ^:private filter-3 [:contains {:lib/uuid uuid-3} [:dimension {} "dim-c"] "search"])
+
+(def ^:private inst-filter-1 {:lib/uuid expr-uuid :filter filter-1})
+(def ^:private inst-filter-2 {:lib/uuid expr-uuid :filter filter-2})
+(def ^:private inst-filter-3 {:lib/uuid expr-uuid :filter filter-3})
+
+(def ^:private projection-1 [:dimension {:lib/uuid uuid-1} "dim-a"])
+(def ^:private projection-2 [:dimension {:lib/uuid uuid-2} "dim-b"])
+(def ^:private projection-3 [:dimension {:lib/uuid uuid-3} "dim-c"])
+
+(def ^:private base-definition
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid expr-uuid} 1]
+ :filters []
+ :projections []
+ :metadata-provider nil})
+
+;;; -------------------------------------------------- replace-clause --------------------------------------------------
+
+(deftest ^:parallel replace-clause-filter-test
+ (testing "replace-clause replaces a filter by UUID match"
+ (let [definition (assoc base-definition :filters [inst-filter-1 inst-filter-2])
+ new-filter [:!= {:lib/uuid uuid-1} [:dimension {} "dim-a"] "new-value"]
+ result (lib-metric.clause/replace-clause definition filter-1 new-filter)]
+ (is (= new-filter (get-in result [:filters 0 :filter])))
+ (is (= filter-2 (get-in result [:filters 1 :filter]))))))
+
+(deftest ^:parallel replace-clause-projection-test
+ (testing "replace-clause replaces a projection by UUID match"
+ (let [definition (assoc base-definition :projections [{:type :metric :id 1 :projection [projection-1 projection-2]}])
+ new-projection [:dimension {:lib/uuid uuid-1 :temporal-unit :month} "dim-a"]
+ result (lib-metric.clause/replace-clause definition projection-1 new-projection)]
+ (is (= new-projection (get-in result [:projections 0 :projection 0])))
+ (is (= projection-2 (get-in result [:projections 0 :projection 1]))))))
+
+(deftest ^:parallel replace-clause-middle-element-test
+ (testing "replace-clause replaces middle element correctly"
+ (let [definition (assoc base-definition :filters [inst-filter-1 inst-filter-2 inst-filter-3])
+ new-filter [:between {:lib/uuid uuid-2} [:dimension {} "dim-b"] 0 200]
+ result (lib-metric.clause/replace-clause definition filter-2 new-filter)]
+ (is (= filter-1 (get-in result [:filters 0 :filter])))
+ (is (= new-filter (get-in result [:filters 1 :filter])))
+ (is (= filter-3 (get-in result [:filters 2 :filter]))))))
+
+(deftest ^:parallel replace-clause-not-found-test
+ (testing "replace-clause returns original definition when clause not found"
+ (let [definition (assoc base-definition :filters [inst-filter-1])
+ unknown-filter [:= {:lib/uuid uuid-4} [:dimension {} "unknown"] "x"]
+ new-filter [:!= {:lib/uuid uuid-4} [:dimension {} "unknown"] "y"]
+ result (lib-metric.clause/replace-clause definition unknown-filter new-filter)]
+ (is (= definition result)))))
+
+(deftest ^:parallel replace-clause-empty-vectors-test
+ (testing "replace-clause returns original when vectors are empty"
+ (let [result (lib-metric.clause/replace-clause base-definition filter-1 filter-2)]
+ (is (= base-definition result)))))
+
+;;; -------------------------------------------------- remove-clause --------------------------------------------------
+
+(deftest ^:parallel remove-clause-filter-test
+ (testing "remove-clause removes a filter by UUID match"
+ (let [definition (assoc base-definition :filters [inst-filter-1 inst-filter-2])
+ result (lib-metric.clause/remove-clause definition filter-1)]
+ (is (= [inst-filter-2] (:filters result))))))
+
+(deftest ^:parallel remove-clause-projection-test
+ (testing "remove-clause removes a projection by UUID match"
+ (let [definition (assoc base-definition :projections [{:type :metric :id 1 :projection [projection-1 projection-2]}])
+ result (lib-metric.clause/remove-clause definition projection-1)]
+ (is (= [projection-2] (get-in result [:projections 0 :projection]))))))
+
+(deftest ^:parallel remove-clause-middle-element-test
+ (testing "remove-clause removes middle element correctly"
+ (let [definition (assoc base-definition :filters [inst-filter-1 inst-filter-2 inst-filter-3])
+ result (lib-metric.clause/remove-clause definition filter-2)]
+ (is (= [inst-filter-1 inst-filter-3] (:filters result))))))
+
+(deftest ^:parallel remove-clause-last-element-test
+ (testing "remove-clause removes last element leaving empty vector"
+ (let [definition (assoc base-definition :filters [inst-filter-1])
+ result (lib-metric.clause/remove-clause definition filter-1)]
+ (is (= [] (:filters result))))))
+
+(deftest ^:parallel remove-clause-not-found-test
+ (testing "remove-clause returns original definition when clause not found"
+ (let [definition (assoc base-definition :filters [inst-filter-1])
+ unknown-filter [:= {:lib/uuid uuid-4} [:dimension {} "unknown"] "x"]
+ result (lib-metric.clause/remove-clause definition unknown-filter)]
+ (is (= definition result)))))
+
+(deftest ^:parallel remove-clause-empty-vectors-test
+ (testing "remove-clause returns original when vectors are empty"
+ (let [result (lib-metric.clause/remove-clause base-definition filter-1)]
+ (is (= base-definition result)))))
+
+(deftest ^:parallel remove-clause-first-of-many-test
+ (testing "remove-clause removes first projection element of many"
+ (let [definition (assoc base-definition :projections [{:type :metric :id 1 :projection [projection-1 projection-2 projection-3]}])
+ result (lib-metric.clause/remove-clause definition projection-1)]
+ (is (= [projection-2 projection-3] (get-in result [:projections 0 :projection]))))))
+
+(deftest ^:parallel remove-clause-last-of-many-test
+ (testing "remove-clause removes last projection element of many"
+ (let [definition (assoc base-definition :projections [{:type :metric :id 1 :projection [projection-1 projection-2 projection-3]}])
+ result (lib-metric.clause/remove-clause definition projection-3)]
+ (is (= [projection-1 projection-2] (get-in result [:projections 0 :projection]))))))
+
+;;; -------------------------------------------------- swap-clauses --------------------------------------------------
+
+(deftest ^:parallel swap-clauses-within-filters-test
+ (testing "swap-clauses swaps two filters"
+ (let [definition (assoc base-definition :filters [inst-filter-1 inst-filter-2 inst-filter-3])
+ result (lib-metric.clause/swap-clauses definition filter-1 filter-3)]
+ (is (= filter-3 (get-in result [:filters 0 :filter])))
+ (is (= filter-2 (get-in result [:filters 1 :filter])))
+ (is (= filter-1 (get-in result [:filters 2 :filter]))))))
+
+(deftest ^:parallel swap-clauses-within-projections-test
+ (testing "swap-clauses swaps two projections"
+ (let [definition (assoc base-definition :projections [{:type :metric :id 1 :projection [projection-1 projection-2 projection-3]}])
+ result (lib-metric.clause/swap-clauses definition projection-1 projection-2)]
+ (is (= [projection-2 projection-1 projection-3]
+ (get-in result [:projections 0 :projection]))))))
+
+(deftest ^:parallel swap-clauses-across-vectors-test
+ (testing "swap-clauses swaps filter with projection"
+ (let [definition (assoc base-definition
+ :filters [inst-filter-1 inst-filter-2]
+ :projections [{:type :metric :id 1 :projection [projection-3]}])
+ result (lib-metric.clause/swap-clauses definition filter-1 projection-3)]
+ ;; filter-1's spot now has projection-3
+ (is (= projection-3 (get-in result [:filters 0 :filter])))
+ ;; projection-3's spot now has filter-1
+ (is (= filter-1 (get-in result [:projections 0 :projection 0]))))))
+
+(deftest ^:parallel swap-clauses-adjacent-test
+ (testing "swap-clauses swaps adjacent elements"
+ (let [definition (assoc base-definition :filters [inst-filter-1 inst-filter-2])
+ result (lib-metric.clause/swap-clauses definition filter-1 filter-2)]
+ (is (= filter-2 (get-in result [:filters 0 :filter])))
+ (is (= filter-1 (get-in result [:filters 1 :filter]))))))
+
+(deftest ^:parallel swap-clauses-source-not-found-test
+ (testing "swap-clauses returns original when source clause not found"
+ (let [definition (assoc base-definition :filters [inst-filter-1])
+ unknown-filter [:= {:lib/uuid uuid-4} [:dimension {} "unknown"] "x"]
+ result (lib-metric.clause/swap-clauses definition unknown-filter filter-1)]
+ (is (= definition result)))))
+
+(deftest ^:parallel swap-clauses-target-not-found-test
+ (testing "swap-clauses returns original when target clause not found"
+ (let [definition (assoc base-definition :filters [inst-filter-1])
+ unknown-filter [:= {:lib/uuid uuid-4} [:dimension {} "unknown"] "x"]
+ result (lib-metric.clause/swap-clauses definition filter-1 unknown-filter)]
+ (is (= definition result)))))
+
+(deftest ^:parallel swap-clauses-both-not-found-test
+ (testing "swap-clauses returns original when both clauses not found"
+ (let [unknown-filter-a [:= {:lib/uuid "aaaa"} [:dimension {} "a"] "x"]
+ unknown-filter-b [:= {:lib/uuid "bbbb"} [:dimension {} "b"] "y"]
+ result (lib-metric.clause/swap-clauses base-definition unknown-filter-a unknown-filter-b)]
+ (is (= base-definition result)))))
+
+(deftest ^:parallel swap-clauses-empty-vectors-test
+ (testing "swap-clauses returns original when vectors are empty"
+ (let [result (lib-metric.clause/swap-clauses base-definition filter-1 filter-2)]
+ (is (= base-definition result)))))
+
+(deftest ^:parallel swap-clauses-same-clause-test
+ (testing "swap-clauses handles swapping clause with itself (no-op)"
+ (let [definition (assoc base-definition :filters [inst-filter-1 inst-filter-2])
+ result (lib-metric.clause/swap-clauses definition filter-1 filter-1)]
+ (is (= filter-1 (get-in result [:filters 0 :filter])))
+ (is (= filter-2 (get-in result [:filters 1 :filter]))))))
diff --git a/test/metabase/lib_metric/definition_test.cljc b/test/metabase/lib_metric/definition_test.cljc
new file mode 100644
index 00000000000..3e84ec98e8c
--- /dev/null
+++ b/test/metabase/lib_metric/definition_test.cljc
@@ -0,0 +1,283 @@
+(ns metabase.lib-metric.definition-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [malli.error :as me]
+ [metabase.lib-metric.definition :as lib-metric.definition]
+ [metabase.lib-metric.measures :as lib-metric.measures]
+ [metabase.lib-metric.metrics :as lib-metric.metrics]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.util.malli.registry :as mr]))
+
+;; Ensure multimethod implementations are loaded
+(comment lib-metric.measures/keep-me
+ lib-metric.metrics/keep-me)
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+
+(def ^:private target-1 [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 1])
+(def ^:private target-2 [:field {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 2])
+
+(def ^:private sample-dimensions
+ [{:id uuid-1 :name "category" :display-name "Category" :status :status/active}
+ {:id uuid-2 :name "created_at" :display-name "Created At" :status :status/active}])
+
+(def ^:private sample-mappings
+ [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}
+ {:type :table :table-id 1 :dimension-id uuid-2 :target target-2}])
+
+(def ^:private sample-metric-metadata
+ {:lib/type :metadata/metric
+ :id 42
+ :name "Total Revenue"
+ :dimensions sample-dimensions
+ :dimension-mappings sample-mappings
+ :dataset-query {:database 1 :type :query :query {:source-table 1}}})
+
+(def ^:private sample-measure-metadata
+ {:lib/type :metadata/measure
+ :id 99
+ :name "Average Order Value"
+ :dimensions sample-dimensions
+ :dimension-mappings sample-mappings
+ :definition {:database 1 :type :query :query {:source-table 2}}})
+
+(def ^:private mock-provider
+ "A mock metadata provider for testing."
+ :mock-provider)
+
+;;; -------------------------------------------------- from-metric-metadata --------------------------------------------------
+
+(deftest ^:parallel from-metric-metadata-creates-valid-definition-test
+ (let [definition (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)]
+ (testing "has correct lib/type"
+ (is (= :metric/definition (:lib/type definition))))
+ (testing "has correct expression"
+ (let [expr (:expression definition)]
+ (is (= :metric (first expr)))
+ (is (string? (get (second expr) :lib/uuid)))
+ (is (= 42 (nth expr 2)))))
+ (testing "dimensions are derived later, not stored in definition"
+ (is (nil? (:dimensions definition))))
+ (testing "dimension-mappings are derived later, not stored in definition"
+ (is (nil? (:dimension-mappings definition))))
+ (testing "starts with empty filters"
+ (is (= [] (:filters definition))))
+ (testing "starts with empty projections"
+ (is (= [] (:projections definition))))
+ (testing "preserves metadata-provider"
+ (is (= mock-provider (:metadata-provider definition))))))
+
+(deftest ^:parallel from-metric-metadata-validates-schema-test
+ (let [definition (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)]
+ (is (nil? (me/humanize (mr/explain ::lib-metric.schema/metric-definition definition)))
+ "definition should conform to the Malli schema")))
+
+;; Note: dimensions and dimension-mappings are derived when building the AST,
+;; not copied from metadata to definition. Tests for dimension derivation
+;; belong in the AST build tests.
+
+;;; -------------------------------------------------- from-measure-metadata --------------------------------------------------
+
+(deftest ^:parallel from-measure-metadata-creates-valid-definition-test
+ (let [definition (lib-metric.definition/from-measure-metadata mock-provider sample-measure-metadata)]
+ (testing "has correct lib/type"
+ (is (= :metric/definition (:lib/type definition))))
+ (testing "has correct expression"
+ (let [expr (:expression definition)]
+ (is (= :measure (first expr)))
+ (is (string? (get (second expr) :lib/uuid)))
+ (is (= 99 (nth expr 2)))))
+ (testing "dimensions are derived later, not stored in definition"
+ (is (nil? (:dimensions definition))))
+ (testing "dimension-mappings are derived later, not stored in definition"
+ (is (nil? (:dimension-mappings definition))))
+ (testing "starts with empty filters"
+ (is (= [] (:filters definition))))
+ (testing "starts with empty projections"
+ (is (= [] (:projections definition))))
+ (testing "preserves metadata-provider"
+ (is (= mock-provider (:metadata-provider definition))))))
+
+(deftest ^:parallel from-measure-metadata-validates-schema-test
+ (let [definition (lib-metric.definition/from-measure-metadata mock-provider sample-measure-metadata)]
+ (is (nil? (me/humanize (mr/explain ::lib-metric.schema/metric-definition definition)))
+ "definition should conform to the Malli schema")))
+
+;; Note: dimensions and dimension-mappings are derived when building the AST,
+;; not copied from metadata to definition. Tests for dimension derivation
+;; belong in the AST build tests.
+
+;;; -------------------------------------------------- source-metric-id --------------------------------------------------
+
+(deftest ^:parallel source-metric-id-returns-id-for-metric-based-definition-test
+ (let [definition (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)]
+ (is (= 42 (lib-metric.definition/source-metric-id definition)))))
+
+(deftest ^:parallel source-metric-id-returns-nil-for-measure-based-definition-test
+ (let [definition (lib-metric.definition/from-measure-metadata mock-provider sample-measure-metadata)]
+ (is (nil? (lib-metric.definition/source-metric-id definition)))))
+
+;;; -------------------------------------------------- source-measure-id --------------------------------------------------
+
+(deftest ^:parallel source-measure-id-returns-id-for-measure-based-definition-test
+ (let [definition (lib-metric.definition/from-measure-metadata mock-provider sample-measure-metadata)]
+ (is (= 99 (lib-metric.definition/source-measure-id definition)))))
+
+(deftest ^:parallel source-measure-id-returns-nil-for-metric-based-definition-test
+ (let [definition (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)]
+ (is (nil? (lib-metric.definition/source-measure-id definition)))))
+
+;;; -------------------------------------------------- filters --------------------------------------------------
+
+(deftest ^:parallel filters-returns-empty-vector-for-new-definition-test
+ (let [definition (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)]
+ (is (= [] (lib-metric.definition/filters definition)))))
+
+(deftest ^:parallel filters-returns-filters-from-definition-test
+ (let [filter-clause [:= [:dimension {} uuid-1] "Electronics"]
+ definition (-> (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)
+ (assoc :filters [{:lib/uuid "inst-1" :filter filter-clause}]))]
+ (is (= [{:lib/uuid "inst-1" :filter filter-clause}] (lib-metric.definition/filters definition)))))
+
+(deftest ^:parallel filters-returns-multiple-filters-test
+ (let [filter-1 [:= [:dimension {} uuid-1] "Electronics"]
+ filter-2 [:> [:dimension {} uuid-2] "2024-01-01"]
+ definition (-> (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)
+ (assoc :filters [{:lib/uuid "inst-1" :filter filter-1}
+ {:lib/uuid "inst-1" :filter filter-2}]))]
+ (is (= 2 (count (lib-metric.definition/filters definition))))))
+
+;;; -------------------------------------------------- projections --------------------------------------------------
+
+(deftest ^:parallel projections-returns-empty-vector-for-new-definition-test
+ (let [definition (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)]
+ (is (= [] (lib-metric.definition/projections definition)))))
+
+(deftest ^:parallel projections-returns-projections-from-definition-test
+ (let [projection [:dimension {} uuid-1]
+ definition (-> (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)
+ (assoc :projections [{:type :metric :id 42 :projection [projection]}]))]
+ (is (= [{:type :metric :id 42 :projection [projection]}]
+ (lib-metric.definition/projections definition)))))
+
+(deftest ^:parallel projections-returns-multiple-projections-test
+ (let [projection-1 [:dimension {} uuid-1]
+ projection-2 [:dimension {:temporal-unit :month} uuid-2]
+ definition (-> (lib-metric.definition/from-metric-metadata mock-provider sample-metric-metadata)
+ (assoc :projections [{:type :metric :id 42 :projection [projection-1 projection-2]}]))]
+ (is (= [projection-1 projection-2]
+ (lib-metric.definition/flat-projections (lib-metric.definition/projections definition))))))
+
+;;; -------------------------------------------------- Expression Helpers --------------------------------------------------
+
+(deftest ^:parallel expression-leaf?-test
+ (testing "metric leaf"
+ (is (lib-metric.definition/expression-leaf? [:metric {:lib/uuid "a"} 42])))
+ (testing "measure leaf"
+ (is (lib-metric.definition/expression-leaf? [:measure {:lib/uuid "a"} 99])))
+ (testing "arithmetic is not a leaf"
+ (is (not (lib-metric.definition/expression-leaf? [:+ {} [:metric {:lib/uuid "a"} 1] [:metric {:lib/uuid "b"} 2]]))))
+ (testing "nil is not a leaf"
+ (is (not (lib-metric.definition/expression-leaf? nil)))))
+
+(deftest ^:parallel expression-leaf-type-test
+ (is (= :metric (lib-metric.definition/expression-leaf-type [:metric {:lib/uuid "a"} 42])))
+ (is (= :measure (lib-metric.definition/expression-leaf-type [:measure {:lib/uuid "a"} 99])))
+ (is (nil? (lib-metric.definition/expression-leaf-type [:+ {} [:metric {:lib/uuid "a"} 1]]))))
+
+(deftest ^:parallel expression-leaf-id-test
+ (is (= 42 (lib-metric.definition/expression-leaf-id [:metric {:lib/uuid "a"} 42])))
+ (is (= 99 (lib-metric.definition/expression-leaf-id [:measure {:lib/uuid "a"} 99])))
+ (is (nil? (lib-metric.definition/expression-leaf-id nil))))
+
+(deftest ^:parallel expression-leaf-uuid-test
+ (is (= "a" (lib-metric.definition/expression-leaf-uuid [:metric {:lib/uuid "a"} 42])))
+ (is (nil? (lib-metric.definition/expression-leaf-uuid nil))))
+
+(deftest ^:parallel flat-projections-test
+ (testing "empty"
+ (is (= [] (lib-metric.definition/flat-projections []))))
+ (testing "single entry with multiple dim-refs"
+ (let [dr1 [:dimension {} "d1"]
+ dr2 [:dimension {} "d2"]]
+ (is (= [dr1 dr2]
+ (lib-metric.definition/flat-projections [{:type :metric :id 1 :projection [dr1 dr2]}])))))
+ (testing "multiple entries"
+ (let [dr1 [:dimension {} "d1"]
+ dr2 [:dimension {} "d2"]]
+ (is (= [dr1 dr2]
+ (lib-metric.definition/flat-projections [{:type :metric :id 1 :projection [dr1]}
+ {:type :measure :id 2 :projection [dr2]}]))))))
+
+;;; -------------------------------------------------- expression-leaves --------------------------------------------------
+
+(deftest ^:parallel expression-leaves-single-metric-leaf-test
+ (testing "single metric leaf returns vector of that leaf"
+ (let [leaf [:metric {:lib/uuid "a"} 42]]
+ (is (= [leaf] (lib-metric.definition/expression-leaves leaf))))))
+
+(deftest ^:parallel expression-leaves-single-measure-leaf-test
+ (testing "single measure leaf returns vector of that leaf"
+ (let [leaf [:measure {:lib/uuid "a"} 99]]
+ (is (= [leaf] (lib-metric.definition/expression-leaves leaf))))))
+
+(deftest ^:parallel expression-leaves-binary-arithmetic-test
+ (testing "binary arithmetic returns both leaves"
+ (let [leaf1 [:metric {:lib/uuid "a"} 1]
+ leaf2 [:metric {:lib/uuid "b"} 2]
+ expr [:+ {} leaf1 leaf2]]
+ (is (= [leaf1 leaf2] (lib-metric.definition/expression-leaves expr))))))
+
+(deftest ^:parallel expression-leaves-nested-arithmetic-test
+ (testing "nested arithmetic returns all leaves in traversal order"
+ (let [leaf1 [:metric {:lib/uuid "a"} 1]
+ leaf2 [:measure {:lib/uuid "b"} 2]
+ leaf3 [:metric {:lib/uuid "c"} 3]
+ inner [:+ {} leaf1 leaf2]
+ expr [:* {} inner leaf3]]
+ (is (= [leaf1 leaf2 leaf3] (lib-metric.definition/expression-leaves expr))))))
+
+(deftest ^:parallel expression-leaves-invalid-input-test
+ (testing "nil returns empty vector"
+ (is (= [] (lib-metric.definition/expression-leaves nil))))
+ (testing "malformed input throws"
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Invalid expression"
+ (lib-metric.definition/expression-leaves "not-an-expression")))
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Invalid expression"
+ (lib-metric.definition/expression-leaves [])))))
+
+(deftest ^:parallel expression-leaves-all-operators-test
+ (testing "all arithmetic operators are supported"
+ (let [leaf1 [:metric {:lib/uuid "a"} 1]
+ leaf2 [:metric {:lib/uuid "b"} 2]]
+ (doseq [op [:+ :- :* :/]]
+ (is (= [leaf1 leaf2]
+ (lib-metric.definition/expression-leaves [op {} leaf1 leaf2]))
+ (str "operator " op " should be supported"))))))
+
+;;; -------------------------------------------------- Schema Validation --------------------------------------------------
+
+(deftest ^:parallel metric-definition-schema-test
+ (let [valid-definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 1]
+ :filters []
+ :projections []
+ :metadata-provider nil}]
+ (testing "valid definition"
+ (is (nil? (me/humanize (mr/explain ::lib-metric.schema/metric-definition valid-definition)))))
+ (testing "invalid lib/type"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/metric-definition
+ (assoc valid-definition :lib/type :other/type))))))
+ (testing "missing required fields"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/metric-definition
+ (dissoc valid-definition :expression))))))
+ (testing "definition with typed projections"
+ (is (nil? (me/humanize (mr/explain ::lib-metric.schema/metric-definition
+ (assoc valid-definition
+ :projections [{:type :metric :id 1
+ :projection [[:dimension {} uuid-1]]}]))))))))
diff --git a/test/metabase/lib_metric/dimension/jvm_test.clj b/test/metabase/lib_metric/dimension/jvm_test.clj
new file mode 100644
index 00000000000..652616ca05a
--- /dev/null
+++ b/test/metabase/lib_metric/dimension/jvm_test.clj
@@ -0,0 +1,67 @@
+(ns metabase.lib-metric.dimension.jvm-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.lib-metric.dimension.jvm :as dimension.jvm]
+ [metabase.lib-metric.metadata.jvm :as lib-metric.metadata.jvm]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.test :as mt]))
+
+(set! *warn-on-reflection* true)
+
+;;; ---------------------------------------- enrich-columns-with-has-field-values ----------------------------------------
+
+(deftest enrich-columns-with-has-field-values-test
+ (testing "enriches columns that have field IDs with :has-field-values"
+ (let [mp (mt/metadata-provider)
+ table (lib.metadata/table mp (mt/id :venues))
+ query (lib/query mp table)
+ columns (lib/visible-columns query)
+ enriched (dimension.jvm/enrich-columns-with-has-field-values columns)]
+ (is (= (count columns) (count enriched))
+ "should return same number of columns")
+ (testing "columns with field IDs should have :has-field-values"
+ (doseq [col enriched
+ :when (pos-int? (:id col))]
+ (is (contains? col :has-field-values)
+ (str "column " (:name col) " should have :has-field-values"))
+ (is (#{:list :search :none} (:has-field-values col))
+ (str "column " (:name col) " should have a valid :has-field-values value"))))))
+
+ (testing "returns empty collection unchanged"
+ (is (= [] (dimension.jvm/enrich-columns-with-has-field-values [])))))
+
+;;; ---------------------------------------- compute-dimension-pairs ----------------------------------------
+
+(deftest compute-dimension-pairs-test
+ (testing "computes dimension pairs from a metric query"
+ (let [mp (lib-metric.metadata.jvm/metadata-provider)
+ table (lib.metadata/table (mt/metadata-provider) (mt/id :venues))
+ query (-> (lib/query (mt/metadata-provider) table)
+ (lib/aggregate (lib/count)))
+ pairs (dimension.jvm/compute-dimension-pairs mp query)]
+ (is (seq pairs) "should produce at least one dimension pair")
+ (testing "each pair has :dimension and :mapping"
+ (doseq [pair pairs]
+ (is (contains? pair :dimension))
+ (is (contains? pair :mapping))))
+ (testing "dimensions have :has-field-values populated"
+ (let [dims-with-hfv (filter #(get-in % [:dimension :has-field-values]) pairs)]
+ (is (seq dims-with-hfv)
+ "at least some dimensions should have :has-field-values")
+ (doseq [pair dims-with-hfv]
+ (is (#{:list :search :none} (get-in pair [:dimension :has-field-values]))
+ (str "dimension " (get-in pair [:dimension :name])
+ " should have a valid :has-field-values value"))))))))
+
+(deftest compute-dimension-pairs-has-field-values-for-category-columns-test
+ (testing "CATEGORY_ID dimension has :has-field-values populated"
+ (let [mp (lib-metric.metadata.jvm/metadata-provider)
+ table (lib.metadata/table (mt/metadata-provider) (mt/id :venues))
+ query (-> (lib/query (mt/metadata-provider) table)
+ (lib/aggregate (lib/count)))
+ pairs (dimension.jvm/compute-dimension-pairs mp query)
+ cat-dim (first (filter #(= "CATEGORY_ID" (get-in % [:dimension :name])) pairs))]
+ (is (some? cat-dim) "CATEGORY_ID dimension should exist")
+ (is (some? (get-in cat-dim [:dimension :has-field-values]))
+ "CATEGORY_ID should have :has-field-values"))))
diff --git a/test/metabase/lib_metric/dimension_test.cljc b/test/metabase/lib_metric/dimension_test.cljc
new file mode 100644
index 00000000000..81360b394bd
--- /dev/null
+++ b/test/metabase/lib_metric/dimension_test.cljc
@@ -0,0 +1,431 @@
+(ns metabase.lib-metric.dimension-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.dimension :as lib-metric.dimension]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+(def ^:private uuid-3 "550e8400-e29b-41d4-a716-446655440003")
+(def ^:private uuid-4 "550e8400-e29b-41d4-a716-446655440004")
+(def ^:private uuid-orphaned "550e8400-e29b-41d4-a716-446655440099")
+
+(def ^:private target-1 [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 1])
+(def ^:private target-2 [:field {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 2])
+(def ^:private target-99 [:field {:lib/uuid "cccccccc-cccc-cccc-cccc-cccccccccccc"} 99])
+
+(defn- make-computed-pair
+ "Helper to create a computed pair for testing."
+ ([name target]
+ {:dimension {:id nil :name name}
+ :mapping {:type :table :target target}})
+ ([name target table-id]
+ {:dimension {:id nil :name name}
+ :mapping {:type :table :table-id table-id :target target}}))
+
+;;; -------------------------------------------------- Target Comparison --------------------------------------------------
+
+(deftest ^:parallel targets-equal?-same-field-id-test
+ (let [target-a [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 100]
+ target-b [:field {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 100]]
+ (is (lib-metric.dimension/targets-equal? target-a target-b)
+ "targets with same field ID are equal regardless of lib/uuid")))
+
+(deftest ^:parallel targets-equal?-different-field-ids-test
+ (let [target-a [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 100]
+ target-b [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 101]]
+ (is (not (lib-metric.dimension/targets-equal? target-a target-b))
+ "targets with different field IDs are not equal")))
+
+(deftest ^:parallel targets-equal?-different-join-aliases-test
+ (let [target-base [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 100]
+ target-with-alias [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" :join-alias "Products"} 100]]
+ (is (not (lib-metric.dimension/targets-equal? target-base target-with-alias))
+ "targets with different join aliases are not equal")))
+
+(deftest ^:parallel targets-equal?-expression-targets-test
+ (let [target-a [:expression {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} "my_expr"]
+ target-b [:expression {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} "my_expr"]]
+ (is (lib-metric.dimension/targets-equal? target-a target-b)
+ "expression targets are compared correctly")))
+
+(deftest ^:parallel targets-equal?-ignores-types-test
+ (let [target-a [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" :effective-type :type/Integer} 100]
+ target-b [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" :effective-type :type/Text :base-type :type/BigInteger} 100]]
+ (is (lib-metric.dimension/targets-equal? target-a target-b)
+ "effective-type and base-type are ignored")))
+
+;;; -------------------------------------------------- Reconciliation --------------------------------------------------
+
+(deftest ^:parallel reconcile-new-dimensions-get-random-uuids-test
+ (let [computed-pairs [(make-computed-pair "col1" target-1)
+ (make-computed-pair "col2" target-2)]
+ {:keys [dimensions dimension-mappings]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings computed-pairs nil nil)]
+ (is (= 2 (count dimensions)))
+ (is (every? #(re-matches #"[a-f0-9-]{36}" (:id %)) dimensions))
+ (is (= 2 (count dimension-mappings)))
+ (is (= (set (map :id dimensions))
+ (set (map :dimension-id dimension-mappings))))))
+
+(deftest ^:parallel reconcile-matched-dimensions-preserve-id-test
+ (let [computed-pairs [(make-computed-pair "col1" target-1)]
+ persisted-dims [{:id uuid-1 :name "col1" :status :status/active}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)]
+ (is (= uuid-1 (:id (first dimensions))))))
+
+(deftest ^:parallel reconcile-matched-dimensions-preserve-modifications-test
+ (let [computed-pairs [(make-computed-pair "col1" target-1)]
+ persisted-dims [{:id uuid-1 :name "col1" :display-name "Custom Name"
+ :semantic-type :type/Category :status :status/active}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ dim (first dimensions)]
+ (is (= "Custom Name" (:display-name dim)))
+ (is (= :type/Category (:semantic-type dim)))
+ (is (= :status/active (:status dim)))))
+
+(deftest ^:parallel reconcile-matching-ignores-lib-uuid-test
+ (let [target-different-uuid [:field {:lib/uuid "dddddddd-dddd-dddd-dddd-dddddddddddd"} 1]
+ computed-pairs [(make-computed-pair "col1" target-different-uuid)]
+ persisted-dims [{:id uuid-1 :name "col1" :display-name "Persisted Name" :status :status/active}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)]
+ (is (= uuid-1 (:id (first dimensions))) "should match despite different lib/uuid")
+ (is (= "Persisted Name" (:display-name (first dimensions))))))
+
+(deftest ^:parallel reconcile-orphaned-dimensions-detected-test
+ (let [computed-pairs [(make-computed-pair "col1" target-1)]
+ persisted-dims [{:id uuid-1 :name "col1" :status :status/active}
+ {:id uuid-orphaned :name "old_column" :status :status/active}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}
+ {:type :table :table-id 1 :dimension-id uuid-orphaned :target target-99}]
+ {:keys [dimensions dimension-mappings]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ orphaned (first (filter #(= uuid-orphaned (:id %)) dimensions))]
+ (is (= 2 (count dimensions)) "should have 2 dimensions")
+ (is (= :status/orphaned (:status orphaned)))
+ (is (= "Column 'old_column' no longer exists in the data source" (:status-message orphaned)))
+ (is (= 1 (count dimension-mappings)) "orphaned dimensions have no mappings")))
+
+(deftest ^:parallel reconcile-non-persisted-dims-tracked-as-orphaned-test
+ (testing "Persisted dims without :status whose target no longer matches computed pairs are orphaned"
+ (let [computed-pairs [(make-computed-pair "col1" target-1)]
+ persisted-dims [{:id uuid-2 :name "col2"}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-2 :target target-2}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ orphaned (first (filter #(= uuid-2 (:id %)) dimensions))]
+ (is (= 2 (count dimensions)) "computed + orphaned dimension")
+ (is (= :status/orphaned (:status orphaned))))))
+
+(deftest ^:parallel reconcile-orphaned-becomes-active-if-target-reappears-test
+ (let [computed-pairs [(make-computed-pair "col1" target-1)]
+ persisted-dims [{:id uuid-1 :name "col1" :display-name "Custom Name"
+ :status :status/orphaned
+ :status-message "Column 'col1' no longer exists"}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ dim (first dimensions)]
+ (is (= 1 (count dimensions)))
+ (is (= uuid-1 (:id dim)))
+ (is (= :status/active (:status dim)))
+ (is (nil? (:status-message dim)))
+ (is (= "Custom Name" (:display-name dim)))))
+
+;;; -------------------------------------------------- FK Dimension Reconciliation --------------------------------------------------
+
+(deftest ^:parallel reconcile-fk-dimension-preserves-source-field-test
+ (testing "FK dimension target with :source-field is preserved through reconciliation"
+ (let [fk-target [:field {:lib/uuid "eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee"
+ :source-field 42} 123]
+ computed-pairs [{:dimension {:id nil :name "fk_col" :lib/source :source/implicitly-joinable}
+ :mapping {:type :table :table-id 200 :target fk-target}}]
+ {:keys [dimensions dimension-mappings]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings computed-pairs nil nil)
+ mapping (first dimension-mappings)]
+ (is (= 1 (count dimensions)))
+ (is (= :status/active (:status (first dimensions))))
+ (is (= 1 (count dimension-mappings)))
+ (is (= 42 (get-in (:target mapping) [1 :source-field])))
+ (is (= 123 (nth (:target mapping) 2))))))
+
+(deftest ^:parallel reconcile-fk-dimension-matches-persisted-test
+ (testing "FK dimension matches persisted mapping by normalized target"
+ (let [fk-target-a [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" :source-field 42} 123]
+ fk-target-b [:field {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb" :source-field 42} 123]
+ computed-pairs [{:dimension {:id nil :name "fk_col"}
+ :mapping {:type :table :table-id 200 :target fk-target-a}}]
+ persisted-dims [{:id uuid-1 :name "fk_col" :display-name "FK Column" :status :status/active}]
+ persisted-mappings [{:type :table :table-id 200 :dimension-id uuid-1 :target fk-target-b}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)]
+ (is (= uuid-1 (:id (first dimensions))))
+ (is (= "FK Column" (:display-name (first dimensions)))))))
+
+;;; -------------------------------------------------- Persistence Helpers --------------------------------------------------
+
+(deftest ^:parallel extract-persisted-dimensions-filters-by-status-test
+ (let [dimensions [{:id uuid-1 :name "col1" :status :status/active}
+ {:id uuid-2 :name "col2"}
+ {:id uuid-3 :name "col3" :status :status/orphaned}
+ {:id uuid-4 :name "col4" :status :status/active}]]
+ (is (= [{:id uuid-1 :name "col1" :status :status/active}
+ {:id uuid-3 :name "col3" :status :status/orphaned}
+ {:id uuid-4 :name "col4" :status :status/active}]
+ (lib-metric.dimension/extract-persisted-dimensions dimensions)))))
+
+(deftest ^:parallel extract-persisted-dimensions-empty-when-no-status-test
+ (let [dimensions [{:id uuid-1 :name "col1"}
+ {:id uuid-2 :name "col2"}]]
+ (is (= [] (lib-metric.dimension/extract-persisted-dimensions dimensions)))))
+
+(deftest ^:parallel dimensions-changed?-true-when-dimensions-differ-test
+ (is (lib-metric.dimension/dimensions-changed?
+ [{:id uuid-1 :name "old" :status :status/active}]
+ [{:id uuid-1 :name "new" :status :status/active}])))
+
+(deftest ^:parallel dimensions-changed?-true-when-dimension-added-test
+ (is (lib-metric.dimension/dimensions-changed?
+ [{:id uuid-1 :status :status/active}]
+ [{:id uuid-1 :status :status/active} {:id uuid-2 :status :status/active}])))
+
+(deftest ^:parallel dimensions-changed?-true-when-dimension-removed-test
+ (is (lib-metric.dimension/dimensions-changed?
+ [{:id uuid-1 :status :status/active} {:id uuid-2 :status :status/active}]
+ [{:id uuid-1 :status :status/active}])))
+
+(deftest ^:parallel dimensions-changed?-true-when-status-changes-test
+ (is (lib-metric.dimension/dimensions-changed?
+ [{:id uuid-1 :name "col1" :status :status/active}]
+ [{:id uuid-1 :name "col1" :status :status/orphaned}])))
+
+(deftest ^:parallel dimensions-changed?-false-when-equal-test
+ (is (not (lib-metric.dimension/dimensions-changed?
+ [{:id uuid-1 :name "col1" :status :status/active}]
+ [{:id uuid-1 :name "col1" :status :status/active}]))))
+
+(deftest ^:parallel dimensions-changed?-false-when-order-differs-test
+ (is (not (lib-metric.dimension/dimensions-changed?
+ [{:id uuid-1 :status :status/active} {:id uuid-2 :status :status/active}]
+ [{:id uuid-2 :status :status/active} {:id uuid-1 :status :status/active}]))))
+
+(deftest ^:parallel dimensions-changed?-ignores-extra-keys-test
+ (is (not (lib-metric.dimension/dimensions-changed?
+ [{:id uuid-1 :name "col1" :status :status/active :lib/source :source/table}]
+ [{:id uuid-1 :name "col1" :status :status/active :lib/source :source/other}]))))
+
+(deftest ^:parallel dimensions-changed?-handles-nil-old-dimensions-test
+ (is (lib-metric.dimension/dimensions-changed?
+ nil
+ [{:id uuid-1 :status :status/active}])))
+
+(deftest ^:parallel dimensions-changed?-handles-empty-dimensions-test
+ (is (not (lib-metric.dimension/dimensions-changed? [] [])))
+ (is (lib-metric.dimension/dimensions-changed? [] [{:id uuid-1 :status :status/active}]))
+ (is (lib-metric.dimension/dimensions-changed? [{:id uuid-1 :status :status/active}] [])))
+
+(deftest ^:parallel mappings-changed?-true-when-mappings-differ-test
+ (is (lib-metric.dimension/mappings-changed?
+ [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ [{:type :table :table-id 1 :dimension-id uuid-1 :target target-2}])))
+
+(deftest ^:parallel mappings-changed?-false-when-only-lib-uuid-differs-test
+ (let [target-a [:field {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 1]
+ target-b [:field {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 1]]
+ (is (not (lib-metric.dimension/mappings-changed?
+ [{:type :table :table-id 1 :dimension-id uuid-1 :target target-a}]
+ [{:type :table :table-id 1 :dimension-id uuid-1 :target target-b}])))))
+
+(deftest ^:parallel mappings-changed?-handles-nil-old-mappings-test
+ (is (lib-metric.dimension/mappings-changed?
+ nil
+ [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}])))
+
+;;; -------------------------------------------------- Always Save Behavior --------------------------------------------------
+
+(deftest ^:parallel reconcile-new-dimensions-get-active-status-test
+ (testing "New computed dimensions should always get :status/active so they are persisted"
+ (let [computed-pairs [(make-computed-pair "col1" target-1)
+ (make-computed-pair "col2" target-2)]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings computed-pairs nil nil)]
+ (is (= 2 (count dimensions)))
+ (is (every? #(= :status/active (:status %)) dimensions)
+ "All new dimensions should have :status/active"))))
+
+(deftest ^:parallel reconcile-all-dimensions-have-status-for-persistence-test
+ (testing "After reconciliation, all active dimensions should be extractable for persistence"
+ (let [computed-pairs [(make-computed-pair "col1" target-1)
+ (make-computed-pair "col2" target-2)]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings computed-pairs nil nil)
+ persisted (lib-metric.dimension/extract-persisted-dimensions dimensions)]
+ (is (= 2 (count persisted))
+ "All dimensions should be extracted for persistence since they all have :status/active"))))
+
+;;; -------------------------------------------------- Dimension Resolution --------------------------------------------------
+
+(deftest ^:parallel get-dimension-or-throw-test
+ (testing "finds dimension by id"
+ (let [dimensions [{:id "dim-1" :name "Dimension 1"}
+ {:id "dim-2" :name "Dimension 2"}]]
+ (is (= {:id "dim-1" :name "Dimension 1"}
+ (lib-metric.dimension/get-dimension-or-throw dimensions "dim-1")))
+ (is (= {:id "dim-2" :name "Dimension 2"}
+ (lib-metric.dimension/get-dimension-or-throw dimensions "dim-2")))))
+ (testing "throws for missing dimension"
+ (let [dimensions [{:id "dim-1" :name "Dimension 1"}]]
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Dimension not found"
+ (lib-metric.dimension/get-dimension-or-throw dimensions "nonexistent"))))))
+
+(deftest ^:parallel get-dimension-mapping-or-throw-test
+ (testing "finds mapping by dimension id"
+ (let [mappings [{:dimension-id "dim-1" :target [:field {} 123]}
+ {:dimension-id "dim-2" :target [:field {} 456]}]]
+ (is (= {:dimension-id "dim-1" :target [:field {} 123]}
+ (lib-metric.dimension/get-dimension-mapping-or-throw mappings "dim-1")))
+ (is (= {:dimension-id "dim-2" :target [:field {} 456]}
+ (lib-metric.dimension/get-dimension-mapping-or-throw mappings "dim-2")))))
+ (testing "throws for missing mapping"
+ (let [mappings [{:dimension-id "dim-1" :target [:field {} 123]}]]
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Dimension mapping not found"
+ (lib-metric.dimension/get-dimension-mapping-or-throw mappings "nonexistent"))))))
+
+(deftest ^:parallel dimension-target->field-id-test
+ (testing "extracts field ID from field ref"
+ (is (= 123 (lib-metric.dimension/dimension-target->field-id [:field {} 123])))
+ (is (= 456 (lib-metric.dimension/dimension-target->field-id [:field {:source-field 789} 456]))))
+ (testing "returns nil for non-field refs"
+ (is (nil? (lib-metric.dimension/dimension-target->field-id nil)))
+ (is (nil? (lib-metric.dimension/dimension-target->field-id [:expression {} "foo"]))))
+ (testing "returns nil for field refs with string names instead of IDs"
+ (is (nil? (lib-metric.dimension/dimension-target->field-id [:field {} "field_name"])))))
+
+(deftest ^:parallel resolve-dimension-to-field-id-test
+ (testing "resolves active dimension to field ID"
+ (let [dimensions [{:id "dim-1" :name "Dimension 1" :status "status/active"}]
+ mappings [{:dimension-id "dim-1" :target [:field {} 123]}]]
+ (is (= 123 (lib-metric.dimension/resolve-dimension-to-field-id dimensions mappings "dim-1"))))))
+
+(deftest ^:parallel resolve-dimension-to-field-id-throws-for-orphaned-test
+ (testing "throws for orphaned dimension"
+ (let [dimensions [{:id "dim-1" :name "Dimension 1" :status :status/orphaned}]
+ mappings [{:dimension-id "dim-1" :target [:field {} 123]}]]
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Cannot use orphaned dimension"
+ (lib-metric.dimension/resolve-dimension-to-field-id dimensions mappings "dim-1"))))))
+
+(deftest ^:parallel resolve-dimension-to-field-id-throws-for-missing-dimension-test
+ (testing "throws for missing dimension"
+ (let [dimensions []
+ mappings [{:dimension-id "dim-1" :target [:field {} 123]}]]
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Dimension not found"
+ (lib-metric.dimension/resolve-dimension-to-field-id dimensions mappings "dim-1"))))))
+
+(deftest ^:parallel resolve-dimension-to-field-id-throws-for-missing-mapping-test
+ (testing "throws for missing mapping"
+ (let [dimensions [{:id "dim-1" :name "Dimension 1" :status "status/active"}]
+ mappings []]
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Dimension mapping not found"
+ (lib-metric.dimension/resolve-dimension-to-field-id dimensions mappings "dim-1"))))))
+
+(deftest ^:parallel resolve-dimension-to-field-id-throws-for-unresolvable-target-test
+ (testing "throws when target cannot be resolved to field ID"
+ (let [dimensions [{:id "dim-1" :name "Dimension 1" :status "status/active"}]
+ mappings [{:dimension-id "dim-1" :target [:field {} "field_name"]}]]
+ (is (thrown-with-msg? #?(:clj clojure.lang.ExceptionInfo :cljs js/Error)
+ #"Cannot resolve dimension target to field ID"
+ (lib-metric.dimension/resolve-dimension-to-field-id dimensions mappings "dim-1"))))))
+
+;;; ----------------------------------------- effective-type / base-type fallback -----------------------------------------
+
+(deftest ^:parallel reconcile-dimension-with-effective-type-from-base-type-test
+ (testing "A dimension computed from a column with only :base-type still gets :effective-type
+ via the base-type fallback, so type predicates like isDateOrDateTime work."
+ (let [;; Simulate what column->computed-pair now produces for a column that has
+ ;; :base-type but no :effective-type (as seen with H2)
+ computed-pairs [{:dimension {:id nil :name "created_at" :effective-type :type/DateTimeWithLocalTZ}
+ :mapping {:type :table :target target-1}}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings computed-pairs nil nil)
+ dim (first dimensions)]
+ (is (= :type/DateTimeWithLocalTZ (:effective-type dim))
+ "effective-type should be present on the reconciled dimension"))))
+
+(deftest ^:parallel reconcile-persisted-nil-effective-type-does-not-clobber-computed-test
+ (testing "When a persisted dimension has nil :effective-type, it should not overwrite
+ the freshly computed :effective-type during reconciliation."
+ (let [computed-pairs [{:dimension {:id nil :name "created_at" :effective-type :type/DateTimeWithLocalTZ}
+ :mapping {:type :table :target target-1}}]
+ ;; Persisted dimension was saved before effective-type was populated (H2 scenario)
+ persisted-dims [{:id uuid-1 :name "created_at" :effective-type nil :status :status/active}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ dim (first dimensions)]
+ (is (= :type/DateTimeWithLocalTZ (:effective-type dim))
+ "computed effective-type should not be overwritten by nil from persisted dimension"))))
+
+(deftest ^:parallel reconcile-persisted-effective-type-overrides-computed-test
+ (testing "When a persisted dimension has a non-nil :effective-type, it should be used."
+ (let [computed-pairs [{:dimension {:id nil :name "created_at" :effective-type :type/DateTimeWithLocalTZ}
+ :mapping {:type :table :target target-1}}]
+ persisted-dims [{:id uuid-1 :name "created_at" :effective-type :type/Date :status :status/active}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ dim (first dimensions)]
+ (is (= :type/Date (:effective-type dim))
+ "persisted non-nil effective-type should override computed value"))))
+
+;;; ----------------------------------------- merge-persisted-modifications -----------------------------------------
+
+(deftest ^:parallel merge-persisted-nil-display-name-does-not-override-computed-test
+ (testing "A persisted dimension with nil :display-name should not override the computed display-name"
+ (let [computed-pairs [{:dimension {:id nil :name "col1" :display-name "Computed Name"}
+ :mapping {:type :table :target target-1}}]
+ persisted-dims [{:id uuid-1 :name "col1" :display-name nil :status :status/active}]
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ dim (first dimensions)]
+ (is (= "Computed Name" (:display-name dim))
+ "nil display-name from persisted dim should not clobber the computed value"))))
+
+;;; ----------------------------------------- find-orphaned-dimensions -----------------------------------------
+
+(deftest ^:parallel reconcile-orphaned-without-status-is-detected-test
+ (testing "A persisted dimension missing :status should still be detected as orphaned"
+ (let [computed-pairs [(make-computed-pair "col1" target-1)]
+ persisted-dims [{:id uuid-1 :name "col1" :status :status/active}
+ {:id uuid-orphaned :name "old_column"}] ;; no :status key
+ persisted-mappings [{:type :table :table-id 1 :dimension-id uuid-1 :target target-1}
+ {:type :table :table-id 1 :dimension-id uuid-orphaned :target target-99}]
+ {:keys [dimensions]}
+ (lib-metric.dimension/reconcile-dimensions-and-mappings
+ computed-pairs persisted-dims persisted-mappings)
+ orphaned (first (filter #(= uuid-orphaned (:id %)) dimensions))]
+ (is (some? orphaned) "dimension without :status should appear in results")
+ (is (= :status/orphaned (:status orphaned)))
+ (is (string? (:status-message orphaned))))))
diff --git a/test/metabase/lib_metric/display_info_test.cljc b/test/metabase/lib_metric/display_info_test.cljc
new file mode 100644
index 00000000000..12f0a25f0c4
--- /dev/null
+++ b/test/metabase/lib_metric/display_info_test.cljc
@@ -0,0 +1,229 @@
+(ns metabase.lib-metric.display-info-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.display-info :as display-info]))
+
+(deftest ^:parallel default-display-info-common-fields-test
+ (testing "extracts common fields from entity"
+ (let [entity {:name "test-name"
+ :display-name "Test Name"
+ :effective-type :type/Text
+ :semantic-type :type/Category
+ :description "A description"}
+ result (display-info/default-display-info nil entity)]
+ (is (= "Test Name" (:display-name result)))
+ (is (= "test-name" (:name result)))
+ (is (= :type/Text (:effective-type result)))
+ (is (= :type/Category (:semantic-type result)))
+ (is (= "A description" (:description result)))))
+ (testing "uses name as display-name fallback"
+ (let [entity {:name "fallback-name"}
+ result (display-info/default-display-info nil entity)]
+ (is (= "fallback-name" (:display-name result))))))
+
+(deftest ^:parallel default-display-info-selected-default-test
+ (testing "handles selected and default flags"
+ (let [entity {:name "test" :selected? true :default? false}
+ result (display-info/default-display-info nil entity)]
+ (is (true? (:selected result)))
+ (is (false? (:default result)))))
+ (testing "handles alternate selected/default keys"
+ (let [entity {:name "test" :selected true :default true}
+ result (display-info/default-display-info nil entity)]
+ (is (true? (:selected result)))
+ (is (true? (:default result))))))
+
+(deftest ^:parallel display-info-method-metric-display-name-test
+ (testing ":metadata/metric returns display-name"
+ (let [metric {:lib/type :metadata/metric
+ :name "revenue"
+ :display-name "Total Revenue"}
+ result (display-info/display-info nil metric)]
+ (is (= "Total Revenue" (:display-name result)))
+ (is (= "revenue" (:name result)))))
+ (testing ":metadata/metric falls back to name"
+ (let [metric {:lib/type :metadata/metric
+ :name "revenue"}
+ result (display-info/display-info nil metric)]
+ (is (= "revenue" (:display-name result))))))
+
+(deftest ^:parallel display-info-method-metric-fallback-test
+ (testing ":metadata/metric has fallback for missing name"
+ (let [metric {:lib/type :metadata/metric}
+ result (display-info/display-info nil metric)]
+ (is (string? (:display-name result))))))
+
+(deftest ^:parallel display-info-method-metric-column-name-test
+ (testing ":metadata/metric includes column-name from display-name"
+ (let [metric {:lib/type :metadata/metric
+ :name "revenue"
+ :display-name "Total Revenue"}
+ result (display-info/display-info nil metric)]
+ (is (= "total_revenue" (:column-name result)))))
+ (testing ":metadata/metric column-name falls back to name"
+ (let [metric {:lib/type :metadata/metric
+ :name "Revenue"}
+ result (display-info/display-info nil metric)]
+ (is (= "revenue" (:column-name result))))))
+
+(deftest ^:parallel display-info-method-metric-column-name-nil-test
+ (testing ":metadata/metric column-name is nil when no name"
+ (let [metric {:lib/type :metadata/metric}
+ result (display-info/display-info nil metric)]
+ (is (nil? (:column-name result))))))
+
+(deftest ^:parallel display-info-method-metric-result-column-name-test
+ (testing ":metadata/metric prefers result-column-name over slugified display-name"
+ (let [metric {:lib/type :metadata/metric
+ :name "revenue"
+ :display-name "Revenue"
+ :result-column-name "sum"}
+ result (display-info/display-info nil metric)]
+ (is (= "sum" (:column-name result))))))
+
+(deftest ^:parallel display-info-method-measure-display-name-test
+ (testing ":metadata/measure returns display-name"
+ (let [measure {:lib/type :metadata/measure
+ :name "count"
+ :display-name "Count"}
+ result (display-info/display-info nil measure)]
+ (is (= "Count" (:display-name result)))
+ (is (= "count" (:name result)))))
+ (testing ":metadata/measure falls back to name"
+ (let [measure {:lib/type :metadata/measure
+ :name "sum"}
+ result (display-info/display-info nil measure)]
+ (is (= "sum" (:display-name result))))))
+
+(deftest ^:parallel display-info-method-measure-column-name-test
+ (testing ":metadata/measure includes column-name"
+ (let [measure {:lib/type :metadata/measure
+ :name "Order Total"
+ :display-name "Order Total"}
+ result (display-info/display-info nil measure)]
+ (is (= "order_total" (:column-name result)))))
+ (testing ":metadata/measure prefers result-column-name over slugified display-name"
+ (let [measure {:lib/type :metadata/measure
+ :name "Order Total"
+ :display-name "Order Total"
+ :result-column-name "sum"}
+ result (display-info/display-info nil measure)]
+ (is (= "sum" (:column-name result))))))
+
+(deftest ^:parallel display-info-method-dimension-fields-test
+ (testing ":metadata/dimension returns expected fields"
+ (let [dimension {:lib/type :metadata/dimension
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type :type/Category
+ :filter-positions [0 1]
+ :projection-positions [2]}
+ result (display-info/display-info nil dimension)]
+ (is (= "Category" (:display-name result)))
+ (is (= "category" (:name result)))
+ (is (= :type/Text (:effective-type result)))
+ (is (= :type/Category (:semantic-type result)))
+ (is (= [0 1] (:filter-positions result)))
+ (is (= [2] (:projection-positions result))))))
+
+(deftest ^:parallel display-info-method-dimension-defaults-test
+ (testing ":metadata/dimension defaults positions to empty vectors"
+ (let [dimension {:lib/type :metadata/dimension
+ :name "test"}
+ result (display-info/display-info nil dimension)]
+ (is (= [] (:filter-positions result)))
+ (is (= [] (:projection-positions result))))))
+
+(deftest ^:parallel display-info-method-dimension-source-indicators-test
+ (testing ":metadata/dimension includes source indicators"
+ (let [join-dim {:lib/type :metadata/dimension
+ :name "join-col"
+ :lib/source :source/joins}
+ expr-dim {:lib/type :metadata/dimension
+ :name "expr-col"
+ :lib/source :source/expressions}]
+ (is (true? (:is-from-join (display-info/display-info nil join-dim))))
+ (is (true? (:is-calculated (display-info/display-info nil expr-dim)))))))
+
+(deftest ^:parallel display-info-method-temporal-bucket-test
+ (testing ":temporal-bucket returns expected fields"
+ (let [bucket {:lib/type :temporal-bucket
+ :unit :month
+ :default true
+ :selected false}
+ result (display-info/display-info nil bucket)]
+ (is (= "month" (:short-name result)))
+ (is (string? (:display-name result)))
+ (is (true? (:default result)))
+ (is (false? (:selected result)))))
+ (testing ":temporal-bucket identifies extraction units"
+ (let [extraction {:lib/type :temporal-bucket
+ :unit :month-of-year}
+ truncation {:lib/type :temporal-bucket
+ :unit :month}]
+ (is (true? (:is-temporal-extraction (display-info/display-info nil extraction))))
+ (is (not (:is-temporal-extraction (display-info/display-info nil truncation)))))))
+
+;; TODO: Enable binning tests once schema dependencies (metabase.lib.schema.metadata,
+;; metabase.legacy-mbql.schema) are properly loaded in test context.
+;; The lib.binning/binning-display-name function requires these schemas to validate inputs.
+#_(deftest display-info-method-binning-strategy-test
+ (testing ":binning-strategy returns expected fields"
+ (let [strategy {:lib/type :binning-strategy
+ :strategy :default
+ :default true
+ :selected false}
+ result (display-info/display-info nil strategy)]
+ (is (string? (:display-name result)))
+ (is (true? (:default result)))
+ (is (false? (:selected result))))))
+
+(deftest ^:parallel display-info-method-default-test
+ (testing "unknown types get default display-info"
+ (let [unknown {:lib/type :unknown/type
+ :name "test"
+ :display-name "Test"}
+ result (display-info/display-info nil unknown)]
+ (is (= "Test" (:display-name result)))
+ (is (= "test" (:name result))))))
+
+(deftest ^:parallel display-info-filter-clause-basic-test
+ (testing "filter clause generates readable display-name with dimension UUID as fallback"
+ (let [clause [:= {} [:dimension {} "dim-uuid"] "value"]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid is value" (:display-name result)))))
+ (testing "contains filter clause"
+ (let [clause [:contains {} [:dimension {} "dim-uuid"] "search"]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid contains search" (:display-name result))))))
+
+(deftest ^:parallel display-info-filter-clause-between-and-unary-test
+ (testing "between filter clause"
+ (let [clause [:between {} [:dimension {} "dim-uuid"] 1 10]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid is between 1 and 10" (:display-name result)))))
+ (testing "unary operator (is-null)"
+ (let [clause [:is-null {} [:dimension {} "dim-uuid"]]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid is empty" (:display-name result))))))
+
+(deftest ^:parallel display-info-filter-clause-time-interval-test
+ (testing "time-interval filter (past)"
+ (let [clause [:time-interval {} [:dimension {} "dim-uuid"] -30 :day]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid is in the last 30 days" (:display-name result)))))
+ (testing "time-interval filter (future)"
+ (let [clause [:time-interval {} [:dimension {} "dim-uuid"] 7 :week]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid is in the next 7 weeks" (:display-name result))))))
+
+(deftest ^:parallel display-info-filter-clause-time-interval-current-test
+ (testing "time-interval filter (current)"
+ (let [clause [:time-interval {} [:dimension {} "dim-uuid"] :current :month]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid is the current month" (:display-name result)))))
+ (testing "time-interval filter (zero means current)"
+ (let [clause [:time-interval {} [:dimension {} "dim-uuid"] 0 :year]
+ result (display-info/display-info nil clause)]
+ (is (= "dim-uuid is the current year" (:display-name result))))))
diff --git a/test/metabase/lib_metric/filter_test.cljc b/test/metabase/lib_metric/filter_test.cljc
new file mode 100644
index 00000000000..43b4dfe973e
--- /dev/null
+++ b/test/metabase/lib_metric/filter_test.cljc
@@ -0,0 +1,801 @@
+(ns metabase.lib-metric.filter-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.filter :as lib-metric.filter]
+ [metabase.lib-metric.metadata.provider :as lib-metric.metadata.provider]
+ [metabase.util.time :as u.time]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+(def ^:private uuid-3 "550e8400-e29b-41d4-a716-446655440003")
+
+(def ^:private dim-ref-1 [:dimension {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} uuid-1])
+(def ^:private dim-ref-2 [:dimension {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} uuid-2])
+(def ^:private dim-ref-3 [:dimension {:lib/uuid "cccccccc-cccc-cccc-cccc-cccccccccccc"} uuid-3])
+
+;;; -------------------------------------------------- leading-dimension-ref --------------------------------------------------
+
+(deftest ^:parallel leading-dimension-ref-equality-filter-test
+ (let [filter-clause [:= {} dim-ref-1 "value"]]
+ (is (= uuid-1 (lib-metric.filter/leading-dimension-ref filter-clause)))))
+
+(deftest ^:parallel leading-dimension-ref-comparison-filter-test
+ (testing "less than"
+ (is (= uuid-1 (lib-metric.filter/leading-dimension-ref [:< {} dim-ref-1 100]))))
+ (testing "greater than or equal"
+ (is (= uuid-2 (lib-metric.filter/leading-dimension-ref [:>= {} dim-ref-2 50])))))
+
+(deftest ^:parallel leading-dimension-ref-between-filter-test
+ (let [filter-clause [:between {} dim-ref-1 10 100]]
+ (is (= uuid-1 (lib-metric.filter/leading-dimension-ref filter-clause)))))
+
+(deftest ^:parallel leading-dimension-ref-string-filter-test
+ (let [filter-clause [:contains {} dim-ref-1 "search"]]
+ (is (= uuid-1 (lib-metric.filter/leading-dimension-ref filter-clause)))))
+
+(deftest ^:parallel leading-dimension-ref-null-filter-test
+ (let [filter-clause [:is-null {} dim-ref-2]]
+ (is (= uuid-2 (lib-metric.filter/leading-dimension-ref filter-clause)))))
+
+(deftest ^:parallel leading-dimension-ref-and-filter-test
+ (testing "Compound :and filter returns nil (no leading dimension)"
+ (let [filter-clause [:and {} [:= {} dim-ref-1 "a"] [:= {} dim-ref-2 "b"]]]
+ (is (nil? (lib-metric.filter/leading-dimension-ref filter-clause))))))
+
+(deftest ^:parallel leading-dimension-ref-or-filter-test
+ (testing "Compound :or filter returns nil (no leading dimension)"
+ (let [filter-clause [:or {} [:= {} dim-ref-1 "a"] [:= {} dim-ref-2 "b"]]]
+ (is (nil? (lib-metric.filter/leading-dimension-ref filter-clause))))))
+
+(deftest ^:parallel leading-dimension-ref-not-filter-test
+ (testing "Compound :not filter returns nil (no leading dimension)"
+ (let [filter-clause [:not {} [:= {} dim-ref-1 "a"]]]
+ (is (nil? (lib-metric.filter/leading-dimension-ref filter-clause))))))
+
+(deftest ^:parallel leading-dimension-ref-invalid-clause-test
+ (testing "Returns nil for non-vector input"
+ (is (nil? (lib-metric.filter/leading-dimension-ref nil)))
+ (is (nil? (lib-metric.filter/leading-dimension-ref "not-a-filter")))
+ (is (nil? (lib-metric.filter/leading-dimension-ref {}))))
+ (testing "Returns nil for vector without dimension ref"
+ (is (nil? (lib-metric.filter/leading-dimension-ref [:= {} "plain-value" "other"])))
+ (is (nil? (lib-metric.filter/leading-dimension-ref [:=])))))
+
+(deftest ^:parallel leading-dimension-ref-malformed-dimension-ref-test
+ (testing "Returns nil when third element is not a proper dimension ref"
+ (is (nil? (lib-metric.filter/leading-dimension-ref [:= {} [:field {} 1] "value"])))
+ (is (nil? (lib-metric.filter/leading-dimension-ref [:= {} [:dimension {}] "value"])))))
+
+;;; -------------------------------------------------- build-filter-positions --------------------------------------------------
+
+(deftest ^:parallel build-filter-positions-empty-filters-test
+ (is (= {} (lib-metric.filter/build-filter-positions []))))
+
+(deftest ^:parallel build-filter-positions-single-filter-test
+ (let [filters [[:= {} dim-ref-1 "value"]]]
+ (is (= {uuid-1 [0]} (lib-metric.filter/build-filter-positions filters)))))
+
+(deftest ^:parallel build-filter-positions-multiple-different-dimensions-test
+ (let [filters [[:= {} dim-ref-1 "a"]
+ [:< {} dim-ref-2 100]
+ [:contains {} dim-ref-3 "search"]]]
+ (is (= {uuid-1 [0]
+ uuid-2 [1]
+ uuid-3 [2]}
+ (lib-metric.filter/build-filter-positions filters)))))
+
+(deftest ^:parallel build-filter-positions-same-dimension-multiple-times-test
+ (let [filters [[:= {} dim-ref-1 "a"]
+ [:= {} dim-ref-2 "b"]
+ [:> {} dim-ref-1 10]
+ [:< {} dim-ref-1 100]]]
+ (is (= {uuid-1 [0 2 3]
+ uuid-2 [1]}
+ (lib-metric.filter/build-filter-positions filters)))))
+
+(deftest ^:parallel build-filter-positions-skips-compound-filters-test
+ (let [filters [[:= {} dim-ref-1 "a"]
+ [:and {} [:= {} dim-ref-2 "b"] [:= {} dim-ref-3 "c"]]
+ [:= {} dim-ref-2 "d"]]]
+ (is (= {uuid-1 [0]
+ uuid-2 [2]}
+ (lib-metric.filter/build-filter-positions filters))
+ "Compound :and filter at index 1 should be skipped")))
+
+(deftest ^:parallel build-filter-positions-nil-filters-test
+ (is (= {} (lib-metric.filter/build-filter-positions nil))))
+
+;;; -------------------------------------------------- operators-for-dimension --------------------------------------------------
+
+(def ^:private string-dimension
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000001ing"
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type nil})
+
+(def ^:private number-dimension
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000002ber"
+ :name "amount"
+ :display-name "Amount"
+ :effective-type :type/Float
+ :semantic-type nil})
+
+(def ^:private boolean-dimension
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000003ean"
+ :name "is_active"
+ :display-name "Is Active"
+ :effective-type :type/Boolean
+ :semantic-type nil})
+
+(def ^:private datetime-dimension
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000004"
+ :name "created_at"
+ :display-name "Created At"
+ :effective-type :type/DateTime
+ :semantic-type :type/CreationTimestamp})
+
+(def ^:private time-dimension
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000005"
+ :name "start_time"
+ :display-name "Start Time"
+ :effective-type :type/Time
+ :semantic-type nil})
+
+(def ^:private coordinate-dimension
+ {:lib/type :metadata/dimension
+ :id "dim-coord"
+ :name "latitude"
+ :display-name "Latitude"
+ :effective-type :type/Float
+ :semantic-type :type/Latitude})
+
+(deftest ^:parallel operators-for-dimension-string-test
+ (testing "String dimensions get string operators"
+ (is (= [:is-empty :not-empty := :!= :contains :does-not-contain :starts-with :ends-with]
+ (lib-metric.filter/operators-for-dimension string-dimension)))))
+
+(deftest ^:parallel operators-for-dimension-number-test
+ (testing "Number dimensions get numeric operators"
+ (is (= [:is-null :not-null := :!= :> :>= :< :<= :between]
+ (lib-metric.filter/operators-for-dimension number-dimension)))))
+
+(deftest ^:parallel operators-for-dimension-boolean-test
+ (testing "Boolean dimensions get boolean operators"
+ (is (= [:is-null :not-null :=]
+ (lib-metric.filter/operators-for-dimension boolean-dimension)))))
+
+(deftest ^:parallel operators-for-dimension-datetime-test
+ (testing "DateTime dimensions get temporal operators"
+ (is (= [:is-null :not-null := :!= :> :< :between]
+ (lib-metric.filter/operators-for-dimension datetime-dimension)))))
+
+(deftest ^:parallel operators-for-dimension-time-test
+ (testing "Time dimensions get time operators"
+ (is (= [:is-null :not-null :> :< :between]
+ (lib-metric.filter/operators-for-dimension time-dimension)))))
+
+(deftest ^:parallel operators-for-dimension-coordinate-test
+ (testing "Coordinate dimensions get coordinate operators"
+ (is (= [:= :!= :> :>= :< :<= :between :inside]
+ (lib-metric.filter/operators-for-dimension coordinate-dimension)))))
+
+(deftest ^:parallel operators-for-dimension-unknown-test
+ (testing "Unknown type dimensions get default operators"
+ (is (= [:is-null :not-null]
+ (lib-metric.filter/operators-for-dimension {:effective-type :type/Unknown})))))
+
+;;; -------------------------------------------------- filterable-dimension-operators --------------------------------------------------
+
+(deftest ^:parallel filterable-dimension-operators-test
+ (testing "filterable-dimension-operators returns same result as operators-for-dimension"
+ (is (= (lib-metric.filter/operators-for-dimension string-dimension)
+ (lib-metric.filter/filterable-dimension-operators string-dimension)))
+ (is (= (lib-metric.filter/operators-for-dimension number-dimension)
+ (lib-metric.filter/filterable-dimension-operators number-dimension)))))
+
+;;; -------------------------------------------------- add-filter --------------------------------------------------
+
+(deftest ^:parallel add-filter-test
+ (testing "add-filter adds a filter clause wrapped as instance-filter"
+ (let [definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "inst-uuid"} 1]
+ :filters []
+ :projections []}
+ filter-clause [:= {} dim-ref-1 "value"]
+ result (lib-metric.filter/add-filter definition filter-clause)]
+ (is (= 1 (count (:filters result))))
+ (is (= filter-clause (:filter (first (:filters result)))))
+ (is (= "inst-uuid" (:lib/uuid (first (:filters result))))))))
+
+(deftest ^:parallel add-filter-appends-test
+ (testing "add-filter appends to existing filters"
+ (let [existing-inst {:lib/uuid "inst-uuid" :filter [:= {} dim-ref-1 "a"]}
+ new-filter [:= {} dim-ref-2 "b"]
+ definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "inst-uuid"} 1]
+ :filters [existing-inst]
+ :projections []}
+ result (lib-metric.filter/add-filter definition new-filter)]
+ (is (= 2 (count (:filters result))))
+ (is (= [:= {} dim-ref-1 "a"] (:filter (first (:filters result)))))
+ (is (= new-filter (:filter (second (:filters result))))))))
+
+(deftest ^:parallel add-filter-nil-filters-test
+ (testing "add-filter works when :filters is nil"
+ (let [definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "inst-uuid"} 1]
+ :projections []}
+ filter-clause [:= {} dim-ref-1 "value"]
+ result (lib-metric.filter/add-filter definition filter-clause)]
+ (is (= 1 (count (:filters result))))
+ (is (= filter-clause (:filter (first (:filters result))))))))
+
+;;; -------------------------------------------------- filterable-dimensions --------------------------------------------------
+;;; Note: Full integration tests for filterable-dimensions require a mock metadata provider
+;;; These tests verify the basic shape of the function
+
+(deftest ^:parallel filterable-dimensions-returns-vector-test
+ (testing "filterable-dimensions returns a vector even with invalid input"
+ ;; With no provider, dimensions-for-* will fail, but we test the structure
+ (let [definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 1]
+ :filters []
+ :projections []
+ :metadata-provider nil}]
+ ;; This will fail due to nil provider, which is expected in unit tests
+ ;; Integration tests with real providers are needed for full coverage
+ (is (thrown? #?(:clj Exception :cljs js/Error)
+ (lib-metric.filter/filterable-dimensions definition))))))
+
+;;; -------------------------------------------------- Filter Clause Creation Tests --------------------------------------------------
+;;; These tests verify clause creation without needing a metadata provider
+
+(deftest ^:parallel default-filter-clause-is-null-test
+ (testing "default-filter-clause creates is-null clause"
+ (let [dimension {:id "dim-1" :effective-type :type/Unknown}
+ parts {:operator :is-null :dimension dimension}
+ clause (lib-metric.filter/default-filter-clause parts)]
+ (is (= :is-null (first clause)))
+ (is (string? (:lib/uuid (second clause))))
+ (is (= [:dimension {} "dim-1"] (nth clause 2))))))
+
+(deftest ^:parallel default-filter-clause-not-null-test
+ (testing "default-filter-clause creates not-null clause"
+ (let [dimension {:id "dim-1" :effective-type :type/Unknown}
+ parts {:operator :not-null :dimension dimension}
+ clause (lib-metric.filter/default-filter-clause parts)]
+ (is (= :not-null (first clause)))
+ (is (= [:dimension {} "dim-1"] (nth clause 2))))))
+
+(deftest ^:parallel boolean-filter-clause-equals-test
+ (testing "boolean-filter-clause creates equals clause"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000003" :effective-type :type/Boolean}
+ parts {:operator :=
+ :dimension dimension
+ :values [true]}
+ clause (lib-metric.filter/boolean-filter-clause parts)]
+ (is (= := (first clause)))
+ (is (= [:dimension {} "00000000-0000-0000-0000-000000000003"] (nth clause 2)))
+ (is (true? (nth clause 3))))))
+
+(deftest ^:parallel boolean-filter-clause-is-null-test
+ (testing "boolean-filter-clause creates is-null clause"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000003" :effective-type :type/Boolean}
+ parts {:operator :is-null :dimension dimension :values []}
+ clause (lib-metric.filter/boolean-filter-clause parts)]
+ (is (= :is-null (first clause))))))
+
+(deftest ^:parallel number-filter-clause-equals-test
+ (testing "number-filter-clause creates equals clause"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000002" :effective-type :type/Integer}
+ parts {:operator := :dimension dimension :values [42]}
+ clause (lib-metric.filter/number-filter-clause parts)]
+ (is (= := (first clause)))
+ (is (= [:dimension {} "00000000-0000-0000-0000-000000000002"] (nth clause 2)))
+ (is (= 42 (nth clause 3))))))
+
+(deftest ^:parallel number-filter-clause-between-test
+ (testing "number-filter-clause creates between clause"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000002" :effective-type :type/Float}
+ parts {:operator :between :dimension dimension :values [10 100]}
+ clause (lib-metric.filter/number-filter-clause parts)]
+ (is (= :between (first clause)))
+ (is (= [:dimension {} "00000000-0000-0000-0000-000000000002"] (nth clause 2)))
+ (is (= 10 (nth clause 3)))
+ (is (= 100 (nth clause 4))))))
+
+(deftest ^:parallel number-filter-clause-comparison-test
+ (testing "number-filter-clause creates comparison clauses"
+ (doseq [op [:> :>= :< :<=]]
+ (let [dimension {:id "00000000-0000-0000-0000-000000000002" :effective-type :type/Integer}
+ parts {:operator op :dimension dimension :values [50]}
+ clause (lib-metric.filter/number-filter-clause parts)]
+ (is (= op (first clause)))
+ (is (= 50 (nth clause 3)))))))
+
+(deftest ^:parallel number-filter-clause-null-test
+ (testing "number-filter-clause creates null check clauses"
+ (doseq [op [:is-null :not-null]]
+ (let [dimension {:id "00000000-0000-0000-0000-000000000002" :effective-type :type/Integer}
+ parts {:operator op :dimension dimension :values []}
+ clause (lib-metric.filter/number-filter-clause parts)]
+ (is (= op (first clause)))
+ (is (= 3 (count clause)))))))
+
+(deftest ^:parallel string-filter-clause-equals-test
+ (testing "string-filter-clause creates equals clause with multiple values"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000001" :effective-type :type/Text}
+ parts {:operator := :dimension dimension :values ["a" "b" "c"] :options {}}
+ clause (lib-metric.filter/string-filter-clause parts)]
+ (is (= := (first clause)))
+ (is (= [:dimension {} "00000000-0000-0000-0000-000000000001"] (nth clause 2)))
+ (is (= "a" (nth clause 3)))
+ (is (= "b" (nth clause 4)))
+ (is (= "c" (nth clause 5))))))
+
+(deftest ^:parallel string-filter-clause-contains-test
+ (testing "string-filter-clause creates contains clause"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000001" :effective-type :type/Text}
+ parts {:operator :contains :dimension dimension :values ["search"] :options {}}
+ clause (lib-metric.filter/string-filter-clause parts)]
+ (is (= :contains (first clause)))
+ (is (= "search" (nth clause 3))))))
+
+(deftest ^:parallel string-filter-clause-contains-with-options-test
+ (testing "string-filter-clause creates contains clause with options"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000001" :effective-type :type/Text}
+ parts {:operator :contains :dimension dimension :values ["search"] :options {:case-sensitive false}}
+ clause (lib-metric.filter/string-filter-clause parts)]
+ (is (= :contains (first clause)))
+ (let [opts (second clause)]
+ (is (false? (:case-sensitive opts)))
+ (is (string? (:lib/uuid opts)))))))
+
+(deftest ^:parallel string-filter-clause-empty-test
+ (testing "string-filter-clause creates is-empty and not-empty clauses"
+ (doseq [op [:is-empty :not-empty]]
+ (let [dimension {:id "00000000-0000-0000-0000-000000000001" :effective-type :type/Text}
+ parts {:operator op :dimension dimension :values [] :options {}}
+ clause (lib-metric.filter/string-filter-clause parts)]
+ (is (= op (first clause)))
+ (is (= 3 (count clause)))))))
+
+(deftest ^:parallel coordinate-filter-clause-standard-test
+ (testing "coordinate-filter-clause creates standard comparison clauses"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000006" :effective-type :type/Float :semantic-type :type/Latitude}
+ parts {:operator := :dimension dimension :longitude-dimension nil :values [40.7128]}
+ clause (lib-metric.filter/coordinate-filter-clause parts)]
+ (is (= := (first clause)))
+ (is (= 40.7128 (nth clause 3))))))
+
+(deftest ^:parallel coordinate-filter-clause-inside-test
+ (testing "coordinate-filter-clause creates inside clause"
+ (let [lat-dim {:id "00000000-0000-0000-0000-000000000006" :effective-type :type/Float :semantic-type :type/Latitude}
+ lon-dim {:id "00000000-0000-0000-0000-000000000007" :effective-type :type/Float :semantic-type :type/Longitude}
+ parts {:operator :inside
+ :dimension lat-dim
+ :longitude-dimension lon-dim
+ :values [41.0 -74.5 40.5 -73.5]} ;; lat-max lon-min lat-min lon-max
+ clause (lib-metric.filter/coordinate-filter-clause parts)]
+ (is (= :inside (first clause)))
+ (is (= [:dimension {} "00000000-0000-0000-0000-000000000006"] (nth clause 2)))
+ (is (= [:dimension {} "00000000-0000-0000-0000-000000000007"] (nth clause 3)))
+ (is (= 41.0 (nth clause 4)))
+ (is (= -74.5 (nth clause 5)))
+ (is (= 40.5 (nth clause 6)))
+ (is (= -73.5 (nth clause 7))))))
+
+(deftest ^:parallel specific-date-filter-clause-equals-test
+ (testing "specific-date-filter-clause creates equals clause"
+ (let [dimension {:id "dim-date" :effective-type :type/Date}
+ parts {:operator := :dimension dimension :values ["2024-01-15"]}
+ clause (lib-metric.filter/specific-date-filter-clause parts)]
+ (is (= := (first clause)))
+ (is (= "2024-01-15" (nth clause 3))))))
+
+(deftest ^:parallel specific-date-filter-clause-between-test
+ (testing "specific-date-filter-clause creates between clause"
+ (let [dimension {:id "dim-date" :effective-type :type/Date}
+ parts {:operator :between :dimension dimension :values ["2024-01-01" "2024-12-31"]}
+ clause (lib-metric.filter/specific-date-filter-clause parts)]
+ (is (= :between (first clause)))
+ (is (= "2024-01-01" (nth clause 3)))
+ (is (= "2024-12-31" (nth clause 4))))))
+
+(deftest ^:parallel relative-date-filter-clause-simple-test
+ (testing "relative-date-filter-clause creates simple time-interval clause"
+ (let [dimension {:id "dim-date" :effective-type :type/DateTime}
+ parts {:dimension dimension :unit :day :value -30 :offset-unit nil :offset-value nil :options {}}
+ clause (lib-metric.filter/relative-date-filter-clause parts)]
+ (is (= :time-interval (first clause)))
+ (is (string? (:lib/uuid (second clause))))
+ (is (= [:dimension {} "dim-date"] (nth clause 2)))
+ (is (= -30 (nth clause 3)))
+ (is (= :day (nth clause 4))))))
+
+(deftest ^:parallel relative-date-filter-clause-with-offset-test
+ (testing "relative-date-filter-clause creates time-interval clause with offset"
+ (let [dimension {:id "dim-date" :effective-type :type/DateTime}
+ parts {:dimension dimension :unit :day :value -7 :offset-unit :week :offset-value -1 :options {:include-current true}}
+ clause (lib-metric.filter/relative-date-filter-clause parts)]
+ (is (= :time-interval (first clause)))
+ (let [opts (second clause)]
+ (is (= :week (:offset-unit opts)))
+ (is (= -1 (:offset-value opts)))
+ (is (true? (:include-current opts)))))))
+
+(deftest ^:parallel exclude-date-filter-clause-day-of-week-test
+ (testing "exclude-date-filter-clause creates exclude by day-of-week"
+ (let [dimension {:id "dim-date" :effective-type :type/DateTime}
+ parts {:operator :!= :dimension dimension :unit :day-of-week :values [1 7]} ;; exclude Sunday and Saturday
+ clause (lib-metric.filter/exclude-date-filter-clause parts)]
+ (is (= :!= (first clause)))
+ (let [extraction (nth clause 2)]
+ (is (= :get-day-of-week (first extraction)))
+ (is (= [:dimension {} "dim-date"] (nth extraction 2))))
+ (is (= 1 (nth clause 3)))
+ (is (= 7 (nth clause 4))))))
+
+(deftest ^:parallel exclude-date-filter-clause-unknown-unit-throws-test
+ (testing "unknown temporal unit throws instead of silently defaulting"
+ (let [dimension {:id "dim-date" :effective-type :type/DateTime}
+ parts {:operator :!= :dimension dimension :unit :year-of-era :values [2024]}]
+ (is (thrown? #?(:clj Exception :cljs js/Error)
+ (lib-metric.filter/exclude-date-filter-clause parts))))))
+
+(deftest ^:parallel exclude-date-filter-clause-null-test
+ (testing "exclude-date-filter-clause creates null check clause"
+ (let [dimension {:id "dim-date" :effective-type :type/DateTime}
+ parts {:operator :is-null :dimension dimension :unit nil :values []}
+ clause (lib-metric.filter/exclude-date-filter-clause parts)]
+ (is (= :is-null (first clause))))))
+
+(deftest ^:parallel time-filter-clause-greater-than-test
+ (testing "time-filter-clause creates greater than clause"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000005" :effective-type :type/Time}
+ parts {:operator :> :dimension dimension :values ["09:00:00"]}
+ clause (lib-metric.filter/time-filter-clause parts)]
+ (is (= :> (first clause)))
+ (is (= "09:00:00" (nth clause 3))))))
+
+(deftest ^:parallel time-filter-clause-between-test
+ (testing "time-filter-clause creates between clause"
+ (let [dimension {:id "00000000-0000-0000-0000-000000000005" :effective-type :type/Time}
+ parts {:operator :between :dimension dimension :values ["09:00:00" "17:00:00"]}
+ clause (lib-metric.filter/time-filter-clause parts)]
+ (is (= :between (first clause)))
+ (is (= "09:00:00" (nth clause 3)))
+ (is (= "17:00:00" (nth clause 4))))))
+
+;;; -------------------------------------------------- Filter Parts Extraction Tests --------------------------------------------------
+;;; These tests use a mock metadata provider to return test dimensions
+
+(def ^:private mock-string-dim
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000001"
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type nil
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private mock-number-dim
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000002"
+ :name "amount"
+ :display-name "Amount"
+ :effective-type :type/Float
+ :semantic-type nil
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private mock-boolean-dim
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000003"
+ :name "is_active"
+ :display-name "Is Active"
+ :effective-type :type/Boolean
+ :semantic-type nil
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private mock-datetime-dim
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000004"
+ :name "created_at"
+ :display-name "Created At"
+ :effective-type :type/DateTime
+ :semantic-type :type/CreationTimestamp
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private mock-time-dim
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000005"
+ :name "start_time"
+ :display-name "Start Time"
+ :effective-type :type/Time
+ :semantic-type nil
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private mock-lat-dim
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000006"
+ :name "latitude"
+ :display-name "Latitude"
+ :effective-type :type/Float
+ :semantic-type :type/Latitude
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private mock-lon-dim
+ {:lib/type :metadata/dimension
+ :id "00000000-0000-0000-0000-000000000007"
+ :name "longitude"
+ :display-name "Longitude"
+ :effective-type :type/Float
+ :semantic-type :type/Longitude
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private mock-dimensions
+ [mock-string-dim mock-number-dim mock-boolean-dim mock-datetime-dim mock-time-dim mock-lat-dim mock-lon-dim])
+
+(defn- mock-dimension-fetcher
+ "Mock dimension fetcher that returns mock-dimensions for metric-id 1."
+ [{:keys [metric-id]}]
+ (when (= metric-id 1)
+ mock-dimensions))
+
+(def ^:private mock-metadata-provider
+ "A mock metadata provider that returns mock dimensions."
+ (lib-metric.metadata.provider/metric-context-metadata-provider
+ (constantly []) ; metric-fetcher-fn
+ (constantly []) ; measure-fetcher-fn
+ mock-dimension-fetcher ; dimension-fetcher-fn
+ (constantly nil) ; table->db-fn
+ (constantly nil) ; db-provider-fn
+ (constantly nil))) ; setting-fn
+
+(def ^:private mock-definition
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 1]
+ :filters []
+ :projections []
+ :metadata-provider mock-metadata-provider})
+
+(deftest ^:parallel default-filter-parts-is-null-test
+ (testing "default-filter-parts extracts is-null parts"
+ (let [clause [:is-null {} [:dimension {} "00000000-0000-0000-0000-000000000002"]]
+ parts (lib-metric.filter/default-filter-parts mock-definition clause)]
+ (is (= :is-null (:operator parts)))
+ (is (= (:id mock-number-dim) (:id (:dimension parts)))))))
+
+(deftest ^:parallel default-filter-parts-not-null-test
+ (testing "default-filter-parts extracts not-null parts"
+ (let [clause [:not-null {} [:dimension {} "00000000-0000-0000-0000-000000000001"]]
+ parts (lib-metric.filter/default-filter-parts mock-definition clause)]
+ (is (= :not-null (:operator parts)))
+ (is (= (:id mock-string-dim) (:id (:dimension parts)))))))
+
+(deftest ^:parallel default-filter-parts-returns-nil-for-other-operators-test
+ (testing "default-filter-parts returns nil for non-null operators"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000002"] 42]
+ parts (lib-metric.filter/default-filter-parts mock-definition clause)]
+ (is (nil? parts)))))
+
+(deftest ^:parallel boolean-filter-parts-equals-test
+ (testing "boolean-filter-parts extracts equals parts"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000003"] true]
+ parts (lib-metric.filter/boolean-filter-parts mock-definition clause)]
+ (is (= := (:operator parts)))
+ (is (= (:id mock-boolean-dim) (:id (:dimension parts))))
+ (is (= [true] (:values parts))))))
+
+(deftest ^:parallel boolean-filter-parts-null-test
+ (testing "boolean-filter-parts extracts null check parts"
+ (let [clause [:is-null {} [:dimension {} "00000000-0000-0000-0000-000000000003"]]
+ parts (lib-metric.filter/boolean-filter-parts mock-definition clause)]
+ (is (= :is-null (:operator parts)))
+ (is (= [] (:values parts))))))
+
+(deftest ^:parallel boolean-filter-parts-returns-nil-for-non-boolean-test
+ (testing "boolean-filter-parts returns nil for non-boolean dimension"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000002"] 42]
+ parts (lib-metric.filter/boolean-filter-parts mock-definition clause)]
+ (is (nil? parts)))))
+
+(deftest ^:parallel number-filter-parts-equals-test
+ (testing "number-filter-parts extracts equals parts"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000002"] 42]
+ parts (lib-metric.filter/number-filter-parts mock-definition clause)]
+ (is (= := (:operator parts)))
+ (is (= (:id mock-number-dim) (:id (:dimension parts))))
+ (is (= [42] (:values parts))))))
+
+(deftest ^:parallel number-filter-parts-between-test
+ (testing "number-filter-parts extracts between parts"
+ (let [clause [:between {} [:dimension {} "00000000-0000-0000-0000-000000000002"] 10 100]
+ parts (lib-metric.filter/number-filter-parts mock-definition clause)]
+ (is (= :between (:operator parts)))
+ (is (= [10 100] (:values parts))))))
+
+(deftest ^:parallel number-filter-parts-comparison-test
+ (testing "number-filter-parts extracts comparison parts"
+ (doseq [op [:> :>= :< :<=]]
+ (let [clause [op {} [:dimension {} "00000000-0000-0000-0000-000000000002"] 50]
+ parts (lib-metric.filter/number-filter-parts mock-definition clause)]
+ (is (= op (:operator parts)))
+ (is (= [50] (:values parts)))))))
+
+(deftest ^:parallel number-filter-parts-returns-nil-for-non-numeric-test
+ (testing "number-filter-parts returns nil for non-numeric dimension"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000001"] "value"]
+ parts (lib-metric.filter/number-filter-parts mock-definition clause)]
+ (is (nil? parts)))))
+
+(deftest ^:parallel string-filter-parts-equals-test
+ (testing "string-filter-parts extracts equals parts"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000001"] "a" "b" "c"]
+ parts (lib-metric.filter/string-filter-parts mock-definition clause)]
+ (is (= := (:operator parts)))
+ (is (= (:id mock-string-dim) (:id (:dimension parts))))
+ (is (= ["a" "b" "c"] (:values parts)))
+ (is (= {} (:options parts))))))
+
+(deftest ^:parallel string-filter-parts-contains-test
+ (testing "string-filter-parts extracts contains parts"
+ (let [clause [:contains {} [:dimension {} "00000000-0000-0000-0000-000000000001"] "search"]
+ parts (lib-metric.filter/string-filter-parts mock-definition clause)]
+ (is (= :contains (:operator parts)))
+ (is (= ["search"] (:values parts)))
+ (is (= {} (:options parts))))))
+
+(deftest ^:parallel string-filter-parts-contains-with-options-test
+ (testing "string-filter-parts extracts contains parts with options"
+ (let [clause [:contains {:case-sensitive false} [:dimension {} "00000000-0000-0000-0000-000000000001"] "search"]
+ parts (lib-metric.filter/string-filter-parts mock-definition clause)]
+ (is (= :contains (:operator parts)))
+ (is (= {:case-sensitive false} (:options parts))))))
+
+(deftest ^:parallel string-filter-parts-empty-test
+ (testing "string-filter-parts extracts is-empty parts"
+ (let [clause [:is-empty {} [:dimension {} "00000000-0000-0000-0000-000000000001"]]
+ parts (lib-metric.filter/string-filter-parts mock-definition clause)]
+ (is (= :is-empty (:operator parts)))
+ (is (= [] (:values parts))))))
+
+(deftest ^:parallel coordinate-filter-parts-standard-test
+ (testing "coordinate-filter-parts extracts standard comparison parts"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000006"] 40.7128]
+ parts (lib-metric.filter/coordinate-filter-parts mock-definition clause)]
+ (is (= := (:operator parts)))
+ (is (= (:id mock-lat-dim) (:id (:dimension parts))))
+ (is (= [40.7128] (:values parts)))
+ (is (nil? (:longitude-dimension parts))))))
+
+(deftest ^:parallel coordinate-filter-parts-inside-test
+ (testing "coordinate-filter-parts extracts inside parts"
+ (let [clause [:inside {} [:dimension {} "00000000-0000-0000-0000-000000000006"] [:dimension {} "00000000-0000-0000-0000-000000000007"] 41.0 -74.5 40.5 -73.5]
+ parts (lib-metric.filter/coordinate-filter-parts mock-definition clause)]
+ (is (= :inside (:operator parts)))
+ (is (= (:id mock-lat-dim) (:id (:dimension parts))))
+ (is (= (:id mock-lon-dim) (:id (:longitude-dimension parts))))
+ (is (= [41.0 -74.5 40.5 -73.5] (:values parts))))))
+
+(deftest ^:parallel specific-date-filter-parts-equals-test
+ (testing "specific-date-filter-parts extracts equals parts"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000004"] "2024-01-15"]
+ parts (lib-metric.filter/specific-date-filter-parts mock-definition clause)]
+ (is (= := (:operator parts)))
+ (is (= (:id mock-datetime-dim) (:id (:dimension parts))))
+ (is (= ["2024-01-15"] (:values parts)))
+ (is (false? (:has-time parts))))))
+
+(deftest ^:parallel specific-date-filter-parts-with-time-test
+ (testing "specific-date-filter-parts detects time component"
+ (let [clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000004"] "2024-01-15T14:30:00"]
+ parts (lib-metric.filter/specific-date-filter-parts mock-definition clause)]
+ (is (= ["2024-01-15T14:30:00"] (:values parts)))
+ (is (true? (:has-time parts))))))
+
+(deftest ^:parallel specific-date-filter-parts-between-test
+ (testing "specific-date-filter-parts extracts between parts"
+ (let [clause [:between {} [:dimension {} "00000000-0000-0000-0000-000000000004"] "2024-01-01" "2024-12-31"]
+ parts (lib-metric.filter/specific-date-filter-parts mock-definition clause)]
+ (is (= :between (:operator parts)))
+ (is (= ["2024-01-01" "2024-12-31"] (:values parts))))))
+
+(deftest ^:parallel relative-date-filter-parts-simple-test
+ (testing "relative-date-filter-parts extracts simple time-interval parts"
+ (let [clause [:time-interval {} [:dimension {} "00000000-0000-0000-0000-000000000004"] -30 :day]
+ parts (lib-metric.filter/relative-date-filter-parts mock-definition clause)]
+ (is (= (:id mock-datetime-dim) (:id (:dimension parts))))
+ (is (= :day (:unit parts)))
+ (is (= -30 (:value parts)))
+ (is (nil? (:offset-unit parts)))
+ (is (nil? (:offset-value parts)))
+ (is (= {} (:options parts))))))
+
+(deftest ^:parallel relative-date-filter-parts-with-offset-test
+ (testing "relative-date-filter-parts extracts parts with offset"
+ (let [clause [:time-interval {:offset-unit :week :offset-value -1 :include-current true}
+ [:dimension {} "00000000-0000-0000-0000-000000000004"] -7 :day]
+ parts (lib-metric.filter/relative-date-filter-parts mock-definition clause)]
+ (is (= :week (:offset-unit parts)))
+ (is (= -1 (:offset-value parts)))
+ (is (= {:include-current true} (:options parts))))))
+
+(deftest ^:parallel exclude-date-filter-parts-day-of-week-test
+ (testing "exclude-date-filter-parts extracts day-of-week exclusion"
+ (let [clause [:!= {} [:get-day-of-week {} [:dimension {} "00000000-0000-0000-0000-000000000004"]] 1 7]
+ parts (lib-metric.filter/exclude-date-filter-parts mock-definition clause)]
+ (is (= :!= (:operator parts)))
+ (is (= (:id mock-datetime-dim) (:id (:dimension parts))))
+ (is (= :day-of-week (:unit parts)))
+ (is (= [1 7] (:values parts))))))
+
+(deftest ^:parallel time-filter-parts-greater-than-test
+ (testing "time-filter-parts extracts greater than parts"
+ (let [clause [:> {} [:dimension {} "00000000-0000-0000-0000-000000000005"] "09:00:00"]
+ parts (lib-metric.filter/time-filter-parts mock-definition clause)]
+ (is (= :> (:operator parts)))
+ (is (= (:id mock-time-dim) (:id (:dimension parts))))
+ (is (= 1 (count (:values parts))))
+ (is (u.time/same-time? (u.time/coerce-to-time "09:00:00") (first (:values parts)))))))
+
+(deftest ^:parallel time-filter-parts-between-test
+ (testing "time-filter-parts extracts between parts"
+ (let [clause [:between {} [:dimension {} "00000000-0000-0000-0000-000000000005"] "09:00:00" "17:00:00"]
+ parts (lib-metric.filter/time-filter-parts mock-definition clause)]
+ (is (= :between (:operator parts)))
+ (is (= 2 (count (:values parts))))
+ (is (u.time/same-time? (u.time/coerce-to-time "09:00:00") (first (:values parts))))
+ (is (u.time/same-time? (u.time/coerce-to-time "17:00:00") (second (:values parts)))))))
+
+(deftest ^:parallel time-filter-parts-returns-nil-for-non-time-test
+ (testing "time-filter-parts returns nil for non-time dimension"
+ (let [clause [:> {} [:dimension {} "00000000-0000-0000-0000-000000000004"] "2024-01-15"]
+ parts (lib-metric.filter/time-filter-parts mock-definition clause)]
+ (is (nil? parts)))))
+
+;;; -------------------------------------------------- filterable-dimensions-for-instance --------------------------------------------------
+
+(deftest ^:parallel filterable-dimensions-for-instance-returns-dims-scoped-to-uuid-test
+ (testing "filterable-dimensions-for-instance returns dims scoped to instance UUID"
+ (let [leaf [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 1]
+ ;; Add a filter keyed to this instance
+ filter-clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000001"] "value"]
+ definition (assoc mock-definition
+ :filters [{:lib/uuid "550e8400-e29b-41d4-a716-446655440001"
+ :filter filter-clause}])
+ dims (lib-metric.filter/filterable-dimensions-for-instance definition leaf)]
+ (is (seq dims))
+ ;; The string dimension should have a filter position
+ (let [string-dim (some #(when (= "00000000-0000-0000-0000-000000000001" (:id %)) %) dims)]
+ (is (some? string-dim))
+ (is (= [0] (:filter-positions string-dim)))))))
+
+(deftest ^:parallel filterable-dimensions-for-instance-excludes-other-instance-filters-test
+ (testing "filterable-dimensions-for-instance excludes filters from other instances"
+ (let [leaf [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 1]
+ ;; Add a filter keyed to a different UUID
+ filter-clause [:= {} [:dimension {} "00000000-0000-0000-0000-000000000001"] "value"]
+ definition (assoc mock-definition
+ :filters [{:lib/uuid "other-instance-uuid"
+ :filter filter-clause}])
+ dims (lib-metric.filter/filterable-dimensions-for-instance definition leaf)]
+ (is (seq dims))
+ ;; All dimensions should have empty filter-positions
+ (doseq [dim dims]
+ (is (= [] (:filter-positions dim)))))))
diff --git a/test/metabase/lib_metric/js_test.cljs b/test/metabase/lib_metric/js_test.cljs
new file mode 100644
index 00000000000..53c96127202
--- /dev/null
+++ b/test/metabase/lib_metric/js_test.cljs
@@ -0,0 +1,527 @@
+(ns metabase.lib-metric.js-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.js :as lib-metric.js]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private sample-metric-metadata
+ {:lib/type :metadata/metric
+ :id 42
+ :name "Total Revenue"
+ :dimensions []
+ :dimension-mappings []
+ :dataset-query {:database 1 :type :query :query {:source-table 1}}})
+
+(def ^:private sample-measure-metadata
+ {:lib/type :metadata/measure
+ :id 99
+ :name "Average Order Value"
+ :table-id 7
+ :dimensions []
+ :dimension-mappings []
+ :definition {:database 1 :type :query :query {:source-table 2}}})
+
+(def ^:private mock-provider
+ "A mock metadata provider that returns test metric/measure metadata."
+ (reify lib.metadata.protocols/MetadataProvider
+ (database [_this]
+ nil)
+ (metadatas [_this spec]
+ (let [lib-type (:lib/type spec)
+ ids (:id spec)]
+ (cond
+ (and (= lib-type :metadata/metric) (contains? ids 42))
+ [sample-metric-metadata]
+
+ (and (= lib-type :metadata/measure) (contains? ids 99))
+ [sample-measure-metadata]
+
+ :else
+ [])))
+ (setting [_this _setting-name]
+ nil)))
+
+;;; -------------------------------------------------- toJsMetricDefinition --------------------------------------------------
+
+(deftest ^:parallel toJsMetricDefinition-metric-source-test
+ (let [definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :filters []
+ :projections []
+ :metadata-provider mock-provider}
+ js-def (lib-metric.js/toJsMetricDefinition definition)
+ clj-def (js->clj js-def :keywordize-keys true)]
+ (testing "has expression key with metric expression"
+ (is (= ["metric" {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42] (:expression clj-def))))
+ (testing "omits empty filters"
+ (is (not (contains? clj-def :filters))))
+ (testing "omits empty projections"
+ (is (not (contains? clj-def :projections))))))
+
+(deftest ^:parallel toJsMetricDefinition-measure-source-test
+ (let [definition {:lib/type :metric/definition
+ :expression [:measure {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]
+ :filters []
+ :projections []
+ :metadata-provider mock-provider}
+ js-def (lib-metric.js/toJsMetricDefinition definition)
+ clj-def (js->clj js-def :keywordize-keys true)]
+ (testing "has expression key with measure expression"
+ (is (= ["measure" {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99] (:expression clj-def))))))
+
+(deftest ^:parallel toJsMetricDefinition-with-filters-and-projections-test
+ (let [inst-filter {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+ :filter [:= {} [:dimension {} "uuid-1"] "Electronics"]}
+ typed-proj {:type :metric :id 42 :projection [[:dimension {} "uuid-2"]]}
+ definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :filters [inst-filter]
+ :projections [typed-proj]
+ :metadata-provider mock-provider}
+ js-def (lib-metric.js/toJsMetricDefinition definition)
+ clj-def (js->clj js-def :keywordize-keys true)]
+ (testing "includes filters when present"
+ (is (some? (:filters clj-def))))
+ (testing "includes projections when present"
+ (is (some? (:projections clj-def))))))
+
+;;; -------------------------------------------------- fromJsMetricDefinition --------------------------------------------------
+
+(deftest ^:parallel fromJsMetricDefinition-expression-format-test
+ (let [js-def #js {:expression #js ["metric" #js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]}
+ definition (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (testing "has correct lib/type"
+ (is (= :metric/definition (:lib/type definition))))
+ (testing "has correct expression"
+ (is (= :metric (first (:expression definition))))
+ (is (= 42 (nth (:expression definition) 2))))
+ (testing "has empty filters"
+ (is (= [] (:filters definition))))
+ (testing "has empty projections"
+ (is (= [] (:projections definition))))
+ (testing "preserves metadata-provider"
+ (is (= mock-provider (:metadata-provider definition))))))
+
+(deftest ^:parallel fromJsMetricDefinition-arithmetic-expression-test
+ (let [js-def #js {:expression #js ["+" #js {} #js ["metric" #js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ #js ["measure" #js {"lib/uuid" "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]]}
+ definition (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (testing "has correct lib/type"
+ (is (= :metric/definition (:lib/type definition))))
+ (testing "has arithmetic expression with correct operator"
+ (is (= :+ (first (:expression definition)))))
+ (testing "has metric leaf"
+ (let [metric-leaf (nth (:expression definition) 2)]
+ (is (= :metric (first metric-leaf)))
+ (is (= 42 (nth metric-leaf 2)))))
+ (testing "has measure leaf"
+ (let [measure-leaf (nth (:expression definition) 3)]
+ (is (= :measure (first measure-leaf)))
+ (is (= 99 (nth measure-leaf 2)))))))
+
+(deftest ^:parallel fromJsMetricDefinition-legacy-metric-source-test
+ (let [js-def #js {:source-metric 42}
+ definition (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (testing "has correct lib/type"
+ (is (= :metric/definition (:lib/type definition))))
+ (testing "has expression with metric type"
+ (is (= :metric (first (:expression definition))))
+ (is (= 42 (nth (:expression definition) 2))))
+ (testing "has empty filters"
+ (is (= [] (:filters definition))))
+ (testing "has empty projections"
+ (is (= [] (:projections definition))))
+ (testing "preserves metadata-provider"
+ (is (= mock-provider (:metadata-provider definition))))))
+
+(deftest ^:parallel fromJsMetricDefinition-legacy-measure-source-test
+ (let [js-def #js {:source-measure 99}
+ definition (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (testing "has expression with measure type"
+ (is (= :measure (first (:expression definition))))
+ (is (= 99 (nth (:expression definition) 2))))))
+
+(deftest ^:parallel fromJsMetricDefinition-with-filters-and-projections-test
+ (let [js-def #js {:expression #js ["metric" #js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :filters #js [#js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+ :filter #js ["=" #js {} #js ["dimension" #js {} "uuid-1"] "Electronics"]}]
+ :projections #js [#js {:type "metric" :id 42
+ :projection #js [#js ["dimension" #js {} "uuid-2"]]}]}
+ definition (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (testing "converts instance filters"
+ (is (= 1 (count (:filters definition))))
+ (is (= "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" (:lib/uuid (first (:filters definition)))))
+ (is (= := (first (:filter (first (:filters definition)))))))
+ (testing "converts typed projections"
+ (is (= 1 (count (:projections definition))))
+ (is (= :metric (:type (first (:projections definition)))))
+ (is (= 42 (:id (first (:projections definition))))))))
+
+(deftest ^:parallel fromJsMetricDefinition-throws-without-source-test
+ (let [js-def #js {:filters #js []}]
+ (is (thrown-with-msg? js/Error #"must have expression or source-metric"
+ (lib-metric.js/fromJsMetricDefinition mock-provider js-def)))))
+
+;;; -------------------------------------------------- Round-trip Tests --------------------------------------------------
+
+(deftest ^:parallel round-trip-metric-definition-test
+ (testing "metric-based definition round-trips correctly"
+ (let [original {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :filters []
+ :projections []
+ :metadata-provider mock-provider}
+ js-def (lib-metric.js/toJsMetricDefinition original)
+ round-trip (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (is (= :metric/definition (:lib/type round-trip)))
+ (is (= :metric (first (:expression round-trip))))
+ (is (= 42 (nth (:expression round-trip) 2)))
+ (is (= [] (:filters round-trip)))
+ (is (= [] (:projections round-trip))))))
+
+(deftest ^:parallel round-trip-measure-definition-test
+ (testing "measure-based definition round-trips correctly"
+ (let [original {:lib/type :metric/definition
+ :expression [:measure {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]
+ :filters []
+ :projections []
+ :metadata-provider mock-provider}
+ js-def (lib-metric.js/toJsMetricDefinition original)
+ round-trip (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (is (= :metric/definition (:lib/type round-trip)))
+ (is (= :measure (first (:expression round-trip))))
+ (is (= 99 (nth (:expression round-trip) 2))))))
+
+(deftest ^:parallel round-trip-with-filters-and-projections-test
+ (testing "definition with filters/projections round-trips correctly"
+ (let [inst-filter {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+ :filter [:= {} [:dimension {} "dimension-uuid"] "value"]}
+ typed-proj {:type :metric :id 42 :projection [[:dimension {} "uuid-2"]]}
+ original {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :filters [inst-filter]
+ :projections [typed-proj]
+ :metadata-provider mock-provider}
+ js-def (lib-metric.js/toJsMetricDefinition original)
+ round-trip (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ ;; After round-trip, check structure is preserved
+ (is (= 1 (count (:filters round-trip))))
+ (is (= 1 (count (:projections round-trip)))))))
+
+;;; -------------------------------------------------- MetadataProviderable Tests --------------------------------------------------
+
+(def ^:private sample-definition
+ "A sample MetricDefinition that can be used as a MetadataProviderable."
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :filters []
+ :projections []
+ :metadata-provider mock-provider})
+
+(deftest ^:parallel metricMetadata-accepts-definition-test
+ (testing "metricMetadata accepts a MetricDefinition as MetadataProviderable"
+ (let [result (lib-metric.js/metricMetadata sample-definition 42)]
+ (is (some? result))
+ (is (= :metadata/metric (:lib/type result)))
+ (is (= 42 (:id result))))))
+
+(deftest ^:parallel metricMetadata-returns-nil-for-missing-metric-test
+ (testing "metricMetadata returns nil for missing metric when using definition"
+ (let [result (lib-metric.js/metricMetadata sample-definition 999)]
+ (is (nil? result)))))
+
+(deftest ^:parallel measureMetadata-accepts-definition-test
+ (testing "measureMetadata accepts a MetricDefinition as MetadataProviderable"
+ (let [result (lib-metric.js/measureMetadata sample-definition 99)]
+ (is (some? result))
+ (is (= :metadata/measure (:lib/type result)))
+ (is (= 99 (:id result))))))
+
+(deftest ^:parallel measureMetadata-returns-nil-for-missing-measure-test
+ (testing "measureMetadata returns nil for missing measure when using definition"
+ (let [result (lib-metric.js/measureMetadata sample-definition 999)]
+ (is (nil? result)))))
+
+(deftest ^:parallel fromMetricMetadata-accepts-definition-test
+ (testing "fromMetricMetadata accepts a MetricDefinition as MetadataProviderable"
+ (let [new-definition (lib-metric.js/fromMetricMetadata sample-definition sample-metric-metadata)]
+ (is (= :metric/definition (:lib/type new-definition)))
+ (is (= :metric (first (:expression new-definition))))
+ (is (= 42 (nth (:expression new-definition) 2)))
+ (is (= mock-provider (:metadata-provider new-definition))))))
+
+(deftest ^:parallel fromMeasureMetadata-accepts-definition-test
+ (testing "fromMeasureMetadata accepts a MetricDefinition as MetadataProviderable"
+ (let [new-definition (lib-metric.js/fromMeasureMetadata sample-definition sample-measure-metadata)]
+ (is (= :metric/definition (:lib/type new-definition)))
+ (is (= :measure (first (:expression new-definition))))
+ (is (= 99 (nth (:expression new-definition) 2)))
+ (is (= mock-provider (:metadata-provider new-definition))))))
+
+(deftest ^:parallel fromJsMetricDefinition-accepts-definition-test
+ (testing "fromJsMetricDefinition accepts a MetricDefinition as MetadataProviderable"
+ (let [js-def #js {:source-metric 42}
+ new-definition (lib-metric.js/fromJsMetricDefinition sample-definition js-def)]
+ (is (= :metric/definition (:lib/type new-definition)))
+ (is (= :metric (first (:expression new-definition))))
+ (is (= 42 (nth (:expression new-definition) 2)))
+ (is (= mock-provider (:metadata-provider new-definition))))))
+
+;;; -------------------------------------------------- fromJsMetricDefinition nil-safety --------------------------------------------------
+
+(deftest ^:parallel fromJsMetricDefinition-nil-filter-dropped-test
+ (testing "instance filter with nil/missing :filter is dropped"
+ (let [js-def #js {:expression #js ["metric" #js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :filters #js [#js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"}]}
+ definition (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (is (= [] (:filters definition))
+ "instance filter with nil :filter should be dropped"))))
+
+(deftest ^:parallel fromJsMetricDefinition-malformed-projection-dropped-test
+ (testing "malformed dimension-ref in projection is dropped"
+ (let [js-def #js {:expression #js ["metric" #js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ :projections #js [#js {:type "metric"
+ :id 42
+ :projection #js [#js ["dimension" #js {} "uuid-1"]
+ #js ["bad"]]}]}
+ definition (lib-metric.js/fromJsMetricDefinition mock-provider js-def)]
+ (is (= 1 (count (:projections definition))))
+ ;; The valid dimension-ref should be kept, the malformed one dropped
+ (let [proj-refs (get-in definition [:projections 0 :projection])]
+ (is (<= (count proj-refs) 1)
+ "malformed dimension-ref should be filtered out")))))
+
+(deftest ^:parallel fromJsMetricDefinition-null-opts-source-instance-test
+ (testing "source instance with null opts doesn't crash"
+ (let [leaf1 [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ leaf2 [:measure {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]
+ definition (assoc sample-definition
+ :expression [:+ {} leaf1 leaf2]
+ :filters [{:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+ :filter [:= {} [:dimension {} "d1"] "v1"]}])
+ ;; Simulate JS array with null opts
+ js-inst #js ["metric" nil 42]
+ result (lib-metric.js/filters definition js-inst)]
+ (is (array? result))
+ (is (= 0 (.-length result))))))
+
+;;; -------------------------------------------------- filter --------------------------------------------------
+
+(deftest ^:parallel filter-adds-clause-test
+ (testing "filter adds a filter clause to the definition"
+ (let [filter-clause [:= {} [:dimension {} "dim-uuid"] "value"]
+ result (lib-metric.js/filter sample-definition filter-clause)]
+ (is (= :metric/definition (:lib/type result)))
+ (is (= 1 (count (:filters result))))
+ (is (= filter-clause (:filter (first (:filters result))))))))
+
+(deftest ^:parallel filter-appends-to-existing-test
+ (testing "filter appends to existing filters"
+ (let [existing-inst {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+ :filter [:= {} [:dimension {} "dim-1"] "a"]}
+ new-filter [:= {} [:dimension {} "dim-2"] "b"]
+ definition (assoc sample-definition :filters [existing-inst])
+ result (lib-metric.js/filter definition new-filter)]
+ (is (= 2 (count (:filters result))))
+ (is (= [:= {} [:dimension {} "dim-1"] "a"] (:filter (first (:filters result))))))))
+
+;;; -------------------------------------------------- filterableDimensionOperators --------------------------------------------------
+
+(def ^:private string-dimension
+ {:lib/type :metadata/dimension
+ :id "dim-string"
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type nil})
+
+(def ^:private number-dimension
+ {:lib/type :metadata/dimension
+ :id "dim-number"
+ :name "amount"
+ :display-name "Amount"
+ :effective-type :type/Float
+ :semantic-type nil})
+
+(deftest ^:parallel filterableDimensionOperators-string-test
+ (testing "filterableDimensionOperators returns string operators for string dimension"
+ (let [result (lib-metric.js/filterableDimensionOperators string-dimension)]
+ (is (array? result))
+ (is (= ["is-empty" "not-empty" "=" "!=" "contains" "does-not-contain" "starts-with" "ends-with"]
+ (js->clj result))))))
+
+(deftest ^:parallel filterableDimensionOperators-number-test
+ (testing "filterableDimensionOperators returns number operators for number dimension"
+ (let [result (lib-metric.js/filterableDimensionOperators number-dimension)]
+ (is (array? result))
+ (is (= ["is-null" "not-null" "=" "!=" ">" ">=" "<" "<=" "between"]
+ (js->clj result))))))
+
+;;; -------------------------------------------------- withTemporalBucket --------------------------------------------------
+
+(def ^:private datetime-dimension
+ {:lib/type :metadata/dimension
+ :id "dim-datetime"
+ :name "created_at"
+ :display-name "Created At"
+ :effective-type :type/DateTime
+ :semantic-type :type/CreationTimestamp
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private dim-ref-datetime
+ [:dimension {:lib/uuid "cccccccc-cccc-cccc-cccc-cccccccccccc"} "dim-datetime"])
+
+(deftest ^:parallel withTemporalBucket-accepts-dimension-reference-test
+ (testing "withTemporalBucket works with a dimension reference"
+ (let [result (lib-metric.js/withTemporalBucket dim-ref-datetime :month)]
+ (is (vector? result))
+ (is (= :dimension (first result)))
+ (is (= "dim-datetime" (nth result 2)))
+ (is (= :month (:temporal-unit (second result)))))))
+
+(deftest ^:parallel withTemporalBucket-accepts-dimension-metadata-test
+ (testing "withTemporalBucket works with dimension metadata (map)"
+ (let [result (lib-metric.js/withTemporalBucket datetime-dimension :month)]
+ (is (vector? result))
+ (is (= :dimension (first result)))
+ (is (= "dim-datetime" (nth result 2)))
+ (is (= :month (:temporal-unit (second result)))))))
+
+(deftest ^:parallel withTemporalBucket-nil-removes-bucket-test
+ (testing "withTemporalBucket with nil removes the temporal unit"
+ (let [with-bucket (lib-metric.js/withTemporalBucket datetime-dimension :month)
+ result (lib-metric.js/withTemporalBucket with-bucket nil)]
+ (is (nil? (:temporal-unit (second result)))))))
+
+;;; -------------------------------------------------- sourceInstances --------------------------------------------------
+
+(deftest ^:parallel sourceInstances-single-leaf-test
+ (testing "sourceInstances returns JS array with one entry for single-source"
+ (let [result (lib-metric.js/sourceInstances sample-definition)]
+ (is (array? result))
+ (is (= 1 (.-length result)))
+ (let [inst (js->clj (aget result 0))]
+ (is (= "metric" (first inst)))
+ (is (= 42 (nth inst 2)))))))
+
+(deftest ^:parallel sourceInstances-multi-source-test
+ (testing "sourceInstances returns JS arrays for multi-source expression"
+ (let [leaf1 [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ leaf2 [:measure {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]
+ definition (assoc sample-definition
+ :expression [:+ {} leaf1 leaf2])
+ result (lib-metric.js/sourceInstances definition)]
+ (is (array? result))
+ (is (= 2 (.-length result)))
+ (let [inst1 (js->clj (aget result 0))
+ inst2 (js->clj (aget result 1))]
+ (is (= "metric" (first inst1)))
+ (is (= 42 (nth inst1 2)))
+ (is (= "measure" (first inst2)))
+ (is (= 99 (nth inst2 2)))))))
+
+;;; -------------------------------------------------- filters multi-arity --------------------------------------------------
+
+(deftest ^:parallel filters-1-arity-returns-flat-clauses-test
+ (testing "filters 1-arity returns flat MBQL filter clauses"
+ (let [filter-clause [:= {} [:dimension {} "dim-uuid"] "value"]
+ definition (lib-metric.js/filter sample-definition filter-clause)
+ result (lib-metric.js/filters definition)]
+ (is (array? result))
+ (is (= 1 (.-length result)))
+ ;; Should be the flat filter clause, not the instance-filter wrapper
+ (is (= := (first (aget result 0)))))))
+
+(deftest ^:parallel filters-1-arity-throws-for-multi-source-test
+ (testing "filters 1-arity throws for multi-source definition"
+ (let [definition (assoc sample-definition
+ :expression [:+ {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "b"} 2]])]
+ (is (thrown? js/Error (lib-metric.js/filters definition))))))
+
+(deftest ^:parallel filters-2-arity-returns-scoped-results-test
+ (testing "filters 2-arity returns filters scoped to source instance"
+ (let [leaf1 [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ leaf2 [:measure {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]
+ filter1 {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+ :filter [:= {} [:dimension {} "d1"] "v1"]}
+ filter2 {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+ :filter [:= {} [:dimension {} "d2"] "v2"]}
+ definition (assoc sample-definition
+ :expression [:+ {} leaf1 leaf2]
+ :filters [filter1 filter2])
+ js-inst #js ["metric" #js {"lib/uuid" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ result (lib-metric.js/filters definition js-inst)]
+ (is (array? result))
+ (is (= 1 (.-length result)))
+ (is (= := (first (aget result 0)))))))
+
+;;; -------------------------------------------------- sourceMetricId / sourceMeasureId with multi-source --------------------------------------------------
+
+(deftest ^:parallel sourceMetricId-returns-nil-for-multi-source-test
+ (testing "sourceMetricId returns nil for multi-source"
+ (let [definition (assoc sample-definition
+ :expression [:+ {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "b"} 2]])]
+ (is (nil? (lib-metric.js/sourceMetricId definition))))))
+
+(deftest ^:parallel sourceMeasureId-returns-nil-for-multi-source-test
+ (testing "sourceMeasureId returns nil for multi-source"
+ (let [definition (assoc sample-definition
+ :expression [:+ {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "b"} 2]])]
+ (is (nil? (lib-metric.js/sourceMeasureId definition))))))
+
+;;; -------------------------------------------------- sourceMeasureTableId --------------------------------------------------
+
+(deftest ^:parallel sourceMeasureTableId-returns-table-id-for-measure-test
+ (testing "sourceMeasureTableId returns the table-id for a measure-based definition"
+ (let [definition (assoc sample-definition
+ :expression [:measure {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99])]
+ (is (= 7 (lib-metric.js/sourceMeasureTableId definition))))))
+
+(deftest ^:parallel sourceMeasureTableId-returns-nil-for-metric-test
+ (testing "sourceMeasureTableId returns nil for a metric-based definition"
+ (is (nil? (lib-metric.js/sourceMeasureTableId sample-definition)))))
+
+;;; -------------------------------------------------- projections multi-arity --------------------------------------------------
+
+(deftest ^:parallel projections-1-arity-returns-flat-dim-refs-test
+ (testing "projections 1-arity returns flat dimension references"
+ (let [dim-ref [:dimension {:lib/uuid "xxx"} "dim-uuid"]
+ definition (assoc sample-definition
+ :projections [{:type :metric :id 42
+ :projection [dim-ref]}])
+ result (lib-metric.js/projections definition)]
+ (is (array? result))
+ (is (= 1 (.-length result)))
+ (is (= :dimension (first (aget result 0)))))))
+
+(deftest ^:parallel projections-1-arity-throws-for-multi-source-test
+ (testing "projections 1-arity throws for multi-source definition"
+ (let [definition (assoc sample-definition
+ :expression [:+ {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "b"} 2]])]
+ (is (thrown? js/Error (lib-metric.js/projections definition))))))
+
+;;; -------------------------------------------------- filter multi-arity --------------------------------------------------
+
+(deftest ^:parallel filter-3-arity-adds-to-correct-instance-test
+ (testing "filter 3-arity adds filter to correct instance UUID"
+ (let [leaf1 [:metric {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} 42]
+ leaf2 [:measure {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]
+ definition (assoc sample-definition
+ :expression [:+ {} leaf1 leaf2])
+ filter-clause [:= {} [:dimension {} "dim-uuid"] "value"]
+ js-inst #js ["measure" #js {"lib/uuid" "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} 99]
+ result (lib-metric.js/filter definition filter-clause js-inst)]
+ (is (= 1 (count (:filters result))))
+ (is (= "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+ (:lib/uuid (first (:filters result))))))))
diff --git a/test/metabase/lib_metric/metadata/jvm_test.clj b/test/metabase/lib_metric/metadata/jvm_test.clj
new file mode 100644
index 00000000000..4ea1e1b0166
--- /dev/null
+++ b/test/metabase/lib_metric/metadata/jvm_test.clj
@@ -0,0 +1,121 @@
+(ns metabase.lib-metric.metadata.jvm-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.lib-metric.metadata.jvm :as metric-jvm]
+ [metabase.lib-metric.metadata.provider :as provider]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]
+ [metabase.test :as mt]))
+
+(deftest ^:parallel database-returns-nil-test
+ (testing "MetricMetadataProvider.database() should return nil"
+ (let [mp (metric-jvm/metadata-provider)]
+ (is (nil? (lib.metadata.protocols/database mp))))))
+
+(deftest ^:synchronized metadatas-fetches-metrics-test
+ (testing "metadatas should fetch metrics from the database"
+ #_{:clj-kondo/ignore [:discouraged-var]}
+ (mt/with-temp [:model/Card metric {:type :metric
+ :name "Test Metric"
+ :database_id (mt/id)
+ :table_id (mt/id :orders)
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :orders)
+ :aggregation [[:count]]}}}]
+ (let [mp (metric-jvm/metadata-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :id #{(:id metric)}})]
+ (is (= 1 (count metrics)))
+ (is (= "Test Metric" (:name (first metrics))))
+ (is (= :metadata/metric (:lib/type (first metrics))))))))
+
+(deftest ^:synchronized metadatas-fetches-metrics-by-table-id-test
+ (testing "metadatas should fetch metrics by table-id"
+ #_{:clj-kondo/ignore [:discouraged-var]}
+ (mt/with-temp [:model/Card metric {:type :metric
+ :name "Table Metric"
+ :database_id (mt/id)
+ :table_id (mt/id :orders)
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :orders)
+ :aggregation [[:count]]}}}]
+ (let [mp (metric-jvm/metadata-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :table-id (mt/id :orders)})]
+ (is (some #(= (:id metric) (:id %)) metrics))
+ (is (every? #(= (mt/id :orders) (:table-id %)) metrics))))))
+
+(deftest ^:synchronized metadatas-excludes-archived-metrics-test
+ (testing "metadatas should exclude archived metrics when not filtering by ID"
+ #_{:clj-kondo/ignore [:discouraged-var]}
+ (mt/with-temp [:model/Card active-metric {:type :metric
+ :name "Active Metric"
+ :archived false
+ :database_id (mt/id)
+ :table_id (mt/id :orders)
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :orders)
+ :aggregation [[:count]]}}}
+ :model/Card archived-metric {:type :metric
+ :name "Archived Metric"
+ :archived true
+ :database_id (mt/id)
+ :table_id (mt/id :orders)
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :orders)
+ :aggregation [[:count]]}}}]
+ (let [mp (metric-jvm/metadata-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :table-id (mt/id :orders)})]
+ (is (some #(= (:id active-metric) (:id %)) metrics))
+ (is (not-any? #(= (:id archived-metric) (:id %)) metrics))))))
+
+(deftest ^:synchronized metadatas-includes-archived-when-filtering-by-id-test
+ (testing "metadatas should include archived metrics when filtering by ID"
+ #_{:clj-kondo/ignore [:discouraged-var]}
+ (mt/with-temp [:model/Card archived-metric {:type :metric
+ :name "Archived Metric"
+ :archived true
+ :database_id (mt/id)
+ :table_id (mt/id :orders)
+ :dataset_query {:database (mt/id)
+ :type :query
+ :query {:source-table (mt/id :orders)
+ :aggregation [[:count]]}}}]
+ (let [mp (metric-jvm/metadata-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :id #{(:id archived-metric)}})]
+ (is (= 1 (count metrics)))
+ (is (= (:id archived-metric) (:id (first metrics))))))))
+
+(deftest ^:parallel metadatas-routes-columns-to-database-provider-test
+ (testing "metadatas should route column requests to the appropriate database provider"
+ (let [mp (metric-jvm/metadata-provider)
+ columns (lib.metadata.protocols/metadatas mp {:lib/type :metadata/column :table-id (mt/id :orders)})]
+ (is (seq columns))
+ (is (every? #(= (mt/id :orders) (:table-id %)) columns)))))
+
+(deftest ^:parallel database-provider-for-table-returns-provider-test
+ (testing "database-provider-for-table should return a working database provider"
+ (let [mp (metric-jvm/metadata-provider)
+ db-provider (provider/database-provider-for-table mp (mt/id :orders))]
+ (is (some? db-provider))
+ (is (= (mt/id) (:id (lib.metadata.protocols/database db-provider)))))))
+
+(deftest ^:parallel setting-returns-values-test
+ (testing "setting should return Metabase setting values"
+ (let [mp (metric-jvm/metadata-provider)]
+ ;; These settings should exist in any Metabase instance
+ (is (some? (lib.metadata.protocols/setting mp :site-name))))))
+
+(deftest ^:parallel has-cache?-returns-true-test
+ (testing "has-cache? should return true"
+ (let [mp (metric-jvm/metadata-provider)]
+ (is (lib.metadata.protocols/has-cache? mp)))))
+
+(deftest ^:synchronized cross-database-table-routing-test
+ (testing "metadatas should route table requests to correct database providers"
+ (let [mp (metric-jvm/metadata-provider)
+ ;; Try to fetch tables from multiple databases (if available)
+ tables (lib.metadata.protocols/metadatas mp {:lib/type :metadata/table :id #{(mt/id :orders) (mt/id :products)}})]
+ (is (= 2 (count tables)))
+ (is (= #{(mt/id :orders) (mt/id :products)} (set (map :id tables)))))))
diff --git a/test/metabase/lib_metric/metadata/provider_test.cljc b/test/metabase/lib_metric/metadata/provider_test.cljc
new file mode 100644
index 00000000000..1ea975f4e17
--- /dev/null
+++ b/test/metabase/lib_metric/metadata/provider_test.cljc
@@ -0,0 +1,257 @@
+(ns metabase.lib-metric.metadata.provider-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.metadata.provider :as provider]
+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]))
+
+;;; -------------------------------------------------- Mock Data --------------------------------------------------
+
+(def ^:private mock-metrics
+ [{:id 1 :name "Revenue" :table-id 10 :type :metric :archived false :lib/type :metadata/metric}
+ {:id 2 :name "Orders" :table-id 10 :type :metric :archived false :lib/type :metadata/metric}
+ {:id 3 :name "Users" :table-id 20 :type :metric :archived false :lib/type :metadata/metric}
+ {:id 4 :name "Archived Metric" :table-id 10 :type :metric :archived true :lib/type :metadata/metric}
+ {:id 5 :name "Card Metric" :table-id nil :source-card-id 100 :type :metric :archived false :lib/type :metadata/metric}])
+
+(def ^:private mock-tables
+ {10 {:id 10 :name "orders" :db-id 1 :lib/type :metadata/table}
+ 20 {:id 20 :name "users" :db-id 2 :lib/type :metadata/table}
+ 30 {:id 30 :name "products" :db-id 1 :lib/type :metadata/table}})
+
+(def ^:private mock-columns
+ {10 [{:id 100 :name "id" :table-id 10 :lib/type :metadata/column}
+ {:id 101 :name "amount" :table-id 10 :lib/type :metadata/column}]
+ 20 [{:id 200 :name "id" :table-id 20 :lib/type :metadata/column}
+ {:id 201 :name "email" :table-id 20 :lib/type :metadata/column}]})
+
+(def ^:private table->db-id
+ {10 1
+ 20 2
+ 30 1})
+
+(def ^:private mock-settings
+ {:site-name "Test Site"
+ :enable-nested-queries true})
+
+;;; -------------------------------------------------- Mock Provider --------------------------------------------------
+
+(defn- mock-metric-fetcher
+ "Mock metric fetcher that filters mock-metrics based on spec."
+ [{id-set :id, name-set :name, :keys [table-id card-id], :as _spec}]
+ (let [active-only? (not (or id-set name-set))]
+ (into []
+ (comp
+ (if id-set
+ (filter #(contains? id-set (:id %)))
+ identity)
+ (if name-set
+ (filter #(contains? name-set (:name %)))
+ identity)
+ (if table-id
+ (filter #(and (= (:table-id %) table-id)
+ (nil? (:source-card-id %))))
+ identity)
+ (if card-id
+ (filter #(= (:source-card-id %) card-id))
+ identity)
+ (if active-only?
+ (filter #(not (:archived %)))
+ identity)
+ (filter #(= (:type %) :metric)))
+ mock-metrics)))
+
+(defn- mock-table->db-fn [table-id]
+ (get table->db-id table-id))
+
+(defn- mock-db-provider
+ "Create a mock database provider that returns tables and columns for that db."
+ [db-id]
+ (reify lib.metadata.protocols/MetadataProvider
+ (database [_this]
+ {:id db-id :name (str "DB-" db-id) :lib/type :metadata/database})
+ (metadatas [_this {metadata-type :lib/type, id-set :id, :keys [table-id], :as _spec}]
+ (case metadata-type
+ :metadata/table
+ (if id-set
+ (into []
+ (filter #(and (contains? id-set (:id %))
+ (= (:db-id %) db-id)))
+ (vals mock-tables))
+ (into []
+ (filter #(= (:db-id %) db-id))
+ (vals mock-tables)))
+ :metadata/column
+ (when table-id
+ (get mock-columns table-id []))
+ []))
+ (setting [_this k]
+ (get mock-settings k))))
+
+(defn- mock-setting-fn [k]
+ (get mock-settings k))
+
+(defn- create-mock-provider []
+ (provider/metric-context-metadata-provider
+ mock-metric-fetcher
+ mock-table->db-fn
+ mock-db-provider
+ mock-setting-fn))
+
+;;; -------------------------------------------------- Tests --------------------------------------------------
+
+(deftest ^:parallel database-returns-nil-test
+ (testing "database() should return nil for MetricContextMetadataProvider"
+ (let [mp (create-mock-provider)]
+ (is (nil? (lib.metadata.protocols/database mp))))))
+
+(deftest ^:parallel metadatas-fetches-all-active-metrics-test
+ (testing "metadatas should fetch all active metrics when no filters specified"
+ (let [mp (create-mock-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric})]
+ (is (= 4 (count metrics)))
+ (is (every? #(= :metric (:type %)) metrics))
+ (is (not-any? :archived metrics)))))
+
+(deftest ^:parallel metadatas-fetches-metrics-by-id-test
+ (testing "metadatas should fetch metrics by ID"
+ (let [mp (create-mock-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :id #{1 2}})]
+ (is (= 2 (count metrics)))
+ (is (= #{1 2} (set (map :id metrics)))))))
+
+(deftest ^:parallel metadatas-fetches-metrics-by-table-id-test
+ (testing "metadatas should fetch metrics by table-id (excludes card-based metrics)"
+ (let [mp (create-mock-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :table-id 10})]
+ (is (= 2 (count metrics)))
+ (is (every? #(= 10 (:table-id %)) metrics))
+ (is (every? #(nil? (:source-card-id %)) metrics)))))
+
+(deftest ^:parallel metadatas-fetches-metrics-by-card-id-test
+ (testing "metadatas should fetch metrics by card-id"
+ (let [mp (create-mock-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :card-id 100})]
+ (is (= 1 (count metrics)))
+ (is (= 100 (:source-card-id (first metrics)))))))
+
+(deftest ^:parallel metadatas-fetches-archived-metrics-when-id-specified-test
+ (testing "metadatas should include archived metrics when fetching by ID"
+ (let [mp (create-mock-provider)
+ metrics (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :id #{4}})]
+ (is (= 1 (count metrics)))
+ (is (= 4 (:id (first metrics))))
+ (is (true? (:archived (first metrics)))))))
+
+(deftest ^:parallel metadatas-routes-columns-to-db-provider-test
+ (testing "metadatas should route column requests to the appropriate database provider"
+ (let [mp (create-mock-provider)
+ columns (lib.metadata.protocols/metadatas mp {:lib/type :metadata/column :table-id 10})]
+ (is (= 2 (count columns)))
+ (is (every? #(= 10 (:table-id %)) columns)))))
+
+(deftest ^:parallel metadatas-routes-columns-returns-empty-without-table-id-test
+ (testing "metadatas should return empty for columns without table-id"
+ (let [mp (create-mock-provider)
+ columns (lib.metadata.protocols/metadatas mp {:lib/type :metadata/column})]
+ (is (empty? columns)))))
+
+(deftest ^:parallel metadatas-routes-tables-by-id-test
+ (testing "metadatas should route table requests and group by database"
+ (let [mp (create-mock-provider)
+ tables (lib.metadata.protocols/metadatas mp {:lib/type :metadata/table :id #{10 20}})]
+ (is (= 2 (count tables)))
+ (is (= #{10 20} (set (map :id tables)))))))
+
+(deftest ^:parallel metadatas-returns-empty-for-tables-without-ids-test
+ (testing "metadatas should return empty for table requests without specific IDs"
+ (let [mp (create-mock-provider)
+ tables (lib.metadata.protocols/metadatas mp {:lib/type :metadata/table})]
+ (is (empty? tables)))))
+
+(deftest ^:parallel setting-returns-values-test
+ (testing "setting should return setting values"
+ (let [mp (create-mock-provider)]
+ (is (= "Test Site" (lib.metadata.protocols/setting mp :site-name)))
+ (is (true? (lib.metadata.protocols/setting mp :enable-nested-queries)))
+ (is (nil? (lib.metadata.protocols/setting mp :nonexistent-setting))))))
+
+(deftest ^:parallel database-provider-for-table-returns-provider-test
+ (testing "database-provider-for-table should return the database provider for a table"
+ (let [mp (create-mock-provider)
+ db-provider (provider/database-provider-for-table mp 10)]
+ (is (some? db-provider))
+ (is (= 1 (:id (lib.metadata.protocols/database db-provider)))))))
+
+(deftest ^:parallel database-provider-for-table-returns-nil-for-unknown-test
+ (testing "database-provider-for-table should return nil for unknown table"
+ (let [mp (create-mock-provider)]
+ (is (nil? (provider/database-provider-for-table mp 999))))))
+
+;;; -------------------------------------------------- Cache Tests --------------------------------------------------
+
+(deftest cached-metadatas-returns-cached-metrics-test
+ (testing "cached-metadatas should return metrics from cache"
+ (let [mp (create-mock-provider)
+ ;; First fetch to populate cache (metadatas stores in cache internally via fetcher)
+ _ (lib.metadata.protocols/metadatas mp {:lib/type :metadata/metric :id #{1}})
+ ;; Store a metric manually
+ _ (lib.metadata.protocols/store-metadata! mp {:id 1 :name "Cached" :lib/type :metadata/metric})
+ cached (lib.metadata.protocols/cached-metadatas mp :metadata/metric [1])]
+ (is (= 1 (count cached)))
+ (is (= "Cached" (:name (first cached)))))))
+
+(deftest ^:parallel has-cache?-returns-true-test
+ (testing "has-cache? should return true"
+ (let [mp (create-mock-provider)]
+ (is (lib.metadata.protocols/has-cache? mp)))))
+
+(deftest clear-cache!-clears-cache-test
+ (testing "clear-cache! should clear the cache"
+ (let [mp (create-mock-provider)]
+ (lib.metadata.protocols/store-metadata! mp {:id 1 :name "Test" :lib/type :metadata/metric})
+ (is (= 1 (count (lib.metadata.protocols/cached-metadatas mp :metadata/metric [1]))))
+ (lib.metadata.protocols/clear-cache! mp)
+ (is (empty? (lib.metadata.protocols/cached-metadatas mp :metadata/metric [1]))))))
+
+(deftest cache-value!-and-cached-value-work-test
+ (testing "cache-value! and cached-value should work for arbitrary values"
+ (let [mp (create-mock-provider)]
+ (lib.metadata.protocols/cache-value! mp :my-key {:some "value"})
+ (is (= {:some "value"} (lib.metadata.protocols/cached-value mp :my-key :not-found)))
+ (is (= :not-found (lib.metadata.protocols/cached-value mp :other-key :not-found))))))
+
+(deftest store-and-retrieve-measure-via-cache-test
+ (testing "store-metadata! and cached-metadatas work for measures"
+ (let [mp (create-mock-provider)
+ measure {:id 10 :name "Revenue Measure" :lib/type :metadata/measure}]
+ (lib.metadata.protocols/store-metadata! mp measure)
+ (let [cached (lib.metadata.protocols/cached-metadatas mp :metadata/measure [10])]
+ (is (= 1 (count cached)))
+ (is (= "Revenue Measure" (:name (first cached)))))
+ (testing "does not return measure when asking for metric"
+ (is (empty? (lib.metadata.protocols/cached-metadatas mp :metadata/metric [10])))))))
+
+(deftest store-and-retrieve-dimension-via-cache-test
+ (testing "store-metadata! and cached-metadatas work for dimensions"
+ (let [mp (create-mock-provider)
+ dimension {:id 20 :name "Date Dimension" :lib/type :metadata/dimension}]
+ (lib.metadata.protocols/store-metadata! mp dimension)
+ (let [cached (lib.metadata.protocols/cached-metadatas mp :metadata/dimension [20])]
+ (is (= 1 (count cached)))
+ (is (= "Date Dimension" (:name (first cached)))))
+ (testing "does not return dimension when asking for measure"
+ (is (empty? (lib.metadata.protocols/cached-metadatas mp :metadata/measure [20])))))))
+
+(deftest clear-cache!-clears-all-types-test
+ (testing "clear-cache! clears metrics, measures, and dimensions"
+ (let [mp (create-mock-provider)]
+ (lib.metadata.protocols/store-metadata! mp {:id 1 :name "M" :lib/type :metadata/metric})
+ (lib.metadata.protocols/store-metadata! mp {:id 2 :name "Meas" :lib/type :metadata/measure})
+ (lib.metadata.protocols/store-metadata! mp {:id 3 :name "Dim" :lib/type :metadata/dimension})
+ (is (= 1 (count (lib.metadata.protocols/cached-metadatas mp :metadata/metric [1]))))
+ (is (= 1 (count (lib.metadata.protocols/cached-metadatas mp :metadata/measure [2]))))
+ (is (= 1 (count (lib.metadata.protocols/cached-metadatas mp :metadata/dimension [3]))))
+ (lib.metadata.protocols/clear-cache! mp)
+ (is (empty? (lib.metadata.protocols/cached-metadatas mp :metadata/metric [1])))
+ (is (empty? (lib.metadata.protocols/cached-metadatas mp :metadata/measure [2])))
+ (is (empty? (lib.metadata.protocols/cached-metadatas mp :metadata/dimension [3]))))))
diff --git a/test/metabase/lib_metric/projection_test.cljc b/test/metabase/lib_metric/projection_test.cljc
new file mode 100644
index 00000000000..1fee0a41e36
--- /dev/null
+++ b/test/metabase/lib_metric/projection_test.cljc
@@ -0,0 +1,347 @@
+(ns metabase.lib-metric.projection-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.dimension :as lib-metric.dimension]
+ [metabase.lib-metric.metadata.provider :as lib-metric.metadata.provider]
+ [metabase.lib-metric.projection :as lib-metric.projection]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-1 "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-2 "550e8400-e29b-41d4-a716-446655440002")
+(def ^:private uuid-3 "550e8400-e29b-41d4-a716-446655440003")
+
+(def ^:private dim-ref-1 [:dimension {:lib/uuid "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"} uuid-1])
+(def ^:private dim-ref-2 [:dimension {:lib/uuid "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"} uuid-2])
+
+(def ^:private dimension-1
+ {:lib/type :metadata/dimension
+ :id uuid-1
+ :name "created_at"
+ :display-name "Created At"
+ :effective-type :type/DateTime
+ :semantic-type :type/CreationTimestamp
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private dimension-2
+ {:lib/type :metadata/dimension
+ :id uuid-2
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type :type/Category
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private dimension-3
+ {:lib/type :metadata/dimension
+ :id uuid-3
+ :name "amount"
+ :display-name "Amount"
+ :effective-type :type/Number
+ :semantic-type nil
+ :source-type :metric
+ :source-id 1})
+
+;;; -------------------------------------------------- add-projection-positions --------------------------------------------------
+
+(deftest ^:parallel add-projection-positions-empty-projections-test
+ (testing "No projections returns dimensions without positions"
+ (let [dimensions [dimension-1 dimension-2]
+ result (lib-metric.projection/add-projection-positions dimensions [])]
+ (is (= 2 (count result)))
+ (is (nil? (:projection-positions (first result))))
+ (is (nil? (:projection-positions (second result)))))))
+
+(deftest ^:parallel add-projection-positions-single-projection-test
+ (testing "Single projection adds position to matching dimension"
+ (let [dimensions [dimension-1 dimension-2]
+ projections [dim-ref-1]
+ result (lib-metric.projection/add-projection-positions dimensions projections)]
+ (is (= [0] (:projection-positions (first result))))
+ (is (nil? (:projection-positions (second result)))))))
+
+(deftest ^:parallel add-projection-positions-multiple-projections-test
+ (testing "Multiple projections add positions to respective dimensions"
+ (let [dimensions [dimension-1 dimension-2 dimension-3]
+ projections [dim-ref-1 dim-ref-2]
+ result (lib-metric.projection/add-projection-positions dimensions projections)]
+ (is (= [0] (:projection-positions (first result))))
+ (is (= [1] (:projection-positions (second result))))
+ (is (nil? (:projection-positions (nth result 2)))))))
+
+(deftest ^:parallel add-projection-positions-same-dimension-multiple-times-test
+ (testing "Same dimension projected multiple times gets all positions"
+ (let [dimensions [dimension-1 dimension-2]
+ projections [dim-ref-1 dim-ref-2 dim-ref-1]
+ result (lib-metric.projection/add-projection-positions dimensions projections)]
+ (is (= [0 2] (:projection-positions (first result))))
+ (is (= [1] (:projection-positions (second result)))))))
+
+(deftest ^:parallel add-projection-positions-no-matching-dimension-test
+ (testing "Projection for non-existent dimension does not cause error"
+ (let [dimensions [dimension-2] ; Only dimension-2, but projecting dimension-1
+ projections [dim-ref-1]
+ result (lib-metric.projection/add-projection-positions dimensions projections)]
+ (is (= 1 (count result)))
+ (is (nil? (:projection-positions (first result)))))))
+
+(deftest ^:parallel add-projection-positions-nil-projections-test
+ (testing "nil projections handled via or in caller"
+ ;; The function expects a sequence, caller uses (or projections [])
+ (let [dimensions [dimension-1]
+ result (lib-metric.projection/add-projection-positions dimensions [])]
+ (is (= 1 (count result)))
+ (is (nil? (:projection-positions (first result)))))))
+
+;;; -------------------------------------------------- projectable-dimensions --------------------------------------------------
+;;; Note: Full integration tests for projectable-dimensions require a mock metadata provider
+;;; These tests verify the basic shape of the function
+
+(deftest ^:parallel projectable-dimensions-returns-vector-test
+ (testing "projectable-dimensions requires a valid provider"
+ (let [definition {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 1]
+ :filters []
+ :projections []
+ :metadata-provider nil}]
+ ;; This will fail due to nil provider, which is expected in unit tests
+ ;; Integration tests with real providers are needed for full coverage
+ (is (thrown? #?(:clj Exception :cljs js/Error)
+ (lib-metric.projection/projectable-dimensions definition))))))
+
+;;; -------------------------------------------------- project --------------------------------------------------
+
+(def ^:private valid-definition
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 1]
+ :filters []
+ :projections []
+ :metadata-provider nil})
+
+;;; -------------------------------------------------- Mock Provider --------------------------------------------------
+
+(defn- make-mock-provider
+ "Create a mock metadata provider that returns the given dimensions for metric-id queries."
+ [dimensions]
+ (lib-metric.metadata.provider/metric-context-metadata-provider
+ ;; metric-fetcher-fn
+ (fn [_metadata-spec] [])
+ ;; measure-fetcher-fn
+ nil
+ ;; dimension-fetcher-fn - returns dimensions when queried by metric-id
+ (fn [{:keys [metric-id]}]
+ (if metric-id
+ (filterv #(and (= :metric (:source-type %))
+ (= metric-id (:source-id %)))
+ dimensions)
+ dimensions))
+ ;; table->db-fn
+ (constantly nil)
+ ;; db-provider-fn
+ (constantly nil)
+ ;; setting-fn
+ (constantly nil)))
+
+(def ^:private mock-dimensions
+ "Dimensions annotated as metadata/dimension with source info."
+ [(assoc dimension-1
+ :lib/type :metadata/dimension
+ :source-type :metric
+ :source-id 1)
+ (assoc dimension-2
+ :lib/type :metadata/dimension
+ :source-type :metric
+ :source-id 1)
+ (assoc dimension-3
+ :lib/type :metadata/dimension
+ :source-type :metric
+ :source-id 1)])
+
+(def ^:private definition-with-provider
+ "A valid definition with a mock metadata provider."
+ (assoc valid-definition
+ :metadata-provider (make-mock-provider mock-dimensions)))
+
+(deftest ^:parallel project-adds-projection-to-definition-test
+ (testing "project adds a dimension reference to typed projections"
+ (let [result (lib-metric.projection/project valid-definition (lib-metric.dimension/reference dimension-1))
+ typed-proj (first (:projections result))
+ dim-ref (first (:projection typed-proj))]
+ (is (= 1 (count (:projections result))))
+ (is (= :metric (:type typed-proj)))
+ (is (= 1 (:id typed-proj)))
+ (is (= :dimension (first dim-ref)))
+ (is (= uuid-1 (nth dim-ref 2))))))
+
+(deftest ^:parallel project-appends-to-existing-projections-test
+ (testing "project appends new projection to existing typed projection"
+ (let [definition (assoc valid-definition
+ :projections [{:type :metric :id 1 :projection [dim-ref-1]}])
+ result (lib-metric.projection/project definition (lib-metric.dimension/reference dimension-2))
+ dim-refs (get-in result [:projections 0 :projection])]
+ (is (= 1 (count (:projections result))))
+ (is (= 2 (count dim-refs)))
+ (is (= uuid-1 (nth (first dim-refs) 2)))
+ (is (= uuid-2 (nth (second dim-refs) 2))))))
+
+(deftest ^:parallel project-creates-correct-dimension-reference-test
+ (testing "project creates a [:dimension opts id] reference with :lib/uuid"
+ (let [result (lib-metric.projection/project valid-definition (lib-metric.dimension/reference dimension-1))
+ dim-ref (get-in result [:projections 0 :projection 0])]
+ (is (= :dimension (first dim-ref)))
+ (is (string? (:lib/uuid (second dim-ref))))
+ (is (= uuid-1 (nth dim-ref 2))))))
+
+(deftest ^:parallel project-allows-same-dimension-multiple-times-test
+ (testing "project allows adding the same dimension multiple times"
+ (let [result (-> valid-definition
+ (lib-metric.projection/project (lib-metric.dimension/reference dimension-1))
+ (lib-metric.projection/project (lib-metric.dimension/reference dimension-1)))
+ dim-refs (get-in result [:projections 0 :projection])]
+ (is (= 1 (count (:projections result))))
+ (is (= 2 (count dim-refs)))
+ (is (= uuid-1 (nth (first dim-refs) 2)))
+ (is (= uuid-1 (nth (second dim-refs) 2))))))
+
+;;; -------------------------------------------------- projection-dimension --------------------------------------------------
+
+(deftest ^:parallel projection-dimension-requires-valid-provider-test
+ (testing "projection-dimension throws when projectable-dimensions fails"
+ ;; Since projectable-dimensions requires a valid metadata provider,
+ ;; we can't fully test projection-dimension without integration tests.
+ ;; This test verifies the function exists and handles errors appropriately.
+ (let [definition (assoc valid-definition
+ :projections [{:type :metric :id 1 :projection [dim-ref-1]}])]
+ (is (thrown? #?(:clj Exception :cljs js/Error)
+ (lib-metric.projection/projection-dimension definition dim-ref-1))))))
+
+(deftest ^:parallel projection-dimension-finds-matching-dimension-test
+ (testing "projection-dimension returns the dimension matching the projection"
+ (let [definition (-> definition-with-provider
+ (lib-metric.projection/project (lib-metric.dimension/reference (first mock-dimensions))))
+ dim-ref (get-in definition [:projections 0 :projection 0])
+ result (lib-metric.projection/projection-dimension definition dim-ref)]
+ (is (some? result))
+ (is (= uuid-1 (:id result)))
+ (is (= "created_at" (:name result))))))
+
+(deftest ^:parallel projection-dimension-returns-nil-for-unknown-test
+ (testing "projection-dimension returns nil for unknown projection"
+ (let [definition definition-with-provider
+ ;; Use a valid UUID format that doesn't match any dimension
+ fake-projection [:dimension {} "00000000-0000-0000-0000-000000000000"]]
+ (is (nil? (lib-metric.projection/projection-dimension definition fake-projection))))))
+
+(deftest ^:parallel projection-dimension-works-with-multiple-projections-test
+ (testing "projection-dimension finds correct dimension among multiple projections"
+ (let [definition (-> definition-with-provider
+ (lib-metric.projection/project (lib-metric.dimension/reference (first mock-dimensions)))
+ (lib-metric.projection/project (lib-metric.dimension/reference (second mock-dimensions))))
+ dim-refs (get-in definition [:projections 0 :projection])
+ result-1 (lib-metric.projection/projection-dimension definition (first dim-refs))
+ result-2 (lib-metric.projection/projection-dimension definition (second dim-refs))]
+ (is (= uuid-1 (:id result-1)))
+ (is (= uuid-2 (:id result-2))))))
+
+;;; -------------------------------------------------- dimension/reference --------------------------------------------------
+
+(deftest ^:parallel reference-from-dimension-metadata-test
+ (testing "reference creates a dimension reference from dimension metadata"
+ (let [result (lib-metric.dimension/reference dimension-1)]
+ (is (vector? result))
+ (is (= :dimension (first result)))
+ (is (= uuid-1 (nth result 2)))
+ (is (string? (:lib/uuid (second result)))))))
+
+(deftest ^:parallel reference-from-existing-reference-test
+ (testing "reference returns a reference as-is (with ensured uuid)"
+ (let [result (lib-metric.dimension/reference dim-ref-1)]
+ (is (vector? result))
+ (is (= :dimension (first result)))
+ (is (= uuid-1 (nth result 2)))
+ (is (string? (:lib/uuid (second result)))))))
+
+(deftest ^:parallel reference-idempotent-test
+ (testing "reference is idempotent - applying it twice yields the same result"
+ (let [from-dim (lib-metric.dimension/reference dimension-1)
+ from-ref (lib-metric.dimension/reference from-dim)]
+ (is (= (nth from-dim 2) (nth from-ref 2)))
+ (is (= :dimension (first from-ref))))))
+
+;;; -------------------------------------------------- with-temporal-bucket accepting dimension-or-reference --------------------------------------------------
+
+(deftest ^:parallel with-temporal-bucket-accepts-dimension-reference-test
+ (testing "with-temporal-bucket works with a dimension reference"
+ (let [result (lib-metric.projection/with-temporal-bucket dim-ref-1 :month)]
+ (is (= :dimension (first result)))
+ (is (= uuid-1 (nth result 2)))
+ (is (= :month (:temporal-unit (second result)))))))
+
+(deftest ^:parallel with-temporal-bucket-accepts-dimension-metadata-test
+ (testing "with-temporal-bucket works with dimension metadata (map)"
+ (let [result (lib-metric.projection/with-temporal-bucket dimension-1 :month)]
+ (is (= :dimension (first result)))
+ (is (= uuid-1 (nth result 2)))
+ (is (= :month (:temporal-unit (second result)))))))
+
+(deftest ^:parallel with-temporal-bucket-nil-removes-bucket-from-metadata-test
+ (testing "with-temporal-bucket with nil removes temporal unit when given dimension metadata"
+ (let [with-bucket (lib-metric.projection/with-temporal-bucket dimension-1 :month)
+ result (lib-metric.projection/with-temporal-bucket with-bucket nil)]
+ (is (nil? (:temporal-unit (second result)))))))
+
+(deftest ^:parallel with-temporal-bucket-option-map-test
+ (testing "with-temporal-bucket accepts an option map with :unit"
+ (let [bucket {:lib/type :option/temporal-bucketing :unit :quarter}
+ result (lib-metric.projection/with-temporal-bucket dimension-1 bucket)]
+ (is (= :quarter (:temporal-unit (second result)))))))
+
+;;; -------------------------------------------------- projectable-dimensions-for-source --------------------------------------------------
+
+(def ^:private source-metric-metadata
+ {:lib/type :metadata/metric :id 1 :name "Test Metric"})
+
+(deftest ^:parallel projectable-dimensions-for-source-test
+ (testing "returns dims scoped to source with projection-positions"
+ (let [definition (assoc definition-with-provider
+ :projections [{:type :metric :id 1
+ :projection [dim-ref-1]}])
+ dims (lib-metric.projection/projectable-dimensions-for-source
+ definition source-metric-metadata)]
+ (is (seq dims))
+ (let [dim-with-pos (some #(when (= uuid-1 (:id %)) %) dims)]
+ (is (some? dim-with-pos))
+ (is (= [0] (:projection-positions dim-with-pos)))))))
+
+(deftest ^:parallel projectable-dimensions-for-source-no-projections-test
+ (testing "returns dims without positions when no projections for source"
+ (let [dims (lib-metric.projection/projectable-dimensions-for-source
+ definition-with-provider source-metric-metadata)]
+ (is (seq dims))
+ (doseq [dim dims]
+ (is (nil? (:projection-positions dim)))))))
+
+;;; -------------------------------------------------- project-for-source --------------------------------------------------
+
+(deftest ^:parallel project-for-source-creates-new-typed-projection-test
+ (testing "project-for-source creates a new typed-projection entry"
+ (let [result (lib-metric.projection/project-for-source
+ definition-with-provider dimension-1 source-metric-metadata)
+ typed-proj (first (:projections result))]
+ (is (= 1 (count (:projections result))))
+ (is (= :metric (:type typed-proj)))
+ (is (= 1 (:id typed-proj)))
+ (is (= 1 (count (:projection typed-proj)))))))
+
+(deftest ^:parallel project-for-source-appends-to-existing-test
+ (testing "project-for-source appends to existing typed-projection"
+ (let [definition (assoc definition-with-provider
+ :projections [{:type :metric :id 1
+ :projection [dim-ref-1]}])
+ result (lib-metric.projection/project-for-source
+ definition dimension-2 source-metric-metadata)
+ dim-refs (get-in result [:projections 0 :projection])]
+ (is (= 1 (count (:projections result))))
+ (is (= 2 (count dim-refs))))))
diff --git a/test/metabase/lib_metric/schema_test.cljc b/test/metabase/lib_metric/schema_test.cljc
new file mode 100644
index 00000000000..bec98fa915d
--- /dev/null
+++ b/test/metabase/lib_metric/schema_test.cljc
@@ -0,0 +1,142 @@
+(ns metabase.lib-metric.schema-test
+ (:require
+ [clojure.test :refer [are deftest is testing]]
+ [malli.error :as me]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.util.malli.registry :as mr]))
+
+(deftest ^:parallel dimension-id-test
+ (testing "dimension-id must be a valid UUID string"
+ (are [id valid?] (= valid? (mr/validate ::lib-metric.schema/dimension-id id))
+ "550e8400-e29b-41d4-a716-446655440000" true
+ "00000000-0000-0000-0000-000000000000" true
+ "not-a-uuid" false
+ "" false
+ nil false
+ 123 false)))
+
+(deftest ^:parallel dimension-test
+ (testing "valid dimensions"
+ (are [dim] (nil? (me/humanize (mr/explain ::lib-metric.schema/dimension dim)))
+ {:id "550e8400-e29b-41d4-a716-446655440000"}
+ {:id "550e8400-e29b-41d4-a716-446655440000"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type :type/Category}
+ {:id "550e8400-e29b-41d4-a716-446655440000"
+ :display-name nil
+ :effective-type nil
+ :semantic-type nil}
+ {:id "550e8400-e29b-41d4-a716-446655440000"
+ :display-name "Product Name"}))
+ (testing "invalid dimensions"
+ (testing "missing id"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension
+ {:display-name "Category"})))))
+ (testing "invalid id"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension
+ {:id "not-a-uuid"})))))
+ (testing "invalid effective-type"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension
+ {:id "550e8400-e29b-41d4-a716-446655440000"
+ :effective-type :not/a-type})))))
+ (testing "invalid semantic-type"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension
+ {:id "550e8400-e29b-41d4-a716-446655440000"
+ :semantic-type :not/a-semantic-type})))))))
+
+(deftest ^:parallel dimension-mapping-type-test
+ (testing "dimension-mapping.type must be :table"
+ (is (mr/validate ::lib-metric.schema/dimension-mapping.type :table))
+ (is (not (mr/validate ::lib-metric.schema/dimension-mapping.type :other)))
+ (is (not (mr/validate ::lib-metric.schema/dimension-mapping.type "table")))))
+
+(deftest ^:parallel dimension-mapping-target-test
+ (testing "valid field references"
+ (are [target] (mr/validate ::lib-metric.schema/dimension-mapping.target target)
+ [:field {:lib/uuid "550e8400-e29b-41d4-a716-446655440000"} 1]
+ [:field {:lib/uuid "550e8400-e29b-41d4-a716-446655440000" :source-field 1} 2]
+ [:field {:lib/uuid "550e8400-e29b-41d4-a716-446655440000" :base-type :type/Text} "column_name"]))
+ (testing "invalid field references"
+ (are [target] (not (mr/validate ::lib-metric.schema/dimension-mapping.target target))
+ [:expression {} "expr"]
+ [:field {} 1])))
+
+(deftest ^:parallel dimension-mapping-test
+ (testing "valid dimension mappings"
+ (are [mapping] (nil? (me/humanize (mr/explain ::lib-metric.schema/dimension-mapping mapping)))
+ {:type :table
+ :table-id 1
+ :dimension-id "550e8400-e29b-41d4-a716-446655440000"
+ :target [:field {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 2]}
+ {:type :table
+ :table-id 100
+ :dimension-id "00000000-0000-0000-0000-000000000000"
+ :target [:field {:lib/uuid "550e8400-e29b-41d4-a716-446655440001" :source-field 1} 2]}))
+ (testing "invalid dimension mappings"
+ (testing "missing required fields"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-mapping
+ {:type :table})))))
+ (testing "invalid type"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-mapping
+ {:type :invalid
+ :table-id 1
+ :dimension-id "550e8400-e29b-41d4-a716-446655440000"
+ :target [:field {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 2]})))))
+ (testing "invalid table-id"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-mapping
+ {:type :table
+ :table-id -1
+ :dimension-id "550e8400-e29b-41d4-a716-446655440000"
+ :target [:field {:lib/uuid "550e8400-e29b-41d4-a716-446655440001"} 2]})))))
+ (testing "invalid target"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-mapping
+ {:type :table
+ :table-id 1
+ :dimension-id "550e8400-e29b-41d4-a716-446655440000"
+ :target [:not-a-field {} 2]})))))))
+
+(deftest ^:parallel dimension-reference-options-test
+ (testing "valid dimension-reference options"
+ (are [opts] (nil? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference.options opts)))
+ {}
+ {:display-name "Custom Name"}
+ {:effective-type :type/Integer}
+ {:semantic-type :type/Category}
+ {:display-name "Custom Name"
+ :effective-type :type/Text
+ :semantic-type :type/Name}
+ {:display-name nil
+ :effective-type nil
+ :semantic-type nil}))
+ (testing "invalid dimension-reference options"
+ (testing "invalid effective-type"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference.options
+ {:effective-type :not/valid})))))
+ (testing "invalid semantic-type"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference.options
+ {:semantic-type :not/valid})))))))
+
+(deftest ^:parallel dimension-reference-test
+ (testing "valid dimension references"
+ (are [ref] (nil? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference ref)))
+ [:dimension {} "550e8400-e29b-41d4-a716-446655440000"]
+ [:dimension {:display-name "Custom"} "550e8400-e29b-41d4-a716-446655440000"]
+ [:dimension
+ {:display-name "Custom Name"
+ :effective-type :type/Text
+ :semantic-type :type/Category}
+ "550e8400-e29b-41d4-a716-446655440000"]))
+ (testing "invalid dimension references"
+ (testing "wrong tag"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference
+ [:field {} "550e8400-e29b-41d4-a716-446655440000"])))))
+ (testing "invalid dimension-id"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference
+ [:dimension {} "not-a-uuid"])))))
+ (testing "missing options map"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference
+ [:dimension "550e8400-e29b-41d4-a716-446655440000"])))))
+ (testing "wrong arity"
+ (is (some? (me/humanize (mr/explain ::lib-metric.schema/dimension-reference
+ [:dimension {} "550e8400-e29b-41d4-a716-446655440000" "extra"])))))))
diff --git a/test/metabase/lib_metric/temporal_bucket_test.cljc b/test/metabase/lib_metric/temporal_bucket_test.cljc
new file mode 100644
index 00000000000..246f0eed7b7
--- /dev/null
+++ b/test/metabase/lib_metric/temporal_bucket_test.cljc
@@ -0,0 +1,189 @@
+(ns metabase.lib-metric.temporal-bucket-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.metadata.provider :as lib-metric.metadata.provider]
+ [metabase.lib-metric.projection :as lib-metric.projection]))
+
+;;; -------------------------------------------------- Test Data --------------------------------------------------
+
+(def ^:private uuid-datetime "550e8400-e29b-41d4-a716-446655440001")
+(def ^:private uuid-date "550e8400-e29b-41d4-a716-446655440002")
+(def ^:private uuid-time "550e8400-e29b-41d4-a716-446655440003")
+(def ^:private uuid-text "550e8400-e29b-41d4-a716-446655440004")
+
+(def ^:private datetime-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-datetime
+ :name "created_at"
+ :display-name "Created At"
+ :effective-type :type/DateTime
+ :semantic-type :type/CreationTimestamp
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private date-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-date
+ :name "order_date"
+ :display-name "Order Date"
+ :effective-type :type/Date
+ :semantic-type nil
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private time-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-time
+ :name "time_of_day"
+ :display-name "Time of Day"
+ :effective-type :type/Time
+ :semantic-type nil
+ :source-type :metric
+ :source-id 1})
+
+(def ^:private text-dimension
+ {:lib/type :metadata/dimension
+ :id uuid-text
+ :name "category"
+ :display-name "Category"
+ :effective-type :type/Text
+ :semantic-type :type/Category
+ :source-type :metric
+ :source-id 1})
+
+(defn- make-mock-provider
+ "Create a mock metadata provider that returns the given dimensions for metric-id queries."
+ [dimensions]
+ (lib-metric.metadata.provider/metric-context-metadata-provider
+ ;; metric-fetcher-fn
+ (fn [_metadata-spec] [])
+ ;; measure-fetcher-fn
+ nil
+ ;; dimension-fetcher-fn
+ (fn [{:keys [metric-id]}]
+ (if metric-id
+ (filterv #(and (= :metric (:source-type %))
+ (= metric-id (:source-id %)))
+ dimensions)
+ dimensions))
+ ;; table->db-fn
+ (constantly nil)
+ ;; db-provider-fn
+ (constantly nil)
+ ;; setting-fn
+ (constantly nil)))
+
+(def ^:private sample-dimensions
+ [datetime-dimension date-dimension time-dimension text-dimension])
+
+(def ^:private definition
+ {:lib/type :metric/definition
+ :expression [:metric {:lib/uuid "550e8400-e29b-41d4-a716-446655440099"} 1]
+ :filters []
+ :projections []
+ :metadata-provider (make-mock-provider sample-dimensions)})
+
+;;; -------------------------------------------------- available-temporal-buckets --------------------------------------------------
+
+(deftest ^:parallel available-temporal-buckets-datetime-test
+ (testing "DateTime dimension returns datetime bucket options"
+ (let [buckets (lib-metric.projection/available-temporal-buckets definition datetime-dimension)]
+ (is (sequential? buckets))
+ (is (pos? (count buckets)))
+ ;; All buckets should have :unit and :lib/type
+ (is (every? #(contains? % :unit) buckets))
+ (is (every? #(= :option/temporal-bucketing (:lib/type %)) buckets))
+ ;; Should include common datetime units
+ (is (some #(= :day (:unit %)) buckets))
+ (is (some #(= :month (:unit %)) buckets))
+ (is (some #(= :year (:unit %)) buckets)))))
+
+(deftest ^:parallel available-temporal-buckets-date-test
+ (testing "Date dimension returns date bucket options"
+ (let [buckets (lib-metric.projection/available-temporal-buckets definition date-dimension)]
+ (is (sequential? buckets))
+ (is (pos? (count buckets)))
+ ;; Should include date units
+ (is (some #(= :day (:unit %)) buckets))
+ (is (some #(= :month (:unit %)) buckets)))))
+
+(deftest ^:parallel available-temporal-buckets-time-test
+ (testing "Time dimension returns time bucket options"
+ (let [buckets (lib-metric.projection/available-temporal-buckets definition time-dimension)]
+ (is (sequential? buckets))
+ (is (pos? (count buckets)))
+ ;; Should include time units
+ (is (some #(= :hour (:unit %)) buckets))
+ (is (some #(= :minute (:unit %)) buckets)))))
+
+(deftest ^:parallel available-temporal-buckets-non-temporal-test
+ (testing "Non-temporal dimension returns empty list"
+ (let [buckets (lib-metric.projection/available-temporal-buckets definition text-dimension)]
+ (is (sequential? buckets))
+ (is (zero? (count buckets))))))
+
+(deftest ^:parallel available-temporal-buckets-marks-selected-test
+ (testing "Selected unit is marked when projection has temporal-unit"
+ (let [projection [:dimension {:temporal-unit :month} uuid-datetime]
+ def-with-proj (assoc definition :projections [{:type :metric :id 1 :projection [projection]}])
+ buckets (lib-metric.projection/available-temporal-buckets def-with-proj datetime-dimension)]
+ (is (some #(and (= :month (:unit %)) (:selected %)) buckets)))))
+
+;;; -------------------------------------------------- temporal-bucket --------------------------------------------------
+
+(deftest ^:parallel temporal-bucket-extracts-unit-test
+ (testing "temporal-bucket extracts unit from projection options"
+ (let [projection [:dimension {:temporal-unit :month} uuid-datetime]
+ result (lib-metric.projection/temporal-bucket projection)]
+ (is (= :option/temporal-bucketing (:lib/type result)))
+ (is (= :month (:unit result))))))
+
+(deftest ^:parallel temporal-bucket-returns-nil-when-no-unit-test
+ (testing "temporal-bucket returns nil when no temporal-unit in options"
+ (let [projection [:dimension {} uuid-datetime]
+ result (lib-metric.projection/temporal-bucket projection)]
+ (is (nil? result)))))
+
+(deftest ^:parallel temporal-bucket-handles-various-units-test
+ (testing "temporal-bucket works with various temporal units"
+ (doseq [unit [:day :week :month :quarter :year :hour :minute]]
+ (let [projection [:dimension {:temporal-unit unit} uuid-datetime]
+ result (lib-metric.projection/temporal-bucket projection)]
+ (is (= unit (:unit result)) (str "Failed for unit: " unit))))))
+
+;;; -------------------------------------------------- with-temporal-bucket --------------------------------------------------
+
+(deftest ^:parallel with-temporal-bucket-adds-unit-test
+ (testing "with-temporal-bucket adds temporal-unit to projection"
+ (let [projection [:dimension {} uuid-datetime]
+ result (lib-metric.projection/with-temporal-bucket projection :month)]
+ (is (= :dimension (first result)))
+ (is (= :month (:temporal-unit (second result))))
+ (is (= uuid-datetime (nth result 2))))))
+
+(deftest ^:parallel with-temporal-bucket-replaces-existing-unit-test
+ (testing "with-temporal-bucket replaces existing temporal-unit"
+ (let [projection [:dimension {:temporal-unit :day} uuid-datetime]
+ result (lib-metric.projection/with-temporal-bucket projection :month)]
+ (is (= :month (:temporal-unit (second result)))))))
+
+(deftest ^:parallel with-temporal-bucket-removes-unit-with-nil-test
+ (testing "with-temporal-bucket removes temporal-unit when passed nil"
+ (let [projection [:dimension {:temporal-unit :month} uuid-datetime]
+ result (lib-metric.projection/with-temporal-bucket projection nil)]
+ (is (nil? (:temporal-unit (second result)))))))
+
+(deftest ^:parallel with-temporal-bucket-accepts-option-map-test
+ (testing "with-temporal-bucket accepts option map with :unit"
+ (let [projection [:dimension {} uuid-datetime]
+ bucket {:lib/type :option/temporal-bucketing :unit :week}
+ result (lib-metric.projection/with-temporal-bucket projection bucket)]
+ (is (= :week (:temporal-unit (second result)))))))
+
+(deftest ^:parallel with-temporal-bucket-preserves-other-options-test
+ (testing "with-temporal-bucket preserves other options"
+ (let [projection [:dimension {:lib/uuid "test-uuid" :display-name "Test"} uuid-datetime]
+ result (lib-metric.projection/with-temporal-bucket projection :month)]
+ (is (= "test-uuid" (:lib/uuid (second result))))
+ (is (= "Test" (:display-name (second result))))
+ (is (= :month (:temporal-unit (second result)))))))
diff --git a/test/metabase/lib_metric/types/constants_test.cljc b/test/metabase/lib_metric/types/constants_test.cljc
new file mode 100644
index 00000000000..8ac852d4107
--- /dev/null
+++ b/test/metabase/lib_metric/types/constants_test.cljc
@@ -0,0 +1,46 @@
+(ns metabase.lib-metric.types.constants-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.types.constants :as constants]))
+
+(deftest ^:lib-metric-types type-hierarchies-structure-test
+ (testing "type-hierarchies contains expected keys"
+ (is (contains? constants/type-hierarchies ::constants/temporal))
+ (is (contains? constants/type-hierarchies ::constants/number))
+ (is (contains? constants/type-hierarchies ::constants/boolean))
+ (is (contains? constants/type-hierarchies ::constants/string))
+ (is (contains? constants/type-hierarchies ::constants/string-like))
+ (is (contains? constants/type-hierarchies ::constants/coordinate))
+ (is (contains? constants/type-hierarchies ::constants/location))
+ (is (contains? constants/type-hierarchies ::constants/foreign-key))
+ (is (contains? constants/type-hierarchies ::constants/primary-key))
+ (is (contains? constants/type-hierarchies ::constants/time))
+ (is (contains? constants/type-hierarchies ::constants/date))))
+
+(deftest ^:lib-metric-types type-hierarchies-effective-types-test
+ (testing "effective-type definitions have correct structure"
+ (is (= {:effective-type [:type/Temporal]}
+ (::constants/temporal constants/type-hierarchies)))
+ (is (= {:effective-type [:type/Number]}
+ (::constants/number constants/type-hierarchies)))
+ (is (= {:effective-type [:type/Boolean]}
+ (::constants/boolean constants/type-hierarchies)))
+ (is (= {:effective-type [:type/Text]}
+ (::constants/string constants/type-hierarchies)))
+ (is (= {:effective-type [:type/TextLike]}
+ (::constants/string-like constants/type-hierarchies)))
+ (is (= {:effective-type [:type/Time]}
+ (::constants/time constants/type-hierarchies)))
+ (is (= {:effective-type [:type/HasDate]}
+ (::constants/date constants/type-hierarchies)))))
+
+(deftest ^:lib-metric-types type-hierarchies-semantic-types-test
+ (testing "semantic-type definitions have correct structure"
+ (is (= {:semantic-type [:type/Coordinate]}
+ (::constants/coordinate constants/type-hierarchies)))
+ (is (= {:semantic-type [:type/Address]}
+ (::constants/location constants/type-hierarchies)))
+ (is (= {:semantic-type [:type/FK]}
+ (::constants/foreign-key constants/type-hierarchies)))
+ (is (= {:semantic-type [:type/PK]}
+ (::constants/primary-key constants/type-hierarchies)))))
diff --git a/test/metabase/lib_metric/types/isa_test.cljc b/test/metabase/lib_metric/types/isa_test.cljc
new file mode 100644
index 00000000000..2f50570da6f
--- /dev/null
+++ b/test/metabase/lib_metric/types/isa_test.cljc
@@ -0,0 +1,257 @@
+(ns metabase.lib-metric.types.isa-test
+ (:require
+ [clojure.test :refer [deftest is testing]]
+ [metabase.lib-metric.types.isa :as isa]))
+
+;;; -------------------------------------------------- Test Fixtures --------------------------------------------------
+
+(def ^:private temporal-dimension
+ {:effective-type :type/DateTime
+ :base-type :type/DateTime})
+
+(def ^:private date-dimension
+ {:effective-type :type/Date
+ :base-type :type/Date})
+
+(def ^:private time-dimension
+ {:effective-type :type/Time
+ :base-type :type/Time})
+
+(def ^:private numeric-dimension
+ {:effective-type :type/Integer
+ :base-type :type/Integer})
+
+(def ^:private float-dimension
+ {:effective-type :type/Float
+ :base-type :type/Float})
+
+(def ^:private boolean-dimension
+ {:effective-type :type/Boolean
+ :base-type :type/Boolean})
+
+(def ^:private string-dimension
+ {:effective-type :type/Text
+ :base-type :type/Text})
+
+(def ^:private string-like-dimension
+ {:effective-type :type/IPAddress
+ :base-type :type/IPAddress})
+
+(def ^:private coordinate-dimension
+ {:effective-type :type/Float
+ :base-type :type/Float
+ :semantic-type :type/Coordinate})
+
+(def ^:private latitude-dimension
+ {:effective-type :type/Float
+ :base-type :type/Float
+ :semantic-type :type/Latitude})
+
+(def ^:private longitude-dimension
+ {:effective-type :type/Float
+ :base-type :type/Float
+ :semantic-type :type/Longitude})
+
+(def ^:private location-dimension
+ {:effective-type :type/Text
+ :base-type :type/Text
+ :semantic-type :type/Address})
+
+(def ^:private city-dimension
+ {:effective-type :type/Text
+ :base-type :type/Text
+ :semantic-type :type/City})
+
+(def ^:private foreign-key-dimension
+ {:effective-type :type/Integer
+ :base-type :type/Integer
+ :semantic-type :type/FK})
+
+(def ^:private primary-key-dimension
+ {:effective-type :type/Integer
+ :base-type :type/Integer
+ :semantic-type :type/PK})
+
+(def ^:private base-type-only-dimension
+ "Dimension with only :base-type, no :effective-type"
+ {:base-type :type/Text})
+
+;;; -------------------------------------------------- column-type tests --------------------------------------------------
+
+(deftest ^:lib-metric-types column-type-test
+ (testing "returns effective-type when present"
+ (is (= :type/DateTime (isa/column-type temporal-dimension))))
+ (testing "falls back to base-type when effective-type is nil"
+ (is (= :type/Text (isa/column-type base-type-only-dimension))))
+ (testing "returns nil for nil input"
+ (is (nil? (isa/column-type nil)))))
+
+;;; -------------------------------------------------- temporal? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types temporal?-test
+ (testing "returns true for temporal types"
+ (is (true? (isa/temporal? temporal-dimension)))
+ (is (true? (isa/temporal? date-dimension)))
+ (is (true? (isa/temporal? time-dimension))))
+ (testing "returns false for non-temporal types"
+ (is (false? (isa/temporal? numeric-dimension)))
+ (is (false? (isa/temporal? string-dimension)))
+ (is (false? (isa/temporal? boolean-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/temporal? nil)))))
+
+;;; -------------------------------------------------- numeric? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types numeric?-test
+ (testing "returns true for numeric types"
+ (is (true? (isa/numeric? numeric-dimension)))
+ (is (true? (isa/numeric? float-dimension))))
+ (testing "returns false for non-numeric types"
+ (is (false? (isa/numeric? string-dimension)))
+ (is (false? (isa/numeric? temporal-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/numeric? nil)))))
+
+;;; -------------------------------------------------- boolean? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types boolean?-test
+ (testing "returns true for boolean types"
+ (is (true? (isa/boolean? boolean-dimension))))
+ (testing "returns false for non-boolean types"
+ (is (false? (isa/boolean? string-dimension)))
+ (is (false? (isa/boolean? numeric-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/boolean? nil)))))
+
+;;; -------------------------------------------------- string? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types string?-test
+ (testing "returns true for text types"
+ (is (true? (isa/string? string-dimension))))
+ (testing "returns false for non-string types"
+ (is (false? (isa/string? numeric-dimension)))
+ (is (false? (isa/string? boolean-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/string? nil)))))
+
+;;; -------------------------------------------------- string-like? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types string-like?-test
+ (testing "returns true for string-like types"
+ (is (true? (isa/string-like? string-like-dimension))))
+ (testing "returns false for plain strings"
+ (is (false? (isa/string-like? string-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/string-like? nil)))))
+
+;;; -------------------------------------------------- string-or-string-like? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types string-or-string-like?-test
+ (testing "returns true for string types"
+ (is (true? (isa/string-or-string-like? string-dimension))))
+ (testing "returns true for string-like types"
+ (is (true? (isa/string-or-string-like? string-like-dimension))))
+ (testing "returns false for non-string types"
+ (is (false? (isa/string-or-string-like? numeric-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/string-or-string-like? nil)))))
+
+;;; -------------------------------------------------- coordinate? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types coordinate?-test
+ (testing "returns true for coordinate semantic type"
+ (is (true? (isa/coordinate? coordinate-dimension))))
+ (testing "returns true for latitude (subtype of coordinate)"
+ (is (true? (isa/coordinate? latitude-dimension))))
+ (testing "returns true for longitude (subtype of coordinate)"
+ (is (true? (isa/coordinate? longitude-dimension))))
+ (testing "returns false for non-coordinate types"
+ (is (false? (isa/coordinate? numeric-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/coordinate? nil)))))
+
+;;; -------------------------------------------------- latitude? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types latitude?-test
+ (testing "returns true for latitude semantic type"
+ (is (true? (isa/latitude? latitude-dimension))))
+ (testing "returns false for other coordinate types"
+ (is (false? (isa/latitude? longitude-dimension)))
+ (is (false? (isa/latitude? coordinate-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/latitude? nil)))))
+
+;;; -------------------------------------------------- longitude? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types longitude?-test
+ (testing "returns true for longitude semantic type"
+ (is (true? (isa/longitude? longitude-dimension))))
+ (testing "returns false for other coordinate types"
+ (is (false? (isa/longitude? latitude-dimension)))
+ (is (false? (isa/longitude? coordinate-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/longitude? nil)))))
+
+;;; -------------------------------------------------- location? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types location?-test
+ (testing "returns true for address semantic type"
+ (is (true? (isa/location? location-dimension))))
+ (testing "returns true for city (subtype of address)"
+ (is (true? (isa/location? city-dimension))))
+ (testing "returns false for non-location types"
+ (is (false? (isa/location? string-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/location? nil)))))
+
+;;; -------------------------------------------------- foreign-key? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types foreign-key?-test
+ (testing "returns true for FK semantic type"
+ (is (true? (isa/foreign-key? foreign-key-dimension))))
+ (testing "returns false for non-FK types"
+ (is (false? (isa/foreign-key? primary-key-dimension)))
+ (is (false? (isa/foreign-key? numeric-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/foreign-key? nil)))))
+
+;;; -------------------------------------------------- primary-key? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types primary-key?-test
+ (testing "returns true for PK semantic type"
+ (is (true? (isa/primary-key? primary-key-dimension))))
+ (testing "returns false for non-PK types"
+ (is (false? (isa/primary-key? foreign-key-dimension)))
+ (is (false? (isa/primary-key? numeric-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/primary-key? nil)))))
+
+;;; -------------------------------------------------- time? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types time?-test
+ (testing "returns true for time types"
+ (is (true? (isa/time? time-dimension))))
+ (testing "returns false for date/datetime types"
+ (is (false? (isa/time? date-dimension)))
+ (is (false? (isa/time? temporal-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/time? nil)))))
+
+;;; -------------------------------------------------- date-or-datetime? tests --------------------------------------------------
+
+(deftest ^:lib-metric-types date-or-datetime?-test
+ (testing "returns true for date types"
+ (is (true? (isa/date-or-datetime? date-dimension))))
+ (testing "returns true for datetime types"
+ (is (true? (isa/date-or-datetime? temporal-dimension))))
+ (testing "returns false for time-only types"
+ (is (false? (isa/date-or-datetime? time-dimension))))
+ (testing "handles nil gracefully"
+ (is (false? (isa/date-or-datetime? nil)))))
+
+;;; -------------------------------------------------- base-type fallback tests --------------------------------------------------
+
+(deftest ^:lib-metric-types base-type-fallback-test
+ (testing "predicates work with only base-type"
+ (is (true? (isa/string? base-type-only-dimension)))
+ (is (false? (isa/numeric? base-type-only-dimension)))))
diff --git a/test/metabase/measures/api_test.clj b/test/metabase/measures/api_test.clj
index 273a76b3b4f..c92ecc64dc9 100644
--- a/test/metabase/measures/api_test.clj
+++ b/test/metabase/measures/api_test.clj
@@ -202,6 +202,43 @@
:definition map?}
(mt/user-http-request :rasta :get 200 (format "measure/%d" id))))))))
+(deftest fetch-measure-saves-dimensions-on-read-test
+ (testing "GET /api/measure/:id saves dimensions and dimension_mappings to the database"
+ (mt/with-temp [:model/Measure {:keys [id]} {:creator_id (mt/user->id :crowberto)
+ :table_id (mt/id :venues)
+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]
+ (testing "no dimensions saved initially"
+ (let [initial-measure (t2/select-one :model/Measure :id id)]
+ (is (nil? (:dimensions initial-measure)))
+ (is (nil? (:dimension_mappings initial-measure)))))
+ (testing "response contains dimensions with active status"
+ (mt/with-full-data-perms-for-all-users!
+ (let [response (mt/user-http-request :rasta :get 200 (format "measure/%d" id))]
+ (is (seq (:dimensions response)))
+ (is (seq (:dimension_mappings response)))
+ (is (every? #(= "status/active" (:status %)) (:dimensions response))))))
+ (testing "dimensions persisted to database"
+ (let [updated-measure (t2/select-one :model/Measure :id id)]
+ (is (seq (:dimensions updated-measure)))
+ (is (seq (:dimension_mappings updated-measure))))))))
+
+(deftest fetch-measure-dimensions-have-has-field-values-test
+ (testing "GET /api/measure/:id returns dimensions with has-field-values populated"
+ (mt/with-temp [:model/Measure {:keys [id]} {:creator_id (mt/user->id :crowberto)
+ :table_id (mt/id :venues)
+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [response (mt/user-http-request :rasta :get 200 (format "measure/%d" id))
+ dimensions (:dimensions response)]
+ (is (seq dimensions) "should have dimensions")
+ (testing "at least some dimensions have has-field-values"
+ (let [dims-with-hfv (filter :has-field-values dimensions)]
+ (is (seq dims-with-hfv)
+ "at least some dimensions should have has-field-values")
+ (doseq [dim dims-with-hfv]
+ (is (#{"list" "search" "none"} (:has-field-values dim))
+ (str "dimension " (:name dim) " has-field-values should be list, search, or none"))))))))))
+
(deftest list-test
(testing "GET /api/measure/"
(mt/with-temp [:model/Measure {id-1 :id} {:name "Measure 1"
@@ -294,15 +331,68 @@
{:name "Venue Count"
:table_id (mt/id :venues)
:definition (mbql4-fragment-definition (mt/id :venues) [[:count]])})
- ;; Query using the measure
- measure-query {:database (mt/id)
- :type :query
- :query {:source-table (mt/id :venues)
- :aggregation [[:measure measure-id]]}}
- ;; Equivalent direct query
- direct-query {:database (mt/id)
- :type :query
- :query {:source-table (mt/id :venues)
- :aggregation [[:count]]}}]
+ measure-query (mt/mbql-query venues {:aggregation [[:measure measure-id]]})
+ direct-query (mt/mbql-query venues {:aggregation [[:count]]})]
(is (= (mt/rows (qp/process-query direct-query))
(mt/rows (qp/process-query measure-query))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Dimension Endpoint Tests |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(defn- hydrate-measure
+ "Fetch measure via API to hydrate dimensions."
+ [measure-id]
+ (mt/user-http-request :crowberto :get 200 (str "measure/" measure-id)))
+
+(defn- find-dimension-by-name
+ "Find a dimension by column name from hydrated measure."
+ [measure column-name]
+ (some #(when (= column-name (:name %)) %) (:dimensions measure)))
+
+(deftest dimension-values-test
+ (testing "GET /api/measure/:id/dimension/:dimension-key/values"
+ (mt/with-temp [:model/Measure {:keys [id]} {:creator_id (mt/user->id :crowberto)
+ :table_id (mt/id :venues)
+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure id)
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (when price-dim
+ (let [response (mt/user-http-request :rasta :get 200
+ (format "measure/%d/dimension/%s/values" id (:id price-dim)))]
+ (is (contains? response :values))
+ (is (contains? response :field_id))
+ (is (contains? response :has_more_values))
+ ;; Price values are 1, 2, 3, 4
+ (is (seq (:values response))))))))))
+
+(deftest dimension-search-test
+ (testing "GET /api/measure/:id/dimension/:dimension-key/search"
+ (mt/with-temp [:model/Measure {:keys [id]} {:creator_id (mt/user->id :crowberto)
+ :table_id (mt/id :venues)
+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure id)
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (when name-dim
+ (let [response (mt/user-http-request :rasta :get 200
+ (format "measure/%d/dimension/%s/search" id (:id name-dim))
+ :query "Red")]
+ ;; Should return matching venue names
+ (is (sequential? response)))))))))
+
+(deftest dimension-remapping-test
+ (testing "GET /api/measure/:id/dimension/:dimension-key/remapping"
+ (mt/with-temp [:model/Measure {:keys [id]} {:creator_id (mt/user->id :crowberto)
+ :table_id (mt/id :venues)
+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure id)
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (when price-dim
+ (let [response (mt/user-http-request :rasta :get 200
+ (format "measure/%d/dimension/%s/remapping" id (:id price-dim))
+ :value "2")]
+ ;; Should return [value] or [value, display-name]
+ (is (= [2] response)))))))))
diff --git a/test/metabase/measures/models/measure_test.clj b/test/metabase/measures/models/measure_test.clj
index 7a9ab539603..821ee5cbbc0 100644
--- a/test/metabase/measures/models/measure_test.clj
+++ b/test/metabase/measures/models/measure_test.clj
@@ -242,6 +242,69 @@
(mt/with-test-user :rasta
(is (false? (mi/can-write? measure)))))))
+(deftest can-read?-superuser-test
+ (testing "Superusers can read measures"
+ (mt/with-temp [:model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ (mt/with-test-user :crowberto
+ (is (true? (mi/can-read? measure)))))))
+
+(deftest can-read?-with-view-data-and-query-builder-test
+ (testing "Users with view-data :unrestricted and create-queries :query-builder can read measures"
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-temp [:model/PermissionsGroup {group-id :id} {}
+ :model/User {user-id :id} {}
+ :model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ (perms/add-user-to-group! user-id group-id)
+ (data-perms/set-table-permission! group-id (mt/id :venues) :perms/view-data :unrestricted)
+ (data-perms/set-table-permission! group-id (mt/id :venues) :perms/create-queries :query-builder)
+ (session/with-current-user user-id
+ (is (true? (mi/can-read? measure))))))))
+
+(deftest can-read?-with-manage-table-metadata-test
+ (testing "Users with manage-table-metadata :yes can read measures"
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-temp [:model/PermissionsGroup {group-id :id} {}
+ :model/User {user-id :id} {}
+ :model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ (perms/add-user-to-group! user-id group-id)
+ (data-perms/set-table-permission! group-id (mt/id :venues) :perms/manage-table-metadata :yes)
+ (session/with-current-user user-id
+ (is (true? (mi/can-read? measure))))))))
+
+(deftest can-read?-without-permissions-test
+ (testing "Users with no table permissions cannot read measures"
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-temp [:model/User {user-id :id} {}
+ :model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ (session/with-current-user user-id
+ (is (false? (mi/can-read? measure))))))))
+
+(deftest can-read?-view-data-only-not-enough-test
+ (testing "Users with only view-data :unrestricted (no query builder perms) cannot read measures"
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-temp [:model/PermissionsGroup {group-id :id} {}
+ :model/User {user-id :id} {}
+ :model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ (perms/add-user-to-group! user-id group-id)
+ (data-perms/set-table-permission! group-id (mt/id :venues) :perms/view-data :unrestricted)
+ (session/with-current-user user-id
+ (is (false? (mi/can-read? measure))))))))
+
(deftest can-create?-superuser-test
(testing "Superusers can create measures"
(mt/with-test-user :crowberto
diff --git a/test/metabase/metrics/api_dataset_test.clj b/test/metabase/metrics/api_dataset_test.clj
new file mode 100644
index 00000000000..f65d7c912bd
--- /dev/null
+++ b/test/metabase/metrics/api_dataset_test.clj
@@ -0,0 +1,1134 @@
+(ns metabase.metrics.api-dataset-test
+ "Comprehensive E2E tests for POST /api/metric/dataset.
+ Tests the full pipeline: API request -> MetricDefinition -> AST -> MBQL -> execution.
+
+ These tests cover:
+ - All aggregation types (count, sum, avg, min, max, distinct)
+ - String, numeric, and temporal filter operators
+ - Compound filters (and, or, not)
+ - Projections/breakouts with temporal bucketing
+ - Binning strategies
+ - Measure sources
+ - Error handling
+
+ Some tests may fail for unimplemented features - this is expected."
+ (:require
+ [clojure.test :refer :all]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]))
+
+(use-fixtures :once (fixtures/initialize :db :web-server :test-users))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Helper Functions |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(defn- hydrate-metric
+ "Fetch metric via API to hydrate dimensions, returns the metric with dimensions."
+ [metric-id]
+ (mt/user-http-request :rasta :get 200 (str "metric/" metric-id)))
+
+(defn- find-dimension-by-name
+ "Find a dimension by column name from hydrated metric's dimensions."
+ [metric column-name]
+ (some #(when (= column-name (:name %)) %)
+ (:dimensions metric)))
+
+(defn- dataset-request
+ "Make POST /api/metric/dataset request with the given definition."
+ [definition]
+ (mt/user-http-request :rasta :post 202 "metric/dataset" {:definition definition}))
+
+(defn- dataset-request-error
+ "Make POST /api/metric/dataset request expecting an error status."
+ [expected-status definition]
+ (mt/user-http-request :rasta :post expected-status "metric/dataset" {:definition definition}))
+
+(defn- result-rows
+ "Extract rows from a dataset response."
+ [response]
+ (get-in response [:data :rows]))
+
+(defn- first-result
+ "Get the first value from the first row of results."
+ [response]
+ (ffirst (result-rows response)))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 1: Aggregation Types |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-count-aggregation-test
+ (mt/dataset test-data
+ (testing "POST /api/metric/dataset with count aggregation"
+ (mt/with-temp [:model/Card metric {:name "Count Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ ;; venues table has 100 rows
+ (is (= 100 (first-result response))))))))
+
+(deftest dataset-sum-aggregation-test
+ (testing "POST /api/metric/dataset with sum aggregation"
+ (mt/with-temp [:model/Card metric {:name "Sum Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:sum $price]]})}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ (is (= 203 (first-result response)))))))
+
+(deftest dataset-avg-aggregation-test
+ (testing "POST /api/metric/dataset with avg aggregation"
+ (mt/with-temp [:model/Card metric {:name "Avg Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:avg $price]]})}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ (is (= 2.03 (first-result response)))))))
+
+(deftest dataset-min-aggregation-test
+ (testing "POST /api/metric/dataset with min aggregation"
+ (mt/with-temp [:model/Card metric {:name "Min Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:min $price]]})}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ ;; Min price should be 1
+ (is (= 1 (first-result response)))))))
+
+(deftest dataset-max-aggregation-test
+ (testing "POST /api/metric/dataset with max aggregation"
+ (mt/with-temp [:model/Card metric {:name "Max Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:max $price]]})}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ ;; Max price should be 4
+ (is (= 4 (first-result response)))))))
+
+(deftest dataset-distinct-aggregation-test
+ (testing "POST /api/metric/dataset with distinct count aggregation"
+ (mt/with-temp [:model/Card metric {:name "Distinct Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:distinct $category_id]]})}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ (is (= 28 (first-result response)))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 2: String Filter Operators |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-string-equals-filter-test
+ (testing "POST /api/metric/dataset with string = filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:= {} [:dimension {} (:id name-dim)] "Red Medicine"]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (first-result response))))))))
+
+(deftest dataset-string-not-equals-filter-test
+ (testing "POST /api/metric/dataset with string != filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:!= {} [:dimension {} (:id name-dim)] "Red Medicine"]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 99 (first-result response))))))))
+
+(deftest dataset-string-contains-filter-test
+ (testing "POST /api/metric/dataset with string contains filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:contains {} [:dimension {} (:id name-dim)] "Burger"]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 2 (first-result response))))))))
+
+(deftest dataset-string-does-not-contain-filter-test
+ (testing "POST /api/metric/dataset with string does-not-contain filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (is (= 28 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:does-not-contain {} [:dimension {} (:id name-dim)] "a"]}]}))))))))
+
+(deftest dataset-string-starts-with-filter-test
+ (testing "POST /api/metric/dataset with string starts-with filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:starts-with {} [:dimension {} (:id name-dim)] "The"]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 10 (first-result response))))))))
+
+(deftest dataset-string-ends-with-filter-test
+ (testing "POST /api/metric/dataset with string ends-with filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:ends-with {} [:dimension {} (:id name-dim)] "Grill"]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 2 (first-result response))))))))
+
+(deftest dataset-string-is-empty-filter-test
+ (testing "POST /api/metric/dataset with string is-empty filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:is-empty {} [:dimension {} (:id name-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 0 (first-result response))))))))
+
+(deftest dataset-string-not-empty-filter-test
+ (testing "POST /api/metric/dataset with string not-empty filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:not-empty {} [:dimension {} (:id name-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 100 (first-result response))))))))
+
+(deftest dataset-string-is-null-filter-test
+ (testing "POST /api/metric/dataset with string is-null filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ name-dim (find-dimension-by-name hydrated "NAME")]
+ (is (some? name-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:is-null {} [:dimension {} (:id name-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 0 (first-result response))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 3: Numeric Filter Operators |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-number-equals-filter-test
+ (testing "POST /api/metric/dataset with numeric = filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:= {} [:dimension {} (:id price-dim)] 2]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 59 (first-result response))))))))
+
+(deftest dataset-number-not-equals-filter-test
+ (testing "POST /api/metric/dataset with numeric != filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (is (= 41 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:!= {} [:dimension {} (:id price-dim)] 2]}]}))))))))
+
+(deftest dataset-number-greater-than-filter-test
+ (testing "POST /api/metric/dataset with numeric > filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:> {} [:dimension {} (:id price-dim)] 2]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 19 (first-result response))))))))
+
+(deftest dataset-number-greater-than-or-equal-filter-test
+ (testing "POST /api/metric/dataset with numeric >= filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (is (= 78 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:>= {} [:dimension {} (:id price-dim)] 2]}]}))))))))
+
+(deftest dataset-number-less-than-filter-test
+ (testing "POST /api/metric/dataset with numeric < filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:< {} [:dimension {} (:id price-dim)] 3]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 81 (first-result response))))))))
+
+(deftest dataset-number-less-than-or-equal-filter-test
+ (testing "POST /api/metric/dataset with numeric <= filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (is (= 94 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:<= {} [:dimension {} (:id price-dim)] 3]}]}))))))))
+
+(deftest dataset-number-between-filter-test
+ (testing "POST /api/metric/dataset with numeric between filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:between {} [:dimension {} (:id price-dim)] 2 3]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 72 (first-result response))))))))
+
+(deftest dataset-number-is-null-filter-test
+ (testing "POST /api/metric/dataset with numeric is-null filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:is-null {} [:dimension {} (:id price-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 0 (first-result response))))))))
+
+(deftest dataset-number-not-null-filter-test
+ (testing "POST /api/metric/dataset with numeric not-null filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:not-null {} [:dimension {} (:id price-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 100 (first-result response))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 4: Temporal Filter Operators |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-time-interval-filter-test
+ (testing "POST /api/metric/dataset with time-interval filter"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:time-interval {} [:dimension {} (:id date-dim)] -365 :day]}]})]
+ (is (= "completed" (:status response))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 5: Compound Filters |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-and-filter-test
+ (testing "POST /api/metric/dataset with AND filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:and {}
+ [:>= {} [:dimension {} (:id price-dim)] 2]
+ [:<= {} [:dimension {} (:id price-dim)] 3]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 72 (first-result response))))))))
+
+(deftest dataset-or-filter-test
+ (testing "POST /api/metric/dataset with OR filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (is (= 28 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:or {}
+ [:= {} [:dimension {} (:id price-dim)] 1]
+ [:= {} [:dimension {} (:id price-dim)] 4]]}]})))
+ "price=1 (22) + price=4 (6) = 28")))))
+
+(deftest dataset-not-filter-test
+ (testing "POST /api/metric/dataset with NOT filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (is (= 41 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:not {} [:= {} [:dimension {} (:id price-dim)] 2]]}]})))
+ "NOT price=2 returns 100-59=41")))))
+
+(deftest dataset-nested-compound-filters-test
+ (testing "POST /api/metric/dataset with nested compound filters"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:and {}
+ [:or {}
+ [:= {} [:dimension {} (:id price-dim)] 1]
+ [:= {} [:dimension {} (:id price-dim)] 2]]
+ [:not {}
+ [:= {} [:dimension {} (:id price-dim)] 1]]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 59 (first-result response))
+ "(price=1 OR price=2) AND NOT price=1 = price=2 = 59"))))))
+
+(deftest dataset-multiple-filters-test
+ (testing "POST /api/metric/dataset with multiple filters (implicit AND)"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:and {}
+ [:>= {} [:dimension {} (:id price-dim)] 2]
+ [:<= {} [:dimension {} (:id price-dim)] 3]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 72 (first-result response))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 6: Projections/Breakouts |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-single-projection-test
+ (testing "POST /api/metric/dataset with single projection"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {} (:id price-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 4 (:row_count response))))))))
+
+(deftest dataset-multiple-projections-test
+ (testing "POST /api/metric/dataset with multiple projections"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")
+ cat-dim (find-dimension-by-name hydrated "CATEGORY_ID")]
+ (is (some? price-dim))
+ (is (some? cat-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {} (:id price-dim)]
+ [:dimension {} (:id cat-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 4 (:row_count response))
+ "should have more than 4 rows for price/category combinations"))))))
+
+(deftest dataset-projection-with-filter-test
+ (testing "POST /api/metric/dataset with projection and filter combined"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:>= {} [:dimension {} (:id price-dim)] 2]}]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {} (:id price-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 3 (:row_count response)) "prices 2, 3, 4")
+ (let [rows (result-rows response)]
+ (is (every? #(>= (first %) 2) rows))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 7: Temporal Bucketing |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-projection-day-bucket-test
+ (testing "POST /api/metric/dataset with day temporal bucket"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :day} (:id date-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 1 (:row_count response)) "should have multiple rows grouped by day"))))))
+
+(deftest dataset-projection-week-bucket-test
+ (testing "POST /api/metric/dataset with week temporal bucket"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [day-count (:row_count (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :day} (:id date-dim)]]}]}))
+ week-count (:row_count (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :week} (:id date-dim)]]}]}))]
+ (is (< week-count day-count) "week grouping should have fewer rows than day grouping"))))))
+
+(deftest dataset-projection-month-bucket-test
+ (testing "POST /api/metric/dataset with month temporal bucket"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :month} (:id date-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 1 (:row_count response)) "should have multiple rows grouped by month"))))))
+
+(deftest dataset-projection-quarter-bucket-test
+ (testing "POST /api/metric/dataset with quarter temporal bucket"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [month-count (:row_count (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :month} (:id date-dim)]]}]}))
+ quarter-count (:row_count (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :quarter} (:id date-dim)]]}]}))]
+ (is (<= quarter-count month-count) "quarter grouping should have fewer or equal rows than month grouping"))))))
+
+(deftest dataset-projection-year-bucket-test
+ (testing "POST /api/metric/dataset with year temporal bucket"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :year} (:id date-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 0 (:row_count response)) "should have at least one row grouped by year"))))))
+
+(deftest dataset-projection-day-of-week-bucket-test
+ (testing "POST /api/metric/dataset with day-of-week temporal bucket"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :day-of-week} (:id date-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 7 (:row_count response))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 8: Binning |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-projection-numeric-binning-default-test
+ (testing "POST /api/metric/dataset with default binning strategy"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ lat-dim (find-dimension-by-name hydrated "LATITUDE")]
+ (is (some? lat-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:binning {:strategy :default}} (:id lat-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 1 (:row_count response)) "should have multiple bins"))))))
+
+(deftest dataset-projection-numeric-binning-num-bins-test
+ (testing "POST /api/metric/dataset with num-bins binning strategy"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ lat-dim (find-dimension-by-name hydrated "LATITUDE")]
+ (is (some? lat-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:binning {:strategy :num-bins :num-bins 5}} (:id lat-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (<= (:row_count response) 6) "should have at most 5+1 bins"))))))
+
+(deftest dataset-projection-numeric-binning-bin-width-test
+ (testing "POST /api/metric/dataset with bin-width binning strategy"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ lat-dim (find-dimension-by-name hydrated "LATITUDE")]
+ (is (some? lat-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:binning {:strategy :bin-width :bin-width 10}} (:id lat-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 0 (:row_count response)) "should have at least one bin"))))))
+
+(deftest dataset-projection-coordinate-binning-test
+ (testing "POST /api/metric/dataset with coordinate binning"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ lat-dim (find-dimension-by-name hydrated "LATITUDE")]
+ (is (some? lat-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:binning {:strategy :default}} (:id lat-dim)]]}]})]
+ (is (= "completed" (:status response))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 9: Measure Source |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-measure-count-test
+ (testing "POST /api/metric/dataset with source-measure count"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Venue Count"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]})]
+ (is (= "completed" (:status response)))
+ (is (= 100 (first-result response)))))))))
+
+(deftest dataset-measure-sum-test
+ (testing "POST /api/metric/dataset with source-measure sum"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ price-col (lib.metadata/field mp (mt/id :venues :price))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/sum price-col)))]
+ (mt/with-temp [:model/Measure measure {:name "Total Price"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]})]
+ (is (= "completed" (:status response)))
+ (is (= 203 (first-result response)))))))))
+
+(deftest dataset-measure-avg-case-test
+ (testing "POST /api/metric/dataset with source-measure avg(case(rating >= 4, 1, 0))"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :products))
+ rating-col (lib.metadata/field mp (mt/id :products :rating))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/avg (lib/case [[(lib/>= rating-col 4) 1]] 0))))]
+ (mt/with-temp [:model/Measure measure {:name "High Rating Ratio"
+ :table_id (mt/id :products)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]})]
+ (is (= "completed" (:status response)))
+ (is (number? (first-result response)))
+ (is (<= 0 (first-result response) 1) "ratio should be between 0 and 1")))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 9b: Measure Source - Advanced Features |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(defn- hydrate-measure
+ "Fetch measure via API to hydrate dimensions, returns the measure with dimensions."
+ [measure-id]
+ (mt/user-http-request :crowberto :get 200 (str "measure/" measure-id)))
+
+(defn- find-measure-dimension-by-name
+ "Find a dimension by column name from hydrated measure's dimensions."
+ [measure column-name]
+ (some #(when (= column-name (:name %)) %)
+ (:dimensions measure)))
+
+(deftest dataset-measure-with-filter-test
+ (testing "POST /api/metric/dataset with source-measure and filter"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Venue Count"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure (:id measure))
+ price-dim (find-measure-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]
+ :filters [{:lib/uuid "a" :filter [:= {} [:dimension {} (:id price-dim)] 2]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 59 (first-result response))))))))))
+
+(deftest dataset-measure-with-projection-test
+ (testing "POST /api/metric/dataset with source-measure and projection"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Venue Count"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure (:id measure))
+ price-dim (find-measure-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]
+ :projections [{:type :measure :id (:id measure) :projection [[:dimension {} (:id price-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 4 (:row_count response))))))))))
+
+(deftest dataset-measure-temporal-bucket-test
+ (testing "POST /api/metric/dataset with source-measure and temporal bucket"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :checkins))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Checkin Count"
+ :table_id (mt/id :checkins)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure (:id measure))
+ date-dim (find-measure-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]
+ :projections [{:type :measure :id (:id measure) :projection [[:dimension {:temporal-unit :month} (:id date-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 1 (:row_count response)) "should have multiple rows grouped by month"))))))))
+
+(deftest dataset-measure-binning-test
+ (testing "POST /api/metric/dataset with source-measure and binning"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Venue Count"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure (:id measure))
+ lat-dim (find-measure-dimension-by-name hydrated "LATITUDE")]
+ (is (some? lat-dim))
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]
+ :projections [{:type :measure :id (:id measure) :projection [[:dimension {:binning {:strategy :num-bins :num-bins 5}} (:id lat-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (<= (:row_count response) 6) "should have at most 5+1 bins"))))))))
+
+(deftest dataset-measure-filter-and-projection-test
+ (testing "POST /api/metric/dataset with source-measure combining filter and projection"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Venue Count"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [hydrated (hydrate-measure (:id measure))
+ price-dim (find-measure-dimension-by-name hydrated "PRICE")
+ cat-dim (find-measure-dimension-by-name hydrated "CATEGORY_ID")]
+ (is (some? price-dim))
+ (is (some? cat-dim))
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]
+ :filters [{:lib/uuid "a" :filter [:>= {} [:dimension {} (:id price-dim)] 2]}]
+ :projections [{:type :measure :id (:id measure) :projection [[:dimension {} (:id cat-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 1 (:row_count response)) "should have rows broken out by category"))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 10: Error Cases |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-invalid-metric-id-test
+ (testing "POST /api/metric/dataset returns 404 for invalid metric ID"
+ (is (= "Not found."
+ (dataset-request-error 404 {:expression [:metric {:lib/uuid "a"} Integer/MAX_VALUE]})))))
+
+(deftest dataset-invalid-measure-id-test
+ (testing "POST /api/metric/dataset returns 404 for invalid measure ID"
+ (is (= "Not found."
+ (dataset-request-error 404 {:expression [:measure {:lib/uuid "a"} Integer/MAX_VALUE]})))))
+
+(deftest dataset-rejects-non-metric-card-test
+ (testing "POST /api/metric/dataset returns 404 for non-metric cards"
+ (mt/with-temp [:model/Card card {:name "Regular Question"
+ :type :question
+ :dataset_query (mt/mbql-query venues)}]
+ (is (= "Not found."
+ (dataset-request-error 404 {:expression [:metric {:lib/uuid "a"} (:id card)]}))))))
+
+(deftest dataset-permission-denied-metric-test
+ (testing "POST /api/metric/dataset respects metric collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (is (= "You don't have permissions to do that."
+ (dataset-request-error 403 {:expression [:metric {:lib/uuid "a"} (:id metric)]})))))))
+
+(deftest dataset-permission-denied-measure-data-perms-test
+ (testing "POST /api/metric/dataset respects measure data permissions"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Protected Measure"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-no-data-perms-for-all-users!
+ (is (= "You don't have permissions to do that."
+ (dataset-request-error 403 {:expression [:measure {:lib/uuid "a"} (:id measure)]}))))))))
+
+(deftest dataset-metric-with-collection-perms-can-execute-test
+ (testing "POST /api/metric/dataset allows execution when user has collection read perms"
+ (mt/with-temp [:model/Card metric {:name "Accessible Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; rasta has access to the root collection by default
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 100 (first-result response)))))))
+
+(deftest dataset-measure-with-data-perms-can-execute-test
+ (testing "POST /api/metric/dataset allows measure execution when user has data perms"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Accessible Measure"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [response (dataset-request {:expression [:measure {:lib/uuid "a"} (:id measure)]})]
+ (is (= "completed" (:status response)))
+ (is (= 100 (first-result response)))))))))
+
+(deftest dataset-metric-admin-can-always-execute-test
+ (testing "POST /api/metric/dataset allows admin to execute metrics in any collection"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; crowberto is admin
+ (let [response (mt/user-http-request :crowberto :post 202 "metric/dataset"
+ {:definition {:expression [:metric {:lib/uuid "a"} (:id metric)]}})]
+ (is (= "completed" (:status response)))
+ (is (= 100 (ffirst (get-in response [:data :rows])))))))))
+
+(deftest dataset-measure-admin-can-always-execute-test
+ (testing "POST /api/metric/dataset allows admin to execute measures regardless of data perms"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-query (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Protected Measure"
+ :table_id (mt/id :venues)
+ :definition pmbql-query}]
+ ;; crowberto is admin and can bypass data perms
+ (let [response (mt/user-http-request :crowberto :post 202 "metric/dataset"
+ {:definition {:expression [:measure {:lib/uuid "a"} (:id measure)]}})]
+ (is (= "completed" (:status response)))
+ (is (= 100 (ffirst (get-in response [:data :rows])))))))))
+
+(deftest dataset-metric-with-filters-respects-permissions-test
+ (testing "POST /api/metric/dataset with filters respects collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; Even with filters, permissions should be checked first
+ (is (= "You don't have permissions to do that."
+ (dataset-request-error 403 {:expression [:metric {:lib/uuid "a"} (:id metric)]})))))))
+
+(deftest dataset-metric-with-projections-respects-permissions-test
+ (testing "POST /api/metric/dataset with projections respects collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; Even with projections, permissions should be checked first
+ (is (= "You don't have permissions to do that."
+ (dataset-request-error 403 {:expression [:metric {:lib/uuid "a"} (:id metric)]})))))))
+
+(deftest dataset-requires-definition-test
+ (testing "POST /api/metric/dataset requires definition"
+ (is (some? (mt/user-http-request :rasta :post 400 "metric/dataset" {})))))
+
+(deftest dataset-requires-source-test
+ (testing "POST /api/metric/dataset requires expression"
+ (is (some? (mt/user-http-request :rasta :post 400 "metric/dataset"
+ {:definition {}})))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 11: Integration Tests |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-full-exploration-test
+ (testing "POST /api/metric/dataset with filter + projection + temporal bucket"
+ (mt/with-temp [:model/Card metric {:name "Checkin Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query checkins {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ date-dim (find-dimension-by-name hydrated "DATE")]
+ (is (some? date-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:time-interval {} [:dimension {} (:id date-dim)] -365 :day]}]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :month} (:id date-dim)]]}]})]
+ (is (= "completed" (:status response))))))))
+
+(deftest dataset-results-match-expected-count-test
+ (testing "POST /api/metric/dataset returns expected count for venues"
+ (mt/with-temp [:model/Card metric {:name "Count Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; venues table has 100 rows
+ (let [api-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= [[100]] (get-in api-result [:data :rows])))))))
+
+(deftest dataset-metric-with-existing-filter-test
+ (testing "POST /api/metric/dataset with metric that has existing filter"
+ (mt/with-temp [:model/Card metric {:name "Expensive Venues"
+ :type :metric
+ :dataset_query (mt/mbql-query venues
+ {:aggregation [[:count]]
+ :filter [:>= $price 3]})}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 19 (first-result response)))))))
+
+(deftest dataset-complex-combined-scenario-test
+ (testing "POST /api/metric/dataset complex scenario with multiple features"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")
+ cat-dim (find-dimension-by-name hydrated "CATEGORY_ID")]
+ (is (some? price-dim))
+ (is (some? cat-dim))
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:and {}
+ [:>= {} [:dimension {} (:id price-dim)] 2]
+ [:<= {} [:dimension {} (:id price-dim)] 3]]}]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {} (:id price-dim)]
+ [:dimension {} (:id cat-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (< 1 (:row_count response)) "should have multiple rows for price/category combinations")
+ (let [rows (result-rows response)]
+ (is (every? #(<= 2 (first %) 3) rows))))))))
+
+(deftest dataset-in-filter-test
+ (testing "POST /api/metric/dataset with IN filter (multiple values)"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (is (= 35 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:in {} [:dimension {} (:id price-dim)] 1 3]}]})))
+ "price=1 (22) + price=3 (13) = 35")))))
+
+(deftest dataset-not-in-filter-test
+ (testing "POST /api/metric/dataset with NOT-IN filter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [hydrated (hydrate-metric (:id metric))
+ price-dim (find-dimension-by-name hydrated "PRICE")]
+ (is (some? price-dim))
+ (is (= 65 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:not-in {} [:dimension {} (:id price-dim)] 1 3]}]})))
+ "100 - (price=1 (22) + price=3 (13)) = 65")))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Category 12: Metrics with Joins |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(defn- create-orders-products-join-query
+ "Create a pMBQL query joining Orders with Products on product_id."
+ []
+ (let [mp (mt/metadata-provider)
+ orders-table (lib.metadata/table mp (mt/id :orders))
+ products-table (lib.metadata/table mp (mt/id :products))
+ orders-product-id (lib.metadata/field mp (mt/id :orders :product_id))
+ products-id (lib.metadata/field mp (mt/id :products :id))]
+ (-> (lib/query mp orders-table)
+ (lib/join (lib/join-clause products-table
+ [(lib/= orders-product-id
+ (lib/with-join-alias products-id "Products"))]))
+ (lib/aggregate (lib/count)))))
+
+(deftest dataset-metric-with-join-basic-test
+ (testing "POST /api/metric/dataset with metric that has a join"
+ (let [query (create-orders-products-join-query)]
+ (mt/with-temp [:model/Card metric {:name "Orders with Products"
+ :type :metric
+ :dataset_query query}]
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ (is (= 18760 (first-result response))
+ "should count all 18760 orders"))))))
+
+(deftest dataset-metric-with-join-filter-on-base-table-test
+ (testing "POST /api/metric/dataset with join filtering on base table column"
+ (let [query (create-orders-products-join-query)]
+ (mt/with-temp [:model/Card metric {:name "Orders with Products"
+ :type :metric
+ :dataset_query query}]
+ (let [hydrated (hydrate-metric (:id metric))
+ total-dim (find-dimension-by-name hydrated "TOTAL")]
+ (is (some? total-dim) "TOTAL dimension should exist")
+ (let [filtered-count (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:> {} [:dimension {} (:id total-dim)] 50]}]}))]
+ (is (< filtered-count 18760)
+ "filtering on total > 50 should return fewer than all orders")))))))
+
+(deftest dataset-metric-with-join-filter-on-joined-table-test
+ (testing "POST /api/metric/dataset with join filtering on joined table column"
+ (let [query (create-orders-products-join-query)]
+ (mt/with-temp [:model/Card metric {:name "Orders with Products"
+ :type :metric
+ :dataset_query query}]
+ (let [hydrated (hydrate-metric (:id metric))
+ category-dim (find-dimension-by-name hydrated "CATEGORY")]
+ (is (some? category-dim) "CATEGORY dimension from Products should exist")
+ (is (= 4939 (first-result (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:= {} [:dimension {} (:id category-dim)] "Gadget"]}]})))
+ "Gadget category has 4939 orders"))))))
+
+(deftest dataset-metric-with-join-projection-base-table-test
+ (testing "POST /api/metric/dataset with join projecting on base table column"
+ (let [query (create-orders-products-join-query)]
+ (mt/with-temp [:model/Card metric {:name "Orders with Products"
+ :type :metric
+ :dataset_query query}]
+ (let [hydrated (hydrate-metric (:id metric))
+ user-dim (find-dimension-by-name hydrated "USER_ID")]
+ (is (some? user-dim) "USER_ID dimension should exist")
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {} (:id user-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 1746 (:row_count response))
+ "should have 1746 rows, one per unique user with orders")))))))
+
+(deftest dataset-metric-with-join-projection-joined-table-test
+ (testing "POST /api/metric/dataset with join projecting on joined table column"
+ (let [query (create-orders-products-join-query)]
+ (mt/with-temp [:model/Card metric {:name "Orders with Products"
+ :type :metric
+ :dataset_query query}]
+ (let [hydrated (hydrate-metric (:id metric))
+ category-dim (find-dimension-by-name hydrated "CATEGORY")]
+ (is (some? category-dim) "CATEGORY dimension from Products should exist")
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {} (:id category-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 4 (:row_count response))
+ "should have 4 rows, one per product category")))))))
+
+(deftest dataset-metric-with-join-filter-and-projection-test
+ (testing "POST /api/metric/dataset with join combining filter and projection"
+ (let [query (create-orders-products-join-query)]
+ (mt/with-temp [:model/Card metric {:name "Orders with Products"
+ :type :metric
+ :dataset_query query}]
+ (let [hydrated (hydrate-metric (:id metric))
+ category-dim (find-dimension-by-name hydrated "CATEGORY")
+ total-dim (find-dimension-by-name hydrated "TOTAL")]
+ (is (some? category-dim) "CATEGORY dimension should exist")
+ (is (some? total-dim) "TOTAL dimension should exist")
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters [{:lib/uuid "a" :filter [:> {} [:dimension {} (:id total-dim)] 20]}]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {} (:id category-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 4 (:row_count response))
+ "should have 4 rows, one per product category")))))))
+
+(deftest dataset-metric-with-join-temporal-projection-test
+ (testing "POST /api/metric/dataset with join using temporal bucketing"
+ (let [query (create-orders-products-join-query)]
+ (mt/with-temp [:model/Card metric {:name "Orders with Products"
+ :type :metric
+ :dataset_query query}]
+ (let [hydrated (hydrate-metric (:id metric))
+ created-dim (find-dimension-by-name hydrated "CREATED_AT")]
+ (is (some? created-dim) "CREATED_AT dimension should exist")
+ (let [response (dataset-request {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric :id (:id metric) :projection [[:dimension {:temporal-unit :month} (:id created-dim)]]}]})]
+ (is (= "completed" (:status response)))
+ (is (= 49 (:row_count response))
+ "should have 49 months of order data")))))))
diff --git a/test/metabase/metrics/api_dimension_test.clj b/test/metabase/metrics/api_dimension_test.clj
new file mode 100644
index 00000000000..b393aa46a2e
--- /dev/null
+++ b/test/metabase/metrics/api_dimension_test.clj
@@ -0,0 +1,207 @@
+(ns metabase.metrics.api-dimension-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.metrics.core :as metrics]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
+ [toucan2.core :as t2]))
+
+(use-fixtures :once (fixtures/initialize :db :web-server :test-users))
+
+;;; ------------------------------------------------ Helper Functions ------------------------------------------------
+
+(defn- metric-query []
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))]
+ (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))))
+
+(defn- get-dimension-id [metric dimension-name]
+ (let [dim (first (filter #(= (:name %) dimension-name) (:dimensions metric)))]
+ (:id dim)))
+
+(def ^:private fake-dimension-id
+ "550e8400-e29b-41d4-a716-446655440000")
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | GET /api/metric/:id/dimension/:key/values |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dimension-values-endpoint-test
+ (testing "GET /api/metric/:id/dimension/:key/values returns field values"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [hydrated-metric (t2/select-one :model/Card :id (:id metric))
+ dim-id (get-dimension-id hydrated-metric "PRICE")]
+ (is (some? dim-id) "PRICE dimension should exist")
+ (let [response (mt/user-http-request :rasta :get 200
+ (str "metric/" (:id metric) "/dimension/" dim-id "/values"))]
+ (is (= (mt/id :venues :price) (:field_id response)))
+ (is (= [[1] [2] [3] [4]] (:values response)))
+ (is (false? (:has_more_values response))))))))
+
+(deftest dimension-values-missing-metric-test
+ (testing "GET /api/metric/:id/dimension/:key/values returns 404 for non-existent metric"
+ (is (= "Not found."
+ (mt/user-http-request :rasta :get 404
+ (str "metric/" Integer/MAX_VALUE "/dimension/" fake-dimension-id "/values"))))))
+
+(deftest dimension-values-missing-dimension-test
+ (testing "GET /api/metric/:id/dimension/:key/values returns 400 for non-existent dimension"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [response (mt/user-http-request :rasta :get 400
+ (str "metric/" (:id metric) "/dimension/" fake-dimension-id "/values"))]
+ (is (re-find #"Dimension not found" (:message response)))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | GET /api/metric/:id/dimension/:key/search/:query |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dimension-search-endpoint-test
+ (testing "GET /api/metric/:id/dimension/:key/search searches field values"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [hydrated-metric (t2/select-one :model/Card :id (:id metric))
+ dim-id (get-dimension-id hydrated-metric "NAME")]
+ (is (some? dim-id) "NAME dimension should exist")
+ (let [response (mt/user-http-request :rasta :get 200
+ (str "metric/" (:id metric) "/dimension/" dim-id "/search")
+ :query "Red Med")]
+ (is (= [["Red Medicine"]] response)))))))
+
+(deftest dimension-search-missing-metric-test
+ (testing "GET /api/metric/:id/dimension/:key/search returns 404 for non-existent metric"
+ (is (= "Not found."
+ (mt/user-http-request :rasta :get 404
+ (str "metric/" Integer/MAX_VALUE "/dimension/" fake-dimension-id "/search")
+ :query "test")))))
+
+(deftest dimension-search-missing-dimension-test
+ (testing "GET /api/metric/:id/dimension/:key/search returns 400 for non-existent dimension"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [response (mt/user-http-request :rasta :get 400
+ (str "metric/" (:id metric) "/dimension/" fake-dimension-id "/search")
+ :query "test")]
+ (is (re-find #"Dimension not found" (:message response)))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | GET /api/metric/:id/dimension/:key/remapping |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dimension-remapping-endpoint-test
+ (testing "GET /api/metric/:id/dimension/:key/remapping returns value"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [hydrated-metric (t2/select-one :model/Card :id (:id metric))
+ dim-id (get-dimension-id hydrated-metric "PRICE")]
+ (is (some? dim-id) "PRICE dimension should exist")
+ (let [response (mt/user-http-request :rasta :get 200
+ (str "metric/" (:id metric) "/dimension/" dim-id "/remapping")
+ :value "1")]
+ (is (= [1] response)))))))
+
+(deftest dimension-remapping-missing-metric-test
+ (testing "GET /api/metric/:id/dimension/:key/remapping returns 404 for non-existent metric"
+ (is (= "Not found."
+ (mt/user-http-request :rasta :get 404
+ (str "metric/" Integer/MAX_VALUE "/dimension/" fake-dimension-id "/remapping")
+ :value "1")))))
+
+(deftest dimension-remapping-missing-dimension-test
+ (testing "GET /api/metric/:id/dimension/:key/remapping returns 400 for non-existent dimension"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [response (mt/user-http-request :rasta :get 400
+ (str "metric/" (:id metric) "/dimension/" fake-dimension-id "/remapping")
+ :value "1")]
+ (is (re-find #"Dimension not found" (:message response)))))))
+
+(deftest dimension-remapping-requires-value-param-test
+ (testing "GET /api/metric/:id/dimension/:key/remapping requires value parameter"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [hydrated-metric (t2/select-one :model/Card :id (:id metric))
+ dim-id (get-dimension-id hydrated-metric "PRICE")]
+ (is (some? dim-id) "PRICE dimension should exist")
+ (is (some? (mt/user-http-request :rasta :get 400
+ (str "metric/" (:id metric) "/dimension/" dim-id "/remapping"))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Permission Tests |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dimension-values-permission-test
+ (testing "GET /api/metric/:id/dimension/:key/values respects collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :get 403
+ (str "metric/" (:id metric) "/dimension/" fake-dimension-id "/values"))))))))
+
+(deftest dimension-search-permission-test
+ (testing "GET /api/metric/:id/dimension/:key/search respects collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :get 403
+ (str "metric/" (:id metric) "/dimension/" fake-dimension-id "/search")
+ :query "test")))))))
+
+(deftest dimension-remapping-permission-test
+ (testing "GET /api/metric/:id/dimension/:key/remapping respects collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :get 403
+ (str "metric/" (:id metric) "/dimension/" fake-dimension-id "/remapping")
+ :value "1")))))))
diff --git a/test/metabase/metrics/api_math_test.clj b/test/metabase/metrics/api_math_test.clj
new file mode 100644
index 00000000000..e279f97f70e
--- /dev/null
+++ b/test/metabase/metrics/api_math_test.clj
@@ -0,0 +1,180 @@
+(ns metabase.metrics.api-math-test
+ "Schema validation tests for the metric math expression contract.
+ Tests cover expression schemas, per-instance filters, typed projections,
+ and JSON normalization."
+ (:require
+ [clojure.test :refer :all]
+ [malli.core :as mc]
+ [malli.transform :as mtx]
+ [metabase.lib-metric.schema :as lib-metric.schema]
+ [metabase.metrics.api :as metrics.api]
+ [metabase.util.malli.registry :as mr]))
+
+(defn- valid?
+ "Check if a value is valid against a registered schema, with normalization."
+ [schema-key value]
+ (mr/validate schema-key
+ (mc/decode (mr/resolve-schema schema-key) value (mtx/transformer {:name :normalize}))))
+
+(defn- decode
+ "Decode a value against a registered schema with normalization."
+ [schema-key value]
+ (mc/decode (mr/resolve-schema schema-key) value (mtx/transformer {:name :normalize})))
+
+(defn- valid-definition?
+ "Check if a definition map is valid against the ::Definition schema."
+ [value]
+ (valid? ::metrics.api/Definition value))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Valid Expression Tests |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest bare-metric-reference-test
+ (testing "A bare metric reference is a valid expression"
+ (is (valid? ::lib-metric.schema/metric-math-expression
+ [:metric {:lib/uuid "abc-123"} 42]))))
+
+(deftest bare-measure-reference-test
+ (testing "A bare measure reference is a valid expression"
+ (is (valid? ::lib-metric.schema/metric-math-expression
+ [:measure {:lib/uuid "def-456"} 7]))))
+
+(deftest simple-arithmetic-test
+ (testing "Simple arithmetic with two operands is valid"
+ (doseq [op [:+ :- :* :/]]
+ (testing (str "operator " op)
+ (is (valid? ::lib-metric.schema/metric-math-expression
+ [op {} [:metric {:lib/uuid "a"} 1] [:metric {:lib/uuid "b"} 2]]))))))
+
+(deftest nested-arithmetic-test
+ (testing "Nested arithmetic (3+ levels) is valid"
+ (is (valid? ::lib-metric.schema/metric-math-expression
+ [:/ {}
+ [:- {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "b"} 1]]
+ [:measure {:lib/uuid "c"} 3]]))))
+
+(deftest mixed-metric-measure-expression-test
+ (testing "Mixed metric + measure in same expression is valid"
+ (is (valid? ::lib-metric.schema/metric-math-expression
+ [:+ {}
+ [:metric {:lib/uuid "a"} 10]
+ [:measure {:lib/uuid "b"} 20]]))))
+
+(deftest three-operand-arithmetic-test
+ (testing "Arithmetic with three operands is valid"
+ (is (valid? ::lib-metric.schema/metric-math-expression
+ [:+ {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "b"} 2]
+ [:metric {:lib/uuid "c"} 3]]))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Invalid Expression Tests |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest missing-uuid-on-reference-test
+ (testing "Missing :lib/uuid on metric reference is invalid (without normalization)"
+ ;; normalize-options-map adds :lib/uuid automatically, so we must test raw validation
+ (is (not (mr/validate ::lib-metric.schema/metric-math-expression
+ [:metric {} 42]))))
+ (testing "Missing :lib/uuid on measure reference is invalid (without normalization)"
+ (is (not (mr/validate ::lib-metric.schema/metric-math-expression
+ [:measure {} 7])))))
+
+(deftest single-operand-arithmetic-test
+ (testing "Arithmetic with a single operand is invalid"
+ (is (not (valid? ::lib-metric.schema/metric-math-expression
+ [:+ {} [:metric {:lib/uuid "a"} 1]])))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Definition Validation Tests |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest valid-definition-bare-expression-test
+ (testing "Valid definition with bare metric expression"
+ (is (valid-definition?
+ {:expression [:metric {:lib/uuid "a"} 42]}))))
+
+(deftest valid-definition-with-filters-test
+ (testing "Valid definition with matching filter UUIDs"
+ (is (valid-definition?
+ {:expression [:- {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "b"} 2]]
+ :filters [{:lib/uuid "a"
+ :filter [:= {} [:dimension {} "550e8400-e29b-41d4-a716-446655440001"] "value"]}]}))))
+
+(deftest valid-definition-with-projections-test
+ (testing "Valid definition with matching projection type/id"
+ (is (valid-definition?
+ {:expression [:metric {:lib/uuid "a"} 42]
+ :projections [{:type :metric
+ :id 42
+ :projection [[:dimension {} "550e8400-e29b-41d4-a716-446655440001"]]}]}))))
+
+(deftest duplicate-uuid-invalid-test
+ (testing "Duplicate :lib/uuid values in expression are invalid"
+ (is (not (valid-definition?
+ {:expression [:- {}
+ [:metric {:lib/uuid "a"} 1]
+ [:metric {:lib/uuid "a"} 2]]})))))
+
+(deftest filter-uuid-not-in-expression-test
+ (testing "Filter referencing UUID not in expression is invalid"
+ (is (not (valid-definition?
+ {:expression [:metric {:lib/uuid "a"} 42]
+ :filters [{:lib/uuid "does-not-exist"
+ :filter [:= {} [:dimension {} "550e8400-e29b-41d4-a716-446655440001"] "value"]}]})))))
+
+(deftest projection-type-id-not-in-expression-test
+ (testing "Projection type/id not matching expression leaf is invalid"
+ (is (not (valid-definition?
+ {:expression [:metric {:lib/uuid "a"} 42]
+ :projections [{:type :measure
+ :id 99
+ :projection [[:dimension {} "550e8400-e29b-41d4-a716-446655440001"]]}]})))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Normalization Tests |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest normalize-string-tags-test
+ (testing "String tags are normalized to keywords"
+ (let [decoded (decode ::lib-metric.schema/metric-math-expression
+ ["metric" {"lib/uuid" "abc"} 1])]
+ (is (= :metric (first decoded)))
+ (is (= "abc" (get (second decoded) :lib/uuid))))))
+
+(deftest normalize-string-operator-test
+ (testing "String arithmetic operator is normalized to keyword"
+ (let [decoded (decode ::lib-metric.schema/metric-math-expression
+ ["+" {} ["metric" {"lib/uuid" "a"} 1] ["metric" {"lib/uuid" "b"} 2]])]
+ (is (= :+ (first decoded))))))
+
+(deftest normalize-nested-string-expression-test
+ (testing "Nested expression with all strings normalizes correctly"
+ (let [decoded (decode ::lib-metric.schema/metric-math-expression
+ ["-" {}
+ ["metric" {"lib/uuid" "a"} 1]
+ ["measure" {"lib/uuid" "b"} 2]])]
+ (is (= :- (first decoded)))
+ (is (= :metric (first (nth decoded 2))))
+ (is (= :measure (first (nth decoded 3)))))))
+
+(deftest normalize-instance-filter-test
+ (testing "Instance filter with string keys normalizes correctly"
+ (let [decoded (decode ::lib-metric.schema/instance-filter
+ {"lib/uuid" "abc" "filter" ["=" {} ["dimension" {} "d1"] "val"]})]
+ (is (= "abc" (:lib/uuid decoded)))
+ (is (some? (:filter decoded))))))
+
+(deftest normalize-typed-projection-test
+ (testing "Typed projection with string keys normalizes correctly"
+ (let [decoded (decode ::lib-metric.schema/typed-projection
+ {"type" "metric" "id" 42 "projection" [["dimension" {} "d1"]]})]
+ (is (= :metric (:type decoded)))
+ (is (= 42 (:id decoded)))
+ (is (= 1 (count (:projection decoded)))))))
diff --git a/test/metabase/metrics/api_test.clj b/test/metabase/metrics/api_test.clj
new file mode 100644
index 00000000000..736b89fcf2c
--- /dev/null
+++ b/test/metabase/metrics/api_test.clj
@@ -0,0 +1,333 @@
+(ns metabase.metrics.api-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.test :as mt]
+ [metabase.test.fixtures :as fixtures]
+ [toucan2.core :as t2]))
+
+(use-fixtures :once (fixtures/initialize :db :web-server :test-users))
+
+(defn- do-with-sample-metrics-archived
+ "Temporarily archive any metric cards belonging to the sample database so they
+ don't interfere with test assertions. Restores them after `thunk` completes."
+ [thunk]
+ (let [sample-db-id (t2/select-one-pk :model/Database :is_sample true)
+ metric-ids (when sample-db-id
+ (t2/select-pks-vec :model/Card
+ :type :metric
+ :archived false
+ :database_id sample-db-id))]
+ (if (seq metric-ids)
+ (try
+ (t2/query {:update :report_card
+ :set {:archived true}
+ :where [:in :id metric-ids]})
+ (thunk)
+ (finally
+ (t2/query {:update :report_card
+ :set {:archived false}
+ :where [:in :id metric-ids]})))
+ (thunk))))
+
+(defmacro with-sample-metrics-archived
+ "Execute `body` with any sample-database metric cards temporarily archived."
+ [& body]
+ `(do-with-sample-metrics-archived (fn [] ~@body)))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | GET /api/metric/ |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest list-metric-returns-accessible-metric-test
+ (testing "GET /api/metric returns metric the user has access to"
+ (with-sample-metrics-archived
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :description "A test metric"
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :get 200 "metric")]
+ (is (= 1 (:total response)))
+ (is (= 500 (:limit response)))
+ (is (= 0 (:offset response)))
+ (is (= 1 (count (:data response))))
+ (let [returned-metric (first (:data response))]
+ (is (= (:id metric) (:id returned-metric)))
+ (is (= "Test Metric" (:name returned-metric)))
+ (is (= "A test metric" (:description returned-metric)))))))))
+
+(deftest list-metric-limit-test
+ (testing "GET /api/metric respects limit parameter"
+ (with-sample-metrics-archived
+ (mt/with-temp [:model/Card _metric1 {:name "Metric A"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}
+ :model/Card _metric2 {:name "Metric B"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}
+ :model/Card _metric3 {:name "Metric C"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :get 200 "metric" :limit 2)]
+ (is (= 3 (:total response)))
+ (is (= 2 (:limit response)))
+ (is (= 2 (count (:data response)))))))))
+
+(deftest list-metric-offset-test
+ (testing "GET /api/metric respects offset parameter"
+ (with-sample-metrics-archived
+ (mt/with-temp [:model/Card _metric1 {:name "Metric A"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}
+ :model/Card _metric2 {:name "Metric B"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}
+ :model/Card _metric3 {:name "Metric C"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :get 200 "metric" :offset 1 :limit 2)]
+ (is (= 3 (:total response)))
+ (is (= 1 (:offset response)))
+ (is (= 2 (count (:data response)))))))))
+
+(deftest list-metric-excludes-archived-test
+ (testing "GET /api/metric does not return archived metric"
+ (with-sample-metrics-archived
+ (mt/with-temp [:model/Card _metric {:name "Archived Metric"
+ :type :metric
+ :archived true
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (is (= 0 (:total (mt/user-http-request :rasta :get 200 "metric"))))))))
+
+(deftest list-metric-excludes-non-metric-test
+ (testing "GET /api/metric does not return non-metric cards"
+ (with-sample-metrics-archived
+ (mt/with-temp [:model/Card _card {:name "Regular Card"
+ :type :question
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (is (= 0 (:total (mt/user-http-request :rasta :get 200 "metric"))))))))
+
+(deftest list-metric-hydrates-collection-test
+ (testing "GET /api/metric hydrates collection information"
+ (mt/with-temp [:model/Collection collection {:name "Test Collection"}
+ :model/Card _metric {:name "Metric in Collection"
+ :type :metric
+ :collection_id (:id collection)
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :get 200 "metric")
+ returned-metric (first (:data response))]
+ (is (= (:id collection) (:collection_id returned-metric)))
+ (is (= (:id collection) (get-in returned-metric [:collection :id])))
+ (is (= "Test Collection" (get-in returned-metric [:collection :name])))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | GET /api/metric/:id |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest fetch-metric-test
+ (testing "GET /api/metric/:id"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :description "A test metric"
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :get 200 (str "metric/" (:id metric)))]
+ (is (= (:id metric) (:id response)))
+ (is (= "Test Metric" (:name response)))
+ (is (= "A test metric" (:description response)))))))
+
+(deftest fetch-metric-not-found-test
+ (testing "GET /api/metric/:id returns 404 for non-existent metric"
+ (is (= "Not found."
+ (mt/user-http-request :rasta :get 404 (str "metric/" Integer/MAX_VALUE))))))
+
+(deftest fetch-metric-hydrates-dimensions-test
+ (testing "GET /api/metric/:id returns dimensions and dimension_mappings"
+ (mt/with-temp [:model/Card metric {:name "Metric with Dimensions"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :get 200 (str "metric/" (:id metric)))]
+ (is (contains? response :dimensions))
+ (is (contains? response :dimension_mappings))))))
+
+(deftest fetch-metric-permissions-test
+ (testing "GET /api/metric/:id respects collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (testing "returns 403 without permissions"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :get 403 (str "metric/" (:id metric))))))))))
+
+(deftest fetch-metric-rejects-non-metric-card-test
+ (testing "GET /api/metric/:id returns 404 for non-metric cards"
+ (mt/with-temp [:model/Card card {:name "Regular Question"
+ :type :question
+ :dataset_query (mt/mbql-query venues)}]
+ (is (= "Not found."
+ (mt/user-http-request :rasta :get 404 (str "metric/" (:id card))))))))
+
+(deftest fetch-metric-saves-dimensions-on-read-test
+ (testing "GET /api/metric/:id saves dimensions and dimension_mappings to the database"
+ (mt/with-temp [:model/Card metric {:name "Metric with Dimensions"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (testing "no dimensions saved initially"
+ (let [initial-card (t2/select-one :model/Card :id (:id metric))]
+ (is (nil? (:dimensions initial-card)))
+ (is (nil? (:dimension_mappings initial-card)))))
+ (testing "response contains dimensions with active status"
+ (let [response (mt/user-http-request :rasta :get 200 (str "metric/" (:id metric)))]
+ (is (seq (:dimensions response)))
+ (is (seq (:dimension_mappings response)))
+ (is (every? #(= "status/active" (:status %)) (:dimensions response)))))
+ (testing "dimensions persisted to database"
+ (let [updated-card (t2/select-one :model/Card :id (:id metric))]
+ (is (seq (:dimensions updated-card)))
+ (is (seq (:dimension_mappings updated-card))))))))
+
+(deftest fetch-metric-dimensions-have-has-field-values-test
+ (testing "GET /api/metric/:id returns dimensions with has-field-values populated"
+ (mt/with-temp [:model/Card metric {:name "Metric with HFV"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :get 200 (str "metric/" (:id metric)))
+ dimensions (:dimensions response)]
+ (is (seq dimensions) "should have dimensions")
+ (testing "at least some dimensions have has-field-values"
+ (let [dims-with-hfv (filter :has-field-values dimensions)]
+ (is (seq dims-with-hfv)
+ "at least some dimensions should have has-field-values")
+ (doseq [dim dims-with-hfv]
+ (is (#{"list" "search" "none"} (:has-field-values dim))
+ (str "dimension " (:name dim) " has-field-values should be list, search, or none")))))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | POST /api/metric/dataset |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest dataset-endpoint-requires-definition-test
+ (testing "POST /api/metric/dataset requires definition"
+ (is (some? (mt/user-http-request :rasta :post 400 "metric/dataset" {})))))
+
+(deftest dataset-endpoint-requires-expression-test
+ (testing "POST /api/metric/dataset requires expression in definition"
+ (is (some? (mt/user-http-request :rasta :post 400 "metric/dataset"
+ {:definition {}})))))
+
+(deftest dataset-endpoint-rejects-duplicate-uuids-test
+ (testing "POST /api/metric/dataset rejects duplicate UUIDs in expression"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (is (some? (mt/user-http-request :rasta :post 400 "metric/dataset"
+ {:definition {:expression [:- {}
+ [:metric {:lib/uuid "a"} (:id metric)]
+ [:metric {:lib/uuid "a"} (:id metric)]]}}))))))
+
+(deftest dataset-endpoint-metric-source-test
+ (testing "POST /api/metric/dataset with metric expression"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (let [response (mt/user-http-request :rasta :post 202 "metric/dataset"
+ {:definition {:expression [:metric {:lib/uuid "a"} (:id metric)]}})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ (is (= [[100]] (get-in response [:data :rows])))))))
+
+(deftest dataset-endpoint-measure-source-test
+ (testing "POST /api/metric/dataset with measure expression"
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))
+ pmbql-definition (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))]
+ (mt/with-temp [:model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :definition pmbql-definition}]
+ (mt/with-full-data-perms-for-all-users!
+ (let [response (mt/user-http-request :rasta :post 202 "metric/dataset"
+ {:definition {:expression [:measure {:lib/uuid "a"} (:id measure)]}})]
+ (is (= "completed" (:status response)))
+ (is (= 1 (:row_count response)))
+ (is (= [[100]] (get-in response [:data :rows])))))))))
+
+(deftest dataset-endpoint-metric-not-found-test
+ (testing "POST /api/metric/dataset returns 404 for non-existent metric"
+ (is (= "Not found."
+ (mt/user-http-request :rasta :post 404 "metric/dataset"
+ {:definition {:expression [:metric {:lib/uuid "a"} Integer/MAX_VALUE]}})))))
+
+(deftest dataset-endpoint-measure-not-found-test
+ (testing "POST /api/metric/dataset returns 404 for non-existent measure"
+ (is (= "Not found."
+ (mt/user-http-request :rasta :post 404 "metric/dataset"
+ {:definition {:expression [:measure {:lib/uuid "a"} Integer/MAX_VALUE]}})))))
+
+(deftest dataset-endpoint-metric-permissions-test
+ (testing "POST /api/metric/dataset respects metric collection permissions"
+ (mt/with-non-admin-groups-no-root-collection-perms
+ (mt/with-temp [:model/Collection collection {}
+ :model/Card metric {:name "Protected Metric"
+ :type :metric
+ :collection_id (:id collection)
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "metric/dataset"
+ {:definition {:expression [:metric {:lib/uuid "a"} (:id metric)]}})))))))
+
+(deftest dataset-endpoint-rejects-non-metric-card-test
+ (testing "POST /api/metric/dataset returns 404 for non-metric cards"
+ (mt/with-temp [:model/Card card {:name "Regular Question"
+ :type :question
+ :dataset_query (mt/mbql-query venues)}]
+ (is (= "Not found."
+ (mt/user-http-request :rasta :post 404 "metric/dataset"
+ {:definition {:expression [:metric {:lib/uuid "a"} (:id card)]}}))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | POST /api/metric/breakout-values |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest breakout-values-endpoint-test
+ (testing "POST /api/metric/breakout-values returns distinct breakout values"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; Fetch metric to trigger dimension sync
+ (let [hydrated (mt/user-http-request :rasta :get 200 (str "metric/" (:id metric)))
+ dim (first (:dimensions hydrated))
+ dim-id (:id dim)
+ response (mt/user-http-request :rasta :post 200 "metric/breakout-values"
+ {:definition {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections [{:type :metric
+ :id (:id metric)
+ :projection [[:dimension {} dim-id]]}]}})]
+ (is (sequential? (:values response)))
+ (is (seq (:values response)))
+ (is (map? (:col response)))))))
+
+(deftest dataset-endpoint-accepts-filters-and-projections-test
+ (testing "POST /api/metric/dataset accepts filters parameter (returns 202 even if filters can't be applied)"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; The endpoint accepts filters even if the metric doesn't have matching dimensions
+ ;; This tests the endpoint parameter validation, not full filter functionality
+ (let [response (mt/user-http-request :rasta :post 202 "metric/dataset"
+ {:definition {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :filters []}})]
+ (is (= "completed" (:status response))))))
+
+ (testing "POST /api/metric/dataset accepts projections parameter (returns 202 even if projections can't be applied)"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :dataset_query (mt/mbql-query venues {:aggregation [[:count]]})}]
+ ;; The endpoint accepts projections even if the metric doesn't have matching dimensions
+ (let [response (mt/user-http-request :rasta :post 202 "metric/dataset"
+ {:definition {:expression [:metric {:lib/uuid "a"} (:id metric)]
+ :projections []}})]
+ (is (= "completed" (:status response)))))))
diff --git a/test/metabase/metrics/core_test.clj b/test/metabase/metrics/core_test.clj
new file mode 100644
index 00000000000..65be9eb2ffe
--- /dev/null
+++ b/test/metabase/metrics/core_test.clj
@@ -0,0 +1,175 @@
+(ns metabase.metrics.core-test
+ "Tests for metrics.core dimension sync functionality."
+ (:require
+ [clojure.test :refer :all]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
+ [metabase.metrics.core :as metrics]
+ [metabase.test :as mt]
+ [toucan2.core :as t2]))
+
+(set! *warn-on-reflection* true)
+
+;;; ------------------------------------------------ Helper Functions ------------------------------------------------
+
+(defn- metric-query
+ "Create a metric-style dataset query (a query with a single aggregation)."
+ []
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))]
+ (-> (lib/query mp table-metadata)
+ (lib/aggregate (lib/count)))))
+
+(defn- measure-definition
+ "Create an MBQL5 measure definition with the given aggregation clause.
+ Uses lib/aggregate to create a proper MBQL5 query."
+ [aggregation-clause]
+ (let [mp (mt/metadata-provider)
+ table-metadata (lib.metadata/table mp (mt/id :venues))]
+ (-> (lib/query mp table-metadata)
+ (lib/aggregate aggregation-clause))))
+
+;;; ------------------------------------------------ Metric Dimension Sync Tests ------------------------------------------------
+
+(deftest metric-sync-dimensions-basic-test
+ (testing "sync-dimensions! computes and persists dimensions from visible columns for metrics"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [reloaded (t2/select-one :model/Card :id (:id metric))]
+ (is (some? (:dimensions reloaded))
+ "Should have dimensions populated")
+ (is (some? (:dimension_mappings reloaded))
+ "Should have dimension-mappings populated")
+ ;; Venues table has ID, NAME, CATEGORY_ID, LATITUDE, LONGITUDE, PRICE columns
+ (is (>= (count (:dimensions reloaded)) 1)
+ "Should have at least one dimension from the venues table")
+ (is (= (count (:dimensions reloaded)) (count (:dimension_mappings reloaded)))
+ "Should have same number of dimensions and mappings")))))
+
+(deftest metric-sync-dimensions-persists-on-first-read-test
+ (testing "sync-dimensions! persists dimensions and mappings to database on first call for metrics"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ ;; Initially, dimensions should be nil in the database
+ (is (nil? (:dimensions (t2/select-one :model/Card :id (:id metric))))
+ "Dimensions should be nil before sync")
+ ;; Sync dimensions
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ ;; Now check that dimensions were persisted
+ (let [reloaded (t2/select-one :model/Card :id (:id metric))]
+ (is (some? (:dimensions reloaded))
+ "Dimensions should be persisted to database")
+ (is (some? (:dimension_mappings reloaded))
+ "Dimension mappings should be persisted to database")))))
+
+(deftest metric-sync-dimensions-preserves-user-modifications-test
+ (testing "sync-dimensions! preserves user modifications like display-name for metrics"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ ;; First sync to get dimensions
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [first-dim (first (:dimensions (t2/select-one :model/Card :id (:id metric))))
+ dim-id (:id first-dim)]
+ ;; Manually update the dimension to have a custom display name
+ (t2/update! :model/Card (:id metric)
+ {:dimensions [{:id dim-id
+ :name (:name first-dim)
+ :display-name "My Custom Metric Dimension"
+ :status :status/active}]})
+ ;; Sync again
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [reloaded (t2/select-one :model/Card :id (:id metric))
+ matching-dim (first (filter #(= dim-id (:id %)) (:dimensions reloaded)))]
+ (is (= "My Custom Metric Dimension" (:display-name matching-dim))
+ "User's custom display-name should be preserved"))))))
+
+(deftest metric-sync-dimensions-no-op-without-query-test
+ (testing "sync-dimensions! is a no-op when dataset_query is empty for metrics"
+ (mt/with-temp [:model/Card metric {:name "Test Metric"
+ :type :metric
+ :database_id (mt/id)
+ :table_id (mt/id :venues)
+ :dataset_query (metric-query)}]
+ ;; Set dataset_query to empty - metrics can't have nil queries, so use empty
+ (t2/update! :model/Card (:id metric) {:dataset_query {}})
+ (metrics/sync-dimensions! :metadata/metric (:id metric))
+ (let [reloaded (t2/select-one :model/Card :id (:id metric))]
+ ;; Should remain unchanged (without :dimensions or :dimension_mappings added)
+ (is (nil? (:dimensions reloaded))
+ "Dimensions should remain nil when query is empty")
+ (is (nil? (:dimension_mappings reloaded))
+ "Dimension mappings should remain nil when query is empty")))))
+
+;;; ------------------------------------------------ Measure Dimension Sync Tests ------------------------------------------------
+
+(deftest measure-sync-dimensions-basic-test
+ (testing "sync-dimensions! computes and persists dimensions from visible columns"
+ (mt/with-temp [:model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ (metrics/sync-dimensions! :metadata/measure (:id measure))
+ (let [reloaded (t2/select-one :model/Measure :id (:id measure))]
+ (is (some? (:dimensions reloaded))
+ "Should have dimensions populated")
+ (is (some? (:dimension_mappings reloaded))
+ "Should have dimension-mappings populated")
+ ;; Venues table has ID, NAME, CATEGORY_ID, LATITUDE, LONGITUDE, PRICE columns
+ (is (>= (count (:dimensions reloaded)) 1)
+ "Should have at least one dimension from the venues table")
+ (is (= (count (:dimensions reloaded)) (count (:dimension_mappings reloaded)))
+ "Should have same number of dimensions and mappings")))))
+
+(deftest measure-sync-dimensions-persists-on-first-read-test
+ (testing "sync-dimensions! persists dimensions and mappings to database on first call"
+ (mt/with-temp [:model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ ;; Initially, dimensions should be nil in the database
+ (is (nil? (:dimensions (t2/select-one :model/Measure :id (:id measure))))
+ "Dimensions should be nil before sync")
+ ;; Sync dimensions
+ (metrics/sync-dimensions! :metadata/measure (:id measure))
+ ;; Now check that dimensions were persisted
+ (let [reloaded (t2/select-one :model/Measure :id (:id measure))]
+ (is (some? (:dimensions reloaded))
+ "Dimensions should be persisted to database")
+ (is (some? (:dimension_mappings reloaded))
+ "Dimension mappings should be persisted to database")))))
+
+(deftest measure-sync-dimensions-preserves-user-modifications-test
+ (testing "sync-dimensions! preserves user modifications like display-name"
+ (mt/with-temp [:model/Measure measure {:name "Test Measure"
+ :table_id (mt/id :venues)
+ :creator_id (mt/user->id :rasta)
+ :definition (measure-definition (lib/count))}]
+ ;; First sync to get dimensions
+ (metrics/sync-dimensions! :metadata/measure (:id measure))
+ (let [first-dim (first (:dimensions (t2/select-one :model/Measure :id (:id measure))))
+ dim-id (:id first-dim)]
+ ;; Manually update the dimension to have a custom display name
+ (t2/update! :model/Measure (:id measure)
+ {:dimensions [{:id dim-id
+ :name (:name first-dim)
+ :display-name "My Custom Name"
+ :status :status/active}]})
+ ;; Sync again
+ (metrics/sync-dimensions! :metadata/measure (:id measure))
+ (let [reloaded (t2/select-one :model/Measure :id (:id measure))
+ matching-dim (first (filter #(= dim-id (:id %)) (:dimensions reloaded)))]
+ (is (= "My Custom Name" (:display-name matching-dim))
+ "User's custom display-name should be preserved"))))))
+
+;; Note: There's no test for "no-op without definition" for measures
+;; because measures have a NOT NULL constraint on the definition column - they must always have a definition.
diff --git a/test/metabase/search/api_test.clj b/test/metabase/search/api_test.clj
index 03858d2296f..f46b838dbb6 100644
--- a/test/metabase/search/api_test.clj
+++ b/test/metabase/search/api_test.clj
@@ -171,7 +171,9 @@
(table-search-results))
(merge
(make-result "measure test measure"
- :model "measure")
+ :model "measure"
+ :creator_id true
+ :creator_common_name "Rasta Toucan")
(table-search-results))]))
(defn- default-table-scoped-results
@@ -416,7 +418,7 @@
(is (= #{"dashboard" "table" "dataset" "segment" "measure" "collection" "database" "action" "metric" "card"}
(get-available-models :q search-term))))
(testing "return a subset of model for created-by filter"
- (is (= #{"dashboard" "dataset" "card" "metric" "action"}
+ (is (= #{"dashboard" "dataset" "card" "metric" "action" "measure"}
(get-available-models :q search-term :created_by (mt/user->id :rasta)))))
(testing "return a subset of model for verified filter"
(mt/with-temp
@@ -435,7 +437,7 @@
(is (= #{"card"}
(get-available-models :q search-term :verified true))))))))
(testing "return a subset of model for created_at filter"
- (is (= #{"dashboard" "table" "dataset" "collection" "database" "action" "card" "metric"}
+ (is (= #{"dashboard" "table" "dataset" "collection" "database" "action" "card" "metric" "measure"}
(get-available-models :q search-term :created_at "today"))))
(testing "return a subset of model for search_native_query filter"
@@ -638,6 +640,17 @@
(is (= []
(search-request-data :rasta :q "test")))))))
+(deftest measure-permissions-test
+ (testing "Measures on tables for which the user does not have access to should not show up in results"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {table-id :id} {:db_id db-id
+ :schema nil}
+ :model/Measure _ {:table_id table-id
+ :name "test measure"}]
+ (mt/with-no-data-perms-for-all-users!
+ (is (= []
+ (search-request-data :rasta :q "test")))))))
+
(deftest permissions-test-8
(testing "Databases for which the user does not have access to should not show up in results"
(mt/with-temp [:model/Database _db-1 {:name "db-1"}
@@ -1311,13 +1324,13 @@
(let [search-term "created-at-filtering"]
(with-search-items-in-root-collection search-term
(testing "returns only applicable models"
- (is (=? {:available_models #(= #{"dashboard" "table" "dataset" "collection" "database" "action" "card" "metric"}
+ (is (=? {:available_models #(= #{"dashboard" "table" "dataset" "collection" "database" "action" "card" "metric" "measure"}
(set %))}
(mt/user-http-request :crowberto :get 200 "search" :q search-term :created_at "today"
:calculate_available_models true))))
(testing "works with others filter too"
- (is (= #{"dashboard" "table" "dataset" "collection" "database" "action" "card" "metric"}
+ (is (= #{"dashboard" "table" "dataset" "collection" "database" "action" "card" "metric" "measure"}
(-> (mt/user-http-request :crowberto :get 200 "search" :q search-term :created_at "today" :creator_id (mt/user->id :rasta)
:calculate_available_models true)
:available_models
@@ -1986,3 +1999,100 @@
"Card in collection should be included")
(is (not (contains? result-ids table-id))
"Published table should NOT be included in collection search in OSS")))))))
+
+;;; +----------------------------------------------------------------------------------------------------------------+
+;;; | Measure Search Tests (Phase 4) |
+;;; +----------------------------------------------------------------------------------------------------------------+
+
+(deftest measure-search-by-description-test
+ (testing "Should be able to find measures by description"
+ (let [unique-desc (mt/random-name)]
+ (mt/with-temp [:model/Measure _ {:name "Some Measure"
+ :table_id (mt/id :venues)
+ :description unique-desc}]
+ (is (=? [{:name "Some Measure" :model "measure" :description unique-desc}]
+ (search-request-data :crowberto :q unique-desc)))))))
+
+(deftest measure-table-db-id-filter-test
+ (testing "Measures are returned when searching with matching table_db_id"
+ (let [measure-name (mt/random-name)]
+ (mt/with-temp [:model/Measure _ {:name measure-name
+ :table_id (mt/id :venues)}]
+ (is (=? [{:name measure-name :model "measure"}]
+ (search-request-data :crowberto :q measure-name
+ :table_db_id (mt/id)))))))
+ (testing "Measures are NOT returned when searching with non-matching table_db_id"
+ (let [measure-name (mt/random-name)]
+ (mt/with-temp [:model/Database {other-db-id :id} {}
+ :model/Measure _ {:name measure-name
+ :table_id (mt/id :venues)}]
+ (is (= []
+ (binding [*search-request-results-database-id* other-db-id]
+ (search-request-data :crowberto :q measure-name
+ :table_db_id other-db-id))))))))
+
+(deftest measure-search-result-shape-test
+ (testing "Measure search results contain table and database context fields"
+ (let [measure-name (mt/random-name)]
+ (mt/with-temp [:model/Measure _ {:name measure-name
+ :table_id (mt/id :venues)}]
+ (is (=? [{:name measure-name
+ :model "measure"
+ :table_id true
+ :table_name "VENUES"
+ :database_id true}]
+ (search-request-data-with identity :crowberto
+ :q measure-name :models "measure")))))))
+
+(deftest measure-models-filter-test
+ (testing "Filtering by models=measure returns only measures"
+ (with-search-items-in-root-collection "test"
+ (let [results (search-request-data :crowberto :q "test" :models "measure")]
+ (is (= 1 (count results)))
+ (is (= "measure" (-> results first :model)))))))
+
+(deftest measure-permissions-with-data-access-test
+ (testing "User with view-data access can see measures in search"
+ (mt/with-temp [:model/Database {db-id :id} {}
+ :model/Table {table-id :id} {:db_id db-id :schema nil}
+ :model/Measure _ {:table_id table-id :name "test measure"}
+ :model/PermissionsGroup {group-id :id} {}
+ :model/PermissionsGroupMembership _ {:group_id group-id :user_id (mt/user->id :rasta)}]
+ (mt/with-no-data-perms-for-all-users!
+ (perms/set-database-permission! group-id db-id :perms/view-data :unrestricted)
+ (perms/set-table-permission! group-id (t2/select-one :model/Table table-id) :perms/create-queries :query-builder)
+ (is (=? [{:name "test measure" :model "measure"}]
+ (binding [*search-request-results-database-id* db-id]
+ (search-request-data :rasta :q "test measure"))))))))
+
+(deftest measure-archive-round-trip-test
+ (testing "Archived measures appear in archived results and not in default results"
+ (let [measure-name (mt/random-name)]
+ (mt/with-temp [:model/Measure {measure-id :id} {:name measure-name
+ :table_id (mt/id :venues)}]
+ (testing "measure appears in default (non-archived) results"
+ (is (=? [{:name measure-name :model "measure"}]
+ (search-request-data :crowberto :q measure-name))))
+ (testing "after archiving, measure disappears from default results"
+ (t2/update! :model/Measure measure-id {:archived true})
+ (is (= [] (search-request-data :crowberto :q measure-name))))
+ (testing "archived measure appears in archived=true results"
+ (is (=? [{:name measure-name :model "measure" :archived true}]
+ (search-request-data :crowberto :q measure-name :archived "true"))))
+ (testing "after unarchiving, measure returns to default results"
+ (t2/update! :model/Measure measure-id {:archived false})
+ (is (=? [{:name measure-name :model "measure"}]
+ (search-request-data :crowberto :q measure-name))))))))
+
+(deftest ^:synchronized measure-appdb-engine-test
+ (when (search/supports-index?)
+ (testing "Measures are indexed and returned by the appdb search engine"
+ (let [measure-name (mt/random-name)]
+ (search.tu/with-temp-index-table
+ (mt/with-temp [:model/Measure _ {:name measure-name
+ :table_id (mt/id :venues)}]
+ (search/reindex! {:async? false :in-place? true})
+ (is (=? [{:name measure-name :model "measure"}]
+ (search-request-data :crowberto :q measure-name
+ :search_engine "appdb"
+ :models "measure")))))))))
diff --git a/test/metabase/search/in_place/filter_test.clj b/test/metabase/search/in_place/filter_test.clj
index 8d350cc26f2..3a174111ab5 100644
--- a/test/metabase/search/in_place/filter_test.clj
+++ b/test/metabase/search/in_place/filter_test.clj
@@ -43,7 +43,7 @@
(deftest ^:parallel ->applicable-models-test-2
(testing "optional filters will return intersection of support models and provided models\n"
(testing "created by"
- (is (= #{"dashboard" "dataset" "document" "action" "card" "metric"}
+ (is (= #{"dashboard" "dataset" "document" "action" "card" "metric" "measure"}
(search.filter/search-context->applicable-models
(merge default-search-ctx
{:created-by #{1}}))))
@@ -55,7 +55,7 @@
:created-by #{1}})))))
(testing "created at"
- (is (= #{"dashboard" "table" "dataset" "document" "collection" "database" "action" "card" "metric" "transform"}
+ (is (= #{"dashboard" "table" "dataset" "document" "collection" "database" "action" "card" "metric" "transform" "measure"}
(search.filter/search-context->applicable-models
(merge default-search-ctx
{:created-at "past3days"}))))
@@ -475,3 +475,13 @@
base-search-query
"action"
(merge default-search-ctx {:search-string "foo" :search-native-query true}))))))))
+
+(deftest ^:parallel build-collection-filter-for-non-collection-models-test
+ (testing "collection filter on models without collections returns false-clause (no results, no error)"
+ (doseq [model ["measure" "segment" "database" "action" "indexed-entity"]]
+ (testing model
+ (let [result (search.filter/build-filters
+ base-search-query model
+ (merge default-search-ctx {:collection 1}))]
+ (is (some #{[:inline [:= 0 1]]}
+ (tree-seq sequential? seq (:where result)))))))))