Skip to content

feature(ui): Make entire task box clickable to select the task in Air… #49299

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 5 commits into from
Apr 23, 2025
Merged

feature(ui): Make entire task box clickable to select the task in Air… #49299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
900996a
feature(ui): Make entire task node clickable to select the task
jsjasonseba Apr 15, 2025
4766e6c
Add z-index to TogglePause for clickability
jsjasonseba Apr 18, 2025
5bd1437
Remove link component
jsjasonseba Apr 18, 2025
5d23e42
Remove unnecessary onClick handler from LinkOverlay
jsjasonseba Apr 18, 2025
ea6e9e7
Forward ref from LinkOverlay
jsjasonseba Apr 23, 2025
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
6 changes: 3 additions & 3 deletions airflow-core/src/airflow/ui/src/components/Graph/AssetNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Flex, Heading, HStack, Link, Text } from "@chakra-ui/react";
import { Flex, Heading, HStack, LinkOverlay, Text } from "@chakra-ui/react";
import type { NodeProps, Node as NodeType } from "@xyflow/react";
import { FiDatabase } from "react-icons/fi";
import { useParams, Link as RouterLink } from "react-router-dom";
Expand Down Expand Up @@ -69,9 +69,9 @@ export const AssetNode = ({
<Heading ml={-2} size="sm">
<FiDatabase />
</Heading>
<Link asChild color="fg.info">
<LinkOverlay asChild>
<RouterLink to={`/assets/${assetId}`}>{label}</RouterLink>
</Link>
</LinkOverlay>
</HStack>
{assetEvent === undefined ? undefined : (
<>
Expand Down
13 changes: 9 additions & 4 deletions airflow-core/src/airflow/ui/src/components/Graph/DagNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Flex, HStack, Link } from "@chakra-ui/react";
import { Flex, HStack, LinkOverlay } from "@chakra-ui/react";
import type { NodeProps, Node as NodeType } from "@xyflow/react";
import { Link as RouterLink } from "react-router-dom";

Expand Down Expand Up @@ -47,11 +47,16 @@ export const DagNode = ({
>
<HStack alignItems="center" justifyContent="space-between">
<DagIcon />
<TogglePause dagId={dag?.dag_id ?? label} disabled={!Boolean(dag)} isPaused={dag?.is_paused} />
<TogglePause
dagId={dag?.dag_id ?? label}
disabled={!Boolean(dag)}
isPaused={dag?.is_paused}
style={{ zIndex: 2 }}
/>
</HStack>
<Link asChild color="fg.info" mb={2}>
<LinkOverlay asChild>
<RouterLink to={`/dags/${dag?.dag_id ?? label}`}>{dag?.dag_display_name ?? label}</RouterLink>
</Link>
</LinkOverlay>
</Flex>
</NodeWrapper>
);
Expand Down
27 changes: 13 additions & 14 deletions airflow-core/src/airflow/ui/src/components/Graph/TaskLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Link } from "@chakra-ui/react";
import { forwardRef } from "react";
import { useParams, useSearchParams, Link as RouterLink } from "react-router-dom";

import { TaskName, type TaskNameProps } from "src/components/TaskName";
Expand All @@ -25,7 +25,7 @@ type Props = {
readonly id: string;
} & TaskNameProps;

export const TaskLink = ({ id, isGroup, isMapped, ...rest }: Props) => {
export const TaskLink = forwardRef<HTMLAnchorElement, Props>(({ id, isGroup, isMapped, ...rest }, ref) => {
const { dagId = "", runId, taskId } = useParams();
const [searchParams] = useSearchParams();

Expand All @@ -35,16 +35,15 @@ export const TaskLink = ({ id, isGroup, isMapped, ...rest }: Props) => {
}

return (
<Link asChild data-testid={id}>
<RouterLink
to={{
// Do not include runId if there is no selected run, clicking a second time will deselect a task id
pathname: `/dags/${dagId}/${runId === undefined ? "" : `runs/${runId}/`}${taskId === id ? "" : `tasks/${id}`}${isMapped && taskId !== id && runId !== undefined ? "/mapped" : ""}`,
search: searchParams.toString(),
}}
>
<TaskName isMapped={isMapped} {...rest} />
</RouterLink>
</Link>
<RouterLink
ref={ref}
to={{
// Do not include runId if there is no selected run, clicking a second time will deselect a task id
pathname: `/dags/${dagId}/${runId === undefined ? "" : `runs/${runId}/`}${taskId === id ? "" : `tasks/${id}`}${isMapped && taskId !== id && runId !== undefined ? "/mapped" : ""}`,
search: searchParams.toString(),
}}
>
<TaskName isMapped={isMapped} {...rest} />
</RouterLink>
);
};
});
22 changes: 12 additions & 10 deletions airflow-core/src/airflow/ui/src/components/Graph/TaskNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Box, Button, Flex, HStack, Text } from "@chakra-ui/react";
import { Box, Button, Flex, HStack, LinkOverlay, Text } from "@chakra-ui/react";
import type { NodeProps, Node as NodeType } from "@xyflow/react";
import { CgRedo } from "react-icons/cg";

Expand Down Expand Up @@ -78,15 +78,17 @@ export const TaskNode = ({
width={`${width + (isSelected ? 4 : 0)}px`}
>
<Box>
<TaskLink
childCount={taskInstance?.task_count}
id={id}
isGroup={isGroup}
isMapped={isMapped}
isOpen={isOpen}
label={label}
setupTeardownType={setupTeardownType}
/>
<LinkOverlay asChild>
<TaskLink
childCount={taskInstance?.task_count}
id={id}
isGroup={isGroup}
isMapped={isMapped}
isOpen={isOpen}
label={label}
setupTeardownType={setupTeardownType}
/>
</LinkOverlay>
<Text color="fg.muted" fontSize="sm" textTransform="capitalize">
{isGroup ? "Task Group" : operator}
</Text>
Expand Down