Skip to content

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

Default viz behavior fixes (#69664)

Kevin Kelleher32b8ab866d22
diff --git a/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.js
index d46c961912a..57d2f9664c4 100644
--- a/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-tabular/pivot_tables.cy.spec.js
@@ -481,7 +481,9 @@ describe("scenarios > visualizations > pivot tables", { tags: "@slow" }, () => {
});
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByText("Pivot tables can only be used with aggregated queries.");
+ cy.findByText(
+ "Pivot tables are only supported for questions built in the query builder.",
+ );
});
describe("custom columns (metabase#14604)", () => {
diff --git a/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.js b/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.js
index cc212c59acb..c9044310290 100644
--- a/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.js
+++ b/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.js
@@ -1,6 +1,10 @@
import icepick from "icepick";
-import { DateTimeColumn, NumberColumn } from "__support__/visualizations";
+import {
+ DateTimeColumn,
+ NumberColumn,
+ StringColumn,
+} from "__support__/visualizations";
import {
getComputedSettingsForSeries,
getStoredSettingsForSeries,
@@ -258,6 +262,56 @@ describe("visualization_settings", () => {
]);
});
});
+
+ describe("pie.metric and pie.dimension", () => {
+ it("should pick defaults when there are multiple metric columns", () => {
+ const series = [
+ {
+ card: { display: "pie", visualization_settings: {} },
+ data: {
+ cols: [
+ StringColumn({ name: "category" }),
+ NumberColumn({ name: "sum" }),
+ NumberColumn({ name: "count" }),
+ ],
+ rows: [
+ ["a", 10, 1],
+ ["b", 20, 2],
+ ],
+ },
+ },
+ ];
+ const settings = getComputedSettingsForSeries(series);
+ expect(settings["pie.dimension"]).toEqual(["category"]);
+ expect(settings["pie.metric"]).toBe("sum");
+ });
+ });
+
+ describe("map.metric and map.dimension", () => {
+ it("should pick defaults when there are multiple metric columns", () => {
+ const series = [
+ {
+ card: {
+ display: "map",
+ visualization_settings: { "map.type": "region" },
+ },
+ data: {
+ cols: [
+ StringColumn({
+ name: "state",
+ semantic_type: "type/State",
+ }),
+ NumberColumn({ name: "count" }),
+ NumberColumn({ name: "sum" }),
+ ],
+ rows: [["CA", 100, 100]],
+ },
+ },
+ ];
+ const settings = getComputedSettingsForSeries(series);
+ expect(settings["map.metric"]).toBe("count");
+ });
+ });
});
const cardWithTimeseriesBreakout = ({
diff --git a/frontend/src/metabase/visualizations/shared/settings/pie.ts b/frontend/src/metabase/visualizations/shared/settings/pie.ts
index 2eb770a00c9..4664d727fb3 100644
--- a/frontend/src/metabase/visualizations/shared/settings/pie.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/pie.ts
@@ -37,11 +37,7 @@ export function getPieDimensions(settings: ComputedVisualizationSettings) {
}
export function getDefaultPieColumns(rawSeries: RawSeries) {
- const { dimensions, metrics } = getDefaultDimensionsAndMetrics(
- rawSeries,
- 3,
- 1,
- );
+ const { dimensions, metrics } = getDefaultDimensionsAndMetrics(rawSeries, 3);
return {
dimension: dimensions,
metric: metrics[0],
diff --git a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
index b1011b567e8..8918d1247ef 100644
--- a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
@@ -21,6 +21,7 @@ import {
import {
hasLatitudeAndLongitudeColumns,
isCountry,
+ isDimension,
isLatitude,
isLongitude,
isMetric,
@@ -216,12 +217,28 @@ export class Map extends Component {
get title() {
return t`Metric field`;
},
+ getDefault: ([
+ {
+ data: { cols },
+ },
+ ]) => cols.find(isMetric)?.name,
getHidden: (series, vizSettings) => vizSettings["map.type"] !== "region",
}),
...dimensionSetting("map.dimension", {
get title() {
return t`Region field`;
},
+ getDefault: ([
+ {
+ data: { cols },
+ },
+ ]) => {
+ const geoDimension = cols.find((col) => isCountry(col) || isState(col));
+ if (geoDimension) {
+ return geoDimension.name;
+ }
+ return cols.find(isDimension)?.name;
+ },
getHidden: (series, vizSettings) => vizSettings["map.type"] !== "region",
}),
"map.colors": {
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
index 35b64849869..490bfba5495 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
@@ -228,6 +228,11 @@ export function checkRenderable(
settings: VisualizationSettings,
query?: NativeQuery | null,
) {
+ if (data.cols.some((col) => col.source === "native")) {
+ throw new Error(
+ t`Pivot tables are only supported for questions built in the query builder.`,
+ );
+ }
if (data.cols.length < 2 || !data.cols.every(isColumnValid)) {
throw new Error(t`Pivot tables can only be used with aggregated queries.`);
}