@things-factory/meta-ui 7.0.1-alpha.61 → 7.0.1-alpha.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/meta-ui",
-  "version": "7.0.1-alpha.61",
+  "version": "7.0.1-alpha.63",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -43,10 +43,11 @@
     "@things-factory/env": "^7.0.1-alpha.55",
     "@things-factory/id-rule-base": "^7.0.1-alpha.61",
     "@things-factory/menu-base": "^7.0.1-alpha.60",
+    "@things-factory/personalization": "^7.0.1-alpha.63",
     "@things-factory/resource-base": "^7.0.1-alpha.60",
     "@things-factory/shell": "^7.0.1-alpha.55",
     "@things-factory/worklist": "^7.0.1-alpha.61",
     "moment-timezone": "^0.5.45"
   },
-  "gitHead": "f1d7963b36feaf36c7d46e1f3b9360b66d74c535"
+  "gitHead": "79f8b01bf5a1c34de919c25ecbf5b57a83c88ebd"
 }

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

@@ -1,6 +1,11 @@
-
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
-import { Domain, ListParam, convertListParams, getRepository, getQueryBuilderFromListParams } from '@things-factory/shell'
+import {
+  Domain,
+  ListParam,
+  convertListParams,
+  getRepository,
+  getQueryBuilderFromListParams
+} from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { ButtonRole } from './button-role'
 import { ButtonRoleList } from './button-role-type'
@@ -11,7 +16,7 @@ export class ButtonRoleQuery {
   async buttonRole(@Arg('id') id: string, @Ctx() context: any): Promise<ButtonRole> {
     const { domain } = context.state
     return await getRepository(ButtonRole).findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
   }
 
@@ -23,7 +28,7 @@ export class ButtonRoleQuery {
       domain,
       params,
       repository: await getRepository(ButtonRole),
-      searchables: ['name','description']
+      searchables: ['name', 'description']
     })
 
     const [items, total] = await queryBuilder.getManyAndCount()

package/server/service/grid-personalize/grid-personalize-mutation.ts

@@ -1,15 +1,17 @@
-
 import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
 import { In } from 'typeorm'
 import { GridPersonalize } from './grid-personalize'
 import { NewGridPersonalize, GridPersonalizePatch } from './grid-personalize-type'
-import { getRepository } from '@things-factory/shell'
+import { ScalarObject } from '@things-factory/shell'
 
 @Resolver(GridPersonalize)
 export class GridPersonalizeMutation {
   @Directive('@transaction')
   @Mutation(returns => GridPersonalize, { description: 'To create new Gridpersonalize' })
-  async createGridpersonalize(@Arg('gridpersonalize') gridPersonalize: NewGridPersonalize, @Ctx() context: any): Promise<GridPersonalize> {
+  async createGridpersonalize(
+    @Arg('gridpersonalize') gridPersonalize: NewGridPersonalize,
+    @Ctx() context: any
+  ): Promise<GridPersonalize> {
     const { domain, user, tx } = context.state
 
     return await tx.getRepository(GridPersonalize).save({
@@ -20,6 +22,34 @@ export class GridPersonalizeMutation {
     })
   }
 
+  @Directive('@transaction')
+  @Mutation(returns => GridPersonalize, { description: 'To create or update my Gridpersonalize' })
+  async saveMyGridpersonalize(
+    @Arg('menuId') menuId: string,
+    @Arg('template', type => ScalarObject) template: { [key: string]: string[] },
+    @Ctx() context: any
+  ): Promise<GridPersonalize> {
+    const { domain, user, tx } = context.state
+
+    if (!menuId) {
+      throw 'menuId required.'
+    }
+
+    const gridpersonalize = await tx.getRepository(GridPersonalize).findOne({
+      where: { domain: { id: domain.id }, menu: { id: menuId }, user: { id: user.id } }
+    })
+
+    return await tx.getRepository(GridPersonalize).save({
+      ...gridpersonalize,
+      domain,
+      menu: { id: menuId },
+      user,
+      template,
+      creator: user,
+      updater: user
+    })
+  }
+
   @Directive('@transaction')
   @Mutation(returns => GridPersonalize, { description: 'To modify Gridpersonalize information' })
   async updateGridPersonalize(
@@ -71,7 +101,9 @@ export class GridPersonalizeMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const updRecord = _updateRecords[i]
-        const gridpersonalize = await gridpersonalizeRepo.findOne({ where: { domain, id: updRecord.id } })
+        const gridpersonalize = await gridpersonalizeRepo.findOne({
+          where: { domain: { id: domain.id }, id: updRecord.id }
+        })
 
         const result = await gridpersonalizeRepo.save({
           ...gridpersonalize,
@@ -97,10 +129,7 @@ export class GridPersonalizeMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete multiple gridpersonalizes' })
-  async deleteGridPersonalizes(
-    @Arg('ids', type => [String]) ids: string[],
-    @Ctx() context: any
-  ): Promise<boolean> {
+  async deleteGridPersonalizes(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<boolean> {
     const { domain, tx } = context.state
 
     await tx.getRepository(GridPersonalize).delete({

package/server/service/grid-personalize/grid-personalize-query.ts

@@ -1,4 +1,3 @@
-
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
 import { Domain, ListParam, convertListParams, getRepository } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
@@ -8,22 +7,22 @@ import { GridPersonalizeList } from './grid-personalize-type'
 
 @Resolver(GridPersonalize)
 export class GridPersonalizeQuery {
-  @Query(returns => GridPersonalize, { description: 'To fetch a Gridpersonalize' })
-  async gridPersonalize(@Arg('id') id: string, @Ctx() context: any): Promise<GridPersonalize> {
+  @Query(returns => GridPersonalize, { nullable: true, description: `To fetch a Gridpersonalize` })
+  async gridPersonalize(@Arg('id') id: string, @Ctx() context: any): Promise<GridPersonalize | null> {
     const { domain } = context.state
     return await getRepository(GridPersonalize).findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
   }
 
-  @Query(returns => GridPersonalizeList, { description: 'To fetch a multiple Gridpersonalize template' })
-  async gridPersonalizeTemplates(@Args() params: ListParam, @Ctx() context: any): Promise<GridPersonalizeList> {
-    const { user } = context.state
-    params.filters.push({ name: "user.id", operator: "eq", value: user.id });
-    return await this.gridPersonalizes(params, context);
+  @Query(returns => GridPersonalize, { nullable: true, description: `To fetch a User's own Gridpersonalize` })
+  async myGridPersonalize(@Arg('menuId') menuId: string, @Ctx() context: any): Promise<GridPersonalize | null> {
+    const { domain, user } = context.state
+    return await getRepository(GridPersonalize).findOne({
+      where: { domain: { id: domain.id }, menu: { id: menuId }, user: { id: user.id } }
+    })
   }
 
-
   @Query(returns => GridPersonalizeList, { description: 'To fetch multiple Gridpersonalizes' })
   async gridPersonalizes(@Args() params: ListParam, @Ctx() context: any): Promise<GridPersonalizeList> {
     const { domain } = context.state
@@ -34,12 +33,12 @@ export class GridPersonalizeQuery {
     return { items, total }
   }
 
-  @FieldResolver(type => Domain)
+  @FieldResolver(type => Menu)
   async menu(@Root() gridPersonalize: GridPersonalize): Promise<Menu> {
     return await getRepository(Menu).findOneBy({ id: gridPersonalize.menuId })
   }
 
-  @FieldResolver(type => Domain)
+  @FieldResolver(type => User)
   async user(@Root() gridPersonalize: GridPersonalize): Promise<User> {
     return await getRepository(User).findOneBy({ id: gridPersonalize.userId })
   }

package/server/service/grid-personalize/grid-personalize-type.ts

@@ -1,20 +1,18 @@
-
 import { ObjectType, Field, InputType, Int, ID, Float, registerEnumType } from 'type-graphql'
-import { ObjectRef } from '@things-factory/shell'
+import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
 import { GridPersonalize } from './grid-personalize'
 
 @InputType()
 export class NewGridPersonalize {
-
   @Field(type => ObjectRef)
   user: ObjectRef
 
   @Field(type => ObjectRef)
   menu: ObjectRef
 
-  @Field({ nullable: false })
-  template: string
+  @Field(type => ScalarObject, { nullable: false })
+  template: { [key: string]: string[] }
 }
 
 @InputType()
@@ -28,8 +26,8 @@ export class GridPersonalizePatch {
   @Field(type => ObjectRef, { nullable: true })
   menu?: ObjectRef
 
-  @Field({ nullable: true })
-  template?: string
+  @Field(type => ScalarObject, { nullable: true })
+  template?: { [key: string]: string[] }
 
   @Field()
   cuFlag: string

package/server/service/grid-personalize/grid-personalize.ts

@@ -1,4 +1,3 @@
-
 import {
   CreateDateColumn,
   UpdateDateColumn,
@@ -12,12 +11,16 @@ import {
 } from 'typeorm'
 import { ObjectType, Field, Int, ID, Float, registerEnumType } from 'type-graphql'
 
-import { Domain } from '@things-factory/shell'
+import { Domain, ScalarObject } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Menu } from '@things-factory/menu-base'
 
 @Entity('grid_personalize')
-@Index('ix_gridpersonalize_0', (gridPersonalize: GridPersonalize) => [gridPersonalize.domain, gridPersonalize.user, gridPersonalize.menu], { unique: true })
+@Index(
+  'ix_gridpersonalize_0',
+  (gridPersonalize: GridPersonalize) => [gridPersonalize.domain, gridPersonalize.user, gridPersonalize.menu],
+  { unique: true }
+)
 @ObjectType({ description: 'Entity for GridPersonalize' })
 export class GridPersonalize {
   @PrimaryGeneratedColumn('uuid')
@@ -38,16 +41,16 @@ export class GridPersonalize {
   @RelationId((gridPersonalize: GridPersonalize) => gridPersonalize.user)
   userId: string
 
-  @ManyToOne(type => Menu, {createForeignKeyConstraints: false})
+  @ManyToOne(type => Menu, { createForeignKeyConstraints: false })
   @Field({ nullable: false })
   menu: Menu
 
   @RelationId((gridPersonalize: GridPersonalize) => gridPersonalize.menu)
   menuId: string
 
-  @Column({ name: 'template', type: 'text', nullable: false })
-  @Field({ nullable: false })
-  template: string
+  @Column('simple-json', { nullable: true })
+  @Field(type => ScalarObject, { nullable: true })
+  template?: { [key: string]: string[] }
 
   @CreateDateColumn()
   @Field({ nullable: true })

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

@@ -1,7 +1,12 @@
-
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
 import { IsNull, Not } from 'typeorm'
-import { Domain, ListParam, convertListParams, getRepository, getQueryBuilderFromListParams } from '@things-factory/shell'
+import {
+  Domain,
+  ListParam,
+  convertListParams,
+  getRepository,
+  getQueryBuilderFromListParams
+} from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { MenuButtonAuth } from './menu-button-auth'
 import { MenuButtonAuthList } from './menu-button-auth-type'
@@ -14,7 +19,7 @@ export class MenuButtonAuthQuery {
   async menuButtonAuth(@Arg('id') id: string, @Ctx() context: any): Promise<MenuButtonAuth> {
     const { domain } = context.state
     return await getRepository(MenuButtonAuth).findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
   }
 
@@ -36,14 +41,12 @@ export class MenuButtonAuthQuery {
   @Query(returns => MenuButtonAuthList, { description: 'To fetch a multiple RoleMenuButtonAuth' })
   async roleMenuButtonAuths(@Args() params: ListParam, @Ctx() context: any): Promise<MenuButtonAuthList> {
     const { domain } = context.state
-    const roleId = params.filters.find(x=> x.name == 'roleId').value
-    const parentMenuId = params.filters.some( x=> x.name == 'menuId') 
-                       ? params.filters.find(x=> x.name == 'menuId').value 
-                       : undefined
-    
-    
-
-    // 기존 role 권한 조회 
+    const roleId = params.filters.find(x => x.name == 'roleId').value
+    const parentMenuId = params.filters.some(x => x.name == 'menuId')
+      ? params.filters.find(x => x.name == 'menuId').value
+      : undefined
+
+    // 기존 role 권한 조회
     const queryBuilder = getQueryBuilderFromListParams({
       domain,
       params,
@@ -52,17 +55,17 @@ export class MenuButtonAuthQuery {
 
     const [items, total] = await queryBuilder.getManyAndCount()
 
-    // 메뉴 리스트 조회 
+    // 메뉴 리스트 조회
     let menuParams = {
-      where: { 
-        domain: { 
-          id: domain.id 
+      where: {
+        domain: {
+          id: domain.id
         }
       },
       order: { rank: 'ASC' }
     }
 
-    if(parentMenuId){
+    if (parentMenuId) {
       menuParams.where['parent'] = {
         id: parentMenuId
       }
@@ -72,15 +75,15 @@ export class MenuButtonAuthQuery {
 
     const menus: Menu[] = await getRepository(Menu).find(menuParams)
 
-    let results:MenuButtonAuth[] = []
-    
-    menus.forEach(menu =>{
+    let results: MenuButtonAuth[] = []
+
+    menus.forEach(menu => {
       let menuRole = {
         id: menu.id,
         menu: menu,
         menuId: menu.id,
         roleId: roleId,
-        role: {id:roleId, name:'', description:'', domain: domain, domainId: domain.id},
+        role: { id: roleId, name: '', description: '', domain: domain, domainId: domain.id },
         domain: domain,
         domainId: domain.id,
         selectAuth: false,
@@ -89,21 +92,20 @@ export class MenuButtonAuthQuery {
         deleteAuth: false
       }
 
-      if(items.some( x=> x.menuId == menu.id)){
-        let menuAuth = items.find(x => x.menuId == menu.id);
+      if (items.some(x => x.menuId == menu.id)) {
+        let menuAuth = items.find(x => x.menuId == menu.id)
 
-        menuRole.id = menuAuth.id;
-        menuRole.selectAuth = menuAuth.selectAuth;
-        menuRole.updateAuth = menuAuth.updateAuth;
-        menuRole.createAuth = menuAuth.createAuth;
-        menuRole.deleteAuth = menuAuth.deleteAuth;
+        menuRole.id = menuAuth.id
+        menuRole.selectAuth = menuAuth.selectAuth
+        menuRole.updateAuth = menuAuth.updateAuth
+        menuRole.createAuth = menuAuth.createAuth
+        menuRole.deleteAuth = menuAuth.deleteAuth
       }
 
       results.push(menuRole)
     })
 
-
-    return { items: results, total:0 }
+    return { items: results, total: 0 }
   }
 
   @FieldResolver(type => ButtonRole)