core&ui: contest: better navbar

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "4.0.15",
+    "version": "4.0.16",
     "bin": "bin/hydrooj.js",
     "main": "src/plugin-api",
     "module": "src/plugin-api",

packages/hydrooj/src/handler/contest.ts

@@ -106,6 +106,36 @@ export class ContestDetailBaseHandler extends Handler {
             this.tsdoc.endAt = moment(this.tsdoc.startAt).add(this.tdoc.duration, 'hours').toDate();
         }
     }
+
+    @param('tid', Types.ObjectID, true)
+    async after(domainId: string, tid: ObjectID) {
+        if (!tid || this.request.json || !this.response.template || !contest.isOngoing(this.tdoc, this.tsdoc)) return;
+        const pdoc = 'pdoc' in this ? (this as any).pdoc : {};
+        this.response.body.overrideNav = [
+            { name: 'homepage', args: { prefix: 'homepage' }, checker: () => true },
+            {
+                name: 'contest_detail',
+                displayName: this.tdoc.title,
+                args: { tid, prefix: 'contest_detail' },
+                checker: () => true,
+            },
+            {
+                name: 'contest_scoreboard',
+                args: { tid, prefix: 'contest_scoreboard' },
+                checker: () => contest.canShowScoreboard.call(this, this.tdoc, true),
+            },
+            {
+                name: 'record_main',
+                args: { tid, prefix: 'record_main', query: contest.canShowRecord.call(this, this.tdoc, true) ? {} : { uidOrName: this.user._id } },
+                checker: () => contest.canShowSelfRecord.call(this, this.tdoc, true),
+            },
+            {
+                displayName: `${String.fromCharCode(65 + this.tdoc.pids.indexOf(pdoc.docId))}. ${pdoc.title}`,
+                args: { query: { tid }, pid: pdoc.docId, prefix: 'contest_detail_problem' },
+                checker: () => 'pdoc' in this,
+            },
+        ];
+    }
 }
 
 export class ContestDetailHandler extends ContestDetailBaseHandler {

packages/hydrooj/src/service/layers/renderer.ts

@@ -35,17 +35,20 @@ export default (router, logger) => async (ctx: KoaContext, next) => {
         response.body = await ctx.renderHTML(name, args);
         response.type = 'text/html';
     };
-    ctx.getUrl = (name: string, kwargs: any = {}) => {
+    ctx.getUrl = (name: string, ...kwargsList: Record<string, any>[]) => {
+        if (name === '#') return '#';
         let res = '#';
         const args: any = {};
         const query: any = {};
-        for (const key in kwargs) {
+        for (const kwargs of kwargsList) {
-            if (kwargs[key] instanceof ObjectID) args[key] = kwargs[key].toHexString();
+            for (const key in kwargs) {
-            else args[key] = kwargs[key].toString().replace(/\//g, '%2F');
+                if (kwargs[key] instanceof ObjectID) args[key] = kwargs[key].toHexString();
-        }
+                else args[key] = kwargs[key].toString().replace(/\//g, '%2F');
-        for (const key in kwargs.query || {}) {
+            }
-            if (query[key] instanceof ObjectID) query[key] = kwargs.query[key].toHexString();
+            for (const key in kwargs.query || {}) {
-            else query[key] = kwargs.query[key].toString();
+                if (query[key] instanceof ObjectID) query[key] = kwargs.query[key].toHexString();
+                else query[key] = kwargs.query[key].toString();
+            }
         }
         try {
             const { anchor } = args;

packages/hydrooj/src/service/server.ts

@@ -252,7 +252,7 @@ async function handle(ctx: KoaContext, HandlerClass, checker) {
             ...operation ? [
                 `handler/before-operation/${name}`, 'handler/before-operation',
                 `post${operation}`, 'log/__operationDone',
-            ] : [],
+            ] : [], 'after',
             `handler/after/${name}`, 'handler/after', 'cleanup',
             `handler/finish/${name}`, 'handler/finish',
         ];

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.41.13",
+  "version": "4.41.14",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "index.ts",

packages/ui-default/templates/partials/nav.html

@@ -1,7 +1,7 @@
-{%- macro nav_item(target_name, target_args, target_prefix) -%}
+{%- macro nav_item(item) -%}
 <li class="nav__list-item">
-  <a href="{{ url(target_name, query=target_args.query(handler) if typeof(target_args.query) == 'function' else target_args.query or {}) }}" class="nav__item{% if page_name.startsWith(target_prefix) %} nav--active{% endif %}">
+  <a href="{{ url(item.name, item.args, query=item.args.query(handler) if typeof(item.args.query) == 'function' else item.args.query or {}) }}" class="nav__item{% if page_name.startsWith(item.args.prefix) %} nav--active{% endif %}">
-    {{ _(target_name) }}
+    {{ _(item.displayName or item.name) }}
   </a>
 </li>
 {%- endmacro -%}
@@ -10,8 +10,8 @@
   <div class="row"><div class="columns clearfix">
     <ol class="nav__list nav__list--main clearfix">
       <li class="nav__list-item"><a href="/" class="nav__logo" style="background-size: 100% 100%;">&nbsp;</a></li>
-      {%- for item in ui.getNodes('Nav') -%}{% if item.checker(handler) %}
+      {%- for item in overrideNav|default(ui.getNodes('Nav')) -%}{% if item.checker(handler) %}
-        {{ nav_item(item.name, item.args, item.args.prefix) }}
+        {{ nav_item(item) }}
       {% endif %}{%- endfor -%}
     </ol>
     <ol class="nav__list nav__list--secondary clearfix">