From 24acd0918d1fd0be16be73431f3b4c3600469965 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Tue, 4 Jul 2023 17:26:08 +0800
Subject: [PATCH] core&ui: hide guest and default role for add_user operation

---
 packages/hydrooj/src/handler/domain.ts         |  3 +--
 packages/ui-default/templates/domain_user.html | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/hydrooj/src/handler/domain.ts b/packages/hydrooj/src/handler/domain.ts
index 07ea45a8d..48d4e255f 100644
--- a/packages/hydrooj/src/handler/domain.ts
+++ b/packages/hydrooj/src/handler/domain.ts
@@ -154,10 +154,9 @@ class DomainUserHandler extends ManageHandler {
             const ud = udict[dudoc.uid];
             rudocs[ud.role || 'default'].push(ud);
         }
-        const rolesSelect = roles.map((role) => [role._id, role._id]);
         this.response.template = 'domain_user.html';
         this.response.body = {
-            roles, rolesSelect, rudocs, udict, domain: this.domain,
+            roles, rudocs, udict, domain: this.domain,
         };
     }
 
diff --git a/packages/ui-default/templates/domain_user.html b/packages/ui-default/templates/domain_user.html
index 020d01eb1..e3b72d7ae 100644
--- a/packages/ui-default/templates/domain_user.html
+++ b/packages/ui-default/templates/domain_user.html
@@ -1,5 +1,7 @@
 {% extends "domain_base.html" %}
 {% block domain_content %}
+{% set _rolesSelect = roles.filter(eval("(i) => i._id !== 'guest'")).map(eval('(role) => [role._id, role._id]')) %}
+{% set _rolesSelectWithoutDefault = _rolesSelect.filter(eval("(i) => i[0] !== 'default'")) %}
 <div style="display: none" class="dialog__body--add-user">
   <div>
     <div class="row"><div class="columns">
@@ -17,9 +19,8 @@
           {{ _('Role') }}
           {{ form.select({
                label:_('Select a role'),
-               options:rolesSelect,
-               name:'role',
-               value:'default'
+               options:_rolesSelectWithoutDefault,
+               name:'role'
              }) }}
         </label>
       </div>
@@ -37,7 +38,7 @@
           {{ _('Set Roles for selected users') }}
           {{ form.select({
                label:_('Select a role'),
-               options:rolesSelect,
+               options:_rolesSelect,
                name:'role'
              }) }}
         </label>
@@ -91,7 +92,7 @@
           </td>
           <td class="col--role">
             {{ form.select({
-                 options:rolesSelect,
+                 options:_rolesSelect,
                  name:'role',
                  value:rudoc.role,
                  extra_class:'compact',