@things-factory/worklist 5.0.7 → 5.0.13

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

@@ -54,7 +54,7 @@ export class ActivityModelItem {
   type?: ActivityModelItemType
 
   @Field(type => ScalarObject, { nullable: true })
-  options?: ScalarObject
+  options?: { [option: string]: any }
 
   @Field({ nullable: true })
   unit?: string
@@ -63,7 +63,7 @@ export class ActivityModelItem {
   quantifier: number[]
 
   @Field(type => ScalarObject, { nullable: true })
-  spec?: ScalarObject
+  spec?: { [key: string]: any }
 }
 
 @InputType()
@@ -84,7 +84,7 @@ export class ActivityModelItemPatch {
   type?: ActivityModelItemType
 
   @Field(type => ScalarObject, { nullable: true })
-  options?: ScalarObject
+  options?: { [option: string]: any }
 
   @Field({ nullable: true })
   unit?: string
@@ -102,5 +102,5 @@ export class ActivityModelItemPatch {
   hidden?: boolean
 
   @Field(type => ScalarObject, { nullable: true })
-  spec?: ScalarObject
+  spec?: { [key: string]: any }
 }

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

@@ -101,11 +101,11 @@ export class ActivityInstanceHistory implements HistoryEntityInterface<ActivityI
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  input?: ScalarObject
+  input?: { [key: string]: any }
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  output?: ScalarObject
+  output?: { [key: string]: any }
 
   @Column({ nullable: true })
   @Field({ nullable: true })

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

@@ -7,8 +7,6 @@ import { ActivityThread } from '../activity-thread/activity-thread'
 import { ActivityInstance } from './activity-instance'
 import { ActivityInstancePatch, ActivityInstancePost, NewActivityInstance } from './activity-instance-type'
 
-const debug = require('debug')('things-factory:worklist:activity-instance-mutation')
-
 @Resolver(ActivityInstance)
 export class ActivityInstanceMutation {
   @Directive('@transaction')
@@ -17,7 +15,7 @@ export class ActivityInstanceMutation {
     @Arg('activityInstance') activityInstance: NewActivityInstance,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await draft(activityInstance, context.state)
+    return await draft(activityInstance, context)
   }
 
   @Directive('@transaction')
@@ -26,7 +24,7 @@ export class ActivityInstanceMutation {
     @Arg('activityInstance') activityInstance: ActivityInstancePost,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await post(activityInstance, context.state)
+    return await post(activityInstance, context)
   }
 
   @Directive('@transaction')
@@ -36,15 +34,14 @@ export class ActivityInstanceMutation {
       'To pick an activity ActivityInstance voluntarily. [cautions] This resolver will return a assigned ActivityThread.'
   })
   async pickActivityInstance(@Arg('id') id: string, @Ctx() context: any): Promise<ActivityThread> {
-    return await pick(id, context.state)
+    return await pick(id, context)
   }
 
   @Directive('@transaction')
   @Mutation(returns => ActivityInstance, { description: 'To assign a ActivityInstance' })
   async assignActivityInstance(
     @Arg('id') id: string,
-    @Arg('assigneeRole', { nullable: true }) assigneeRole: string,
-    @Arg('supervisoryRole', { nullable: true }) supervisoryRole: string,
+    @Arg('assignees', type => [String], { nullable: true, description: 'Email of assignee users' }) assignees: string[],
     @Arg('reason', { nullable: true }) reason: string,
     @Arg('dueAt', { nullable: true }) dueAt: Date,
     @Ctx() context: any
@@ -52,12 +49,11 @@ export class ActivityInstanceMutation {
     return await assign(
       {
         id,
-        assigneeRole,
-        supervisoryRole,
+        assignees,
         reason,
         dueAt
       },
-      context.state
+      context
     )
   }
 
@@ -68,7 +64,7 @@ export class ActivityInstanceMutation {
     @Arg('patch') patch: ActivityInstancePatch,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await adjust(id, patch, context.state)
+    return await adjust(id, patch, context)
   }
 
   @Directive('@transaction')
@@ -80,18 +76,18 @@ export class ActivityInstanceMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await delegate({ id, assigneeRole, dueAt, reason }, context.state)
+    return await delegate({ id, assigneeRole, dueAt, reason }, context)
   }
 
   @Directive('@transaction')
   @Mutation(returns => ActivityInstance, { description: 'To end a ActivityInstance' })
   async endActivityInstance(
     @Arg('id') id: string,
-    @Arg('output', type => ScalarObject, { nullable: true }) output: ScalarObject,
+    @Arg('output', type => ScalarObject, { nullable: true }) output: { [key: string]: any },
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await end({ id, output, reason }, context.state)
+    return await end({ id, output, reason }, context)
   }
 
   @Directive('@transaction')
@@ -101,6 +97,6 @@ export class ActivityInstanceMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await abort({ id, reason }, context.state)
+    return await abort({ id, reason }, context)
   }
 }

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

@@ -7,8 +7,6 @@ import { pubsub } from '@things-factory/shell'
 
 import { ActivityInstance } from './activity-instance'
 
-const debug = require('debug')('things-factory:worklist:activity-instance-subscription')
-
 @Resolver(ActivityInstance)
 export class ActivityInstanceSubscription {
   @Subscription({
@@ -16,8 +14,6 @@ export class ActivityInstanceSubscription {
       const { domain, user } = context.state
       const subdomain = domain?.subdomain
 
-      debug('subscribe', subdomain)
-
       if (!domain) {
         throw new Error('domain required')
       }
@@ -46,7 +42,7 @@ export class ActivityInstanceSubscription {
             relations: ['roles']
           })
 
-          return userWithRoles.roles.find(role => role.id === activityInstance.assigneeRoleId)
+          return !!userWithRoles.roles.find(role => role.id === activityInstance.assigneeRoleId)
         }
       )(_, args, context, info)
     }

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

@@ -1,6 +1,6 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
-import { Role, User } from '@things-factory/auth-base'
+import { Role } from '@things-factory/auth-base'
 import { ObjectRef, ScalarDate, ScalarObject } from '@things-factory/shell'
 
 import { ActivityType, ActivityUIType } from '../activity/activity'
@@ -12,7 +12,7 @@ export class NewActivityInstance {
   name: string
 
   @Field({ nullable: true })
-  activityId?: string
+  activityId: string
 
   @Field({ nullable: true })
   description?: string
@@ -30,10 +30,10 @@ export class NewActivityInstance {
   threadsMax?: number
 
   @Field(type => ScalarDate, { nullable: true })
-  dueAt?: ScalarDate
+  dueAt?: Date
 
   @Field(type => ScalarObject, { nullable: true })
-  input?: ScalarObject
+  input?: { [key: string]: any }
 
   @Field({ nullable: true })
   adhocType?: string
@@ -84,10 +84,10 @@ export class ActivityInstancePost {
   threadsMax?: number
 
   @Field(type => ScalarDate, { nullable: true })
-  dueAt?: ScalarDate
+  dueAt?: Date
 
   @Field(type => ScalarObject, { nullable: true })
-  input?: ScalarObject
+  input?: { [key: string]: any }
 
   @Field({ nullable: true })
   adhocType?: string
@@ -110,14 +110,14 @@ export class ActivityInstancePost {
   @Field(type => ObjectRef, { nullable: true })
   assigneeRole?: Role
 
-  @Field(type => [ObjectRef], { nullable: true })
-  assignees?: User[]
+  @Field(type => [String], { nullable: true, description: 'Email of assignee users' })
+  assignees?: string[]
 }
 
 @InputType()
 export class ActivityInstanceSave {
   @Field(type => ScalarObject, { nullable: true })
-  output?: ScalarObject
+  output?: { [key: string]: any }
 }
 
 @InputType()
@@ -137,11 +137,17 @@ export class ActivityInstancePatch {
   @Field({ nullable: true })
   state?: ActivityInstanceStatus
 
+  @Field(type => Int, { nullable: true })
+  threadsMin?: number
+
+  @Field(type => Int, { nullable: true })
+  threadsMax?: number
+
   @Field(type => ScalarDate, { nullable: true })
-  dueAt?: ScalarDate
+  dueAt?: Date
 
   @Field(type => ScalarObject, { nullable: true })
-  input?: ScalarObject
+  input?: { [key: string]: any }
 
   @Field({ nullable: true })
   cuFlag?: string

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

@@ -112,11 +112,11 @@ export class ActivityInstance {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  input?: ScalarObject
+  input?: { [key: string]: any }
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  output?: ScalarObject
+  output?: { [key: string]: any }
 
   @Column({ nullable: true })
   @Field({ nullable: true })

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

@@ -5,6 +5,7 @@ import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
+import { ActivityModelItem } from '../activity/activity-model-type'
 import { ActivityTemplate } from './activity-template'
 import { ActivityTemplateList } from './activity-template-type'
 
@@ -35,6 +36,15 @@ export class ActivityTemplateQuery {
     return { items, total }
   }
 
+  @FieldResolver(type => [ActivityModelItem])
+  async model(@Root() activityTemplate: ActivityTemplate): Promise<ActivityModelItem[]> {
+    if (activityTemplate.model instanceof Array) {
+      return activityTemplate.model.filter(model => model.name)
+    }
+
+    return []
+  }
+
   @FieldResolver(type => String)
   async thumbnail(@Root() activityTemplate: ActivityTemplate): Promise<string | undefined> {
     const attachment: Attachment = await getRepository(Attachment).findOne({

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

@@ -139,11 +139,11 @@ export class ActivityThreadMutation {
   @Mutation(returns => ActivityThread!, { nullable: true, description: 'To start ActivityThread information' })
   async startActivityThread(
     @Arg('id') id: string,
-    @Arg('output', type => ScalarObject, { nullable: true }) output: ScalarObject,
+    @Arg('output', type => ScalarObject, { nullable: true }) output: { [key: string]: any },
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await start(id, output, reason, context.state)
+    return await start(id, output, reason, context)
   }
 
   @Directive('@transaction')
@@ -155,7 +155,7 @@ export class ActivityThreadMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await delegate({ id, assigneeRole, dueAt, reason }, context.state)
+    return await delegate({ id, assigneeRole, dueAt, reason }, context)
   }
 
   @Directive('@transaction')
@@ -165,18 +165,18 @@ export class ActivityThreadMutation {
     @Arg('save') save: ActivityThreadSave,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await saveActivityThread(id, save, context.state)
+    return await saveActivityThread(id, save, context)
   }
 
   @Directive('@transaction')
   @Mutation(returns => ActivityThread, { description: 'To end a ActivityThread' })
   async endActivityThread(
     @Arg('id') id: string,
-    @Arg('output', type => ScalarObject, { nullable: true }) output: ScalarObject,
+    @Arg('output', type => ScalarObject, { nullable: true }) output: { [key: string]: any },
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await end({ id, output, reason }, context.state)
+    return await end({ id, output, reason }, context)
   }
 
   @Directive('@transaction')
@@ -186,6 +186,6 @@ export class ActivityThreadMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await abort({ id, reason }, context.state)
+    return await abort({ id, reason }, context)
   }
 }

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

@@ -5,8 +5,6 @@ import { pubsub } from '@things-factory/shell'
 
 import { ActivityThread } from './activity-thread'
 
-const debug = require('debug')('things-factory:worklist:activity-thread-subscription')
-
 @Resolver(ActivityThread)
 export class ActivityThreadSubscription {
   @Subscription({
@@ -14,8 +12,6 @@ export class ActivityThreadSubscription {
       const { domain, user } = context.state
       const subdomain = domain?.subdomain
 
-      debug('subscribe', subdomain)
-
       if (!domain) {
         throw new Error('domain required')
       }

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

@@ -34,7 +34,7 @@ export class ActivityThreadPatch {
 @InputType()
 export class ActivityThreadSave {
   @Field(type => ScalarObject, { nullable: true })
-  output?: ScalarObject
+  output?: { [key: string]: any }
 }
 
 @ObjectType()

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

@@ -70,7 +70,7 @@ export class ActivityThread {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  output?: ScalarObject
+  output?: { [key: string]: any }
 
   @ManyToOne(type => User, {
     nullable: true

package/server/service/activity-thread/event-subscriber.ts

@@ -15,7 +15,7 @@ export class ActivityThreadSubscriber implements EntitySubscriberInterface<Activ
   async afterInsert(event: InsertEvent<ActivityThread>): Promise<any> {
     const activityThread = event.entity
 
-    await updateActivityInstanceState(activityThread.activityInstanceId, { tx: event.manager })
+    await updateActivityInstanceState(activityThread.activityInstanceId, { state: { tx: event.manager } })
 
     pubsub.publish('activity-thread', {
       activityThread
@@ -27,7 +27,7 @@ export class ActivityThreadSubscriber implements EntitySubscriberInterface<Activ
   async afterUpdate(event: UpdateEvent<ActivityThread>): Promise<any> {
     const activityThread = event.entity
 
-    await updateActivityInstanceState(activityThread.activityInstanceId, { tx: event.manager })
+    await updateActivityInstanceState(activityThread.activityInstanceId, { state: { tx: event.manager } })
 
     pubsub.publish('activity-thread', {
       activityThread
@@ -38,6 +38,6 @@ export class ActivityThreadSubscriber implements EntitySubscriberInterface<Activ
   async afterRemove(event: RemoveEvent<ActivityThread>): Promise<any> {
     const activityThread = event.entity
 
-    await updateActivityInstanceState(activityThread.activityInstanceId, { tx: event.manager })
+    await updateActivityInstanceState(activityThread.activityInstanceId, { state: { tx: event.manager } })
   }
 }

package/server/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig-base.json",
+  "compilerOptions": {
+    "strict": false,
+    "module": "commonjs",
+    "outDir": "../dist-server",
+    "baseUrl": "./"
+  },
+  "include": ["./**/*"]
+}

package/things-factory.config.js

@@ -1,5 +1,5 @@
-import bootstrap from './client/bootstrap'
-import route from './client/route'
+import bootstrap from './dist-client/bootstrap.js'
+import route from './dist-client/route.js'
 
 export default {
   bootstrap,

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../tsconfig-base.json",
-  "compilerOptions": {
-    "outDir": "./dist-server",
-    "baseUrl": "./"
-  },
-  "include": ["./server/**/*"],
-  "exclude": ["**/*.spec.ts"]
-}