ui: problem_files: pjax support

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.26.0",
+    "version": "2.26.1",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/error.ts

@@ -92,6 +92,7 @@ export const ValidationError = Err('ValidationError', ForbiddenError, function (
     return 'Field {0} or {1} validation failed.';
 });
 export const ContestNotAttendedError = Err('ContestNotAttendedError', ForbiddenError, "You haven't attended this contest yet.");
+export const RequireProError = Err('RequireProError', ForbiddenError, 'RequireProError');
 export const ContestAlreadyAttendedError = Err('ContestAlreadyAttendedError', ForbiddenError, "You've already attended this contest.");
 export const ContestNotLiveError = Err('ContestNotLiveError', ForbiddenError, 'This contest is not live.');
 export const ContestScoreboardHiddenError = Err('ContestScoreboardHiddenError', ForbiddenError, 'Contest scoreboard is not visible.');
@@ -142,6 +143,7 @@ global.Hydro.error = {
     OpcountExceededError,
     PermissionError,
     PrivilegeError,
+    RequireProError,
     NoProblemError,
     ValidationError,
     ProblemNotFoundError,

packages/hydrooj/src/handler/problem.ts

@@ -379,13 +379,24 @@ export class ProblemEditHandler extends ProblemManageHandler {
 export class ProblemFilesHandler extends ProblemDetailHandler {
     @param('testdata', Types.Boolean)
     @param('additional_file', Types.Boolean)
-    async get(domainId: string, getTestdata = true, getAdditionalFile = true) {
+    @param('pjax', Types.Boolean)
+    async get(domainId: string, getTestdata = true, getAdditionalFile = true, pjax = false) {
         const canReadData = this.user.own(this.pdoc)
             || this.user.hasPriv(PRIV.PRIV_READ_PROBLEM_DATA)
             || this.user.hasPerm(PERM.PERM_READ_PROBLEM_DATA);
         this.response.body.testdata = (getTestdata && canReadData) ? sortFiles(this.pdoc.data || []) : [];
         this.response.body.additional_file = getAdditionalFile ? sortFiles(this.pdoc.additional_file || []) : [];
-        this.response.template = 'problem_files.html';
+        if (pjax) {
+            const { testdata, additional_file } = this.response.body;
+            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 }),
+                ])).map((i) => ({ html: i })),
+            };
+            this.response.template = '';
+        } else this.response.template = 'problem_files.html';
     }
 
     @post('files', Types.Set)

packages/hydrooj/src/model/setting.ts

@@ -28,6 +28,7 @@ for (const lang in global.Hydro.locales) {
 export const FLAG_HIDDEN = 1;
 export const FLAG_DISABLED = 2;
 export const FLAG_SECRET = 4;
+export const FLAG_PRO = 8;
 
 export const PREFERENCE_SETTINGS: _Setting[] = [];
 export const ACCOUNT_SETTINGS: _Setting[] = [];
@@ -167,7 +168,8 @@ SystemSetting(
     Setting('setting_server', 'server.center', 'https://hydro.undefined.moe:8443/center', 'text', 'server.center', '', FLAG_HIDDEN),
     Setting('setting_server', 'server.proxy', false, 'boolean', 'server.proxy', 'Use hydro center proxy to send problems'),
     Setting('setting_server', 'server.name', 'Hydro', 'text', 'server.name', 'Server Name'),
-    Setting('setting_server', 'server.worker', 1, 'number', 'server.worker', 'Server Workers Number'),
+    Setting('setting_server', 'server.displayName', 'Hydro', 'text', 'server.name', 'Server Name (Global Display)', FLAG_PRO),
+    Setting('setting_server', 'server.worker', 1, 'number', 'server.worker', 'Server Workers Number', FLAG_PRO),
     Setting('setting_server', 'server.hostname', 'oj.undefined.moe', 'text', 'server.hostname', 'Server Hostname'),
     Setting('setting_server', 'server.host', 'oj.undefined.moe', 'text', 'server.host', 'Server Host'),
     Setting('setting_server', 'server.url', '/', 'text', 'server.url', 'Server BaseURL'),
@@ -176,9 +178,9 @@ SystemSetting(
     Setting('setting_server', 'server.xff', null, 'text', 'server.xff', 'IP Header'),
     Setting('setting_server', 'server.xhost', null, 'text', 'server.xhost', 'Hostname Header'),
     Setting('setting_server', 'server.language', 'zh_CN', langRange, 'server.language', 'Default display language'),
-    Setting('setting_server', 'server.login', true, 'boolean', 'server.login', 'Allow builtin-login'),
+    Setting('setting_server', 'server.login', true, 'boolean', 'server.login', 'Allow builtin-login', FLAG_PRO),
     Setting('setting_limits', 'limit.problem_files_max', 100, 'number', 'limit.problem_files_max', 'Max files per problem'),
-    Setting('setting_basic', 'default.priv', builtin.PRIV.PRIV_DEFAULT, 'number', 'default.priv', 'Default Privilege'),
+    Setting('setting_basic', 'default.priv', builtin.PRIV.PRIV_DEFAULT, 'number', 'default.priv', 'Default Privilege', FLAG_PRO),
     Setting('setting_basic', 'problem.categories', builtin.CATEGORIES, 'yaml', 'problem.categories', 'Problem Categories'),
     Setting('setting_basic', 'pagination.problem', 100, 'number', 'pagination.problem', 'Problems per page'),
     Setting('setting_basic', 'pagination.contest', 20, 'number', 'pagination.contest', 'Contests per page'),
@@ -244,6 +246,7 @@ global.Hydro.model.setting = {
     FLAG_HIDDEN,
     FLAG_DISABLED,
     FLAG_SECRET,
+    FLAG_PRO,
     PREFERENCE_SETTINGS,
     ACCOUNT_SETTINGS,
     SETTINGS,

packages/hydrooj/src/model/storage.ts

@@ -50,7 +50,7 @@ export class StorageModel {
 
     static async list(target: string, recursive = true) {
         if (target.includes('..') || target.includes('//')) throw new Error('Invalid path');
-        if (target?.length && !target.endsWith('/')) target += '/';
+        if (target.length && !target.endsWith('/')) target += '/';
         const results = recursive
             ? await StorageModel.coll.find({ path: { $regex: new RegExp(`^${escapeRegExp(target)}`, 'i') } }).toArray()
             : await StorageModel.coll.find({ path: { $regex: new RegExp(`^${escapeRegExp(target)}[^/]+$`) } }).toArray();