feat: optimize legacy contest user registration

sdutacm · Dec 1, 2023 · 15427f8 · 15427f8
1 parent 807628c
commit 15427f8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "onlinejudge3-fe",
-  "version": "3.5.5",
+  "version": "3.5.6",
   "description": "",
   "scripts": {
     "dev": "gulp dev",

diff --git a/src/common b/src/common
diff --git a/src/components/ContestUserList.tsx b/src/components/ContestUserList.tsx
@@ -247,13 +247,13 @@ class ContestUserList extends React.Component<Props, State> {
         field: 'class1',
         component: 'input',
         initialValue: safeGet(contestUser[uid], 'members[0].class', ''),
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel',
         field: 'tel1',
         component: 'input',
         initialValue: safeGet(contestUser[uid], 'members[0].tel', ''),
+        rules: [{ required: true, message: 'Please input phone number' }],
       },
       {
         name: 'Email',
@@ -293,7 +293,7 @@ class ContestUserList extends React.Component<Props, State> {
           value: item.id,
         })),
         initialValue: `${contestUser[uid]?.status ?? ContestUserStatus.accepted}`,
-        rules: [{ required: true, message: 'Please ' }],
+        rules: [{ required: true, message: 'Please select status' }],
       });
     }
     return items;
@@ -364,13 +364,13 @@ class ContestUserList extends React.Component<Props, State> {
         field: 'class1',
         component: 'input',
         initialValue: safeGet(contestUser[uid], 'members[0].class', ''),
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel of Member 1',
         field: 'tel1',
         component: 'input',
         initialValue: safeGet(contestUser[uid], 'members[0].tel', ''),
+        rules: [{ required: true, message: 'Please input phone number' }],
       },
       {
         name: 'Email of Member 1',
@@ -426,7 +426,6 @@ class ContestUserList extends React.Component<Props, State> {
         field: 'class2',
         component: 'input',
         initialValue: safeGet(contestUser[uid], 'members[1].class', ''),
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel of Member 2',
@@ -487,7 +486,6 @@ class ContestUserList extends React.Component<Props, State> {
         field: 'class3',
         component: 'input',
         initialValue: safeGet(contestUser[uid], 'members[2].class', ''),
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel of Member 3',
@@ -705,6 +703,7 @@ class ContestUserList extends React.Component<Props, State> {
                         <GeneralFormModal
                           loadingEffect="contests/updateContestUser"
                           title="Edit Register Info"
+                          maskClosable={false}
                           autoMsg
                           items={
                             contestUser[text.contestUserId]
@@ -777,6 +776,7 @@ class ContestUserList extends React.Component<Props, State> {
                         <GeneralFormModal
                           loadingEffect="admin/auditContestUser"
                           title="Audit Registration"
+                          maskClosable={false}
                           autoMsg
                           items={this.auditFormItems}
                           submit={(dispatch: ReduxProps['dispatch'], values) => {
@@ -839,6 +839,7 @@ class ContestUserList extends React.Component<Props, State> {
               <GeneralFormModal
                 loadingEffect="contests/addContestUser"
                 title="Add Contest User"
+                maskClosable={false}
                 autoMsg
                 items={contestDetail?.team ? this.addTeamUserFormItems() : this.addUserFormItems()}
                 submit={(dispatch: ReduxProps['dispatch'], values) => {

diff --git a/src/components/GeneralFormModal.tsx b/src/components/GeneralFormModal.tsx
@@ -20,6 +20,7 @@ export interface IGeneralFormModalProps extends ReduxProps, FormProps {
   autoMsg?: boolean;
   className?: string;
   disabled?: boolean;
+  maskClosable?: boolean;
   submit(dispatch: ReduxProps['dispatch'], values): Promise<IApiResponse<any>>;
   onSuccess?(dispatch: ReduxProps['dispatch'], ret: IApiResponse<any>): void;
   onSuccessModalClosed?(dispatch: ReduxProps['dispatch'], ret: IApiResponse<any>): void;
@@ -94,6 +95,7 @@ class GeneralFormModal extends React.Component<IGeneralFormModalProps, State> {
       okText,
       cancelText,
       className,
+      maskClosable,
     } = this.props;
 
     return (
@@ -109,6 +111,7 @@ class GeneralFormModal extends React.Component<IGeneralFormModalProps, State> {
           confirmLoading={loadings[loadingEffect] || false}
           onOk={this.handleOk}
           onCancel={this.handleHideModel}
+          maskClosable={maskClosable}
         >
           <GeneralForm form={form} items={items} initialValues={initialValues} />
         </Modal>

diff --git a/src/pages/contests/$id/users/index.tsx b/src/pages/contests/$id/users/index.tsx
@@ -35,6 +35,9 @@ class ContestUserListPage extends React.Component<Props, State> {
     } = this.props;
     return (
       <PageAnimation>
+        <h4 className="mb-md-lg">
+          Participants of {id} - {contestDetail?.title || '-'}
+        </h4>
         <ContestUserList
           id={id}
           data={data}

diff --git a/src/pages/contests/index.tsx b/src/pages/contests/index.tsx
@@ -175,12 +175,12 @@ class ContestList extends React.Component<Props, State> {
         name: 'Class',
         field: 'class1',
         component: 'input',
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel',
         field: 'tel1',
         component: 'input',
+        rules: [{ required: true, message: 'Please input phone number' }],
       },
       {
         name: 'Email',
@@ -253,12 +253,12 @@ class ContestList extends React.Component<Props, State> {
         name: 'Class of Member 1',
         field: 'class1',
         component: 'input',
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel of Member 1',
         field: 'tel1',
         component: 'input',
+        rules: [{ required: true, message: 'Please input phone number' }],
       },
       {
         name: 'Email of Member 1',
@@ -306,7 +306,6 @@ class ContestList extends React.Component<Props, State> {
         name: 'Class of Member 2',
         field: 'class2',
         component: 'input',
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel of Member 2',
@@ -358,7 +357,6 @@ class ContestList extends React.Component<Props, State> {
         name: 'Class of Member 3',
         field: 'class3',
         component: 'input',
-        rules: [{ required: true, message: 'Please input class' }],
       },
       {
         name: 'Tel of Member 3',
@@ -477,6 +475,7 @@ class ContestList extends React.Component<Props, State> {
                             <GeneralFormModal
                               loadingEffect="contests/addContestUser"
                               title="Register Contest"
+                              maskClosable={false}
                               autoMsg
                               items={record.team ? addTeamUserFormItems : addUserFormItems}
                               submit={(dispatch: ReduxProps['dispatch'], values) => {
@@ -519,6 +518,10 @@ class ContestList extends React.Component<Props, State> {
                                   category: 'contests',
                                   action: 'registerContest',
                                 });
+                                setTimeout(
+                                  () => router.push(urlf(pages.contests.users, { param: { id: record.contestId } })),
+                                  constants.modalAnimationDurationFade,
+                                );
                               }}
                             >
                               <a title="Register Contest">

diff --git a/src/pages/contests/models/contests.ts b/src/pages/contests/models/contests.ts
@@ -312,9 +312,9 @@ export default {
       return ret;
     },
     *getUserList({ payload: prams }, { call, put, select }) {
-      const formattedQuery = {
+      const formattedQuery: any = {
         ...formatListQuery(prams.query),
-        // order: [['contestUserId', 'DESC']],
+        order: [['contestUserId', 'DESC']],
       };
       formattedQuery.contestUserId &&
         (formattedQuery.contestUserId = +formattedQuery.contestUserId);