Skip to content

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

Translate at call time, not at import time (#82147)

Romeo Van Snick90688e49a7cb
diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx
index 2a92cb7061c..f2eac45e602 100644
--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx
@@ -18,6 +18,7 @@ import CS from "metabase/css/core/index.css";
import { getUser } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { Box, Icon } from "metabase/ui";
+import { mergeLazily } from "metabase/utils/merge-lazily";
import type {
Collection,
CollectionId,
@@ -56,9 +57,9 @@ const getOurAnalyticsCollection = (
// A sentinel root node that buildCollectionTree special-cases by id; it isn't a
// real Collection, so we assert the type here rather than fabricate every field.
-const ALL_PERSONAL_COLLECTIONS_ROOT = {
- ...PERSONAL_COLLECTIONS,
-} as Collection;
+const ALL_PERSONAL_COLLECTIONS_ROOT = mergeLazily(
+ PERSONAL_COLLECTIONS,
+) as Collection;
export function SavedEntityPicker(props: SavedEntityPickerProps) {
const { data: collections } = useListCollectionsTreeQuery({
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.tsx
index b64a45922b5..10cc7570082 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/index.tsx
@@ -28,16 +28,18 @@ import { getImpersonations } from "./selectors";
import { getEditImpersonationUrl } from "./utils";
const IMPERSONATED_PERMISSION_OPTION = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Impersonated`,
+ get label() {
+ return t`Impersonated`;
+ },
value: DataPermissionValue.IMPERSONATED,
icon: "database",
iconColor: "warning",
} satisfies PermissionOption;
const BLOCK_PERMISSION_OPTION = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Blocked`,
+ get label() {
+ return t`Blocked`;
+ },
value: DataPermissionValue.BLOCKED,
icon: "close",
iconColor: "danger",
@@ -136,7 +138,9 @@ export function initializePlugin() {
PLUGIN_ADMIN_PERMISSIONS_DATABASE_ACTIONS[
DataPermissionValue.IMPERSONATED
].push({
- label: t`Edit Impersonated`,
+ get label() {
+ return t`Edit Impersonated`;
+ },
iconColor: "warning",
icon: "database",
onSelect: (entityId, groupId, view) => {
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/constants.ts b/enterprise/frontend/src/metabase-enterprise/application_permissions/constants.ts
index 2e7da292fb1..616d7d94de8 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/constants.ts
@@ -2,15 +2,17 @@ import { t } from "ttag";
export const APPLICATION_PERMISSIONS_OPTIONS = {
yes: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Yes`,
+ get label() {
+ return t`Yes`;
+ },
value: "yes",
icon: "check",
iconColor: "feedback-positive",
},
no: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`No`,
+ get label() {
+ return t`No`;
+ },
value: "no",
icon: "close",
iconColor: "feedback-negative",
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsx
index c360b05551a..b595db2e4ac 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SessionTimeoutSetting/SessionTimeoutSetting.tsx
@@ -14,7 +14,7 @@ const getUnits = () => [
{ value: "hours", label: t`hours` },
];
-const DEFAULT_VALUE = { amount: 30, unit: getUnits()[0].value };
+const DEFAULT_VALUE: TimeoutValue = { amount: 30, unit: "minutes" };
// This should mirror the BE validation of the session-timeout setting.
const validate = (value: TimeoutValue | null) => {
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/constants.ts b/enterprise/frontend/src/metabase-enterprise/caching/constants.ts
index 17486a7c959..60fb0132c89 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/caching/constants.ts
@@ -62,7 +62,7 @@ export const getEnterprisePerformanceTabMetadata = () => {
return [
metadata.find(({ key }) => key === "performance-databases"),
{
- name: t`Dashboard and question caching`,
+ getName: () => t`Dashboard and question caching`,
path: "/admin/performance/dashboards-and-questions",
key: "performance-dashboards-and-questions",
tabId: PerformanceTabId.DashboardsAndQuestions,
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModalFilters.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModalFilters.tsx
index 0cd1f7540ee..2d2b1de716d 100644
--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModalFilters.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModalFilters.tsx
@@ -2,7 +2,7 @@ import { c, t } from "ttag";
import { Flex, Icon, Select, Switch, Text } from "metabase/ui";
-import { type DateFilter, dateFilterOptions, isDateFilter } from "./utils";
+import { type DateFilter, getDateFilterOptions, isDateFilter } from "./utils";
interface CleanupCollectionModalFiltersProps {
dateFilter: DateFilter;
@@ -31,7 +31,7 @@ export const CleanupCollectionModalFilters = ({
<Select
key="select"
leftSection={<Icon name="calendar" />}
- data={dateFilterOptions}
+ data={getDateFilterOptions()}
value={dateFilter}
onChange={(option) => {
if (option && isDateFilter(option)) {
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/utils.ts b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/utils.ts
index c65a4247ec3..a8111e97854 100644
--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/utils.ts
@@ -14,7 +14,7 @@ export const getModalHeightCalc = (additionalOffset?: string) => {
export const itemKeyFn = (item: StaleCollectionItem) =>
`${item.id}:${item.model}`;
-export const dateFilterOptions = [
+export const getDateFilterOptions = () => [
{
label: c(`Occurs in the phrase 'Not used in over 1 month'`).t`1 month`,
value: "one-month",
@@ -60,8 +60,12 @@ export const dateFilterOptions = [
},
];
-export type DateFilter = (typeof dateFilterOptions)[number]["value"];
-export type DateDurations = (typeof dateFilterOptions)[number]["duration"];
+export type DateFilter = ReturnType<
+ typeof getDateFilterOptions
+>[number]["value"];
+export type DateDurations = ReturnType<
+ typeof getDateFilterOptions
+>[number]["duration"];
export type DateFilterOption = {
label: string;
value: DateFilter;
@@ -69,21 +73,22 @@ export type DateFilterOption = {
};
export type DateFilterOptions = DateFilterOption[];
-const dateFiltersMap = _.object(
- dateFilterOptions.map<[DateFilter, DateFilterOption]>((option) => [
- option.value,
- option,
- ]),
-);
+const getDateFiltersMap = () =>
+ _.object(
+ getDateFilterOptions().map<[DateFilter, DateFilterOption]>((option) => [
+ option.value,
+ option,
+ ]),
+ );
export const isDateFilter = (value: string): value is DateFilter => {
- return value in dateFiltersMap;
+ return value in getDateFiltersMap();
};
export const getDateFilterValue = (dateFilter: DateFilter) => {
const today = dayjs().startOf("day");
- const dateFilterOption = dateFiltersMap[dateFilter];
+ const dateFilterOption = getDateFiltersMap()[dateFilter];
const filterOffsetDurations = dateFilterOption.duration;
const date = filterOffsetDurations.reduce((date, [amount, unit]) => {
return date.subtract(amount, unit);
@@ -93,7 +98,7 @@ export const getDateFilterValue = (dateFilter: DateFilter) => {
};
export const getDateFilterLabel = (dateFilter: DateFilter) => {
- const option = dateFilterOptions.find(
+ const option = getDateFilterOptions().find(
(option) => option.value === dateFilter,
);
const label = option?.label;
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx
index 9432412ac72..2381682c4ff 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionInstanceAnalyticsIcon.tsx
@@ -11,18 +11,13 @@ interface Props extends Omit<IconProps, "name" | "tooltip"> {
entity: "collection" | "question" | "model" | "dashboard" | "metric";
}
-const collectionIconTooltipNameMap = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+const getCollectionIconTooltipNames = () => ({
collection: t`collection`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
question: t`question`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
model: t`model`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
dashboard: t`dashboard`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
metric: t`metric`,
-};
+});
export function CollectionInstanceAnalyticsIcon({
collection,
@@ -40,7 +35,7 @@ export function CollectionInstanceAnalyticsIcon({
{...iconProps}
flex="0 0 auto"
name={collectionType.icon}
- tooltip={t`This is a read-only Usage Analytics ${collectionIconTooltipNameMap[entity]}.`}
+ tooltip={t`This is a read-only Usage Analytics ${getCollectionIconTooltipNames()[entity]}.`}
data-testid="instance-analytics-collection-marker"
/>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx
index af55f8d4de0..d4381b9287b 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx
@@ -13,7 +13,7 @@ interface Props extends HTMLAttributes<HTMLDivElement> {
title?: string;
}
-const OPTIONS = [
+const getOptions = () => [
{
label: REGULAR_COLLECTION.name,
value: REGULAR_COLLECTION.type,
@@ -52,7 +52,7 @@ export function FormCollectionAuthorityLevel({
<SegmentedControl
value={String(value)}
onChange={handleChange}
- data={OPTIONS.map((option) => ({
+ data={getOptions().map((option) => ({
value: String(option.value),
label: (
<Center style={{ gap: 10 }} c={option.selectedColor}>
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/constants.ts b/enterprise/frontend/src/metabase-enterprise/collections/constants.ts
index d4ba4bb7419..317acc5b71b 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/collections/constants.ts
@@ -8,8 +8,9 @@ import type { BaseEntityId } from "metabase-types/api";
export const REGULAR_COLLECTION: CollectionAuthorityLevelConfig = {
type: null,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- name: t`Regular`,
+ get name() {
+ return t`Regular`;
+ },
icon: "folder",
};
@@ -20,23 +21,27 @@ export const REMOTE_SYNC_COLLECTION: CollectionInstanceAnaltyicsConfig = {
export const OFFICIAL_COLLECTION: CollectionAuthorityLevelConfig = {
type: "official",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- name: t`Official`,
+ get name() {
+ return t`Official`;
+ },
icon: "official_collection",
color: "core-yellow-saturated" as const,
tooltips: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- default: t`Official collection`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- belonging: t`Belongs to an Official collection`,
+ get default() {
+ return t`Official collection`;
+ },
+ get belonging() {
+ return t`Belongs to an Official collection`;
+ },
},
};
export const INSTANCE_ANALYTICS_COLLECTION: CollectionInstanceAnaltyicsConfig =
{
type: "instance-analytics",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- name: t`Instance Analytics`,
+ get name() {
+ return t`Instance Analytics`;
+ },
icon: "audit",
};
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/index.tsx b/enterprise/frontend/src/metabase-enterprise/collections/index.tsx
index 4cd051ecab3..571d1852d83 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/index.tsx
@@ -97,6 +97,7 @@ export function initializePlugin() {
PLUGIN_COLLECTIONS.useGetDefaultCollectionId = useGetDefaultCollectionId;
PLUGIN_COLLECTIONS.CUSTOM_INSTANCE_ANALYTICS_COLLECTION_ENTITY_ID =
CUSTOM_INSTANCE_ANALYTICS_COLLECTION_ENTITY_ID;
- PLUGIN_COLLECTIONS.INSTANCE_ANALYTICS_ADMIN_READONLY_MESSAGE = t`This instance analytics collection is read-only for admin users`;
+ PLUGIN_COLLECTIONS.getInstanceAnalyticsAdminReadonlyMessage = () =>
+ t`This instance analytics collection is read-only for admin users`;
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts
index 733195c7087..2de2aaffbd3 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts
@@ -30,22 +30,25 @@ import {
export const DATA_MODEL_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
none: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`No`,
+ get label() {
+ return t`No`;
+ },
value: DataPermissionValue.NONE,
icon: "close",
iconColor: "feedback-negative",
},
edit: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Yes`,
+ get label() {
+ return t`Yes`;
+ },
value: DataPermissionValue.ALL,
icon: "check",
iconColor: "feedback-positive",
},
controlled: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Granular`,
+ get label() {
+ return t`Granular`;
+ },
value: DataPermissionValue.CONTROLLED,
icon: "permissions_limited",
iconColor: "feedback-warning",
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.ts
index 5ce0d34fe30..2f205c99ff4 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.ts
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.ts
@@ -22,15 +22,17 @@ import {
export const DETAILS_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
no: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`No`,
+ get label() {
+ return t`No`;
+ },
value: DataPermissionValue.NO,
icon: "close",
iconColor: "feedback-negative",
},
yes: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Yes`,
+ get label() {
+ return t`Yes`;
+ },
value: DataPermissionValue.YES,
icon: "check",
iconColor: "feedback-positive",
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts
index 8327d9c3c5e..301d56e0922 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts
@@ -41,29 +41,33 @@ const getTooltipMessage = (isAdmin: boolean, isBlockedAccess: boolean) => {
export const DOWNLOAD_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
none: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`No`,
+ get label() {
+ return t`No`;
+ },
value: DataPermissionValue.NONE,
icon: "close",
iconColor: "feedback-negative",
},
limited: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`10 thousand rows`,
+ get label() {
+ return t`10 thousand rows`;
+ },
value: DataPermissionValue.LIMITED,
icon: "10k",
iconColor: "accent7",
},
full: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`1 million rows`,
+ get label() {
+ return t`1 million rows`;
+ },
value: DataPermissionValue.FULL,
icon: "1m",
iconColor: "accent7",
},
controlled: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Granular`,
+ get label() {
+ return t`Granular`;
+ },
value: DataPermissionValue.CONTROLLED,
icon: "permissions_limited",
iconColor: "feedback-warning",
diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/utils.ts b/enterprise/frontend/src/metabase-enterprise/group_managers/utils.ts
index 7cdda713a3f..c559978f40f 100644
--- a/enterprise/frontend/src/metabase-enterprise/group_managers/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/utils.ts
@@ -4,12 +4,10 @@ import type { ConfirmationState } from "metabase/common/hooks/use-confirmation";
import type { AdminPath, AdminPathKey } from "metabase/redux/store";
import type { Member, Membership, User } from "metabase-types/api";
-const REVOKE_MANAGING_CONFIRMATION = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+const getRevokeManagingConfirmation = () => ({
title: t`Are you sure?`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
message: t`You will not be able to manage users of this group anymore.`,
-};
+});
const canAccessPeople = (user?: User) =>
user?.permissions?.is_group_manager ?? false;
@@ -63,7 +61,7 @@ export const getRemoveMembershipConfirmation = (
) != null;
return isRemovingSelf && !currentUser.is_superuser
- ? REVOKE_MANAGING_CONFIRMATION
+ ? getRevokeManagingConfirmation()
: null;
};
@@ -76,6 +74,6 @@ export const getChangeMembershipConfirmation = (
!updatedMembership.is_group_manager;
return isRevokingFromSelf && !currentUser.is_superuser
- ? REVOKE_MANAGING_CONFIRMATION
+ ? getRevokeManagingConfirmation()
: null;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
index e5ad4ce7dea..36f8afc4da8 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
@@ -55,8 +55,7 @@ import {
import S from "./EditSandboxingModal.module.css";
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const ERROR_MESSAGE = t`An error occurred.`;
+const getErrorMessage = () => t`An error occurred.`;
const getNormalizedPolicy = (
policy: GroupTableAccessPolicy | GroupTableAccessPolicyDraft,
@@ -343,7 +342,7 @@ const EditSandboxingModal = ({
{typeof error === "string"
? error
: // @ts-expect-error provide correct type for error
- (error.data.message ?? ERROR_MESSAGE)}
+ (error.data.message ?? getErrorMessage())}
</div>
)}
</div>
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsx
index 35a3faab073..fe4968295c3 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsx
@@ -35,8 +35,9 @@ import EditSandboxingModal from "./containers/EditSandboxingModal";
import { getDraftPolicies, hasPolicyChanges } from "./selectors";
const OPTION_SEGMENTED = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- label: t`Row and column security`,
+ get label() {
+ return t`Row and column security`;
+ },
value: DataPermissionValue.SANDBOXED,
icon: "permissions_limited",
iconColor: "brand",
@@ -96,7 +97,9 @@ export function initializePlugin() {
);
PLUGIN_ADMIN_PERMISSIONS_TABLE_FIELDS_OPTIONS.push(OPTION_SEGMENTED);
PLUGIN_ADMIN_PERMISSIONS_TABLE_FIELDS_ACTIONS[OPTION_SEGMENTED.value].push({
- label: t`Edit row and column security`,
+ get label() {
+ return t`Edit row and column security`;
+ },
iconColor: "brand",
icon: "pencil",
onSelect: (entityId, groupId, view) =>
diff --git a/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts b/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts
index 03b30cae66a..54186bd0a6b 100644
--- a/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts
+++ b/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts
@@ -10,10 +10,12 @@ import type { TokenStatus } from "metabase-types/api";
export const LICENSE_ACCEPTED_URL_HASH = "#activated";
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const INVALID_TOKEN_ERROR = t`This token doesn't seem to be valid. Double-check it, then contact support if you think it should be working.`;
-// eslint-disable-next-line ttag/no-module-declaration, metabase/no-literal-metabase-strings
-const UNABLE_TO_VALIDATE_TOKEN = t`We're having trouble validating your token. Please double-check that your instance can connect to Metabase's servers.`;
+const getInvalidTokenError = () =>
+ t`This token doesn't seem to be valid. Double-check it, then contact support if you think it should be working.`;
+
+const getUnableToValidateToken = () =>
+ // eslint-disable-next-line metabase/no-literal-metabase-strings
+ t`We're having trouble validating your token. Please double-check that your instance can connect to Metabase's servers.`;
export const useLicense = (onActivated?: () => void) => {
const dispatch = useDispatch();
@@ -49,9 +51,9 @@ export const useLicense = (onActivated?: () => void) => {
} catch (e) {
// Unjustified type cast. FIXME
if ((e as any).status === 503) {
- setError(UNABLE_TO_VALIDATE_TOKEN);
+ setError(getUnableToValidateToken());
} else {
- setError(INVALID_TOKEN_ERROR);
+ setError(getInvalidTokenError());
}
} finally {
setIsUpdating(false);
@@ -73,7 +75,7 @@ export const useLicense = (onActivated?: () => void) => {
} catch (e) {
// Unjustified type cast. FIXME
if ((e as any).status !== 404) {
- setError(UNABLE_TO_VALIDATE_TOKEN);
+ setError(getUnableToValidateToken());
}
} finally {
setLoading(false);
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx
index 5ee9a606800..22a1bc4ca62 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx
@@ -16,19 +16,20 @@ import type { Tenant } from "metabase-types/api";
const MAX_SLUG_LENGTH = 255;
-const localTenantSchema = Yup.object({
- name: Yup.string().default("").required().max(254, Errors.maxLength),
- slug: Yup.string()
- .default("")
- .required()
- .matches(/^[-_a-z0-9]+$/, {
- excludeEmptyString: true,
- get message() {
- return t`Only lowercase letters, numbers, hyphens (-), and underscores (_) are allowed`;
- },
- })
- .max(MAX_SLUG_LENGTH, Errors.maxLength),
-});
+const getLocalTenantSchema = () =>
+ Yup.object({
+ name: Yup.string().default("").required().max(254, Errors.maxLength),
+ slug: Yup.string()
+ .default("")
+ .required()
+ .matches(/^[-_a-z0-9]+$/, {
+ excludeEmptyString: true,
+ get message() {
+ return t`Only lowercase letters, numbers, hyphens (-), and underscores (_) are allowed`;
+ },
+ })
+ .max(MAX_SLUG_LENGTH, Errors.maxLength),
+ });
interface TenantFormProps {
initialValues?: Partial<Tenant>;
@@ -55,7 +56,7 @@ export const TenantForm = ({
return (
<FormProvider
initialValues={initialValues}
- validationSchema={localTenantSchema}
+ validationSchema={getLocalTenantSchema()}
enableReinitialize
onSubmit={onSubmit}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
index 4e8642fb3db..2c16f615494 100644
--- a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
@@ -29,13 +29,10 @@ import type { Table } from "metabase-types/api";
import { DeleteConfirmModal } from "./DeleteConfirmModal";
import { getDateDisplay } from "./utils";
-const columns = [
+const getColumns = () => [
{ key: "checkbox", name: "", sortable: false },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ key: "name", name: t`Table name` },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ key: "created_at", name: t`Created at` },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ key: "schema", name: t`Schema` },
{ key: "actions", name: "", sortable: false },
];
@@ -158,7 +155,7 @@ export function UploadManagementTable() {
</Text>
<ClientSortableTable
data-testid="upload-tables-table"
- columns={columns}
+ columns={getColumns()}
rows={uploadTables}
rowRenderer={(row) => renderRow(row)}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
index ed7a2f59c05..01676be664d 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
@@ -54,24 +54,18 @@ const getIllustrationType = (
}
};
-const SELECT_OPTIONS: Record<IllustrationType, SelectOption[]> = {
+const getSelectOptions = (): Record<IllustrationType, SelectOption[]> => ({
background: [
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ label: t`Lighthouse`, value: "default" },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ label: t`No illustration`, value: "none" },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ label: t`Custom`, value: "custom" },
],
icon: [
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ label: t`Sailboat`, value: "default" },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ label: t`No illustration`, value: "none" },
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
{ label: t`Custom`, value: "custom" },
],
-} as const;
+});
export function IllustrationWidget({
name,
@@ -88,7 +82,7 @@ export function IllustrationWidget({
const [errorMessage, setErrorMessage] = useState("");
const fileInputRef = useRef<HTMLInputElement>(null);
const type = getIllustrationType(name);
- const options = SELECT_OPTIONS[type];
+ const options = getSelectOptions()[type];
const customIllustrationSettingName =
// Unjustified type cast. FIXME
`${name}-custom` as EnterpriseSettingKey;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsx
index bb5984d8461..8baf0c979b3 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsx
@@ -13,20 +13,16 @@ const DESCRIPTIONS_WIDTHS: Record<IllustrationType, number> = {
icon: 250,
};
-const DESCRIPTIONS: Record<IllustrationType, string[]> = {
+const getDescriptions = (): Record<IllustrationType, string[]> => ({
background: [
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
t`For best results, choose an image that is horizontally oriented and upload it as an SVG file. Other accepted formats are JPG and PNG.`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
t`Your file should not be larger than 2MB.`,
],
icon: [
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
t`For best results, upload an SVG file. Other accepted formats are JPG and PNG.`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
t`Your file should not be larger than 2MB.`,
],
-};
+});
export const ImageUploadInfoDot = ({ type }: CustomFileUploadInfoDot) => {
return (
@@ -36,7 +32,7 @@ export const ImageUploadInfoDot = ({ type }: CustomFileUploadInfoDot) => {
</HoverCard.Target>
<HoverCard.Dropdown>
<Stack p="lg" gap="sm" maw={DESCRIPTIONS_WIDTHS[type]}>
- {DESCRIPTIONS[type].map((message, index) => (
+ {getDescriptions()[type].map((message, index) => (
<Text key={index} size="sm">
{message}
</Text>
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/loading-message.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/loading-message.ts
index 8feebd37634..c22af3bbc76 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/loading-message.ts
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/loading-message.ts
@@ -2,19 +2,22 @@ import { t } from "ttag";
export const LOADING_MESSAGE_BY_SETTING = {
"doing-science": {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- name: t`Doing science...`,
+ get name() {
+ return t`Doing science...`;
+ },
value: (isSlow?: boolean) =>
isSlow ? t`Waiting for results...` : t`Doing science...`,
},
"running-query": {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- name: t`Running query...`,
+ get name() {
+ return t`Running query...`;
+ },
value: (_isSlow?: boolean) => t`Running query...`,
},
"loading-results": {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- name: t`Loading results...`,
+ get name() {
+ return t`Loading results...`;
+ },
value: (_isSlow?: boolean) => t`Loading results...`,
},
};
diff --git a/frontend/lint/scripts/side-effect-files.js b/frontend/lint/scripts/side-effect-files.js
index 1937ae4166b..d596069ea09 100644
--- a/frontend/lint/scripts/side-effect-files.js
+++ b/frontend/lint/scripts/side-effect-files.js
@@ -24,6 +24,8 @@ const REPO_ROOT = path.resolve(__dirname, "../../..");
const SOURCE_ROOTS = ["frontend/src", "enterprise/frontend/src"];
const SOURCE_EXTENSIONS = new Set([".ts", ".tsx", ".js", ".jsx"]);
+// Generated by the SDK package build and gitignored, so it is not source.
+const GENERATED_DIRECTORY = "cli-snippets-tmp";
const RULE_NAME = "metabase/no-module-side-effects";
@@ -53,7 +55,9 @@ function listSourceFiles() {
})
.filter(
(entry) =>
- entry.isFile() && SOURCE_EXTENSIONS.has(path.extname(entry.name)),
+ entry.isFile() &&
+ SOURCE_EXTENSIONS.has(path.extname(entry.name)) &&
+ !entry.parentPath.includes(GENERATED_DIRECTORY),
)
.map((entry) =>
path
diff --git a/frontend/src/metabase-lib/v1/operators/constants.ts b/frontend/src/metabase-lib/v1/operators/constants.ts
index 97342ec2288..7094a5ccef2 100644
--- a/frontend/src/metabase-lib/v1/operators/constants.ts
+++ b/frontend/src/metabase-lib/v1/operators/constants.ts
@@ -184,18 +184,15 @@ export const FIELD_FILTER_OPERATORS = {
numberArgument,
numberArgument,
],
- placeholders: [
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- t`Select longitude field`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- t`Enter upper latitude`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- t`Enter left longitude`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- t`Enter lower latitude`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- t`Enter right longitude`,
- ],
+ get placeholders() {
+ return [
+ t`Select longitude field`,
+ t`Enter upper latitude`,
+ t`Enter left longitude`,
+ t`Enter lower latitude`,
+ t`Enter right longitude`,
+ ];
+ },
formatOptions: [
{ hide: true },
{ column: { semantic_type: TYPE.Latitude }, compact: true },
diff --git a/frontend/src/metabase/AppKBarProvider.tsx b/frontend/src/metabase/AppKBarProvider.tsx
index 34e8c5ddcad..740ee4b8117 100644
--- a/frontend/src/metabase/AppKBarProvider.tsx
+++ b/frontend/src/metabase/AppKBarProvider.tsx
@@ -30,7 +30,7 @@ const AppPaletteActions = () => {
return [...adminPaths, ...adminSubpaths].map((adminPath) => ({
id: `admin-page-${adminPath.key}`,
- name: adminPath.name,
+ name: adminPath.getName(),
icon: "gear",
perform: () => {},
section: "admin",
diff --git a/frontend/src/metabase/account/password/components/UserPasswordForm/UserPasswordForm.tsx b/frontend/src/metabase/account/password/components/UserPasswordForm/UserPasswordForm.tsx
index 061e21d3bf0..65778a08d36 100644
--- a/frontend/src/metabase/account/password/components/UserPasswordForm/UserPasswordForm.tsx
+++ b/frontend/src/metabase/account/password/components/UserPasswordForm/UserPasswordForm.tsx
@@ -17,21 +17,21 @@ import type { User } from "metabase-types/api";
import type { UserPasswordData } from "../../types";
-const USER_PASSWORD_SCHEMA = Yup.object({
- old_password: Yup.string().default("").required(requiredErrorMessage),
- password: Yup.string()
- .default("")
- .required(requiredErrorMessage)
- .test(async (value = "", context) => {
- const error = await context.options.context?.onValidatePassword(value);
- return error ? context.createError({ message: error }) : true;
- }),
- password_confirm: Yup.string()
- .default("")
- .required(requiredErrorMessage)
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- .oneOf([Yup.ref("password")], t`Passwords do not match`),
-});
+const getUserPasswordSchema = () =>
+ Yup.object({
+ old_password: Yup.string().default("").required(requiredErrorMessage),
+ password: Yup.string()
+ .default("")
+ .required(requiredErrorMessage)
+ .test(async (value = "", context) => {
+ const error = await context.options.context?.onValidatePassword(value);
+ return error ? context.createError({ message: error }) : true;
+ }),
+ password_confirm: Yup.string()
+ .default("")
+ .required(requiredErrorMessage)
+ .oneOf([Yup.ref("password")], t`Passwords do not match`),
+ });
export interface UserPasswordFormProps {
user: User;
@@ -43,7 +43,7 @@ export const UserPasswordForm = ({
onValidatePassword,
}: UserPasswordFormProps): JSX.Element => {
const initialValues = useMemo(() => {
- return USER_PASSWORD_SCHEMA.getDefault();
+ return getUserPasswordSchema().getDefault();
}, []);
const validationContext = useMemo(
@@ -68,7 +68,7 @@ export const UserPasswordForm = ({
return (
<FormProvider
initialValues={initialValues}
- validationSchema={USER_PASSWORD_SCHEMA}
+ validationSchema={getUserPasswordSchema()}
validationContext={validationContext}
onSubmit={handleSubmit}
>
diff --git a/frontend/src/metabase/admin/app/reducers.ts b/frontend/src/metabase/admin/app/reducers.ts
index e25533284a8..49cf1461a82 100644
--- a/frontend/src/metabase/admin/app/reducers.ts
+++ b/frontend/src/metabase/admin/app/reducers.ts
@@ -10,47 +10,47 @@ import { isNotNull } from "metabase/utils/types";
export const getAdminPaths: () => AdminPath[] = () => {
const items: AdminPath[] = [
{
- name: t`Settings`,
+ getName: () => t`Settings`,
path: "/admin/settings",
key: "settings",
},
{
- name: t`Databases`,
+ getName: () => t`Databases`,
path: "/admin/databases",
key: "databases",
},
{
- name: t`Embedding`,
+ getName: () => t`Embedding`,
path: "/admin/embedding",
key: "embedding",
},
{
- name: t`AI`,
+ getName: () => t`AI`,
path: "/admin/metabot",
key: "metabot",
},
{
- name: t`Table Metadata`,
+ getName: () => t`Table Metadata`,
path: "/admin/datamodel",
key: "data-model",
},
{
- name: t`People`,
+ getName: () => t`People`,
path: "/admin/people",
key: "people",
},
{
- name: t`Permissions`,
+ getName: () => t`Permissions`,
path: "/admin/permissions",
key: "permissions",
},
{
- name: t`Performance`,
+ getName: () => t`Performance`,
path: "/admin/performance",
key: "performance",
},
{
- name: t`Help`,
+ getName: () => t`Help`,
path: "/admin/help",
key: "help",
},
@@ -59,29 +59,32 @@ export const getAdminPaths: () => AdminPath[] = () => {
return items;
};
-const paths = createReducer(getAdminPaths(), (builder) => {
- builder.addMatcher(
- currentUserApi.endpoints.getCurrentUser.matchFulfilled,
- (state, { payload: user }) => {
- if (user?.is_superuser) {
- return state;
- }
+const paths = createReducer(
+ () => getAdminPaths(),
+ (builder) => {
+ builder.addMatcher(
+ currentUserApi.endpoints.getCurrentUser.matchFulfilled,
+ (state, { payload: user }) => {
+ if (user?.is_superuser) {
+ return state;
+ }
- const allowedPaths = PLUGIN_ADMIN_ALLOWED_PATH_GETTERS.map((getter) => {
- return getter(user);
- })
- .flat()
- .reduce((acc, pathKey) => {
- acc.add(pathKey);
- return acc;
- }, new Set<AdminPathKey>());
+ const allowedPaths = PLUGIN_ADMIN_ALLOWED_PATH_GETTERS.map((getter) => {
+ return getter(user);
+ })
+ .flat()
+ .reduce((acc, pathKey) => {
+ acc.add(pathKey);
+ return acc;
+ }, new Set<AdminPathKey>());
- return state
- .filter((path) => (allowedPaths.has(path.key) ? path : null))
- .filter(isNotNull);
- },
- );
-});
+ return state
+ .filter((path) => (allowedPaths.has(path.key) ? path : null))
+ .filter(isNotNull);
+ },
+ );
+ },
+);
export const appReducer = combineReducers({
paths,
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
index 69fb5e9c0b6..564614f0dbc 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
@@ -18,7 +18,7 @@ import {
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
+import { getBeforeUnloadUnsavedMessage } from "metabase/common/hooks/use-before-unload";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
import { createMockCollection } from "metabase-types/api/mocks";
@@ -97,7 +97,7 @@ describe("SegmentApp", () => {
return callMockEvent(mockEventListener, "beforeunload");
});
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toBe(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toBe(getBeforeUnloadUnsavedMessage());
});
it("should not have an beforeunload event when segment is unedited", () => {
diff --git a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
index a2df2aa401c..8eb8f02660b 100644
--- a/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/people/containers/AdminPeopleApp/AdminPeopleApp.unit.spec.tsx
@@ -71,7 +71,9 @@ const setupTenantRoute = async (initialRoute: string) => {
const state = createMockState({
admin: createMockAdminState({
app: createMockAdminAppState({
- paths: [{ key: "people", name: "People", path: "/admin/people" }],
+ paths: [
+ { key: "people", getName: () => "People", path: "/admin/people" },
+ ],
}),
}),
currentUser: createMockUser({
diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
index e04d2747678..8fe443c82ae 100644
--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
import type { ChangeEvent } from "react";
import { useEffect, useState } from "react";
import { c, msgid, ngettext, t } from "ttag";
@@ -27,7 +26,7 @@ import { Switch, Text } from "metabase/ui";
import ModelPersistenceConfigurationS from "./ModelPersistenceConfiguration.module.css";
import { PerformancePageContent } from "./PerformancePageContent";
-const modelCachingOptions = [
+const getModelCachingOptions = () => [
{
value: "0 0 0/1 * * ? *",
// this has to be plural because it's plural elsewhere and it cannot be both a singular message ID and a
@@ -166,7 +165,7 @@ export const ModelPersistenceConfiguration = () => {
<div>
<ModelCachingScheduleWidget
value={modelCachingSchedule}
- options={modelCachingOptions}
+ options={getModelCachingOptions()}
onChange={async (value: string) => {
await resolveWithToasts([
setRefreshSchedule({ cron: value }).unwrap(),
diff --git a/frontend/src/metabase/admin/performance/constants/complex.ts b/frontend/src/metabase/admin/performance/constants/complex.ts
index 161ec9894d5..870f0c088ed 100644
--- a/frontend/src/metabase/admin/performance/constants/complex.ts
+++ b/frontend/src/metabase/admin/performance/constants/complex.ts
@@ -3,4 +3,7 @@ import { t } from "ttag";
import type { AdminPath } from "metabase/redux/store";
export const getPerformanceAdminPaths = (metadata: AdminPath[]) =>
- metadata.map((tab) => ({ ...tab, name: `${t`Performance`} - ${tab.name}` }));
+ metadata.map((tab) => ({
+ ...tab,
+ getName: () => `${t`Performance`} - ${tab.getName()}`,
+ }));
diff --git a/frontend/src/metabase/admin/performance/utils.tsx b/frontend/src/metabase/admin/performance/utils.tsx
index 41cf72a3fd1..677c15c836b 100644
--- a/frontend/src/metabase/admin/performance/utils.tsx
+++ b/frontend/src/metabase/admin/performance/utils.tsx
@@ -218,9 +218,9 @@ export const translateConfigToAPI = <T extends CacheConfig>(config: T): T =>
translateConfig(config, "toAPI");
export const getPerformanceTabName = (tabId: PerformanceTabId) =>
- PLUGIN_CACHING.getTabMetadata().find(
- ({ key }) => key === `performance-${tabId}`,
- )?.name;
+ PLUGIN_CACHING.getTabMetadata()
+ .find(({ key }) => key === `performance-${tabId}`)
+ ?.getName();
export const getDefaultValueForField = (
strategyType: CacheStrategyType,
diff --git a/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts b/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts
index ca5887d41c4..05a18346ac6 100644
--- a/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts
+++ b/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts
@@ -1,23 +1,28 @@
-/* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
import { t } from "ttag";
import { DataPermissionValue, type PermissionOption } from "../types";
export const COLLECTION_OPTIONS: Record<string, PermissionOption> = {
write: {
- label: t`Curate`,
+ get label() {
+ return t`Curate`;
+ },
value: DataPermissionValue.WRITE,
icon: "check",
iconColor: "feedback-positive",
},
read: {
- label: t`View`,
+ get label() {
+ return t`View`;
+ },
value: DataPermissionValue.READ,
icon: "eye",
iconColor: "feedback-warning",
},
none: {
- label: t`No access`,
+ get label() {
+ return t`No access`;
+ },
value: DataPermissionValue.NONE,
icon: "close",
iconColor: "feedback-negative",
diff --git a/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx b/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx
index 5050e3b6fce..09ce8a60b14 100644
--- a/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx
@@ -1,41 +1,52 @@
-/* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
import { t } from "ttag";
import { DataPermissionValue, type PermissionOption } from "../types";
export const DATA_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
unrestricted: {
- label: t`Can view`,
+ get label() {
+ return t`Can view`;
+ },
value: DataPermissionValue.UNRESTRICTED,
icon: "eye",
iconColor: "feedback-positive",
},
controlled: {
- label: t`Granular`,
+ get label() {
+ return t`Granular`;
+ },
value: DataPermissionValue.CONTROLLED,
icon: "permissions_limited",
iconColor: "feedback-warning",
},
noSelfServiceDeprecated: {
- label: t`No self-service (Deprecated)`,
+ get label() {
+ return t`No self-service (Deprecated)`;
+ },
value: DataPermissionValue.LEGACY_NO_SELF_SERVICE,
icon: "eye_crossed_out",
iconColor: "accent5",
},
no: {
- label: t`No`,
+ get label() {
+ return t`No`;
+ },
value: DataPermissionValue.NO,
icon: "close",
iconColor: "feedback-negative",
},
queryBuilder: {
- label: t`Query builder only`,
+ get label() {
+ return t`Query builder only`;
+ },
value: DataPermissionValue.QUERY_BUILDER,
icon: "permissions_limited",
iconColor: "feedback-warning",
},
queryBuilderAndNative: {
- label: t`Query builder and native`,
+ get label() {
+ return t`Query builder and native`;
+ },
value: DataPermissionValue.QUERY_BUILDER_AND_NATIVE,
icon: "check",
iconColor: "feedback-positive",
diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
index 0a7cb6dbee9..fec44af59aa 100644
--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
@@ -231,7 +231,7 @@ const getCollectionDisabledTooltip = (
isIACollection: boolean,
): string | null => {
if (groupType === "admin" && isIACollection) {
- return PLUGIN_COLLECTIONS.INSTANCE_ANALYTICS_ADMIN_READONLY_MESSAGE;
+ return PLUGIN_COLLECTIONS.getInstanceAnalyticsAdminReadonlyMessage();
}
if (groupType === "analyst" && isLibrary) {
return Messages.UNABLE_TO_CHANGE_DATA_ANALYST_LIBRARY_PERMISSIONS;
diff --git a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx
index d827e11d4de..60962861259 100644
--- a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx
@@ -16,7 +16,7 @@ import {
import { delay } from "__support__/utils";
import { DataPermissionsPage } from "metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage";
import { DatabasesPermissionsPage } from "metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage";
-import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
+import { getBeforeUnloadUnsavedMessage } from "metabase/common/hooks/use-before-unload";
import { PLUGIN_ADMIN_PERMISSIONS_TABLE_GROUP_ROUTES } from "metabase/plugins";
import { Route } from "metabase/router";
import { createMockGroup } from "metabase-types/api/mocks/group";
@@ -108,7 +108,7 @@ describe("DatabasesPermissionsPage", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toBe(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toBe(getBeforeUnloadUnsavedMessage());
});
it("should not have beforeunload event when permissions are unedited", async function () {
diff --git a/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsx b/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsx
index 743541d12da..7bee934bb9f 100644
--- a/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/permissions/test/GroupsPermissionsPage/GroupsPermissionsPage.unit.spec.tsx
@@ -15,7 +15,7 @@ import {
import { delay } from "__support__/utils";
import { DataPermissionsPage } from "metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage";
import { GroupsPermissionsPage } from "metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage";
-import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
+import { getBeforeUnloadUnsavedMessage } from "metabase/common/hooks/use-before-unload";
import { PLUGIN_ADMIN_PERMISSIONS_TABLE_ROUTES } from "metabase/plugins";
import { Route } from "metabase/router";
import { createMockGroup } from "metabase-types/api/mocks/group";
@@ -121,7 +121,7 @@ describe("GroupsPermissionsPage", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toBe(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toBe(getBeforeUnloadUnsavedMessage());
});
it("should not have beforeunload event when permissions are unedited", async function () {
diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsx
index 5564986f186..dc7f2e3f707 100644
--- a/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsx
+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/CreateApiKeyModal.tsx
@@ -16,7 +16,7 @@ import { useCreateApiKeyMutation } from "../../api/api-key";
import S from "./CreateApiKeyModal.module.css";
import { SecretKeyModal } from "./SecretKeyModal";
-import { API_KEY_VALIDATION_SCHEMA } from "./utils";
+import { getApiKeyValidationSchema } from "./utils";
export const CreateApiKeyModal = ({ onClose }: { onClose: () => void }) => {
const [createApiKey, response] = useCreateApiKeyMutation();
@@ -47,7 +47,7 @@ export const CreateApiKeyModal = ({ onClose }: { onClose: () => void }) => {
>
<FormProvider
initialValues={{ name: "", group_id: null }}
- validationSchema={API_KEY_VALIDATION_SCHEMA}
+ validationSchema={getApiKeyValidationSchema()}
onSubmit={handleSubmit}
>
<Form data-testid="create-api-key-modal">
diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx
index 75adc27d77c..26d7197024a 100644
--- a/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx
+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx
@@ -20,7 +20,7 @@ import {
import S from "./EditApiKeyModal.module.css";
import { SecretKeyModal } from "./SecretKeyModal";
-import { API_KEY_VALIDATION_SCHEMA } from "./utils";
+import { getApiKeyValidationSchema } from "./utils";
const { fontFamilyMonospace } = getThemeOverrides();
@@ -142,7 +142,7 @@ export const EditApiKeyModal = ({
<FormProvider
initialValues={{ ...apiKey, group_id: apiKey.group.id }}
onSubmit={handleSubmit}
- validationSchema={API_KEY_VALIDATION_SCHEMA}
+ validationSchema={getApiKeyValidationSchema()}
>
{({ dirty }) => (
<Form>
diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/utils.ts b/frontend/src/metabase/admin/settings/components/ApiKeys/utils.ts
index 9f0d4933f79..7e77453f4fb 100644
--- a/frontend/src/metabase/admin/settings/components/ApiKeys/utils.ts
+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/utils.ts
@@ -5,10 +5,10 @@ export function formatMaskedKey(maskedKey: string) {
return maskedKey.substring(0, 7) + "...";
}
-export const API_KEY_VALIDATION_SCHEMA = Yup.object({
- name: Yup.string().required(),
- group_id: Yup.number()
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- .typeError(t`Group is a required field`)
- .required(),
-});
+export const getApiKeyValidationSchema = () =>
+ Yup.object({
+ name: Yup.string().required(),
+ group_id: Yup.number()
+ .typeError(t`Group is a required field`)
+ .required(),
+ });
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
index 0e47d9122a1..d565b8d7290 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
@@ -30,12 +29,12 @@ interface MigrationInProgressProps {
migration: InProgressCloudMigration;
}
-const progressMessage: Record<InProgressStates, string> = {
+const getProgressMessages = (): Record<InProgressStates, string> => ({
init: t`Talking to Metabase Cloud...`,
setup: t`Talking to Metabase Cloud...`,
dump: t`Taking a snapshot of this instance...`,
upload: t`Uploading the snapshot to the cloud...`,
-};
+});
export const MigrationInProgress = ({
storeUrl,
@@ -90,7 +89,7 @@ export const MigrationInProgress = ({
<Box mt="xl" mb="lg">
<Text size="md" c="text-secondary">
- {progressMessage[migration.state]}
+ {getProgressMessages()[migration.state]}
</Text>
<Progress value={migration.progress} mt=".25rem" />
</Box>
diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
index 5c0d64676e6..21a669ec612 100644
--- a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
@@ -41,10 +41,10 @@ import { SettingHeader } from "../SettingHeader";
import { dbHasSchema, getDatabaseOptions, getSchemaOptions } from "./utils";
const FEEDBACK_TIMEOUT = 5000;
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const enableErrorMessage = t`There was a problem enabling uploads. Please try again shortly.`;
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const disableErrorMessage = t`There was a problem disabling uploads. Please try again shortly.`;
+const getEnableErrorMessage = () =>
+ t`There was a problem enabling uploads. Please try again shortly.`;
+const getDisableErrorMessage = () =>
+ t`There was a problem disabling uploads. Please try again shortly.`;
export function UploadSettingsFormView({
databases,
@@ -108,7 +108,7 @@ export function UploadSettingsFormView({
toast: false,
}).then((response) => {
if (response.error) {
- showError(getErrorMessage(enableErrorMessage));
+ showError(getErrorMessage(getEnableErrorMessage()));
throw new Error(t`Error enabling uploads`);
}
@@ -127,7 +127,7 @@ export function UploadSettingsFormView({
toast: false,
}).then((response) => {
if (response.error) {
- showError(getErrorMessage(disableErrorMessage));
+ showError(getErrorMessage(getDisableErrorMessage()));
throw new Error(t`Error disabling uploads`);
}
setDbId(null);
diff --git a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx
index f05e8d41372..2205999f7e5 100644
--- a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx
+++ b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx
@@ -21,20 +21,20 @@ import {
PasswordFormTitle,
} from "./ResetPasswordForm.styled";
-const RESET_PASSWORD_SCHEMA = Yup.object({
- password: Yup.string()
- .default("")
- .required(Errors.required)
- .test(async (value = "", context) => {
- const error = await context.options.context?.onValidatePassword(value);
- return error ? context.createError({ message: error }) : true;
- }),
- password_confirm: Yup.string()
- .default("")
- .required(Errors.required)
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- .oneOf([Yup.ref("password")], t`passwords do not match`),
-});
+const getResetPasswordSchema = () =>
+ Yup.object({
+ password: Yup.string()
+ .default("")
+ .required(Errors.required)
+ .test(async (value = "", context) => {
+ const error = await context.options.context?.onValidatePassword(value);
+ return error ? context.createError({ message: error }) : true;
+ }),
+ password_confirm: Yup.string()
+ .default("")
+ .required(Errors.required)
+ .oneOf([Yup.ref("password")], t`passwords do not match`),
+ });
interface ResetPasswordFormProps {
onValidatePassword: (password: string) => Promise<string | undefined>;
@@ -46,7 +46,7 @@ export const ResetPasswordForm = ({
onSubmit,
}: ResetPasswordFormProps): JSX.Element => {
const initialValues = useMemo(() => {
- return RESET_PASSWORD_SCHEMA.getDefault();
+ return getResetPasswordSchema().getDefault();
}, []);
const passwordDescription = useMemo(() => {
@@ -66,7 +66,7 @@ export const ResetPasswordForm = ({
</PasswordFormMessage>
<FormProvider
initialValues={initialValues}
- validationSchema={RESET_PASSWORD_SCHEMA}
+ validationSchema={getResetPasswordSchema()}
validationContext={validationContext}
onSubmit={onSubmit}
>
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
index 402c051ae36..bc5e3d07fda 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
@@ -17,6 +17,7 @@ import { getUser, getUserIsAdmin } from "metabase/current-user";
import { PLUGIN_LIBRARY, PLUGIN_TENANTS } from "metabase/plugins";
import { type DispatchFn, useDispatch, useSelector } from "metabase/redux";
import { useSetting } from "metabase/settings";
+import { mergeLazily } from "metabase/utils/merge-lazily";
import type {
Collection,
CollectionNamespace,
@@ -33,14 +34,16 @@ import type {
import { getRootCollectionItem } from "./utils";
-const personalCollectionsRoot: OmniPickerCollectionItem = {
- ...PERSONAL_COLLECTIONS,
- can_write: false,
- model: "collection",
- location: "/",
- here: ["collection"],
- below: ["collection"],
-};
+const personalCollectionsRoot: OmniPickerCollectionItem = mergeLazily(
+ PERSONAL_COLLECTIONS,
+ {
+ can_write: false,
+ model: "collection" as const,
+ location: "/",
+ here: ["collection" as const],
+ below: ["collection" as const],
+ },
+);
/**
* This will generate a list of the top level items for the entity picker
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
index 5dcd134a89d..2113742277f 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
@@ -5,6 +5,7 @@ import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";
import { allCollectionModels } from "metabase/common/components/Pickers/utils";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { DispatchFn } from "metabase/redux";
+import { mergeLazily } from "metabase/utils/merge-lazily";
import type { CollectionNamespace } from "metabase-types/api";
import type { OmniPickerCollectionItem } from "../types";
@@ -38,14 +39,16 @@ export const getOurAnalytics = (): OmniPickerCollectionItem => ({
namespace: null,
});
-export const personalCollectionsRoot: OmniPickerCollectionItem = {
- ...PERSONAL_COLLECTIONS,
- can_write: false,
- model: "collection",
- location: "/",
- here: ["collection"],
- below: allCollectionModels,
-};
+export const personalCollectionsRoot: OmniPickerCollectionItem = mergeLazily(
+ PERSONAL_COLLECTIONS,
+ {
+ can_write: false,
+ model: "collection" as const,
+ location: "/",
+ here: ["collection" as const],
+ below: allCollectionModels,
+ },
+);
export const getRootCollectionItem = async ({
namespace,
diff --git a/frontend/src/metabase/common/hooks/use-before-unload/index.ts b/frontend/src/metabase/common/hooks/use-before-unload/index.ts
index f94a4d59740..f80420e65e6 100644
--- a/frontend/src/metabase/common/hooks/use-before-unload/index.ts
+++ b/frontend/src/metabase/common/hooks/use-before-unload/index.ts
@@ -1,4 +1,4 @@
export {
useBeforeUnload,
- BEFORE_UNLOAD_UNSAVED_MESSAGE,
+ getBeforeUnloadUnsavedMessage,
} from "./use-before-unload";
diff --git a/frontend/src/metabase/common/hooks/use-before-unload/use-before-unload.ts b/frontend/src/metabase/common/hooks/use-before-unload/use-before-unload.ts
index 8d88f156fed..d2937b625eb 100644
--- a/frontend/src/metabase/common/hooks/use-before-unload/use-before-unload.ts
+++ b/frontend/src/metabase/common/hooks/use-before-unload/use-before-unload.ts
@@ -3,11 +3,10 @@ import { t } from "ttag";
// most browsers don't use a custom message with beforeunload anymore, just putting here to retain compatibility
// https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event#compatibility_notes
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-export const BEFORE_UNLOAD_UNSAVED_MESSAGE = t`You have unsaved changes.`;
+export const getBeforeUnloadUnsavedMessage = () => t`You have unsaved changes.`;
export const useBeforeUnload = (
condition: Parameters<typeof useBeforeUnloadHook>[0],
) => {
- return useBeforeUnloadHook(condition, BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ return useBeforeUnloadHook(condition, getBeforeUnloadUnsavedMessage());
};
diff --git a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
index aefc246e196..e3f0f8ae90d 100644
--- a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
@@ -23,8 +23,8 @@ import {
import { checkNotNull } from "metabase/utils/types";
import type { ActionDashboardCard } from "metabase-types/api";
-const settings = checkNotNull(ActionViz.settings);
-const buttonVariantOptions = settings["button.variant"].getProps().options;
+const getButtonVariantOptions = () =>
+ checkNotNull(ActionViz.settings)["button.variant"].getProps().options;
export function ActionSidebar() {
const {
@@ -91,7 +91,7 @@ export function ActionSidebar() {
title={t`Button variant`}
label={t`Button variant`}
name="button_variant"
- data={buttonVariantOptions}
+ data={getButtonVariantOptions()}
onChange={(value) =>
onUpdateDashCardVisualizationSettings(dashcard.id, {
"button.variant": value,
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ActionViz.tsx b/frontend/src/metabase/dashboard/components/ActionViz/ActionViz.tsx
index 029b625fd3a..4ef81a070eb 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/ActionViz.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/ActionViz.tsx
@@ -38,8 +38,9 @@ const ActionViz: VisualizationDefinition = {
},
actionDisplayType: {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Action Form Display`,
+ get title() {
+ return t`Action Form Display`;
+ },
widget: "radio",
hidden: true,
getProps: () => ({
@@ -51,15 +52,17 @@ const ActionViz: VisualizationDefinition = {
},
"button.label": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Label`,
+ get title() {
+ return t`Label`;
+ },
widget: "input",
getHidden: isForm,
},
"button.variant": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Variant`,
+ get title() {
+ return t`Variant`;
+ },
widget: "select",
getDefault: () => "primary",
getHidden: isForm,
diff --git a/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx b/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx
index c1da9c7a11f..eec3cde0376 100644
--- a/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx
@@ -7,8 +7,7 @@ import { getDashboard, getDashboardId } from "metabase/dashboard/selectors";
import { useDispatch, useSelector } from "metabase/redux";
import { Box, Popover, Stack, Switch } from "metabase/ui";
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const EXTRA_BUTTONS_DESCRIPTION = t`Toggle width`;
+const getExtraButtonsDescription = () => t`Toggle width`;
export function ExtraEditButtonsMenu() {
const dispatch = useDispatch();
@@ -28,8 +27,8 @@ export function ExtraEditButtonsMenu() {
<Popover.Target>
<Box>
<ToolbarButton
- tooltipLabel={EXTRA_BUTTONS_DESCRIPTION}
- aria-label={EXTRA_BUTTONS_DESCRIPTION}
+ tooltipLabel={getExtraButtonsDescription()}
+ aria-label={getExtraButtonsDescription()}
icon="ellipsis"
/>
</Box>
diff --git a/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx b/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx
index 2fc69a1b144..0b7d9a708f6 100644
--- a/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx
+++ b/frontend/src/metabase/dashboard/components/ParameterSettings/ParameterSettings.tsx
@@ -67,13 +67,6 @@ export interface ParameterSettingsProps {
editingParameterInlineDashcard?: DashboardCard;
}
-const parameterSections = getDashboardParameterSections();
-const dataTypeSectionsData = parameterSections.map((section) => ({
- label: section.name,
- value: section.id,
-}));
-const defaultOptionForSection = getDefaultOptionForParameterSectionMap();
-
export const ParameterSettings = ({
parameter,
editingParameterInlineDashcard,
@@ -90,6 +83,13 @@ export const ParameterSettings = ({
embeddedParameterVisibility,
hasMapping,
}: ParameterSettingsProps): JSX.Element => {
+ const parameterSections = getDashboardParameterSections();
+ const dataTypeSectionsData = parameterSections.map((section) => ({
+ label: section.name,
+ value: section.id,
+ }));
+ const defaultOptionForSection = getDefaultOptionForParameterSectionMap();
+
const dispatch = useDispatch();
const [tempLabelValue, setTempLabelValue] = useState(parameter.name);
// TODO: sectionId should always be present, but current type definition presumes it's optional in the parameter.
@@ -162,7 +162,7 @@ export const ParameterSettings = ({
label: option.menuName ?? option.name,
value: option.type,
}));
- }, [sectionId]);
+ }, [sectionId, parameterSections]);
return (
<Box p="1.5rem 1rem 0.5rem">
diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
index b7438d4aa30..09434728a1d 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
@@ -24,7 +24,7 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
+import { getBeforeUnloadUnsavedMessage } from "metabase/common/hooks/use-before-unload";
import { DashboardApp } from "metabase/dashboard/containers/DashboardApp/DashboardApp";
import { Route } from "metabase/router";
import { checkNotNull } from "metabase/utils/types";
@@ -148,7 +148,7 @@ describe("DashboardApp", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toEqual(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toEqual(getBeforeUnloadUnsavedMessage());
});
it("should not have a beforeunload event when the dashboard is unedited", async function () {
diff --git a/frontend/src/metabase/dashboard/visualizations/Text/index.ts b/frontend/src/metabase/dashboard/visualizations/Text/index.ts
index 0c2596c4c8a..0d1e755404c 100644
--- a/frontend/src/metabase/dashboard/visualizations/Text/index.ts
+++ b/frontend/src/metabase/dashboard/visualizations/Text/index.ts
@@ -39,8 +39,9 @@ const TextViz: VisualizationDefinition = {
},
"text.align_vertical": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Vertical Alignment`,
+ get title() {
+ return t`Vertical Alignment`;
+ },
widget: "select",
getProps: () => ({
options: [
@@ -53,8 +54,9 @@ const TextViz: VisualizationDefinition = {
},
"text.align_horizontal": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Horizontal Alignment`,
+ get title() {
+ return t`Horizontal Alignment`;
+ },
widget: "select",
getProps: () => ({
options: [
@@ -67,8 +69,9 @@ const TextViz: VisualizationDefinition = {
},
"dashcard.background": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Show background`,
+ get title() {
+ return t`Show background`;
+ },
dashboard: true,
inline: true,
widget: "toggle",
diff --git a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsx
index f83674cd89f..35334b81fdc 100644
--- a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsx
+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/PreviewModeSelector.tsx
@@ -18,15 +18,13 @@ const ControlOptionItem = ({
</Group>
);
-const CODE_PREVIEW_CONTROL_OPTIONS = [
+const getCodePreviewControlOptions = () => [
{
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
label: <ControlOptionItem label={t`Code`} iconName="embed" />,
// Unjustified type cast. FIXME
value: "code" as ActivePreviewPane,
},
{
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
label: <ControlOptionItem label={t`Preview`} iconName="eye_filled" />,
// Unjustified type cast. FIXME
value: "preview" as ActivePreviewPane,
@@ -44,7 +42,7 @@ export const PreviewModeSelector = ({
}: PreviewModeSelectorProps): JSX.Element => (
<SegmentedControl
value={value}
- data={CODE_PREVIEW_CONTROL_OPTIONS}
+ data={getCodePreviewControlOptions()}
onChange={onChange}
/>
);
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts
index 86c42ecd1ca..7a5f03169f0 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts
@@ -12,7 +12,7 @@ import {
import type { HighlightedCommentState } from "metabase/redux/store/explorations";
import { getColorsForValues } from "metabase/ui/colors/charts";
import { getAccentColors } from "metabase/ui/colors/groups";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import {
formatDateTimeRangeWithUnit,
formatValue,
@@ -460,7 +460,7 @@ export function formatColumnValue(
columnSettings?: ColumnSettings,
): string {
const settings = columnSettings ?? { column };
- return String(formatValue(value ?? NULL_DISPLAY_VALUE, settings));
+ return String(formatValue(value ?? getNullDisplayValue(), settings));
}
function getClickedColumnSettings(
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.ts b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.ts
index ece26efac17..94acc077110 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.ts
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.ts
@@ -6,7 +6,7 @@ import {
} from "metabase/explorations/constants";
import { createQuery } from "metabase/explorations/test-utils";
import type { HighlightedCommentState } from "metabase/redux/store/explorations";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { registerVisualizations } from "metabase/visualizations/register";
import type { ClickObject } from "metabase/visualizations/types";
import type {
@@ -312,7 +312,7 @@ describe("getExploreFurtherFilters", () => {
operator: "=",
field_ref: ["field", 10, null],
value: null,
- display_value: NULL_DISPLAY_VALUE,
+ display_value: getNullDisplayValue(),
},
]);
});
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
index ae8ed223c29..fff4f511428 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
@@ -13,7 +13,7 @@ import { Button, Group, Modal, Stack, Text } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import type { MetabotFeedback, MetabotIssueType } from "metabase-types/api";
-import { issueTypeOptions } from "./feedback-issue-types";
+import { getIssueTypeOptions } from "./feedback-issue-types";
// Issue types that require free text feedback
const ISSUE_TYPES_REQUIRING_FREEFORM = ["ui-bug", "other"] as const;
@@ -111,7 +111,7 @@ export const MetabotFeedbackModal = ({
<FormSelect
name="issue_type"
placeholder={t`Select issue type`}
- data={issueTypeOptions}
+ data={getIssueTypeOptions()}
/>
</Stack>
)}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/feedback-issue-types.ts b/frontend/src/metabase/metabot/components/MetabotChat/feedback-issue-types.ts
index cc7ce4e2a26..6af4e5a80a4 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/feedback-issue-types.ts
+++ b/frontend/src/metabase/metabot/components/MetabotChat/feedback-issue-types.ts
@@ -17,7 +17,8 @@ export const getIssueTypeLabel = (value: MetabotIssueType): string =>
.with("other", () => t`Other`)
.exhaustive();
-export const issueTypeOptions = METABOT_ISSUE_TYPE_VALUES.map((value) => ({
- value,
- label: getIssueTypeLabel(value),
-}));
+export const getIssueTypeOptions = () =>
+ METABOT_ISSUE_TYPE_VALUES.map((value) => ({
+ value,
+ label: getIssueTypeLabel(value),
+ }));
diff --git a/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx b/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx
index 4f1a59b4bbc..8e960e4c79e 100644
--- a/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx
+++ b/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx
@@ -8,8 +8,6 @@ import {
} from "metabase/ui";
import type { FieldVisibilityType } from "metabase-types/api";
-const DATA = getData();
-
interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {
value: FieldVisibilityType;
onChange: (value: FieldVisibilityType) => void;
@@ -21,6 +19,8 @@ export const FieldVisibilityPicker = ({
onChange,
...props
}: Props) => {
+ const data = getData();
+
const handleChange = (value: string) => {
if (!isFieldVisibilityType(value)) {
throw new Error("Unknown FieldVisibilityType. This should never happen");
@@ -41,10 +41,10 @@ export const FieldVisibilityPicker = ({
position: "bottom-start",
...comboboxProps,
}}
- data={DATA}
+ data={data}
placeholder={t`Select a field visibility`}
renderOption={(item) => {
- const option = DATA.find(
+ const option = data.find(
(option) => option.value === item.option.value,
);
diff --git a/frontend/src/metabase/metadata/utils/field.ts b/frontend/src/metabase/metadata/utils/field.ts
index 72797071d17..ff5d84e1016 100644
--- a/frontend/src/metabase/metadata/utils/field.ts
+++ b/frontend/src/metabase/metadata/utils/field.ts
@@ -1,5 +1,5 @@
import { is_coerceable } from "cljs/metabase.types.core";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { getGlobalSettingsForColumn } from "metabase/viz-core";
import { TYPE } from "metabase-lib/v1/types/constants";
import { isTypeFK, isa } from "metabase-lib/v1/types/utils/isa";
@@ -82,7 +82,7 @@ export function getFieldDisplayName(
field.dimensions?.[0]?.name ||
field.display_name ||
getFieldRawName(field) ||
- NULL_DISPLAY_VALUE;
+ getNullDisplayValue();
if (table) {
if (schema) {
diff --git a/frontend/src/metabase/metadata/utils/field.unit.spec.ts b/frontend/src/metabase/metadata/utils/field.unit.spec.ts
index edfe62ecbec..6e90df96c19 100644
--- a/frontend/src/metabase/metadata/utils/field.unit.spec.ts
+++ b/frontend/src/metabase/metadata/utils/field.unit.spec.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import MetabaseSettings from "metabase/utils/settings";
import {
createMockDatabase,
@@ -231,7 +231,7 @@ describe("getFieldDisplayName", () => {
display_name: "",
});
- expect(getFieldDisplayName(field)).toBe(NULL_DISPLAY_VALUE);
+ expect(getFieldDisplayName(field)).toBe(getNullDisplayValue());
});
it("should handle empty dimensions array", () => {
diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
index 0bd7dceedef..25b9e3fb7d2 100644
--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
@@ -96,9 +96,9 @@ export const AdminNavbar = ({
gap="0.25rem"
miw={0}
>
- {adminPaths.map(({ name, key, path }) => (
+ {adminPaths.map(({ getName, key, path }) => (
<AdminNavItem
- name={name}
+ name={getName()}
path={path}
key={key}
currentPath={currentPath}
@@ -161,14 +161,14 @@ const MobileNavbar = ({ adminPaths, currentPath }: AdminMobileNavbarProps) => {
bdrs="0 0 0 0.5rem"
style={{ overflowY: "auto" }}
>
- {adminPaths.map(({ name, key, path }) => (
+ {adminPaths.map(({ getName, key, path }) => (
<AdminNavLink
to={path}
key={key}
isSelected={currentPath.startsWith(path)}
isInMobileNav
>
- {name}
+ {getName()}
</AdminNavLink>
))}
{/* Security Center is rendered outside adminPaths because it
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
index aa61f25ce1e..7d2a2be95c7 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.unit.spec.tsx
@@ -43,7 +43,7 @@ const HOSTED_ITEMS = [...ADMIN_ITEMS];
const WITH_AREAS = [...ADMIN_ITEMS, "Data studio", "Monitor"];
const adminNavItem = {
- name: `People`,
+ getName: () => `People`,
path: "/admin/people",
key: "people",
} as const;
diff --git a/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx b/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx
index 8cd09f6a6a8..9991de706b8 100644
--- a/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx
+++ b/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx
@@ -1,5 +1,6 @@
import { useHotkeys } from "@mantine/hooks";
import cx from "classnames";
+import { useMemo } from "react";
import { t } from "ttag";
import _ from "underscore";
@@ -18,15 +19,14 @@ import {
import { ELLIPSIS, GROUP_LABELS } from "../../constants";
-const groupedShortcuts = _.groupBy(
- _.mapObject(ALL_SHORTCUTS, (val, id) => ({ id, ...val })),
- "shortcutGroup",
-);
-
-// Unjustified type cast. FIXME
-const shortcutGroups = Object.keys(groupedShortcuts).filter(
- (val) => !!val,
-) as ShortcutGroup[];
+// Built when the modal opens rather than at import: a shortcut's `name` and
+// `keywords` are getters so they translate when read, and spreading them at
+// module scope would freeze whatever language was loaded at import.
+const groupShortcuts = () =>
+ _.groupBy(
+ _.mapObject(ALL_SHORTCUTS, (val, id) => ({ id, ...val })),
+ "shortcutGroup",
+ );
export const PaletteShortcutsModal = ({
onClose,
@@ -35,6 +35,17 @@ export const PaletteShortcutsModal = ({
onClose: ModalProps["onClose"];
open: boolean;
}) => {
+ const groupedShortcuts = useMemo(
+ () => (open ? groupShortcuts() : {}),
+ [open],
+ );
+ const shortcutGroups = useMemo(
+ () =>
+ // Unjustified type cast. FIXME
+ Object.keys(groupedShortcuts).filter((val) => !!val) as ShortcutGroup[],
+ [groupedShortcuts],
+ );
+
useHotkeys([
["Shift+?", onClose],
["?", onClose],
diff --git a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
index 4b86fc4e6e5..df973949f31 100644
--- a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
+++ b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
@@ -153,11 +153,15 @@ export const commonSetup = ({
app: createMockAdminAppState({
paths: [
{
- name: "Permissions",
+ getName: () => "Permissions",
path: "/admin/permissions",
key: "permissions",
},
- { name: "Settings", path: "/admin/settings", key: "settings" },
+ {
+ getName: () => "Settings",
+ path: "/admin/settings",
+ key: "settings",
+ },
],
}),
})
diff --git a/frontend/src/metabase/palette/shortcuts/index.ts b/frontend/src/metabase/palette/shortcuts/index.ts
index 259f251c392..e3e7fc4acb8 100644
--- a/frontend/src/metabase/palette/shortcuts/index.ts
+++ b/frontend/src/metabase/palette/shortcuts/index.ts
@@ -1,15 +1,17 @@
+import { mergeLazily } from "metabase/utils/merge-lazily";
+
import { adminShortcuts } from "./admin";
import { collectionShortcuts } from "./collection";
import { dashboardShortcuts } from "./dashboard";
import { globalShortcuts } from "./global";
import { questionShortcuts } from "./question";
-export const shortcuts = {
- ...globalShortcuts,
- ...dashboardShortcuts,
- ...collectionShortcuts,
- ...questionShortcuts,
- ...adminShortcuts,
-};
+export const shortcuts = mergeLazily(
+ globalShortcuts,
+ dashboardShortcuts,
+ collectionShortcuts,
+ questionShortcuts,
+ adminShortcuts,
+);
export type KeyboardShortcutId = keyof typeof shortcuts;
diff --git a/frontend/src/metabase/plugins/oss/caching.ts b/frontend/src/metabase/plugins/oss/caching.ts
index 58bd8380144..8f5db295856 100644
--- a/frontend/src/metabase/plugins/oss/caching.ts
+++ b/frontend/src/metabase/plugins/oss/caching.ts
@@ -150,13 +150,13 @@ export const getPerformanceTabMetadata = () =>
// Unjustified type cast. FIXME
[
{
- name: t`Database caching`,
+ getName: () => t`Database caching`,
path: "/admin/performance/databases",
key: "performance-databases",
tabId: PerformanceTabId.Databases,
},
{
- name: t`Model persistence`,
+ getName: () => t`Model persistence`,
path: "/admin/performance/models",
key: "performance-models",
tabId: PerformanceTabId.Models,
diff --git a/frontend/src/metabase/plugins/oss/collections.ts b/frontend/src/metabase/plugins/oss/collections.ts
index 761985e9465..5aca83119d9 100644
--- a/frontend/src/metabase/plugins/oss/collections.ts
+++ b/frontend/src/metabase/plugins/oss/collections.ts
@@ -75,7 +75,7 @@ const getDefaultPluginCollections = () => ({
useGetDefaultCollectionId: null as GetCollectionIdType | null,
// Unjustified type cast. FIXME
CUSTOM_INSTANCE_ANALYTICS_COLLECTION_ENTITY_ID: "" as BaseEntityId | "",
- INSTANCE_ANALYTICS_ADMIN_READONLY_MESSAGE:
+ getInstanceAnalyticsAdminReadonlyMessage: () =>
// eslint-disable-next-line metabase/no-literal-metabase-strings -- This string only shows for admins.
t`Administrators always have the highest level of access to everything in Metabase.`,
getAuthorityLevelMenuItems: (
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx
index 8a7ee2f9818..b801be7e487 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.tsx
@@ -85,12 +85,13 @@ function getVisibilityTypeName(visibilityType: VisibilityType) {
return visibilityType.name;
}
-const visibilityTypeOptions = FIELD_VISIBILITY_TYPES.filter(
- (type) => type.id !== "sensitive",
-).map((type) => ({
- name: getVisibilityTypeName(type),
- value: type.id,
-}));
+const getVisibilityTypeOptions = () =>
+ FIELD_VISIBILITY_TYPES.filter((type) => type.id !== "sensitive").map(
+ (type) => ({
+ name: getVisibilityTypeName(type),
+ value: type.id,
+ }),
+ );
const VIEW_AS_FIELDS = ["view_as", "link_text", "link_url"];
@@ -380,7 +381,7 @@ function DatasetFieldMetadataSidebarInner({
}}
onChange={handleVisibilityTypeChange}
>
- {visibilityTypeOptions.map((option) => (
+ {getVisibilityTypeOptions().map((option) => (
<Radio
key={`visibility-type-${option.value}`}
value={option.value}
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
index 0f1e94e1225..cb4d125f3a7 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
@@ -4,7 +4,7 @@ import { callMockEvent } from "__support__/events";
import { setupLastDownloadFormatEndpoints } from "__support__/server-mocks";
import { screen, waitForLoaderToBeRemoved, within } from "__support__/ui";
import { mockGetBoundingClientRect } from "__support__/utils";
-import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
+import { getBeforeUnloadUnsavedMessage } from "metabase/common/hooks/use-before-unload";
import { registerVisualizations } from "metabase/visualizations/register";
import {
@@ -53,7 +53,7 @@ describe("QueryBuilder - beforeunload events", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toBe(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toBe(getBeforeUnloadUnsavedMessage());
});
it("should not trigger beforeunload event when leaving unedited query", async () => {
@@ -81,7 +81,7 @@ describe("QueryBuilder - beforeunload events", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toBe(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toBe(getBeforeUnloadUnsavedMessage());
});
it("should not trigger beforeunload event when model metadata is unedited", async () => {
@@ -116,7 +116,7 @@ describe("QueryBuilder - beforeunload events", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toBe(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toBe(getBeforeUnloadUnsavedMessage());
});
it("should not trigger beforeunload event when leaving new empty native question", async () => {
@@ -148,7 +148,7 @@ describe("QueryBuilder - beforeunload events", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toEqual(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toEqual(getBeforeUnloadUnsavedMessage());
});
it("should trigger beforeunload event when user tries to leave an ad-hoc native query", async () => {
@@ -160,7 +160,7 @@ describe("QueryBuilder - beforeunload events", () => {
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
expect(mockEvent.preventDefault).toHaveBeenCalled();
- expect(mockEvent.returnValue).toEqual(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toEqual(getBeforeUnloadUnsavedMessage());
});
it("should not trigger beforeunload event when query is unedited", async () => {
diff --git a/frontend/src/metabase/querying/action-creator/tests/ActionCreator-Common.unit.spec.tsx b/frontend/src/metabase/querying/action-creator/tests/ActionCreator-Common.unit.spec.tsx
index 8e8f2354c9b..8b736e02fa3 100644
--- a/frontend/src/metabase/querying/action-creator/tests/ActionCreator-Common.unit.spec.tsx
+++ b/frontend/src/metabase/querying/action-creator/tests/ActionCreator-Common.unit.spec.tsx
@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
import { callMockEvent } from "__support__/events";
import { screen, waitFor } from "__support__/ui";
import { getDefaultFormSettings } from "metabase/actions/utils";
-import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
+import { getBeforeUnloadUnsavedMessage } from "metabase/common/hooks/use-before-unload";
import {
createMockActionParameter,
createMockImplicitQueryAction,
@@ -74,7 +74,7 @@ describe("ActionCreator > Common", () => {
).toHaveValue("Thanks!");
const mockEvent = callMockEvent(mockEventListener, "beforeunload");
- expect(mockEvent.returnValue).toEqual(BEFORE_UNLOAD_UNSAVED_MESSAGE);
+ expect(mockEvent.returnValue).toEqual(getBeforeUnloadUnsavedMessage());
expect(mockEvent.preventDefault).toHaveBeenCalled();
});
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsx
index 310d426411e..7c36dd94405 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.tsx
@@ -19,6 +19,7 @@ import CS from "metabase/css/core/index.css";
import { getUser } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { Box, Icon } from "metabase/ui";
+import { mergeLazily } from "metabase/utils/merge-lazily";
import type {
CardType,
Collection,
@@ -54,9 +55,9 @@ const getOurAnalyticsCollection = (
// A sentinel root node that buildCollectionTree special-cases by id; it isn't a
// real Collection, so we assert the type here rather than fabricate every field.
-const ALL_PERSONAL_COLLECTIONS_ROOT = {
- ...PERSONAL_COLLECTIONS,
-} as Collection;
+const ALL_PERSONAL_COLLECTIONS_ROOT = mergeLazily(
+ PERSONAL_COLLECTIONS,
+) as Collection;
export function SavedEntityPicker(props: SavedEntityPickerProps) {
const { data: collections } = useListCollectionsTreeQuery({
diff --git a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx
index 6b26da2ebd7..c7ca29be2d8 100644
--- a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx
+++ b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx
@@ -4,8 +4,7 @@ import { Button, Flex, Icon } from "metabase/ui";
import ExpressionWidgetHeaderS from "./ExpressionWidgetHeader.module.css";
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const DEFAULT_SECTION_NAME = t`Custom Expression`;
+const getDefaultSectionName = () => t`Custom Expression`;
interface Props {
title?: string;
@@ -14,7 +13,7 @@ interface Props {
}
export const ExpressionWidgetHeader = ({
- title = DEFAULT_SECTION_NAME,
+ title = getDefaultSectionName(),
onBack,
}: Props): JSX.Element => {
return (
diff --git a/frontend/src/metabase/redux/store/admin.ts b/frontend/src/metabase/redux/store/admin.ts
index 3494afabc58..00adc37736a 100644
--- a/frontend/src/metabase/redux/store/admin.ts
+++ b/frontend/src/metabase/redux/store/admin.ts
@@ -23,7 +23,7 @@ export type AdminPathKey =
export type AdminPath = {
key: AdminPathKey;
- name: string;
+ getName: () => string;
path: string;
};
diff --git a/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx b/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx
index 2c06410687b..9b30f734984 100644
--- a/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx
+++ b/frontend/src/metabase/route-guards/auth-guards.unit.spec.tsx
@@ -126,7 +126,7 @@ describe("route-guards", () => {
describe("CanAccessSettings", () => {
const DATABASES_PATH: AdminPath = {
- name: "Databases",
+ getName: () => "Databases",
path: "/admin/databases",
key: "databases",
};
diff --git a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx
index eaf7dde0518..810d9d8e459 100644
--- a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx
+++ b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx
@@ -14,19 +14,22 @@ import * as Errors from "metabase/utils/errors";
import S from "./InviteUserForm.module.css";
-const INVITE_USER_SCHEMA = Yup.object({
- first_name: Yup.string().nullable().default(null).max(100, Errors.maxLength),
- last_name: Yup.string().nullable().default(null).max(100, Errors.maxLength),
- email: Yup.string()
- .default("")
- .required(Errors.required)
- .email(Errors.email)
- .notOneOf(
- [Yup.ref("$email")],
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- t`must be different from the email address you used in setup`,
- ),
-});
+const getInviteUserSchema = () =>
+ Yup.object({
+ first_name: Yup.string()
+ .nullable()
+ .default(null)
+ .max(100, Errors.maxLength),
+ last_name: Yup.string().nullable().default(null).max(100, Errors.maxLength),
+ email: Yup.string()
+ .default("")
+ .required(Errors.required)
+ .email(Errors.email)
+ .notOneOf(
+ [Yup.ref("$email")],
+ t`must be different from the email address you used in setup`,
+ ),
+ });
interface InviteUserFormProps {
user?: UserInfo;
@@ -40,13 +43,13 @@ export const InviteUserForm = ({
onSubmit,
}: InviteUserFormProps): JSX.Element => {
const initialValues = useMemo(() => {
- return invite ?? INVITE_USER_SCHEMA.getDefault();
+ return invite ?? getInviteUserSchema().getDefault();
}, [invite]);
return (
<FormProvider
initialValues={initialValues}
- validationSchema={INVITE_USER_SCHEMA}
+ validationSchema={getInviteUserSchema()}
validationContext={user}
onSubmit={onSubmit}
>
diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx
index 4b795882158..dc32d41dd07 100644
--- a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx
+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx
@@ -21,7 +21,7 @@ import {
UnstyledButton,
} from "metabase/ui";
-import { LICENSE_TOKEN_SCHEMA } from "./constants";
+import { getLicenseTokenSchema } from "./constants";
type LicenseTokenFormProps = {
onSubmit: (token: string) => Promise<void>;
@@ -47,7 +47,7 @@ export const LicenseTokenForm = ({
return (
<FormProvider
initialValues={{ license_token: initialValue }}
- validationSchema={LICENSE_TOKEN_SCHEMA}
+ validationSchema={getLicenseTokenSchema()}
onSubmit={(values) => onSubmit(values.license_token)}
>
{({ errors, setValues }) => (
diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx
index 5caf72455c8..aae52400004 100644
--- a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx
+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx
@@ -2,10 +2,11 @@ import * as Yup from "yup";
import * as Errors from "metabase/utils/errors";
-export const LICENSE_TOKEN_SCHEMA = Yup.object({
- license_token: Yup.string()
- .test("license-token-test", Errors.exactLength({ length: 64 }), (value) =>
- Boolean(value?.length === 64 || value?.startsWith("airgap_")),
- )
- .required(Errors.required),
-});
+export const getLicenseTokenSchema = () =>
+ Yup.object({
+ license_token: Yup.string()
+ .test("license-token-test", Errors.exactLength({ length: 64 }), (value) =>
+ Boolean(value?.length === 64 || value?.startsWith("airgap_")),
+ )
+ .required(Errors.required),
+ });
diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx
index d7597abbaa7..3c63ae8a57d 100644
--- a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx
@@ -1,45 +1,47 @@
import * as Errors from "metabase/utils/errors";
-import { LICENSE_TOKEN_SCHEMA } from "./constants";
+import { getLicenseTokenSchema } from "./constants";
-describe("LICENSE_TOKEN_SCHEMA", () => {
+describe("getLicenseTokenSchema()", () => {
it("should validate a valid license token with the correct length", async () => {
const validLicenseToken = "a".repeat(64);
await expect(
- LICENSE_TOKEN_SCHEMA.validate({ license_token: validLicenseToken }),
+ getLicenseTokenSchema().validate({ license_token: validLicenseToken }),
).resolves.toEqual({ license_token: validLicenseToken });
});
it('should validate a valid license token that starts with "airgap_"', async () => {
const validLicenseTokenAirgap = "airgap_toucan";
await expect(
- LICENSE_TOKEN_SCHEMA.validate({ license_token: validLicenseTokenAirgap }),
+ getLicenseTokenSchema().validate({
+ license_token: validLicenseTokenAirgap,
+ }),
).resolves.toEqual({ license_token: validLicenseTokenAirgap });
});
it("should show a length error for an invalid length license token", async () => {
const invalidLicenseToken = "a".repeat(63); // One character too short and does not start with "airgap_"
await expect(
- LICENSE_TOKEN_SCHEMA.validate({ license_token: invalidLicenseToken }),
+ getLicenseTokenSchema().validate({ license_token: invalidLicenseToken }),
).rejects.toThrow(Errors.exactLength({ length: 64 }));
});
it("should show the length error when license token is not provided", async () => {
- await expect(LICENSE_TOKEN_SCHEMA.validate({})).rejects.toThrow(
+ await expect(getLicenseTokenSchema().validate({})).rejects.toThrow(
Errors.exactLength({ length: 64 }),
);
});
it("should show an error when license token is undefined", async () => {
await expect(
- LICENSE_TOKEN_SCHEMA.validate({ license_token: undefined }),
+ getLicenseTokenSchema().validate({ license_token: undefined }),
).rejects.toThrow(Errors.exactLength({ length: 64 }));
});
it('should not validate a license token with invalid length that does not start with "airgap_"', async () => {
const invalidLicenseToken = "b".repeat(65); // Too long and does not start with "airgap_"
await expect(
- LICENSE_TOKEN_SCHEMA.validate({ license_token: invalidLicenseToken }),
+ getLicenseTokenSchema().validate({ license_token: invalidLicenseToken }),
).rejects.toThrow(Errors.exactLength({ length: 64 }));
});
});
diff --git a/frontend/src/metabase/setup/components/UserForm/UserForm.tsx b/frontend/src/metabase/setup/components/UserForm/UserForm.tsx
index 1c1df44db27..0dbd176fadb 100644
--- a/frontend/src/metabase/setup/components/UserForm/UserForm.tsx
+++ b/frontend/src/metabase/setup/components/UserForm/UserForm.tsx
@@ -16,24 +16,30 @@ import { memoize } from "metabase/utils/memoize";
import { UserFieldGroup } from "./UserForm.styled";
-const USER_SCHEMA = Yup.object({
- first_name: Yup.string().nullable().default(null).max(100, Errors.maxLength),
- last_name: Yup.string().nullable().default(null).max(100, Errors.maxLength),
- email: Yup.string().default("").required(Errors.required).email(Errors.email),
- site_name: Yup.string().default("").required(Errors.required),
- password: Yup.string()
- .default("")
- .required(Errors.required)
- .test(async (value = "", context) => {
- const error = await context.options.context?.onValidatePassword(value);
- return error ? context.createError({ message: error }) : true;
- }),
- password_confirm: Yup.string()
- .default("")
- .required(Errors.required)
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- .oneOf([Yup.ref("password")], t`passwords do not match`),
-});
+const getUserSchema = () =>
+ Yup.object({
+ first_name: Yup.string()
+ .nullable()
+ .default(null)
+ .max(100, Errors.maxLength),
+ last_name: Yup.string().nullable().default(null).max(100, Errors.maxLength),
+ email: Yup.string()
+ .default("")
+ .required(Errors.required)
+ .email(Errors.email),
+ site_name: Yup.string().default("").required(Errors.required),
+ password: Yup.string()
+ .default("")
+ .required(Errors.required)
+ .test(async (value = "", context) => {
+ const error = await context.options.context?.onValidatePassword(value);
+ return error ? context.createError({ message: error }) : true;
+ }),
+ password_confirm: Yup.string()
+ .default("")
+ .required(Errors.required)
+ .oneOf([Yup.ref("password")], t`passwords do not match`),
+ });
interface UserFormProps {
user?: UserInfo;
@@ -48,13 +54,13 @@ export const UserForm = ({ user, isHosted, onSubmit }: UserFormProps) => {
[validatePassword],
);
const initialValues = useMemo(() => {
- return user ?? USER_SCHEMA.getDefault();
+ return user ?? getUserSchema().getDefault();
}, [user]);
return (
<FormProvider
initialValues={initialValues}
- validationSchema={USER_SCHEMA}
+ validationSchema={getUserSchema()}
validationContext={validationContext}
onSubmit={onSubmit}
>
diff --git a/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsx b/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsx
index 866130341d1..77d115cdb7d 100644
--- a/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsx
+++ b/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsx
@@ -15,8 +15,9 @@ export const selectOverrides = {
<DefaultSelectItem {...item.option} selected={item.checked} />
),
clearButtonProps: {
- // eslint-disable-next-line ttag/no-module-declaration
- "aria-label": t`Clear`,
+ get "aria-label"() {
+ return t`Clear`;
+ },
color: "text-primary",
className: S.SelectClearButton,
},
diff --git a/frontend/src/metabase/ui/components/overlays/Modal/Modal.config.tsx b/frontend/src/metabase/ui/components/overlays/Modal/Modal.config.tsx
index 2563ef8cceb..6bff05de7a9 100644
--- a/frontend/src/metabase/ui/components/overlays/Modal/Modal.config.tsx
+++ b/frontend/src/metabase/ui/components/overlays/Modal/Modal.config.tsx
@@ -45,8 +45,9 @@ export const modalOverrides = {
ModalCloseButton: Modal.CloseButton.extend({
defaultProps: {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- "aria-label": t`Close`,
+ get "aria-label"() {
+ return t`Close`;
+ },
},
}),
};
diff --git a/frontend/src/metabase/utils/constants.ts b/frontend/src/metabase/utils/constants.ts
index 5a9b29ee18c..a964d499d70 100644
--- a/frontend/src/metabase/utils/constants.ts
+++ b/frontend/src/metabase/utils/constants.ts
@@ -6,5 +6,9 @@ export const DEFAULT_SEARCH_LIMIT = 50;
export const EMPTY_CELL_PLACEHOLDER = "—";
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-export const NULL_DISPLAY_VALUE = t`(empty)`;
+// Pie and treemap slice settings persist this key for a null dimension value.
+// It stays the untranslated label so a chart saved in one locale keeps its
+// slice settings when it is opened in another.
+export const NULL_DIMENSION_KEY = "(empty)";
+
+export const getNullDisplayValue = () => t`(empty)`;
diff --git a/frontend/src/metabase/utils/formatting/nullable.ts b/frontend/src/metabase/utils/formatting/nullable.ts
index efaf102541f..7655dead463 100644
--- a/frontend/src/metabase/utils/formatting/nullable.ts
+++ b/frontend/src/metabase/utils/formatting/nullable.ts
@@ -1,5 +1,5 @@
-import { NULL_DISPLAY_VALUE } from "../constants";
+import { getNullDisplayValue } from "../constants";
export function formatNullable<T>(value: T | null | undefined) {
- return value ?? NULL_DISPLAY_VALUE;
+ return value ?? getNullDisplayValue();
}
diff --git a/frontend/src/metabase/utils/merge-lazily.ts b/frontend/src/metabase/utils/merge-lazily.ts
new file mode 100644
index 00000000000..5c673e6d38e
--- /dev/null
+++ b/frontend/src/metabase/utils/merge-lazily.ts
@@ -0,0 +1,65 @@
+type UnionToIntersection<Union> = (
+ Union extends unknown ? (arg: Union) => void : never
+) extends (arg: infer Intersection) => void
+ ? Intersection
+ : never;
+
+/**
+ * Merges objects by copying property descriptors rather than reading values.
+ *
+ * A spread or a rest destructure evaluates every getter it copies. Where an
+ * object holds `get name() { return t`...`; }` so that the string translates
+ * when it is read, spreading that object at module scope translates it at
+ * import instead, and the result is frozen in whatever language was loaded.
+ * This keeps the getters as getters.
+ *
+ * At runtime the last source wins, as it does in a spread. The return type is
+ * an intersection of the sources rather than an override of one by the next,
+ * because a recursive override type is too expensive for tsc on the larger
+ * merges here. Two sources that give the same key incompatible types therefore
+ * read back as `never` instead of as the last source's type.
+ */
+export function mergeLazily<Sources extends object[]>(
+ ...sources: Sources
+): UnionToIntersection<Sources[number]> {
+ const target = {};
+ for (const source of sources) {
+ Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+ }
+ // Object.defineProperties returns a plain object; the shape is what the
+ // descriptors carry.
+ return target as UnionToIntersection<Sources[number]>;
+}
+
+/**
+ * Like `mergeLazily`, but drops the named keys. Use it where a helper consumes
+ * some keys itself and passes the rest on.
+ */
+export function omitLazily<Result extends object>(
+ source: object,
+ keys: string[],
+): Result {
+ const descriptors = Object.getOwnPropertyDescriptors(source);
+ for (const key of keys) {
+ // Descriptor maps are keyed by the source's own property names.
+ delete descriptors[key as keyof typeof descriptors];
+ }
+ // Object.defineProperties returns a plain object; the shape is what the
+ // descriptors carry.
+ return Object.defineProperties({}, descriptors) as Result;
+}
+
+/**
+ * Copies properties onto an existing object without reading them.
+
+ * `Object.assign` evaluates getters; this keeps them.
+ */
+export function assignLazily<Target extends object, Source extends object>(
+ target: Target,
+ source: Source,
+): Target & Source {
+ Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+ // Object.defineProperties returns a plain object; the shape is what the
+ // descriptors carry.
+ return target as Target & Source;
+}
diff --git a/frontend/src/metabase/value-formatting/column.ts b/frontend/src/metabase/value-formatting/column.ts
index 1e7ff3a2030..9e29297e2a7 100644
--- a/frontend/src/metabase/value-formatting/column.ts
+++ b/frontend/src/metabase/value-formatting/column.ts
@@ -1,10 +1,10 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import type { DatasetColumn } from "metabase-types/api/dataset";
export function displayNameForColumn(column: DatasetColumn): string {
return (
column?.remapped_to_column?.display_name ??
column?.display_name ??
- NULL_DISPLAY_VALUE
+ getNullDisplayValue()
);
}
diff --git a/frontend/src/metabase/value-formatting/link.ts b/frontend/src/metabase/value-formatting/link.ts
index a36be26a53c..0f248cd1e03 100644
--- a/frontend/src/metabase/value-formatting/link.ts
+++ b/frontend/src/metabase/value-formatting/link.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
import { isDate } from "metabase-lib/v1/types/utils/isa";
import type { ColumnSettings, ParameterValueOrArray } from "metabase-types/api";
@@ -86,7 +86,7 @@ export function renderLinkURLForClick(
if (
valueForLinkTemplate == null ||
- valueForLinkTemplate === NULL_DISPLAY_VALUE
+ valueForLinkTemplate === getNullDisplayValue()
) {
return "";
}
diff --git a/frontend/src/metabase/value-formatting/value.tsx b/frontend/src/metabase/value-formatting/value.tsx
index 07c07b3fbc7..8388829f358 100644
--- a/frontend/src/metabase/value-formatting/value.tsx
+++ b/frontend/src/metabase/value-formatting/value.tsx
@@ -2,7 +2,7 @@ import cx from "classnames";
import CS from "metabase/css/core/index.css";
import { type Dayjs, dayjs } from "metabase/dayjs";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { formatNumber, removeNewLines } from "metabase/utils/formatting";
import { parseNumber } from "metabase/utils/number";
import {
@@ -210,7 +210,7 @@ export function formatValueRaw(
}
if (value == null) {
- return options.stringifyNull ? NULL_DISPLAY_VALUE : null;
+ return options.stringifyNull ? getNullDisplayValue() : null;
} else if (
options.view_as !== "image" &&
options.click_behavior &&
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx
index c67c9982eff..25c55588467 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx
@@ -2,7 +2,7 @@ import cx from "classnames";
import { isValidElement, useMemo } from "react";
import CS from "metabase/css/core/index.css";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import {
type ComputedVisualizationSettings,
type DataPoint,
@@ -117,7 +117,7 @@ const getRows = (hovered: HoveredObject) => {
export const getRowFromDataPoint = (data: DataPoint) => ({
...data,
- key: data.key || (data?.col?.display_name ?? NULL_DISPLAY_VALUE),
+ key: data.key || (data?.col?.display_name ?? getNullDisplayValue()),
});
const getRowFromDimension = ({ column, value }: HoveredDimension) => ({
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx
index 3d1c1821edb..255fc372dc2 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import type { DragEndEvent } from "metabase/common/components/Sortable";
import { Box } from "metabase/ui";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { isEmpty } from "metabase/utils/validate";
import type { Series } from "metabase-types/api";
@@ -76,7 +76,7 @@ export const ChartSettingOrderedSimple = ({
const getItemTitle = useCallback((item: SortableItem) => {
if (isEmpty(item.name)) {
- return NULL_DISPLAY_VALUE;
+ return getNullDisplayValue();
}
return item.name;
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
index 4571ed0f543..f67e0d78b69 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
@@ -9,7 +9,7 @@ import type { DragEndEvent } from "metabase/common/components/Sortable";
import { Box, Button, Flex, Group, Icon, Select, Text } from "metabase/ui";
import { color } from "metabase/ui/colors";
import { getNamedAccentColors } from "metabase/ui/colors/groups";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { getEventTarget } from "metabase/utils/dom";
import { isEmpty } from "metabase/utils/validate";
import type {
@@ -99,7 +99,7 @@ export const ChartSettingSeriesOrder = ({
);
const getItemTitle = useCallback((item: ChartSettingSeriesOrderItem) => {
- return isEmpty(item.name) ? NULL_DISPLAY_VALUE : item.name;
+ return isEmpty(item.name) ? getNullDisplayValue() : item.name;
}, []);
const handleOnEdit = useCallback(
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleDescription.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleDescription.tsx
index 0770da2c251..ea0c3b7d80b 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleDescription.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleDescription.tsx
@@ -7,7 +7,7 @@ import type {
ColumnSingleFormattingSetting,
} from "metabase-types/api";
-import { ALL_OPERATOR_NAMES } from "./get-operators-for-columns";
+import { getAllOperatorNames } from "./get-operators-for-columns";
export const getValueForDescription = (rule: ColumnSingleFormattingSetting) =>
["is-null", "not-null"].includes(rule.operator) ? "" : ` ${rule.value}`;
@@ -29,7 +29,7 @@ export const RuleDescription = ({
(singleRule) =>
jt`When a cell in these columns ${(
<Text component="span" key="bold" fw="bold" lh="normal">
- {ALL_OPERATOR_NAMES[singleRule.operator]}
+ {getAllOperatorNames()[singleRule.operator]}
{getValueForDescription(singleRule)}
</Text>
)} it will be tinted this color.`,
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/get-operators-for-columns.ts b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/get-operators-for-columns.ts
index e000cce8252..f981f67e814 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/get-operators-for-columns.ts
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/get-operators-for-columns.ts
@@ -12,49 +12,33 @@ import type {
DatasetColumn,
} from "metabase-types/api";
-const COMMON_OPERATOR_NAMES = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+const commonOperatorNames = () => ({
"is-null": t`is null`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"not-null": t`is not null`,
-};
+});
-const NUMBER_OPERATOR_NAMES = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+const numberOperatorNames = () => ({
"=": t`is equal to`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"!=": t`is not equal to`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"<": t`is less than`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
">": t`is greater than`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"<=": t`is less than or equal to`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
">=": t`is greater than or equal to`,
-};
+});
-const STRING_OPERATOR_NAMES = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+const stringOperatorNames = () => ({
"=": t`is equal to`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"!=": t`is not equal to`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
contains: t`contains`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"does-not-contain": t`does not contain`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"starts-with": t`starts with`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"ends-with": t`ends with`,
-};
+});
-const BOOLEAN_OPERATOR_NAMES = {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
+const booleanOperatorNames = () => ({
"is-true": t`is true`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
"is-false": t`is false`,
-};
+});
const not =
(...fns: ((field: DatasetColumn) => boolean)[]) =>
@@ -66,12 +50,15 @@ const or =
(field: DatasetColumn) =>
fns.some((fn) => fn(field));
-export const ALL_OPERATOR_NAMES: Record<ColumnFormattingOperator, string> = {
- ...NUMBER_OPERATOR_NAMES,
- ...STRING_OPERATOR_NAMES,
- ...BOOLEAN_OPERATOR_NAMES,
- ...COMMON_OPERATOR_NAMES,
-};
+export const getAllOperatorNames = (): Record<
+ ColumnFormattingOperator,
+ string
+> => ({
+ ...numberOperatorNames(),
+ ...stringOperatorNames(),
+ ...booleanOperatorNames(),
+ ...commonOperatorNames(),
+});
export function getOperatorsForColumns(
columns: (DatasetColumn | undefined)[],
@@ -103,7 +90,7 @@ export function getOperatorsForColumns(
return {
...defaultResult,
isBooleanRule: true,
- operators: { ...COMMON_OPERATOR_NAMES, ...BOOLEAN_OPERATOR_NAMES },
+ operators: { ...commonOperatorNames(), ...booleanOperatorNames() },
isFieldDisabled: not(isBoolean),
};
}
@@ -114,7 +101,7 @@ export function getOperatorsForColumns(
...defaultResult,
isKeyRule: true,
isStringRule: true,
- operators: { ...COMMON_OPERATOR_NAMES, ...STRING_OPERATOR_NAMES },
+ operators: { ...commonOperatorNames(), ...stringOperatorNames() },
isFieldDisabled: not(isPK, isFK),
};
}
@@ -124,7 +111,7 @@ export function getOperatorsForColumns(
return {
...defaultResult,
isStringRule: true,
- operators: { ...COMMON_OPERATOR_NAMES, ...STRING_OPERATOR_NAMES },
+ operators: { ...commonOperatorNames(), ...stringOperatorNames() },
isFieldDisabled: or(not(isString), isBoolean),
};
}
@@ -134,7 +121,7 @@ export function getOperatorsForColumns(
return {
...defaultResult,
isNumericRule: true,
- operators: { ...COMMON_OPERATOR_NAMES, ...NUMBER_OPERATOR_NAMES },
+ operators: { ...commonOperatorNames(), ...numberOperatorNames() },
isFieldDisabled: or(not(isNumeric), isPK, isFK),
};
}
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/index.ts b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/index.ts
index 8818d9775e6..6a5452c119e 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/index.ts
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/index.ts
@@ -1,3 +1,3 @@
export { ChartSettingsTableFormatting } from "./ChartSettingsTableFormatting";
export { isFormattable } from "./util";
-export { ALL_OPERATOR_NAMES } from "./get-operators-for-columns";
+export { getAllOperatorNames } from "./get-operators-for-columns";
diff --git a/frontend/src/metabase/visualizations/tests/table-formatting-operator-contract.unit.spec.ts b/frontend/src/metabase/visualizations/tests/table-formatting-operator-contract.unit.spec.ts
index 50c13b592b2..f6d62978286 100644
--- a/frontend/src/metabase/visualizations/tests/table-formatting-operator-contract.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/tests/table-formatting-operator-contract.unit.spec.ts
@@ -1,4 +1,4 @@
-import { ALL_OPERATOR_NAMES } from "metabase/visualizations/components/settings/ChartSettingsTableFormatting";
+import { getAllOperatorNames } from "metabase/visualizations/components/settings/ChartSettingsTableFormatting";
import { OPERATOR_FORMATTER_FACTORIES } from "metabase/viz-core";
describe("table formatting operator contract", () => {
@@ -6,7 +6,7 @@ describe("table formatting operator contract", () => {
// This test is to remind anyone adding/removing operator support,
// that the same should be done to `OPERATOR_FORMATTER_FACTORIES`.
const supportedOperators = Object.keys(OPERATOR_FORMATTER_FACTORIES).sort();
- const definedOperators = Object.keys(ALL_OPERATOR_NAMES).sort();
+ const definedOperators = Object.keys(getAllOperatorNames()).sort();
expect(supportedOperators).toEqual(definedOperators);
});
diff --git a/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx b/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx
index 2bc75748202..5dc927bcc50 100644
--- a/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/AreaChart/AreaChart.tsx
@@ -1,3 +1,4 @@
+import { assignLazily } from "metabase/utils/merge-lazily";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
import type { VisualizationProps } from "../../types";
@@ -8,7 +9,7 @@ function AreaChartComponent(props: VisualizationProps) {
return <CartesianChart {...props} />;
}
-export const AreaChart = Object.assign(
+export const AreaChart = assignLazily(
AreaChartComponent,
AREA_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/AreaChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/AreaChart/definition.ts
index 44e89ba25ea..bf18a470026 100644
--- a/frontend/src/metabase/visualizations/visualizations/AreaChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/AreaChart/definition.ts
@@ -15,8 +15,9 @@ const AreaViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
getUiName: () => t`Area`,
identifier: "area",
iconName: "area",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`area chart`,
+ get noun() {
+ return t`area chart`;
+ },
minSize: getMinSize("area"),
defaultSize: getDefaultSize("area"),
settings: {
diff --git a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx
index d5b58df647e..bc5ec11f4c9 100644
--- a/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BarChart/BarChart.tsx
@@ -1,3 +1,4 @@
+import { assignLazily } from "metabase/utils/merge-lazily";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
import type { VisualizationProps } from "../../types";
@@ -8,4 +9,4 @@ function BarChartComponent(props: VisualizationProps) {
return <CartesianChart {...props} />;
}
-export const BarChart = Object.assign(BarChartComponent, BAR_CHART_DEFINITION);
+export const BarChart = assignLazily(BarChartComponent, BAR_CHART_DEFINITION);
diff --git a/frontend/src/metabase/visualizations/visualizations/BarChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/BarChart/definition.ts
index 45daf6f2340..0505a288d35 100644
--- a/frontend/src/metabase/visualizations/visualizations/BarChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/BarChart/definition.ts
@@ -15,8 +15,9 @@ const BarViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
getUiName: () => t`Bar`,
identifier: "bar",
iconName: "bar",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`bar chart`,
+ get noun() {
+ return t`bar chart`;
+ },
minSize: getMinSize("bar"),
defaultSize: getDefaultSize("bar"),
settings: {
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
index eeeaad3216b..c9060e694ef 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
@@ -3,6 +3,7 @@ import { type MouseEvent, useCallback, useMemo, useRef, useState } from "react";
import { useSet } from "react-use";
import { isReducedMotionPreferred } from "metabase/utils/dom";
+import { assignLazily } from "metabase/utils/merge-lazily";
import { ChartRenderingErrorBoundary } from "metabase/visualizations/components/ChartRenderingErrorBoundary";
import { ResponsiveEChartsRenderer } from "metabase/visualizations/components/EChartsRenderer";
import { LegendCaption } from "metabase/visualizations/components/legend/LegendCaption";
@@ -241,7 +242,4 @@ function BoxPlotComponent(props: VisualizationProps) {
);
}
-export const BoxPlot = Object.assign(
- BoxPlotComponent,
- BOXPLOT_CHART_DEFINITION,
-);
+export const BoxPlot = assignLazily(BoxPlotComponent, BOXPLOT_CHART_DEFINITION);
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/definition.ts b/frontend/src/metabase/visualizations/visualizations/BoxPlot/definition.ts
index 6d2d8c3fd11..ae6ae70723f 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/definition.ts
@@ -19,8 +19,9 @@ export const BOXPLOT_CHART_DEFINITION: VisualizationDefinition = {
getUiName: () => t`Box Plot`,
identifier: "boxplot",
iconName: "boxplot",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`box plot`,
+ get noun() {
+ return t`box plot`;
+ },
minSize: getMinSize("boxplot"),
defaultSize: getDefaultSize("boxplot"),
maxMetricsSupported: Infinity,
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.ts
index 0e3a3266b08..ba2c85572f6 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/definition.ts
@@ -1,5 +1,6 @@
import _ from "underscore";
+import { mergeLazily } from "metabase/utils/merge-lazily";
import {
GRAPH_AXIS_SETTINGS,
GRAPH_COLORS_SETTINGS,
@@ -106,23 +107,22 @@ export const getCartesianChartDefinition = <
T extends Partial<VisualizationDefinition>,
>(
props: T,
-): T & CartesianChartAdditions => ({
- ...cartesianChartAdditions,
- ...props,
-});
+): T & CartesianChartAdditions =>
+ // mergeLazily cannot express an intersection with a generic parameter.
+ mergeLazily(cartesianChartAdditions, props) as T & CartesianChartAdditions;
export const COMBO_CHARTS_SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions =
- {
- ...STACKABLE_SETTINGS,
- ...SPLIT_PANELS_SETTINGS,
- ...LINE_SETTINGS,
- ...GRAPH_GOAL_SETTINGS,
- ...GRAPH_TREND_SETTINGS,
- ...GRAPH_COLORS_SETTINGS,
- ...GRAPH_AXIS_SETTINGS,
- ...GRAPH_DISPLAY_VALUES_SETTINGS,
- ...GRAPH_DATA_SETTINGS,
- ...TOOLTIP_SETTINGS,
- ...LEGEND_SETTINGS,
- ...TIMELINE_EVENTS_SETTINGS,
- };
+ mergeLazily(
+ STACKABLE_SETTINGS,
+ SPLIT_PANELS_SETTINGS,
+ LINE_SETTINGS,
+ GRAPH_GOAL_SETTINGS,
+ GRAPH_TREND_SETTINGS,
+ GRAPH_COLORS_SETTINGS,
+ GRAPH_AXIS_SETTINGS,
+ GRAPH_DISPLAY_VALUES_SETTINGS,
+ GRAPH_DATA_SETTINGS,
+ TOOLTIP_SETTINGS,
+ LEGEND_SETTINGS,
+ TIMELINE_EVENTS_SETTINGS,
+ );
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
index 185869fe187..11e0633a43a 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
@@ -5,7 +5,7 @@ import { isNative } from "metabase/common/utils/card";
import { dayjs } from "metabase/dayjs";
import { selectQuestionFromCard } from "metabase/metadata-store";
import type { State } from "metabase/redux/store";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { formatChangeWithSign, formatPercent } from "metabase/utils/formatting";
import { getObjectKeys } from "metabase/utils/objects";
import {
@@ -223,7 +223,7 @@ const getEventColumnsData = (
const displayValue =
isBreakoutSeries(seriesModel) && seriesModel.breakoutColumn === col
? seriesModel.name
- : (value ?? NULL_DISPLAY_VALUE);
+ : (value ?? getNullDisplayValue());
return {
key,
diff --git a/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx b/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx
index 117116a6c51..0ce5443411b 100644
--- a/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/ComboChart/ComboChart.tsx
@@ -1,3 +1,4 @@
+import { assignLazily } from "metabase/utils/merge-lazily";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
import type { VisualizationProps } from "../../types";
@@ -8,7 +9,7 @@ function ComboChartComponent(props: VisualizationProps) {
return <CartesianChart {...props} />;
}
-export const ComboChart = Object.assign(
+export const ComboChart = assignLazily(
ComboChartComponent,
COMBO_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/ComboChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/ComboChart/definition.ts
index 0efeb2191c8..2da3cd294dd 100644
--- a/frontend/src/metabase/visualizations/visualizations/ComboChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/ComboChart/definition.ts
@@ -17,8 +17,9 @@ const ComboViz: Omit<
getUiName: () => t`Combo`,
identifier: "combo",
iconName: "lineandbar",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`line and bar chart`,
+ get noun() {
+ return t`line and bar chart`;
+ },
minSize: getMinSize("combo"),
defaultSize: getDefaultSize("combo"),
settings: {
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts b/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts
index 6aefd2390cc..8ef3be75408 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/definition.ts
@@ -68,8 +68,9 @@ export const FUNNEL_CHART_DEFINITION: VisualizationDefinition = {
...columnSettings({ getHidden: () => true }),
...dimensionSetting("funnel.dimension", {
getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
- title: t`Column with steps`,
+ get title() {
+ return t`Column with steps`;
+ },
dashboard: false,
useRawSeries: true,
showColumnSetting: true,
@@ -141,16 +142,18 @@ export const FUNNEL_CHART_DEFINITION: VisualizationDefinition = {
...metricSetting("funnel.metric", {
getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
- title: t`Measure`,
+ get title() {
+ return t`Measure`;
+ },
dashboard: false,
useRawSeries: true,
showColumnSetting: true,
}),
"funnel.type": {
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504
- title: t`Funnel type`,
+ get title() {
+ return t`Funnel type`;
+ },
getSection: () => t`Display`,
diff --git a/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx b/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx
index 824b17aee26..4b44b4eed73 100644
--- a/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/LineChart/LineChart.tsx
@@ -1,3 +1,4 @@
+import { assignLazily } from "metabase/utils/merge-lazily";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
import type { VisualizationProps } from "../../types";
@@ -8,7 +9,7 @@ function LineChartComponent(props: VisualizationProps) {
return <CartesianChart {...props} />;
}
-export const LineChart = Object.assign(
+export const LineChart = assignLazily(
LineChartComponent,
LINE_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/LineChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/LineChart/definition.ts
index adf11b5fc1f..29703fe1cc2 100644
--- a/frontend/src/metabase/visualizations/visualizations/LineChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/LineChart/definition.ts
@@ -15,8 +15,9 @@ const LineViz: Omit<VisualizationDefinition, "isSensible" | "checkRenderable"> =
getUiName: () => t`Line`,
identifier: "line",
iconName: "line",
- // eslint-disable-next-line ttag/no-module-declaration
- noun: t`line chart`,
+ get noun() {
+ return t`line chart`;
+ },
minSize: getMinSize("line"),
defaultSize: getDefaultSize("line"),
settings: {
diff --git a/frontend/src/metabase/visualizations/visualizations/ObjectDetail/ObjectDetail.ts b/frontend/src/metabase/visualizations/visualizations/ObjectDetail/ObjectDetail.ts
index 7e632209166..c8e1236bd1d 100644
--- a/frontend/src/metabase/visualizations/visualizations/ObjectDetail/ObjectDetail.ts
+++ b/frontend/src/metabase/visualizations/visualizations/ObjectDetail/ObjectDetail.ts
@@ -1,8 +1,9 @@
+import { assignLazily } from "metabase/utils/merge-lazily";
import { ObjectDetail } from "metabase/visualizations/components/ObjectDetail";
import { OBJECT_DETAIL_DEFINITION } from "./definition";
-const ObjectDetailWithProperties = Object.assign(
+const ObjectDetailWithProperties = assignLazily(
ObjectDetail,
OBJECT_DETAIL_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/DimensionsWidget.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/DimensionsWidget.tsx
index 173c1072b1e..a3ab5912a52 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/DimensionsWidget.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/DimensionsWidget.tsx
@@ -69,22 +69,15 @@ function DimensionPicker({
);
}
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const BREAKOUT_TITLE = t`Breakout`;
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const INNER_RING_TITLE = t`Inner Ring`;
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const MIDDLE_RING_TITLE = t`Middle Ring`;
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-const OUTER_RING_TITLE = t`Outer Ring`;
-
-const SINGLE_RING_SETTING_TITLES = [BREAKOUT_TITLE];
-const TWO_RING_SETTING_TITLES = [INNER_RING_TITLE, OUTER_RING_TITLE];
-const THREE_RING_SETTING_TITLES = [
- INNER_RING_TITLE,
- MIDDLE_RING_TITLE,
- OUTER_RING_TITLE,
-];
+const getDimensionTitles = (ringCount: number) => {
+ if (ringCount === 1) {
+ return [t`Breakout`];
+ }
+ if (ringCount === 2) {
+ return [t`Inner Ring`, t`Outer Ring`];
+ }
+ return [t`Inner Ring`, t`Middle Ring`, t`Outer Ring`];
+};
export function DimensionsWidget({
rawSeries,
@@ -98,12 +91,7 @@ export function DimensionsWidget({
]);
const actualRingCount = dimensions.filter((d) => d != null).length;
- const dimensionTitles =
- actualRingCount === 1
- ? SINGLE_RING_SETTING_TITLES
- : actualRingCount === 2
- ? TWO_RING_SETTING_TITLES
- : THREE_RING_SETTING_TITLES;
+ const dimensionTitles = getDimensionTitles(actualRingCount);
const updateDimensions = (newDimensions: (string | undefined)[]) => {
setDimensions(newDimensions);
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/partitions.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/partitions.tsx
index 2751ba607fa..196458e1f62 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/partitions.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/partitions.tsx
@@ -11,12 +11,11 @@ export interface Partition {
title: React.ReactNode;
}
-export const partitions: Partition[] = [
+export const getPartitions = (): Partition[] => [
{
name: "rows",
columnFilter: isDimension,
title: (
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
<PivotTableSettingLabel data-testid="pivot-table-setting">{t`Rows`}</PivotTableSettingLabel>
),
},
@@ -24,7 +23,6 @@ export const partitions: Partition[] = [
name: "columns",
columnFilter: isDimension,
title: (
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
<PivotTableSettingLabel data-testid="pivot-table-setting">{t`Columns`}</PivotTableSettingLabel>
),
},
@@ -32,7 +30,6 @@ export const partitions: Partition[] = [
name: "values",
columnFilter: (col) => !isDimension(col),
title: (
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
<PivotTableSettingLabel data-testid="pivot-table-setting">{t`Measures`}</PivotTableSettingLabel>
),
},
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
index 491b4b79137..aa48035425a 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
@@ -32,7 +32,7 @@ import type {
VisualizationSettings,
} from "metabase-types/api";
-import { partitions } from "./partitions";
+import { getPartitions } from "./partitions";
import {
addMissingCardBreakouts,
isColumnValid,
@@ -90,7 +90,7 @@ export const settings = {
settings[COLUMN_SPLIT_SETTING] ?? { rows: [], columns: [], values: [] },
data?.cols ?? [],
),
- partitions,
+ partitions: getPartitions(),
columns: data == null ? [] : data.cols,
settings,
getColumnTitle: (column: DatasetColumn) => {
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
index b15edc7ac2f..0f1b3c1ac4b 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
@@ -25,7 +25,7 @@ import {
MIN_HEADER_CELL_WIDTH,
ROW_TOGGLE_ICON_WIDTH,
} from "./constants";
-import { partitions } from "./partitions";
+import { getPartitions } from "./partitions";
import type { CustomColumnWidth, HeaderItem } from "./types";
// adds or removes columns from the pivot settings based on the current query
@@ -62,6 +62,7 @@ export function updateValueWithCurrentColumns(
);
// add toAdd to first partitions where it matches the filter
+ const partitions = getPartitions();
for (const columnName of toAdd) {
for (const { columnFilter: filter, name } of partitions) {
const column = columns.find((c) => c.name === columnName);
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
index d7c8eea7bca..37c9ff2d5f2 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
@@ -4,6 +4,7 @@ import { t } from "ttag";
import CS from "metabase/css/core/index.css";
import { Flex, Icon } from "metabase/ui";
+import { assignLazily } from "metabase/utils/merge-lazily";
import { checkNotNull } from "metabase/utils/types";
import { formatValue } from "metabase/value-formatting";
import type { VisualizationProps } from "metabase/visualizations/types";
@@ -254,7 +255,7 @@ export function IconWithBorder() {
);
}
-export const Progress = Object.assign(
+export const Progress = assignLazily(
ProgressComponent,
PROGRESS_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
index 82cd0955ef3..28cc440e864 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
@@ -5,6 +5,7 @@ import CS from "metabase/css/core/index.css";
import { getFontFamilyValue } from "metabase/utils/fonts";
import type { FontStyle } from "metabase/utils/measure-text";
import { measureTextWidth } from "metabase/utils/measure-text";
+import { assignLazily } from "metabase/utils/merge-lazily";
import type { VisualizationProps } from "metabase/visualizations/types";
import {
getClickData,
@@ -305,7 +306,7 @@ const RowChartVisualization = ({
);
};
-export const RowChart = Object.assign(
+export const RowChart = assignLazily(
RowChartVisualization,
ROW_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/definition.ts
index da93325a4af..31ae7818f1c 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/definition.ts
@@ -1,5 +1,6 @@
import { t } from "ttag";
+import { mergeLazily } from "metabase/utils/merge-lazily";
import {
type ComputedVisualizationSettings,
GRAPH_DATA_SETTINGS,
@@ -32,28 +33,28 @@ export const ROW_CHART_DEFINITION: VisualizationDefinition = {
getUiName: () => t`Row`,
identifier: "row",
iconName: "horizontal_bar",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`row chart`,
+ get noun() {
+ return t`row chart`;
+ },
noHeader: true,
hasEmptyState: true,
minSize: getMinSize("row"),
defaultSize: getDefaultSize("row"),
- settings: {
- ...ROW_CHART_SETTINGS,
- ...GRAPH_DATA_SETTINGS,
- ["graph.metrics"]: {
- ...GRAPH_DATA_SETTINGS["graph.metrics"],
+ settings: mergeLazily(ROW_CHART_SETTINGS, GRAPH_DATA_SETTINGS, {
+ ["graph.metrics"]: mergeLazily(GRAPH_DATA_SETTINGS["graph.metrics"] ?? {}, {
get title() {
return t`X-axis`;
},
- },
- ["graph.dimensions"]: {
- ...GRAPH_DATA_SETTINGS["graph.dimensions"],
- get title() {
- return t`Y-axis`;
+ }),
+ ["graph.dimensions"]: mergeLazily(
+ GRAPH_DATA_SETTINGS["graph.dimensions"] ?? {},
+ {
+ get title() {
+ return t`Y-axis`;
+ },
},
- },
- },
+ ),
+ }),
isSensible: ({ cols, rows }: DatasetData) => {
return (
rows.length > 1 &&
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts
index 8eed1d41422..286a41f44d4 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts
@@ -1,6 +1,6 @@
import type { NumberLike, StringLike } from "@visx/scale";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { isEmpty } from "metabase/utils/validate";
import { formatValue } from "metabase/value-formatting";
import {
@@ -92,6 +92,6 @@ export const getLabelsFormatter = (
export const getColumnValueFormatter = () => {
return (value: RowValue, column: DatasetColumn) =>
isEmpty(value)
- ? NULL_DISPLAY_VALUE
+ ? getNullDisplayValue()
: String(formatValue(value, { column }));
};
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx b/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx
index d1acc04b14c..2ed89d084ca 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/SankeyChart.tsx
@@ -1,6 +1,7 @@
import type { EChartsType } from "echarts/core";
import { useCallback, useMemo, useRef } from "react";
+import { assignLazily } from "metabase/utils/merge-lazily";
import { ResponsiveEChartsRenderer } from "metabase/visualizations/components/EChartsRenderer";
import { useBrowserRenderingContext } from "metabase/visualizations/hooks/use-browser-rendering-context";
import type { VisualizationProps } from "metabase/visualizations/types";
@@ -84,7 +85,7 @@ const SankeyChartComponent = ({
);
};
-export const SankeyChart = Object.assign(
+export const SankeyChart = assignLazily(
SankeyChartComponent,
SANKEY_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
index 683f24564ba..c37f201e42c 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/definition.ts
@@ -24,8 +24,9 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
...columnSettings({ getHidden: () => true }),
...dimensionSetting("sankey.source", {
getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Source`,
+ get title() {
+ return t`Source`;
+ },
showColumnSetting: true,
persistDefault: true,
dashboard: false,
@@ -35,8 +36,9 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
}),
...dimensionSetting("sankey.target", {
getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Target`,
+ get title() {
+ return t`Target`;
+ },
showColumnSetting: true,
persistDefault: true,
dashboard: false,
@@ -46,8 +48,9 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
}),
...metricSetting("sankey.value", {
getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Value`,
+ get title() {
+ return t`Value`;
+ },
showColumnSetting: true,
persistDefault: true,
dashboard: false,
@@ -57,8 +60,9 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
}),
"sankey.node_align": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Align`,
+ get title() {
+ return t`Align`;
+ },
widget: "select",
getDefault: () => "left",
getProps: () => ({
@@ -80,16 +84,18 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
},
"sankey.show_edge_labels": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Show edge labels`,
+ get title() {
+ return t`Show edge labels`;
+ },
widget: "toggle",
getDefault: () => false,
inline: true,
},
"sankey.label_value_formatting": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Auto formatting`,
+ get title() {
+ return t`Auto formatting`;
+ },
widget: "segmentedControl",
getProps: () => ({
options: [
@@ -105,8 +111,9 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
},
"sankey.edge_color": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Edge color`,
+ get title() {
+ return t`Edge color`;
+ },
widget: "segmentedControl",
getDefault: () => "source",
getProps: () => ({
@@ -123,8 +130,9 @@ export const SANKEY_CHART_DEFINITION: VisualizationDefinition = {
getUiName: () => t`Sankey`,
identifier: "sankey",
iconName: "sankey",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`sankey chart`,
+ get noun() {
+ return t`sankey chart`;
+ },
minSize: getMinSize("sankey"),
disableVisualizer: true,
defaultSize: getDefaultSize("sankey"),
diff --git a/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx
index 08627f7ed53..d1fb2e741a7 100644
--- a/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/ScatterPlot.tsx
@@ -1,3 +1,4 @@
+import { assignLazily } from "metabase/utils/merge-lazily";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
import type { VisualizationProps } from "../../types";
@@ -8,7 +9,7 @@ function ScatterPlotComponent(props: VisualizationProps) {
return <CartesianChart {...props} />;
}
-export const ScatterPlot = Object.assign(
+export const ScatterPlot = assignLazily(
ScatterPlotComponent,
SCATTER_PLOT_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/ScatterPlot/definition.ts b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/definition.ts
index 9350dd1dd58..ed4854e0ac4 100644
--- a/frontend/src/metabase/visualizations/visualizations/ScatterPlot/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/ScatterPlot/definition.ts
@@ -23,8 +23,9 @@ const ScatterViz: Omit<
getUiName: () => t`Scatter`,
identifier: "scatter",
iconName: "bubble",
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`scatter plot`,
+ get noun() {
+ return t`scatter plot`;
+ },
minSize: getMinSize("scatter"),
defaultSize: getDefaultSize("scatter"),
settings: {
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
index 02940602567..0c5bc40ebca 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
@@ -2,6 +2,7 @@ import { useEffect, useMemo, useRef } from "react";
import DashboardS from "metabase/css/dashboard.module.css";
import { Box, Stack, Text, rem } from "metabase/ui";
+import { assignLazily } from "metabase/utils/merge-lazily";
import {
ScalarCardShell,
useScalarCardShell,
@@ -235,7 +236,7 @@ function SmartScalarComponent(
);
}
-export const SmartScalar = Object.assign(
+export const SmartScalar = assignLazily(
SmartScalarComponent,
SMART_SCALAR_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/definition.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/definition.ts
index 54f44d8b5e4..0358b11673d 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/definition.ts
@@ -26,14 +26,16 @@ import {
export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
...fieldSetting("scalar.field", {
getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Primary number`,
+ get title() {
+ return t`Primary number`;
+ },
fieldFilter: isSuitableScalarColumn,
}),
"scalar.comparisons": {
getSection: () => t`Data`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Comparisons`,
+ get title() {
+ return t`Comparisons`;
+ },
widget: "smartScalarComparison",
getValue: (series, vizSettings) => getComparisons(series, vizSettings),
isValid: (series, vizSettings) => validateComparisons(series, vizSettings),
@@ -53,24 +55,27 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
},
"scalar.switch_positive_negative": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Switch positive / negative colors?`,
+ get title() {
+ return t`Switch positive / negative colors?`;
+ },
widget: "toggle",
inline: true,
getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.switch_positive_negative"],
},
"scalar.compact_primary_number": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Compact number`,
+ get title() {
+ return t`Compact number`;
+ },
widget: "toggle",
inline: true,
getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.compact_primary_number"],
},
"scalar.show_comparison_value": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Show comparison value`,
+ get title() {
+ return t`Show comparison value`;
+ },
widget: "toggle",
inline: true,
getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.show_comparison_value"],
diff --git a/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx b/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx
index 26b50d818b1..ec5ebe5bb22 100644
--- a/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/TreemapChart/TreemapChart.tsx
@@ -3,6 +3,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useLatest } from "react-use";
import { Box, Stack } from "metabase/ui";
+import { assignLazily } from "metabase/utils/merge-lazily";
import { ResponsiveEChartsRenderer } from "metabase/visualizations/components/EChartsRenderer";
import { useBrowserRenderingContext } from "metabase/visualizations/hooks/use-browser-rendering-context";
import type { VisualizationProps } from "metabase/visualizations/types";
@@ -288,7 +289,7 @@ const TreemapChartComponent = ({
);
};
-export const TreemapChart = Object.assign(
+export const TreemapChart = assignLazily(
TreemapChartComponent,
TREEMAP_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
index 0a225c76671..e6023576373 100644
--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
@@ -1,3 +1,4 @@
+import { assignLazily } from "metabase/utils/merge-lazily";
import { CartesianChart } from "metabase/visualizations/visualizations/CartesianChart";
import type { VisualizationProps } from "../../types";
@@ -8,7 +9,7 @@ function WaterfallChartComponent(props: VisualizationProps) {
return <CartesianChart {...props} />;
}
-export const WaterfallChart = Object.assign(
+export const WaterfallChart = assignLazily(
WaterfallChartComponent,
WATERFALL_CHART_DEFINITION,
);
diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/definition.ts b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/definition.ts
index 8844eb2ef52..e98f125b3b8 100644
--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/definition.ts
@@ -34,8 +34,9 @@ const WaterfallViz: Omit<VisualizationDefinition, "checkRenderable"> = {
metricCount > 0
);
},
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- noun: t`waterfall chart`,
+ get noun() {
+ return t`waterfall chart`;
+ },
minSize: getMinSize("waterfall"),
defaultSize: getDefaultSize("waterfall"),
maxMetricsSupported: 1,
@@ -58,8 +59,9 @@ const WaterfallViz: Omit<VisualizationDefinition, "checkRenderable"> = {
},
"waterfall.show_total": {
getSection: () => t`Display`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- title: t`Show total`,
+ get title() {
+ return t`Show total`;
+ },
widget: "toggle",
getDefault: () => true,
inline: true,
diff --git a/frontend/src/metabase/viz-core/echarts/boxplot/model/index.ts b/frontend/src/metabase/viz-core/echarts/boxplot/model/index.ts
index 38e180f87a5..0468d0f4a53 100644
--- a/frontend/src/metabase/viz-core/echarts/boxplot/model/index.ts
+++ b/frontend/src/metabase/viz-core/echarts/boxplot/model/index.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { memoize } from "metabase/utils/memoize";
import { formatValue } from "metabase/value-formatting";
import {
@@ -235,7 +235,7 @@ const createXAxisFormatter = (
return (value: RowValue) => {
if (value == null || value === ECHARTS_CATEGORY_AXIS_NULL_VALUE) {
- return NULL_DISPLAY_VALUE;
+ return getNullDisplayValue();
}
return String(
diff --git a/frontend/src/metabase/viz-core/echarts/cartesian/model/axis.ts b/frontend/src/metabase/viz-core/echarts/cartesian/model/axis.ts
index 647bb597cb7..c5776522e3e 100644
--- a/frontend/src/metabase/viz-core/echarts/cartesian/model/axis.ts
+++ b/frontend/src/metabase/viz-core/echarts/cartesian/model/axis.ts
@@ -2,7 +2,7 @@ import * as d3 from "d3";
import _ from "underscore";
import { dayjs } from "metabase/dayjs";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { getObjectEntries, getObjectKeys } from "metabase/utils/objects";
import { isNotNull, isNumber } from "metabase/utils/types";
import { formatValue } from "metabase/value-formatting";
@@ -871,7 +871,7 @@ export function getXAxisModel(
const formatter = (value: RowValue) => {
if (value === ECHARTS_CATEGORY_AXIS_NULL_VALUE) {
- return NULL_DISPLAY_VALUE;
+ return getNullDisplayValue();
}
return String(
diff --git a/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.ts b/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.ts
index f93c0c86196..b85f60309e5 100644
--- a/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.ts
+++ b/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.ts
@@ -572,8 +572,8 @@ export function filterNullDimensionValues(
return filteredDataset;
}
-// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
-export const NO_X_AXIS_VALUES_ERROR_MESSAGE = t`There is no data to display. Check the query to ensure there are non-null x-axis values.`;
+export const getNoXAxisValuesErrorMessage = () =>
+ t`There is no data to display. Check the query to ensure there are non-null x-axis values.`;
export function replaceZeroesForLogScale(
dataset: ChartDataset,
@@ -803,7 +803,7 @@ export const applyVisualizationSettingsDataTransformations = (
) {
dataset = filterNullDimensionValues(dataset, showWarning);
if (dataset.length === 0) {
- throw new Error(NO_X_AXIS_VALUES_ERROR_MESSAGE);
+ throw new Error(getNoXAxisValuesErrorMessage());
}
}
diff --git a/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.unit.spec.ts b/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.unit.spec.ts
index 156fd21634a..e0779608a63 100644
--- a/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.unit.spec.ts
+++ b/frontend/src/metabase/viz-core/echarts/cartesian/model/dataset.unit.spec.ts
@@ -28,11 +28,11 @@ import {
} from "../constants/dataset";
import {
- NO_X_AXIS_VALUES_ERROR_MESSAGE,
applyVisualizationSettingsDataTransformations,
getDatasetExtents,
getDatasetKey,
getJoinedCardsDataset,
+ getNoXAxisValuesErrorMessage,
replaceValues,
sortDataset,
} from "./dataset";
@@ -892,7 +892,7 @@ describe("dataset transform functions", () => {
yAxisScaleTransforms,
createMockComputedVisualizationSettings(),
),
- ).toThrow(NO_X_AXIS_VALUES_ERROR_MESSAGE);
+ ).toThrow(getNoXAxisValuesErrorMessage());
});
});
diff --git a/frontend/src/metabase/viz-core/echarts/cartesian/model/series.ts b/frontend/src/metabase/viz-core/echarts/cartesian/model/series.ts
index 2461bb50481..bd0b69cac7a 100644
--- a/frontend/src/metabase/viz-core/echarts/cartesian/model/series.ts
+++ b/frontend/src/metabase/viz-core/echarts/cartesian/model/series.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { memoize } from "metabase/utils/memoize";
import { isEmpty } from "metabase/utils/validate";
import { formatValue } from "metabase/value-formatting";
@@ -85,7 +85,7 @@ export const formatBreakoutValue = (
column: DatasetColumn,
): string => {
return String(
- formatValue(isEmpty(value) ? NULL_DISPLAY_VALUE : value, { column }),
+ formatValue(isEmpty(value) ? getNullDisplayValue() : value, { column }),
);
};
diff --git a/frontend/src/metabase/viz-core/echarts/cartesian/waterfall/model/dataset.ts b/frontend/src/metabase/viz-core/echarts/cartesian/waterfall/model/dataset.ts
index b2c18ba1eac..8afeea819f0 100644
--- a/frontend/src/metabase/viz-core/echarts/cartesian/waterfall/model/dataset.ts
+++ b/frontend/src/metabase/viz-core/echarts/cartesian/waterfall/model/dataset.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import type { RowValue } from "metabase-types/api";
import { getNumberOr } from "../../../../lib/settings/row-values";
@@ -58,7 +58,7 @@ export const getWaterfallDataset = (
}
const waterfallDatum: Datum = {
- [X_AXIS_DATA_KEY]: datum[X_AXIS_DATA_KEY] ?? NULL_DISPLAY_VALUE,
+ [X_AXIS_DATA_KEY]: datum[X_AXIS_DATA_KEY] ?? getNullDisplayValue(),
[WATERFALL_VALUE_KEY]: value,
[WATERFALL_START_KEY]: start,
[WATERFALL_END_KEY]: end,
diff --git a/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.ts b/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.ts
index 5beac8211bc..1d057a0969b 100644
--- a/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.ts
+++ b/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import type {
DatasetColumn,
RawSeries,
@@ -151,7 +151,7 @@ export function getTreemapData(
map: leafMap,
rawName: subGroupingValue,
displayName:
- formatSubGroupingName?.(subGroupingValue) ?? NULL_DISPLAY_VALUE,
+ formatSubGroupingName?.(subGroupingValue) ?? getNullDisplayValue(),
withChildren: false,
});
addRowMetric(leaf, metricValue, rowIndex);
diff --git a/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.unit.spec.ts b/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.unit.spec.ts
index 840dac6262b..96908b480c5 100644
--- a/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.unit.spec.ts
+++ b/frontend/src/metabase/viz-core/echarts/graph/treemap/model/data.unit.spec.ts
@@ -1,4 +1,7 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import {
+ NULL_DIMENSION_KEY,
+ getNullDisplayValue,
+} from "metabase/utils/constants";
import type { DatasetColumn, RowValue } from "metabase-types/api";
import { createMockCard } from "metabase-types/api/mocks/card";
import {
@@ -160,9 +163,9 @@ describe("treemap data model", () => {
treemapColumns,
[
{
- key: NULL_DISPLAY_VALUE,
+ key: NULL_DIMENSION_KEY,
name: "No category",
- originalName: NULL_DISPLAY_VALUE,
+ originalName: getNullDisplayValue(),
color: "#FF0000",
defaultColor: false,
enabled: true,
@@ -231,7 +234,7 @@ describe("treemap data model", () => {
},
{
rawName: null,
- displayName: NULL_DISPLAY_VALUE,
+ displayName: getNullDisplayValue(),
value: 4,
rowIndices: [1],
},
diff --git a/frontend/src/metabase/viz-core/echarts/graph/treemap/model/formatters.ts b/frontend/src/metabase/viz-core/echarts/graph/treemap/model/formatters.ts
index a992c728472..37ec9d39254 100644
--- a/frontend/src/metabase/viz-core/echarts/graph/treemap/model/formatters.ts
+++ b/frontend/src/metabase/viz-core/echarts/graph/treemap/model/formatters.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { formatValue } from "metabase/value-formatting";
import type { DatasetColumn, RowValue } from "metabase-types/api";
@@ -66,14 +66,14 @@ export function getTreemapColumnFormatter(
return (value: RowValue): string => {
if (value == null) {
- return NULL_DISPLAY_VALUE;
+ return getNullDisplayValue();
}
return String(
formatValue(value, {
...columnSettings,
column,
- }) ?? NULL_DISPLAY_VALUE,
+ }) ?? getNullDisplayValue(),
);
};
}
diff --git a/frontend/src/metabase/viz-core/echarts/pie/format.ts b/frontend/src/metabase/viz-core/echarts/pie/format.ts
index 09a8ed8be59..7377516d6b3 100644
--- a/frontend/src/metabase/viz-core/echarts/pie/format.ts
+++ b/frontend/src/metabase/viz-core/echarts/pie/format.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { formatValue } from "metabase/value-formatting";
import type { RowValue } from "metabase-types/api";
@@ -96,7 +96,7 @@ export function getDimensionFormatter(
return (value: RowValue) => {
if (value == null) {
- return NULL_DISPLAY_VALUE;
+ return getNullDisplayValue();
}
return String(formatValue(value, dimensionColSettings));
diff --git a/frontend/src/metabase/viz-core/echarts/tooltip/format.ts b/frontend/src/metabase/viz-core/echarts/tooltip/format.ts
index 81ee04be1b1..0e6508088cd 100644
--- a/frontend/src/metabase/viz-core/echarts/tooltip/format.ts
+++ b/frontend/src/metabase/viz-core/echarts/tooltip/format.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import { formatValue } from "metabase/value-formatting";
import type { ColumnSettings, DatasetColumn } from "metabase-types/api";
@@ -30,5 +30,5 @@ export const formatValueForTooltip = ({
options.scale = 1;
}
- return formatValue(value, options) ?? NULL_DISPLAY_VALUE;
+ return formatValue(value, options) ?? getNullDisplayValue();
};
diff --git a/frontend/src/metabase/viz-core/lib/settings/column.ts b/frontend/src/metabase/viz-core/lib/settings/column.ts
index ed36d671d31..cf97ce39eed 100644
--- a/frontend/src/metabase/viz-core/lib/settings/column.ts
+++ b/frontend/src/metabase/viz-core/lib/settings/column.ts
@@ -1,7 +1,7 @@
import { t } from "ttag";
import _ from "underscore";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import {
currency,
getCurrency,
@@ -540,7 +540,7 @@ export const getTitleForColumn = (
const pivoted = isPivoted(series, settings);
if (pivoted) {
- return displayNameForColumn(column) || NULL_DISPLAY_VALUE;
+ return displayNameForColumn(column) || getNullDisplayValue();
}
return (
diff --git a/frontend/src/metabase/viz-core/lib/settings/graph.ts b/frontend/src/metabase/viz-core/lib/settings/graph.ts
index dc4940ef10e..be7819402e3 100644
--- a/frontend/src/metabase/viz-core/lib/settings/graph.ts
+++ b/frontend/src/metabase/viz-core/lib/settings/graph.ts
@@ -2,6 +2,7 @@ import { t } from "ttag";
import _ from "underscore";
import { color } from "metabase/ui/colors";
+import { mergeLazily } from "metabase/utils/merge-lazily";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import { isNumeric } from "metabase-lib/v1/types/utils/isa";
import type { Series, VisualizationDisplay } from "metabase-types/api";
@@ -85,7 +86,7 @@ function canHaveDataLabels(
return vizSettings["stackable.stack_type"] !== "normalized" || !areAllAreas;
}
-export const GRAPH_DATA_SETTINGS: VisualizationSettingsDefinitions = {
+const graphDataSettings: VisualizationSettingsDefinitions = {
...columnSettings({
getColumns: ([
{
@@ -250,9 +251,11 @@ export const GRAPH_DATA_SETTINGS: VisualizationSettingsDefinitions = {
dashboard: false,
useRawSeries: true,
},
- ...seriesSetting(),
};
+export const GRAPH_DATA_SETTINGS: VisualizationSettingsDefinitions =
+ mergeLazily(graphDataSettings, seriesSetting());
+
export const GRAPH_BUBBLE_SETTINGS: VisualizationSettingsDefinitions = {
"scatter.bubble": {
getSection: () => t`Data`,
@@ -1178,10 +1181,10 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions = {
},
};
-export const BOXPLOT_DATA_SETTINGS: VisualizationSettingsDefinitions = {
- ...GRAPH_DATA_SETTINGS,
- "graph.dimensions": {
- ...GRAPH_DATA_SETTINGS["graph.dimensions"],
- getDefault: getDefaultBoxplotDimensions,
- },
-};
+export const BOXPLOT_DATA_SETTINGS: VisualizationSettingsDefinitions =
+ mergeLazily(GRAPH_DATA_SETTINGS, {
+ "graph.dimensions": mergeLazily(
+ GRAPH_DATA_SETTINGS["graph.dimensions"] ?? {},
+ { getDefault: getDefaultBoxplotDimensions },
+ ),
+ });
diff --git a/frontend/src/metabase/viz-core/lib/settings/series.ts b/frontend/src/metabase/viz-core/lib/settings/series.ts
index f1541e701ca..920a5d91ab9 100644
--- a/frontend/src/metabase/viz-core/lib/settings/series.ts
+++ b/frontend/src/metabase/viz-core/lib/settings/series.ts
@@ -80,7 +80,9 @@ export function seriesSetting({
},
display: {
widget: "segmentedControl",
- title: t`Display type`,
+ get title() {
+ return t`Display type`;
+ },
getProps: () => ({
options: [
{ value: "line", icon: "line" },
@@ -116,7 +118,9 @@ export function seriesSetting({
},
},
"line.interpolate": {
- title: t`Line shape`,
+ get title() {
+ return t`Line shape`;
+ },
widget: "segmentedControl",
getProps: () => ({
options: [
@@ -134,7 +138,9 @@ export function seriesSetting({
readDependencies: ["display"],
},
"line.style": {
- title: t`Line style`,
+ get title() {
+ return t`Line style`;
+ },
widget: "segmentedControl",
getProps: () => ({
options: [
@@ -149,7 +155,9 @@ export function seriesSetting({
readDependencies: ["display"],
},
"line.size": {
- title: t`Line size`,
+ get title() {
+ return t`Line size`;
+ },
widget: "segmentedControl",
getProps: () => ({
options: [
@@ -164,7 +172,9 @@ export function seriesSetting({
readDependencies: ["display"],
},
"line.marker_enabled": {
- title: t`Show dots on lines`,
+ get title() {
+ return t`Show dots on lines`;
+ },
widget: "segmentedControl",
getProps: () => ({
options: [
@@ -182,7 +192,9 @@ export function seriesSetting({
readDependencies: ["display"],
},
"line.missing": {
- title: t`Replace missing values with`,
+ get title() {
+ return t`Replace missing values with`;
+ },
widget: "select",
getProps: () => ({
options: [
@@ -200,7 +212,9 @@ export function seriesSetting({
readDependencies: ["display"],
},
axis: {
- title: t`Y-axis position`,
+ get title() {
+ return t`Y-axis position`;
+ },
widget: "segmentedControl",
getHidden: (single, _seriesSettings, extra) =>
single.card.display === "row" ||
@@ -217,7 +231,9 @@ export function seriesSetting({
readDependencies: ["display"],
},
show_series_trendline: {
- title: t`Show trend line for this series`,
+ get title() {
+ return t`Show trend line for this series`;
+ },
widget: "toggle",
inline: true,
getHidden: (_single, _seriesSettings, extra) => {
@@ -232,7 +248,9 @@ export function seriesSetting({
readDependencies: ["graph.show_trendline"],
},
show_series_values: {
- title: t`Show values for this series`,
+ get title() {
+ return t`Show values for this series`;
+ },
widget: "toggle",
inline: true,
getHidden: (_single, _seriesSettings, extra) => {
diff --git a/frontend/src/metabase/viz-core/lib/settings/utils.ts b/frontend/src/metabase/viz-core/lib/settings/utils.ts
index 7d1a000c41b..250c222c475 100644
--- a/frontend/src/metabase/viz-core/lib/settings/utils.ts
+++ b/frontend/src/metabase/viz-core/lib/settings/utils.ts
@@ -1,5 +1,6 @@
import _ from "underscore";
+import { mergeLazily, omitLazily } from "metabase/utils/merge-lazily";
import { isDimension, isMetric } from "metabase-lib/v1/types/utils/isa";
import type {
DatasetColumn,
@@ -19,22 +20,34 @@ export function getOptionFromColumn(col: DatasetColumn) {
}
export function metricSetting(id: string, def: SeriesSettingDefinition = {}) {
- return fieldSetting(id, {
- fieldFilter: isMetric,
- getDefault: (series) => getDefaultDimensionAndMetric(series).metric,
- ...def,
- });
+ return fieldSetting(
+ id,
+ mergeLazily(
+ {
+ fieldFilter: isMetric,
+ getDefault: (series: Series) =>
+ getDefaultDimensionAndMetric(series).metric,
+ },
+ def,
+ ),
+ );
}
export function dimensionSetting(
id: string,
def: SeriesSettingDefinition = {},
) {
- return fieldSetting(id, {
- fieldFilter: isDimension,
- getDefault: (series) => getDefaultDimensionAndMetric(series).dimension,
- ...def,
- });
+ return fieldSetting(
+ id,
+ mergeLazily(
+ {
+ fieldFilter: isDimension,
+ getDefault: (series: Series) =>
+ getDefaultDimensionAndMetric(series).dimension,
+ },
+ def,
+ ),
+ );
}
const DEFAULT_FIELD_FILTER = (_column: DatasetColumn) => true;
@@ -52,12 +65,7 @@ export function getDefaultColumn(
export function fieldSetting(
id: string,
- {
- fieldFilter = DEFAULT_FIELD_FILTER,
- showColumnSetting,
- autoOpenWhenUnset,
- ...def
- }: SeriesSettingDefinition & {
+ options: SeriesSettingDefinition & {
fieldFilter?: FieldFilterFn;
showColumnSetting?: boolean;
autoOpenWhenUnset?: boolean;
@@ -65,21 +73,37 @@ export function fieldSetting(
): {
[id]: SeriesSettingDefinition;
} {
+ // Read by name only the keys this helper consumes. Everything else is copied
+ // by descriptor so getters survive.
+ const {
+ fieldFilter = DEFAULT_FIELD_FILTER,
+ showColumnSetting,
+ autoOpenWhenUnset,
+ } = options;
+ const def = omitLazily<SeriesSettingDefinition>(options, [
+ "fieldFilter",
+ "showColumnSetting",
+ "autoOpenWhenUnset",
+ ]);
+
return {
- [id]: {
- widget: "field",
- isValid: ([{ card, data }]) =>
- columnsAreValid(card.visualization_settings[id], data, fieldFilter),
- getDefault: (series, vizSettings) =>
- getDefaultColumn(series, vizSettings, fieldFilter),
- getProps: ([{ data }]) => ({
- options: data.cols.filter(fieldFilter).map(getOptionFromColumn),
- columns: data.cols,
- showColumnSetting,
- autoOpenWhenUnset,
- }),
- ...def,
- },
+ // mergeLazily returns the merged descriptors, which is this shape.
+ [id]: mergeLazily(
+ {
+ widget: "field",
+ isValid: ([{ card, data }]: Series) =>
+ columnsAreValid(card.visualization_settings[id], data, fieldFilter),
+ getDefault: (series: Series, vizSettings: VisualizationSettings) =>
+ getDefaultColumn(series, vizSettings, fieldFilter),
+ getProps: ([{ data }]: Series) => ({
+ options: data.cols.filter(fieldFilter).map(getOptionFromColumn),
+ columns: data.cols,
+ showColumnSetting,
+ autoOpenWhenUnset,
+ }),
+ },
+ def,
+ ) as SeriesSettingDefinition,
};
}
diff --git a/frontend/src/metabase/viz-core/shared/settings/pie.ts b/frontend/src/metabase/viz-core/shared/settings/pie.ts
index 8f5fcf56ae3..985578f8595 100644
--- a/frontend/src/metabase/viz-core/shared/settings/pie.ts
+++ b/frontend/src/metabase/viz-core/shared/settings/pie.ts
@@ -1,7 +1,10 @@
import _ from "underscore";
import { getColorsForValues } from "metabase/ui/colors/charts";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import {
+ NULL_DIMENSION_KEY,
+ getNullDisplayValue,
+} from "metabase/utils/constants";
import { checkNotNull, checkNumber, isNumber } from "metabase/utils/types";
import {
type DatasetColumn,
@@ -59,7 +62,7 @@ export const getDefaultSliceThreshold = () => SLICE_THRESHOLD * 100;
export function getKeyFromDimensionValue(dimensionValue: RowValue) {
if (dimensionValue == null) {
- return NULL_DISPLAY_VALUE;
+ return NULL_DIMENSION_KEY;
} else if (typeof dimensionValue === "object") {
return JSON.stringify(dimensionValue);
}
@@ -67,7 +70,7 @@ export function getKeyFromDimensionValue(dimensionValue: RowValue) {
}
export function getValueFromDimensionKey(key: string) {
- return key === NULL_DISPLAY_VALUE ? null : key;
+ return key === NULL_DIMENSION_KEY ? null : key;
}
export function getAggregatedRows(
@@ -174,8 +177,8 @@ export function getColors(
existingColorMapping = Object.fromEntries(
Object.entries(currentSettings["pie.colors"]).map(([key, value]) => [
// Historically we used String(dimensionValue) in the `pie.colors` setting instead of `getKeyFromDimensionValue`
- // For compatibility with old charts, we'll transform the strings "null" and "undefined" into NULL_DISPLAY_VALUE
- key === "null" || key === "undefined" ? NULL_DISPLAY_VALUE : key,
+ // For compatibility with old charts, we'll transform the strings "null" and "undefined" into NULL_DIMENSION_KEY
+ key === "null" || key === "undefined" ? NULL_DIMENSION_KEY : key,
getHexColor(value),
]),
);
@@ -192,15 +195,15 @@ export function getColors(
}
}
- // historically we used "null" rather than NULL_DISPLAY_VALUE in `getColorsForValues`
- // to avoid changing existing charts, we'll convert NULL_DISPLAY_VALUE to "null"
+ // historically we used "null" rather than NULL_DIMENSION_KEY in `getColorsForValues`
+ // to avoid changing existing charts, we'll convert NULL_DIMENSION_KEY to "null"
const colors = getColorsForValues(
dimensionValues.map((value) =>
- value === NULL_DISPLAY_VALUE ? "null" : value,
+ value === NULL_DIMENSION_KEY ? "null" : value,
),
Object.fromEntries(
Object.entries(existingColorMapping).map(([key, value]) => [
- key === NULL_DISPLAY_VALUE ? "null" : key,
+ key === NULL_DIMENSION_KEY ? "null" : key,
value,
]),
),
@@ -208,7 +211,7 @@ export function getColors(
// then flip it back
return Object.fromEntries(
Object.entries(colors).map(([key, value]) => [
- key === "null" ? NULL_DISPLAY_VALUE : key,
+ key === "null" ? NULL_DIMENSION_KEY : key,
getHexColor(value),
]),
);
@@ -244,10 +247,10 @@ export function getPieRows(
const formatDimensionValue = (value: RowValue) => {
if (value == null) {
- return NULL_DISPLAY_VALUE;
+ return getNullDisplayValue();
}
- return formatter(value, dimensionColSettings) ?? NULL_DISPLAY_VALUE;
+ return formatter(value, dimensionColSettings) ?? getNullDisplayValue();
};
const colors = getColors(rawSeries, settings);
diff --git a/frontend/src/metabase/viz-core/shared/settings/pie.unit.spec.ts b/frontend/src/metabase/viz-core/shared/settings/pie.unit.spec.ts
index 6d822f8169e..e4dfabb5825 100644
--- a/frontend/src/metabase/viz-core/shared/settings/pie.unit.spec.ts
+++ b/frontend/src/metabase/viz-core/shared/settings/pie.unit.spec.ts
@@ -1,5 +1,7 @@
+import { addLocale, useLocale } from "ttag";
+
import { color } from "metabase/ui/colors";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { NULL_DIMENSION_KEY } from "metabase/utils/constants";
import type { PieRow, RawSeries } from "metabase-types/api";
import {
createMockColumn,
@@ -9,8 +11,8 @@ import {
import { getAggregatedRows, getColors, getKeyFromDimensionValue } from "./pie";
describe("getKeyFromDimensionValue", () => {
- it("should return NULL_DISPLAY_VALUE for null", () => {
- expect(getKeyFromDimensionValue(null)).toBe(NULL_DISPLAY_VALUE);
+ it("should return NULL_DIMENSION_KEY for null", () => {
+ expect(getKeyFromDimensionValue(null)).toBe(NULL_DIMENSION_KEY);
});
it("should return string representation for strings", () => {
@@ -207,3 +209,53 @@ describe("getColors", () => {
expect(getColors(rawSeries, settings).Doohickey).toBe(color("accent3"));
});
});
+
+describe("with a non-English locale", () => {
+ beforeAll(() => {
+ addLocale("es-fake", {
+ headers: { "plural-forms": "nplurals=2; plural=(n != 1);" },
+ translations: {
+ "": { "(empty)": { msgid: "(empty)", msgstr: ["(vacío)"] } },
+ },
+ });
+ useLocale("es-fake");
+ });
+
+ afterAll(() => {
+ // restore the default locale so later tests aren't affected
+ useLocale("en");
+ });
+
+ it("keys the null slice by its untranslated label so saved rows still match", () => {
+ expect(getKeyFromDimensionValue(null)).toBe("(empty)");
+ });
+
+ it("keeps the color a saved null slice records", () => {
+ // getColors only reads rows and cols off the series
+ const rawSeries = [
+ {
+ data: createMockDatasetData({
+ rows: [[null, 1]],
+ cols: [
+ createMockColumn({ name: "Category" }),
+ createMockColumn({ name: "Count" }),
+ ],
+ }),
+ },
+ ] as RawSeries;
+ const settings = {
+ "pie.metric": "Count",
+ "pie.dimension": "Category",
+ // getColors only reads the key, color and defaultColor of a row
+ "pie.rows": [
+ {
+ key: NULL_DIMENSION_KEY,
+ defaultColor: false,
+ color: "#FF0000",
+ },
+ ] as PieRow[],
+ };
+
+ expect(getColors(rawSeries, settings)[NULL_DIMENSION_KEY]).toBe("#FF0000");
+ });
+});
diff --git a/frontend/src/metabase/viz-core/shared/settings/treemap.ts b/frontend/src/metabase/viz-core/shared/settings/treemap.ts
index 6cb17e4a0a5..931a88e3d69 100644
--- a/frontend/src/metabase/viz-core/shared/settings/treemap.ts
+++ b/frontend/src/metabase/viz-core/shared/settings/treemap.ts
@@ -1,5 +1,5 @@
import { getColorsForValues } from "metabase/ui/colors/charts";
-import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getNullDisplayValue } from "metabase/utils/constants";
import type { RawSeries, RowValue, TreemapRow } from "metabase-types/api";
import { getTreemapChartColumns } from "../../echarts/graph/treemap/model/data";
@@ -100,9 +100,9 @@ function createNameFormatter({
}): NameFormatter {
return (rawValue: RowValue) => {
if (rawValue == null) {
- return NULL_DISPLAY_VALUE;
+ return getNullDisplayValue();
}
- return formatter(rawValue, groupingColumnSettings) ?? NULL_DISPLAY_VALUE;
+ return formatter(rawValue, groupingColumnSettings) ?? getNullDisplayValue();
};
}
diff --git a/frontend/test/i18n-import-time.unit.spec.ts b/frontend/test/i18n-import-time.unit.spec.ts
new file mode 100644
index 00000000000..63caca41941
--- /dev/null
+++ b/frontend/test/i18n-import-time.unit.spec.ts
@@ -0,0 +1,180 @@
+import fs from "fs";
+import path from "path";
+
+const translated: { text: string; stack?: string }[] = [];
+let recording = false;
+
+jest.mock("ttag", () => {
+ const record = (
+ strings: TemplateStringsArray | string,
+ ...values: unknown[]
+ ) => {
+ const text = typeof strings === "string" ? strings : strings.join("{}");
+ if (recording) {
+ translated.push({ text, stack: new Error().stack });
+ }
+ return typeof strings === "string"
+ ? strings
+ : String.raw({ raw: strings }, ...values);
+ };
+ const chained = {
+ t: record,
+ jt: record,
+ ngettext: record,
+ msgid: record,
+ gettext: record,
+ };
+ return {
+ ...chained,
+ c: () => chained,
+ addLocale: jest.fn(),
+ useLocale: jest.fn(),
+ setDefaultLang: jest.fn(),
+ default: {},
+ };
+});
+
+const ROOT = path.resolve(__dirname, "../..");
+
+const ROOTS = (
+ process.env.I18N_IMPORT_ROOTS ?? "frontend/src,enterprise/frontend/src"
+).split(",");
+
+function sourceFiles(dir: string): string[] {
+ const out: string[] = [];
+ for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+ const p = path.join(dir, entry.name);
+ if (entry.isDirectory()) {
+ if (
+ [
+ "__mocks__",
+ "__support__",
+ "node_modules",
+ ".storybook",
+ "shared-tests",
+ "test",
+ "tests",
+ // Generated by the SDK package build and gitignored, so not source.
+ "cli-snippets-tmp",
+ // Node scripts: they write build output when they are imported, and
+ // they reach ESM-only packages that jest does not transform.
+ "bin",
+ "cli",
+ ].includes(entry.name)
+ ) {
+ continue;
+ }
+ out.push(...sourceFiles(p));
+ } else if (
+ /\.tsx?$/.test(entry.name) &&
+ !/\.spec\.tsx?$/.test(entry.name) &&
+ !/(^|[.-])test-utils\.tsx?$|^test-/.test(entry.name) &&
+ !/\.stories\.tsx?$/.test(entry.name) &&
+ !entry.name.endsWith(".d.ts")
+ ) {
+ out.push(p);
+ }
+ }
+ return out;
+}
+
+// A module that throws while it is imported hides the translations it would
+// have run, so the guard fails on any import error that is not named here.
+// None of these modules import ttag, and every module they pull in is visited
+// on its own, because the scan walks source files rather than an entry graph.
+const UNIMPORTABLE = new Set<string>([
+ // Entry points: they read webpack globals and call into the plugin bundle.
+ "frontend/src/embedding-sdk-bundle/embedding-sdk-bootstrap.ts",
+ "frontend/src/metabase/app-embed-mcp-public-path.ts",
+ "frontend/src/metabase/app-embed-mcp.tsx",
+ "frontend/src/metabase/app-embed.ts",
+ "frontend/src/metabase/app-main.ts",
+ "frontend/src/metabase/app-public.ts",
+ "frontend/src/metabase/app.tsx",
+ "enterprise/frontend/src/metabase-enterprise/sdk-iframe-embedding-script-plugins.ts",
+
+ // Build tooling: node scripts and bundler configs, not app code.
+ "enterprise/frontend/src/custom-viz/scripts/check-package-versions.ts",
+ "enterprise/frontend/src/custom-viz/src/cli.ts",
+ "enterprise/frontend/src/custom-viz/src/pack.ts",
+ "enterprise/frontend/src/custom-viz/src/templates.ts",
+ "enterprise/frontend/src/custom-viz/src/templates/vite.config.ts",
+ "enterprise/frontend/src/custom-viz/vite.config.ts",
+ "enterprise/frontend/src/embedding-sdk-package/data-app-dev-entry.tsx",
+ "enterprise/frontend/src/embedding-sdk-package/data-app-dev.config.ts",
+ "enterprise/frontend/src/embedding-sdk-package/data-app-dev/config/build-config.ts",
+ "enterprise/frontend/src/embedding-sdk-package/data-app-dev/dev-plugin/app-bundle.ts",
+ "enterprise/frontend/src/embedding-sdk-package/data-app-dev/dev-plugin/plugin.ts",
+ "enterprise/frontend/src/embedding-sdk-package/data-app-dev/index.ts",
+
+ // Storybook data that reads a geojson asset webpack resolves.
+ "frontend/src/metabase/static-viz/components/StaticChoropleth/stories-data.ts",
+]);
+
+describe("translation at import time", () => {
+ it("no module translates while it is being imported", async () => {
+ const files = ROOTS.flatMap((r) => sourceFiles(path.join(ROOT, r)));
+ const unimportable: { file: string; error: unknown }[] = [];
+
+ // Modules are imported outside the app, so many of them log on the way up,
+ // and a few register jest hooks that cannot be nested inside a test.
+ const consoleError = jest.spyOn(console, "error").mockImplementation();
+ const consoleWarn = jest.spyOn(console, "warn").mockImplementation();
+ const hookNames = [
+ "beforeAll",
+ "beforeEach",
+ "afterEach",
+ "afterAll",
+ ] as const;
+ const realHooks = hookNames.map(
+ (name) => [name, globalThis[name]] as const,
+ );
+ for (const name of hookNames) {
+ // globalThis is not typed with jest's hook registrars.
+ (globalThis as unknown as Record<string, unknown>)[name] = () => {};
+ }
+
+ recording = true;
+ for (const file of files) {
+ try {
+ await import(file);
+ } catch (error) {
+ unimportable.push({ file: path.relative(ROOT, file), error });
+ }
+ }
+ recording = false;
+ for (const [name, hook] of realHooks) {
+ // globalThis is not typed with jest's hook registrars.
+ (globalThis as unknown as Record<string, unknown>)[name] = hook;
+ }
+ consoleError.mockRestore();
+ consoleWarn.mockRestore();
+
+ const unexpected = unimportable
+ .filter(({ file }) => !UNIMPORTABLE.has(file))
+ .map(
+ ({ file, error }) =>
+ `${file}: ${error instanceof Error ? error.message : String(error)}`,
+ );
+ const stale = [...UNIMPORTABLE].filter((allowed) =>
+ unimportable.every(({ file }) => file !== allowed),
+ );
+ expect({ unexpected, stale }).toEqual({ unexpected: [], stale: [] });
+
+ const byModule = new Map<string, Set<string>>();
+ for (const { text, stack } of translated) {
+ const frames = (stack ?? "")
+ .split("\n")
+ .map((line) => line.match(/\(?(\/[^\s)]+\.tsx?):\d+:\d+\)?/)?.[1])
+ .filter(
+ (file): file is string =>
+ Boolean(file) && !file!.includes("i18n-import-time"),
+ )
+ .map((file) => path.relative(ROOT, file));
+ const key = frames.slice(0, 3).join(" <- ") || "unattributed";
+ (byModule.get(key) ?? byModule.set(key, new Set()).get(key)!).add(text);
+ }
+
+ expect([...byModule.keys()]).toEqual([]);
+ }, 600000);
+});
diff --git a/jest.esm-packages.js b/jest.esm-packages.js
index a0c8efc6cfd..88de16f825e 100644
--- a/jest.esm-packages.js
+++ b/jest.esm-packages.js
@@ -6,6 +6,7 @@
*/
const esmPackages = [
"@metabase\\+track",
+ "@modelcontextprotocol\\+ext-apps",
"bail",
"ccount",
"character-entities.*",