@things-factory/menu-base 7.0.0-alpha.8 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/menu-base",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.0",
   "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.0-alpha.8"
+    "@things-factory/auth-base": "^7.0.0"
   },
-  "gitHead": "b4981ea2721e7eaf4dbd618b6c77316ebc000ee5"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }

package/server/index.ts

@@ -1,2 +1 @@
-export * from './migrations'
 export * from './service'

package/server/service/index.ts

@@ -14,25 +14,24 @@ import { entities as MenuButtonEntities, resolvers as MenuButtonResolvers } from
 import { entities as MenuDetailEntities, resolvers as MenuDetailResolvers } from './menu-detail'
 import { entities as MenuEntities, resolvers as MenuResolvers } from './menu'
 
-export const entities = [  
+export const entities = [
   /* ENTITIES */
-	...MenuDetailColumnEntities,
-	...MenuDetailButtonEntities,
-	...MenuColumnEntities,
-	...MenuButtonEntities,
-	...MenuDetailEntities,
-	...MenuEntities,
-] 
-
+  ...MenuDetailColumnEntities,
+  ...MenuDetailButtonEntities,
+  ...MenuColumnEntities,
+  ...MenuButtonEntities,
+  ...MenuDetailEntities,
+  ...MenuEntities
+]
 
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
-		...MenuDetailColumnResolvers,
-		...MenuDetailButtonResolvers,
-		...MenuColumnResolvers,
-		...MenuButtonResolvers,
-		...MenuDetailResolvers,
-		...MenuResolvers,
-  ] 
+    ...MenuDetailColumnResolvers,
+    ...MenuDetailButtonResolvers,
+    ...MenuColumnResolvers,
+    ...MenuButtonResolvers,
+    ...MenuDetailResolvers,
+    ...MenuResolvers
+  ]
 }

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'
@@ -64,7 +64,7 @@ export class MenuQuery {
   }
 
   @Query(returns => MenuList, { description: 'To fetch multiple Menus' })
-  async menus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuList> {
+  async menus(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<MenuList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -79,6 +79,30 @@ export class MenuQuery {
     return { items, total }
   }
 
+  @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 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,31 @@ export class MenuQuery {
   }
 
   @FieldResolver(type => [Menu])
-  async children(@Root() menu: Menu): Promise<Menu[]> {
-    return (
+  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'
@@ -30,7 +30,7 @@ export class Menu {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((menu: Menu) => menu.domain)
@@ -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
@@ -168,14 +172,14 @@ export class Menu {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((menu: Menu) => menu.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((menu: Menu) => menu.updater)

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

@@ -19,7 +19,10 @@ export class MenuButtonQuery {
   }
 
   @Query(returns => MenuButtonList, { description: 'To fetch multiple MenuButtons' })
-  async menuButtons(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuButtonList> {
+  async menuButtons(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<MenuButtonList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -25,7 +25,7 @@ export class MenuButton {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((menuButton: MenuButton) => menuButton.domain)
@@ -71,14 +71,14 @@ export class MenuButton {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((menuButton: MenuButton) => menuButton.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((menuButton: MenuButton) => menuButton.updater)

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

@@ -19,7 +19,10 @@ export class MenuColumnQuery {
   }
 
   @Query(returns => MenuColumnList, { description: 'To fetch multiple MenuColumns' })
-  async menuColumns(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuColumnList> {
+  async menuColumns(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<MenuColumnList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -27,7 +27,7 @@ export class MenuColumn {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((menuColumn: MenuColumn) => menuColumn.domain)
@@ -185,14 +185,14 @@ export class MenuColumn {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((menuColumn: MenuColumn) => menuColumn.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((menuColumn: MenuColumn) => menuColumn.updater)

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

@@ -21,7 +21,10 @@ export class MenuDetailQuery {
   }
 
   @Query(returns => MenuDetailList, { description: 'To fetch multiple MenuDetails' })
-  async menuDetails(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuDetailList> {
+  async menuDetails(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<MenuDetailList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -29,7 +29,7 @@ export class MenuDetail {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((menuDetail: MenuDetail) => menuDetail.domain)
@@ -96,14 +96,14 @@ export class MenuDetail {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((menuDetail: MenuDetail) => menuDetail.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((menuDetail: MenuDetail) => menuDetail.updater)

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

@@ -19,7 +19,10 @@ export class MenuDetailButtonQuery {
   }
 
   @Query(returns => MenuDetailButtonList, { description: 'To fetch multiple MenuDetailButtons' })
-  async menuDetailButtons(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuDetailButtonList> {
+  async menuDetailButtons(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<MenuDetailButtonList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/menu-detail-button/menu-detail-button.ts

@@ -29,7 +29,7 @@ export class MenuDetailButton {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((menuDetailButton: MenuDetailButton) => menuDetailButton.domain)
@@ -71,14 +71,14 @@ export class MenuDetailButton {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((menuDetailButton: MenuDetailButton) => menuDetailButton.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((menuDetailButton: MenuDetailButton) => menuDetailButton.updater)

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

@@ -19,7 +19,10 @@ export class MenuDetailColumnQuery {
   }
 
   @Query(returns => MenuDetailColumnList, { description: 'To fetch multiple MenuDetailColumns' })
-  async menuDetailColumns(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuDetailColumnList> {
+  async menuDetailColumns(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<MenuDetailColumnList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/menu-detail-column/menu-detail-column.ts

@@ -32,7 +32,7 @@ export class MenuDetailColumn {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((menuDetailColumn: MenuDetailColumn) => menuDetailColumn.domain)
@@ -190,14 +190,14 @@ export class MenuDetailColumn {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((menuDetailColumn: MenuDetailColumn) => menuDetailColumn.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((menuDetailColumn: MenuDetailColumn) => menuDetailColumn.updater)

package/dist-server/migrations/index.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrations = void 0;
-const glob = require('glob');
-const path = require('path');
-exports.migrations = [];
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function (file) {
-    if (file.indexOf('index.js') !== -1)
-        return;
-    exports.migrations = exports.migrations.concat(Object.values(require(path.resolve(file))) || []);
-});
-//# sourceMappingURL=index.js.map

package/dist-server/migrations/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/migrations/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEjB,QAAA,UAAU,GAAG,EAAE,CAAA;AAE1B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,UAAS,IAAI;IACzE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAAE,OAAM;IAC3C,kBAAU,GAAG,kBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA","sourcesContent":["const glob = require('glob')\nconst path = require('path')\n\nexport var migrations = []\n\nglob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {\n  if (file.indexOf('index.js') !== -1) return\n  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])\n})\n"]}

package/server/migrations/index.ts

@@ -1,9 +0,0 @@
-const glob = require('glob')
-const path = require('path')
-
-export var migrations = []
-
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {
-  if (file.indexOf('index.js') !== -1) return
-  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])
-})