The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Preserve dashboard table column settings for stale SQL question metadata (#76434)
Anderson14f19898886c
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.tsindex 9a5811dd668..7d9db62169a 100644--- a/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts+++ b/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts@@ -7,7 +7,11 @@ import {createMockSingleSeries,} from "metabase-types/api/mocks";-import { NUMBER_COLUMN_SETTINGS, columnSettings } from "./column";+import {+ NUMBER_COLUMN_SETTINGS,+ columnSettings,+ tableColumnSettings,+} from "./column";registerVisualizations();@@ -148,4 +152,35 @@ describe("column settings", () => {expect(onChangeSpy).toHaveBeenCalledWith(false);});});++ describe("table.columns", () => {+ it("should filter stale table column settings against current result columns (#76136)", () => {+ const series: Series = [+ createMockSingleSeries(+ {},+ {+ data: {+ cols: [+ createMockColumn({ name: "ID" }),+ createMockColumn({ name: "QUANTITY_RENAMED" }),+ ],+ },+ },+ ),+ ];++ const computed = getComputedSettings(tableColumnSettings(), series, {+ "table.columns": [+ { name: "ID", enabled: true },+ { name: "QUANTITY", enabled: false },+ { name: "QUANTITY_RENAMED", enabled: true },+ ],+ });++ expect(computed["table.columns"]).toEqual([+ { name: "ID", enabled: true },+ { name: "QUANTITY_RENAMED", enabled: true },+ ]);+ });+ });});diff --git a/frontend/src/metabase/visualizations/lib/settings/typed-utils.ts b/frontend/src/metabase/visualizations/lib/settings/typed-utils.tsindex 8b2ddd23caa..3ec1174c8e0 100644--- a/frontend/src/metabase/visualizations/lib/settings/typed-utils.ts+++ b/frontend/src/metabase/visualizations/lib/settings/typed-utils.ts@@ -54,17 +54,8 @@ const mergeTableColumns = (({ name }) =>secondTableColumns.findIndex((col) => col.name === name) === -1,);- const removedColumns = secondTableColumns- .filter(- ({ name }) =>- firstTableColumns.findIndex((col) => col.name === name) === -1,- )- .map(({ name }) => name);- return [- ...secondTableColumns.filter(({ name }) => !removedColumns.includes(name)),- ...addedColumns,- ];+ return [...secondTableColumns, ...addedColumns];};export const isSettingHiddenOnDashboards = (diff --git a/frontend/src/metabase/visualizations/lib/settings/typed-utils.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/typed-utils.unit.spec.tsindex 68ba7aa5e13..e8fde883f34 100644--- a/frontend/src/metabase/visualizations/lib/settings/typed-utils.unit.spec.ts+++ b/frontend/src/metabase/visualizations/lib/settings/typed-utils.unit.spec.ts@@ -74,7 +74,11 @@ describe("mergeSettings (metabase#14597)", () => {name: "DISCOUNT",});- it("should remove columns that don't appear in the first settings", () => {+ const RENAMED_QUANTITY_COLUMN = createMockTableColumnOrderSetting({+ name: "QUANTITY_RENAMED",+ });++ it("should keep added columns that only appear in the second settings (#76136)", () => {expect(mergeSettings({@@ -85,7 +89,26 @@ describe("mergeSettings (metabase#14597)", () => {},),).toEqual({- "table.columns": [ID_COLUMN, QUANTITY_COLUMN],+ "table.columns": [ID_COLUMN, QUANTITY_COLUMN, TAX_COLUMN],+ });+ });++ it("should keep replacement columns that only appear in the second settings (#76136)", () => {+ expect(+ mergeSettings(+ {+ "table.columns": [ID_COLUMN, QUANTITY_COLUMN],+ },+ {+ "table.columns": [ID_COLUMN, { ...TAX_COLUMN, enabled: false }],+ },+ ),+ ).toEqual({+ "table.columns": [+ ID_COLUMN,+ { ...TAX_COLUMN, enabled: false },+ QUANTITY_COLUMN,+ ],});});@@ -124,6 +147,29 @@ describe("mergeSettings (metabase#14597)", () => {DISCOUNT_COLUMN,{ ...ID_COLUMN, enabled: false },QUANTITY_COLUMN,+ TAX_COLUMN,+ ],+ });+ });++ it("should preserve second settings order when columns are replaced", () => {+ expect(+ mergeSettings(+ {+ "table.columns": [ID_COLUMN, RENAMED_QUANTITY_COLUMN],+ },+ {+ "table.columns": [+ QUANTITY_COLUMN,+ { ...ID_COLUMN, enabled: false },+ ],+ },+ ),+ ).toEqual({+ "table.columns": [+ QUANTITY_COLUMN,+ { ...ID_COLUMN, enabled: false },+ RENAMED_QUANTITY_COLUMN,],});});