Skip to content

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

Fix text wrapping in dependencies (#68615)

Alexander Polyankin75251f933a1c
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
index 1053dc7ccc2..6c838e4e574 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
@@ -2,6 +2,7 @@ import { Fragment } from "react";
import { Link } from "react-router";
import { t } from "ttag";
+import CS from "metabase/css/core/index.css";
import {
Form,
FormErrorMessage,
@@ -60,7 +61,7 @@ export function CheckDependenciesForm({
<DependencyItemCard key={index} item={item} />
))}
</Stack>
- <Group px="xl">
+ <Group px="xl" wrap="nowrap">
<Box flex={1}>
<FormErrorMessage />
</Box>
@@ -106,7 +107,7 @@ function DependencyItemCard({ item }: DependencyItemCardProps) {
shadow="none"
withBorder
>
- <Stack gap="xs">
+ <Stack className={CS.textWrap} gap="xs">
<Group c="brand" gap="sm" wrap="nowrap">
<FixedSizeIcon name={getItemIcon(item)} />
<Box fw="bold" lh="h4">
@@ -228,7 +229,14 @@ type BreadcrumbProps = {
function Breadcrumb({ item }: BreadcrumbProps) {
return (
- <Anchor component={Link} to={item.to} c="text-secondary" fz="sm" lh="h5">
+ <Anchor
+ component={Link}
+ className={CS.textWrap}
+ to={item.to}
+ c="text-secondary"
+ fz="sm"
+ lh="h5"
+ >
{item.title}
</Anchor>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.module.css
index b9248cd8283..b7c2fb32066 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.module.css
@@ -1,10 +1,19 @@
-.panel {
+.leftPanel {
+ right: 0;
+ pointer-events: none;
+}
+
+.rightPanel {
display: flex;
flex-direction: column;
bottom: 0;
pointer-events: none;
}
+.panelContent {
+ pointer-events: all;
+}
+
[data-mantine-color-scheme="dark"] {
.reactFlow {
--xy-background-color-default: transparent;
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx
index 400cb0445fe..1f0ed0440e4 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx
@@ -116,8 +116,8 @@ export function DependencyGraph({
<Background />
<Controls className={S.controls} showInteractive={false} />
<GraphNodeLayout />
- <Panel position="top-left">
- <Group>
+ <Panel className={S.leftPanel} position="top-left">
+ <Group className={S.panelContent} wrap="nowrap">
{withEntryPicker && (
<GraphEntryInput
node={entryNode?.data ?? null}
@@ -129,7 +129,7 @@ export function DependencyGraph({
</Group>
</Panel>
{selection != null && selectedNode != null && (
- <Panel className={S.panel} position="top-right">
+ <Panel className={S.rightPanel} position="top-right">
{selection.groupType != null ? (
<GraphDependencyPanel
node={selectedNode.data}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx
index e76ff602201..d65438431d2 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphBreadcrumbs/GraphBreadcrumbs.tsx
@@ -1,6 +1,8 @@
+import cx from "classnames";
import { Fragment } from "react";
import { Link } from "react-router";
+import CS from "metabase/css/core/index.css";
import { Box, Group, type GroupProps } from "metabase/ui";
import type { NodeLink } from "../../../types";
@@ -19,7 +21,7 @@ export function GraphBreadcrumbs({ links, ...props }: GraphBreadcrumbsProps) {
<Fragment key={linkIndex}>
{linkIndex > 0 && <Box>/</Box>}
<Box
- className={S.link}
+ className={cx(S.link, CS.textWrap)}
component={Link}
to={link.url}
target="_blank"
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.tsx
index 29aa33b7220..379b04c15e5 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelBody/PanelBody.tsx
@@ -1,5 +1,6 @@
import { memo } from "react";
+import CS from "metabase/css/core/text.module.css";
import { Box, Group, Stack } from "metabase/ui";
import type { DependencyEntry, DependencyNode } from "metabase-types/api";
@@ -60,7 +61,7 @@ function ListItem({ node, getGraphUrl }: ListItemProps) {
url={getGraphUrl(node)}
/>
{viewCount != null ? (
- <Box c="text-secondary" fz="sm" lh="1rem">
+ <Box className={CS.textNoWrap} c="text-secondary" fz="sm" lh="1rem">
{getNodeViewCountLabel(viewCount)}
</Box>
) : link != null ? (
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
index 756fb3f9df8..8e8af6aa034 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
@@ -43,7 +43,7 @@ export function GraphEntryInput({
return (
<>
- <Card p={0} bdrs={0} bg="transparent">
+ <Card p={0} flex="0 1 auto" bdrs={0} bg="transparent">
{node != null ? (
<EntryButton
node={node}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx
index 8fc6a0765f9..32cae5fe72d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx
@@ -2,6 +2,7 @@ import { t } from "ttag";
import { EntityCreationInfo } from "metabase/common/components/EntityCreationInfo";
import { getColumnIcon } from "metabase/common/utils/columns";
+import CS from "metabase/css/core/index.css";
import { Box, FixedSizeIcon, Group, Stack, Title } from "metabase/ui";
import * as Lib from "metabase-lib";
import type { DependencyEntry, DependencyNode } from "metabase-types/api";
@@ -47,7 +48,11 @@ function DescriptionSection({ node }: SectionProps) {
}
return (
- <Box c={description ? "text-primary" : "text-secondary"} lh="h4">
+ <Box
+ className={CS.textWrap}
+ c={description ? "text-primary" : "text-secondary"}
+ lh="h4"
+ >
{description.length > 0 ? description : t`No description`}
</Box>
);
@@ -111,13 +116,20 @@ function FieldsSection({ node }: SectionProps) {
return (
<Stack gap="md" lh="1rem">
- <Title order={6}>{getNodeFieldsLabel(fields.length)}</Title>
+ <Title className={CS.textWrap} order={6}>
+ {getNodeFieldsLabel(fields.length)}
+ </Title>
{fields.map((field, fieldIndex) => {
const fieldTypeInfo = Lib.legacyColumnTypeInfo(field);
const fieldIcon = getColumnIcon(fieldTypeInfo);
return (
- <Group key={fieldIndex} gap="sm" wrap="nowrap">
+ <Group
+ className={CS.textWrap}
+ key={fieldIndex}
+ gap="sm"
+ wrap="nowrap"
+ >
<FixedSizeIcon name={fieldIcon} c="text-secondary" />
{field.display_name}
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx
index dfe6189b0f1..84afe784407 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx
@@ -1,5 +1,6 @@
import { t } from "ttag";
+import CS from "metabase/css/core/index.css";
import {
ActionIcon,
Center,
@@ -36,12 +37,12 @@ export function PanelHeader({ node, onClose }: PanelHeaderProps) {
<FixedSizeIcon name={getNodeIcon(node)} c="brand" size={20} />
</Center>
<Stack gap="xs" flex={1}>
- <Title order={3} lh="1.5rem">
+ <Title className={CS.textWrap} order={3} lh="1.5rem">
{getNodeLabel(node)}
</Title>
{location != null && <GraphBreadcrumbs links={location.links} />}
</Stack>
- <Group m="-sm" gap="xs">
+ <Group m="-sm" gap="xs" wrap="nowrap">
{link != null && (
<GraphExternalLink label={link.label} url={link.url} />
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx
index c78afc9683e..219abba21a5 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphLink/GraphLink.tsx
@@ -1,6 +1,8 @@
+import cx from "classnames";
import { Link } from "react-router";
-import { Box, FixedSizeIcon, Flex, type IconName } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { Box, FixedSizeIcon, Group, type IconName } from "metabase/ui";
import S from "./GraphLink.module.css";
@@ -12,11 +14,11 @@ type GraphLinkProps = {
export function GraphLink({ label, icon, url }: GraphLinkProps) {
return (
- <Box className={S.link} component={Link} to={url}>
- <Flex gap="sm" align="center">
+ <Box className={cx(S.link, CS.textWrap)} component={Link} to={url}>
+ <Group gap="sm" align="center" wrap="nowrap">
<FixedSizeIcon name={icon} c="brand" />
<Box lh="h4">{label}</Box>
- </Flex>
+ </Group>
</Box>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css
index f050b3e5343..3c2bbef1fa8 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css
@@ -1,5 +1,6 @@
.card {
min-width: 15rem;
+ max-width: 30rem;
&:hover,
&.selected {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx
index c418771fc80..7cbeb1345a7 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.tsx
@@ -8,6 +8,7 @@ import {
import cx from "classnames";
import { type MouseEvent, memo, useContext } from "react";
+import CS from "metabase/css/core/index.css";
import {
Box,
Card,
@@ -67,13 +68,13 @@ export const GraphNode = memo(function ItemNode({
onClick={handleClick}
>
<Stack gap="sm">
- <Group c={typeInfo.color} gap="xs">
+ <Group c={typeInfo.color} gap="xs" wrap="nowrap">
<FixedSizeIcon name={getNodeIcon(node)} />
<Box fz="sm" fw="bold" lh="1rem">
{typeInfo.label}
</Box>
</Group>
- <Box fw="bold" lh="1rem">
+ <Box className={CS.textWrap} fw="bold" lh="1rem">
{label}
</Box>
</Stack>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/GraphSelectionInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/GraphSelectionInput.tsx
index 2e569cd95e4..90754367239 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/GraphSelectionInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphSelectionInput/GraphSelectionInput.tsx
@@ -26,7 +26,7 @@ export function GraphSelectInput({ nodes }: GraphSelectInputProps) {
};
return (
- <Card p={0} bdrs={0} bg="transparent">
+ <Card p={0} flex="0 0 auto" bdrs={0} bg="transparent">
{isOpened ? (
<Select
value={null}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.module.css
index 0073571bccc..5780d690fe1 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.module.css
@@ -1,3 +1,7 @@
.main {
overflow: hidden;
}
+
+.resizing {
+ user-select: none;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
index 79756ddf14f..5d5d91d4f44 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
@@ -1,3 +1,5 @@
+import { useDisclosure, useElementSize } from "@mantine/hooks";
+import cx from "classnames";
import { useLayoutEffect, useState } from "react";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
@@ -68,6 +70,10 @@ export function DependencyList({
limit: PAGE_SIZE,
});
+ const { ref, width } = useElementSize();
+ const [isResizing, { open: startResizing, close: stopResizing }] =
+ useDisclosure();
+
const nodes = data?.data ?? [];
const totalNodesCount = data?.total ?? 0;
@@ -107,7 +113,12 @@ export function DependencyList({
}, [selectedEntry, selectedNode]);
return (
- <Flex h="100%">
+ <Flex
+ className={cx({ [S.resizing]: isResizing })}
+ ref={ref}
+ h="100%"
+ wrap="nowrap"
+ >
<Stack className={S.main} flex={1} px="3.5rem" pb="md" gap="md">
<ListHeader />
<ListSearchBar
@@ -144,6 +155,9 @@ export function DependencyList({
{selectedNode != null && (
<ListSidebar
node={selectedNode}
+ containerWidth={width}
+ onResizeStart={startResizing}
+ onResizeStop={stopResizing}
onClose={() => setSelectedEntry(undefined)}
/>
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
index fc709420842..f2366ecc2ed 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
@@ -70,7 +70,13 @@ export const ListBody = function ListBody({
});
return (
- <Card flex={1} mih={0} p={0} withBorder data-testid="dependency-list">
+ <Card
+ flex="0 1 auto"
+ mih={0}
+ p={0}
+ withBorder
+ data-testid="dependency-list"
+ >
{isLoading ? (
<TreeTableSkeleton columnWidths={getColumnWidths(mode)} />
) : (
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/LocationCell.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/LocationCell.tsx
index 272b3feb2d1..c631bad6372 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/LocationCell.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/LocationCell.tsx
@@ -1,5 +1,5 @@
import { Ellipsified } from "metabase/common/components/Ellipsified";
-import { FixedSizeIcon, Flex } from "metabase/ui";
+import { FixedSizeIcon, Group } from "metabase/ui";
import type { DependencyNode } from "metabase-types/api";
import { getNodeLocationInfo } from "../../../../utils";
@@ -19,9 +19,9 @@ export function LocationCell({ node }: LocationCellProps) {
const path = links.map((link) => link.label).join(" / ");
return (
- <Flex align="center" gap="sm" miw={0}>
+ <Group align="center" gap="sm" miw={0} wrap="nowrap">
{icon && <FixedSizeIcon name={icon} />}
<Ellipsified tooltipProps={{ openDelay: 300 }}>{path}</Ellipsified>
- </Flex>
+ </Group>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/NameCell.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/NameCell.tsx
index 825a52d2af0..4e07f0ba112 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/NameCell.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/NameCell.tsx
@@ -1,5 +1,5 @@
import { Ellipsified } from "metabase/common/components/Ellipsified";
-import { FixedSizeIcon, Flex } from "metabase/ui";
+import { FixedSizeIcon, Group } from "metabase/ui";
import type { DependencyNode } from "metabase-types/api";
import { getNodeIcon, getNodeLabel } from "../../../../utils";
@@ -13,9 +13,9 @@ export function NameCell({ node }: NameCellProps) {
const icon = getNodeIcon(node);
return (
- <Flex align="center" gap="sm" miw={0}>
+ <Group align="center" gap="sm" miw={0} wrap="nowrap">
{icon && <FixedSizeIcon name={icon} />}
<Ellipsified tooltipProps={{ openDelay: 300 }}>{label}</Ellipsified>
- </Flex>
+ </Group>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
index a35f7b3ff82..ffa92e3ebdb 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
@@ -3,7 +3,7 @@ import { type ChangeEvent, memo, useState } from "react";
import { t } from "ttag";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
-import { FixedSizeIcon, Flex, Loader, TextInput } from "metabase/ui";
+import { FixedSizeIcon, Group, Loader, TextInput } from "metabase/ui";
import type { DependencyFilterOptions } from "../../../types";
import { getSearchQuery } from "../../../utils";
@@ -51,7 +51,7 @@ export const ListSearchBar = memo(function ListSearchBar({
};
return (
- <Flex gap="md" align="center">
+ <Group gap="md" align="center" wrap="nowrap">
<TextInput
value={searchValue}
placeholder={t`Search…`}
@@ -66,6 +66,6 @@ export const ListSearchBar = memo(function ListSearchBar({
availableGroupTypes={getAvailableGroupTypes(mode)}
onFilterOptionsChange={handleFilterOptionsChange}
/>
- </Flex>
+ </Group>
);
});
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.module.css
index 9f1c9cd59db..7d187e7c837 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.module.css
@@ -1,10 +1,12 @@
.sidebar {
+ flex: 1 1 auto;
overflow: auto;
border-left: 1px solid var(--mb-color-border);
}
.link {
color: var(--mb-color-text-primary);
+ white-space: normal;
&:hover {
color: var(--mb-color-brand);
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
index 3dccfcde3a9..3abf38a5c3d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
@@ -11,43 +11,55 @@ import { SidebarDependentsSection } from "./SidebarDependentsSection";
import { SidebarErrorSection } from "./SidebarErrorSection";
import { SidebarHeader } from "./SidebarHeader";
import { SidebarLocationSection } from "./SidebarLocationSection";
+import { SidebarResizableBox } from "./SidebarResizableBox";
import { SidebarTransformSection } from "./SidebarTransformSection";
type ListSidebarProps = {
node: DependencyNode;
+ containerWidth: number;
+ onResizeStart: () => void;
+ onResizeStop: () => void;
onClose: () => void;
};
export const ListSidebar = memo(function ListSidebar({
node,
+ containerWidth,
+ onResizeStart,
+ onResizeStop,
onClose,
}: ListSidebarProps) {
const errors = getDependencyErrors(node.dependents_errors ?? []);
const errorGroups = getDependencyErrorGroups(errors);
return (
- <Stack
- className={S.sidebar}
- p="lg"
- w="32rem"
- gap="xl"
- bg="background-primary"
- data-testid="dependency-list-sidebar"
+ <SidebarResizableBox
+ containerWidth={containerWidth}
+ onResizeStart={onResizeStart}
+ onResizeStop={onResizeStop}
>
- <Stack gap="lg">
- <SidebarHeader node={node} onClose={onClose} />
- <SidebarLocationSection node={node} />
- <SidebarTransformSection node={node} />
- <SidebarCreationSection node={node} />
+ <Stack
+ className={S.sidebar}
+ p="lg"
+ gap="xl"
+ bg="background-primary"
+ data-testid="dependency-list-sidebar"
+ >
+ <Stack gap="lg">
+ <SidebarHeader node={node} onClose={onClose} />
+ <SidebarLocationSection node={node} />
+ <SidebarTransformSection node={node} />
+ <SidebarCreationSection node={node} />
+ </Stack>
+ {errorGroups.map((errorGroup) => (
+ <SidebarErrorSection
+ key={errorGroup.type}
+ type={errorGroup.type}
+ errors={errorGroup.errors}
+ />
+ ))}
+ <SidebarDependentsSection node={node} />
</Stack>
- {errorGroups.map((errorGroup) => (
- <SidebarErrorSection
- key={errorGroup.type}
- type={errorGroup.type}
- errors={errorGroup.errors}
- />
- ))}
- <SidebarDependentsSection node={node} />
- </Stack>
+ </SidebarResizableBox>
);
});
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/SidebarCreationSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/SidebarCreationSection.tsx
index d9cb405518d..226103457c4 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/SidebarCreationSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarCreationSection/SidebarCreationSection.tsx
@@ -72,7 +72,7 @@ function UserSection({ label, name, date }: UserSectionProps) {
<Box className={CS.textWrap} c="text-primary">
{name}
</Box>
- <DateTime value={date} unit="day" />
+ <DateTime className={CS.textNoWrap} value={date} unit="day" />
</Group>
</Stack>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.module.css
index 06edbfd453d..ae3487772c1 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.module.css
@@ -10,3 +10,7 @@
border-bottom: 1px solid var(--mb-color-border);
}
}
+
+.link {
+ white-space: normal;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.tsx
index 66891e1a5df..3243ce0688d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarDependentsSection/SidebarDependentsSection.tsx
@@ -88,7 +88,7 @@ export function SidebarDependentsSection({
{isFetching && <Loader size="sm" />}
</Group>
{count > DEPENDENTS_SEARCH_THRESHOLD && (
- <Group gap={0}>
+ <Group gap={0} wrap="nowrap">
<SortOptionsPicker
sortOptions={sortOptions}
availableSortColumns={BROKEN_DEPENDENTS_SORT_COLUMNS}
@@ -161,7 +161,11 @@ function DependentItem({ node }: DependentItemProps) {
pl="sm"
>
{location.links.map((link, linkIndex) => (
- <Box key={linkIndex} className={CS.textWrap} lh="1rem">
+ <Box
+ key={linkIndex}
+ className={cx(S.link, CS.textWrap)}
+ lh="1rem"
+ >
{link.label}
</Box>
))}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.tsx
index c5ebdb5b2b2..672cdc5e2df 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarErrorSection/SidebarErrorSection.tsx
@@ -39,7 +39,7 @@ export function SidebarErrorSection({
return (
<Stack role="region" aria-label={getErrorTypeLabel(type)}>
- <Group gap="sm">
+ <Group gap="sm" wrap="nowrap">
<Badge c="text-selected" bg="error">
{count}
</Badge>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
index 40eef518221..b8910a59668 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
@@ -38,7 +38,7 @@ export function SidebarHeader({ node, onClose }: SidebarHeaderProps) {
>
{getNodeLabel(node)}
</Anchor>
- <Group gap="sm">
+ <Group gap="sm" wrap="nowrap">
<Tooltip
label={t`View in dependency graph`}
openDelay={TOOLTIP_OPEN_DELAY_MS}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/SidebarLocationSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/SidebarLocationSection.tsx
index 4c42a06705c..5ecb096deb5 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/SidebarLocationSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarLocationSection/SidebarLocationSection.tsx
@@ -22,7 +22,10 @@ export function SidebarLocationSection({ node }: SidebarLocationSectionProps) {
return (
<div role="region" aria-label={t`Location`}>
- <Breadcrumbs lh="1rem">
+ <Breadcrumbs
+ lh="1rem"
+ separator={<FixedSizeIcon name="chevronright" size={12} />}
+ >
{locationInfo.links.map((link, linkIndex) => (
<Anchor
key={linkIndex}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.module.css
new file mode 100644
index 00000000000..5a7b5e9487b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.module.css
@@ -0,0 +1,3 @@
+.resizableBox {
+ display: flex;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.tsx
new file mode 100644
index 00000000000..8d4237c7441
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.tsx
@@ -0,0 +1,41 @@
+import type { ReactNode } from "react";
+import { ResizableBox } from "react-resizable";
+
+import { ResizeHandle } from "metabase/common/components/ResizeHandle";
+
+import S from "./SidebarResizableBox.module.css";
+
+const MIN_SIDEBAR_WIDTH = 400;
+const DEFAULT_SIDEBAR_WIDTH = 512;
+
+type SidebarResizableBoxProps = {
+ containerWidth: number;
+ children?: ReactNode;
+ onResizeStart: () => void;
+ onResizeStop: () => void;
+};
+
+export function SidebarResizableBox({
+ containerWidth,
+ children,
+ onResizeStart,
+ onResizeStop,
+}: SidebarResizableBoxProps) {
+ const maxSidebarWidth = Math.max(containerWidth / 2, MIN_SIDEBAR_WIDTH);
+
+ return (
+ <ResizableBox
+ className={S.resizableBox}
+ width={DEFAULT_SIDEBAR_WIDTH}
+ minConstraints={[MIN_SIDEBAR_WIDTH, 0]}
+ maxConstraints={[maxSidebarWidth, 0]}
+ axis="x"
+ resizeHandles={["w"]}
+ handle={<ResizeHandle handleAxis="w" />}
+ onResizeStart={onResizeStart}
+ onResizeStop={onResizeStop}
+ >
+ {children}
+ </ResizableBox>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/index.ts
new file mode 100644
index 00000000000..cdad874b262
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/index.ts
@@ -0,0 +1 @@
+export * from "./SidebarResizableBox";
diff --git a/frontend/src/metabase/common/components/DateTime/DateTime.tsx b/frontend/src/metabase/common/components/DateTime/DateTime.tsx
index 133471bbb2d..c7c1dd620e8 100644
--- a/frontend/src/metabase/common/components/DateTime/DateTime.tsx
+++ b/frontend/src/metabase/common/components/DateTime/DateTime.tsx
@@ -1,13 +1,12 @@
-import { forwardRef } from "react";
+import { type HTMLAttributes, forwardRef } from "react";
import { formatDateTimeWithUnit } from "metabase/lib/formatting";
import type { OptionsType } from "metabase/lib/formatting/types";
import MetabaseSettings from "metabase/lib/settings";
import type { DatetimeUnit } from "metabase-types/api";
-type DateTimeProps = {
+type DateTimeProps = HTMLAttributes<HTMLSpanElement> & {
value: string | Date | number;
- componentProps?: React.ComponentProps<"span">;
unit?: DatetimeUnit;
};
diff --git a/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx b/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
index 2c3ba901766..68d245990cd 100644
--- a/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
+++ b/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
@@ -1,6 +1,7 @@
import { c, t } from "ttag";
import DateTime from "metabase/common/components/DateTime";
+import CS from "metabase/css/core/index.css";
import { getUserName } from "metabase/lib/user";
import { Box, FixedSizeIcon, Group, Stack, Title } from "metabase/ui";
import type { LastEditInfo, UserInfo } from "metabase-types/api";
@@ -37,7 +38,7 @@ export function EntityCreationInfo({
data-testid="entity-creation-info-created"
>
<FixedSizeIcon name="ai" />
- <Box>
+ <Box className={CS.textWrap}>
{c(
"Describes when an entity was created. {0} is a date/time and {1} is a person's name",
).jt`${(
@@ -49,7 +50,7 @@ export function EntityCreationInfo({
{lastEditedAt != null && lastEditor != null && (
<Group gap="sm" wrap="nowrap" data-testid="entity-creation-info-edited">
<FixedSizeIcon name="pencil" />
- <Box>
+ <Box className={CS.textWrap}>
{c(
"Describes when an entity was last edited. {0} is a date/time and {1} is a person's name",
).jt`${(
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.module.css b/frontend/src/metabase/common/components/ResizeHandle/ResizeHandle.module.css
similarity index 100%
rename from frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.module.css
rename to frontend/src/metabase/common/components/ResizeHandle/ResizeHandle.module.css
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.tsx b/frontend/src/metabase/common/components/ResizeHandle/ResizeHandle.tsx
similarity index 100%
rename from frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/ResizeHandle.tsx
rename to frontend/src/metabase/common/components/ResizeHandle/ResizeHandle.tsx
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/index.ts b/frontend/src/metabase/common/components/ResizeHandle/index.ts
similarity index 100%
rename from frontend/src/metabase/querying/editor/components/QueryEditor/ResizeHandle/index.ts
rename to frontend/src/metabase/common/components/ResizeHandle/index.ts
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
index a8b14389fb7..f2b2563c2bb 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
@@ -2,12 +2,11 @@ import { ResizableBox } from "react-resizable";
import { useWindowSize } from "react-use";
import { t } from "ttag";
+import { ResizeHandle } from "metabase/common/components/ResizeHandle";
import { NotebookNativePreview } from "metabase/querying/notebook/components/NotebookNativePreview";
import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
-import { ResizeHandle } from "../ResizeHandle";
-
import S from "./NativeQueryPreviewSidebar.module.css";
type NativeQueryPreviewSidebarProps = {
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
index b1024347504..173f69d8a2d 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
@@ -4,6 +4,7 @@ import { useWindowSize } from "react-use";
import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";
import type { DataPickerItem } from "metabase/common/components/Pickers/DataPicker";
+import { ResizeHandle } from "metabase/common/components/ResizeHandle";
import { useSetting } from "metabase/common/hooks";
import {
NativeQueryEditor,
@@ -20,8 +21,6 @@ import type {
RecentCollectionItem,
} from "metabase-types/api";
-import { ResizeHandle } from "../ResizeHandle";
-
import S from "./QueryEditorBody.module.css";
const EDITOR_HEIGHT = 550;