Fix some bugs in dash

ulagbulag · Sep 25, 2023 · 0be3cb5 · 0be3cb5
1 parent eaa37a6
commit 0be3cb5
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 23 deletions.
diff --git a/dash/api/src/model.rs b/dash/api/src/model.rs
@@ -644,7 +644,7 @@ impl Default for ModelFieldKindStringSpec {
 #[serde(rename_all = "camelCase")]
 pub enum ModelFieldKindObjectSpec {
     Dynamic,
-    OneOfStatic,
+    Enumerate,
     Static,
 }
 

diff --git a/dash/controller/src/validator/model.rs b/dash/controller/src/validator/model.rs
@@ -199,18 +199,21 @@ impl ModelFieldsParser {
                     self.parse_json_property_aggregation(&name, prop.properties.as_ref())?;
 
                 Some(ModelFieldKindNativeSpec::Object {
-                    kind: match prop.one_of.as_ref() {
-                        Some(one_of) => {
+                    kind: match prop.one_of.as_ref().zip(prop.properties.as_ref()) {
+                        Some((one_of, properties)) => {
                             let one_of = one_of
                                 .iter()
                                 .filter_map(|one_of| one_of.required.as_ref())
                                 .flatten()
-                                .cloned()
                                 .collect::<BTreeSet<_>>();
-                            if children == one_of {
-                                ModelFieldKindObjectSpec::OneOfStatic
+                            let properties = properties
+                                .keys()
+                                .filter(|&property| property != "default")
+                                .collect::<BTreeSet<_>>();
+                            if one_of == properties {
+                                ModelFieldKindObjectSpec::Enumerate
                             } else {
-                                warn!("partial oneOf property is not supported");
+                                warn!("partial oneOf property is not supported for {name:?}: {format:?}");
                                 ModelFieldKindObjectSpec::Static
                             }
                         }

diff --git a/dash/provider/src/input.rs b/dash/provider/src/input.rs
@@ -210,19 +210,25 @@ impl InputTemplate {
                 *field = Value::Null;
                 Ok(())
             }
-            ModelFieldKindNativeSpec::Boolean { default: _ } => {
-                if value.is_boolean() {
-                    *field = value;
+            ModelFieldKindNativeSpec::Boolean { default: _ } => match value {
+                Value::Bool(value) => {
+                    *field = Value::Bool(value);
                     Ok(())
-                } else {
-                    assert_optional(&name, &value, &base_field.parsed, optional)
                 }
-            }
+                Value::String(value) => {
+                    *field = Value::Bool(value.parse()?);
+                    Ok(())
+                }
+                value => assert_optional(&name, &value, &base_field.parsed, optional),
+            },
             ModelFieldKindNativeSpec::Integer {
                 default: _,
                 minimum,
                 maximum,
-            } => match value.as_i64() {
+            } => match value
+                .as_i64()
+                .or_else(|| value.as_str().and_then(|value| value.parse().ok()))
+            {
                 Some(value_number) => {
                     assert_cmp(
                         &name,
@@ -241,7 +247,7 @@ impl InputTemplate {
                         Ordering::Less,
                     )?;
 
-                    *field = value;
+                    *field = Value::Number(value_number.into());
                     Ok(())
                 }
                 None => assert_optional(&name, &value, &base_field.parsed, optional),
@@ -250,8 +256,13 @@ impl InputTemplate {
                 default: _,
                 minimum,
                 maximum,
-            } => match value.as_f64().map(Into::into) {
-                Some(value_number) => {
+            } => match value
+                .as_f64()
+                .or_else(|| value.as_str().and_then(|value| value.parse().ok()))
+                .map(Number::from)
+                .and_then(|value| Some((value, ::serde_json::Number::from_f64(value.0)?)))
+            {
+                Some((value_number, value)) => {
                     assert_cmp(
                         &name,
                         &value_number,
@@ -269,7 +280,7 @@ impl InputTemplate {
                         Ordering::Less,
                     )?;
 
-                    *field = value;
+                    *field = Value::Number(value);
                     Ok(())
                 }
                 None => assert_optional(&name, &value, &base_field.parsed, optional),
@@ -364,7 +375,7 @@ impl InputTemplate {
                         *field = Value::Object(children);
                         Ok(())
                     }
-                    ModelFieldKindObjectSpec::OneOfStatic | ModelFieldKindObjectSpec::Static => {
+                    ModelFieldKindObjectSpec::Enumerate | ModelFieldKindObjectSpec::Static => {
                         for (child, value) in children.into_iter() {
                             let child = InputField::sub_object(&name, &child, value);
                             self.update_field_value_impl(storage, child, optional)
@@ -796,7 +807,7 @@ impl<'a> ItemTemplate<'a> {
                         *field = Value::Object(children);
                         Ok(())
                     }
-                    ModelFieldKindObjectSpec::OneOfStatic | ModelFieldKindObjectSpec::Static => {
+                    ModelFieldKindObjectSpec::Enumerate | ModelFieldKindObjectSpec::Static => {
                         for (child, value) in children.into_iter() {
                             let child = InputField::sub_object(&name, &child, value);
                             self.update_field_value_impl(child, optional)?;

diff --git a/dash/provider/src/storage/db.rs b/dash/provider/src/storage/db.rs
@@ -609,9 +609,7 @@ fn convert_field_to_column(
                     column.json();
                     Ok(Some(column))
                 }
-                ModelFieldKindObjectSpec::OneOfStatic | ModelFieldKindObjectSpec::Static => {
-                    Ok(None)
-                }
+                ModelFieldKindObjectSpec::Enumerate | ModelFieldKindObjectSpec::Static => Ok(None),
             }
         }
         ModelFieldKindNativeSpec::ObjectArray { children: _ } => {

diff --git a/dash/router/src/routes/mod.rs b/dash/router/src/routes/mod.rs
@@ -0,0 +1 @@
+
diff --git a/kiss/plugin/src/routes/box/power/batch.rs b/kiss/plugin/src/routes/box/power/batch.rs
@@ -0,0 +1 @@
+