Skip to content

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

Static viz imports optimization (#77658)

Alexander Polyankine7211002cf3b
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx
index 0a26ea0912b..a8223467742 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/mcp-analytics/components/McpAnalyticsPage.unit.spec.tsx
@@ -10,7 +10,7 @@ import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Database, Dataset, Field } from "metabase-types/api";
import {
createMockColumn,
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts
index e3f3611047b..33e83087a90 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts
@@ -1,5 +1,5 @@
import type { ContentTranslationFunction } from "metabase/content-translation/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type {
Series,
SeriesSettings,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
index 09f11884b62..ed8bec09b93 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
@@ -1,4 +1,4 @@
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type {
AnalysisFindingError,
AnalysisFindingErrorType,
diff --git a/enterprise/frontend/src/metabase-enterprise/static-viz-overrides.ts b/enterprise/frontend/src/metabase-enterprise/static-viz-overrides.ts
index 6b376912b85..f04532c2ae7 100644
--- a/enterprise/frontend/src/metabase-enterprise/static-viz-overrides.ts
+++ b/enterprise/frontend/src/metabase-enterprise/static-viz-overrides.ts
@@ -1,8 +1,6 @@
-import { initializePlugin as initializeCustomVizPlugin } from "./custom_viz";
import { applyWhitelabelOverride } from "./whitelabel/static-viz-overrides";
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default function apply() {
applyWhitelabelOverride();
- initializeCustomVizPlugin();
}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdownInner.stories.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdownInner.stories.tsx
index 4477ff16ceb..ca037f699dd 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdownInner.stories.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdownInner.stories.tsx
@@ -1,5 +1,5 @@
import { Box } from "metabase/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { ChartTypeDropdownInner } from "./ChartTypeDropdown";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/QuestionSettings/QuestionSettings.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/QuestionSettings/QuestionSettings.tsx
index 7199b518f3f..13c5d7f1844 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/QuestionSettings/QuestionSettings.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/QuestionSettings/QuestionSettings.tsx
@@ -5,7 +5,7 @@ import {
BaseChartSettings,
useChartSettingsState,
} from "metabase/visualizations/components/ChartSettings";
-import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";
+import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/widgets";
import type Question from "metabase-lib/v1/Question";
import type { VisualizationSettings } from "metabase-types/api";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx
index 3046a449ba2..9fbcc7aaaba 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay-simple-embedding.unit.spec.tsx
@@ -22,7 +22,9 @@ import {
const TEST_USER = createMockUser();
-jest.mock("metabase/visualizations/register", () => jest.fn(() => {}));
+jest.mock("metabase/visualizations/register", () => ({
+ registerVisualizations: jest.fn(),
+}));
jest.mock("metabase/embedding-sdk/config", () => ({
...jest.requireActual("metabase/embedding-sdk/config"),
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx
index 8c390caa6f9..982c0a766b3 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemDisplay.unit.spec.tsx
@@ -26,7 +26,9 @@ import {
const TEST_USER = createMockUser();
-jest.mock("metabase/visualizations/register", () => jest.fn(() => {}));
+jest.mock("metabase/visualizations/register", () => ({
+ registerVisualizations: jest.fn(),
+}));
interface Options {
authConfig: MetabaseAuthConfig;
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
index 487187cc723..b90acf03d3c 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
@@ -31,7 +31,7 @@ import {
} from "metabase/embedding-sdk/config";
import { PLUGIN_API, PLUGIN_EMBEDDING_SDK } from "metabase/plugins";
import { setBasename } from "metabase/utils/basename";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
const reactSdkEmbedReferrerHandler: OnBeforeRequestHandler = async (
config,
diff --git a/frontend/src/metabase-lib/v1/queries/utils/pivot-options.ts b/frontend/src/metabase-lib/v1/queries/utils/pivot-options.ts
new file mode 100644
index 00000000000..3dbfe032d15
--- /dev/null
+++ b/frontend/src/metabase-lib/v1/queries/utils/pivot-options.ts
@@ -0,0 +1,89 @@
+import _ from "underscore";
+
+import { isNotNull } from "metabase/utils/types";
+import * as Lib from "metabase-lib";
+import type Question from "metabase-lib/v1/Question";
+import type {
+ ColumnNameColumnSplitSetting,
+ FieldRefColumnSplitSetting,
+ PivotTableColumnSplitSetting,
+} from "metabase-types/api";
+
+import { isColumnNameColumnSplitSetting } from "./pivot";
+
+type PivotOptions = {
+ pivot_rows: number[];
+ pivot_cols: number[];
+ show_row_totals?: boolean;
+ show_column_totals?: boolean;
+};
+
+function getColumnNamePivotOptions(
+ query: Lib.Query,
+ stageIndex: number,
+ setting: ColumnNameColumnSplitSetting,
+): PivotOptions {
+ const returnedColumns = Lib.returnedColumns(query, stageIndex);
+ const breakoutColumnNames = returnedColumns
+ .map((column) => Lib.displayInfo(query, stageIndex, column))
+ .filter((columnInfo) => columnInfo.isBreakout)
+ .map((columnInfo) => columnInfo.name);
+
+ const { rows, columns } = _.mapObject(setting, (columnNames) => {
+ return columnNames
+ .map((columnName) => breakoutColumnNames.indexOf(columnName))
+ .filter((columnIndex) => columnIndex >= 0);
+ });
+
+ return { pivot_rows: rows ?? [], pivot_cols: columns ?? [] };
+}
+
+function getFieldRefPivotOptions(
+ query: Lib.Query,
+ stageIndex: number,
+ setting: FieldRefColumnSplitSetting,
+): PivotOptions {
+ const returnedColumns = Lib.returnedColumns(query, stageIndex);
+ const breakoutColumns = returnedColumns.filter(
+ (column) => Lib.displayInfo(query, stageIndex, column).isBreakout,
+ );
+
+ const { rows, columns } = _.mapObject(setting, (fieldRefs) => {
+ if (breakoutColumns.length === 0) {
+ return [];
+ }
+
+ const nonEmptyFieldRefs = fieldRefs.filter(isNotNull);
+ const breakoutIndexes = Lib.findColumnIndexesFromLegacyRefs(
+ query,
+ stageIndex,
+ breakoutColumns,
+ nonEmptyFieldRefs,
+ );
+ return breakoutIndexes.filter((breakoutIndex) => breakoutIndex >= 0);
+ });
+
+ return { pivot_rows: rows ?? [], pivot_cols: columns ?? [] };
+}
+
+export function getPivotOptions(question: Question) {
+ const query = question.query();
+ const stageIndex = -1;
+ const setting: PivotTableColumnSplitSetting =
+ question.setting("pivot_table.column_split") ?? {};
+
+ // Extract totals settings
+ const showRowTotals = question.setting("pivot.show_row_totals") ?? true;
+ const showColumnTotals = question.setting("pivot.show_column_totals") ?? true;
+
+ const pivotSplitOptions = isColumnNameColumnSplitSetting(setting)
+ ? getColumnNamePivotOptions(query, stageIndex, setting)
+ : getFieldRefPivotOptions(query, stageIndex, setting);
+
+ // Add totals settings to the options
+ return {
+ ...pivotSplitOptions,
+ show_row_totals: showRowTotals,
+ show_column_totals: showColumnTotals,
+ };
+}
diff --git a/frontend/src/metabase-lib/v1/queries/utils/pivot.ts b/frontend/src/metabase-lib/v1/queries/utils/pivot.ts
index ccf208224f6..50e7a8f82b6 100644
--- a/frontend/src/metabase-lib/v1/queries/utils/pivot.ts
+++ b/frontend/src/metabase-lib/v1/queries/utils/pivot.ts
@@ -1,8 +1,4 @@
-import _ from "underscore";
-
import { isNotNull } from "metabase/utils/types";
-import * as Lib from "metabase-lib";
-import type Question from "metabase-lib/v1/Question";
import {
getDimensionReferenceWithoutBaseType,
isDimensionReferenceWithOptions,
@@ -12,19 +8,11 @@ import type {
ColumnNameColumnSplitSetting,
DatasetColumn,
DimensionReference,
- FieldRefColumnSplitSetting,
FieldReference,
PivotTableCollapsedRowsSetting,
PivotTableColumnSplitSetting,
} from "metabase-types/api";
-type PivotOptions = {
- pivot_rows: number[];
- pivot_cols: number[];
- show_row_totals?: boolean;
- show_column_totals?: boolean;
-};
-
export function isColumnNameColumnSplitSetting(
setting: PivotTableColumnSplitSetting,
): setting is ColumnNameColumnSplitSetting {
@@ -43,76 +31,6 @@ export function isColumnNameCollapsedRowsSetting(
return rows.every((value) => typeof value === "string");
}
-function getColumnNamePivotOptions(
- query: Lib.Query,
- stageIndex: number,
- setting: ColumnNameColumnSplitSetting,
-): PivotOptions {
- const returnedColumns = Lib.returnedColumns(query, stageIndex);
- const breakoutColumnNames = returnedColumns
- .map((column) => Lib.displayInfo(query, stageIndex, column))
- .filter((columnInfo) => columnInfo.isBreakout)
- .map((columnInfo) => columnInfo.name);
-
- const { rows, columns } = _.mapObject(setting, (columnNames) => {
- return columnNames
- .map((columnName) => breakoutColumnNames.indexOf(columnName))
- .filter((columnIndex) => columnIndex >= 0);
- });
-
- return { pivot_rows: rows ?? [], pivot_cols: columns ?? [] };
-}
-
-function getFieldRefPivotOptions(
- query: Lib.Query,
- stageIndex: number,
- setting: FieldRefColumnSplitSetting,
-): PivotOptions {
- const returnedColumns = Lib.returnedColumns(query, stageIndex);
- const breakoutColumns = returnedColumns.filter(
- (column) => Lib.displayInfo(query, stageIndex, column).isBreakout,
- );
-
- const { rows, columns } = _.mapObject(setting, (fieldRefs) => {
- if (breakoutColumns.length === 0) {
- return [];
- }
-
- const nonEmptyFieldRefs = fieldRefs.filter(isNotNull);
- const breakoutIndexes = Lib.findColumnIndexesFromLegacyRefs(
- query,
- stageIndex,
- breakoutColumns,
- nonEmptyFieldRefs,
- );
- return breakoutIndexes.filter((breakoutIndex) => breakoutIndex >= 0);
- });
-
- return { pivot_rows: rows ?? [], pivot_cols: columns ?? [] };
-}
-
-export function getPivotOptions(question: Question) {
- const query = question.query();
- const stageIndex = -1;
- const setting: PivotTableColumnSplitSetting =
- question.setting("pivot_table.column_split") ?? {};
-
- // Extract totals settings
- const showRowTotals = question.setting("pivot.show_row_totals") ?? true;
- const showColumnTotals = question.setting("pivot.show_column_totals") ?? true;
-
- const pivotSplitOptions = isColumnNameColumnSplitSetting(setting)
- ? getColumnNamePivotOptions(query, stageIndex, setting)
- : getFieldRefPivotOptions(query, stageIndex, setting);
-
- // Add totals settings to the options
- return {
- ...pivotSplitOptions,
- show_row_totals: showRowTotals,
- show_column_totals: showColumnTotals,
- };
-}
-
function migratePivotSetting(
columns: DatasetColumn[],
fieldRefs: (FieldReference | null)[] = [],
diff --git a/frontend/src/metabase-lib/v1/references.ts b/frontend/src/metabase-lib/v1/references.ts
index 632b3b4ae69..7604eb7a32f 100644
--- a/frontend/src/metabase-lib/v1/references.ts
+++ b/frontend/src/metabase-lib/v1/references.ts
@@ -1,6 +1,5 @@
import _ from "underscore";
-import { normalize } from "metabase-lib/v1/queries/utils/normalize";
import type {
AggregateFieldReference,
DimensionReference,
@@ -89,7 +88,14 @@ export const getNormalizedDimensionReference = (
const normalizedOptions = normalizeReferenceOptions(mbql[2]);
normalizedReference[2] = normalizedOptions;
- return normalize(normalizedReference);
+ // MBQL normalization drops empty options from expression and aggregation
+ // references, while field references keep the options position.
+ if (normalizedOptions == null && !isFieldReference(normalizedReference)) {
+ // slice does not narrow the tuple type
+ return normalizedReference.slice(0, 2) as DimensionReference;
+ }
+
+ return normalizedReference;
}
return mbql;
diff --git a/frontend/src/metabase/admin/settings/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/admin/settings/tests/enterprise.unit.spec.tsx
index 1e5a1d5c015..92145e0ce96 100644
--- a/frontend/src/metabase/admin/settings/tests/enterprise.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/tests/enterprise.unit.spec.tsx
@@ -65,11 +65,9 @@ describe("Admin Settings Routing - Enterprise without features", () => {
describe("does not render the premium routes", () => {
it.each(notFoundRoutes)(
"should not find the $name enterprise route",
- async ({ path }) => {
+ async ({ path, testPattern }) => {
await setup({ isAdmin: true, initialRoute: path });
- expect(
- await screen.findByText("We're a little lost..."),
- ).toBeInTheDocument();
+ expect(screen.queryByText(testPattern)).not.toBeInTheDocument();
},
);
});
diff --git a/frontend/src/metabase/admin/settings/tests/oss.unit.spec.tsx b/frontend/src/metabase/admin/settings/tests/oss.unit.spec.tsx
index 1ff87103e9f..d2fc6f0a875 100644
--- a/frontend/src/metabase/admin/settings/tests/oss.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/tests/oss.unit.spec.tsx
@@ -62,11 +62,9 @@ describe("Admin Settings Routing - OSS", () => {
it.each(notFoundRoutes)(
"should not find the $name enterprise route",
- async ({ path }) => {
+ async ({ path, testPattern }) => {
await setup({ isAdmin: true, initialRoute: path });
- expect(
- await screen.findByText("We're a little lost..."),
- ).toBeInTheDocument();
+ expect(screen.queryByText(testPattern)).not.toBeInTheDocument();
},
);
});
diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.js
index 075cdf53886..29793329f01 100644
--- a/frontend/src/metabase/app.js
+++ b/frontend/src/metabase/app.js
@@ -48,7 +48,7 @@ import { captureConsoleErrors } from "metabase/utils/errors";
import { initMetaplow } from "metabase/utils/metaplow";
import { initTracing, rotateTraceId } from "metabase/utils/otel";
import MetabaseSettings from "metabase/utils/settings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { HistoryProvider } from "./history";
import { RouterProvider } from "./router";
diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx
index 64c0618245c..0aaffacf6ac 100644
--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx
+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx
@@ -8,7 +8,7 @@ import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import { createMockState } from "metabase/redux/store/mocks";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { CollectionItem } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/actions/save.ts b/frontend/src/metabase/dashboard/actions/save.ts
index 2d0025209d9..97e71160347 100644
--- a/frontend/src/metabase/dashboard/actions/save.ts
+++ b/frontend/src/metabase/dashboard/actions/save.ts
@@ -3,10 +3,10 @@ import _ from "underscore";
import { cardApi, dashboardApi } from "metabase/api";
import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";
-import { clickBehaviorIsValid } from "metabase/parameters/utils/click-behavior";
import { createThunkAction } from "metabase/redux";
import { UPDATE_DASHBOARD_AND_CARDS } from "metabase/redux/dashboard";
import type { StoreDashboard, StoreDashcard } from "metabase/redux/store";
+import { clickBehaviorIsValid } from "metabase/visualizations/lib/formatting/click-data";
import type {
DashCardId,
ParameterId,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx
index 0e5a0d0c857..73b7668d82e 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx
@@ -9,10 +9,8 @@ import {
useDashboardContext,
} from "metabase/dashboard/context";
import { isTableDisplay } from "metabase/dashboard/utils";
-import {
- canSaveClickBehavior,
- clickBehaviorIsValid,
-} from "metabase/parameters/utils/click-behavior";
+import { canSaveClickBehavior } from "metabase/parameters/utils/click-behavior";
+import { clickBehaviorIsValid } from "metabase/visualizations/lib/formatting/click-data";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import type {
ClickBehavior,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
index 3b0a8e5842c..c0372118472 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
@@ -5,7 +5,6 @@ import { t } from "ttag";
import CS from "metabase/css/core/index.css";
import { isTableDisplay } from "metabase/dashboard/utils";
-import { clickBehaviorIsValid } from "metabase/parameters/utils/click-behavior";
import {
Button,
Flex,
@@ -14,6 +13,7 @@ import {
Text,
TextInputBlurChange,
} from "metabase/ui";
+import { clickBehaviorIsValid } from "metabase/visualizations/lib/formatting/click-data";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
ArbitraryCustomDestinationClickBehavior,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsx
index 8eb888caaf2..bc2b6c767b4 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton.unit.spec.tsx
@@ -4,7 +4,7 @@ import { setupDatabaseEndpoints } from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
import { ChartSettingsButton } from "metabase/dashboard/components/DashCard/DashCardActionsPanel/ChartSettingsButton/ChartSettingsButton";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import {
createMockColumn,
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
index 035d983ba15..71241812a97 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
@@ -24,7 +24,7 @@ import {
createMockState,
} from "metabase/redux/store/mocks";
import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { DashCardDataMap } from "metabase-types/api";
import {
createMockActionDashboardCard,
diff --git a/frontend/src/metabase/dashboard/components/DashboardChartSettings/ChartNestedSettingSeriesMultiple.unit.spec.js b/frontend/src/metabase/dashboard/components/DashboardChartSettings/ChartNestedSettingSeriesMultiple.unit.spec.js
index 29a65b70366..53200d0ecce 100644
--- a/frontend/src/metabase/dashboard/components/DashboardChartSettings/ChartNestedSettingSeriesMultiple.unit.spec.js
+++ b/frontend/src/metabase/dashboard/components/DashboardChartSettings/ChartNestedSettingSeriesMultiple.unit.spec.js
@@ -5,7 +5,7 @@ import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen, within } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { createMockCard } from "metabase-types/api/mocks";
import { DashboardChartSettings } from "./DashboardChartSettings";
diff --git a/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsx
index 0b8690f500f..da40435d373 100644
--- a/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardChartSettings/DashboardChartSettings.unit.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
import { MockDashboardContext } from "metabase/dashboard/context/mock-context";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import {
createMockCard,
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx
index b140ccd318b..fe28fb67888 100644
--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.unit.spec.tsx
@@ -5,7 +5,7 @@ import {
createMockDashboardState,
createMockSettingsState,
} from "metabase/redux/store/mocks";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Parameter } from "metabase-types/api";
import {
createMockDashboard,
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
index 33e882a90b9..608cae5bcb0 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
@@ -16,7 +16,7 @@ import {
} from "__support__/ui";
import { createMockDashboardState } from "metabase/redux/store/mocks";
import * as iframeUtils from "metabase/utils/iframe";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type {
LinkCardSettings,
Parameter,
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
index 4941c7c4f40..9f6aa6ba2b1 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
@@ -27,7 +27,7 @@ import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { IndexRedirect, Link, Redirect, Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { checkNotNull } from "metabase/utils/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type {
Database,
Field,
diff --git a/frontend/src/metabase/detail-view/components/Header/Header.unit.spec.tsx b/frontend/src/metabase/detail-view/components/Header/Header.unit.spec.tsx
index 0bbe1ec9de9..2b8988dacf8 100644
--- a/frontend/src/metabase/detail-view/components/Header/Header.unit.spec.tsx
+++ b/frontend/src/metabase/detail-view/components/Header/Header.unit.spec.tsx
@@ -1,7 +1,7 @@
import { screen } from "@testing-library/react";
import { getIcon, queryIcon, renderWithProviders } from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { DatasetColumn, IconName, RowValues } from "metabase-types/api";
import { createMockColumn } from "metabase-types/api/mocks/dataset";
diff --git a/frontend/src/metabase/documents/hooks/use-card-data.ts b/frontend/src/metabase/documents/hooks/use-card-data.ts
index 3740b24705e..884f59b5051 100644
--- a/frontend/src/metabase/documents/hooks/use-card-data.ts
+++ b/frontend/src/metabase/documents/hooks/use-card-data.ts
@@ -9,7 +9,7 @@ import { useSelector } from "metabase/redux";
import type { UseCardDataResult } from "metabase/rich_text_editing/tiptap/EditorHost";
import { getMetadata } from "metabase/selectors/metadata";
import Question from "metabase-lib/v1/Question";
-import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot";
+import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot-options";
import type { Card, Dataset, RawSeries } from "metabase-types/api";
import { isObject } from "metabase-types/guards";
diff --git a/frontend/src/metabase/hooks/use-icon.unit.spec.ts b/frontend/src/metabase/hooks/use-icon.unit.spec.ts
index 610e6c13629..db9cd8f6ab7 100644
--- a/frontend/src/metabase/hooks/use-icon.unit.spec.ts
+++ b/frontend/src/metabase/hooks/use-icon.unit.spec.ts
@@ -1,6 +1,6 @@
import { renderHook } from "@testing-library/react";
-import register from "metabase/visualizations/register";
+import { registerVisualizations as register } from "metabase/visualizations/register";
import { useGetIcon } from "./use-icon";
diff --git a/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.unit.spec.tsx b/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.unit.spec.tsx
index 070b841a20d..516e072162d 100644
--- a/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.unit.spec.tsx
+++ b/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.unit.spec.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
import { setupCardDataset } from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import {
createOrdersTable,
createOrdersTotalField,
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
index 8dfcc13b9f6..aa3893cded0 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
@@ -24,7 +24,7 @@ import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { IndexRedirect, Link, Route } from "metabase/router";
import * as Urls from "metabase/urls";
import { checkNotNull } from "metabase/utils/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type {
Database,
Field,
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx
index 2ab8814a7c7..dcdeacb739a 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
import { renderWithProviders, screen } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
import { Route } from "metabase/router";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Card, Dataset, Field } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/parameters/utils/click-behavior.ts b/frontend/src/metabase/parameters/utils/click-behavior.ts
index b82a4a20cf5..bc6c6531775 100644
--- a/frontend/src/metabase/parameters/utils/click-behavior.ts
+++ b/frontend/src/metabase/parameters/utils/click-behavior.ts
@@ -1,13 +1,11 @@
-import _ from "underscore";
-
import { parseTimestamp } from "metabase/utils/time-dayjs";
import { checkNotNull } from "metabase/utils/types";
+import { clickBehaviorIsValid } from "metabase/visualizations/lib/formatting/click-data";
import {
formatDateTimeForParameter,
formatDateToRangeForParameter,
} from "metabase/visualizations/lib/formatting/date";
import type { ValueAndColumnForColumnNameDate } from "metabase/visualizations/lib/formatting/link";
-import type { ClickObjectDimension as DimensionType } from "metabase-lib";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import {
@@ -17,8 +15,6 @@ import {
} from "metabase-lib/v1/parameters/utils/filters";
import { getParameterColumns } from "metabase-lib/v1/parameters/utils/targets";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
-import type { ClickObjectDataRow } from "metabase-lib/v1/queries/drills/types";
-import { getColumnSettings } from "metabase-lib/v1/queries/utils/column-key";
import { TYPE } from "metabase-lib/v1/types/constants";
import { isDate, isa } from "metabase-lib/v1/types/utils/isa";
import type {
@@ -26,18 +22,13 @@ import type {
ClickBehaviorDimensionTarget,
ClickBehaviorSource,
ClickBehaviorTarget,
- ColumnSettings,
Dashboard,
DashboardId,
DatasetColumn,
DatetimeUnit,
Parameter,
- ParameterValueOrArray,
QuestionDashboardCard,
- UserAttributeMap,
- VisualizationSettings,
} from "metabase-types/api";
-import { isImplicitActionClickBehavior } from "metabase-types/guards";
import { parseParameterValue } from "./parameter-parsing";
@@ -60,101 +51,6 @@ interface ExtraData {
dashboards?: Record<Dashboard["id"], Dashboard>;
}
-export function getDataFromClicked({
- extraData: { dashboard, parameterValuesBySlug = {}, userAttributes } = {},
- dimensions = [],
- data = [],
- settings,
-}: {
- extraData?: {
- dashboard?: Dashboard;
- parameterValuesBySlug?: Record<string, ParameterValueOrArray>;
- userAttributes?: UserAttributeMap | null;
- };
- dimensions?: DimensionType[];
- data?: (ClickObjectDataRow & {
- clickBehaviorValue?: ClickObjectDataRow["value"];
- })[];
- // Accept computed viz settings (with the per-column resolver) so
- // we can read user-configured formatting + type-derived defaults.
- settings?: VisualizationSettings & {
- column?: (col: DatasetColumn) => ColumnSettings;
- };
-}): ValueAndColumnForColumnNameDate {
- const column = [
- ...dimensions,
- ...data.map((d) => ({
- column: d.col,
- // When the data is changed to a display value for use in tooltips, we can set clickBehaviorValue to the raw value for filtering.
- value: d.clickBehaviorValue || d.value,
- })),
- ]
- .filter((d) => d.column != null)
- .reduce<ValueAndColumnForColumnNameDate["column"]>(
- (acc, { column, value }) => {
- if (!column) {
- return acc;
- }
-
- const name = column.name.toLowerCase();
-
- if (acc[name] === undefined) {
- // The raw DatasetColumn only carries metadata-level settings.
- // Pull the computed per-column viz settings (which include
- // user-saved formatting + type-derived defaults like
- // `number_style: "currency"` for currency columns) so
- // downstream formatters (e.g. renderLinkTextForClick) can
- // apply them. Fall back to the raw column_settings lookup if
- // the computed resolver isn't attached (e.g. some non-cell
- // click contexts).
- const vizColumnSettings =
- settings?.column?.(column) ?? getColumnSettings(settings, column);
- const columnWithSettings = vizColumnSettings
- ? {
- ...column,
- settings: { ...(column.settings ?? {}), ...vizColumnSettings },
- }
- : column;
- return { ...acc, [name]: { value, column: columnWithSettings } };
- }
-
- return acc;
- },
- {},
- );
-
- const dashboardParameters = (dashboard?.parameters || []).filter(
- ({ slug }) => parameterValuesBySlug[slug] != null,
- );
-
- const parameterByName = Object.fromEntries(
- dashboardParameters.map(({ name, slug }) => [
- name.toLowerCase(),
- { value: parameterValuesBySlug[slug] },
- ]),
- );
-
- const parameterBySlug = _.mapObject(parameterValuesBySlug, (value) => ({
- value,
- }));
-
- const parameter = Object.fromEntries(
- dashboardParameters.map(({ id, slug }) => [
- id,
- { value: parameterValuesBySlug[slug] },
- ]),
- );
-
- const userAttribute = Object.fromEntries(
- Object.entries(userAttributes || {}).map(([key, value]) => [
- key,
- { value },
- ]),
- );
-
- return { column, parameter, parameterByName, parameterBySlug, userAttribute };
-}
-
function notRelativeDateOrRange({ type }: Parameter) {
return type !== "date/range" && type !== "date/relative";
}
@@ -341,38 +237,6 @@ function baseTypeFilterForParameterType(parameterType: string) {
};
}
-export function clickBehaviorIsValid(
- clickBehavior: ClickBehavior | undefined | null,
-): boolean {
- // opens drill-through menu
- if (clickBehavior == null) {
- return true;
- }
-
- if (clickBehavior.type === "crossfilter") {
- return Object.keys(clickBehavior.parameterMapping || {}).length > 0;
- }
-
- if (clickBehavior.type === "action") {
- return isImplicitActionClickBehavior(clickBehavior);
- }
-
- if (clickBehavior.type === "link") {
- const { linkType } = clickBehavior;
-
- if (linkType === "url") {
- return (clickBehavior.linkTemplate || "").length > 0;
- }
-
- if (linkType === "dashboard" || linkType === "question") {
- return clickBehavior.targetId != null;
- }
- }
-
- // we've picked "link" without picking a link type
- return false;
-}
-
export function canSaveClickBehavior(
clickBehavior: ClickBehavior | undefined | null,
targetDashboard: Dashboard | undefined,
diff --git a/frontend/src/metabase/parameters/utils/click-behavior.unit.spec.ts b/frontend/src/metabase/parameters/utils/click-behavior.unit.spec.ts
index 39976946d71..e5e3c203c68 100644
--- a/frontend/src/metabase/parameters/utils/click-behavior.unit.spec.ts
+++ b/frontend/src/metabase/parameters/utils/click-behavior.unit.spec.ts
@@ -1,5 +1,6 @@
import { createMockMetadata } from "__support__/metadata";
import { checkNotNull } from "metabase/utils/types";
+import { getDataFromClicked } from "metabase/visualizations/lib/formatting/click-data";
import * as dateFormatUtils from "metabase/visualizations/lib/formatting/date";
import Question from "metabase-lib/v1/Question";
import type Field from "metabase-lib/v1/metadata/Field";
@@ -32,7 +33,6 @@ import {
import {
formatSourceForTarget,
- getDataFromClicked,
getTargetsForDashboard,
getTargetsForQuestion,
} from "./click-behavior";
diff --git a/frontend/src/metabase/plugins/components/PluginPlaceholder/PluginPlaceholder.tsx b/frontend/src/metabase/plugins/components/PluginPlaceholder/PluginPlaceholder.tsx
index 7abb0ce3c67..028747138bf 100644
--- a/frontend/src/metabase/plugins/components/PluginPlaceholder/PluginPlaceholder.tsx
+++ b/frontend/src/metabase/plugins/components/PluginPlaceholder/PluginPlaceholder.tsx
@@ -1,7 +1,3 @@
-import { t } from "ttag";
-
-import NoResults from "assets/img/no_results.svg";
-import { EmptyState } from "metabase/common/components/EmptyState";
interface Props {
[key: string]: any;
}
@@ -9,13 +5,3 @@ interface Props {
export function PluginPlaceholder<T = Props>(_props: T): JSX.Element | null {
return null;
}
-
-export function NotFoundPlaceholder<T = Props>(_props: T): JSX.Element | null {
- return (
- <EmptyState
- illustrationElement={<img src={NoResults} />}
- title={t`We're a little lost...`}
- message={t`The page you asked for couldn't be found.`}
- />
- );
-}
diff --git a/frontend/src/metabase/plugins/oss/auth.ts b/frontend/src/metabase/plugins/oss/auth.ts
index 84b7a66b287..d8ff8e28933 100644
--- a/frontend/src/metabase/plugins/oss/auth.ts
+++ b/frontend/src/metabase/plugins/oss/auth.ts
@@ -1,7 +1,4 @@
-import {
- NotFoundPlaceholder,
- PluginPlaceholder,
-} from "metabase/plugins/components/PluginPlaceholder";
+import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
import type { User } from "metabase-types/api";
import type { GetAuthProviders } from "../types";
@@ -18,10 +15,10 @@ export type AuthSettingsPageProps = {
const getDefaultPluginAuthProviders = () => ({
isEnabled: () => false,
AuthSettingsPage: PluginPlaceholder<AuthSettingsPageProps>,
- UserProvisioningSettings: NotFoundPlaceholder,
- SettingsSAMLForm: NotFoundPlaceholder,
- SettingsJWTForm: NotFoundPlaceholder,
- SettingsOIDCForm: NotFoundPlaceholder,
+ UserProvisioningSettings: PluginPlaceholder,
+ SettingsSAMLForm: PluginPlaceholder,
+ SettingsJWTForm: PluginPlaceholder,
+ SettingsOIDCForm: PluginPlaceholder,
// Unjustified type cast. FIXME
providers: [] as GetAuthProviders[],
});
diff --git a/frontend/src/metabase/plugins/oss/multi-factor-auth.ts b/frontend/src/metabase/plugins/oss/multi-factor-auth.ts
index 595c7d01106..4b0d3a105b4 100644
--- a/frontend/src/metabase/plugins/oss/multi-factor-auth.ts
+++ b/frontend/src/metabase/plugins/oss/multi-factor-auth.ts
@@ -1,7 +1,4 @@
-import {
- NotFoundPlaceholder,
- PluginPlaceholder,
-} from "metabase/plugins/components/PluginPlaceholder";
+import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
import type { MfaMethod } from "metabase-types/api";
export type AuthChallengeFormProps = {
@@ -13,7 +10,7 @@ export type AuthChallengeFormProps = {
const getDefaultPluginMultiFactorAuth = () => ({
AuthChallengeForm: PluginPlaceholder<AuthChallengeFormProps>,
- AccountSecurityPanel: NotFoundPlaceholder,
+ AccountSecurityPanel: PluginPlaceholder,
AdminAuthCard: PluginPlaceholder,
});
diff --git a/frontend/src/metabase/plugins/oss/remote-sync.ts b/frontend/src/metabase/plugins/oss/remote-sync.ts
index 3bd9ea662e7..591c01cd97a 100644
--- a/frontend/src/metabase/plugins/oss/remote-sync.ts
+++ b/frontend/src/metabase/plugins/oss/remote-sync.ts
@@ -13,10 +13,7 @@ import type {
GitSyncSetupMenuItemProps,
SyncedCollectionsSidebarSectionProps,
} from "metabase/plugins";
-import {
- NotFoundPlaceholder,
- PluginPlaceholder,
-} from "metabase/plugins/components/PluginPlaceholder";
+import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
import type { State } from "metabase/redux/store";
import type {
RemoteSyncChangesResponse,
@@ -62,7 +59,7 @@ export interface RemoteSyncDirtyState {
const getDefaultPluginRemoteSync = () => ({
isEnabled: false,
LibraryNav: PluginPlaceholder,
- RemoteSyncSettings: NotFoundPlaceholder,
+ RemoteSyncSettings: PluginPlaceholder,
SyncedCollectionsSidebarSection: PluginPlaceholder,
// Unjustified type cast. FIXME
GitSyncAppBarControls: PluginPlaceholder as ComponentType,
diff --git a/frontend/src/metabase/plugins/oss/support.ts b/frontend/src/metabase/plugins/oss/support.ts
index 02038a977c0..b41aad0022b 100644
--- a/frontend/src/metabase/plugins/oss/support.ts
+++ b/frontend/src/metabase/plugins/oss/support.ts
@@ -2,12 +2,12 @@ import type { ComponentType } from "react";
import type { ModalComponentProps } from "metabase/hoc/ModalRoute";
-import { NotFoundPlaceholder } from "../components/PluginPlaceholder";
+import { PluginPlaceholder } from "../components/PluginPlaceholder";
const getDefaultPluginSupport = () => ({
isEnabled: false,
- SupportSettings: NotFoundPlaceholder,
- GrantAccessModal: NotFoundPlaceholder,
+ SupportSettings: PluginPlaceholder,
+ GrantAccessModal: PluginPlaceholder,
});
export const PLUGIN_SUPPORT: {
diff --git a/frontend/src/metabase/plugins/oss/transforms.ts b/frontend/src/metabase/plugins/oss/transforms.ts
index 2bc4f01ffa4..c7dce8176e7 100644
--- a/frontend/src/metabase/plugins/oss/transforms.ts
+++ b/frontend/src/metabase/plugins/oss/transforms.ts
@@ -1,10 +1,7 @@
import type { ComponentType, ReactNode } from "react";
import type { OmniPickerItem } from "metabase/common/components/Pickers";
-import {
- NotFoundPlaceholder,
- PluginPlaceholder,
-} from "metabase/plugins/components/PluginPlaceholder";
+import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
import type { PythonTransformSourceDraft, Transform } from "metabase-types/api";
// Types
@@ -79,7 +76,7 @@ const getDefaultPluginTransformsPython = (): PythonTransformsPlugin => ({
getPythonSourceValidationResult: () => ({ isValid: true }),
TransformEditor: PluginPlaceholder,
SourceSection: PluginPlaceholder,
- PythonRunnerSettingsPage: NotFoundPlaceholder,
+ PythonRunnerSettingsPage: PluginPlaceholder,
getAdminRoutes: () => null,
getTransformsNavLinks: () => null,
sharedLibImportPath: "",
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
index e927b56d6d8..963575009d6 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
@@ -9,7 +9,7 @@ import {
} from "metabase/redux/store/mocks";
import { getMetadata } from "metabase/selectors/metadata";
import { checkNotNull } from "metabase/utils/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import Question from "metabase-lib/v1/Question";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type {
diff --git a/frontend/src/metabase/query_builder/actions/url.unit.spec.ts b/frontend/src/metabase/query_builder/actions/url.unit.spec.ts
index 609a7bbd565..5dc9734c79f 100644
--- a/frontend/src/metabase/query_builder/actions/url.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/url.unit.spec.ts
@@ -15,7 +15,7 @@ import {
import { getMetadata } from "metabase/selectors/metadata";
import * as Urls from "metabase/urls";
import { checkNotNull } from "metabase/utils/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx b/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx
index 2b7ddf92130..b7a341755e4 100644
--- a/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/ObjectDetailSidesheet.unit.spec.tsx
@@ -21,7 +21,7 @@ import {
createMockState,
} from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Field } from "metabase-types/api";
import { createMockCard, createMockDataset } from "metabase-types/api/mocks";
import {
diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
index e7312e5e5e0..359133c562f 100644
--- a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
@@ -11,7 +11,7 @@ import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownl
import { createMockState } from "metabase/redux/store/mocks";
import { getMetadata } from "metabase/selectors/metadata";
import { checkNotNull } from "metabase/utils/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Card, Dataset } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx
index 407bbff9cd3..f71f31a1c83 100644
--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx
@@ -2,7 +2,7 @@ import { renderWithProviders, screen, within } from "__support__/ui";
import { checkNotNull } from "metabase/utils/types";
import visualizations from "metabase/visualizations";
import { DEFAULT_VIZ_ORDER } from "metabase/visualizations/lib/viz-order";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { ChartTypeList, type ChartTypeListProps } from "./ChartTypeList";
diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.unit.spec.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.unit.spec.tsx
index b49971eb4e8..ba3945b0cd3 100644
--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.unit.spec.tsx
@@ -6,7 +6,7 @@ import {
renderWithProviders,
screen,
} from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { CardDisplayType, IconName } from "metabase-types/api";
import { ChartTypeOption, type ChartTypeOptionProps } from "./ChartTypeOption";
diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsx
index 49b17659b7a..d315cee4f1b 100644
--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { getIcon, render, screen } from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import {
ChartTypeSettings,
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx
index 53bce4f5201..aa4dfc0b1fc 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.unit.spec.tsx
@@ -6,7 +6,7 @@ import {
createMockState,
} from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { createMockColumn, createMockDataset } from "metabase-types/api/mocks";
import {
PRODUCTS_ID,
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.unit.spec.tsx
index cb71897ac58..4da0fbd4603 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.unit.spec.tsx
@@ -1,5 +1,5 @@
import { renderWithProviders, screen, within } from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Dataset } from "metabase-types/api";
import { createMockDataset } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
index 84c6fe36206..0f1e94e1225 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
@@ -5,7 +5,7 @@ import { setupLastDownloadFormatEndpoints } from "__support__/server-mocks";
import { screen, waitForLoaderToBeRemoved, within } from "__support__/ui";
import { mockGetBoundingClientRect } from "__support__/utils";
import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import {
TEST_MODEL_CARD,
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.timeline-events.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.timeline-events.unit.spec.tsx
index 00e007082e5..18140433d98 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.timeline-events.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.timeline-events.unit.spec.tsx
@@ -1,5 +1,5 @@
import { screen, waitFor } from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import {
createMockTimeline,
createMockTimelineEvent,
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.unit.spec.tsx
index 60b596fdb65..e31738b8a19 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.unit.spec.tsx
@@ -12,7 +12,7 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { createMockCard, createMockDataset } from "metabase-types/api/mocks";
import {
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
index 1c334c8a1ae..6b4fe39b5fa 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
@@ -13,7 +13,7 @@ import {
within,
} from "__support__/ui";
import { mockGetBoundingClientRect } from "__support__/utils";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { createMockCardQueryMetadata } from "metabase-types/api/mocks";
import {
diff --git a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsx b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsx
index f12e099fca7..c94c3df4514 100644
--- a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsx
+++ b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.tsx
@@ -15,7 +15,7 @@ import {
getVisualizationSvgDataUri,
} from "metabase/visualizations/lib/image-exports";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
-import { transformSeries as transformCartesianSeries } from "metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy";
+import { transformSeries as transformCartesianSeries } from "metabase/visualizations/visualizations/CartesianChart/definition-legacy";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type {
diff --git a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsx
index 7facf0273df..8ec02050b2e 100644
--- a/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/use-register-query-builder-metabot-context.unit.spec.tsx
@@ -3,7 +3,7 @@ import _ from "underscore";
import { setupUserMetabotPermissionsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderHookWithProviders } from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import Question from "metabase-lib/v1/Question";
import type {
diff --git a/frontend/src/metabase/query_builder/selectors.unit.spec.ts b/frontend/src/metabase/query_builder/selectors.unit.spec.ts
index 179c2808d4f..0986ec6ccd7 100644
--- a/frontend/src/metabase/query_builder/selectors.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/selectors.unit.spec.ts
@@ -20,7 +20,7 @@ import {
createMockQueryBuilderUIControlsState,
createMockState,
} from "metabase/redux/store/mocks";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type {
diff --git a/frontend/src/metabase/querying/run-query.ts b/frontend/src/metabase/querying/run-query.ts
index ef1a3d6bc89..321c84091bd 100644
--- a/frontend/src/metabase/querying/run-query.ts
+++ b/frontend/src/metabase/querying/run-query.ts
@@ -10,7 +10,7 @@ import type { Dispatch } from "metabase/redux/store";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import { normalizeParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
-import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot";
+import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot-options";
import type {
Card,
CardQueryRequest,
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
index 06abaaedfc5..9663fd89a5b 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
@@ -16,7 +16,7 @@ import { renderWithProviders, screen, within } from "__support__/ui";
import type { SettingsState } from "metabase/redux/store";
import { createMockState } from "metabase/redux/store/mocks";
import { Input } from "metabase/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { type RecentItem, isRecentTableItem } from "metabase-types/api";
import {
createMockDatabase,
diff --git a/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsx b/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsx
index ef53710e43e..801e7c96392 100644
--- a/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsx
+++ b/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsx
@@ -18,16 +18,19 @@ const COLS = [
name: "Date",
base_type: "type/DateTime",
effective_type: "type/DateTime",
+ source: "breakout",
}),
createMockColumn({
name: "Count",
base_type: "type/Integer",
effective_type: "type/Integer",
+ source: "aggregation",
}),
createMockColumn({
name: "Average",
base_type: "type/Integer",
effective_type: "type/Integer",
+ source: "aggregation",
}),
];
diff --git a/frontend/src/metabase/static-viz/index.tsx b/frontend/src/metabase/static-viz/index.tsx
index 3e5b1f62b60..1e020eaa5b4 100644
--- a/frontend/src/metabase/static-viz/index.tsx
+++ b/frontend/src/metabase/static-viz/index.tsx
@@ -19,13 +19,13 @@ import MetabaseSettings from "metabase/utils/settings";
import { extractRemappings, isCartesianChart } from "metabase/visualizations";
import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";
import { makeCellBackgroundGetter } from "metabase/visualizations/lib/table_format";
+import { createDataSource } from "metabase/visualizer/utils/data-source";
+import { getVisualizationColumns } from "metabase/visualizer/utils/get-visualization-columns";
+import { mergeVisualizerData } from "metabase/visualizer/utils/merge-data";
import {
- createDataSource,
- getVisualizationColumns,
- mergeVisualizerData,
shouldSplitVisualizerSeries,
splitVisualizerSeries,
-} from "metabase/visualizer/utils";
+} from "metabase/visualizer/utils/split-series";
import type {
Card,
DashCardVisualizationSettings,
diff --git a/frontend/src/metabase/static-viz/register.ts b/frontend/src/metabase/static-viz/register.ts
index 5949ad6effe..c09ce28b784 100644
--- a/frontend/src/metabase/static-viz/register.ts
+++ b/frontend/src/metabase/static-viz/register.ts
@@ -2,53 +2,45 @@ import {
registerVisualization,
setDefaultVisualization,
} from "metabase/visualizations";
-import { AreaChart } from "metabase/visualizations/visualizations/AreaChart";
-import { BarChart } from "metabase/visualizations/visualizations/BarChart";
-import { BoxPlot } from "metabase/visualizations/visualizations/BoxPlot";
-import { ComboChart } from "metabase/visualizations/visualizations/ComboChart";
-import { Funnel } from "metabase/visualizations/visualizations/Funnel";
-import { LineChart } from "metabase/visualizations/visualizations/LineChart";
-import { PieChart } from "metabase/visualizations/visualizations/PieChart";
-import { Progress } from "metabase/visualizations/visualizations/Progress";
-import { RowChart } from "metabase/visualizations/visualizations/RowChart";
-import { SankeyChart } from "metabase/visualizations/visualizations/SankeyChart";
-import { Scalar } from "metabase/visualizations/visualizations/Scalar";
-import { ScatterPlot } from "metabase/visualizations/visualizations/ScatterPlot";
-import { SmartScalar } from "metabase/visualizations/visualizations/SmartScalar";
-import { TreemapChart } from "metabase/visualizations/visualizations/TreemapChart";
-import { WaterfallChart } from "metabase/visualizations/visualizations/WaterfallChart";
+import { AREA_CHART_DEFINITION } from "metabase/visualizations/visualizations/AreaChart/definition";
+import { BAR_CHART_DEFINITION } from "metabase/visualizations/visualizations/BarChart/definition";
+import { BOXPLOT_CHART_DEFINITION } from "metabase/visualizations/visualizations/BoxPlot/definition";
+import { COMBO_CHART_DEFINITION } from "metabase/visualizations/visualizations/ComboChart/definition";
+import { FUNNEL_CHART_DEFINITION } from "metabase/visualizations/visualizations/Funnel/definition";
+import { LINE_CHART_DEFINITION } from "metabase/visualizations/visualizations/LineChart/definition";
+import { PIE_CHART_DEFINITION } from "metabase/visualizations/visualizations/PieChart/definition";
+import { PROGRESS_CHART_DEFINITION } from "metabase/visualizations/visualizations/Progress/definition";
+import { ROW_CHART_DEFINITION } from "metabase/visualizations/visualizations/RowChart/definition";
+import { SANKEY_CHART_DEFINITION } from "metabase/visualizations/visualizations/SankeyChart/definition";
+import { SCALAR_CHART_DEFINITION } from "metabase/visualizations/visualizations/Scalar/definition";
+import { SCATTER_PLOT_DEFINITION } from "metabase/visualizations/visualizations/ScatterPlot/definition";
+import { SMART_SCALAR_CHART_DEFINITION } from "metabase/visualizations/visualizations/SmartScalar/definition";
+import { TREEMAP_CHART_DEFINITION } from "metabase/visualizations/visualizations/TreemapChart/definition";
+import { WATERFALL_CHART_DEFINITION } from "metabase/visualizations/visualizations/WaterfallChart/definition";
+
+const STATIC_CHART_DEFINITIONS = [
+ SCALAR_CHART_DEFINITION,
+ SMART_SCALAR_CHART_DEFINITION,
+ LINE_CHART_DEFINITION,
+ AREA_CHART_DEFINITION,
+ FUNNEL_CHART_DEFINITION,
+ BAR_CHART_DEFINITION,
+ WATERFALL_CHART_DEFINITION,
+ COMBO_CHART_DEFINITION,
+ SCATTER_PLOT_DEFINITION,
+ BOXPLOT_CHART_DEFINITION,
+ PIE_CHART_DEFINITION,
+ SANKEY_CHART_DEFINITION,
+ ROW_CHART_DEFINITION,
+ PROGRESS_CHART_DEFINITION,
+ TREEMAP_CHART_DEFINITION,
+];
export const registerStaticVisualizations = () => {
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(Scalar);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(SmartScalar);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(LineChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(AreaChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(Funnel);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(BarChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(WaterfallChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(ComboChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(ScatterPlot);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(BoxPlot);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(PieChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(SankeyChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(RowChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(Progress);
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(TreemapChart);
- // @ts-expect-error: incompatible prop types with registerVisualization
- setDefaultVisualization(Scalar);
+ STATIC_CHART_DEFINITIONS.forEach((definition) => {
+ // @ts-expect-error: chart definitions are not full Visualization components
+ registerVisualization(definition);
+ });
+ // @ts-expect-error: chart definitions are not full Visualization components
+ setDefaultVisualization(SCALAR_CHART_DEFINITION);
};
diff --git a/frontend/src/metabase/static-viz/watermark.svg b/frontend/src/metabase/static-viz/watermark.svg
index f35a2c7a7bc..e7b5a4de01e 100644
--- a/frontend/src/metabase/static-viz/watermark.svg
+++ b/frontend/src/metabase/static-viz/watermark.svg
@@ -1 +1 @@
-<svg viewBox="0 0 819 819" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M401.85 812.36c2.04.02 4.07.5 6.09 1.43 2.02.94 3.94 2.32 5.77 4.14a20.33 20.33 0 0 1 4.16 5.8 14.96 14.96 0 0 1 1.45 6.1c.05 2.04-.36 4.04-1.22 6.02a17.76 17.76 0 0 1-3.85 5.52 18.12 18.12 0 0 1-5.57 3.9 14.46 14.46 0 0 1-6.04 1.24 15.58 15.58 0 0 1-6.1-1.45 20.31 20.31 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.14-5.77 15.26 15.26 0 0 1-1.43-6.09c-.01-2.04.41-4.04 1.27-6.02a18.12 18.12 0 0 1 3.9-5.56c1.71-1.72 3.55-3 5.52-3.85a14.34 14.34 0 0 1 6-1.25Zm-1 7.06c-2.23-.39-4.3.38-6.24 2.31-1.96 1.96-2.75 4.08-2.38 6.36.38 2.25 1.81 4.62 4.3 7.1 2.5 2.5 4.86 3.93 7.1 4.3 2.26.35 4.36-.46 6.32-2.42 1.93-1.93 2.71-4 2.33-6.22-.36-2.23-1.8-4.6-4.3-7.1s-4.88-3.95-7.13-4.33ZM-7.56 811.66c2.03.01 4.06.49 6.08 1.42 2.02.94 3.95 2.32 5.77 4.14a20.3 20.3 0 0 1 4.17 5.8 14.96 14.96 0 0 1 1.44 6.1c.05 2.04-.36 4.05-1.22 6.02a17.77 17.77 0 0 1-3.84 5.52 18.12 18.12 0 0 1-5.57 3.9c-1.98.86-3.99 1.27-6.04 1.24a15.58 15.58 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.13-5.77 15.24 15.24 0 0 1-1.43-6.09c-.01-2.03.4-4.04 1.27-6.01a18.13 18.13 0 0 1 3.89-5.57c1.72-1.72 3.56-3 5.52-3.85a14.34 14.34 0 0 1 6-1.24Zm-1 7.06c-2.23-.4-4.31.37-6.24 2.3-1.97 1.97-2.76 4.09-2.38 6.36.38 2.25 1.81 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.93 2.7-4 2.33-6.23-.36-2.23-1.8-4.6-4.3-7.1s-4.88-3.95-7.13-4.32ZM811.27 811.66c2.03.01 4.06.49 6.08 1.42 2.02.94 3.95 2.32 5.77 4.14a20.3 20.3 0 0 1 4.17 5.8 14.96 14.96 0 0 1 1.45 6.1c.04 2.04-.37 4.05-1.23 6.02a17.76 17.76 0 0 1-3.84 5.52 18.12 18.12 0 0 1-5.57 3.9 14.46 14.46 0 0 1-6.04 1.24 15.58 15.58 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.23 20.23 0 0 1-4.13-5.77 15.26 15.26 0 0 1-1.43-6.09c-.02-2.03.4-4.04 1.27-6.02a18.12 18.12 0 0 1 3.89-5.56c1.72-1.72 3.56-3 5.52-3.85a14.35 14.35 0 0 1 6-1.24Zm-1 7.06c-2.23-.4-4.31.37-6.25 2.3-1.96 1.97-2.75 4.08-2.37 6.36.38 2.25 1.81 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.94 2.7-4.01 2.33-6.23-.36-2.23-1.8-4.6-4.3-7.1s-4.88-3.95-7.13-4.32ZM423.47 785.77c1.58-.53 3.26-.67 5.02-.41 1.77.23 3.6.88 5.48 1.95a25.78 25.78 0 0 1 5.68 4.4 22.47 22.47 0 0 1 4.12 5.53 16.5 16.5 0 0 1 1.83 5.86c.23 1.95.03 3.85-.59 5.7a12.97 12.97 0 0 1-3.21 5.03c-1.3 1.3-2.6 2.2-3.92 2.73-1.32.52-2.7.78-4.14.8l9.5 9.5-5.58 5.59-30.8-30.8 3.42-3.41c.72-.73 1.54-.87 2.44-.41l2.6 1.7c-.12-2.03.1-3.97.64-5.84a12.29 12.29 0 0 1 3.26-5.25 10.68 10.68 0 0 1 4.25-2.67Zm3.4 7.24c-1-.18-1.93-.12-2.79.2-.84.3-1.63.82-2.37 1.56a7.89 7.89 0 0 0-2.22 3.71c-.33 1.3-.42 2.76-.25 4.37l10.4 10.4c1.41.14 2.64 0 3.7-.42a8.84 8.84 0 0 0 2.92-1.97 7.57 7.57 0 0 0 1.8-2.76c.37-1 .46-2.05.28-3.17a9.97 9.97 0 0 0-1.34-3.55 20.08 20.08 0 0 0-3.12-3.9 21.01 21.01 0 0 0-3.78-3.1 9.23 9.23 0 0 0-3.24-1.37ZM14.06 785.06c1.58-.53 3.25-.66 5.02-.4a15 15 0 0 1 5.47 1.94 25.78 25.78 0 0 1 5.68 4.41 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.84 5.86c.22 1.95.03 3.85-.6 5.7a12.97 12.97 0 0 1-3.2 5.03c-1.3 1.3-2.6 2.2-3.92 2.74-1.33.5-2.7.77-4.14.79l9.5 9.5-5.59 5.6-30.8-30.8 3.42-3.42c.73-.73 1.54-.86 2.45-.41l2.6 1.7c-.12-2.02.1-3.97.63-5.84a12.29 12.29 0 0 1 3.26-5.25 10.67 10.67 0 0 1 4.26-2.67Zm3.39 7.24c-1-.18-1.92-.11-2.78.2-.85.3-1.64.83-2.38 1.57a7.89 7.89 0 0 0-2.22 3.7c-.33 1.3-.41 2.76-.25 4.37l10.41 10.41c1.4.14 2.64 0 3.7-.43a8.84 8.84 0 0 0 2.91-1.97 7.56 7.56 0 0 0 1.81-2.76c.36-1 .45-2.05.27-3.16a9.95 9.95 0 0 0-1.33-3.56 20.02 20.02 0 0 0-3.13-3.89 21.01 21.01 0 0 0-3.77-3.1 9.23 9.23 0 0 0-3.24-1.38ZM832.88 785.06c1.59-.53 3.26-.66 5.03-.4a15 15 0 0 1 5.48 1.94 25.8 25.8 0 0 1 5.67 4.41 22.48 22.48 0 0 1 4.12 5.52 16.48 16.48 0 0 1 1.84 5.86c.22 1.95.02 3.85-.6 5.7a12.97 12.97 0 0 1-3.2 5.03c-1.3 1.3-2.6 2.2-3.92 2.74-1.33.5-2.7.77-4.14.79l9.5 9.5-5.59 5.59-30.8-30.8 3.42-3.41c.73-.73 1.54-.86 2.45-.41l2.6 1.7c-.12-2.03.1-3.97.63-5.84a12.29 12.29 0 0 1 3.26-5.25 10.67 10.67 0 0 1 4.25-2.67Zm3.4 7.24c-1-.18-1.92-.11-2.78.2-.85.3-1.64.83-2.38 1.57a7.89 7.89 0 0 0-2.22 3.7c-.33 1.3-.41 2.76-.25 4.37l10.41 10.41c1.4.14 2.64 0 3.7-.43a8.82 8.82 0 0 0 2.91-1.97 7.57 7.57 0 0 0 1.81-2.76c.36-1 .45-2.05.27-3.16a9.96 9.96 0 0 0-1.33-3.56 20.08 20.08 0 0 0-3.13-3.89 21.02 21.02 0 0 0-3.77-3.1 9.23 9.23 0 0 0-3.24-1.38Z"/><path d="M461.27 747.7c1.4-.61 2.8-.88 4.24-.8 1.43.07 2.86.48 4.3 1.22 1.44.73 2.87 1.79 4.27 3.2l14.78 14.77-5.6 5.59-14.77-14.78c-1.48-1.48-2.9-2.26-4.3-2.35-1.4-.1-2.73.47-3.98 1.72a5.49 5.49 0 0 0-1.74 4.05c0 .72.17 1.47.52 2.24.35.77.88 1.51 1.6 2.24l14.78 14.77-5.61 5.61-14.78-14.77c-1.55-1.55-3-2.37-4.34-2.44-1.33-.1-2.6.46-3.8 1.67a6.38 6.38 0 0 0-1.68 2.9c-.3 1.08-.4 2.28-.31 3.57l16.99 17-5.59 5.58-23.21-23.21 3.41-3.42c.73-.72 1.54-.86 2.45-.4l2.08 1.35c-.05-.86-.04-1.7.02-2.51a10.77 10.77 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.17 3.5.17 5.27 1.01a10.31 10.31 0 0 1-.18-6.47c.3-1 .73-1.93 1.29-2.82a14.32 14.32 0 0 1 5.97-5.3ZM51.86 746.98c1.39-.6 2.8-.86 4.23-.79 1.43.08 2.87.48 4.3 1.22 1.45.73 2.87 1.8 4.28 3.2l14.77 14.77-5.59 5.59-14.77-14.78c-1.48-1.48-2.91-2.26-4.3-2.35-1.4-.1-2.73.47-3.98 1.72a5.47 5.47 0 0 0-1.74 4.05c0 .72.17 1.47.51 2.24.35.77.89 1.52 1.61 2.24l14.78 14.78-5.62 5.6-14.77-14.77c-1.55-1.55-3-2.37-4.35-2.44-1.32-.1-2.59.47-3.8 1.67a6.38 6.38 0 0 0-1.67 2.9c-.3 1.08-.4 2.28-.32 3.57l17 17-5.6 5.59-23.2-23.22 3.4-3.42c.73-.72 1.55-.86 2.45-.4l2.08 1.35c-.04-.86-.03-1.7.03-2.5a10.78 10.78 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.18 3.49.16 5.27 1a10.3 10.3 0 0 1-.18-6.47c.3-.99.73-1.93 1.29-2.82.57-.9 1.23-1.73 1.96-2.47a13.1 13.1 0 0 1 4-2.83Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M490.93 722.38c1.78 0 3.58.4 5.39 1.22 1.8.78 3.55 2.01 5.23 3.69.84.84 1.32 1.5 1.44 1.99.11.47-.1.96-.6 1.47L488 745.12a15.75 15.75 0 0 0 3.74 2.46c1.19.53 2.34.81 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.98-1.17 2.89-2.08.9-.9 1.57-1.79 2.01-2.65.45-.87.8-1.68 1.02-2.42.24-.75.44-1.41.59-1.99.16-.59.42-1.05.77-1.4.46-.47.99-.64 1.56-.52l3.64.43c.1 1.34.02 2.65-.25 3.91a17.46 17.46 0 0 1-3.19 6.77 25.6 25.6 0 0 1-2.33 2.7 17.78 17.78 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.44 21.44 0 0 1-6.27-4.5 18.04 18.04 0 0 1-3.69-5.23 15.11 15.11 0 0 1-1.45-5.84c-.07-2 .27-4 1.04-5.97.79-2 2.05-3.86 3.78-5.6a16.08 16.08 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.13Zm-.58 6.2a5.84 5.84 0 0 0-2.7.43c-.9.33-1.77.9-2.6 1.74-1.61 1.61-2.43 3.35-2.44 5.2 0 1.84.71 3.74 2.15 5.68l10.54-10.54a9.06 9.06 0 0 0-2.35-1.72 6.67 6.67 0 0 0-2.6-.8ZM81.52 721.67c1.78 0 3.57.4 5.38 1.22 1.81.78 3.56 2.01 5.23 3.69.85.84 1.33 1.5 1.45 2 .1.46-.1.95-.61 1.46L78.6 744.41a15.73 15.73 0 0 0 3.73 2.47c1.2.52 2.35.8 3.47.83 1.1.02 2.16-.2 3.19-.65 1.02-.49 1.99-1.18 2.9-2.08.9-.91 1.57-1.8 2-2.65.46-.88.8-1.68 1.02-2.42.25-.76.44-1.42.6-2 .16-.58.42-1.05.76-1.4.47-.47.99-.64 1.56-.52l3.65.43c.1 1.34.02 2.65-.25 3.92a17.47 17.47 0 0 1-3.2 6.76c-.73.98-1.5 1.88-2.32 2.7a17.77 17.77 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.45 21.45 0 0 1-6.28-4.5 18.05 18.05 0 0 1-3.68-5.23 15.13 15.13 0 0 1-1.45-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.86 3.78-5.6a16.07 16.07 0 0 1 4.75-3.34c1.7-.77 3.45-1.15 5.25-1.13Zm-.59 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.62-2.42 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.68l10.55-10.54a9.07 9.07 0 0 0-2.36-1.72 6.68 6.68 0 0 0-2.6-.8Z"/><path d="M512.1 697a9.07 9.07 0 0 1 4.25-.63c1.43.1 2.86.53 4.28 1.29 1.42.72 2.77 1.73 4.07 3.03l14.78 14.78-5.6 5.59-14.77-14.78c-1.41-1.42-2.83-2.19-4.25-2.3-1.43-.14-2.81.45-4.14 1.78a8.23 8.23 0 0 0-2.06 3.37c-.4 1.28-.61 2.68-.61 4.19l16.79 16.79-5.6 5.59-23.2-23.22 3.41-3.42c.72-.72 1.54-.86 2.44-.4l2.22 1.44c0-.93.06-1.85.18-2.76a12.8 12.8 0 0 1 1.86-5.2c.5-.83 1.14-1.64 1.92-2.42a11.6 11.6 0 0 1 4.03-2.72ZM102.68 696.3a9.07 9.07 0 0 1 4.26-.64c1.43.1 2.86.54 4.28 1.3 1.41.72 2.77 1.73 4.07 3.02l14.77 14.78-5.59 5.59-14.77-14.78c-1.42-1.41-2.84-2.18-4.26-2.3-1.43-.14-2.8.46-4.14 1.78a8.23 8.23 0 0 0-2.06 3.37c-.4 1.29-.6 2.68-.6 4.2l16.78 16.78-5.59 5.59-23.21-23.22 3.41-3.41c.73-.73 1.54-.86 2.45-.41l2.22 1.45c0-.94.06-1.86.18-2.76a12.8 12.8 0 0 1 1.85-5.2c.5-.84 1.14-1.65 1.93-2.43a11.6 11.6 0 0 1 4.02-2.71ZM528.98 679.94l6.2-6.2 3.99 3.98-6.2 6.2 12.58 12.58a3.6 3.6 0 0 0 2.22 1.18c.76.04 1.46-.25 2.08-.86a3.88 3.88 0 0 0 1.08-1.86c.1-.27.17-.51.23-.72.04-.23.13-.41.27-.55a.85.85 0 0 1 .54-.27c.18-.03.42-.02.7.03l4.4 1.04c-.14 1.49-.56 2.94-1.27 4.34s-1.63 2.67-2.76 3.8c-2.02 2.02-4.14 3.01-6.36 2.97-2.22-.08-4.33-1.12-6.34-3.13l-12.96-12.96-2.38 2.37c-.3.3-.65.46-1.06.48-.4.01-.8-.18-1.2-.57l-2.22-2.21 3.12-4.35-5.15-7.51a1.75 1.75 0 0 1-.28-1.13c.05-.38.24-.73.57-1.07l2.9-2.9 7.3 7.32ZM119.57 679.23l6.2-6.2 3.98 3.98-6.2 6.2 12.58 12.58a3.59 3.59 0 0 0 2.22 1.18c.77.04 1.46-.24 2.08-.86a3.88 3.88 0 0 0 1.09-1.86l.22-.72c.05-.23.14-.4.28-.54a.85.85 0 0 1 .54-.27c.18-.04.41-.03.7.02l4.39 1.04c-.14 1.5-.56 2.94-1.27 4.34-.7 1.4-1.63 2.67-2.76 3.8-2.02 2.03-4.14 3.01-6.36 2.97-2.21-.08-4.32-1.12-6.33-3.12l-12.97-12.97-2.37 2.38c-.3.3-.66.46-1.07.47-.4.02-.8-.17-1.2-.56l-2.21-2.22 3.12-4.35-5.16-7.5a1.76 1.76 0 0 1-.27-1.14c.05-.38.23-.73.56-1.06l2.9-2.9 7.31 7.3Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M282.3 506.27c2.88-.01 5.72.59 8.53 1.8 2.8 1.2 5.4 3 7.8 5.4 2.4 2.4 4.2 5 5.41 7.8 1.2 2.81 1.81 5.66 1.81 8.56 0 2.9-.62 5.76-1.85 8.6a26.07 26.07 0 0 1-5.6 7.99l-12.46 12.46-32.72-32.72 12.47-12.46a25.65 25.65 0 0 1 8-5.57 21.33 21.33 0 0 1 8.6-1.86Zm-1.13 7.79c-1.9-.1-3.74.22-5.55.97-1.8.74-3.5 1.91-5.09 3.5l-6.36 6.37 23.04 23.03 6.35-6.36c1.6-1.6 2.77-3.3 3.51-5.09a12.63 12.63 0 0 0 1-5.52c-.1-1.9-.61-3.8-1.56-5.68a21.4 21.4 0 0 0-4.12-5.56 21.1 21.1 0 0 0-5.55-4.1c-1.9-.97-3.79-1.49-5.67-1.56ZM692.42 506.27c2.88-.01 5.72.59 8.53 1.8 2.8 1.2 5.4 3 7.8 5.4a25 25 0 0 1 5.41 7.8c1.21 2.81 1.81 5.66 1.81 8.56 0 2.9-.62 5.76-1.85 8.6a26.07 26.07 0 0 1-5.6 7.99l-12.46 12.46-32.72-32.72 12.47-12.46a25.65 25.65 0 0 1 8.01-5.57 21.33 21.33 0 0 1 8.6-1.86Zm-1.13 7.79c-1.89-.1-3.74.22-5.55.97-1.8.74-3.49 1.91-5.09 3.5l-6.36 6.37 23.04 23.03 6.36-6.36c1.6-1.6 2.76-3.3 3.5-5.09a12.61 12.61 0 0 0 1-5.52c-.1-1.9-.61-3.8-1.56-5.68a21.4 21.4 0 0 0-4.12-5.56 21.1 21.1 0 0 0-5.54-4.1c-1.9-.97-3.8-1.49-5.68-1.56ZM315.94 487.25c1.78 0 3.57.4 5.38 1.22 1.81.78 3.56 2.01 5.23 3.69.84.84 1.33 1.5 1.45 2 .1.46-.1.95-.61 1.46L313.02 510a15.76 15.76 0 0 0 3.73 2.47c1.2.52 2.35.8 3.46.83 1.1.02 2.17-.2 3.2-.65 1.02-.49 1.99-1.18 2.9-2.08.9-.91 1.57-1.8 2-2.65.46-.88.8-1.68 1.02-2.42.25-.76.44-1.42.6-2 .16-.58.42-1.05.76-1.4.47-.46.99-.64 1.56-.52l3.65.43c.1 1.35.02 2.65-.25 3.92a17.46 17.46 0 0 1-3.2 6.76 25.6 25.6 0 0 1-2.32 2.7 17.76 17.76 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.45 21.45 0 0 1-6.28-4.5 18.04 18.04 0 0 1-3.68-5.23 15.11 15.11 0 0 1-1.45-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.86 3.78-5.6a16.08 16.08 0 0 1 4.75-3.34c1.7-.77 3.45-1.15 5.25-1.13Zm-.59 6.2a5.84 5.84 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.62-2.42 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.69l10.55-10.55a9.05 9.05 0 0 0-2.36-1.72 6.65 6.65 0 0 0-2.6-.8ZM726.06 487.25c1.78 0 3.58.4 5.39 1.22 1.8.78 3.55 2.01 5.22 3.69.85.84 1.33 1.5 1.45 1.99.1.47-.1.96-.61 1.47L723.14 510a15.75 15.75 0 0 0 3.74 2.47c1.19.52 2.34.8 3.46.83 1.1.02 2.16-.2 3.19-.65 1.02-.49 1.99-1.18 2.9-2.08.9-.91 1.57-1.8 2-2.65.46-.88.8-1.68 1.03-2.42.24-.76.43-1.42.58-2 .17-.58.43-1.05.77-1.4.47-.46 1-.64 1.57-.52l3.64.43c.1 1.35.02 2.65-.25 3.92a17.46 17.46 0 0 1-3.2 6.76c-.73.98-1.5 1.88-2.32 2.7a17.78 17.78 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.45 21.45 0 0 1-6.27-4.5 18.04 18.04 0 0 1-3.7-5.23 15.11 15.11 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.79-2 2.05-3.86 3.78-5.6a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.13Zm-.59 6.2a5.84 5.84 0 0 0-2.69.43c-.9.33-1.77.91-2.6 1.74-1.62 1.62-2.43 3.35-2.45 5.2 0 1.85.72 3.74 2.15 5.69l10.55-10.55a9.05 9.05 0 0 0-2.35-1.72 6.65 6.65 0 0 0-2.6-.8Z"/><path d="m355.4 489.42-5.07 5.07-32.42-14 4.61-4.62c.43-.42.87-.67 1.34-.75.48-.09.92-.03 1.31.18l16.88 7.92a47.14 47.14 0 0 1 5.32 3.1c-.55-.84-1.07-1.7-1.59-2.58-.5-.87-1-1.8-1.47-2.78l-7.83-16.97c-.2-.4-.25-.85-.18-1.31.08-.47.3-.9.68-1.27l4.41-4.41 14.01 32.42ZM765.52 489.42l-5.07 5.07-32.42-14 4.62-4.62c.42-.43.86-.67 1.33-.75.48-.09.92-.03 1.31.18l16.88 7.92a46.78 46.78 0 0 1 5.32 3.1c-.54-.84-1.07-1.7-1.58-2.58-.52-.87-1-1.8-1.48-2.78l-7.82-16.97c-.2-.4-.26-.85-.19-1.31.08-.47.3-.9.68-1.27l4.42-4.41 14 32.42Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M363.64 439.54c1.79 0 3.58.4 5.4 1.22 1.8.79 3.54 2.02 5.22 3.7.84.84 1.32 1.5 1.45 1.98.1.47-.1.96-.61 1.47l-14.37 14.37a15.72 15.72 0 0 0 3.73 2.47c1.2.53 2.35.8 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.98-1.18 2.89-2.08.9-.9 1.58-1.79 2.01-2.65.46-.87.8-1.68 1.02-2.42.24-.75.44-1.42.59-2 .17-.58.42-1.05.77-1.4.47-.46.99-.63 1.56-.51l3.64.43c.1 1.34.03 2.64-.25 3.91a17.46 17.46 0 0 1-3.19 6.77c-.74.98-1.51 1.87-2.33 2.69a17.78 17.78 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.45 21.45 0 0 1-6.27-4.5 18.04 18.04 0 0 1-3.69-5.23 15.12 15.12 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-1.99 2.04-3.85 3.77-5.59a16.08 16.08 0 0 1 4.76-3.35c1.7-.77 3.45-1.14 5.25-1.13Zm-.58 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.77.91-2.6 1.74-1.61 1.62-2.43 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.69L368 448.25a9.07 9.07 0 0 0-2.35-1.72 6.69 6.69 0 0 0-2.6-.79ZM773.77 439.54c1.78 0 3.57.4 5.38 1.22 1.81.79 3.56 2.02 5.23 3.7.84.84 1.33 1.5 1.45 1.98.1.47-.1.96-.61 1.47l-14.37 14.37a15.75 15.75 0 0 0 3.73 2.47c1.2.53 2.35.8 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.99-1.18 2.89-2.08.9-.9 1.58-1.79 2.01-2.65.46-.87.8-1.68 1.02-2.42.24-.75.44-1.42.6-2 .16-.58.41-1.05.76-1.4.47-.46.99-.63 1.56-.51l3.64.43c.11 1.34.03 2.64-.24 3.91a17.46 17.46 0 0 1-3.2 6.77c-.73.98-1.51 1.87-2.32 2.69a17.78 17.78 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.31-.22 21.44 21.44 0 0 1-6.27-4.5 18.04 18.04 0 0 1-3.69-5.23 15.12 15.12 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-1.99 2.04-3.85 3.78-5.59a16.08 16.08 0 0 1 4.75-3.35c1.7-.77 3.45-1.14 5.25-1.13Zm-.6 6.2a5.85 5.85 0 0 0-2.68.43c-.9.33-1.78.91-2.6 1.74-1.62 1.62-2.43 3.35-2.45 5.2 0 1.85.72 3.74 2.15 5.69l10.54-10.55a9.06 9.06 0 0 0-2.35-1.72 6.68 6.68 0 0 0-2.6-.79Z"/><path d="m397.62 447.2-5.6 5.6-33.62-33.63 5.6-5.59 33.62 33.63ZM807.74 447.2l-5.59 5.6-33.62-33.63 5.59-5.59 33.62 33.62Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M-8.27 402.24c2.04.02 4.06.5 6.09 1.43 2.02.93 3.94 2.31 5.77 4.14a20.3 20.3 0 0 1 4.16 5.8 14.96 14.96 0 0 1 1.45 6.1c.04 2.04-.36 4.04-1.22 6.02a17.77 17.77 0 0 1-3.85 5.52 18.12 18.12 0 0 1-5.57 3.9c-1.97.85-3.99 1.27-6.04 1.24a15.58 15.58 0 0 1-6.1-1.45 20.3 20.3 0 0 1-5.8-4.17 20.2 20.2 0 0 1-4.14-5.76 15.24 15.24 0 0 1-1.43-6.1c-.01-2.03.41-4.03 1.27-6.01a18.13 18.13 0 0 1 3.9-5.57c1.71-1.72 3.55-3 5.51-3.84a14.36 14.36 0 0 1 6-1.25Zm-1 7.06c-2.23-.39-4.31.38-6.24 2.31-1.96 1.96-2.75 4.08-2.38 6.36.38 2.24 1.81 4.61 4.3 7.1 2.5 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.46 6.32-2.42 1.93-1.93 2.7-4 2.33-6.22-.36-2.23-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.13-4.33ZM401.85 402.24c2.04.02 4.07.5 6.09 1.43 2.02.93 3.94 2.31 5.77 4.14a20.31 20.31 0 0 1 4.16 5.8 14.96 14.96 0 0 1 1.45 6.1c.04 2.04-.36 4.04-1.22 6.02a17.76 17.76 0 0 1-3.85 5.52 18.12 18.12 0 0 1-5.57 3.9 14.46 14.46 0 0 1-6.04 1.24 15.59 15.59 0 0 1-6.1-1.45 20.33 20.33 0 0 1-5.8-4.17 20.2 20.2 0 0 1-4.14-5.76 15.26 15.26 0 0 1-1.43-6.1c-.01-2.03.41-4.03 1.27-6.01a18.13 18.13 0 0 1 3.9-5.57c1.71-1.72 3.55-3 5.51-3.84a14.36 14.36 0 0 1 6-1.25Zm-1 7.06c-2.23-.39-4.3.38-6.24 2.31-1.96 1.96-2.75 4.08-2.38 6.36.38 2.24 1.81 4.61 4.3 7.1 2.5 2.5 4.86 3.93 7.1 4.3 2.26.35 4.36-.46 6.32-2.42 1.93-1.93 2.7-4 2.33-6.22-.36-2.23-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.13-4.33ZM811.97 402.24c2.04.02 4.07.5 6.09 1.43 2.02.93 3.94 2.31 5.77 4.14a20.3 20.3 0 0 1 4.16 5.8 14.96 14.96 0 0 1 1.45 6.1c.05 2.04-.36 4.04-1.22 6.02a17.76 17.76 0 0 1-3.85 5.52 18.12 18.12 0 0 1-5.56 3.9 14.46 14.46 0 0 1-6.04 1.24 15.59 15.59 0 0 1-6.12-1.45 20.3 20.3 0 0 1-5.79-4.17 20.23 20.23 0 0 1-4.14-5.76 15.24 15.24 0 0 1-1.42-6.1c-.02-2.03.4-4.04 1.26-6.01a18.13 18.13 0 0 1 3.9-5.57c1.71-1.72 3.56-3 5.52-3.84a14.36 14.36 0 0 1 6-1.25Zm-1 7.06c-2.23-.4-4.3.38-6.24 2.31-1.96 1.96-2.75 4.08-2.37 6.36.37 2.24 1.8 4.61 4.3 7.1 2.48 2.5 4.85 3.93 7.1 4.3 2.25.35 4.35-.46 6.31-2.42 1.93-1.93 2.71-4 2.33-6.22-.36-2.24-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.12-4.33ZM13.35 375.64c1.58-.52 3.26-.66 5.02-.4a15 15 0 0 1 5.48 1.94 25.78 25.78 0 0 1 5.68 4.42 22.52 22.52 0 0 1 4.12 5.52 16.52 16.52 0 0 1 1.83 5.86c.22 1.94.03 3.84-.59 5.7a12.97 12.97 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.92 2.74-1.33.51-2.7.78-4.14.8l9.5 9.5-5.58 5.58-30.8-30.79 3.42-3.42c.72-.72 1.54-.86 2.44-.4l2.6 1.7c-.12-2.03.1-3.98.64-5.85a12.29 12.29 0 0 1 3.25-5.25 10.67 10.67 0 0 1 4.26-2.67Zm3.4 7.25c-1-.19-1.93-.12-2.79.2-.85.3-1.64.82-2.38 1.56a7.89 7.89 0 0 0-2.21 3.71c-.34 1.3-.42 2.75-.25 4.37l10.4 10.4c1.4.14 2.64 0 3.7-.42a8.84 8.84 0 0 0 2.91-1.97 7.56 7.56 0 0 0 1.81-2.76c.36-1 .46-2.05.27-3.17a9.96 9.96 0 0 0-1.33-3.55 20.02 20.02 0 0 0-3.12-3.9 21.02 21.02 0 0 0-3.78-3.1 9.23 9.23 0 0 0-3.24-1.37ZM423.47 375.64c1.58-.52 3.26-.66 5.02-.4a15 15 0 0 1 5.48 1.94 25.76 25.76 0 0 1 5.68 4.42 22.49 22.49 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.83 5.86c.22 1.94.03 3.84-.59 5.7a12.96 12.96 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.92 2.74-1.32.51-2.7.78-4.14.8l9.5 9.5-5.58 5.58-30.8-30.79 3.42-3.42c.72-.72 1.54-.86 2.44-.4l2.6 1.7c-.12-2.03.1-3.98.64-5.85a12.29 12.29 0 0 1 3.26-5.25 10.67 10.67 0 0 1 4.25-2.67Zm3.4 7.25c-1-.19-1.93-.12-2.79.2-.84.3-1.64.82-2.38 1.56a7.9 7.9 0 0 0-2.21 3.71c-.33 1.3-.42 2.75-.25 4.37l10.4 10.4c1.41.14 2.64 0 3.7-.42a8.85 8.85 0 0 0 2.92-1.97 7.57 7.57 0 0 0 1.8-2.76c.37-1 .46-2.05.28-3.17a9.97 9.97 0 0 0-1.34-3.55 20.08 20.08 0 0 0-3.12-3.9 21.01 21.01 0 0 0-3.78-3.1 9.23 9.23 0 0 0-3.24-1.37ZM833.6 375.64c1.57-.52 3.25-.66 5.01-.4 1.77.22 3.6.87 5.48 1.94a25.79 25.79 0 0 1 5.68 4.42 22.49 22.49 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.83 5.86c.23 1.94.03 3.84-.59 5.7a12.97 12.97 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.91 2.74-1.33.51-2.71.78-4.14.8l9.5 9.5-5.6 5.58-30.79-30.79 3.42-3.42c.72-.72 1.54-.86 2.44-.4l2.6 1.7c-.12-2.03.1-3.98.64-5.85a12.29 12.29 0 0 1 3.26-5.25 10.66 10.66 0 0 1 4.25-2.67Zm3.39 7.25c-1-.19-1.93-.12-2.79.2-.84.3-1.63.82-2.37 1.56a7.89 7.89 0 0 0-2.22 3.71c-.33 1.3-.42 2.75-.25 4.37l10.4 10.4c1.41.14 2.64 0 3.7-.42a8.84 8.84 0 0 0 2.92-1.97 7.57 7.57 0 0 0 1.8-2.76c.37-1 .46-2.05.28-3.17a9.96 9.96 0 0 0-1.34-3.55 20.03 20.03 0 0 0-3.12-3.9 21.01 21.01 0 0 0-3.78-3.1 9.23 9.23 0 0 0-3.23-1.38Z"/><path d="M51.15 337.57c1.39-.6 2.8-.87 4.23-.8 1.44.08 2.87.49 4.3 1.23 1.45.72 2.88 1.79 4.28 3.19l14.77 14.77-5.58 5.6-14.78-14.78c-1.48-1.48-2.91-2.26-4.3-2.35-1.4-.1-2.73.46-3.98 1.71a5.48 5.48 0 0 0-1.74 4.05c0 .73.17 1.48.52 2.25.34.76.88 1.51 1.6 2.24l14.78 14.77-5.61 5.61-14.78-14.77c-1.55-1.56-3-2.37-4.34-2.45-1.33-.09-2.6.47-3.8 1.68a6.38 6.38 0 0 0-1.68 2.9c-.3 1.08-.4 2.27-.31 3.57l16.99 17-5.59 5.58-23.22-23.21 3.42-3.42c.72-.73 1.54-.86 2.44-.4l2.09 1.35c-.05-.86-.04-1.7.02-2.51a10.75 10.75 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.17 3.49.17 5.27 1.01a10.3 10.3 0 0 1-.18-6.47c.3-1 .73-1.94 1.29-2.82.57-.91 1.23-1.73 1.97-2.47a13.1 13.1 0 0 1 4-2.83ZM461.27 337.57c1.4-.6 2.8-.87 4.24-.8 1.43.08 2.86.49 4.3 1.23 1.44.72 2.87 1.79 4.27 3.19l14.78 14.77-5.6 5.6-14.77-14.78c-1.48-1.48-2.9-2.26-4.3-2.35-1.4-.1-2.73.46-3.98 1.71a5.48 5.48 0 0 0-1.74 4.05c0 .73.17 1.48.52 2.25.35.76.88 1.51 1.6 2.24l14.78 14.77-5.61 5.61-14.78-14.77c-1.55-1.56-3-2.37-4.34-2.45-1.33-.09-2.6.47-3.8 1.68a6.37 6.37 0 0 0-1.68 2.9c-.3 1.08-.4 2.27-.31 3.57l16.99 17-5.59 5.58-23.21-23.21 3.41-3.42c.73-.73 1.54-.86 2.44-.4l2.09 1.35c-.05-.86-.04-1.7.02-2.51a10.77 10.77 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.17 3.5.17 5.27 1.01a10.32 10.32 0 0 1-.18-6.47c.3-1 .73-1.94 1.29-2.82a14.33 14.33 0 0 1 5.97-5.3Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M80.81 312.25c1.78 0 3.58.41 5.39 1.23 1.8.78 3.55 2.01 5.22 3.68.85.85 1.33 1.51 1.45 2 .1.46-.1.95-.6 1.47l-14.38 14.36a15.76 15.76 0 0 0 3.74 2.47c1.19.53 2.34.8 3.46.84 1.1.01 2.16-.2 3.19-.66 1.02-.48 1.99-1.18 2.9-2.08.9-.9 1.57-1.79 2-2.65.46-.87.8-1.68 1.03-2.42.24-.75.43-1.42.59-1.99.16-.59.42-1.06.77-1.4.46-.47.98-.64 1.56-.52l3.64.43c.1 1.34.02 2.64-.25 3.91a17.46 17.46 0 0 1-3.19 6.77c-.74.98-1.52 1.88-2.33 2.69a17.77 17.77 0 0 1-5.3 3.71 14.54 14.54 0 0 1-12.3-.22 21.45 21.45 0 0 1-6.27-4.5 18.05 18.05 0 0 1-3.7-5.24A15.13 15.13 0 0 1 66 328.3c-.07-2 .27-4 1.04-5.98.79-1.99 2.05-3.85 3.78-5.59a16.05 16.05 0 0 1 4.75-3.35c1.7-.76 3.46-1.14 5.25-1.13Zm-.59 6.2a5.85 5.85 0 0 0-2.69.43c-.9.34-1.77.92-2.6 1.75-1.62 1.61-2.43 3.35-2.45 5.2 0 1.84.72 3.73 2.15 5.68l10.55-10.55a9.07 9.07 0 0 0-2.35-1.71 6.68 6.68 0 0 0-2.6-.8ZM490.93 312.25c1.78 0 3.58.41 5.39 1.23 1.8.78 3.55 2.01 5.23 3.68.84.85 1.32 1.51 1.44 2 .1.46-.1.95-.6 1.47L488 334.99a15.73 15.73 0 0 0 3.74 2.47c1.19.53 2.35.8 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.98-1.18 2.89-2.08.9-.9 1.57-1.79 2.01-2.65.45-.87.8-1.68 1.02-2.42.24-.75.44-1.42.59-1.99.16-.59.42-1.06.77-1.4.46-.47.99-.64 1.56-.52l3.64.43c.1 1.34.02 2.64-.25 3.91a17.46 17.46 0 0 1-3.19 6.77 25.6 25.6 0 0 1-2.33 2.69 17.78 17.78 0 0 1-5.3 3.71 14.54 14.54 0 0 1-12.3-.22 21.45 21.45 0 0 1-6.27-4.5 18.05 18.05 0 0 1-3.69-5.24 15.12 15.12 0 0 1-1.45-5.83c-.07-2 .27-4 1.04-5.98.79-1.99 2.05-3.85 3.78-5.59a16.08 16.08 0 0 1 4.75-3.35c1.7-.76 3.46-1.14 5.25-1.13Zm-.58 6.2a5.85 5.85 0 0 0-2.7.43c-.9.34-1.77.92-2.6 1.75-1.61 1.61-2.43 3.35-2.44 5.2 0 1.84.71 3.73 2.15 5.68l10.54-10.55a9.07 9.07 0 0 0-2.35-1.71 6.69 6.69 0 0 0-2.6-.8Z"/><path d="M101.98 286.88a9.07 9.07 0 0 1 4.25-.63c1.43.1 2.86.53 4.28 1.29 1.41.72 2.77 1.73 4.07 3.03l14.78 14.78-5.6 5.58L109 296.16c-1.42-1.42-2.83-2.19-4.25-2.31-1.44-.14-2.82.46-4.14 1.79a8.23 8.23 0 0 0-2.06 3.37c-.41 1.28-.61 2.68-.61 4.19l16.79 16.79-5.6 5.58-23.2-23.21 3.4-3.42c.73-.72 1.55-.86 2.45-.4l2.22 1.44c0-.93.06-1.85.18-2.76a12.8 12.8 0 0 1 1.86-5.2c.5-.83 1.13-1.64 1.92-2.42a11.6 11.6 0 0 1 4.03-2.72ZM512.1 286.88a9.07 9.07 0 0 1 4.25-.63c1.43.1 2.86.53 4.28 1.29 1.42.72 2.77 1.73 4.07 3.03l14.78 14.78-5.6 5.58-14.77-14.77c-1.41-1.42-2.83-2.19-4.25-2.31-1.43-.14-2.81.46-4.14 1.79a8.23 8.23 0 0 0-2.06 3.37c-.4 1.28-.61 2.68-.61 4.19l16.79 16.79-5.6 5.58-23.2-23.21 3.41-3.42c.72-.72 1.54-.86 2.44-.4l2.22 1.44c0-.93.06-1.85.18-2.76a12.8 12.8 0 0 1 1.86-5.2c.5-.83 1.14-1.64 1.92-2.42a11.6 11.6 0 0 1 4.03-2.72ZM118.86 269.81l6.2-6.2 3.98 3.99-6.2 6.2 12.59 12.58a3.59 3.59 0 0 0 2.21 1.17c.77.05 1.47-.24 2.08-.86a3.9 3.9 0 0 0 1.09-1.85c.1-.27.17-.51.23-.72.04-.23.13-.41.27-.55a.85.85 0 0 1 .54-.27c.18-.03.42-.02.7.02l4.4 1.04c-.14 1.5-.57 2.94-1.27 4.35-.71 1.4-1.63 2.67-2.77 3.8-2.02 2.02-4.14 3-6.35 2.96-2.22-.07-4.33-1.11-6.34-3.12l-12.96-12.96-2.38 2.37c-.3.3-.66.46-1.06.48-.41.01-.81-.18-1.2-.57l-2.22-2.22 3.12-4.34-5.16-7.51a1.76 1.76 0 0 1-.27-1.14c.05-.37.23-.73.57-1.06l2.9-2.9 7.3 7.31ZM528.98 269.81l6.2-6.2 3.99 3.99-6.2 6.2 12.58 12.58a3.6 3.6 0 0 0 2.21 1.17c.77.05 1.47-.24 2.09-.86a3.88 3.88 0 0 0 1.08-1.85c.1-.27.17-.51.23-.72.04-.23.13-.41.27-.55a.85.85 0 0 1 .54-.27c.18-.03.42-.02.7.02l4.4 1.04c-.14 1.5-.56 2.95-1.27 4.35-.71 1.4-1.63 2.67-2.76 3.8-2.02 2.02-4.14 3-6.36 2.96-2.22-.07-4.33-1.11-6.34-3.12l-12.96-12.96-2.38 2.37c-.3.3-.65.46-1.06.48-.4.01-.8-.18-1.2-.57l-2.22-2.22 3.12-4.34-5.15-7.51a1.75 1.75 0 0 1-.28-1.14c.05-.37.24-.73.57-1.06l2.9-2.9 7.3 7.31Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M691.71 96.86c2.88-.02 5.73.58 8.53 1.79 2.8 1.2 5.4 3 7.8 5.4 2.4 2.4 4.2 5 5.42 7.81 1.2 2.8 1.8 5.66 1.8 8.55 0 2.9-.61 5.77-1.85 8.6a26.07 26.07 0 0 1-5.59 7.99l-12.47 12.47-32.72-32.72 12.47-12.47a25.64 25.64 0 0 1 8.01-5.57 21.33 21.33 0 0 1 8.6-1.85Zm-1.13 7.78c-1.89-.1-3.73.22-5.54.98-1.8.73-3.5 1.9-5.1 3.5l-6.35 6.36 23.03 23.04 6.36-6.36c1.6-1.6 2.77-3.3 3.5-5.1a12.61 12.61 0 0 0 1-5.52c-.09-1.9-.6-3.79-1.56-5.67a21.4 21.4 0 0 0-4.12-5.57 21.1 21.1 0 0 0-5.54-4.1c-1.9-.96-3.8-1.48-5.68-1.56ZM282.3 96.15c2.88-.01 5.72.58 8.53 1.79 2.8 1.2 5.4 3.01 7.8 5.4a25 25 0 0 1 5.41 7.81c1.2 2.8 1.81 5.66 1.81 8.56 0 2.9-.62 5.76-1.85 8.6a26.07 26.07 0 0 1-5.6 7.98l-12.46 12.47-32.72-32.72 12.47-12.47a25.64 25.64 0 0 1 8-5.56 21.33 21.33 0 0 1 8.6-1.86Zm-1.13 7.79c-1.9-.11-3.74.21-5.55.97-1.8.74-3.5 1.9-5.09 3.5l-6.36 6.37 23.04 23.03 6.35-6.36c1.6-1.6 2.77-3.3 3.51-5.09a12.62 12.62 0 0 0 1-5.52c-.1-1.9-.61-3.8-1.56-5.68a21.41 21.41 0 0 0-4.12-5.57 21.1 21.1 0 0 0-5.55-4.1c-1.9-.96-3.79-1.48-5.67-1.55ZM725.35 77.83c1.78 0 3.58.41 5.39 1.23 1.8.78 3.55 2.01 5.23 3.68.84.85 1.32 1.51 1.44 2 .1.46-.1.95-.6 1.47l-14.38 14.37a15.76 15.76 0 0 0 3.74 2.46c1.19.53 2.34.8 3.46.84 1.1.01 2.16-.2 3.2-.66a10.32 10.32 0 0 0 2.89-2.08c.9-.9 1.57-1.79 2.01-2.65.45-.87.8-1.68 1.02-2.42.24-.75.44-1.42.59-1.99.16-.59.42-1.06.77-1.4.47-.47.99-.64 1.56-.52l3.64.43c.1 1.34.02 2.64-.25 3.91a17.48 17.48 0 0 1-3.19 6.77 25.6 25.6 0 0 1-2.33 2.69 17.78 17.78 0 0 1-5.3 3.71 14.54 14.54 0 0 1-12.3-.23 21.45 21.45 0 0 1-6.27-4.5 18.04 18.04 0 0 1-3.69-5.22 15.12 15.12 0 0 1-1.45-5.84c-.07-2 .27-4 1.04-5.98.79-1.99 2.05-3.85 3.78-5.59a16.08 16.08 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.14Zm-.59 6.2a5.85 5.85 0 0 0-2.69.43c-.9.34-1.77.92-2.6 1.75-1.61 1.61-2.43 3.35-2.44 5.2 0 1.84.71 3.73 2.15 5.68l10.54-10.54a9.06 9.06 0 0 0-2.35-1.72 6.67 6.67 0 0 0-2.6-.8ZM315.94 77.13c1.78 0 3.57.4 5.38 1.22 1.81.78 3.56 2.01 5.23 3.69.84.84 1.33 1.5 1.45 1.99.1.47-.1.96-.61 1.47l-14.37 14.37a15.74 15.74 0 0 0 3.73 2.46c1.2.53 2.35.81 3.46.84 1.1.02 2.17-.2 3.2-.66a10.34 10.34 0 0 0 2.9-2.08c.9-.9 1.57-1.78 2-2.64.46-.88.8-1.69 1.02-2.43.25-.75.44-1.41.6-1.99.16-.58.42-1.05.76-1.4.47-.47.99-.64 1.56-.52l3.65.43c.1 1.34.02 2.65-.25 3.91a17.47 17.47 0 0 1-3.2 6.77 25.6 25.6 0 0 1-2.32 2.7 17.78 17.78 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.45 21.45 0 0 1-6.28-4.5 18.05 18.05 0 0 1-3.68-5.23 15.12 15.12 0 0 1-1.45-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.86 3.78-5.6a16.08 16.08 0 0 1 4.75-3.34c1.7-.77 3.45-1.15 5.25-1.13Zm-.59 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.61-2.42 3.35-2.44 5.2 0 1.84.72 3.74 2.15 5.68l10.55-10.54a9.06 9.06 0 0 0-2.36-1.72 6.67 6.67 0 0 0-2.6-.8Z"/><path d="m764.82 80-5.07 5.08-32.43-14.01 4.62-4.62c.42-.42.86-.67 1.33-.74.49-.1.92-.03 1.32.18l16.87 7.92a47.08 47.08 0 0 1 5.32 3.1 73.7 73.7 0 0 1-1.58-2.58c-.51-.88-1-1.8-1.47-2.79l-7.83-16.97c-.2-.4-.26-.84-.18-1.3.07-.48.3-.9.68-1.28l4.4-4.4L764.83 80ZM355.4 79.3l-5.07 5.07-32.42-14 4.61-4.62c.43-.43.87-.68 1.34-.75.48-.1.92-.03 1.31.18l16.88 7.92a47.02 47.02 0 0 1 5.32 3.1c-.55-.85-1.07-1.7-1.59-2.58-.5-.87-1-1.8-1.47-2.78l-7.83-16.97c-.2-.41-.25-.85-.18-1.32.08-.46.3-.89.68-1.26l4.41-4.42L355.4 79.3Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M773.06 30.13c1.78 0 3.58.4 5.39 1.22 1.8.78 3.55 2.01 5.22 3.69.85.84 1.33 1.5 1.45 1.99.1.47-.1.96-.61 1.47l-14.37 14.37a15.76 15.76 0 0 0 3.74 2.46c1.19.53 2.34.81 3.46.84 1.1.02 2.16-.2 3.19-.66 1.02-.48 1.99-1.17 2.9-2.08.9-.9 1.57-1.78 2-2.64.46-.88.8-1.69 1.03-2.43.24-.75.43-1.41.58-1.99.17-.58.43-1.05.77-1.4.47-.47 1-.64 1.57-.52l3.64.43c.1 1.34.02 2.65-.25 3.91a17.48 17.48 0 0 1-3.2 6.77c-.73.98-1.5 1.88-2.32 2.7a17.77 17.77 0 0 1-5.3 3.7 14.55 14.55 0 0 1-12.3-.22 21.43 21.43 0 0 1-6.27-4.5 18.04 18.04 0 0 1-3.7-5.23 15.12 15.12 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.05-3.86 3.78-5.6a16.08 16.08 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.13Zm-.59 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.61-2.42 3.35-2.44 5.2 0 1.84.72 3.74 2.15 5.68l10.55-10.54a9.06 9.06 0 0 0-2.36-1.72 6.67 6.67 0 0 0-2.6-.8ZM363.64 29.42c1.79 0 3.58.4 5.4 1.22 1.8.79 3.54 2.02 5.22 3.69.84.85 1.32 1.5 1.45 2 .1.46-.1.95-.61 1.46l-14.37 14.37a15.75 15.75 0 0 0 3.73 2.47c1.2.52 2.35.8 3.46.83 1.1.02 2.17-.2 3.2-.65 1.02-.48 1.98-1.18 2.89-2.08.9-.9 1.58-1.8 2.01-2.65.46-.88.8-1.68 1.02-2.42.24-.76.44-1.42.59-2 .17-.58.42-1.05.77-1.4.47-.46.99-.64 1.56-.52l3.64.43c.1 1.35.03 2.65-.25 3.92a17.46 17.46 0 0 1-3.19 6.76c-.74.98-1.51 1.88-2.33 2.7a17.77 17.77 0 0 1-5.3 3.7 14.55 14.55 0 0 1-12.3-.22 21.43 21.43 0 0 1-6.27-4.5 18.04 18.04 0 0 1-3.69-5.23 15.12 15.12 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.85 3.77-5.59a16.08 16.08 0 0 1 4.76-3.35c1.7-.77 3.45-1.14 5.25-1.13Zm-.58 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.77.91-2.6 1.74-1.61 1.62-2.43 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.69L368 38.13a9.06 9.06 0 0 0-2.35-1.72 6.67 6.67 0 0 0-2.6-.79Z"/><path d="m807.03 37.79-5.59 5.59-33.62-33.63 5.59-5.58 33.62 33.62ZM397.62 37.08l-5.6 5.6L358.4 9.04l5.6-5.6 33.62 33.63Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M-7.56-7.17c2.03.01 4.06.49 6.08 1.42C.54-4.8 2.47-3.43 4.3-1.6a20.3 20.3 0 0 1 4.17 5.8 14.97 14.97 0 0 1 1.44 6.1c.05 2.04-.36 4.05-1.22 6.02a17.78 17.78 0 0 1-3.84 5.53 18.12 18.12 0 0 1-5.57 3.89c-1.98.86-3.99 1.27-6.04 1.24a15.59 15.59 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.13-5.77 15.25 15.25 0 0 1-1.43-6.09c-.01-2.03.4-4.04 1.27-6.02a18.12 18.12 0 0 1 3.89-5.56c1.72-1.72 3.56-3 5.52-3.85a14.36 14.36 0 0 1 6-1.24Zm-1 7.06c-2.23-.4-4.31.37-6.24 2.3-1.97 1.97-2.76 4.09-2.38 6.36.38 2.25 1.81 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.93 2.7-4 2.33-6.23-.36-2.23-1.8-4.6-4.3-7.1S-6.31.26-8.56-.11ZM811.27-7.17c2.03.01 4.06.49 6.08 1.42 2.02.94 3.95 2.32 5.77 4.14a20.3 20.3 0 0 1 4.17 5.8 14.96 14.96 0 0 1 1.44 6.1c.05 2.04-.36 4.05-1.22 6.02a17.77 17.77 0 0 1-3.84 5.53 18.13 18.13 0 0 1-5.57 3.89 14.47 14.47 0 0 1-6.04 1.24 15.59 15.59 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.13-5.77 15.26 15.26 0 0 1-1.43-6.09c-.02-2.03.4-4.04 1.27-6.02a18.12 18.12 0 0 1 3.89-5.56c1.72-1.72 3.56-3 5.52-3.85a14.36 14.36 0 0 1 6-1.24Zm-1 7.06c-2.23-.4-4.31.37-6.25 2.3-1.96 1.97-2.75 4.09-2.37 6.36.38 2.25 1.8 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.93 2.7-4 2.33-6.23-.37-2.23-1.8-4.6-4.3-7.1s-4.88-3.95-7.13-4.32ZM401.85-7.88c2.04.01 4.07.49 6.09 1.43 2.02.93 3.94 2.31 5.77 4.14a20.33 20.33 0 0 1 4.16 5.79 14.96 14.96 0 0 1 1.45 6.1c.04 2.04-.36 4.05-1.22 6.03a17.77 17.77 0 0 1-3.85 5.52 18.13 18.13 0 0 1-5.57 3.89 14.47 14.47 0 0 1-6.04 1.24 15.6 15.6 0 0 1-6.1-1.44 20.31 20.31 0 0 1-5.8-4.17 20.2 20.2 0 0 1-4.14-5.77 15.26 15.26 0 0 1-1.43-6.08c-.01-2.04.41-4.05 1.27-6.02a18.12 18.12 0 0 1 3.9-5.57c1.71-1.72 3.55-3 5.51-3.85a14.36 14.36 0 0 1 6-1.24Zm-1 7.06c-2.23-.4-4.3.38-6.24 2.3-1.96 1.97-2.75 4.09-2.38 6.37.38 2.24 1.81 4.61 4.3 7.1 2.5 2.49 4.86 3.92 7.1 4.3 2.26.35 4.36-.46 6.32-2.42 1.93-1.93 2.7-4 2.33-6.22-.36-2.24-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.13-4.33ZM14.06-33.77c1.58-.53 3.25-.66 5.02-.4a15 15 0 0 1 5.47 1.94 25.79 25.79 0 0 1 5.68 4.41 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.84 5.86c.22 1.95.03 3.85-.6 5.7a12.98 12.98 0 0 1-3.2 5.03c-1.3 1.3-2.6 2.2-3.92 2.74-1.33.5-2.7.77-4.14.79l9.5 9.5-5.59 5.59-30.8-30.8L.87-21.3c.73-.73 1.54-.86 2.45-.41l2.6 1.7c-.12-2.02.1-3.97.63-5.84A12.3 12.3 0 0 1 9.8-31.1a10.67 10.67 0 0 1 4.26-2.67Zm3.39 7.24c-1-.18-1.92-.11-2.78.2-.85.3-1.64.83-2.38 1.57a7.9 7.9 0 0 0-2.22 3.7c-.33 1.3-.41 2.76-.25 4.37L20.23-6.28c1.4.14 2.64 0 3.7-.43a8.84 8.84 0 0 0 2.91-1.97 7.55 7.55 0 0 0 1.81-2.76c.36-1 .45-2.05.27-3.17a9.95 9.95 0 0 0-1.33-3.55 20.03 20.03 0 0 0-3.13-3.89 21.03 21.03 0 0 0-3.77-3.1 9.23 9.23 0 0 0-3.24-1.38ZM423.47-34.48c1.58-.53 3.26-.66 5.02-.4a15 15 0 0 1 5.48 1.94 25.77 25.77 0 0 1 5.68 4.41 22.47 22.47 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.83 5.87c.22 1.94.03 3.84-.59 5.7a12.96 12.96 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.92 2.74-1.32.51-2.7.78-4.14.8l9.5 9.5-5.58 5.58-30.8-30.8 3.42-3.4c.72-.73 1.54-.87 2.44-.42l2.6 1.7c-.12-2.02.1-3.97.64-5.84a12.3 12.3 0 0 1 3.26-5.25 10.67 10.67 0 0 1 4.25-2.67Zm3.4 7.24c-1-.18-1.93-.11-2.79.2-.84.3-1.64.83-2.38 1.57a7.89 7.89 0 0 0-2.21 3.7c-.33 1.3-.42 2.76-.25 4.38L429.64-7c1.41.14 2.64 0 3.7-.42a8.84 8.84 0 0 0 2.92-1.97 7.56 7.56 0 0 0 1.8-2.76c.37-1 .46-2.06.28-3.17a9.97 9.97 0 0 0-1.34-3.55 20.1 20.1 0 0 0-3.12-3.9 21.03 21.03 0 0 0-3.78-3.1 9.23 9.23 0 0 0-3.24-1.38Z"/></g><defs><clipPath id="a"><path d="M0 0h819v819H0z"/></clipPath></defs></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 819 819"><g clip-path="url(#a)"><path fill-rule="evenodd" d="M401.85 812.36c2.04.02 4.07.5 6.09 1.43 2.02.94 3.94 2.32 5.77 4.14a20.3 20.3 0 0 1 4.16 5.8 15 15 0 0 1 1.45 6.1c.05 2.04-.36 4.04-1.22 6.02a17.8 17.8 0 0 1-3.85 5.52 18.1 18.1 0 0 1-5.57 3.9 14.5 14.5 0 0 1-6.04 1.24 15.6 15.6 0 0 1-6.1-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.14-5.77 15.3 15.3 0 0 1-1.43-6.09c-.01-2.04.41-4.04 1.27-6.02a18.1 18.1 0 0 1 3.9-5.56c1.71-1.72 3.55-3 5.52-3.85a14.3 14.3 0 0 1 6-1.25Zm-1 7.06c-2.23-.39-4.3.38-6.24 2.31-1.96 1.96-2.75 4.08-2.38 6.36.38 2.25 1.81 4.62 4.3 7.1 2.5 2.5 4.86 3.93 7.1 4.3 2.26.35 4.36-.46 6.32-2.42 1.93-1.93 2.71-4 2.33-6.22-.36-2.23-1.8-4.6-4.3-7.1s-4.88-3.95-7.13-4.33m-408.41-7.76c2.03.01 4.06.49 6.08 1.42 2.02.94 3.95 2.32 5.77 4.14a20.3 20.3 0 0 1 4.17 5.8 15 15 0 0 1 1.44 6.1c.05 2.04-.36 4.05-1.22 6.02a17.8 17.8 0 0 1-3.84 5.52 18.1 18.1 0 0 1-5.57 3.9c-1.98.86-3.99 1.27-6.04 1.24a15.6 15.6 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.13-5.77 15.2 15.2 0 0 1-1.43-6.09c-.01-2.03.4-4.04 1.27-6.01a18.1 18.1 0 0 1 3.89-5.57c1.72-1.72 3.56-3 5.52-3.85a14.3 14.3 0 0 1 6-1.24m-1 7.06c-2.23-.4-4.31.37-6.24 2.3-1.97 1.97-2.76 4.09-2.38 6.36.38 2.25 1.81 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.93 2.7-4 2.33-6.23-.36-2.23-1.8-4.6-4.3-7.1s-4.88-3.95-7.13-4.32m819.83-7.06c2.03.01 4.06.49 6.08 1.42 2.02.94 3.95 2.32 5.77 4.14a20.3 20.3 0 0 1 4.17 5.8 15 15 0 0 1 1.45 6.1c.04 2.04-.37 4.05-1.23 6.02a17.8 17.8 0 0 1-3.84 5.52 18.1 18.1 0 0 1-5.57 3.9 14.5 14.5 0 0 1-6.04 1.24 15.6 15.6 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.13-5.77 15.3 15.3 0 0 1-1.43-6.09c-.02-2.03.4-4.04 1.27-6.02a18.1 18.1 0 0 1 3.89-5.56c1.72-1.72 3.56-3 5.52-3.85a14.35 14.35 0 0 1 6-1.24m-1 7.06c-2.23-.4-4.31.37-6.25 2.3-1.96 1.97-2.75 4.08-2.37 6.36.38 2.25 1.81 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.94 2.7-4.01 2.33-6.23-.36-2.23-1.8-4.6-4.3-7.1s-4.88-3.95-7.13-4.32m-386.8-32.95c1.58-.53 3.26-.67 5.02-.41 1.77.23 3.6.88 5.48 1.95a25.8 25.8 0 0 1 5.68 4.4 22.5 22.5 0 0 1 4.12 5.53 16.5 16.5 0 0 1 1.83 5.86c.23 1.95.03 3.85-.59 5.7a13 13 0 0 1-3.21 5.03c-1.3 1.3-2.6 2.2-3.92 2.73-1.32.52-2.7.78-4.14.8l9.5 9.5-5.58 5.59-30.8-30.8 3.42-3.41c.72-.73 1.54-.87 2.44-.41l2.6 1.7c-.12-2.03.1-3.97.64-5.84a12.3 12.3 0 0 1 3.26-5.25 10.7 10.7 0 0 1 4.25-2.67m3.4 7.24c-1-.18-1.93-.12-2.79.2q-1.26.45-2.37 1.56a7.9 7.9 0 0 0-2.22 3.71c-.33 1.3-.42 2.76-.25 4.37l10.4 10.4c1.41.14 2.64 0 3.7-.42a8.8 8.8 0 0 0 2.92-1.97 7.6 7.6 0 0 0 1.8-2.76c.37-1 .46-2.05.28-3.17a10 10 0 0 0-1.34-3.55 20 20 0 0 0-3.12-3.9 21 21 0 0 0-3.78-3.1 9.2 9.2 0 0 0-3.24-1.37Zm-412.81-7.95c1.58-.53 3.25-.66 5.02-.4a15 15 0 0 1 5.47 1.94 25.8 25.8 0 0 1 5.68 4.41 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.84 5.86c.22 1.95.03 3.85-.6 5.7a13 13 0 0 1-3.2 5.03c-1.3 1.3-2.6 2.2-3.92 2.74-1.33.5-2.7.77-4.14.79l9.5 9.5-5.59 5.6-30.8-30.8 3.42-3.42c.73-.73 1.54-.86 2.45-.41l2.6 1.7c-.12-2.02.1-3.97.63-5.84a12.3 12.3 0 0 1 3.26-5.25 10.7 10.7 0 0 1 4.26-2.67m3.39 7.24c-1-.18-1.92-.11-2.78.2-.85.3-1.64.83-2.38 1.57a7.9 7.9 0 0 0-2.22 3.7c-.33 1.3-.41 2.76-.25 4.37l10.41 10.41c1.4.14 2.64 0 3.7-.43a8.8 8.8 0 0 0 2.91-1.97 7.6 7.6 0 0 0 1.81-2.76c.36-1 .45-2.05.27-3.16a10 10 0 0 0-1.33-3.56 20 20 0 0 0-3.13-3.89 21 21 0 0 0-3.77-3.1 9.2 9.2 0 0 0-3.24-1.38m815.43-7.24c1.59-.53 3.26-.66 5.03-.4a15 15 0 0 1 5.48 1.94 25.8 25.8 0 0 1 5.67 4.41 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.84 5.86q.33 2.925-.6 5.7a13 13 0 0 1-3.2 5.03c-1.3 1.3-2.6 2.2-3.92 2.74-1.33.5-2.7.77-4.14.79l9.5 9.5-5.59 5.59-30.8-30.8 3.42-3.41c.73-.73 1.54-.86 2.45-.41l2.6 1.7c-.12-2.03.1-3.97.63-5.84a12.3 12.3 0 0 1 3.26-5.25 10.7 10.7 0 0 1 4.25-2.67m3.4 7.24c-1-.18-1.92-.11-2.78.2-.85.3-1.64.83-2.38 1.57a7.9 7.9 0 0 0-2.22 3.7c-.33 1.3-.41 2.76-.25 4.37l10.41 10.41c1.4.14 2.64 0 3.7-.43a8.8 8.8 0 0 0 2.91-1.97 7.6 7.6 0 0 0 1.81-2.76c.36-1 .45-2.05.27-3.16a10 10 0 0 0-1.33-3.56 20 20 0 0 0-3.13-3.89 21 21 0 0 0-3.77-3.1 9.2 9.2 0 0 0-3.24-1.38" clip-rule="evenodd"/><path d="M461.27 747.7c1.4-.61 2.8-.88 4.24-.8 1.43.07 2.86.48 4.3 1.22 1.44.73 2.87 1.79 4.27 3.2l14.78 14.77-5.6 5.59-14.77-14.78c-1.48-1.48-2.9-2.26-4.3-2.35-1.4-.1-2.73.47-3.98 1.72a5.5 5.5 0 0 0-1.74 4.05c0 .72.17 1.47.52 2.24s.88 1.51 1.6 2.24l14.78 14.77-5.61 5.61-14.78-14.77c-1.55-1.55-3-2.37-4.34-2.44-1.33-.1-2.6.46-3.8 1.67a6.4 6.4 0 0 0-1.68 2.9c-.3 1.08-.4 2.28-.31 3.57l16.99 17-5.59 5.58-23.21-23.21 3.41-3.42c.73-.72 1.54-.86 2.45-.4l2.08 1.35c-.05-.86-.04-1.7.02-2.51a10.77 10.77 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.17 3.5.17 5.27 1.01a10.3 10.3 0 0 1-.18-6.47c.3-1 .73-1.93 1.29-2.82a14.3 14.3 0 0 1 5.97-5.3Zm-409.41-.72c1.39-.6 2.8-.86 4.23-.79 1.43.08 2.87.48 4.3 1.22 1.45.73 2.87 1.8 4.28 3.2l14.77 14.77-5.59 5.59-14.77-14.78c-1.48-1.48-2.91-2.26-4.3-2.35-1.4-.1-2.73.47-3.98 1.72a5.47 5.47 0 0 0-1.74 4.05c0 .72.17 1.47.51 2.24.35.77.89 1.52 1.61 2.24l14.78 14.78-5.62 5.6-14.77-14.77c-1.55-1.55-3-2.37-4.35-2.44-1.32-.1-2.59.47-3.8 1.67a6.4 6.4 0 0 0-1.67 2.9c-.3 1.08-.4 2.28-.32 3.57l17 17-5.6 5.59-23.2-23.22 3.4-3.42c.73-.72 1.55-.86 2.45-.4l2.08 1.35c-.04-.86-.03-1.7.03-2.5a10.78 10.78 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.18 3.49.16 5.27 1a10.3 10.3 0 0 1-.18-6.47q.45-1.485 1.29-2.82c.57-.9 1.23-1.73 1.96-2.47a13.1 13.1 0 0 1 4-2.83Z"/><path fill-rule="evenodd" d="M490.93 722.38c1.78 0 3.58.4 5.39 1.22 1.8.78 3.55 2.01 5.23 3.69.84.84 1.32 1.5 1.44 1.99.11.47-.1.96-.6 1.47L488 745.12a15.8 15.8 0 0 0 3.74 2.46c1.19.53 2.34.81 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.98-1.17 2.89-2.08.9-.9 1.57-1.79 2.01-2.65.45-.87.8-1.68 1.02-2.42.24-.75.44-1.41.59-1.99.16-.59.42-1.05.77-1.4.46-.47.99-.64 1.56-.52l3.64.43c.1 1.34.02 2.65-.25 3.91a17.5 17.5 0 0 1-3.19 6.77 26 26 0 0 1-2.33 2.7 17.8 17.8 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.4 21.4 0 0 1-6.27-4.5 18 18 0 0 1-3.69-5.23 15.1 15.1 0 0 1-1.45-5.84c-.07-2 .27-4 1.04-5.97.79-2 2.05-3.86 3.78-5.6a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.13Zm-.58 6.2a5.84 5.84 0 0 0-2.7.43c-.9.33-1.77.9-2.6 1.74-1.61 1.61-2.43 3.35-2.44 5.2 0 1.84.71 3.74 2.15 5.68l10.54-10.54a9 9 0 0 0-2.35-1.72 6.7 6.7 0 0 0-2.6-.8Zm-408.83-6.91c1.78 0 3.57.4 5.38 1.22 1.81.78 3.56 2.01 5.23 3.69.85.84 1.33 1.5 1.45 2 .1.46-.1.95-.61 1.46L78.6 744.41a15.7 15.7 0 0 0 3.73 2.47c1.2.52 2.35.8 3.47.83 1.1.02 2.16-.2 3.19-.65 1.02-.49 1.99-1.18 2.9-2.08.9-.91 1.57-1.8 2-2.65.46-.88.8-1.68 1.02-2.42.25-.76.44-1.42.6-2s.42-1.05.76-1.4c.47-.47.99-.64 1.56-.52l3.65.43c.1 1.34.02 2.65-.25 3.92a17.5 17.5 0 0 1-3.2 6.76c-.73.98-1.5 1.88-2.32 2.7a17.8 17.8 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.5 21.5 0 0 1-6.28-4.5 18 18 0 0 1-3.68-5.23 15.1 15.1 0 0 1-1.45-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.86 3.78-5.6a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.45-1.15 5.25-1.13m-.59 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.62-2.42 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.68l10.55-10.54a9 9 0 0 0-2.36-1.72 6.7 6.7 0 0 0-2.6-.8Z" clip-rule="evenodd"/><path d="M512.1 697a9.1 9.1 0 0 1 4.25-.63c1.43.1 2.86.53 4.28 1.29 1.42.72 2.77 1.73 4.07 3.03l14.78 14.78-5.6 5.59-14.77-14.78c-1.41-1.42-2.83-2.19-4.25-2.3-1.43-.14-2.81.45-4.14 1.78a8.2 8.2 0 0 0-2.06 3.37c-.4 1.28-.61 2.68-.61 4.19l16.79 16.79-5.6 5.59-23.2-23.22 3.41-3.42c.72-.72 1.54-.86 2.44-.4l2.22 1.44q0-1.395.18-2.76a12.8 12.8 0 0 1 1.86-5.2c.5-.83 1.14-1.64 1.92-2.42a11.6 11.6 0 0 1 4.03-2.72m-409.42-.7a9.1 9.1 0 0 1 4.26-.64c1.43.1 2.86.54 4.28 1.3 1.41.72 2.77 1.73 4.07 3.02l14.77 14.78-5.59 5.59-14.77-14.78c-1.42-1.41-2.84-2.18-4.26-2.3-1.43-.14-2.8.46-4.14 1.78a8.2 8.2 0 0 0-2.06 3.37c-.4 1.29-.6 2.68-.6 4.2l16.78 16.78-5.59 5.59-23.21-23.22 3.41-3.41c.73-.73 1.54-.86 2.45-.41l2.22 1.45q0-1.41.18-2.76a12.8 12.8 0 0 1 1.85-5.2c.5-.84 1.14-1.65 1.93-2.43a11.6 11.6 0 0 1 4.02-2.71m426.3-16.36 6.2-6.2 3.99 3.98-6.2 6.2 12.58 12.58a3.6 3.6 0 0 0 2.22 1.18c.76.04 1.46-.25 2.08-.86a3.9 3.9 0 0 0 1.08-1.86c.1-.27.17-.51.23-.72a1 1 0 0 1 .27-.55.85.85 0 0 1 .54-.27c.18-.03.42-.02.7.03l4.4 1.04c-.14 1.49-.56 2.94-1.27 4.34s-1.63 2.67-2.76 3.8q-3.03 3.03-6.36 2.97c-2.22-.08-4.33-1.12-6.34-3.13l-12.96-12.96-2.38 2.37c-.3.3-.65.46-1.06.48q-.6.015-1.2-.57l-2.22-2.21 3.12-4.35-5.15-7.51a1.75 1.75 0 0 1-.28-1.13c.05-.38.24-.73.57-1.07l2.9-2.9zm-409.41-.71 6.2-6.2 3.98 3.98-6.2 6.2 12.58 12.58a3.6 3.6 0 0 0 2.22 1.18c.77.04 1.46-.24 2.08-.86a3.9 3.9 0 0 0 1.09-1.86l.22-.72c.05-.23.14-.4.28-.54a.85.85 0 0 1 .54-.27c.18-.04.41-.03.7.02l4.39 1.04c-.14 1.5-.56 2.94-1.27 4.34-.7 1.4-1.63 2.67-2.76 3.8-2.02 2.03-4.14 3.01-6.36 2.97q-3.315-.12-6.33-3.12l-12.97-12.97-2.37 2.38c-.3.3-.66.46-1.07.47-.4.02-.8-.17-1.2-.56l-2.21-2.22 3.12-4.35-5.16-7.5a1.76 1.76 0 0 1-.27-1.14c.05-.38.23-.73.56-1.06l2.9-2.9 7.31 7.3Z"/><path fill-rule="evenodd" d="M282.3 506.27c2.88-.01 5.72.59 8.53 1.8q4.2 1.8 7.8 5.4c2.4 2.4 4.2 5 5.41 7.8 1.2 2.81 1.81 5.66 1.81 8.56s-.62 5.76-1.85 8.6a26.1 26.1 0 0 1-5.6 7.99l-12.46 12.46-32.72-32.72 12.47-12.46a25.7 25.7 0 0 1 8-5.57 21.3 21.3 0 0 1 8.6-1.86Zm-1.13 7.79c-1.9-.1-3.74.22-5.55.97-1.8.74-3.5 1.91-5.09 3.5l-6.36 6.37 23.04 23.03 6.35-6.36c1.6-1.6 2.77-3.3 3.51-5.09a12.6 12.6 0 0 0 1-5.52c-.1-1.9-.61-3.8-1.56-5.68a21.4 21.4 0 0 0-4.12-5.56 21.1 21.1 0 0 0-5.55-4.1q-2.85-1.455-5.67-1.56m411.25-7.79c2.88-.01 5.72.59 8.53 1.8q4.2 1.8 7.8 5.4a25 25 0 0 1 5.41 7.8c1.21 2.81 1.81 5.66 1.81 8.56s-.62 5.76-1.85 8.6a26.1 26.1 0 0 1-5.6 7.99l-12.46 12.46-32.72-32.72 12.47-12.46a25.7 25.7 0 0 1 8.01-5.57 21.3 21.3 0 0 1 8.6-1.86m-1.13 7.79c-1.89-.1-3.74.22-5.55.97-1.8.74-3.49 1.91-5.09 3.5l-6.36 6.37 23.04 23.03 6.36-6.36c1.6-1.6 2.76-3.3 3.5-5.09a12.6 12.6 0 0 0 1-5.52c-.1-1.9-.61-3.8-1.56-5.68a21.4 21.4 0 0 0-4.12-5.56 21.1 21.1 0 0 0-5.54-4.1c-1.9-.97-3.8-1.49-5.68-1.56m-375.35-26.81c1.78 0 3.57.4 5.38 1.22 1.81.78 3.56 2.01 5.23 3.69.84.84 1.33 1.5 1.45 2 .1.46-.1.95-.61 1.46L313.02 510a15.8 15.8 0 0 0 3.73 2.47c1.2.52 2.35.8 3.46.83 1.1.02 2.17-.2 3.2-.65 1.02-.49 1.99-1.18 2.9-2.08.9-.91 1.57-1.8 2-2.65.46-.88.8-1.68 1.02-2.42.25-.76.44-1.42.6-2s.42-1.05.76-1.4c.47-.46.99-.64 1.56-.52l3.65.43c.1 1.35.02 2.65-.25 3.92a17.5 17.5 0 0 1-3.2 6.76 26 26 0 0 1-2.32 2.7 17.8 17.8 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.5 21.5 0 0 1-6.28-4.5 18 18 0 0 1-3.68-5.23 15.1 15.1 0 0 1-1.45-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.86 3.78-5.6a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.45-1.15 5.25-1.13Zm-.59 6.2a5.84 5.84 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.62-2.42 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.69l10.55-10.55a9 9 0 0 0-2.36-1.72 6.65 6.65 0 0 0-2.6-.8Zm410.71-6.2c1.78 0 3.58.4 5.39 1.22 1.8.78 3.55 2.01 5.22 3.69.85.84 1.33 1.5 1.45 1.99.1.47-.1.96-.61 1.47L723.14 510a15.8 15.8 0 0 0 3.74 2.47c1.19.52 2.34.8 3.46.83 1.1.02 2.16-.2 3.19-.65 1.02-.49 1.99-1.18 2.9-2.08.9-.91 1.57-1.8 2-2.65.46-.88.8-1.68 1.03-2.42.24-.76.43-1.42.58-2 .17-.58.43-1.05.77-1.4.47-.46 1-.64 1.57-.52l3.64.43c.1 1.35.02 2.65-.25 3.92a17.5 17.5 0 0 1-3.2 6.76c-.73.98-1.5 1.88-2.32 2.7a17.8 17.8 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.5 21.5 0 0 1-6.27-4.5 18 18 0 0 1-3.7-5.23 15.1 15.1 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.79-2 2.05-3.86 3.78-5.6a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.13Zm-.59 6.2a5.84 5.84 0 0 0-2.69.43c-.9.33-1.77.91-2.6 1.74-1.62 1.62-2.43 3.35-2.45 5.2 0 1.85.72 3.74 2.15 5.69l10.55-10.55a9 9 0 0 0-2.35-1.72 6.65 6.65 0 0 0-2.6-.8Z" clip-rule="evenodd"/><path d="m355.4 489.42-5.07 5.07-32.42-14 4.61-4.62c.43-.42.87-.67 1.34-.75.48-.09.92-.03 1.31.18l16.88 7.92a47 47 0 0 1 5.32 3.1c-.55-.84-1.07-1.7-1.59-2.58-.5-.87-1-1.8-1.47-2.78l-7.83-16.97c-.2-.4-.25-.85-.18-1.31.08-.47.3-.9.68-1.27l4.41-4.41zm410.12 0-5.07 5.07-32.42-14 4.62-4.62c.42-.43.86-.67 1.33-.75.48-.09.92-.03 1.31.18l16.88 7.92a47 47 0 0 1 5.32 3.1c-.54-.84-1.07-1.7-1.58-2.58-.52-.87-1-1.8-1.48-2.78l-7.82-16.97c-.2-.4-.26-.85-.19-1.31.08-.47.3-.9.68-1.27l4.42-4.41z"/><path fill-rule="evenodd" d="M363.64 439.54c1.79 0 3.58.4 5.4 1.22 1.8.79 3.54 2.02 5.22 3.7.84.84 1.32 1.5 1.45 1.98.1.47-.1.96-.61 1.47l-14.37 14.37a15.7 15.7 0 0 0 3.73 2.47c1.2.53 2.35.8 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.98-1.18 2.89-2.08.9-.9 1.58-1.79 2.01-2.65.46-.87.8-1.68 1.02-2.42.24-.75.44-1.42.59-2 .17-.58.42-1.05.77-1.4q.705-.69 1.56-.51l3.64.43c.1 1.34.03 2.64-.25 3.91a17.5 17.5 0 0 1-3.19 6.77c-.74.98-1.51 1.87-2.33 2.69a17.8 17.8 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.5 21.5 0 0 1-6.27-4.5 18 18 0 0 1-3.69-5.23 15.1 15.1 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-1.99 2.04-3.85 3.77-5.59a16.1 16.1 0 0 1 4.76-3.35c1.7-.77 3.45-1.14 5.25-1.13Zm-.58 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.77.91-2.6 1.74-1.61 1.62-2.43 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.69L368 448.25a9 9 0 0 0-2.35-1.72 6.7 6.7 0 0 0-2.6-.79Zm410.71-6.2c1.78 0 3.57.4 5.38 1.22 1.81.79 3.56 2.02 5.23 3.7.84.84 1.33 1.5 1.45 1.98.1.47-.1.96-.61 1.47l-14.37 14.37a15.8 15.8 0 0 0 3.73 2.47c1.2.53 2.35.8 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.99-1.18 2.89-2.08s1.58-1.79 2.01-2.65c.46-.87.8-1.68 1.02-2.42.24-.75.44-1.42.6-2s.41-1.05.76-1.4q.705-.69 1.56-.51l3.64.43c.11 1.34.03 2.64-.24 3.91a17.5 17.5 0 0 1-3.2 6.77c-.73.98-1.51 1.87-2.32 2.69a17.8 17.8 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.31-.22 21.4 21.4 0 0 1-6.27-4.5 18 18 0 0 1-3.69-5.23 15.1 15.1 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-1.99 2.04-3.85 3.78-5.59a16.1 16.1 0 0 1 4.75-3.35c1.7-.77 3.45-1.14 5.25-1.13m-.6 6.2a5.85 5.85 0 0 0-2.68.43c-.9.33-1.78.91-2.6 1.74-1.62 1.62-2.43 3.35-2.45 5.2 0 1.85.72 3.74 2.15 5.69l10.54-10.55a9 9 0 0 0-2.35-1.72 6.7 6.7 0 0 0-2.6-.79Z" clip-rule="evenodd"/><path d="m397.62 447.2-5.6 5.6-33.62-33.63 5.6-5.59 33.62 33.63Zm410.12 0-5.59 5.6-33.62-33.63 5.59-5.59z"/><path fill-rule="evenodd" d="M-8.27 402.24c2.04.02 4.06.5 6.09 1.43 2.02.93 3.94 2.31 5.77 4.14a20.3 20.3 0 0 1 4.16 5.8 15 15 0 0 1 1.45 6.1c.04 2.04-.36 4.04-1.22 6.02a17.8 17.8 0 0 1-3.85 5.52 18.1 18.1 0 0 1-5.57 3.9c-1.97.85-3.99 1.27-6.04 1.24a15.6 15.6 0 0 1-6.1-1.45 20.3 20.3 0 0 1-5.8-4.17 20.2 20.2 0 0 1-4.14-5.76 15.2 15.2 0 0 1-1.43-6.1c-.01-2.03.41-4.03 1.27-6.01a18.1 18.1 0 0 1 3.9-5.57c1.71-1.72 3.55-3 5.51-3.84a14.4 14.4 0 0 1 6-1.25m-1 7.06q-3.345-.585-6.24 2.31c-1.96 1.96-2.75 4.08-2.38 6.36.38 2.24 1.81 4.61 4.3 7.1 2.5 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.46 6.32-2.42 1.93-1.93 2.7-4 2.33-6.22-.36-2.23-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.13-4.33m411.12-7.06c2.04.02 4.07.5 6.09 1.43s3.94 2.31 5.77 4.14a20.3 20.3 0 0 1 4.16 5.8 15 15 0 0 1 1.45 6.1c.04 2.04-.36 4.04-1.22 6.02a17.8 17.8 0 0 1-3.85 5.52 18.1 18.1 0 0 1-5.57 3.9 14.5 14.5 0 0 1-6.04 1.24 15.6 15.6 0 0 1-6.1-1.45 20.3 20.3 0 0 1-5.8-4.17 20.2 20.2 0 0 1-4.14-5.76 15.3 15.3 0 0 1-1.43-6.1c-.01-2.03.41-4.03 1.27-6.01a18.1 18.1 0 0 1 3.9-5.57c1.71-1.72 3.55-3 5.51-3.84a14.4 14.4 0 0 1 6-1.25m-1 7.06c-2.23-.39-4.3.38-6.24 2.31-1.96 1.96-2.75 4.08-2.38 6.36.38 2.24 1.81 4.61 4.3 7.1 2.5 2.5 4.86 3.93 7.1 4.3 2.26.35 4.36-.46 6.32-2.42 1.93-1.93 2.7-4 2.33-6.22-.36-2.23-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.13-4.33m411.12-7.06c2.04.02 4.07.5 6.09 1.43s3.94 2.31 5.77 4.14a20.3 20.3 0 0 1 4.16 5.8 15 15 0 0 1 1.45 6.1c.05 2.04-.36 4.04-1.22 6.02a17.8 17.8 0 0 1-3.85 5.52 18.1 18.1 0 0 1-5.56 3.9 14.5 14.5 0 0 1-6.04 1.24 15.6 15.6 0 0 1-6.12-1.45 20.3 20.3 0 0 1-5.79-4.17 20.2 20.2 0 0 1-4.14-5.76 15.2 15.2 0 0 1-1.42-6.1c-.02-2.03.4-4.04 1.26-6.01a18.1 18.1 0 0 1 3.9-5.57c1.71-1.72 3.56-3 5.52-3.84a14.4 14.4 0 0 1 6-1.25Zm-1 7.06c-2.23-.4-4.3.38-6.24 2.31q-2.94 2.94-2.37 6.36c.37 2.24 1.8 4.61 4.3 7.1 2.48 2.5 4.85 3.93 7.1 4.3 2.25.35 4.35-.46 6.31-2.42 1.93-1.93 2.71-4 2.33-6.22-.36-2.24-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.12-4.33ZM13.35 375.64c1.58-.52 3.26-.66 5.02-.4a15 15 0 0 1 5.48 1.94 25.8 25.8 0 0 1 5.68 4.42 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.83 5.86c.22 1.94.03 3.84-.59 5.7a13 13 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.92 2.74-1.33.51-2.7.78-4.14.8l9.5 9.5-5.58 5.58-30.8-30.79 3.42-3.42c.72-.72 1.54-.86 2.44-.4l2.6 1.7c-.12-2.03.1-3.98.64-5.85a12.3 12.3 0 0 1 3.25-5.25 10.7 10.7 0 0 1 4.26-2.67m3.4 7.25c-1-.19-1.93-.12-2.79.2-.85.3-1.64.82-2.38 1.56a7.9 7.9 0 0 0-2.21 3.71c-.34 1.3-.42 2.75-.25 4.37l10.4 10.4c1.4.14 2.64 0 3.7-.42a8.8 8.8 0 0 0 2.91-1.97 7.6 7.6 0 0 0 1.81-2.76c.36-1 .46-2.05.27-3.17a10 10 0 0 0-1.33-3.55 20 20 0 0 0-3.12-3.9 21 21 0 0 0-3.78-3.1 9.2 9.2 0 0 0-3.24-1.37Zm406.72-7.25c1.58-.52 3.26-.66 5.02-.4a15 15 0 0 1 5.48 1.94 25.8 25.8 0 0 1 5.68 4.42 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.83 5.86c.22 1.94.03 3.84-.59 5.7a12.96 12.96 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.92 2.74-1.32.51-2.7.78-4.14.8l9.5 9.5-5.58 5.58-30.8-30.79 3.42-3.42c.72-.72 1.54-.86 2.44-.4l2.6 1.7c-.12-2.03.1-3.98.64-5.85a12.3 12.3 0 0 1 3.26-5.25 10.7 10.7 0 0 1 4.25-2.67m3.4 7.25c-1-.19-1.93-.12-2.79.2-.84.3-1.64.82-2.38 1.56a7.9 7.9 0 0 0-2.21 3.71c-.33 1.3-.42 2.75-.25 4.37l10.4 10.4c1.41.14 2.64 0 3.7-.42a8.85 8.85 0 0 0 2.92-1.97 7.6 7.6 0 0 0 1.8-2.76c.37-1 .46-2.05.28-3.17a10 10 0 0 0-1.34-3.55 20 20 0 0 0-3.12-3.9 21 21 0 0 0-3.78-3.1 9.2 9.2 0 0 0-3.24-1.37Zm406.73-7.25c1.57-.52 3.25-.66 5.01-.4 1.77.22 3.6.87 5.48 1.94a25.8 25.8 0 0 1 5.68 4.42 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.83 5.86c.23 1.94.03 3.84-.59 5.7a13 13 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.91 2.74-1.33.51-2.71.78-4.14.8l9.5 9.5-5.6 5.58-30.79-30.79 3.42-3.42c.72-.72 1.54-.86 2.44-.4l2.6 1.7c-.12-2.03.1-3.98.64-5.85a12.3 12.3 0 0 1 3.26-5.25 10.66 10.66 0 0 1 4.25-2.67Zm3.39 7.25c-1-.19-1.93-.12-2.79.2q-1.26.45-2.37 1.56a7.9 7.9 0 0 0-2.22 3.71c-.33 1.3-.42 2.75-.25 4.37l10.4 10.4c1.41.14 2.64 0 3.7-.42a8.8 8.8 0 0 0 2.92-1.97 7.6 7.6 0 0 0 1.8-2.76c.37-1 .46-2.05.28-3.17a10 10 0 0 0-1.34-3.55 20 20 0 0 0-3.12-3.9 21 21 0 0 0-3.78-3.1 9.2 9.2 0 0 0-3.23-1.38Z" clip-rule="evenodd"/><path d="M51.15 337.57c1.39-.6 2.8-.87 4.23-.8 1.44.08 2.87.49 4.3 1.23 1.45.72 2.88 1.79 4.28 3.19l14.77 14.77-5.58 5.6-14.78-14.78c-1.48-1.48-2.91-2.26-4.3-2.35-1.4-.1-2.73.46-3.98 1.71a5.48 5.48 0 0 0-1.74 4.05c0 .73.17 1.48.52 2.25.34.76.88 1.51 1.6 2.24l14.78 14.77-5.61 5.61-14.78-14.77c-1.55-1.56-3-2.37-4.34-2.45-1.33-.09-2.6.47-3.8 1.68a6.4 6.4 0 0 0-1.68 2.9c-.3 1.08-.4 2.27-.31 3.57l16.99 17-5.59 5.58-23.22-23.21 3.42-3.42c.72-.73 1.54-.86 2.44-.4l2.09 1.35c-.05-.86-.04-1.7.02-2.51a10.75 10.75 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.17 3.49.17 5.27 1.01a10.3 10.3 0 0 1-.18-6.47q.45-1.5 1.29-2.82c.57-.91 1.23-1.73 1.97-2.47a13.1 13.1 0 0 1 4-2.83m410.12 0c1.4-.6 2.8-.87 4.24-.8 1.43.08 2.86.49 4.3 1.23 1.44.72 2.87 1.79 4.27 3.19l14.78 14.77-5.6 5.6-14.77-14.78c-1.48-1.48-2.9-2.26-4.3-2.35-1.4-.1-2.73.46-3.98 1.71a5.48 5.48 0 0 0-1.74 4.05c0 .73.17 1.48.52 2.25.35.76.88 1.51 1.6 2.24l14.78 14.77-5.61 5.61-14.78-14.77c-1.55-1.56-3-2.37-4.34-2.45-1.33-.09-2.6.47-3.8 1.68a6.37 6.37 0 0 0-1.68 2.9c-.3 1.08-.4 2.27-.31 3.57l16.99 17-5.59 5.58-23.21-23.21 3.41-3.42c.73-.73 1.54-.86 2.44-.4l2.09 1.35c-.05-.86-.04-1.7.02-2.51a10.77 10.77 0 0 1 3.12-6.83 7.56 7.56 0 0 1 4.8-2.4c1.73-.17 3.5.17 5.27 1.01a10.32 10.32 0 0 1-.18-6.47q.45-1.5 1.29-2.82a14.33 14.33 0 0 1 5.97-5.3"/><path fill-rule="evenodd" d="M80.81 312.25c1.78 0 3.58.41 5.39 1.23 1.8.78 3.55 2.01 5.22 3.68.85.85 1.33 1.51 1.45 2q.15.69-.6 1.47l-14.38 14.36a15.8 15.8 0 0 0 3.74 2.47c1.19.53 2.34.8 3.46.84 1.1.01 2.16-.2 3.19-.66 1.02-.48 1.99-1.18 2.9-2.08.9-.9 1.57-1.79 2-2.65.46-.87.8-1.68 1.03-2.42.24-.75.43-1.42.59-1.99.16-.59.42-1.06.77-1.4.46-.47.98-.64 1.56-.52l3.64.43c.1 1.34.02 2.64-.25 3.91a17.5 17.5 0 0 1-3.19 6.77c-.74.98-1.52 1.88-2.33 2.69a17.8 17.8 0 0 1-5.3 3.71 14.54 14.54 0 0 1-12.3-.22 21.5 21.5 0 0 1-6.27-4.5 18 18 0 0 1-3.7-5.24A15.1 15.1 0 0 1 66 328.3c-.07-2 .27-4 1.04-5.98.79-1.99 2.05-3.85 3.78-5.59a16 16 0 0 1 4.75-3.35c1.7-.76 3.46-1.14 5.25-1.13Zm-.59 6.2a5.85 5.85 0 0 0-2.69.43c-.9.34-1.77.92-2.6 1.75-1.62 1.61-2.43 3.35-2.45 5.2 0 1.84.72 3.73 2.15 5.68l10.55-10.55a9 9 0 0 0-2.35-1.71 6.7 6.7 0 0 0-2.6-.8Zm410.71-6.2c1.78 0 3.58.41 5.39 1.23 1.8.78 3.55 2.01 5.23 3.68.84.85 1.32 1.51 1.44 2q.15.69-.6 1.47L488 334.99a15.7 15.7 0 0 0 3.74 2.47c1.19.53 2.35.8 3.46.84 1.1.01 2.17-.2 3.2-.66 1.02-.48 1.98-1.18 2.89-2.08.9-.9 1.57-1.79 2.01-2.65.45-.87.8-1.68 1.02-2.42.24-.75.44-1.42.59-1.99.16-.59.42-1.06.77-1.4.46-.47.99-.64 1.56-.52l3.64.43c.1 1.34.02 2.64-.25 3.91a17.5 17.5 0 0 1-3.19 6.77 26 26 0 0 1-2.33 2.69 17.8 17.8 0 0 1-5.3 3.71 14.54 14.54 0 0 1-12.3-.22 21.5 21.5 0 0 1-6.27-4.5 18 18 0 0 1-3.69-5.24 15.1 15.1 0 0 1-1.45-5.83c-.07-2 .27-4 1.04-5.98.79-1.99 2.05-3.85 3.78-5.59a16.1 16.1 0 0 1 4.75-3.35c1.7-.76 3.46-1.14 5.25-1.13Zm-.58 6.2a5.85 5.85 0 0 0-2.7.43c-.9.34-1.77.92-2.6 1.75-1.61 1.61-2.43 3.35-2.44 5.2 0 1.84.71 3.73 2.15 5.68l10.54-10.55a9 9 0 0 0-2.35-1.71 6.7 6.7 0 0 0-2.6-.8" clip-rule="evenodd"/><path d="M101.98 286.88a9.1 9.1 0 0 1 4.25-.63c1.43.1 2.86.53 4.28 1.29 1.41.72 2.77 1.73 4.07 3.03l14.78 14.78-5.6 5.58L109 296.16c-1.42-1.42-2.83-2.19-4.25-2.31-1.44-.14-2.82.46-4.14 1.79a8.2 8.2 0 0 0-2.06 3.37c-.41 1.28-.61 2.68-.61 4.19l16.79 16.79-5.6 5.58-23.2-23.21 3.4-3.42c.73-.72 1.55-.86 2.45-.4l2.22 1.44q0-1.395.18-2.76a12.8 12.8 0 0 1 1.86-5.2c.5-.83 1.13-1.64 1.92-2.42a11.6 11.6 0 0 1 4.03-2.72Zm410.12 0a9.1 9.1 0 0 1 4.25-.63c1.43.1 2.86.53 4.28 1.29 1.42.72 2.77 1.73 4.07 3.03l14.78 14.78-5.6 5.58-14.77-14.77c-1.41-1.42-2.83-2.19-4.25-2.31-1.43-.14-2.81.46-4.14 1.79a8.2 8.2 0 0 0-2.06 3.37c-.4 1.28-.61 2.68-.61 4.19l16.79 16.79-5.6 5.58-23.2-23.21 3.41-3.42c.72-.72 1.54-.86 2.44-.4l2.22 1.44q0-1.395.18-2.76a12.8 12.8 0 0 1 1.86-5.2c.5-.83 1.14-1.64 1.92-2.42a11.6 11.6 0 0 1 4.03-2.72m-393.24-17.07 6.2-6.2 3.98 3.99-6.2 6.2 12.59 12.58a3.6 3.6 0 0 0 2.21 1.17c.77.05 1.47-.24 2.08-.86a3.9 3.9 0 0 0 1.09-1.85c.1-.27.17-.51.23-.72a1 1 0 0 1 .27-.55.85.85 0 0 1 .54-.27c.18-.03.42-.02.7.02l4.4 1.04c-.14 1.5-.57 2.94-1.27 4.35-.71 1.4-1.63 2.67-2.77 3.8-2.02 2.02-4.14 3-6.35 2.96-2.22-.07-4.33-1.11-6.34-3.12l-12.96-12.96-2.38 2.37c-.3.3-.66.46-1.06.48q-.615.015-1.2-.57l-2.22-2.22 3.12-4.34-5.16-7.51a1.76 1.76 0 0 1-.27-1.14c.05-.37.23-.73.57-1.06l2.9-2.9zm410.12 0 6.2-6.2 3.99 3.99-6.2 6.2 12.58 12.58a3.6 3.6 0 0 0 2.21 1.17c.77.05 1.47-.24 2.09-.86a3.9 3.9 0 0 0 1.08-1.85c.1-.27.17-.51.23-.72a1 1 0 0 1 .27-.55.85.85 0 0 1 .54-.27c.18-.03.42-.02.7.02l4.4 1.04c-.14 1.5-.56 2.95-1.27 4.35s-1.63 2.67-2.76 3.8c-2.02 2.02-4.14 3-6.36 2.96-2.22-.07-4.33-1.11-6.34-3.12l-12.96-12.96-2.38 2.37c-.3.3-.65.46-1.06.48q-.6.015-1.2-.57l-2.22-2.22 3.12-4.34-5.15-7.51a1.75 1.75 0 0 1-.28-1.14c.05-.37.24-.73.57-1.06l2.9-2.9z"/><path fill-rule="evenodd" d="M691.71 96.86c2.88-.02 5.73.58 8.53 1.79q4.2 1.8 7.8 5.4c2.4 2.4 4.2 5 5.42 7.81 1.2 2.8 1.8 5.66 1.8 8.55 0 2.9-.61 5.77-1.85 8.6a26.1 26.1 0 0 1-5.59 7.99l-12.47 12.47-32.72-32.72 12.47-12.47a25.6 25.6 0 0 1 8.01-5.57 21.3 21.3 0 0 1 8.6-1.85m-1.13 7.78c-1.89-.1-3.73.22-5.54.98-1.8.73-3.5 1.9-5.1 3.5l-6.35 6.36 23.03 23.04 6.36-6.36c1.6-1.6 2.77-3.3 3.5-5.1a12.6 12.6 0 0 0 1-5.52c-.09-1.9-.6-3.79-1.56-5.67a21.4 21.4 0 0 0-4.12-5.57 21.1 21.1 0 0 0-5.54-4.1c-1.9-.96-3.8-1.48-5.68-1.56M282.3 96.15c2.88-.01 5.72.58 8.53 1.79 2.8 1.2 5.4 3.01 7.8 5.4a25 25 0 0 1 5.41 7.81c1.2 2.8 1.81 5.66 1.81 8.56s-.62 5.76-1.85 8.6a26.1 26.1 0 0 1-5.6 7.98l-12.46 12.47-32.72-32.72 12.47-12.47a25.6 25.6 0 0 1 8-5.56 21.3 21.3 0 0 1 8.6-1.86Zm-1.13 7.79c-1.9-.11-3.74.21-5.55.97-1.8.74-3.5 1.9-5.09 3.5l-6.36 6.37 23.04 23.03 6.35-6.36c1.6-1.6 2.77-3.3 3.51-5.09a12.6 12.6 0 0 0 1-5.52c-.1-1.9-.61-3.8-1.56-5.68a21.4 21.4 0 0 0-4.12-5.57 21.1 21.1 0 0 0-5.55-4.1c-1.9-.96-3.79-1.48-5.67-1.55m444.18-26.11c1.78 0 3.58.41 5.39 1.23 1.8.78 3.55 2.01 5.23 3.68.84.85 1.32 1.51 1.44 2q.15.69-.6 1.47l-14.38 14.37a15.8 15.8 0 0 0 3.74 2.46c1.19.53 2.34.8 3.46.84 1.1.01 2.16-.2 3.2-.66a10.3 10.3 0 0 0 2.89-2.08c.9-.9 1.57-1.79 2.01-2.65.45-.87.8-1.68 1.02-2.42.24-.75.44-1.42.59-1.99.16-.59.42-1.06.77-1.4.47-.47.99-.64 1.56-.52l3.64.43c.1 1.34.02 2.64-.25 3.91a17.5 17.5 0 0 1-3.19 6.77 26 26 0 0 1-2.33 2.69 17.8 17.8 0 0 1-5.3 3.71 14.54 14.54 0 0 1-12.3-.23 21.5 21.5 0 0 1-6.27-4.5 18 18 0 0 1-3.69-5.22 15.1 15.1 0 0 1-1.45-5.84c-.07-2 .27-4 1.04-5.98.79-1.99 2.05-3.85 3.78-5.59a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.14m-.59 6.2a5.85 5.85 0 0 0-2.69.43c-.9.34-1.77.92-2.6 1.75-1.61 1.61-2.43 3.35-2.44 5.2 0 1.84.71 3.73 2.15 5.68l10.54-10.54a9 9 0 0 0-2.35-1.72 6.7 6.7 0 0 0-2.6-.8Zm-408.82-6.9c1.78 0 3.57.4 5.38 1.22 1.81.78 3.56 2.01 5.23 3.69.84.84 1.33 1.5 1.45 1.99.1.47-.1.96-.61 1.47l-14.37 14.37a15.7 15.7 0 0 0 3.73 2.46c1.2.53 2.35.81 3.46.84 1.1.02 2.17-.2 3.2-.66a10.3 10.3 0 0 0 2.9-2.08c.9-.9 1.57-1.78 2-2.64q.69-1.32 1.02-2.43c.25-.75.44-1.41.6-1.99s.42-1.05.76-1.4c.47-.47.99-.64 1.56-.52l3.65.43c.1 1.34.02 2.65-.25 3.91a17.5 17.5 0 0 1-3.2 6.77 26 26 0 0 1-2.32 2.7 17.8 17.8 0 0 1-5.3 3.7 14.54 14.54 0 0 1-12.3-.22 21.5 21.5 0 0 1-6.28-4.5 18 18 0 0 1-3.68-5.23 15.1 15.1 0 0 1-1.45-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.86 3.78-5.6a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.45-1.15 5.25-1.13m-.59 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.61-2.42 3.35-2.44 5.2 0 1.84.72 3.74 2.15 5.68l10.55-10.54a9 9 0 0 0-2.36-1.72 6.7 6.7 0 0 0-2.6-.8Z" clip-rule="evenodd"/><path d="m764.82 80-5.07 5.08-32.43-14.01 4.62-4.62c.42-.42.86-.67 1.33-.74.49-.1.92-.03 1.32.18l16.87 7.92a47 47 0 0 1 5.32 3.1 74 74 0 0 1-1.58-2.58c-.51-.88-1-1.8-1.47-2.79l-7.83-16.97c-.2-.4-.26-.84-.18-1.3.07-.48.3-.9.68-1.28l4.4-4.4L764.83 80Zm-409.42-.7-5.07 5.07-32.42-14 4.61-4.62c.43-.43.87-.68 1.34-.75.48-.1.92-.03 1.31.18l16.88 7.92a47 47 0 0 1 5.32 3.1c-.55-.85-1.07-1.7-1.59-2.58-.5-.87-1-1.8-1.47-2.78l-7.83-16.97c-.2-.41-.25-.85-.18-1.32.08-.46.3-.89.68-1.26l4.41-4.42z"/><path fill-rule="evenodd" d="M773.06 30.13c1.78 0 3.58.4 5.39 1.22 1.8.78 3.55 2.01 5.22 3.69.85.84 1.33 1.5 1.45 1.99.1.47-.1.96-.61 1.47l-14.37 14.37a15.8 15.8 0 0 0 3.74 2.46c1.19.53 2.34.81 3.46.84 1.1.02 2.16-.2 3.19-.66 1.02-.48 1.99-1.17 2.9-2.08.9-.9 1.57-1.78 2-2.64.46-.88.8-1.69 1.03-2.43.24-.75.43-1.41.58-1.99.17-.58.43-1.05.77-1.4.47-.47 1-.64 1.57-.52l3.64.43c.1 1.34.02 2.65-.25 3.91a17.5 17.5 0 0 1-3.2 6.77c-.73.98-1.5 1.88-2.32 2.7a17.8 17.8 0 0 1-5.3 3.7 14.55 14.55 0 0 1-12.3-.22 21.4 21.4 0 0 1-6.27-4.5 18 18 0 0 1-3.7-5.23 15.1 15.1 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.05-3.86 3.78-5.6a16.1 16.1 0 0 1 4.75-3.34c1.7-.77 3.46-1.15 5.25-1.13m-.59 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.76.91-2.6 1.74-1.6 1.61-2.42 3.35-2.44 5.2 0 1.84.72 3.74 2.15 5.68l10.55-10.54a9 9 0 0 0-2.36-1.72 6.7 6.7 0 0 0-2.6-.8Zm-408.83-6.91c1.79 0 3.58.4 5.4 1.22q2.7 1.185 5.22 3.69c.84.85 1.32 1.5 1.45 2 .1.46-.1.95-.61 1.46l-14.37 14.37a15.8 15.8 0 0 0 3.73 2.47c1.2.52 2.35.8 3.46.83 1.1.02 2.17-.2 3.2-.65 1.02-.48 1.98-1.18 2.89-2.08.9-.9 1.58-1.8 2.01-2.65.46-.88.8-1.68 1.02-2.42.24-.76.44-1.42.59-2 .17-.58.42-1.05.77-1.4.47-.46.99-.64 1.56-.52l3.64.43c.1 1.35.03 2.65-.25 3.92a17.5 17.5 0 0 1-3.19 6.76c-.74.98-1.51 1.88-2.33 2.7a17.8 17.8 0 0 1-5.3 3.7 14.55 14.55 0 0 1-12.3-.22 21.4 21.4 0 0 1-6.27-4.5 18 18 0 0 1-3.69-5.23 15.1 15.1 0 0 1-1.44-5.84c-.08-2 .27-4 1.04-5.97.78-2 2.04-3.85 3.77-5.59a16.1 16.1 0 0 1 4.76-3.35c1.7-.77 3.45-1.14 5.25-1.13Zm-.58 6.2a5.85 5.85 0 0 0-2.7.43c-.9.33-1.77.91-2.6 1.74-1.61 1.62-2.43 3.35-2.44 5.2 0 1.85.72 3.74 2.15 5.69L368 38.13a9 9 0 0 0-2.35-1.72 6.7 6.7 0 0 0-2.6-.79Z" clip-rule="evenodd"/><path d="m807.03 37.79-5.59 5.59-33.62-33.63 5.59-5.58zm-409.41-.71-5.6 5.6L358.4 9.04l5.6-5.6 33.62 33.63Z"/><path fill-rule="evenodd" d="M-7.56-7.17c2.03.01 4.06.49 6.08 1.42C.54-4.8 2.47-3.43 4.3-1.6a20.3 20.3 0 0 1 4.17 5.8 15 15 0 0 1 1.44 6.1c.05 2.04-.36 4.05-1.22 6.02a17.8 17.8 0 0 1-3.84 5.53 18.1 18.1 0 0 1-5.57 3.89c-1.98.86-3.99 1.27-6.04 1.24a15.6 15.6 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.13-5.77 15.25 15.25 0 0 1-1.43-6.09c-.01-2.03.4-4.04 1.27-6.02a18.1 18.1 0 0 1 3.89-5.56c1.72-1.72 3.56-3 5.52-3.85a14.4 14.4 0 0 1 6-1.24Zm-1 7.06c-2.23-.4-4.31.37-6.24 2.3-1.97 1.97-2.76 4.09-2.38 6.36.38 2.25 1.81 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.93 2.7-4 2.33-6.23-.36-2.23-1.8-4.6-4.3-7.1S-6.31.26-8.56-.11m819.83-7.06c2.03.01 4.06.49 6.08 1.42 2.02.94 3.95 2.32 5.77 4.14a20.3 20.3 0 0 1 4.17 5.8 15 15 0 0 1 1.44 6.1c.05 2.04-.36 4.05-1.22 6.02a17.8 17.8 0 0 1-3.84 5.53 18.1 18.1 0 0 1-5.57 3.89 14.5 14.5 0 0 1-6.04 1.24 15.6 15.6 0 0 1-6.11-1.45 20.3 20.3 0 0 1-5.8-4.16 20.2 20.2 0 0 1-4.13-5.77 15.3 15.3 0 0 1-1.43-6.09c-.02-2.03.4-4.04 1.27-6.02a18.1 18.1 0 0 1 3.89-5.56c1.72-1.72 3.56-3 5.52-3.85a14.4 14.4 0 0 1 6-1.24m-1 7.06c-2.23-.4-4.31.37-6.25 2.3q-2.94 2.955-2.37 6.36c.38 2.25 1.8 4.62 4.3 7.1 2.49 2.5 4.86 3.93 7.1 4.3 2.25.35 4.36-.45 6.32-2.41 1.93-1.93 2.7-4 2.33-6.23s-1.8-4.6-4.3-7.1-4.88-3.95-7.13-4.32M401.85-7.88c2.04.01 4.07.49 6.09 1.43 2.02.93 3.94 2.31 5.77 4.14a20.3 20.3 0 0 1 4.16 5.79 15 15 0 0 1 1.45 6.1c.04 2.04-.36 4.05-1.22 6.03a17.8 17.8 0 0 1-3.85 5.52 18.1 18.1 0 0 1-5.57 3.89 14.5 14.5 0 0 1-6.04 1.24 15.6 15.6 0 0 1-6.1-1.44 20.3 20.3 0 0 1-5.8-4.17 20.2 20.2 0 0 1-4.14-5.77 15.3 15.3 0 0 1-1.43-6.08c-.01-2.04.41-4.05 1.27-6.02a18.1 18.1 0 0 1 3.9-5.57c1.71-1.72 3.55-3 5.51-3.85a14.4 14.4 0 0 1 6-1.24m-1 7.06c-2.23-.4-4.3.38-6.24 2.3-1.96 1.97-2.75 4.09-2.38 6.37.38 2.24 1.81 4.61 4.3 7.1 2.5 2.49 4.86 3.92 7.1 4.3 2.26.35 4.36-.46 6.32-2.42 1.93-1.93 2.7-4 2.33-6.22-.36-2.24-1.8-4.6-4.3-7.1-2.5-2.51-4.88-3.95-7.13-4.33M14.06-33.77c1.58-.53 3.25-.66 5.02-.4a15 15 0 0 1 5.47 1.94 25.8 25.8 0 0 1 5.68 4.41 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.84 5.86c.22 1.95.03 3.85-.6 5.7a13 13 0 0 1-3.2 5.03c-1.3 1.3-2.6 2.2-3.92 2.74-1.33.5-2.7.77-4.14.79l9.5 9.5-5.59 5.59-30.8-30.8L.87-21.3c.73-.73 1.54-.86 2.45-.41l2.6 1.7c-.12-2.02.1-3.97.63-5.84A12.3 12.3 0 0 1 9.8-31.1a10.7 10.7 0 0 1 4.26-2.67m3.39 7.24c-1-.18-1.92-.11-2.78.2-.85.3-1.64.83-2.38 1.57a7.9 7.9 0 0 0-2.22 3.7c-.33 1.3-.41 2.76-.25 4.37L20.23-6.28c1.4.14 2.64 0 3.7-.43a8.8 8.8 0 0 0 2.91-1.97 7.55 7.55 0 0 0 1.81-2.76c.36-1 .45-2.05.27-3.17a10 10 0 0 0-1.33-3.55 20 20 0 0 0-3.13-3.89 21 21 0 0 0-3.77-3.1 9.2 9.2 0 0 0-3.24-1.38m406.02-7.95c1.58-.53 3.26-.66 5.02-.4a15 15 0 0 1 5.48 1.94 25.8 25.8 0 0 1 5.68 4.41 22.5 22.5 0 0 1 4.12 5.52 16.5 16.5 0 0 1 1.83 5.87c.22 1.94.03 3.84-.59 5.7a12.96 12.96 0 0 1-3.21 5.02c-1.3 1.3-2.6 2.21-3.92 2.74-1.32.51-2.7.78-4.14.8l9.5 9.5-5.58 5.58-30.8-30.8 3.42-3.4c.72-.73 1.54-.87 2.44-.42l2.6 1.7c-.12-2.02.1-3.97.64-5.84a12.3 12.3 0 0 1 3.26-5.25 10.7 10.7 0 0 1 4.25-2.67m3.4 7.24c-1-.18-1.93-.11-2.79.2-.84.3-1.64.83-2.38 1.57a7.9 7.9 0 0 0-2.21 3.7c-.33 1.3-.42 2.76-.25 4.38L429.64-7c1.41.14 2.64 0 3.7-.42a8.8 8.8 0 0 0 2.92-1.97 7.6 7.6 0 0 0 1.8-2.76c.37-1 .46-2.06.28-3.17a10 10 0 0 0-1.34-3.55 20 20 0 0 0-3.12-3.9 21 21 0 0 0-3.78-3.1 9.2 9.2 0 0 0-3.24-1.38Z" clip-rule="evenodd"/></g><defs><clipPath id="a"><path d="M0 0h819v819H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx
index 367ac4ab2fa..df57598e9bd 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/ColumnFormattingAction/ColumnFormattingAction.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import { Box } from "metabase/ui";
import ChartSettingsWidget from "metabase/visualizations/components/ChartSettingsWidget";
import { updateSettings } from "metabase/visualizations/lib/settings";
-import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";
+import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/widgets";
import type {
ClickActionPopoverProps,
LegacyDrill,
diff --git a/frontend/src/metabase/visualizations/click-actions/lib/dashboard-click-drill.js b/frontend/src/metabase/visualizations/click-actions/lib/dashboard-click-drill.js
index 689fe04d1ee..bdee9a826b5 100644
--- a/frontend/src/metabase/visualizations/click-actions/lib/dashboard-click-drill.js
+++ b/frontend/src/metabase/visualizations/click-actions/lib/dashboard-click-drill.js
@@ -5,10 +5,10 @@ import _ from "underscore";
import {
formatSourceForTarget,
- getDataFromClicked,
getTargetForQueryParams,
} from "metabase/parameters/utils/click-behavior";
import * as Urls from "metabase/urls";
+import { getDataFromClicked } from "metabase/visualizations/lib/formatting/click-data";
import { renderLinkURLForClick } from "metabase/visualizations/lib/formatting/link";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx
index 6912b593a7a..0cf58db77f7 100644
--- a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx
@@ -5,12 +5,10 @@ import _ from "underscore";
import CS from "metabase/css/core/index.css";
import { Stack, Tabs } from "metabase/ui";
import { updateSeriesColor } from "metabase/visualizations/lib/series";
-import {
- getComputedSettings,
- getSettingsWidgets,
-} from "metabase/visualizations/lib/settings";
+import { getComputedSettings } from "metabase/visualizations/lib/settings";
import { getSettingDefinitionsForColumn } from "metabase/visualizations/lib/settings/column";
import { keyForSingleSeries } from "metabase/visualizations/lib/settings/series";
+import { getSettingsWidgets } from "metabase/visualizations/lib/widgets";
import { SERIES_SETTING_KEY } from "metabase/visualizations/shared/settings/series";
import type { Widget } from "metabase/visualizations/types";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsx
index 21e8780fc32..14f4119192c 100644
--- a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.unit.spec.tsx
@@ -1,7 +1,7 @@
import { addLocale, useLocale } from "ttag";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Widget } from "metabase/visualizations/types";
import { createMockCard, createMockDataset } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/hooks.ts b/frontend/src/metabase/visualizations/components/ChartSettings/hooks.ts
index 99ca84be8e7..8690f48d669 100644
--- a/frontend/src/metabase/visualizations/components/ChartSettings/hooks.ts
+++ b/frontend/src/metabase/visualizations/components/ChartSettings/hooks.ts
@@ -7,7 +7,7 @@ import {
getVisualizationTransformed,
} from "metabase/visualizations";
import { updateSettings } from "metabase/visualizations/lib/settings";
-import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";
+import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/widgets";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type {
SettingsExtra,
diff --git a/frontend/src/metabase/visualizations/components/ColumnSettings.jsx b/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
index 25fede37ea9..554b3844e1f 100644
--- a/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
+++ b/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
@@ -4,11 +4,9 @@ import { t } from "ttag";
import NoResults from "assets/img/no_results.svg";
import { EmptyState } from "metabase/common/components/EmptyState";
import ChartSettingsWidget from "metabase/visualizations/components/ChartSettingsWidget";
-import {
- getComputedSettings,
- getSettingsWidgets,
-} from "metabase/visualizations/lib/settings";
+import { getComputedSettings } from "metabase/visualizations/lib/settings";
import { getSettingDefinitionsForColumn } from "metabase/visualizations/lib/settings/column";
+import { getSettingsWidgets } from "metabase/visualizations/lib/widgets";
function getWidgets({
column,
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
index 5a177cf46a2..4c76bd173a1 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
@@ -14,7 +14,7 @@ import { getMetadata } from "metabase/selectors/metadata";
import { checkNotNull } from "metabase/utils/types";
import { ObjectDetail } from "metabase/visualizations/components/ObjectDetail/ObjectDetail";
import type { ObjectDetailProps } from "metabase/visualizations/components/ObjectDetail/types";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { createMockCard } from "metabase-types/api/mocks";
import { createProductsTable } from "metabase-types/api/mocks/presets";
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization-object.unit.spec.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization-object.unit.spec.tsx
index ce6ce93f2b3..6940064c25d 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization-object.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization-object.unit.spec.tsx
@@ -4,7 +4,7 @@ import {
} from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
import Visualization from "metabase/visualizations/components/Visualization";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { FieldVisibilityType } from "metabase-types/api";
import {
createMockColumn,
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization-themed.unit.spec.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization-themed.unit.spec.tsx
index 05fa2cafd0e..4c137f639ae 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization-themed.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization-themed.unit.spec.tsx
@@ -2,7 +2,7 @@ import { renderWithProviders, screen } from "__support__/ui";
import { delay } from "__support__/utils";
import { NumberColumn, StringColumn } from "__support__/visualizations";
import { getColorShades } from "metabase/ui/utils/colors";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Series } from "metabase-types/api";
import { createMockCard } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx
index aa7683c749c..4e93d234208 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx
@@ -7,7 +7,7 @@ import { createMockState } from "metabase/redux/store/mocks";
import { color } from "metabase/ui/colors";
import { registerVisualization } from "metabase/visualizations";
import VisualizationComponent from "metabase/visualizations/components/Visualization";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { VisualizationProps } from "metabase/visualizations/types";
import type {
RawSeries,
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.unit.spec.tsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.unit.spec.tsx
index ca88371e765..72393917923 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.unit.spec.tsx
@@ -6,7 +6,7 @@ import {
within,
} from "__support__/ui";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { Series } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.unit.spec.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.unit.spec.tsx
index 922762b51ad..1975cb23f6d 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
// these tests use QuestionChartSettings directly, but logic we're testing lives in ChartSettingFieldPicker
import { renderWithProviders, screen, within } from "__support__/ui";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { DatasetColumn, Series } from "metabase-types/api";
import {
createMockColumn,
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.tsx
index 9c517bc341f..b8e61136423 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.tsx
@@ -3,34 +3,38 @@ import { Component, type ComponentType } from "react";
import _ from "underscore";
import { updateSettings } from "metabase/visualizations/lib/settings";
-import type { CompleteVisualizationSettingDefinition } from "metabase/visualizations/types";
+import { getSettingsWidgets } from "metabase/visualizations/lib/widgets";
+import type {
+ ComputedVisualizationSettings,
+ VisualizationSettingsDefinitions,
+} from "metabase/visualizations/types";
import type { Series, VisualizationSettings } from "metabase-types/api";
import ChartSettingsWidget from "../ChartSettingsWidget";
-type ChartSettingNestedSettingsConfig<T> = {
+type ChartSettingNestedSettingsProps<T> = {
+ series: Series;
+ objects: T[];
+ value?: Record<string, VisualizationSettings>;
+ onChange: (value: Record<string, VisualizationSettings>) => void;
+ initialKey?: string | null;
+ onEndShowWidget?: () => void;
+ extra?: any;
getObjectKey: (object: T) => string;
getObjectSettings: (
allStoredSettings: Record<string, VisualizationSettings>,
object: T,
) => any;
- getSettingsWidgetsForObject: (
+ getSettingDefinitionsForObject: (
+ series: Series,
+ object: T,
+ ) => VisualizationSettingsDefinitions;
+ getComputedSettingsForObject: (
series: Series,
object: T,
storedSettings: VisualizationSettings,
- onChangeSettings: (newSettings: Partial<VisualizationSettings>) => void,
extra: any,
- ) => CompleteVisualizationSettingDefinition<T>[];
-};
-
-type ChartSettingNestedSettingsProps<T> = {
- series: Series;
- objects: T[];
- value?: Record<string, VisualizationSettings>;
- onChange: (value: Record<string, VisualizationSettings>) => void;
- initialKey?: string | null;
- onEndShowWidget?: () => void;
- extra?: any;
+ ) => ComputedVisualizationSettings;
};
type ChartSettingNestedSettingsState = {
@@ -40,126 +44,158 @@ type ChartSettingNestedSettingsState = {
/**
* @deprecated HOCs are deprecated
*/
-export const chartSettingNestedSettings = <T,>({
- getObjectKey,
- getObjectSettings,
- getSettingsWidgetsForObject,
-}: ChartSettingNestedSettingsConfig<T>) => {
- return (ComposedComponent: ComponentType<any>): ComponentType<any> => {
- const Wrapped = class extends Component<
- ChartSettingNestedSettingsProps<T> & Record<string, unknown>,
- ChartSettingNestedSettingsState
- > {
- state: ChartSettingNestedSettingsState = {};
+export const chartSettingNestedSettings = <T,>(
+ ComposedComponent: ComponentType<any>,
+): ComponentType<any> =>
+ class extends Component<
+ ChartSettingNestedSettingsProps<T> & Record<string, unknown>,
+ ChartSettingNestedSettingsState
+ > {
+ state: ChartSettingNestedSettingsState = {};
- getEditingObjectKey = (): string | null | undefined => {
- return (
- this.state.objectKeyOverride ||
- (this.props.initialKey ??
- (this.props.objects.length === 1
- ? getObjectKey(this.props.objects[0])
- : null))
- );
- };
+ getEditingObjectKey = (): string | null | undefined => {
+ const { getObjectKey } = this.props;
+ return (
+ this.state.objectKeyOverride ||
+ (this.props.initialKey ??
+ (this.props.objects.length === 1
+ ? getObjectKey(this.props.objects[0])
+ : null))
+ );
+ };
- handleChangeEditingObject = (editingObject: T | null) => {
- // objectKeyOverride allows child components to set the editing object key to a different value than is derived
- // from the props. For example, this is used by the "More options" button in ChartNestedSettingSeries.
- this.setState({
- objectKeyOverride: editingObject ? getObjectKey(editingObject) : null,
- });
- // special prop to notify ChartSettings it should unswap replaced widget
- if (!editingObject && this.props.onEndShowWidget) {
- this.props.onEndShowWidget();
- }
- };
+ handleChangeEditingObject = (editingObject: T | null) => {
+ const { getObjectKey } = this.props;
+ // objectKeyOverride allows child components to set the editing object key to a different value than is derived
+ // from the props. For example, this is used by the "More options" button in ChartNestedSettingSeries.
+ this.setState({
+ objectKeyOverride: editingObject ? getObjectKey(editingObject) : null,
+ });
+ // special prop to notify ChartSettings it should unswap replaced widget
+ if (!editingObject && this.props.onEndShowWidget) {
+ this.props.onEndShowWidget();
+ }
+ };
- handleChangeSettingsForEditingObject = (
- newSettings: Partial<VisualizationSettings>,
- ) => {
- const editingObjectKey = this.getEditingObjectKey();
- if (editingObjectKey != null) {
- this.handleChangeSettingsForObjectKey(editingObjectKey, newSettings);
- }
- };
+ handleChangeSettingsForEditingObject = (
+ newSettings: Partial<VisualizationSettings>,
+ ) => {
+ const editingObjectKey = this.getEditingObjectKey();
+ if (editingObjectKey != null) {
+ this.handleChangeSettingsForObjectKey(editingObjectKey, newSettings);
+ }
+ };
- handleChangeSettingsForObject = (
- object: T,
- newSettings: Partial<VisualizationSettings>,
- ) => {
- const objectKey = getObjectKey(object);
- if (objectKey != null) {
- this.handleChangeSettingsForObjectKey(objectKey, newSettings);
- }
- };
+ handleChangeSettingsForObject = (
+ object: T,
+ newSettings: Partial<VisualizationSettings>,
+ ) => {
+ const objectKey = this.props.getObjectKey(object);
+ if (objectKey != null) {
+ this.handleChangeSettingsForObjectKey(objectKey, newSettings);
+ }
+ };
- handleChangeSettingsForObjectKey = (
- changedKey: string,
- changedSettings: Partial<VisualizationSettings>,
- ) => {
- const { objects, onChange } = this.props;
- const oldSettings = this.props.value || {};
- const newSettings: Record<string, VisualizationSettings> = {};
- for (const object of objects) {
- const currentKey = getObjectKey(object);
- const objectSettings = getObjectSettings(oldSettings, object);
- if (currentKey === changedKey) {
- newSettings[currentKey] = updateSettings(
- objectSettings,
- changedSettings,
- );
- } else if (objectSettings != null) {
- // Objects without stored settings must not be added as `undefined`
- // entries, which would corrupt the settings map (EMB-1940).
- newSettings[currentKey] = objectSettings;
- }
+ handleChangeSettingsForObjectKey = (
+ changedKey: string,
+ changedSettings: Partial<VisualizationSettings>,
+ ) => {
+ const { objects, onChange, getObjectKey, getObjectSettings } = this.props;
+ const oldSettings = this.props.value || {};
+ const newSettings: Record<string, VisualizationSettings> = {};
+ for (const object of objects) {
+ const currentKey = getObjectKey(object);
+ const objectSettings = getObjectSettings(oldSettings, object);
+ if (currentKey === changedKey) {
+ newSettings[currentKey] = updateSettings(
+ objectSettings,
+ changedSettings,
+ );
+ } else if (objectSettings != null) {
+ // Objects without stored settings must not be added as `undefined`
+ // entries, which would corrupt the settings map (EMB-1940).
+ newSettings[currentKey] = objectSettings;
}
- onChange(newSettings);
- };
+ }
+ onChange(newSettings);
+ };
+
+ getSettingsWidgetsForObject = (
+ series: Series,
+ object: T,
+ storedSettings: VisualizationSettings,
+ onChangeSettings: (newSettings: Partial<VisualizationSettings>) => void,
+ extra: any,
+ ) => {
+ const { getSettingDefinitionsForObject, getComputedSettingsForObject } =
+ this.props;
+ const settingsDefs = getSettingDefinitionsForObject(series, object);
+ const computedSettings = getComputedSettingsForObject(
+ series,
+ object,
+ storedSettings,
+ extra,
+ );
+ const widgets = getSettingsWidgets(
+ settingsDefs,
+ storedSettings,
+ computedSettings,
+ object,
+ onChangeSettings,
+ extra,
+ );
+
+ return widgets.map((widget) => ({
+ ...widget,
+ style: {
+ ...widget.style,
+ marginLeft: 0,
+ marginRight: 0,
+ },
+ }));
+ };
- render() {
- const { series, objects, extra } = this.props;
- const editingObjectKey = this.getEditingObjectKey();
- if (editingObjectKey !== undefined) {
- const editingObject = _.find(
- objects,
- (o) => getObjectKey(o) === editingObjectKey,
+ render() {
+ const { series, objects, extra, getObjectKey, getObjectSettings } =
+ this.props;
+ const editingObjectKey = this.getEditingObjectKey();
+ if (editingObjectKey !== undefined) {
+ const editingObject = _.find(
+ objects,
+ (o) => getObjectKey(o) === editingObjectKey,
+ );
+ if (editingObject) {
+ const objectsSettings = this.props.value || {};
+ const objectSettings =
+ getObjectSettings(objectsSettings, editingObject) ?? {};
+ const objectSettingsWidgets = this.getSettingsWidgetsForObject(
+ series,
+ editingObject,
+ objectSettings,
+ this.handleChangeSettingsForEditingObject,
+ extra,
+ );
+ return (
+ <ComposedComponent
+ {...this.props}
+ getObjectKey={getObjectKey}
+ onChangeEditingObject={this.handleChangeEditingObject}
+ onChangeObjectSettings={this.handleChangeSettingsForObject}
+ object={editingObject}
+ objectSettingsWidgets={objectSettingsWidgets.map((widget) => (
+ <ChartSettingsWidget key={widget.id} {...widget} />
+ ))}
+ />
);
- if (editingObject) {
- const objectsSettings = this.props.value || {};
- const objectSettings =
- getObjectSettings(objectsSettings, editingObject) ?? {};
- const objectSettingsWidgets = getSettingsWidgetsForObject(
- series,
- editingObject,
- objectSettings,
- this.handleChangeSettingsForEditingObject,
- extra,
- );
- return (
- <ComposedComponent
- {...this.props}
- getObjectKey={getObjectKey}
- onChangeEditingObject={this.handleChangeEditingObject}
- onChangeObjectSettings={this.handleChangeSettingsForObject}
- object={editingObject}
- objectSettingsWidgets={objectSettingsWidgets.map((widget) => (
- <ChartSettingsWidget key={widget.id} {...widget} />
- ))}
- />
- );
- }
}
- return (
- <ComposedComponent
- {...this.props}
- getObjectKey={getObjectKey}
- onChangeEditingObject={this.handleChangeEditingObject}
- onChangeObjectSettings={this.handleChangeSettingsForObject}
- />
- );
}
- };
- return Wrapped;
+ return (
+ <ComposedComponent
+ {...this.props}
+ getObjectKey={getObjectKey}
+ onChangeEditingObject={this.handleChangeEditingObject}
+ onChangeObjectSettings={this.handleChangeSettingsForObject}
+ />
+ );
+ }
};
-};
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.unit.spec.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.unit.spec.tsx
index bd8fa7292c9..41cd79cd865 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingNestedSettings.unit.spec.tsx
@@ -24,11 +24,7 @@ const ComposedComponent = ({ object, onChangeObjectSettings }: any) => (
</button>
);
-const WrappedComponent = chartSettingNestedSettings({
- getObjectKey,
- getObjectSettings,
- getSettingsWidgetsForObject: () => [],
-})(ComposedComponent);
+const WrappedComponent = chartSettingNestedSettings(ComposedComponent);
describe("chartSettingNestedSettings", () => {
it("does not write undefined entries for objects without stored settings (EMB-1940)", async () => {
@@ -39,6 +35,10 @@ describe("chartSettingNestedSettings", () => {
<WrappedComponent
series={[]}
objects={objects}
+ getObjectKey={getObjectKey}
+ getObjectSettings={getObjectSettings}
+ getSettingDefinitionsForObject={() => ({})}
+ getComputedSettingsForObject={() => ({})}
// only object B has stored settings
value={{ '["name","B"]': { column_title: "Old title" } }}
initialKey={getObjectKey(objects[1])}
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingStacked.unit.spec.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingStacked.unit.spec.tsx
index 29647be8cb5..66625a7bfa3 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingStacked.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingStacked.unit.spec.tsx
@@ -1,7 +1,7 @@
// these tests use QuestionChartSettings directly, but logic we're testing lives in ChartNestedSettingSeries
import { renderWithProviders, screen } from "__support__/ui";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Series } from "metabase-types/api";
import { createMockSingleSeries } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts
index 799fca1d11c..3523526280d 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts
@@ -19,7 +19,7 @@ import {
getTimezoneOrOffset,
normalizeDate,
} from "metabase/visualizations/echarts/cartesian/utils/timeseries";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { ContinuousDomain } from "metabase/visualizations/shared/types/scale";
import {
type DateTimeAbsoluteUnit,
diff --git a/frontend/src/metabase/visualizations/index.ts b/frontend/src/metabase/visualizations/index.ts
index 84863be2fc4..d950235dfef 100644
--- a/frontend/src/metabase/visualizations/index.ts
+++ b/frontend/src/metabase/visualizations/index.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from "react";
import { t } from "ttag";
import _ from "underscore";
@@ -16,6 +17,7 @@ import type { Visualization } from "./types/visualization";
const visualizations = new Map<VisualizationDisplay, Visualization>();
const aliases = new Map<string, Visualization>();
+const settingWidgets = new Map<string, ComponentType<any>>();
visualizations.get = function (key) {
return (
Map.prototype.get.call(this, key) ||
@@ -39,6 +41,10 @@ export function setDefaultVisualization(visualization: Visualization) {
defaultVisualization = visualization;
}
+function isVisualizationComponent(visualization: Visualization | undefined) {
+ return typeof visualization === "function";
+}
+
export function registerVisualization(visualization: Visualization) {
if (visualization == null) {
throw new Error(t`Visualization is null`);
@@ -51,20 +57,34 @@ export function registerVisualization(visualization: Visualization) {
);
}
if (visualizations.has(identifier)) {
- if (isStorybookActive) {
- console.error(
- `Visualization with that identifier is already registered: ` +
- visualization.name,
- );
-
- // do not throw if it's storybook
+ const registeredVisualization = visualizations.get(identifier);
+ const isReplacingDefinitionWithComponent =
+ isVisualizationComponent(visualization) &&
+ !isVisualizationComponent(registeredVisualization);
+ const isRegisteringDefinitionOverComponent =
+ !isVisualizationComponent(visualization) &&
+ isVisualizationComponent(registeredVisualization);
+
+ if (isRegisteringDefinitionOverComponent) {
return;
}
- throw new Error(
- t`Visualization with that identifier is already registered: ` +
- visualization.name,
- );
+ if (!isReplacingDefinitionWithComponent) {
+ if (isStorybookActive) {
+ console.error(
+ `Visualization with that identifier is already registered: ` +
+ visualization.name,
+ );
+
+ // do not throw if it's storybook
+ return;
+ }
+
+ throw new Error(
+ t`Visualization with that identifier is already registered: ` +
+ visualization.name,
+ );
+ }
}
visualizations.set(identifier, visualization);
for (const alias of visualization.aliases || []) {
@@ -72,6 +92,18 @@ export function registerVisualization(visualization: Visualization) {
}
}
+export function registerSettingWidgets(
+ widgets: Record<string, ComponentType<any>>,
+) {
+ for (const [key, widget] of Object.entries(widgets)) {
+ settingWidgets.set(key, widget);
+ }
+}
+
+export function getSettingWidgetComponent(key: string) {
+ return settingWidgets.get(key);
+}
+
type SeriesLike = Array<{ card: { display: VisualizationDisplay } }>;
export function getVisualization(display: VisualizationDisplay | null) {
diff --git a/frontend/src/metabase/visualizations/lib/formatting/click-data.ts b/frontend/src/metabase/visualizations/lib/formatting/click-data.ts
new file mode 100644
index 00000000000..bf02926c010
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/formatting/click-data.ts
@@ -0,0 +1,144 @@
+import _ from "underscore";
+
+import type { ClickObjectDimension } from "metabase-lib";
+import type { ClickObjectDataRow } from "metabase-lib/v1/queries/drills/types";
+import { getColumnSettings } from "metabase-lib/v1/queries/utils/column-key";
+import type {
+ ClickBehavior,
+ ColumnSettings,
+ Dashboard,
+ DatasetColumn,
+ ParameterValueOrArray,
+ UserAttributeMap,
+ VisualizationSettings,
+} from "metabase-types/api";
+import { isImplicitActionClickBehavior } from "metabase-types/guards";
+
+import type { ValueAndColumnForColumnNameDate } from "./link";
+
+export function getDataFromClicked({
+ extraData: { dashboard, parameterValuesBySlug = {}, userAttributes } = {},
+ dimensions = [],
+ data = [],
+ settings,
+}: {
+ extraData?: {
+ dashboard?: Dashboard;
+ parameterValuesBySlug?: Record<string, ParameterValueOrArray>;
+ userAttributes?: UserAttributeMap | null;
+ };
+ dimensions?: ClickObjectDimension[];
+ data?: (ClickObjectDataRow & {
+ clickBehaviorValue?: ClickObjectDataRow["value"];
+ })[];
+ // Accept computed viz settings (with the per-column resolver) so
+ // we can read user-configured formatting + type-derived defaults.
+ settings?: VisualizationSettings & {
+ column?: (col: DatasetColumn) => ColumnSettings;
+ };
+}): ValueAndColumnForColumnNameDate {
+ const column = [
+ ...dimensions,
+ ...data.map((d) => ({
+ column: d.col,
+ // When the data is changed to a display value for use in tooltips, we can set clickBehaviorValue to the raw value for filtering.
+ value: d.clickBehaviorValue || d.value,
+ })),
+ ]
+ .filter((d) => d.column != null)
+ .reduce<ValueAndColumnForColumnNameDate["column"]>(
+ (acc, { column, value }) => {
+ if (!column) {
+ return acc;
+ }
+
+ const name = column.name.toLowerCase();
+
+ if (acc[name] === undefined) {
+ // The raw DatasetColumn only carries metadata-level settings.
+ // Pull the computed per-column viz settings (which include
+ // user-saved formatting + type-derived defaults like
+ // `number_style: "currency"` for currency columns) so
+ // downstream formatters (e.g. renderLinkTextForClick) can
+ // apply them. Fall back to the raw column_settings lookup if
+ // the computed resolver isn't attached (e.g. some non-cell
+ // click contexts).
+ const vizColumnSettings =
+ settings?.column?.(column) ?? getColumnSettings(settings, column);
+ const columnWithSettings = vizColumnSettings
+ ? {
+ ...column,
+ settings: { ...(column.settings ?? {}), ...vizColumnSettings },
+ }
+ : column;
+ return { ...acc, [name]: { value, column: columnWithSettings } };
+ }
+
+ return acc;
+ },
+ {},
+ );
+
+ const dashboardParameters = (dashboard?.parameters || []).filter(
+ ({ slug }) => parameterValuesBySlug[slug] != null,
+ );
+
+ const parameterByName = Object.fromEntries(
+ dashboardParameters.map(({ name, slug }) => [
+ name.toLowerCase(),
+ { value: parameterValuesBySlug[slug] },
+ ]),
+ );
+
+ const parameterBySlug = _.mapObject(parameterValuesBySlug, (value) => ({
+ value,
+ }));
+
+ const parameter = Object.fromEntries(
+ dashboardParameters.map(({ id, slug }) => [
+ id,
+ { value: parameterValuesBySlug[slug] },
+ ]),
+ );
+
+ const userAttribute = Object.fromEntries(
+ Object.entries(userAttributes || {}).map(([key, value]) => [
+ key,
+ { value },
+ ]),
+ );
+
+ return { column, parameter, parameterByName, parameterBySlug, userAttribute };
+}
+
+export function clickBehaviorIsValid(
+ clickBehavior: ClickBehavior | undefined | null,
+): boolean {
+ // opens drill-through menu
+ if (clickBehavior == null) {
+ return true;
+ }
+
+ if (clickBehavior.type === "crossfilter") {
+ return Object.keys(clickBehavior.parameterMapping || {}).length > 0;
+ }
+
+ if (clickBehavior.type === "action") {
+ return isImplicitActionClickBehavior(clickBehavior);
+ }
+
+ if (clickBehavior.type === "link") {
+ const { linkType } = clickBehavior;
+
+ if (linkType === "url") {
+ return (clickBehavior.linkTemplate || "").length > 0;
+ }
+
+ if (linkType === "dashboard" || linkType === "question") {
+ return clickBehavior.targetId != null;
+ }
+ }
+
+ // we've picked "link" without picking a link type
+ return false;
+}
diff --git a/frontend/src/metabase/visualizations/lib/formatting/email.tsx b/frontend/src/metabase/visualizations/lib/formatting/email.tsx
index 22db504bdfe..c21e589d915 100644
--- a/frontend/src/metabase/visualizations/lib/formatting/email.tsx
+++ b/frontend/src/metabase/visualizations/lib/formatting/email.tsx
@@ -1,9 +1,9 @@
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { getDataFromClicked } from "metabase/parameters/utils/click-behavior";
import { isEmail } from "metabase/utils/email";
import { removeNewLines } from "metabase/utils/formatting/strings";
import type { ColumnSettings } from "metabase-types/api";
+import { getDataFromClicked } from "./click-data";
import { renderLinkTextForClick } from "./link";
export function formatEmail(
diff --git a/frontend/src/metabase/visualizations/lib/formatting/jsx-link-renderer.tsx b/frontend/src/metabase/visualizations/lib/formatting/jsx-link-renderer.tsx
new file mode 100644
index 00000000000..3273b97608a
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/formatting/jsx-link-renderer.tsx
@@ -0,0 +1,41 @@
+import cx from "classnames";
+import type { ReactElement, ReactNode } from "react";
+
+import { handleLinkSdkPlugin } from "embedding-sdk-shared/lib/sdk-global-plugins";
+import { ExternalLink } from "metabase/common/components/ExternalLink";
+import { Link } from "metabase/common/components/Link";
+import CS from "metabase/css/core/index.css";
+import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
+import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
+
+export function renderJsxLink(url: string, text: ReactNode): ReactElement {
+ const className = cx(CS.link, CS.linkWrappable);
+
+ // on the react sdk we treat all user provided urls as external links
+ if (isSameOrSiteUrlOrigin(url) && !isEmbeddingSdk()) {
+ return (
+ <Link className={className} to={url}>
+ {text}
+ </Link>
+ );
+ }
+
+ const onClickCaptureInSdk = isEmbeddingSdk()
+ ? {
+ onClickCapture: async (e: React.MouseEvent<HTMLAnchorElement>) => {
+ e.preventDefault(); // Prevent immediately while we await the response
+ const result = await handleLinkSdkPlugin(url);
+ if (!result.handled) {
+ // Parent didn't handle it - proceed with default navigation
+ window.open(url, "_blank", "noopener");
+ }
+ },
+ }
+ : {};
+
+ return (
+ <ExternalLink className={className} href={url} {...onClickCaptureInSdk}>
+ {text}
+ </ExternalLink>
+ );
+}
diff --git a/frontend/src/metabase/visualizations/lib/formatting/registry.ts b/frontend/src/metabase/visualizations/lib/formatting/registry.ts
new file mode 100644
index 00000000000..492245bf400
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/formatting/registry.ts
@@ -0,0 +1,13 @@
+import type { ReactElement, ReactNode } from "react";
+
+type JsxLinkRenderer = (url: string, text: ReactNode) => ReactElement;
+
+let jsxLinkRenderer: JsxLinkRenderer | undefined;
+
+export function registerJsxLinkRenderer(renderer: JsxLinkRenderer) {
+ jsxLinkRenderer = renderer;
+}
+
+export function getJsxLinkRenderer() {
+ return jsxLinkRenderer;
+}
diff --git a/frontend/src/metabase/visualizations/lib/formatting/ui.tsx b/frontend/src/metabase/visualizations/lib/formatting/ui.tsx
new file mode 100644
index 00000000000..b8968274ace
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/formatting/ui.tsx
@@ -0,0 +1,47 @@
+import cx from "classnames";
+import type { ReactElement, ReactNode } from "react";
+
+import { handleLinkSdkPlugin } from "embedding-sdk-shared/lib/sdk-global-plugins";
+import { ExternalLink } from "metabase/common/components/ExternalLink";
+import { Link } from "metabase/common/components/Link";
+import CS from "metabase/css/core/index.css";
+import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
+import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
+
+import { registerJsxLinkRenderer } from "./registry";
+
+function renderJsxLink(url: string, text: ReactNode): ReactElement {
+ const className = cx(CS.link, CS.linkWrappable);
+
+ // on the react sdk we treat all user provided urls as external links
+ if (isSameOrSiteUrlOrigin(url) && !isEmbeddingSdk()) {
+ return (
+ <Link className={className} to={url}>
+ {text}
+ </Link>
+ );
+ }
+
+ const onClickCaptureInSdk = isEmbeddingSdk()
+ ? {
+ onClickCapture: async (e: React.MouseEvent<HTMLAnchorElement>) => {
+ e.preventDefault(); // Prevent immediately while we await the response
+ const result = await handleLinkSdkPlugin(url);
+ if (!result.handled) {
+ // Parent didn't handle it - proceed with default navigation
+ window.open(url, "_blank", "noopener");
+ }
+ },
+ }
+ : {};
+
+ return (
+ <ExternalLink className={className} href={url} {...onClickCaptureInSdk}>
+ {text}
+ </ExternalLink>
+ );
+}
+
+export function registerJsxFormatting() {
+ registerJsxLinkRenderer(renderJsxLink);
+}
diff --git a/frontend/src/metabase/visualizations/lib/formatting/url.tsx b/frontend/src/metabase/visualizations/lib/formatting/url.ts
similarity index 65%
rename from frontend/src/metabase/visualizations/lib/formatting/url.tsx
rename to frontend/src/metabase/visualizations/lib/formatting/url.ts
index c866aaf5cc8..fff3a163e33 100644
--- a/frontend/src/metabase/visualizations/lib/formatting/url.tsx
+++ b/frontend/src/metabase/visualizations/lib/formatting/url.ts
@@ -1,17 +1,10 @@
-import cx from "classnames";
-
-import { handleLinkSdkPlugin } from "embedding-sdk-shared/lib/sdk-global-plugins";
-import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { Link } from "metabase/common/components/Link";
-import CS from "metabase/css/core/index.css";
-import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { getDataFromClicked } from "metabase/parameters/utils/click-behavior";
-import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
import { removeNewLines } from "metabase/utils/formatting/strings";
import { isURL } from "metabase-lib/v1/types/utils/isa";
import type { ColumnSettings } from "metabase-types/api";
+import { getDataFromClicked } from "./click-data";
import { renderLinkTextForClick, renderLinkURLForClick } from "./link";
+import { getJsxLinkRenderer } from "./registry";
import { formatValue, getRemappedValue } from "./value";
function isSafeProtocol(protocol: string) {
@@ -40,37 +33,10 @@ export function formatUrl(value: string, options: ColumnSettings = {}) {
const url = getLinkUrl(value, options);
- if (jsx && rich && url) {
+ const jsxLinkRenderer = getJsxLinkRenderer();
+ if (jsx && rich && url && jsxLinkRenderer) {
const text = getLinkText(value, options);
- const className = cx(CS.link, CS.linkWrappable);
-
- // on the react sdk we treat all user provided urls as external links
- if (isSameOrSiteUrlOrigin(url) && !isEmbeddingSdk()) {
- return (
- <Link className={className} to={url}>
- {text}
- </Link>
- );
- }
-
- const onClickCaptureInSdk = isEmbeddingSdk()
- ? {
- onClickCapture: async (e: React.MouseEvent<HTMLAnchorElement>) => {
- e.preventDefault(); // Prevent immediately while we await the response
- const result = await handleLinkSdkPlugin(url);
- if (!result.handled) {
- // Parent didn't handle it - proceed with default navigation
- window.open(url, "_blank", "noopener");
- }
- },
- }
- : {};
-
- return (
- <ExternalLink className={className} href={url} {...onClickCaptureInSdk}>
- {text}
- </ExternalLink>
- );
+ return jsxLinkRenderer(url, text);
} else if (!url && !isURL(column)) {
// Even when no URL is found, return a formatted value
return formatValue(value, { ...options, view_as: null });
diff --git a/frontend/src/metabase/visualizations/lib/formatting/url.unit.spec.tsx b/frontend/src/metabase/visualizations/lib/formatting/url.unit.spec.tsx
index b5ca3f39e94..1a8ecbb75a6 100644
--- a/frontend/src/metabase/visualizations/lib/formatting/url.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/lib/formatting/url.unit.spec.tsx
@@ -7,6 +7,7 @@ import { render, screen } from "__support__/ui";
import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";
+import { registerJsxFormatting } from "metabase/visualizations/lib/formatting/ui";
import { TYPE } from "metabase-lib/v1/types/constants";
import {
createMockColumn,
@@ -16,6 +17,8 @@ import {
import { formatUrl, slugify } from "./url";
import { formatValue } from "./value";
+registerJsxFormatting();
+
const SITE_URL = "http://localhost:3000";
describe("formatUrl", () => {
diff --git a/frontend/src/metabase/visualizations/lib/formatting/value.tsx b/frontend/src/metabase/visualizations/lib/formatting/value.tsx
index 6c4411605a5..01564bf83c4 100644
--- a/frontend/src/metabase/visualizations/lib/formatting/value.tsx
+++ b/frontend/src/metabase/visualizations/lib/formatting/value.tsx
@@ -5,10 +5,6 @@ import ReactMarkdown from "react-markdown";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import CS from "metabase/css/core/index.css";
-import {
- clickBehaviorIsValid,
- getDataFromClicked,
-} from "metabase/parameters/utils/click-behavior";
import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import { formatNumber } from "metabase/utils/formatting/numbers";
import { removeNewLines } from "metabase/utils/formatting/strings";
@@ -25,6 +21,7 @@ import {
} from "metabase-lib/v1/types/utils/isa";
import type { ColumnSettings, DatasetColumn } from "metabase-types/api";
+import { clickBehaviorIsValid, getDataFromClicked } from "./click-data";
import { formatDateTimeWithUnit, formatRange } from "./date";
import { formatEmail } from "./email";
import { formatCoordinate } from "./geography";
diff --git a/frontend/src/metabase/visualizations/lib/formatting/value.unit.spec.tsx b/frontend/src/metabase/visualizations/lib/formatting/value.unit.spec.tsx
index 88e7361624f..d736c3a59f9 100644
--- a/frontend/src/metabase/visualizations/lib/formatting/value.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/lib/formatting/value.unit.spec.tsx
@@ -5,12 +5,15 @@ import { mockSettings } from "__support__/settings";
import { render, screen } from "__support__/ui";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { Link } from "metabase/common/components/Link";
+import { registerJsxFormatting } from "metabase/visualizations/lib/formatting/ui";
import { TYPE } from "metabase-lib/v1/types/constants";
import type { ColumnSettings } from "metabase-types/api";
import { createMockColumn } from "metabase-types/api/mocks";
import { formatValue } from "./value";
+registerJsxFormatting();
+
const SITE_URL = "http://localhost:3000";
describe("formatValue", () => {
diff --git a/frontend/src/metabase/visualizations/lib/sensibility.unit.spec.ts b/frontend/src/metabase/visualizations/lib/sensibility.unit.spec.ts
index 22f8a2cc024..de77d63e869 100644
--- a/frontend/src/metabase/visualizations/lib/sensibility.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/sensibility.unit.spec.ts
@@ -1,4 +1,4 @@
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import {
createMockCategoryColumn,
createMockDatasetData,
diff --git a/frontend/src/metabase/visualizations/lib/settings.ts b/frontend/src/metabase/visualizations/lib/settings.ts
index 9c292ec1824..8bbe5b8ec7c 100644
--- a/frontend/src/metabase/visualizations/lib/settings.ts
+++ b/frontend/src/metabase/visualizations/lib/settings.ts
@@ -1,4 +1,3 @@
-import type React from "react";
import _ from "underscore";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
@@ -6,26 +5,12 @@ import {
convertLinkColumnToClickBehavior,
removeInternalClickBehaviors,
} from "metabase/embedding-sdk/lib/links";
-import { ChartSettingColorPicker } from "metabase/visualizations/components/settings/ChartSettingColorPicker";
-import { ChartSettingColorsPicker } from "metabase/visualizations/components/settings/ChartSettingColorsPicker";
-import { ChartSettingFieldPicker } from "metabase/visualizations/components/settings/ChartSettingFieldPicker";
-import { ChartSettingFieldsPartition } from "metabase/visualizations/components/settings/ChartSettingFieldsPartition";
-import { ChartSettingFieldsPicker } from "metabase/visualizations/components/settings/ChartSettingFieldsPicker";
-import { ChartSettingInput } from "metabase/visualizations/components/settings/ChartSettingInput";
-import { ChartSettingInputNumeric } from "metabase/visualizations/components/settings/ChartSettingInputNumeric";
-import { ChartSettingMultiSelect } from "metabase/visualizations/components/settings/ChartSettingMultiSelect";
-import { ChartSettingRadio } from "metabase/visualizations/components/settings/ChartSettingRadio";
-import { ChartSettingSegmentedControl } from "metabase/visualizations/components/settings/ChartSettingSegmentedControl";
-import { ChartSettingSelect } from "metabase/visualizations/components/settings/ChartSettingSelect";
-import { ChartSettingToggle } from "metabase/visualizations/components/settings/ChartSettingToggle";
import type {
- CompleteVisualizationSettingDefinition,
ComputedVisualizationSettings,
SettingsExtra,
VisualizationSettingDefinition,
VisualizationSettingsDefinitions,
} from "metabase/visualizations/types";
-import type Question from "metabase-lib/v1/Question";
import type {
ColumnSettings,
Series,
@@ -34,21 +19,6 @@ import type {
} from "metabase-types/api";
import { isObjectWithRaw } from "metabase-types/guards";
-const WIDGETS: Record<string, React.ComponentType<any>> = {
- input: ChartSettingInput,
- number: ChartSettingInputNumeric,
- radio: ChartSettingRadio,
- select: ChartSettingSelect,
- toggle: ChartSettingToggle,
- segmentedControl: ChartSettingSegmentedControl,
- field: ChartSettingFieldPicker,
- fields: ChartSettingFieldsPicker,
- fieldsPartition: ChartSettingFieldsPartition,
- color: ChartSettingColorPicker,
- colors: ChartSettingColorsPicker,
- multiselect: ChartSettingMultiSelect,
-};
-
export function getComputedSettings<T>(
settingsDefs: VisualizationSettingsDefinitions,
object: T,
@@ -154,109 +124,6 @@ function getComputedSetting<T, TValue, TProps extends Record<string, unknown>>(
computedSettings[settingId] = undefined;
}
-function getSettingWidget<T, TValue, TProps extends Record<string, unknown>>(
- settingDefs: VisualizationSettingsDefinitions,
- settingId: VisualizationSettingKey,
- storedSettings: VisualizationSettings,
- computedSettings: ComputedVisualizationSettings,
- object: T,
- onChangeSettings: (
- newSettings: Partial<VisualizationSettings>,
- question?: Question,
- ) => void,
- extra: SettingsExtra = {},
-): CompleteVisualizationSettingDefinition<T, TValue, TProps> {
- const settingDef: VisualizationSettingDefinition<T, TValue, TProps> =
- settingDefs[settingId] ?? {};
- const value = computedSettings[settingId];
-
- const onChange = (newValue: TValue, question?: Question) => {
- const newSettings: Partial<VisualizationSettings> = {
- [settingId]: newValue,
- };
- for (const depId of settingDef.writeDependencies || []) {
- newSettings[depId] = computedSettings[depId];
- }
- for (const eraseId of settingDef.eraseDependencies || []) {
- newSettings[eraseId] = null;
- }
- onChangeSettings(newSettings, question);
- settingDef.onUpdate?.(newValue, extra);
- };
-
- let resolvedObject = object;
- if (settingDef.useRawSeries && isObjectWithRaw(object) && object._raw) {
- // only if object is (RawSeries | TransformedSeries)
- if (Array.isArray(object)) {
- extra.transformedSeries = object;
- }
-
- resolvedObject = object._raw;
- }
-
- const {
- getProps,
- getWrapperStyle,
- getSection,
- getHidden,
- ...settingDefProps
- } = settingDef;
-
- return {
- ...settingDefProps,
- id: settingId,
- value,
- section: getSection?.(resolvedObject, computedSettings, extra),
- hidden: getHidden?.(resolvedObject, computedSettings, extra) ?? false,
- props:
- getProps?.(
- resolvedObject,
- computedSettings,
- onChange,
- extra,
- onChangeSettings,
- ) ?? {},
- set: settingId in storedSettings,
- widget:
- typeof settingDef.widget === "string"
- ? WIDGETS[settingDef.widget]
- : settingDef.widget,
- style: getWrapperStyle?.(resolvedObject, computedSettings, extra),
- onChange,
- onChangeSettings, // this gives a widget access to update other settings
- };
-}
-
-export function getSettingsWidgets<
- T,
- TValue,
- TProps extends Record<string, unknown>,
->(
- settingDefs: VisualizationSettingsDefinitions,
- storedSettings: VisualizationSettings,
- computedSettings: ComputedVisualizationSettings,
- object: T,
- onChangeSettings: (
- newSettings: Partial<VisualizationSettings>,
- question?: Question,
- ) => void,
- extra: SettingsExtra = {},
-): CompleteVisualizationSettingDefinition<T, TValue, TProps>[] {
- return Object.keys(settingDefs)
- .map((settingId) =>
- getSettingWidget<T, TValue, TProps>(
- settingDefs,
- settingId,
- storedSettings,
- computedSettings,
- object,
- onChangeSettings,
- extra,
- ),
- )
- .filter((widget) => widget.widget);
-}
-
export function getPersistableDefaultSettings(
settingsDefs: VisualizationSettingsDefinitions,
completeSettings: ComputedVisualizationSettings,
diff --git a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
index 471793009a8..745dd6ebe52 100644
--- a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
@@ -1,11 +1,11 @@
-// NOTE: need to load visualizations first for getSettings to work
-import "metabase/visualizations";
-
import {
getClickBehaviorSettings,
getComputedSettings,
- getSettingsWidgets,
} from "metabase/visualizations/lib/settings";
+import { getSettingsWidgets } from "metabase/visualizations/lib/widgets";
+import { registerVisualizations } from "metabase/visualizations/register";
+
+registerVisualizations();
describe("settings framework", () => {
const mockObject = "[mockObject]";
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.ts b/frontend/src/metabase/visualizations/lib/settings/column.ts
index 6f48a42e6b9..f6685525a24 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/column.ts
@@ -14,8 +14,6 @@ import {
import { hasHour } from "metabase/utils/formatting/datetime-utils";
import MetabaseSettings from "metabase/utils/settings";
import { getVisualizationRaw } from "metabase/visualizations";
-import { ChartNestedSettingColumns } from "metabase/visualizations/components/settings/ChartNestedSettingColumns";
-import { ChartSettingTableColumns } from "metabase/visualizations/components/settings/ChartSettingTableColumns";
import {
getDateFormatFromStyle,
getDateStyleOptionsForUnit,
@@ -84,7 +82,7 @@ export function columnSettings({
getObjectKey: getColumnKey,
getObjectSettings: getObjectColumnSettings,
getSettingDefinitionsForObject: getSettingDefinitionsForColumn,
- component: ChartNestedSettingColumns,
+ widget: "nestedColumns",
getInheritedSettingsForObject: getInheritedSettingsForColumn,
useRawSeries: true,
...def,
@@ -554,7 +552,7 @@ export function tableColumnSettings({
"table.columns": {
getSection: () => t`Columns`,
// title: t`Columns`,
- widget: ChartSettingTableColumns,
+ widget: "tableColumns",
getHidden: (_series, vizSettings) => vizSettings["table.pivot"],
getValue: ([{ data }], vizSettings) => {
const { cols } = data;
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts
index 2f9e1a2275d..d159ef0f0eb 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts
@@ -1,6 +1,6 @@
import { checkNotNull } from "metabase/utils/types";
import { getComputedSettings } from "metabase/visualizations/lib/settings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { DatasetColumn, Series } from "metabase-types/api";
import {
createMockColumn,
diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.ts b/frontend/src/metabase/visualizations/lib/settings/graph.ts
index 698ba822671..e4b5aae41cc 100644
--- a/frontend/src/metabase/visualizations/lib/settings/graph.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/graph.ts
@@ -7,13 +7,8 @@ import {
getMaxMetricsSupported,
} from "metabase/visualizations";
import { trackStackedSeriesEnabled } from "metabase/visualizations/analytics";
-import {
- ChartSettingEnumToggle,
- type ChartSettingEnumToggleProps,
-} from "metabase/visualizations/components/settings/ChartSettingEnumToggle";
-import { ChartSettingMaxCategories } from "metabase/visualizations/components/settings/ChartSettingMaxCategories";
+import type { ChartSettingEnumToggleProps } from "metabase/visualizations/components/settings/ChartSettingEnumToggle";
import type { ChartSettingSegmentedControlProps } from "metabase/visualizations/components/settings/ChartSettingSegmentedControl";
-import { ChartSettingSeriesOrder } from "metabase/visualizations/components/settings/ChartSettingSeriesOrder";
import { dimensionIsNumeric } from "metabase/visualizations/lib/numeric";
import { columnSettings } from "metabase/visualizations/lib/settings/column";
import { seriesSetting } from "metabase/visualizations/lib/settings/series";
@@ -158,7 +153,7 @@ export const GRAPH_DATA_SETTINGS: VisualizationSettingsDefinitions = {
},
"graph.series_order": {
getSection: () => t`Data`,
- widget: ChartSettingSeriesOrder,
+ widget: "seriesOrder",
useRawSeries: true,
getWrapperStyle: () => ({
marginBottom: "1rem",
@@ -621,7 +616,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {
readDependencies: ["series_settings"],
},
"graph.max_categories": {
- widget: ChartSettingMaxCategories,
+ widget: "maxCategories",
getHidden: () => true,
// temporarily hiding the setting (metabase#50510)
getDefault: () => Number.MAX_SAFE_INTEGER,
@@ -982,7 +977,7 @@ const BOXPLOT_LABEL_VALUE_FREQUENCY_SETTING: SeriesSettingDefinition<
get title() {
return t`Hide overlapping labels`;
},
- widget: ChartSettingEnumToggle,
+ widget: "enumToggle",
getDefault: () => "fit",
inline: true,
getHidden: (_series, vizSettings) => !vizSettings["graph.show_values"],
diff --git a/frontend/src/metabase/visualizations/lib/settings/nested.ts b/frontend/src/metabase/visualizations/lib/settings/nested.ts
index d78574e5ddc..423aaaaf123 100644
--- a/frontend/src/metabase/visualizations/lib/settings/nested.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/nested.ts
@@ -1,11 +1,6 @@
-import type { ComponentType } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { checkNotNull } from "metabase/utils/types";
-import type { ChartNestedSettingColumnsProps } from "metabase/visualizations/components/settings/ChartNestedSettingColumns";
-import type { ChartNestedSettingSeriesProps } from "metabase/visualizations/components/settings/ChartNestedSettingSeries";
-import { chartSettingNestedSettings } from "metabase/visualizations/components/settings/ChartSettingNestedSettings";
import type {
ComputedVisualizationSettings,
SeriesSettingDefinition,
@@ -15,7 +10,7 @@ import type {
} from "metabase/visualizations/types";
import type { Series, VisualizationSettings } from "metabase-types/api";
-import { getComputedSettings, getSettingsWidgets } from "../settings";
+import { getComputedSettings } from "../settings";
export type NestedSettingsOptions<
T,
@@ -39,9 +34,6 @@ export type NestedSettingsOptions<
object: T,
) => VisualizationSettingsDefinitions;
getInheritedSettingsForObject?: (object: T) => VisualizationSettings;
- component?:
- | React.ComponentType<ChartNestedSettingSeriesProps>
- | React.ComponentType<ChartNestedSettingColumnsProps>;
getExtraProps?: (
series: Series,
settings: VisualizationSettings,
@@ -67,8 +59,7 @@ export function nestedSettings<
getObjectSettings = () => ({}),
getSettingDefinitionsForObject = () => ({}),
getInheritedSettingsForObject = () => ({}),
- component,
- widget: widgetProp,
+ widget,
...def
}: NestedSettingsOptions<T, TValue, TProps>,
): VisualizationSettingsDefinitions {
@@ -112,51 +103,6 @@ export function nestedSettings<
return allComputedSettings;
}
- function getSettingsWidgetsForObject(
- series: Series,
- object: T,
- storedSettings: VisualizationSettings,
- onChangeSettings: (newSettings: Partial<VisualizationSettings>) => void,
- extra: SettingsExtra,
- ) {
- const settingsDefs = getSettingDefinitionsForObject(series, object);
- const computedSettings = getComputedSettingsForObject(
- series,
- object,
- storedSettings,
- extra,
- );
- const widgets = getSettingsWidgets(
- settingsDefs,
- storedSettings,
- computedSettings,
- object,
- onChangeSettings,
- extra,
- );
-
- return widgets.map((widget) => ({
- ...widget,
- style: {
- ...widget.style,
- marginLeft: 0,
- marginRight: 0,
- },
- }));
- }
-
- // decorate with nested settings HOC
- const defaultWidget: ComponentType<TProps & { id: string }> | undefined =
- component
- ? chartSettingNestedSettings({
- getObjectKey,
- getObjectSettings,
- getSettingsWidgetsForObject,
- })(component)
- : undefined;
- // either "component" or "widget" prop needs to be passed
- const widget = checkNotNull(widgetProp ?? defaultWidget);
-
type Value = VisualizationSettingsDefinitions[Key];
// Unjustified type cast. FIXME
@@ -176,6 +122,10 @@ export function nestedSettings<
settings,
objects,
allComputedSettings,
+ getObjectKey,
+ getObjectSettings,
+ getSettingDefinitionsForObject,
+ getComputedSettingsForObject,
extra: { series, settings },
...(def.getExtraProps?.(series, settings, onChange, extra) ?? {}),
...extra,
diff --git a/frontend/src/metabase/visualizations/lib/settings/nested.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/nested.unit.spec.ts
index d42fb1e309e..9d3fc9ec14c 100644
--- a/frontend/src/metabase/visualizations/lib/settings/nested.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/nested.unit.spec.ts
@@ -15,7 +15,7 @@ describe("nestedSettings", () => {
getDefault: (object: string) => `foo${object}`,
},
}),
- component: () => null,
+ widget: "nestedSeries",
},
);
const stored = { nested_settings: { 1: { foo: "bar" } } };
diff --git a/frontend/src/metabase/visualizations/lib/settings/series.ts b/frontend/src/metabase/visualizations/lib/settings/series.ts
index 1e228b38a14..0702ed2f6e4 100644
--- a/frontend/src/metabase/visualizations/lib/settings/series.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/series.ts
@@ -1,7 +1,6 @@
import { getIn } from "icepick";
import { t } from "ttag";
-import ChartNestedSettingSeries from "metabase/visualizations/components/settings/ChartNestedSettingSeries";
import { OTHER_DATA_KEY } from "metabase/visualizations/echarts/cartesian/constants/dataset";
import type { LegacySeriesSettingsObjectKey } from "metabase/visualizations/echarts/cartesian/model/types";
import {
@@ -266,7 +265,7 @@ export function seriesSetting({
getObjectSettings: (storedSettings, object) =>
storedSettings[keyForSingleSeries(object)],
getSettingDefinitionsForObject: () => COMMON_SETTINGS,
- component: ChartNestedSettingSeries,
+ widget: "nestedSeries",
readDependencies: [SERIES_COLORS_SETTING_KEY, ...readDependencies],
getWrapperStyle: () => ({
marginLeft: 0,
diff --git a/frontend/src/metabase/visualizations/lib/settings/visualization.ts b/frontend/src/metabase/visualizations/lib/settings/visualization.ts
index 2a4001ead4e..2efa5036f6a 100644
--- a/frontend/src/metabase/visualizations/lib/settings/visualization.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/visualization.ts
@@ -9,7 +9,6 @@ import type {
SettingsExtra,
VisualizationSettingsDefinitions,
} from "metabase/visualizations/types";
-import { normalize } from "metabase-lib/v1/queries/utils/normalize";
import type {
ColumnSettings,
DimensionReference,
@@ -20,7 +19,6 @@ import type {
import {
getComputedSettings,
getPersistableDefaultSettings,
- getSettingsWidgets,
} from "../settings";
const COMMON_SETTINGS: VisualizationSettingsDefinitions = {
@@ -61,7 +59,7 @@ const COMMON_SETTINGS: VisualizationSettingsDefinitions = {
click_behavior: {},
};
-function getSettingDefinitionsForSeries(
+export function getSettingDefinitionsForSeries(
series: Series | null | undefined,
): VisualizationSettingsDefinitions {
if (!series) {
@@ -85,11 +83,9 @@ function normalizeColumnSettings(
for (const oldColumnKey of Object.keys(columnSettings)) {
const [refOrName, fieldRef]: [string, DimensionReference] =
JSON.parse(oldColumnKey);
- // if the key is a reference, normalize the mbql syntax
+ // keys are re-serialized so legacy formatting differences don't matter
const newColumnKey =
- refOrName === "ref"
- ? JSON.stringify(["ref", normalize(fieldRef)])
- : oldColumnKey;
+ refOrName === "ref" ? JSON.stringify(["ref", fieldRef]) : oldColumnKey;
newColumnSettings[newColumnKey] = columnSettings[oldColumnKey];
}
return newColumnSettings;
@@ -132,26 +128,3 @@ export function getPersistableDefaultSettingsForSeries(
const computedSettings = getComputedSettingsForSeries(series);
return getPersistableDefaultSettings(settingsDefs, computedSettings);
}
-
-export function getSettingsWidgetsForSeries(
- series: Series | null | undefined,
- onChangeSettings: (newSettings: Partial<VisualizationSettings>) => void,
- isDashboard = false,
- extra: SettingsExtra = {},
-) {
- const settingsDefs = getSettingDefinitionsForSeries(series);
- const storedSettings = getStoredSettingsForSeries(series);
- const computedSettings = getComputedSettingsForSeries(series);
-
- return getSettingsWidgets(
- settingsDefs,
- storedSettings,
- computedSettings,
- series ?? [],
- onChangeSettings,
- { isDashboard, ...extra },
- ).filter(
- (widget) =>
- widget.dashboard === undefined || widget.dashboard === isDashboard,
- );
-}
diff --git a/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.ts
index b83d62bbe29..3d31f2f3d13 100644
--- a/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/visualization.unit.spec.ts
@@ -9,7 +9,7 @@ import {
getComputedSettingsForSeries,
getStoredSettingsForSeries,
} from "metabase/visualizations/lib/settings/visualization";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type {
Series,
VisualizationDisplay,
diff --git a/frontend/src/metabase/visualizations/lib/timeseries.unit.spec.ts b/frontend/src/metabase/visualizations/lib/timeseries.unit.spec.ts
index 5fa84b444f7..61d74264794 100644
--- a/frontend/src/metabase/visualizations/lib/timeseries.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/timeseries.unit.spec.ts
@@ -1,5 +1,5 @@
import { dimensionIsTimeseries } from "metabase/visualizations/lib/timeseries";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { TYPE } from "metabase-lib/v1/types/constants";
import {
createMockColumn,
diff --git a/frontend/src/metabase/visualizations/lib/widgets.ts b/frontend/src/metabase/visualizations/lib/widgets.ts
new file mode 100644
index 00000000000..687eae4f3d9
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/widgets.ts
@@ -0,0 +1,146 @@
+import { getSettingWidgetComponent } from "metabase/visualizations";
+import {
+ getComputedSettingsForSeries,
+ getSettingDefinitionsForSeries,
+ getStoredSettingsForSeries,
+} from "metabase/visualizations/lib/settings/visualization";
+import type {
+ CompleteVisualizationSettingDefinition,
+ ComputedVisualizationSettings,
+ SettingsExtra,
+ VisualizationSettingDefinition,
+ VisualizationSettingsDefinitions,
+} from "metabase/visualizations/types";
+import type Question from "metabase-lib/v1/Question";
+import type {
+ Series,
+ VisualizationSettingKey,
+ VisualizationSettings,
+} from "metabase-types/api";
+import { isObjectWithRaw } from "metabase-types/guards";
+
+function getSettingWidget<T, TValue, TProps extends Record<string, unknown>>(
+ settingDefs: VisualizationSettingsDefinitions,
+ settingId: VisualizationSettingKey,
+ storedSettings: VisualizationSettings,
+ computedSettings: ComputedVisualizationSettings,
+ object: T,
+ onChangeSettings: (
+ newSettings: Partial<VisualizationSettings>,
+ question?: Question,
+ ) => void,
+ extra: SettingsExtra = {},
+): CompleteVisualizationSettingDefinition<T, TValue, TProps> {
+ const settingDef: VisualizationSettingDefinition<T, TValue, TProps> =
+ settingDefs[settingId] ?? {};
+ const value = computedSettings[settingId];
+
+ const onChange = (newValue: TValue, question?: Question) => {
+ const newSettings: Partial<VisualizationSettings> = {
+ [settingId]: newValue,
+ };
+ for (const depId of settingDef.writeDependencies || []) {
+ newSettings[depId] = computedSettings[depId];
+ }
+ for (const eraseId of settingDef.eraseDependencies || []) {
+ newSettings[eraseId] = null;
+ }
+ onChangeSettings(newSettings, question);
+ settingDef.onUpdate?.(newValue, extra);
+ };
+
+ let resolvedObject = object;
+ if (settingDef.useRawSeries && isObjectWithRaw(object) && object._raw) {
+ // only if object is (RawSeries | TransformedSeries)
+ if (Array.isArray(object)) {
+ extra.transformedSeries = object;
+ }
+
+ resolvedObject = object._raw;
+ }
+
+ const {
+ getProps,
+ getWrapperStyle,
+ getSection,
+ getHidden,
+ ...settingDefProps
+ } = settingDef;
+
+ return {
+ ...settingDefProps,
+ id: settingId,
+ value,
+ section: getSection?.(resolvedObject, computedSettings, extra),
+ hidden: getHidden?.(resolvedObject, computedSettings, extra) ?? false,
+ props:
+ getProps?.(
+ resolvedObject,
+ computedSettings,
+ onChange,
+ extra,
+ onChangeSettings,
+ ) ?? {},
+ set: settingId in storedSettings,
+ widget:
+ typeof settingDef.widget === "string"
+ ? getSettingWidgetComponent(settingDef.widget)
+ : settingDef.widget,
+ style: getWrapperStyle?.(resolvedObject, computedSettings, extra),
+ onChange,
+ onChangeSettings, // this gives a widget access to update other settings
+ };
+}
+
+export function getSettingsWidgets<
+ T,
+ TValue,
+ TProps extends Record<string, unknown>,
+>(
+ settingDefs: VisualizationSettingsDefinitions,
+ storedSettings: VisualizationSettings,
+ computedSettings: ComputedVisualizationSettings,
+ object: T,
+ onChangeSettings: (
+ newSettings: Partial<VisualizationSettings>,
+ question?: Question,
+ ) => void,
+ extra: SettingsExtra = {},
+): CompleteVisualizationSettingDefinition<T, TValue, TProps>[] {
+ return Object.keys(settingDefs)
+ .map((settingId) =>
+ getSettingWidget<T, TValue, TProps>(
+ settingDefs,
+ settingId,
+ storedSettings,
+ computedSettings,
+ object,
+ onChangeSettings,
+ extra,
+ ),
+ )
+ .filter((widget) => widget.widget);
+}
+
+export function getSettingsWidgetsForSeries(
+ series: Series | null | undefined,
+ onChangeSettings: (newSettings: Partial<VisualizationSettings>) => void,
+ isDashboard = false,
+ extra: SettingsExtra = {},
+) {
+ const settingsDefs = getSettingDefinitionsForSeries(series);
+ const storedSettings = getStoredSettingsForSeries(series);
+ const computedSettings = getComputedSettingsForSeries(series);
+
+ return getSettingsWidgets(
+ settingsDefs,
+ storedSettings,
+ computedSettings,
+ series ?? [],
+ onChangeSettings,
+ { isDashboard, ...extra },
+ ).filter(
+ (widget) =>
+ widget.dashboard === undefined || widget.dashboard === isDashboard,
+ );
+}
diff --git a/frontend/src/metabase/visualizations/register.js b/frontend/src/metabase/visualizations/register.js
index 1fac677d618..b9d1b889fd0 100644
--- a/frontend/src/metabase/visualizations/register.js
+++ b/frontend/src/metabase/visualizations/register.js
@@ -1,8 +1,32 @@
import {
+ registerSettingWidgets,
registerVisualization,
setDefaultVisualization,
} from "metabase/visualizations";
+import { registerJsxFormatting } from "metabase/visualizations/lib/formatting/ui";
+import { ChartNestedSettingColumns } from "./components/settings/ChartNestedSettingColumns";
+import ChartNestedSettingSeries from "./components/settings/ChartNestedSettingSeries";
+import { ChartSettingColorPicker } from "./components/settings/ChartSettingColorPicker";
+import { ChartSettingColorsPicker } from "./components/settings/ChartSettingColorsPicker";
+import { ChartSettingEnumToggle } from "./components/settings/ChartSettingEnumToggle";
+import { ChartSettingFieldPicker } from "./components/settings/ChartSettingFieldPicker";
+import { ChartSettingFieldsPartition } from "./components/settings/ChartSettingFieldsPartition";
+import { ChartSettingFieldsPicker } from "./components/settings/ChartSettingFieldsPicker";
+import { ChartSettingGoalInput } from "./components/settings/ChartSettingGoalInput";
+import { ChartSettingInput } from "./components/settings/ChartSettingInput";
+import { ChartSettingInputNumeric } from "./components/settings/ChartSettingInputNumeric";
+import { ChartSettingMaxCategories } from "./components/settings/ChartSettingMaxCategories";
+import { ChartSettingMultiSelect } from "./components/settings/ChartSettingMultiSelect";
+import { chartSettingNestedSettings } from "./components/settings/ChartSettingNestedSettings";
+import { ChartSettingOrderedSimple } from "./components/settings/ChartSettingOrderedSimple";
+import { ChartSettingRadio } from "./components/settings/ChartSettingRadio";
+import { ChartSettingSegmentedControl } from "./components/settings/ChartSettingSegmentedControl";
+import { ChartSettingSegmentsEditor } from "./components/settings/ChartSettingSegmentsEditor";
+import { ChartSettingSelect } from "./components/settings/ChartSettingSelect";
+import { ChartSettingSeriesOrder } from "./components/settings/ChartSettingSeriesOrder";
+import { ChartSettingTableColumns } from "./components/settings/ChartSettingTableColumns";
+import { ChartSettingToggle } from "./components/settings/ChartSettingToggle";
import { AreaChart } from "./visualizations/AreaChart";
import { BarChart } from "./visualizations/BarChart";
import { BoxPlot } from "./visualizations/BoxPlot";
@@ -14,6 +38,8 @@ import { ListViz } from "./visualizations/List/components/ListViz";
import { Map } from "./visualizations/Map";
import { ObjectDetail } from "./visualizations/ObjectDetail";
import { PieChart } from "./visualizations/PieChart";
+import { DimensionsWidget } from "./visualizations/PieChart/DimensionsWidget";
+import { SliceNameWidget } from "./visualizations/PieChart/SliceNameWidget";
import { PivotTable } from "./visualizations/PivotTable";
import { Progress } from "./visualizations/Progress";
import { RowChart } from "./visualizations/RowChart";
@@ -21,12 +47,13 @@ import { SankeyChart } from "./visualizations/SankeyChart";
import { Scalar } from "./visualizations/Scalar";
import { ScatterPlot } from "./visualizations/ScatterPlot";
import { SmartScalar } from "./visualizations/SmartScalar";
+import { SmartScalarComparisonWidget } from "./visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets";
import { Table } from "./visualizations/Table/Table";
import { TreemapChart } from "./visualizations/TreemapChart";
+import { TreemapGroupsPicker } from "./visualizations/TreemapChart/TreemapGroupsPicker";
import { WaterfallChart } from "./visualizations/WaterfallChart";
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default function () {
+function registerVisualizationComponents() {
registerVisualization(Scalar);
registerVisualization(SmartScalar);
registerVisualization(Progress);
@@ -52,3 +79,39 @@ export default function () {
setDefaultVisualization(Table);
}
+
+function registerVisualizationSettingWidgets() {
+ registerSettingWidgets({
+ input: ChartSettingInput,
+ number: ChartSettingInputNumeric,
+ radio: ChartSettingRadio,
+ select: ChartSettingSelect,
+ toggle: ChartSettingToggle,
+ segmentedControl: ChartSettingSegmentedControl,
+ field: ChartSettingFieldPicker,
+ fields: ChartSettingFieldsPicker,
+ fieldsPartition: ChartSettingFieldsPartition,
+ color: ChartSettingColorPicker,
+ colors: ChartSettingColorsPicker,
+ multiselect: ChartSettingMultiSelect,
+ enumToggle: ChartSettingEnumToggle,
+ goalInput: ChartSettingGoalInput,
+ maxCategories: ChartSettingMaxCategories,
+ orderedSimple: ChartSettingOrderedSimple,
+ segmentsEditor: ChartSettingSegmentsEditor,
+ seriesOrder: ChartSettingSeriesOrder,
+ tableColumns: ChartSettingTableColumns,
+ nestedColumns: chartSettingNestedSettings(ChartNestedSettingColumns),
+ nestedSeries: chartSettingNestedSettings(ChartNestedSettingSeries),
+ pieDimensions: DimensionsWidget,
+ pieSliceName: SliceNameWidget,
+ smartScalarComparison: SmartScalarComparisonWidget,
+ treemapGroups: TreemapGroupsPicker,
+ });
+}
+
+export function registerVisualizations() {
+ registerVisualizationComponents();
+ registerVisualizationSettingWidgets();
+ registerJsxFormatting();
+}
diff --git a/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx b/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx
index a4399be043f..b67683f0755 100644
--- a/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx
@@ -1,32 +1,10 @@
-import { t } from "ttag";
-
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
-import {
- COMBO_CHARTS_SETTINGS_DEFINITIONS,
- getCartesianChartDefinition,
-} from "metabase/visualizations/visualizations/CartesianChart/chart-definition";
-import type { VisualizationDefinition, VisualizationProps } from "../../types";
+import type { VisualizationProps } from "../../types";
-const AreaViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
- {
- getUiName: () => t`Area`,
- identifier: "area",
- iconName: "area",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`area chart`,
- minSize: getMinSize("area"),
- defaultSize: getDefaultSize("area"),
- settings: {
- ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
- },
- };
+import { AREA_CHART_DEFINITION } from "./definition";
-Object.assign(AreaChart, getCartesianChartDefinition(AreaViz));
+Object.assign(AreaChart, AREA_CHART_DEFINITION);
export function AreaChart(props: VisualizationProps) {
return <CartesianChart {...props} />;
diff --git a/frontend/src/metabase/visualizations/visualizations/AreaChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/AreaChart/definition.ts
new file mode 100644
index 00000000000..5638ce7d7fe
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/AreaChart/definition.ts
@@ -0,0 +1,28 @@
+import { t } from "ttag";
+
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import {
+ COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ getCartesianChartDefinition,
+} from "metabase/visualizations/visualizations/CartesianChart/definition";
+
+import type { VisualizationDefinition } from "../../types";
+
+const AreaViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
+ {
+ getUiName: () => t`Area`,
+ identifier: "area",
+ iconName: "area",
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ noun: t`area chart`,
+ minSize: getMinSize("area"),
+ defaultSize: getDefaultSize("area"),
+ settings: {
+ ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ },
+ };
+
+export const AREA_CHART_DEFINITION = getCartesianChartDefinition(AreaViz);
diff --git a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx
index a3c849f55d5..106362bd776 100644
--- a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx
@@ -1,32 +1,10 @@
-import { t } from "ttag";
-
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
-import {
- COMBO_CHARTS_SETTINGS_DEFINITIONS,
- getCartesianChartDefinition,
-} from "metabase/visualizations/visualizations/CartesianChart/chart-definition";
-import type { VisualizationDefinition, VisualizationProps } from "../../types";
+import type { VisualizationProps } from "../../types";
-const BarViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
- {
- getUiName: () => t`Bar`,
- identifier: "bar",
- iconName: "bar",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`bar chart`,
- minSize: getMinSize("bar"),
- defaultSize: getDefaultSize("bar"),
- settings: {
- ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
- },
- };
+import { BAR_CHART_DEFINITION } from "./definition";
-Object.assign(BarChart, getCartesianChartDefinition(BarViz));
+Object.assign(BarChart, BAR_CHART_DEFINITION);
export function BarChart(props: VisualizationProps) {
return <CartesianChart {...props} />;
diff --git a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.unit.spec.tsx
index c4404696279..b39c8f8b340 100644
--- a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.unit.spec.tsx
@@ -1,7 +1,7 @@
import { createMockMetadata } from "__support__/metadata";
import { renderWithProviders, screen } from "__support__/ui";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import Question from "metabase-lib/v1/Question";
import type { Series } from "metabase-types/api";
import { createMockColumn, createMockDataset } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/visualizations/visualizations/BarChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/BarChart/definition.ts
new file mode 100644
index 00000000000..99cbbec657d
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/BarChart/definition.ts
@@ -0,0 +1,28 @@
+import { t } from "ttag";
+
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import {
+ COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ getCartesianChartDefinition,
+} from "metabase/visualizations/visualizations/CartesianChart/definition";
+
+import type { VisualizationDefinition } from "../../types";
+
+const BarViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
+ {
+ getUiName: () => t`Bar`,
+ identifier: "bar",
+ iconName: "bar",
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ noun: t`bar chart`,
+ minSize: getMinSize("bar"),
+ defaultSize: getDefaultSize("bar"),
+ settings: {
+ ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ },
+ };
+
+export const BAR_CHART_DEFINITION = getCartesianChartDefinition(BarViz);
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
index 640741247fb..35a15a7c461 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
@@ -28,7 +28,7 @@ import {
} from "metabase/visualizations/visualizations/CartesianChart/CartesianChart.styled";
import { useTooltipMouseLeave } from "metabase/visualizations/visualizations/CartesianChart/use-tooltip-mouse-leave";
-import { BOXPLOT_CHART_DEFINITION } from "./chart-definition";
+import { BOXPLOT_CHART_DEFINITION } from "./definition";
import { useBoxPlotEvents } from "./events";
function BoxPlotInner({
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.ts
index 72f940b8872..97d5c414cc8 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.unit.spec.ts
@@ -3,7 +3,7 @@ import {
createMockDatasetData,
} from "metabase-types/api/mocks/dataset";
-import { BOXPLOT_CHART_DEFINITION } from "./chart-definition";
+import { BOXPLOT_CHART_DEFINITION } from "./definition";
const categoryColumn = createMockColumn({
name: "Category",
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/BoxPlot/definition.ts
similarity index 97%
rename from frontend/src/metabase/visualizations/visualizations/BoxPlot/chart-definition.ts
rename to frontend/src/metabase/visualizations/visualizations/BoxPlot/definition.ts
index ebd5281f341..c98edcc660b 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/definition.ts
@@ -15,7 +15,7 @@ import type {
ComputedVisualizationSettings,
VisualizationDefinition,
} from "metabase/visualizations/types";
-import { transformSeries } from "metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy";
+import { transformSeries } from "metabase/visualizations/visualizations/CartesianChart/definition-legacy";
import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
import type { DatasetData, RawSeries } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition-legacy.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy.ts
rename to frontend/src/metabase/visualizations/visualizations/CartesianChart/definition-legacy.ts
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.ts
similarity index 98%
rename from frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition.ts
rename to frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.ts
index 4209976fbe9..193cf8efd4d 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.ts
@@ -32,7 +32,7 @@ import type {
VisualizationSettings,
} from "metabase-types/api";
-import { transformSeries } from "./chart-definition-legacy";
+import { transformSeries } from "./definition-legacy";
const transformCartesianSeries = (series: Series): TransformedSeries => {
if ("_raw" in series) {
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.unit.spec.ts
similarity index 93%
rename from frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition.unit.spec.ts
rename to frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.unit.spec.ts
index 35edb697bad..840da0ac3ac 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.unit.spec.ts
@@ -1,9 +1,9 @@
import { SERIES_SETTING_KEY } from "metabase/visualizations/shared/settings/series";
import type { VisualizationSettings } from "metabase-types/api";
-import { getCartesianChartDefinition } from "./chart-definition";
+import { getCartesianChartDefinition } from "./definition";
-describe("chart-definition", () => {
+describe("definition", () => {
describe("onDisplayUpdate", () => {
const onDisplayUpdate = getCartesianChartDefinition({}).onDisplayUpdate!;
diff --git a/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx b/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx
index 091feb27535..e18ca8fdc82 100644
--- a/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx
@@ -1,34 +1,10 @@
-import { t } from "ttag";
-
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
-import {
- COMBO_CHARTS_SETTINGS_DEFINITIONS,
- getCartesianChartDefinition,
-} from "metabase/visualizations/visualizations/CartesianChart/chart-definition";
-import type { VisualizationDefinition, VisualizationProps } from "../../types";
+import type { VisualizationProps } from "../../types";
-const ComboViz: Omit<
- VisualizationDefinition,
- "isSensible" | "checkRenderable"
-> = {
- getUiName: () => t`Combo`,
- identifier: "combo",
- iconName: "lineandbar",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`line and bar chart`,
- minSize: getMinSize("combo"),
- defaultSize: getDefaultSize("combo"),
- settings: {
- ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
- },
-};
+import { COMBO_CHART_DEFINITION } from "./definition";
-Object.assign(ComboChart, getCartesianChartDefinition(ComboViz));
+Object.assign(ComboChart, COMBO_CHART_DEFINITION);
export function ComboChart(props: VisualizationProps) {
return <CartesianChart {...props} />;
diff --git a/frontend/src/metabase/visualizations/visualizations/ComboChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/ComboChart/definition.ts
new file mode 100644
index 00000000000..f7b276f635c
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/ComboChart/definition.ts
@@ -0,0 +1,30 @@
+import { t } from "ttag";
+
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import {
+ COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ getCartesianChartDefinition,
+} from "metabase/visualizations/visualizations/CartesianChart/definition";
+
+import type { VisualizationDefinition } from "../../types";
+
+const ComboViz: Omit<
+ VisualizationDefinition,
+ "isSensible" | "checkRenderable"
+> = {
+ getUiName: () => t`Combo`,
+ identifier: "combo",
+ iconName: "lineandbar",
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ noun: t`line and bar chart`,
+ minSize: getMinSize("combo"),
+ defaultSize: getDefaultSize("combo"),
+ settings: {
+ ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ },
+};
+
+export const COMBO_CHART_DEFINITION = getCartesianChartDefinition(ComboViz);
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
index c1dbd1bd909..ed7801f28cd 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
@@ -1,193 +1,20 @@
import cx from "classnames";
import React from "react";
-import { t } from "ttag";
-import _ from "underscore";
import CS from "metabase/css/core/index.css";
-import { formatNullable } from "metabase/utils/formatting/nullable";
import ChartCaption from "metabase/visualizations/components/ChartCaption";
import { TransformedVisualization } from "metabase/visualizations/components/TransformedVisualization";
-import { ChartSettingOrderedSimple } from "metabase/visualizations/components/settings/ChartSettingOrderedSimple";
import { useBrowserRenderingContext } from "metabase/visualizations/hooks/use-browser-rendering-context";
import { groupRawSeriesMetrics } from "metabase/visualizations/lib/dataset";
-import {
- ChartSettingsError,
- MinRowsError,
-} from "metabase/visualizations/lib/errors";
-import { columnSettings } from "metabase/visualizations/lib/settings/column";
-import {
- dimensionSetting,
- metricSetting,
-} from "metabase/visualizations/lib/settings/utils";
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
-import type {
- ComputedVisualizationSettings,
- VisualizationDefinition,
- VisualizationProps,
-} from "metabase/visualizations/types";
+import type { VisualizationProps } from "metabase/visualizations/types";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { funnelToBarTransform } from "metabase/visualizations/visualizations/Funnel/funnel-bar-transform";
-import {
- type DatasetData,
- type RawSeries,
- type RowValue,
- getRowsForStableKeys,
-} from "metabase-types/api";
import { FunnelNormal } from "../../components/FunnelNormal";
-import type { FunnelRow } from "./types";
+import { FUNNEL_CHART_DEFINITION } from "./definition";
-const getUniqueFunnelRows = (rows: FunnelRow[]) => {
- return [...new Map(rows.map((row) => [row.key, row])).values()];
-};
-
-const FunnelViz: VisualizationDefinition = {
- getUiName: () => t`Funnel`,
- identifier: "funnel",
- iconName: "funnel",
- noHeader: true,
- minSize: getMinSize("funnel"),
- supportsVisualizer: true,
- defaultSize: getDefaultSize("funnel"),
- isSensible({ cols }: DatasetData) {
- return cols.length === 2;
- },
- checkRenderable: (
- series: RawSeries,
- settings: ComputedVisualizationSettings,
- ) => {
- const [
- {
- data: { rows },
- },
- ] = series;
- if (series.length > 1) {
- return;
- }
-
- if (rows.length < 1) {
- throw new MinRowsError(rows.length);
- }
- if (!settings["funnel.dimension"] || !settings["funnel.metric"]) {
- throw new ChartSettingsError(
- t`Which fields do you want to use?`,
- { section: t`Data` },
- t`Choose fields`,
- );
- }
- },
-
- hasEmptyState: true,
-
- settings: {
- ...columnSettings({ getHidden: () => true }),
- ...dimensionSetting("funnel.dimension", {
- getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
- title: t`Column with steps`,
- dashboard: false,
- useRawSeries: true,
- showColumnSetting: true,
- getWrapperStyle: () => ({
- marginBottom: "0.625rem",
- }),
- }),
- "funnel.order_dimension": {
- getValue: (_series: RawSeries, settings: ComputedVisualizationSettings) =>
- settings["funnel.dimension"],
- readDependencies: ["funnel.rows"],
- },
- "funnel.rows": {
- getSection: () => t`Data`,
- widget: ChartSettingOrderedSimple,
- getValue: (
- rawSeries: RawSeries,
- settings: ComputedVisualizationSettings,
- ) => {
- const { cols } = rawSeries[0].data;
- const dimensionIndex = cols.findIndex(
- (col) => col.name === settings["funnel.dimension"],
- );
- const orderDimension = settings["funnel.order_dimension"];
- const dimension = settings["funnel.dimension"];
-
- const rowsOrder = settings["funnel.rows"];
- const rowsForKeys = getRowsForStableKeys(rawSeries[0].data);
- const rowsKeys = rowsForKeys.map((row) =>
- formatNullable(row[dimensionIndex]),
- );
-
- const getDefault = (keys: RowValue[]) =>
- keys.map((key) => ({
- key,
- name: key,
- enabled: true,
- }));
- if (
- !rowsOrder ||
- !_.isArray(rowsOrder) ||
- !rowsOrder.every((setting) => setting.key !== undefined) ||
- orderDimension !== dimension
- ) {
- return getUniqueFunnelRows(getDefault(rowsKeys));
- }
-
- const removeMissingOrder = (keys: RowValue[], order: any) =>
- order.filter((o: any) => keys.includes(o.key));
- const newKeys = (keys: RowValue[], order: any) =>
- keys.filter((key) => !order.find((o: any) => o.key === key));
-
- const funnelRows = [
- ...removeMissingOrder(rowsKeys, rowsOrder),
- ...getDefault(newKeys(rowsKeys, rowsOrder)),
- ];
-
- return getUniqueFunnelRows(funnelRows);
- },
- getProps: () => ({
- hasEditSettings: false,
- }),
- getHidden: (series: RawSeries, settings: ComputedVisualizationSettings) =>
- settings["funnel.dimension"] === null ||
- settings["funnel.metric"] === null,
- writeDependencies: ["funnel.order_dimension"],
- dataTestId: "funnel-row-sort",
- },
- ...metricSetting("funnel.metric", {
- getSection: () => t`Data`,
-
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
- title: t`Measure`,
-
- dashboard: false,
- useRawSeries: true,
- showColumnSetting: true,
- }),
- "funnel.type": {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
- title: t`Funnel type`,
-
- getSection: () => t`Display`,
-
- widget: "select",
- getProps: () => ({
- options: [
- { name: t`Funnel`, value: "funnel" },
- { name: t`Bar chart`, value: "bar" },
- ],
- }),
- // legacy "bar" funnel was only previously available via multiseries
- getDefault: (series: RawSeries) => (series.length > 1 ? "bar" : "funnel"),
- useRawSeries: true,
- },
- },
-};
-
-Object.assign(Funnel, FunnelViz);
+Object.assign(Funnel, FUNNEL_CHART_DEFINITION);
export function Funnel(props: VisualizationProps) {
const {
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsx
index e9f8bd0f555..71108cdaf9c 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsx
@@ -1,6 +1,6 @@
import { renderWithProviders, screen } from "__support__/ui";
import { ThemeProvider } from "metabase/ui";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { VisualizationProps } from "metabase/visualizations/types";
import type { VisualizationSettings } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts b/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts
new file mode 100644
index 00000000000..615608367ba
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts
@@ -0,0 +1,175 @@
+import { t } from "ttag";
+import _ from "underscore";
+
+import { formatNullable } from "metabase/utils/formatting/nullable";
+import {
+ ChartSettingsError,
+ MinRowsError,
+} from "metabase/visualizations/lib/errors";
+import { columnSettings } from "metabase/visualizations/lib/settings/column";
+import {
+ dimensionSetting,
+ metricSetting,
+} from "metabase/visualizations/lib/settings/utils";
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import type {
+ ComputedVisualizationSettings,
+ VisualizationDefinition,
+} from "metabase/visualizations/types";
+import {
+ type DatasetData,
+ type RawSeries,
+ type RowValue,
+ getRowsForStableKeys,
+} from "metabase-types/api";
+
+import type { FunnelRow } from "./types";
+
+const getUniqueFunnelRows = (rows: FunnelRow[]) => {
+ return [...new Map(rows.map((row) => [row.key, row])).values()];
+};
+
+export const FUNNEL_CHART_DEFINITION: VisualizationDefinition = {
+ getUiName: () => t`Funnel`,
+ identifier: "funnel",
+ iconName: "funnel",
+ noHeader: true,
+ minSize: getMinSize("funnel"),
+ supportsVisualizer: true,
+ defaultSize: getDefaultSize("funnel"),
+ isSensible({ cols }: DatasetData) {
+ return cols.length === 2;
+ },
+ checkRenderable: (
+ series: RawSeries,
+ settings: ComputedVisualizationSettings,
+ ) => {
+ const [
+ {
+ data: { rows },
+ },
+ ] = series;
+ if (series.length > 1) {
+ return;
+ }
+
+ if (rows.length < 1) {
+ throw new MinRowsError(rows.length);
+ }
+ if (!settings["funnel.dimension"] || !settings["funnel.metric"]) {
+ throw new ChartSettingsError(
+ t`Which fields do you want to use?`,
+ { section: t`Data` },
+ t`Choose fields`,
+ );
+ }
+ },
+
+ hasEmptyState: true,
+
+ settings: {
+ ...columnSettings({ getHidden: () => true }),
+ ...dimensionSetting("funnel.dimension", {
+ getSection: () => t`Data`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
+ title: t`Column with steps`,
+ dashboard: false,
+ useRawSeries: true,
+ showColumnSetting: true,
+ getWrapperStyle: () => ({
+ marginBottom: "0.625rem",
+ }),
+ }),
+ "funnel.order_dimension": {
+ getValue: (_series: RawSeries, settings: ComputedVisualizationSettings) =>
+ settings["funnel.dimension"],
+ readDependencies: ["funnel.rows"],
+ },
+ "funnel.rows": {
+ getSection: () => t`Data`,
+ widget: "orderedSimple",
+ getValue: (
+ rawSeries: RawSeries,
+ settings: ComputedVisualizationSettings,
+ ) => {
+ const { cols } = rawSeries[0].data;
+ const dimensionIndex = cols.findIndex(
+ (col) => col.name === settings["funnel.dimension"],
+ );
+ const orderDimension = settings["funnel.order_dimension"];
+ const dimension = settings["funnel.dimension"];
+
+ const rowsOrder = settings["funnel.rows"];
+ const rowsForKeys = getRowsForStableKeys(rawSeries[0].data);
+ const rowsKeys = rowsForKeys.map((row) =>
+ formatNullable(row[dimensionIndex]),
+ );
+
+ const getDefault = (keys: RowValue[]) =>
+ keys.map((key) => ({
+ key,
+ name: key,
+ enabled: true,
+ }));
+ if (
+ !rowsOrder ||
+ !_.isArray(rowsOrder) ||
+ !rowsOrder.every((setting) => setting.key !== undefined) ||
+ orderDimension !== dimension
+ ) {
+ return getUniqueFunnelRows(getDefault(rowsKeys));
+ }
+
+ const removeMissingOrder = (keys: RowValue[], order: any) =>
+ order.filter((o: any) => keys.includes(o.key));
+ const newKeys = (keys: RowValue[], order: any) =>
+ keys.filter((key) => !order.find((o: any) => o.key === key));
+
+ const funnelRows = [
+ ...removeMissingOrder(rowsKeys, rowsOrder),
+ ...getDefault(newKeys(rowsKeys, rowsOrder)),
+ ];
+
+ return getUniqueFunnelRows(funnelRows);
+ },
+ getProps: () => ({
+ hasEditSettings: false,
+ }),
+ getHidden: (series: RawSeries, settings: ComputedVisualizationSettings) =>
+ settings["funnel.dimension"] === null ||
+ settings["funnel.metric"] === null,
+ writeDependencies: ["funnel.order_dimension"],
+ dataTestId: "funnel-row-sort",
+ },
+ ...metricSetting("funnel.metric", {
+ getSection: () => t`Data`,
+
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
+ title: t`Measure`,
+
+ dashboard: false,
+ useRawSeries: true,
+ showColumnSetting: true,
+ }),
+ "funnel.type": {
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
+ title: t`Funnel type`,
+
+ getSection: () => t`Display`,
+
+ widget: "select",
+ getProps: () => ({
+ options: [
+ { name: t`Funnel`, value: "funnel" },
+ { name: t`Bar chart`, value: "bar" },
+ ],
+ }),
+ // legacy "bar" funnel was only previously available via multiseries
+ getDefault: (series: RawSeries) => (series.length > 1 ? "bar" : "funnel"),
+ useRawSeries: true,
+ },
+ },
+};
diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx
index e9bf5fa8d3b..f181de63691 100644
--- a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx
@@ -12,7 +12,6 @@ import { GaugeArc } from "./GaugeArc";
import { GaugeNeedle } from "./GaugeNeedle";
import { GaugeSegmentLabel } from "./GaugeSegmentLabel";
import { HideIfOverflowingSVG } from "./HideIfOverflowingSVG";
-import { GAUGE_CHART_DEFINITION } from "./chart-definition";
import {
ARC_DEGREES,
FONT_SIZE_CENTER_LABEL_MAX,
@@ -27,6 +26,7 @@ import {
getCenterLabelColor,
getSegmentLabelColor,
} from "./constants";
+import { GAUGE_CHART_DEFINITION } from "./definition";
import { isGaugeRange, isGaugeSegmentsArray } from "./types";
import { getValue, radians } from "./utils";
diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/Gauge/definition.ts
similarity index 94%
rename from frontend/src/metabase/visualizations/visualizations/Gauge/chart-definition.ts
rename to frontend/src/metabase/visualizations/visualizations/Gauge/definition.ts
index 921dfb2afc9..c0810b41f53 100644
--- a/frontend/src/metabase/visualizations/visualizations/Gauge/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/definition.ts
@@ -3,7 +3,6 @@ import { t } from "ttag";
import _ from "underscore";
import { color as colorHex } from "metabase/ui/colors";
-import { ChartSettingSegmentsEditor } from "metabase/visualizations/components/settings/ChartSettingSegmentsEditor";
import { columnSettings } from "metabase/visualizations/lib/settings/column";
import { segmentIsValid } from "metabase/visualizations/lib/utils";
import {
@@ -83,7 +82,7 @@ export const GAUGE_CHART_DEFINITION: VisualizationDefinition = {
{ min: value, max: value * 2, color: successColor, label: "" },
];
},
- widget: ChartSettingSegmentsEditor,
+ widget: "segmentsEditor",
persistDefault: true,
getWrapperStyle: () => ({
marginLeft: 0,
diff --git a/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx b/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx
index 7727459c0bd..20a81e5c51f 100644
--- a/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx
@@ -1,32 +1,10 @@
-import { t } from "ttag";
-
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
-import {
- COMBO_CHARTS_SETTINGS_DEFINITIONS,
- getCartesianChartDefinition,
-} from "metabase/visualizations/visualizations/CartesianChart/chart-definition";
-import type { VisualizationDefinition, VisualizationProps } from "../../types";
+import type { VisualizationProps } from "../../types";
-const LineViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
- {
- getUiName: () => t`Line`,
- identifier: "line",
- iconName: "line",
- // eslint-disable-next-line ttag/no-module-declaration
- noun: t`line chart`,
- minSize: getMinSize("line"),
- defaultSize: getDefaultSize("line"),
- settings: {
- ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
- },
- };
+import { LINE_CHART_DEFINITION } from "./definition";
-Object.assign(LineChart, getCartesianChartDefinition(LineViz));
+Object.assign(LineChart, LINE_CHART_DEFINITION);
export function LineChart(props: VisualizationProps) {
return <CartesianChart {...props} />;
diff --git a/frontend/src/metabase/visualizations/visualizations/LineChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/LineChart/definition.ts
new file mode 100644
index 00000000000..aed691a4b12
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/LineChart/definition.ts
@@ -0,0 +1,28 @@
+import { t } from "ttag";
+
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import {
+ COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ getCartesianChartDefinition,
+} from "metabase/visualizations/visualizations/CartesianChart/definition";
+
+import type { VisualizationDefinition } from "../../types";
+
+const LineViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
+ {
+ getUiName: () => t`Line`,
+ identifier: "line",
+ iconName: "line",
+ // eslint-disable-next-line ttag/no-module-declaration
+ noun: t`line chart`,
+ minSize: getMinSize("line"),
+ defaultSize: getDefaultSize("line"),
+ settings: {
+ ...COMBO_CHARTS_SETTINGS_DEFINITIONS,
+ },
+ };
+
+export const LINE_CHART_DEFINITION = getCartesianChartDefinition(LineViz);
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx
index ec610abd2c5..7fc4ca6784a 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx
@@ -20,7 +20,7 @@ import type { VisualizationProps } from "metabase/visualizations/types";
import { useTooltipMouseLeave } from "metabase/visualizations/visualizations/CartesianChart/use-tooltip-mouse-leave";
import S from "./PieChart.module.css";
-import { PIE_CHART_DEFINITION } from "./chart-definition";
+import { PIE_CHART_DEFINITION } from "./definition";
import { useChartEvents } from "./use-chart-events";
Object.assign(PieChart, PIE_CHART_DEFINITION);
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts
similarity index 97%
rename from frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts
rename to frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts
index 8fcc55cbc89..ce682ce58cd 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts
@@ -33,8 +33,7 @@ import type { VisualizationDefinition } from "metabase/visualizations/types";
import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
import type { SingleSeries } from "metabase-types/api";
-import { DimensionsWidget } from "./DimensionsWidget";
-import { SliceNameWidget, type SliceNameWidgetProps } from "./SliceNameWidget";
+import type { SliceNameWidgetProps } from "./SliceNameWidget";
const pieRowsReadDeps = [
"pie.dimension",
@@ -145,7 +144,7 @@ export const PIE_CHART_DEFINITION: VisualizationDefinition = {
SliceNameWidgetProps
>(SERIES_SETTING_KEY, {
getObjectKey: keyForSingleSeries,
- widget: SliceNameWidget,
+ widget: "pieSliceName",
getHidden: ([{ card }], _settings, extra) =>
!extra?.isDashboard || card?.display === "waterfall",
getSection: (_series, _settings, extra) =>
@@ -178,7 +177,7 @@ export const PIE_CHART_DEFINITION: VisualizationDefinition = {
"pie._dimensions_widget": {
getSection: () => t`Data`,
- widget: DimensionsWidget,
+ widget: "pieDimensions",
getProps: (rawSeries, settings, _onChange, _extra, onChangeSettings) => ({
rawSeries,
settings,
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx
index 05eaaa5e62e..d730b581307 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx
@@ -8,7 +8,7 @@ import { createMockMetadata } from "__support__/metadata";
import { renderWithProviders } from "__support__/ui";
import * as domUtils from "metabase/utils/dom";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import Question from "metabase-lib/v1/Question";
import type { VisualizationSettings } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
index d08fe4bc24e..0a923227b93 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
@@ -8,7 +8,7 @@ import { checkNotNull } from "metabase/utils/types";
import { formatValue } from "metabase/visualizations/lib/formatting";
import type { VisualizationProps } from "metabase/visualizations/types";
-import { PROGRESS_CHART_DEFINITION } from "./chart-definition";
+import { PROGRESS_CHART_DEFINITION } from "./definition";
import {
calculateProgressMetrics,
extractProgressValue,
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/Progress/definition.ts
similarity index 95%
rename from frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts
rename to frontend/src/metabase/visualizations/visualizations/Progress/definition.ts
index 160cb594cfb..d310ccad8fa 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Progress/definition.ts
@@ -1,7 +1,6 @@
import { t } from "ttag";
import { color } from "metabase/ui/colors";
-import { ChartSettingGoalInput } from "metabase/visualizations/components/settings/ChartSettingGoalInput";
import { columnSettings } from "metabase/visualizations/lib/settings/column";
import { fieldSetting } from "metabase/visualizations/lib/settings/utils";
import {
@@ -71,7 +70,7 @@ export const PROGRESS_CHART_DEFINITION: VisualizationDefinition = {
get title() {
return t`Goal`;
},
- widget: ChartSettingGoalInput,
+ widget: "goalInput",
getDefault: () => 0,
isValid: ([{ data }], settings) => {
const goalSetting = settings["progress.goal"];
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
index 2fb27f7fd3c..cb8e5be1456 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
@@ -1,5 +1,4 @@
import { useEffect, useMemo } from "react";
-import { t } from "ttag";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import CS from "metabase/css/core/index.css";
@@ -7,22 +6,8 @@ import { getFontFamilyValue } from "metabase/utils/fonts";
import type { FontStyle } from "metabase/utils/measure-text";
import { measureTextWidth } from "metabase/utils/measure-text";
import { extractRemappedColumns } from "metabase/visualizations";
-import {
- getCartesianChartColumns,
- hasValidColumnsSelected,
-} from "metabase/visualizations/lib/graph/columns";
import { getChartGoal } from "metabase/visualizations/lib/settings/goal";
-import { GRAPH_DATA_SETTINGS } from "metabase/visualizations/lib/settings/graph";
import { getStackOffset } from "metabase/visualizations/lib/settings/stacking";
-import {
- getBreakoutCardinality,
- validateBreakoutSeriesCount,
- validateChartDataSettings,
- validateDatasetRows,
- validateStacking,
-} from "metabase/visualizations/lib/settings/validation";
-import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
-import { MAX_SERIES } from "metabase/visualizations/lib/utils";
import type { RowChartProps } from "metabase/visualizations/shared/components/RowChart";
import { RowChart } from "metabase/visualizations/shared/components/RowChart";
import type { BarData } from "metabase/visualizations/shared/components/RowChart/types";
@@ -33,18 +18,11 @@ import type {
import type { HoveredData } from "metabase/visualizations/shared/types/events";
import {
getGroupedDataset,
- getSeries,
trimData,
} from "metabase/visualizations/shared/utils/data";
import { getTwoDimensionalChartSeries } from "metabase/visualizations/shared/utils/series";
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import type {
- ComputedVisualizationSettings,
RemappingHydratedChartData,
- VisualizationDefinition,
VisualizationProps,
} from "metabase/visualizations/types";
import {
@@ -53,13 +31,6 @@ import {
getLegendClickData,
} from "metabase/visualizations/visualizations/RowChart/utils/events";
import { useRowChartTheme } from "metabase/visualizations/visualizations/RowChart/utils/theme";
-import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
-import type {
- Card,
- DatasetData,
- TransformedCard,
- VisualizationSettings,
-} from "metabase-types/api";
import {
RowChartContainer,
@@ -67,6 +38,7 @@ import {
RowLegendCaption,
RowVisualizationRoot,
} from "./RowChart.styled";
+import { ROW_CHART_DEFINITION } from "./definition";
import {
getColumnValueFormatter,
getFormatters,
@@ -79,7 +51,6 @@ import {
getLabels,
getXValueRange,
} from "./utils/settings";
-import { ROW_CHART_SETTINGS } from "./utils/settings-definitions";
import { getChartWarnings } from "./utils/warnings";
interface RowChartRendererProps extends RowChartProps<GroupedDatum> {
@@ -338,103 +309,6 @@ const RowChartVisualization = ({
);
};
-const RowViz: VisualizationDefinition = {
- getUiName: () => t`Row`,
- identifier: "row",
- iconName: "horizontal_bar",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`row chart`,
- noHeader: true,
- hasEmptyState: true,
- minSize: getMinSize("row"),
- defaultSize: getDefaultSize("row"),
- settings: {
- ...ROW_CHART_SETTINGS,
- ...GRAPH_DATA_SETTINGS,
- ["graph.metrics"]: {
- ...GRAPH_DATA_SETTINGS["graph.metrics"],
- get title() {
- return t`X-axis`;
- },
- },
- ["graph.dimensions"]: {
- ...GRAPH_DATA_SETTINGS["graph.dimensions"],
- get title() {
- return t`Y-axis`;
- },
- },
- },
- isSensible: ({ cols, rows }: DatasetData) => {
- return (
- rows.length > 1 &&
- cols.length >= 2 &&
- cols.filter(isDimension).length > 0 &&
- cols.filter(isMetric).length > 0
- );
- },
- isLiveResizable: (series: any[]) => {
- const totalRows = series.reduce((sum, s) => sum + s.data.rows.length, 0);
- return totalRows < 10;
- },
- /**
- * Required to make it compatible with series settings without rewriting them fully
- * It expands a single card + dataset into multiple "series" and sets _seriesKey which is needed for settings to work
- */
- transformSeries: (originalMultipleSeries) => {
- const [series] = originalMultipleSeries;
- const settings: ComputedVisualizationSettings =
- getComputedSettingsForSeries(originalMultipleSeries);
- const { card, data } = series;
-
- if (isTransformedCard(card) || !hasValidColumnsSelected(settings, data)) {
- return originalMultipleSeries;
- }
-
- const cardinality = getBreakoutCardinality(data.cols, data.rows, settings);
- if (cardinality != null && cardinality > MAX_SERIES) {
- return originalMultipleSeries;
- }
-
- const chartColumns = getCartesianChartColumns(data.cols, settings);
- const seriesDefinitions = getSeries(
- data,
- chartColumns,
- getColumnValueFormatter(),
- settings,
- );
-
- const transformedSeries = seriesDefinitions.map((seriesDef) => ({
- card: {
- ...card,
- name: seriesDef.seriesName,
- _seriesKey: seriesDef.seriesKey,
- _transformed: true,
- },
- data: {
- ...data,
- cols: [
- seriesDef.seriesInfo?.dimensionColumn,
- seriesDef.seriesInfo?.metricColumn,
- ].filter((column) => column != null),
- },
- }));
-
- return transformedSeries.length > 0
- ? transformedSeries
- : originalMultipleSeries;
- },
- checkRenderable: (series: any[], settings: VisualizationSettings) => {
- validateDatasetRows(series);
- validateBreakoutSeriesCount(series, settings);
- validateChartDataSettings(settings);
- validateStacking(settings);
- },
-};
-
-function isTransformedCard(card: Card): card is TransformedCard {
- return "_transformed" in card && card._transformed === true;
-}
-
-Object.assign(RowChartVisualization, RowViz);
+Object.assign(RowChartVisualization, ROW_CHART_DEFINITION);
export { RowChartVisualization as RowChart };
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/definition.ts
new file mode 100644
index 00000000000..1d4e12e821a
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/definition.ts
@@ -0,0 +1,132 @@
+import { t } from "ttag";
+
+import {
+ getCartesianChartColumns,
+ hasValidColumnsSelected,
+} from "metabase/visualizations/lib/graph/columns";
+import { GRAPH_DATA_SETTINGS } from "metabase/visualizations/lib/settings/graph";
+import {
+ getBreakoutCardinality,
+ validateBreakoutSeriesCount,
+ validateChartDataSettings,
+ validateDatasetRows,
+ validateStacking,
+} from "metabase/visualizations/lib/settings/validation";
+import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
+import { MAX_SERIES } from "metabase/visualizations/lib/utils";
+import { getSeries } from "metabase/visualizations/shared/utils/data";
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import type {
+ ComputedVisualizationSettings,
+ VisualizationDefinition,
+} from "metabase/visualizations/types";
+import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
+import type {
+ Card,
+ DatasetData,
+ TransformedCard,
+ VisualizationSettings,
+} from "metabase-types/api";
+
+import { getColumnValueFormatter } from "./utils/format";
+import { ROW_CHART_SETTINGS } from "./utils/settings-definitions";
+
+export const ROW_CHART_DEFINITION: VisualizationDefinition = {
+ getUiName: () => t`Row`,
+ identifier: "row",
+ iconName: "horizontal_bar",
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ noun: t`row chart`,
+ noHeader: true,
+ hasEmptyState: true,
+ minSize: getMinSize("row"),
+ defaultSize: getDefaultSize("row"),
+ settings: {
+ ...ROW_CHART_SETTINGS,
+ ...GRAPH_DATA_SETTINGS,
+ ["graph.metrics"]: {
+ ...GRAPH_DATA_SETTINGS["graph.metrics"],
+ get title() {
+ return t`X-axis`;
+ },
+ },
+ ["graph.dimensions"]: {
+ ...GRAPH_DATA_SETTINGS["graph.dimensions"],
+ get title() {
+ return t`Y-axis`;
+ },
+ },
+ },
+ isSensible: ({ cols, rows }: DatasetData) => {
+ return (
+ rows.length > 1 &&
+ cols.length >= 2 &&
+ cols.filter(isDimension).length > 0 &&
+ cols.filter(isMetric).length > 0
+ );
+ },
+ isLiveResizable: (series: any[]) => {
+ const totalRows = series.reduce((sum, s) => sum + s.data.rows.length, 0);
+ return totalRows < 10;
+ },
+ /**
+ * Required to make it compatible with series settings without rewriting them fully
+ * It expands a single card + dataset into multiple "series" and sets _seriesKey which is needed for settings to work
+ */
+ transformSeries: (originalMultipleSeries) => {
+ const [series] = originalMultipleSeries;
+ const settings: ComputedVisualizationSettings =
+ getComputedSettingsForSeries(originalMultipleSeries);
+ const { card, data } = series;
+
+ if (isTransformedCard(card) || !hasValidColumnsSelected(settings, data)) {
+ return originalMultipleSeries;
+ }
+
+ const cardinality = getBreakoutCardinality(data.cols, data.rows, settings);
+ if (cardinality != null && cardinality > MAX_SERIES) {
+ return originalMultipleSeries;
+ }
+
+ const chartColumns = getCartesianChartColumns(data.cols, settings);
+ const seriesDefinitions = getSeries(
+ data,
+ chartColumns,
+ getColumnValueFormatter(),
+ settings,
+ );
+
+ const transformedSeries = seriesDefinitions.map((seriesDef) => ({
+ card: {
+ ...card,
+ name: seriesDef.seriesName,
+ _seriesKey: seriesDef.seriesKey,
+ _transformed: true,
+ },
+ data: {
+ ...data,
+ cols: [
+ seriesDef.seriesInfo?.dimensionColumn,
+ seriesDef.seriesInfo?.metricColumn,
+ ].filter((column) => column != null),
+ },
+ }));
+
+ return transformedSeries.length > 0
+ ? transformedSeries
+ : originalMultipleSeries;
+ },
+ checkRenderable: (series: any[], settings: VisualizationSettings) => {
+ validateDatasetRows(series);
+ validateBreakoutSeriesCount(series, settings);
+ validateChartDataSettings(settings);
+ validateStacking(settings);
+ },
+};
+
+function isTransformedCard(card: Card): card is TransformedCard {
+ return "_transformed" in card && card._transformed === true;
+}
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.stories.tsx b/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.stories.tsx
index 145923bbd70..c4ea9072d71 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.stories.tsx
@@ -5,9 +5,12 @@ import {
SdkVisualizationStory,
} from "__support__/storybook";
import type { StaticChartProps } from "metabase/static-viz/components/StaticVisualization";
+import { registerVisualizations } from "metabase/visualizations/register";
import * as data from "./stories-data";
+registerVisualizations();
+
export default {
title: "viz/SankeyChart",
component: IsomorphicVisualizationStory,
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx b/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx
index 9137a801d87..296f780f52d 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx
@@ -15,7 +15,7 @@ import { useBrowserRenderingContext } from "metabase/visualizations/hooks/use-br
import type { VisualizationProps } from "metabase/visualizations/types";
import { useTooltipMouseLeave } from "metabase/visualizations/visualizations/CartesianChart/use-tooltip-mouse-leave";
-import { SANKEY_CHART_DEFINITION } from "./chart-definition";
+import { SANKEY_CHART_DEFINITION } from "./definition";
import { useChartEvents } from "./events";
export const SankeyChart = ({
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
similarity index 100%
rename from frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts
rename to frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.unit.spec.ts
similarity index 99%
rename from frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.unit.spec.ts
rename to frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.unit.spec.ts
index 57be891d66a..57c6cda5a2a 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.unit.spec.ts
@@ -6,7 +6,7 @@ import {
createMockDatasetData,
} from "metabase-types/api/mocks/dataset";
-import { SANKEY_CHART_DEFINITION } from "./chart-definition";
+import { SANKEY_CHART_DEFINITION } from "./definition";
const isSensible = checkNotNull(SANKEY_CHART_DEFINITION.isSensible);
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
index bf2f616fbae..59ae376b605 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
@@ -1,5 +1,4 @@
import { Component } from "react";
-import { t } from "ttag";
import _ from "underscore";
import DashboardS from "metabase/css/dashboard.module.css";
@@ -9,28 +8,22 @@ import {
ScalarWrapper,
} from "metabase/visualizations/components/ScalarValue/ScalarValue";
import { TransformedVisualization } from "metabase/visualizations/components/TransformedVisualization";
-import { ChartSettingSegmentsEditor } from "metabase/visualizations/components/settings/ChartSettingSegmentsEditor";
import {
compactifyValue,
getColor,
getTooltipContent,
} from "metabase/visualizations/lib/scalar_utils";
-import { columnSettings } from "metabase/visualizations/lib/settings/column";
-import { fieldSetting } from "metabase/visualizations/lib/settings/utils";
import { segmentIsValid } from "metabase/visualizations/lib/utils";
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import type {
ComputedVisualizationSettings,
VisualizationPassThroughProps,
VisualizationProps,
} from "metabase/visualizations/types";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
-import type { DatasetColumn, DatasetData } from "metabase-types/api/dataset";
+import type { DatasetColumn } from "metabase-types/api/dataset";
import { ScalarValueContainer } from "./ScalarValueContainer";
+import { SCALAR_CHART_DEFINITION } from "./definition";
import { scalarToBarTransform } from "./scalars-bar-transform";
const PADDING = 32;
@@ -52,110 +45,6 @@ function legacyScalarSettingsToFormatOptions(
export class Scalar extends Component<
VisualizationProps & VisualizationPassThroughProps
> {
- static getUiName = () => t`Number`;
- static identifier = "scalar";
- static iconName = "number";
- static canSavePng = false;
-
- static minSize = getMinSize("scalar");
- static defaultSize = getDefaultSize("scalar");
-
- static isSensible({ cols, rows }: DatasetData) {
- return rows.length === 1 && cols.length === 1;
- }
-
- static checkRenderable() {
- // scalar can always be rendered, nothing needed here
- }
-
- static settings = {
- ...fieldSetting("scalar.field", {
- getSection: () => t`Formatting`,
- get title() {
- return t`Field to show`;
- },
- getDefault: ([
- {
- data: { cols },
- },
- ]) => cols[0]?.name,
- getHidden: ([
- {
- data: { cols },
- },
- ]) => cols.length < 2,
- }),
- "scalar.segments": {
- getSection: () => t`Conditional colors`,
- getDefault() {
- return [];
- },
- widget: ChartSettingSegmentsEditor,
- persistDefault: true,
- getWrapperStyle: () => ({
- marginLeft: 0,
- marginRight: 0,
- }),
- getProps: () => ({
- canRemoveAll: true,
- }),
- },
- ...columnSettings({
- getColumns: (
- [
- {
- data: { cols },
- },
- ],
- settings,
- ) => [
- _.find(cols, (col) => col.name === settings["scalar.field"]) || cols[0],
- ],
- readDependencies: ["scalar.field"],
- }),
- // used by metrics viewer
- "scalar.label": {
- getHidden: () => true,
- getDefault: () => undefined,
- },
- // used by metrics viewer
- "scalar.sublabel": {
- getHidden: () => true,
- getDefault: () => undefined,
- },
- // LEGACY scalar settings, now handled by column level settings
- "scalar.locale": {
- // title: t`Separator style`,
- // widget: "select",
- // getProps: () => ({
- // options: [
- // { name: "100000.00", value: null },
- // { name: "100,000.00", value: "en" },
- // { name: "100 000,00", value: "fr" },
- // { name: "100.000,00", value: "de" },
- // ],
- // }),
- // getDefault:() => "en",
- },
- "scalar.decimals": {
- // title: t`Number of decimal places`,
- // widget: "number",
- },
- "scalar.prefix": {
- // title: t`Add a prefix`,
- // widget: "input",
- },
- "scalar.suffix": {
- // title: t`Add a suffix`,
- // widget: "input",
- },
- "scalar.scale": {
- // title: t`Multiply by a number`,
- // widget: "number",
- },
- click_behavior: {},
- };
-
_scalar: HTMLElement | null = null;
_getColumnIndex(
@@ -303,3 +192,5 @@ export class Scalar extends Component<
);
}
}
+
+Object.assign(Scalar, SCALAR_CHART_DEFINITION);
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx
index dc2f97010b9..e67b1a1f4db 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import type { ComponentProps } from "react";
import { render, renderWithProviders, screen, within } from "__support__/ui";
-import { registerVisualization } from "metabase/visualizations";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Series } from "metabase-types/api";
import {
createMockCard,
@@ -114,8 +114,7 @@ describe("Scalar", () => {
describe("scalar viz settings", () => {
beforeAll(() => {
- // @ts-expect-error: incompatible prop types with registerVisualization
- registerVisualization(Scalar);
+ registerVisualizations();
});
it("should render the field to show input in the formatting section if there are 2 or more columns", async () => {
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/definition.ts b/frontend/src/metabase/visualizations/visualizations/Scalar/definition.ts
new file mode 100644
index 00000000000..1df85e908f5
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/definition.ts
@@ -0,0 +1,117 @@
+import { t } from "ttag";
+import _ from "underscore";
+
+import { columnSettings } from "metabase/visualizations/lib/settings/column";
+import { fieldSetting } from "metabase/visualizations/lib/settings/utils";
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import type { VisualizationDefinition } from "metabase/visualizations/types";
+import type { DatasetData } from "metabase-types/api/dataset";
+
+export const SCALAR_CHART_DEFINITION: VisualizationDefinition = {
+ getUiName: () => t`Number`,
+ identifier: "scalar",
+ iconName: "number",
+ canSavePng: false,
+
+ minSize: getMinSize("scalar"),
+ defaultSize: getDefaultSize("scalar"),
+
+ isSensible({ cols, rows }: DatasetData) {
+ return rows.length === 1 && cols.length === 1;
+ },
+
+ checkRenderable() {
+ // scalar can always be rendered, nothing needed here
+ },
+
+ settings: {
+ ...fieldSetting("scalar.field", {
+ getSection: () => t`Formatting`,
+ get title() {
+ return t`Field to show`;
+ },
+ getDefault: ([
+ {
+ data: { cols },
+ },
+ ]) => cols[0]?.name,
+ getHidden: ([
+ {
+ data: { cols },
+ },
+ ]) => cols.length < 2,
+ }),
+ "scalar.segments": {
+ getSection: () => t`Conditional colors`,
+ getDefault() {
+ return [];
+ },
+ widget: "segmentsEditor",
+ persistDefault: true,
+ getWrapperStyle: () => ({
+ marginLeft: 0,
+ marginRight: 0,
+ }),
+ getProps: () => ({
+ canRemoveAll: true,
+ }),
+ },
+ ...columnSettings({
+ getColumns: (
+ [
+ {
+ data: { cols },
+ },
+ ],
+ settings,
+ ) => [
+ _.find(cols, (col) => col.name === settings["scalar.field"]) || cols[0],
+ ],
+ readDependencies: ["scalar.field"],
+ }),
+ // used by metrics viewer
+ "scalar.label": {
+ getHidden: () => true,
+ getDefault: () => undefined,
+ },
+ // used by metrics viewer
+ "scalar.sublabel": {
+ getHidden: () => true,
+ getDefault: () => undefined,
+ },
+ // LEGACY scalar settings, now handled by column level settings
+ "scalar.locale": {
+ // title: t`Separator style`,
+ // widget: "select",
+ // getProps: () => ({
+ // options: [
+ // { name: "100000.00", value: null },
+ // { name: "100,000.00", value: "en" },
+ // { name: "100 000,00", value: "fr" },
+ // { name: "100.000,00", value: "de" },
+ // ],
+ // }),
+ // getDefault:() => "en",
+ },
+ "scalar.decimals": {
+ // title: t`Number of decimal places`,
+ // widget: "number",
+ },
+ "scalar.prefix": {
+ // title: t`Add a prefix`,
+ // widget: "input",
+ },
+ "scalar.suffix": {
+ // title: t`Add a suffix`,
+ // widget: "input",
+ },
+ "scalar.scale": {
+ // title: t`Multiply by a number`,
+ // widget: "number",
+ },
+ click_behavior: {},
+ },
+};
diff --git a/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx
index c157980cdc2..fbfd86b9cab 100644
--- a/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx
@@ -1,48 +1,10 @@
-import { t } from "ttag";
-
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
-import { getCartesianChartDefinition } from "metabase/visualizations/visualizations/CartesianChart/chart-definition";
-import { GRAPH_GOAL_SETTINGS } from "../../lib/settings/goal";
-import {
- GRAPH_AXIS_SETTINGS,
- GRAPH_BUBBLE_SETTINGS,
- GRAPH_COLORS_SETTINGS,
- GRAPH_DATA_SETTINGS,
- GRAPH_TREND_SETTINGS,
- SPLIT_PANELS_SETTINGS,
- TOOLTIP_SETTINGS,
-} from "../../lib/settings/graph";
-import type { VisualizationDefinition, VisualizationProps } from "../../types";
+import type { VisualizationProps } from "../../types";
-const ScatterViz: Omit<
- VisualizationDefinition,
- "isSensible" | "checkRenderable"
-> = {
- getUiName: () => t`Scatter`,
- identifier: "scatter",
- iconName: "bubble",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`scatter plot`,
- minSize: getMinSize("scatter"),
- defaultSize: getDefaultSize("scatter"),
- settings: {
- ...GRAPH_BUBBLE_SETTINGS,
- ...GRAPH_GOAL_SETTINGS,
- ...GRAPH_TREND_SETTINGS,
- ...GRAPH_COLORS_SETTINGS,
- ...GRAPH_AXIS_SETTINGS,
- ...GRAPH_DATA_SETTINGS,
- ...SPLIT_PANELS_SETTINGS,
- ...TOOLTIP_SETTINGS,
- },
-};
+import { SCATTER_PLOT_DEFINITION } from "./definition";
-Object.assign(ScatterPlot, getCartesianChartDefinition(ScatterViz));
+Object.assign(ScatterPlot, SCATTER_PLOT_DEFINITION);
export function ScatterPlot(props: VisualizationProps) {
return <CartesianChart {...props} />;
diff --git a/frontend/src/metabase/visualizations/visualizations/ScatterPlot/definition.ts b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/definition.ts
new file mode 100644
index 00000000000..4b4847ae98c
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/definition.ts
@@ -0,0 +1,44 @@
+import { t } from "ttag";
+
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import { getCartesianChartDefinition } from "metabase/visualizations/visualizations/CartesianChart/definition";
+
+import { GRAPH_GOAL_SETTINGS } from "../../lib/settings/goal";
+import {
+ GRAPH_AXIS_SETTINGS,
+ GRAPH_BUBBLE_SETTINGS,
+ GRAPH_COLORS_SETTINGS,
+ GRAPH_DATA_SETTINGS,
+ GRAPH_TREND_SETTINGS,
+ SPLIT_PANELS_SETTINGS,
+ TOOLTIP_SETTINGS,
+} from "../../lib/settings/graph";
+import type { VisualizationDefinition } from "../../types";
+
+const ScatterViz: Omit<
+ VisualizationDefinition,
+ "isSensible" | "checkRenderable"
+> = {
+ getUiName: () => t`Scatter`,
+ identifier: "scatter",
+ iconName: "bubble",
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ noun: t`scatter plot`,
+ minSize: getMinSize("scatter"),
+ defaultSize: getDefaultSize("scatter"),
+ settings: {
+ ...GRAPH_BUBBLE_SETTINGS,
+ ...GRAPH_GOAL_SETTINGS,
+ ...GRAPH_TREND_SETTINGS,
+ ...GRAPH_COLORS_SETTINGS,
+ ...GRAPH_AXIS_SETTINGS,
+ ...GRAPH_DATA_SETTINGS,
+ ...SPLIT_PANELS_SETTINGS,
+ ...TOOLTIP_SETTINGS,
+ },
+};
+
+export const SCATTER_PLOT_DEFINITION = getCartesianChartDefinition(ScatterViz);
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
index a476b52aa45..d93d5cee6ba 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
@@ -1,5 +1,4 @@
import { useEffect, useMemo, useRef } from "react";
-import { c, t } from "ttag";
import DashboardS from "metabase/css/dashboard.module.css";
import { Box } from "metabase/ui";
@@ -8,46 +7,20 @@ import {
ScalarWrapper,
} from "metabase/visualizations/components/ScalarValue/ScalarValue";
import { useBrowserRenderingContext } from "metabase/visualizations/hooks/use-browser-rendering-context";
-import { ChartSettingsError } from "metabase/visualizations/lib/errors";
import { compactifyValue } from "metabase/visualizations/lib/scalar_utils";
-import { columnSettings } from "metabase/visualizations/lib/settings/column";
-import { fieldSetting } from "metabase/visualizations/lib/settings/utils";
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
import type {
- VisualizationDefinition,
VisualizationPassThroughProps,
VisualizationProps,
- VisualizationSettingsDefinitions,
} from "metabase/visualizations/types";
-import { isDate, isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
-import type { DatasetColumn, DatasetData, Series } from "metabase-types/api";
-import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";
import { ScalarValueContainer } from "../Scalar/ScalarValueContainer";
import { PreviousValueComparison } from "./PreviousValueComparison";
import { ScalarPeriod } from "./ScalarPeriod";
-import { SmartScalarComparisonWidget } from "./SettingsComponents/SmartScalarSettingsWidgets";
import { computeTrend } from "./compute";
-import {
- DASHCARD_HEADER_HEIGHT,
- MAX_COMPARISONS,
- VIZ_SETTINGS_DEFAULTS,
-} from "./constants";
-import {
- getColumnsForComparison,
- getComparisonOptions,
- getComparisons,
- getDefaultComparison,
- getValueHeight,
- getValueWidth,
- isPeriodVisible,
- isSuitableScalarColumn,
- validateComparisons,
-} from "./utils";
+import { DASHCARD_HEADER_HEIGHT } from "./constants";
+import { SMART_SCALAR_CHART_DEFINITION } from "./definition";
+import { getValueHeight, getValueWidth, isPeriodVisible } from "./utils";
export function SmartScalar({
onVisualizationClick,
@@ -165,140 +138,4 @@ export function SmartScalar({
);
}
-export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
- ...fieldSetting("scalar.field", {
- getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Primary number`,
- fieldFilter: isSuitableScalarColumn,
- }),
- "scalar.comparisons": {
- getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Comparisons`,
- widget: SmartScalarComparisonWidget,
- getValue: (series, vizSettings) => getComparisons(series, vizSettings),
- isValid: (series, vizSettings) => validateComparisons(series, vizSettings),
- getDefault: (series, vizSettings) =>
- getDefaultComparison(series, vizSettings),
- getProps: (series, vizSettings) => {
- const cols = series[0].data.cols;
- return {
- maxComparisons: MAX_COMPARISONS,
- comparableColumns: getColumnsForComparison(cols, vizSettings),
- options: getComparisonOptions(series, vizSettings),
- series,
- settings: vizSettings,
- };
- },
- readDependencies: ["scalar.field"],
- },
- "scalar.switch_positive_negative": {
- getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Switch positive / negative colors?`,
- widget: "toggle",
- inline: true,
- getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.switch_positive_negative"],
- },
- "scalar.compact_primary_number": {
- getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Compact number`,
- widget: "toggle",
- inline: true,
- getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.compact_primary_number"],
- },
- ...columnSettings({
- getSection: () => t`Display`,
- getColumns: (
- [
- {
- data: { cols },
- },
- ],
- settings,
- ) => {
- const metricColumn =
- // try and find a selected field setting
- cols.find((col) => col.name === settings["scalar.field"]) ||
- // fall back to the second column
- cols[1] ||
- // but if there's only one column use that
- cols[0];
- // expose the date dimension so its granularity/format can be configured
- const dateColumn = cols.find(
- (col) => isDate(col) || isAbsoluteDateTimeUnit(col.unit),
- );
- const columns = [metricColumn, dateColumn].filter(
- (col): col is DatasetColumn => col != null,
- );
- return columns.filter((col, index) => columns.indexOf(col) === index);
- },
- readDependencies: ["scalar.field"],
- }),
- click_behavior: {},
-};
-
-const SmartScalarViz: VisualizationDefinition = {
- getUiName: () => t`Trend`,
- identifier: "smartscalar",
- iconName: "smartscalar",
- canSavePng: true,
-
- minSize: getMinSize("smartscalar"),
- defaultSize: getDefaultSize("smartscalar"),
-
- settings: SETTINGS_DEFINITIONS,
-
- columnSettings: (column) => {
- const isDateColumn = isDate(column) || isAbsoluteDateTimeUnit(column.unit);
- if (!isDateColumn) {
- return {};
- }
- return {
- date_granularity: {
- title: t`Date granularity`,
- widget: "select",
- getDefault: () => "default",
- getProps: () => ({
- options: [
- { name: t`Full date`, value: "default" },
- {
- name: c(
- "Date granularity option, distinct from the pluralized unit",
- ).t`Year`,
- value: "year",
- },
- { name: t`Quarter and year`, value: "quarter" },
- { name: t`Month and year`, value: "month" },
- ],
- }),
- },
- };
- },
-
- isSensible({ cols, insights }: DatasetData) {
- const dimensionCount = cols.filter(
- (col) => isDimension(col) && !isMetric(col),
- ).length;
- return !!insights && insights?.length > 0 && dimensionCount === 1;
- },
-
- // Smart scalars need to have a breakout
- checkRenderable([
- {
- data: { insights },
- },
- ]: Series) {
- if (!insights || insights.length === 0) {
- throw new ChartSettingsError(
- t`Group only by a time field to see how this has changed over time`,
- );
- }
- },
-
- hasEmptyState: true,
-};
-
-Object.assign(SmartScalar, SmartScalarViz);
+Object.assign(SmartScalar, SMART_SCALAR_CHART_DEFINITION);
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
index 12ef84c8f3d..62f354b36f9 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
@@ -14,7 +14,6 @@ import {
formatPreviousPeriodOptionName,
} from "metabase/visualizations/visualizations/SmartScalar/utils";
import type { ClickObject } from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
import { isDate } from "metabase-lib/v1/types/utils/isa";
import type {
ColumnSettings,
@@ -248,7 +247,6 @@ function getCurrentMetricData({
}): MetricData {
const [
{
- card,
data: { rows, cols },
},
] = series;
@@ -293,8 +291,7 @@ function getCurrentMetricData({
const dateUnit = metricInsight?.unit;
const dateColumn = cols[dimensionColIndex];
- const question = new Question(card);
- const isNative = question.isNative();
+ const isNative = cols.some((col) => col.source === "native");
const dateColumnWithUnit = { ...dateColumn };
if (!isNative) {
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts
index bc102b6270f..dc386494112 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts
@@ -72,7 +72,15 @@ describe("SmartScalar > compute", () => {
return [
createMockSingleSeries(
{ dataset_query: createMockNativeDatasetQuery() },
- { data: { rows, cols } },
+ {
+ data: {
+ rows,
+ cols: cols.map((col) => ({
+ ...col,
+ source: "native" as const,
+ })),
+ },
+ },
),
];
}
@@ -2581,6 +2589,7 @@ function createMockDateTimeColumn(opts: Partial<DatasetColumn>) {
base_type: "type/DateTime",
effective_type: "type/DateTime",
semantic_type: null,
+ source: "breakout",
...opts,
});
}
@@ -2590,6 +2599,7 @@ function createMockNumberColumn(opts: Partial<DatasetColumn>) {
base_type: "type/Integer",
effective_type: "type/Integer",
semantic_type: "type/Number",
+ source: "aggregation",
...opts,
});
}
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/definition.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/definition.ts
new file mode 100644
index 00000000000..a6481b645a2
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/definition.ts
@@ -0,0 +1,162 @@
+import { c, t } from "ttag";
+
+import { ChartSettingsError } from "metabase/visualizations/lib/errors";
+import { columnSettings } from "metabase/visualizations/lib/settings/column";
+import { fieldSetting } from "metabase/visualizations/lib/settings/utils";
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import type {
+ VisualizationDefinition,
+ VisualizationSettingsDefinitions,
+} from "metabase/visualizations/types";
+import { isDate, isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
+import type { DatasetColumn, DatasetData, Series } from "metabase-types/api";
+import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";
+
+import { MAX_COMPARISONS, VIZ_SETTINGS_DEFAULTS } from "./constants";
+import {
+ getColumnsForComparison,
+ getComparisonOptions,
+ getComparisons,
+ getDefaultComparison,
+ isSuitableScalarColumn,
+ validateComparisons,
+} from "./utils";
+
+export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
+ ...fieldSetting("scalar.field", {
+ getSection: () => t`Data`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ title: t`Primary number`,
+ fieldFilter: isSuitableScalarColumn,
+ }),
+ "scalar.comparisons": {
+ getSection: () => t`Data`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ title: t`Comparisons`,
+ widget: "smartScalarComparison",
+ getValue: (series, vizSettings) => getComparisons(series, vizSettings),
+ isValid: (series, vizSettings) => validateComparisons(series, vizSettings),
+ getDefault: (series, vizSettings) =>
+ getDefaultComparison(series, vizSettings),
+ getProps: (series, vizSettings) => {
+ const cols = series[0].data.cols;
+ return {
+ maxComparisons: MAX_COMPARISONS,
+ comparableColumns: getColumnsForComparison(cols, vizSettings),
+ options: getComparisonOptions(series, vizSettings),
+ series,
+ settings: vizSettings,
+ };
+ },
+ readDependencies: ["scalar.field"],
+ },
+ "scalar.switch_positive_negative": {
+ getSection: () => t`Display`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ title: t`Switch positive / negative colors?`,
+ widget: "toggle",
+ inline: true,
+ getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.switch_positive_negative"],
+ },
+ "scalar.compact_primary_number": {
+ getSection: () => t`Display`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ title: t`Compact number`,
+ widget: "toggle",
+ inline: true,
+ getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.compact_primary_number"],
+ },
+ ...columnSettings({
+ getSection: () => t`Display`,
+ getColumns: (
+ [
+ {
+ data: { cols },
+ },
+ ],
+ settings,
+ ) => {
+ const metricColumn =
+ // try and find a selected field setting
+ cols.find((col) => col.name === settings["scalar.field"]) ||
+ // fall back to the second column
+ cols[1] ||
+ // but if there's only one column use that
+ cols[0];
+ // expose the date dimension so its granularity/format can be configured
+ const dateColumn = cols.find(
+ (col) => isDate(col) || isAbsoluteDateTimeUnit(col.unit),
+ );
+ const columns = [metricColumn, dateColumn].filter(
+ (col): col is DatasetColumn => col != null,
+ );
+ return columns.filter((col, index) => columns.indexOf(col) === index);
+ },
+ readDependencies: ["scalar.field"],
+ }),
+ click_behavior: {},
+};
+
+export const SMART_SCALAR_CHART_DEFINITION: VisualizationDefinition = {
+ getUiName: () => t`Trend`,
+ identifier: "smartscalar",
+ iconName: "smartscalar",
+ canSavePng: true,
+
+ minSize: getMinSize("smartscalar"),
+ defaultSize: getDefaultSize("smartscalar"),
+
+ settings: SETTINGS_DEFINITIONS,
+
+ columnSettings: (column) => {
+ const isDateColumn = isDate(column) || isAbsoluteDateTimeUnit(column.unit);
+ if (!isDateColumn) {
+ return {};
+ }
+ return {
+ date_granularity: {
+ title: t`Date granularity`,
+ widget: "select",
+ getDefault: () => "default",
+ getProps: () => ({
+ options: [
+ { name: t`Full date`, value: "default" },
+ {
+ name: c(
+ "Date granularity option, distinct from the pluralized unit",
+ ).t`Year`,
+ value: "year",
+ },
+ { name: t`Quarter and year`, value: "quarter" },
+ { name: t`Month and year`, value: "month" },
+ ],
+ }),
+ },
+ };
+ },
+
+ isSensible({ cols, insights }: DatasetData) {
+ const dimensionCount = cols.filter(
+ (col) => isDimension(col) && !isMetric(col),
+ ).length;
+ return !!insights && insights?.length > 0 && dimensionCount === 1;
+ },
+
+ // Smart scalars need to have a breakout
+ checkRenderable([
+ {
+ data: { insights },
+ },
+ ]: Series) {
+ if (!insights || insights.length === 0) {
+ throw new ChartSettingsError(
+ t`Group only by a time field to see how this has changed over time`,
+ );
+ }
+ },
+
+ hasEmptyState: true,
+};
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/SmartScalar.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/SmartScalar.unit.spec.tsx
index 7ab60e9877e..929eb00501e 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/SmartScalar.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/SmartScalar.unit.spec.tsx
@@ -3,8 +3,8 @@ import userEvent from "@testing-library/user-event";
import { getIcon, renderWithProviders, screen, within } from "__support__/ui";
import { NumberColumn } from "__support__/visualizations";
import Visualization from "metabase/visualizations/components/Visualization";
-import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";
-import registerVisualizations from "metabase/visualizations/register";
+import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/widgets";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Series } from "metabase-types/api";
import type { Insight } from "metabase-types/api/insight";
import { createMockSingleSeries } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/test-mocks.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/test-mocks.ts
index c3dd28d4fa1..60ca77647ef 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/test-mocks.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/test-mocks.ts
@@ -38,9 +38,9 @@ export const mockSeries = ({
comparisonType = PREVIOUS_PERIOD_COMPARISON,
}: MockSeriesOptions) => {
const cols = [
- DateTimeColumn({ name: "Month" }),
- NumberColumn({ name: "Count" }),
- NumberColumn({ name: "Sum" }),
+ DateTimeColumn({ name: "Month", source: "breakout" }),
+ NumberColumn({ name: "Count", source: "aggregation" }),
+ NumberColumn({ name: "Sum", source: "aggregation" }),
];
// Unjustified type cast. FIXME
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
index 633e26dd283..b6d8a578961 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
@@ -18,16 +18,14 @@ import {
} from "metabase/redux/store/mocks";
import { Box } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
-import { registerVisualization } from "metabase/visualizations";
import Visualization from "metabase/visualizations/components/Visualization";
-import { Table } from "metabase/visualizations/visualizations/Table/Table";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { RawSeries } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
import * as data from "./stories-data";
-// @ts-expect-error: incompatible prop types with registerVisualization
-registerVisualization(Table);
+registerVisualizations();
const settings = mockSettings();
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
index dc1b536d38c..6992c5ff37d 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
@@ -5,7 +5,7 @@ import { useState } from "react";
import { createMockMetadata } from "__support__/metadata";
import { renderWithProviders, screen, within } from "__support__/ui";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import { Table } from "metabase/visualizations/visualizations/Table/Table";
import Question from "metabase-lib/v1/Question";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
diff --git a/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx b/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx
index b417946ca04..28ca02afc1c 100644
--- a/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx
@@ -29,7 +29,7 @@ import type { VisualizationProps } from "metabase/visualizations/types";
import { TreemapBreadcrumb } from "./TreemapBreadcrumb";
import S from "./TreemapChart.module.css";
-import { TREEMAP_CHART_DEFINITION } from "./chart-definition";
+import { TREEMAP_CHART_DEFINITION } from "./definition";
import { dispatchTreemapViewRoot, useChartEvents } from "./events";
import { type TreemapHoverOverlay, hideTreemapHoverOverlay } from "./overlay";
import { getTreemapTooltipOption } from "./tooltip";
diff --git a/frontend/src/metabase/visualizations/visualizations/TreemapChart/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.ts
similarity index 97%
rename from frontend/src/metabase/visualizations/visualizations/TreemapChart/chart-definition.ts
rename to frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.ts
index 7fe32a0042a..c7a8702c954 100644
--- a/frontend/src/metabase/visualizations/visualizations/TreemapChart/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.ts
@@ -21,12 +21,7 @@ import type {
import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
import type { DatasetData, RawSeries, SingleSeries } from "metabase-types/api";
-import {
- SliceNameWidget,
- type SliceNameWidgetProps,
-} from "../PieChart/SliceNameWidget";
-
-import { TreemapGroupsPicker } from "./TreemapGroupsPicker";
+import type { SliceNameWidgetProps } from "../PieChart/SliceNameWidget";
export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
...columnSettings({ getHidden: () => true }),
@@ -57,7 +52,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
}),
"treemap._groups_widget": {
getSection: () => t`Data`,
- widget: TreemapGroupsPicker,
+ widget: "treemapGroups",
getWrapperStyle: () => ({ marginBottom: 0 }),
getProps: (
rawSeries: RawSeries,
@@ -79,7 +74,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
SliceNameWidgetProps
>(SERIES_SETTING_KEY, {
getObjectKey: keyForSingleSeries,
- widget: SliceNameWidget,
+ widget: "pieSliceName",
getHidden: (_series, _settings, extra) => !extra?.isDashboard,
getSection: (_series, _settings, extra) =>
extra?.isDashboard ? t`Display` : t`Style`,
diff --git a/frontend/src/metabase/visualizations/visualizations/TreemapChart/chart-definition.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.unit.spec.ts
similarity index 97%
rename from frontend/src/metabase/visualizations/visualizations/TreemapChart/chart-definition.unit.spec.ts
rename to frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.unit.spec.ts
index 5024438ae27..37ce933a5b0 100644
--- a/frontend/src/metabase/visualizations/visualizations/TreemapChart/chart-definition.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.unit.spec.ts
@@ -1,9 +1,8 @@
import { checkNotNull } from "metabase/utils/types";
import { ChartSettingsError } from "metabase/visualizations/lib/errors";
-import {
- getComputedSettings,
- getSettingsWidgets,
-} from "metabase/visualizations/lib/settings";
+import { getComputedSettings } from "metabase/visualizations/lib/settings";
+import { getSettingsWidgets } from "metabase/visualizations/lib/widgets";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { RowValues } from "metabase-types/api/dataset";
import { createMockCard } from "metabase-types/api/mocks/card";
import {
@@ -11,7 +10,7 @@ import {
createMockDatasetData,
} from "metabase-types/api/mocks/dataset";
-import { TREEMAP_CHART_DEFINITION } from "./chart-definition";
+import { TREEMAP_CHART_DEFINITION } from "./definition";
const isSensible = checkNotNull(TREEMAP_CHART_DEFINITION.isSensible);
@@ -61,6 +60,7 @@ const makeSeries = (
},
];
+registerVisualizations();
describe("TREEMAP_CHART_DEFINITION", () => {
describe("isSensible", () => {
it("returns true with at least one row, one dimension, and one metric", () => {
diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
index 761f494a00c..250fd8f999b 100644
--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
@@ -1,91 +1,10 @@
-import Color from "color";
-import { t } from "ttag";
+import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
-import { color, staticVizOverrides } from "metabase/ui/colors";
-import { GRAPH_GOAL_SETTINGS } from "metabase/visualizations/lib/settings/goal";
-import {
- GRAPH_AXIS_SETTINGS,
- GRAPH_DATA_SETTINGS,
- GRAPH_DISPLAY_VALUES_SETTINGS,
- TOOLTIP_SETTINGS,
-} from "metabase/visualizations/lib/settings/graph";
-import {
- getDefaultSize,
- getMinSize,
-} from "metabase/visualizations/shared/utils/sizes";
-import type {
- ComputedVisualizationSettings,
- VisualizationDefinition,
- VisualizationProps,
-} from "metabase/visualizations/types";
-import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
+import type { VisualizationProps } from "../../types";
-import { CartesianChart } from "../CartesianChart";
-import { getCartesianChartDefinition } from "../CartesianChart/chart-definition";
+import { WATERFALL_CHART_DEFINITION } from "./definition";
-const WaterfallViz: Omit<VisualizationDefinition, "checkRenderable"> = {
- getUiName: () => t`Waterfall`,
- identifier: "waterfall",
- iconName: "waterfall",
- isSensible: ({ cols, rows }) => {
- const dimensionCount = cols.filter(
- (col) => isDimension(col) && !isMetric(col),
- ).length;
- const metricCount = cols.filter(isMetric).length;
- return (
- rows.length > 1 &&
- cols.length >= 2 &&
- dimensionCount === 1 &&
- metricCount > 0
- );
- },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`waterfall chart`,
- minSize: getMinSize("waterfall"),
- defaultSize: getDefaultSize("waterfall"),
- maxMetricsSupported: 1,
- maxDimensionsSupported: 1,
- supportsVisualizer: false,
- settings: {
- ...GRAPH_AXIS_SETTINGS,
- ...GRAPH_GOAL_SETTINGS,
- "waterfall.increase_color": {
- getSection: () => t`Display`,
- getProps: () => ({ title: t`Increase color` }),
- widget: "color",
- getDefault: () => color("accent1"),
- },
- "waterfall.decrease_color": {
- getSection: () => t`Display`,
- getProps: () => ({ title: t`Decrease color` }),
- widget: "color",
- getDefault: () => color("accent3"),
- },
- "waterfall.show_total": {
- getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Show total`,
- widget: "toggle",
- getDefault: () => true,
- inline: true,
- },
- "waterfall.total_color": {
- getSection: () => t`Display`,
- getProps: () => ({ title: t`Total color` }),
- widget: "color",
- // Unfortunately, to get static viz to look right, we need to avoid using alpha colors here
- getDefault: () => Color(color("text-primary", staticVizOverrides)).hex(),
- getHidden: (_series: any, vizSettings: ComputedVisualizationSettings) =>
- vizSettings["waterfall.show_total"] !== true,
- readDependencies: ["waterfall.show_total"],
- },
- ...GRAPH_DISPLAY_VALUES_SETTINGS,
- ...GRAPH_DATA_SETTINGS,
- ...TOOLTIP_SETTINGS,
- },
-};
-
-Object.assign(WaterfallChart, getCartesianChartDefinition(WaterfallViz));
+Object.assign(WaterfallChart, WATERFALL_CHART_DEFINITION);
export function WaterfallChart(props: VisualizationProps) {
return <CartesianChart {...props} />;
diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/definition.ts
new file mode 100644
index 00000000000..2adb1acf1ea
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/definition.ts
@@ -0,0 +1,87 @@
+import Color from "color";
+import { t } from "ttag";
+
+import { color, staticVizOverrides } from "metabase/ui/colors";
+import { GRAPH_GOAL_SETTINGS } from "metabase/visualizations/lib/settings/goal";
+import {
+ GRAPH_AXIS_SETTINGS,
+ GRAPH_DATA_SETTINGS,
+ GRAPH_DISPLAY_VALUES_SETTINGS,
+ TOOLTIP_SETTINGS,
+} from "metabase/visualizations/lib/settings/graph";
+import {
+ getDefaultSize,
+ getMinSize,
+} from "metabase/visualizations/shared/utils/sizes";
+import type {
+ ComputedVisualizationSettings,
+ VisualizationDefinition,
+} from "metabase/visualizations/types";
+import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
+
+import { getCartesianChartDefinition } from "../CartesianChart/definition";
+
+const WaterfallViz: Omit<VisualizationDefinition, "checkRenderable"> = {
+ getUiName: () => t`Waterfall`,
+ identifier: "waterfall",
+ iconName: "waterfall",
+ isSensible: ({ cols, rows }) => {
+ const dimensionCount = cols.filter(
+ (col) => isDimension(col) && !isMetric(col),
+ ).length;
+ const metricCount = cols.filter(isMetric).length;
+ return (
+ rows.length > 1 &&
+ cols.length >= 2 &&
+ dimensionCount === 1 &&
+ metricCount > 0
+ );
+ },
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ noun: t`waterfall chart`,
+ minSize: getMinSize("waterfall"),
+ defaultSize: getDefaultSize("waterfall"),
+ maxMetricsSupported: 1,
+ maxDimensionsSupported: 1,
+ supportsVisualizer: false,
+ settings: {
+ ...GRAPH_AXIS_SETTINGS,
+ ...GRAPH_GOAL_SETTINGS,
+ "waterfall.increase_color": {
+ getSection: () => t`Display`,
+ getProps: () => ({ title: t`Increase color` }),
+ widget: "color",
+ getDefault: () => color("accent1"),
+ },
+ "waterfall.decrease_color": {
+ getSection: () => t`Display`,
+ getProps: () => ({ title: t`Decrease color` }),
+ widget: "color",
+ getDefault: () => color("accent3"),
+ },
+ "waterfall.show_total": {
+ getSection: () => t`Display`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+ title: t`Show total`,
+ widget: "toggle",
+ getDefault: () => true,
+ inline: true,
+ },
+ "waterfall.total_color": {
+ getSection: () => t`Display`,
+ getProps: () => ({ title: t`Total color` }),
+ widget: "color",
+ // Unfortunately, to get static viz to look right, we need to avoid using alpha colors here
+ getDefault: () => Color(color("text-primary", staticVizOverrides)).hex(),
+ getHidden: (_series: any, vizSettings: ComputedVisualizationSettings) =>
+ vizSettings["waterfall.show_total"] !== true,
+ readDependencies: ["waterfall.show_total"],
+ },
+ ...GRAPH_DISPLAY_VALUES_SETTINGS,
+ ...GRAPH_DATA_SETTINGS,
+ ...TOOLTIP_SETTINGS,
+ },
+};
+
+export const WATERFALL_CHART_DEFINITION =
+ getCartesianChartDefinition(WaterfallViz);
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/getIsCompatible.unit.spec.ts b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/getIsCompatible.unit.spec.ts
index a78ba22a997..296a2137c0c 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/getIsCompatible.unit.spec.ts
+++ b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/getIsCompatible.unit.spec.ts
@@ -1,4 +1,4 @@
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { Field } from "metabase-types/api";
import {
createMockCategoryColumn,
diff --git a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
index cf5aa2bd8b4..84cdf57786b 100644
--- a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
+++ b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "metabase/redux";
import { Center } from "metabase/ui";
import { BaseChartSettings } from "metabase/visualizations/components/ChartSettings";
import { ErrorView } from "metabase/visualizations/components/Visualization/ErrorView";
-import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";
+import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/widgets";
import {
getVisualizerComputedSettings,
getVisualizerRawSeries,
diff --git a/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.unit.spec.ts b/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.unit.spec.ts
index 2ffcc4949c5..6b4dfe31c7b 100644
--- a/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.unit.spec.ts
+++ b/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.unit.spec.ts
@@ -1,4 +1,4 @@
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { CardDisplayType } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.unit.spec.ts b/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.unit.spec.ts
index d371f9fbe79..5c8b3ad993e 100644
--- a/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.unit.spec.ts
+++ b/frontend/src/metabase/visualizer/utils/get-initial-state-for-visualizer-card.unit.spec.ts
@@ -1,4 +1,4 @@
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { VisualizerVizDefinition } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.unit.spec.ts b/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.unit.spec.ts
index 4b1e5f510a6..27446cd443a 100644
--- a/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.unit.spec.ts
+++ b/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.unit.spec.ts
@@ -1,4 +1,4 @@
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { VisualizerColumnValueSource } from "metabase-types/api";
import {
createMockCategoryColumn,
diff --git a/frontend/src/metabase/visualizer/utils/split-series.unit.spec.ts b/frontend/src/metabase/visualizer/utils/split-series.unit.spec.ts
index 6490cf4db17..384ff5f1823 100644
--- a/frontend/src/metabase/visualizer/utils/split-series.unit.spec.ts
+++ b/frontend/src/metabase/visualizer/utils/split-series.unit.spec.ts
@@ -1,4 +1,4 @@
-import registerVisualizations from "metabase/visualizations/register";
+import { registerVisualizations } from "metabase/visualizations/register";
import type { RowValues } from "metabase-types/api/dataset";
import {
createMockCard,
diff --git a/frontend/src/metabase/visualizer/visualizations/funnel.ts b/frontend/src/metabase/visualizer/visualizations/funnel.ts
index acca0c21394..275c13f14dd 100644
--- a/frontend/src/metabase/visualizer/visualizations/funnel.ts
+++ b/frontend/src/metabase/visualizer/visualizations/funnel.ts
@@ -8,11 +8,11 @@ import { DROPPABLE_ID } from "metabase/visualizer/constants";
import {
addColumnMapping,
copyColumn,
- createDataSourceNameRef,
createVisualizerColumnReference,
extractReferencedColumns,
- isDraggedColumnItem,
-} from "metabase/visualizer/utils";
+} from "metabase/visualizer/utils/column";
+import { createDataSourceNameRef } from "metabase/visualizer/utils/data-source";
+import { isDraggedColumnItem } from "metabase/visualizer/utils/drag-and-drop";
import {
isDimension,
isMetric,
diff --git a/loki.config.js b/loki.config.js
index db3a329999e..3c854d82765 100644
--- a/loki.config.js
+++ b/loki.config.js
@@ -20,7 +20,6 @@ module.exports = {
"^Components/Data display/KeyboardShortcut Overview",
"^Components/Table",
"^App/Palette",
- "^EmbeddingSDK/SdkQuestion/ChartTypeDropdownInner",
"^viz/GridMapPdfExport",
"ParameterValueWidget",
].join("|"),
diff --git a/rspack.static-viz.config.js b/rspack.static-viz.config.js
index 74b09fc6d1c..a98be4a953c 100644
--- a/rspack.static-viz.config.js
+++ b/rspack.static-viz.config.js
@@ -26,7 +26,12 @@ module.exports = (env) => {
context: SRC_PATH,
performance: {
- hints: false,
+ // The static-viz bundle runs inside the backend's GraalVM context, so its size is
+ // a startup-time and memory cost. Fail the build if it grows past the budget -
+ // sudden growth almost always means app code (metabase/ui, api, metabase-lib) leaked in.
+ hints: "error",
+ maxAssetSize: 3.5 * 1024 * 1024,
+ maxEntrypointSize: 3.5 * 1024 * 1024,
},
entry: {