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
Disable the data model controls of read-only tables (#85093)
Alexander Polyankin62062399c8cf
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/TableAttributesEditSingle.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/TableAttributesEditSingle.tsxindex 7c39279797e..a3a39d41905 100644--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/TableAttributesEditSingle.tsx+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/TableAttributesEditSingle/TableAttributesEditSingle.tsx@@ -166,7 +166,7 @@ export function TableAttributesEditSingle({ table, onUpdate }: Props) {email={table.owner_email}label={t`Owner`}userId={isOwnerSpecified ? table.owner_user_id : "unknown"}- readOnly={readOnly}+ disabled={readOnly}onEmailChange={handleOwnerEmailChange}onUserIdChange={handleOwnerUserIdChange}className={S.gridLabelInput}@@ -179,7 +179,7 @@ export function TableAttributesEditSingle({ table, onUpdate }: Props) {<LayerInputvalue={table.data_layer ?? "hidden"}- readOnly={readOnly}+ disabled={readOnly}onChange={handleLayerChange}classNames={{ input: S.input, label: S.label }}className={S.gridLabelInput}@@ -187,15 +187,14 @@ export function TableAttributesEditSingle({ table, onUpdate }: Props) {<EntityTypeInputvalue={table.entity_type ?? "entity/GenericTable"}- readOnly={readOnly}+ disabled={readOnly}onChange={handleEntityTypeChange}classNames={{ input: S.input, label: S.label }}className={S.gridLabelInput}/><DataSourceInput- disabled={table.data_source === "metabase-transform"}- readOnly={readOnly}+ disabled={readOnly || table.data_source === "metabase-transform"}value={table.data_source ?? "unknown"}onChange={handleDataSourceChange}classNames={{ input: S.input, label: S.label }}diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/common.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/common.unit.spec.tsxindex c86586c226b..bb563a126b2 100644--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/TableSection/tests/common.unit.spec.tsx@@ -11,12 +11,6 @@ import { createOrdersQuantityField } from "metabase-types/api/mocks/presets";import { setup } from "./setup";-function getShownListboxes() {- return screen- .queryAllByRole("listbox")- .filter((listbox) => !listbox.closest('[data-hidden="true"]'));-}-describe("TableSection", () => {it("should render the link to explore this table in the query builder", () => {const table = createMockTable();@@ -164,20 +158,16 @@ describe("TableSection", () => {expect(screen.getByPlaceholderText("Give this table a description"),).toHaveAttribute("readonly");- await userEvent.click(+ expect(screen.getByPlaceholderText("Pick someone, or type an email"),- );- expect(getShownListboxes()).toHaveLength(0);- await userEvent.click(+ ).toBeDisabled();+ expect(screen.getByPlaceholderText("Select visibility layer"),- );- expect(getShownListboxes()).toHaveLength(0);- await userEvent.click(screen.getByPlaceholderText("Select entity type"));- expect(getShownListboxes()).toHaveLength(0);- await userEvent.click(+ ).toBeDisabled();+ expect(screen.getByPlaceholderText("Select entity type")).toBeDisabled();+ expect(screen.getByPlaceholderText("Select a data source"),- );- expect(getShownListboxes()).toHaveLength(0);+ ).toBeDisabled();await userEvent.click(screen.getByRole("button", { name: "More actions" }),diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/BehaviorSection.tsx b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/BehaviorSection.tsxindex a7bc0166301..d4756cd06b3 100644--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/BehaviorSection.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/BehaviorSection.tsx@@ -27,14 +27,14 @@ import { RemappingPicker } from "./RemappingPicker";type BehaviorSectionBaseProps = {field: Field;databaseId: DatabaseId;- readOnly?: boolean;+ disabled?: boolean;onTrackMetadataChange: (detail: MetadataEditEventDetail) => void;};const BehaviorSectionBase = ({field,databaseId,- readOnly,+ disabled,onTrackMetadataChange,}: BehaviorSectionBaseProps) => {const id = getRawTableFieldId(field);@@ -132,7 +132,7 @@ const BehaviorSectionBase = ({<TitledSection><FieldVisibilityPickerdescription={t`Where this field should be displayed`}- readOnly={readOnly}+ disabled={disabled}label={t`Visibility`}value={field.visibility_type}onChange={handleVisibilityChange}@@ -140,7 +140,7 @@ const BehaviorSectionBase = ({<FieldValuesTypePickerdescription={t`How this field should be filtered`}- readOnly={readOnly}+ disabled={disabled}label={t`Filtering`}value={field.has_field_values}onChange={handleFilteringChange}@@ -150,7 +150,7 @@ const BehaviorSectionBase = ({<RemappingPickerdatabase={database}description={t`Choose to show the original value from the database, or have this field display associated or custom information.`}- readOnly={readOnly}+ disabled={disabled}field={field}label={t`Display values`}onTrackMetadataChange={onTrackMetadataChange}@@ -160,7 +160,7 @@ const BehaviorSectionBase = ({{database != null && canFieldUnfoldJson(field, database) && (<UnfoldJsonPickerdescription={t`Unfold JSON into component fields, where each JSON key becomes a column. You can turn this off if performance is slow.`}- readOnly={readOnly}+ disabled={disabled}label={t`Unfold JSON`}value={isFieldJsonUnfolded(field, database)}onChange={handleUnfoldJsonChange}diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsxindex 377a7fd58cb..8c6bf318c3b 100644--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx@@ -55,20 +55,20 @@ type RemappingPicker = Omit<SelectProps, "data" | "value" | "onChange"> & {type FkRemappingFieldSelectProps = {error?: boolean;fieldName?: string;- readOnly?: boolean;+ disabled?: boolean;};const FkRemappingFieldSelect = ({error,fieldName,- readOnly,+ disabled,}: FkRemappingFieldSelectProps) => (<Selectdata={[{ label: fieldName ?? t`Choose a field`, value: "choose-a-field" }]}dropdownOpened={false}error={error}placeholder={t`Choose a field`}- readOnly={readOnly}+ disabled={disabled}value="choose-a-field"w="100%"onClick={(event) => event.preventDefault()}@@ -79,7 +79,7 @@ export const RemappingPicker = ({database,field,comboboxProps,- readOnly,+ disabled,onTrackMetadataChange,...props}: RemappingPicker) => {@@ -281,7 +281,7 @@ export const RemappingPicker = ({onDropdownOpen={() => setIsChoosingDisplayValue(true)}onDropdownClose={() => setIsChoosingDisplayValue(false)}onChange={handleDisplayValueChange}- readOnly={readOnly}+ disabled={disabled}{...props}/>@@ -291,10 +291,10 @@ export const RemappingPicker = ({<SubInputIllustration /></Flex>- {fkTargetTable && readOnly && (+ {fkTargetTable && disabled && (<FkRemappingFieldSelectfieldName={fkRemappingField?.display_name}- readOnly+ disabled/>)}@@ -303,7 +303,7 @@ export const RemappingPicker = ({* but fkTargetTable is not. It would go to "schema" step of DataSelector* which does not exist in FieldDataSelector, hence this conditional render.*/}- {fkTargetTable && !readOnly && (+ {fkTargetTable && !disabled && (<FieldDataSelectordatabases={[database]}isInitiallyOpen={isChoosingInitialFkTarget}@@ -348,7 +348,7 @@ export const RemappingPicker = ({onClose={() => setIsCustomMappingOpen(false)}/>- {!readOnly && (+ {!disabled && (<Group mt="sm"><Buttonsize="compact-md"diff --git a/frontend/src/metabase/metadata/components/FieldSection/DataSection/DataSection.tsx b/frontend/src/metabase/metadata/components/FieldSection/DataSection/DataSection.tsxindex 812f1e84082..e301dbf529e 100644--- a/frontend/src/metabase/metadata/components/FieldSection/DataSection/DataSection.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/DataSection/DataSection.tsx@@ -22,13 +22,13 @@ import SubInputIllustration from "./illustrations/sub-input.svg?component";type DataSectionBaseProps = {field: Field;- readOnly?: boolean;+ disabled?: boolean;onTrackMetadataChange: (detail: MetadataEditEventDetail) => void;};const DataSectionBase = ({field,- readOnly,+ disabled,onTrackMetadataChange,}: DataSectionBaseProps) => {const id = getRawTableFieldId(field);@@ -136,7 +136,7 @@ const DataSectionBase = ({<Stack><Switchchecked={isCasting}- disabled={readOnly}+ disabled={disabled}classNames={{body: S.switchBody,}}@@ -149,7 +149,7 @@ const DataSectionBase = ({<CoercionStrategyPickerautoFocus={autoFocusCoercionPicker}baseType={field.base_type}- readOnly={readOnly}+ disabled={disabled}dropdownOpened={isCoercionPickerOpen}value={field.coercion_strategy ?? undefined}onChange={handleCoercionStrategyChange}diff --git a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsxindex ede7b07cb9d..1cd50c55beb 100644--- a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.tsx@@ -145,25 +145,25 @@ const FieldSectionBase = ({<Stack gap="xxl"><DataSectionfield={field}- readOnly={readOnly}+ disabled={readOnly}onTrackMetadataChange={onTrackMetadataChange}/><MetadataSectionfield={field}table={table}getFieldHref={getFieldHref}- readOnly={readOnly}+ disabled={readOnly}onTrackMetadataChange={onTrackMetadataChange}/><BehaviorSectionfield={field}databaseId={table.db_id}- readOnly={readOnly}+ disabled={readOnly}onTrackMetadataChange={onTrackMetadataChange}/><FormattingSectionfield={field}- readOnly={readOnly}+ disabled={readOnly}onTrackMetadataChange={onTrackMetadataChange}/></Stack>diff --git a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.unit.spec.tsx b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.unit.spec.tsxindex 59de384c3a7..2abf10116a7 100644--- a/frontend/src/metabase/metadata/components/FieldSection/FieldSection.unit.spec.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/FieldSection.unit.spec.tsx@@ -242,11 +242,6 @@ describe("FieldSection", () => {});describe("read-only table", () => {- async function assertSelectIsReadOnly(input: HTMLElement) {- await userEvent.click(input);- expect(getShownListboxes()).toHaveLength(0);- }-it("shows the field settings of a table that cannot be written as read-only", async () => {setup({ table: { ...ORDERS_TABLE, can_write: false } });@@ -262,19 +257,19 @@ describe("FieldSection", () => {expect(screen.getByLabelText("Cast to a specific data type"),).toBeDisabled();- expect(screen.getByTestId("prefix")).toHaveAttribute("readonly");- await assertSelectIsReadOnly(+ expect(screen.getByTestId("prefix")).toBeDisabled();+ expect(screen.getByPlaceholderText("Select a semantic type"),- );- await assertSelectIsReadOnly(+ ).toBeDisabled();+ expect(screen.getByPlaceholderText("Select a field visibility"),- );- await assertSelectIsReadOnly(+ ).toBeDisabled();+ expect(screen.getByPlaceholderText("Select field filtering"),- );- await assertSelectIsReadOnly(+ ).toBeDisabled();+ expect(await screen.findByPlaceholderText("Select display values"),- );+ ).toBeDisabled();expect(screen.getByRole("button", { name: /Field values/ }),).toBeEnabled();diff --git a/frontend/src/metabase/metadata/components/FieldSection/FormattingSection/FormattingSection.tsx b/frontend/src/metabase/metadata/components/FieldSection/FormattingSection/FormattingSection.tsxindex dc6adc7eff8..2d2e04dc860 100644--- a/frontend/src/metabase/metadata/components/FieldSection/FormattingSection/FormattingSection.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/FormattingSection/FormattingSection.tsx@@ -17,13 +17,13 @@ import { TitledSection } from "../../TitledSection";interface Props {field: Field;- readOnly?: boolean;+ disabled?: boolean;onTrackMetadataChange: (detail: MetadataEditEventDetail) => void;}const FormattingSectionBase = ({field,- readOnly,+ disabled,onTrackMetadataChange,}: Props) => {const id = getRawTableFieldId(field);@@ -65,7 +65,7 @@ const FormattingSectionBase = ({denylist={denyList}extraData={{ forAdminSettings: true }}inheritedSettings={inheritedSettings}- readOnly={readOnly}+ disabled={disabled}style={{ maxWidth: undefined }}value={field.settings ?? {}}onChange={handleChange}diff --git a/frontend/src/metabase/metadata/components/FieldSection/MetadataSection/MetadataSection.tsx b/frontend/src/metabase/metadata/components/FieldSection/MetadataSection/MetadataSection.tsxindex d326d3cf5a2..f274815e6cb 100644--- a/frontend/src/metabase/metadata/components/FieldSection/MetadataSection/MetadataSection.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/MetadataSection/MetadataSection.tsx@@ -23,7 +23,7 @@ type MetadataSectionBaseProps = {field: Field;table: Table;getFieldHref: (fieldId: FieldId) => string;- readOnly?: boolean;+ disabled?: boolean;onTrackMetadataChange: (detail: MetadataEditEventDetail) => void;};@@ -31,14 +31,15 @@ const MetadataSectionBase = ({field,table,getFieldHref,- readOnly,+ disabled,onTrackMetadataChange,}: MetadataSectionBaseProps) => {const id = getRawTableFieldId(field);- const { data: idFields = [] } = useListDatabaseIdFieldsQuery({- id: table.db_id,- ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,- });+ const { data: idFields = [], isLoading: isLoadingIdFields } =+ useListDatabaseIdFieldsQuery({+ id: table.db_id,+ ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,+ });const [updateField] = useUpdateFieldMutation();const semanticTypeError = useMemo(() => {return getSemanticTypeError(table, field, getFieldHref);@@ -78,8 +79,9 @@ const MetadataSectionBase = ({field={field}idFields={idFields}label={t`Semantic type`}- selectProps={{ readOnly }}+ selectProps={{ disabled }}semanticTypeError={semanticTypeError}+ isLoadingIdFields={isLoadingIdFields}onChange={handleChange}/></TitledSection>diff --git a/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.tsx b/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.tsxindex bafb6c749ed..dfb3d895445 100644--- a/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.tsx+++ b/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.tsx@@ -33,14 +33,17 @@ interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {field: FkTargetPickerField;idFields: Field[];value: FieldId | null;+ isLoading?: boolean;onChange: (value: FieldId | null) => void;}export const FkTargetPicker = ({- comboboxProps,field,idFields,value,+ comboboxProps,+ disabled,+ isLoading,onChange,...props}: Props) => {@@ -99,7 +102,7 @@ export const FkTargetPicker = ({...comboboxProps,}}data={data}- disabled={!hasIdFields}+ disabled={disabled || isLoading || !hasIdFields}filter={({ options, search }) => {const query = search.toLowerCase().trim();@@ -121,7 +124,11 @@ export const FkTargetPicker = ({});}}nothingFoundMessage={t`Didn't find any results`}- placeholder={getFkFieldPlaceholder(field, comparableIdFields)}+ placeholder={+ isLoading+ ? t`Loading…`+ : getFkFieldPlaceholder(field, comparableIdFields)+ }renderOption={(item) => {const field = getFieldFromValue(item.option.value);const selected = getFieldIdFromValue(item.option.value) === value;diff --git a/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.unit.spec.tsx b/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.unit.spec.tsxindex 3bfa03c555c..328f905d81d 100644--- a/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.unit.spec.tsx+++ b/frontend/src/metabase/metadata/components/FkTargetPicker/FkTargetPicker.unit.spec.tsx@@ -45,12 +45,16 @@ interface SetupOpts {field?: Field;idFields?: Field[];value?: FieldId | null;+ disabled?: boolean;+ isLoading?: boolean;}function setup({field = FIELD,idFields = ID_FIELDS,value = null,+ disabled,+ isLoading,}: SetupOpts = {}) {const onChange = jest.fn();@@ -59,6 +63,8 @@ function setup({field={field}idFields={idFields}value={value}+ disabled={disabled}+ isLoading={isLoading}onChange={onChange}/>,);@@ -164,4 +170,33 @@ describe("FkTargetPicker", () => {screen.getByPlaceholderText("Field access denied"),).toBeInTheDocument();});++ it("should show a loading placeholder instead of the no access one while the keys load", () => {+ setup({+ field: createMockField({+ ...FIELD,+ semantic_type: "type/FK",+ fk_target_field_id: getNextId(),+ }),+ idFields: [],+ isLoading: true,+ });++ expect(screen.getByPlaceholderText("Loading…")).toBeDisabled();+ expect(+ screen.queryByPlaceholderText("Field access denied"),+ ).not.toBeInTheDocument();+ });++ it("should stay disabled without keys even when not disabled by the caller", () => {+ setup({ idFields: [], disabled: false });++ expect(screen.getByPlaceholderText("No key available")).toBeDisabled();+ });++ it("should be disabled when disabled by the caller", () => {+ setup({ disabled: true });++ expect(screen.getByPlaceholderText("Select a target")).toBeDisabled();+ });});diff --git a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.module.css b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.module.cssindex 5c23fa8f90c..5daa30177e1 100644--- a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.module.css+++ b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.module.css@@ -5,27 +5,3 @@z-index: 1; /* prevent focus state from being cut off after imitating collapsed borders */}}--.section {- width: auto;-}--.description {- position: relative;- top: -2px; /* Imitate collapsed borders. -1px does not seem to do the trick on Mac. */-}--.nameInput {- border-start-start-radius: var(--mantine-radius-sm);- border-start-end-radius: var(--mantine-radius-sm);- border-end-start-radius: 0;- border-end-end-radius: 0;-}--.descriptionInput {- line-height: var(--mantine-line-height-lg);- border-start-start-radius: 0;- border-start-end-radius: 0;- border-end-start-radius: var(--mantine-radius-sm);- border-end-end-radius: var(--mantine-radius-sm);-}diff --git a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsxindex c444b64c2b8..fccf7dd7bb1 100644--- a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx+++ b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx@@ -38,6 +38,9 @@ export const NameDescriptionInput = ({const { ref, width } = useElementSize();const { ref: sectionRef, width: sectionWidth } = useElementSize();const leftSectionWidth = Math.max(sectionWidth, 40);+ const readOnlyStyles = readOnly+ ? { borderColor: "var(--mb-color-border-neutral)", cursor: "default" }+ : undefined;const handleDescriptionChange = (value: string) => {const newDescription = value.trim();@@ -58,11 +61,7 @@ export const NameDescriptionInput = ({return (<Box ref={ref}><Input- classNames={{- input: S.nameInput,- root: S.name,- section: S.section,- }}+ classNames={{ root: S.name }}fw="bold"leftSection={<Group@@ -109,11 +108,17 @@ export const NameDescriptionInput = ({size="lg"styles={{section: {+ width: "auto",// limit the flicker when element is being measured for the first timevisibility: sectionWidth === 0 ? "hidden" : undefined,},input: {paddingLeft: leftSectionWidth,+ borderStartStartRadius: "var(--mantine-radius-sm)",+ borderStartEndRadius: "var(--mantine-radius-sm)",+ borderEndStartRadius: 0,+ borderEndEndRadius: 0,+ ...readOnlyStyles,},}}value={name}@@ -123,13 +128,21 @@ export const NameDescriptionInput = ({<Textareaautosize- classNames={{- input: S.descriptionInput,- root: S.description,- }}maxRows={4}minRows={2}placeholder={descriptionPlaceholder}+ pos="relative"+ styles={{+ input: {+ lineHeight: "var(--mantine-line-height-lg)",+ borderStartStartRadius: 0,+ borderStartEndRadius: 0,+ borderEndStartRadius: "var(--mantine-radius-sm)",+ borderEndEndRadius: "var(--mantine-radius-sm)",+ ...readOnlyStyles,+ },+ }}+ top={rem(-2)}value={description}readOnly={readOnly}onChange={handleDescriptionChange}diff --git a/frontend/src/metabase/metadata/components/SemanticTypeAndTargetPicker/SemanticTypeAndTargetPicker.tsx b/frontend/src/metabase/metadata/components/SemanticTypeAndTargetPicker/SemanticTypeAndTargetPicker.tsxindex 2f9ad47e219..a5834c045ba 100644--- a/frontend/src/metabase/metadata/components/SemanticTypeAndTargetPicker/SemanticTypeAndTargetPicker.tsx+++ b/frontend/src/metabase/metadata/components/SemanticTypeAndTargetPicker/SemanticTypeAndTargetPicker.tsx@@ -18,6 +18,7 @@ interface SemanticTypeAndTargetPickerProps {label?: string;selectProps?: Omit<SelectProps, "data" | "value" | "onChange">;semanticTypeError?: ReactNode;+ isLoadingIdFields?: boolean;onChange: (patch: Partial<Pick<Field, "semantic_type" | "fk_target_field_id" | "settings">@@ -32,6 +33,7 @@ export const SemanticTypeAndTargetPicker = ({label,selectProps,semanticTypeError,+ isLoadingIdFields,onChange,}: SemanticTypeAndTargetPickerProps) => {const showFKTargetSelect = isFK(field);@@ -99,6 +101,7 @@ export const SemanticTypeAndTargetPicker = ({{...selectProps}field={field}idFields={idFields}+ isLoading={isLoadingIdFields}value={field.fk_target_field_id}onChange={handleChangeTarget}/>diff --git a/frontend/src/metabase/visualizations/components/ColumnSettings.tsx b/frontend/src/metabase/visualizations/components/ColumnSettings.tsxindex 13276ac512a..6577d494f1c 100644--- a/frontend/src/metabase/visualizations/components/ColumnSettings.tsx+++ b/frontend/src/metabase/visualizations/components/ColumnSettings.tsx@@ -26,7 +26,7 @@ type CommonProps = {allowlist?: ReadonlySet<string>;denylist?: ReadonlySet<string>;extraData?: Omit<SettingsExtra, "series">;- readOnly?: boolean;+ disabled?: boolean;};type GetWidgetsProps = CommonProps & {@@ -51,7 +51,7 @@ function getWidgets({allowlist,denylist,extraData,- readOnly,+ disabled,}: GetWidgetsProps) {// fake seriesconst series: Series = [];@@ -92,7 +92,7 @@ function getWidgets({(!denylist || !denylist.has(widget.id)),).map((widget) =>- readOnly ? { ...widget, props: { ...widget.props, readOnly } } : widget,+ disabled ? { ...widget, props: { ...widget.props, disabled } } : widget,);}diff --git a/frontend/src/metabase/visualizations/components/ColumnSettings.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ColumnSettings.unit.spec.tsxindex da221820172..b2fa708c866 100644--- a/frontend/src/metabase/visualizations/components/ColumnSettings.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ColumnSettings.unit.spec.tsx@@ -79,13 +79,13 @@ describe("ColumnSettings", () => {});});-describe("ColumnSettings read-only", () => {+describe("ColumnSettings disabled", () => {type SetupOpts = {value?: ApiColumnSettings;- readOnly?: boolean;+ disabled?: boolean;};- const setup = ({ value = {}, readOnly }: SetupOpts = {}) => {+ const setup = ({ value = {}, disabled }: SetupOpts = {}) => {renderWithProviders(<ColumnSettingscolumn={createMockField({@@ -93,21 +93,21 @@ describe("ColumnSettings read-only", () => {effective_type: "type/Integer",})}value={value}- readOnly={readOnly}+ disabled={disabled}/>,);};- it("shows the formatting of a read-only column without letting it change", () => {- setup({ readOnly: true });+ it("shows the formatting of a column without letting it change when disabled", () => {+ setup({ disabled: true });- expect(screen.getByTestId("prefix")).toHaveAttribute("readonly");- expect(screen.getByTestId("suffix")).toHaveAttribute("readonly");+ expect(screen.getByTestId("prefix")).toBeDisabled();+ expect(screen.getByTestId("suffix")).toBeDisabled();expect(screen.getByRole("switch")).toBeDisabled();});- it("disables the radio settings of a read-only column", () => {- setup({ value: { number_style: "currency" }, readOnly: true });+ it("disables the radio settings of a disabled column", () => {+ setup({ value: { number_style: "currency" }, disabled: true });const radios = screen.getAllByRole("radio");expect(radios.length).toBeGreaterThan(0);@@ -117,7 +117,7 @@ describe("ColumnSettings read-only", () => {it("keeps the formatting of a column editable by default", () => {setup({ value: { number_style: "currency" } });- expect(screen.getByTestId("prefix")).not.toHaveAttribute("readonly");+ expect(screen.getByTestId("prefix")).toBeEnabled();expect(screen.getByRole("switch")).toBeEnabled();screen.getAllByRole("radio")diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingInput.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingInput.tsxindex e79b013bc8d..6cbdf3b32b0 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingInput.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingInput.tsx@@ -9,7 +9,7 @@ interface ChartSettingInputProps {placeholder: string;onChange: (value: string) => void;id?: string;- readOnly?: boolean;+ disabled?: boolean;}export const ChartSettingInput = ({@@ -17,7 +17,7 @@ export const ChartSettingInput = ({onChange,placeholder,id,- readOnly,+ disabled,}: ChartSettingInputProps) => {const [inputValue, setInputValue] = useState(value ?? "");@@ -36,7 +36,7 @@ export const ChartSettingInput = ({id={id}data-testid={id}placeholder={placeholder}- readOnly={readOnly}+ disabled={disabled}value={inputValue}onChange={(e) => {setInputValue(e.target.value);diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingInputNumeric.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingInputNumeric.tsxindex 201e759cf40..757ce978a32 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingInputNumeric.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingInputNumeric.tsx@@ -41,7 +41,7 @@ interface ChartSettingInputProps extends Omit<id?: string;placeholder?: string;className?: string;- readOnly?: boolean;+ disabled?: boolean;}export const ChartSettingInputNumeric = ({@@ -51,7 +51,7 @@ export const ChartSettingInputNumeric = ({options,id,className,- readOnly,+ disabled,}: ChartSettingInputProps) => {const [inputValue, setInputValue] = useState<string>(value?.toString() ?? "");const isFocusedRef = useRef(false);@@ -111,7 +111,7 @@ export const ChartSettingInputNumeric = ({id={id}placeholder={placeholder}type="text"- readOnly={readOnly}+ disabled={disabled}error={inputValue && isNaN(Number(inputValue))}value={inputValue}onChange={(e: ChangeEvent<HTMLInputElement>) => {diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingLinkUrlInput.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingLinkUrlInput.tsxindex caca3715365..0f3f9edf33c 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingLinkUrlInput.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingLinkUrlInput.tsx@@ -8,7 +8,7 @@ interface ChartSettingLinkUrlInputProps {onChange: (value: string) => void;id?: string;options?: string[];- readOnly?: boolean;+ disabled?: boolean;onChangeSettings?: (settings: Partial<VisualizationSettings>) => void;}@@ -32,7 +32,7 @@ const ChartSettingLinkUrlInput = ({onChange,options,id,- readOnly,+ disabled,onChangeSettings,}: ChartSettingLinkUrlInputProps) => {const valueOrDefault = value ?? "";@@ -68,7 +68,7 @@ const ChartSettingLinkUrlInput = ({data-testid={id}onChangeSettings={onChangeSettings}options={options}- readOnly={readOnly}+ disabled={disabled}onChange={setFocusedValue}value={isFocused ? focusedValue : valueOrDefault}onFocus={handleFocus}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingRadio.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingRadio.tsxindex 2a4fdb3b578..52b686ab63a 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingRadio.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingRadio.tsx@@ -7,7 +7,7 @@ interface ChartSettingRadioProps {options: { name: string; value: string | null }[];value: string | null;className?: string;- readOnly?: boolean;+ disabled?: boolean;onChange: (value: unknown) => void;}@@ -16,7 +16,7 @@ export const ChartSettingRadio = ({onChange,options: rawOptions = [],className,- readOnly,+ disabled,}: ChartSettingRadioProps) => {const options: { name: string; value: string }[] = useMemo(() => {return rawOptions.map(({ name, value }) => ({@@ -44,7 +44,7 @@ export const ChartSettingRadio = ({</Text>}value={optionValue}- disabled={readOnly}+ disabled={disabled}styles={{inner: { alignSelf: "center" },}}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsxindex 9114e15f215..cdc47f821a0 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSelect.tsx@@ -36,7 +36,7 @@ type ChartSettingSelectProps = Pick<options?: ChartSettingSelectOption[];placeholder?: string;placeholderNoOptions?: string;- readOnly?: boolean;+ disabled?: boolean;rightSectionWidth?: string;searchProp?: string;value?: ChartSettingSelectValue;@@ -59,7 +59,7 @@ export const ChartSettingSelect = ({placeholder,placeholderNoOptions,pr,- readOnly,+ disabled: externallyDisabled,rightSection,rightSectionWidth,searchProp,@@ -90,6 +90,7 @@ export const ChartSettingSelect = ({}, [scrollContainer, dropdownOpened]);const disabled =+ externallyDisabled ||options.length === 0 ||(options.length === 1 && options[0].value === value);@@ -130,9 +131,18 @@ export const ChartSettingSelect = ({section: S.section,input: cx(S.input, { [S.inputWithLeftSection]: hasLeftSection }),}}+ styles={+ externallyDisabled+ ? {+ input: {+ backgroundColor: "var(--mb-color-background_surface-disabled)",+ color: "var(--mb-color-text-disabled)",+ },+ }+ : undefined+ }data={data}disabled={disabled}- readOnly={readOnly}value={selectedValue}// Mantine's Select passes two arguments to onChange, but the onChange defined in the settings code takes one.onChange={(v) => {diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingToggle.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingToggle.tsxindex 0036e838d30..bb318790673 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingToggle.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingToggle.tsx@@ -5,13 +5,11 @@ export const ChartSettingToggle = ({onChange,id,disabled,- readOnly,}: {value: boolean | undefined;onChange: (value: boolean) => void;id?: string;disabled?: boolean;- readOnly?: boolean;}) => (<SwitchlabelPosition="left"@@ -19,6 +17,6 @@ export const ChartSettingToggle = ({onChange={(e) => onChange(e.currentTarget.checked)}id={id}role="switch"- disabled={disabled || readOnly}+ disabled={disabled}/>);