You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bb...@apache.org on 2022/04/20 14:31:40 UTC
[airflow] 09/09: Get gantt/graph modal actions working again
This is an automated email from the ASF dual-hosted git repository.
bbovenzi pushed a commit to branch mapped-instance-actions
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 009eb4d4fe6f20459ea8cc355b71326e6fd6f8a4
Author: Brent Bovenzi <br...@gmail.com>
AuthorDate: Wed Apr 20 10:29:06 2022 -0400
Get gantt/graph modal actions working again
---
airflow/www/static/js/dag.js | 9 ++++-----
airflow/www/templates/airflow/dag.html | 6 +++---
airflow/www/utils.py | 1 +
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/airflow/www/static/js/dag.js b/airflow/www/static/js/dag.js
index ded26baeab..0445e0686c 100644
--- a/airflow/www/static/js/dag.js
+++ b/airflow/www/static/js/dag.js
@@ -347,11 +347,10 @@ $('form[data-action]').on('submit', function submit(e) {
if (form.task_id) {
form.task_id.value = taskId;
}
- if (form.map_index) {
- form.map_index.value = mapIndex === undefined ? '' : mapIndex;
- }
- if (form.map_indexes) {
- form.map_indexes.value = mapIndex === undefined ? '' : mapIndex;
+ if (form.map_index && mapIndex >= 0) {
+ form.map_index.value = mapIndex;
+ } else if (form.map_index) {
+ form.map_index.remove();
}
form.action = $(this).data('action');
form.submit();
diff --git a/airflow/www/templates/airflow/dag.html b/airflow/www/templates/airflow/dag.html
index 8259c7045c..e7afde8af9 100644
--- a/airflow/www/templates/airflow/dag.html
+++ b/airflow/www/templates/airflow/dag.html
@@ -310,7 +310,7 @@
<input type="hidden" name="dag_id" value="{{ dag.dag_id }}">
<input type="hidden" name="task_id">
<input type="hidden" name="execution_date">
- <input type="hidden" name="map_indexes">
+ <input type="hidden" name="map_index">
<input type="hidden" name="origin" value="{{ request.base_url }}">
<div class="row">
<span class="btn-group col-xs-12 col-sm-9 task-instance-modal-column" data-toggle="buttons">
@@ -352,7 +352,7 @@
<input type="hidden" name="dag_id" value="{{ dag.dag_id }}">
<input type="hidden" name="task_id">
<input type="hidden" name="dag_run_id">
- <input type="hidden" name="map_indexes">
+ <input type="hidden" name="map_index">
<input type="hidden" name="origin" value="{{ request.base_url }}">
<input type="hidden" name="state" value="failed">
<div class="row">
@@ -386,7 +386,7 @@
<input type="hidden" name="dag_id" value="{{ dag.dag_id }}">
<input type="hidden" name="task_id">
<input type="hidden" name="dag_run_id">
- <input type="hidden" name="map_indexes">
+ <input type="hidden" name="map_index">
<input type="hidden" name="origin" value="{{ request.base_url }}">
<input type="hidden" name="state" value="success">
<div class="row">
diff --git a/airflow/www/utils.py b/airflow/www/utils.py
index 8a5cc3c717..0c452dea38 100644
--- a/airflow/www/utils.py
+++ b/airflow/www/utils.py
@@ -64,6 +64,7 @@ def get_mapped_instances(task_instance, session):
TaskInstance.run_id == task_instance.run_id,
TaskInstance.task_id == task_instance.task_id,
)
+ .order_by(TaskInstance.map_index)
.all()
)