@nocobase/plugin-notification-manager 1.4.0-alpha.20241105053324 → 1.4.0-alpha.3

package/dist/externalVersion.js

@@ -10,16 +10,16 @@
 module.exports = {
   "react": "18.2.0",
   "antd": "5.12.8",
-  "@nocobase/client": "1.4.0-alpha.20241105053324",
-  "@nocobase/utils": "1.4.0-alpha.20241105053324",
-  "@nocobase/server": "1.4.0-alpha.20241105053324",
-  "@nocobase/logger": "1.4.0-alpha.20241105053324",
+  "@nocobase/client": "1.4.0-alpha.3",
+  "@nocobase/utils": "1.4.0-alpha.3",
+  "@nocobase/server": "1.4.0-alpha.3",
+  "@nocobase/logger": "1.4.0-alpha.3",
   "@formily/react": "2.3.0",
   "@formily/core": "2.3.0",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "1.4.0-alpha.20241105053324",
+  "@nocobase/database": "1.4.0-alpha.3",
   "@formily/shared": "2.3.2",
   "@ant-design/icons": "5.2.6",
   "@formily/antd-v5": "1.2.2",
-  "@nocobase/plugin-workflow": "1.4.0-alpha.20241105053324"
+  "@nocobase/plugin-workflow": "1.4.0-alpha.3"
 };

package/dist/index.d.ts

@@ -6,4 +6,4 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export { default, COLLECTION_NAME, ChannelsCollectionDefinition, BaseNotificationChannel, parseUserSelectionConfig, } from './server';
+export { default, COLLECTION_NAME, ChannelsCollectionDefinition, BaseNotificationChannel, parseUserSelectionConfig, SendFnType, } from './server';

package/dist/index.js

@@ -39,6 +39,7 @@ __export(src_exports, {
   BaseNotificationChannel: () => import_server.BaseNotificationChannel,
   COLLECTION_NAME: () => import_server.COLLECTION_NAME,
   ChannelsCollectionDefinition: () => import_server.ChannelsCollectionDefinition,
+  SendFnType: () => import_server.SendFnType,
   default: () => import_server.default,
   parseUserSelectionConfig: () => import_server.parseUserSelectionConfig
 });
@@ -49,5 +50,6 @@ var import_server = __toESM(require("./server"));
   BaseNotificationChannel,
   COLLECTION_NAME,
   ChannelsCollectionDefinition,
+  SendFnType,
   parseUserSelectionConfig
 });

package/dist/server/manager.js

@@ -32,6 +32,7 @@ __export(manager_exports, {
 module.exports = __toCommonJS(manager_exports);
 var import_utils = require("@nocobase/utils");
 var import_constant = require("../constant");
+var import_compile = require("./utils/compile");
 class NotificationManager {
   plugin;
   channelTypes = new import_utils.Registry();
@@ -48,10 +49,11 @@ class NotificationManager {
   async send(params) {
     this.plugin.logger.info("receive sending message request", params);
     const channelsRepo = this.plugin.app.db.getRepository(import_constant.COLLECTION_NAME.channels);
+    const messageData = { ...params.receivers ? { receivers: params.receivers } : {}, ...params.message };
     const logData = {
       triggerFrom: params.triggerFrom,
       channelName: params.channelName,
-      message: params.message
+      message: messageData
     };
     try {
       const channel = await channelsRepo.findOne({ filterByTk: params.channelName });
@@ -60,6 +62,7 @@ class NotificationManager {
         const instance = new Channel(this.plugin.app);
         logData.channelTitle = channel.title;
         logData.notificationType = channel.notificationType;
+        logData.receivers = params.receivers;
         const result = await instance.send({ message: params.message, channel, receivers: params.receivers });
         logData.status = result.status;
         logData.reason = result.reason;
@@ -78,8 +81,9 @@ class NotificationManager {
     }
   }
   async sendToUsers(options) {
-    const { userIds, channels, message, data } = options;
     this.plugin.logger.info(`notificationManager.sendToUsers options: ${JSON.stringify(options)}`);
+    const { userIds, channels, message: template = {}, data = {} } = options;
+    const message = (0, import_compile.compile)(template, data);
     return await Promise.all(
       channels.map(
         (channelName) => this.send({ channelName, message, triggerFrom: "sendToUsers", receivers: { value: userIds, type: "userId" } })

package/dist/server/utils/compile.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare function compile(template: Record<string, any>, data: Record<string, any>): Record<string, any>;

package/dist/server/utils/compile.js

@@ -0,0 +1,58 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var compile_exports = {};
+__export(compile_exports, {
+  compile: () => compile
+});
+module.exports = __toCommonJS(compile_exports);
+var import_utils = require("@nocobase/utils");
+function compile(template, data) {
+  if (!template) {
+    return {};
+  }
+  const result = Object.keys(template).reduce((object, key) => {
+    let c;
+    let value = object[key];
+    switch (typeof template[key]) {
+      case "object":
+        value = compile(template[key], data);
+        break;
+      case "string":
+        c = import_utils.Handlebars.compile(template[key]);
+        value = c(data);
+        break;
+      default:
+        break;
+    }
+    return Object.assign(object, { [key]: value });
+  }, {});
+  return result;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  compile
+});

package/package.json

@@ -4,7 +4,7 @@
   "description": "Provides a unified management service that includes channel configuration, logging, and other features, supporting the configuration of various notification channels, including in-app message and email.",
   "displayName.zh-CN": "通知管理",
   "description.zh-CN": "提供统一的管理服务，涵盖渠道配置、日志记录等功能，支持多种通知渠道的配置，包括站内信和电子邮件等。",
-  "version": "1.4.0-alpha.20241105053324",
+  "version": "1.4.0-alpha.3",
   "main": "dist/server/index.js",
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -29,5 +29,5 @@
   "keywords": [
     "Notification"
   ],
-  "gitHead": "a6e647971c02c1ffb443e2dc2c230ca2719e3319"
+  "gitHead": "9268a5b29cbbe9f83255e5cd66fa82f012aab46a"
 }