@nocobase/plugin-ui-schema-storage 0.11.0-alpha.1 → 0.11.1-alpha.1

package/lib/server/collections/uiSchemaTemplates.js

@@ -22,7 +22,8 @@ var _default = (0, _database().defineCollection)({
     primaryKey: true
   }, {
     type: 'string',
-    name: 'name'
+    name: 'name',
+    translation: true
   }, {
     type: 'string',
     name: 'componentName'

package/lib/server/repository.js

@@ -346,6 +346,9 @@ class UiSchemaRepository extends _database().Repository {
           transaction,
           hooks: false
         });
+        if (newSchema['x-server-hooks']) {
+          yield _this7.database.emitAsync(`${_this7.collection.name}.afterSave`, s, options);
+        }
         return;
       }
       const oldTree = yield _this7.getJsonSchema(rootUid, {
@@ -406,6 +409,11 @@ class UiSchemaRepository extends _database().Repository {
         hooks: false,
         transaction
       });
+      if (schema['x-server-hooks']) {
+        yield _this9.database.emitAsync(`${_this9.collection.name}.afterSave`, nodeModel, {
+          transaction
+        });
+      }
     })();
   }
   childrenCount(uid, transaction) {
@@ -788,6 +796,7 @@ class UiSchemaRepository extends _database().Repository {
           transaction
         });
         yield _this28.database.emitAsync(`${_this28.collection.name}.afterCreateWithAssociations`, rootModel, options);
+        yield _this28.database.emitAsync(`${_this28.collection.name}.afterSave`, rootModel, options);
       }
       if (options !== null && options !== void 0 && options.returnNode) {
         return nodes;

package/lib/server/server-hooks/index.d.ts

@@ -1,5 +1,5 @@
 import { Database } from '@nocobase/database';
-export type HookType = 'onSelfDestroy' | 'onCollectionDestroy' | 'onCollectionFieldDestroy' | 'onAnyCollectionFieldDestroy' | 'onSelfCreate' | 'onSelfMove';
+export type HookType = 'onSelfDestroy' | 'onCollectionDestroy' | 'onCollectionFieldDestroy' | 'onAnyCollectionFieldDestroy' | 'onSelfCreate' | 'onSelfSave' | 'onSelfMove';
 export declare class ServerHooks {
     protected db: Database;
     hooks: Map<HookType, Map<string, any>>;
@@ -12,6 +12,7 @@ export declare class ServerHooks {
     protected onAnyCollectionFieldDestroy(fieldModel: any, options: any): Promise<void>;
     protected onCollectionFieldDestroy(fieldModel: any, options: any): Promise<void>;
     protected onUiSchemaCreate(schemaInstance: any, options: any): Promise<void>;
+    protected onUiSchemaSave(schemaInstance: any, options: any): Promise<void>;
     protected findHooksAndCall(hooksFilter: any, hooksArgs: any, transaction: any): Promise<void>;
     /**
      * register a server hook function
@@ -20,4 +21,5 @@ export declare class ServerHooks {
      * @param hookFunc server hook function
      */
     register(type: HookType, name: string, hookFunc: any): void;
+    remove(type: HookType, name: string): void;
 }

package/lib/server/server-hooks/index.js

@@ -61,6 +61,14 @@ class ServerHooks {
         return _ref4.apply(this, arguments);
       };
     }());
+    this.db.on('uiSchemas.afterSave', /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator(function* (model, options) {
+        yield _this.onUiSchemaSave(model, options);
+      });
+      return function (_x9, _x10) {
+        return _ref5.apply(this, arguments);
+      };
+    }());
   }
   callSchemaInstanceHooksByType(schemaInstance, options, type) {
     var _this2 = this;
@@ -74,7 +82,7 @@ class ServerHooks {
           var _this2$hooks$get;
           const hook = _step.value;
           const hookFunc = (_this2$hooks$get = _this2.hooks.get(type)) === null || _this2$hooks$get === void 0 ? void 0 : _this2$hooks$get.get(hook['method']);
-          yield hookFunc({
+          yield hookFunc === null || hookFunc === void 0 ? void 0 : hookFunc({
             schemaInstance,
             options,
             db: _this2.db,
@@ -143,10 +151,16 @@ class ServerHooks {
       yield _this7.callSchemaInstanceHooksByType(schemaInstance, options, 'onSelfCreate');
     })();
   }
-  findHooksAndCall(hooksFilter, hooksArgs, transaction) {
+  onUiSchemaSave(schemaInstance, options) {
     var _this8 = this;
     return _asyncToGenerator(function* () {
-      const hooks = yield _this8.db.getRepository('uiSchemaServerHooks').find({
+      yield _this8.callSchemaInstanceHooksByType(schemaInstance, options, 'onSelfSave');
+    })();
+  }
+  findHooksAndCall(hooksFilter, hooksArgs, transaction) {
+    var _this9 = this;
+    return _asyncToGenerator(function* () {
+      const hooks = yield _this9.db.getRepository('uiSchemaServerHooks').find({
         filter: hooksFilter,
         appends: ['uiSchema'],
         transaction
@@ -155,14 +169,14 @@ class ServerHooks {
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _this8$hooks$get;
+          var _this9$hooks$get;
           const hookRecord = _step2.value;
           const hoodMethodName = hookRecord.get('method');
-          const hookFunc = (_this8$hooks$get = _this8.hooks.get(hookRecord.get('type'))) === null || _this8$hooks$get === void 0 ? void 0 : _this8$hooks$get.get(hoodMethodName);
+          const hookFunc = (_this9$hooks$get = _this9.hooks.get(hookRecord.get('type'))) === null || _this9$hooks$get === void 0 ? void 0 : _this9$hooks$get.get(hoodMethodName);
           if (hookFunc) {
             yield hookFunc(_objectSpread(_objectSpread({}, hooksArgs), {}, {
               schemaInstance: hookRecord.uiSchema,
-              db: _this8.db,
+              db: _this9.db,
               params: hookRecord.get('params')
             }));
           }
@@ -187,5 +201,12 @@ class ServerHooks {
     const hookTypeMap = this.hooks.get(type);
     hookTypeMap.set(name, hookFunc);
   }
+  remove(type, name) {
+    if (!this.hooks.has(type)) {
+      return;
+    }
+    const hookTypeMap = this.hooks.get(type);
+    hookTypeMap.delete(name);
+  }
 }
 exports.ServerHooks = ServerHooks;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "UI schema",
   "description": "A plugin used for managing page UI schemas.",
   "description.zh-CN": "UI schema 配置。",
-  "version": "0.11.0-alpha.1",
+  "version": "0.11.1-alpha.1",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "files": [
@@ -20,16 +20,16 @@
   ],
   "devDependencies": {
     "@formily/json-schema": "2.2.26",
-    "@nocobase/actions": "0.11.0-alpha.1",
-    "@nocobase/cache": "0.11.0-alpha.1",
-    "@nocobase/client": "0.11.0-alpha.1",
-    "@nocobase/database": "0.11.0-alpha.1",
-    "@nocobase/plugin-error-handler": "0.11.0-alpha.1",
-    "@nocobase/plugin-users": "0.11.0-alpha.1",
-    "@nocobase/resourcer": "0.11.0-alpha.1",
-    "@nocobase/server": "0.11.0-alpha.1",
-    "@nocobase/test": "0.11.0-alpha.1",
-    "@nocobase/utils": "0.11.0-alpha.1"
+    "@nocobase/actions": "0.11.1-alpha.1",
+    "@nocobase/cache": "0.11.1-alpha.1",
+    "@nocobase/client": "0.11.1-alpha.1",
+    "@nocobase/database": "0.11.1-alpha.1",
+    "@nocobase/plugin-error-handler": "0.11.1-alpha.1",
+    "@nocobase/plugin-users": "0.11.1-alpha.1",
+    "@nocobase/resourcer": "0.11.1-alpha.1",
+    "@nocobase/server": "0.11.1-alpha.1",
+    "@nocobase/test": "0.11.1-alpha.1",
+    "@nocobase/utils": "0.11.1-alpha.1"
   },
-  "gitHead": "7581b6d3a3a54f09f06a9effb7e3e65328281b2b"
+  "gitHead": "9ed1dba520bc5f3a7cb1255ea8d92ccbefc11bc8"
 }

package/src/server/collections/uiSchemaTemplates.ts

@@ -14,6 +14,7 @@ export default defineCollection({
     {
       type: 'string',
       name: 'name',
+      translation: true,
     },
     {
       type: 'string',

package/src/server/repository.ts

@@ -341,6 +341,9 @@ export class UiSchemaRepository extends Repository {
       s.set('schema', { ...s.toJSON(), ...newSchema });
       // console.log(s.toJSON());
       await s.save({ transaction, hooks: false });
+      if (newSchema['x-server-hooks']) {
+        await this.database.emitAsync(`${this.collection.name}.afterSave`, s, options);
+      }
       return;
     }
     const oldTree = await this.getJsonSchema(rootUid, { transaction });
@@ -389,6 +392,10 @@ export class UiSchemaRepository extends Repository {
         transaction,
       },
     );
+
+    if (schema['x-server-hooks']) {
+      await this.database.emitAsync(`${this.collection.name}.afterSave`, nodeModel, { transaction });
+    }
   }
 
   protected async childrenCount(uid, transaction) {
@@ -806,6 +813,7 @@ export class UiSchemaRepository extends Repository {
     if (rootNode['x-server-hooks']) {
       const rootModel = await this.findOne({ filter: { 'x-uid': rootNode['x-uid'] }, transaction });
       await this.database.emitAsync(`${this.collection.name}.afterCreateWithAssociations`, rootModel, options);
+      await this.database.emitAsync(`${this.collection.name}.afterSave`, rootModel, options);
     }
 
     if (options?.returnNode) {

package/src/server/server-hooks/index.ts

@@ -8,6 +8,7 @@ export type HookType =
   | 'onCollectionFieldDestroy'
   | 'onAnyCollectionFieldDestroy'
   | 'onSelfCreate'
+  | 'onSelfSave'
   | 'onSelfMove';
 
 export class ServerHooks {
@@ -39,6 +40,10 @@ export class ServerHooks {
     this.db.on('uiSchemaMove', async (model, options) => {
       await this.onUiSchemaMove(model, options);
     });
+
+    this.db.on('uiSchemas.afterSave', async (model, options) => {
+      await this.onUiSchemaSave(model, options);
+    });
   }
 
   protected async callSchemaInstanceHooksByType(schemaInstance, options, type: HookType) {
@@ -48,7 +53,7 @@ export class ServerHooks {
 
     for (const hook of hooks) {
       const hookFunc = this.hooks.get(type)?.get(hook['method']);
-      await hookFunc({
+      await hookFunc?.({
         schemaInstance,
         options,
         db: this.db,
@@ -117,6 +122,10 @@ export class ServerHooks {
     await this.callSchemaInstanceHooksByType(schemaInstance, options, 'onSelfCreate');
   }
 
+  protected async onUiSchemaSave(schemaInstance, options) {
+    await this.callSchemaInstanceHooksByType(schemaInstance, options, 'onSelfSave');
+  }
+
   protected async findHooksAndCall(hooksFilter, hooksArgs, transaction) {
     const hooks = (await this.db.getRepository('uiSchemaServerHooks').find({
       filter: hooksFilter,
@@ -153,4 +162,13 @@ export class ServerHooks {
     const hookTypeMap = this.hooks.get(type);
     hookTypeMap.set(name, hookFunc);
   }
+
+  remove(type: HookType, name: string) {
+    if (!this.hooks.has(type)) {
+      return;
+    }
+
+    const hookTypeMap = this.hooks.get(type);
+    hookTypeMap.delete(name);
+  }
 }