Skip to content

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

Don't hide number style options when type is currency (#78560)

Riley Thompsonc06f7dda2528
diff --git a/frontend/src/metabase/viz-core/lib/settings/column.ts b/frontend/src/metabase/viz-core/lib/settings/column.ts
index c15a334af4e..3bc85b5da4e 100644
--- a/frontend/src/metabase/viz-core/lib/settings/column.ts
+++ b/frontend/src/metabase/viz-core/lib/settings/column.ts
@@ -28,7 +28,6 @@ import {
} from "metabase-lib/v1/queries/utils/dataset";
import {
isCoordinate,
- isCurrency,
isDate,
isDateWithoutTime,
isNumber,
@@ -297,9 +296,6 @@ export const NUMBER_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {
],
}),
getDefault: getDefaultNumberStyle,
- // hide this for currency
- getHidden: (column, settings) =>
- isCurrency(column) && settings.number_style === "currency",
readDependencies: ["currency"],
},
currency: {
diff --git a/frontend/src/metabase/viz-core/lib/settings/column.unit.spec.ts b/frontend/src/metabase/viz-core/lib/settings/column.unit.spec.ts
index f682911de37..4c0d60241f7 100644
--- a/frontend/src/metabase/viz-core/lib/settings/column.unit.spec.ts
+++ b/frontend/src/metabase/viz-core/lib/settings/column.unit.spec.ts
@@ -1,11 +1,17 @@
import { checkNotNull } from "metabase/utils/types";
-import type { DatasetColumn, Series } from "metabase-types/api";
+import type {
+ DatasetColumn,
+ Series,
+ VisualizationSettings,
+} from "metabase-types/api";
import {
createMockColumn,
createMockSingleSeries,
} from "metabase-types/api/mocks";
+import { registerSettingWidgets } from "../registry";
import { getComputedSettings } from "../settings";
+import { getSettingsWidgets } from "../widgets";
import {
NUMBER_COLUMN_SETTINGS,
@@ -150,6 +156,50 @@ describe("column settings", () => {
onChange(options[1].value);
expect(onChangeSpy).toHaveBeenCalledWith(false);
});
+
+ describe("widget visibility for currency columns", () => {
+ beforeAll(() => {
+ registerSettingWidgets({ select: () => null, radio: () => null });
+ });
+
+ function getWidgetHiddenById(storedSettings: VisualizationSettings = {}) {
+ const series = seriesWithColumn();
+ const column = series[0].data.cols[0];
+ const computedSettings = getComputedSettings(
+ NUMBER_COLUMN_SETTINGS,
+ column,
+ storedSettings,
+ { series },
+ );
+ const widgets = getSettingsWidgets(
+ NUMBER_COLUMN_SETTINGS,
+ storedSettings,
+ computedSettings,
+ column,
+ jest.fn(),
+ { series },
+ );
+ return Object.fromEntries(
+ widgets.map((widget) => [widget.id, widget.hidden]),
+ );
+ }
+
+ it("should not hide the number_style widget for a currency column", () => {
+ const hiddenById = getWidgetHiddenById();
+ expect(hiddenById.number_style).toBe(false);
+ expect(hiddenById.currency).toBe(false);
+ expect(hiddenById.currency_style).toBe(false);
+ expect(hiddenById.currency_in_header).toBe(false);
+ });
+
+ it("should hide the currency widgets when the percent style is selected", () => {
+ const hiddenById = getWidgetHiddenById({ number_style: "percent" });
+ expect(hiddenById.number_style).toBe(false);
+ expect(hiddenById.currency).toBe(true);
+ expect(hiddenById.currency_style).toBe(true);
+ expect(hiddenById.currency_in_header).toBe(true);
+ });
+ });
});
describe("table.columns", () => {