Skip to content

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

Prepare visualizations for the viz-core split (#80784)

Fraserb3f2191d7b39
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index 215819c5d30..18e12a5ba19 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -29,7 +29,7 @@ import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheP
import { Global, css, useTheme } from "@emotion/react";
import { loadVisualizationComponents } from "metabase/visualizations";
-import { saveDomImageStyles } from "metabase/visualizations/lib/image-exports";
+import { getSaveDomImageStyles } from "metabase/visualizations/lib/image-exports";
import { initialize, mswLoader } from "msw-storybook-addon";
@@ -116,7 +116,7 @@ const globalStyles = css`
${rootStyle}
}
- ${saveDomImageStyles}
+ ${getSaveDomImageStyles(false)}
${baseStyle}
`;
diff --git a/frontend/src/metabase/static-viz/components/StaticChoropleth/utils.ts b/frontend/src/metabase/static-viz/components/StaticChoropleth/utils.ts
index 55e409de4e2..d1bd7e9744b 100644
--- a/frontend/src/metabase/static-viz/components/StaticChoropleth/utils.ts
+++ b/frontend/src/metabase/static-viz/components/StaticChoropleth/utils.ts
@@ -8,9 +8,6 @@ import { getStoredSettingsForSeries } from "metabase/visualizations/lib/settings
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { GeoJSONData, RawSeries, RowValue } from "metabase-types/api";
-// Color constants and legend helpers are shared with the runtime ChoroplethMap via
-// metabase/visualizations/lib/choropleth (a Leaflet-free module the static-viz bundle can load).
-
// Internal projection resolution, not output size — the SVG is rasterized at a fixed width downstream.
export const MAP_WIDTH = 1000;
diff --git a/frontend/src/metabase/visualizations/analytics.ts b/frontend/src/metabase/visualizations/analytics.ts
index 1438258b27c..0a8622bc253 100644
--- a/frontend/src/metabase/visualizations/analytics.ts
+++ b/frontend/src/metabase/visualizations/analytics.ts
@@ -23,13 +23,6 @@ export const trackClickActionPerformed = (action: RegularClickAction) => {
}
};
-export const trackStackedSeriesEnabled = () => {
- trackSimpleEvent({
- event: "stack_series_enabled",
- triggered_from: "viz_settings",
- });
-};
-
export const trackTableFreezeColumnsEnabled = () => {
trackSimpleEvent({
event: "table_freeze_columns_enabled",
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx
index 38d6b1f3b3f..a08374b5d97 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx
@@ -1,11 +1,15 @@
+import type { ComponentProps } from "react";
+
import { SdkVisualizationWrapper } from "__support__/storybook";
-import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
-import { defineMetabaseTheme } from "metabase/embedding-sdk/theme";
import { Box, Flex } from "metabase/ui";
import { EChartsTooltip, type EChartsTooltipProps } from "./EChartsTooltip";
import S from "./EChartsTooltip.module.css";
+type Theme = NonNullable<
+ ComponentProps<typeof SdkVisualizationWrapper>["theme"]
+>;
+
const data: EChartsTooltipProps = {
header: "Header Text",
rows: [
@@ -76,13 +80,13 @@ export const LightTheme = {
parameters: {
loki: { skip: true },
},
- render: ({ theme }: { theme: MetabaseTheme }) => (
+ render: ({ theme }: { theme: Theme }) => (
<SdkVisualizationWrapper theme={theme}>
<DefaultTemplate />
</SdkVisualizationWrapper>
),
args: {
- theme: defineMetabaseTheme({
+ theme: {
components: {
tooltip: {
textColor: "#2f3542",
@@ -91,6 +95,6 @@ export const LightTheme = {
focusedBackgroundColor: "#f1f2f6",
},
},
- }),
+ },
},
};
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsx
index 473534c1c03..f7d048f1ffa 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsx
@@ -134,7 +134,7 @@ export const ChartSettingSelect = ({
data={data}
disabled={disabled}
value={selectedValue}
- //Mantine V7 select onChange has 2 arguments passed. This breaks the assumption in visualizations/lib/settings.js where the onChange function is defined
+ // Mantine's Select passes two arguments to onChange, but the onChange defined in the settings code takes one.
onChange={(v) => {
onChange(
// Unjustified type cast. FIXME
diff --git a/frontend/src/metabase/visualizations/echarts/graph/treemap/model/labels.ts b/frontend/src/metabase/visualizations/echarts/graph/treemap/model/labels.ts
index fe976931574..41f9297cbe9 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/treemap/model/labels.ts
+++ b/frontend/src/metabase/visualizations/echarts/graph/treemap/model/labels.ts
@@ -1,8 +1,8 @@
import { match } from "ts-pattern";
import type {
+ ComputedVisualizationSettings,
VisualizationGridSize,
- VisualizationProps,
} from "metabase/visualizations/types";
import { LABEL_PADDING, groupHeader } from "../style";
@@ -23,7 +23,7 @@ export interface TreemapLabelLayout {
export function shouldShowParentLabels(
gridSize: VisualizationGridSize | undefined,
- settings: VisualizationProps["settings"],
+ settings: ComputedVisualizationSettings,
) {
const fitsParentLabels =
gridSize === undefined ||
diff --git a/frontend/src/metabase/visualizations/lib/settings/analytics.ts b/frontend/src/metabase/visualizations/lib/settings/analytics.ts
index b2e0364962d..4f20facac78 100644
--- a/frontend/src/metabase/visualizations/lib/settings/analytics.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/analytics.ts
@@ -1,6 +1,13 @@
-import { trackSchemaEvent } from "metabase/analytics";
+import { trackSchemaEvent, trackSimpleEvent } from "metabase/analytics";
import type { DashboardId } from "metabase-types/api";
+export const trackStackedSeriesEnabled = () => {
+ trackSimpleEvent({
+ event: "stack_series_enabled",
+ triggered_from: "viz_settings",
+ });
+};
+
export const trackCardSetToHideWhenNoResults = (dashboardId: DashboardId) => {
trackSchemaEvent("dashboard", {
event: "card_set_to_hide_when_no_results",
diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.ts b/frontend/src/metabase/visualizations/lib/settings/graph.ts
index a834d5582f0..3ca5ba09ded 100644
--- a/frontend/src/metabase/visualizations/lib/settings/graph.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/graph.ts
@@ -51,7 +51,6 @@ import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import { isNumeric } from "metabase-lib/v1/types/utils/isa";
import type { Series, VisualizationDisplay } from "metabase-types/api";
-import { trackStackedSeriesEnabled } from "../../analytics";
import type {
ChartSettingEnumToggleProps,
ChartSettingSegmentedControlProps,
@@ -59,6 +58,8 @@ import type {
import { dimensionIsNumeric } from "../numeric";
import { getMaxDimensionsSupported, getMaxMetricsSupported } from "../registry";
+import { trackStackedSeriesEnabled } from "./analytics";
+
export const getSeriesDisplays = (
transformedSeries: Series,
settings: ComputedVisualizationSettings,
diff --git a/frontend/src/metabase/visualizations/lib/table.ts b/frontend/src/metabase/visualizations/lib/table.ts
index 6a8eed602c0..f149e8b1c5a 100644
--- a/frontend/src/metabase/visualizations/lib/table.ts
+++ b/frontend/src/metabase/visualizations/lib/table.ts
@@ -1,3 +1,4 @@
+import type { ClickObject } from "metabase-lib";
import { isCoordinate, isNumber } from "metabase-lib/v1/types/utils/isa";
import type {
DatasetColumn,
@@ -7,11 +8,7 @@ import type {
VisualizationSettings,
} from "metabase-types/api";
-import type {
- ClickObject,
- PivotedDatasetColumn,
- PivotedRowValues,
-} from "../types";
+import type { PivotedDatasetColumn, PivotedRowValues } from "../types";
type Dimension = {
col: DatasetColumn;
diff --git a/frontend/src/metabase/visualizations/lib/trend-helpers.ts b/frontend/src/metabase/visualizations/lib/trend-helpers.ts
index 4af7f01ac67..7f3266b413c 100644
--- a/frontend/src/metabase/visualizations/lib/trend-helpers.ts
+++ b/frontend/src/metabase/visualizations/lib/trend-helpers.ts
@@ -2,8 +2,7 @@ import { t } from "ttag";
import { isEmpty } from "metabase/utils/validate";
import { computeChange } from "metabase/visualizations/lib/numeric";
-import { formatPreviousPeriodOptionName } from "metabase/visualizations/visualizations/SmartScalar/utils";
-import type { RowValues } from "metabase-types/api";
+import type { DateTimeAbsoluteUnit, RowValues } from "metabase-types/api";
import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";
export function findPreviousNonEmptyRowIndex(
@@ -67,3 +66,23 @@ export function computePreviousPeriodChange(
return { percent, description };
}
+
+export function formatPreviousPeriodOptionName(dateUnit: DateTimeAbsoluteUnit) {
+ switch (dateUnit) {
+ case "minute":
+ return t`Previous minute`;
+ case "hour":
+ return t`Previous hour`;
+ case "day":
+ return t`Previous day`;
+ case "week":
+ return t`Previous week`;
+ case "month":
+ return t`Previous month`;
+ case "quarter":
+ return t`Previous quarter`;
+ case "year":
+ return t`Previous year`;
+ }
+ return "";
+}
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
index c5d6c7006f0..dd7376d42d0 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
@@ -9,12 +9,12 @@ import {
formatValue,
} from "metabase/value-formatting";
import { computeChange } from "metabase/visualizations/lib/numeric";
-import { findPreviousNonEmptyRowIndex } from "metabase/visualizations/lib/trend-helpers";
-import { COMPARISON_TYPES } from "metabase/visualizations/visualizations/SmartScalar/constants";
import {
- formatChange,
+ findPreviousNonEmptyRowIndex,
formatPreviousPeriodOptionName,
-} from "metabase/visualizations/visualizations/SmartScalar/utils";
+} from "metabase/visualizations/lib/trend-helpers";
+import { COMPARISON_TYPES } from "metabase/visualizations/visualizations/SmartScalar/constants";
+import { formatChange } from "metabase/visualizations/visualizations/SmartScalar/utils";
import type { ClickObject } from "metabase-lib";
import { isDate } from "metabase-lib/v1/types/utils/isa";
import type {
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts
index 778996a535c..5a9fd63f470 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts
@@ -6,6 +6,7 @@ import { formatNumber } from "metabase/utils/formatting";
import { measureText } from "metabase/utils/measure-text";
import { uuid } from "metabase/utils/uuid";
import { isEmpty } from "metabase/utils/validate";
+import { formatPreviousPeriodOptionName } from "metabase/visualizations/lib/trend-helpers";
import type { ComparisonMenuOption } from "metabase/visualizations/types";
import { isDate, isNumeric } from "metabase-lib/v1/types/utils/isa";
import type {
@@ -397,26 +398,6 @@ function createComparisonMenuOption(
return COMPARISON_SELECTOR_OPTIONS.PREVIOUS_VALUE;
}
-export function formatPreviousPeriodOptionName(dateUnit: DateTimeAbsoluteUnit) {
- switch (dateUnit) {
- case "minute":
- return t`Previous minute`;
- case "hour":
- return t`Previous hour`;
- case "day":
- return t`Previous day`;
- case "week":
- return t`Previous week`;
- case "month":
- return t`Previous month`;
- case "quarter":
- return t`Previous quarter`;
- case "year":
- return t`Previous year`;
- }
- return "";
-}
-
function formatPeriodsAgoOptionName(dateUnit: DateTimeAbsoluteUnit) {
switch (dateUnit) {
case "minute":