@things-factory/worklist 6.0.133 → 6.0.137

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.133",
+  "version": "6.0.137",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,10 +33,10 @@
     "@things-factory/auth-base": "^6.0.133",
     "@things-factory/board-service": "^6.0.133",
     "@things-factory/context-ui": "^6.0.133",
-    "@things-factory/organization": "^6.0.133",
+    "@things-factory/organization": "^6.0.137",
     "@things-factory/scheduler-client": "^6.0.133",
     "@things-factory/shell": "^6.0.133",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "c08bf83d00cbb66e1338cdfeed8ca91d4e130c97"
+  "gitHead": "374fe27c35c1a4dbb305f972032d283a51ac8813"
 }

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

@@ -68,23 +68,23 @@ export async function draft(
     activityInstance.dueAt = new Date(Date.now() + activity.standardTime * 1000)
   }
 
-  if (activityInstance.assignees) {
-    activityInstance.assignees = activityInstance.assignees.map(assignee => {
-      return {
-        type: assignee.type,
-        value: assignee.value
-      }
-    })
-  }
+  // if (activityInstance.assignees) {
+  //   activityInstance.assignees = activityInstance.assignees.map(assignee => {
+  //     return {
+  //       type: assignee.type,
+  //       value: assignee.value
+  //     }
+  //   })
+  // }
 
-  if (activityInstance.approvalLine) {
-    activityInstance.approvalLine = activityInstance.approvalLine.map(approval => {
-      return {
-        type: approval.type,
-        value: approval.value
-      }
-    })
-  }
+  // if (activityInstance.approvalLine) {
+  //   activityInstance.approvalLine = activityInstance.approvalLine.map(approval => {
+  //     return {
+  //       type: approval.type,
+  //       value: approval.value
+  //     }
+  //   })
+  // }
 
   const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)
 

package/server/controllers/common.ts

@@ -244,24 +244,25 @@ export async function getSystemUserFromOrgMemberItem(
 ): Promise<User> {
   const { domain, user, tx } = context.state
 
-  const { type, value: id } = item
+  const { type, approver, assignee, value } = item
+  const id = approver?.id || assignee?.id || value
 
   if (type == OrgMemberTargetType.Employee) {
-    const employee = await tx.getRepository(Employee).findOne({ where: { id }, relations: ['user'] })
+    const employee = id && (await tx.getRepository(Employee).findOne({ where: { id }, relations: ['user'] }))
 
     if (!employee || !employee.user) {
       return
     }
     return employee.user
   } else if (type == OrgMemberTargetType.Department) {
-    const department = await tx.getRepository(Department).findOne({ where: { id }, relations: ['manager'] })
+    const department = id && (await tx.getRepository(Department).findOne({ where: { id }, relations: ['manager'] }))
 
     if (!department || !department.manager) {
       return
     }
     return await tx.getRepository(User).findOneBy({ id: department.manager.userId })
   } else if (type == OrgMemberTargetType.Role) {
-    const role = await tx.getRepository(Role).findOne({ where: { id }, relations: ['users'] })
+    const role = id && (await tx.getRepository(Role).findOne({ where: { id }, relations: ['users'] }))
 
     if (!role || !role.users || !role.users[0]) {
       return

package/server/index.ts

@@ -1,5 +1,4 @@
 import './routes'
 
 export * from './controllers'
-export * from './middlewares'
 export * from './service'

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

@@ -144,18 +144,20 @@ export class ActivityQuery {
     var assigneeItemList = []
 
     for (let item of assignees) {
-      var { type, value: id } = item
+      // "value" deprecated. to be removed
+      var { type, assignee, value } = item
+      var id = assignee?.id || id
       var assignee
 
       switch (type) {
         case 'Employee':
-          assignee = await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id })
+          assignee = id && (await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Department':
-          assignee = await getRepository('Department').findOneBy({ domain: { id: domain.id }, id })
+          assignee = id && (await getRepository('Department').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Role':
-          assignee = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
+          assignee = id && (await getRepository('Role').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Myself':
           assignee = user
@@ -184,18 +186,20 @@ export class ActivityQuery {
     var approvalLineItems = []
 
     for (let item of approvalLine) {
-      var { type, value: id } = item
-      var approver
+      // "value" deprecated. to be removed
+      var { type, approver, value } = item
+      var id = approver?.id || value
+      approver = null
 
       switch (type) {
         case 'Employee':
-          approver = await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id })
+          approver = id && (await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Department':
-          approver = await getRepository('Department').findOneBy({ domain: { id: domain.id }, id })
+          approver = id && (await getRepository('Department').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Role':
-          approver = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
+          approver = id && (await getRepository('Role').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Myself':
           approver = user
@@ -206,7 +210,7 @@ export class ActivityQuery {
         default:
       }
 
-      approver && approvalLineItems.push({ type, value: id, approver })
+      id ? approvalLineItems.push({ type, approver }) : approvalLineItems.push({ type })
     }
 
     return approvalLineItems

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

@@ -191,18 +191,20 @@ export class ActivityInstanceQuery {
     var assigneeItemList = []
 
     for (let item of assignees) {
-      var { type, value: id } = item
+      // "value" deprecated. to be removed
+      var { type, assignee, value } = item
+      var id = assignee?.id || value
       var assignee
 
       switch (type) {
         case 'Employee':
-          assignee = await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id })
+          assignee = id && (await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Department':
-          assignee = await getRepository('Department').findOneBy({ domain: { id: domain.id }, id })
+          assignee = id && (await getRepository('Department').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Role':
-          assignee = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
+          assignee = id && (await getRepository('Role').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Myself':
           assignee = user
@@ -234,18 +236,20 @@ export class ActivityInstanceQuery {
     var approvalLineItems = []
 
     for (let item of approvalLine) {
-      var { type, value: id } = item
-      var approver
+      // "value" deprecated. to be removed
+      var { type, approver, value } = item
+      var id = approver?.id || value
+      approver = null
 
       switch (type) {
         case 'Employee':
-          approver = await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id })
+          approver = id && (await getRepository('Employee').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Department':
-          approver = await getRepository('Department').findOneBy({ domain: { id: domain.id }, id })
+          approver = id && (await getRepository('Department').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Role':
-          approver = await getRepository('Role').findOneBy({ domain: { id: domain.id }, id })
+          approver = id && (await getRepository('Role').findOneBy({ domain: { id: domain.id }, id }))
           break
         case 'Myself':
           approver = user
@@ -256,7 +260,7 @@ export class ActivityInstanceQuery {
         default:
       }
 
-      approver && approvalLineItems.push({ type, value: id, approver })
+      id ? approvalLineItems.push({ type, approver }) : approvalLineItems.push({ type })
     }
 
     return approvalLineItems

package/server/middlewares/index.ts

@@ -1,3 +0,0 @@
-export function initMiddlewares(app) {
-  /* can add middlewares into app */
-}

package/server/migrations/index.ts

@@ -1,9 +0,0 @@
-const glob = require('glob')
-const path = require('path')
-
-export var migrations = []
-
-glob.sync(path.resolve(__dirname, '.', '**', '*.js')).forEach(function(file) {
-  if (file.indexOf('index.js') !== -1) return
-  migrations = migrations.concat(Object.values(require(path.resolve(file))) || [])
-})