Skip to content
Merged
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 @@ -26,7 +26,7 @@ import type {
} from "openapi/requests/types.gen";
import Time from "src/components/Time";
import { Tooltip, type TooltipProps } from "src/components/ui";
import { getDuration } from "src/utils";
import { renderDuration } from "src/utils";

type Props = {
readonly taskInstance?: LightGridTaskInstanceSummary | TaskInstanceHistoryResponse | TaskInstanceResponse;
Expand Down Expand Up @@ -64,7 +64,7 @@ const TaskInstanceTooltip = ({ children, positioning, taskInstance, ...rest }: P
{translate("endDate")}: <Time datetime={taskInstance.end_date} />
</Text>
<Text>
{translate("duration")}: {getDuration(taskInstance.start_date, taskInstance.end_date)}
{translate("duration")}: {renderDuration(taskInstance.duration)}
</Text>
</>
) : undefined}
Expand Down
15 changes: 5 additions & 10 deletions airflow-core/src/airflow/ui/src/pages/DagsList/RecentRuns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { Link } from "react-router-dom";
import type { DAGWithLatestDagRunsResponse } from "openapi/requests/types.gen";
import Time from "src/components/Time";
import { Tooltip } from "src/components/ui";
import { getDuration } from "src/utils";
import { renderDuration } from "src/utils";

dayjs.extend(duration);

Expand All @@ -42,19 +42,14 @@ export const RecentRuns = ({
return undefined;
}

const runsWithDuration = latestRuns.map((run) => ({
...run,
duration: dayjs.duration(dayjs(run.end_date).diff(run.start_date)).asSeconds(),
}));

const max = Math.max.apply(
undefined,
runsWithDuration.map((run) => run.duration),
latestRuns.map((run) => run.duration ?? 0),
);

return (
<Flex alignItems="flex-end" flexDirection="row-reverse" pb={1}>
{runsWithDuration.map((run) => (
{latestRuns.map((run) => (
<Tooltip
content={
<Box>
Expand All @@ -75,7 +70,7 @@ export const RecentRuns = ({
</Text>
)}
<Text>
{translate("duration")}: {getDuration(run.start_date, run.end_date)}
{translate("duration")}: {renderDuration(run.duration)}
</Text>
</Box>
}
Expand All @@ -93,7 +88,7 @@ export const RecentRuns = ({
<Box
bg={`${run.state}.solid`}
borderRadius="4px"
height={`${(run.duration / max) * BAR_HEIGHT}px`}
height={`${run.duration === null ? 1 : (run.duration / max) * BAR_HEIGHT}px`}
minHeight={1}
width="4px"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { TaskTrySelect } from "src/components/TaskTrySelect";
import Time from "src/components/Time";
import { ClipboardRoot, ClipboardIconButton } from "src/components/ui";
import { SearchParamsKeys } from "src/constants/searchParams";
import { getDuration, useAutoRefresh, isStatePending } from "src/utils";
import { useAutoRefresh, isStatePending, renderDuration } from "src/utils";

import { BlockingDeps } from "./BlockingDeps";
import { ExtraLinks } from "./ExtraLinks";
Expand Down Expand Up @@ -147,11 +147,7 @@ export const Details = () => {
</Table.Row>
<Table.Row>
<Table.Cell>{translate("duration")}</Table.Cell>
<Table.Cell>
{Boolean(tryInstance?.start_date) // eslint-disable-next-line unicorn/no-null
? getDuration(tryInstance?.start_date ?? null, tryInstance?.end_date ?? null)
: ""}
</Table.Cell>
<Table.Cell>{renderDuration(tryInstance?.duration)}</Table.Cell>
</Table.Row>
<Table.Row>
<Table.Cell>{translate("startDate")}</Table.Cell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { HeaderCard } from "src/components/HeaderCard";
import { MarkTaskInstanceAsButton } from "src/components/MarkAs";
import Time from "src/components/Time";
import { usePatchTaskInstance } from "src/queries/usePatchTaskInstance";
import { getDuration, useContainerWidth } from "src/utils";
import { renderDuration, useContainerWidth } from "src/utils";

export const Header = ({
isRefreshing,
Expand All @@ -53,7 +53,7 @@ export const Header = ({
{ label: translate("startDate"), value: <Time datetime={taskInstance.start_date} /> },
{ label: translate("endDate"), value: <Time datetime={taskInstance.end_date} /> },
...(Boolean(taskInstance.start_date)
? [{ label: translate("duration"), value: getDuration(taskInstance.start_date, taskInstance.end_date) }]
? [{ label: translate("duration"), value: renderDuration(taskInstance.duration) }]
: []),
{
label: translate("taskInstance.dagVersion"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { StateBadge } from "src/components/StateBadge";
import Time from "src/components/Time";
import { TruncatedText } from "src/components/TruncatedText";
import { SearchParamsKeys, type SearchParamsKeysType } from "src/constants/searchParams";
import { getDuration, useAutoRefresh, isStatePending } from "src/utils";
import { useAutoRefresh, isStatePending, renderDuration } from "src/utils";
import { getTaskInstanceLink } from "src/utils/links";

import DeleteTaskInstanceButton from "./DeleteTaskInstanceButton";
Expand Down Expand Up @@ -183,8 +183,8 @@ const taskInstanceColumns = ({
header: translate("task.operator"),
},
{
cell: ({ row: { original } }) =>
Boolean(original.start_date) ? getDuration(original.start_date, original.end_date) : "",
accessorKey: "duration",
cell: ({ row: { original } }) => renderDuration(original.duration),
header: translate("duration"),
},
{
Expand Down
10 changes: 6 additions & 4 deletions airflow-core/src/airflow/ui/src/utils/datetimeUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
import { describe, it, expect } from "vitest";

import { getDuration } from "./datetimeUtils";
import { getDuration, renderDuration } from "./datetimeUtils";

describe("getDuration", () => {
it("handles durations less than 10 seconds", () => {
Expand Down Expand Up @@ -49,8 +49,10 @@ describe("getDuration", () => {
expect(getDuration(start, end)).toBe("02:30:00");
});

it("handles null or undefined dates", () => {
expect(getDuration(null, null)).toBe("00:00:00");
expect(getDuration(undefined, undefined)).toBe("00:00:00");
it("handles small, null or undefined values", () => {
// eslint-disable-next-line unicorn/no-null
expect(getDuration(null, null)).toBe(undefined);
expect(getDuration(undefined, undefined)).toBe(undefined);
expect(renderDuration(0.000_01)).toBe(undefined);
});
});
13 changes: 5 additions & 8 deletions airflow-core/src/airflow/ui/src/utils/datetimeUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,17 @@ dayjs.extend(tz);
export const DEFAULT_DATETIME_FORMAT = "YYYY-MM-DD HH:mm:ss";
export const DEFAULT_DATETIME_FORMAT_WITH_TZ = `${DEFAULT_DATETIME_FORMAT} z`;

export const renderDuration = (durationSeconds: number | null | undefined): string => {
if (
durationSeconds === null ||
durationSeconds === undefined ||
isNaN(durationSeconds) ||
durationSeconds <= 0
) {
return "00:00:00";
export const renderDuration = (durationSeconds: number | null | undefined): string | undefined => {
if (durationSeconds === null || durationSeconds === undefined || durationSeconds <= 0.01) {
return undefined;
}

// If under 10 seconds, render as 9s
if (durationSeconds < 10) {
return `${durationSeconds.toFixed(2)}s`;
}

// If under 1 day, render as HH:mm:ss otherwise include the number of days
return durationSeconds < 86_400
? dayjs.duration(durationSeconds, "seconds").format("HH:mm:ss")
: dayjs.duration(durationSeconds, "seconds").format("D[d]HH:mm:ss");
Expand Down