[optimize] simplify Questionnaire types

kaiyuanshe · Aug 29, 2024 · 240454e · 240454e · github-actions · Aug 29, 2024
1 parent 414d1c6
commit 240454e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/models/Activity/Question.ts b/models/Activity/Question.ts
@@ -11,10 +11,6 @@ export interface Question {
   required?: boolean;
 }
 
-export interface Extensions {
-  name: string;
-  value: string;
-}
 export const questions: Question[] = [
   {
     title: t('what_is_your_occupation'),

diff --git a/models/Activity/index.ts b/models/Activity/index.ts
@@ -1,8 +1,9 @@
 import {
-  Base,
   Enrollment,
+  Extension,
   Hackathon,
   HackathonStatus,
+  Questionnaire,
 } from '@kaiyuanshe/openhackathon-service';
 import { action, observable } from 'mobx';
 import { toggle } from 'mobx-restful';
@@ -16,7 +17,7 @@ import { EnrollmentModel } from './Enrollment';
 import { LogModel } from './Log';
 import { AnnouncementModel } from './Message';
 import { OrganizerModel } from './Organization';
-import { Extensions, Question } from './Question';
+import { Question } from './Question';
 import { StaffModel } from './Staff';
 import { TeamModel } from './Team';
 
@@ -44,11 +45,6 @@ export interface ActivityLogsFilter extends Filter<Hackathon> {
   name: string;
 }
 
-export interface Questionnaire extends Base {
-  extensions: Extensions[];
-  hackathonName: string;
-}
-
 export class ActivityModel extends TableModel<Hackathon, ActivityFilter> {
   baseURI = 'hackathon';
   indexKey = 'name' as const;
@@ -171,7 +167,7 @@ export class ActivityModel extends TableModel<Hackathon, ActivityFilter> {
 
   @toggle('uploading')
   createQuestionnaire(
-    extensions: Extensions[],
+    extensions: Extension[],
     activity = this.currentOne.name,
   ) {
     return this.client.put(`${this.baseURI}/${activity}/questionnaire`, {
@@ -181,7 +177,7 @@ export class ActivityModel extends TableModel<Hackathon, ActivityFilter> {
 
   @toggle('uploading')
   updateQuestionnaire(
-    extensions: Extensions[],
+    extensions: Extension[],
     activity = this.currentOne.name,
   ) {
     return this.client.patch(`${this.baseURI}/${activity}/questionnaire`, {

diff --git a/pages/activity/[name]/manage/questionnaire.tsx b/pages/activity/[name]/manage/questionnaire.tsx
@@ -1,3 +1,4 @@
+import { Extension } from '@kaiyuanshe/openhackathon-service';
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import {
@@ -16,7 +17,7 @@ import { QuestionnaireForm } from '../../../../components/Activity/Questionnaire
 import { QuestionnaireTable } from '../../../../components/Activity/QuestionnaireTable';
 import { ServerSessionBox } from '../../../../components/User/ServerSessionBox';
 import activityStore from '../../../../models/Activity';
-import { Extensions, Question } from '../../../../models/Activity/Question';
+import { Question } from '../../../../models/Activity/Question';
 import { isServer } from '../../../../models/Base';
 import { i18n } from '../../../../models/Base/Translation';
 
@@ -68,7 +69,7 @@ class ActivityQuestionnaireEditor extends PureComponent<ActivityQuestionnairePag
 
     if (!questionnaire[0]) return self.alert(t('please_add_question'));
 
-    const questions: Extensions[] = questionnaire.map(v => ({
+    const questions: Extension[] = questionnaire.map(v => ({
       name: v.id || v.title,
       value: JSON.stringify(v),
     }));
@@ -78,13 +79,11 @@ class ActivityQuestionnaireEditor extends PureComponent<ActivityQuestionnairePag
     } else {
       await activityStore.updateQuestionnaire(questions, this.activity);
     }
-
     self.alert(
       this.isCreate
         ? t('create_questionnaire_success')
         : t('update_questionnaire_success'),
     );
-
     this.isCreate = false;
   };
 

diff --git a/pages/activity/[name]/register.tsx b/pages/activity/[name]/register.tsx
@@ -1,3 +1,4 @@
+import { Extension } from '@kaiyuanshe/openhackathon-service';
 import { textJoin } from 'mobx-i18n';
 import { observer } from 'mobx-react';
 import {
@@ -16,7 +17,7 @@ import { QuestionnaireForm } from '../../../components/Activity/QuestionnairePre
 import { PageHead } from '../../../components/layout/PageHead';
 import { ServerSessionBox } from '../../../components/User/ServerSessionBox';
 import activityStore, { ActivityModel } from '../../../models/Activity';
-import { Extensions, Question } from '../../../models/Activity/Question';
+import { Question } from '../../../models/Activity/Question';
 import { i18n } from '../../../models/Base/Translation';
 
 const { t } = i18n;
@@ -53,14 +54,8 @@ export default class RegisterPage extends PureComponent<RegisterPageProps> {
       data = formToJSON(event.target as HTMLFormElement);
 
     const extensions = Object.entries(data)
-      .map(
-        ([name, value]) =>
-          value && {
-            name,
-            value: value + '',
-          },
-      )
-      .filter(Boolean) as Extensions[];
+      .map(([name, value]) => value && { name, value: value + '' })
+      .filter(Boolean) as Extension[];
 
     await activityStore.signOne(activity, extensions);