@nocobase/plugin-data-source-main 1.9.0-beta.8 → 2.0.0-alpha.10

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.9.0-beta.8",
+  "@nocobase/client": "2.0.0-alpha.10",
   "lodash": "4.17.21",
-  "@nocobase/database": "1.9.0-beta.8",
-  "@nocobase/plugin-error-handler": "1.9.0-beta.8",
-  "@nocobase/server": "1.9.0-beta.8",
-  "@nocobase/test": "1.9.0-beta.8",
-  "@nocobase/utils": "1.9.0-beta.8",
+  "@nocobase/database": "2.0.0-alpha.10",
+  "@nocobase/plugin-error-handler": "2.0.0-alpha.10",
+  "@nocobase/server": "2.0.0-alpha.10",
+  "@nocobase/test": "2.0.0-alpha.10",
+  "@nocobase/utils": "2.0.0-alpha.10",
   "sequelize": "6.35.2",
   "dayjs": "1.11.13"
 };

package/dist/server/collections/collectionCategories.js

@@ -36,9 +36,14 @@ var collectionCategories_default = {
   migrationRules: ["overwrite", "schema-only"],
   shared: true,
   name: "collectionCategories",
-  autoGenId: true,
   sortable: true,
   fields: [
+    {
+      name: "id",
+      type: "snowflakeId",
+      primaryKey: true,
+      allowNull: false
+    },
     {
       type: "string",
       name: "name",

package/dist/server/hooks/beforeDestoryField.d.ts

@@ -1,2 +1,10 @@
+/**
+ * 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.
+ */
 import { Database } from '@nocobase/database';
 export declare function beforeDestoryField(db: Database): (model: any, opts: any) => Promise<void>;

package/dist/server/hooks/beforeDestoryField.js

@@ -32,8 +32,13 @@ module.exports = __toCommonJS(beforeDestoryField_exports);
 var import_field_is_depended_on_by_other = require("../errors/field-is-depended-on-by-other");
 function beforeDestoryField(db) {
   return async (model, opts) => {
+    var _a;
     const { transaction } = opts;
     const { name, type, collectionName } = model.get();
+    const collection = db.getCollection(model.get("collectionName"));
+    if ((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.uiManageable) {
+      throw new Error("Cannot remove a UI manageable field");
+    }
     if (["belongsTo", "hasOne", "hasMany", "belongsToMany"].includes(type)) {
       return;
     }

package/dist/server/repositories/collection-repository.d.ts

@@ -15,6 +15,7 @@ export declare class CollectionRepository extends Repository {
     private app;
     setApp(app: any): void;
     load(options?: LoadOptions): Promise<void>;
+    db2cmCollections(collectionNames: string[]): Promise<void>;
     db2cm(collectionName: string): Promise<void>;
 }
 export {};

package/dist/server/repositories/collection-repository.js

@@ -140,6 +140,9 @@ class CollectionRepository extends import_database.Repository {
     }
     this.database.logger.debug("collections loaded");
   }
+  async db2cmCollections(collectionNames) {
+    await Promise.all(collectionNames.map((collectionName) => this.db2cm(collectionName)));
+  }
   async db2cm(collectionName) {
     const collection = this.database.getCollection(collectionName);
     if (await this.findOne({ filter: { name: collectionName } })) {

package/dist/server/server.d.ts

@@ -10,9 +10,11 @@ import { Filter } from '@nocobase/database';
 import { Plugin } from '@nocobase/server';
 export declare class PluginDataSourceMainServer extends Plugin {
     private loadFilter;
+    private db2cmCollections;
     setLoadFilter(filter: Filter): void;
     handleSyncMessage(message: any): Promise<void>;
     beforeLoad(): Promise<void>;
+    private db2cm;
     load(): Promise<void>;
     install(): Promise<void>;
 }

package/dist/server/server.js

@@ -57,6 +57,7 @@ var import_collections = __toESM(require("./resourcers/collections"));
 var import_views = __toESM(require("./resourcers/views"));
 class PluginDataSourceMainServer extends import_server.Plugin {
   loadFilter = {};
+  db2cmCollections = [];
   setLoadFilter(filter) {
     this.loadFilter = filter;
   }
@@ -128,6 +129,9 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       }
     );
     this.app.db.on("collections.beforeDestroy", async (model, options) => {
+      if (model.options.uiManageable) {
+        throw new Error("Cannot remove a UI manageable collection");
+      }
       const removeOptions = {};
       if (options.transaction) {
         removeOptions["transaction"] = options.transaction;
@@ -359,6 +363,22 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       name: `pm.data-source-manager.collection-view `,
       actions: ["dbViews:*"]
     });
+    this.app.db.on("afterDefineCollection", async (collection) => {
+      var _a;
+      if ((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.uiManageable) {
+        this.db2cmCollections.push(collection.name);
+      }
+    });
+    this.app.on("afterEnablePlugin", this.db2cm.bind(this));
+    this.app.on("afterInstall", this.db2cm.bind(this));
+    this.app.on("afterUpgrade", this.db2cm.bind(this));
+  }
+  async db2cm() {
+    if (this.db2cmCollections.length) {
+      await this.app.db.getRepository("collections").db2cmCollections(this.db2cmCollections);
+      this.log.info(`collections synced to collection manager: ${this.db2cmCollections.join(", ")}`);
+      this.db2cmCollections = [];
+    }
   }
   async load() {
     this.db.getRepository("collections").setApp(this.app);

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.9.0-beta.8",
+  "version": "2.0.0-alpha.10",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
@@ -14,15 +14,15 @@
     "toposort": "^2.0.2"
   },
   "peerDependencies": {
-    "@nocobase/client": "1.x",
-    "@nocobase/database": "1.x",
-    "@nocobase/plugin-error-handler": "1.x",
-    "@nocobase/plugin-field-sort": "1.x",
-    "@nocobase/server": "1.x",
-    "@nocobase/test": "1.x",
-    "@nocobase/utils": "1.x"
+    "@nocobase/client": "2.x",
+    "@nocobase/database": "2.x",
+    "@nocobase/plugin-error-handler": "2.x",
+    "@nocobase/plugin-field-sort": "2.x",
+    "@nocobase/server": "2.x",
+    "@nocobase/test": "2.x",
+    "@nocobase/utils": "2.x"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8",
+  "gitHead": "6422cfb6fa6c8450de2efa3294fd29a28b228990",
   "keywords": [
     "Data sources"
   ]