@nocobase/plugin-notification-in-app-message 2.0.0-beta.8 → 2.0.0

package/dist/externalVersion.js

@@ -9,24 +9,24 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "2.0.0-beta.8",
-  "@nocobase/plugin-notification-manager": "2.0.0-beta.8",
-  "@nocobase/plugin-mobile": "2.0.0-beta.8",
-  "@nocobase/utils": "2.0.0-beta.8",
+  "@nocobase/client": "2.0.0",
+  "@nocobase/plugin-notification-manager": "2.0.0",
+  "@nocobase/plugin-mobile": "2.0.0",
+  "@nocobase/utils": "2.0.0",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.0.0-beta.8",
+  "@nocobase/server": "2.0.0",
   "sequelize": "6.35.2",
-  "@nocobase/actions": "2.0.0-beta.8",
-  "@nocobase/database": "2.0.0-beta.8",
+  "@nocobase/actions": "2.0.0",
+  "@nocobase/database": "2.0.0",
   "antd": "5.24.2",
-  "@nocobase/flow-engine": "2.0.0-beta.8",
+  "@nocobase/flow-engine": "2.0.0",
   "antd-style": "3.7.1",
   "@emotion/css": "11.13.0",
   "@formily/react": "2.3.7",
   "react-router-dom": "6.30.1",
   "@formily/core": "2.3.7",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/plugin-workflow": "2.0.0-beta.8",
+  "@nocobase/plugin-workflow": "2.0.0",
   "@formily/reactive": "2.3.7",
   "@formily/shared": "2.3.7"
 };

package/dist/server/InAppNotificationChannel.d.ts

@@ -12,15 +12,6 @@ export default class InAppNotificationChannel extends BaseNotificationChannel {
     load(): 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;
-        title: string;
-        channelName: string;
-        status: 'read' | 'unread';
-        receiveTimestamp?: number;
-        options?: Record<string, any>;
-    }) => Promise<any>;
     send: SendFnType<InAppMessageFormValues>;
     defineActions(): void;
 }

package/dist/server/InAppNotificationChannel.js

@@ -45,60 +45,38 @@ var import_parseUserSelectionConf = require("./parseUserSelectionConf");
 var import_defineMyInAppMessages = __toESM(require("./defineMyInAppMessages"));
 var import_defineMyInAppChannels = __toESM(require("./defineMyInAppChannels"));
 class InAppNotificationChannel extends import_plugin_notification_manager.BaseNotificationChannel {
-  // userClientsMap: Record<UserID, Record<ClientID, PassThrough>>;
-  // constructor(protected app: Application) {
-  //   super(app);
-  //   this.userClientsMap = {};
-  // }
   async load() {
     this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterCreate`, this.onMessageCreated);
+    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterBulkCreate`, this.onMessageCreated);
     this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterUpdate`, this.onMessageUpdated);
+    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterBulkUpdate`, this.onMessageUpdated);
     this.defineActions();
   }
   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()
-      }
-    });
+    const models = Array.isArray(model) ? model : [model];
+    for (const m of models) {
+      const userId = m.userId;
+      this.app.emit("ws:sendToUser", {
+        userId,
+        message: {
+          type: "in-app-message:created",
+          payload: m.toJSON()
+        }
+      });
+    }
   };
   onMessageUpdated = async (model, options) => {
-    const userId = model.userId;
-    this.app.emit("ws:sendToTag", {
-      tagKey: "userId",
-      tagValue: userId,
-      message: {
-        type: "in-app-message:updated",
-        payload: model.toJSON()
-      }
-    });
-  };
-  saveMessageToDB = async ({
-    content,
-    status,
-    userId,
-    title,
-    channelName,
-    receiveTimestamp,
-    options = {}
-  }) => {
-    const messagesRepo = this.app.db.getRepository(import_types2.InAppMessagesDefinition.name);
-    const message = await messagesRepo.create({
-      values: {
-        content,
-        title,
-        channelName,
-        status,
+    const models = Array.isArray(model) ? model : [model];
+    for (const m of models) {
+      const userId = m.userId;
+      this.app.emit("ws:sendToUser", {
         userId,
-        receiveTimestamp: receiveTimestamp ?? Date.now(),
-        options
-      }
-    });
-    return message;
+        message: {
+          type: "in-app-message:updated",
+          payload: m.toJSON()
+        }
+      });
+    }
   };
   send = async (params) => {
     const { channel, message, receivers } = params;
@@ -110,17 +88,17 @@ class InAppNotificationChannel extends import_plugin_notification_manager.BaseNo
     } else {
       userIds = (await (0, import_parseUserSelectionConf.parseUserSelectionConf)(message.receivers, userRepo)).map((i) => parseInt(i));
     }
-    await Promise.all(
-      userIds.map(async (userId) => {
-        await this.saveMessageToDB({
-          title,
-          content,
-          status: "unread",
-          userId,
-          channelName: channel.name,
-          options
-        });
-      })
+    const MessageModel = this.app.db.getModel(import_types2.InAppMessagesDefinition.name);
+    await MessageModel.bulkCreate(
+      userIds.map((userId) => ({
+        title,
+        content,
+        status: "unread",
+        userId,
+        channelName: channel.name,
+        receiveTimestamp: Date.now(),
+        options
+      }))
     );
     return { status: "success", message };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0",
   "displayName": "Notification: In-app message",
   "displayName.ru-RU": "Уведомления: Всплывающие сообщения внутри приложения",
   "displayName.zh-CN": "通知：站内信",
@@ -29,5 +29,5 @@
     "@nocobase/test": "2.x",
     "react-router-dom": "^6.x"
   },
-  "gitHead": "6bd912b1028eb8bc09a823d35e4d37b3000861b1"
+  "gitHead": "3590c0087a56f0f285a5357f43a80bdc62b11bec"
 }