@things-factory/lite-menu 7.1.31 → 7.1.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/lite-menu",
-  "version": "7.1.31",
+  "version": "7.1.34",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -41,13 +41,13 @@
     "@operato/styles": "^7.0.0",
     "@operato/utils": "^7.0.0",
     "@things-factory/apptool-base": "^7.1.24",
-    "@things-factory/auth-base": "^7.1.24",
-    "@things-factory/board-service": "^7.1.29",
-    "@things-factory/board-ui": "^7.1.31",
+    "@things-factory/auth-base": "^7.1.33",
+    "@things-factory/board-service": "^7.1.34",
+    "@things-factory/board-ui": "^7.1.33",
     "@things-factory/more-base": "^7.1.24",
-    "@things-factory/personalization": "^7.1.24",
-    "@things-factory/setting-base": "^7.1.24",
+    "@things-factory/personalization": "^7.1.33",
+    "@things-factory/setting-base": "^7.1.33",
     "@things-factory/utils": "^7.1.24"
   },
-  "gitHead": "49a1f306f2f49780b6a25a9f8447969fe00d5ba3"
+  "gitHead": "22830c9e51c9fffb3c95d1d1f8cacc7706f7d2d1"
 }

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

@@ -1,8 +1,8 @@
-import { In } from 'typeorm'
+import { In, Brackets } from 'typeorm'
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
-import { User, checkPermission } from '@things-factory/auth-base'
+import { User, Role } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 
 import { LiteMenu } from './lite-menu'
@@ -43,25 +43,34 @@ export class LiteMenuQuery {
     @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<LiteMenuList> {
-    const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
+    const { domain, user } = context.state
 
-    const queryBuilder = getQueryBuilderFromListParams({
+    const me = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles']
+    })
+
+    const roles = me.roles
+      .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
+      .map(role => role.id)
+
+    const [items, total] = await getQueryBuilderFromListParams({
       repository: getRepository(LiteMenu),
       params,
       domain,
+      alias: 'menu',
       searchables: ['name', 'description']
     })
-    var [items, total] = await queryBuilder.getManyAndCount()
-
-    const filtered = []
+      .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()
 
-    for (let item of items) {
-      if (await checkPermission(item.privilege, user, domain, unsafeIP, prohibitedPrivileges)) {
-        filtered.push(item)
-      }
-    }
-
-    return { items: filtered, total: filtered.length }
+    return { items, total }
   }
 
   @FieldResolver(type => String)
@@ -79,18 +88,23 @@ export class LiteMenuQuery {
     }
   }
 
+  @FieldResolver(type => Role)
+  async role(@Root() liteMenu: LiteMenu) {
+    return liteMenu.roleId && (await getRepository(Role).findOneBy({ id: liteMenu.roleId }))
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() liteMenu: LiteMenu) {
-    return await getRepository(Domain).findOneBy({ id: liteMenu.domainId })
+    return liteMenu.domainId && (await getRepository(Domain).findOneBy({ id: liteMenu.domainId }))
   }
 
   @FieldResolver(type => User)
   async updater(@Root() liteMenu: LiteMenu): Promise<User> {
-    return await getRepository(User).findOneBy({ id: liteMenu.updaterId })
+    return liteMenu.updaterId && (await getRepository(User).findOneBy({ id: liteMenu.updaterId }))
   }
 
   @FieldResolver(type => User)
   async creator(@Root() liteMenu: LiteMenu): Promise<User> {
-    return await getRepository(User).findOneBy({ id: liteMenu.creatorId })
+    return liteMenu.creatorId && (await getRepository(User).findOneBy({ id: liteMenu.creatorId }))
   }
 }

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

@@ -1,7 +1,6 @@
 import { Field, InputType, Int, ObjectType } from 'type-graphql'
 
-import { ScalarObject } from '@things-factory/shell'
-import { Privilege, PrivilegeInput } from '@things-factory/auth-base'
+import { ScalarObject, ObjectRef } from '@things-factory/shell'
 
 import { LiteMenu } from './lite-menu'
 
@@ -34,8 +33,8 @@ export class NewLiteMenu {
   @Field({ nullable: true })
   active?: boolean
 
-  @Field(type => PrivilegeInput, { nullable: true })
-  privilege?: PrivilegeInput
+  @Field(type => ObjectRef, { nullable: true })
+  role?: ObjectRef
 
   @Field(type => ScalarObject, { nullable: true })
   labels?: any // { [lng: string]: string }
@@ -73,8 +72,8 @@ export class LiteMenuPatch {
   @Field({ nullable: true })
   active?: boolean
 
-  @Field(type => PrivilegeInput, { nullable: true })
-  privilege?: PrivilegeInput
+  @Field(type => ObjectRef, { nullable: true })
+  role?: ObjectRef
 
   @Field(type => ScalarObject, { nullable: true })
   labels?: any // { [lng: string]: string }

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

@@ -10,7 +10,7 @@ import {
   UpdateDateColumn
 } from 'typeorm'
 
-import { PrivilegeObject, User } from '@things-factory/auth-base'
+import { PrivilegeObject, User, Role } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 import { Domain, ScalarObject } from '@things-factory/shell'
 import { config } from '@things-factory/env'
@@ -95,9 +95,12 @@ export class LiteMenu {
   @Field(type => Board, { nullable: true })
   board?: Board
 
-  @Column({ type: 'simple-json', nullable: true })
-  @Field(type => PrivilegeObject, { nullable: true })
-  privilege?: PrivilegeObject
+  @ManyToOne(type => Role)
+  @Field(type => Role, { nullable: true })
+  role?: Role
+
+  @RelationId((liteMenu: LiteMenu) => liteMenu.role)
+  roleId?: string
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true, description: 'Settings for multilingual titles' })