diff --git a/airflow/www/static/js/dag/details/taskInstance/Details.tsx b/airflow/www/static/js/dag/details/taskInstance/Details.tsx index 72d8273ce6358..80e26d79ca29e 100644 --- a/airflow/www/static/js/dag/details/taskInstance/Details.tsx +++ b/airflow/www/static/js/dag/details/taskInstance/Details.tsx @@ -231,29 +231,6 @@ const Details = ({ gridInstance, taskInstance, group }: Props) => { )} - {taskInstance?.renderedFields && ( - <> - {Object.keys(taskInstance.renderedFields).map((key) => { - const renderedFields = taskInstance.renderedFields as Record< - string, - unknown - >; - if (renderedFields[key]) { - return ( - - {key} - - - {JSON.stringify(renderedFields[key])} - - - - ); - } - return null; - })} - - )} {!!taskInstance?.pool && ( Pool @@ -300,6 +277,42 @@ const Details = ({ gridInstance, taskInstance, group }: Props) => { )} + {taskInstance?.renderedFields && ( + + + Rendered Templates + + + + {Object.keys(taskInstance.renderedFields).map((key) => { + const renderedFields = taskInstance.renderedFields as Record< + string, + unknown + >; + let field = renderedFields[key]; + if (field) { + if (typeof field !== "string") { + try { + field = JSON.stringify(field); + } catch (e) { + // skip + } + } + return ( + + + + + ); + } + return null; + })} + +
{key} + {field as string} +
+
+ )} ); }; diff --git a/airflow/www/static/js/dag/details/taskInstance/Nav.tsx b/airflow/www/static/js/dag/details/taskInstance/Nav.tsx index 1e5d84d8ba48b..88560d5dac0a4 100644 --- a/airflow/www/static/js/dag/details/taskInstance/Nav.tsx +++ b/airflow/www/static/js/dag/details/taskInstance/Nav.tsx @@ -29,7 +29,6 @@ const dagId = getMetaValue("dag_id"); const isK8sExecutor = getMetaValue("k8s_or_k8scelery_executor") === "True"; const taskInstancesUrl = getMetaValue("task_instances_list_url"); const renderedK8sUrl = getMetaValue("rendered_k8s_url"); -const renderedTemplatesUrl = getMetaValue("rendered_templates_url"); const taskUrl = getMetaValue("task_url"); const gridUrl = getMetaValue("grid_url"); @@ -50,7 +49,6 @@ const Nav = forwardRef( map_index: mapIndex ?? -1, }); const detailsLink = `${taskUrl}&${params}`; - const renderedLink = `${renderedTemplatesUrl}&${params}`; const k8sLink = `${renderedK8sUrl}&${params}`; const listParams = new URLSearchParamsWrapper({ _flt_3_dag_id: dagId, @@ -79,7 +77,6 @@ const Nav = forwardRef( {(!isMapped || mapIndex !== undefined) && ( <> More Details - Rendered Template {isK8sExecutor && ( K8s Pod Spec )} @@ -88,11 +85,8 @@ const Nav = forwardRef( )} )} - - List Instances, all runs + + List All Instances ); diff --git a/airflow/www/templates/airflow/dag.html b/airflow/www/templates/airflow/dag.html index d9ef3c139a161..29f535b4b671e 100644 --- a/airflow/www/templates/airflow/dag.html +++ b/airflow/www/templates/airflow/dag.html @@ -65,7 +65,6 @@ -