Skip to content

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

Fix cardinality cache collisions (#79856)

Kevin Kelleherda492ba066e5
diff --git a/bun.lock b/bun.lock
index c3a6f9ed9ac..54b171b244f 100644
--- a/bun.lock
+++ b/bun.lock
@@ -84,7 +84,6 @@
"crc-32": "^1.2.2",
"cron-expression-validator": "^1.0.20",
"cronstrue": "^2.11.0",
- "crossfilter": "^1.3.12",
"csv-parse": "^5.5.6",
"csv-stringify": "^6.5.0",
"cypress-each": "^1.14.1",
@@ -230,7 +229,6 @@
"@types/babel__core": "^7.20.4",
"@types/babel__preset-env": "^7.9.5",
"@types/color": "^3.0.2",
- "@types/crossfilter": "^0.0.34",
"@types/d3": "^7.4.3",
"@types/d3-array": "^3.2.1",
"@types/d3-scale": "^4.0.8",
@@ -1808,8 +1806,6 @@
"@types/cookie": ["@types/[email protected]", "", {}, "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="],
- "@types/crossfilter": ["@types/[email protected]", "", {}, "sha512-O5TMGZ3DvbB3cTIHlbp+shNI5y9C3+vuvyIkcQ6vuW3/cCtfi2FYikeG/KAwmmxhOi4mvL9Gw9+OpTtGBFzcIg=="],
-
"@types/d3": ["@types/[email protected]", "", { "dependencies": { "@types/d3-array": "*", "@types/d3-axis": "*", "@types/d3-brush": "*", "@types/d3-chord": "*", "@types/d3-color": "*", "@types/d3-contour": "*", "@types/d3-delaunay": "*", "@types/d3-dispatch": "*", "@types/d3-drag": "*", "@types/d3-dsv": "*", "@types/d3-ease": "*", "@types/d3-fetch": "*", "@types/d3-force": "*", "@types/d3-format": "*", "@types/d3-geo": "*", "@types/d3-hierarchy": "*", "@types/d3-interpolate": "*", "@types/d3-path": "*", "@types/d3-polygon": "*", "@types/d3-quadtree": "*", "@types/d3-random": "*", "@types/d3-scale": "*", "@types/d3-scale-chromatic": "*", "@types/d3-selection": "*", "@types/d3-shape": "*", "@types/d3-time": "*", "@types/d3-time-format": "*", "@types/d3-timer": "*", "@types/d3-transition": "*", "@types/d3-zoom": "*" } }, "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww=="],
"@types/d3-array": ["@types/[email protected]", "", {}, "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg=="],
@@ -2736,8 +2732,6 @@
"cross-spawn": ["[email protected]", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug=="],
- "crossfilter": ["[email protected]", "", {}, "sha1-FH1yNqmMRcafeL3DqZ1vsA9wkww="],
-
"crypt": ["[email protected]", "", {}, "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="],
"crypto-browserify": ["[email protected]", "", { "dependencies": { "browserify-cipher": "^1.0.1", "browserify-sign": "^4.2.3", "create-ecdh": "^4.0.4", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", "diffie-hellman": "^5.0.3", "hash-base": "~3.0.4", "inherits": "^2.0.4", "pbkdf2": "^3.1.2", "public-encrypt": "^4.0.3", "randombytes": "^2.1.0", "randomfill": "^1.0.4" } }, "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ=="],
diff --git a/e2e/test/scenarios/dashboard-filters/temporal-unit-parameters.cy.spec.js b/e2e/test/scenarios/dashboard-filters/temporal-unit-parameters.cy.spec.js
index 02a2229222f..8c8679dbe64 100644
--- a/e2e/test/scenarios/dashboard-filters/temporal-unit-parameters.cy.spec.js
+++ b/e2e/test/scenarios/dashboard-filters/temporal-unit-parameters.cy.spec.js
@@ -385,7 +385,13 @@ describe("scenarios > dashboard > temporal unit parameters", () => {
});
it("should connect multiple parameters to a card with multiple breakouts and drill thru", () => {
- H.createQuestion(multiBreakoutQuestionDetails);
+ H.createQuestion({
+ ...multiBreakoutQuestionDetails,
+ visualization_settings: {
+ "table.pivot": true,
+ "table.pivot_column": "CREATED_AT_2",
+ },
+ });
H.createDashboard(dashboardDetails).then(({ body: dashboard }) =>
H.visitDashboard(dashboard.id),
);
diff --git a/frontend/src/metabase/visualizations/lib/utils.ts b/frontend/src/metabase/visualizations/lib/utils.ts
index 810a617544c..2795222431f 100644
--- a/frontend/src/metabase/visualizations/lib/utils.ts
+++ b/frontend/src/metabase/visualizations/lib/utils.ts
@@ -1,9 +1,7 @@
-import crossfilter from "crossfilter";
import * as d3 from "d3";
import _ from "underscore";
import { isNotNull } from "metabase/utils/types";
-import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import {
isCoordinate,
isDate,
@@ -15,6 +13,7 @@ import type {
CardId,
DatasetColumn,
DatasetData,
+ JsonQuery,
RowValues,
Series,
SingleSeries,
@@ -179,29 +178,40 @@ export function isSameSeries(
}
// cache computed cardinalities since they are computationally expensive
-const cardinalityCache = new Map<string, number>();
+const cardinalityCache = new WeakMap<JsonQuery, Map<string, number>>();
+
+function computeColumnCardinality(rows: RowValues[], colIndex: number): number {
+ const uniqueValues = new Set();
+ for (const row of rows) {
+ uniqueValues.add(row[colIndex]);
+ }
+ return uniqueValues.size;
+}
export function getColumnCardinality(
- cols: DatasetColumn[],
rows: RowValues[],
- index: number,
+ colIndex: number,
+ colName: string,
+ jsonQuery?: JsonQuery,
): number {
- const col = cols[index];
- const key = getColumnKey(col);
-
- if (!cardinalityCache.has(key) && rows) {
- const dataset = crossfilter(rows);
- cardinalityCache.set(
- key,
- dataset
- .dimension((d) => d[index])
- .group()
- .size(),
- );
+ if (!jsonQuery) {
+ return computeColumnCardinality(rows, colIndex);
}
- // ok to cast since the code above will put the value in the map if it's not there
- return cardinalityCache.get(key) as number;
+ let cache = cardinalityCache.get(jsonQuery);
+ if (!cache) {
+ cache = new Map<string, number>();
+ cardinalityCache.set(jsonQuery, cache);
+ }
+
+ const cachedCardinality = cache.get(colName);
+ if (cachedCardinality !== undefined) {
+ return cachedCardinality;
+ }
+
+ const computedCardinality = computeColumnCardinality(rows, colIndex);
+ cache.set(colName, computedCardinality);
+ return computedCardinality;
}
const extentCache = new WeakMap<DatasetColumn, ReturnType<typeof d3.extent>>();
@@ -284,7 +294,7 @@ export function getSingleSeriesDimensionsAndMetrics(
metrics: string[] | [null];
bubble?: null;
} {
- const { data } = series;
+ const { data, json_query: jsonQuery } = series;
if (!data) {
return {
dimensions: [null],
@@ -316,8 +326,18 @@ export function getSingleSeriesDimensionsAndMetrics(
// if the series dimension is a date but the axis dimension is not then swap them
dimensions.reverse();
} else if (
- getColumnCardinality(cols, rows, cols.indexOf(dimensions[0])) <
- getColumnCardinality(cols, rows, cols.indexOf(dimensions[1]))
+ getColumnCardinality(
+ rows,
+ cols.indexOf(dimensions[0]),
+ dimensions[0].name,
+ jsonQuery,
+ ) <
+ getColumnCardinality(
+ rows,
+ cols.indexOf(dimensions[1]),
+ dimensions[1].name,
+ jsonQuery,
+ )
) {
// if the series dimension is higher cardinality than the axis dimension then swap them
dimensions.reverse();
@@ -326,7 +346,12 @@ export function getSingleSeriesDimensionsAndMetrics(
if (
dimensions.length > 1 &&
- getColumnCardinality(cols, rows, cols.indexOf(dimensions[1])) > MAX_SERIES
+ getColumnCardinality(
+ rows,
+ cols.indexOf(dimensions[1]),
+ dimensions[1].name,
+ jsonQuery,
+ ) > MAX_SERIES
) {
dimensions.pop();
}
@@ -418,17 +443,23 @@ export function getCardKey(cardId: CardId | undefined) {
const PIVOT_SENSIBLE_MAX_CARDINALITY = 16;
-export const getDefaultPivotColumn = (
- cols: DatasetColumn[],
- rows: RowValues[],
-) => {
+export const getDefaultPivotColumn = (series: SingleSeries) => {
+ const {
+ data: { cols, rows },
+ json_query: jsonQuery,
+ } = series;
const columnsWithCardinality = cols
.map((column, index) => {
if (!isDimension(column)) {
return null;
}
- const cardinality = getColumnCardinality(cols, rows, index);
+ const cardinality = getColumnCardinality(
+ rows,
+ index,
+ column.name,
+ jsonQuery,
+ );
if (cardinality > PIVOT_SENSIBLE_MAX_CARDINALITY) {
return null;
}
@@ -488,7 +519,10 @@ function findSankeyColumnPair(
};
}
-export function findSensibleSankeyColumns(data: DatasetData | null) {
+export function findSensibleSankeyColumns(
+ data: DatasetData | null,
+ jsonQuery?: JsonQuery,
+) {
if (!data?.cols || !data?.rows) {
return null;
}
@@ -522,7 +556,12 @@ export function findSensibleSankeyColumns(data: DatasetData | null) {
uniqueValues.size > 0 &&
uniqueValues.size <= MAX_REASONABLE_SANKEY_DIMENSION_CARDINALITY
) {
- const cardinality = getColumnCardinality(cols, rows, index);
+ const cardinality = getColumnCardinality(
+ rows,
+ index,
+ col.name,
+ jsonQuery,
+ );
if (
cardinality > 0 &&
cardinality <= MAX_REASONABLE_SANKEY_DIMENSION_CARDINALITY
diff --git a/frontend/src/metabase/visualizations/lib/utils.unit.spec.ts b/frontend/src/metabase/visualizations/lib/utils.unit.spec.ts
index 60bb39d497c..b546af65f96 100644
--- a/frontend/src/metabase/visualizations/lib/utils.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/utils.unit.spec.ts
@@ -16,6 +16,8 @@ import {
createMockCard,
createMockColumn,
createMockDatasetData,
+ createMockSingleSeries,
+ createMockStructuredDatasetQuery,
} from "metabase-types/api/mocks";
import type { Extent } from "../types";
@@ -179,16 +181,44 @@ describe("metabase/visualization/lib/utils", () => {
describe("getColumnCardinality", () => {
it("should get column cardinality", () => {
- const cols = [createMockColumn({})];
const rows = [[1], [2], [3], [3]];
- expect(getColumnCardinality(cols, rows, 0)).toEqual(3);
+ expect(getColumnCardinality(rows, 0, "n")).toEqual(3);
});
- it("should get column cardinality for frozen column", () => {
- const cols = [createMockColumn({})];
- const rows = [[1], [2], [3], [3]];
- Object.freeze(cols[0]);
- expect(getColumnCardinality(cols, rows, 0)).toEqual(3);
+ it("should not reuse cardinality across different query executions with the same column name", () => {
+ const jsonQueryA = createMockStructuredDatasetQuery();
+ const jsonQueryB = createMockStructuredDatasetQuery();
+
+ expect(
+ getColumnCardinality([["a"], ["b"]], 0, "category", jsonQueryA),
+ ).toEqual(2);
+ expect(
+ getColumnCardinality([["x"], ["y"], ["z"]], 0, "category", jsonQueryB),
+ ).toEqual(3);
+ });
+
+ it("should reuse cardinality for the same query execution when a remapped column is dropped", () => {
+ const jsonQuery = createMockStructuredDatasetQuery();
+ const preRemapRows = [
+ [1, "Alice", 10],
+ [1, "Alice", 10],
+ [2, "Bob", 10],
+ ];
+ const postRemapRows = [
+ [1, 10],
+ [1, 10],
+ [2, 11], // this is a purposely different value to ensure we're hitting the cache
+ ];
+
+ expect(getColumnCardinality(preRemapRows, 1, "name", jsonQuery)).toEqual(
+ 2,
+ );
+ expect(getColumnCardinality(preRemapRows, 2, "count", jsonQuery)).toEqual(
+ 1,
+ );
+ expect(
+ getColumnCardinality(postRemapRows, 1, "count", jsonQuery),
+ ).toEqual(1);
});
});
@@ -392,7 +422,11 @@ describe("metabase/visualization/lib/utils", () => {
n % highCardinality,
]);
- expect(getDefaultPivotColumn(cols, rows)).toBeNull();
+ expect(
+ getDefaultPivotColumn(
+ createMockSingleSeries({}, { data: { cols, rows } }),
+ ),
+ ).toBeNull();
});
it("returns lowest cardinality column from ones where it is <= 16", () => {
@@ -409,9 +443,11 @@ describe("metabase/visualization/lib/utils", () => {
n % lowestCardinality,
]);
- expect(getDefaultPivotColumn(cols, rows)).toEqual(
- lowestCardinalityColumn,
- );
+ expect(
+ getDefaultPivotColumn(
+ createMockSingleSeries({}, { data: { cols, rows } }),
+ ),
+ ).toEqual(lowestCardinalityColumn);
});
it("ignores low cardinality non-dimension columns", () => {
@@ -424,7 +460,11 @@ describe("metabase/visualization/lib/utils", () => {
];
const rows = _.range(lowCardinality).map((n) => [n, 1]);
- expect(getDefaultPivotColumn(cols, rows)).toEqual(lowCardinalityColumn);
+ expect(
+ getDefaultPivotColumn(
+ createMockSingleSeries({}, { data: { cols, rows } }),
+ ),
+ ).toEqual(lowCardinalityColumn);
});
});
diff --git a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts
index d23842f8ef2..13ff99b2bbe 100644
--- a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts
@@ -26,7 +26,6 @@ import {
import type {
Card,
DatasetColumn,
- DatasetData,
RawSeries,
SeriesOrderSetting,
VisualizationDisplay,
@@ -363,18 +362,22 @@ export const isXAxisScaleValid = (
export const getDefaultGoalLabel = () => t`Goal`;
-/**
- * Returns the default column names to be used for scatter plot viz settings.
- *
- * @param data - property on the series object from the `rawSeries` array
- * @returns object containing column names
- */
-export function getDefaultScatterColumns(data: DatasetData): {
+export function getDefaultScatterColumns(series: RawSeries): {
dimensions: string[] | [null];
metrics: string[] | [null];
bubble?: null;
} {
- const { cols, rows } = data;
+ if (!series[0]) {
+ return {
+ dimensions: [null],
+ metrics: [null],
+ bubble: null,
+ };
+ }
+ const {
+ data: { cols, rows },
+ json_query: jsonQuery,
+ } = series[0];
const dimensions = cols.filter(isDimension);
const metrics = cols.filter(isMetric);
@@ -382,14 +385,16 @@ export function getDefaultScatterColumns(data: DatasetData): {
let xAxisDimension; // only used when there's only one metric
if (dimensions.length === 2) {
const cardinality0 = getColumnCardinality(
- cols,
rows,
cols.indexOf(dimensions[0]),
+ dimensions[0].name,
+ jsonQuery,
);
const cardinality1 = getColumnCardinality(
- cols,
rows,
cols.indexOf(dimensions[1]),
+ dimensions[1].name,
+ jsonQuery,
);
if (cardinality0 <= cardinality1 && cardinality0 <= MAX_SERIES) {
colorDimension = dimensions[0].name;
@@ -438,7 +443,7 @@ export function getDefaultColumns(series: RawSeries): {
bubble?: null;
} {
if (series[0].card.display === "scatter") {
- return getDefaultScatterColumns(series[0].data);
+ return getDefaultScatterColumns(series);
} else {
return getDefaultLineAreaBarColumns(series);
}
@@ -516,15 +521,24 @@ export function getDefaultBoxplotDimensions(
if (dimensions.length <= 1) {
return dimensions;
}
- const { cols, rows } = series[0].data;
+ if (!series[0]) {
+ return [];
+ }
+ const {
+ data: { cols, rows },
+ json_query: jsonQuery,
+ } = series[0];
let lowestDimension: string | null = null;
let lowestCardinality = Infinity;
for (const dimension of dimensions) {
+ if (dimension == null) {
+ continue;
+ }
const index = cols.findIndex((col) => col.name === dimension);
if (index === -1) {
continue;
}
- const cardinality = getColumnCardinality(cols, rows, index);
+ const cardinality = getColumnCardinality(rows, index, dimension, jsonQuery);
if (cardinality < lowestCardinality) {
lowestDimension = dimension;
lowestCardinality = cardinality;
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts
index 2bb0a8dbf5b..9865740c7ad 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts
@@ -93,6 +93,7 @@ export const PIE_CHART_DEFINITION: VisualizationDefinition = {
},
showColumnSetting: true,
getDefault: (rawSeries) => getDefaultPieColumns(rawSeries).metric,
+ persistDefault: true,
}),
...columnSettings({ getHidden: () => true }),
...dimensionSetting("pie.dimension", {
@@ -102,6 +103,7 @@ export const PIE_CHART_DEFINITION: VisualizationDefinition = {
},
showColumnSetting: true,
getDefault: (rawSeries) => getDefaultPieColumns(rawSeries).dimension,
+ persistDefault: true,
}),
"pie.rows": {
getHidden: () => true,
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
index 443f58cc07d..16dcd4e42a2 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
@@ -34,7 +34,8 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
persistDefault: true,
dashboard: false,
autoOpenWhenUnset: false,
- getDefault: ([series]) => findSensibleSankeyColumns(series.data)?.source,
+ getDefault: ([series]) =>
+ findSensibleSankeyColumns(series.data, series.json_query)?.source,
}),
...dimensionSetting("sankey.target", {
getSection: () => t`Data`,
@@ -44,7 +45,8 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
persistDefault: true,
dashboard: false,
autoOpenWhenUnset: false,
- getDefault: ([series]) => findSensibleSankeyColumns(series.data)?.target,
+ getDefault: ([series]) =>
+ findSensibleSankeyColumns(series.data, series.json_query)?.target,
}),
...metricSetting("sankey.value", {
getSection: () => t`Data`,
@@ -54,7 +56,8 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
persistDefault: true,
dashboard: false,
autoOpenWhenUnset: false,
- getDefault: ([series]) => findSensibleSankeyColumns(series.data)?.metric,
+ getDefault: ([series]) =>
+ findSensibleSankeyColumns(series.data, series.json_query)?.metric,
}),
"sankey.node_align": {
getSection: () => t`Display`,
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
index d51ec52ae48..3c20b759869 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
@@ -13,6 +13,7 @@ import {
import { loadVisualizationComponents } from "metabase/visualizations";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
import Visualization from "metabase/visualizations/components/Visualization";
+import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
import { registerVisualizations } from "metabase/visualizations/register";
import { Table } from "metabase/visualizations/visualizations/Table/Table";
import Question from "metabase-lib/v1/Question";
@@ -24,7 +25,6 @@ import type {
VisualizationSettings,
} from "metabase-types/api";
import {
- createMockCard,
createMockCategoryColumn,
createMockColumn,
createMockDataset,
@@ -197,18 +197,21 @@ const setup = ({ display, visualization_settings = {} }: SetupOptions) => {
});
describe("table.pivot", () => {
- describe("getHidden", () => {
- const createMockSeriesWithCols = (cols: string[]): Series => [
- createMockSingleSeries(
- createMockCard(),
- createMockDataset({
- data: createMockDatasetData({
- cols: cols.map((name) => createMockColumn({ name })),
- }),
+ const createMockSeriesWithCols = (
+ cols: string[],
+ visualization_settings: VisualizationSettings = {},
+ ): Series => [
+ createMockSingleSeries(
+ { visualization_settings },
+ createMockDataset({
+ data: createMockDatasetData({
+ cols: cols.map((name) => createMockColumn({ name })),
}),
- ),
- ];
+ }),
+ ),
+ ];
+ describe("getHidden", () => {
const threeCols = createMockSeriesWithCols(["dim1", "dim2", "metric"]);
const fourCols = createMockSeriesWithCols([
"dim1",
@@ -251,6 +254,15 @@ describe("table.pivot", () => {
expect(isHidden).toBe(false);
});
});
+
+ it("should unpivot when table.pivot is stored true but there are not 3 columns", () => {
+ const series = createMockSeriesWithCols(
+ ["dim1", "dim2", "dim3", "metric"],
+ { "table.pivot": true },
+ );
+
+ expect(getComputedSettingsForSeries(series)["table.pivot"]).toBe(false);
+ });
});
describe("dashboard client-side sorting", () => {
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/definition.ts b/frontend/src/metabase/visualizations/visualizations/Table/definition.ts
index 1597bc093bd..6b92acf5ae6 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Table/definition.ts
@@ -155,7 +155,8 @@ export const TABLE_DEFINITION = {
[{ data }]: Series,
settings: ComputedVisualizationSettings,
) => data && data.cols.length !== 3 && !settings["table.pivot"],
- getDefault: ([{ card, data }]: Series) => {
+ getDefault: ([series]: Series) => {
+ const { card, data } = series;
let native: boolean;
try {
native = isNative(card);
@@ -173,8 +174,16 @@ export const TABLE_DEFINITION = {
return false;
}
- return getDefaultPivotColumn(data.cols, data.rows) != null;
+ return getDefaultPivotColumn(series) != null;
},
+ isValid: (
+ [{ data }]: Series,
+ settings: ComputedVisualizationSettings,
+ ) => {
+ const isInvalid = settings["table.pivot"] && data?.cols.length !== 3; // must have exactly 3 columns to pivot
+ return !isInvalid;
+ },
+ persistDefault: true,
},
"table.pivot_column": {
@@ -183,12 +192,8 @@ export const TABLE_DEFINITION = {
return t`Pivot column`;
},
widget: "field",
- getDefault: ([
- {
- data: { cols, rows },
- },
- ]: Series) => {
- return getDefaultPivotColumn(cols, rows)?.name;
+ getDefault: ([series]: Series) => {
+ return getDefaultPivotColumn(series)?.name;
},
getProps: ([
{
diff --git a/package.json b/package.json
index 5c471b9c96a..3892862d74a 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,6 @@
"crc-32": "^1.2.2",
"cron-expression-validator": "^1.0.20",
"cronstrue": "^2.11.0",
- "crossfilter": "^1.3.12",
"csv-parse": "^5.5.6",
"csv-stringify": "^6.5.0",
"cypress-each": "^1.14.1",
@@ -239,7 +238,6 @@
"@types/babel__core": "^7.20.4",
"@types/babel__preset-env": "^7.9.5",
"@types/color": "^3.0.2",
- "@types/crossfilter": "^0.0.34",
"@types/d3": "^7.4.3",
"@types/d3-array": "^3.2.1",
"@types/d3-scale": "^4.0.8",