Tree view, repeated nodes are now collapsed by default

TiDeane · Oct 29, 2014 · 4d20e3a · 4d20e3a
1 parent b8eb9fe
commit 4d20e3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/airflow/www/app.py b/airflow/www/app.py
@@ -153,7 +153,20 @@ def tree(self):
         for ti in dag.get_task_instances(from_date):
             task_instances[(ti.task_id, ti.execution_date)] = ti
 
+        expanded = []
+
         def recurse_nodes(task):
+            children = [recurse_nodes(t) for t in task.upstream_list]
+
+            # D3 tree uses children vs _children to define what is
+            # expanded or not. The following block makes it such that
+            # repeated nodes are collapsed by default.
+            children_key = 'children'
+            if task.task_id not in expanded:
+                expanded.append(task.task_id)
+            elif children:
+                children_key = "_children"
+
             return {
                 'name': task.task_id,
                 'instances': [
@@ -163,7 +176,7 @@ def recurse_nodes(task):
                             'task_id': task.task_id
                         }
                     for d in dates],
-                'children': [recurse_nodes(t) for t in task.upstream_list],
+                children_key: children,
                 'num_dep': len(task.upstream_list),
                 'operator': task.task_type,
                 'retries': task.retries,

diff --git a/airflow/www/static/graph.css b/airflow/www/static/graph.css
@@ -1,5 +1,5 @@
 g.node rect {
-    stroke-width: 4;
+    stroke-width: 2;
     stroke: #CCC;
     cursor: pointer;
 }

diff --git a/dags/examples/example2.py b/dags/examples/example2.py
@@ -20,15 +20,16 @@
 for i in range(10):
     i = str(i)
     task = BashOperator(
-            task_id='runme_'+i, 
-            bash_command='echo "'+str(i)+': {{ ti.execution_date }}"', 
+            task_id='runme_'+i,
+            bash_command='echo "'+str(i)+': {{ ti.execution_date }}"',
             **default_args)
     task.set_downstream(run_this)
     dag.add_task(task)
 
 task = BashOperator(task_id='also_run_this', bash_command='ls -l', **default_args)
 dag.add_task(task)
 task.set_downstream(run_this_last)
+task.set_upstream(run_this)
 
 #dag.tree_view()
 #dag.db_merge()