Skip to content

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

GDGT-1995 Get rid of VisualizationSettingDefinition["disabled"] (#71000)

Kamil Mielnike271bc5e522c
diff --git a/frontend/src/metabase/visualizations/components/ChartSettingsWidget.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettingsWidget.styled.tsx
index 6d87dc99ea9..745418e919a 100644
--- a/frontend/src/metabase/visualizations/components/ChartSettingsWidget.styled.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartSettingsWidget.styled.tsx
@@ -4,7 +4,6 @@ import { css } from "@emotion/react";
import styled from "@emotion/styled";
export const Root = styled.div<{
- disabled?: boolean;
noPadding?: boolean;
inline?: boolean;
marginBottom?: string;
@@ -29,12 +28,6 @@ export const Root = styled.div<{
margin-bottom: ${props.marginBottom || "1.5em"};
`}
- ${(props) =>
- props.disabled &&
- css`
- pointer-events: none;
- opacity: 0.4;
- `}
${(props) =>
props.inline &&
!props.hidden &&
diff --git a/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsx b/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsx
index 64aa693c08c..b82a93722fa 100644
--- a/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsx
@@ -12,7 +12,6 @@ type Props = {
description?: string;
hint?: string;
hidden?: boolean;
- disabled?: boolean;
widget?: string | ComponentType<{ id: string }>;
inline?: boolean;
marginBottom?: string;
@@ -29,7 +28,6 @@ const ChartSettingsWidget = ({
description,
hint,
hidden,
- disabled,
variant = "default",
inline = false,
marginBottom = undefined,
@@ -49,7 +47,6 @@ const ChartSettingsWidget = ({
<Root
hidden={hidden}
noPadding={noPadding}
- disabled={disabled}
className={cx({
[FormS.FormField]: isFormField,
[PopoverS.FormField]: isFormField,
diff --git a/frontend/src/metabase/visualizations/lib/settings.ts b/frontend/src/metabase/visualizations/lib/settings.ts
index 4afddc7a944..428974ce758 100644
--- a/frontend/src/metabase/visualizations/lib/settings.ts
+++ b/frontend/src/metabase/visualizations/lib/settings.ts
@@ -217,9 +217,6 @@ function getSettingWidget<T, TValue, TProps extends Record<string, unknown>>(
marginBottom: settingDef.getMarginBottom
? settingDef.getMarginBottom(resolvedObject, computedSettings, extra)
: settingDef.marginBottom,
- disabled: settingDef.getDisabled
- ? settingDef.getDisabled(resolvedObject, computedSettings, extra)
- : (settingDef.disabled ?? false),
props:
getProps?.(
resolvedObject,
diff --git a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
index c90f013eb43..e77d241898c 100644
--- a/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings.unit.spec.ts
@@ -101,7 +101,6 @@ describe("settings framework", () => {
{
id: "foo",
title: "Foo",
- disabled: false,
hidden: false,
props: {},
value: "foo",
@@ -110,20 +109,6 @@ describe("settings framework", () => {
]);
});
- it("should return disabled widget when `disabled` is true", () => {
- const defs = { foo: { widget: "input", disabled: true } };
- const widgets = getSettingsWidgets(defs, {}, {}, mockObject, () => {});
- expect(widgets[0].disabled).toEqual(true);
- });
-
- it("should return disabled widget when `getDisabled` returns true", () => {
- const getDisabled = jest.fn().mockReturnValue(true);
- const defs = { foo: { widget: "input", getDisabled } };
- const widgets = getSettingsWidgets(defs, {}, {}, mockObject, () => {});
- expect(widgets[0].disabled).toEqual(true);
- expect(getDisabled.mock.calls).toEqual([[mockObject, {}, {}]]);
- });
-
it("should return hidden widget when `hidden` is true", () => {
const defs = { foo: { widget: "input", hidden: true } };
const widgets = getSettingsWidgets(defs, {}, {}, mockObject, () => {});
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 0732641e561..3762302c82a 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -345,13 +345,6 @@ export type VisualizationSettingDefinition<
: ComputedVisualizationSettings,
extra?: SettingsExtra,
) => TValue;
- getDisabled?: (
- object: T,
- settings: T extends DatasetColumn
- ? ColumnSettings
- : ComputedVisualizationSettings,
- extra?: SettingsExtra,
- ) => boolean;
getSection?: (
object: T,
settings: T extends DatasetColumn
@@ -360,7 +353,6 @@ export type VisualizationSettingDefinition<
extra?: SettingsExtra,
) => string;
autoOpenWhenUnset?: boolean;
- disabled?: boolean;
default?: TValue;
marginBottom?: string;
noPadding?: boolean;