Skip to content
Snippets Groups Projects
Unverified Commit 338666fa authored by Case Nelson's avatar Case Nelson Committed by GitHub
Browse files

[MLv2] Make long display name available. (#30882)

* [MLv2] Export display-name

* Add long-display-name to display-info

* Removem display-name since it won't be used

* Fix FE tests
parent ce00efce
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,7 @@ describe("order by", () => {
expect.objectContaining({
name: "ID",
displayName: "ID",
longDisplayName: "ID",
effectiveType: "type/BigInteger",
semanticType: "type/PK",
isCalculated: false,
......@@ -29,6 +30,7 @@ describe("order by", () => {
table: {
name: "ORDERS",
displayName: "Orders",
longDisplayName: "Orders",
isSourceTable: true,
},
}),
......@@ -42,6 +44,7 @@ describe("order by", () => {
expect.objectContaining({
name: "TITLE",
displayName: "Title",
longDisplayName: "Products → Title",
effectiveType: "type/Text",
semanticType: "type/Title",
isCalculated: false,
......@@ -51,6 +54,7 @@ describe("order by", () => {
table: {
name: "PRODUCTS",
displayName: "Products",
longDisplayName: "Products",
isSourceTable: false,
},
}),
......
......@@ -255,6 +255,7 @@
(mr/register! ::display-info
[:map
[:display-name :string]
[:long-display-name {:optional true} :string]
;; for things that have a Table, e.g. a Field
[:table {:optional true} [:maybe [:ref ::display-info]]]
;; these are derived from the `:lib/source`/`:metabase.lib.metadata/column-source`, but instead of using that value
......@@ -308,6 +309,8 @@
;; TODO -- not 100% convinced the FE should actually have access to `:name`, can't it use `:display-name`
;; everywhere? Determine whether or not this is the case.
(select-keys x-metadata [:name :display-name :semantic-type])
(when-let [long-display-name (display-name query stage-number x :long)]
{:long-display-name long-display-name})
;; don't return `:base-type`, FE should just use `:effective-type` everywhere and not even need to know
;; `:base-type` exists.
(when-let [effective-type ((some-fn :effective-type :base-type) x-metadata)]
......
......@@ -14,3 +14,11 @@
"TOTAL"]))]
(is (= "Venues, Sorted by Total ascending"
(lib.metadata.calculation/suggested-name query))))))
(deftest ^:parallel long-display-name-test
(let [query (lib/query-for-table-name meta/metadata-provider "VENUES")
results (->> query
lib.metadata.calculation/visible-columns
(map (comp :long-display-name #(lib/display-info query 0 %))))]
(is (= ["ID" "Name" "Category ID" "Latitude" "Longitude" "Price" "Categories → ID" "Categories → Name"]
results))))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment