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
Adjust DB form page width and form fields spacing (#63818)
Jakub Chodorowicz34e7a0e9f171
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsxindex 25423fcc411..f0eae1fcbcf 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx@@ -56,6 +56,7 @@ export const DatabaseHelpSidePanel = ({ engineKey, onClose }: Props) => {display="flex"flex={{ sm: "1 0 20rem", md: "1 0 26.5rem", base: "1 0 100%" }}h="100%"+ bg="var(--mb-color-bg-white)"><Box p="xl" w="100%"><Flex align="baseline" justify="space-between" mb="md">diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsxindex 9b3db1c6396..e967fa59a4a 100644--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx@@ -3,6 +3,7 @@ import { useEffect, useState } from "react";import type { Route } from "react-router";import { t } from "ttag";+import { SettingsSection } from "metabase/admin/components/SettingsSection";import { getEngines } from "metabase/databases/selectors";import { useSelector } from "metabase/lib/redux";import {@@ -61,18 +62,19 @@ export function DatabasePage({ params, route }: DatabasePageProps) {};return (- <Flex direction="row" h="100%">+ <Flex+ direction="row"+ h="100%"+ style={{ backgroundColor: "var(--mb-color-bg-light)" }}+ ><Box h="100%" w="100%" component={ScrollArea}><Boxw="100%"- maw={{- base: `calc(28.5rem + 2rem)`,- md: `calc(28.5rem + 4rem)`,- }}+ maw="54rem"mx="auto"p={{base: `md`,- md: `xl`,+ sm: `xl`,}}><Flex@@ -101,17 +103,19 @@ export function DatabasePage({ params, route }: DatabasePageProps) {</Text>)}</Flex>- <DatabaseEditConnectionForm- database={database}- isAttachedDWH={database?.is_attached_dwh ?? false}- initializeError={databaseReq.error}- onSubmitted={handleOnSubmit}- route={route}- onCancel={handleCancel}- config={config}- formLocation="full-page"- onEngineChange={onEngineChange}- />+ <SettingsSection>+ <DatabaseEditConnectionForm+ database={database}+ isAttachedDWH={database?.is_attached_dwh ?? false}+ initializeError={databaseReq.error}+ onSubmitted={handleOnSubmit}+ route={route}+ onCancel={handleCancel}+ config={config}+ formLocation="full-page"+ onEngineChange={onEngineChange}+ />+ </SettingsSection></Box></Box>{showSidePanel && (diff --git a/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsx b/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsxindex 8b825e6c9f4..d5e750c7bf4 100644--- a/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsx@@ -10,6 +10,7 @@ import { isEngineKey } from "metabase-types/guards";import type { FormLocation } from "../../types";import { setDatabaseFormValues } from "../../utils/schema";+import { getSharedFieldStyleProps } from "../styles";import {connectionStringParsedFailed,@@ -133,13 +134,10 @@ export function DatabaseConnectionStringField({onChange={(event: React.ChangeEvent<HTMLTextAreaElement>) => {setConnectionString(event.target.value);}}- mb="md"placeholder={placeholder}name="connection-string"- labelProps={{- mb: "sm",- }}onBlur={handleBlur}+ {...getSharedFieldStyleProps()}/>);}diff --git a/frontend/src/metabase/databases/components/DatabaseDetailField/DatabaseDetailField.tsx b/frontend/src/metabase/databases/components/DatabaseDetailField.tsxsimilarity index 82%rename from frontend/src/metabase/databases/components/DatabaseDetailField/DatabaseDetailField.tsxrename to frontend/src/metabase/databases/components/DatabaseDetailField.tsxindex 7235dc6496c..f8cfaf31102 100644--- a/frontend/src/metabase/databases/components/DatabaseDetailField/DatabaseDetailField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseDetailField.tsx@@ -14,11 +14,13 @@ import type {EngineKey,} from "metabase-types/api";-import { FIELD_OVERRIDES } from "../../constants";-import type { EngineFieldOverride } from "../../types";-import { DatabaseHostnameWithProviderField } from "../DatabaseHostnameWithProviderField/DatabaseHostnameWithProviderField";-import DatabaseInfoField from "../DatabaseInfoField";-import DatabaseSectionField from "../DatabaseSectionField";+import { FIELD_OVERRIDES } from "../constants";+import type { EngineFieldOverride, FieldType } from "../types";++import { DatabaseHostnameWithProviderField } from "./DatabaseHostnameWithProviderField/DatabaseHostnameWithProviderField";+import DatabaseInfoField from "./DatabaseInfoField";+import DatabaseSectionField from "./DatabaseSectionField";+import { getSharedFieldStyleProps } from "./styles";export interface DatabaseDetailFieldProps {field: EngineField;@@ -27,7 +29,7 @@ export interface DatabaseDetailFieldProps {engine: Engine | undefined;}-const DatabaseDetailField = ({+export const DatabaseDetailField = ({field,autoFocus,engineKey,@@ -37,7 +39,7 @@ const DatabaseDetailField = ({const type = getFieldType(field, override);const props = {...(autoFocus ? { autoFocus, "data-autofocus": autoFocus } : {}),- ...getFieldProps(field, override),+ ...getFieldProps(field, override, type),};if (field.name === "host" && engineKey === "postgres") {@@ -96,7 +98,11 @@ const getFieldType = (field: EngineField, override?: EngineFieldOverride) => {return override?.type ?? field.type;};-const getFieldProps = (field: EngineField, override?: EngineFieldOverride) => {+const getFieldProps = (+ field: EngineField,+ override: EngineFieldOverride | undefined,+ type: FieldType | undefined,+) => {const placeholder =override?.placeholder ?? field.placeholder ?? field.default;@@ -107,10 +113,7 @@ const getFieldProps = (field: EngineField, override?: EngineFieldOverride) => {description: override?.description ?? field.description,placeholder: placeholder != null ? String(placeholder) : undefined,encoding: field["treat-before-posting"],- mb: "md",- labelProps: {- mb: "sm",- },+ ...getSharedFieldStyleProps(type),};};@@ -138,17 +141,14 @@ const getPasswordProps = (field: EngineField) => {const getSelectProps = (field: EngineField, override?: EngineFieldOverride) => {return {- data: convertEnginFeildOptionsToSelectOptions(+ data: convertEngineFieldOptionsToSelectOptions(override?.options ?? field.options ?? [],),};};-const convertEnginFeildOptionsToSelectOptions = (+const convertEngineFieldOptionsToSelectOptions = (options: EngineFieldOption[],) => {return options.map((option) => ({ label: option.name, value: option.value }));};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default DatabaseDetailField;diff --git a/frontend/src/metabase/databases/components/DatabaseDetailField/index.ts b/frontend/src/metabase/databases/components/DatabaseDetailField/index.tsdeleted file mode 100644index 30e3e355086..00000000000--- a/frontend/src/metabase/databases/components/DatabaseDetailField/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./DatabaseDetailField";diff --git a/frontend/src/metabase/databases/components/DatabaseEngineField/DatabaseEngineSelect.tsx b/frontend/src/metabase/databases/components/DatabaseEngineField/DatabaseEngineSelect.tsxindex 223f7053adf..fff8f41add4 100644--- a/frontend/src/metabase/databases/components/DatabaseEngineField/DatabaseEngineSelect.tsx+++ b/frontend/src/metabase/databases/components/DatabaseEngineField/DatabaseEngineSelect.tsx@@ -11,6 +11,8 @@ import {type SelectProps,} from "metabase/ui";+import { getSharedFieldStyleProps } from "../styles";+const ICON_SIZE = 16;export interface DatabaseEngineSelectProps {@@ -41,13 +43,10 @@ export const DatabaseEngineSelect = ({data={options}disabled={disabled}onChange={handleChange}- mb="md"searchableleftSection={<DatabaseIcon engineKey={engineKey} />}renderOption={renderSelectOption}- labelProps={{- mb: "sm",- }}+ {...getSharedFieldStyleProps()}/>);};diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsxindex 9f445e570a4..f1a9791756a 100644--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsx+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsx@@ -11,7 +11,7 @@ import { Box } from "metabase/ui";import type { DatabaseData, Engine, EngineKey } from "metabase-types/api";import { DatabaseConnectionStringField } from "../DatabaseConnectionUri";-import DatabaseDetailField from "../DatabaseDetailField";+import { DatabaseDetailField } from "../DatabaseDetailField";import { DatabaseEngineField } from "../DatabaseEngineField";import DatabaseEngineWarning from "../DatabaseEngineWarning";import { DatabaseFormError } from "../DatabaseFormError";diff --git a/frontend/src/metabase/databases/components/DatabaseNameField/DatabaseNameField.tsx b/frontend/src/metabase/databases/components/DatabaseNameField/DatabaseNameField.tsxindex 57183f11885..6d098fe45ff 100644--- a/frontend/src/metabase/databases/components/DatabaseNameField/DatabaseNameField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseNameField/DatabaseNameField.tsx@@ -6,6 +6,8 @@ import { PLUGIN_DB_ROUTING } from "metabase/plugins";import { Icon, Tooltip } from "metabase/ui";import type { Engine } from "metabase-types/api";+import { getSharedFieldStyleProps } from "../styles";+export interface DatabaseNameFieldProps {engine: Engine;config: DatabaseFormConfig;@@ -37,12 +39,9 @@ export const DatabaseNameField = ({<Icon name="info" /></Tooltip>}- mb="md"{...autoFocusProps}{...props}- labelProps={{- mb: "sm",- }}+ {...getSharedFieldStyleProps()}/>);};diff --git a/frontend/src/metabase/databases/components/styles.ts b/frontend/src/metabase/databases/components/styles.tsnew file mode 100644index 00000000000..009e6b4d672--- /dev/null+++ b/frontend/src/metabase/databases/components/styles.ts@@ -0,0 +1,18 @@+import type { FieldType } from "../types";++export function getSharedFieldStyleProps(type?: FieldType) {+ // our boolean (Switch) fields don't support the labelProps+ const labelProps =+ type !== "boolean"+ ? {+ labelProps: {+ mb: "sm",+ },+ }+ : undefined;++ return {+ mb: "lg",+ ...labelProps,+ };+}diff --git a/frontend/src/metabase/databases/types.ts b/frontend/src/metabase/databases/types.tsindex 2149eea87ad..bf9f4d32b39 100644--- a/frontend/src/metabase/databases/types.ts+++ b/frontend/src/metabase/databases/types.ts@@ -44,3 +44,5 @@ export interface DatabaseFormConfig {export type ContinueWithoutDataComponent = (props: {onCancel?: () => void;}) => JSX.Element;++export type FieldType = EngineFieldType | ComponentType<EngineFieldProps>;