Skip to content

correcting wrong time showing in grid view #34179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbovenzi merged 3 commits into from
Sep 12, 2023
Merged

correcting wrong time showing in grid view #34179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
503e276
correcting wrong time showing in grid view
Abhishek-kumar-ISM Sep 7, 2023
1c1e2c0
lint errors resolved
Abhishek-kumar-ISM Sep 8, 2023
4934a0d
lint errors resolved
Abhishek-kumar-ISM Sep 8, 2023
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
18 changes: 15 additions & 3 deletions airflow/www/static/js/dag/grid/dagRuns/Bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ import { Flex, Box, Tooltip, Text, VStack, useTheme } from "@chakra-ui/react";
import { useContainerRef } from "src/context/containerRef";
import Time from "src/components/Time";
import type { SelectionProps } from "src/dag/useSelection";
import { hoverDelay, getStatusBackgroundColor } from "src/utils";
import {
hoverDelay,
getStatusBackgroundColor,
getDagRunLabel,
} from "src/utils";
import RunTypeIcon from "src/components/RunTypeIcon";

import { useGridData } from "src/api";
import DagRunTooltip from "./Tooltip";
import type { RunWithDuration } from ".";

Expand All @@ -51,7 +56,7 @@ const DagRunBar = ({
isSelected,
onSelect,
}: Props) => {
const { runType, runId, duration, state, executionDate } = run;
const { runType, runId, duration, state } = run;
const containerRef = useContainerRef();
const { colors } = useTheme();
const hoverBlue = `${colors.blue[100]}50`;
Expand Down Expand Up @@ -86,6 +91,10 @@ const DagRunBar = ({
inverseIndex === 4 || (inverseIndex > 4 && (inverseIndex - 4) % 10 === 0);

const color = stateColors[state];
const {
data: { ordering },
} = useGridData();
const dagRun = run;

return (
<Box
Expand Down Expand Up @@ -159,7 +168,10 @@ const DagRunBar = ({
transform="rotate(-30deg) translateX(28px)"
mt="-23px !important"
>
<Time dateTime={executionDate} format="MMM DD, HH:mm" />
<Time
dateTime={getDagRunLabel({ dagRun, ordering })}
format="MMM DD, HH:mm"
/>
</Text>
<Box borderLeftWidth={1} opacity={0.7} height="100px" zIndex={0} />
</VStack>
Expand Down