open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): fix form extension not handling default field type. Fix #804

Browse Source
This commit is contained in:
Federico Terzi 2021-10-21 21:39:47 +02:00
parent 7588bdb1cf
commit 869d8dbbaa
1 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
espanso/src/cli/worker/engine/process/middleware/render/extension/form.rs
View File

@ -55,55 +55,53 @@ fn convert_fields(fields: &Params) -> HashMap<String, FormField> {
let mut form_field = None; let mut form_field = None;
if let Value::Object(params) = field { if let Value::Object(params) = field {
if let Some(Value::String(field_type)) = params.get("type") { form_field = match params.get("type") {
form_field = match field_type.as_str() { Some(Value::String(field_type)) if field_type == "choice" => Some(FormField::Choice {
"text" => Some(FormField::Text { default: params
default: params .get("default")
.get("default") .and_then(|val| val.as_string())
.and_then(|val| val.as_string()) .cloned(),
.cloned(), values: params
multiline: params .get("values")
.get("multiline") .and_then(|val| val.as_array())
.and_then(|val| val.as_bool()) .map(|arr| {
.cloned() arr
.unwrap_or(false), .iter()
}), .flat_map(|choice| choice.as_string())
"choice" => Some(FormField::Choice { .cloned()
default: params .collect()
.get("default") })
.and_then(|val| val.as_string()) .unwrap_or_default(),
.cloned(), }),
values: params Some(Value::String(field_type)) if field_type == "list" => Some(FormField::List {
.get("values") default: params
.and_then(|val| val.as_array()) .get("default")
.map(|arr| { .and_then(|val| val.as_string())
arr .cloned(),
.iter() values: params
.flat_map(|choice| choice.as_string()) .get("values")
.cloned() .and_then(|val| val.as_array())
.collect() .map(|arr| {
}) arr
.unwrap_or_default(), .iter()
}), .flat_map(|choice| choice.as_string())
"list" => Some(FormField::List { .cloned()
default: params .collect()
.get("default") })
.and_then(|val| val.as_string()) .unwrap_or_default(),
.cloned(), }),
values: params // By default, it's considered type 'text'
.get("values") _ => Some(FormField::Text {
.and_then(|val| val.as_array()) default: params
.map(|arr| { .get("default")
arr .and_then(|val| val.as_string())
.iter() .cloned(),
.flat_map(|choice| choice.as_string()) multiline: params
.cloned() .get("multiline")
.collect() .and_then(|val| val.as_bool())
}) .cloned()
.unwrap_or_default(), .unwrap_or(false),
}), }),
_ => None,
}
} }
} }