From d35b7480e09bd67928fb0afea3a4a793797b2271 Mon Sep 17 00:00:00 2001
From: TechQuery <shiy2008@gmail.com>
Date: Wed, 28 Aug 2024 05:33:39 +0800
Subject: [PATCH] [refactor] simplify Announcement types & model [add] GitHub
 PR badges

---
 .github/pr-badge.yml                          | 17 +++++++
 components/Message/MessageList.tsx            | 26 ++++++-----
 components/Message/MessageModal.tsx           | 19 ++++----
 configuration/menu.ts                         |  2 +-
 models/Activity/Message.ts                    | 45 +++++--------------
 models/Activity/index.ts                      | 12 ++---
 package.json                                  |  2 +-
 pages/activity/[name]/index.tsx               |  6 +--
 .../manage/{message.tsx => announcement.tsx}  | 10 ++---
 pnpm-lock.yaml                                | 10 ++---
 10 files changed, 75 insertions(+), 74 deletions(-)
 create mode 100644 .github/pr-badge.yml
 rename pages/activity/[name]/manage/{message.tsx => announcement.tsx} (91%)

diff --git a/.github/pr-badge.yml b/.github/pr-badge.yml
new file mode 100644
index 00000000..74005161
--- /dev/null
+++ b/.github/pr-badge.yml
@@ -0,0 +1,17 @@
+- icon: visualstudio
+  label: 'GitHub.dev'
+  message: 'PR-$prNumber'
+  color: 'blue'
+  url: 'https://github.dev/$owner/$repo/pull/$prNumber'
+
+- icon: github
+  label: 'GitHub codespaces'
+  message: 'PR-$prNumber'
+  color: 'black'
+  url: 'https://codespaces.new/$owner/$repo/pull/$prNumber'
+
+- icon: git
+  label: 'GitPod.io'
+  message: 'PR-$prNumber'
+  color: 'orange'
+  url: 'https://gitpod.io/?autostart=true#https://github.com/$owner/$repo/pull/$prNumber'
diff --git a/components/Message/MessageList.tsx b/components/Message/MessageList.tsx
index a6fe65ef..18ce66b8 100644
--- a/components/Message/MessageList.tsx
+++ b/components/Message/MessageList.tsx
@@ -1,15 +1,15 @@
 import { faEdit, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Announcement } from '@kaiyuanshe/openhackathon-service';
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import { ScrollList, ScrollListProps } from 'mobx-restful-table';
-import { FC, PureComponent } from 'react';
+import { Component, FC, PureComponent } from 'react';
 import { Button, Form, Table } from 'react-bootstrap';
 
 import {
-  Message,
-  MessageType,
-  MessageTypeName,
+  AnnouncementType,
+  AnnouncementTypeName,
 } from '../../models/Activity/Message';
 import { i18n } from '../../models/Base/Translation';
 import styles from '../../styles/participant.module.less';
@@ -17,13 +17,14 @@ import { XScrollListProps } from '../layout/ScrollList';
 
 const { t } = i18n;
 
-export interface MessageListLayoutProps extends XScrollListProps<Message> {
+export interface AnnouncementListLayoutProps
+  extends XScrollListProps<Announcement> {
   hideControls?: boolean;
   onEdit?: (id: number) => any;
   onDelete?: (id: number) => any;
 }
 
-export const MessageListLayout: FC<MessageListLayoutProps> = ({
+export const AnnouncementListLayout: FC<AnnouncementListLayoutProps> = ({
   defaultData = [],
   selectedIds = [],
   hideControls,
@@ -90,7 +91,7 @@ export const MessageListLayout: FC<MessageListLayoutProps> = ({
           </td>
           <td>{title}</td>
           <td>{content}</td>
-          <td>{MessageTypeName()[MessageType.Hackathon]}</td>
+          <td>{AnnouncementTypeName()[AnnouncementType.Hackathon]}</td>
           <td hidden={hideControls}>
             <Button
               className="me-2"
@@ -110,11 +111,14 @@ export const MessageListLayout: FC<MessageListLayoutProps> = ({
   </Table>
 );
 
-export type MessageListProps = Pick<ScrollListProps<Message>, 'store'> &
-  MessageListLayoutProps;
+export type AnnouncementListProps = Pick<
+  ScrollListProps<Announcement>,
+  'store'
+> &
+  AnnouncementListLayoutProps;
 
 @observer
-export class MessageList extends PureComponent<MessageListProps> {
+export class AnnouncementList extends Component<AnnouncementListProps> {
   @observable
   accessor selectedIds: number[] = [];
 
@@ -141,7 +145,7 @@ export class MessageList extends PureComponent<MessageListProps> {
         translator={i18n}
         store={this.props.store}
         renderList={allItems => (
-          <MessageListLayout
+          <AnnouncementListLayout
             {...{ ...props, ...this }}
             defaultData={allItems}
           />
diff --git a/components/Message/MessageModal.tsx b/components/Message/MessageModal.tsx
index 950feb59..7f4ba78a 100644
--- a/components/Message/MessageModal.tsx
+++ b/components/Message/MessageModal.tsx
@@ -1,25 +1,26 @@
+import { Announcement } from '@kaiyuanshe/openhackathon-service';
 import { observer } from 'mobx-react';
 import { NewData } from 'mobx-restful';
-import { createRef, FormEvent, PureComponent } from 'react';
+import { Component, createRef, FormEvent } from 'react';
 import { Button, Form, Modal, ModalProps } from 'react-bootstrap';
 import { formToJSON } from 'web-utility';
 
 import {
-  Message,
-  MessageModel,
-  MessageTypeName,
+  AnnouncementModel,
+  AnnouncementTypeName,
 } from '../../models/Activity/Message';
 import { i18n } from '../../models/Base/Translation';
 
 const { t } = i18n;
 
-export interface MessageModalProps extends Pick<ModalProps, 'show' | 'onHide'> {
-  store: MessageModel;
+export interface AnnouncementModalProps
+  extends Pick<ModalProps, 'show' | 'onHide'> {
+  store: AnnouncementModel;
   onSave?: () => any;
 }
 
 @observer
-export class MessageModal extends PureComponent<MessageModalProps> {
+export class AnnouncementModal extends Component<AnnouncementModalProps> {
   private form = createRef<HTMLFormElement>();
 
   handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
@@ -31,7 +32,7 @@ export class MessageModal extends PureComponent<MessageModalProps> {
 
     if (!store || !form) return;
 
-    const data = formToJSON<NewData<Message>>(form);
+    const data = formToJSON<NewData<Announcement>>(form);
 
     await store.updateOne(data, store.currentOne.id);
     await store.refreshList();
@@ -77,7 +78,7 @@ export class MessageModal extends PureComponent<MessageModalProps> {
           <Form.Group className="mt-2" controlId="type">
             <Form.Label>{t('type')}</Form.Label>
             <Form.Select name="type">
-              {Object.entries(MessageTypeName()).map(([key, value]) => (
+              {Object.entries(AnnouncementTypeName()).map(([key, value]) => (
                 <option key={key} value={key}>
                   {value}
                 </option>
diff --git a/configuration/menu.ts b/configuration/menu.ts
index 7462cd5d..f38c7db8 100644
--- a/configuration/menu.ts
+++ b/configuration/menu.ts
@@ -66,7 +66,7 @@ export const menus: () => MenuItem[] = () => [
       },
       {
         title: t('announcement'),
-        href: 'message',
+        href: 'announcement',
         icon: 'bullhorn',
       },
       {
diff --git a/models/Activity/Message.ts b/models/Activity/Message.ts
index da9b3e45..0f412248 100644
--- a/models/Activity/Message.ts
+++ b/models/Activity/Message.ts
@@ -1,49 +1,26 @@
-import { Base } from '@kaiyuanshe/openhackathon-service';
-import { IDType, ListModel, Stream, toggle } from 'mobx-restful';
-import { buildURLData } from 'web-utility';
+import { Announcement, BaseFilter } from '@kaiyuanshe/openhackathon-service';
 
-import { createListStream, Filter, InputData } from '../Base';
+import { Filter, TableModel } from '../Base';
 import { i18n } from '../Base/Translation';
-import sessionStore from '../User/Session';
 
 const { t } = i18n;
 
-export enum MessageType {
+export enum AnnouncementType {
   Hackathon = 'hackathon',
 }
 
-export const MessageTypeName = () => ({
-  [MessageType.Hackathon]: t('hackathon_message'),
+export const AnnouncementTypeName = () => ({
+  [AnnouncementType.Hackathon]: t('hackathon_message'),
 });
 
-export interface Message extends Base {
-  title: string;
-  content: string;
-}
-
-export type MessageFilter = Filter<Message>;
+export type AnnouncementFilter = Filter<Announcement> & BaseFilter;
 
-export class MessageModel extends Stream<Message, MessageFilter>(ListModel) {
-  client = sessionStore.client;
-
-  constructor(baseURI: string) {
+export class AnnouncementModel extends TableModel<
+  Announcement,
+  AnnouncementFilter
+> {
+  constructor(public baseURI: string) {
     super();
     this.baseURI = `${baseURI}/announcement`;
   }
-
-  openStream(filter: MessageFilter) {
-    return createListStream<Message>(
-      `${this.baseURI}s?${buildURLData(filter)}`,
-      this.client,
-      count => (this.totalCount = count),
-    );
-  }
-
-  @toggle('uploading')
-  async updateOne(data: InputData<Message>, id?: IDType) {
-    const { body } = await (id
-      ? this.client.patch<Message>(`${this.baseURI}/${id}`, data)
-      : this.client.put<Message>(this.baseURI, data));
-    return (this.currentOne = body!);
-  }
 }
diff --git a/models/Activity/index.ts b/models/Activity/index.ts
index 753c8c28..19171d95 100644
--- a/models/Activity/index.ts
+++ b/models/Activity/index.ts
@@ -15,7 +15,7 @@ import platformAdmin from '../User/PlatformAdmin';
 import { AwardModel } from './Award';
 import { EnrollmentModel } from './Enrollment';
 import { LogModel } from './Log';
-import { MessageModel } from './Message';
+import { AnnouncementModel } from './Message';
 import { OrganizerModel } from './Organization';
 import { Extensions, Question } from './Question';
 import { StaffModel } from './Staff';
@@ -61,7 +61,7 @@ export class ActivityModel extends TableModel<Hackathon, ActivityFilter> {
   @observable
   accessor currentEnrollment: EnrollmentModel | undefined;
 
-  currentMessage?: MessageModel;
+  currentAnnouncement?: AnnouncementModel;
 
   @observable
   accessor currentTeam: TeamModel | undefined;
@@ -89,8 +89,10 @@ export class ActivityModel extends TableModel<Hackathon, ActivityFilter> {
     return (this.currentEnrollment = new EnrollmentModel(`hackathon/${name}`));
   }
 
-  messageOf(name = this.currentOne.name) {
-    return (this.currentMessage = new MessageModel(`hackathon/${name}`));
+  announcementOf(name = this.currentOne.name) {
+    return (this.currentAnnouncement = new AnnouncementModel(
+      `hackathon/${name}`,
+    ));
   }
 
   teamOf(name = this.currentOne.name) {
@@ -137,7 +139,7 @@ export class ActivityModel extends TableModel<Hackathon, ActivityFilter> {
     this.enrollmentOf(name);
     this.teamOf(name);
     this.organizationOf(name);
-    this.messageOf(name);
+    this.announcementOf(name);
     this.templateOf(name);
 
     return (this.currentOne = {
diff --git a/package.json b/package.json
index bcffb912..a222fa3a 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@babel/plugin-proposal-decorators": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
-    "@kaiyuanshe/openhackathon-service": "^0.17.0",
+    "@kaiyuanshe/openhackathon-service": "^0.18.0",
     "@octokit/openapi-types": "^22.2.0",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/leaflet": "^1.9.12",
diff --git a/pages/activity/[name]/index.tsx b/pages/activity/[name]/index.tsx
index e935908c..77a17fa6 100644
--- a/pages/activity/[name]/index.tsx
+++ b/pages/activity/[name]/index.tsx
@@ -34,7 +34,7 @@ import {
 import { getActivityStatusText } from '../../../components/Activity/ActivityEntry';
 import { CommentBox } from '../../../components/CommentBox';
 import { PageHead } from '../../../components/layout/PageHead';
-import { MessageList } from '../../../components/Message/MessageList';
+import { AnnouncementList } from '../../../components/Message/MessageList';
 import { OrganizationListLayout } from '../../../components/Organization/OrganizationList';
 import { TeamCard } from '../../../components/Team/TeamCard';
 import { TeamCreateModal } from '../../../components/Team/TeamCreateModal';
@@ -84,7 +84,7 @@ export default class ActivityPage extends PureComponent<ActivityPageProps> {
   logStore = activityStore.logOf(this.props.activity.id);
   enrollmentStore = activityStore.enrollmentOf(this.props.activity.name);
   teamStore = activityStore.teamOf(this.props.activity.name);
-  messageStore = activityStore.messageOf(this.props.activity.name);
+  messageStore = activityStore.announcementOf(this.props.activity.name);
 
   @observable
   accessor showCreateTeam = false;
@@ -314,7 +314,7 @@ export default class ActivityPage extends PureComponent<ActivityPageProps> {
                 {/*todo update no data*/}
               </Tab>
               <Tab className="pt-2" eventKey="log" title={t('latest_news')}>
-                <MessageList store={myMessage} hideControls />
+                <AnnouncementList store={myMessage} hideControls />
               </Tab>
               <Tab eventKey="team" title={t('all_teams')} className="pt-2">
                 <h3>{t('my_team')}</h3>
diff --git a/pages/activity/[name]/manage/message.tsx b/pages/activity/[name]/manage/announcement.tsx
similarity index 91%
rename from pages/activity/[name]/manage/message.tsx
rename to pages/activity/[name]/manage/announcement.tsx
index 166c5e1e..22a9fcd9 100644
--- a/pages/activity/[name]/manage/message.tsx
+++ b/pages/activity/[name]/manage/announcement.tsx
@@ -13,8 +13,8 @@ import { createRef, FC, FormEvent, PureComponent } from 'react';
 import { Button, Container, Form } from 'react-bootstrap';
 
 import { ActivityManageFrame } from '../../../../components/Activity/ActivityManageFrame';
-import { MessageList } from '../../../../components/Message/MessageList';
-import { MessageModal } from '../../../../components/Message/MessageModal';
+import { AnnouncementList } from '../../../../components/Message/MessageList';
+import { AnnouncementModal } from '../../../../components/Message/MessageModal';
 import { ServerSessionBox } from '../../../../components/User/ServerSessionBox';
 import activityStore from '../../../../models/Activity';
 import { i18n } from '../../../../models/Base/Translation';
@@ -45,7 +45,7 @@ export default MessageListPage;
 
 @observer
 class MessageListEditor extends PureComponent<MessageListPageProps> {
-  store = activityStore.messageOf(this.props.route.params!.name);
+  store = activityStore.announcementOf(this.props.route.params!.name);
 
   form = createRef<HTMLFormElement>();
 
@@ -96,14 +96,14 @@ class MessageListEditor extends PureComponent<MessageListPageProps> {
           </Button>
         </Form>
 
-        <MessageList
+        <AnnouncementList
           store={store}
           hideControls={false}
           onSelect={list => (this.selectedIds = list)}
           onEdit={() => (this.show = true)}
           onDelete={this.handleReset}
         />
-        <MessageModal
+        <AnnouncementModal
           store={store}
           show={show}
           onHide={() => (this.show = false)}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9ea9d151..4a66ae31 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -118,8 +118,8 @@ importers:
         specifier: ^7.24.7
         version: 7.24.7(@babel/core@7.25.2)
       '@kaiyuanshe/openhackathon-service':
-        specifier: ^0.17.0
-        version: 0.17.0(mobx@6.13.1)(typescript@5.5.4)
+        specifier: ^0.18.0
+        version: 0.18.0(mobx@6.13.1)(typescript@5.5.4)
       '@octokit/openapi-types':
         specifier: ^22.2.0
         version: 22.2.0
@@ -959,8 +959,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@kaiyuanshe/openhackathon-service@0.17.0':
-    resolution: {integrity: sha512-mk0AXaH37J0QNxfoC6MoyklVLh23iKW5bpspXsptwnnQCz05CVwb50R1/+5NX+JhV0V3JuMdM6uIE3oSNVv1bQ==, tarball: https://npm.pkg.github.com/download/@kaiyuanshe/openhackathon-service/0.17.0/b3d16f1aef02388f52dcedb6cb394d646d9afcb9}
+  '@kaiyuanshe/openhackathon-service@0.18.0':
+    resolution: {integrity: sha512-Om8GM0rMrS+5atqUaWymveHfmeDXvf/svqzwDdR+An3Oqoj1DyQzhwYUcJFinoYlIUGXS+JUHtAGTZ9gy9u6YQ==, tarball: https://npm.pkg.github.com/download/@kaiyuanshe/openhackathon-service/0.18.0/e572f4ccdf8b14ea305284819e76393f746b8a2d}
 
   '@lit-labs/ssr-dom-shim@1.2.1':
     resolution: {integrity: sha512-wx4aBmgeGvFmOKucFKY+8VFJSYZxs9poN3SDNQFF6lT6NrQUnHiPB2PWz2sc4ieEcAaYYzN+1uWahEeTq2aRIQ==}
@@ -5819,7 +5819,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  '@kaiyuanshe/openhackathon-service@0.17.0(mobx@6.13.1)(typescript@5.5.4)':
+  '@kaiyuanshe/openhackathon-service@0.18.0(mobx@6.13.1)(typescript@5.5.4)':
     dependencies:
       '@octokit/openapi-types': 22.2.0
       '@types/jsonwebtoken': 9.0.6