@things-factory/menu-base 7.0.1-alpha.64 → 7.0.1-alpha.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/menu-base",
-  "version": "7.0.1-alpha.64",
+  "version": "7.0.1-alpha.69",
   "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 -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^7.0.1-alpha.64"
+    "@things-factory/auth-base": "^7.0.1-alpha.69"
   },
-  "gitHead": "d9d40222a2a4b8f9360ffb8baab6a78e84f84c1c"
+  "gitHead": "7dc123e788e8c2854fd0e4064cda018aac6fa34a"
 }

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 { Role, User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { checkPermission, Role, User } from '@things-factory/auth-base'
 
 import { MenuButton } from '../menu-button/menu-button'
 import { MenuColumn } from '../menu-column/menu-column'
@@ -79,6 +79,30 @@ export class MenuQuery {
     return { items, total }
   }
 
+  @Query(returns => MenuList, { description: 'To fetch my own Menus' })
+  async myMenus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuList> {
+    const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: await getRepository(Menu),
+      searchables: ['name', 'description']
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    const filtered = []
+
+    for (let item of items) {
+      if (await checkPermission(item.privilege, user, domain, unsafeIP, prohibitedPrivileges)) {
+        filtered.push(item)
+      }
+    }
+
+    return { items: filtered, total: filtered.length }
+  }
+
   @Query(returns => MenuList, { description: 'To fetch Menus by role' })
   async roleMenus(@Arg('roleId') roleId: string, @Ctx() context: ResolverContext) {
     const { domain } = context.state
@@ -145,13 +169,25 @@ export class MenuQuery {
   }
 
   @FieldResolver(type => [Menu])
-  async children(@Root() menu: Menu): Promise<Menu[]> {
-    return (
-      menu.children ||
-      (await getRepository(Menu).findBy({
-        parent: { id: menu.id }
-      }))
-    )
+  async children(@Root() menu: Menu, @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
+    }
+
+    const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
+    const filtered = []
+
+    for (let item of menus) {
+      if (await checkPermission(item.privilege, user, domain, unsafeIP, prohibitedPrivileges)) {
+        filtered.push(item)
+      }
+    }
+
+    return filtered
   }
 
   @FieldResolver(type => [MenuButton])

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

@@ -1,6 +1,7 @@
 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'
 
@@ -31,6 +32,7 @@ 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[]
@@ -64,6 +66,7 @@ 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

@@ -13,8 +13,8 @@ import {
   UpdateDateColumn
 } from 'typeorm'
 
-import { Role, User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
+import { PrivilegeObject, Role, User } from '@things-factory/auth-base'
 
 import { MenuButton } from '../menu-button/menu-button'
 import { MenuColumn } from '../menu-column/menu-column'
@@ -75,6 +75,10 @@ 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