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
Fixes "In HTML, <button> cannot be a descendant of <button>." error and removes console warnings (#64904)
Sébastien750c6ebb2288
diff --git a/e2e/test/scenarios/dashboard-filters/dashboard-filter-defaults.cy.spec.ts b/e2e/test/scenarios/dashboard-filters/dashboard-filter-defaults.cy.spec.tsindex e807433601e..3a19d944c03 100644--- a/e2e/test/scenarios/dashboard-filters/dashboard-filter-defaults.cy.spec.ts+++ b/e2e/test/scenarios/dashboard-filters/dashboard-filter-defaults.cy.spec.ts@@ -92,10 +92,9 @@ describe("scenarios > dashboard > filters > reset", () => {H.sidebar().within(() => {cy.findByLabelText("Input box").click();clearDefaultFilterValue();- setDefaultFilterValue("Foo");});- H.popover().button("Add filter").click();+ setDefaultFilterValue("Foo");cy.location("search").should("eq", "?filter_one=&filter_two=Foo");@@ -153,10 +152,9 @@ describe("scenarios > dashboard > filters > reset", () => {H.sidebar().within(() => {cy.findByLabelText("Input box").click();- setDefaultFilterValue("Foo");});- H.popover().button("Add filter").click();+ setDefaultFilterValue("Foo");cy.location("search").should("eq", "?filter_one=Foo&filter_two=Bar");@@ -174,5 +172,11 @@ function clearDefaultFilterValue() {}function setDefaultFilterValue(value: string) {- cy.findByLabelText("No default").type(value);+ H.sidebar().within(() => {+ cy.findByLabelText("No default").click();+ });+ H.popover().within(() => {+ cy.findByPlaceholderText("Enter some text").type(value);+ cy.button("Add filter").click();+ });}diff --git a/e2e/test/scenarios/organization/timelines-question.cy.spec.js b/e2e/test/scenarios/organization/timelines-question.cy.spec.jsindex c55cdd8a5b5..59e0061bcf6 100644--- a/e2e/test/scenarios/organization/timelines-question.cy.spec.js+++ b/e2e/test/scenarios/organization/timelines-question.cy.spec.js@@ -414,6 +414,8 @@ describe("scenarios > organization > timelines > question", () => {cy.button("Create").click();});+ H.modal().should("not.exist"); // wait for modal to close+cy.log("remove all other events except the new one");toggleEventVisibility("RC1").should("not.be.checked");toggleEventVisibility("RC2").should("not.be.checked");diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex ff5f1654426..741d4b4f3b3 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -46,6 +46,7 @@ import {import ChartSkeleton from "metabase/visualizations/components/skeletons/ChartSkeleton";import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";+import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import {createDataSource,isVisualizerDashboardCard,@@ -160,6 +161,26 @@ const DashCardLoadingView = ({);};+/**+ * This populates the `data` field of each series with an empty+ * object if it doesn't already have one. This is useful to compute+ * the visualization settings correctly before data is loaded.+ *+ * @param series the series to sanitize+ */+function sanitizeSeriesData(series: RawSeries | { card: Card }[]) {+ return series.map((s) => {+ if ("data" in s) {+ // If the series already has data, we're good+ return s;+ }++ return {+ ...s,+ data: { cols: [], rows: [] },+ };+ });+}interface DashCardVisualizationProps {dashcard: DashboardCard;series: Series;@@ -467,7 +488,9 @@ export function DashCardVisualization({);const cardTitle = useMemo(() => {- const settings = getComputedSettingsForSeries(series);+ const settings = getComputedSettingsForSeries(+ sanitizeSeriesData(series),+ ) as ComputedVisualizationSettings;return settings["card.title"] ?? series?.[0].card.name ?? "";}, [series]);diff --git a/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsx b/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsxindex 9a66ac6fc72..cf9ccbdfe1d 100644--- a/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsx+++ b/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsx@@ -1,7 +1,7 @@import type { MouseEvent } from "react";import { t } from "ttag";-import { Button, Flex, Icon, Tooltip, rem } from "metabase/ui";+import { Box, Flex, Icon, Tooltip } from "metabase/ui";import type { Status } from "./types";@@ -12,14 +12,6 @@ type Props = {onClick?: () => void;};-const COMPACT_BUTTON_PADDING = 4;--/**- * Account for compact button's padding, so that the placement of this component's root element- * is the same regardless of whether the button is rendered or not.- */-const BUTTON_MARGIN = -COMPACT_BUTTON_PADDING;-export const WidgetStatus = ({className,highlighted,@@ -42,31 +34,39 @@ export const WidgetStatus = ({>{status === "clear" && (<Tooltip label={t`Clear`}>- <Button+ <Boxaria-label={t`Clear`}- color={highlighted ? undefined : "text-medium"}- size="compact-md"- leftSection={<Icon name="close" />}- m={rem(BUTTON_MARGIN)}- radius="md"- variant="subtle"+ h={24}+ pt={4}+ pb={4}onClick={handleClick}- />+ role="button"+ >+ <Icon+ name="close"+ color={highlighted ? undefined : "text-medium"}+ size={16}+ />+ </Box></Tooltip>)}{status === "reset" && (<Tooltip label={t`Reset filter to default state`}>- <Button+ <Boxaria-label={t`Reset filter to default state`}- color={highlighted ? undefined : "text-medium"}- size="compact-md"- leftSection={<Icon name="revert" />}- m={rem(BUTTON_MARGIN)}- radius="md"- variant="subtle"+ h={24}+ pt={4}+ pb={4}onClick={handleClick}- />+ role="button"+ >+ <Icon+ name="revert"+ color={highlighted ? undefined : "text-medium"}+ size={16}+ />+ </Box></Tooltip>)}diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.tsindex 799a331b498..00c36f8c8b9 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts@@ -162,53 +162,56 @@ export const getCardSeriesModels = (// Charts without breakout have one series per selected metric column.if (!hasBreakout) {- return columns.metrics.map((metric) => {- const vizSettingsKey = getSeriesVizSettingsKey(- metric.column,- hasMultipleCards,- isFirstCard,- columns.metrics.length,- null,- card.name,- );- const legacySeriesSettingsObjectKey =- createLegacySeriesObjectKey(vizSettingsKey);-- const customName = settings[SERIES_SETTING_KEY]?.[vizSettingsKey]?.title;- const tooltipName = customName ?? metric.column.display_name;- const name =- customName ??- getDefaultSeriesName(- metric.column.display_name,+ return columns.metrics+ .filter((m) => !!m.column)+ .map((metric) => {+ const vizSettingsKey = getSeriesVizSettingsKey(+ metric.column,hasMultipleCards,+ isFirstCard,columns.metrics.length,- false,+ null,card.name,);+ const legacySeriesSettingsObjectKey =+ createLegacySeriesObjectKey(vizSettingsKey);++ const customName =+ settings[SERIES_SETTING_KEY]?.[vizSettingsKey]?.title;+ const tooltipName = customName ?? metric.column.display_name;+ const name =+ customName ??+ getDefaultSeriesName(+ metric.column.display_name,+ hasMultipleCards,+ columns.metrics.length,+ false,+ card.name,+ );- const color = getHexColor(- settings?.[SERIES_COLORS_SETTING_KEY]?.[vizSettingsKey],- );+ const color = getHexColor(+ settings?.[SERIES_COLORS_SETTING_KEY]?.[vizSettingsKey],+ );- const dataKey = getDatasetKey(metric.column, cardId);-- return {- name,- tooltipName,- color,- visible: !hiddenSeries.includes(dataKey),- cardId,- column: metric.column,- columnIndex: metric.index,- dataKey,- vizSettingsKey,- legacySeriesSettingsObjectKey,- bubbleSizeDataKey:- hasBubbleSize && columns.bubbleSize != null- ? getDatasetKey(columns.bubbleSize.column, cardId)- : undefined,- };- });+ const dataKey = getDatasetKey(metric.column, cardId);++ return {+ name,+ tooltipName,+ color,+ visible: !hiddenSeries.includes(dataKey),+ cardId,+ column: metric.column,+ columnIndex: metric.index,+ dataKey,+ vizSettingsKey,+ legacySeriesSettingsObjectKey,+ bubbleSizeDataKey:+ hasBubbleSize && columns.bubbleSize != null+ ? getDatasetKey(columns.bubbleSize.column, cardId)+ : undefined,+ };+ });}// Charts with breakout have one series per a unique breakout value. They can have only one metric in such cases.diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.js b/frontend/src/metabase/visualizations/lib/settings/graph.jsindex e725a6c8bb3..974addd2191 100644--- a/frontend/src/metabase/visualizations/lib/settings/graph.js+++ b/frontend/src/metabase/visualizations/lib/settings/graph.js@@ -647,7 +647,7 @@ export const GRAPH_AXIS_SETTINGS = {},],vizSettings,- ) => getDefaultIsHistogram(cols[0]),+ ) => cols[0] && getDefaultIsHistogram(cols[0]),},"graph.x_axis.scale": {get section() {