@things-factory/worklist 6.0.27 → 6.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.27",
+  "version": "6.0.32",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,12 +27,13 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/grist-editor": "^1.0.0",
-    "@things-factory/attachment-base": "^6.0.27",
-    "@things-factory/auth-base": "^6.0.27",
-    "@things-factory/board-service": "^6.0.27",
-    "@things-factory/context-ui": "^6.0.27",
-    "@things-factory/organization": "^6.0.27",
-    "@things-factory/shell": "^6.0.27"
+    "@things-factory/attachment-base": "^6.0.32",
+    "@things-factory/auth-base": "^6.0.32",
+    "@things-factory/board-service": "^6.0.32",
+    "@things-factory/context-ui": "^6.0.32",
+    "@things-factory/organization": "^6.0.32",
+    "@things-factory/shell": "^6.0.32",
+    "moment-timezone": "^0.5.40"
   },
-  "gitHead": "684784a4f3e450e9ce07dcd51db70b8a2d2c2a0f"
+  "gitHead": "1b7b1eb2d2e1c0823ec69ee8160790c5da62072c"
 }

package/server/controllers/activity-approval/approve.ts

@@ -2,6 +2,7 @@ import { getSystemUserFromOrgMemberItem } from '../../controllers/common'
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
 import { ApprovalLineItem } from '@things-factory/organization'
+import { updateActivityInstanceState } from '../common'
 
 export async function approve(
   { id, comment }: { id: string; comment: string },
@@ -77,5 +78,7 @@ export async function approve(
     })
   }
 
+  await updateActivityInstanceState(activityThread.activityInstanceId, context)
+
   return result
 }

package/server/controllers/activity-approval/reject.ts

@@ -1,5 +1,6 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
+import { updateActivityInstanceState } from '../common'
 
 export async function reject(
   { id, comment }: { id: string; comment: string },
@@ -39,5 +40,7 @@ export async function reject(
     updater: user
   })
 
+  await updateActivityInstanceState(activityApproval.activityThread.activityInstanceId, context)
+
   return result
 }

package/server/controllers/{activity-installation-controller.ts → activity-installation/activity-installation-controller.ts}

@@ -1,4 +1,4 @@
-import { InstallableActivity } from '../service/installable-activity/installable-activity'
+import { InstallableActivity } from '../../service/installable-activity/installable-activity'
 
 export class ActivityInstallations {
   static templates: { [name: string]: InstallableActivity } = {}
@@ -14,4 +14,15 @@ export class ActivityInstallations {
   static list(): InstallableActivity[] {
     return Object.values(ActivityInstallations.templates)
   }
+
+  static async callback(name: string, activityInstance: any, context: ResolverContext) {
+    const installableActivity = ActivityInstallations.templates[name]
+    if (!installableActivity) {
+      return
+    }
+
+    const { callback } = installableActivity
+
+    callback && (await callback(activityInstance, context))
+  }
 }

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

@@ -25,7 +25,7 @@ export async function abort(
   return await repository.save({
     ...activityInstance,
     reason,
-    state: await evalActivityInstanceState(id, context),
+    ...(await evalActivityInstanceState(id, context)),
     transaction: 'abort',
     updater: user,
     terminatedAt: new Date(),

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

@@ -19,7 +19,7 @@ export async function adjust(
     ...activityInstance,
     ...patch,
     transaction: 'adjust',
-    state: await evalActivityInstanceState(id, context),
+    ...(await evalActivityInstanceState(id, context)),
     updater: user
   })
 }

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

@@ -1,4 +1,4 @@
-import { ActivityInstance } from '../../service/activity-instance/activity-instance'
+import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'
 import { evalActivityInstanceState } from '../common'
 
 export async function delegate(
@@ -32,6 +32,14 @@ export async function delegate(
     )
   }
 
+  if (!activityInstance.isDelegatable()) {
+    throw new Error(
+      context.t('error.activity-instance not delegatable', {
+        activityInstance: id
+      })
+    )
+  }
+
   if (dueAt) {
     activityInstance.dueAt = dueAt
   }

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

@@ -1,6 +1,7 @@
 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 { fillActivitySearchKeys } from '../common'
 
 export async function draft(
   activityInstance: NewActivityInstance,
@@ -10,7 +11,7 @@ export async function draft(
   const { activityId, input, dueAt } = activityInstance
 
   var repository = tx.getRepository(Activity)
-  var activity = {} as any
+  var activity = {} as Activity
 
   if (activityId) {
     activity = await repository.findOne({
@@ -29,6 +30,12 @@ export async function draft(
 
   activityInstance.adhocType = 'standard'
   activityInstance.refBy = activityId
+  if (!activityInstance.assignees) {
+    activityInstance.assignees = activity.assignees
+  }
+  if (!activityInstance.approvalLine) {
+    activityInstance.approvalLine = activity.approvalLine
+  }
 
   if (!dueAt && activity.standardTime) {
     activityInstance.dueAt = new Date(Date.now() + activity.standardTime * 1000)
@@ -41,6 +48,7 @@ export async function draft(
         value: assignee.value
       }
     })
+  } else {
   }
 
   if (activityInstance.approvalLine) {
@@ -52,17 +60,20 @@ export async function draft(
     })
   }
 
+  const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)
+
   return await tx.getRepository(ActivityInstance).save({
     activityType: activity.activityType,
-    uiType: activity.uiType,
-    uiSource: activity.uiSource,
+    // uiType: activity.uiType,
+    // uiSource: activity.uiSource,
+    // viewType: activity.viewType,
+    // viewSource: activity.viewSource,
     assigneeRole: activity.assigneeRole,
     supervisoryRole: activity.supervisoryRole,
-    adhocType: activity.adhocType,
-    refBy: activity.refBy,
     ...activityInstance,
     transaction: 'draft',
     activity,
+    ...activitySearchKeys,
     state: ActivityInstanceStatus.Draft,
     domain,
     creator: user,

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

@@ -1,9 +1,11 @@
+import { Activity } from '../../service/activity/activity'
 import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'
 import { ActivityInstancePost } from '../../service/activity-instance/activity-instance-type'
 import {
   createActivityThreadsForAllRoleUsers,
   createActivityThreadsForUsers,
-  getSystemUserFromOrgMemberItem
+  getSystemUserFromOrgMemberItem,
+  fillActivitySearchKeys
 } from '../common'
 
 export async function post(
@@ -11,7 +13,8 @@ export async function post(
   context: ResolverContext
 ): Promise<ActivityInstance> {
   const { domain, user, tx } = context.state
-  const { id, assignees } = activityInstance
+  const issuedAt = new Date()
+  var { id, assignees, dueAt, approvalLine, activityId, input } = activityInstance
 
   var origin = id
     ? await tx.getRepository(ActivityInstance).findOne({
@@ -29,20 +32,65 @@ export async function post(
       })
     : null
 
+  if (!origin && activityId) {
+    var repository = tx.getRepository(Activity)
+    var activity = {} as Activity
+
+    if (activityId) {
+      activity = await repository.findOne({
+        where: { domain: { id: domain.id }, id: activityId },
+        relations: ['assigneeRole', 'supervisoryRole']
+      })
+
+      if (!activity) {
+        throw new Error(
+          context.t('error.activity not found', {
+            activity: activityId
+          })
+        )
+      }
+    }
+
+    activityInstance.activityType = activity.activityType
+    // activityInstance.uiType = activity.uiType
+    // activityInstance.uiSource = activity.uiSource
+    activityInstance.assigneeRole = activity.assigneeRole
+    activityInstance.supervisoryRole = activity.supervisoryRole
+
+    if (!assignees || !approvalLine) {
+      activityInstance.adhocType = 'standard'
+      activityInstance.refBy = activityId
+      if (!activityInstance.assignees) {
+        activityInstance.assignees = activity.assignees
+      }
+      if (!activityInstance.approvalLine) {
+        activityInstance.approvalLine = activity.approvalLine
+      }
+
+      if (!dueAt && activity.standardTime) {
+        activityInstance.dueAt = new Date(issuedAt.getTime() + activity.standardTime * 1000)
+      }
+    }
+  }
+
+  const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)
+
   const posted = await tx.getRepository(ActivityInstance).save({
+    creator: user,
     ...origin,
     ...activityInstance,
     transaction: 'post',
+    activity,
+    ...activitySearchKeys,
     state: ActivityInstanceStatus.Posted,
     domain,
-    creator: user,
-    updater: user
+    issuer: user,
+    updater: user,
+    issuedAt
   })
 
   const assignedUsers = await Promise.all(assignees.map(assignee => getSystemUserFromOrgMemberItem(assignee, context)))
 
-  assignees.map(async assignee => await getSystemUserFromOrgMemberItem(assignee, context))
-
   if (assignedUsers.length == 0 && posted.threadsMin === 0 && posted.assigneeRoleId) {
     await createActivityThreadsForAllRoleUsers('post', posted, context)
   }

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

@@ -13,7 +13,7 @@ export async function start(id: string, context: ResolverContext): Promise<Activ
   return await repository.save({
     ...activityInstance,
     transaction: 'start',
-    state: await evalActivityInstanceState(id, context),
+    ...(await evalActivityInstanceState(id, context)),
     updater: user,
     startedAt: new Date()
   })

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

@@ -62,6 +62,7 @@ export async function submit(
       transaction: 'end',
       state: ActivityThreadStatus.Ended,
       updater: user,
+      terminator: user,
       terminatedAt: new Date()
     })
   }

package/server/controllers/common.ts

@@ -1,39 +1,39 @@
 import { Role, User } from '@things-factory/auth-base'
 
+import { ActivitySearchKeyItem } from '../service/activity/activity-search-key-item-type'
 import { ActivityInstance, ActivityInstanceStatus, AssigneeItem } from '../service/activity-instance/activity-instance'
 import { ActivityThread, ActivityThreadStatus } from '../service/activity-thread/activity-thread'
 import { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'
+import { ActivityInstallations } from './activity-installation/activity-installation-controller'
 
 export async function updateActivityInstanceState(id: string, context: ResolverContext) {
   const { tx } = context.state
 
-  await tx.getRepository(ActivityInstance).save({
-    ...(await tx.getRepository(ActivityInstance).findOne({
-      where: { id },
-      relations: [
-        'domain',
-        'activity',
-        'assigneeRole',
-        'supervisoryRole',
-        'updater',
-        'creator',
-        'starter',
-        'terminator'
-      ]
-    })),
+  var activityInstance = await tx.getRepository(ActivityInstance).findOne({
+    where: { id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
+  })
+
+  activityInstance = await tx.getRepository(ActivityInstance).save({
+    ...activityInstance,
     transaction: 'thread' /* change by transaction of activity thread */,
-    state: await evalActivityInstanceState(id, context)
+    ...(await evalActivityInstanceState(id, context))
   })
+
+  await ActivityInstallations.callback(activityInstance.activity.name, activityInstance, context)
 }
 
-export async function evalActivityInstanceState(id: string, context: ResolverContext): Promise<ActivityInstanceStatus> {
-  const { tx } = context.state
+export async function evalActivityInstanceState(
+  id: string,
+  context: ResolverContext
+): Promise<Partial<ActivityInstance>> {
+  const { tx, user } = context.state
 
   const activityInstance = await tx.getRepository(ActivityInstance).findOne({
     where: { id },
     relations: ['activityThreads']
   })
-  const { threadsMin, threadsMax, activityThreads, state, dueAt } = activityInstance
+  const { threadsMin, activityThreads, state, dueAt } = activityInstance
 
   const validThreads = activityThreads.filter(thread => thread.isValid())
   const pendingStartedThreads = activityThreads.filter(thread => thread.isPendingStarted())
@@ -43,17 +43,51 @@ export async function evalActivityInstanceState(id: string, context: ResolverCon
     case state === ActivityInstanceStatus.Draft:
     case state === ActivityInstanceStatus.Ended:
     case state === ActivityInstanceStatus.Aborted:
-      return state
+      return {}
     case validThreads.length === 0:
-      return ActivityInstanceStatus.Posted
+      return {
+        state: ActivityInstanceStatus.Posted
+      }
     case threadsMin > validThreads.length:
-      return ActivityInstanceStatus.WaitingAssignment
+      return {
+        state: ActivityInstanceStatus.WaitingAssignment
+      }
     case pendingStartedThreads.length > 0:
-      return ActivityInstanceStatus.Assigned
+      return {
+        state: ActivityInstanceStatus.Assigned,
+        assignedAt: new Date()
+      }
     case pendingEndedThreads.length > 0:
-      return !dueAt || dueAt.getTime() > Date.now() ? ActivityInstanceStatus.Started : ActivityInstanceStatus.Pending
+      var started = !dueAt || dueAt.getTime() > Date.now()
+      var changed =
+        (started && state !== ActivityInstanceStatus.Started) || (!started && state !== ActivityInstanceStatus.Pending)
+
+      return !changed
+        ? null
+        : started
+        ? {
+            state: ActivityInstanceStatus.Started,
+            startedAt: new Date(),
+            starter: user
+          }
+        : {
+            state: ActivityInstanceStatus.Pending
+          }
     default:
-      return ActivityInstanceStatus.Ended
+      return {
+        state: activityThreads.find(thread => thread.state == ActivityThreadStatus.Aborted)
+          ? ActivityInstanceStatus.Aborted
+          : ActivityInstanceStatus.Ended,
+        reason: '',
+        output: activityThreads
+          .filter(thread => (thread.state = ActivityThreadStatus.Ended))
+          .reduce((sum, thread) => {
+            sum[thread.assigneeId] = thread.output
+            return sum
+          }, {} as any),
+        terminatedAt: new Date(),
+        terminator: user
+      }
   }
 }
 
@@ -68,8 +102,12 @@ export async function createActivityThreadsForUsers(
   const threadRepo = tx.getRepository(ActivityThread)
   const now = new Date()
 
+  const distinct = assignees.filter((assignee, idx) => {
+    return assignee && !assignees.slice(0, idx).find(x => x.id == assignee.id)
+  })
+
   const result = await threadRepo.save(
-    assignees.map(assignee => {
+    distinct.map(assignee => {
       return {
         assignee,
         state: ActivityThreadStatus.Assigned,
@@ -126,11 +164,20 @@ export async function getSystemUserFromMyDepartmentManager(context: ResolverCont
   const department = await tx.getRepository(Department).findOne({
     where: {
       id: employee.departmentId
+    }
+  })
+
+  if (!department || !department.managerId) return
+
+  const manager = await tx.getRepository(Employee).findOne({
+    where: {
+      domain: { id: domain.id },
+      id: department.managerId
     },
-    relations: ['manager']
+    relations: ['user']
   })
 
-  return department.manager
+  return manager?.user
 }
 
 export async function getSystemUserFromMySupervosor(context: ResolverContext): Promise<User> {
@@ -152,7 +199,7 @@ export async function getSystemUserFromMySupervosor(context: ResolverContext): P
     relations: ['user']
   })
 
-  return supervisor.user
+  return supervisor?.user
 }
 
 export async function getSystemUserFromOrgMemberItem(
@@ -193,3 +240,13 @@ export async function getSystemUserFromOrgMemberItem(
     return await getSystemUserFromMySupervosor(context)
   }
 }
+
+export function fillActivitySearchKeys(searchKeys: ActivitySearchKeyItem[], input: { [key: string]: any }) {
+  return searchKeys?.reduce((sum, key, index) => {
+    const value = input[key.inputKey]
+    if (value != null) {
+      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value
+    }
+    return sum
+  }, {})
+}

package/server/controllers/index.ts

@@ -1 +1 @@
-export * from './activity-installation-controller'
+export * from './activity-installation/activity-installation-controller'

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

@@ -10,7 +10,9 @@ import {
 import { Role, User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain } from '@things-factory/shell'
+import { ApprovalLineItem } from '@things-factory/organization'
 
+import { AssigneeItem } from '../activity-instance/activity-instance'
 import { Activity, ActivityStatus, ActivityType, ActivityUIType } from './activity'
 import { ActivityModelItem } from './activity-model-type'
 
@@ -73,6 +75,16 @@ export class ActivityHistory implements HistoryEntityInterface<Activity> {
   @Field({ nullable: true })
   startable?: boolean
 
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  schedule?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  timezone?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   standardTime?: number
@@ -110,16 +122,35 @@ export class ActivityHistory implements HistoryEntityInterface<Activity> {
   @RelationId((activity: Activity) => activity.supervisoryRole)
   supervisoryRoleId?: string
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => [AssigneeItem], { nullable: true, description: 'Who to resolve for the activity.' })
+  assignees?: AssigneeItem[]
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => [ApprovalLineItem], {
+    nullable: true,
+    description: 'Approval line for handling the activity.'
+  })
+  approvalLine?: ApprovalLineItem[]
+
   @Column({ nullable: true })
-  @Field({ nullable: true })
+  @Field({ nullable: true, description: 'The type of UI to be shown when a task is performed' })
   uiType?: ActivityUIType
 
   @Column({ nullable: true })
   @Field({ nullable: true })
   uiSource?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'The type of view to be shown when a task is approved' })
+  viewType?: ActivityUIType
+
   @Column({ nullable: true })
   @Field({ nullable: true })
+  viewSource?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'The type of report to be shown when a task is approved' })
   reportType?: ActivityUIType
 
   @Column({ nullable: true })

package/server/service/activity/activity-search-key-item-type.ts

@@ -0,0 +1,16 @@
+import { Field, ObjectType } from 'type-graphql'
+
+@ObjectType({ description: 'Entity for ActivitySearchKeyItem' })
+export class ActivitySearchKeyItem {
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  inputKey: string
+
+  @Field({ nullable: true })
+  tKey?: string
+}

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

@@ -3,9 +3,12 @@ import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
+import { ApprovalLineItem } from '@things-factory/organization'
 
-import { Activity, ActivityType, ActivityUIType } from './activity'
+import { AssigneeItem } from '../activity-instance/activity-instance'
+import { Activity, ActivityStatus, ActivityType, ActivityUIType } from './activity'
 import { ActivityModelItem } from './activity-model-type'
+import { ActivitySearchKeyItem } from './activity-search-key-item-type'
 
 @InputType()
 export class NewActivity {
@@ -18,6 +21,12 @@ export class NewActivity {
   @Field({ nullable: true })
   activityType?: ActivityType
 
+  @Field(type => ScalarObject, { nullable: true })
+  searchKeys?: ActivitySearchKeyItem[]
+
+  @Field({ nullable: true })
+  state?: ActivityStatus
+
   @Field(type => ScalarObject, { nullable: true })
   model?: ActivityModelItem[]
 
@@ -30,6 +39,9 @@ export class NewActivity {
   @Field({ nullable: true })
   schedule?: string
 
+  @Field({ nullable: true })
+  timezone?: string
+
   @Field({ nullable: true })
   standardTime?: number
 
@@ -51,12 +63,24 @@ export class NewActivity {
   @Field(type => ObjectRef, { nullable: true })
   supervisoryRole?: ObjectRef
 
+  @Field(type => ScalarObject, { nullable: true })
+  assignees?: AssigneeItem[]
+
+  @Field(type => ScalarObject, { nullable: true })
+  approvalLine?: ApprovalLineItem[]
+
   @Field({ nullable: true })
   uiType?: ActivityUIType
 
   @Field({ nullable: true })
   uiSource?: string
 
+  @Field({ nullable: true })
+  viewType?: ActivityUIType
+
+  @Field({ nullable: true })
+  viewSource?: string
+
   @Field({ nullable: true })
   reportType?: ActivityUIType
 
@@ -84,6 +108,12 @@ export class ActivityPatch {
   @Field({ nullable: true })
   activityType?: ActivityType
 
+  @Field(type => ScalarObject, { nullable: true })
+  searchKeys?: ActivitySearchKeyItem[]
+
+  @Field({ nullable: true })
+  state?: ActivityStatus
+
   @Field(type => ScalarObject, { nullable: true })
   model?: ActivityModelItem[]
 
@@ -96,6 +126,9 @@ export class ActivityPatch {
   @Field({ nullable: true })
   schedule?: string
 
+  @Field({ nullable: true })
+  timezone?: string
+
   @Field({ nullable: true })
   standardTime?: number
 
@@ -117,12 +150,24 @@ export class ActivityPatch {
   @Field(type => ObjectRef, { nullable: true })
   supervisoryRole?: ObjectRef
 
+  @Field(type => ScalarObject, { nullable: true })
+  assignees?: AssigneeItem[]
+
+  @Field(type => ScalarObject, { nullable: true })
+  approvalLine?: ApprovalLineItem[]
+
   @Field({ nullable: true })
   uiType?: ActivityUIType
 
   @Field({ nullable: true })
   uiSource?: string
 
+  @Field({ nullable: true })
+  viewType?: ActivityUIType
+
+  @Field({ nullable: true })
+  viewSource?: string
+
   @Field({ nullable: true })
   reportType?: ActivityUIType