From 603f2938fb291397aee6ecc726a1ee5e7a6bf001 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sun, 10 Oct 2021 20:08:10 +0800
Subject: [PATCH] ui: fix fileio pretest

---
 packages/geoip/download.js                    |  5 ---
 packages/geoip/package.json                   |  2 +-
 packages/hydrooj/src/handler/discussion.ts    |  6 ----
 .../scratchpad/DataInputComponent.jsx         | 36 +++++++++++--------
 .../scratchpad/ScratchpadToolbarContainer.jsx |  5 +--
 packages/ui-default/package.json              |  2 +-
 6 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 packages/geoip/download.js

diff --git a/packages/geoip/download.js b/packages/geoip/download.js
deleted file mode 100644
index 3fdf898a9..000000000
--- a/packages/geoip/download.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { spawnSync } = require('child_process');
-const os = require('os');
-if (os.platform() === 'linux') {
-    spawnSync('bash download.sh');
-}
diff --git a/packages/geoip/package.json b/packages/geoip/package.json
index 96d8544c2..8b7675950 100644
--- a/packages/geoip/package.json
+++ b/packages/geoip/package.json
@@ -10,7 +10,7 @@
     },
     "preferUnplugged": true,
     "scripts": {
-        "prepublish": "node download.js"
+        "prepublish": "./download.sh"
     },
     "peerDependencies": {
         "hydrooj": "*"
diff --git a/packages/hydrooj/src/handler/discussion.ts b/packages/hydrooj/src/handler/discussion.ts
index 609902f9e..5fc16e116 100644
--- a/packages/hydrooj/src/handler/discussion.ts
+++ b/packages/hydrooj/src/handler/discussion.ts
@@ -114,18 +114,12 @@ class DiscussionNodeHandler extends DiscussionHandler {
             user.getList(domainId, uids),
             discussion.getNodes(domainId),
         ]);
-        const path = [
-            ['Hydro', 'homepage'],
-            ['discussion_main', 'discussion_main'],
-            [this.vnode.title, null, true],
-        ];
         const vndict = { [typeMapper[type]]: { [name.toString()]: this.vnode } };
         this.response.template = 'discussion_main_or_node.html';
         this.response.body = {
             ddocs,
             dpcount,
             udict,
-            path,
             page,
             vndict,
             vnode: this.vnode,
diff --git a/packages/ui-default/components/scratchpad/DataInputComponent.jsx b/packages/ui-default/components/scratchpad/DataInputComponent.jsx
index 0726ede4d..1cd75e301 100644
--- a/packages/ui-default/components/scratchpad/DataInputComponent.jsx
+++ b/packages/ui-default/components/scratchpad/DataInputComponent.jsx
@@ -13,20 +13,28 @@ export default function DataInputComponent(props) {
   const cn = classNames(className, 'flex-col flex-fill');
   return (
     <div {...rest} className={cn}>
-      {html // eslint-disable-next-line react/no-danger
-        ? <div className="scratchpad__data-input" wrap="off"><pre dangerouslySetInnerHTML={{ __html: value }} /></div>
-        : (
-          <textarea
-            className="scratchpad__data-input"
-            wrap="off"
-            value={value}
-            onChange={(ev) => {
-              ev.stopPropagation();
-              onChange(ev.target.value);
-            }}
-            placeholder={title}
-          />
-        )}
+      {html ? (
+        <div
+          className="scratchpad__data-input"
+          style={{ overflowY: 'scroll' }}
+          wrap="off"
+          contentEditable
+        >
+          {/* eslint-disable-next-line react/no-danger */}
+          <pre dangerouslySetInnerHTML={{ __html: value }} />
+        </div>
+      ) : (
+        <textarea
+          className="scratchpad__data-input"
+          wrap="off"
+          value={value}
+          onChange={(ev) => {
+            ev.stopPropagation();
+            onChange(ev.target.value);
+          }}
+          placeholder={title}
+        />
+      )}
     </div>
   );
 }
diff --git a/packages/ui-default/components/scratchpad/ScratchpadToolbarContainer.jsx b/packages/ui-default/components/scratchpad/ScratchpadToolbarContainer.jsx
index 6b75d5266..3a6e857fe 100644
--- a/packages/ui-default/components/scratchpad/ScratchpadToolbarContainer.jsx
+++ b/packages/ui-default/components/scratchpad/ScratchpadToolbarContainer.jsx
@@ -90,9 +90,10 @@ export default connect(mapStateToProps, mapDispatchToProps)(class ScratchpadTool
     }
     const keys = Object.keys(LANGS);
     if (!keys.includes(this.props.editorLang)) this.props.setEditorLanguage(keys[0]);
+    const canUsePretest = ['default', 'fileio'].includes(UiContext.pdoc.config?.type);
     return (
       <Toolbar>
-        {UiContext.pdoc.config?.type === 'default' && (
+        {canUsePretest && (
           <ToolbarButton
             disabled={this.props.isPosting || this.props.isRunning}
             className="scratchpad__toolbar__pretest"
@@ -156,7 +157,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class ScratchpadTool
           </select>
         </ToolbarItem>
         <ToolbarSplit />
-        {['default', 'fileio'].includes(UiContext.pdoc.config?.type) && (
+        {canUsePretest && (
           <ToolbarButton
             activated={this.props.pretestVisible}
             onClick={() => this.props.togglePanel('pretest')}
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index f2a30fafa..775e0d837 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.24.1",
+  "version": "4.24.2",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",