Skip to content

Auto-refresh default state #11559

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
kaxil merged 6 commits into from
Oct 15, 2020
Merged

Auto-refresh default state #11559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5e748c
Merge pull request #974 from apache/master
jhtimmins Oct 14, 2020
36d196a
Merge branch 'master' of github.com:astronomer/airflow into master
ryanahamilton Oct 15, 2020
3fcc931
Merge pull request #976 from apache/master
jhtimmins Oct 15, 2020
0521fb8
Merge branch 'master' of github.com:astronomer/airflow into master
ryanahamilton Oct 15, 2020
16abca8
Only default the graph auto-refresh to "on" if DAG has RUNNING DagRuns
ryanahamilton Oct 15, 2020
b5edbda
Update logic to use dag run state
ryanahamilton Oct 15, 2020
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
2 changes: 1 addition & 1 deletion airflow/www/templates/airflow/graph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<span class="loading-dot"></span>
</span>
<label class="switch-label">
<input class="switch-input" id="auto_refresh" type="checkbox" checked>
<input class="switch-input" id="auto_refresh" type="checkbox" {% if dag_run_state == 'running' %}checked{% endif %}>
<span class="switch" aria-hidden="true"></span>
Auto-refresh
</label>
Expand Down
3 changes: 2 additions & 1 deletion airflow/www/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,7 +1842,8 @@ class GraphForm(DateTimeWithNumRunsWithDagRunsForm):
nodes=nodes,
edges=edges,
show_external_log_redirect=task_log_reader.supports_external_link,
external_log_name=external_log_name)
external_log_name=external_log_name,

@kaxil kaxil Oct 15, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was mostly thinking of the current DagRun i.e. if this DagRun isn't running we don't refresh as with the current change, if another DagRun is running, this will still refresh automatically

You can get the state of it already using dt_nr_dr_data['dr_state'] (also used on L1839)

@ryanahamilton ryanahamilton Oct 15, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks @kaxil!

dag_run_state=dt_nr_dr_data['dr_state'])

@expose('/duration')
@has_dag_access(can_dag_read=True)
Expand Down