Skip to content
Snippets Groups Projects
Unverified Commit 73829ade authored by Alexander Polyankin's avatar Alexander Polyankin Committed by GitHub
Browse files

Remove FE hacks for empty display names for column groups (#47812)

parent 4427ae5d
No related branches found
No related tags found
No related merge requests found
......@@ -554,7 +554,7 @@ describe("scenarios > visualizations > table column settings", () => {
const testData = {
column: "Count",
columnName: "Count",
table: "question",
table: "summaries",
sanityCheck: "Product ID",
needsScroll: false,
};
......@@ -562,7 +562,7 @@ describe("scenarios > visualizations > table column settings", () => {
const testData2 = {
column: "Product ID",
columnName: "Product ID",
table: "question",
table: "summaries",
sanityCheck: "Count",
needsScroll: false,
};
......
......@@ -275,8 +275,7 @@ describe("parameters/utils/mapping-options", () => {
);
expect(options).toEqual([
{
// this is a source query, and tables for source queries do not have a display_name
sectionName: "",
sectionName: "Summaries",
name: "Created At",
icon: "calendar",
target: [
......
import { t } from "ttag";
import * as Lib from "metabase-lib";
import type { ColumnGroupItem, ColumnItem } from "./types";
......@@ -43,7 +41,7 @@ function getGroupsWithColumns(
return {
columnItems,
displayName: groupInfo.displayName || t`Question`,
displayName: groupInfo.displayName,
isSelected: columnItems.every(({ isSelected }) => isSelected),
isDisabled: columnItems.every(({ isDisabled }) => isDisabled),
isSourceGroup: groupIndex === 0,
......
import { t } from "ttag";
import { getColumnGroupIcon } from "metabase/common/utils/column-groups";
import * as Lib from "metabase-lib";
......@@ -33,7 +31,7 @@ export function getGroupItems(query: Lib.Query): GroupItem[] {
return {
key: `${stageIndex}-${groupIndex}`,
displayName: groupInfo.displayName || t`Summaries`,
displayName: groupInfo.displayName,
icon: getColumnGroupIcon(groupInfo),
columnItems: availableColumns.map(column => {
const columnInfo = Lib.displayInfo(query, stageIndex, column);
......
......@@ -72,9 +72,9 @@
(lib.metadata.calculation/display-info query stage-number table))
(when-let [card (some->> (:source-card stage) (lib.metadata/card query))]
(lib.metadata.calculation/display-info query stage-number card))
;; for multi-stage queries return an empty string (#30108)
;; multi-stage queries (#30108)
(when (next (:stages query))
{:display-name ""})
{:display-name "Summaries"})
;; if this is a native query or something else that doesn't have a source Table or source Card then use the
;; stage display name.
{:display-name (lib.metadata.calculation/display-name query stage-number stage)}))
......
......@@ -81,7 +81,7 @@
{:display-name "Sum of ID", :lib/source :source/previous-stage}]}]
groups))
(testing `lib/display-info
(is (=? [{:display-name ""
(is (=? [{:display-name "Summaries"
:is-from-join false
:is-implicitly-joinable false}]
(for [group groups]
......@@ -250,7 +250,7 @@
{:display-name "sum of User ID", :lib/source :source/previous-stage}]}]
groups))
(testing `lib/display-info
(is (=? [{:display-name ""
(is (=? [{:display-name "Summaries"
:is-from-join false
:is-implicitly-joinable false}]
(for [group groups]
......
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