@things-factory/worklist 5.0.8 → 5.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "5.0.8",
+  "version": "5.0.11",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -28,10 +28,10 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/grist-editor": "^1.0.0",
-    "@things-factory/attachment-base": "^5.0.7",
-    "@things-factory/auth-base": "^5.0.7",
-    "@things-factory/board-service": "^5.0.7",
-    "@things-factory/shell": "^5.0.7"
+    "@things-factory/attachment-base": "^5.0.11",
+    "@things-factory/auth-base": "^5.0.11",
+    "@things-factory/board-service": "^5.0.11",
+    "@things-factory/shell": "^5.0.11"
   },
-  "gitHead": "de14539186ad35c0bd1379b8ae4dccda7b13256e"
+  "gitHead": "37cd4feb62e062899cae7029588d86a5d4b4036a"
 }

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

@@ -3,14 +3,10 @@ import { getRepository } from 'typeorm'
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { type ContextStatus, evalActivityInstanceState } from '../common'
 
-const debug = require('debug')('things-factory:worklist:abort')
-
 export async function abort(
   { id, reason }: { id: string; reason: string },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityInstance> {
-  debug('abortActivityInstance', id, reason)
-
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({

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

@@ -5,8 +5,6 @@ import { Role } from '@things-factory/auth-base'
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { type ContextStatus, evalActivityInstanceState } from '../common'
 
-const debug = require('debug')('things-factory:worklist:assign')
-
 export async function assign(
   {
     id,
@@ -17,8 +15,6 @@ export async function assign(
   }: { id: string; assigneeRole?: string; supervisoryRole?: string; reason?: string; dueAt?: Date },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityInstance> {
-  debug('assignActivityInstance', id)
-
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
@@ -39,14 +35,14 @@ export async function assign(
   }
 
   if (assigneeRole) {
-    activityInstance.assigneeRole = getRepository(Role).findOne({
+    activityInstance.assigneeRole = await getRepository(Role).findOne({
       domain,
       name: assigneeRole
     })
   }
 
   if (supervisoryRole) {
-    activityInstance.supervisoryRole = getRepository(Role).findOne({
+    activityInstance.supervisoryRole = await getRepository(Role).findOne({
       domain,
       name: supervisoryRole
     })

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

@@ -3,8 +3,6 @@ import { getRepository } from 'typeorm'
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { type ContextStatus, evalActivityInstanceState } from '../common'
 
-const debug = require('debug')('things-factory:worklist:delegate')
-
 export async function delegate(
   {
     id,
@@ -19,8 +17,6 @@ export async function delegate(
   },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityInstance> {
-  debug('delegateActivity', id, assigneeRole)
-
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({

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

@@ -5,16 +5,12 @@ import { NewActivityInstance } from '../../service/activity-instance/activity-in
 import { Activity } from '../../service/activity/activity'
 import { type ContextStatus } from '../common'
 
-const debug = require('debug')('things-factory:worklist:create')
-
 export async function draft(
   activityInstance: NewActivityInstance,
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityInstance> {
   const { activityId, input, dueAt } = activityInstance
 
-  debug('draftActivityInstance', activityId, input)
-
   var repository = getRepository(Activity)
   var activity = {} as any
 

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

@@ -3,14 +3,10 @@ import { getRepository } from 'typeorm'
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { type ContextStatus, evalActivityInstanceState } from '../common'
 
-const debug = require('debug')('things-factory:worklist:end')
-
 export async function end(
   { id, output, reason }: { id: string; output?: object; reason?: string },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityInstance> {
-  debug('end', id, output)
-
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({

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

@@ -4,11 +4,7 @@ import { ActivityInstance } from '../../service/activity-instance/activity-insta
 import { ActivityThread } from '../../service/activity-thread/activity-thread'
 import { type ContextStatus, createActivityThreadsForUsers } from '../common'
 
-const debug = require('debug')('things-factory:worklist:pick')
-
 export async function pick(id: string, { domain, user, tx, t }: ContextStatus): Promise<ActivityThread> {
-  debug('pickActivityInstance', id)
-
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({

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

@@ -2,16 +2,12 @@ import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity
 import { ActivityInstancePost } from '../../service/activity-instance/activity-instance-type'
 import { type ContextStatus, createActivityThreadsForAllRoleUsers, createActivityThreadsForUsers } from '../common'
 
-const debug = require('debug')('things-factory:worklist:create')
-
 export async function post(
   activityInstance: ActivityInstancePost,
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityInstance> {
   const { id, assignees } = activityInstance
 
-  debug('postActivityInstance', activityInstance)
-
   var origin = id ? await tx.getRepository(ActivityInstance).findOne(id) : null
 
   const posted = await tx.getRepository(ActivityInstance).save({

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

@@ -3,14 +3,10 @@ import { getRepository } from 'typeorm'
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { type ContextStatus, evalActivityInstanceState } from '../common'
 
-const debug = require('debug')('things-factory:worklist:terminate')
-
 export async function terminate(
   { id, output, reason }: { id: string; output?: object; reason?: string },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityInstance> {
-  debug('terminate', id, output)
-
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({

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

@@ -3,14 +3,10 @@ import { getRepository } from 'typeorm'
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { type ContextStatus } from '../common'
 
-const debug = require('debug')('things-factory:worklist:abort')
-
 export async function abort(
   { id, reason }: { id: string; reason: string },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityThread> {
-  debug('abortActivityThread', id, reason)
-
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({

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

@@ -3,8 +3,6 @@ import { getRepository } from 'typeorm'
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { type ContextStatus } from '../common'
 
-const debug = require('debug')('things-factory:worklist:delegate')
-
 export async function delegate(
   {
     id,
@@ -19,8 +17,6 @@ export async function delegate(
   },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityThread> {
-  debug('delegateActivity', id, assigneeRole)
-
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({

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

@@ -3,14 +3,10 @@ import { getRepository } from 'typeorm'
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { type ContextStatus } from '../common'
 
-const debug = require('debug')('things-factory:worklist:end')
-
 export async function end(
   { id, output, reason }: { id: string; output?: object; reason?: string },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityThread> {
-  debug('end', id, output)
-
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({

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

@@ -1,16 +1,12 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { type ContextStatus } from '../common'
 
-const debug = require('debug')('things-factory:worklist:start')
-
 export async function start(
   id: string,
   output: object,
   reason: string,
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityThread> {
-  debug('startActivityThread', id)
-
   const repository = tx.getRepository(ActivityThread)
   const activityThread = await repository.findOne({
     where: { domain, id }

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

@@ -3,14 +3,10 @@ import { getRepository } from 'typeorm'
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { type ContextStatus } from '../common'
 
-const debug = require('debug')('things-factory:worklist:terminate')
-
 export async function terminate(
   { id, output, reason }: { id: string; output?: object; reason?: string },
   { domain, user, tx, t }: ContextStatus
 ): Promise<ActivityThread> {
-  debug('terminate', id, output)
-
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({

package/server/routes.ts

@@ -1,5 +1,3 @@
-const debug = require('debug')('things-factory:worklist:routes')
-
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
   /*
    * can add global public routes to application (auth not required, tenancy not required)

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')
@@ -87,7 +85,7 @@ export class ActivityInstanceMutation {
   @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> {

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

@@ -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
@@ -117,7 +117,7 @@ export class ActivityInstancePost {
 @InputType()
 export class ActivityInstanceSave {
   @Field(type => ScalarObject, { nullable: true })
-  output?: ScalarObject
+  output?: { [key: string]: any }
 }
 
 @InputType()
@@ -138,10 +138,10 @@ export class ActivityInstancePatch {
   state?: ActivityInstanceStatus
 
   @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-thread/activity-thread-mutation.ts

@@ -139,7 +139,7 @@ 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> {
@@ -172,7 +172,7 @@ export class ActivityThreadMutation {
   @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> {

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/tsconfig.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "strict": false,
-    "declaration": false,
     "module": "commonjs",
     "outDir": "../dist-server",
     "baseUrl": "./"