@things-factory/menu-base 7.0.1-beta.9 → 7.0.1-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/menu-base",
-  "version": "7.0.1-beta.9",
+  "version": "7.0.1-rc.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.1-beta.9"
+    "@things-factory/auth-base": "^7.0.1-rc.0"
   },
-  "gitHead": "b2fb4923e2763b4d831f934905dd6ae0019446a4"
+  "gitHead": "45476b164b69aef2c211d9a5257897f42d8e2f5f"
 }

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

@@ -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({
@@ -80,7 +80,7 @@ export class MenuQuery {
   }
 
   @Query(returns => MenuList, { description: 'To fetch my own Menus' })
-  async myMenus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MenuList> {
+  async myMenus(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<MenuList> {
     const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -169,12 +169,18 @@ export class MenuQuery {
   }
 
   @FieldResolver(type => [Menu])
-  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) {
+  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
     }
 

package/server/service/menu/menu.ts

@@ -172,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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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)