ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: call root server hook after insertNewSchema (#282)

Browse Source
This commit is contained in:
ChengLei Shao 2022-04-11 10:09:25 +08:00 committed by GitHub
parent 8b5ddf4501
commit 571b077840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,6 +264,38 @@ describe('server hooks', () => {
expect(jsonTree['properties']['child2']).not.toBeDefined();
});
it('should bind menu to role when insert new menu using insertAdjacent', async () => {
await db.getRepository('roles').create({
values: {
name: 'role1',
allowConfigure: true,
allowNewMenu: true,
},
});
const schema = {
'x-uid': 'root',
name: 'root',
properties: {},
};
await uiSchemaRepository.insert(schema);
await uiSchemaRepository.insertAdjacent('afterBegin', 'root', {
'x-uid': 'child2',
name: 'child2',
'x-server-hooks': [
{
type: 'onSelfCreate',
method: 'bindMenuToRole',
},
],
});
const role1Menus = await db.getRepository<BelongsToManyRepository>('roles.menuUiSchemas', 'role1').find();
expect(role1Menus.length).toEqual(1);
});
it('should bind menu to role when create new menu', async () => {
await db.getRepository('roles').create({
values: {

9
packages/plugin-ui-schema-storage/src/repository.ts
View File

@ -594,6 +594,7 @@ export class UiSchemaRepository extends Repository {
options.removeParentsIfNoChildren = false;
} else {
const schemaExists = await this.schemaExists(schema, { transaction });
if (schemaExists) {
schema = lodash.isString(schema) ? schema : schema['x-uid'];
} else {
@ -711,6 +712,12 @@ export class UiSchemaRepository extends Repository {
},
);
const rootNode = nodes[0];
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);
}
if (options?.returnNode) {
return nodes;
}
@ -880,7 +887,7 @@ export class UiSchemaRepository extends Repository {
// Compatible with mysql
if (this.database.sequelize.getDialect() === 'mysql') {
updateSql = `UPDATE ${treeTable} as TreeTable
updateSql = `UPDATE ${treeTable} as TreeTable
JOIN ${treeTable} as NodeInfo ON (NodeInfo.descendant = TreeTable.descendant and NodeInfo.depth = 0)
SET TreeTable.sort = TreeTable.sort + 1
WHERE TreeTable.depth = 1 AND TreeTable.ancestor = :ancestor and NodeInfo.type = :type`;