@things-factory/worklist 6.0.39 → 6.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.39",
+  "version": "6.0.41",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -31,10 +31,10 @@
     "@things-factory/auth-base": "^6.0.34",
     "@things-factory/board-service": "^6.0.34",
     "@things-factory/context-ui": "^6.0.34",
-    "@things-factory/organization": "^6.0.39",
+    "@things-factory/organization": "^6.0.40",
     "@things-factory/scheduler-client": "^6.0.35",
     "@things-factory/shell": "^6.0.34",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "0785dcb60e33faa110e9d6056909384c4f50b7bf"
+  "gitHead": "781f8ef2c026fc38c7485eaa6bd51367fbe7ec09"
 }

package/server/controllers/activity-instance/end.ts

@@ -21,6 +21,10 @@ export async function end(
     )
   }
 
+  if (!activityInstance.startedAt) {
+    activityInstance.startedAt = new Date()
+  }
+
   return await repository.save({
     ...activityInstance,
     reason,

package/server/controllers/activity-instance/post.ts

@@ -24,6 +24,7 @@ export async function post(
     viewType,
     viewSource,
     dueAt,
+    priority,
     approvalLine,
     activityId,
     activityType,
@@ -76,6 +77,7 @@ export async function post(
     activityInstance.viewSource = viewSource || activity.viewSource
     activityInstance.assigneeRole = assigneeRole || activity.assigneeRole
     activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole
+    activityInstance.priority = priority ?? activity.priority
 
     if (!assignees || !approvalLine) {
       activityInstance.adhocType = 'standard'

package/server/controllers/activity-instance/terminate.ts

@@ -22,6 +22,10 @@ export async function terminate(
     )
   }
 
+  if (!activityInstance.startedAt) {
+    activityInstance.startedAt = new Date()
+  }
+
   return await repository.save({
     ...activityInstance,
     reason,

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

@@ -22,7 +22,11 @@ export async function abort(
     )
   }
 
-  const result = await repository.save({
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
+  activityThread = await repository.save({
     ...activityThread,
     reason,
     state: ActivityThreadStatus.Aborted,
@@ -34,5 +38,5 @@ export async function abort(
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

package/server/controllers/activity-thread/adjust.ts

@@ -15,6 +15,18 @@ export async function adjust(
     relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
+  if (!activityThread) {
+    throw new Error(
+      context.t('error.activity-thread not found', {
+        activityThread: id
+      })
+    )
+  }
+
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
   const result = await repository.save({
     ...activityThread,
     ...patch,

package/server/controllers/activity-thread/end.ts

@@ -21,7 +21,11 @@ export async function end(
     )
   }
 
-  const result = await repository.save({
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
+  activityThread = await repository.save({
     ...activityThread,
     reason,
     output,
@@ -33,5 +37,5 @@ export async function end(
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

package/server/controllers/activity-thread/save.ts

@@ -6,7 +6,7 @@ export async function save(id: string, save: ActivityThreadSave, context: Resolv
   const { domain, user, tx } = context.state
   const repository = tx.getRepository(ActivityThread)
 
-  const activityThread = await repository.findOne({
+  var activityThread = await repository.findOne({
     where: { domain: { id: domain.id }, id }
   })
 
@@ -18,7 +18,11 @@ export async function save(id: string, save: ActivityThreadSave, context: Resolv
     )
   }
 
-  const result = await repository.save({
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
+  activityThread = await repository.save({
     ...activityThread,
     ...save,
     state: ActivityThreadStatus.Started,
@@ -28,5 +32,5 @@ export async function save(id: string, save: ActivityThreadSave, context: Resolv
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

package/server/controllers/activity-thread/submit.ts

@@ -25,6 +25,10 @@ export async function submit(
     )
   }
 
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
   const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine
 
   if (approvalLine && approvalLine.length > 0) {
@@ -46,7 +50,7 @@ export async function submit(
       updater: user
     })
 
-    var result = await repository.save({
+    activityThread = await repository.save({
       ...activityThread,
       reason,
       output,
@@ -55,7 +59,7 @@ export async function submit(
       updater: user
     })
   } else {
-    var result = await repository.save({
+    activityThread = await repository.save({
       ...activityThread,
       reason,
       output,
@@ -69,5 +73,5 @@ export async function submit(
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

package/server/controllers/common.ts

@@ -50,7 +50,7 @@ export async function evalActivityInstanceState(
       }
     case threadsMin > validThreads.length:
       return {
-        state: ActivityInstanceStatus.WaitingAssignment
+        state: ActivityInstanceStatus.PendingAssignment
       }
     case pendingStartedThreads.length > 0:
       return {

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

@@ -34,7 +34,7 @@ export class ActivityApprovalQuery {
   }
 
   @Query(returns => ActivityApprovalList, { description: 'To fetch the list of work results I need to review' })
-  async approvalWaitingList(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityApprovalList> {
+  async approvalPendingList(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityApprovalList> {
     var { domain, user } = context.state
 
     const judgment = [

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

@@ -97,7 +97,7 @@ export class ActivityInstanceQuery {
     })
       .leftJoinAndSelect('ai.activityThreads', 'threads', 'threads.assignee = :user', { user: user.id })
       .andWhere('ai.state IN (:...status)', {
-        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.WaitingAssignment]
+        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.PendingAssignment]
       })
       .andWhere('ai.assigneeRole IN (:...roles)', { roles })
       .andWhere('threads.id IS NULL') /* 이미 내가 할당된 경우는 제외한다. */

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

@@ -22,7 +22,7 @@ import { Activity, ActivityType, ActivityUIType } from '../activity/activity'
 export enum ActivityInstanceStatus {
   Draft = 'draft',
   Posted = 'posted',
-  WaitingAssignment = 'waiting-assignment',
+  PendingAssignment = 'pending-assignment',
   Assigned = 'assigned',
   Started = 'started',
   Pending = 'pending',

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

@@ -38,7 +38,7 @@ export class ActivitySummaryQuery {
   }
 
   @FieldResolver(type => Number)
-  async numberOfApprovalWaitings(
+  async numberOfApprovalPendings(
     @Root() activitySummary: ActivitySummary,
     @Ctx() context: ResolverContext
   ): Promise<number> {
@@ -104,7 +104,7 @@ export class ActivitySummaryQuery {
     })
       .leftJoinAndSelect('ai.activityThreads', 'threads', 'threads.assignee = :user', { user: user.id })
       .andWhere('ai.state IN (:...status)', {
-        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.WaitingAssignment]
+        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.PendingAssignment]
       })
       .andWhere('ai.assigneeRole IN (:...roles)', { roles })
       .andWhere('threads.id IS NULL') /* 이미 내가 할당된 경우는 제외한다. */

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

@@ -6,7 +6,7 @@ export class ActivitySummary {
   numberOfToDos?: number
 
   @Field({ nullable: true })
-  numberOfApprovalWaitings?: number
+  numberOfApprovalPendings?: number
 
   @Field({ nullable: true })
   numberOfPicks?: number

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

@@ -23,6 +23,9 @@ export class InstallableActivity {
   @Field({ nullable: true })
   activityType?: ActivityType
 
+  @Field({ nullable: true })
+  priority?: number = 1
+
   @Field({ nullable: true })
   startable?: boolean
 

package/things-factory.config.js

@@ -8,10 +8,9 @@ export default {
     { tagname: 'worklist-home', page: 'worklist-home' },
     { tagname: 'worklist-dashboard', page: 'worklist-dashboard' },
     { tagname: 'pickable-list-page', page: 'pickable-list' },
-    { tagname: 'assigned-list-page', page: 'assigned-list' },
     { tagname: 'todo-list-page', page: 'todo-list' },
     { tagname: 'done-list-page', page: 'done-list' },
-    { tagname: 'approval-waiting-list-page', page: 'approval-waiting-list' },
+    { tagname: 'approval-pending-list-page', page: 'approval-pending-list' },
     { tagname: 'draft-list-page', page: 'draft-list' },
     { tagname: 'starter-list-page', page: 'starter-list' },
     { tagname: 'reporter-list-page', page: 'reporter-list' },

package/translations/en.json

@@ -55,7 +55,7 @@
   "label.activity-state-released": "released",
   "label.activity-state-deprecated": "deprecated",
   "label.activity-state-posted": "posted",
-  "label.activity-state-waiting-assignment": "waiting assignment",
+  "label.activity-state-pending-assignment": "pending assignment",
   "label.activity-state-assigned": "assigned",
   "label.activity-state-started": "started",
   "label.activity-state-delegated": "delegated",
@@ -70,9 +70,9 @@
   "label.filter-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
-  "label.filter-rejected": "rejected",
   "label.filter-proceeding": "proceeding",
   "label.filter-resubmitted": "resubmitted",
+  "label.filter-pending-approval": "pending approval",
   "label.hours": "hours",
   "label.minutes": "minutes",
   "label.seconds": "seconds",
@@ -100,12 +100,14 @@
   "title.activity summary": "activity summary",
   "title.activity template model item list": "activity template model item list",
   "title.activity template list": "activity template list",
-  "title.approval waiting list": "approval waiting list",
+  "title.approval pending list": "approval pending list",
   "title.assigned list": "assigned list",
   "title.done list": "done list",
   "title.draft list": "draft list",
   "title.edit duration": "edit duration",
   "title.installable activity list": "installable activity list",
+  "title.open this activity page": "open this activity page",
+  "title.pick activity": "pick this activity to handle",
   "title.todo list": "todo list",
   "title.view page": "view page"
 }

package/translations/ko.json

@@ -55,7 +55,7 @@
   "label.activity-state-posted": "게시됨",
   "label.activity-state-released": "배포됨",
   "label.activity-state-deprecated": "폐기됨",
-  "label.activity-state-waiting-assignment": "할당대기",
+  "label.activity-state-pending-assignment": "할당대기",
   "label.activity-state-assigned": "할당됨",
   "label.activity-state-started": "진행중",
   "label.activity-state-delegated": "위임됨",
@@ -70,9 +70,9 @@
   "label.filter-important": "중요",
   "label.filter-due": "만기",
   "label.filter-recent": "최근",
-  "label.filter-rejected": "반려",
   "label.filter-proceeding": "작업중",
   "label.filter-resubmitted": "재상신",
+  "label.filter-pending-approval": "승인진행중",
   "label.hours": "시간",
   "label.minutes": "분",
   "label.seconds": "초",
@@ -100,12 +100,14 @@
   "title.activity summary": "업무 종합 현황",
   "title.activity template model item list": "업무 템플릿 모델 항목",
   "title.activity template list": "업무 템플릿",
-  "title.approval waiting list": "승인 대기 리스트",
+  "title.approval pending list": "승인 대기 리스트",
   "title.assigned list": "나의 연관 업무 현황",
   "title.done list": "완료한 업무",
   "title.draft list": "작성중인 업무",
   "title.edit duration": "소요시간 편집",
   "title.installable activity list": "설치 가능 업무",
+  "title.open this activity page": "이 업무 페이지 열기",
+  "title.pick activity": "이 업무를 내가 담당하기위해 선택",
   "title.todo list": "나의 할일 리스트",
   "title.view page": "페이지 보기"
 }

package/translations/ms.json

@@ -55,7 +55,7 @@
   "label.activity-state-released": "[ms] released",
   "label.activity-state-deprecated": "[ms] deprecated",
   "label.activity-state-posted": "[ms] posted",
-  "label.activity-state-waiting-assignment": "[ms] waiting assignment",
+  "label.activity-state-pending-assignment": "[ms] pending assignment",
   "label.activity-state-assigned": "[ms] assigned",
   "label.activity-state-started": "[ms] started",
   "label.activity-state-delegated": "[ms] delegated",
@@ -70,9 +70,9 @@
   "label.filter-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
-  "label.filter-rejected": "rejected",
   "label.filter-proceeding": "proceeding",
   "label.filter-resubmitted": "resubmitted",
+  "label.filter-pending-approval": "pending approval",
   "label.hours": "[ms] hours",
   "label.minutes": "[ms] minutes",
   "label.seconds": "[ms] seconds",
@@ -100,12 +100,14 @@
   "title.activity summary": "[ms] activity summary",
   "title.activity template model item list": "[ms] activity template model item list",
   "title.activity template list": "[ms] activity template list",
-  "title.approval waiting list": "[ms] approval waiting list",
+  "title.approval pending list": "[ms] approval pending list",
   "title.assigned list": "[ms] assigned list",
   "title.done list": "[ms] done list",
   "title.draft list": "[ms] draft list",
   "title.edit duration": "[ms] edit duration",
   "title.installable activity list": "[ms] installable activity list",
+  "title.open this activity page": "[ms] open this activity page",
+  "title.pick activity": "[ms] pick this activity to handle",
   "title.todo list": "[ms] todo list",
   "title.view page": "[ms] view page"
 }

package/translations/zh.json

@@ -55,7 +55,7 @@
   "label.activity-state-released": "[zh] released",
   "label.activity-state-deprecated": "[zh] deprecated",
   "label.activity-state-posted": "[zh] posted",
-  "label.activity-state-waiting-assignment": "[zh] waiting assignment",
+  "label.activity-state-pending-assignment": "[zh] pending assignment",
   "label.activity-state-assigned": "[zh] assigned",
   "label.activity-state-started": "[zh] started",
   "label.activity-state-delegated": "[zh] delegated",
@@ -70,9 +70,9 @@
   "label.filter-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
-  "label.filter-rejected": "rejected",
   "label.filter-proceeding": "proceeding",
   "label.filter-resubmitted": "resubmitted",
+  "label.filter-pending-approval": "pending approval",
   "label.hours": "小时",
   "label.minutes": "分钟",
   "label.seconds": "秒钟",
@@ -100,12 +100,14 @@
   "title.activity summary": "[zh] activity summary",
   "title.activity template model item list": "[zh] activity template model item list",
   "title.activity template list": "[zh] activity template list",
-  "title.approval waiting list": "[zh] approval waiting list",
+  "title.approval pending list": "[zh] approval pending list",
   "title.assigned list": "[zh] assigned list",
   "title.done list": "[zh] done list",
   "title.draft list": "[zh] draft list",
   "title.edit duration": "[zh] edit duration",
   "title.installable activity list": "[zh] installable activity list",
+  "title.open this activity page": "[zh] open this activity page",
+  "title.pick activity": "[zh] pick this activity to handle",
   "title.todo list": "[zh] todo list",
   "title.view page": "[zh] view page"
 }