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 2023/02/11 14:38:48 UTC
[airflow] branch main updated: Bugfix/26215 remove trigger UI glitches (#29376)
This is an automated email from the ASF dual-hosted git repository.
bbovenzi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 9c6f83bb6f Bugfix/26215 remove trigger UI glitches (#29376)
9c6f83bb6f is described below
commit 9c6f83bb6f3e3b57ae0abbe9eb0582fcde265702
Author: Jens Scheffler <95...@users.noreply.github.com>
AuthorDate: Sat Feb 11 15:38:34 2023 +0100
Bugfix/26215 remove trigger UI glitches (#29376)
* Fixing JavaScript problems in params UI tutorial for color picker
* Fixing JavaScript TypeError when no recent config list is rendered in UI
* Fixing JavaScript event handler after un-folding generated JSON formatting
---
airflow/example_dags/example_params_ui_tutorial.py | 18 +++++++++---------
airflow/www/static/js/trigger.js | 8 ++++++--
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/airflow/example_dags/example_params_ui_tutorial.py b/airflow/example_dags/example_params_ui_tutorial.py
index df93157c4d..485817f137 100644
--- a/airflow/example_dags/example_params_ui_tutorial.py
+++ b/airflow/example_dags/example_params_ui_tutorial.py
@@ -195,25 +195,25 @@ with DAG(
</td></tr></tbody></table>
<script lang="javascript">
const hex_chars = "0123456789ABCDEF";
- const dgebi = document.getElementById;
function i2hex(name) {
- var i = dgebi(name).value;
+ var i = document.getElementById(name).value;
return hex_chars.substr(parseInt(i / 16), 1) + hex_chars.substr(parseInt(i % 16), 1)
}
function u_{name}() {
- dgebi("{name}").value = "#"+i2hex("r_{name}")+i2hex("g_{name}")+i2hex("b_{name}");
- dgebi("preview_{name}").style.background = dgebi("{name}").value;
+ var hex_val = "#"+i2hex("r_{name}")+i2hex("g_{name}")+i2hex("b_{name}");
+ document.getElementById("{name}").value = hex_val;
+ document.getElementById("preview_{name}").style.background = hex_val;
updateJSONconf();
}
function hex2i(text) {
return hex_chars.indexOf(text.substr(0,1)) * 16 + hex_chars.indexOf(text.substr(1,1));
}
function v_{name}() {
- var value = dgebi("{name}").value.toUpperCase();
- dgebi("r_{name}").value = hex2i(value.substr(1,2));
- dgebi("g_{name}").value = hex2i(value.substr(3,2));
- dgebi("b_{name}").value = hex2i(value.substr(5,2));
- dgebi("preview_{name}").style.background = dgebi("{name}").value;
+ var value = document.getElementById("{name}").value.toUpperCase();
+ document.getElementById("r_{name}").value = hex2i(value.substr(1,2));
+ document.getElementById("g_{name}").value = hex2i(value.substr(3,2));
+ document.getElementById("b_{name}").value = hex2i(value.substr(5,2));
+ document.getElementById("preview_{name}").style.background = value;
}
v_{name}();
</script>""",
diff --git a/airflow/www/static/js/trigger.js b/airflow/www/static/js/trigger.js
index 9cff308a8e..17a5b08de2 100644
--- a/airflow/www/static/js/trigger.js
+++ b/airflow/www/static/js/trigger.js
@@ -149,7 +149,9 @@ function initForm() {
// Ensure layout is refreshed on generated JSON as well
document.getElementById('generated_json_toggle').addEventListener('click', () => {
- setTimeout(jsonForm.refresh, 300);
+ setTimeout(() => {
+ jsonForm.refresh();
+ }, 300);
});
// Update generated conf once
@@ -196,4 +198,6 @@ function setRecentConfig(e) {
jsonForm.setValue(value);
}
-recentConfigList.addEventListener('change', setRecentConfig);
+if (recentConfigList) {
+ recentConfigList.addEventListener('change', setRecentConfig);
+}