feat: enhance config loading and saving with null field stripping; update response structure in handlers; adjust playwright config command

Author: ZR233

jkconfig-web/src/config.rs

@@ -53,10 +53,7 @@ pub fn load_config(path: &Path) -> Result<Option<Value>> {
         return Ok(None);
     }
 
-    let ext = path
-        .extension()
-        .and_then(|s| s.to_str())
-        .unwrap_or("");
+    let ext = path.extension().and_then(|s| s.to_str()).unwrap_or("");
 
     let value = match ext {
         "json" => serde_json::from_str(&content)?,
@@ -72,15 +69,31 @@ pub fn load_config(path: &Path) -> Result<Option<Value>> {
     Ok(Some(value))
 }
 
+/// 递归删除 JSON Value 中所有 null 字段（TOML 不支持 null）
+fn strip_nulls(value: Value) -> Value {
+    match value {
+        Value::Object(map) => {
+            let cleaned = map
+                .into_iter()
+                .filter(|(_, v)| !v.is_null())
+                .map(|(k, v)| (k, strip_nulls(v)))
+                .collect();
+            Value::Object(cleaned)
+        }
+        Value::Array(arr) => Value::Array(arr.into_iter().map(strip_nulls).collect()),
+        other => other,
+    }
+}
+
 /// 保存配置文件
 pub fn save_config(path: &Path, value: &Value) -> Result<()> {
-    let ext = path
-        .extension()
-        .and_then(|s| s.to_str())
-        .unwrap_or("");
+    let ext = path.extension().and_then(|s| s.to_str()).unwrap_or("");
 
     let content = match ext {
-        "toml" | "tml" => toml::to_string_pretty(value)?,
+        "toml" | "tml" => {
+            let cleaned = strip_nulls(value.clone());
+            toml::to_string_pretty(&cleaned)?
+        }
         "json" => serde_json::to_string_pretty(value)?,
         _ => {
             return Err(Error::UnsupportedFileType(ext.to_string()));

jkconfig-web/src/web/handlers.rs

@@ -47,15 +47,21 @@ pub async fn update_config_handler(
 ) -> impl IntoResponse {
     if let Some(config) = payload.get("config") {
         state.jkconfig.update_config(config.clone()).await;
-        Json(json!({
-            "success": true,
-            "message": "Configuration updated successfully"
-        }))
+        (
+            StatusCode::OK,
+            Json(json!({
+                "success": true,
+                "message": "Configuration updated successfully"
+            })),
+        )
     } else {
-        Json(json!({
-            "success": false,
-            "error": "Missing 'config' field in request"
-        }))
+        (
+            StatusCode::BAD_REQUEST,
+            Json(json!({
+                "success": false,
+                "error": "Missing 'config' field in request"
+            })),
+        )
     }
 }
 

jkconfig-web/tests/e2e/playwright.config.ts

@@ -24,7 +24,7 @@ export default defineConfig({
     },
   ],
   webServer: {
-    command: 'cargo run -p jkconfig-web -- --port 3000 --schema tests/test-schema.json',
+    command: 'cd .. && cargo run -p jkconfig-web -- --port 3000 --schema tests/test-schema.json',
     url: 'http://localhost:3000/api/health',
     reuseExistingServer: !process.env.CI,
     timeout: 120000,

jkconfig-web/web/src/ConfigEditor.tsx

@@ -166,8 +166,10 @@ export const ConfigEditor: React.FC = () => {
               schema={schema}
               formData={config}
               onChange={handleChange}
+              onSubmit={() => handleSave()}
               validator={validator}
               liveValidate
+              uiSchema={{ 'ui:submitButtonOptions': { norender: true } }}
             />
           </Box>
         </Paper>