The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
GDGT-1939 Get rid of VisualizationSettingDefinition["props"] (#70867)
Kamil Mielnik492008d7fd31
diff --git a/frontend/src/metabase/visualizations/lib/settings.ts b/frontend/src/metabase/visualizations/lib/settings.tsindex 17cf96d1da7..4afddc7a944 100644--- a/frontend/src/metabase/visualizations/lib/settings.ts+++ b/frontend/src/metabase/visualizations/lib/settings.ts@@ -200,15 +200,14 @@ function getSettingWidget<T, TValue, TProps extends Record<string, unknown>>(}const getHiddenFn = settingDef.getHidden;- const getPropsFn = settingDef.getProps;- const defaultProps = {} as TProps;+ const { getProps, ...settingDefProps } = settingDef;const section = settingDef.getSection? settingDef.getSection(resolvedObject, computedSettings, extra): settingDef.section;return {- ...settingDef,+ ...settingDefProps,id: settingId,value,section,@@ -221,20 +220,14 @@ function getSettingWidget<T, TValue, TProps extends Record<string, unknown>>(disabled: settingDef.getDisabled? settingDef.getDisabled(resolvedObject, computedSettings, extra): (settingDef.disabled ?? false),- props: {- ...(settingDef.props && typeof settingDef.props === "object"- ? settingDef.props- : defaultProps),- ...(getPropsFn- ? getPropsFn(- resolvedObject,- computedSettings,- onChange,- extra,- onChangeSettings,- )- : defaultProps),- },+ props:+ getProps?.(+ resolvedObject,+ computedSettings,+ onChange,+ extra,+ onChangeSettings,+ ) ?? {},set: settingId in storedSettings,widget:typeof settingDef.widget === "string"diff --git a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings.unit.spec.tsindex aa7884a2956..c90f013eb43 100644--- a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts+++ b/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts@@ -138,10 +138,10 @@ describe("settings framework", () => {expect(getHidden.mock.calls).toEqual([[mockObject, {}, {}]]);});- it("should return props when `props` is provided", () => {+ it("should ignore provided `props`", () => {const defs = { foo: { widget: "input", props: { hello: "world" } } };const widgets = getSettingsWidgets(defs, {}, {}, mockObject, () => {});- expect(widgets[0].props).toEqual({ hello: "world" });+ expect(widgets[0].props).toEqual({});});it("should compute props when `getProps` is provided", () => {diff --git a/frontend/src/metabase/visualizations/lib/settings/column.ts b/frontend/src/metabase/visualizations/lib/settings/column.tsindex 2d937525508..ba4ead2528f 100644--- a/frontend/src/metabase/visualizations/lib/settings/column.ts+++ b/frontend/src/metabase/visualizations/lib/settings/column.ts@@ -246,7 +246,7 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {return t`Style`;},widget: "select",- props: {+ getProps: () => ({options: [{get name() {@@ -273,7 +273,7 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {value: "currency",},],- },+ }),getDefault: getDefaultNumberStyle,// hide this for currencygetHidden: (column, settings) =>@@ -285,7 +285,7 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {return t`Unit of currency`;},widget: "select",- props: {+ getProps: () => ({// FIXME: rest of these optionsoptions: currency.map(([_code, c]) => ({name: c.name,@@ -293,7 +293,7 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {})),searchProp: "name",searchCaseSensitive: false,- },+ }),getDefault: getDefaultCurrency,getHidden: (_column, settings) => settings.number_style !== "currency",},@@ -343,7 +343,7 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {return t`Separator style`;},widget: "select",- props: {+ getProps: () => ({options: [{ name: "100,000.00", value: ".," },{ name: "100 000,00", value: ", " },@@ -351,7 +351,7 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {{ name: "100000.00", value: "." },{ name: "100’000.00", value: ".’" },],- },+ }),getDefault: getDefaultNumberSeparators,},decimals: {@@ -359,42 +359,42 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {return t`Number of decimal places`;},widget: "number",- props: {+ getProps: () => ({placeholder: "1",options: {isNonNegative: true,isInteger: true,},- },+ }),},scale: {get title() {return t`Multiply by a number`;},widget: "number",- props: {+ getProps: () => ({placeholder: "1",- },+ }),},prefix: {get title() {return t`Add a prefix`;},widget: "input",- props: {+ getProps: () => ({placeholder: "$",- },+ }),},suffix: {get title() {return t`Add a suffix`;},widget: "input",- props: {+ getProps: () => ({get placeholder() {return t`dollars`;},- },+ }),},// Optimization: build a single NumberFormat object that is used by formatting.js_numberFormatter: {@@ -433,9 +433,9 @@ const COMMON_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {// markdown_template: {// title: t`Markdown template`,// widget: "input",- // props: {+ // getProps: () => ({// placeholder: "{{value}}",- // },+ // }),// },column: {getValue: (column) => column,diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.ts b/frontend/src/metabase/visualizations/lib/settings/graph.tsindex e0661c9dd70..e04d3518ce5 100644--- a/frontend/src/metabase/visualizations/lib/settings/graph.ts+++ b/frontend/src/metabase/visualizations/lib/settings/graph.ts@@ -317,7 +317,7 @@ export const STACKABLE_SETTINGS: VisualizationSettingsDefinitions = {return t`Stacking`;},widget: "radio",- props: {+ getProps: () => ({options: [{get name() {@@ -338,7 +338,7 @@ export const STACKABLE_SETTINGS: VisualizationSettingsDefinitions = {value: "normalized",},],- },+ }),isValid: (series, settings) => {const seriesDisplays = getSeriesDisplays(series, settings);@@ -474,7 +474,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {return !canHaveDataLabels(series, vizSettings);},- props: {+ getProps: () => ({options: [{get name() {@@ -489,7 +489,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {value: "all",},],- },+ }),getDefault: getDefaultDataLabelsFrequency,readDependencies: ["graph.show_values"],},@@ -517,7 +517,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {vizSettings,);},- props: {+ getProps: () => ({options: [{get name() {@@ -538,7 +538,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {value: "all",},],- },+ }),getDefault: (_series, settings) => getDefaultShowStackValues(settings),readDependencies: ["graph.show_values", "stackable.stack_type"],},@@ -553,7 +553,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {getHidden: (series, vizSettings) => {return !canHaveDataLabels(series, vizSettings);},- props: {+ getProps: () => ({options: [{get name() {@@ -574,7 +574,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS: VisualizationSettingsDefinitions = {value: "full",},],- },+ }),getDefault: (_series, vizSettings) => {const columnSettings = vizSettings["column_settings"];if (columnSettings) {@@ -732,7 +732,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {},index: 3,widget: "select",- props: {+ getProps: () => ({options: [{get name() {@@ -765,7 +765,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {value: "rotate-90",},],- },+ }),default: true,},"graph.y_axis.axis_enabled": {@@ -780,7 +780,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {return t`Y-axis`;},widget: "select",- props: {+ getProps: () => ({options: [{get name() {@@ -795,7 +795,7 @@ export const GRAPH_AXIS_SETTINGS: VisualizationSettingsDefinitions = {value: true,},],- },+ }),default: true,},"graph.y_axis.unpin_from_zero": {@@ -995,14 +995,14 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<},widget: "radio",default: "tukey",- props: {+ getProps: () => ({get options() {return [{ name: t`1.5 × interquartile range`, value: "tukey" },{ name: t`Min/Max`, value: "min-max" },];},- },+ }),},"boxplot.points_mode": {get section() {@@ -1068,7 +1068,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<widget: "segmentedControl",default: "median",getHidden: (_series, vizSettings) => !vizSettings["graph.show_values"],- props: {+ getProps: () => ({options: [{get name() {@@ -1083,7 +1083,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<value: "all",},],- },+ }),readDependencies: ["graph.show_values"],},"graph.label_value_frequency": {@@ -1097,10 +1097,10 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<default: "fit",inline: true,getHidden: (_series, vizSettings) => !vizSettings["graph.show_values"],- props: {+ getProps: () => ({checkedValue: "fit",uncheckedValue: "all",- },+ }),readDependencies: ["graph.show_values"],},"graph.label_value_formatting": {@@ -1113,7 +1113,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<widget: "segmentedControl",default: "compact",getHidden: (_series, vizSettings) => !vizSettings["graph.show_values"],- props: {+ getProps: () => ({options: [{get name() {@@ -1128,7 +1128,7 @@ export const BOXPLOT_SETTINGS: VisualizationSettingsDefinitions<value: "full",},],- },+ }),readDependencies: ["graph.show_values"],},};diff --git a/frontend/src/metabase/visualizations/lib/settings/series.ts b/frontend/src/metabase/visualizations/lib/settings/series.tsindex 16edcc6b4c6..bc39b60f415 100644--- a/frontend/src/metabase/visualizations/lib/settings/series.ts+++ b/frontend/src/metabase/visualizations/lib/settings/series.ts@@ -82,13 +82,13 @@ export function seriesSetting({display: {widget: "segmentedControl",title: t`Display type`,- props: {+ getProps: () => ({options: [{ value: "line", icon: "line" },{ value: "area", icon: "area" },{ value: "bar", icon: "bar" },],- },+ }),getHidden: (single, settings, _extra) =>!["line", "area", "bar", "combo"].includes(single.card.display ?? "") ||settings["stackable.stack_type"] != null,@@ -119,13 +119,13 @@ export function seriesSetting({"line.interpolate": {title: t`Line shape`,widget: "segmentedControl",- props: {+ getProps: () => ({options: [{ icon: "straight", value: "linear" },{ icon: "curved", value: "cardinal" },{ icon: "stepped", value: "step-after" },],- },+ }),getHidden: (_single, settings) =>!LINE_DISPLAY_TYPES.has(settings["display"]),getDefault: (_single, _settings, extra) => {@@ -137,13 +137,13 @@ export function seriesSetting({"line.style": {title: t`Line style`,widget: "segmentedControl",- props: {+ getProps: () => ({options: [{ icon: "line_style_solid", value: "solid" },{ icon: "line_style_dashed", value: "dashed" },{ icon: "line_style_dotted", value: "dotted" },],- },+ }),getDefault: (_series, settings) => getSeriesDefaultLineStyle(settings),getHidden: (_single, settings) =>!LINE_DISPLAY_TYPES.has(settings["display"]),@@ -152,13 +152,13 @@ export function seriesSetting({"line.size": {title: t`Line size`,widget: "segmentedControl",- props: {+ getProps: () => ({options: [{ name: "S", value: "S" },{ name: "M", value: "M" },{ name: "L", value: "L" },],- },+ }),getDefault: (_series, settings) => getSeriesDefaultLineSize(settings),getHidden: (_single, settings) =>!LINE_DISPLAY_TYPES.has(settings["display"]),@@ -167,13 +167,13 @@ export function seriesSetting({"line.marker_enabled": {title: t`Show dots on lines`,widget: "segmentedControl",- props: {+ getProps: () => ({options: [{ name: t`Auto`, value: null },{ name: t`On`, value: true },{ name: t`Off`, value: false },],- },+ }),getHidden: (_single, settings) =>!LINE_DISPLAY_TYPES.has(settings["display"]),getDefault: (_single, _settings, extra) => {@@ -185,13 +185,13 @@ export function seriesSetting({"line.missing": {title: t`Replace missing values with`,widget: "select",- props: {+ getProps: () => ({options: [{ name: t`Zero`, value: "zero" },{ name: t`Nothing`, value: "none" },{ name: t`Linear Interpolated`, value: "interpolate" },],- },+ }),getHidden: (_single, settings) =>!LINE_DISPLAY_TYPES.has(settings["display"]),getDefault: (_single, _settings, extra) => {@@ -205,13 +205,13 @@ export function seriesSetting({widget: "segmentedControl",default: null,getHidden: (single) => single.card.display === "row",- props: {+ getProps: () => ({options: [{ name: t`Auto`, value: null },{ name: t`Left`, value: "left" },{ name: t`Right`, value: "right" },],- },+ }),readDependencies: ["display"],},show_series_trendline: {diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.tsindex 3649c1a5947..0732641e561 100644--- a/frontend/src/metabase/visualizations/types/visualization.ts+++ b/frontend/src/metabase/visualizations/types/visualization.ts@@ -375,7 +375,6 @@ export type VisualizationSettingDefinition<) => string;persistDefault?: boolean;inline?: boolean;- props?: Partial<TProps>;getProps?: (object: T,vizSettings: T extends DatasetColumn@@ -400,8 +399,9 @@ export type CompleteVisualizationSettingDefinition<T = unknown,TValue = unknown,TProps extends Record<string, unknown> = Record<string, unknown>,-> = VisualizationSettingDefinition<T, TValue, TProps> & {+> = Omit<VisualizationSettingDefinition<T, TValue, TProps>, "getProps"> & {id: string;+ props: Partial<TProps>;};export type DatasetColumnSettingDefinition<diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsxindex 8303a8dab80..74fb694dc7c 100644--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx@@ -147,9 +147,9 @@ Object.assign(Funnel, {return getUniqueFunnelRows(funnelRows);},- props: {+ getProps: () => ({hasEditSettings: false,- },+ }),getHidden: (series: RawSeries, settings: ComputedVisualizationSettings) =>settings["funnel.dimension"] === null ||settings["funnel.metric"] === null,@@ -175,14 +175,12 @@ Object.assign(Funnel, {section: t`Display`,widget: "select",- props: {+ getProps: () => ({options: [- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504{ name: t`Funnel`, value: "funnel" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#5504{ name: t`Bar chart`, value: "bar" },],- },+ }),// legacy "bar" funnel was only previously available via multiseriesgetDefault: (series: RawSeries) => (series.length > 1 ? "bar" : "funnel"),useRawSeries: true,diff --git a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsxindex 876cb5b3539..8528fcd4e93 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx@@ -67,7 +67,7 @@ export class Map extends Component {return t`Map type`;},widget: "select",- props: {+ getProps: () => ({options: [{get name() {@@ -83,7 +83,7 @@ export class Map extends Component {},{ name: "Grid map", value: "grid" },],- },+ }),getDefault: ([{ card, data }], settings) => {switch (card.display) {case "state":@@ -125,7 +125,7 @@ export class Map extends Component {return t`Pin type`;},widget: "select",- props: {+ getProps: () => ({options: [{get name() {@@ -141,7 +141,7 @@ export class Map extends Component {},{ name: "Grid", value: "grid" },],- },+ }),getDefault: ([{ data }], vizSettings) =>vizSettings["map.type"] === "heat"? "heat"@@ -239,7 +239,7 @@ export class Map extends Component {return t`Color`;},widget: ColorRangeSelector,- props: {+ getProps: () => ({colors: getAccentColors(),colorMapping: Object.fromEntries(getAccentColors().map((color) => [@@ -248,7 +248,7 @@ export class Map extends Component {]),),isQuantile: true,- },+ }),default: getColorplethColorScale(getAccentColors()[0]),getHidden: (series, vizSettings) => vizSettings["map.type"] !== "region",},diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.tsindex 36bd7256633..29878278a51 100644--- a/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts@@ -231,7 +231,7 @@ export const PIE_CHART_DEFINITION: VisualizationDefinition = {},widget: "radio",getDefault: getDefaultPercentVisibility,- props: {+ getProps: () => ({options: [{get name() {@@ -258,7 +258,7 @@ export const PIE_CHART_DEFINITION: VisualizationDefinition = {value: "both",},],- },+ }),},"pie.decimal_places": {get section() {@@ -268,12 +268,12 @@ export const PIE_CHART_DEFINITION: VisualizationDefinition = {return t`Number of decimal places`;},widget: "number",- props: {+ getProps: () => ({get placeholder() {return t`Auto`;},options: { isInteger: true, isNonNegative: true },- },+ }),getHidden: (_, settings) =>settings["pie.percent_visibility"] == null ||settings["pie.percent_visibility"] === "off",diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.tsindex 8961d21c951..0e13a074a46 100644--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts@@ -271,7 +271,7 @@ export const _columnSettings = {widget: ChartSettingIconRadio,inline: true,borderBottom: true,- props: {+ getProps: () => ({options: [{iconName: "arrow_up",@@ -282,7 +282,7 @@ export const _columnSettings = {value: COLUMN_SORT_ORDER_DESC,},],- },+ }),getHidden: ({ source }: { source: DatasetColumn["source"] }) =>source === "aggregation",},diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.tsindex d44501569af..f965de178c1 100644--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.ts+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/settings-definitions.ts@@ -2,9 +2,10 @@ import { t } from "ttag";import { GRAPH_GOAL_SETTINGS } from "metabase/visualizations/lib/settings/goal";import { getDefaultDimensionLabel } from "metabase/visualizations/lib/settings/graph";+import type { VisualizationSettingsDefinitions } from "metabase/visualizations/types";import type { Series, VisualizationSettings } from "metabase-types/api";-export const ROW_CHART_SETTINGS = {+export const ROW_CHART_SETTINGS: VisualizationSettingsDefinitions = {"stackable.stack_type": {get section() {return t`Display`;@@ -15,7 +16,7 @@ export const ROW_CHART_SETTINGS = {index: 1,widget: "radio",default: null,- props: {+ getProps: () => ({options: [{get name() {@@ -36,7 +37,7 @@ export const ROW_CHART_SETTINGS = {value: "normalized",},],- },+ }),},...GRAPH_GOAL_SETTINGS,"graph.x_axis.scale": {@@ -89,7 +90,7 @@ export const ROW_CHART_SETTINGS = {},index: 3,widget: "select",- props: {+ getProps: () => ({options: [{get name() {@@ -104,7 +105,7 @@ export const ROW_CHART_SETTINGS = {value: true,},],- },+ }),default: true,},"graph.y_axis.axis_enabled": {@@ -119,7 +120,7 @@ export const ROW_CHART_SETTINGS = {return t`X-axis`;},widget: "select",- props: {+ getProps: () => ({options: [{get name() {@@ -134,7 +135,7 @@ export const ROW_CHART_SETTINGS = {value: true,},],- },+ }),default: true,},"graph.y_axis.auto_range": {@@ -288,7 +289,7 @@ export const ROW_CHART_SETTINGS = {getHidden: (_series: Series, vizSettings: VisualizationSettings) =>vizSettings["graph.show_values"] !== true ||vizSettings["stackable.stack_type"] === "normalized",- props: {+ getProps: () => ({options: [{get name() {@@ -303,7 +304,7 @@ export const ROW_CHART_SETTINGS = {value: "full",},],- },+ }),default: "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.tsindex 58a198d1945..3b54f588eca 100644--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.ts@@ -66,25 +66,22 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {title: t`Align`,widget: "select",default: "left",- props: {+ getProps: () => ({options: [{- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045name: t`Left`,value: "left",},{- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045name: t`Right`,value: "right",},{- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045name: t`Justify`,value: "justify",},],- },+ }),},"sankey.show_edge_labels": {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045@@ -101,16 +98,13 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045title: t`Auto formatting`,widget: "segmentedControl",- props: {+ getProps: () => ({options: [- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Auto`, value: "auto" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Compact`, value: "compact" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Full`, value: "full" },],- },+ }),getHidden: (_series, vizSettings) => {return !vizSettings["sankey.show_edge_labels"];},@@ -123,16 +117,13 @@ export const SETTINGS_DEFINITIONS: VisualizationSettingsDefinitions = {title: t`Edge color`,widget: "segmentedControl",default: "source",- props: {+ getProps: () => ({options: [- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Gray`, value: "gray" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Source`, value: "source" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Target`, value: "target" },],- },+ }),},};diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsxindex b257ea27b4a..18e61d854ee 100644--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.tsx@@ -97,9 +97,9 @@ export class Scalar extends Component<widget: ChartSettingSegmentsEditor,persistDefault: true,noPadding: true,- props: {+ getProps: () => ({canRemoveAll: true,- },+ }),},...columnSettings({getColumns: (@@ -118,14 +118,14 @@ export class Scalar extends Component<"scalar.locale": {// title: t`Separator style`,// widget: "select",- // props: {+ // getProps: () => ({// options: [// { name: "100000.00", value: null },// { name: "100,000.00", value: "en" },// { name: "100 000,00", value: "fr" },// { name: "100.000,00", value: "de" },// ],- // },+ // }),// default: "en",},"scalar.decimals": {diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsxindex 041faf724c3..54f3e58a9da 100644--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx@@ -268,13 +268,13 @@ export class Table extends Component<TableProps, TableState> {? "right": "left";},- props: {+ getProps: () => ({options: [{ name: t`Left`, value: "left" },{ name: t`Right`, value: "right" },{ name: t`Middle`, value: "middle" },],- },+ }),},};@@ -329,9 +329,9 @@ export class Table extends Component<TableProps, TableState> {title: t`Display as`,widget: options.length === 2 ? "radio" : "select",default: defaultValue,- props: {+ getProps: () => ({options,- },+ }),};}diff --git a/frontend/src/metabase/visualizations/visualizations/Text/index.ts b/frontend/src/metabase/visualizations/visualizations/Text/index.tsindex 5b3a13b6e58..0bce8dffd37 100644--- a/frontend/src/metabase/visualizations/visualizations/Text/index.ts+++ b/frontend/src/metabase/visualizations/visualizations/Text/index.ts@@ -44,16 +44,13 @@ const TextWrapper = Object.assign(Text, {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045title: t`Vertical Alignment`,widget: "select",- props: {+ getProps: () => ({options: [- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Top`, value: "top" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Middle`, value: "middle" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Bottom`, value: "bottom" },],- },+ }),default: "top",},"text.align_horizontal": {@@ -62,16 +59,13 @@ const TextWrapper = Object.assign(Text, {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045title: t`Horizontal Alignment`,widget: "select",- props: {+ getProps: () => ({options: [- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Left`, value: "left" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Center`, value: "center" },- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045{ name: t`Right`, value: "right" },],- },+ }),default: "left",},"dashcard.background": {diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsxindex 37c6bb2e648..2aca199134d 100644--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx@@ -52,16 +52,14 @@ Object.assign("waterfall.increase_color": {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045section: t`Display`,- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045- props: { title: t`Increase color` },+ getProps: () => ({ title: t`Increase color` }),widget: "color",getDefault: () => color("accent1"),},"waterfall.decrease_color": {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045section: t`Display`,- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045- props: { title: t`Decrease color` },+ getProps: () => ({ title: t`Decrease color` }),widget: "color",getDefault: () => color("accent3"),},@@ -77,8 +75,7 @@ Object.assign("waterfall.total_color": {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045section: t`Display`,- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045- props: { title: t`Total color` },+ getProps: () => ({ title: t`Total color` }),widget: "color",// Unfortunately, to get static viz to look right, we need to avoid using alpha colors heregetDefault: () =>