ui: fix #106, fix #108

packages/ui-default/components/form/form.page.js

@@ -1,4 +1,5 @@
 import { AutoloadPage } from 'vj/misc/Page';
+import delay from 'vj/utils/delay'
 
 const formPage = new AutoloadPage('formPage', () => {
   $(document).on('vjFormDisableUpdate', 'input, select, textarea', (ev) => {
@@ -10,6 +11,15 @@ const formPage = new AutoloadPage('formPage', () => {
       $formItem.removeClass('is--disabled');
     }
   });
+
+  const submitting = {};
+
+  $('[type="submit"]').on('click', async (ev) => {
+    if (!submitting[ev.currentTarget]) $(ev.currentTarget).closest('form').submit();
+    submitting[ev.currentTarget] = true;
+    await delay(5000);
+    submitting[ev.currentTarget] = false;
+  })
 });
 
 export default formPage;

packages/ui-default/components/scratchpad/DataInputComponent.jsx

@@ -3,6 +3,7 @@ import classNames from 'classnames';
 
 export default function DataInputComponent(props) {
   const {
+    html,
     title,
     value,
     onChange,
@@ -12,16 +13,20 @@ export default function DataInputComponent(props) {
   const cn = classNames(className, 'flex-col flex-fill');
   return (
     <div {...rest} className={cn}>
-      <textarea
-        className="scratchpad__data-input"
-        wrap="off"
-        value={value}
-        onChange={(ev) => {
-          ev.stopPropagation();
-          onChange(ev.target.value);
-        }}
-        placeholder={title}
-      />
+      {html // eslint-disable-next-line react/no-danger
+        ? <div className="scratchpad__data-input" wrap="off" dangerouslySetInnerHTML={{ __html: value }} />
+        : (
+          <textarea
+            className="scratchpad__data-input"
+            wrap="off"
+            value={value}
+            onChange={(ev) => {
+              ev.stopPropagation();
+              onChange(ev.target.value);
+            }}
+            placeholder={title}
+          />
+        )}
     </div>
   );
 }

packages/ui-default/components/scratchpad/ScratchpadPretestContainer.jsx

@@ -45,6 +45,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class ScratchpadPret
           <DataInput
             title={i18n('Output')}
             value={this.props.output}
+            html
           />
         </div>
       </Panel>

packages/ui-default/components/scratchpad/reducers/pretest.js

@@ -1,3 +1,5 @@
+import { STATUS_TEXTS } from '@hydrooj/utils/lib/status';
+
 export default function reducer(state = {
   input: '',
   output: '',
@@ -12,10 +14,13 @@ export default function reducer(state = {
   }
   if (action.type === 'SCRATCHPAD_RECORDS_PUSH') {
     const { rdoc } = action.payload;
-    if (rdoc._id === state.rid && rdoc.testCases[0]) {
+    if (rdoc._id === state.rid) {
+      const output = [`${STATUS_TEXTS[rdoc.status]} ${rdoc.time}ms ${rdoc.memory}MiB`];
+      if (rdoc.compilerTexts.length) output.push(rdoc.compilerTexts.join('\n'));
+      if (rdoc.testCases.length) output.push(rdoc.testCases[0].message || '');
       return {
         ...state,
-        output: rdoc.testCases[0].message,
+        output: output.join('\n'),
       };
     }
   }