@things-factory/worklist 6.0.34 → 6.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.34",
+  "version": "6.0.36",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -32,9 +32,9 @@
     "@things-factory/board-service": "^6.0.34",
     "@things-factory/context-ui": "^6.0.34",
     "@things-factory/organization": "^6.0.34",
-    "@things-factory/scheduler-client": "^6.0.34",
+    "@things-factory/scheduler-client": "^6.0.35",
     "@things-factory/shell": "^6.0.34",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "a460e5183f6e97e061be886d1efe9a114bd1316b"
+  "gitHead": "7a3049f87fca6c58b754b701f97bb41efa1d7424"
 }

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/activity-mutation.ts

@@ -2,7 +2,7 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
 
 import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
-import { registerSchedule, unregisterSchedule } from '@things-factory/scheduler-client'
+import { Application, CallbackBase, registerSchedule, unregisterSchedule } from '@things-factory/scheduler-client'
 
 import { Activity } from './activity'
 import { ActivityPatch, NewActivity } from './activity-type'
@@ -230,7 +230,7 @@ export class ActivityMutation {
       var handle = await registerSchedule({
         name: activity.name,
         client: {
-          application: 'operato-worklist',
+          application: Application,
           group: `${domain.id}`,
           type: 'activity',
           key: activity.id,
@@ -242,7 +242,7 @@ export class ActivityMutation {
         task: {
           type: 'rest',
           connection: {
-            host: 'http://localhost:3000/callback-schedule-for-activity',
+            host: `${CallbackBase}/callback-schedule-for-activity`,
             headers: {
               'Content-Type': 'application/json',
               accept: '*/*'

package/translations/ko.json

@@ -36,7 +36,7 @@
   "field.search-keys": "검색키",
   "field.spec": "명세",
   "field.standard-time": "ST(초)",
-  "field.startable": "시작 가능 업무",
+  "field.startable": "수동 시작 가능",
   "field.started-at": "시작 시간",
   "field.status": "상태",
   "field.supervisory-role": "관리자 역할",
@@ -71,7 +71,7 @@
   "title.activity preview": "업무 미리보기",
   "title.activity reporter list": "업무 현황",
   "title.activity starter": "업무 발급",
-  "title.activity starter list": "시작 가능 업무",
+  "title.activity starter list": "새업무 할당",
   "title.activity store": "업무 스토어",
   "title.activity summary": "업무 종합 현황",
   "title.activity template model item list": "업무 템플릿 모델 항목",