This is an automated email from the ASF dual-hosted git repository.
jscheffl pushed a commit to branch v3-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v3-1-test by this push:
new df1b0262af9 [v3-1-test] Use Task Display Name in Grid if existing
(#56393) (#56410)
df1b0262af9 is described below
commit df1b0262af9c72677528e8b559fc3582d27a263a
Author: Jens Scheffler <[email protected]>
AuthorDate: Sun Oct 5 12:24:30 2025 +0200
[v3-1-test] Use Task Display Name in Grid if existing (#56393) (#56410)
* Use Task Display Name in Grid if existing
* Consider short task ID w/o prefix if no display name
* Add some tests with labels on tasks
* Apply ruff
(cherry picked from commit d43b468c1852fb94f29748126242400cf22bb411)
---
.../api_fastapi/core_api/services/ui/task_group.py | 9 ++++++---
.../src/airflow/ui/src/pages/TaskInstance/Header.tsx | 1 -
.../unit/api_fastapi/core_api/routes/ui/test_grid.py | 20 +++++++++++---------
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git
a/airflow-core/src/airflow/api_fastapi/core_api/services/ui/task_group.py
b/airflow-core/src/airflow/api_fastapi/core_api/services/ui/task_group.py
index ed9a96718e9..3b71ea1cff0 100644
--- a/airflow-core/src/airflow/api_fastapi/core_api/services/ui/task_group.py
+++ b/airflow-core/src/airflow/api_fastapi/core_api/services/ui/task_group.py
@@ -25,6 +25,7 @@ from operator import methodcaller
from airflow.configuration import conf
from airflow.models.mappedoperator import MappedOperator, is_mapped
+from airflow.sdk import TaskGroup
from airflow.serialization.serialized_objects import SerializedBaseOperator
@@ -90,15 +91,17 @@ def task_group_to_dict_grid(task_item_or_group,
parent_group_is_mapped=False):
setup_teardown_type = "setup"
elif task.is_teardown is True:
setup_teardown_type = "teardown"
+ # we explicitly want the short task ID here, not the full doted
notation if in a group
+ task_display_name = task.task_display_name if task.task_display_name
!= task.task_id else task.label
return {
"id": task.task_id,
- "label": task.label,
+ "label": task_display_name,
"is_mapped": mapped,
"children": None,
"setup_teardown_type": setup_teardown_type,
}
- task_group = task_item_or_group
+ task_group: TaskGroup = task_item_or_group
task_group_sort = get_task_group_children_getter()
mapped = is_mapped(task_group)
children = [
@@ -108,7 +111,7 @@ def task_group_to_dict_grid(task_item_or_group,
parent_group_is_mapped=False):
return {
"id": task_group.group_id,
- "label": task_group.label,
+ "label": task_group.group_display_name or task_group.label,
"is_mapped": mapped or None,
"children": children or None,
}
diff --git a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Header.tsx
b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Header.tsx
index 37349d8f030..0698baeaddc 100644
--- a/airflow-core/src/airflow/ui/src/pages/TaskInstance/Header.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/TaskInstance/Header.tsx
@@ -125,7 +125,6 @@ export const Header = ({
isRefreshing={isRefreshing}
state={taskInstance.state}
stats={stats}
- subTitle={<Time datetime={taskInstance.start_date} />}
title={`${taskInstance.task_display_name}${taskInstance.map_index > -1
? ` [${taskInstance.rendered_map_index ?? taskInstance.map_index}]` : ""}`}
/>
</Box>
diff --git
a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py
b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py
index 32f8f2683f0..65173dabda8 100644
--- a/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py
+++ b/airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py
@@ -84,7 +84,7 @@ GRID_NODES = [
"is_mapped": True,
"label": "mapped_task_group",
},
- {"id": "task", "label": "task"},
+ {"id": "task", "label": "A Beautiful Task Name 🚀"},
{
"children": [
{
@@ -92,11 +92,11 @@ GRID_NODES = [
{
"id":
"task_group.inner_task_group.inner_task_group_sub_task",
"is_mapped": True,
- "label": "inner_task_group_sub_task",
+ "label": "Inner Task Group Sub Task Label",
}
],
"id": "task_group.inner_task_group",
- "label": "inner_task_group",
+ "label": "My Inner Task Group",
},
{"id": "task_group.mapped_task", "is_mapped": True, "label":
"mapped_task"},
],
@@ -121,7 +121,7 @@ def setup(dag_maker, session=None):
# DAG 1
with dag_maker(dag_id=DAG_ID, serialized=True, session=session) as dag:
- task = EmptyOperator(task_id=TASK_ID)
+ task = EmptyOperator(task_id=TASK_ID, task_display_name="A Beautiful
Task Name 🚀")
@task_group
def mapped_task_group(arg1):
@@ -131,8 +131,10 @@ def setup(dag_maker, session=None):
with TaskGroup(group_id=TASK_GROUP_ID):
MockOperator.partial(task_id=MAPPED_TASK_ID).expand(arg1=["a",
"b", "c", "d"])
- with TaskGroup(group_id=INNER_TASK_GROUP):
-
MockOperator.partial(task_id=INNER_TASK_GROUP_SUB_TASK).expand(arg1=["a", "b"])
+ with TaskGroup(group_id=INNER_TASK_GROUP, group_display_name="My
Inner Task Group"):
+ MockOperator.partial(
+ task_id=INNER_TASK_GROUP_SUB_TASK,
task_display_name="Inner Task Group Sub Task Label"
+ ).expand(arg1=["a", "b"])
# Mapped but never expanded. API should not crash, but count this as
one no-status ti.
MockOperator.partial(task_id=MAPPED_TASK_ID_2).expand(arg1=task.output)
@@ -447,7 +449,7 @@ class TestGetGridDataEndpoint:
"is_mapped": True,
"label": "mapped_task_group",
},
- {"id": "task", "label": "task"},
+ {"id": "task", "label": "A Beautiful Task Name 🚀"},
{
"children": [
{
@@ -455,11 +457,11 @@ class TestGetGridDataEndpoint:
{
"id":
"task_group.inner_task_group.inner_task_group_sub_task",
"is_mapped": True,
- "label": "inner_task_group_sub_task",
+ "label": "Inner Task Group Sub Task Label",
}
],
"id": "task_group.inner_task_group",
- "label": "inner_task_group",
+ "label": "My Inner Task Group",
},
{"id": "task_group.mapped_task", "is_mapped": True,
"label": "mapped_task"},
],
