From b1b933f3d7f40a8fdebd6ba7deb70e3a1dee1e32 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sun, 4 Sep 2022 16:50:36 +0800
Subject: [PATCH] core&ui: optimize schema display

---
 packages/hydrooj/package.json                    | 2 +-
 packages/hydrooj/src/handler/manage.ts           | 6 +++++-
 packages/ui-default/package.json                 | 2 +-
 packages/ui-default/templates/manage_config.html | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 94c56c0b..9d530232 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.16.9",
+    "version": "3.16.10",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
diff --git a/packages/hydrooj/src/handler/manage.ts b/packages/hydrooj/src/handler/manage.ts
index e6de73a4..b41957fe 100644
--- a/packages/hydrooj/src/handler/manage.ts
+++ b/packages/hydrooj/src/handler/manage.ts
@@ -186,9 +186,13 @@ class SystemSettingHandler extends SystemHandler {
 class SystemConfigHandler extends SystemHandler {
     async get() {
         this.response.template = 'manage_config.html';
+        let value = configSource;
+        try {
+            value = yaml.dump(Schema.intersect(SystemSettings)(yaml.load(configSource)));
+        } catch (e) { }
         this.response.body = {
             schema: Schema.intersect(SystemSettings).toJSON(),
-            value: configSource,
+            value,
         };
     }
 
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 8348ee22..eaa1f0ff 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.39.23",
+  "version": "4.39.24",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/templates/manage_config.html b/packages/ui-default/templates/manage_config.html
index 9041670d..d25d41ea 100644
--- a/packages/ui-default/templates/manage_config.html
+++ b/packages/ui-default/templates/manage_config.html
@@ -11,7 +11,7 @@
             <textarea id="config" data-yaml data-model="hydro://system/setting.yaml" placeholder="" class="textbox">{{ value }}</textarea>
           </div>
         </label>
-        <p class="help-text" id="info"></p>
+        <pre class="help-text" id="info"></pre>
       </div>
     </div>
     <div class="row">