Skip to content

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

Fix table layout issues in transform pages (#63540)

Alexander Polyankina7971b43b13d
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx
index 3ca870e488e..27446d6145b 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx
@@ -18,7 +18,7 @@ export function RunStatusInfo({
const isError = status === "failed" || status === "timeout";
return (
- <Group gap="xs">
+ <Group gap="xs" wrap="nowrap">
<Box c={isError ? "error" : undefined}>{formatStatus(status)}</Box>
{isError && message != null && (
<RunErrorInfo message={message} endTime={endTime} />
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx
index 862d66a5981..85546884124 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TimezoneIndicator/TimezoneIndicator.tsx
@@ -1,13 +1,13 @@
import { t } from "ttag";
import { useSetting } from "metabase/common/hooks";
-import { Icon } from "metabase/ui";
+import { FixedSizeIcon } from "metabase/ui";
export function TimezoneIndicator() {
const systemTimezone = useSetting("system-timezone");
return (
- <Icon
+ <FixedSizeIcon
name="info_outline"
size={16}
tooltip={t`Timezone is ${systemTimezone}`}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.module.css
index 431ed82e759..5e3a99848a1 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.module.css
@@ -2,6 +2,6 @@
cursor: pointer;
}
-.nowrap {
- white-space: nowrap;
+.cell {
+ overflow-wrap: break-word;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
index 81e3276dbd8..cdaefc73251 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
@@ -64,7 +64,6 @@ export function JobList({ params }: { params: JobListParams }) {
<Flex align="center" gap="xs" key="next-run">
{t`Next run`} <TimezoneIndicator />
</Flex>,
- t`Transforms`,
t`Tags`,
]}
>
@@ -74,8 +73,8 @@ export function JobList({ params }: { params: JobListParams }) {
className={S.row}
onClick={() => handleRowClick(job)}
>
- <td>{job.name}</td>
- <td className={S.nowrap}>
+ <td className={S.cell}>{job.name}</td>
+ <td className={S.cell}>
{job.last_run?.start_time
? parseTimestampWithTimezone(
job.last_run?.start_time,
@@ -83,7 +82,7 @@ export function JobList({ params }: { params: JobListParams }) {
).format("lll")
: null}
</td>
- <td className={S.nowrap}>
+ <td className={S.cell}>
{job.next_run?.start_time
? parseTimestampWithTimezone(
job.next_run?.start_time,
@@ -91,8 +90,7 @@ export function JobList({ params }: { params: JobListParams }) {
).format("lll")
: null}
</td>
- <td className={S.nowrap}></td>
- <td>
+ <td className={S.cell}>
<TagList tags={tags} tagIds={job.tag_ids ?? []} />
</td>
</tr>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.module.css
index 431ed82e759..5e3a99848a1 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.module.css
@@ -2,6 +2,6 @@
cursor: pointer;
}
-.nowrap {
- white-space: nowrap;
+.cell {
+ overflow-wrap: break-word;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
index dbd44d4e780..28272a3e74a 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
@@ -68,10 +68,10 @@ function RunTable({ runs }: RunTableProps) {
<AdminContentTable
columnTitles={[
t`Transform`,
- <Flex align="center" gap="xs" key="started-at">
+ <Flex key="started-at" align="center" gap="xs">
{t`Started at`} <TimezoneIndicator />
</Flex>,
- <Flex align="center" gap="xs" key="end-at">
+ <Flex key="end-at" align="center" gap="xs">
{t`End at`} <TimezoneIndicator />
</Flex>,
t`Status`,
@@ -84,14 +84,14 @@ function RunTable({ runs }: RunTableProps) {
className={S.row}
onClick={() => handleRowClick(run)}
>
- <td>{run.transform?.name}</td>
- <td className={S.nowrap}>
+ <td className={S.cell}>{run.transform?.name}</td>
+ <td className={S.cell}>
{parseTimestampWithTimezone(
run.start_time,
systemTimezone,
).format("lll")}
</td>
- <td className={S.nowrap}>
+ <td className={S.cell}>
{run.end_time
? parseTimestampWithTimezone(
run.end_time,
@@ -99,7 +99,7 @@ function RunTable({ runs }: RunTableProps) {
).format("lll")
: null}
</td>
- <td>
+ <td className={S.cell}>
<RunStatusInfo
status={run.status}
message={run.message}
@@ -113,7 +113,7 @@ function RunTable({ runs }: RunTableProps) {
}
/>
</td>
- <td>{formatRunMethod(run.run_method)}</td>
+ <td className={S.cell}>{formatRunMethod(run.run_method)}</td>
</tr>
))}
</AdminContentTable>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.module.css
index 431ed82e759..5e3a99848a1 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.module.css
@@ -2,6 +2,6 @@
cursor: pointer;
}
-.nowrap {
- white-space: nowrap;
+.cell {
+ overflow-wrap: break-word;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
index 14a034f2367..c552b7a1d2a 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx
@@ -55,7 +55,7 @@ export function TransformList() {
columnTitles={[
t`Transform`,
t`Target`,
- <Flex align="center" gap="xs" key="last-run-at">
+ <Flex key="last-run-at" component="span" align="center" gap="xs">
{t`Last run at`} <TimezoneIndicator />
</Flex>,
t`Last run status`,
@@ -68,9 +68,9 @@ export function TransformList() {
className={S.row}
onClick={() => handleRowClick(transform)}
>
- <td>{transform.name}</td>
- <td>{transform.target.name}</td>
- <td className={S.nowrap}>
+ <td className={S.cell}>{transform.name}</td>
+ <td className={S.cell}>{transform.target.name}</td>
+ <td className={S.cell}>
{transform.last_run?.end_time
? parseTimestampWithTimezone(
transform.last_run.end_time,
@@ -78,7 +78,7 @@ export function TransformList() {
).format("lll")
: null}
</td>
- <td className={S.nowrap}>
+ <td className={S.cell}>
{transform.last_run != null ? (
<RunStatusInfo
status={transform.last_run.status}
@@ -94,7 +94,7 @@ export function TransformList() {
/>
) : null}
</td>
- <td>
+ <td className={S.cell}>
<TagList tags={tags} tagIds={transform.tag_ids ?? []} />
</td>
</tr>
diff --git a/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.module.css b/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.module.css
new file mode 100644
index 00000000000..a29152053fe
--- /dev/null
+++ b/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.module.css
@@ -0,0 +1,22 @@
+.root {
+ display: flex;
+ align-items: center;
+}
+
+.item {
+ display: flex;
+ align-items: center;
+}
+
+.link {
+ cursor: pointer;
+
+ &:hover {
+ color: var(--mb-color-brand);
+ }
+}
+
+.icon {
+ margin: 0 0.5rem;
+ color: var(--mb-color-text-light);
+}
diff --git a/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.styled.tsx b/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.styled.tsx
deleted file mode 100644
index a9dfabc1c62..00000000000
--- a/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.styled.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import Link from "metabase/common/components/Link";
-import { Icon } from "metabase/ui";
-
-export const BrowserCrumbsRoot = styled.div`
- display: flex;
- align-items: center;
-`;
-
-export const BrowserCrumbsItem = styled.div`
- display: flex;
- align-items: center;
-`;
-
-export const BrowserCrumbsLink = styled(Link)`
- cursor: pointer;
-
- &:hover {
- color: var(--mb-color-brand);
- }
-`;
-
-export const BrowserCrumbsIcon = styled(Icon)`
- margin: 0 0.5rem;
- color: var(--mb-color-text-light);
-`;
diff --git a/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.tsx b/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.tsx
index bdc6dea2535..2e177539927 100644
--- a/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.tsx
+++ b/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.tsx
@@ -1,14 +1,11 @@
import cx from "classnames";
import type { ReactNode } from "react";
+import Link from "metabase/common/components/Link/Link";
import CS from "metabase/css/core/index.css";
+import { Icon } from "metabase/ui";
-import {
- BrowserCrumbsIcon,
- BrowserCrumbsItem,
- BrowserCrumbsLink,
- BrowserCrumbsRoot,
-} from "./BrowserCrumbs.styled";
+import S from "./BrowserCrumbs.module.css";
// TODO: merge with Breadcrumbs
@@ -29,22 +26,22 @@ type BrowserCrumbsType = {
};
export const BrowserCrumbs = ({ crumbs }: BrowserCrumbsType) => (
- <BrowserCrumbsRoot data-testid="browsercrumbs">
+ <div className={S.root} data-testid="browsercrumbs">
{crumbs
.filter((c) => c)
.map((crumb, index, crumbs) => (
- <BrowserCrumbsItem key={index}>
+ <div key={index} className={S.item}>
{crumb.to ? (
- <BrowserCrumbsLink to={crumb.to}>
+ <Link className={S.link} to={crumb.to}>
<Crumb>{crumb.title}</Crumb>
- </BrowserCrumbsLink>
+ </Link>
) : (
<Crumb>{crumb.title}</Crumb>
)}
{index < crumbs.length - 1 ? (
- <BrowserCrumbsIcon name="chevronright" />
+ <Icon className={S.icon} name="chevronright" />
) : null}
- </BrowserCrumbsItem>
+ </div>
))}
- </BrowserCrumbsRoot>
+ </div>
);