@things-factory/organization 6.0.21 → 6.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "6.0.21",
+  "version": "6.0.25",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,9 +30,9 @@
     "@operato/data-tree": "^1.0.0",
     "@operato/graphql": "^1.0.0",
     "@operato/shell": "^1.0.0",
-    "@things-factory/auth-base": "^6.0.21",
-    "@things-factory/contact": "^6.0.21",
-    "@things-factory/shell": "^6.0.21"
+    "@things-factory/auth-base": "^6.0.25",
+    "@things-factory/contact": "^6.0.25",
+    "@things-factory/shell": "^6.0.25"
   },
-  "gitHead": "074a4f460d08fed4bc7e9882aa57f4c120cf0f11"
+  "gitHead": "8a987a42de944dc915b8cfddb047eb7bc0d4ba41"
 }

package/server/service/approval-line/approval-line-item.ts

@@ -1,26 +1,21 @@
-import { ObjectType, Field, ID, InputType, registerEnumType } from 'type-graphql'
+import { ObjectType, Field, ID, registerEnumType } from 'type-graphql'
 
-import { ObjectRef } from '@things-factory/shell'
-
-export enum ApprovalLineItemType {
+export enum OrgMemberTargetType {
   Employee = 'Employee',
   Department = 'Department',
-  Role = 'Role'
+  Role = 'Role',
+  Myself = 'Myself',
+  MyDepartment = 'MyDepartment',
+  MySupervisor = 'MySupervisor'
 }
 
-registerEnumType(ApprovalLineItemType, {
-  name: 'ApprovalLineItemType',
+registerEnumType(OrgMemberTargetType, {
+  name: 'OrgMemberTargetType',
   description: 'type enumeration of a approval line item'
 })
 
-// @InputType()
-// export class ObjectRefApprover extends ObjectRef {
-//   @Field({ nullable: true })
-//   controlNo?: string
-// }
-
 @ObjectType()
-export class ApproverTarget {
+export class OrgMemberTarget {
   @Field(() => ID, { description: 'Field id' })
   id?: string
 
@@ -37,20 +32,11 @@ export class ApproverTarget {
 @ObjectType({ description: 'Entity for approval line item' })
 export class ApprovalLineItem {
   @Field({ nullable: true })
-  type?: ApprovalLineItemType
+  type?: OrgMemberTargetType
 
   @Field(type => String, { nullable: true })
   value?: string
 
-  @Field(type => ApproverTarget, { nullable: true })
-  approver?: ApproverTarget
+  @Field(type => OrgMemberTarget, { nullable: true })
+  approver?: OrgMemberTarget
 }
-
-// @InputType()
-// export class ApprovalLineItemPatch {
-//   @Field({ nullable: true })
-//   type?: ApprovalLineItemType
-
-//   @Field(type => ObjectRefApprover, { nullable: true })
-//   approver?: ObjectRefApprover
-// }

package/server/service/approval-line/approval-line-query.ts

@@ -30,7 +30,7 @@ async function getOwnerValue(approvalLine: ApprovalLine, context: ResolverContex
 }
 
 async function getModel(approvalLine: ApprovalLine, context: ResolverContext): Promise<ApprovalLineItem[]> {
-  const { domain } = context.state
+  const { domain, user } = context.state
   const { model } = approvalLine
 
   if (!model || !(model instanceof Array)) {
@@ -53,6 +53,12 @@ async function getModel(approvalLine: ApprovalLine, context: ResolverContext): P
       case 'Role':
         approver = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
         break
+      case 'Myself':
+        approver = user
+        break
+      case 'MyDepartment':
+      case 'MySupervisor':
+        break
       default:
     }
 

package/translations/en.json

@@ -14,6 +14,7 @@
   "label.picture": "picture",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
+  "title.assignee list": "assignee list",
   "title.common-approval-line template list": "common approval line template list",
   "title.my-approval-line template list": "my approval line template list",
   "title.employee list": "employee list",

package/translations/ko.json

@@ -14,6 +14,7 @@
   "label.picture": "사진",
   "title.approval-line item list": "결재라인 상세",
   "title.approval-line template list": "결재라인 템플릿 목록",
+  "title.assignee list": "할당자 목록",
   "title.common-approval-line template list": "공통 결재라인 템플릿 목록",
   "title.my-approval-line template list": "나의 결재라인 템플릿 목록",
   "title.employee list": "직원 목록",

package/translations/ms.json

@@ -14,6 +14,7 @@
   "label.picture": "picture",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
+  "title.assignee list": "assignee list",
   "title.common-approval-line template list": "common approval line template list",
   "title.my-approval-line template list": "my approval line template list",
   "title.employee list": "employee list",

package/translations/zh.json

@@ -14,6 +14,7 @@
   "label.picture": "picture",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",
+  "title.assignee list": "assignee list",
   "title.common-approval-line template list": "common approval line template list",
   "title.my-approval-line template list": "my approval line template list",
   "title.employee list": "employee list",