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
UXW-2537 fix row/bar viz crash after native query column rename (#66786)
Denis Berezin044323c97c40
diff --git a/e2e/test/scenarios/native/native-reproductions.cy.spec.ts b/e2e/test/scenarios/native/native-reproductions.cy.spec.tsindex d89471e4647..dea8d41826c 100644--- a/e2e/test/scenarios/native/native-reproductions.cy.spec.ts+++ b/e2e/test/scenarios/native/native-reproductions.cy.spec.ts@@ -853,3 +853,83 @@ describe("issue 63711", () => {});});});++describe("issue 66745", () => {+ beforeEach(() => {+ H.restore();+ cy.signInAsNormalUser();++ cy.intercept("POST", "/api/dataset").as("dataset");+ cy.intercept("GET", "/api/card/*").as("getCard");+ cy.intercept("PUT", "/api/card/*").as("saveCard");+ });++ ["row", "bar"].forEach((vizType) => {+ it(`should not break visualization on native query column rename (metabase#63711) - ${vizType}`, () => {+ H.createNativeQuestion(+ {+ name: `66745 - ${vizType}`,+ native: {+ query:+ 'SELECT \'Category 1\' AS CATEGORY_NAME, \'Category 2\' AS CATEGORY_NAME2, 100 AS "Total", 60 AS "Hello", 40 AS "World"',+ },+ display: vizType,+ visualization_settings: {+ "graph.dimensions": ["CATEGORY_NAME"],+ "graph.metrics": ["Total", "World"],+ },+ },+ {+ wrapId: true,+ visitQuestion: true,+ },+ );++ cy.findByTestId("query-builder-main")+ .findByText("Open Editor")+ .should("be.visible")+ .click();++ H.NativeEditor.focus().type('{backspace}2"');++ getRunQueryButton().click();+ cy.wait("@dataset");++ cy.findByTestId("query-visualization-root").within(() => {+ cy.findByText("Total").should("be.visible");+ cy.findByText("World").should("not.exist");+ });++ cy.findByTestId("qb-header-action-panel").findByText("Save").click();++ H.modal().findByText("Save").click();++ cy.wait("@saveCard");++ cy.findByTestId("qb-header-action-panel")+ .findByText("Save")+ .should("not.exist");++ H.visitQuestion("@questionId");++ cy.wait("@getCard");+ cy.wait("@cardQuery");++ // eslint-disable-next-line no-unscoped-text-selectors+ cy.findByText("Something’s gone wrong").should("not.exist");++ cy.findByTestId("query-visualization-root").within(() => {+ cy.findByText("Total").should("be.visible");+ cy.findByText("World").should("not.exist");+ });++ H.openVizSettingsSidebar();+ H.leftSidebar().within(() => {+ cy.findAllByPlaceholderText("Select a field").should("have.length", 2);+ cy.findAllByPlaceholderText("Select a field")+ .eq(1)+ .should("have.value", "Total");+ });+ });+ });+});diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.tsindex 033716bb115..6b0d97b3665 100644--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.ts+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.ts@@ -33,7 +33,7 @@ export const getSankeyChartColumns = <TColumn extends DatasetColumn>(const target = getColumnDescriptors([settings["sankey.target"]], columns)[0];const value = getColumnDescriptors([settings["sankey.value"]], columns)[0];- if (!source.column || !target.column || !value.column) {+ if (!source?.column || !target?.column || !value?.column) {return null;}diff --git a/frontend/src/metabase/visualizations/lib/graph/columns.ts b/frontend/src/metabase/visualizations/lib/graph/columns.tsindex b74579d9a8d..8da9080ab83 100644--- a/frontend/src/metabase/visualizations/lib/graph/columns.ts+++ b/frontend/src/metabase/visualizations/lib/graph/columns.ts@@ -17,14 +17,20 @@ export const getColumnDescriptors = <TColumn extends DatasetColumn>(columnNames: string[],columns: TColumn[],): ColumnDescriptor[] => {- return columnNames.map((columnName) => {+ const result: ColumnDescriptor[] = [];++ columnNames.forEach((columnName) => {const index = columns.findIndex((column) => column.name === columnName);- return {- index,- column: columns[index],- };+ if (index > -1) {+ result.push({+ index,+ column: columns[index],+ });+ }});++ return result;};export const hasValidColumnsSelected = (