@things-factory/worklist 5.0.11 → 5.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "5.0.11",
+  "version": "5.0.13",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -33,5 +33,5 @@
     "@things-factory/board-service": "^5.0.11",
     "@things-factory/shell": "^5.0.11"
   },
-  "gitHead": "37cd4feb62e062899cae7029588d86a5d4b4036a"
+  "gitHead": "72dfd33e398eab9872600e91d1b13fef0595c174"
 }

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

@@ -1,12 +1,11 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
-import { type ContextStatus, evalActivityInstanceState } from '../common'
+import { evalActivityInstanceState } from '../common'
+
+export async function abort({ id, reason }: { id: string; reason: string }, context: any): Promise<ActivityInstance> {
+  const { domain, user, tx } = context.state
 
-export async function abort(
-  { id, reason }: { id: string; reason: string },
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityInstance> {
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
@@ -15,7 +14,7 @@ export async function abort(
 
   if (!activityInstance) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityInstance: id
       })
     )
@@ -24,7 +23,7 @@ export async function abort(
   return await tx.getRepository(ActivityInstance).save({
     ...activityInstance,
     reason,
-    state: await evalActivityInstanceState(id, { domain, user, tx, t }),
+    state: await evalActivityInstanceState(id, context),
     transaction: 'abort',
     updater: user,
     terminatedAt: new Date(),

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

@@ -1,12 +1,10 @@
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { ActivityInstancePatch } from '../../service/activity-instance/activity-instance-type'
-import { type ContextStatus, evalActivityInstanceState } from '../common'
+import { evalActivityInstanceState } from '../common'
+
+export async function adjust(id: string, patch: ActivityInstancePatch, context: any): Promise<ActivityInstance> {
+  const { domain, user, tx } = context.state
 
-export async function adjust(
-  id: string,
-  patch: ActivityInstancePatch,
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityInstance> {
   const repository = tx.getRepository(ActivityInstance)
   const activityInstance = await repository.findOne({
     where: { domain, id }
@@ -16,7 +14,7 @@ export async function adjust(
     ...activityInstance,
     ...patch,
     transaction: 'adjust',
-    state: await evalActivityInstanceState(id, { domain, user, tx, t }),
+    state: await evalActivityInstanceState(id, context),
     updater: user
   })
 }

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

@@ -1,21 +1,17 @@
-import { getRepository } from 'typeorm'
+import { In } from 'typeorm'
 
-import { Role } from '@things-factory/auth-base'
+import { User } from '@things-factory/auth-base'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
-import { type ContextStatus, evalActivityInstanceState } from '../common'
+import { createActivityThreadsForUsers } from '../common'
 
 export async function assign(
-  {
-    id,
-    assigneeRole,
-    supervisoryRole,
-    reason,
-    dueAt
-  }: { id: string; assigneeRole?: string; supervisoryRole?: string; reason?: string; dueAt?: Date },
-  { domain, user, tx, t }: ContextStatus
+  { id, assignees, reason, dueAt }: { id: string; assignees?: string[]; reason?: string; dueAt?: Date },
+  context: any
 ): Promise<ActivityInstance> {
-  var repository = getRepository(ActivityInstance)
+  const { domain, user, tx } = context.state
+
+  const repository = tx.getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
     where: { domain, id },
@@ -24,7 +20,7 @@ export async function assign(
 
   if (!activityInstance) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityInstance: id
       })
     )
@@ -34,35 +30,11 @@ export async function assign(
     activityInstance.dueAt = dueAt
   }
 
-  if (assigneeRole) {
-    activityInstance.assigneeRole = await getRepository(Role).findOne({
-      domain,
-      name: assigneeRole
-    })
-  }
-
-  if (supervisoryRole) {
-    activityInstance.supervisoryRole = await getRepository(Role).findOne({
-      domain,
-      name: supervisoryRole
-    })
-  }
+  const assignedUsers = await tx.getRepository(User).find({
+    email: In(assignees)
+  })
 
-  if (!activityInstance.assigneeRole) {
-    throw new Error(
-      t('error.activity-instance assignee role not found', {
-        activityInstance: id,
-        role: assigneeRole
-      })
-    )
-  }
+  await createActivityThreadsForUsers('assign', activityInstance, assignedUsers, context)
 
-  if (activityInstance.assigneeRole)
-    return await tx.getRepository(ActivityInstance).save({
-      ...activityInstance,
-      reason,
-      transaction: 'assign',
-      state: await evalActivityInstanceState(id, { domain, user, tx, t }),
-      updater: user
-    })
+  return await tx.getRepository(ActivityInstance).findOne(activityInstance.id)
 }

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

@@ -1,7 +1,7 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
-import { type ContextStatus, evalActivityInstanceState } from '../common'
+import { evalActivityInstanceState } from '../common'
 
 export async function delegate(
   {
@@ -15,9 +15,11 @@ export async function delegate(
     dueAt?: Date
     reason?: string
   },
-  { domain, user, tx, t }: ContextStatus
+  context: any
 ): Promise<ActivityInstance> {
-  var repository = getRepository(ActivityInstance)
+  const { domain, user, tx } = context.state
+
+  const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
     where: { domain, id }
@@ -25,7 +27,7 @@ export async function delegate(
 
   if (!activityInstance) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityInstance: id
       })
     )
@@ -40,7 +42,7 @@ export async function delegate(
     reason,
     assigneeRole,
     transaction: 'delegate',
-    state: await evalActivityInstanceState(id, { domain, user, tx, t }),
+    state: await evalActivityInstanceState(id, context),
     updater: user,
     assignedAt: new Date()
   })

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

@@ -3,12 +3,9 @@ import { getRepository } from 'typeorm'
 import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'
 import { NewActivityInstance } from '../../service/activity-instance/activity-instance-type'
 import { Activity } from '../../service/activity/activity'
-import { type ContextStatus } from '../common'
 
-export async function draft(
-  activityInstance: NewActivityInstance,
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityInstance> {
+export async function draft(activityInstance: NewActivityInstance, context: any): Promise<ActivityInstance> {
+  const { domain, user, tx } = context.state
   const { activityId, input, dueAt } = activityInstance
 
   var repository = getRepository(Activity)
@@ -22,16 +19,16 @@ export async function draft(
 
     if (!activity) {
       throw new Error(
-        t('error.activity not found', {
+        context.t('error.activity not found', {
           activity: activityId
         })
       )
     }
-
-    activity.adhocType = 'standard'
-    activity.refBy = activityId
   }
 
+  activityInstance.adhocType = 'standard'
+  activityInstance.refBy = activityId
+
   if (!dueAt && activity.standardTime) {
     activityInstance.dueAt = new Date(Date.now() + activity.standardTime * 1000)
   }
@@ -46,6 +43,7 @@ export async function draft(
     refBy: activity.refBy,
     ...activityInstance,
     transaction: 'draft',
+    activity,
     state: ActivityInstanceStatus.Draft,
     domain,
     creator: user,

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

@@ -1,13 +1,14 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
-import { type ContextStatus, evalActivityInstanceState } from '../common'
+import { evalActivityInstanceState } from '../common'
 
 export async function end(
   { id, output, reason }: { id: string; output?: object; reason?: string },
-  { domain, user, tx, t }: ContextStatus
+  context: any
 ): Promise<ActivityInstance> {
-  var repository = getRepository(ActivityInstance)
+  const { domain, user, tx } = context.state
+  const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
     where: { domain, id }
@@ -15,7 +16,7 @@ export async function end(
 
   if (!activityInstance) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityInstance: id
       })
     )
@@ -26,7 +27,7 @@ export async function end(
     reason,
     output,
     transaction: 'end',
-    state: await evalActivityInstanceState(id, { domain, user, tx, t }),
+    state: await evalActivityInstanceState(id, context),
     updater: user,
     terminatedAt: new Date(),
     terminator: user

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

@@ -2,10 +2,11 @@ import { getRepository } from 'typeorm'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { ActivityThread } from '../../service/activity-thread/activity-thread'
-import { type ContextStatus, createActivityThreadsForUsers } from '../common'
+import { createActivityThreadsForUsers } from '../common'
 
-export async function pick(id: string, { domain, user, tx, t }: ContextStatus): Promise<ActivityThread> {
-  var repository = getRepository(ActivityInstance)
+export async function pick(id: string, context: any): Promise<ActivityThread> {
+  const { domain, user, tx } = context.state
+  const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
     where: { domain, id }
@@ -13,11 +14,17 @@ export async function pick(id: string, { domain, user, tx, t }: ContextStatus):
 
   if (!activityInstance) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityInstance: id
       })
     )
   }
 
-  return (await createActivityThreadsForUsers(activityInstance, [user], { domain, user, tx, t }))[0]
+  const picked = await tx.getRepository(ActivityInstance).save({
+    ...activityInstance,
+    transaction: 'pick',
+    updater: user
+  })
+
+  return (await createActivityThreadsForUsers('pick', picked, [user], context))[0]
 }

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

@@ -1,11 +1,13 @@
+import { In } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+
 import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'
 import { ActivityInstancePost } from '../../service/activity-instance/activity-instance-type'
-import { type ContextStatus, createActivityThreadsForAllRoleUsers, createActivityThreadsForUsers } from '../common'
+import { createActivityThreadsForAllRoleUsers, createActivityThreadsForUsers } from '../common'
 
-export async function post(
-  activityInstance: ActivityInstancePost,
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityInstance> {
+export async function post(activityInstance: ActivityInstancePost, context: any): Promise<ActivityInstance> {
+  const { domain, user, tx } = context.state
   const { id, assignees } = activityInstance
 
   var origin = id ? await tx.getRepository(ActivityInstance).findOne(id) : null
@@ -20,12 +22,16 @@ export async function post(
     updater: user
   })
 
+  const assignedUsers = await tx.getRepository(User).find({
+    email: In(assignees || [])
+  })
+
   if (posted.threadsMin === 0 && posted.assigneeRoleId) {
-    await createActivityThreadsForAllRoleUsers(posted, { domain, user, tx, t })
+    await createActivityThreadsForAllRoleUsers('post', posted, context)
   }
 
-  if (assignees instanceof Array) {
-    await createActivityThreadsForUsers(activityInstance, assignees, { domain, user, tx, t })
+  if (assignedUsers.length > 0) {
+    await createActivityThreadsForUsers('post', posted, assignedUsers, context)
   }
 
   return await tx.getRepository(ActivityInstance).findOne(posted.id)

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

@@ -1,7 +1,9 @@
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
-import { type ContextStatus, evalActivityInstanceState } from '../common'
+import { evalActivityInstanceState } from '../common'
+
+export async function start(id: string, context: any): Promise<ActivityInstance> {
+  const { domain, user, tx } = context.state
 
-export async function start(id: string, { domain, user, tx, t }: ContextStatus): Promise<ActivityInstance> {
   const repository = tx.getRepository(ActivityInstance)
   const activityInstance = await repository.findOne({
     where: { domain, id }
@@ -10,7 +12,7 @@ export async function start(id: string, { domain, user, tx, t }: ContextStatus):
   return await repository.save({
     ...activityInstance,
     transaction: 'start',
-    state: await evalActivityInstanceState(id, { domain, user, tx, t }),
+    state: await evalActivityInstanceState(id, context),
     updater: user,
     startedAt: new Date()
   })

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

@@ -1,13 +1,15 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
-import { type ContextStatus, evalActivityInstanceState } from '../common'
+import { evalActivityInstanceState } from '../common'
 
 export async function terminate(
   { id, output, reason }: { id: string; output?: object; reason?: string },
-  { domain, user, tx, t }: ContextStatus
+  context: any
 ): Promise<ActivityInstance> {
-  var repository = getRepository(ActivityInstance)
+  const { domain, user, tx } = context.state
+
+  const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
     where: { domain, id }
@@ -15,7 +17,7 @@ export async function terminate(
 
   if (!activityInstance) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityInstance: id
       })
     )
@@ -26,7 +28,7 @@ export async function terminate(
     reason,
     output,
     transaction: 'terminate',
-    state: await evalActivityInstanceState(id, { domain, user, tx, t }),
+    state: await evalActivityInstanceState(id, context),
     updater: user,
     terminatedAt: new Date(),
     terminator: user

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

@@ -1,12 +1,10 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
-import { type ContextStatus } from '../common'
 
-export async function abort(
-  { id, reason }: { id: string; reason: string },
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityThread> {
+export async function abort({ id, reason }: { id: string; reason: string }, context: any): Promise<ActivityThread> {
+  const { domain, user, tx } = context.state
+
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
@@ -15,7 +13,7 @@ export async function abort(
 
   if (!activityThread) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityThread: id
       })
     )

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

@@ -1,13 +1,10 @@
 import { ActivityThread } from '../../service/activity-thread/activity-thread'
 import { ActivityThreadPatch } from '../../service/activity-thread/activity-thread-type'
-import { type ContextStatus } from '../common'
 
-export async function adjust(
-  id: string,
-  patch: ActivityThreadPatch,
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityThread> {
+export async function adjust(id: string, patch: ActivityThreadPatch, context: any): Promise<ActivityThread> {
+  const { domain, user, tx } = context.state
   const repository = tx.getRepository(ActivityThread)
+
   const activityThread = await repository.findOne({
     where: { domain, id }
   })

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

@@ -1,7 +1,6 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
-import { type ContextStatus } from '../common'
 
 export async function delegate(
   {
@@ -15,9 +14,11 @@ export async function delegate(
     dueAt?: Date
     reason?: string
   },
-  { domain, user, tx, t }: ContextStatus
+  context: any
 ): Promise<ActivityThread> {
-  var repository = getRepository(ActivityThread)
+  const { domain, user, tx } = context.state
+
+  const repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
     where: { domain, id }
@@ -25,7 +26,7 @@ export async function delegate(
 
   if (!activityThread) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityThread: id
       })
     )

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

@@ -1,13 +1,14 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
-import { type ContextStatus } from '../common'
 
 export async function end(
   { id, output, reason }: { id: string; output?: object; reason?: string },
-  { domain, user, tx, t }: ContextStatus
+  context: any
 ): Promise<ActivityThread> {
-  var repository = getRepository(ActivityThread)
+  const { domain, user, tx } = context.state
+
+  const repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
     where: { domain, id }
@@ -15,7 +16,7 @@ export async function end(
 
   if (!activityThread) {
     throw new Error(
-      t('error.activity-thread not found', {
+      context.t('error.activity-thread not found', {
         activityThread: id
       })
     )

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

@@ -1,13 +1,10 @@
 import { ActivityThread } from '../../service/activity-thread/activity-thread'
 import { ActivityThreadSave } from '../../service/activity-thread/activity-thread-type'
-import { type ContextStatus } from '../common'
 
-export async function save(
-  id: string,
-  save: ActivityThreadSave,
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityThread> {
+export async function save(id: string, save: ActivityThreadSave, context: any): Promise<ActivityThread> {
+  const { domain, user, tx } = context.state
   const repository = tx.getRepository(ActivityThread)
+
   const activityThread = await repository.findOne({
     where: { domain, id }
   })

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

@@ -1,12 +1,8 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
-import { type ContextStatus } from '../common'
 
-export async function start(
-  id: string,
-  output: object,
-  reason: string,
-  { domain, user, tx, t }: ContextStatus
-): Promise<ActivityThread> {
+export async function start(id: string, output: object, reason: string, context: any): Promise<ActivityThread> {
+  const { domain, user, tx } = context.state
+
   const repository = tx.getRepository(ActivityThread)
   const activityThread = await repository.findOne({
     where: { domain, id }
@@ -14,7 +10,7 @@ export async function start(
 
   if (!activityThread) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityInstance: id
       })
     )
@@ -28,6 +24,7 @@ export async function start(
     ...activityThread,
     reason,
     state: ActivityThreadStatus.Started,
+    transaction: 'start',
     updater: user,
     startedAt: new Date()
   })

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

@@ -1,12 +1,12 @@
 import { getRepository } from 'typeorm'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
-import { type ContextStatus } from '../common'
 
 export async function terminate(
   { id, output, reason }: { id: string; output?: object; reason?: string },
-  { domain, user, tx, t }: ContextStatus
+  context: any
 ): Promise<ActivityThread> {
+  const { domain, user, tx } = context.state
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
@@ -15,7 +15,7 @@ export async function terminate(
 
   if (!activityThread) {
     throw new Error(
-      t('error.activity-instance not found', {
+      context.t('error.activity-instance not found', {
         activityThread: id
       })
     )