@things-factory/worklist 6.1.58 → 6.1.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.1.58",
+  "version": "6.1.59",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,10 +33,10 @@
     "@things-factory/auth-base": "^6.1.48",
     "@things-factory/board-service": "^6.1.55",
     "@things-factory/context-ui": "^6.1.48",
-    "@things-factory/organization": "^6.1.57",
+    "@things-factory/organization": "^6.1.59",
     "@things-factory/scheduler-client": "^6.1.48",
     "@things-factory/shell": "^6.1.48",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "14638f64619902e1ebcc8ca81d76275d5453f9d4"
+  "gitHead": "5171439c6798421e40997498f5e1936f86af2671"
 }

package/server/controllers/activity-approval/abort.ts

@@ -25,7 +25,7 @@ export async function abort(
 
   /* 
     Prerequisite of Abortion
-    - Previous judgement should be 'pending'
+    - Previous judgment should be 'pending'
   */
   if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {
     throw new Error(

package/server/controllers/activity-approval/approve.ts

@@ -26,7 +26,7 @@ export async function approve(
 
   /* 
     Prerequisite of Approval
-    - Previous judgement should be 'pending'
+    - Previous judgment should be 'pending'
   */
   if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {
     throw new Error(

package/server/controllers/activity-approval/delegate.ts

@@ -25,7 +25,7 @@ export async function delegate(
 
   /* 
     Prerequisite of Delegation
-    - Previous judgement should be 'pending'
+    - Previous judgment should be 'pending'
   */
   if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {
     throw new Error(

package/server/controllers/activity-approval/reject.ts

@@ -25,7 +25,7 @@ export async function reject(
 
   /* 
     Prerequisite of Rejection
-    - Previous judgement should be 'pending'
+    - Previous judgment should be 'pending'
   */
   if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {
     throw new Error(

package/server/service/activity-thread/activity-thread-query.ts

@@ -5,6 +5,7 @@ import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from
 
 import { ActivityInstance } from '../activity-instance/activity-instance'
 import { ActivityThread, ActivityThreadStatus } from './activity-thread'
+import { ActivityApproval } from '../activity-approval/activity-approval'
 import { ActivityThreadList } from './activity-thread-type'
 
 @Resolver(ActivityThread)
@@ -104,6 +105,16 @@ export class ActivityThreadQuery {
     return await getRepository(ActivityInstance).findOneBy({ id: activityThread.activityInstanceId })
   }
 
+  @FieldResolver(type => [ActivityApproval])
+  async activityApprovals(
+    @Root() activityThread: ActivityThread,
+    @Ctx() context: ResolverContext
+  ): Promise<ActivityApproval[]> {
+    return await getRepository(ActivityApproval).findBy({
+      activityThread: { id: activityThread.id }
+    })
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() activityThread: ActivityThread): Promise<Domain> {
     return await getRepository(Domain).findOneBy({ id: activityThread.domainId })

package/server/service/activity-thread/activity-thread.ts

@@ -16,6 +16,7 @@ import { User } from '@things-factory/auth-base'
 import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { ActivityInstance } from '../activity-instance/activity-instance'
+import { ActivityApproval } from '../activity-approval/activity-approval'
 
 export enum ActivityThreadStatus {
   Assigned = 'assigned',
@@ -87,6 +88,10 @@ export class ActivityThread {
   @Field({ nullable: true })
   transaction?: string
 
+  @OneToMany(type => ActivityApproval, activityApproval => activityApproval.activityThread)
+  @Field(type => [ActivityApproval])
+  activityApprovals?: ActivityApproval[]
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   dueAt?: Date

package/translations/en.json

@@ -36,6 +36,8 @@
   "field.mandatory": "mandatory",
   "field.multiple": "multiple",
   "field.options": "options",
+  "field.order": "order",
+  "field.output": "output",
   "field.priority": "priority",
   "field.provider": "provider",
   "field.quantifier": "quantifier",

package/translations/ja.json

@@ -36,6 +36,8 @@
   "field.mandatory": "必須",
   "field.multiple": "多重インスタンス",
   "field.options": "選択オプション",
+  "field.order": "じゅんじょ",
+  "field.output": "しゅつりょく",
   "field.priority": "優先順位",
   "field.provider": "プロバイダー",
   "field.quantifier": "数量",

package/translations/ko.json

@@ -36,6 +36,8 @@
   "field.mandatory": "필수",
   "field.multiple": "다중인스턴스",
   "field.options": "선택옵션",
+  "field.order": "순서",
+  "field.output": "출력값",
   "field.priority": "우선순위",
   "field.provider": "공급자",
   "field.quantifier": "수량",

package/translations/ms.json

@@ -36,6 +36,8 @@
   "field.mandatory": "wajib",
   "field.multiple": "pelbagai",
   "field.options": "pilihan",
+  "field.order": "urutan",
+  "field.output": "output",
   "field.priority": "keutamaan",
   "field.provider": "penyedia",
   "field.quantifier": "pemboleh ubah",

package/translations/zh.json

@@ -37,6 +37,8 @@
   "field.mandatory": "必填",
   "field.multiple": "多项",
   "field.options": "选项",
+  "field.order": "顺序",
+  "field.output": "输出",
   "field.priority": "优先级",
   "field.quantifier": "定量器",
   "field.schedule": "日程",