feat: bind new menu to role

packages/plugin-ui-schema-storage/src/__tests__/server-hook-impl.test.ts

@@ -1,7 +1,8 @@
 import { mockServer, MockServer } from '@nocobase/test';
-import { Database } from '@nocobase/database';
+import { BelongsToManyRepository, Database, HasManyRepository } from '@nocobase/database';
 import PluginUiSchema, { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
 import PluginCollectionManager from '@nocobase/plugin-collection-manager';
+import PluginACL from '@nocobase/plugin-acl';
 
 describe('server hooks', () => {
   let app: MockServer;
@@ -23,6 +24,7 @@ describe('server hooks', () => {
     await app.cleanDb();
     app.plugin(PluginUiSchema);
     app.plugin(PluginCollectionManager);
+    app.plugin(PluginACL);
 
     await app.loadAndInstall();
 
@@ -261,4 +263,46 @@ describe('server hooks', () => {
     expect(jsonTree['properties']['child1']).toBeDefined();
     expect(jsonTree['properties']['child2']).not.toBeDefined();
   });
+
+  it('should bind menu to role when create new menu', async () => {
+    await db.getRepository('roles').create({
+      values: {
+        name: 'role1',
+        allowConfigure: true,
+        allowNewMenu: true,
+      },
+    });
+
+    await db.getRepository('roles').create({
+      values: {
+        name: 'role2',
+        allowConfigure: true,
+        allowNewMenu: false,
+      },
+    });
+
+    const schema = {
+      'x-uid': 'root',
+      name: 'root',
+      properties: {
+        child2: {
+          'x-uid': 'child2',
+          'x-server-hooks': [
+            {
+              type: 'onSelfCreate',
+              method: 'bindMenuToRow',
+            },
+          ],
+        },
+      },
+    };
+
+    await uiSchemaRepository.insert(schema);
+
+    const role1Menus = await db.getRepository<BelongsToManyRepository>('roles.menuUiSchemas', 'role1').find();
+    expect(role1Menus.length).toEqual(1);
+
+    const role2Menus = await db.getRepository<BelongsToManyRepository>('roles.menuUiSchemas', 'role2').find();
+    expect(role2Menus.length).toEqual(0);
+  });
 });

packages/plugin-ui-schema-storage/src/__tests__/server-hook.test.ts

@@ -157,11 +157,7 @@ describe('server hooks', () => {
 
     serverHooks.register('onSelfCreate', 'afterCreateMenu', hookFn);
 
-    await uiSchemaRepository.create({
+    await uiSchemaRepository.insert(menuSchema);
-      values: {
-        schema: menuSchema,
-      },
-    });
 
     expect(hookFn).toHaveBeenCalled();
   });

packages/plugin-ui-schema-storage/src/repository.ts

@@ -438,7 +438,7 @@ export default class UiSchemaRepository extends Repository {
     }
   }
 
-  async insert(schema: any, options?) {
+  async insert(schema: any, options?: TransactionAble) {
     const nodes = UiSchemaRepository.schemaToSingleNodes(schema);
     const insertedNodes = await this.insertNodes(nodes, options);
     return this.getJsonSchema(insertedNodes[0].get('uid'), {
@@ -457,7 +457,9 @@ export default class UiSchemaRepository extends Repository {
         serverHooks,
       },
       transaction,
-      hooks: false,
+      context: {
+        disableInsertHook: true,
+      },
     });
 
     return node;

packages/plugin-ui-schema-storage/src/server-hooks/hooks/bind-menu-to-row.ts

@@ -0,0 +1,17 @@
+import { BelongsToManyRepository } from '@nocobase/database';
+
+export async function bindMenuToRow({ schemaInstance, db, options }) {
+  const { transaction } = options;
+  const addNewMenuRoles = await db.getRepository('roles').find({
+    filter: {
+      allowNewMenu: true,
+    },
+  });
+
+  for (const role of addNewMenuRoles) {
+    await db.getRepository('roles.menuUiSchemas', role.get('name')).set({
+      tk: schemaInstance.get('uid'),
+      transaction,
+    });
+  }
+}

packages/plugin-ui-schema-storage/src/server-hooks/hooks/index.ts

@@ -1,9 +1,11 @@
 import { hookFactory } from './factory';
-import { removeSchema } from './removeSchema';
+import { removeSchema } from './remove-schema';
+import { bindMenuToRow } from './bind-menu-to-row';
 
 const hooks = [
   hookFactory('onCollectionDestroy', 'removeSchema', removeSchema),
   hookFactory('onCollectionFieldDestroy', 'removeSchema', removeSchema),
+  hookFactory('onSelfCreate', 'bindMenuToRow', bindMenuToRow),
 ];
 
 export { hooks };

packages/plugin-ui-schema-storage/src/server-hooks/hooks/remove-schema.ts

@@ -1,4 +1,3 @@
-import { hookFactory } from './factory';
 import { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
 
 export async function removeSchema({ schemaInstance, options, db, params }) {

packages/plugin-ui-schema-storage/src/server-hooks/index.ts

@@ -91,17 +91,19 @@ export class ServerHooks {
   protected async onUiSchemaCreate(schemaInstance, options) {
     const { transaction } = options;
 
-    await this.findHooksAndCall(
+    const serverHooks = schemaInstance.get('serverHooks') || [];
-      {
+
-        type: 'onSelfCreate',
+    const onSelfCreateHooks = serverHooks.filter((serverHook) => serverHook.get('type') === 'onSelfCreate');
-        uid: schemaInstance.schema['x-uid'],
+
-      },
+    for (const serverHook of onSelfCreateHooks) {
-      {
+      const hookFunc = this.hooks.get('onSelfCreate')?.get(serverHook.get('method'));
+      await hookFunc({
         schemaInstance,
         options,
-      },
+        db: this.db,
-      transaction,
+        params: serverHook.get('params'),
-    );
+      });
+    }
   }
 
   protected async findHooksAndCall(hooksFilter, hooksArgs, transaction) {

packages/plugin-ui-schema-storage/src/server.ts

@@ -33,6 +33,12 @@ export default class PluginUiSchema extends Plugin {
       const { transaction } = options;
       const uiSchemaRepository = db.getCollection('ui_schemas').repository as UiSchemaRepository;
 
+      const context = options.context;
+
+      if (context?.disableInsertHook) {
+        return;
+      }
+
       await uiSchemaRepository.insert(model.toJSON(), {
         transaction,
       });