From 715e5649718b4b2f9ffe3f41148c9d6159f69d46 Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 4 Jun 2021 21:26:57 +0800 Subject: [PATCH] core&ui: fix contest problem ref --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/contest.ts | 6 +++--- packages/hydrooj/src/handler/homework.ts | 6 +++--- packages/hydrooj/src/lib/testdataConfig.ts | 1 - packages/hydrooj/src/service/server.ts | 3 +-- packages/ui-default/package.json | 2 +- packages/ui-default/pages/user_detail.page.js | 2 -- packages/ui-default/templates/problem_detail.html | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 9d7fa16e..8b6c7e28 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.28.17", + "version": "2.28.18", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts index b0e6601a..0745d415 100644 --- a/packages/hydrooj/src/handler/contest.ts +++ b/packages/hydrooj/src/handler/contest.ts @@ -74,10 +74,10 @@ export class ContestDetailHandler extends Handler { ['contest_main', 'contest_main'], [tdoc.title, null, null, true], ]; + const index = tdoc.pids.map((i) => i.toString()); for (const key in pdict) { - // @ts-ignore - if (pdict[key].domainId !== domainId) pdict[key].docId = `${pdict[key].domainId}:${pdict[key].docId}`; - pdict[key].pid = (tdoc.pids.indexOf(pdict[key].docId) + 10).toString(36).toUpperCase(); + const i = (index.indexOf(key) + 10).toString(36).toUpperCase(); + if (i !== '9') pdict[key].pid = i; } this.response.body = { path, tdoc, tsdoc, attended, udict, pdict, psdict, rdict, page, diff --git a/packages/hydrooj/src/handler/homework.ts b/packages/hydrooj/src/handler/homework.ts index 45a20acd..e457fb56 100644 --- a/packages/hydrooj/src/handler/homework.ts +++ b/packages/hydrooj/src/handler/homework.ts @@ -90,10 +90,10 @@ class HomeworkDetailHandler extends Handler { ['homework_main', 'homework_main'], [tdoc.title, null, null, true], ]; + const index = tdoc.pids.map((i) => i.toString()); for (const key in pdict) { - // @ts-ignore - if (pdict[key].domainId !== domainId) pdict[key].docId = `${pdict[key].domainId}:${pdict[key].docId}`; - pdict[key].pid = (tdoc.pids.indexOf(pdict[key].docId) + 10).toString(36).toUpperCase(); + const i = (index.indexOf(key) + 10).toString(36).toUpperCase(); + if (i !== '9') pdict[key].pid = i; } this.response.template = 'homework_detail.html'; this.response.body = { diff --git a/packages/hydrooj/src/lib/testdataConfig.ts b/packages/hydrooj/src/lib/testdataConfig.ts index 4263134a..969d231c 100644 --- a/packages/hydrooj/src/lib/testdataConfig.ts +++ b/packages/hydrooj/src/lib/testdataConfig.ts @@ -34,7 +34,6 @@ export async function parseConfig(config: string | ProblemConfigFile = {}) { result.timeMax = result.timeMin = 1000; } if (cfg.langs) result.langs = cfg.langs; - console.log(result); return result; } diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index 15032bbd..ef5cc463 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -17,7 +17,6 @@ import cache from 'koa-static-cache'; import sockjs from 'sockjs'; import cac from 'cac'; import { createHash } from 'crypto'; -import type { SetOption } from 'cookies'; import * as bus from './bus'; import { errorMessage } from '../utils'; import { User, DomainDoc } from '../interface'; @@ -611,7 +610,7 @@ export class Handler extends HandlerCommon { } else { [, this.session] = await token.add(token.TYPE_SESSION, expireSeconds, { ...this.session, ...$update, ...$create }); } - const cookie: SetOption = { + const cookie = { secure: !!system.get('session.secure'), httpOnly: false, }; diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index ed715f67..f5e822bf 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.11.9", + "version": "4.11.10", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/pages/user_detail.page.js b/packages/ui-default/pages/user_detail.page.js index d0599f23..ff4aa397 100644 --- a/packages/ui-default/pages/user_detail.page.js +++ b/packages/ui-default/pages/user_detail.page.js @@ -40,12 +40,10 @@ const page = new NamedPage('user_detail', async () => { toolbox: { right: 10, feature: { - dataZoom: { yAxisIndex: 'none' }, restore: {}, saveAsImage: {}, }, }, - dataZoom: [{ type: 'inside' }], visualMap: { show: false, pieces: [{ diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html index f6949025..3b945b23 100644 --- a/packages/ui-default/templates/problem_detail.html +++ b/packages/ui-default/templates/problem_detail.html @@ -14,7 +14,7 @@ {{ set(UiContext, 'postSubmitUrl', url('contest_detail_problem_submit' if tdoc.docType == model.document.TYPE_CONTEST else 'homework_detail_problem_submit', pid=pdoc.pid, tid=tdoc.docId)) }} {{ set(UiContext, 'getSubmissionsUrl', url('contest_detail_problem_submit' if tdoc.docType == model.document.TYPE_CONTEST else 'homework_detail_problem_submit', pid=pdoc.pid, tid=tdoc.docId)) }} {{ set(UiContext, 'getRecordDetailUrl', url('record_detail', rid='{rid}', query={tid:tdoc.docId})) }} - {{ set(UiContext, 'pretestConnUrl', "/record-conn?pretest=1&uid=" + handler.user._id + "&pid=" + pdoc.docId + "&domainId=" + handler.domainId + "&tid=" + tdoc.docId) }} + {{ set(UiContext, 'pretestConnUrl', "/record-conn?pretest=1&uid=" + handler.user._id + "&pid=" + pdoc.domainId + ":" + pdoc.docId + "&domainId=" + handler.domainId + "&tid=" + tdoc.docId) }} {% else %} {{ set(UiContext, 'canViewRecord', true) }} {{ set(UiContext, 'postSubmitUrl', url('problem_submit', pid=pdoc.docId)) }}