@nocobase/plugin-data-source-main 2.0.0-alpha.7 → 2.0.0-alpha.70

package/dist/server/server.d.ts

@@ -16,6 +16,7 @@ export declare class PluginDataSourceMainServer extends Plugin {
     beforeLoad(): Promise<void>;
     private db2cm;
     load(): Promise<void>;
+    registerErrorHandler(): void;
     install(): Promise<void>;
 }
 export default PluginDataSourceMainServer;

package/dist/server/server.js

@@ -55,6 +55,10 @@ var import_beforeDestoryField = require("./hooks/beforeDestoryField");
 var import_models = require("./models");
 var import_collections = __toESM(require("./resourcers/collections"));
 var import_views = __toESM(require("./resourcers/views"));
+var import_main_data_source = __toESM(require("./resourcers/main-data-source"));
+var import_constants = require("./constants");
+var import_json_schema = require("@formily/json-schema");
+var import_lodash2 = __toESM(require("lodash"));
 class PluginDataSourceMainServer extends import_server.Plugin {
   loadFilter = {};
   db2cmCollections = [];
@@ -178,7 +182,24 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       }
     });
     this.app.db.on("fields.beforeCreate", (0, import_beforeCreateForValidateField.beforeCreateForValidateField)(this.app.db));
-    this.app.db.on("fields.afterCreate", (0, import_hooks.afterCreateForReverseField)(this.app.db));
+    this.app.db.on("fields.afterCreate", async (model, { transaction }) => {
+      const Field = this.app.db.getCollection("fields");
+      const reverseKey = model.get("reverseKey");
+      if (!reverseKey) {
+        return;
+      }
+      const reverse = await Field.model.findByPk(reverseKey, { transaction });
+      await reverse.update({ reverseKey: model.get("key") }, { hooks: false, transaction });
+      this.sendSyncMessage(
+        {
+          type: "syncCollection",
+          collectionName: model.get("collectionName")
+        },
+        {
+          transaction
+        }
+      );
+    });
     this.app.db.on("fields.beforeCreate", async (model, options) => {
       const { transaction } = options;
       const collectionName = model.get("collectionName");
@@ -357,7 +378,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     this.app.acl.allow("collectionCategories", "list", "loggedIn");
     this.app.acl.registerSnippet({
       name: `pm.data-source-manager.data-source-main`,
-      actions: ["collections:*", "collections.fields:*", "collectionCategories:*"]
+      actions: ["collections:*", "collections.fields:*", "collectionCategories:*", "mainDataSource:*"]
     });
     this.app.acl.registerSnippet({
       name: `pm.data-source-manager.collection-view `,
@@ -382,7 +403,98 @@ class PluginDataSourceMainServer extends import_server.Plugin {
   }
   async load() {
     this.db.getRepository("collections").setApp(this.app);
-    const errorHandlerPlugin = this.app.getPlugin("error-handler");
+    this.registerErrorHandler();
+    this.app.resourceManager.use(async function mergeReverseFieldWhenSaveCollectionField(ctx, next) {
+      if (ctx.action.resourceName === "collections.fields" && ["create", "update"].includes(ctx.action.actionName)) {
+        ctx.action.mergeParams({
+          updateAssociationValues: ["reverseField"]
+        });
+      }
+      await next();
+    });
+    this.app.resourceManager.define(import_views.default);
+    this.app.resourceManager.registerActionHandlers(import_collections.default);
+    this.app.resourceManager.define(import_main_data_source.default);
+    const handleFieldSource = ({
+      fields,
+      isRawValue,
+      rawFields
+    }) => {
+      import_lodash.default.castArray(fields).forEach((field, index) => {
+        var _a;
+        const source = isRawValue ? field.source : field.get("source");
+        if (!source) {
+          return;
+        }
+        const [collectionSource, fieldSource] = source.split(".");
+        const collectionField = (_a = this.app.db.getCollection(collectionSource)) == null ? void 0 : _a.getField(fieldSource);
+        if (!collectionField) {
+          return;
+        }
+        const newOptions = {};
+        import_lodash.default.merge(newOptions, import_lodash.default.omit(collectionField.options, "name"));
+        const currentValues = isRawValue ? field : field.get();
+        import_lodash.default.mergeWith(newOptions, currentValues, (objValue, srcValue) => {
+          if (srcValue === null) {
+            return objValue;
+          }
+        });
+        if (isRawValue) {
+          fields[index] = {
+            ...field,
+            ...newOptions
+          };
+        } else {
+          field.set("options", newOptions);
+        }
+        const fieldTypes = import_database.fieldTypeMap[this.db.options.dialect];
+        if (rawFields && fieldTypes) {
+          const rawField = rawFields[field.get("name")];
+          if (rawField && !import_constants.PRESET_FIELDS_INTERFACES.includes(field.get("interface"))) {
+            const mappedType = (0, import_database.extractTypeFromDefinition)(rawField.type);
+            const possibleTypes = fieldTypes[mappedType];
+            field.set("possibleTypes", possibleTypes);
+          }
+        }
+      });
+    };
+    this.app.resourceManager.use(async function handleFieldSourceMiddleware(ctx, next) {
+      var _a;
+      await next();
+      if (ctx.action.resourceName === "collections" && ctx.action.actionName == "listMeta") {
+        for (const collection of ctx.body) {
+          if (collection.view === true) {
+            const fields = collection.fields;
+            handleFieldSource({ fields, isRawValue: true });
+          }
+        }
+      }
+      if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "list") {
+        const collectionName = ctx.action.sourceId;
+        const collection = ctx.db.getCollection(collectionName);
+        let rawFields = {};
+        if (collection) {
+          try {
+            rawFields = await ctx.app.db.queryInterface.sequelizeQueryInterface.describeTable(
+              collection.getTableNameWithSchema()
+            );
+          } catch (err) {
+          }
+        }
+        handleFieldSource({ fields: ((_a = ctx.action.params) == null ? void 0 : _a.paginate) == "false" ? ctx.body : ctx.body.rows, rawFields });
+      }
+      if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "get") {
+        handleFieldSource({ fields: ctx.body });
+      }
+    });
+    this.app.db.extendCollection({
+      name: "collectionCategory",
+      dumpRules: "required",
+      origin: this.options.packageName
+    });
+  }
+  registerErrorHandler() {
+    const errorHandlerPlugin = this.app.pm.get("error-handler");
     errorHandlerPlugin.errorHandler.register(
       (err) => {
         return err instanceof import_database.UniqueConstraintError;
@@ -428,59 +540,47 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         };
       }
     );
-    this.app.resourceManager.use(async function mergeReverseFieldWhenSaveCollectionField(ctx, next) {
-      if (ctx.action.resourceName === "collections.fields" && ["create", "update"].includes(ctx.action.actionName)) {
-        ctx.action.mergeParams({
-          updateAssociationValues: ["reverseField"]
-        });
-      }
-      await next();
-    });
-    this.app.resource(import_views.default);
-    this.app.actions(import_collections.default);
-    const handleFieldSource = (fields) => {
-      var _a;
-      for (const field of import_lodash.default.castArray(fields)) {
-        if (field.get("source")) {
-          const [collectionSource, fieldSource] = field.get("source").split(".");
-          const collectionField = (_a = this.app.db.getCollection(collectionSource)) == null ? void 0 : _a.getField(fieldSource);
-          if (!collectionField) {
-            continue;
-          }
-          const newOptions = {};
-          import_lodash.default.merge(newOptions, import_lodash.default.omit(collectionField.options, "name"));
-          import_lodash.default.mergeWith(newOptions, field.get(), (objValue, srcValue) => {
-            if (srcValue === null) {
-              return objValue;
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_database.JoiValidationError,
+      (err, ctx) => {
+        const t = ctx.i18n.t;
+        ctx.status = 400;
+        ctx.body = {
+          errors: err.details.map((detail) => {
+            const context = detail.context;
+            const label = context.label;
+            if (label) {
+              const [collectionName, fieldName] = label.split(".");
+              const collection = this.db.getCollection(collectionName);
+              if (collection) {
+                const collectionTitle = import_json_schema.Schema.compile(collection.options.title, { t });
+                const field = collection.getField(fieldName);
+                const fieldOptions = import_json_schema.Schema.compile(field == null ? void 0 : field.options, { t });
+                const fieldTitle = import_lodash2.default.get(fieldOptions, "uiSchema.title", fieldName);
+                context.label = `${t(collectionTitle, {
+                  ns: ["lm-collections", "client"]
+                })}: ${t(fieldTitle, {
+                  ns: ["lm-collections", "client"]
+                })}`;
+              }
             }
-          });
-          field.set("options", newOptions);
-        }
-      }
-    };
-    this.app.resourceManager.use(async function handleFieldSourceMiddleware(ctx, next) {
-      var _a, _b;
-      await next();
-      if (ctx.action.resourceName === "collections" && ctx.action.actionName == "list" && ((_a = ctx.action.params) == null ? void 0 : _a.paginate) == "false") {
-        for (const collection of ctx.body) {
-          if (collection.get("view")) {
-            const fields = collection.fields;
-            handleFieldSource(fields);
-          }
-        }
-      }
-      if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "list") {
-        handleFieldSource(((_b = ctx.action.params) == null ? void 0 : _b.paginate) == "false" ? ctx.body : ctx.body.rows);
-      }
-      if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "get") {
-        handleFieldSource(ctx.body);
+            if (context.regex) {
+              context.regex = context.regex.source;
+            }
+            let message = ctx.i18n.t(detail.type, {
+              ...context,
+              ns: "data-source-main"
+            });
+            if (message === detail.type) {
+              message = err.message.replace(`"${label}"`, context.label);
+            }
+            return {
+              message
+            };
+          })
+        };
       }
-    });
-    this.app.db.extendCollection({
-      name: "collectionCategory",
-      dumpRules: "required",
-      origin: this.options.packageName
-    });
+    );
   }
   async install() {
     const dataSourcesCollection = this.app.db.getCollection("dataSources");

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@nocobase/plugin-data-source-main",
   "displayName": "Data source: Main",
+  "displayName.ru-RU": "Основной Источник данных",
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
+  "description.ru-RU": "Основная база данных NocoBase: поддерживает реляционные СУБД, включая PostgreSQL, MySQL, MariaDB и другие.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.70",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
+  "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -22,7 +25,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "cb012f93256f534472d3ae56e075839ca1675779",
+  "gitHead": "42556ed4b29d8410e104ffd8af4fa72c9b1bae7f",
   "keywords": [
     "Data sources"
   ]