@nocobase/plugin-notification-in-app-message 1.9.0-alpha.9 → 1.9.0-beta.10

package/dist/externalVersion.js

@@ -9,15 +9,15 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "1.9.0-alpha.9",
-  "@nocobase/plugin-notification-manager": "1.9.0-alpha.9",
-  "@nocobase/plugin-mobile": "1.9.0-alpha.9",
-  "@nocobase/utils": "1.9.0-alpha.9",
+  "@nocobase/client": "1.9.0-beta.10",
+  "@nocobase/plugin-notification-manager": "1.9.0-beta.10",
+  "@nocobase/plugin-mobile": "1.9.0-beta.10",
+  "@nocobase/utils": "1.9.0-beta.10",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.9.0-alpha.9",
+  "@nocobase/server": "1.9.0-beta.10",
   "sequelize": "6.35.2",
-  "@nocobase/actions": "1.9.0-alpha.9",
-  "@nocobase/database": "1.9.0-alpha.9",
+  "@nocobase/actions": "1.9.0-beta.10",
+  "@nocobase/database": "1.9.0-beta.10",
   "antd": "5.24.2",
   "@formily/reactive-react": "2.3.0",
   "antd-style": "3.7.1",
@@ -26,7 +26,7 @@ module.exports = {
   "react-router-dom": "6.28.1",
   "@formily/core": "2.3.0",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/plugin-workflow": "1.9.0-alpha.9",
+  "@nocobase/plugin-workflow": "1.9.0-beta.10",
   "@formily/reactive": "2.3.0",
   "@formily/shared": "2.3.2"
 };

package/dist/locale/zh-CN.json

@@ -22,12 +22,14 @@
   "Plain text": "纯文本",
   "detail URL": "详情链接",
   "Details page for desktop": "桌面端详情页",
-  "Support two types of links: internal links and external links. If using an internal link, the link starts with\"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/admin”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
+  "Support two types of links: internal links and external links. If using an internal link, the link starts with \"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/admin”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
   "Mark as read": "标为已读",
   "Mark as unread": "标为未读",
   "Mark all as read": "全部标为已读",
-  "Support two types of links: internal links and external links. If using an internal link, the link starts with\"/\", for example, \"/m\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/m”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
+  "Support two types of links: internal links and external links. If using an internal link, the link starts with \"/\", for example, \"/m\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/m”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
   "Details page for mobile": "移动端详情页",
   "The message page has already been created.": "站内信页面已创建。",
-  "When select receivers from node result, only support ID of user (or IDs array of users). Others will not match any user.": "从节点结果中选择接收者时，仅支持用户ID（或用户ID数组）。其他将不匹配任何用户。"
+  "When select receivers from node result, only support ID of user (or IDs array of users). Others will not match any user.": "从节点结果中选择接收者时，仅支持用户ID（或用户ID数组）。其他将不匹配任何用户。",
+  "Close after": "关闭延时",
+  "Unit is second. Will not close automatically when set to empty.": "单位为秒。设置为空则不自动关闭。"
 }

package/dist/server/InAppNotificationChannel.d.ts

@@ -10,7 +10,8 @@ import { SendFnType, BaseNotificationChannel } from '@nocobase/plugin-notificati
 import { InAppMessageFormValues } from '../types';
 export default class InAppNotificationChannel extends BaseNotificationChannel {
     load(): Promise<void>;
-    onMessageCreatedOrUpdated: (model: any, options: any) => Promise<void>;
+    onMessageCreated: (model: any, options: any) => Promise<void>;
+    onMessageUpdated: (model: any, options: any) => Promise<void>;
     saveMessageToDB: ({ content, status, userId, title, channelName, receiveTimestamp, options, }: {
         content: string;
         userId: number;

package/dist/server/InAppNotificationChannel.js

@@ -51,10 +51,22 @@ class InAppNotificationChannel extends import_plugin_notification_manager.BaseNo
   //   this.userClientsMap = {};
   // }
   async load() {
-    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterSave`, this.onMessageCreatedOrUpdated);
+    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterCreate`, this.onMessageCreated);
+    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterUpdate`, this.onMessageUpdated);
     this.defineActions();
   }
-  onMessageCreatedOrUpdated = async (model, options) => {
+  onMessageCreated = async (model, options) => {
+    const userId = model.userId;
+    this.app.emit("ws:sendToTag", {
+      tagKey: "userId",
+      tagValue: userId,
+      message: {
+        type: "in-app-message:created",
+        payload: model.toJSON()
+      }
+    });
+  };
+  onMessageUpdated = async (model, options) => {
     const userId = model.userId;
     this.app.emit("ws:sendToTag", {
       tagKey: "userId",

package/dist/server/defineMyInAppChannels.js

@@ -97,7 +97,6 @@ function defineMyInAppChannels(app) {
           const channelsRepo = app.db.getRepository(import_plugin_notification_manager.ChannelsCollectionDefinition.name);
           try {
             const channelsRes = channelsRepo.find({
-              logging: console.log,
               limit,
               attributes: {
                 include: [

package/dist/server/defineMyInAppMessages.js

@@ -52,7 +52,6 @@ function defineMyInAppMessages(app) {
       name: channelsCollection.getRealFieldName(import_plugin_notification_manager.ChannelsCollectionDefinition.fieldNameMap.name, true)
     };
     const count = await messagesRepo.count({
-      logging: console.log,
       // @ts-ignore
       where: {
         userId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "1.9.0-alpha.9",
+  "version": "1.9.0-beta.10",
   "displayName": "Notification: In-app message",
   "displayName.zh-CN": "通知：站内信",
   "description": "It supports users in receiving real-time message notifications within the NocoBase application.",
@@ -26,5 +26,5 @@
     "@nocobase/test": "1.x",
     "react-router-dom": "^6.x"
   },
-  "gitHead": "b2527eb4d2543e211af1bbdc835740fc94338420"
+  "gitHead": "a4a5180d8e9b6bebe9df1a931c2c0f8b5c5d26e6"
 }