The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Create shared value-formatting module (#77771)
Fraser244700d893dd
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.tsxindex 9308fc19789..98d9035a8e0 100644--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.tsx+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.tsx@@ -6,9 +6,8 @@ import { EmptyState } from "metabase/common/components/EmptyState";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";import { Box, Checkbox, Icon } from "metabase/ui";-import { displayNameForColumn } from "metabase/utils/formatting";+import { displayNameForColumn, formatValue } from "metabase/value-formatting";import { registerVisualization } from "metabase/visualizations/index";-import { formatValue } from "metabase/visualizations/lib/formatting";import { isColumnRightAligned } from "metabase/visualizations/lib/table";import type {AuditTableSorting,diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.ts b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.tsindex 613057f86b3..d248856f51e 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.ts@@ -1,5 +1,5 @@import { formatNumber } from "metabase/utils/formatting";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { BillingInfoLineItem } from "metabase-types/api";import {supportedDisplayTypes,diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsxindex 33ee7f7d584..4f488858fa6 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx@@ -30,7 +30,7 @@ import {Text,} from "metabase/ui";import * as Errors from "metabase/utils/errors";-import { slugify } from "metabase/visualizations/lib/formatting/url";+import { slugify } from "metabase/utils/formatting";import { useReplaceModelWithTransformMutation } from "metabase-enterprise/api";import type { Card, Database } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsxindex a7fb4e33f03..2175bb24f9c 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsx@@ -1,6 +1,6 @@import { msgid, ngettext, t } from "ttag";-import { formatNumber } from "metabase/utils/formatting/numbers";+import { formatNumber } from "metabase/utils/formatting";import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils/index";import type { Dataset } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsxindex 1a82f562e20..a9c485b3817 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsx@@ -1,7 +1,7 @@import { type KeyboardEvent, useCallback, useState } from "react";import { DateInput } from "metabase/ui";-import { DEFAULT_DATE_STYLE } from "metabase/utils/formatting/datetime-utils";+import { DEFAULT_DATE_STYLE } from "metabase/utils/formatting";import type { TableActionInputSharedProps } from "./types";import {diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsxindex 61c2bb501bd..a52703067e1 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsx@@ -5,7 +5,7 @@ import { DateTimePicker } from "metabase/ui";import {DEFAULT_DATE_STYLE,DEFAULT_TIME_STYLE,-} from "metabase/utils/formatting/datetime-utils";+} from "metabase/utils/formatting";import type { TableActionInputSharedProps } from "./types";import { useDateValueWithoutTimezone } from "./use-date-value-without-timezone";diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsxindex 878c7680b1d..91bbe2508cc 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsx@@ -2,7 +2,7 @@ import cx from "classnames";import { useCallback, useMemo } from "react";import type { ColumnOptions } from "metabase/data-grid";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type { DescribeActionFormResponse } from "metabase-enterprise/table-editing/api/types";import type { DatasetColumn, RowValue, RowValues } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsxindex cff0e41deb6..bf7bf893f1c 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx@@ -16,7 +16,7 @@ import {Text,TextInput,} from "metabase/ui";-import { slugify } from "metabase/visualizations/lib/formatting";+import { slugify } from "metabase/utils/formatting";import type { DataSegregationStrategy, FieldId } from "metabase-types/api";import { useCreateTenantMutation } from "../../../api/tenants";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/GenericSummarySections/components/FieldInfoSection/utils.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/GenericSummarySections/components/FieldInfoSection/utils.tsxindex 302ec780c51..e8545f2b443 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/GenericSummarySections/components/FieldInfoSection/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/GenericSummarySections/components/FieldInfoSection/utils.tsx@@ -2,7 +2,7 @@ import type { CellContext } from "@tanstack/react-table";import { c, t } from "ttag";import { getFormattedTime } from "metabase/common/components/DateTime";-import { formatNumber, formatPercent } from "metabase/static-viz/lib/numbers";+import { formatNumber } from "metabase/static-viz/lib/numbers";import { Ellipsified } from "metabase/ui";import {EntityNameCell,@@ -10,6 +10,7 @@ import {Text,type TreeTableColumnDef,} from "metabase/ui";+import { formatPercent } from "metabase/utils/formatting";import {isDate,isDateWithoutTime,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.tsindex daed4c8420c..cfcdb82ade5 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.ts@@ -1,4 +1,4 @@-import { slugify as toSlug } from "metabase/visualizations/lib/formatting";+import { slugify as toSlug } from "metabase/utils/formatting";import type {PythonTransformTableAliases,PythonTransformTableEntry,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsxindex 2b824d8a8db..1e4e4a676e5 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsx@@ -5,7 +5,7 @@ import {DataGrid,useDataGridInstance,} from "metabase/data-grid";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type { RowValue, TestPythonTransformResponse } from "metabase-types/api";export type Row = Record<string, RowValue>;diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex 227d52c0a1b..413f194dc61 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -63,6 +63,11 @@ const elements = [// basiccreateElement({ type: "basic", name: "router" }),createElement({ type: "basic", name: "ui" }),+ createElement({+ type: "basic",+ name: "value-formatting",+ enforcePublicApi: true,+ }),// sharedcreateElement({ type: "feature", name: "account" }),@@ -414,6 +419,11 @@ const baseRules = [from: ["basic/ui"],allow: ["lib/lib"],},+ // The column-vocabulary predicates (isa, column-key) live in metabase-lib/v1.+ {+ from: ["basic/value-formatting"],+ allow: ["basic/mlv1"],+ },{from: ["shared/*"],allow: ["lib/*", "basic/*", "shared/*"],diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.tsindex e2aa3e84bb6..3582c285fcc 100644--- a/frontend/src/metabase-types/api/card.ts+++ b/frontend/src/metabase-types/api/card.ts@@ -1,5 +1,3 @@-import type { CurrencyStyle } from "metabase/utils/formatting";-import type { TimeOnlyOptions } from "metabase/utils/formatting/types";import type { IconName } from "metabase-types/api";import type { EntityToken, EntityUuid } from "metabase-types/api/entity";@@ -18,6 +16,7 @@ import type { Document, DocumentId } from "./document";import type { EmbeddingParameters, EmbeddingType } from "./embed";import type { BaseEntityId } from "./entity-id";import type { Field } from "./field";+import type { CurrencyStyle, TimeOnlyOptions } from "./formatting";import type { ModerationReview } from "./moderation";import type { PaginationRequest, PaginationResponse } from "./pagination";import type {diff --git a/frontend/src/metabase/utils/formatting/types.ts b/frontend/src/metabase-types/api/formatting.tssimilarity index 74%rename from frontend/src/metabase/utils/formatting/types.tsrename to frontend/src/metabase-types/api/formatting.tsindex c375d9b9c91..82fd6f8a984 100644--- a/frontend/src/metabase/utils/formatting/types.ts+++ b/frontend/src/metabase-types/api/formatting.ts@@ -1,3 +1,5 @@+export type CurrencyStyle = Intl.NumberFormatOptionsCurrencyDisplay;+export type TimeEnabled = "minutes" | "milliseconds" | "seconds";export interface TimeOnlyOptions {diff --git a/frontend/src/metabase-types/api/index.ts b/frontend/src/metabase-types/api/index.tsindex c8d421280b5..e8417fe5a88 100644--- a/frontend/src/metabase-types/api/index.ts+++ b/frontend/src/metabase-types/api/index.ts@@ -29,6 +29,7 @@ export * from "./entity-id";export * from "./erd";export * from "./exploration";export * from "./field";+export * from "./formatting";export * from "./geojson";export * from "./group";export * from "./icon";diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 6d560add783..4914baa28ef 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -1,11 +1,10 @@import type { ReactNode } from "react";-import type { CurrencyStyle } from "metabase/utils/formatting";-import type { InputSettingType } from "./actions";import type { DashboardId } from "./dashboard";import type { DatabaseId } from "./database";import type { SdkIframeEmbedSetupTheme } from "./embedding-theme";+import type { CurrencyStyle } from "./formatting";import type { GroupId } from "./group";import type { MetabotLimitPeriod, MetabotLimitType } from "./metabot";import type { NotificationRecipient } from "./notification";diff --git a/frontend/src/metabase-types/guards/click-behavior.ts b/frontend/src/metabase-types/guards/click-behavior.tsindex 60e56b5445e..9cd68d48dd1 100644--- a/frontend/src/metabase-types/guards/click-behavior.ts+++ b/frontend/src/metabase-types/guards/click-behavior.ts@@ -1,5 +1,6 @@import type {BaseActionClickBehavior,+ ClickBehavior,DeleteActionClickBehavior,ImplicitActionClickBehavior,InsertActionClickBehavior,@@ -67,3 +68,37 @@ export const isImplicitActionClickBehavior = (isDeleteActionClickBehavior(value));};++// Whether a click behavior is fully configured (a null behavior opens the+// default drill-through menu, so it counts as valid).+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/account/notifications/components/ArchiveModal/ArchiveModal.tsx b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsxindex 4a697482531..78c966379ed 100644--- a/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx+++ b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx@@ -7,7 +7,7 @@ import type { NotificationType } from "metabase/notifications/types";import { formatChannelRecipients } from "metabase/pulse";import { Box, Button, Stack } from "metabase/ui";import Settings from "metabase/utils/settings";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { Alert, DashboardSubscription, User } from "metabase-types/api";type ArchiveModalProps = {diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsxindex 7362f7d4bd6..ba0612c1f8e 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx@@ -24,7 +24,7 @@ import {useTreeTableInstance,} from "metabase/ui";import { getThemeOverrides } from "metabase/ui/theme";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting/date";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { ApiKey } from "metabase-types/api";import { CreateApiKeyModal } from "./CreateApiKeyModal";diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsxindex 7c6346cb7ad..653437c57ca 100644--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx@@ -7,15 +7,14 @@ import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";import { useAdminSetting } from "metabase/settings";import { Box, Radio, Select, Stack, Switch, Text } from "metabase/ui";import {- type CurrencyStyle,getCurrencyOptions,getCurrencyStyleOptions,} from "metabase/utils/formatting";import {getDateStyleOptionsForUnit,getTimeStyleOptions,-} from "metabase/visualizations/lib/formatting";-import type { FormattingSettings } from "metabase-types/api";+} from "metabase/value-formatting";+import type { CurrencyStyle, FormattingSettings } from "metabase-types/api";const DEFAULT_FORMATTING_SETTINGS: FormattingSettings = {"type/Temporal": {diff --git a/frontend/src/metabase/browse/metrics/utils.ts b/frontend/src/metabase/browse/metrics/utils.tsindex cee77003055..37582e405eb 100644--- a/frontend/src/metabase/browse/metrics/utils.ts+++ b/frontend/src/metabase/browse/metrics/utils.ts@@ -1,7 +1,7 @@import { t } from "ttag";import { getCollectionPathAsString } from "metabase/common/collections/utils";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import { isDate } from "metabase-lib/v1/types/utils/isa";import type { Dataset, SortingOptions } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/DateTime/DateTime.tsx b/frontend/src/metabase/common/components/DateTime/DateTime.tsxindex 8977c2a3abb..2b2a9a83278 100644--- a/frontend/src/metabase/common/components/DateTime/DateTime.tsx+++ b/frontend/src/metabase/common/components/DateTime/DateTime.tsx@@ -1,7 +1,7 @@import { type HTMLAttributes, forwardRef } from "react";import MetabaseSettings from "metabase/utils/settings";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { ColumnSettings, DatetimeUnit } from "metabase-types/api";type DateTimeProps = HTMLAttributes<HTMLSpanElement> & {diff --git a/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsx b/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsxindex c76295ef07e..76ca08797b5 100644--- a/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsx+++ b/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsx@@ -5,7 +5,7 @@ import { DateTime } from "metabase/common/components/DateTime";import {DEFAULT_DATE_STYLE,DEFAULT_TIME_STYLE,-} from "metabase/utils/formatting/datetime-utils";+} from "metabase/utils/formatting";import MetabaseSettings from "metabase/utils/settings";describe("DateTime", () => {diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsxindex 19cb95d57c2..213c55c21c3 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx@@ -11,7 +11,7 @@ import { Route } from "metabase/router";import {DEFAULT_DATE_STYLE,DEFAULT_TIME_STYLE,-} from "metabase/utils/formatting/datetime-utils";+} from "metabase/utils/formatting";import type { CollectionItem, IconName } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsxindex 4a0522e96e3..1eb08916d8a 100644--- a/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/QueryColumnFingerprintInfo/DateTimeFingerprint.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type * as Lib from "metabase-lib";import { Table } from "../MetadataInfo.styled";diff --git a/frontend/src/metabase/common/components/TimelineEventInfo/TimelineEventInfo.tsx b/frontend/src/metabase/common/components/TimelineEventInfo/TimelineEventInfo.tsxindex 1beb0779991..4b6a603e5fb 100644--- a/frontend/src/metabase/common/components/TimelineEventInfo/TimelineEventInfo.tsx+++ b/frontend/src/metabase/common/components/TimelineEventInfo/TimelineEventInfo.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { Markdown } from "metabase/common/components/Markdown";import { Box, Flex, Icon, Text } from "metabase/ui";import Settings from "metabase/utils/settings";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { TimelineEvent } from "metabase-types/api";import S from "./TimelineEventInfo.module.css";diff --git a/frontend/src/metabase/common/hooks/use-number-formatter.ts b/frontend/src/metabase/common/hooks/use-number-formatter.tsindex 9d120ad3d23..46ead8cab78 100644--- a/frontend/src/metabase/common/hooks/use-number-formatter.ts+++ b/frontend/src/metabase/common/hooks/use-number-formatter.ts@@ -4,7 +4,7 @@ import { useSetting } from "metabase/settings";import {type FormatNumberOptions,formatNumber,-} from "metabase/utils/formatting/numbers";+} from "metabase/utils/formatting";export type UseFormatNumberOptions = FormatNumberOptions & {ignoreInstanceSettings?: boolean;diff --git a/frontend/src/metabase/dashboard/actions/save.ts b/frontend/src/metabase/dashboard/actions/save.tsindex 7b534f652f8..332a1ff7e6c 100644--- a/frontend/src/metabase/dashboard/actions/save.ts+++ b/frontend/src/metabase/dashboard/actions/save.ts@@ -7,12 +7,12 @@ import { createThunkAction } from "metabase/redux";import { UPDATE_DASHBOARD_AND_CARDS } from "metabase/redux/dashboard";import type { StoreDashboard, StoreDashcard } from "metabase/redux/store";import type { Location } from "metabase/router";-import { clickBehaviorIsValid } from "metabase/visualizations/lib/formatting/click-data";import type {DashCardId,ParameterId,UpdateCardRequest,} from "metabase-types/api";+import { clickBehaviorIsValid } from "metabase-types/guards";import { trackDashboardSaved } from "../analytics";import { getDashboardBeforeEditing } from "../selectors";diff --git a/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.js b/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.jsindex 7dbc739ddc4..3d8ce4fb851 100644--- a/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.js+++ b/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.js@@ -8,8 +8,10 @@ import {getTargetForQueryParams,} from "metabase/dashboard/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 {+ getDataFromClicked,+ renderLinkURLForClick,+} from "metabase/value-formatting";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";import { getObjectColumnSettings } from "metabase-lib/v1/queries/utils/column-key";diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsxindex 1265163672c..a66273179d6 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx@@ -10,13 +10,13 @@ import {} from "metabase/dashboard/context";import { isTableDisplay } from "metabase/dashboard/utils";import { canSaveClickBehavior } from "metabase/dashboard/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,DashCardVisualizationSettings,DatasetColumn,} from "metabase-types/api";+import { clickBehaviorIsValid } from "metabase-types/guards";import { ClickBehaviorSidebarContent } from "./ClickBehaviorSidebarContent";import { ClickBehaviorSidebarHeader } from "./ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader";diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsxindex c0372118472..3d8ec018689 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx@@ -13,13 +13,13 @@ 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,ClickBehavior,DashboardCard,} from "metabase-types/api";+import { clickBehaviorIsValid } from "metabase-types/guards";import LinkOptionsS from "../LinkOptions/LinkOptions.module.css";import { SidebarItem } from "../SidebarItem";diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsxindex 7b9e93927ef..33fe2bb4987 100644--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx@@ -11,9 +11,12 @@ import { getActivePulseParameters } from "metabase/pulse";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { Button, Card, Flex, Icon, Tooltip } from "metabase/ui";-import { conjunct, formatTimeWithUnit } from "metabase/utils/formatting";+import { conjunct } from "metabase/utils/formatting";import { formatFrame } from "metabase/utils/time-dayjs";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";+import {+ formatDateTimeWithUnit,+ formatTimeWithUnit,+} from "metabase/value-formatting";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {Channel,diff --git a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsxindex 9a95df55ecd..392f2ada505 100644--- a/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/ParameterSidebar/ParameterSidebar.tsx@@ -9,7 +9,7 @@ import { hasMapping } from "metabase/parameters/utils/dashboards";import { canUseLinkedFilters } from "metabase/parameters/utils/linked-filters";import { useSelector } from "metabase/redux";import { Tabs } from "metabase/ui";-import { slugify } from "metabase/visualizations/lib/formatting";+import { slugify } from "metabase/utils/formatting";import { isFilterParameter } from "metabase-lib/v1/parameters/utils/parameter-type";import { parameterHasNoDisplayValue } from "metabase-lib/v1/parameters/utils/parameter-values";import type {diff --git a/frontend/src/metabase/dashboard/utils/click-behavior.ts b/frontend/src/metabase/dashboard/utils/click-behavior.tsindex dfafac2fe20..9e1c7fe92e0 100644--- a/frontend/src/metabase/dashboard/utils/click-behavior.ts+++ b/frontend/src/metabase/dashboard/utils/click-behavior.ts@@ -1,12 +1,11 @@import { parseParameterValue } from "metabase/parameters/utils/parameter-parsing";import { parseTimestamp } from "metabase/utils/time-dayjs";import { checkNotNull } from "metabase/utils/types";-import { clickBehaviorIsValid } from "metabase/visualizations/lib/formatting/click-data";+import type { ValueAndColumnForColumnNameDate } from "metabase/value-formatting";import {formatDateTimeForParameter,formatDateToRangeForParameter,-} from "metabase/visualizations/lib/formatting/date";-import type { ValueAndColumnForColumnNameDate } from "metabase/visualizations/lib/formatting/link";+} from "metabase/value-formatting";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import {@@ -34,6 +33,7 @@ import type {Parameter,QuestionDashboardCard,} from "metabase-types/api";+import { clickBehaviorIsValid } from "metabase-types/guards";interface Target {id: Parameter["id"];diff --git a/frontend/src/metabase/dashboard/utils/click-behavior.unit.spec.ts b/frontend/src/metabase/dashboard/utils/click-behavior.unit.spec.tsindex 7284523b6ed..32280b81c1e 100644--- a/frontend/src/metabase/dashboard/utils/click-behavior.unit.spec.ts+++ b/frontend/src/metabase/dashboard/utils/click-behavior.unit.spec.ts@@ -1,7 +1,7 @@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 { getDataFromClicked } from "metabase/value-formatting";+import * as dateFormatUtils from "metabase/value-formatting";import Question from "metabase-lib/v1/Question";import type Field from "metabase-lib/v1/metadata/Field";import type {diff --git a/frontend/src/metabase/detail-view/utils.ts b/frontend/src/metabase/detail-view/utils.tsindex 04e0bada46b..661f30e47b4 100644--- a/frontend/src/metabase/detail-view/utils.ts+++ b/frontend/src/metabase/detail-view/utils.ts@@ -1,5 +1,5 @@import type { ContentTranslationFunction } from "metabase/content-translation/types";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import { getComputedSettings } from "metabase/visualizations/lib/settings";import {getGlobalSettingsForColumn,diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.tsindex f13cb1b4878..8a0ec517d9f 100644--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts@@ -6,10 +6,12 @@ import { OTHER_BUCKET_LABEL } from "metabase/explorations/constants";import { getColorsForValues } from "metabase/ui/colors/charts";import { getAccentColors } from "metabase/ui/colors/groups";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";+import {+ formatDateTimeRangeWithUnit,+ formatValue,+} from "metabase/value-formatting";import { isCartesianChart } from "metabase/visualizations";import { getSeriesVizSettingsKey } from "metabase/visualizations/echarts/cartesian/model/series";-import { formatValue } from "metabase/visualizations/lib/formatting";-import { formatDateTimeRangeWithUnit } from "metabase/visualizations/lib/formatting/date";import type {BrushClickObject,BrushRange,diff --git a/frontend/src/metabase/notifications/utils.ts b/frontend/src/metabase/notifications/utils.tsindex 28a1cb460b0..0d591124ca6 100644--- a/frontend/src/metabase/notifications/utils.ts+++ b/frontend/src/metabase/notifications/utils.ts@@ -5,10 +5,12 @@ import { cronToScheduleSettings } from "metabase/common/components/Schedule/cronimport type { NotificationListItem } from "metabase/notifications/types";import { getScheduleExplanation } from "metabase/utils/cron";import { getEmailDomain, isEmail } from "metabase/utils/email";-import { formatTimeWithUnit } from "metabase/utils/formatting/time";import MetabaseSettings from "metabase/utils/settings";import { formatFrame } from "metabase/utils/time-dayjs";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting/date";+import {+ formatDateTimeWithUnit,+ formatTimeWithUnit,+} from "metabase/value-formatting";import type Question from "metabase-lib/v1/Question";import type {CardId,diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsxindex d8279f7033d..2634755a816 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsx+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsx@@ -3,7 +3,7 @@ import type { ReactNode } from "react";import { useTranslateContent } from "metabase/content-translation/hooks";import CS from "metabase/css/core/index.css";import AutoLoadRemapped from "metabase/hoc/Remapped";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type Field from "metabase-lib/v1/metadata/Field";type RenderNormal = (opts: { value?: unknown; column?: Field }) => ReactNode;diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsxindex 6c3c1434099..b5d16ded5b5 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsx+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsx@@ -2,7 +2,7 @@ import { isValidElement } from "react";import { useTranslateContent } from "metabase/content-translation/hooks";import { useEmbeddingEntityContext } from "metabase/embedding/context";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type {ColumnSettings,DashboardId,diff --git a/frontend/src/metabase/parameters/utils/dashboards.ts b/frontend/src/metabase/parameters/utils/dashboards.tsindex 32f2e21c46b..f72e6afb665 100644--- a/frontend/src/metabase/parameters/utils/dashboards.ts+++ b/frontend/src/metabase/parameters/utils/dashboards.ts@@ -3,8 +3,8 @@ import _ from "underscore";import { tag_names } from "cljs/metabase.parameters.shared";import { generateParameterId } from "metabase/parameters/utils/parameter-id";import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";+import { slugify } from "metabase/utils/formatting";import { isNotNull } from "metabase/utils/types";-import { slugify } from "metabase/visualizations/lib/formatting";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {diff --git a/frontend/src/metabase/parameters/utils/formatting.ts b/frontend/src/metabase/parameters/utils/formatting.tsindex 3a988e71e2c..7d38c7f3c85 100644--- a/frontend/src/metabase/parameters/utils/formatting.ts+++ b/frontend/src/metabase/parameters/utils/formatting.ts@@ -1,6 +1,6 @@import { msgid, ngettext } from "ttag";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import * as Lib from "metabase-lib";import Field from "metabase-lib/v1/metadata/Field";import type { UiParameter } from "metabase-lib/v1/parameters/types";diff --git a/frontend/src/metabase/pulse/pulse.ts b/frontend/src/metabase/pulse/pulse.tsindex 4de1ac0a1ae..e7b45dc9731 100644--- a/frontend/src/metabase/pulse/pulse.ts+++ b/frontend/src/metabase/pulse/pulse.ts@@ -3,10 +3,12 @@ import _ from "underscore";import type { DashboardSubscriptionData } from "metabase/redux/store";import { getEmailDomain } from "metabase/utils/email";-import { formatTimeWithUnit } from "metabase/utils/formatting/time";import MetabaseSettings from "metabase/utils/settings";import { formatFrame } from "metabase/utils/time-dayjs";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting/date";+import {+ formatDateTimeWithUnit,+ formatTimeWithUnit,+} from "metabase/value-formatting";import {getDefaultValuePopulatedParameters,normalizeParameterValue,diff --git a/frontend/src/metabase/query_builder/components/view/ExecutionTime/ExecutionTime.tsx b/frontend/src/metabase/query_builder/components/view/ExecutionTime/ExecutionTime.tsxindex 63f80a0f33d..d1e4142310f 100644--- a/frontend/src/metabase/query_builder/components/view/ExecutionTime/ExecutionTime.tsx+++ b/frontend/src/metabase/query_builder/components/view/ExecutionTime/ExecutionTime.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { FixedSizeIcon, Flex, Tooltip } from "metabase/ui";-import { formatDurationLong } from "metabase/utils/formatting/time";+import { formatDurationLong } from "metabase/utils/formatting";/*** `time` can most likely never be `null`diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsxindex 4a7982188af..1acee024f0a 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx@@ -12,8 +12,8 @@ import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import { useDispatch, useSelector } from "metabase/redux";import { onOpenTimelines } from "metabase/redux/query-builder";import { Box, Button, Icon } from "metabase/ui";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { CartesianChartDateTimeAbsoluteUnit } from "metabase/visualizations/echarts/cartesian/model/types";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting/date";import type Question from "metabase-lib/v1/Question";import type { DatetimeUnit, Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/common/utils/dates.ts b/frontend/src/metabase/querying/common/utils/dates.tsindex b9a53066181..31b23deef32 100644--- a/frontend/src/metabase/querying/common/utils/dates.ts+++ b/frontend/src/metabase/querying/common/utils/dates.ts@@ -6,7 +6,7 @@ import type {DateFilterDisplayOpts,DateFilterValue,} from "metabase/querying/common/types";-import { DEFAULT_TIME_STYLE } from "metabase/utils/formatting/datetime-utils";+import { DEFAULT_TIME_STYLE } from "metabase/utils/formatting";import type { ExcludeDateFilterUnit } from "metabase-lib";import * as Lib from "metabase-lib";import type { DateFormattingSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/expressions/identifier.ts b/frontend/src/metabase/querying/expressions/identifier.tsindex 1d9750c0188..d068d82f57e 100644--- a/frontend/src/metabase/querying/expressions/identifier.ts+++ b/frontend/src/metabase/querying/expressions/identifier.ts@@ -1,4 +1,4 @@-import { FK_SYMBOL } from "metabase/utils/formatting/constants";+import { FK_SYMBOL } from "metabase/utils/formatting";import { quoteString } from "./string";diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.tsindex b044cc76ef2..537447caf41 100644--- a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts+++ b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts@@ -1,8 +1,8 @@import type { PolygonProps } from "@visx/shape/lib/shapes/Polygon";import { CHAR_SIZES_FONT_WEIGHT } from "metabase/static-viz/constants/char-sizes";-import { formatNumber, formatPercent } from "metabase/static-viz/lib/numbers";import { measureTextWidth } from "metabase/static-viz/lib/text";+import { formatPercent } from "metabase/utils/formatting";import type { TextWidthMeasurer } from "metabase/utils/measure-text";import { isNotNull } from "metabase/utils/types";import type {@@ -12,6 +12,7 @@ import type {} from "metabase/visualizations/lib/funnel/types";import { truncateText } from "metabase/visualizations/lib/text";+import { formatNumber } from "../../../lib/numbers";import type { FunnelSettings } from "../types";type StepDimensions = Pick<FunnelStep, "top" | "left" | "height">;diff --git a/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsx b/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsxindex 1fbc44c4b59..bb28537537d 100644--- a/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsx+++ b/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsx@@ -4,7 +4,7 @@ import { scaleLinear } from "@visx/scale";import { useMemo } from "react";import { c } from "ttag";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import {calculateProgressMetrics,extractProgressValue,diff --git a/frontend/src/metabase/static-viz/components/TreemapChart/legend.ts b/frontend/src/metabase/static-viz/components/TreemapChart/legend.tsindex 785f9fb5afb..6c01a08fa9d 100644--- a/frontend/src/metabase/static-viz/components/TreemapChart/legend.ts+++ b/frontend/src/metabase/static-viz/components/TreemapChart/legend.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { formatPercent as formatPercentDefault } from "metabase/static-viz/lib/numbers";+import { formatPercent as formatPercentDefault } from "metabase/utils/formatting";import { getTreemapNodeKey } from "metabase/visualizations/echarts/graph/treemap/model/data";import { getTreemapPercentOfTotalFormatter } from "metabase/visualizations/echarts/graph/treemap/model/formatters";import { hasChildren } from "metabase/visualizations/echarts/graph/treemap/model/tree";diff --git a/frontend/src/metabase/static-viz/lib/numbers.ts b/frontend/src/metabase/static-viz/lib/numbers.tsindex c9de21fbd04..f8fe2d5fcff 100644--- a/frontend/src/metabase/static-viz/lib/numbers.ts+++ b/frontend/src/metabase/static-viz/lib/numbers.ts@@ -1,5 +1,5 @@-import type { CurrencyStyle } from "metabase/utils/formatting";-import { formatNumber as appFormatNumber } from "metabase/utils/formatting/numbers";+import { formatNumber as appFormatNumber } from "metabase/utils/formatting";+import type { CurrencyStyle } from "metabase-types/api";export type NumberStyle = "currency" | "decimal" | "scientific" | "percent";@@ -35,6 +35,3 @@ export const formatNumber = (number: number, options?: NumberFormatOptions) => {return `${prefix}${appFormatNumber(number, optionsWithDefault)}${suffix}`;};--export const formatPercent = (percent: number) =>- `${(100 * percent).toFixed(Math.abs(percent) === 1 ? 0 : 2)} %`;diff --git a/frontend/src/metabase/static-viz/lib/numbers.unit.spec.ts b/frontend/src/metabase/static-viz/lib/numbers.unit.spec.tsindex 889d0dacd64..cf0320ec227 100644--- a/frontend/src/metabase/static-viz/lib/numbers.unit.spec.ts+++ b/frontend/src/metabase/static-viz/lib/numbers.unit.spec.ts@@ -1,4 +1,4 @@-import { formatNumber, formatPercent } from "./numbers";+import { formatNumber } from "./numbers";describe("formatNumber", () => {it("should format a number with default options", () => {@@ -117,10 +117,3 @@ describe("formatNumber", () => {expect(formatNumber(-0.00191)).toEqual("-0.0019");});});--describe("formatPercent", () => {- it("formats percent with two decimals", () => {- expect(formatPercent(0.12245)).toBe("12.25 %");- expect(formatPercent(0)).toBe("0.00 %");- });-});diff --git a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsxindex d26c752f2bf..817dfea1c0d 100644--- a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx+++ b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx@@ -5,7 +5,7 @@ import { ForwardRefLink, Link } from "metabase/common/components/Link";import { ActionIcon, Icon, Menu } from "metabase/ui";import * as Urls from "metabase/urls";import Settings from "metabase/utils/settings";-import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting";+import { formatDateTimeWithUnit } from "metabase/value-formatting";import type { Timeline, TimelineEvent } from "metabase-types/api";import {diff --git a/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsx b/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsxindex 9f4d0afc3ee..5c61104807b 100644--- a/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsx+++ b/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsx@@ -3,7 +3,7 @@ import { useEffect, useRef } from "react";import { t } from "ttag";import { FormTextInput } from "metabase/forms";-import { slugify } from "metabase/visualizations/lib/formatting/url";+import { slugify } from "metabase/utils/formatting";type TargetNameInputProps = {description?: string;diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunInfoSection.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunInfoSection.tsxindex e41f0253018..57fd02ec2ee 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunInfoSection.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunInfoSection.tsx@@ -10,7 +10,7 @@ import {} from "metabase/transforms/utils";import { Box, Card } from "metabase/ui";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatDurationLong } from "metabase/utils/formatting/time";+import { formatDurationLong } from "metabase/utils/formatting";import type { TransformJobRun } from "metabase-types/api";type JobRunInfoSectionProps = {diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/TransformRunItem.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/TransformRunItem.tsxindex af0321ee15a..8b90ec9d28d 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/TransformRunItem.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/TransformRunItem.tsx@@ -22,7 +22,7 @@ import {} from "metabase/ui";import * as Urls from "metabase/urls";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatDurationLong } from "metabase/utils/formatting/time";+import { formatDurationLong } from "metabase/utils/formatting";import type { TransformRunForJobRun } from "metabase-types/api";import S from "./TransformRunItem.module.css";diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/utils.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/utils.tsxindex 78b1cf1fcac..e1ba0927330 100644--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/utils.tsx+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunTable/utils.tsx@@ -12,7 +12,7 @@ import {import type { TreeTableColumnDef } from "metabase/ui";import { Box, Ellipsified, Group, SortableHeaderPill } from "metabase/ui";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatDurationLong } from "metabase/utils/formatting/time";+import { formatDurationLong } from "metabase/utils/formatting";import {TRANSFORM_JOB_RUN_SORT_COLUMNS,type TransformJobRun,diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.tsindex 7cc304914d4..ce2f03a459a 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts@@ -1,7 +1,7 @@import * as Yup from "yup";import * as Errors from "metabase/utils/errors";-import { slugify } from "metabase/visualizations/lib/formatting/url";+import { slugify } from "metabase/utils/formatting";import type {CreateTransformRequest,TransformSource,diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunTable/utils.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/utils.tsxindex 3c3fb9dfe45..d5592fc5b05 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunTable/utils.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/utils.tsx@@ -20,7 +20,7 @@ import {Tooltip,} from "metabase/ui";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatDurationLong } from "metabase/utils/formatting/time";+import { formatDurationLong } from "metabase/utils/formatting";import {TRANSFORM_RUN_SORT_COLUMNS,type TransformRun,diff --git a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunInfoSection.tsx b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunInfoSection.tsxindex 0a76dbd9726..8a45a29cfa3 100644--- a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunInfoSection.tsx+++ b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunInfoSection.tsx@@ -10,7 +10,7 @@ import {} from "metabase/transforms/utils";import { Box, Card } from "metabase/ui";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatDurationLong } from "metabase/utils/formatting/time";+import { formatDurationLong } from "metabase/utils/formatting";import type { TransformGraphRun } from "metabase-types/api";import { formatRunType } from "../TransformGraphRunTable";diff --git a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/utils.tsx b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/utils.tsxindex c6e2407db2b..7c0b71e8f0c 100644--- a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/utils.tsx+++ b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunTable/utils.tsx@@ -21,7 +21,7 @@ import {Tooltip,} from "metabase/ui";import { EMPTY_CELL_PLACEHOLDER } from "metabase/utils/constants";-import { formatDurationLong } from "metabase/utils/formatting/time";+import { formatDurationLong } from "metabase/utils/formatting";import {TRANSFORM_GRAPH_RUN_SORT_COLUMNS,type TransformGraphRun,diff --git a/frontend/src/metabase/utils/formatting/currency.ts b/frontend/src/metabase/utils/formatting/currency.tsindex 41070db3368..f85189448a4 100644--- a/frontend/src/metabase/utils/formatting/currency.ts+++ b/frontend/src/metabase/utils/formatting/currency.ts@@ -1,6 +1,7 @@import { t } from "ttag";import { currency as currencyCljs } from "cljs/metabase.util.currency";+import type { CurrencyStyle } from "metabase-types/api";export const currency: [Currency["symbol"], Currency][] = currencyCljs;@@ -19,8 +20,6 @@ export interface CurrencyOption {value: string;}-export type CurrencyStyle = Intl.NumberFormatOptionsCurrencyDisplay;-export interface CurrencyStyleOption {name: string;value: CurrencyStyle;diff --git a/frontend/src/metabase/utils/formatting/datetime-utils.ts b/frontend/src/metabase/utils/formatting/datetime-utils.tsindex 3ad59f4b009..a2e474ea151 100644--- a/frontend/src/metabase/utils/formatting/datetime-utils.ts+++ b/frontend/src/metabase/utils/formatting/datetime-utils.ts@@ -22,7 +22,6 @@ export const hasHour = (unit: DatetimeUnit | undefined) =>export function getTimeFormatFromStyle(style: string,- unit: DatetimeUnit,timeEnabled?: "minutes" | "milliseconds" | "seconds" | null,) {const format = style;diff --git a/frontend/src/metabase/utils/formatting/time.ts b/frontend/src/metabase/utils/formatting/duration.tssimilarity index 52%rename from frontend/src/metabase/utils/formatting/time.tsrename to frontend/src/metabase/utils/formatting/duration.tsindex 9f847c91ff4..ccd59a8a785 100644--- a/frontend/src/metabase/utils/formatting/time.ts+++ b/frontend/src/metabase/utils/formatting/duration.ts@@ -1,16 +1,6 @@-import dayjs, { type Dayjs } from "dayjs";+import dayjs from "dayjs";import { msgid, ngettext, t } from "ttag";-import type { TimeOnlyOptions } from "metabase/utils/formatting/types";-import { parseTime, parseTimestamp } from "metabase/utils/time-dayjs";-import type { DatetimeUnit } from "metabase-types/api/query";--import {- DEFAULT_TIME_STYLE,- getTimeFormatFromStyle,- hasHour,-} from "./datetime-utils";-export function duration(milliseconds: number) {const SECOND = 1000;const MINUTE = 60 * SECOND;@@ -65,64 +55,3 @@ export function formatDurationLong(durationMs: number): string {// asHours (vs hours()) so very long backfills don't wrap past 24h.return t`${Math.floor(d.asHours())}h ${d.minutes()}m`;}--interface TimeWithUnitType {- local?: boolean;- time_enabled?: "minutes" | "milliseconds" | "seconds" | boolean;- time_format?: string;- time_style?: string;-}--export function formatTimeWithUnit(- value: number,- unit: DatetimeUnit,- options: TimeWithUnitType = {},-) {- const d = parseTimestamp(value, unit, options.local);- if (!d.isValid()) {- return String(value);- }-- const timeStyle = options.time_style- ? options.time_style- : DEFAULT_TIME_STYLE;-- const timeEnabled = options.time_enabled- ? options.time_enabled- : hasHour(unit)- ? "minutes"- : null;-- const timeFormat = options.time_format- ? options.time_format- : // Unjustified type cast. FIXME- getTimeFormatFromStyle(timeStyle, unit, timeEnabled as any);-- return d.format(timeFormat);-}--export function formatTime(- time: Dayjs | string,- unit: DatetimeUnit = "default",- options: TimeOnlyOptions = {},-) {- const parsedTime = parseTime(time);-- const timeStyle = options.time_style ?? DEFAULT_TIME_STYLE;-- let timeEnabled;- if (options.time_enabled) {- timeEnabled = options.time_enabled;- } else if (hasHour(unit)) {- timeEnabled = "minute";- } else {- timeEnabled = null;- }-- const timeFormat =- options.time_format ??- // Unjustified type cast. FIXME- getTimeFormatFromStyle(timeStyle, unit, timeEnabled as any);-- return parsedTime.isValid() ? parsedTime.format(timeFormat) : String(time);-}diff --git a/frontend/src/metabase/utils/formatting/duration.unit.spec.ts b/frontend/src/metabase/utils/formatting/duration.unit.spec.tsnew file mode 100644index 00000000000..61cc5978170--- /dev/null+++ b/frontend/src/metabase/utils/formatting/duration.unit.spec.ts@@ -0,0 +1,44 @@+import { formatDurationLong } from "./duration";++describe("formatDurationLong", () => {+ it("formats 0 and sub-second durations in ms", () => {+ expect(formatDurationLong(0)).toBe("0ms");+ expect(formatDurationLong(1)).toBe("1ms");+ expect(formatDurationLong(999)).toBe("999ms");+ });++ it("formats sub-minute durations as seconds with one decimal", () => {+ expect(formatDurationLong(1_000)).toBe("1.0s");+ expect(formatDurationLong(1_500)).toBe("1.5s");+ expect(formatDurationLong(59_900)).toBe("59.9s");+ });++ it("formats sub-hour durations as Xm Ys", () => {+ expect(formatDurationLong(60_000)).toBe("1m 0s");+ expect(formatDurationLong(90_000)).toBe("1m 30s");+ expect(formatDurationLong(522_000)).toBe("8m 42s");+ expect(formatDurationLong(3_599_000)).toBe("59m 59s");+ });++ it("promotes to the next unit when display rounding hits the boundary", () => {+ expect(formatDurationLong(59_999)).toBe("1m 0s");+ expect(formatDurationLong(59_951)).toBe("1m 0s");+ expect(formatDurationLong(59_949)).toBe("59.9s");+ expect(formatDurationLong(3_599_999)).toBe("1h 0m");+ });++ it("formats hour-plus durations as Xh Ym", () => {+ expect(formatDurationLong(3_600_000)).toBe("1h 0m");+ expect(formatDurationLong(5_400_000)).toBe("1h 30m");+ expect(formatDurationLong(7_320_000)).toBe("2h 2m");+ });++ it("does not wrap total hours past 24 for long backfills", () => {+ expect(formatDurationLong(90_000_000)).toBe("25h 0m");+ });++ it("clamps negative values to 0ms (defends against clock skew)", () => {+ expect(formatDurationLong(-1)).toBe("0ms");+ expect(formatDurationLong(-99_999)).toBe("0ms");+ });+});diff --git a/frontend/src/metabase/utils/formatting/index.ts b/frontend/src/metabase/utils/formatting/index.tsindex d18618641ba..886c7bb20fd 100644--- a/frontend/src/metabase/utils/formatting/index.ts+++ b/frontend/src/metabase/utils/formatting/index.ts@@ -1,7 +1,44 @@-export * from "./column";-export * from "./currency";-export * from "./field";-export * from "./numbers";-export * from "./strings";-export * from "./time";-export * from "./types";+export { FK_SYMBOL } from "./constants";+export {+ COMPACT_CURRENCY_OPTIONS,+ type CompactCurrencyOptions,+ type Currency,+ type CurrencyOption,+ type CurrencyStyleOption,+ currency,+ getCurrency,+ getCurrencyNarrowSymbol,+ getCurrencyOptions,+ getCurrencyStyleOptions,+ getCurrencySymbol,+} from "./currency";+export {+ DEFAULT_DATE_STYLE,+ DEFAULT_TIME_STYLE,+ getTimeFormatFromStyle,+ hasDay,+ hasHour,+} from "./datetime-utils";+export { duration, formatDurationLong } from "./duration";+export { formatField } from "./field";+export { formatNullable } from "./nullable";+export {+ type FormatNumberOptions,+ formatChangeWithSign,+ formatNumber,+ formatPercent,+ numberFormatterForOptions,+ roundFloat,+} from "./numbers";+export {+ capitalize,+ conjunct,+ humanize,+ inflect,+ pluralize,+ removeNewLines,+ singularize,+ slugify,+ stripId,+ titleize,+} from "./strings";diff --git a/frontend/src/metabase/utils/formatting/numbers.tsx b/frontend/src/metabase/utils/formatting/numbers.tsxindex 8f787b4c0ee..90c7dfa89f9 100644--- a/frontend/src/metabase/utils/formatting/numbers.tsx+++ b/frontend/src/metabase/utils/formatting/numbers.tsx@@ -179,6 +179,9 @@ export function formatChangeWithSign(return change > 0 ? `+${formattedNumber}` : formattedNumber;}+export const formatPercent = (percent: number) =>+ `${(100 * percent).toFixed(Math.abs(percent) === 1 ? 0 : 2)} %`;+export function numberFormatterForOptions(options: FormatNumberOptions) {options = {...getDefaultNumberOptions(options),diff --git a/frontend/src/metabase/utils/formatting/numbers.unit.spec.ts b/frontend/src/metabase/utils/formatting/numbers.unit.spec.tsindex 7e8f62ff42c..e1794c89d57 100644--- a/frontend/src/metabase/utils/formatting/numbers.unit.spec.ts+++ b/frontend/src/metabase/utils/formatting/numbers.unit.spec.ts@@ -1,4 +1,8 @@-import { formatNumber, numberFormatterForOptions } from "./numbers";+import {+ formatNumber,+ formatPercent,+ numberFormatterForOptions,+} from "./numbers";describe("formatNumber", () => {it("should respect the decimals setting even when compact is true (metabase#54063)", () => {@@ -404,3 +408,10 @@ describe("formatNumber with scale (multiply function)", () => {expect(formatNumber(BigInt(-5), { scale: 2.5 })).toBe("-12.5");});});++describe("formatPercent", () => {+ it("formats percent with two decimals", () => {+ expect(formatPercent(0.12245)).toBe("12.25 %");+ expect(formatPercent(0)).toBe("0.00 %");+ });+});diff --git a/frontend/src/metabase/utils/formatting/readme.md b/frontend/src/metabase/utils/formatting/readme.mdnew file mode 100644index 00000000000..94b870c11f7--- /dev/null+++ b/frontend/src/metabase/utils/formatting/readme.md@@ -0,0 +1,16 @@+# utils/formatting++Formatting primitives: plain value in, display string out. Numbers,+currency, durations, null placeholders, and identifier-to-display-name+string munging (`singularize`, `titleize`, `formatField`, `slugify`, ...).++This directory is **lib tier** - the module-boundaries linter guarantees it+can import nothing app-ward (only other lib code, `metabase-types`, and+compiled cljs). Keep it that way: these helpers are imported from+everywhere, including `metabase-lib/v1`.++Anything that needs a **column** or speaks column-settings / temporal-unit+vocabulary does not belong here - that's+[`metabase/value-formatting`](../../value-formatting/readme.md). The+boundary is a signature test, not a topic test: `formatTime(value, unit,+TimeOnlyOptions)` lives there, `formatDurationLong(ms)` lives here.diff --git a/frontend/src/metabase/utils/formatting/strings.ts b/frontend/src/metabase/utils/formatting/strings.tsindex 1d156d79c59..b817cbef79c 100644--- a/frontend/src/metabase/utils/formatting/strings.ts+++ b/frontend/src/metabase/utils/formatting/strings.ts@@ -48,6 +48,10 @@ export function stripId(name: string) {return name?.replace(/ id$/i, "").trim();}+export function slugify(name: string) {+ return name && encodeURIComponent(name.toLowerCase().replace(/\s/g, "_"));+}+export function removeNewLines<T>(value: T) {if (typeof value === "string") {// Replace all common newline sequences with a single spacediff --git a/frontend/src/metabase/utils/formatting/strings.util.spec.ts b/frontend/src/metabase/utils/formatting/strings.unit.spec.tssimilarity index 55%rename from frontend/src/metabase/utils/formatting/strings.util.spec.tsrename to frontend/src/metabase/utils/formatting/strings.unit.spec.tsindex 10f3c2c46c3..5be6b182a97 100644--- a/frontend/src/metabase/utils/formatting/strings.util.spec.ts+++ b/frontend/src/metabase/utils/formatting/strings.unit.spec.ts@@ -1,4 +1,4 @@-import { capitalize } from "./strings";+import { capitalize, slugify } from "./strings";describe("formatting", () => {describe("strings", () => {@@ -26,5 +26,25 @@ describe("formatting", () => {expect(capitalize("", { lowercase: false })).toBe("");});});++ describe("slugify", () => {+ it("should slugify Chinese", () => {+ expect(slugify("類型")).toEqual("%E9%A1%9E%E5%9E%8B");+ });++ it("should slugify multiple words", () => {+ expect(slugify("Test Parameter")).toEqual("test_parameter");+ });++ it("should slugify Russian", () => {+ expect(slugify("русский язык")).toEqual(+ "%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA",+ );+ });++ it("should slugify diacritics", () => {+ expect(slugify("än umlaut")).toEqual("%C3%A4n_umlaut");+ });+ });});});diff --git a/frontend/src/metabase/visualizations/lib/formatting/click-data.ts b/frontend/src/metabase/value-formatting/click-data.tssimilarity index 80%rename from frontend/src/metabase/visualizations/lib/formatting/click-data.tsrename to frontend/src/metabase/value-formatting/click-data.tsindex bf02926c010..08f9380dea7 100644--- a/frontend/src/metabase/visualizations/lib/formatting/click-data.ts+++ b/frontend/src/metabase/value-formatting/click-data.ts@@ -4,7 +4,6 @@ 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,@@ -12,7 +11,6 @@ import type {UserAttributeMap,VisualizationSettings,} from "metabase-types/api";-import { isImplicitActionClickBehavior } from "metabase-types/guards";import type { ValueAndColumnForColumnNameDate } from "./link";@@ -110,35 +108,3 @@ export function getDataFromClicked({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/utils/formatting/column.ts b/frontend/src/metabase/value-formatting/column.tssimilarity index 100%rename from frontend/src/metabase/utils/formatting/column.tsrename to frontend/src/metabase/value-formatting/column.tsdiff --git a/frontend/src/metabase/visualizations/lib/formatting/date.tsx b/frontend/src/metabase/value-formatting/date.tsxsimilarity index 99%rename from frontend/src/metabase/visualizations/lib/formatting/date.tsxrename to frontend/src/metabase/value-formatting/date.tsxindex 96df779877d..8ab67fa5b3e 100644--- a/frontend/src/metabase/visualizations/lib/formatting/date.tsx+++ b/frontend/src/metabase/value-formatting/date.tsx@@ -9,7 +9,7 @@ import {getTimeFormatFromStyle,hasDay,hasHour,-} from "metabase/utils/formatting/datetime-utils";+} from "metabase/utils/formatting";import { parseTimestamp } from "metabase/utils/time-dayjs";import { isDateWithoutTime } from "metabase-lib/v1/types/utils/isa";import type { ColumnSettings } from "metabase-types/api";@@ -1360,7 +1360,6 @@ export function formatDateTimeWithUnit(timeFormat = getTimeFormatFromStyle(// Unjustified type cast. FIXMEoptions.time_style as string,- unit,options.time_enabled,);}diff --git a/frontend/src/metabase/visualizations/lib/formatting/date.unit.spec.tsx b/frontend/src/metabase/value-formatting/date.unit.spec.tsxsimilarity index 99%rename from frontend/src/metabase/visualizations/lib/formatting/date.unit.spec.tsxrename to frontend/src/metabase/value-formatting/date.unit.spec.tsxindex 844039714b1..828be5a6d9d 100644--- a/frontend/src/metabase/visualizations/lib/formatting/date.unit.spec.tsx+++ b/frontend/src/metabase/value-formatting/date.unit.spec.tsx@@ -6,7 +6,7 @@ import {formatDateTimeForParameter,formatDateTimeRangeWithUnit,formatDateTimeWithUnit,-} from "metabase/visualizations/lib/formatting/date";+} from "./date";import "dayjs/locale/es";import "dayjs/locale/fr";diff --git a/frontend/src/metabase/visualizations/lib/formatting/email.tsx b/frontend/src/metabase/value-formatting/email.tsxsimilarity index 93%rename from frontend/src/metabase/visualizations/lib/formatting/email.tsxrename to frontend/src/metabase/value-formatting/email.tsxindex 59a75e1410f..a60610c769f 100644--- a/frontend/src/metabase/visualizations/lib/formatting/email.tsx+++ b/frontend/src/metabase/value-formatting/email.tsx@@ -1,5 +1,5 @@import { isEmail } from "metabase/utils/email";-import { removeNewLines } from "metabase/utils/formatting/strings";+import { removeNewLines } from "metabase/utils/formatting";import type { ColumnSettings } from "metabase-types/api";import { getDataFromClicked } from "./click-data";diff --git a/frontend/src/metabase/value-formatting/email.unit.spec.tsx b/frontend/src/metabase/value-formatting/email.unit.spec.tsxnew file mode 100644index 00000000000..d3ad10f0f86--- /dev/null+++ b/frontend/src/metabase/value-formatting/email.unit.spec.tsx@@ -0,0 +1,27 @@+import { formatEmail } from "./email";++// Pure engine behaviour only. The jsx + rich rendering path needs the+// registered renderer and is tested in+// visualizations/lib/register-jsx-formatting.unit.spec.tsx.+describe("formatEmail", () => {+ it("should return the email as a string when jsx is false", () => {+ const result = formatEmail("[email protected]");+ expect(result).toBe("[email protected]");+ });++ it("should collapse newlines in string output when not in jsx mode", () => {+ const emailWithNewlines = "[email protected]\nwith newlines";+ const result = formatEmail(emailWithNewlines, {+ collapseNewlines: true,+ });++ expect(result).toBe("[email protected] with newlines");+ });++ it("should handle null and undefined by converting to string", () => {+ // Unjustified type cast. FIXME+ expect(formatEmail(null as any)).toBe("null");+ // Unjustified type cast. FIXME+ expect(formatEmail(undefined as any)).toBe("undefined");+ });+});diff --git a/frontend/src/metabase/visualizations/lib/formatting/geography.ts b/frontend/src/metabase/value-formatting/geography.tssimilarity index 100%rename from frontend/src/metabase/visualizations/lib/formatting/geography.tsrename to frontend/src/metabase/value-formatting/geography.tsdiff --git a/frontend/src/metabase/visualizations/lib/formatting/image.tsx b/frontend/src/metabase/value-formatting/image.tsxsimilarity index 100%rename from frontend/src/metabase/visualizations/lib/formatting/image.tsxrename to frontend/src/metabase/value-formatting/image.tsxdiff --git a/frontend/src/metabase/value-formatting/index.ts b/frontend/src/metabase/value-formatting/index.tsnew file mode 100644index 00000000000..92ae2438f34--- /dev/null+++ b/frontend/src/metabase/value-formatting/index.ts@@ -0,0 +1,26 @@+// The module's public interface. Internal helpers stay unexported here on+// purpose - add a name only when a consumer outside the module needs it.+export { getDataFromClicked } from "./click-data";+export { displayNameForColumn } from "./column";+export {+ formatDateTimeForParameter,+ formatDateTimeRangeWithUnit,+ formatDateTimeWithUnit,+ formatDateToRangeForParameter,+ getDateFormatFromStyle,+ getDateStyleOptionsForUnit,+ getTimeStyleOptions,+} from "./date";+export {+ isSafeUrl,+ renderLinkURLForClick,+ type ValueAndColumnForColumnNameDate,+} from "./link";+export {+ type MarkdownTemplateValues,+ registerJsxEmailRenderer,+ registerJsxLinkRenderer,+ registerJsxMarkdownRenderer,+} from "./registry";+export { formatTimeWithUnit } from "./time";+export { formatValue } from "./value";diff --git a/frontend/src/metabase/visualizations/lib/formatting/link.ts b/frontend/src/metabase/value-formatting/link.tssimilarity index 100%rename from frontend/src/metabase/visualizations/lib/formatting/link.tsrename to frontend/src/metabase/value-formatting/link.tsdiff --git a/frontend/src/metabase/visualizations/lib/formatting/link.unit.spec.tsx b/frontend/src/metabase/value-formatting/link.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/visualizations/lib/formatting/link.unit.spec.tsxrename to frontend/src/metabase/value-formatting/link.unit.spec.tsxdiff --git a/frontend/src/metabase/visualizations/lib/formatting/registry.ts b/frontend/src/metabase/value-formatting/registry.tssimilarity index 100%rename from frontend/src/metabase/visualizations/lib/formatting/registry.tsrename to frontend/src/metabase/value-formatting/registry.tsdiff --git a/frontend/src/metabase/value-formatting/time.ts b/frontend/src/metabase/value-formatting/time.tsnew file mode 100644index 00000000000..69bc22cd2f4--- /dev/null+++ b/frontend/src/metabase/value-formatting/time.ts@@ -0,0 +1,70 @@+import type { Dayjs } from "dayjs";++import {+ DEFAULT_TIME_STYLE,+ getTimeFormatFromStyle,+ hasHour,+} from "metabase/utils/formatting";+import { parseTime, parseTimestamp } from "metabase/utils/time-dayjs";+import type { DatetimeUnit, TimeOnlyOptions } from "metabase-types/api";++interface TimeWithUnitType {+ local?: boolean;+ time_enabled?: "minutes" | "milliseconds" | "seconds" | boolean;+ time_format?: string;+ time_style?: string;+}++export function formatTimeWithUnit(+ value: number,+ unit: DatetimeUnit,+ options: TimeWithUnitType = {},+) {+ const d = parseTimestamp(value, unit, options.local);+ if (!d.isValid()) {+ return String(value);+ }++ const timeStyle = options.time_style+ ? options.time_style+ : DEFAULT_TIME_STYLE;++ const timeEnabled = options.time_enabled+ ? options.time_enabled+ : hasHour(unit)+ ? "minutes"+ : null;++ const timeFormat = options.time_format+ ? options.time_format+ : // Unjustified type cast. FIXME+ getTimeFormatFromStyle(timeStyle, timeEnabled as any);++ return d.format(timeFormat);+}++export function formatTime(+ time: Dayjs | string,+ unit: DatetimeUnit = "default",+ options: TimeOnlyOptions = {},+) {+ const parsedTime = parseTime(time);++ const timeStyle = options.time_style ?? DEFAULT_TIME_STYLE;++ let timeEnabled;+ if (options.time_enabled) {+ timeEnabled = options.time_enabled;+ } else if (hasHour(unit)) {+ timeEnabled = "minute";+ } else {+ timeEnabled = null;+ }++ const timeFormat =+ options.time_format ??+ // Unjustified type cast. FIXME+ getTimeFormatFromStyle(timeStyle, timeEnabled as any);++ return parsedTime.isValid() ? parsedTime.format(timeFormat) : String(time);+}diff --git a/frontend/src/metabase/utils/formatting/time.unit.spec.ts b/frontend/src/metabase/value-formatting/time.unit.spec.tssimilarity index 54%rename from frontend/src/metabase/utils/formatting/time.unit.spec.tsrename to frontend/src/metabase/value-formatting/time.unit.spec.tsindex 1a76b57ef11..3061d25223f 100644--- a/frontend/src/metabase/utils/formatting/time.unit.spec.ts+++ b/frontend/src/metabase/value-formatting/time.unit.spec.ts@@ -1,4 +1,4 @@-import { formatDurationLong, formatTime, formatTimeWithUnit } from "./time";+import { formatTime, formatTimeWithUnit } from "./time";describe("time", () => {describe("formatTime", () => {@@ -74,47 +74,4 @@ describe("time", () => {expect(formatTimeWithUnit(14.4, "hour-of-day", options)).toEqual("14");});});-- describe("formatDurationLong", () => {- it("formats 0 and sub-second durations in ms", () => {- expect(formatDurationLong(0)).toBe("0ms");- expect(formatDurationLong(1)).toBe("1ms");- expect(formatDurationLong(999)).toBe("999ms");- });-- it("formats sub-minute durations as seconds with one decimal", () => {- expect(formatDurationLong(1_000)).toBe("1.0s");- expect(formatDurationLong(1_500)).toBe("1.5s");- expect(formatDurationLong(59_900)).toBe("59.9s");- });-- it("formats sub-hour durations as Xm Ys", () => {- expect(formatDurationLong(60_000)).toBe("1m 0s");- expect(formatDurationLong(90_000)).toBe("1m 30s");- expect(formatDurationLong(522_000)).toBe("8m 42s");- expect(formatDurationLong(3_599_000)).toBe("59m 59s");- });-- it("promotes to the next unit when display rounding hits the boundary", () => {- expect(formatDurationLong(59_999)).toBe("1m 0s");- expect(formatDurationLong(59_951)).toBe("1m 0s");- expect(formatDurationLong(59_949)).toBe("59.9s");- expect(formatDurationLong(3_599_999)).toBe("1h 0m");- });-- it("formats hour-plus durations as Xh Ym", () => {- expect(formatDurationLong(3_600_000)).toBe("1h 0m");- expect(formatDurationLong(5_400_000)).toBe("1h 30m");- expect(formatDurationLong(7_320_000)).toBe("2h 2m");- });-- it("does not wrap total hours past 24 for long backfills", () => {- expect(formatDurationLong(90_000_000)).toBe("25h 0m");- });-- it("clamps negative values to 0ms (defends against clock skew)", () => {- expect(formatDurationLong(-1)).toBe("0ms");- expect(formatDurationLong(-99_999)).toBe("0ms");- });- });});diff --git a/frontend/src/metabase/visualizations/lib/formatting/url.ts b/frontend/src/metabase/value-formatting/url.tssimilarity index 93%rename from frontend/src/metabase/visualizations/lib/formatting/url.tsrename to frontend/src/metabase/value-formatting/url.tsindex fff3a163e33..fcb823f4446 100644--- a/frontend/src/metabase/visualizations/lib/formatting/url.ts+++ b/frontend/src/metabase/value-formatting/url.ts@@ -1,4 +1,4 @@-import { removeNewLines } from "metabase/utils/formatting/strings";+import { removeNewLines } from "metabase/utils/formatting";import { isURL } from "metabase-lib/v1/types/utils/isa";import type { ColumnSettings } from "metabase-types/api";@@ -98,7 +98,3 @@ function getLinkUrl(return null;}--export function slugify(name: string) {- return name && encodeURIComponent(name.toLowerCase().replace(/\s/g, "_"));-}diff --git a/frontend/src/metabase/value-formatting/url.unit.spec.tsx b/frontend/src/metabase/value-formatting/url.unit.spec.tsxnew file mode 100644index 00000000000..bfb107ee753--- /dev/null+++ b/frontend/src/metabase/value-formatting/url.unit.spec.tsx@@ -0,0 +1,10 @@+import { formatUrl } from "./url";++// Pure engine behaviour only. The jsx + rich rendering paths (link components,+// SDK click handling, safety guards in the presence of a real renderer) are+// tested in visualizations/lib/register-jsx-formatting.unit.spec.tsx.+describe("formatUrl", () => {+ it("should return a string when not in jsx mode", () => {+ expect(formatUrl("http://metabase.com/")).toEqual("http://metabase.com/");+ });+});diff --git a/frontend/src/metabase/visualizations/lib/formatting/value.tsx b/frontend/src/metabase/value-formatting/value.tsxsimilarity index 96%rename from frontend/src/metabase/visualizations/lib/formatting/value.tsxrename to frontend/src/metabase/value-formatting/value.tsxindex dd49179f64a..c345dde047d 100644--- a/frontend/src/metabase/visualizations/lib/formatting/value.tsx+++ b/frontend/src/metabase/value-formatting/value.tsx@@ -3,9 +3,7 @@ import dayjs, { type Dayjs } from "dayjs";import CS from "metabase/css/core/index.css";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";-import { formatNumber } from "metabase/utils/formatting/numbers";-import { removeNewLines } from "metabase/utils/formatting/strings";-import { formatTime } from "metabase/utils/formatting/time";+import { formatNumber, removeNewLines } from "metabase/utils/formatting";import { parseNumber } from "metabase/utils/number";import {isBoolean,@@ -17,14 +15,16 @@ import {isURL,} from "metabase-lib/v1/types/utils/isa";import type { ColumnSettings, DatasetColumn } from "metabase-types/api";+import { clickBehaviorIsValid } from "metabase-types/guards";-import { clickBehaviorIsValid, getDataFromClicked } from "./click-data";+import { getDataFromClicked } from "./click-data";import { formatDateTimeWithUnit, formatRange } from "./date";import { formatEmail } from "./email";import { formatCoordinate } from "./geography";import { formatImage } from "./image";import { renderLinkTextForClick } from "./link";import { getJsxMarkdownRenderer } from "./registry";+import { formatTime } from "./time";import { formatUrl } from "./url";export function formatValue(value: unknown, _options: ColumnSettings = {}) {diff --git a/frontend/src/metabase/value-formatting/value.unit.spec.tsx b/frontend/src/metabase/value-formatting/value.unit.spec.tsxnew file mode 100644index 00000000000..569a3d91380--- /dev/null+++ b/frontend/src/metabase/value-formatting/value.unit.spec.tsx@@ -0,0 +1,200 @@+import { TYPE } from "metabase-lib/v1/types/constants";+import { createMockColumn } from "metabase-types/api/mocks";++import { formatValue } from "./value";++// Pure engine behaviour only (direct formatValue return values, no rendering).+// The jsx + rich rendering paths (links, images, email components, and the+// collapse-newlines behaviour that runs through them) are tested in+// visualizations/lib/register-jsx-formatting.unit.spec.tsx.+describe("formatValue", () => {+ describe("collapseNewlines", () => {+ it("should collapse newlines in plain text when collapseNewlines is true", () => {+ const result = formatValue("Line 1\nLine 2\nLine 3", {+ collapseNewlines: true,+ jsx: false,+ });+ expect(result).toBe("Line 1 Line 2 Line 3");+ });++ it("should preserve newlines when collapseNewlines is false", () => {+ const result = formatValue("Line 1\nLine 2\nLine 3", {+ collapseNewlines: false,+ jsx: false,+ });+ expect(result).toBe("Line 1\nLine 2\nLine 3");+ });++ it("should preserve newlines when collapseNewlines is not specified", () => {+ const result = formatValue("Line 1\nLine 2\nLine 3", {+ jsx: false,+ });+ expect(result).toBe("Line 1\nLine 2\nLine 3");+ });++ it("should handle null values with collapseNewlines", () => {+ const result = formatValue(null, {+ collapseNewlines: true,+ jsx: false,+ });+ expect(result).toBe(null);+ });++ it("should handle numbers with collapseNewlines", () => {+ const result = formatValue(123.45, {+ collapseNewlines: true,+ jsx: false,+ column: createMockColumn({ base_type: "type/Float" }),+ });+ expect(result).toBe("123.45");+ });++ it("should collapse multiple consecutive newlines", () => {+ const result = formatValue("Line 1\n\n\nLine 2", {+ collapseNewlines: true,+ jsx: false,+ });+ expect(result).toBe("Line 1 Line 2");+ });++ it("should collapse Windows CRLF newlines", () => {+ const result = formatValue("Line 1\r\nLine 2\r\nLine 3", {+ collapseNewlines: true,+ jsx: false,+ });+ expect(result).toBe("Line 1 Line 2 Line 3");+ });++ it("should collapse old Mac CR newlines", () => {+ const result = formatValue("Line 1\rLine 2\rLine 3", {+ collapseNewlines: true,+ jsx: false,+ });+ expect(result).toBe("Line 1 Line 2 Line 3");+ });++ it("should collapse mixed newline types", () => {+ const result = formatValue("Line 1\nLine 2\r\nLine 3\rLine 4", {+ collapseNewlines: true,+ jsx: false,+ });+ expect(result).toBe("Line 1 Line 2 Line 3 Line 4");+ });++ it("should collapse Unicode line separators", () => {+ const result = formatValue("Line 1\u2028Line 2\u2029Line 3", {+ collapseNewlines: true,+ jsx: false,+ });+ expect(result).toBe("Line 1 Line 2 Line 3");+ });+ });++ it("should return null on nullish values by default", () => {+ expect(formatValue(null)).toEqual(null);+ expect(formatValue(undefined)).toEqual(null);+ });++ it("should format null as (empty) when stringifyNull option is true", () => {+ expect(formatValue(null, { stringifyNull: true })).toEqual("(empty)");+ expect(formatValue(undefined, { stringifyNull: true })).toEqual("(empty)");+ });++ it("should format numbers with null column", () => {+ expect(formatValue(12345)).toEqual("12345");+ });++ it("should format numbers with commas", () => {+ expect(+ formatValue(12345, {+ column: { base_type: TYPE.Number, semantic_type: TYPE.Number },+ }),+ ).toEqual("12,345");+ });++ it("should format big integers", () => {+ const options = {+ column: { base_type: TYPE.Number, semantic_type: TYPE.Number },+ };++ expect(formatValue(9223372036854775807n, options)).toEqual(+ "9,223,372,036,854,775,807",+ );+ expect(formatValue("9223372036854775807", options)).toEqual(+ "9,223,372,036,854,775,807",+ );+ });++ it("should format zip codes without commas", () => {+ expect(+ formatValue(12345, {+ column: { base_type: TYPE.Number, semantic_type: TYPE.ZipCode },+ }),+ ).toEqual("12345");+ });++ it("should format latitude and longitude columns correctly", () => {+ expect(+ formatValue(37.7749, {+ column: { base_type: TYPE.Number, semantic_type: TYPE.Latitude },+ }),+ ).toEqual("37.77490000° N");+ expect(+ formatValue(-122.4194, {+ column: { base_type: TYPE.Number, semantic_type: TYPE.Longitude },+ }),+ ).toEqual("122.41940000° W");+ });++ it("should not add mailto prefix if there's a different semantic type", () => {+ expect(+ formatValue("[email protected]", {+ jsx: true,+ rich: true,+ column: { semantic_type: "type/PK" },+ }),+ ).toEqual("[email protected]");+ });++ it("should display hour-of-day with 12 hour clock", () => {+ expect(+ formatValue(24, {+ date_style: null,+ time_enabled: "minutes",+ time_style: "h:mm A",+ column: {+ base_type: "type/DateTime",+ unit: "hour-of-day",+ },+ }),+ ).toEqual("12:00 AM");+ });++ it("should display hour-of-day with 24 hour clock", () => {+ expect(+ formatValue(24, {+ date_style: null,+ time_enabled: "minutes",+ time_style: "HH:mm",+ column: {+ base_type: "type/DateTime",+ unit: "hour-of-day",+ },+ }),+ ).toEqual("00:00");+ });++ it("should not include time for type/Date type (metabase#7494)", () => {+ expect(+ formatValue("2019-07-07T00:00:00.000Z", {+ date_style: "M/D/YYYY",+ time_enabled: "minutes",+ time_style: "HH:mm",+ column: {+ base_type: "type/Date",+ unit: "hour-of-day",+ },+ }),+ ).toEqual("7/7/2019");+ });+});diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.tsxindex 2b75959e3ac..a046e05a1a8 100644--- a/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.tsx+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.tsx@@ -1,7 +1,7 @@import cx from "classnames";import { t } from "ttag";-import { formatPercent } from "metabase/static-viz/lib/numbers";+import { formatPercent } from "metabase/utils/formatting";import type { TooltipRowModel } from "metabase/visualizations/types";import S from "./TooltipRow.module.css";diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/utils.ts b/frontend/src/metabase/visualizations/components/ChartTooltip/utils.tsindex 6273bde0989..680c0b4fb9e 100644--- a/frontend/src/metabase/visualizations/components/ChartTooltip/utils.ts+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/utils.ts@@ -1,5 +1,5 @@import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type {ComputedVisualizationSettings,RemappingHydratedDatasetColumn,diff --git a/frontend/src/metabase/visualizations/components/FunnelNormal.tsx b/frontend/src/metabase/visualizations/components/FunnelNormal.tsxindex 60437b9a9f6..55a94c5b299 100644--- a/frontend/src/metabase/visualizations/components/FunnelNormal.tsx+++ b/frontend/src/metabase/visualizations/components/FunnelNormal.tsx@@ -5,9 +5,13 @@ import { t } from "ttag";import CS from "metabase/css/core/index.css";import { Ellipsified } from "metabase/ui";import { color } from "metabase/ui/colors";-import { formatChangeWithSign, formatNumber } from "metabase/utils/formatting";-import { formatNullable } from "metabase/utils/formatting/nullable";+import {+ formatChangeWithSign,+ formatNullable,+ formatNumber,+} from "metabase/utils/formatting";import { isNotNull } from "metabase/utils/types";+import { formatValue } from "metabase/value-formatting";import {FunnelNormalRoot,FunnelStart,@@ -17,7 +21,6 @@ import {Subtitle,Title,} from "metabase/visualizations/components/FunnelNormal.styled";-import { formatValue } from "metabase/visualizations/lib/formatting";import {calculateFunnelSteps,calculateStepOpacity,diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsxindex d5931ccc5f6..b9deed2f68a 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx@@ -7,8 +7,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";import CS from "metabase/css/core/index.css";import QueryBuilderS from "metabase/css/query_builder.module.css";import { Box, Ellipsified } from "metabase/ui";-import { displayNameForColumn } from "metabase/utils/formatting";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { displayNameForColumn, formatValue } from "metabase/value-formatting";import type { ClickObject } from "metabase-lib";import { findColumnIndexesForColumnSettings } from "metabase-lib/v1/queries/utils/dataset";import { TYPE } from "metabase-lib/v1/types/constants";diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts b/frontend/src/metabase/visualizations/components/ObjectDetail/utils.tsindex bcd838e4f94..e1760fcdb34 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts@@ -6,7 +6,7 @@ import {} from "metabase/actions/utils";import * as Urls from "metabase/urls";import { singularize } from "metabase/utils/formatting";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type Question from "metabase-lib/v1/Question";import { canRunAction } from "metabase-lib/v1/actions/utils";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsxindex 0e15a105908..bf7f81db350 100644--- a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx+++ b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx@@ -48,7 +48,7 @@ import { useDispatch } from "metabase/redux";import { setUIControls } from "metabase/redux/query-builder";import { Flex, type MantineTheme } from "metabase/ui";import { getScrollBarSize } from "metabase/utils/dom";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import {getTableCellClickedObject,getTableClickedObjectRowData,diff --git a/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts b/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.tsindex 74d033508ac..42644844ce9 100644--- a/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts+++ b/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts@@ -1,7 +1,9 @@import { useMemo } from "react";-import { formatValue } from "metabase/visualizations/lib/formatting";-import { formatDateTimeRangeWithUnit } from "metabase/visualizations/lib/formatting/date";+import {+ formatDateTimeRangeWithUnit,+ formatValue,+} from "metabase/value-formatting";import type { PreviousPeriodChange } from "metabase/visualizations/lib/trend-helpers";import {computePreviousPeriodChange,diff --git a/frontend/src/metabase/visualizations/custom-visualizations/custom-viz-utils.ts b/frontend/src/metabase/visualizations/custom-visualizations/custom-viz-utils.tsindex f5c1c52f0d2..724a0462dc6 100644--- a/frontend/src/metabase/visualizations/custom-visualizations/custom-viz-utils.ts+++ b/frontend/src/metabase/visualizations/custom-visualizations/custom-viz-utils.ts@@ -1,5 +1,5 @@import { getSubpathSafeUrl } from "metabase/urls";-import { formatValue as internalFormatValue } from "metabase/visualizations/lib/formatting/value";+import { formatValue as internalFormatValue } from "metabase/value-formatting";import type {ColumnSettings,CustomVizPluginId,diff --git a/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts b/frontend/src/metabase/visualizations/echarts/boxplot/model/index.tsindex 3ed6c5057f2..fb3484ab0d3 100644--- a/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts+++ b/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts@@ -1,5 +1,6 @@import { memoize } from "metabase/common/hooks/use-memoized-callback";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";+import { formatValue } from "metabase/value-formatting";import {ECHARTS_CATEGORY_AXIS_NULL_VALUE,X_AXIS_DATA_KEY,@@ -31,7 +32,6 @@ import type {YAxisModel,} from "metabase/visualizations/echarts/cartesian/model/types";import type { ShowWarning } from "metabase/visualizations/echarts/types";-import { formatValue } from "metabase/visualizations/lib/formatting";import type { CartesianChartColumns } from "metabase/visualizations/lib/graph/columns";import { getCartesianChartColumns } from "metabase/visualizations/lib/graph/columns";import type {diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.tsindex b4c201e0b89..9ff15c4fd15 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts@@ -5,6 +5,7 @@ import _ from "underscore";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";import { getObjectEntries, getObjectKeys } from "metabase/utils/objects";import { isNotNull, isNumber } from "metabase/utils/types";+import { formatValue } from "metabase/value-formatting";import {ECHARTS_CATEGORY_AXIS_NULL_VALUE,X_AXIS_DATA_KEY,@@ -37,7 +38,6 @@ import {normalizeDate,tryGetDate,} from "metabase/visualizations/echarts/cartesian/utils/timeseries";-import { formatValue } from "metabase/visualizations/lib/formatting";import { computeNumericDataInterval } from "metabase/visualizations/lib/numeric";import { getLineAreaBarComparisonSettings } from "metabase/visualizations/lib/settings";import type {diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.tsindex e90b34642ca..1b25216045a 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts@@ -1,6 +1,7 @@import { memoize } from "metabase/common/hooks/use-memoized-callback";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";import { isEmpty } from "metabase/utils/validate";+import { formatValue } from "metabase/value-formatting";import { getDatasetKey } from "metabase/visualizations/echarts/cartesian/model/dataset";import type {ChartDataset,@@ -20,7 +21,6 @@ import type {WaterFallChartDataDensity,} from "metabase/visualizations/echarts/cartesian/model/types";import { getHexColor } from "metabase/visualizations/lib/color";-import { formatValue } from "metabase/visualizations/lib/formatting";import type { CartesianChartColumns } from "metabase/visualizations/lib/graph/columns";import {SERIES_COLORS_SETTING_KEY,diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.tsindex b5e0163ad3a..b325f240a52 100644--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.ts+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.ts@@ -1,5 +1,5 @@import { memoize } from "metabase/common/hooks/use-memoized-callback";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import type { SankeyChartColumns, SankeyFormatters, SankeyNode } from "./types";diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsxindex 408d1d4705d..520f3577cea 100644--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx@@ -1,7 +1,7 @@import type { TooltipOption } from "echarts/types/dist/shared";import { t } from "ttag";-import { formatPercent } from "metabase/static-viz/lib/numbers";+import { formatPercent } from "metabase/utils/formatting";import { reactNodeToHtmlString } from "metabase/utils/react-to-html";import {EChartsTooltip,diff --git a/frontend/src/metabase/visualizations/echarts/graph/treemap/model/formatters.ts b/frontend/src/metabase/visualizations/echarts/graph/treemap/model/formatters.tsindex a179d89a88e..9fbfa598971 100644--- a/frontend/src/metabase/visualizations/echarts/graph/treemap/model/formatters.ts+++ b/frontend/src/metabase/visualizations/echarts/graph/treemap/model/formatters.ts@@ -1,5 +1,5 @@import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import { computeMaxDecimalsForValues } from "metabase/visualizations/lib/utils";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import type { DatasetColumn, RowValue } from "metabase-types/api";diff --git a/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.ts b/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.tsindex 16df27088d4..43f4daf4383 100644--- a/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.ts+++ b/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.ts@@ -1,8 +1,8 @@import type { TreemapSeriesOption } from "echarts/charts";import { match } from "ts-pattern";-import { formatPercent as formatPercentDefault } from "metabase/static-viz/lib/numbers";import { getTextColorForBackground } from "metabase/ui/colors";+import { formatPercent as formatPercentDefault } from "metabase/utils/formatting";import { truncateText } from "metabase/visualizations/lib/text";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.unit.spec.tsindex becdda22378..925e0bf576a 100644--- a/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.unit.spec.ts+++ b/frontend/src/metabase/visualizations/echarts/graph/treemap/option/option.unit.spec.ts@@ -1,4 +1,4 @@-import { formatPercent } from "metabase/static-viz/lib/numbers";+import { formatPercent } from "metabase/utils/formatting";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/visualizations/echarts/pie/format.ts b/frontend/src/metabase/visualizations/echarts/pie/format.tsindex 5222b4bcdef..70d97e4edf5 100644--- a/frontend/src/metabase/visualizations/echarts/pie/format.ts+++ b/frontend/src/metabase/visualizations/echarts/pie/format.ts@@ -1,5 +1,5 @@import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import { computeMaxDecimalsForValues } from "metabase/visualizations/lib/utils";import type {ComputedVisualizationSettings,diff --git a/frontend/src/metabase/visualizations/lib/choropleth.ts b/frontend/src/metabase/visualizations/lib/choropleth.tsindex 6c87ea2d95c..2371a689640 100644--- a/frontend/src/metabase/visualizations/lib/choropleth.ts+++ b/frontend/src/metabase/visualizations/lib/choropleth.ts@@ -1,7 +1,7 @@import * as d3 from "d3";import ss from "simple-statistics";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import {isCountry,isDimension,diff --git a/frontend/src/metabase/visualizations/lib/data_grid.js b/frontend/src/metabase/visualizations/lib/data_grid.jsindex 99e553a575e..8782a476eca 100644--- a/frontend/src/metabase/visualizations/lib/data_grid.js+++ b/frontend/src/metabase/visualizations/lib/data_grid.js@@ -1,7 +1,7 @@import _ from "underscore";import * as Pivot from "cljs/metabase.pivot.js";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import { makeCellBackgroundGetter } from "metabase/visualizations/lib/table_format";import { migratePivotColumnSplitSetting } from "metabase-lib/v1/queries/utils/pivot";diff --git a/frontend/src/metabase/visualizations/lib/formatting/email.unit.spec.tsx b/frontend/src/metabase/visualizations/lib/formatting/email.unit.spec.tsxdeleted file mode 100644index 63b541ab42b..00000000000--- a/frontend/src/metabase/visualizations/lib/formatting/email.unit.spec.tsx+++ /dev/null@@ -1,171 +0,0 @@-import { render, screen } from "@testing-library/react";-import { isElementOfType } from "react-dom/test-utils";--import { ExternalLink } from "metabase/common/components/ExternalLink";-import { createMockColumn } from "metabase-types/api/mocks";--import { formatEmail } from "./email";-import { registerJsxFormatting } from "./ui";--registerJsxFormatting();--describe("formatEmail", () => {- describe("email link generation", () => {- it("should return the email as a string when jsx is false", () => {- const result = formatEmail("[email protected]");- expect(result).toBe("[email protected]");- });-- it("should create an ExternalLink for valid emails in jsx + rich mode", () => {- const result = formatEmail("[email protected]", {- jsx: true,- rich: true,- });- // Unjustified type cast. FIXME- expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);-- render(result);-- expect(screen.getByRole("link")).toHaveAttribute(- "href",- "mailto:[email protected]",- );- expect(screen.getByRole("link")).toHaveTextContent("[email protected]");- });-- it.each([- "[email protected]",- "[email protected]",- "[email protected]",- "[email protected]",- ])("should handle complex valid email address: %s", (email) => {- const result = formatEmail(email, { jsx: true, rich: true });- // Unjustified type cast. FIXME- expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);-- render(result);-- expect(screen.getByRole("link")).toHaveAttribute(- "href",- `mailto:${email}`,- );- expect(screen.getByRole("link")).toHaveTextContent(email);- });- });-- describe("invalid email handling", () => {- it("should return string for invalid email addresses", () => {- const invalidEmails = [- "not-an-email",- "@example.com",- "user@",- "user [email protected]",- "[email protected]",- "",- ];-- invalidEmails.forEach((email) => {- const result = formatEmail(email, { jsx: true, rich: true });- expect(result).toBe(email);- });- });-- it("should handle very long email addresses that exceed regex limits", () => {- // Create an email that's too long (over 254 characters)- const longEmail = `${"a".repeat(250)}@example.com`;- const result = formatEmail(longEmail, { jsx: true, rich: true });- expect(result).toBe(longEmail);- });- });-- describe("link text handling", () => {- it("should use custom link_text when provided with clicked data", () => {- const column = createMockColumn({ name: "email" });- const clicked = {- value: "[email protected]",- column,- data: [{ value: "[email protected]", col: column }],- };-- const result = formatEmail("[email protected]", {- jsx: true,- rich: true,- link_text: "Custom Label",- clicked,- });-- // Unjustified type cast. FIXME- expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);-- render(result);-- expect(screen.getByRole("link")).toHaveAttribute(- "href",- "mailto:[email protected]",- );- expect(screen.getByRole("link")).toHaveTextContent("Custom Label");- });- });-- describe("newline collapsing", () => {- it("should collapse newlines in email text when collapseNewlines is true", () => {- const emailWithNewlines = "[email protected]\n\rextra text";- const result = formatEmail(emailWithNewlines, {- jsx: true,- rich: true,- collapseNewlines: true,- });-- // Unjustified type cast. FIXME- expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(false);- expect(result).toBe("[email protected] extra text");- });-- it("should collapse newlines in custom link text when collapseNewlines is true", () => {- const column = createMockColumn({ name: "email" });- const clicked = {- value: "[email protected]",- column,- data: [{ value: "[email protected]", col: column }],- };-- const result = formatEmail("[email protected]", {- jsx: true,- rich: true,- link_text: "Custom\nLabel",- clicked,- collapseNewlines: true,- });-- // Unjustified type cast. FIXME- expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);-- render(result);-- expect(screen.getByRole("link")).toHaveTextContent("Custom Label");- });-- it("should collapse newlines in string output when not in jsx mode", () => {- const emailWithNewlines = "[email protected]\nwith newlines";- const result = formatEmail(emailWithNewlines, {- collapseNewlines: true,- });-- expect(result).toBe("[email protected] with newlines");- });- });-- describe("edge cases", () => {- it("should handle empty string", () => {- const result = formatEmail("", { jsx: true, rich: true });- expect(result).toBe("");- });-- it("should handle null and undefined by converting to string", () => {- // Unjustified type cast. FIXME- expect(formatEmail(null as any)).toBe("null");- // Unjustified type cast. FIXME- expect(formatEmail(undefined as any)).toBe("undefined");- });- });-});diff --git a/frontend/src/metabase/visualizations/lib/formatting/index.ts b/frontend/src/metabase/visualizations/lib/formatting/index.tsdeleted file mode 100644index 105d6ba547a..00000000000--- a/frontend/src/metabase/visualizations/lib/formatting/index.ts+++ /dev/null@@ -1,7 +0,0 @@-export * from "./date";-export * from "./email";-export * from "./geography";-export * from "./image";-export * from "./link";-export * from "./url";-export * from "./value";diff --git a/frontend/src/metabase/visualizations/lib/formatting/jsx-link-renderer.tsx b/frontend/src/metabase/visualizations/lib/formatting/jsx-link-renderer.tsxdeleted file mode 100644index 3273b97608a..00000000000--- a/frontend/src/metabase/visualizations/lib/formatting/jsx-link-renderer.tsx+++ /dev/null@@ -1,41 +0,0 @@-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/url.unit.spec.tsx b/frontend/src/metabase/visualizations/lib/formatting/url.unit.spec.tsxdeleted file mode 100644index 1a8ecbb75a6..00000000000--- a/frontend/src/metabase/visualizations/lib/formatting/url.unit.spec.tsx+++ /dev/null@@ -1,421 +0,0 @@-import type { ReactElement } from "react";-import { isElementOfType } from "react-dom/test-utils";--import { setupSdkPlugins } from "__support__/enterprise";-import { mockSettings } from "__support__/settings";-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,- createMockTokenFeatures,-} from "metabase-types/api/mocks";--import { formatUrl, slugify } from "./url";-import { formatValue } from "./value";--registerJsxFormatting();--const SITE_URL = "http://localhost:3000";--describe("formatUrl", () => {- beforeAll(() => {- mockSettings({ "site-url": SITE_URL });- });-- afterEach(() => {- ensureMetabaseProviderPropsStore().cleanup();- jest.restoreAllMocks();- });-- it("calls handleLinkSdkPlugin and prevents default in SDK", async () => {- mockSettings({- "token-features": createMockTokenFeatures({ embedding_sdk: true }),- });- setupSdkPlugins();- await mockIsEmbeddingSdk(true);-- const url = "https://example.com/dashboard/1";- const handleLink = jest.fn().mockReturnValue({ handled: true });-- ensureMetabaseProviderPropsStore().setProps({- pluginsConfig: { handleLink },- });-- // Unjustified type cast. FIXME- const node = formatUrl(url, {- jsx: true,- rich: true,- view_as: "link",- }) as ReactElement;- render(node);-- const link = screen.getByRole("link");- // Manually creating the event instead of using fireEvent.click because we need to inspect- // the defaultPrevented property of the event.- const event = new MouseEvent("click", { bubbles: true, cancelable: true });- link.dispatchEvent(event);-- expect(handleLink).toHaveBeenCalledWith(url);- expect(event.defaultPrevented).toBe(true);- });-- it("does not call handleLinkSdkPlugin in core app", async () => {- await mockIsEmbeddingSdk(false);-- const url = "https://example.com/dashboard/2";- const handleLink = jest.fn();-- ensureMetabaseProviderPropsStore().setProps({- pluginsConfig: { handleLink },- });-- // Unjustified type cast. FIXME- const node = formatUrl(url, {- jsx: true,- rich: true,- view_as: "link",- }) as ReactElement;- render(node);-- const link = screen.getByRole("link");- // Manually creating the event instead of using fireEvent.click because we need to inspect- // the defaultPrevented property of the event.- const event = new MouseEvent("click", { bubbles: true, cancelable: true });- link.dispatchEvent(event);-- expect(handleLink).not.toHaveBeenCalled();- expect(event.defaultPrevented).toBe(false);- });-- it("should return a string when not in jsx mode", () => {- expect(formatUrl("http://metabase.com/")).toEqual("http://metabase.com/");- });-- it("should return a component for http:, https:, and mailto: links in jsx mode", () => {- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatUrl("http://metabase.com/", {- jsx: true,- rich: true,- }) as ReactElement,- ExternalLink,- ),- ).toEqual(true);- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatUrl("https://metabase.com/", {- jsx: true,- rich: true,- }) as ReactElement,- ExternalLink,- ),- ).toEqual(true);- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatUrl("mailto:[email protected]", {- jsx: true,- rich: true,- }) as ReactElement,- ExternalLink,- ),- ).toEqual(true);- });-- it("should return a component for custom protocols if the column type is URL", () => {- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatUrl("myproto:some-custom-thing", {- jsx: true,- rich: true,- column: { semantic_type: TYPE.URL },- }) as ReactElement,- ExternalLink,- ),- ).toEqual(true);- });-- it("should not return a component for bad urls if the column type is URL", () => {- expect(- // Unjustified type cast. FIXME- formatUrl("invalid-blah-blah-blah", {- jsx: true,- rich: true,- column: { semantic_type: TYPE.URL },- }) as ReactElement,- ).toEqual("invalid-blah-blah-blah");- });-- it("should not return a component for custom protocols if the column type isn't URL", () => {- expect(- // Unjustified type cast. FIXME- formatUrl("myproto:some-custom-thing", {- jsx: true,- rich: true,- }) as ReactElement,- ).toEqual("myproto:some-custom-thing");- });-- it("should not return a link component for unrecognized links in jsx mode", () => {- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatUrl("metabase.com", { jsx: true, rich: true }) as ReactElement,- ExternalLink,- ),- ).toEqual(false);- });-- it("should return a string for javascript:, data:, and other links in jsx mode", () => {- expect(- // Unjustified type cast. FIXME- formatUrl("javascript:alert('pwnd')", {- jsx: true,- rich: true,- }) as ReactElement,- ).toEqual("javascript:alert('pwnd')");- expect(- // Unjustified type cast. FIXME- formatUrl("data:text/plain;charset=utf-8,hello%20world", {- jsx: true,- rich: true,- }) as ReactElement,- ).toEqual("data:text/plain;charset=utf-8,hello%20world");- });-- describe("when view_as = link", () => {- it("should return link component for type/URL and view_as = link", () => {- // Unjustified type cast. FIXME- const formatted = formatUrl("http://whatever", {- jsx: true,- rich: true,- column: { semantic_type: TYPE.URL },- view_as: "link",- }) as ReactElement;- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);- });-- it("should return link component using link_url and link_text when specified", () => {- // Unjustified type cast. FIXME- const formatted = formatUrl("http://not.metabase.com", {- jsx: true,- rich: true,- link_text: "metabase link",- link_url: "http://metabase.com",- view_as: "link",- clicked: {},- }) as ReactElement;-- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);- expect(formatted.props.children).toEqual("metabase link");- expect(formatted.props.href).toEqual("http://metabase.com");- });-- it("should return link component using link_text and the value as url when link_url is empty", () => {- // Unjustified type cast. FIXME- const formatted = formatUrl("http://metabase.com", {- jsx: true,- rich: true,- link_text: "metabase link",- link_url: "",- view_as: "link",- clicked: {},- }) as ReactElement;-- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);- expect(formatted.props.children).toEqual("metabase link");- expect(formatted.props.href).toEqual("http://metabase.com");- });-- it("should return link component using link_url and the value as text when link_text is empty", () => {- // Unjustified type cast. FIXME- const formatted = formatUrl("metabase link", {- jsx: true,- rich: true,- link_text: "",- link_url: "http://metabase.com",- view_as: "link",- clicked: {},- }) as ReactElement;-- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);- expect(formatted.props.children).toEqual("metabase link");- expect(formatted.props.href).toEqual("http://metabase.com");- });-- it("should apply the column's number formatting settings to the link text when link_text references the current column (metabase#56876)", () => {- const column = createMockColumn({- name: "hubspot_id",- base_type: TYPE.Integer,- });- const value = 35660212261;- // Unjustified type cast. FIXME- const formatted = formatValue(value, {- jsx: true,- rich: true,- column,- view_as: "link",- link_text: "{{hubspot_id}}",- link_url: "http://example.com/{{hubspot_id}}",- number_style: "decimal",- // No thousand separator: the user has chosen to render the value- // without group separators (e.g. for ID-like numbers).- number_separators: ".",- clicked: {- value,- column,- data: [{ value, col: column }],- settings: {- column_settings: {- '["name","hubspot_id"]': {- number_style: "decimal",- number_separators: ".",- },- },- },- },- }) as ReactElement;-- expect(isElementOfType(formatted, ExternalLink)).toBe(true);- expect(formatted.props.children).toBe("35660212261");- });-- it("should apply the column's separator-style setting to a link text referencing the current column", () => {- const column = createMockColumn({- name: "amount",- base_type: TYPE.Float,- });- const value = 1234567.89;- // Unjustified type cast. FIXME- const formatted = formatValue(value, {- jsx: true,- rich: true,- column,- view_as: "link",- link_text: "{{amount}}",- link_url: "http://example.com",- number_style: "decimal",- // European-style separators: "." for thousands, "," for decimals.- number_separators: ",.",- clicked: {- value,- column,- data: [{ value, col: column }],- settings: {- column_settings: {- '["name","amount"]': {- number_style: "decimal",- number_separators: ",.",- },- },- },- },- }) as ReactElement;-- expect(isElementOfType(formatted, ExternalLink)).toBe(true);- expect(formatted.props.children).toBe("1.234.567,89");- });-- it("should apply a different column's formatting when link_text references that other column", () => {- const linkColumn = createMockColumn({- name: "name",- base_type: TYPE.Text,- });- const amountColumn = createMockColumn({- name: "amount",- base_type: TYPE.Float,- });- const linkValue = "Widget";- const amountValue = 1234567.89;- // Unjustified type cast. FIXME- const formatted = formatValue(linkValue, {- jsx: true,- rich: true,- column: linkColumn,- view_as: "link",- link_text: "Buy for {{amount}}",- link_url: "http://example.com",- clicked: {- value: linkValue,- column: linkColumn,- data: [- { value: linkValue, col: linkColumn },- { value: amountValue, col: amountColumn },- ],- settings: {- column_settings: {- '["name","amount"]': {- number_style: "currency",- currency: "USD",- currency_style: "symbol",- },- },- },- },- }) as ReactElement;-- expect(isElementOfType(formatted, ExternalLink)).toBe(true);- expect(formatted.props.children).toBe("Buy for $1,234,567.89");- });-- it("should not return an ExternalLink in jsx + rich mode if there's click behavior", () => {- // Unjustified type cast. FIXME- const formatted = formatValue("http://metabase.com/", {- jsx: true,- rich: true,- click_behavior: {- linkTemplate: "foo",- linkTextTemplate: "bar",- linkType: "url",- type: "link",- },- link_text: "metabase link",- link_url: "http://metabase.com",- view_as: "link",- clicked: {},- }) as ReactElement;-- // it is not a link set on the question level- expect(isElementOfType(formatted, ExternalLink)).toEqual(false);- // expect the text to be in a div (which has link formatting) rather than ExternalLink- expect(formatted.props["data-testid"]).toEqual("link-formatted-text");- });- });-- it("should not crash if column is null", () => {- expect(- formatUrl("foobar", {- jsx: true,- rich: true,- column: null,- }),- ).toEqual("foobar");- });-- describe("slugify", () => {- it("should slugify Chinese", () => {- expect(slugify("類型")).toEqual("%E9%A1%9E%E5%9E%8B");- });-- it("should slugify multiple words", () => {- expect(slugify("Test Parameter")).toEqual("test_parameter");- });-- it("should slugify Russian", () => {- expect(slugify("русский язык")).toEqual(- "%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA",- );- });-- it("should slugify diacritics", () => {- expect(slugify("än umlaut")).toEqual("%C3%A4n_umlaut");- });- });-});diff --git a/frontend/src/metabase/visualizations/lib/formatting/value.unit.spec.tsx b/frontend/src/metabase/visualizations/lib/formatting/value.unit.spec.tsxdeleted file mode 100644index d736c3a59f9..00000000000--- a/frontend/src/metabase/visualizations/lib/formatting/value.unit.spec.tsx+++ /dev/null@@ -1,540 +0,0 @@-import type { ReactElement } from "react";-import { isElementOfType } from "react-dom/test-utils";--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", () => {- const setup = (value: any, overrides: Partial<ColumnSettings> = {}) => {- mockSettings();- const column = createMockColumn({- base_type: "type/Float",- });- const options: ColumnSettings = {- view_as: "auto",- column: column,- type: "cell",- jsx: true,- rich: true,- clicked: {- value: value,- column: column,- origin: {- rowIndex: 0,- row: [value],- cols: [column],- },- data: [- {- value: value,- col: column,- },- ],- },- ...overrides,- };- render(<>{formatValue(value, options)}</>);- };-- describe("link", () => {- it("should not apply prefix or suffix more than once for links with no link_text", () => {- setup(23.12, {- view_as: "link",- prefix: "foo ",- suffix: " bar",- link_url: "http://google.ca",- });- expect(- screen.getByText((content) => content.startsWith("foo")),- ).toBeInTheDocument();- expect(- screen.getByText((content) => content.endsWith("bar")),- ).toBeInTheDocument();- expect(screen.getByText("23.12")).toBeInTheDocument();- });-- it("should not apply prefix or suffix to null values", () => {- setup(null, {- prefix: "foo ",- suffix: " bar",- });-- const anyContent = screen.queryByText(/./);- expect(anyContent).not.toBeInTheDocument();- });-- it("should trim values to specified decimals", () => {- setup(23.123459, {- decimals: 5,- number_style: "decimal",- number_separators: ".",- });- expect(screen.getByText("23.12346")).toBeInTheDocument();- });-- it("should preserve number separator formatting when displayed as a link with no URL set", () => {- setup(100000.0, {- view_as: "link",- number_style: "decimal",- number_separators: ".,",- });- expect(screen.getByText("100,000")).toBeInTheDocument();- });-- it("should preserve number separator formatting when displayed as a link with a custom URL", () => {- setup(100000.0, {- view_as: "link",- number_style: "decimal",- number_separators: ".,",- link_url: "http://example.com",- });- expect(screen.getByText("100,000")).toBeInTheDocument();- });- });-- describe("remapped column", () => {- it("should apply formatting settings", () => {- const column = createMockColumn({- base_type: "type/Float",- remapped_to_column: createMockColumn({- base_type: "type/Text",- }),- remapping: new Map([- [1, "One"],- [2, "2"],- [3, "Three"],- ]),- });- setup(1, { column, scale: 100 });- expect(screen.getByText("One")).toBeInTheDocument();-- setup(2, { column, scale: 100 });- expect(screen.getByText("200")).toBeInTheDocument();- });-- it("should correctly parse string with initial digit", () => {- const column = createMockColumn({- base_type: "type/Float",- remapped_to_column: createMockColumn({- base_type: "type/Text",- }),- remapping: new Map([- [1, "1j"],- [2, "2"],- [3, "Three"],- ]),- });- setup(1, { column, scale: 100 });- expect(screen.getByText("1j")).toBeInTheDocument();-- setup(2, { column, scale: 100 });- expect(screen.getByText("200")).toBeInTheDocument();- });-- it("should correctly parse string with big integer", () => {- const column = createMockColumn({- base_type: "type/Float",- remapped_to_column: createMockColumn({- base_type: "type/Text",- }),- remapping: new Map([- [1, "4000000000000000000"], // bigger than 9,007,199,254,740,991 to trigger BigInt branch- [2, "2"],- [3, "Three"],- ]),- });- setup(1, { column, scale: 100 });- expect(- screen.getByText("400,000,000,000,000,000,000"),- ).toBeInTheDocument();-- setup(2, { column, scale: 100 });- expect(screen.getByText("200")).toBeInTheDocument();- });- });-- describe("collapseNewlines", () => {- it("should collapse newlines in plain text when collapseNewlines is true", () => {- const result = formatValue("Line 1\nLine 2\nLine 3", {- collapseNewlines: true,- jsx: false,- });- expect(result).toBe("Line 1 Line 2 Line 3");- });-- it("should preserve newlines when collapseNewlines is false", () => {- const result = formatValue("Line 1\nLine 2\nLine 3", {- collapseNewlines: false,- jsx: false,- });- expect(result).toBe("Line 1\nLine 2\nLine 3");- });-- it("should preserve newlines when collapseNewlines is not specified", () => {- const result = formatValue("Line 1\nLine 2\nLine 3", {- jsx: false,- });- expect(result).toBe("Line 1\nLine 2\nLine 3");- });-- it("should collapse newlines in jsx link display text", () => {- setup("http://example.com", {- collapseNewlines: true,- jsx: true,- rich: true,- view_as: "link",- link_text: "Display\nText\nWith\nNewlines",- clicked: { value: "http://example.com" },- });- expect(screen.getByRole("link")).toHaveTextContent(- "Display Text With Newlines",- );- });-- it("should collapse newlines in JSX email link display text", () => {- const column = createMockColumn({- base_type: "type/Text",- semantic_type: "type/Email",- });- setup("[email protected]", {- collapseNewlines: true,- jsx: true,- rich: true,- column,- link_text: "Contact\nUser",- clicked: { value: "[email protected]" },- });- expect(screen.getByRole("link")).toHaveTextContent("Contact User");- });-- it("should collapse newlines with prefix and suffix", () => {- setup("Value\nwith\nnewlines", {- collapseNewlines: true,- prefix: "Prefix:\n ",- suffix: " \n:Suffix",- jsx: true,- });- expect(- screen.getByText((content) =>- content.includes("Prefix: Value with newlines :Suffix"),- ),- ).toBeInTheDocument();- });-- it("should handle null values with collapseNewlines", () => {- const result = formatValue(null, {- collapseNewlines: true,- jsx: false,- });- expect(result).toBe(null);- });-- it("should handle numbers with collapseNewlines", () => {- const result = formatValue(123.45, {- collapseNewlines: true,- jsx: false,- column: createMockColumn({ base_type: "type/Float" }),- });- expect(result).toBe("123.45");- });-- it("should collapse newlines in remapped values", () => {- const column = createMockColumn({- base_type: "type/Integer",- remapping: new Map([[1, "Value\nwith\nnewlines"]]),- });- setup(1, {- column,- collapseNewlines: true,- jsx: true,- });- expect(screen.getByText("Value with newlines")).toBeInTheDocument();- });-- it("should collapse multiple consecutive newlines", () => {- const result = formatValue("Line 1\n\n\nLine 2", {- collapseNewlines: true,- jsx: false,- });- expect(result).toBe("Line 1 Line 2");- });-- it("should collapse Windows CRLF newlines", () => {- const result = formatValue("Line 1\r\nLine 2\r\nLine 3", {- collapseNewlines: true,- jsx: false,- });- expect(result).toBe("Line 1 Line 2 Line 3");- });-- it("should collapse old Mac CR newlines", () => {- const result = formatValue("Line 1\rLine 2\rLine 3", {- collapseNewlines: true,- jsx: false,- });- expect(result).toBe("Line 1 Line 2 Line 3");- });-- it("should collapse mixed newline types", () => {- const result = formatValue("Line 1\nLine 2\r\nLine 3\rLine 4", {- collapseNewlines: true,- jsx: false,- });- expect(result).toBe("Line 1 Line 2 Line 3 Line 4");- });-- it("should collapse Unicode line separators", () => {- const result = formatValue("Line 1\u2028Line 2\u2029Line 3", {- collapseNewlines: true,- jsx: false,- });- expect(result).toBe("Line 1 Line 2 Line 3");- });-- it("should collapse newlines in click behavior link text", () => {- setup("Text\nwith\nnewlines", {- collapseNewlines: true,- jsx: true,- rich: true,- click_behavior: {- type: "link",- linkType: "url",- linkTemplate: "http://example.com",- },- });- expect(screen.getByTestId("link-formatted-text")).toHaveTextContent(- "Text with newlines",- );- });- });-- it("should return null on nullish values by default", () => {- expect(formatValue(null)).toEqual(null);- expect(formatValue(undefined)).toEqual(null);- });-- it("should format null as (empty) when stringifyNull option is true", () => {- expect(formatValue(null, { stringifyNull: true })).toEqual("(empty)");- expect(formatValue(undefined, { stringifyNull: true })).toEqual("(empty)");- });-- it("should format numbers with null column", () => {- expect(formatValue(12345)).toEqual("12345");- });-- it("should format numbers with commas", () => {- expect(- formatValue(12345, {- column: { base_type: TYPE.Number, semantic_type: TYPE.Number },- }),- ).toEqual("12,345");- });-- it("should format big integers", () => {- const options = {- column: { base_type: TYPE.Number, semantic_type: TYPE.Number },- };-- expect(formatValue(9223372036854775807n, options)).toEqual(- "9,223,372,036,854,775,807",- );- expect(formatValue("9223372036854775807", options)).toEqual(- "9,223,372,036,854,775,807",- );- });-- it("should format zip codes without commas", () => {- expect(- formatValue(12345, {- column: { base_type: TYPE.Number, semantic_type: TYPE.ZipCode },- }),- ).toEqual("12345");- });-- it("should format latitude and longitude columns correctly", () => {- expect(- formatValue(37.7749, {- column: { base_type: TYPE.Number, semantic_type: TYPE.Latitude },- }),- ).toEqual("37.77490000° N");- expect(- formatValue(-122.4194, {- column: { base_type: TYPE.Number, semantic_type: TYPE.Longitude },- }),- ).toEqual("122.41940000° W");- });-- it("should return the component for external links in jsx + rich mode", () => {- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatValue("http://metabase.com/", {- jsx: true,- rich: true,- }) as ReactElement,- ExternalLink,- ),- ).toEqual(true);- });-- it("should return a component for internal links in jsx + rich mode", () => {- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatValue(SITE_URL, { jsx: true, rich: true }) as ReactElement,- Link,- ),- ).toBe(true);- });-- it("should return a component for relative links in jsx + rich mode", () => {- const column = createMockColumn({- name: "column_name",- base_type: "type/Text",- effective_type: "type/Text",- semantic_type: "type/URL",- });- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatValue("/question/12", {- jsx: true,- rich: true,- view_as: "link",- link_url: "{{column_name}}",- clicked: {- value: "/question/12",- column: column,- data: [{ value: "question/12", col: column }],- },- }) as ReactElement,- Link,- ),- ).toEqual(true);- });-- it("should not return an ExternalLink for links in jsx + rich mode if there's click behavior", () => {- // Unjustified type cast. FIXME- const formatted = formatValue("http://metabase.com/", {- jsx: true,- rich: true,- click_behavior: {- linkTemplate: "foo",- linkTextTemplate: "foo",- linkType: "url",- type: "link",- },- clicked: {},- }) as ReactElement;- // it's not actually a link- expect(isElementOfType(formatted, ExternalLink)).toEqual(false);- // expect the text to be in a div (which has link formatting) rather than ExternalLink- expect(formatted.props["data-testid"]).toEqual("link-formatted-text");- });-- it("should render image", () => {- // Unjustified type cast. FIXME- const formatted = formatValue("http://metabase.com/logo.png", {- jsx: true,- rich: true,- view_as: "image",- column: { semantic_type: "type/ImageURL" },- }) as ReactElement;- expect(formatted.type).toEqual("img");- expect(formatted.props.src).toEqual("http://metabase.com/logo.png");- });-- it("should render image with a click behavior in jsx + rich mode (metabase#17161)", () => {- // Unjustified type cast. FIXME- const formatted = formatValue("http://metabase.com/logo.png", {- jsx: true,- rich: true,- view_as: "image",- click_behavior: {- linkTemplate: "foo",- linkType: "url",- type: "link",- },- clicked: {},- }) as ReactElement;- expect(formatted.type).toEqual("img");- expect(formatted.props.src).toEqual("http://metabase.com/logo.png");- });-- it("should return a component for email addresses in jsx + rich mode", () => {- expect(- isElementOfType(- // Unjustified type cast. FIXME- formatValue("[email protected]", {- jsx: true,- rich: true,- }) as ReactElement,- ExternalLink,- ),- ).toEqual(true);- });-- it("should not add mailto prefix if there's a different semantic type", () => {- expect(- formatValue("[email protected]", {- jsx: true,- rich: true,- column: { semantic_type: "type/PK" },- }),- ).toEqual("[email protected]");- });-- it("should display hour-of-day with 12 hour clock", () => {- expect(- formatValue(24, {- date_style: null,- time_enabled: "minutes",- time_style: "h:mm A",- column: {- base_type: "type/DateTime",- unit: "hour-of-day",- },- }),- ).toEqual("12:00 AM");- });-- it("should display hour-of-day with 24 hour clock", () => {- expect(- formatValue(24, {- date_style: null,- time_enabled: "minutes",- time_style: "HH:mm",- column: {- base_type: "type/DateTime",- unit: "hour-of-day",- },- }),- ).toEqual("00:00");- });-- it("should not include time for type/Date type (metabase#7494)", () => {- expect(- formatValue("2019-07-07T00:00:00.000Z", {- date_style: "M/D/YYYY",- time_enabled: "minutes",- time_style: "HH:mm",- column: {- base_type: "type/Date",- unit: "hour-of-day",- },- }),- ).toEqual("7/7/2019");- });-});diff --git a/frontend/src/metabase/visualizations/lib/iframe.ts b/frontend/src/metabase/visualizations/lib/iframe.tsindex 2c5de9df211..aa02fa511ea 100644--- a/frontend/src/metabase/visualizations/lib/iframe.ts+++ b/frontend/src/metabase/visualizations/lib/iframe.ts@@ -1,4 +1,4 @@-import { isSafeUrl } from "metabase/visualizations/lib/formatting/link";+import { isSafeUrl } from "metabase/value-formatting";/*** Reconstructs a URL from its parts while preserving parameter placeholders (e.g. {{param}}).diff --git a/frontend/src/metabase/visualizations/lib/formatting/ui.tsx b/frontend/src/metabase/visualizations/lib/register-jsx-formatting.tsxsimilarity index 98%rename from frontend/src/metabase/visualizations/lib/formatting/ui.tsxrename to frontend/src/metabase/visualizations/lib/register-jsx-formatting.tsxindex df676d631ce..94d8b21a7e1 100644--- a/frontend/src/metabase/visualizations/lib/formatting/ui.tsx+++ b/frontend/src/metabase/visualizations/lib/register-jsx-formatting.tsx@@ -9,13 +9,12 @@ 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 {type MarkdownTemplateValues,registerJsxEmailRenderer,registerJsxLinkRenderer,registerJsxMarkdownRenderer,-} from "./registry";+} from "metabase/value-formatting";function renderJsxLink(url: string, text: ReactNode): ReactElement {const className = cx(CS.link, CS.linkWrappable);diff --git a/frontend/src/metabase/visualizations/lib/register-jsx-formatting.unit.spec.tsx b/frontend/src/metabase/visualizations/lib/register-jsx-formatting.unit.spec.tsxnew file mode 100644index 00000000000..bf02616a594--- /dev/null+++ b/frontend/src/metabase/visualizations/lib/register-jsx-formatting.unit.spec.tsx@@ -0,0 +1,882 @@+import type { ReactElement } from "react";+import { isElementOfType } from "react-dom/test-utils";++import { setupSdkPlugins } from "__support__/enterprise";+import { mockSettings } from "__support__/settings";+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 { Link } from "metabase/common/components/Link";+import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";+import { formatValue } from "metabase/value-formatting";+import { TYPE } from "metabase-lib/v1/types/constants";+import type { ColumnSettings } from "metabase-types/api";+import {+ createMockColumn,+ createMockTokenFeatures,+} from "metabase-types/api/mocks";++import { registerJsxFormatting } from "./register-jsx-formatting";++// These are integration tests for the JSX renderers this module registers into+// value-formatting. The pure engine behaviour (string outputs, non-jsx paths)+// is tested in isolation in the value-formatting module's own specs; the tests+// here need the registered renderer to produce real ExternalLink/Link output.+registerJsxFormatting();++describe("registered JSX email formatting", () => {+ describe("email link generation", () => {+ it("should create an ExternalLink for valid emails in jsx + rich mode", () => {+ const result = formatValue("[email protected]", {+ jsx: true,+ rich: true,+ });+ // Unjustified type cast. FIXME+ expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);++ // Unjustified type cast. FIXME+ render(result as ReactElement);++ expect(screen.getByRole("link")).toHaveAttribute(+ "href",+ "mailto:[email protected]",+ );+ expect(screen.getByRole("link")).toHaveTextContent("[email protected]");+ });++ it.each([+ "[email protected]",+ "[email protected]",+ "[email protected]",+ "[email protected]",+ ])("should handle complex valid email address: %s", (email) => {+ const result = formatValue(email, { jsx: true, rich: true });+ // Unjustified type cast. FIXME+ expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);++ // Unjustified type cast. FIXME+ render(result as ReactElement);++ expect(screen.getByRole("link")).toHaveAttribute(+ "href",+ `mailto:${email}`,+ );+ expect(screen.getByRole("link")).toHaveTextContent(email);+ });+ });++ describe("invalid email handling", () => {+ it("should return string for invalid email addresses", () => {+ const invalidEmails = [+ "not-an-email",+ "@example.com",+ "user@",+ "user [email protected]",+ "[email protected]",+ "",+ ];++ invalidEmails.forEach((email) => {+ const result = formatValue(email, { jsx: true, rich: true });+ expect(result).toBe(email);+ });+ });++ it("should handle very long email addresses that exceed regex limits", () => {+ // Create an email that's too long (over 254 characters)+ const longEmail = `${"a".repeat(250)}@example.com`;+ const result = formatValue(longEmail, { jsx: true, rich: true });+ expect(result).toBe(longEmail);+ });+ });++ describe("link text handling", () => {+ it("should use custom link_text when provided with clicked data", () => {+ const column = createMockColumn({ name: "email" });+ const clicked = {+ value: "[email protected]",+ column,+ data: [{ value: "[email protected]", col: column }],+ };++ const result = formatValue("[email protected]", {+ jsx: true,+ rich: true,+ link_text: "Custom Label",+ clicked,+ });++ // Unjustified type cast. FIXME+ expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);++ // Unjustified type cast. FIXME+ render(result as ReactElement);++ expect(screen.getByRole("link")).toHaveAttribute(+ "href",+ "mailto:[email protected]",+ );+ expect(screen.getByRole("link")).toHaveTextContent("Custom Label");+ });+ });++ describe("newline collapsing", () => {+ it("should collapse newlines in email text when collapseNewlines is true", () => {+ const emailWithNewlines = "[email protected]\n\rextra text";+ const result = formatValue(emailWithNewlines, {+ jsx: true,+ rich: true,+ collapseNewlines: true,+ });++ // Unjustified type cast. FIXME+ expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(false);+ expect(result).toBe("[email protected] extra text");+ });++ it("should collapse newlines in custom link text when collapseNewlines is true", () => {+ const column = createMockColumn({ name: "email" });+ const clicked = {+ value: "[email protected]",+ column,+ data: [{ value: "[email protected]", col: column }],+ };++ const result = formatValue("[email protected]", {+ jsx: true,+ rich: true,+ link_text: "Custom\nLabel",+ clicked,+ collapseNewlines: true,+ });++ // Unjustified type cast. FIXME+ expect(isElementOfType(result as JSX.Element, ExternalLink)).toBe(true);++ // Unjustified type cast. FIXME+ render(result as ReactElement);++ expect(screen.getByRole("link")).toHaveTextContent("Custom Label");+ });+ });++ describe("edge cases", () => {+ it("should handle empty string", () => {+ const result = formatValue("", { jsx: true, rich: true });+ expect(result).toBe("");+ });+ });+});++const SITE_URL = "http://localhost:3000";++describe("registered JSX url formatting", () => {+ beforeAll(() => {+ mockSettings({ "site-url": SITE_URL });+ });++ afterEach(() => {+ ensureMetabaseProviderPropsStore().cleanup();+ jest.restoreAllMocks();+ });++ it("calls handleLinkSdkPlugin and prevents default in SDK", async () => {+ mockSettings({+ "token-features": createMockTokenFeatures({ embedding_sdk: true }),+ });+ setupSdkPlugins();+ await mockIsEmbeddingSdk(true);++ const url = "https://example.com/dashboard/1";+ const handleLink = jest.fn().mockReturnValue({ handled: true });++ ensureMetabaseProviderPropsStore().setProps({+ pluginsConfig: { handleLink },+ });++ // Unjustified type cast. FIXME+ const node = formatValue(url, {+ jsx: true,+ rich: true,+ view_as: "link",+ }) as ReactElement;+ render(node);++ const link = screen.getByRole("link");+ // Manually creating the event instead of using fireEvent.click because we need to inspect+ // the defaultPrevented property of the event.+ const event = new MouseEvent("click", { bubbles: true, cancelable: true });+ link.dispatchEvent(event);++ expect(handleLink).toHaveBeenCalledWith(url);+ expect(event.defaultPrevented).toBe(true);+ });++ it("does not call handleLinkSdkPlugin in core app", async () => {+ await mockIsEmbeddingSdk(false);++ const url = "https://example.com/dashboard/2";+ const handleLink = jest.fn();++ ensureMetabaseProviderPropsStore().setProps({+ pluginsConfig: { handleLink },+ });++ // Unjustified type cast. FIXME+ const node = formatValue(url, {+ jsx: true,+ rich: true,+ view_as: "link",+ }) as ReactElement;+ render(node);++ const link = screen.getByRole("link");+ // Manually creating the event instead of using fireEvent.click because we need to inspect+ // the defaultPrevented property of the event.+ const event = new MouseEvent("click", { bubbles: true, cancelable: true });+ link.dispatchEvent(event);++ expect(handleLink).not.toHaveBeenCalled();+ expect(event.defaultPrevented).toBe(false);+ });++ it("should return a component for http:, https:, and mailto: links in jsx mode", () => {+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("http://metabase.com/", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ExternalLink,+ ),+ ).toEqual(true);+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("https://metabase.com/", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ExternalLink,+ ),+ ).toEqual(true);+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("mailto:[email protected]", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ExternalLink,+ ),+ ).toEqual(true);+ });++ it("should return a component for custom protocols if the column type is URL", () => {+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("myproto:some-custom-thing", {+ jsx: true,+ rich: true,+ column: { semantic_type: TYPE.URL },+ }) as ReactElement,+ ExternalLink,+ ),+ ).toEqual(true);+ });++ it("should not return a component for bad urls if the column type is URL", () => {+ expect(+ // Unjustified type cast. FIXME+ formatValue("invalid-blah-blah-blah", {+ jsx: true,+ rich: true,+ column: { semantic_type: TYPE.URL },+ }) as ReactElement,+ ).toEqual("invalid-blah-blah-blah");+ });++ it("should not return a component for custom protocols if the column type isn't URL", () => {+ expect(+ // Unjustified type cast. FIXME+ formatValue("myproto:some-custom-thing", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ).toEqual("myproto:some-custom-thing");+ });++ it("should not return a link component for unrecognized links in jsx mode", () => {+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("metabase.com", { jsx: true, rich: true }) as ReactElement,+ ExternalLink,+ ),+ ).toEqual(false);+ });++ it("should return a string for javascript:, data:, and other links in jsx mode", () => {+ expect(+ // Unjustified type cast. FIXME+ formatValue("javascript:alert('pwnd')", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ).toEqual("javascript:alert('pwnd')");+ expect(+ // Unjustified type cast. FIXME+ formatValue("data:text/plain;charset=utf-8,hello%20world", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ).toEqual("data:text/plain;charset=utf-8,hello%20world");+ });++ describe("when view_as = link", () => {+ it("should return link component for type/URL and view_as = link", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("http://whatever", {+ jsx: true,+ rich: true,+ column: { semantic_type: TYPE.URL },+ view_as: "link",+ }) as ReactElement;+ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);+ });++ it("should return link component using link_url and link_text when specified", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("http://not.metabase.com", {+ jsx: true,+ rich: true,+ link_text: "metabase link",+ link_url: "http://metabase.com",+ view_as: "link",+ clicked: {},+ }) as ReactElement;++ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);+ expect(formatted.props.children).toEqual("metabase link");+ expect(formatted.props.href).toEqual("http://metabase.com");+ });++ it("should return link component using link_text and the value as url when link_url is empty", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("http://metabase.com", {+ jsx: true,+ rich: true,+ link_text: "metabase link",+ link_url: "",+ view_as: "link",+ clicked: {},+ }) as ReactElement;++ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);+ expect(formatted.props.children).toEqual("metabase link");+ expect(formatted.props.href).toEqual("http://metabase.com");+ });++ it("should return link component using link_url and the value as text when link_text is empty", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("metabase link", {+ jsx: true,+ rich: true,+ link_text: "",+ link_url: "http://metabase.com",+ view_as: "link",+ clicked: {},+ }) as ReactElement;++ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);+ expect(formatted.props.children).toEqual("metabase link");+ expect(formatted.props.href).toEqual("http://metabase.com");+ });++ it("should apply the column's number formatting settings to the link text when link_text references the current column (metabase#56876)", () => {+ const column = createMockColumn({+ name: "hubspot_id",+ base_type: TYPE.Integer,+ });+ const value = 35660212261;+ // Unjustified type cast. FIXME+ const formatted = formatValue(value, {+ jsx: true,+ rich: true,+ column,+ view_as: "link",+ link_text: "{{hubspot_id}}",+ link_url: "http://example.com/{{hubspot_id}}",+ number_style: "decimal",+ // No thousand separator: the user has chosen to render the value+ // without group separators (e.g. for ID-like numbers).+ number_separators: ".",+ clicked: {+ value,+ column,+ data: [{ value, col: column }],+ settings: {+ column_settings: {+ '["name","hubspot_id"]': {+ number_style: "decimal",+ number_separators: ".",+ },+ },+ },+ },+ }) as ReactElement;++ expect(isElementOfType(formatted, ExternalLink)).toBe(true);+ expect(formatted.props.children).toBe("35660212261");+ });++ it("should apply the column's separator-style setting to a link text referencing the current column", () => {+ const column = createMockColumn({+ name: "amount",+ base_type: TYPE.Float,+ });+ const value = 1234567.89;+ // Unjustified type cast. FIXME+ const formatted = formatValue(value, {+ jsx: true,+ rich: true,+ column,+ view_as: "link",+ link_text: "{{amount}}",+ link_url: "http://example.com",+ number_style: "decimal",+ // European-style separators: "." for thousands, "," for decimals.+ number_separators: ",.",+ clicked: {+ value,+ column,+ data: [{ value, col: column }],+ settings: {+ column_settings: {+ '["name","amount"]': {+ number_style: "decimal",+ number_separators: ",.",+ },+ },+ },+ },+ }) as ReactElement;++ expect(isElementOfType(formatted, ExternalLink)).toBe(true);+ expect(formatted.props.children).toBe("1.234.567,89");+ });++ it("should apply a different column's formatting when link_text references that other column", () => {+ const linkColumn = createMockColumn({+ name: "name",+ base_type: TYPE.Text,+ });+ const amountColumn = createMockColumn({+ name: "amount",+ base_type: TYPE.Float,+ });+ const linkValue = "Widget";+ const amountValue = 1234567.89;+ // Unjustified type cast. FIXME+ const formatted = formatValue(linkValue, {+ jsx: true,+ rich: true,+ column: linkColumn,+ view_as: "link",+ link_text: "Buy for {{amount}}",+ link_url: "http://example.com",+ clicked: {+ value: linkValue,+ column: linkColumn,+ data: [+ { value: linkValue, col: linkColumn },+ { value: amountValue, col: amountColumn },+ ],+ settings: {+ column_settings: {+ '["name","amount"]': {+ number_style: "currency",+ currency: "USD",+ currency_style: "symbol",+ },+ },+ },+ },+ }) as ReactElement;++ expect(isElementOfType(formatted, ExternalLink)).toBe(true);+ expect(formatted.props.children).toBe("Buy for $1,234,567.89");+ });++ it("should not return an ExternalLink in jsx + rich mode if there's click behavior", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("http://metabase.com/", {+ jsx: true,+ rich: true,+ click_behavior: {+ linkTemplate: "foo",+ linkTextTemplate: "bar",+ linkType: "url",+ type: "link",+ },+ link_text: "metabase link",+ link_url: "http://metabase.com",+ view_as: "link",+ clicked: {},+ }) as ReactElement;++ // it is not a link set on the question level+ expect(isElementOfType(formatted, ExternalLink)).toEqual(false);+ // expect the text to be in a div (which has link formatting) rather than ExternalLink+ expect(formatted.props["data-testid"]).toEqual("link-formatted-text");+ });+ });++ it("should not crash if column is null", () => {+ expect(+ formatValue("foobar", {+ jsx: true,+ rich: true,+ column: null,+ }),+ ).toEqual("foobar");+ });+});++describe("registered JSX value formatting", () => {+ const setup = (value: any, overrides: Partial<ColumnSettings> = {}) => {+ mockSettings();+ const column = createMockColumn({+ base_type: "type/Float",+ });+ const options: ColumnSettings = {+ view_as: "auto",+ column: column,+ type: "cell",+ jsx: true,+ rich: true,+ clicked: {+ value: value,+ column: column,+ origin: {+ rowIndex: 0,+ row: [value],+ cols: [column],+ },+ data: [+ {+ value: value,+ col: column,+ },+ ],+ },+ ...overrides,+ };+ render(<>{formatValue(value, options)}</>);+ };++ describe("link", () => {+ it("should not apply prefix or suffix more than once for links with no link_text", () => {+ setup(23.12, {+ view_as: "link",+ prefix: "foo ",+ suffix: " bar",+ link_url: "http://google.ca",+ });+ expect(+ screen.getByText((content) => content.startsWith("foo")),+ ).toBeInTheDocument();+ expect(+ screen.getByText((content) => content.endsWith("bar")),+ ).toBeInTheDocument();+ expect(screen.getByText("23.12")).toBeInTheDocument();+ });++ it("should not apply prefix or suffix to null values", () => {+ setup(null, {+ prefix: "foo ",+ suffix: " bar",+ });++ const anyContent = screen.queryByText(/./);+ expect(anyContent).not.toBeInTheDocument();+ });++ it("should trim values to specified decimals", () => {+ setup(23.123459, {+ decimals: 5,+ number_style: "decimal",+ number_separators: ".",+ });+ expect(screen.getByText("23.12346")).toBeInTheDocument();+ });++ it("should preserve number separator formatting when displayed as a link with no URL set", () => {+ setup(100000.0, {+ view_as: "link",+ number_style: "decimal",+ number_separators: ".,",+ });+ expect(screen.getByText("100,000")).toBeInTheDocument();+ });++ it("should preserve number separator formatting when displayed as a link with a custom URL", () => {+ setup(100000.0, {+ view_as: "link",+ number_style: "decimal",+ number_separators: ".,",+ link_url: "http://example.com",+ });+ expect(screen.getByText("100,000")).toBeInTheDocument();+ });+ });++ describe("remapped column", () => {+ it("should apply formatting settings", () => {+ const column = createMockColumn({+ base_type: "type/Float",+ remapped_to_column: createMockColumn({+ base_type: "type/Text",+ }),+ remapping: new Map([+ [1, "One"],+ [2, "2"],+ [3, "Three"],+ ]),+ });+ setup(1, { column, scale: 100 });+ expect(screen.getByText("One")).toBeInTheDocument();++ setup(2, { column, scale: 100 });+ expect(screen.getByText("200")).toBeInTheDocument();+ });++ it("should correctly parse string with initial digit", () => {+ const column = createMockColumn({+ base_type: "type/Float",+ remapped_to_column: createMockColumn({+ base_type: "type/Text",+ }),+ remapping: new Map([+ [1, "1j"],+ [2, "2"],+ [3, "Three"],+ ]),+ });+ setup(1, { column, scale: 100 });+ expect(screen.getByText("1j")).toBeInTheDocument();++ setup(2, { column, scale: 100 });+ expect(screen.getByText("200")).toBeInTheDocument();+ });++ it("should correctly parse string with big integer", () => {+ const column = createMockColumn({+ base_type: "type/Float",+ remapped_to_column: createMockColumn({+ base_type: "type/Text",+ }),+ remapping: new Map([+ [1, "4000000000000000000"], // bigger than 9,007,199,254,740,991 to trigger BigInt branch+ [2, "2"],+ [3, "Three"],+ ]),+ });+ setup(1, { column, scale: 100 });+ expect(+ screen.getByText("400,000,000,000,000,000,000"),+ ).toBeInTheDocument();++ setup(2, { column, scale: 100 });+ expect(screen.getByText("200")).toBeInTheDocument();+ });+ });++ describe("collapseNewlines", () => {+ it("should collapse newlines in jsx link display text", () => {+ setup("http://example.com", {+ collapseNewlines: true,+ jsx: true,+ rich: true,+ view_as: "link",+ link_text: "Display\nText\nWith\nNewlines",+ clicked: { value: "http://example.com" },+ });+ expect(screen.getByRole("link")).toHaveTextContent(+ "Display Text With Newlines",+ );+ });++ it("should collapse newlines in JSX email link display text", () => {+ const column = createMockColumn({+ base_type: "type/Text",+ semantic_type: "type/Email",+ });+ setup("[email protected]", {+ collapseNewlines: true,+ jsx: true,+ rich: true,+ column,+ link_text: "Contact\nUser",+ clicked: { value: "[email protected]" },+ });+ expect(screen.getByRole("link")).toHaveTextContent("Contact User");+ });++ it("should collapse newlines with prefix and suffix", () => {+ setup("Value\nwith\nnewlines", {+ collapseNewlines: true,+ prefix: "Prefix:\n ",+ suffix: " \n:Suffix",+ jsx: true,+ });+ expect(+ screen.getByText((content) =>+ content.includes("Prefix: Value with newlines :Suffix"),+ ),+ ).toBeInTheDocument();+ });++ it("should collapse newlines in remapped values", () => {+ const column = createMockColumn({+ base_type: "type/Integer",+ remapping: new Map([[1, "Value\nwith\nnewlines"]]),+ });+ setup(1, {+ column,+ collapseNewlines: true,+ jsx: true,+ });+ expect(screen.getByText("Value with newlines")).toBeInTheDocument();+ });++ it("should collapse newlines in click behavior link text", () => {+ setup("Text\nwith\nnewlines", {+ collapseNewlines: true,+ jsx: true,+ rich: true,+ click_behavior: {+ type: "link",+ linkType: "url",+ linkTemplate: "http://example.com",+ },+ });+ expect(screen.getByTestId("link-formatted-text")).toHaveTextContent(+ "Text with newlines",+ );+ });+ });++ it("should return the component for external links in jsx + rich mode", () => {+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("http://metabase.com/", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ExternalLink,+ ),+ ).toEqual(true);+ });++ it("should return a component for internal links in jsx + rich mode", () => {+ mockSettings({ "site-url": SITE_URL });+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue(SITE_URL, { jsx: true, rich: true }) as ReactElement,+ Link,+ ),+ ).toBe(true);+ });++ it("should return a component for relative links in jsx + rich mode", () => {+ const column = createMockColumn({+ name: "column_name",+ base_type: "type/Text",+ effective_type: "type/Text",+ semantic_type: "type/URL",+ });+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("/question/12", {+ jsx: true,+ rich: true,+ view_as: "link",+ link_url: "{{column_name}}",+ clicked: {+ value: "/question/12",+ column: column,+ data: [{ value: "question/12", col: column }],+ },+ }) as ReactElement,+ Link,+ ),+ ).toEqual(true);+ });++ it("should not return an ExternalLink for links in jsx + rich mode if there's click behavior", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("http://metabase.com/", {+ jsx: true,+ rich: true,+ click_behavior: {+ linkTemplate: "foo",+ linkTextTemplate: "foo",+ linkType: "url",+ type: "link",+ },+ clicked: {},+ }) as ReactElement;+ // it's not actually a link+ expect(isElementOfType(formatted, ExternalLink)).toEqual(false);+ // expect the text to be in a div (which has link formatting) rather than ExternalLink+ expect(formatted.props["data-testid"]).toEqual("link-formatted-text");+ });++ it("should render image", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("http://metabase.com/logo.png", {+ jsx: true,+ rich: true,+ view_as: "image",+ column: { semantic_type: "type/ImageURL" },+ }) as ReactElement;+ expect(formatted.type).toEqual("img");+ expect(formatted.props.src).toEqual("http://metabase.com/logo.png");+ });++ it("should render image with a click behavior in jsx + rich mode (metabase#17161)", () => {+ // Unjustified type cast. FIXME+ const formatted = formatValue("http://metabase.com/logo.png", {+ jsx: true,+ rich: true,+ view_as: "image",+ click_behavior: {+ linkTemplate: "foo",+ linkType: "url",+ type: "link",+ },+ clicked: {},+ }) as ReactElement;+ expect(formatted.type).toEqual("img");+ expect(formatted.props.src).toEqual("http://metabase.com/logo.png");+ });++ it("should return a component for email addresses in jsx + rich mode", () => {+ expect(+ isElementOfType(+ // Unjustified type cast. FIXME+ formatValue("[email protected]", {+ jsx: true,+ rich: true,+ }) as ReactElement,+ ExternalLink,+ ),+ ).toEqual(true);+ });+});diff --git a/frontend/src/metabase/visualizations/lib/renderer_utils.ts b/frontend/src/metabase/visualizations/lib/renderer_utils.tsindex fac757362a8..fae16a25b6b 100644--- a/frontend/src/metabase/visualizations/lib/renderer_utils.ts+++ b/frontend/src/metabase/visualizations/lib/renderer_utils.ts@@ -2,7 +2,7 @@ import type { Dayjs } from "dayjs";import { getIn } from "icepick";import _ from "underscore";-import { formatNullable } from "metabase/utils/formatting/nullable";+import { formatNullable } from "metabase/utils/formatting";import { parseTimestamp } from "metabase/utils/time-dayjs";import { datasetContainsNoResults } from "metabase-lib/v1/queries/utils/dataset";import type {diff --git a/frontend/src/metabase/visualizations/lib/scalar_utils.tsx b/frontend/src/metabase/visualizations/lib/scalar_utils.tsxindex 43fd09f987d..78f97ee7285 100644--- a/frontend/src/metabase/visualizations/lib/scalar_utils.tsx+++ b/frontend/src/metabase/visualizations/lib/scalar_utils.tsx@@ -1,7 +1,7 @@import { ColorPill } from "metabase/common/components/ColorPill";import { Text } from "metabase/ui";import { color } from "metabase/ui/utils/colors";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type {ColumnSettings,RowValue,diff --git a/frontend/src/metabase/visualizations/lib/settings/column.ts b/frontend/src/metabase/visualizations/lib/settings/column.tsindex 90911a9ad03..f2af637de9d 100644--- a/frontend/src/metabase/visualizations/lib/settings/column.ts+++ b/frontend/src/metabase/visualizations/lib/settings/column.ts@@ -3,23 +3,21 @@ import _ from "underscore";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";import {- type TimeEnabled,currency,- displayNameForColumn,getCurrency,getCurrencyNarrowSymbol,getCurrencyStyleOptions,getCurrencySymbol,+ hasHour,numberFormatterForOptions,} from "metabase/utils/formatting";-import { hasHour } from "metabase/utils/formatting/datetime-utils";import MetabaseSettings from "metabase/utils/settings";-import { getVisualization, getVisualizationRaw } from "metabase/visualizations";import {+ displayNameForColumn,getDateFormatFromStyle,getDateStyleOptionsForUnit,getTimeStyleOptions,-} from "metabase/visualizations/lib/formatting";+} from "metabase/value-formatting";import { getDeduplicatedTableColumnSettings } from "metabase/visualizations/lib/settings/utils";import {getDefaultCurrency,@@ -53,9 +51,12 @@ import type {DatasetColumn,DatetimeUnit,Series,+ TimeEnabled,VisualizationSettings,} from "metabase-types/api";+import { getVisualization, getVisualizationRaw } from "../..";+import { nestedSettings } from "./nested";type GetColumnsFn = (diff --git a/frontend/src/metabase/visualizations/lib/tooltip.ts b/frontend/src/metabase/visualizations/lib/tooltip.tsindex 6f5b9222d46..8e23bf744d9 100644--- a/frontend/src/metabase/visualizations/lib/tooltip.ts+++ b/frontend/src/metabase/visualizations/lib/tooltip.ts@@ -1,5 +1,5 @@-import { formatNullable } from "metabase/utils/formatting/nullable";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatNullable } from "metabase/utils/formatting";+import { formatValue } from "metabase/value-formatting";import type { DatasetColumn, VisualizationSettings } from "metabase-types/api";import { getFormattingOptionsWithoutScaling } from "../echarts/cartesian/model/util";diff --git a/frontend/src/metabase/visualizations/register.ts b/frontend/src/metabase/visualizations/register.tsindex b9d1b889fd0..b52638404a5 100644--- a/frontend/src/metabase/visualizations/register.ts+++ b/frontend/src/metabase/visualizations/register.ts@@ -3,7 +3,6 @@ import {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";@@ -27,6 +26,7 @@ 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 { registerJsxFormatting } from "./lib/register-jsx-formatting";import { AreaChart } from "./visualizations/AreaChart";import { BarChart } from "./visualizations/BarChart";import { BoxPlot } from "./visualizations/BoxPlot";diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.ts b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.tsindex fa7377f1568..0d08770502d 100644--- a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.ts+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.ts@@ -3,7 +3,7 @@ import * as d3 from "d3";import { stack, stackOffsetDiverging, stackOffsetExpand } from "d3";import _ from "underscore";-import { formatNullable } from "metabase/utils/formatting/nullable";+import { formatNullable } from "metabase/utils/formatting";import type { SeriesInfo } from "metabase/visualizations/shared/types/data";import type { ContinuousScaleType } from "metabase/visualizations/shared/types/scale";diff --git a/frontend/src/metabase/visualizations/shared/utils/data.ts b/frontend/src/metabase/visualizations/shared/utils/data.tsindex 9203cdace8f..a0d2c24a338 100644--- a/frontend/src/metabase/visualizations/shared/utils/data.ts+++ b/frontend/src/metabase/visualizations/shared/utils/data.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { formatNullable } from "metabase/utils/formatting/nullable";+import { formatNullable } from "metabase/utils/formatting";import { getColumnScaling } from "metabase/visualizations/echarts/cartesian/model/util";import { sumMetric } from "metabase/visualizations/lib/dataset";import type {diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.tsindex 217cc624bc9..27830a7e6ea 100644--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts@@ -2,9 +2,8 @@ import { t } from "ttag";import _ from "underscore";import { isNative } from "metabase/common/utils/card";-import { formatPercent } from "metabase/static-viz/lib/numbers";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";-import { formatChangeWithSign } from "metabase/utils/formatting";+import { formatChangeWithSign, formatPercent } from "metabase/utils/formatting";import { getObjectKeys } from "metabase/utils/objects";import {getDaylightSavingsChangeTolerance,diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts b/frontend/src/metabase/visualizations/visualizations/Funnel/definition.tsindex 615608367ba..ec7034f0d1f 100644--- a/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts@@ -1,7 +1,7 @@import { t } from "ttag";import _ from "underscore";-import { formatNullable } from "metabase/utils/formatting/nullable";+import { formatNullable } from "metabase/utils/formatting";import {ChartSettingsError,MinRowsError,diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.ts b/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.tsindex 7b2989d1777..8dd2a63a1eb 100644--- a/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.ts+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.ts@@ -1,6 +1,6 @@import { isNotNull } from "metabase/utils/types";+import { formatValue } from "metabase/value-formatting";import type { TransformSeries } from "metabase/visualizations/components/TransformedVisualization";-import { formatValue } from "metabase/visualizations/lib/formatting";import type { RowValue } from "metabase-types/api";export const funnelToBarTransform: TransformSeries = (rawSeries, settings) => {diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsxindex 9f8ed0e2a0e..b58f8f999b4 100644--- a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx@@ -4,7 +4,7 @@ import * as d3 from "d3";import { useCallback, useEffect, useRef } from "react";import CS from "metabase/css/core/index.css";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import { segmentIsValid } from "metabase/visualizations/lib/utils";import type { VisualizationProps } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsx b/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsxindex 96f9f59f87b..6ab8c1bf949 100644--- a/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsx@@ -1,7 +1,7 @@import * as d3 from "d3";import type { MouseEvent } from "react";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type {ClickObject,ComputedVisualizationSettings,diff --git a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ColumnValue.tsx b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ColumnValue.tsxindex 28a73412b95..e726f5fbac0 100644--- a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ColumnValue.tsx+++ b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ColumnValue.tsx@@ -11,8 +11,8 @@ import {Text,} from "metabase/ui";import { formatNumber, getCurrencySymbol } from "metabase/utils/formatting";+import { formatValue } from "metabase/value-formatting";import { MiniBarCell } from "metabase/visualizations/components/TableInteractive/cells/MiniBarCell";-import { formatValue } from "metabase/visualizations/lib/formatting";import { getColumnExtent } from "metabase/visualizations/lib/utils";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import { TYPE } from "metabase-lib/v1/types/constants";diff --git a/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx b/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsxindex db460563b1b..8e0f6df78e3 100644--- a/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx+++ b/frontend/src/metabase/visualizations/visualizations/List/components/ListViz/ListViz.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { Box } from "metabase/ui";import { color } from "metabase/ui/utils/colors";-import { displayNameForColumn } from "metabase/utils/formatting";+import { displayNameForColumn } from "metabase/value-formatting";import ChartSettingLinkUrlInput from "metabase/visualizations/components/settings/ChartSettingLinkUrlInput";import { columnSettings } from "metabase/visualizations/lib/settings/column";import {diff --git a/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsx b/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsxindex a73d9632fe3..713168c43e6 100644--- a/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsx+++ b/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { displayNameForColumn } from "metabase/utils/formatting";+import { displayNameForColumn } from "metabase/value-formatting";import { ObjectDetail } from "metabase/visualizations/components/ObjectDetail";import {columnSettings,diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/PieChart/definition.tsindex ce682ce58cd..4e538df271b 100644--- a/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/definition.ts@@ -1,11 +1,11 @@import { t } from "ttag";import _ from "underscore";+import { formatValue } from "metabase/value-formatting";import {ChartSettingsError,MinRowsError,} from "metabase/visualizations/lib/errors";-import { formatValue } from "metabase/visualizations/lib/formatting";import { columnSettings } from "metabase/visualizations/lib/settings/column";import { nestedSettings } from "metabase/visualizations/lib/settings/nested";import { keyForSingleSeries } from "metabase/visualizations/lib/settings/series";diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.ts b/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.tsindex 0c50c1ccf39..6a4a8bc22e9 100644--- a/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.ts+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.ts@@ -2,7 +2,7 @@ import type { EChartsType } from "echarts/core";import { type MutableRefObject, useEffect, useMemo } from "react";import { t } from "ttag";-import { formatPercent } from "metabase/static-viz/lib/numbers";+import { formatPercent } from "metabase/utils/formatting";import { checkNotNull } from "metabase/utils/types";import type {EChartsTooltipModel,diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.tsindex 10ac4fde65b..b24546ea7f1 100644--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts@@ -2,7 +2,7 @@ import { getIn } from "icepick";import { t } from "ttag";import _ from "underscore";-import { displayNameForColumn } from "metabase/utils/formatting";+import { displayNameForColumn } from "metabase/value-formatting";import { ChartSettingIconRadio } from "metabase/visualizations/components/settings/ChartSettingIconRadio";import { ChartSettingsTableFormatting } from "metabase/visualizations/components/settings/ChartSettingsTableFormatting";import {diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsxindex ea3f0c78c19..d7c8eea7bca 100644--- a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import CS from "metabase/css/core/index.css";import { Flex, Icon } from "metabase/ui";import { checkNotNull } from "metabase/utils/types";-import { formatValue } from "metabase/visualizations/lib/formatting";+import { formatValue } from "metabase/value-formatting";import type { VisualizationProps } from "metabase/visualizations/types";import { PROGRESS_CHART_DEFINITION } from "./definition";diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.tsindex 378c2019283..274167a1784 100644--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts@@ -1,7 +1,7 @@import { getIn } from "icepick";import _ from "underscore";-import { formatNullable } from "metabase/utils/formatting/nullable";+import { formatNullable } from "metabase/utils/formatting";import { isNotNull } from "metabase/utils/types";import { sumMetric } from "metabase/visualizations/lib/dataset";import type {diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.tsindex 87e724dff37..11a2c5034c2 100644--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts@@ -2,8 +2,8 @@ import type { NumberLike, StringLike } from "@visx/scale";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";import { isEmpty } from "metabase/utils/validate";+import { formatValue } from "metabase/value-formatting";import { getFormattingOptionsWithoutScaling } from "metabase/visualizations/echarts/cartesian/model/util";-import { formatValue } from "metabase/visualizations/lib/formatting";import type { CartesianChartColumns } from "metabase/visualizations/lib/graph/columns";import { getStackOffset } from "metabase/visualizations/lib/settings/stacking";import type { BarData } from "metabase/visualizations/shared/components/RowChart/types";diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.tsindex c137dae0f4f..b1dc1d95895 100644--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.ts@@ -1,5 +1,5 @@+import { getDataFromClicked } from "metabase/value-formatting";import type { EChartsSeriesMouseEvent } from "metabase/visualizations/echarts/types";-import { getDataFromClicked } from "metabase/visualizations/lib/formatting/click-data";import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";import {createMockCard,diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsxindex f9273622704..b7be98ecc24 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx@@ -3,7 +3,7 @@ import innerText from "react-innertext";import DashboardS from "metabase/css/dashboard.module.css";import { Badge, Flex, Group, Icon, Stack, Tooltip } from "metabase/ui";import { measureTextWidth } from "metabase/utils/measure-text";-import { formatValue } from "metabase/visualizations/lib/formatting/value";+import { formatValue } from "metabase/value-formatting";import { SAVING_DOM_IMAGE_DISPLAY_NONE_CLASS } from "metabase/visualizations/lib/image-exports";import type { ColumnSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsxindex 9b4a8c1ef5d..2e81b9f9f5e 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsx@@ -1,5 +1,5 @@import { Flex } from "metabase/ui";-import { formatValue } from "metabase/visualizations/lib/formatting/value";+import { formatValue } from "metabase/value-formatting";import type { ColumnSettings } from "metabase-types/api";import { CHANGE_TYPE_OPTIONS, type ComparisonResult } from "../compute";diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.tsindex 62f354b36f9..f30595aae12 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts@@ -4,8 +4,10 @@ import { t } from "ttag";import type { ColorGetter } from "metabase/ui/colors/types";import { isNumber } from "metabase/utils/types";import { isEmpty } from "metabase/utils/validate";-import { formatValue } from "metabase/visualizations/lib/formatting";-import { formatDateTimeRangeWithUnit } from "metabase/visualizations/lib/formatting/date";+import {+ formatDateTimeRangeWithUnit,+ formatValue,+} from "metabase/value-formatting";import { computeChange } from "metabase/visualizations/lib/numeric";import { findPreviousNonEmptyRowIndex } from "metabase/visualizations/lib/trend-helpers";import { COMPARISON_TYPES } from "metabase/visualizations/visualizations/SmartScalar/constants";diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.tsindex dc386494112..1b599c37459 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts@@ -1,6 +1,6 @@import { color, colors } from "metabase/ui/colors";import { isNumber } from "metabase/utils/types";-import { formatValue } from "metabase/visualizations/lib/formatting/value";+import { formatValue } from "metabase/value-formatting";import { computeChange } from "metabase/visualizations/lib/numeric";import {CHANGE_ARROW_ICONS,diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.tsindex d65a4a0110e..5adb2eb36f9 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts@@ -2,7 +2,7 @@ import dayjs from "dayjs";import { t } from "ttag";import _ from "underscore";-import { formatNumber } from "metabase/utils/formatting/numbers";+import { formatNumber } from "metabase/utils/formatting";import { measureText } from "metabase/utils/measure-text";import { uuid } from "metabase/utils/uuid";import { isEmpty } from "metabase/utils/validate";diff --git a/frontend/src/metabase/visualizations/visualizations/Table/definition.ts b/frontend/src/metabase/visualizations/visualizations/Table/definition.tsindex 0bdc5878317..58150073abe 100644--- a/frontend/src/metabase/visualizations/visualizations/Table/definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/Table/definition.ts@@ -1,7 +1,7 @@import { t } from "ttag";import { isNative } from "metabase/common/utils/card";-import { displayNameForColumn } from "metabase/utils/formatting";+import { displayNameForColumn } from "metabase/value-formatting";import {trackTableFreezeColumnsEnabled,trackTableFreezeRowsEnabled,diff --git a/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.tsindex c7a8702c954..8c11103ce2f 100644--- a/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/TreemapChart/definition.ts@@ -1,8 +1,8 @@import { t } from "ttag";+import { formatValue } from "metabase/value-formatting";import { getTreemapChartColumns } from "metabase/visualizations/echarts/graph/treemap/model/data";import { ChartSettingsError } from "metabase/visualizations/lib/errors";-import { formatValue } from "metabase/visualizations/lib/formatting";import { columnSettings } from "metabase/visualizations/lib/settings/column";import { nestedSettings } from "metabase/visualizations/lib/settings/nested";import { keyForSingleSeries } from "metabase/visualizations/lib/settings/series";diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsxindex a5383e20243..9a6ce692b3b 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx@@ -8,7 +8,7 @@ import { t } from "ttag";import { Ellipsified } from "metabase/ui";import { ActionIcon, Flex, type FlexProps, Icon } from "metabase/ui";-import { displayNameForColumn } from "metabase/utils/formatting";+import { displayNameForColumn } from "metabase/value-formatting";import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";import type { DatasetColumn, IconName } from "metabase-types/api";diff --git a/src/metabase/pivot/core.cljc b/src/metabase/pivot/core.cljcindex b25ddc69eaa..022b3247ac8 100644--- a/src/metabase/pivot/core.cljc+++ b/src/metabase/pivot/core.cljc@@ -451,7 +451,7 @@row-tree)))))(defn display-name-for-col- "Translated from frontend/src/metabase/utils/formatting/column.ts"+ "Translated from frontend/src/metabase/value-formatting/column.ts"[column col-settings format-values?](or (if format-values?(or