@things-factory/lite-menu 5.0.11 → 6.0.0-alpha.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/lite-menu",
-  "version": "5.0.11",
+  "version": "6.0.0-alpha.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
   "license": "MIT",
-  "author": "heartyoh",
+  "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "module that helps to organize menus efficiently and flexibly",
   "publishConfig": {
     "access": "public",
@@ -33,14 +33,14 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/apptool-base": "^5.0.11",
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/board-service": "^5.0.11",
-    "@things-factory/board-ui": "^5.0.11",
-    "@things-factory/grist-ui": "^5.0.11",
-    "@things-factory/more-base": "^5.0.11",
-    "@things-factory/setting-base": "^5.0.11",
-    "@things-factory/utils": "^5.0.1"
+    "@things-factory/apptool-base": "^6.0.0-alpha.3",
+    "@things-factory/auth-base": "^6.0.0-alpha.3",
+    "@things-factory/board-service": "^6.0.0-alpha.3",
+    "@things-factory/board-ui": "^6.0.0-alpha.3",
+    "@things-factory/grist-ui": "^6.0.0-alpha.3",
+    "@things-factory/more-base": "^6.0.0-alpha.3",
+    "@things-factory/setting-base": "^6.0.0-alpha.3",
+    "@things-factory/utils": "^6.0.0-alpha.3"
   },
-  "gitHead": "37cd4feb62e062899cae7029588d86a5d4b4036a"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

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

@@ -1,5 +1,6 @@
 import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
-import { getRepository } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
 
 import { LiteMenu } from './lite-menu'
 import { LiteMenuPatch, NewLiteMenu } from './lite-menu-type'
@@ -7,7 +8,7 @@ import { LiteMenuPatch, NewLiteMenu } from './lite-menu-type'
 @Resolver(LiteMenu)
 export class LiteMenuMutation {
   @Mutation(returns => LiteMenu, { description: 'To create new LiteMenu' })
-  async createLiteMenu(@Arg('liteMenu') liteMenu: NewLiteMenu, @Ctx() context: any): Promise<LiteMenu> {
+  async createLiteMenu(@Arg('liteMenu') liteMenu: NewLiteMenu, @Ctx() context: ResolverContext): Promise<LiteMenu> {
     const { domain, user } = context.state
 
     return await getRepository(LiteMenu).save({
@@ -22,13 +23,13 @@ export class LiteMenuMutation {
   async updateLiteMenu(
     @Arg('id') id: string,
     @Arg('patch') patch: LiteMenuPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<LiteMenu> {
     const { domain, user } = context.state
 
     const repository = getRepository(LiteMenu)
     const liteMenu = await repository.findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
 
     return await repository.save({
@@ -41,10 +42,10 @@ export class LiteMenuMutation {
   }
 
   @Mutation(returns => Boolean, { description: 'To delete LiteMenu' })
-  async deleteLiteMenu(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
+  async deleteLiteMenu(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain } = context.state
 
-    await getRepository(LiteMenu).delete({ domain, id })
+    await getRepository(LiteMenu).delete({ domain: { id: domain.id }, id })
     return true
   }
 }

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

@@ -1,9 +1,8 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
-import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { LiteMenu } from './lite-menu'
 import { LiteMenuList } from './lite-menu-type'
@@ -11,19 +10,20 @@ import { LiteMenuList } from './lite-menu-type'
 @Resolver(LiteMenu)
 export class LiteMenuQuery {
   @Query(returns => LiteMenu, { description: 'To fetch a LiteMenu' })
-  async liteMenu(@Arg('id') id: string, @Ctx() context: any): Promise<LiteMenu> {
+  async liteMenu(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<LiteMenu> {
     const { domain } = context.state
     const repository = getRepository(LiteMenu)
 
     var liteMenu: any = repository.findOne({
-      where: { domain, id, relations: ['domain', 'creator', 'updater'] }
+      where: { domain: { id: domain.id }, id },
+      relations: ['domain', 'creator', 'updater']
     })
 
     return liteMenu
   }
 
   @Query(returns => LiteMenuList, { description: 'To fetch multiple LiteMenus' })
-  async liteMenus(@Args() params: ListParam, @Ctx() context: any): Promise<LiteMenuList> {
+  async liteMenus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<LiteMenuList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -40,22 +40,22 @@ export class LiteMenuQuery {
   @FieldResolver(type => Board)
   async board(@Root() liteMenu: LiteMenu) {
     if ((liteMenu.type === 'board' || liteMenu.type === 'interactive-board') && liteMenu.value) {
-      return await getRepository(Board).findOne({ id: liteMenu.value })
+      return await getRepository(Board).findOneBy({ id: liteMenu.value })
     }
   }
 
   @FieldResolver(type => Domain)
   async domain(@Root() liteMenu: LiteMenu) {
-    return await getRepository(Domain).findOne(liteMenu.domainId)
+    return await getRepository(Domain).findOneBy({ id: liteMenu.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() liteMenu: LiteMenu): Promise<User> {
-    return await getRepository(User).findOne(liteMenu.updaterId)
+    return await getRepository(User).findOneBy({ id: liteMenu.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() liteMenu: LiteMenu): Promise<User> {
-    return await getRepository(User).findOne(liteMenu.creatorId)
+    return await getRepository(User).findOneBy({ id: liteMenu.creatorId })
   }
 }