@things-factory/worklist 6.0.35 → 6.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.35",
+  "version": "6.0.37",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -36,5 +36,5 @@
     "@things-factory/shell": "^6.0.34",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "2f731189d998bc4a6fb99cd8f4851cc90ef7a748"
+  "gitHead": "e5452b75c589aded925c61455b320f90e5e4469d"
 }

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

@@ -14,7 +14,23 @@ export async function post(
 ): Promise<ActivityInstance> {
   const { domain, user, tx } = context.state
   const issuedAt = new Date()
-  var { id, assignees, dueAt, approvalLine, activityId, input } = activityInstance
+  var {
+    id,
+    name,
+    description,
+    assignees,
+    uiType,
+    uiSource,
+    viewType,
+    viewSource,
+    dueAt,
+    approvalLine,
+    activityId,
+    activityType,
+    assigneeRole,
+    supervisoryRole,
+    input
+  } = activityInstance
 
   var origin = id
     ? await tx.getRepository(ActivityInstance).findOne({
@@ -51,15 +67,15 @@ export async function post(
       }
     }
 
-    activityInstance.name = activity.name
-    activityInstance.description = activity.description
-    activityInstance.activityType = activity.activityType
-    activityInstance.uiType = activity.uiType
-    activityInstance.uiSource = activity.uiSource
-    activityInstance.viewType = activity.viewType
-    activityInstance.viewSource = activity.viewSource
-    activityInstance.assigneeRole = activity.assigneeRole
-    activityInstance.supervisoryRole = activity.supervisoryRole
+    activityInstance.name = name || activity.name
+    activityInstance.description = description || activity.description
+    activityInstance.activityType = activityType || activity.activityType
+    activityInstance.uiType = uiType || activity.uiType
+    activityInstance.uiSource = uiSource || activity.uiSource
+    activityInstance.viewType = viewType || activity.viewType
+    activityInstance.viewSource = viewSource || activity.viewSource
+    activityInstance.assigneeRole = assigneeRole || activity.assigneeRole
+    activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole
 
     if (!assignees || !approvalLine) {
       activityInstance.adhocType = 'standard'

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

@@ -58,6 +58,14 @@ export class ActivityApprovalQuery {
         description: {
           relationColumn: 'activityThread.activityInstance',
           columnName: 'description'
+        },
+        priority: {
+          relationColumn: 'activityThread.activityInstance',
+          columnName: 'priority'
+        },
+        dueAt: {
+          relationColumn: 'activityThread.activityInstance',
+          columnName: 'dueAt'
         }
       }
     })

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

@@ -56,7 +56,8 @@ export class ActivityThreadQuery {
       searchables: ['name', 'description'],
       filtersMap: {
         name: { columnName: 'name', relationColumn: 'activityInstance' },
-        description: { columnName: 'description', relationColumn: 'activityInstance' }
+        description: { columnName: 'description', relationColumn: 'activityInstance' },
+        priority: { columnName: 'priority', relationColumn: 'activityInstance' }
       }
     })
       .andWhere('at.state NOT IN (:...status)', { status })
@@ -80,7 +81,8 @@ export class ActivityThreadQuery {
       searchables: ['name', 'description'],
       filtersMap: {
         name: { columnName: 'name', relationColumn: 'activityInstance' },
-        description: { columnName: 'description', relationColumn: 'activityInstance' }
+        description: { columnName: 'description', relationColumn: 'activityInstance' },
+        priority: { columnName: 'priority', relationColumn: 'activityInstance' }
       }
     })
       .andWhere('at.state IN (:...status)', { status })

package/translations/en.json

@@ -50,6 +50,12 @@
   "field.view-source": "view source",
   "label.activity-instance": "activity instance",
   "label.days": "days",
+  "label.filter-aborted": "aborted",
+  "label.filter-important": "important",
+  "label.filter-due": "due",
+  "label.filter-recent": "recent",
+  "label.filter-rejected": "rejected",
+  "label.filter-resubmitted": "resubmitted",
   "label.hours": "hours",
   "label.minutes": "minutes",
   "label.seconds": "seconds",

package/translations/ko.json

@@ -50,6 +50,12 @@
   "field.view-source": "뷰 소스",
   "label.activity-instance": "업무 인스턴스",
   "label.days": "일",
+  "label.filter-aborted": "중단",
+  "label.filter-important": "중요",
+  "label.filter-due": "만기",
+  "label.filter-recent": "최근",
+  "label.filter-rejected": "반려",
+  "label.filter-resubmitted": "재상신",
   "label.hours": "시간",
   "label.minutes": "분",
   "label.seconds": "초",

package/translations/ms.json

@@ -50,6 +50,12 @@
   "field.view-source": "[ms] view source",
   "label.activity-instance": "[ms] activity instance",
   "label.days": "[ms] days",
+  "label.filter-aborted": "aborted",
+  "label.filter-important": "important",
+  "label.filter-due": "due",
+  "label.filter-recent": "recent",
+  "label.filter-rejected": "rejected",
+  "label.filter-resubmitted": "resubmitted",
   "label.hours": "[ms] hours",
   "label.minutes": "[ms] minutes",
   "label.seconds": "[ms] seconds",

package/translations/zh.json

@@ -50,6 +50,12 @@
   "field.view-source": "[zh] view source",
   "label.activity-instance": "[zh] activity instance",
   "label.days": "天",
+  "label.filter-aborted": "aborted",
+  "label.filter-important": "important",
+  "label.filter-due": "due",
+  "label.filter-recent": "recent",
+  "label.filter-rejected": "rejected",
+  "label.filter-resubmitted": "resubmitted",
   "label.hours": "小时",
   "label.minutes": "分钟",
   "label.seconds": "秒钟",