Skip to content

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

Move funnel data types next to calculateFunnelSteps (#79122)

Fraser0f1d14da6933
diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/FunnelChart.tsx b/frontend/src/metabase/static-viz/components/FunnelChart/FunnelChart.tsx
index 1980498d990..9272c93d3e1 100644
--- a/frontend/src/metabase/static-viz/components/FunnelChart/FunnelChart.tsx
+++ b/frontend/src/metabase/static-viz/components/FunnelChart/FunnelChart.tsx
@@ -2,10 +2,7 @@ import { Group } from "@visx/group";
import { Line, Polygon } from "@visx/shape";
import { Fragment } from "react";
-import type {
- FunnelDatum,
- FunnelSettings,
-} from "metabase/static-viz/components/FunnelChart/types";
+import type { FunnelSettings } from "metabase/static-viz/components/FunnelChart/types";
import {
calculateFunnelPolygonPoints,
getFormattedStep,
@@ -14,6 +11,7 @@ import {
} from "metabase/static-viz/components/FunnelChart/utils/funnel";
import { Text } from "metabase/static-viz/components/Text";
import { measureTextHeight } from "metabase/static-viz/lib/text";
+import type { FunnelDatum } from "metabase/visualizations/lib/funnel/types";
import {
calculateFunnelSteps,
calculateStepOpacity,
diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/types.ts b/frontend/src/metabase/static-viz/components/FunnelChart/types.ts
index 3484ad28619..00e80eb8b71 100644
--- a/frontend/src/metabase/static-viz/components/FunnelChart/types.ts
+++ b/frontend/src/metabase/static-viz/components/FunnelChart/types.ts
@@ -1,11 +1,6 @@
import type { NumberFormatOptions } from "metabase/static-viz/lib/numbers";
import type { VisualizationSettings } from "metabase-types/api";
-export type Step = string | number;
-export type Measure = number;
-
-export type FunnelDatum = [Step, Measure];
-
export type FunnelSettings = {
step: {
name: string;
@@ -21,12 +16,3 @@ export type FunnelSettings = {
};
visualization_settings: VisualizationSettings;
};
-
-export type FunnelStep = {
- step: string | number;
- measure: number;
- percent: number;
- top: number;
- left: number;
- height: number;
-};
diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
index 046c1206553..b044cc76ef2 100644
--- a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
+++ b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
@@ -5,9 +5,14 @@ import { formatNumber, formatPercent } from "metabase/static-viz/lib/numbers";
import { measureTextWidth } from "metabase/static-viz/lib/text";
import type { TextWidthMeasurer } from "metabase/utils/measure-text";
import { isNotNull } from "metabase/utils/types";
+import type {
+ FunnelDatum,
+ FunnelStep,
+ Step,
+} from "metabase/visualizations/lib/funnel/types";
import { truncateText } from "metabase/visualizations/lib/text";
-import type { FunnelDatum, FunnelSettings, FunnelStep, Step } from "../types";
+import type { FunnelSettings } from "../types";
type StepDimensions = Pick<FunnelStep, "top" | "left" | "height">;
diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.unit.spec.ts b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.unit.spec.ts
index 6fa4b605fe7..4fc3dd2071a 100644
--- a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.unit.spec.ts
+++ b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.unit.spec.ts
@@ -1,8 +1,9 @@
import { merge } from "icepick";
+import type { FunnelDatum } from "metabase/visualizations/lib/funnel/types";
import { calculateFunnelSteps } from "metabase/visualizations/lib/funnel/utils";
-import type { FunnelDatum, FunnelSettings } from "../types";
+import type { FunnelSettings } from "../types";
import { calculateFunnelPolygonPoints, reorderData } from "./funnel";
diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/utils/margin.ts b/frontend/src/metabase/static-viz/components/FunnelChart/utils/margin.ts
index 9a2ceeb0be6..322ac8ad019 100644
--- a/frontend/src/metabase/static-viz/components/FunnelChart/utils/margin.ts
+++ b/frontend/src/metabase/static-viz/components/FunnelChart/utils/margin.ts
@@ -3,8 +3,9 @@ import {
measureTextHeight,
measureTextWidth,
} from "metabase/static-viz/lib/text";
+import type { FunnelDatum } from "metabase/visualizations/lib/funnel/types";
-import type { FunnelDatum, FunnelSettings } from "../types";
+import type { FunnelSettings } from "../types";
export const calculateMargin = (
firstStep: FunnelDatum,
diff --git a/frontend/src/metabase/visualizations/lib/funnel/types.ts b/frontend/src/metabase/visualizations/lib/funnel/types.ts
new file mode 100644
index 00000000000..a35ae1e536f
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/funnel/types.ts
@@ -0,0 +1,13 @@
+export type Step = string | number;
+export type Measure = number;
+
+export type FunnelDatum = [Step, Measure];
+
+export type FunnelStep = {
+ step: string | number;
+ measure: number;
+ percent: number;
+ top: number;
+ left: number;
+ height: number;
+};
diff --git a/frontend/src/metabase/visualizations/lib/funnel/utils.ts b/frontend/src/metabase/visualizations/lib/funnel/utils.ts
index 1bfa9a0ec14..a1daef976dc 100644
--- a/frontend/src/metabase/visualizations/lib/funnel/utils.ts
+++ b/frontend/src/metabase/visualizations/lib/funnel/utils.ts
@@ -1,7 +1,4 @@
-import type {
- FunnelDatum,
- FunnelStep,
-} from "metabase/static-viz/components/FunnelChart/types";
+import type { FunnelDatum, FunnelStep } from "./types";
export const calculateFunnelSteps = (
data: FunnelDatum[],