Skip to content

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

Move PieRow into metabase-types (#73714)

Fraserba2b6442e630
diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.ts
index 4c60f033da2..5e3d0efa5bc 100644
--- a/frontend/src/metabase-types/api/card.ts
+++ b/frontend/src/metabase-types/api/card.ts
@@ -4,7 +4,6 @@ import type {
} from "metabase/public/lib/types";
import type { IconName } from "metabase/ui";
import type { CurrencyStyle } from "metabase/utils/formatting";
-import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
import type { EntityToken, EntityUuid } from "metabase-types/api/entity";
import type { ClickBehavior } from "./click-behavior";
@@ -33,7 +32,7 @@ import type { CollectionEssentials } from "./search";
import type { Table, TableId } from "./table";
import type { UserInfo } from "./user";
import type { CardDisplayType, VisualizationDisplay } from "./visualization";
-import type { SmartScalarComparison } from "./visualization-settings";
+import type { PieRow, SmartScalarComparison } from "./visualization-settings";
export const CARD_TYPES = ["model", "question", "metric"] as const;
export type CardType = (typeof CARD_TYPES)[number];
diff --git a/frontend/src/metabase-types/api/mocks/card.ts b/frontend/src/metabase-types/api/mocks/card.ts
index 06f06193ba6..b0d140c7338 100644
--- a/frontend/src/metabase-types/api/mocks/card.ts
+++ b/frontend/src/metabase-types/api/mocks/card.ts
@@ -1,4 +1,3 @@
-import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
import type {
Card,
CardQueryMetadata,
@@ -6,6 +5,7 @@ import type {
ColumnSingleFormattingSetting,
ModerationReview,
NativeDatasetQuery,
+ PieRow,
PublicCard,
ScalarSegment,
SeriesOrderSetting,
diff --git a/frontend/src/metabase-types/api/visualization-settings.ts b/frontend/src/metabase-types/api/visualization-settings.ts
index 4221593cecd..63c9039050f 100644
--- a/frontend/src/metabase-types/api/visualization-settings.ts
+++ b/frontend/src/metabase-types/api/visualization-settings.ts
@@ -42,3 +42,14 @@ export type SmartScalarComparison =
| SmartScalarComparisonPreviousPeriod
| SmartScalarComparisonPeriodsAgo
| SmartScalarComparisonStaticNumber;
+
+export interface PieRow {
+ key: string;
+ name: string;
+ originalName: string;
+ color: string;
+ defaultColor: boolean;
+ enabled: boolean;
+ hidden: boolean;
+ isOther: boolean;
+}
diff --git a/frontend/src/metabase/visualizations/echarts/pie/model/types.ts b/frontend/src/metabase/visualizations/echarts/pie/model/types.ts
index 7e708edf9f1..37ad2f7817e 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/model/types.ts
+++ b/frontend/src/metabase/visualizations/echarts/pie/model/types.ts
@@ -1,17 +1,6 @@
import type { ColumnDescriptor } from "metabase/visualizations/lib/graph/columns";
import type { RemappingHydratedDatasetColumn } from "metabase/visualizations/types";
-export interface PieRow {
- key: string;
- name: string;
- originalName: string;
- color: string;
- defaultColor: boolean;
- enabled: boolean;
- hidden: boolean;
- isOther: boolean;
-}
-
export interface PieColumnDescriptors {
metricDesc: ColumnDescriptor;
dimensionDesc: ColumnDescriptor;
diff --git a/frontend/src/metabase/visualizations/shared/settings/pie.ts b/frontend/src/metabase/visualizations/shared/settings/pie.ts
index 861cdfe21d3..ec7ecb03c09 100644
--- a/frontend/src/metabase/visualizations/shared/settings/pie.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/pie.ts
@@ -5,7 +5,6 @@ import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import { checkNotNull, checkNumber, isNumber } from "metabase/utils/types";
import { SLICE_THRESHOLD } from "metabase/visualizations/echarts/pie/constants";
import { getPieColumns } from "metabase/visualizations/echarts/pie/model";
-import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
import type { ShowWarning } from "metabase/visualizations/echarts/types";
import { getHexColor } from "metabase/visualizations/lib/color";
import { getNumberOr } from "metabase/visualizations/lib/settings/row-values";
@@ -18,6 +17,7 @@ import type {
import {
type DatasetColumn,
type MaybeTranslatedSeries,
+ type PieRow,
type RawSeries,
type RowValue,
type RowValues,
diff --git a/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts b/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts
index 6d46769d535..5b09cbcb267 100644
--- a/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts
@@ -1,6 +1,5 @@
import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
-import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
-import type { RawSeries } from "metabase-types/api";
+import type { PieRow, RawSeries } from "metabase-types/api";
import {
createMockColumn,
createMockDatasetData,
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsx
index 8abaae6e9f3..15727aedb50 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsx
@@ -5,13 +5,12 @@ import {
ChartSettingSeriesOrder,
type SortableChartSettingOrderedItem,
} from "metabase/visualizations/components/settings/ChartSettingSeriesOrder";
-import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
import {
createHexToAccentNumberMap,
getPickerColorAlias,
} from "metabase/visualizations/echarts/pie/util/colors";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
-import type { RawSeries } from "metabase-types/api";
+import type { PieRow, RawSeries } from "metabase-types/api";
export function PieRowsPicker({
rawSeries,
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsx
index 50011004fe6..37c7aae3c82 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsx
@@ -1,5 +1,5 @@
import { Box } from "metabase/ui";
-import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
+import type { PieRow } from "metabase-types/api";
import { SliceNameInput } from "./SliceNameWidget.styled";