@things-factory/menu-base 4.0.0-y.0 → 4.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/entities/menu.js +2 -2
- package/dist-server/entities/menu.js.map +1 -1
- package/dist-server/graphql/resolvers/menu/menu-query.js +1 -1
- package/dist-server/graphql/resolvers/menu/menu-query.js.map +1 -1
- package/dist-server/graphql/resolvers/menu/update-menu.js +4 -4
- package/dist-server/graphql/resolvers/menu/update-menu.js.map +1 -1
- package/dist-server/graphql/resolvers/menu/update-role-menu.js +2 -2
- package/dist-server/graphql/resolvers/menu/update-role-menu.js.map +1 -1
- package/dist-server/graphql/types/menu/menu-patch.js +1 -1
- package/dist-server/graphql/types/menu/menu.js +1 -1
- package/dist-server/graphql/types/menu/new-menu.js +1 -1
- package/package.json +3 -3
- package/server/entities/menu.ts +2 -2
- package/server/graphql/resolvers/menu/menu-query.ts +1 -1
- package/server/graphql/resolvers/menu/update-menu.ts +4 -4
- package/server/graphql/resolvers/menu/update-role-menu.ts +2 -2
- package/server/graphql/types/menu/menu-patch.ts +1 -1
- package/server/graphql/types/menu/menu.ts +1 -1
- package/server/graphql/types/menu/new-menu.ts +1 -1
|
@@ -37,13 +37,13 @@ __decorate([
|
|
|
37
37
|
__metadata("design:type", String)
|
|
38
38
|
], Menu.prototype, "description", void 0);
|
|
39
39
|
__decorate([
|
|
40
|
-
(0, typeorm_1.ManyToOne)(type => Menu_1, parent => parent.
|
|
40
|
+
(0, typeorm_1.ManyToOne)(type => Menu_1, parent => parent.children, { nullable: true }),
|
|
41
41
|
__metadata("design:type", Menu)
|
|
42
42
|
], Menu.prototype, "parent", void 0);
|
|
43
43
|
__decorate([
|
|
44
44
|
(0, typeorm_1.OneToMany)(type => Menu_1, child => child.parent),
|
|
45
45
|
__metadata("design:type", Array)
|
|
46
|
-
], Menu.prototype, "
|
|
46
|
+
], Menu.prototype, "children", void 0);
|
|
47
47
|
__decorate([
|
|
48
48
|
(0, typeorm_1.Column)({
|
|
49
49
|
nullable: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../server/entities/menu.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAsD;AACtD,iDAA8C;AAC9C,qCAWgB;AAChB,+CAA0C;AAC1C,+CAA0C;AAO1C,IAAa,IAAI,YAAjB,MAAa,IAAI;CA2JhB,CAAA;AAzJC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gCACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;oCAAA;AAGd;IADC,IAAA,gBAAM,GAAE;;kCACG;AAKZ;IAHC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;;yCACiB;AAGnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,MAAI,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../server/entities/menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/menu/menu-query.ts"],"names":[],"mappings":";;;AAAA,iDAA4E;AAC5E,qCAAuD;AACvD,yDAAgD;AAChD,gDAA8E;AAEjE,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,IAAI,CAAC,CAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO;QAChC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,OAAO,MAAM,IAAA,uBAAa,EAAC,eAAU,CAAC,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACrB,SAAS,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC;SACrD,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACjD,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QACjD,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAA;QAEnD,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,eAAU,CAAC,CAAC,YAAY,iCAC5D,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,EAC9D,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK;aACZ,IACD,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,CAAM,EAAE,EAAE,MAAM,EAAsB,EAAE,OAAY;QAClE,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,MAAM,QAAQ,GAA2B,IAAA,uBAAa,EAAC,eAAU,CAAC,CAAA;QAClE,MAAM,KAAK,GAAiB,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;QACtG,MAAM,IAAI,GAAS,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QAEvF,IAAI,aAAa,GAAiB,EAAE,CAAA;QAEpC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBAEnD,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBACjC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBACzB;aACF;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,CAAC,MAAM,EAAE,CAAA;IAC9D,CAAC;CACF,CAAA;AAEY,QAAA,IAAI,GAAG;IAClB,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"menu-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/menu/menu-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,14 @@ async function updateMenu(id, patch, domain, user, tx) {
|
|
|
14
14
|
const menuRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Menu)) || (0, typeorm_1.getRepository)(entities_1.Menu);
|
|
15
15
|
const menu = await menuRepo.findOne({
|
|
16
16
|
where: { domain, id },
|
|
17
|
-
relations: ['
|
|
17
|
+
relations: ['children', 'parent']
|
|
18
18
|
});
|
|
19
19
|
if ((_a = patch === null || patch === void 0 ? void 0 : patch.parent) === null || _a === void 0 ? void 0 : _a.id) {
|
|
20
20
|
patch.parent = await menuRepo.findOne(patch.parent.id);
|
|
21
21
|
}
|
|
22
|
-
if ((_b = patch === null || patch === void 0 ? void 0 : patch.
|
|
23
|
-
const childrenIds = patch.
|
|
24
|
-
patch.
|
|
22
|
+
if ((_b = patch === null || patch === void 0 ? void 0 : patch.children) === null || _b === void 0 ? void 0 : _b.length) {
|
|
23
|
+
const childrenIds = patch.children.map((children) => children.id);
|
|
24
|
+
patch.children = await menuRepo.findByIds(childrenIds);
|
|
25
25
|
}
|
|
26
26
|
return await menuRepo.save(Object.assign(Object.assign(Object.assign({}, menu), patch), { updater: user }));
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-menu.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/menu/update-menu.ts"],"names":[],"mappings":";;;AAEA,qCAAkE;AAClE,gDAAwC;AAE3B,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,UAAU,CAAC,CAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,OAAY;QAClD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,OAAO,MAAM,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACtD,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,UAAU,CAC9B,EAAU,EACV,KAAW,EACX,MAAc,EACd,IAAU,EACV,EAAkB;;IAElB,MAAM,QAAQ,GAAqB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,eAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,eAAI,CAAC,CAAA;IAEjF,MAAM,IAAI,GAAS,MAAM,QAAQ,CAAC,OAAO,CAAC;QACxC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrB,SAAS,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"update-menu.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/menu/update-menu.ts"],"names":[],"mappings":";;;AAEA,qCAAkE;AAClE,gDAAwC;AAE3B,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,UAAU,CAAC,CAAM,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,OAAY;QAClD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,OAAO,MAAM,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACtD,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,UAAU,CAC9B,EAAU,EACV,KAAW,EACX,MAAc,EACd,IAAU,EACV,EAAkB;;IAElB,MAAM,QAAQ,GAAqB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,eAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,eAAI,CAAC,CAAA;IAEjF,MAAM,IAAI,GAAS,MAAM,QAAQ,CAAC,OAAO,CAAC;QACxC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QACrB,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;KAClC,CAAC,CAAA;IAEF,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,0CAAE,EAAE,EAAE;QACrB,KAAK,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;KACvD;IAED,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM,EAAE;QAC3B,MAAM,WAAW,GAAa,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAc,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QACjF,KAAK,CAAC,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;KACvD;IAED,OAAO,MAAM,QAAQ,CAAC,IAAI,+CACrB,IAAI,GACJ,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;AACJ,CAAC;AA5BD,gCA4BC"}
|
|
@@ -33,9 +33,9 @@ async function updateRoleMenus(roleId, parentMenuId, isCheckedAll, domain, tx) {
|
|
|
33
33
|
const roleRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(auth_base_1.Role)) || (0, typeorm_1.getRepository)(auth_base_1.Role);
|
|
34
34
|
const targetParentMenu = await menuRepo.findOne({
|
|
35
35
|
where: { domain, id: parentMenuId },
|
|
36
|
-
relations: ['
|
|
36
|
+
relations: ['children', 'children.roles']
|
|
37
37
|
});
|
|
38
|
-
let childMenus = targetParentMenu.
|
|
38
|
+
let childMenus = targetParentMenu.children;
|
|
39
39
|
const targetRole = await roleRepo.findOne({ where: { domain, id: roleId } });
|
|
40
40
|
if (isCheckedAll) {
|
|
41
41
|
childMenus.forEach(async (child) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-role-menu.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/menu/update-role-menu.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,qCAAkE;AAClE,gDAAwC;AAE3B,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,OAAY;QAChF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAC9E,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,OAAY;QAChF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,OAAO,MAAM,eAAe,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAC9E,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,YAAoB,EACpB,aAAsB,EACtB,MAAc,EACd,EAAkB;IAElB,MAAM,QAAQ,GAAqB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,eAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,eAAI,CAAC,CAAA;IACjF,MAAM,QAAQ,GAAqB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,gBAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAA;IAEjF,MAAM,IAAI,GAAS,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACxG,MAAM,UAAU,GAAS,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IAElF,IAAI,aAAa,EAAE;QACjB,IAAI,CAAC,KAAK,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;KACtE;SAAM;QACL,IAAI,CAAC,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;KACtD;IAED,OAAO,MAAM,QAAQ,CAAC,IAAI,mBACrB,IAAI,EACP,CAAA;AACJ,CAAC;AAtBD,wCAsBC;AAEM,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,YAAoB,EACpB,YAAqB,EACrB,MAAc,EACd,EAAkB;IAElB,MAAM,QAAQ,GAAqB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,eAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,eAAI,CAAC,CAAA;IACjF,MAAM,QAAQ,GAAqB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,gBAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAA;IAEjF,MAAM,gBAAgB,GAAS,MAAM,QAAQ,CAAC,OAAO,CAAC;QACpD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE;QACnC,SAAS,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"update-role-menu.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/menu/update-role-menu.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/menu-base",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.5",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^4.0.
|
|
27
|
+
"@things-factory/auth-base": "^4.0.5"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "b7b2976818dceab74a34903499d408eed5d45b04"
|
|
30
30
|
}
|
package/server/entities/menu.ts
CHANGED
|
@@ -35,11 +35,11 @@ export class Menu {
|
|
|
35
35
|
})
|
|
36
36
|
description: string
|
|
37
37
|
|
|
38
|
-
@ManyToOne(type => Menu, parent => parent.
|
|
38
|
+
@ManyToOne(type => Menu, parent => parent.children, { nullable: true })
|
|
39
39
|
parent: Menu
|
|
40
40
|
|
|
41
41
|
@OneToMany(type => Menu, child => child.parent)
|
|
42
|
-
|
|
42
|
+
children: Menu[]
|
|
43
43
|
|
|
44
44
|
@Column({
|
|
45
45
|
nullable: true
|
|
@@ -22,16 +22,16 @@ export async function updateMenu(
|
|
|
22
22
|
|
|
23
23
|
const menu: Menu = await menuRepo.findOne({
|
|
24
24
|
where: { domain, id },
|
|
25
|
-
relations: ['
|
|
25
|
+
relations: ['children', 'parent']
|
|
26
26
|
})
|
|
27
27
|
|
|
28
28
|
if (patch?.parent?.id) {
|
|
29
29
|
patch.parent = await menuRepo.findOne(patch.parent.id)
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
if (patch?.
|
|
33
|
-
const childrenIds: string[] = patch.
|
|
34
|
-
patch.
|
|
32
|
+
if (patch?.children?.length) {
|
|
33
|
+
const childrenIds: string[] = patch.children.map((children: Menu) => children.id)
|
|
34
|
+
patch.children = await menuRepo.findByIds(childrenIds)
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
return await menuRepo.save({
|
|
@@ -53,9 +53,9 @@ export async function updateRoleMenus(
|
|
|
53
53
|
|
|
54
54
|
const targetParentMenu: Menu = await menuRepo.findOne({
|
|
55
55
|
where: { domain, id: parentMenuId },
|
|
56
|
-
relations: ['
|
|
56
|
+
relations: ['children', 'children.roles']
|
|
57
57
|
})
|
|
58
|
-
let childMenus: Menu[] = targetParentMenu.
|
|
58
|
+
let childMenus: Menu[] = targetParentMenu.children
|
|
59
59
|
|
|
60
60
|
const targetRole: Role = await roleRepo.findOne({ where: { domain, id: roleId } })
|
|
61
61
|
|