@nocobase/plugin-data-source-main 2.0.0-alpha.9 → 2.1.0-alpha.1

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,52 +403,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
   }
   async load() {
     this.db.getRepository("collections").setApp(this.app);
-    const errorHandlerPlugin = this.app.getPlugin("error-handler");
-    errorHandlerPlugin.errorHandler.register(
-      (err) => {
-        return err instanceof import_database.UniqueConstraintError;
-      },
-      (err, ctx) => {
-        return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));
-      }
-    );
-    errorHandlerPlugin.errorHandler.register(
-      (err) => err instanceof import_field_is_depended_on_by_other.FieldIsDependedOnByOtherError,
-      (err, ctx) => {
-        ctx.status = 400;
-        ctx.body = {
-          errors: [
-            {
-              message: ctx.i18n.t("field-is-depended-on-by-other", {
-                fieldName: err.options.fieldName,
-                fieldCollectionName: err.options.fieldCollectionName,
-                dependedFieldName: err.options.dependedFieldName,
-                dependedFieldCollectionName: err.options.dependedFieldCollectionName,
-                dependedFieldAs: err.options.dependedFieldAs,
-                ns: "data-source-main"
-              })
-            }
-          ]
-        };
-      }
-    );
-    errorHandlerPlugin.errorHandler.register(
-      (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
-      (err, ctx) => {
-        ctx.status = 400;
-        ctx.body = {
-          errors: [
-            {
-              message: ctx.i18n.t("field-name-exists", {
-                name: err.value,
-                collectionName: err.collectionName,
-                ns: "data-source-main"
-              })
-            }
-          ]
-        };
-      }
-    );
+    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({
@@ -436,9 +412,10 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       }
       await next();
     });
-    this.app.resource(import_views.default);
-    this.app.actions(import_collections.default);
-    const handleFieldSource = (fields) => {
+    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, rawFields) => {
       var _a;
       for (const field of import_lodash.default.castArray(fields)) {
         if (field.get("source")) {
@@ -456,6 +433,15 @@ class PluginDataSourceMainServer extends import_server.Plugin {
           });
           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) {
@@ -470,7 +456,18 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         }
       }
       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);
+        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(((_b = ctx.action.params) == null ? void 0 : _b.paginate) == "false" ? ctx.body : ctx.body.rows, rawFields);
       }
       if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "get") {
         handleFieldSource(ctx.body);
@@ -482,6 +479,95 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       origin: this.options.packageName
     });
   }
+  registerErrorHandler() {
+    const errorHandlerPlugin = this.app.pm.get("error-handler");
+    errorHandlerPlugin.errorHandler.register(
+      (err) => {
+        return err instanceof import_database.UniqueConstraintError;
+      },
+      (err, ctx) => {
+        return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_field_is_depended_on_by_other.FieldIsDependedOnByOtherError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-is-depended-on-by-other", {
+                fieldName: err.options.fieldName,
+                fieldCollectionName: err.options.fieldCollectionName,
+                dependedFieldName: err.options.dependedFieldName,
+                dependedFieldCollectionName: err.options.dependedFieldCollectionName,
+                dependedFieldAs: err.options.dependedFieldAs,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-name-exists", {
+                name: err.value,
+                collectionName: err.collectionName,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
+    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"]
+                })}`;
+              }
+            }
+            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
+            };
+          })
+        };
+      }
+    );
+  }
   async install() {
     const dataSourcesCollection = this.app.db.getCollection("dataSources");
     if (dataSourcesCollection) {

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.9",
+  "version": "2.1.0-alpha.1",
   "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": "4a9acf96f21a3aa35bccbd188b942595b09da0a9",
+  "gitHead": "d27baf21569643d6fa83f882233f4e90eb5b89f1",
   "keywords": [
     "Data sources"
   ]