quine-global-labs/mirror-cockpit-project-cockpit
1
0
Fork 0
mirror of https://github.com/cockpit-project/cockpit.git synced 2026-11-03 21:49:50 -09:00
Code Issues Projects Releases Packages Wiki Activity

storage: Don't change dialog state during input validation

Browse source
This commit is contained in:
Marius Vollmer 2025-06-06 10:29:50 +03:00 committed by Martin Pitt
parent 675f9d3b0a
commit 1e23793965
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/storaged/dialog.jsx
View file

@ -420,11 +420,11 @@ export const dialog_open = (def) => {
function run_action(progress_callback, variant) {
const func = () => {
return validate(variant)
.then(() => {
.then(validated_values => {
const visible_values = { variant };
fields.forEach(f => {
if (is_visible(f, values))
visible_values[f.tag] = values[f.tag];
visible_values[f.tag] = validated_values[f.tag];
});
if (def.Action.wrapper)
return def.Action.wrapper(visible_values, progress_callback,
@ -506,9 +506,24 @@ export const dialog_open = (def) => {
};
const validate = (variant) => {
// The validation functions sometimes change the dialog values
// for the benefit of the action functions. For example, a
// SizeSlider will convert from "text plus unit" to a numeric
// value during validation.
//
// However, if the action fails, we don't want the values in
// the dialog to change. The SizeSlider would convert back
// from a numeric value to "text plus unit", for example, and
// that conversion might change what the user had type.
//
// So we make a copy of the dialog state and let the validate
// and action functions work with that.
//
const validated_values = { ...values };
return Promise.all(fields.map(f => {
if (is_visible(f, values) && f.options && f.options.validate)
return f.options.validate(values[f.tag], values, variant);
return f.options.validate(validated_values[f.tag], validated_values, variant);
else
return null;
})).then(results => {
@ -516,6 +531,7 @@ export const dialog_open = (def) => {
fields.forEach((f, i) => { if (results[i]) errors[f.tag] = results[i]; });
if (Object.keys(errors).length > 0)
return Promise.reject(errors);
return validated_values;
});
};

14
test/verify/check-storage-partitions
View file

@ -93,11 +93,8 @@ class TestStoragePartitions(storagelib.StorageCase):
# Switch the dialog into the mode where it stores separate text and unit
# instead of a numeric value.
self.dialog_set_val("size", 26.2)
# Change to GB
unit = "1000000000"
b.select_from_dropdown(".size-unit > select", unit)
b.set_input_text(".size-text > input", "26.200001")
b.select_from_dropdown(".size-unit > select", "1000000000") # GB
# Apply the dialog. This will convert from text+unit back to a
# correctly rounded numeric value (which is too large).
@ -105,11 +102,12 @@ class TestStoragePartitions(storagelib.StorageCase):
self.dialog_apply()
self.dialog_wait_error("size", "Size is too large")
# The text in the input field must not have changed
b.wait_val(".size-text > input", "26.200001")
# Change unit back to MB. (This must round again, which it
# didn't always do.)
unit = "1000000"
b.select_from_dropdown(".size-unit > select", unit)
b.select_from_dropdown(".size-unit > select", "1000000") # MB
self.dialog_apply()
self.dialog_wait_close()