@things-factory/menu-base 7.1.24 → 7.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/menu-base",
-  "version": "7.1.24",
+  "version": "7.1.33",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,7 +24,7 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^7.1.24"
+    "@things-factory/auth-base": "^7.1.33"
   },
-  "gitHead": "1838925b39cce3caa8e49a6dd2c15796af567695"
+  "gitHead": "da463a7d7851cf47c7d4b8136e7be6690b55969e"
 }

package/server/service/menu/menu-query.ts

@@ -1,8 +1,8 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { In, Repository, SelectQueryBuilder } from 'typeorm'
+import { In, Repository, Brackets, SelectQueryBuilder } from 'typeorm'
 
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
-import { checkPermission, Role, User } from '@things-factory/auth-base'
+import { Role, User } from '@things-factory/auth-base'
 
 import { MenuButton } from '../menu-button/menu-button'
 import { MenuColumn } from '../menu-column/menu-column'
@@ -81,26 +81,34 @@ export class MenuQuery {
 
   @Query(returns => MenuList, { description: 'To fetch my own Menus' })
   async myMenus(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<MenuList> {
-    const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
+    const { domain, user } = context.state
 
-    const queryBuilder = getQueryBuilderFromListParams({
-      domain,
-      params,
-      repository: await getRepository(Menu),
-      searchables: ['name', 'description']
+    const me = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles']
     })
 
-    const [items, total] = await queryBuilder.getManyAndCount()
-
-    const filtered = []
+    const roles = me.roles
+      .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
+      .map(role => role.id)
 
-    for (let item of items) {
-      if (await checkPermission(item.privilege, user, domain, unsafeIP, prohibitedPrivileges)) {
-        filtered.push(item)
-      }
-    }
+    const [items, total] = await getQueryBuilderFromListParams({
+      repository: getRepository(Menu),
+      params,
+      domain,
+      alias: 'menu',
+      searchables: ['name', 'description']
+    })
+      .andWhere('menu.active = :active', { active: true })
+      .andWhere(
+        new Brackets(qb => {
+          qb.where('menu.role IN (:...roles)').orWhere('menu.role is null')
+        })
+      )
+      .setParameter('roles', roles)
+      .getManyAndCount()
 
-    return { items: filtered, total: filtered.length }
+    return { items, total }
   }
 
   @Query(returns => MenuList, { description: 'To fetch Menus by role' })
@@ -174,26 +182,37 @@ export class MenuQuery {
     @Arg('permittedOnly', { defaultValue: false }) permittedOnly: boolean,
     @Ctx() context: ResolverContext
   ): Promise<Menu[]> {
-    var menus =
-      menu.children ||
-      (await getRepository(Menu).findBy({
-        parent: { id: menu.id }
-      }))
-
     if (!permittedOnly) {
-      return menus
+      return (
+        menu.children ||
+        (await getRepository(Menu).findBy({
+          parent: { id: menu.id }
+        }))
+      )
     }
 
-    const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
-    const filtered = []
+    const { domain, user } = context.state
 
-    for (let item of menus) {
-      if (await checkPermission(item.privilege, user, domain, unsafeIP, prohibitedPrivileges)) {
-        filtered.push(item)
-      }
-    }
+    const me = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles']
+    })
 
-    return filtered
+    const roles = me.roles
+      .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
+      .map(role => role.id)
+
+    return await getRepository(Menu)
+      .createQueryBuilder('menu')
+      .where('menu.parent = :parentId', { id: menu.id })
+      .andWhere('menu.active = :active', { active: true })
+      .andWhere(
+        new Brackets(qb => {
+          qb.where('menu.role IN (:...roles)').orWhere('menu.role is null')
+        })
+      )
+      .setParameter('roles', roles)
+      .getMany()
   }
 
   @FieldResolver(type => [MenuButton])

package/server/service/menu/menu-type.ts

@@ -1,7 +1,6 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
 import { ObjectRef } from '@things-factory/shell'
-import { PrivilegeInput } from '@things-factory/auth-base'
 
 import { Menu } from './menu'
 
@@ -32,7 +31,6 @@ export class NewMenu {
   @Field(type => Int, { nullable: true }) fixedColumns?: number
   @Field({ nullable: true }) iconPath?: string
   @Field({ nullable: true }) role?: ObjectRef
-  @Field({ nullable: true }) privilege?: PrivilegeInput
   @Field({ nullable: true }) parent?: ObjectRef
   @Field(type => [ObjectRef], { nullable: true }) children?: ObjectRef[]
   @Field(type => [ObjectRef], { nullable: true }) buttons?: ObjectRef[]
@@ -66,7 +64,6 @@ export class MenuPatch {
   @Field(type => Int, { nullable: true }) fixedColumns?: number
   @Field({ nullable: true }) iconPath?: string
   @Field({ nullable: true }) role?: ObjectRef
-  @Field({ nullable: true }) privilege?: PrivilegeInput
   @Field({ nullable: true }) parent?: ObjectRef
   @Field(type => [ObjectRef], { nullable: true }) children?: ObjectRef[]
   @Field(type => [ObjectRef], { nullable: true }) buttons?: ObjectRef[]

package/server/service/menu/menu.ts

@@ -75,10 +75,6 @@ export class Menu {
   @Field(type => [Role], { nullable: true })
   roles?: Role[]
 
-  @Column({ type: 'simple-json', nullable: true })
-  @Field(type => PrivilegeObject, { nullable: true })
-  privilege?: PrivilegeObject
-
   @Column('int', { nullable: true })
   @Field({ nullable: true })
   rank?: number