Merge pull request #16 from PKUHPC/style-notification

style: 更新消息系统 UI
PKUHPC · Sep 19, 2024 · 4599ada · 4599ada
2 parents de3e5f1 + 74312de
commit 4599ada
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 49 deletions.
diff --git a/.changeset/lazy-garlics-impress.md b/.changeset/lazy-garlics-impress.md
@@ -0,0 +1,5 @@
+---
+"@scow/lib-web": patch
+---
+
+修复 navlink 只有图标没有文字是不水平居中的问题
diff --git a/.changeset/silver-yaks-scream.md b/.changeset/silver-yaks-scream.md
@@ -0,0 +1,6 @@
+---
+"@scow/notification": patch
+"@scow/mis-server": patch
+---
+
+修改消息系统 ui
diff --git a/apps/mis-server/src/models/messageType.ts b/apps/mis-server/src/models/messageType.ts
@@ -16,7 +16,7 @@ export enum InternalMessageType {
   AccountLowBalance = "AccountLowBalance",
   AccountBalance = "AccountBalance",
   AccountLocked = "AccountLocked",
-  AccountRestored = "AccountRestored",
+  AccountUnblocked = "AccountUnblocked",
   JobStarted = "JobStarted",
   JobFinished = "JobFinished",
   JobAbnormalTermination = "JobAbnormalTermination",

diff --git a/apps/mis-server/src/services/account.ts b/apps/mis-server/src/services/account.ts
@@ -179,7 +179,7 @@ export const accountServiceServer = plugin((server) => {
       // 发送消息
       const ownerAndAdmin = await getAccountOwnerAndAdmin(accountName, logger, em);
       await sendMessage({
-        messageType: InternalMessageType.AccountRestored,
+        messageType: InternalMessageType.AccountUnblocked,
         targetType: TargetType.USER, targetIds: ownerAndAdmin.map((x) => x.userId),
         metadata: {
           time: (new Date()).toISOString(),
@@ -424,7 +424,7 @@ export const accountServiceServer = plugin((server) => {
           // 发送账户解封消息
           const ownerAndAdmin = await getAccountOwnerAndAdmin(accountName, logger, em);
           await sendMessage({
-            messageType: InternalMessageType.AccountRestored,
+            messageType: InternalMessageType.AccountUnblocked,
             targetType: TargetType.USER, targetIds: ownerAndAdmin.map((x) => x.userId),
             metadata: {
               time: (new Date()).toISOString(),

diff --git a/apps/mis-server/src/tasks/fetch.ts b/apps/mis-server/src/tasks/fetch.ts
@@ -121,13 +121,17 @@ export async function fetchJobs(
 
           // Determine whether the job can be inserted into the database. If not, skip the job
           await em.flush();
-          
+
           await sendMessage({
             messageType: InternalMessageType.JobFinished,
             targetType: TargetType.USER, targetIds: [job.user],
             metadata: {
               time: job.endTime!,
               jobId: job.jobId.toString(),
+              jobName: job.name,
+              cluster: job.cluster,
+              account: job.account,
+              price: price.account?.price.toString() ?? "0",
             },
           }, logger);
         } catch (error) {

diff --git a/apps/mis-server/src/utils/sendMessage.ts b/apps/mis-server/src/utils/sendMessage.ts
@@ -70,8 +70,8 @@ interface AccountLocked extends BaseMessage {
   };
 }
 
-interface AccountRestored extends BaseMessage {
-  messageType: InternalMessageType.AccountRestored;
+interface AccountUnblocked extends BaseMessage {
+  messageType: InternalMessageType.AccountUnblocked;
   targetType: TargetType.USER,
   metadata: {
     time: string;
@@ -85,11 +85,15 @@ interface JobFinished extends BaseMessage {
   metadata: {
     time: string;
     jobId: string;
+    jobName: string;
+    cluster: string;
+    account: string;
+    price: string;
   };
 }
 
 type Message = AccountLocked | AccountOverdue | AccountRechargeSuccess
-  | AccountLowBalance | AccountBalance | AccountRestored
+  | AccountLowBalance | AccountBalance | AccountUnblocked
   | JobFinished;
 
 export const sendMessage = async (message: Message, logger: Logger) => {

diff --git a/apps/notification/src/models/i18n.ts b/apps/notification/src/models/i18n.ts
@@ -21,6 +21,14 @@ export type I18nStringType = string | {
 // languageDic for partitionsManagement
 export const languageDic = {
   zh_cn: {
+    api: {
+      notification: "通知",
+      myMsgs: "我的消息",
+      msgSub: "消息订阅",
+      msgConfig: "消息设置",
+      sendMsg: "发送消息",
+      createType: "创建自定义消息类型",
+    },
     common: {
       default: "默认",
       zhCn: "简体中文",
@@ -82,8 +90,8 @@ export const languageDic = {
       },
       messageConfigModal: {
         modifySuccess: "修改成功",
-        authorization: "授权方式",
-        dontAllowCancel: "不允许用户取消以下授权方式",
+        authorization: "订阅设置",
+        dontAllowCancel: "不允许用户取消订阅以下类型的通知",
         inputTitle: "请输入标题",
       },
     },
@@ -105,7 +113,7 @@ export const languageDic = {
       },
     },
     notification: {
-      pageTitle: "消息通知",
+      pageTitle: "我的消息",
       markAllReadErrorInfo: "标记全部已读失败",
       markAllReadSuccessInfo: "标记全部已读成功",
       deleteReadMsgErrorInfo: "删除已读消息失败",
@@ -140,6 +148,14 @@ export const languageDic = {
     },
   },
   en: {
+    api: {
+      notification: "Notification",
+      myMsgs: "My Messages",
+      msgSub: "Message Subscription",
+      msgConfig: "Message Config",
+      sendMsg: "Send Message",
+      createType: "Create Custom Message Type",
+    },
     common: {
       default: "Default",
       zhCn: "Simplified Chinese",
@@ -205,8 +221,8 @@ export const languageDic = {
       messageConfigModal: {
         inputTitle: "Please enter a title",
         modifySuccess: "Modification successful",
-        authorization: "Authorization",
-        dontAllowCancel: "Do not allow users to cancel the following authorization methods",
+        authorization: "Subscription Settings",
+        dontAllowCancel: "Do not allow users to unsubscribe from the following types of notifications.",
       },
     },
     sendMessage: {

diff --git a/apps/notification/src/models/message-type.ts b/apps/notification/src/models/message-type.ts
@@ -30,7 +30,7 @@ export enum InternalMessageType {
   AccountLowBalance = "AccountLowBalance",
   AccountBalance = "AccountBalance",
   AccountLocked = "AccountLocked",
-  AccountRestored = "AccountRestored",
+  AccountUnblocked = "AccountUnblocked",
   JobStarted = "JobStarted",
   JobFinished = "JobFinished",
   JobAbnormalTermination = "JobAbnormalTermination",
@@ -160,12 +160,12 @@ export const internalMessageTypesMap = new Map<InternalMessageType, MessageTypeI
       zhCn: "账户 {__accountName__} 已于【{__time__}】被封锁，您可以联系管理员申请解封。",
     },
   }],
-  [InternalMessageType.AccountRestored, {
-    type: "AccountRestored",
+  [InternalMessageType.AccountUnblocked, {
+    type: "AccountUnblocked",
     titleTemplate: {
-      default: "账户恢复通知",
-      en: "Account Restored",
-      zhCn: "账户恢复通知",
+      default: "账户解封通知",
+      en: "Account Unblocking",
+      zhCn: "账户解封通知",
     },
     category: "Account",
     categoryTemplate: {

diff --git a/apps/notification/src/pages/api/mis/navbarLinks.ts b/apps/notification/src/pages/api/mis/navbarLinks.ts
@@ -19,11 +19,6 @@ import { applyMiddleware } from "../middleware/cors";
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
 
-  const searchParams = req.query;
-  const scowLangId = searchParams.scowLangId;
-
-  const isChinese = scowLangId === "zh_cn";
-
   if (req.method === "POST") {
 
     const cookie = req.headers.cookie;
@@ -47,7 +42,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     const navbarLinks = [
       {
         path: "/notification",
-        text: isChinese ? "消息系统" : "Messaging System",
+        text: "",
         icon: { src: svgFilePath },
       },
     ];

diff --git a/apps/notification/src/pages/api/mis/rewriteNavigations.ts b/apps/notification/src/pages/api/mis/rewriteNavigations.ts
@@ -14,6 +14,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 import { join } from "path";
 import { PlatformRole } from "src/models/user";
 import { validateToken } from "src/server/auth/token";
+import { getLanguage } from "src/utils/i18n";
 import { BASE_PATH } from "src/utils/processEnv";
 
 import { applyMiddleware } from "../middleware/cors";
@@ -37,12 +38,12 @@ interface Request {
 }
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
+
   const body = req.body as Request;
 
   const searchParams = req.query;
-  const scowLangId = searchParams.scowLangId;
-
-  const isChinese = scowLangId === "zh_cn";
+  const scowLangId = searchParams.scowLangId ?? "zh_cn";
+  const language = getLanguage(scowLangId as string).api;
 
   const cookie = req.headers.cookie;
   // 将 cookie 字符串解析为对象
@@ -63,38 +64,38 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
   body.navs.push({
     path: "/",
     clickToPath: "/notification",
-    text: isChinese ? "通知" : "Notification",
+    text: language.notification,
     hideIfNotActive: true,
     children: [
       {
         path: "/notification",
         clickToPath: undefined,
-        text: isChinese ? "消息通知" : "Message Notification",
+        text: language.myMsgs,
         icon: { src: join(BASE_PATH, "/icons/notification.svg") },
       },
       {
         path: "/subscription",
         clickToPath: undefined,
-        text: isChinese ? "消息订阅" : "Message Subscription",
+        text: language.msgSub,
         icon: { src: join(BASE_PATH, "/icons/subscription.svg") },
       },
       ...cookie && userInfo?.platformRoles.includes(PlatformRole.PLATFORM_ADMIN) ? [
         {
           path: "/message-config",
           clickToPath: undefined,
-          text: isChinese ? "消息设置" : "Message Setting",
+          text: language.msgConfig,
           icon: { src: join(BASE_PATH, "/icons/msg-config.svg") },
         },
         {
           path: "/send-message",
           clickToPath: undefined,
-          text: isChinese ? "发送消息" : "Send Message",
+          text: language.sendMsg,
           icon: { src: join(BASE_PATH, "/icons/send-msg.svg") },
         },
         {
           path: "/create-custom-message-type",
           clickToPath: undefined,
-          text: isChinese ? "创建自定义消息类型" : "Create Custom Message Type",
+          text: language.createType,
           icon: { src: join(BASE_PATH, "/icons/create-custom-type.svg") },
         },
       ] : [],

diff --git a/apps/notification/src/pages/api/portal/navbarLinks.ts b/apps/notification/src/pages/api/portal/navbarLinks.ts
@@ -19,11 +19,6 @@ import { applyMiddleware } from "../middleware/cors";
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
 
-  const searchParams = req.query;
-  const scowLangId = searchParams.scowLangId;
-
-  const isChinese = scowLangId === "zh_cn";
-
   if (req.method === "POST") {
 
     const cookie = req.headers.cookie;
@@ -47,7 +42,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     const navbarLinks = [
       {
         path: "/notification",
-        text: isChinese ? "消息系统" : "Messaging System",
+        text: "",
         icon: { src: svgFilePath },
       },
     ];

diff --git a/apps/notification/src/pages/api/portal/rewriteNavigations.ts b/apps/notification/src/pages/api/portal/rewriteNavigations.ts
@@ -14,6 +14,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 import { join } from "path";
 import { PlatformRole } from "src/models/user";
 import { validateToken } from "src/server/auth/token";
+import { getLanguage } from "src/utils/i18n";
 import { BASE_PATH } from "src/utils/processEnv";
 
 import { applyMiddleware } from "../middleware/cors";
@@ -37,12 +38,12 @@ interface Request {
 }
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
+
   const body = req.body as Request;
 
   const searchParams = req.query;
-  const scowLangId = searchParams.scowLangId;
-
-  const isChinese = scowLangId === "zh_cn";
+  const scowLangId = searchParams.scowLangId ?? "zh_cn";
+  const language = getLanguage(scowLangId as string).api;
 
   const cookie = req.headers.cookie;
   // 将 cookie 字符串解析为对象
@@ -63,38 +64,38 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
   body.navs.push({
     path: "/",
     clickToPath: "/notification",
-    text: isChinese ? "通知" : "Notification",
+    text: language.notification,
     hideIfNotActive: true,
     children: [
       {
         path: "/notification",
         clickToPath: undefined,
-        text: isChinese ? "消息通知" : "Message Notification",
+        text: language.myMsgs,
         icon: { src: join(BASE_PATH, "/icons/notification.svg") },
       },
       {
         path: "/subscription",
         clickToPath: undefined,
-        text: isChinese ? "消息订阅" : "Message Subscription",
+        text: language.msgSub,
         icon: { src: join(BASE_PATH, "/icons/subscription.svg") },
       },
       ...cookie && userInfo?.platformRoles.includes(PlatformRole.PLATFORM_ADMIN) ? [
         {
           path: "/message-config",
           clickToPath: undefined,
-          text: isChinese ? "消息设置" : "Message Setting",
+          text: language.msgConfig,
           icon: { src: join(BASE_PATH, "/icons/msg-config.svg") },
         },
         {
           path: "/send-message",
           clickToPath: undefined,
-          text: isChinese ? "发送消息" : "Send Message",
+          text: language.sendMsg,
           icon: { src: join(BASE_PATH, "/icons/send-msg.svg") },
         },
         {
           path: "/create-custom-message-type",
           clickToPath: undefined,
-          text: isChinese ? "创建自定义消息类型" : "Create Custom Message Type",
+          text: language.createType,
           icon: { src: join(BASE_PATH, "/icons/create-custom-type.svg") },
         },
       ] : [],

diff --git a/dev/vagrant/config/notification/config.yaml b/dev/vagrant/config/notification/config.yaml
@@ -11,7 +11,7 @@ redis:
   port: 6379
 
 scow:
-  misServerUrl: http://localhost:5004
+  misServerUrl: localhost:5004
 
 noticeType:
   siteMessage:

diff --git a/libs/web/src/layouts/base/header/index.tsx b/libs/web/src/layouts/base/header/index.tsx
@@ -60,6 +60,7 @@ const MenuPartPlaceholder = styled.div`
 const LinksPart = styled.div`
   display: flex;
   flex-direction: row;
+  align-items: center;
 `;
 
 const RightContentPart = styled.div`