Skip to content

[v2-10-test] Fix update issues for object and advanced-arrays fields when empty default (#45313) #45315

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
jscheffl merged 1 commit into from
Dec 31, 2024
Merged

[v2-10-test] Fix update issues for object and advanced-arrays fields when empty default (#45313) #45315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions airflow/www/static/js/trigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ function updateJSONconf() {
}
}
params[keyName] = values.length === 0 ? null : values;
} else if (elements[i].value.length === 0) {
params[keyName] = null;
} else if (
elements[i].attributes.valuetype &&
(elements[i].attributes.valuetype.value === "object" ||
Expand All @@ -81,6 +79,8 @@ function updateJSONconf() {
// ignore JSON parsing errors
// we don't want to bother users during entry, error will be displayed before submit
}
} else if (elements[i].value.length === 0) {
params[keyName] = null;
} else if (Number.isNaN(elements[i].value)) {
params[keyName] = elements[i].value;
} else if (
Expand Down
4 changes: 3 additions & 1 deletion airflow/www/templates/airflow/trigger.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@
{% elif form_details.schema and "object" in form_details.schema.type %}
<textarea class="form-control" name="element_{{ form_key }}" id="element_{{ form_key }}" valuetype="object" rows="6"
{%- if not "null" in form_details.schema.type %} required=""{% endif -%}>
{{- form_details.value | tojson() -}}
{%- if form_details.value %}
{{- form_details.value | tojson() -}}
{% endif -%}
</textarea>
{% elif form_details.schema and ("integer" in form_details.schema.type or "number" in form_details.schema.type) %}
<input class="form-control" name="element_{{ form_key }}" id="element_{{ form_key }}"
Expand Down