[optimize] simplify several details & update Upstream packages

Author: TechQuery

components/Activity/AgendaList.tsx

@@ -12,16 +12,16 @@ import userStore from '../../models/User';
 import { renderTagInput } from '../Tag';
 
 export interface AgendaListProps {
+  userId?: number;
   activityId?: number;
   isOrganizer?: boolean;
-  userId?: number;
 }
 
 @observer
 export class AgendaList extends ObservedComponent<AgendaListProps, typeof i18n> {
   static contextType = I18nContext;
 
-  agendaStore = new AgendaModel(this.props.activityId);
+  agendaStore = new AgendaModel();
 
   @computed
   get columns(): Column<Agenda>[] {
@@ -43,12 +43,14 @@ export class AgendaList extends ObservedComponent<AgendaListProps, typeof i18n>
       },
       {
         renderHead: t('start_time'),
-        renderBody: ({ forum }) => forum?.startTime ? new Date(forum.startTime).toLocaleString() : '-',
+        renderBody: ({ forum }) =>
+          forum?.startTime ? new Date(forum.startTime).toLocaleString() : '-',
         type: 'datetime-local',
       },
       {
         renderHead: t('end_time'),
-        renderBody: ({ forum }) => forum?.endTime ? new Date(forum.endTime).toLocaleString() : '-',
+        renderBody: ({ forum }) =>
+          forum?.endTime ? new Date(forum.endTime).toLocaleString() : '-',
         type: 'datetime-local',
       },
       {
@@ -61,8 +63,7 @@ export class AgendaList extends ObservedComponent<AgendaListProps, typeof i18n>
       {
         key: 'mentors',
         renderHead: t('mentors'),
-        renderBody: ({ mentors }) => 
-          mentors?.map(mentor => mentor.name).join(', ') || '-',
+        renderBody: ({ mentors }) => mentors?.map(mentor => mentor.name).join(', ') || '-',
         renderInput: renderTagInput(userStore),
         required: true,
         invalidMessage: t('field_required'),
@@ -83,7 +84,7 @@ export class AgendaList extends ObservedComponent<AgendaListProps, typeof i18n>
 
   render() {
     const { activityId, userId } = this.props;
-    
+
     return (
       <RestTable
         className="h-100 text-center"
@@ -93,9 +94,9 @@ export class AgendaList extends ObservedComponent<AgendaListProps, typeof i18n>
         deletable
         columns={this.columns}
         store={this.agendaStore}
-        {...({ filter: { activity: activityId, createdBy: userId } } as any)}
+        filter={{ activity: activityId, createdBy: userId }}
         translator={this.observedContext}
       />
     );
   }
-}
+}

components/Session/List.tsx

@@ -8,20 +8,15 @@ import { Button } from 'react-bootstrap';
 import sessionStore from '../../models/Session';
 import { i18n, I18nContext } from '../../models/Translation';
 
-export interface SessionListProps {
-  showActions?: boolean;
-}
-
 @observer
-export class SessionList extends ObservedComponent<SessionListProps, typeof i18n> {
+export class SessionList extends ObservedComponent<{}, typeof i18n> {
   static contextType = I18nContext;
 
   @computed
   get columns(): Column<Session>[] {
     const { t } = this.observedContext;
-    const { showActions = true } = this.observedProps;
 
-    const baseColumns: Column<Session>[] = [
+    return [
       {
         key: 'title',
         renderHead: t('title'),
@@ -52,36 +47,29 @@ export class SessionList extends ObservedComponent<SessionListProps, typeof i18n
         type: 'number',
         min: 1,
       },
-    ];
-
-    if (showActions) {
-      baseColumns.push({
+      {
         renderHead: t('actions'),
         renderBody: () => (
           <Button variant="outline-success" size="sm" href="/user/agenda">
             {t('submit_to_activity')}
           </Button>
         ),
-      });
-    }
-
-    return baseColumns;
+      },
+    ];
   }
 
   render() {
-    const { showActions = true } = this.observedProps;
-
     return (
       <RestTable
         className="h-100 text-center"
         striped
         hover
-        editable={showActions}
-        deletable={showActions}
+        editable
+        deletable
         columns={this.columns}
         store={sessionStore}
         translator={this.observedContext}
       />
     );
   }
-}
+}

models/Agenda.ts

@@ -4,11 +4,6 @@ import { TableModel } from './Base';
 import userStore from './User';
 
 export class AgendaModel extends TableModel<Agenda> {
-  baseURI = '';
+  baseURI = 'agenda';
   client = userStore.client;
-
-  constructor(activityId: number) {
-    super();
-    this.baseURI = `activity/${activityId}/agenda`;
-  }
-}
+}

next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

package.json

@@ -18,11 +18,11 @@
     "@koa/router": "^14.0.0",
     "@mdx-js/loader": "^3.1.0",
     "@mdx-js/react": "^3.1.0",
-    "@next/mdx": "^15.4.7",
+    "@next/mdx": "^15.5.0",
     "@passwordless-id/webauthn": "^2.3.1",
     "@sentry/nextjs": "^10.5.0",
     "copy-webpack-plugin": "^13.0.1",
-    "core-js": "^3.45.0",
+    "core-js": "^3.45.1",
     "editorjs-html": "^4.0.5",
     "idb-keyval": "^6.2.2",
     "idea-react": "^2.0.0-rc.13",
@@ -38,8 +38,8 @@
     "mobx-react": "^9.2.0",
     "mobx-react-helper": "^0.5.1",
     "mobx-restful": "^2.1.0",
-    "mobx-restful-table": "^2.5.2",
-    "next": "^15.4.7",
+    "mobx-restful-table": "^2.5.3",
+    "next": "^15.5.0",
     "next-pwa": "~5.6.0",
     "next-ssr-middleware": "^1.0.2",
     "next-with-less": "^3.0.1",
@@ -52,7 +52,7 @@
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.1",
     "remark-mdx-frontmatter": "^5.2.0",
-    "undici": "^7.14.0",
+    "undici": "^7.15.0",
     "web-utility": "^4.5.1",
     "webpack": "^5.101.3",
     "yaml": "^2.8.1"
@@ -65,7 +65,7 @@
     "@eslint/compat": "^1.3.2",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.33.0",
-    "@next/eslint-plugin-next": "^15.4.7",
+    "@next/eslint-plugin-next": "^15.5.0",
     "@open-source-bazaar/activityhub-service": "1.0.0-rc.1",
     "@softonus/prettier-plugin-duplicate-remover": "^1.1.2",
     "@stylistic/eslint-plugin": "^5.2.3",
@@ -75,7 +75,7 @@
     "@types/lodash": "^4.17.20",
     "@types/next-pwa": "^5.6.9",
     "@types/node": "^22.17.2",
-    "@types/react": "^19.1.10",
+    "@types/react": "^19.1.11",
     "dotenv-cli": "^10.0.0",
     "eslint": "^9.33.0",
     "eslint-config-prettier": "^10.1.8",
@@ -92,7 +92,8 @@
     "typescript-eslint": "^8.40.0"
   },
   "resolutions": {
-    "next": "$next"
+    "next": "$next",
+    "mobx-react-helper": "$mobx-react-helper"
   },
   "pnpm": {
     "onlyBuiltDependencies": [