core&ui: fix group filter display

packages/hydrooj/src/handler/contest.ts

@@ -77,7 +77,7 @@ export class ContestListHandler extends Handler {
     @param('page', Types.PositiveInt, true)
     async get(domainId: string, rule = '', group = '', page = 1) {
         if (rule && contest.RULES[rule].hidden) throw new BadRequestError();
-        const groups = (await user.listGroup(domainId, this.user._id)).map((i) => i.name);
+        const groups = (await user.listGroup(domainId, this.user._id)).map((i) => i.name).filter((i) => !Number.isSafeInteger(+i));
         if (group && !groups.includes(group)) throw new NotAssignedError(group);
         const rules = Object.keys(contest.RULES).filter((i) => !contest.RULES[i].hidden);
         const q = {

packages/hydrooj/src/handler/homework.ts

@@ -24,7 +24,7 @@ class HomeworkMainHandler extends Handler {
     @param('group', Types.Name, true)
     @param('page', Types.PositiveInt, true)
     async get(domainId: string, group = '', page = 1) {
-        const groups = (await user.listGroup(domainId, this.user._id)).map((i) => i.name);
+        const groups = (await user.listGroup(domainId, this.user._id)).map((i) => i.name).filter((i) => !Number.isSafeInteger(+i));
         if (group && !groups.includes(group)) throw new NotAssignedError(group);
         const cursor = contest.getMulti(domainId, {
             rule: 'homework',

packages/ui-default/locales/zh.yaml

@@ -555,6 +555,7 @@ New: 创建
 No {0} at current.: 当前没有{0}。
 No comments so far...: 目前还没有评论...
 No discussion yet...: 目前没有讨论…
+No group available: 没有可用小组
 No Permission to Attend Contest: 您没有权限参加比赛
 No Permission to Claim Homework: 您没有权限认领作业
 No Permission to Create a Discussion: 您没有权限创建讨论

packages/ui-default/templates/contest_main.html

@@ -60,14 +60,15 @@
         <div class="section__tools">
           <form method="get" name="filter-form">
             {{ _('Show') }}:
-          {% if groups.length %}
             <select class="inline compact select" name="group">
               <option value=""{% if not group %} selected{% endif %}>{{ _('All') }}</option>
               {%- for g in groups -%}
                 <option value="{{ g }}"{% if group == g %} selected{% endif %}>{{ g }}</option>
               {%- endfor -%}
+              {%- if not groups|length -%}
+                <option disabled>{{ _('No group available') }}</option>
+              {%- endif -%}
             </select>
-          {% endif %}
             <select class="inline compact select" name="rule">
               <option value=""{% if not rule %} selected{% endif %}>{{ _('All') }}</option>
               {%- for k, v in model.contest.RULES -%}

packages/ui-default/templates/homework_main.html

@@ -22,6 +22,9 @@
               {%- for g in groups -%}
                 <option value="{{ g }}"{% if group == g %} selected{% endif %}>{{ g }}</option>
               {%- endfor -%}
+              {%- if not groups|length -%}
+                <option disabled>{{ _('No group available') }}</option>
+              {%- endif -%}
             </select>
             <button type="submit" class="compact button hasjs--hide">
               {{ _('Search') }}