diff --git a/packages/hydrooj/src/handler/problem.ts b/packages/hydrooj/src/handler/problem.ts index 9629037ea..a9aad08d8 100644 --- a/packages/hydrooj/src/handler/problem.ts +++ b/packages/hydrooj/src/handler/problem.ts @@ -671,19 +671,23 @@ export class ProblemFilesHandler extends ProblemDetailHandler { @param('testdata', Types.Boolean) @param('additional_file', Types.Boolean) @param('pjax', Types.Boolean) - async get(domainId: string, getTestdata = true, getAdditionalFile = true, pjax = false) { + @param('sidebar', Types.Boolean) + async get(domainId: string, getTestdata = true, getAdditionalFile = true, pjax = false, sidebar = false) { this.response.body.testdata = getTestdata ? sortFiles(this.pdoc.data || []) : []; this.response.body.reference = getTestdata ? this.pdoc.reference : ''; this.response.body.additional_file = getAdditionalFile ? sortFiles(this.pdoc.additional_file || []) : []; if (pjax) { const { testdata, additional_file } = this.response.body; const owner = await user.getById(domainId, this.pdoc.owner); + const args = { + testdata, additional_file, pdoc: this.pdoc, owner_udoc: owner, sidebar, + }; + const tasks = []; + if (getTestdata) tasks.push(this.renderHTML('partials/problem_files.html', { ...args, filetype: 'testdata' })); + if (getAdditionalFile) tasks.push(this.renderHTML('partials/problem_files.html', { ...args, filetype: 'additional_file' })); + if (!sidebar) tasks.push(this.renderHTML('partials/problem-sidebar-information.html', args)); this.response.body = { - fragments: (await Promise.all([ - this.renderHTML('partials/problem_files-testdata.html', { testdata, pdoc: this.pdoc }), - this.renderHTML('partials/problem_files-additional_file.html', { additional_file, pdoc: this.pdoc }), - this.renderHTML('partials/problem-sidebar-information.html', { pdoc: this.pdoc, owner_udoc: owner }), - ])).map((i) => ({ html: i })), + fragments: (await Promise.all(tasks)).map((i) => ({ html: i })), }; this.response.template = ''; } else this.response.template = 'problem_files.html'; diff --git a/packages/hydrooj/src/service/decorators.ts b/packages/hydrooj/src/service/decorators.ts index 9116740ac..780505aa9 100644 --- a/packages/hydrooj/src/service/decorators.ts +++ b/packages/hydrooj/src/service/decorators.ts @@ -64,7 +64,7 @@ export const Types: Types = { Float: [(v) => +v, (v) => Number.isFinite(+v)], // eslint-disable-next-line no-shadow ObjectID: [(v) => new ObjectID(v), ObjectID.isValid], - Boolean: [(v) => !!v, null, true], + Boolean: [(v) => v && !['false', 'off'].includes(v), null, true], Date: [ (v) => { const d = v.split('-'); diff --git a/packages/ui-default/components/preview/preview.page.ts b/packages/ui-default/components/preview/preview.page.ts index 6857a503a..c9d1b54a4 100644 --- a/packages/ui-default/components/preview/preview.page.ts +++ b/packages/ui-default/components/preview/preview.page.ts @@ -4,9 +4,8 @@ import { nanoid } from 'nanoid'; import { ActionDialog, InfoDialog } from 'vj/components/dialog/index'; import Notification from 'vj/components/notification'; import { AutoloadPage } from 'vj/misc/Page'; -import { - i18n, pjax, request, tpl, -} from 'vj/utils'; +import { i18n, request, tpl } from 'vj/utils'; +import uploadFiles from '../upload'; async function startEdit(filename, value, fileCategory = 'file') { const { default: Editor } = await import('vj/components/editor/index'); @@ -144,17 +143,17 @@ export async function previewFile(ev, type = '') { } else Notification.info(i18n('Loading editor...')); const val = await startEdit(filename, content, type || 'file'); if (typeof val !== 'string') return null; - Notification.info(i18n('Saving file...')); - const data = new FormData(); - data.append('filename', filename); - data.append('file', new Blob([val], { type: 'text/plain' })); - if (type) data.append('type', type); - data.append('operation', 'upload_file'); - const postUrl = !window.location.href.endsWith('/files') - ? `${window.location.href.substring(0, window.location.href.lastIndexOf('/'))}/files` : ''; - await request.postFile(postUrl, data); - Notification.success(i18n('File saved.')); - return pjax.request({ push: false }); + const file = new File([val], filename, { type: 'text/plain' }); + const endpoint = new URL(!window.location.href.endsWith('/files') + ? `${window.location.href.substring(0, window.location.href.lastIndexOf('/'))}/files` : '', window.location.href); + const sidebarType = $(ev.currentTarget).closest('[data-fragment-id]').data('type'); + const sidebar = $(ev.currentTarget).closest('[data-fragment-id]').data('sidebar') !== undefined; + await uploadFiles(endpoint.toString(), [file], { + type: sidebarType || type, + sidebar, + pjax: true, + }); + return null; } const dataPreviewPage = new AutoloadPage('dataPreview', () => { diff --git a/packages/ui-default/components/upload.ts b/packages/ui-default/components/upload.ts index 83131f0ea..915022ee5 100644 --- a/packages/ui-default/components/upload.ts +++ b/packages/ui-default/components/upload.ts @@ -11,6 +11,7 @@ function onBeforeUnload(e) { interface UploadOptions { type?: string; pjax?: boolean; + sidebar?: boolean; singleFileUploadCallback?: (file: File) => any; } export default async function uploadFiles(endpoint = '', files: File[] | FileList = [], options: UploadOptions = {}) { @@ -65,7 +66,12 @@ export default async function uploadFiles(endpoint = '', files: File[] | FileLis } window.removeEventListener('beforeunload', onBeforeUnload); Notification.success(i18n('File uploaded successfully.')); - if (options.pjax) await pjax.request({ push: false }); + if (options.pjax) { + let params = ''; + if (options.type) params += `?testdata=${options.type === 'testdata'}&additional_file=${options.type === 'additional_file'}`; + if (options.sidebar) params += `${params ? '&' : '?'}sidebar=true`; + await pjax.request({ push: false, url: `${endpoint}${params || ''}` }); + } } catch (e) { console.error(e); Notification.error(i18n('File upload failed: {0}', e.toString())); diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml index 20e587c7b..553dfbd7b 100644 --- a/packages/ui-default/locales/zh.yaml +++ b/packages/ui-default/locales/zh.yaml @@ -68,6 +68,7 @@ Add module: 添加模块 Add new data: 添加新数据 Add User: 添加用户 Add: 添加 +additional_file: 附加文件 All {0} Contests: 所有 {0} 比赛 All Contests: 所有比赛 All Homeworks: 所有作业 @@ -529,8 +530,7 @@ New file: 新文件 New Password: 新密码 New Training Plan: 新训练计划 New: 创建 -No additional file at current: 当前没有附加文件 -No additional file at current.: 暂无附加文件。 +No {0} at current.: 当前没有{0}。 No comments so far...: 目前还没有评论... no discussion yet...: 目前没有讨论… No Permission to Attend Contest: 您没有权限参加比赛 @@ -814,6 +814,7 @@ Temporary session: 临时会话 Terms of Service: 服务条款 Test data comes from: 测试数据来自 Testdata Config: 测试数据配置 +testdata: 测试数据 Testdata: 测试数据 Text: 文本 The 'default' role applies to ALL REGISTERED USER.: default 角色作用于所有已注册用户 diff --git a/packages/ui-default/pages/problem_config.page.styl b/packages/ui-default/pages/problem_config.page.styl index ef43e08a1..964b69cd1 100644 --- a/packages/ui-default/pages/problem_config.page.styl +++ b/packages/ui-default/pages/problem_config.page.styl @@ -1,8 +1,7 @@ .page--problem_config - .section--problem-sidebar-testdata - .problem-sidebar-testdata__detail - max-height: 270px - overflow-y: auto + .problem-sidebar-testdata + max-height: 270px + overflow-y: auto .col--size width: 80px diff --git a/packages/ui-default/pages/problem_config.page.tsx b/packages/ui-default/pages/problem_config.page.tsx index 525adc5c0..29c4f44d3 100644 --- a/packages/ui-default/pages/problem_config.page.tsx +++ b/packages/ui-default/pages/problem_config.page.tsx @@ -1,4 +1,4 @@ -import { normalizeSubtasks, readSubtasksFromFiles, size } from '@hydrooj/utils/lib/common'; +import { normalizeSubtasks, readSubtasksFromFiles } from '@hydrooj/utils/lib/common'; import type { SubtaskType } from 'hydrooj/src/interface'; import $ from 'jquery'; import yaml from 'js-yaml'; @@ -11,7 +11,7 @@ import uploadFiles from 'vj/components/upload'; import download from 'vj/components/zipDownloader'; import { NamedPage } from 'vj/misc/Page'; import { - i18n, loadReactRedux, request, tpl, + i18n, loadReactRedux, pjax, request, tpl, } from 'vj/utils'; const page = new NamedPage('problem_config', () => { @@ -25,6 +25,8 @@ const page = new NamedPage('problem_config', () => { await new Promise((resolve) => { input.onchange = resolve; }); await uploadFiles('./files', input.files, { type: 'testdata', + sidebar: true, + pjax: true, singleFileUploadCallback: (file) => { reduxStore.dispatch({ type: 'CONFIG_ADD_TESTDATA', @@ -34,13 +36,6 @@ const page = new NamedPage('problem_config', () => { size: file.size, }, }); - $('.testdata-table tbody').append( - $(tpl` - ${file.name} - ${size(file.size)} - - `), - ); }, }); } @@ -62,7 +57,7 @@ const page = new NamedPage('problem_config', () => { type: 'CONFIG_DELETE_TESTDATA', value: file, }); - $(ev.currentTarget).parent().parent().remove(); + await pjax.request({ url: './files?testdata=false&sidebar=true', push: false }); } catch (error) { Notification.error(error.message); } diff --git a/packages/ui-default/pages/problem_edit.page.js b/packages/ui-default/pages/problem_edit.page.js index 7ba896771..ae78ab321 100644 --- a/packages/ui-default/pages/problem_edit.page.js +++ b/packages/ui-default/pages/problem_edit.page.js @@ -1,4 +1,3 @@ -import { size } from '@hydrooj/utils/lib/common'; import $ from 'jquery'; import _ from 'lodash'; import { ConfirmDialog } from 'vj/components/dialog'; @@ -9,7 +8,7 @@ import uploadFiles from 'vj/components/upload'; import download from 'vj/components/zipDownloader'; import { NamedPage } from 'vj/misc/Page'; import { - i18n, request, slideDown, slideUp, tpl, + i18n, pjax, request, slideDown, slideUp, tpl, } from 'vj/utils'; const categories = {}; @@ -197,15 +196,8 @@ export default new NamedPage(['problem_create', 'problem_edit'], (pagename) => { await new Promise((resolve) => { input.onchange = resolve; }); await uploadFiles('./files', input.files, { type: 'additional_file', - singleFileUploadCallback: (file) => { - $('.additionalfile-table tbody').append( - $(tpl` - ${file.name} - ${size(file.size)} - - `), - ); - }, + sidebar: true, + pjax: true, }); } @@ -222,7 +214,7 @@ export default new NamedPage(['problem_create', 'problem_edit'], (pagename) => { type: 'additional_file', }); Notification.success(i18n('File have been deleted.')); - $(ev.currentTarget).parent().parent().remove(); + await pjax.request({ url: './files?testdata=false&sidebar=true', push: false }); } catch (error) { Notification.error(error.message); } diff --git a/packages/ui-default/pages/problem_edit.page.styl b/packages/ui-default/pages/problem_edit.page.styl index 7662dc97f..a54e41502 100644 --- a/packages/ui-default/pages/problem_edit.page.styl +++ b/packages/ui-default/pages/problem_edit.page.styl @@ -12,10 +12,9 @@ &.tab--active border-color: #ed5f82; - .section--problem-sidebar-additional_file - .problem-sidebar-additional_file__detail - height: 270px - overflow-y: auto + .problem-sidebar-additional_file + height: 270px + overflow-y: auto .col--size width: 80px diff --git a/packages/ui-default/templates/components/nothing.html b/packages/ui-default/templates/components/nothing.html index b4f3143e7..27ab520d1 100644 --- a/packages/ui-default/templates/components/nothing.html +++ b/packages/ui-default/templates/components/nothing.html @@ -1,6 +1,6 @@ -{% macro render(text, compact=false) %} +{% macro render(text, compact=false, args=[]) %}
- {{ _(text) }} + {{ _(text).format(args) }}
{% endmacro %} diff --git a/packages/ui-default/templates/partials/problem_description.html b/packages/ui-default/templates/partials/problem_description.html index 631e3a9bb..ea2a0fcbc 100644 --- a/packages/ui-default/templates/partials/problem_description.html +++ b/packages/ui-default/templates/partials/problem_description.html @@ -1,7 +1,7 @@
{% if not pdoc.data.length and not pdoc.reference %}
-

{{ _('No testdata at current.') }}

+

{{ _('No {0} at current.').format(_("testdata")) }}

{% endif %} {% if typeof(pdoc.config) == 'string' %} diff --git a/packages/ui-default/templates/partials/problem_files-additional_file.html b/packages/ui-default/templates/partials/problem_files-additional_file.html deleted file mode 100644 index a3feae9d5..000000000 --- a/packages/ui-default/templates/partials/problem_files-additional_file.html +++ /dev/null @@ -1,40 +0,0 @@ -{% import "components/nothing.html" as nothing with context %} -
- {% if additional_file.length %} - - - - - - - - - - - - - - - {%- for file in additional_file -%} - - - - - - {%- endfor -%} - -
- - {{ _('Filename') }}{{ _('Size') }}
- - - {{ file.name }} - {{ size(file.size) }}
- {% else %} - {{ nothing.render('No additional file at current.') }} - {% endif %} -
\ No newline at end of file diff --git a/packages/ui-default/templates/partials/problem_files-testdata.html b/packages/ui-default/templates/partials/problem_files-testdata.html deleted file mode 100644 index 42002e6d0..000000000 --- a/packages/ui-default/templates/partials/problem_files-testdata.html +++ /dev/null @@ -1,48 +0,0 @@ -{% import "components/nothing.html" as nothing with context %} -
- {% if reference %} -
-

{{ _('This is a copy of another problem.') }}

-
- {% elif testdata.length %} - - - - - - - - - - - - - - - {%- for file in testdata -%} - - - - - - {%- endfor -%} - -
- - {{ _('Filename') }}{{ _('Size') }}
- - - {% if handler.user.own(pdoc) or handler.user.hasPriv(PRIV.PRIV_READ_PROBLEM_DATA) or handler.user.hasPerm(perm.PERM_READ_PROBLEM_DATA) %} - {{ file.name }} - {% else %} -

{{ file.name }}

- {% endif %} - 		{{ size(file.size) }}
- {% else %} - {{ nothing.render('No testdata at current.') }} - {% endif %} -
\ No newline at end of file diff --git a/packages/ui-default/templates/partials/problem_files.html b/packages/ui-default/templates/partials/problem_files.html new file mode 100644 index 000000000..df40c41d5 --- /dev/null +++ b/packages/ui-default/templates/partials/problem_files.html @@ -0,0 +1,59 @@ +{% import "components/nothing.html" as nothing with context %} +{% set _files = testdata if filetype == 'testdata' else additional_file %} +
+ {% if reference %} +
+

{{ _('This is a copy of another problem.') }}

+
+ {% elif _files.length %} + + + {% if not sidebar %}{% endif %} + + + {% if sidebar %}{% endif %} + + + + {% if not sidebar %} + + {% endif %} + + + {% if sidebar %}{% endif %} + + + + {%- for file in _files -%} + + {% if not sidebar %} + + {% endif %} + + + {% if sidebar %} + + {% endif %} + + {%- endfor -%} + +
+ + {{ _('Filename') }}{{ _('Size') }}
+ + + {% if filetype != 'testdata' or handler.user.own(pdoc) or handler.user.hasPriv(PRIV.PRIV_READ_PROBLEM_DATA) or handler.user.hasPerm(perm.PERM_READ_PROBLEM_DATA) %} + {{ file.name }} + {% else %} +

{{ file.name }}

+ {% endif %} + 		{{ size(file.size) }}
+ {% else %} + {{ nothing.render('No {0} at current.', compact=sidebar, args=[_(filetype)]) }} + {% endif %} +
\ No newline at end of file diff --git a/packages/ui-default/templates/partials/problem_sidebar_additional_file.html b/packages/ui-default/templates/partials/problem_sidebar_additional_file.html deleted file mode 100644 index 6194a1301..000000000 --- a/packages/ui-default/templates/partials/problem_sidebar_additional_file.html +++ /dev/null @@ -1,48 +0,0 @@ -{% import "components/nothing.html" as nothing with context %} -{% import "components/problem.html" as problem with context %} -
-
-

{{ additional_file.length|default(0) }} {{_('Additional File')}}

-
-
    -
  1. - - {{ _('Upload') }} - - - {{ _('Download All') }} - -
    2. -
-
- {% if additional_file.length %} - - - - - - - - - - - - - - - {%- for file in additional_file -%} - - - - - - {%- endfor -%} - -
{{ _('Filename') }}{{ _('Size') }}
- {{ file.name }} - {{ size(file.size) }}
- {% else %} - {{ nothing.render('No additional file at current.',compact = true) }} - {% endif %} -
-
\ No newline at end of file diff --git a/packages/ui-default/templates/partials/problem_sidebar_testdata.html b/packages/ui-default/templates/partials/problem_sidebar_testdata.html deleted file mode 100644 index 9316d66d5..000000000 --- a/packages/ui-default/templates/partials/problem_sidebar_testdata.html +++ /dev/null @@ -1,47 +0,0 @@ -{% import "components/nothing.html" as nothing with context %} -{% import "components/problem.html" as problem with context %} -
-
-

{{ testdata.length if testdata.length else 0 }} {{_('Testdata')}}

-
-
    -
  1. - - {{ _('Upload') }} - - - {{ _('Download All') }} - -
    2. -
  2. -
-
- {% if testdata.length %} - - - - - - - - - - - - - - - {%- for file in testdata -%} - - - - - - {%- endfor -%} - -
{{ _('Filename') }}{{ _('Size') }}
{{ file.name }}{{ size(file.size) }}
- {% else %} - {{ nothing.render('No testdata at current.', compact = true) }} - {% endif %} -
-
\ No newline at end of file diff --git a/packages/ui-default/templates/problem_config.html b/packages/ui-default/templates/problem_config.html index a894fd765..611df3991 100644 --- a/packages/ui-default/templates/problem_config.html +++ b/packages/ui-default/templates/problem_config.html @@ -13,7 +13,25 @@
- {% include "partials/problem_sidebar_testdata.html" %} +
+
+

{{ testdata.length|default(0) }} {{_('Testdata')}}

+
+
    +
  1. + + {{ _('Upload') }} + + + {{ _('Download All') }} + +
    2. +
  2. +
+ {% set sidebar = true %} + {% set filetype = "testdata" %} + {% include "partials/problem_files.html" %} +
{% set owner_udoc = udoc %} {% include "partials/problem_sidebar.html" %}
diff --git a/packages/ui-default/templates/problem_edit.html b/packages/ui-default/templates/problem_edit.html index adf2e9806..8db72bc3b 100644 --- a/packages/ui-default/templates/problem_edit.html +++ b/packages/ui-default/templates/problem_edit.html @@ -92,7 +92,24 @@ {% if page_name == 'problem_edit' %} - {% include "partials/problem_sidebar_additional_file.html" %} +
+
+

{{ additional_file.length|default(0) }} {{_('Additional File')}}

+
+
    +
  1. + + {{ _('Upload') }} + + + {{ _('Download All') }} + +
    2. +
+ {% set sidebar = true %} + {% set filetype = "additional_file" %} + {% include "partials/problem_files.html" %} +
{% set owner_udoc = udoc %} {% include "partials/problem_sidebar.html" %} {% else %} diff --git a/packages/ui-default/templates/problem_files.html b/packages/ui-default/templates/problem_files.html index 6e531d559..ac01788b1 100644 --- a/packages/ui-default/templates/problem_files.html +++ b/packages/ui-default/templates/problem_files.html @@ -14,7 +14,8 @@ {{ noscript_note.render() }} - {% include "partials/problem_files-testdata.html" %} + {% set filetype = "testdata" %} + {% include "partials/problem_files.html" %} {% if not reference and (handler.user.own(pdoc) or handler.user.hasPerm(perm.PERM_READ_PROBLEM_DATA) or handler.user.hasPriv(PRIV.PRIV_READ_PROBLEM_DATA)) %}
@@ -36,7 +37,8 @@ {% endif %}
- {% include "partials/problem_files-additional_file.html" %} + {% set filetype = "additional_file" %} + {% include "partials/problem_files.html" %}
{% if handler.user.own(pdoc, perm.PERM_EDIT_PROBLEM_SELF) or handler.user.hasPerm(perm.PERM_EDIT_PROBLEM) %}