Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@ type Props = {
readonly text: string;
} & TextProps;

export const TruncatedText = ({ text, ...rest }: Props) => (
export const WrappedText = ({ text, ...rest }: Props) => (
<Text
display="-webkit-box"
minWidth={200}
overflow="hidden"
style={{
WebkitBoxOrient: "vertical",
WebkitLineClamp: 2,
}}
title={text}
wordBreak="break-word"
Expand Down
6 changes: 3 additions & 3 deletions airflow-core/src/airflow/ui/src/pages/DagRuns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import RenderedJsonField from "src/components/RenderedJsonField";
import { RunTypeIcon } from "src/components/RunTypeIcon";
import { StateBadge } from "src/components/StateBadge";
import Time from "src/components/Time";
import { TruncatedText } from "src/components/TruncatedText";
import { WrappedText } from "src/components/WrappedText";
import { SearchParamsKeys, type SearchParamsKeysType } from "src/constants/searchParams";
import { DagRunsFilters } from "src/pages/DagRunsFilters";
import DeleteRunButton from "src/pages/DeleteRunButton";
Expand Down Expand Up @@ -67,7 +67,7 @@ const runColumns = (translate: TFunction, dagId?: string): Array<ColumnDef<DAGRu
cell: ({ row: { original } }: DagRunRow) => (
<Link asChild color="fg.info">
<RouterLink to={`/dags/${original.dag_id}`}>
<TruncatedText text={original.dag_display_name} />
<WrappedText text={original.dag_display_name} />
</RouterLink>
</Link>
),
Expand All @@ -80,7 +80,7 @@ const runColumns = (translate: TFunction, dagId?: string): Array<ColumnDef<DAGRu
cell: ({ row: { original } }: DagRunRow) => (
<Link asChild color="fg.info" fontWeight="bold">
<RouterLink to={`/dags/${original.dag_id}/runs/${original.dag_run_id}`}>
<TruncatedText text={original.dag_run_id} />
<WrappedText text={original.dag_run_id} />
</RouterLink>
</Link>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { Link as RouterLink } from "react-router-dom";
import { useAssetServiceNextRunAssets } from "openapi/queries";
import { AssetExpression, type ExpressionType } from "src/components/AssetExpression";
import type { NextRunEvent } from "src/components/AssetExpression/types";
import { TruncatedText } from "src/components/TruncatedText";
import { WrappedText } from "src/components/WrappedText";
import { Popover } from "src/components/ui";

type Props = {
Expand Down Expand Up @@ -66,7 +66,7 @@ export const AssetSchedule = ({ assetExpression, dagId, latestRunAfter, timetabl
<FiDatabase style={{ display: "inline", flexShrink: 0 }} />
<Link asChild color="fg.info" display="block" fontSize="sm">
<RouterLink to={`/assets/${asset.id}`}>
<TruncatedText minWidth={0} text={asset.name ?? asset.uri} />
<WrappedText minWidth={0} text={asset.name ?? asset.uri} />
</RouterLink>
</Link>
</HStack>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { useTableURLState } from "src/components/DataTable/useTableUrlState";
import { ErrorAlert } from "src/components/ErrorAlert";
import { StateBadge } from "src/components/StateBadge";
import Time from "src/components/Time";
import { TruncatedText } from "src/components/TruncatedText";
import { WrappedText } from "src/components/WrappedText";
import { SearchParamsKeys, type SearchParamsKeysType } from "src/constants/searchParams";
import { useAutoRefresh } from "src/utils";
import { getHITLState } from "src/utils/hitl";
Expand Down Expand Up @@ -75,7 +75,7 @@ const taskInstanceColumns = ({
cell: ({ row: { original } }: TaskInstanceRow) => (
<Link asChild color="fg.info" fontWeight="bold">
<RouterLink to={`${getTaskInstanceLink(original.task_instance)}/required_actions`}>
<TruncatedText text={original.subject} />
<WrappedText text={original.subject} />
</RouterLink>
</Link>
),
Expand All @@ -89,7 +89,7 @@ const taskInstanceColumns = ({
cell: ({ row: { original } }: TaskInstanceRow) => (
<Link asChild color="fg.info">
<RouterLink to={`/dags/${original.task_instance.dag_id}`}>
<TruncatedText text={original.task_instance.dag_display_name} />
<WrappedText text={original.task_instance.dag_display_name} />
</RouterLink>
</Link>
),
Expand All @@ -107,7 +107,7 @@ const taskInstanceColumns = ({
<RouterLink
to={`/dags/${original.task_instance.dag_id}/runs/${original.task_instance.dag_run_id}`}
>
<TruncatedText text={original.task_instance.dag_run_id} />
<WrappedText text={original.task_instance.dag_run_id} />
</RouterLink>
</Link>
),
Expand All @@ -133,7 +133,7 @@ const taskInstanceColumns = ({
cell: ({ row: { original } }: TaskInstanceRow) => (
<Link asChild color="fg.info" fontWeight="bold">
<RouterLink to={`${getTaskInstanceLink(original.task_instance)}/required_actions`}>
<TruncatedText text={original.task_instance.task_display_name} />
<WrappedText text={original.task_instance.task_display_name} />
</RouterLink>
</Link>
),
Expand All @@ -142,12 +142,12 @@ const taskInstanceColumns = ({
]),
{
accessorKey: "rendered_map_index",
cell: ({ row: { original } }) => <TruncatedText text={original.task_instance.rendered_map_index ?? ""} />,
cell: ({ row: { original } }) => <WrappedText text={original.task_instance.rendered_map_index ?? ""} />,
header: translate("common:mapIndex"),
},
{
accessorKey: "task_instance_operator",
cell: ({ row: { original } }) => <TruncatedText text={original.task_instance.operator ?? ""} />,
cell: ({ row: { original } }) => <WrappedText text={original.task_instance.operator ?? ""} />,
header: translate("common:task.operator"),
},
{
Expand All @@ -157,7 +157,7 @@ const taskInstanceColumns = ({
},
{
accessorKey: "responded_by_user_name",
cell: ({ row: { original } }) => <TruncatedText text={original.responded_by_user?.name ?? ""} />,
cell: ({ row: { original } }) => <WrappedText text={original.responded_by_user?.name ?? ""} />,
header: translate("response.responded_by_user_name"),
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { ErrorAlert } from "src/components/ErrorAlert";
import { MarkTaskInstanceAsButton } from "src/components/MarkAs";
import { StateBadge } from "src/components/StateBadge";
import Time from "src/components/Time";
import { TruncatedText } from "src/components/TruncatedText";
import { WrappedText } from "src/components/WrappedText";
import { SearchParamsKeys, type SearchParamsKeysType } from "src/constants/searchParams";
import { useAutoRefresh, isStatePending, renderDuration } from "src/utils";
import { getTaskInstanceLink } from "src/utils/links";
Expand Down Expand Up @@ -82,7 +82,7 @@ const taskInstanceColumns = ({
cell: ({ row: { original } }: TaskInstanceRow) => (
<Link asChild color="fg.info">
<RouterLink to={`/dags/${original.dag_id}`}>
<TruncatedText text={original.dag_display_name} />
<WrappedText text={original.dag_display_name} />
</RouterLink>
</Link>
),
Expand Down Expand Up @@ -117,7 +117,7 @@ const taskInstanceColumns = ({
cell: ({ row: { original } }: TaskInstanceRow) => (
<Link asChild color="fg.info" fontWeight="bold">
<RouterLink to={getTaskInstanceLink(original)}>
<TruncatedText text={original.task_display_name} />
<WrappedText text={original.task_display_name} />
</RouterLink>
</Link>
),
Expand Down
6 changes: 3 additions & 3 deletions airflow-core/src/airflow/ui/src/pages/XCom/XCom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { useTableURLState } from "src/components/DataTable/useTableUrlState";
import { ErrorAlert } from "src/components/ErrorAlert";
import { ExpandCollapseButtons } from "src/components/ExpandCollapseButtons";
import Time from "src/components/Time";
import { TruncatedText } from "src/components/TruncatedText";
import { WrappedText } from "src/components/WrappedText";
import { SearchParamsKeys, type SearchParamsKeysType } from "src/constants/searchParams";
import { getTaskInstanceLink } from "src/utils/links";

Expand Down Expand Up @@ -72,7 +72,7 @@ const getColumns = ({ open, translate }: ColumnsProps): Array<ColumnDef<XComResp
cell: ({ row: { original } }: { row: { original: XComResponse } }) => (
<Link asChild color="fg.info" fontWeight="bold">
<RouterLink to={`/dags/${original.dag_id}/runs/${original.run_id}`}>
<TruncatedText text={original.run_id} />
<WrappedText text={original.run_id} />
</RouterLink>
</Link>
),
Expand All @@ -91,7 +91,7 @@ const getColumns = ({ open, translate }: ColumnsProps): Array<ColumnDef<XComResp
taskId: original.task_id,
})}
>
<TruncatedText text={original.task_display_name} />
<WrappedText text={original.task_display_name} />
</RouterLink>
</Link>
),
Expand Down
Loading