Skip to content

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

GDGT-2001 Get rid of VisualizationSettingDefinition["default"] (#71015)

Kamil Mielnik55144d12bea1
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionViz.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionViz.tsx
index eb798f2ef50..8e1600e2a0d 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionViz.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionViz.tsx
@@ -43,41 +43,38 @@ export default Object.assign(Action, {
title: t`Action Form Display`,
widget: "radio",
hidden: true,
- props: {
+ getProps: () => ({
options: [
- /* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
{ name: t`Form`, value: "form" },
- /* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
{ name: t`Button`, value: "button" },
],
- },
+ }),
},
"button.label": {
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
section: t`Display`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
title: t`Label`,
widget: "input",
getHidden: isForm,
},
"button.variant": {
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
section: t`Display`,
+ // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
title: t`Variant`,
widget: "select",
- default: "primary",
+ getDefault: () => "primary",
getHidden: isForm,
- props: {
+ getProps: () => ({
options: [
- /* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
{ label: t`Primary`, value: "primary" },
- /* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
{ label: t`Outline`, value: "default" },
- /* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
{ label: t`Danger`, value: "danger" },
- /* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
{ label: t`Success`, value: "success" },
- /* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
{ label: t`Borderless`, value: "borderless" },
],
- },
+ }),
},
},
});
diff --git a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
index e9529aa7069..1247dd21501 100644
--- a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
@@ -14,7 +14,8 @@ import { Form, FormProvider, FormSelect, FormTextInput } from "metabase/forms";
import { Box, Button, Divider, Flex, Modal, Stack, Title } from "metabase/ui";
import type { ActionDashboardCard } from "metabase-types/api";
-const buttonVariantOptions = ActionViz.settings["button.variant"].props.options;
+const buttonVariantOptions =
+ ActionViz.settings["button.variant"].getProps().options;
export function ActionSidebar() {
const {
diff --git a/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx b/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx
index beefc05978a..0e12487d16f 100644
--- a/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx
+++ b/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx
@@ -53,16 +53,16 @@ const vizDefinition = {
settings: {
...columnSettings({ hidden: true }),
"list.entity_icon": {
- default: null,
+ getDefault: () => null,
},
"list.entity_icon_color": {
- default: color("text-primary"),
+ getDefault: () => color("text-primary"),
},
"list.entity_icon_enabled": {
- default: true,
+ getDefault: () => true,
},
"list.use_image_column": {
- default: false,
+ getDefault: () => false,
},
"list.columns": {
getDefault: ([
@@ -154,7 +154,7 @@ const vizDefinition = {
settings["text_wrapping"] = {
title: t`Wrap text`,
- default: false,
+ getDefault: () => false,
widget: "toggle",
inline: true,
isValid: (_column, columnSettings) => {
@@ -190,7 +190,7 @@ const vizDefinition = {
settings["view_as"] = {
title: t`Display as`,
widget: options.length === 2 ? "radio" : "select",
- default: defaultValue,
+ getDefault: () => defaultValue,
props: {
options,
},
@@ -203,7 +203,7 @@ const vizDefinition = {
title: t`Link text`,
widget: ChartSettingLinkUrlInput,
hint: linkFieldsHint,
- default: null,
+ getDefault: () => null,
getHidden: (_, settings) =>
settings["view_as"] !== "link" && settings["view_as"] !== "email_link",
readDependencies: ["view_as"],
@@ -230,7 +230,7 @@ const vizDefinition = {
title: t`Link URL`,
widget: ChartSettingLinkUrlInput,
hint: linkFieldsHint,
- default: null,
+ getDefault: () => null,
getHidden: (_, settings) => settings["view_as"] !== "link",
readDependencies: ["view_as"],
getProps: (
diff --git a/frontend/src/metabase/visualizations/lib/settings.ts b/frontend/src/metabase/visualizations/lib/settings.ts
index d7fb5947290..9d8a435d54a 100644
--- a/frontend/src/metabase/visualizations/lib/settings.ts
+++ b/frontend/src/metabase/visualizations/lib/settings.ts
@@ -148,11 +148,6 @@ function getComputedSetting<T, TValue, TProps extends Record<string, unknown>>(
computedSettings[settingId] = defaultValue;
return;
}
-
- if ("default" in settingDef) {
- computedSettings[settingId] = settingDef.default;
- return;
- }
} catch (e) {
console.warn("Error getting setting", settingId, e);
}
diff --git a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
index e77d241898c..98490fb429f 100644
--- a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
@@ -25,13 +25,6 @@ describe("settings framework", () => {
expect(getComputedSettings(defs, mockObject, stored)).toEqual(expected);
});
- it("should use `default` if no stored setting", () => {
- const defs = { foo: { default: "foo" } };
- const stored = {};
- const expected = { foo: "foo" };
- expect(getComputedSettings(defs, mockObject, stored)).toEqual(expected);
- });
-
it("should use `getDefault` if no stored setting", () => {
const defs = { foo: { getDefault: () => "foo" } };
const stored = {};
@@ -46,8 +39,8 @@ describe("settings framework", () => {
expect(getComputedSettings(defs, mockObject, stored)).toEqual(expected);
});
- it("should use default if `isValid` returns false", () => {
- const defs = { foo: { default: "bar", isValid: () => false } };
+ it("should use `getDefault` if `isValid` returns false", () => {
+ const defs = { foo: { getDefault: () => "bar", isValid: () => false } };
const stored = { foo: "foo" };
const expected = { foo: "bar" };
expect(getComputedSettings(defs, mockObject, stored)).toEqual(expected);
@@ -64,7 +57,7 @@ describe("settings framework", () => {
const getDefault = jest.fn().mockReturnValue("foo");
const defs = {
foo: { getDefault, readDependencies: ["bar"] },
- bar: { default: "bar" },
+ bar: { getDefault: () => "bar" },
};
const stored = {};
const expected = { foo: "foo", bar: "bar" };
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.ts b/frontend/src/metabase/visualizations/lib/settings/column.ts
index ba4ead2528f..ea1e8f09a8a 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/column.ts
@@ -177,7 +177,7 @@ export const DATE_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {
return t`Date separators`;
},
widget: "radio",
- default: "/",
+ getDefault: () => "/",
getProps: (_column, settings) => {
const style = /\//.test(settings.date_style ?? "")
? (settings.date_style ?? "")
@@ -198,7 +198,7 @@ export const DATE_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {
return t`Abbreviate days and months`;
},
widget: "toggle",
- default: false,
+ getDefault: () => false,
inline: true,
getHidden: ({ unit }, settings) => {
const format = getDateFormatFromStyle(
@@ -230,7 +230,7 @@ export const DATE_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {
return t`Time style`;
},
widget: "radio",
- default: "h:mm A",
+ getDefault: () => "h:mm A",
getProps: (column) => ({
options: getTimeStyleOptions(column.unit ?? "default"),
}),
diff --git a/frontend/src/metabase/visualizations/lib/settings/goal.ts b/frontend/src/metabase/visualizations/lib/settings/goal.ts
index 678feca964b..3b6495f4920 100644
--- a/frontend/src/metabase/visualizations/lib/settings/goal.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/goal.ts
@@ -33,7 +33,7 @@ export const GRAPH_GOAL_SETTINGS: VisualizationSettingsDefinitions = {
return t`Goal line`;
},
widget: "toggle",
- default: false,
+ getDefault: () => false,
inline: true,
getMarginBottom: () => "1rem",
},
@@ -45,7 +45,7 @@ export const GRAPH_GOAL_SETTINGS: VisualizationSettingsDefinitions = {
return t`Goal value`;
},
widget: "number",
- default: 0,
+ getDefault: () => 0,
getHidden: (_series, vizSettings) =>
vizSettings["graph.show_goal"] !== true,
readDependencies: ["graph.show_goal"],
diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.ts b/frontend/src/metabase/visualizations/lib/settings/graph.ts
index 2d43782d518..845e14ddc39 100644
--- a/frontend/src/metabase/visualizations/lib/settings/graph.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/graph.ts
@@ -295,16 +295,16 @@ export const GRAPH_BUBBLE_SETTINGS: VisualizationSettingsDefinitions = {
},
};
-export const LINE_SETTINGS = {
+export const LINE_SETTINGS: VisualizationSettingsDefinitions = {
// DEPRECATED: moved to series settings
"line.interpolate": {
- default: "linear",
+ getDefault: () => "linear",
},
// DEPRECATED: moved to series settings
"line.marker_enabled": {},
// DEPRECATED: moved to series settings
"line.missing": {
- default: "interpolate",
+ getDefault: () => "interpolate",
},
};
@@ -384,7 +384,7 @@ export const SPLIT_PANELS_SETTINGS: VisualizationSettingsDefinitions = {
return t`Split series into panels`;
},
widget: "toggle",
- default: false,
+ getDefault: () => false,
inline: true,
getMarginBottom: () => "1rem",
getHidden: (series, settings) => {
@@ -456,7 +456,7 @@ export const GRAPH_TREND_SETTINGS: VisualizationSettingsDefinitions = {
return t`Trend line`;
},
widget: "toggle",
- default: false,
+ getDefault: () => false,
getHidden: (series, vizSettings) => {
const { insights } = series[0].data;
const graphDimensions = vizSettings["graph.dimensions"] ?? [];
@@ -636,7 +636,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {
"graph.max_categories_enabled": {
hidden: true,
// temporarily hiding the setting (metabase#50510)
- default: false,
+ getDefault: () => false,
isValid: () => false,
readDependencies: ["series_settings"],
},
@@ -644,7 +644,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {
widget: ChartSettingMaxCategories,
hidden: true,
// temporarily hiding the setting (metabase#50510)
- default: Number.MAX_SAFE_INTEGER,
+ getDefault: () => Number.MAX_SAFE_INTEGER,
isValid: () => false,
getProps: (_series, settings) => {
return {
@@ -659,7 +659,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {
],
},
"graph.other_category_color": {
- default: color("text-tertiary"),
+ getDefault: () => color("text-tertiary"),
},
"graph.other_category_aggregation_fn": {
hidden: true,
@@ -748,7 +748,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {
return t`Y-axis`;
},
widget: "select",
- default: "linear",
+ getDefault: () => "linear",
getProps: () => ({
options: [
{ name: t`Linear`, value: "linear" },
@@ -803,7 +803,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {
},
],
}),
- default: true,
+ getDefault: () => true,
},
"graph.y_axis.axis_enabled": {
get section() {
@@ -833,7 +833,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {
},
],
}),
- default: true,
+ getDefault: () => true,
},
"graph.y_axis.unpin_from_zero": {
get section() {
@@ -888,7 +888,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {
return t`Min`;
},
widget: "number",
- default: 0,
+ getDefault: () => 0,
getHidden: (_series, vizSettings) =>
vizSettings["graph.y_axis.auto_range"] !== false,
},
@@ -904,7 +904,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {
return t`Max`;
},
widget: "number",
- default: 100,
+ getDefault: () => 100,
getHidden: (series, vizSettings) =>
vizSettings["graph.y_axis.auto_range"] !== false,
},
@@ -1033,7 +1033,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<
return t`Whiskers extend to`;
},
widget: "radio",
- default: "tukey",
+ getDefault: () => "tukey",
getProps: () => ({
get options() {
return [
@@ -1051,7 +1051,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<
return t`Show points`;
},
widget: "radio",
- default: "outliers",
+ getDefault: () => "outliers",
getValue: (_series, settings) => {
const isMinMax = settings["boxplot.whisker_type"] === "min-max";
const savedValue = settings["boxplot.points_mode"];
@@ -1082,7 +1082,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<
return t`Show mean`;
},
widget: "toggle",
- default: true,
+ getDefault: () => true,
inline: true,
},
"graph.show_values": {
@@ -1093,7 +1093,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<
return t`Show values on data points`;
},
widget: "toggle",
- default: false,
+ getDefault: () => false,
inline: true,
getMarginBottom: () => "1rem",
},
@@ -1105,7 +1105,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<
return t`Values to display`;
},
widget: "segmentedControl",
- default: "median",
+ getDefault: () => "median",
getHidden: (_series, vizSettings) => !vizSettings["graph.show_values"],
getProps: () => ({
options: [
@@ -1133,7 +1133,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<
return t`Hide overlapping labels`;
},
widget: ChartSettingEnumToggle,
- default: "fit",
+ getDefault: () => "fit",
inline: true,
getHidden: (_series, vizSettings) => !vizSettings["graph.show_values"],
getProps: () => ({
@@ -1150,7 +1150,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<
return t`Auto formatting`;
},
widget: "segmentedControl",
- default: "compact",
+ getDefault: () => "compact",
getHidden: (_series, vizSettings) => !vizSettings["graph.show_values"],
getProps: () => ({
options: [
diff --git a/frontend/src/metabase/visualizations/lib/settings/nested.ts b/frontend/src/metabase/visualizations/lib/settings/nested.ts
index 6c695e12fcd..59b0ae4061b 100644
--- a/frontend/src/metabase/visualizations/lib/settings/nested.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/nested.ts
@@ -150,7 +150,7 @@ export function nestedSettings<
const idDef: SeriesSettingDefinition<Value, TProps & { id: string }> = {
section: t`Display`,
- default: {},
+ getDefault: () => ({}),
getProps: (series, settings, onChange, extra) => {
const objects = getObjects(series, settings);
const allComputedSettings = getComputedSettingsForAllObjects(
diff --git a/frontend/src/metabase/visualizations/lib/settings/series.ts b/frontend/src/metabase/visualizations/lib/settings/series.ts
index a633071610e..21f9b2700f5 100644
--- a/frontend/src/metabase/visualizations/lib/settings/series.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/series.ts
@@ -203,7 +203,6 @@ export function seriesSetting({
axis: {
title: t`Y-axis position`,
widget: "segmentedControl",
- default: null,
getHidden: (single, _seriesSettings, extra) =>
single.card.display === "row" ||
extra?.settings?.["graph.split_panels"] === true,
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 8f1a3d201ae..2391fa7b353 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -277,7 +277,6 @@ export type ColumnSettingDefinition<TValue, TProps = unknown> = {
title?: string;
hint?: string;
widget?: string | ComponentType<any>;
- default?: TValue;
props?: TProps;
inline?: boolean;
readDependencies?: string[];
@@ -352,7 +351,6 @@ export type VisualizationSettingDefinition<
extra?: SettingsExtra,
) => string;
autoOpenWhenUnset?: boolean;
- default?: TValue;
noPadding?: boolean;
value?: TValue;
set?: boolean;
diff --git a/frontend/src/metabase/visualizations/visualizations/Heading/index.ts b/frontend/src/metabase/visualizations/visualizations/Heading/index.ts
index b33205b5202..caf543007a5 100644
--- a/frontend/src/metabase/visualizations/visualizations/Heading/index.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Heading/index.ts
@@ -28,18 +28,17 @@ const HeadingWrapper = Object.assign(Heading, {
settings: {
"card.title": {
dashboard: false,
- // eslint-disable-next-line ttag/no-module-declaration
- default: t`Heading card`,
+ getDefault: () => t`Heading card`,
},
"card.description": {
dashboard: false,
},
text: {
value: "",
- default: "",
+ getDefault: () => "",
},
"dashcard.background": {
- default: false,
+ getDefault: () => false,
},
},
});
diff --git a/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameVizSettings.ts b/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameVizSettings.ts
index 6a1d702a82e..c5a4a9e026c 100644
--- a/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameVizSettings.ts
+++ b/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameVizSettings.ts
@@ -29,7 +29,7 @@ export const settings = {
},
iframe: {
value: "",
- default: "",
+ getDefault: () => "",
},
},
};
diff --git a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkVizSettings.ts b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkVizSettings.ts
index 19796c27164..5d2961e7e52 100644
--- a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkVizSettings.ts
+++ b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkVizSettings.ts
@@ -31,9 +31,9 @@ export const settings = {
value: {
url: "",
},
- default: {
+ getDefault: () => ({
url: "",
- },
+ }),
},
},
preventDragging: (e: React.SyntheticEvent) => e.stopPropagation(),
diff --git a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
index 84096b38f15..7b9db4cd92c 100644
--- a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
@@ -249,7 +249,7 @@ export class Map extends Component {
),
isQuantile: true,
}),
- default: getColorplethColorScale(getAccentColors()[0]),
+ getDefault: () => getColorplethColorScale(getAccentColors()[0]),
getHidden: (series, vizSettings) => vizSettings["map.type"] !== "region",
},
"map.zoom": {},
@@ -260,7 +260,7 @@ export class Map extends Component {
return t`Radius`;
},
widget: "number",
- default: 30,
+ getDefault: () => 30,
getHidden: (series, vizSettings) => vizSettings["map.type"] !== "heat",
},
"map.heat.blur": {
@@ -268,7 +268,7 @@ export class Map extends Component {
return t`Blur`;
},
widget: "number",
- default: 60,
+ getDefault: () => 60,
getHidden: (series, vizSettings) => vizSettings["map.type"] !== "heat",
},
"map.heat.min-opacity": {
@@ -276,7 +276,7 @@ export class Map extends Component {
return t`Min Opacity`;
},
widget: "number",
- default: 0,
+ getDefault: () => 0,
getHidden: (series, vizSettings) => vizSettings["map.type"] !== "heat",
},
"map.heat.max-zoom": {
@@ -284,7 +284,7 @@ export class Map extends Component {
return t`Max Zoom`;
},
widget: "number",
- default: 1,
+ getDefault: () => 1,
getHidden: (series, vizSettings) => vizSettings["map.type"] !== "heat",
},
};
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
index 589199dfc58..2afbdfa4bb6 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
@@ -156,7 +156,7 @@ export const settings = {
return t`Show row totals`;
},
widget: "toggle",
- default: true,
+ getDefault: () => true,
inline: true,
},
"pivot.show_column_totals": {
@@ -167,7 +167,7 @@ export const settings = {
return t`Show column totals`;
},
widget: "toggle",
- default: true,
+ getDefault: () => true,
inline: true,
},
"pivot.condense_duplicate_totals": {
@@ -181,7 +181,7 @@ export const settings = {
return t`Hide additional total elements if the totals are the same`;
},
widget: "toggle",
- default: true,
+ getDefault: () => true,
inline: true,
getHidden: (
_series: RawSeries,
@@ -200,7 +200,6 @@ export const settings = {
return t`Conditional Formatting`;
},
widget: ChartSettingsTableFormatting,
- default: [],
getDefault: (
[{ data }]: [{ data: DatasetData }],
settings: VisualizationSettings,
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts
index af6c95a84c0..b72d780931c 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts
@@ -76,7 +76,7 @@ export const PROGRESS_CHART_DEFINITION: VisualizationDefinition = {
return t`Goal`;
},
widget: ChartSettingGoalInput,
- default: 0,
+ getDefault: () => 0,
isValid: ([{ data }], settings) => {
const goalSetting = settings["progress.goal"];
@@ -105,7 +105,7 @@ export const PROGRESS_CHART_DEFINITION: VisualizationDefinition = {
return t`Color`;
},
widget: "color",
- default: color("accent1"),
+ getDefault: () => color("accent1"),
},
},
};
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.ts
index f965de178c1..7df6d7aaf51 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.ts
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.ts
@@ -15,7 +15,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
index: 1,
widget: "radio",
- default: null,
+ getDefault: () => null,
getProps: () => ({
options: [
{
@@ -52,7 +52,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
index: 4,
widget: "select",
- default: "ordinal",
+ getDefault: () => "ordinal",
getProps: () => {
return { options: [{ name: t`Ordinal`, value: "ordinal" }] };
},
@@ -69,7 +69,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
return t`X-axis`;
},
widget: "select",
- default: "linear",
+ getDefault: () => "linear",
getProps: () => ({
options: [
{ name: t`Linear`, value: "linear" },
@@ -106,7 +106,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
],
}),
- default: true,
+ getDefault: () => true,
},
"graph.y_axis.axis_enabled": {
get section() {
@@ -136,7 +136,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
],
}),
- default: true,
+ getDefault: () => true,
},
"graph.y_axis.auto_range": {
get section() {
@@ -151,7 +151,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
inline: true,
widget: "toggle",
- default: true,
+ getDefault: () => true,
},
"graph.y_axis.min": {
get section() {
@@ -165,7 +165,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
return t`Min`;
},
widget: "number",
- default: 0,
+ getDefault: () => 0,
getHidden: (_series: Series, vizSettings: VisualizationSettings) =>
vizSettings["graph.y_axis.auto_range"] !== false,
},
@@ -181,7 +181,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
return t`Max`;
},
widget: "number",
- default: 100,
+ getDefault: () => 100,
getHidden: (_series: Series, vizSettings: VisualizationSettings) =>
vizSettings["graph.y_axis.auto_range"] !== false,
},
@@ -198,7 +198,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
inline: true,
widget: "toggle",
- default: true,
+ getDefault: () => true,
},
"graph.x_axis.title_text": {
get section() {
@@ -232,7 +232,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
widget: "toggle",
inline: true,
- default: true,
+ getDefault: () => true,
},
"graph.y_axis.title_text": {
get section() {
@@ -276,7 +276,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
inline: true,
getHidden: (_series: Series, vizSettings: VisualizationSettings) =>
vizSettings["stackable.stack_type"] === "normalized",
- default: false,
+ getDefault: () => false,
},
"graph.label_value_formatting": {
get section() {
@@ -305,7 +305,7 @@ export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {
},
],
}),
- default: "full",
+ getDefault: () => "full",
readDependencies: ["graph.show_values"],
},
};
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts
index 3b54f588eca..0095db787d6 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts
@@ -65,7 +65,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
title: t`Align`,
widget: "select",
- default: "left",
+ getDefault: () => "left",
getProps: () => ({
options: [
{
@@ -89,7 +89,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
title: t`Show edge labels`,
widget: "toggle",
- default: false,
+ getDefault: () => false,
inline: true,
},
"sankey.label_value_formatting": {
@@ -108,7 +108,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
getHidden: (_series, vizSettings) => {
return !vizSettings["sankey.show_edge_labels"];
},
- default: "auto",
+ getDefault: () => "auto",
},
"sankey.edge_color": {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
@@ -116,7 +116,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
title: t`Edge color`,
widget: "segmentedControl",
- default: "source",
+ getDefault: () => "source",
getProps: () => ({
options: [
{ name: t`Gray`, value: "gray" },
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
index 18e61d854ee..43513b3c7f6 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx
@@ -126,7 +126,7 @@ export class Scalar extends Component<
// { name: "100.000,00", value: "de" },
// ],
// }),
- // default: "en",
+ // getDefault:() => "en",
},
"scalar.decimals": {
// title: t`Number of decimal places`,
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
index 732ee890976..947f90e46b4 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.tsx
@@ -199,7 +199,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
title: t`Switch positive / negative colors?`,
widget: "toggle",
inline: true,
- default: VIZ_SETTINGS_DEFAULTS["scalar.switch_positive_negative"],
+ getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.switch_positive_negative"],
},
"scalar.compact_primary_number": {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
@@ -208,7 +208,7 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {
title: t`Compact number`,
widget: "toggle",
inline: true,
- default: VIZ_SETTINGS_DEFAULTS["scalar.compact_primary_number"],
+ getDefault: () => VIZ_SETTINGS_DEFAULTS["scalar.compact_primary_number"],
},
...columnSettings({
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
index 21f042f4aa0..9c7c95e4cc2 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
@@ -102,7 +102,7 @@ export class Table extends Component<TableProps, TableState> {
inline: true,
widget: "toggle",
dashboard: true,
- default: false,
+ getDefault: () => false,
},
"table.row_index": {
get section() {
@@ -113,7 +113,7 @@ export class Table extends Component<TableProps, TableState> {
},
inline: true,
widget: "toggle",
- default: false,
+ getDefault: () => false,
},
"table.pivot": {
get section() {
@@ -215,7 +215,7 @@ export class Table extends Component<TableProps, TableState> {
return t`Conditional Formatting`;
},
widget: ChartSettingsTableFormatting,
- default: [],
+ getDefault: () => [],
getProps: (series: Series, settings: VisualizationSettings) => ({
cols: series[0].data.cols.filter(isFormattable),
isPivoted: settings["table.pivot"],
@@ -292,7 +292,7 @@ export class Table extends Component<TableProps, TableState> {
settings["text_wrapping"] = {
title: t`Wrap text`,
- default: false,
+ getDefault: () => false,
widget: "toggle",
inline: true,
isValid: (_column, columnSettings) => {
@@ -328,7 +328,7 @@ export class Table extends Component<TableProps, TableState> {
settings["view_as"] = {
title: t`Display as`,
widget: options.length === 2 ? "radio" : "select",
- default: defaultValue,
+ getDefault: () => defaultValue,
getProps: () => ({
options,
}),
@@ -341,7 +341,7 @@ export class Table extends Component<TableProps, TableState> {
title: t`Link text`,
widget: ChartSettingLinkUrlInput,
hint: linkFieldsHint,
- default: null,
+ getDefault: () => null,
getHidden: (_, settings) =>
settings["view_as"] !== "link" && settings["view_as"] !== "email_link",
readDependencies: ["view_as"],
@@ -368,7 +368,7 @@ export class Table extends Component<TableProps, TableState> {
title: t`Link URL`,
widget: ChartSettingLinkUrlInput,
hint: linkFieldsHint,
- default: null,
+ getDefault: () => null,
getHidden: (_, settings) => settings["view_as"] !== "link",
readDependencies: ["view_as"],
getProps: (
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
index 0f57659a217..dc1b536d38c 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.unit.spec.tsx
@@ -354,7 +354,7 @@ describe("text_wrapping", () => {
const stringColumn = createMockCategoryColumn();
const textWrappingSetting = getTextWrappingSetting(stringColumn);
- expect(textWrappingSetting.default).toBe(false);
+ expect(textWrappingSetting.getDefault?.(stringColumn, {})).toBe(false);
});
});
});
diff --git a/frontend/src/metabase/visualizations/visualizations/Text/index.ts b/frontend/src/metabase/visualizations/visualizations/Text/index.ts
index 0bce8dffd37..f82f4141228 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text/index.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Text/index.ts
@@ -28,15 +28,14 @@ const TextWrapper = Object.assign(Text, {
settings: {
"card.title": {
dashboard: false,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- default: t`Text card`,
+ getDefault: () => t`Text card`,
},
"card.description": {
dashboard: false,
},
text: {
value: "",
- default: "",
+ getDefault: () => "",
},
"text.align_vertical": {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
@@ -51,7 +50,7 @@ const TextWrapper = Object.assign(Text, {
{ name: t`Bottom`, value: "bottom" },
],
}),
- default: "top",
+ getDefault: () => "top",
},
"text.align_horizontal": {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
@@ -66,7 +65,7 @@ const TextWrapper = Object.assign(Text, {
{ name: t`Right`, value: "right" },
],
}),
- default: "left",
+ getDefault: () => "left",
},
"dashcard.background": {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
@@ -76,7 +75,7 @@ const TextWrapper = Object.assign(Text, {
dashboard: true,
inline: true,
widget: "toggle",
- default: true,
+ getDefault: () => true,
},
},
});
diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
index b4721cb6596..d98045f15b7 100644
--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx
@@ -69,7 +69,7 @@ Object.assign(
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
title: t`Show total`,
widget: "toggle",
- default: true,
+ getDefault: () => true,
inline: true,
},
"waterfall.total_color": {