@things-factory/worklist 6.0.49 → 6.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.49",
+  "version": "6.0.50",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -32,10 +32,10 @@
     "@things-factory/auth-base": "^6.0.49",
     "@things-factory/board-service": "^6.0.49",
     "@things-factory/context-ui": "^6.0.49",
-    "@things-factory/organization": "^6.0.49",
+    "@things-factory/organization": "^6.0.50",
     "@things-factory/scheduler-client": "^6.0.49",
     "@things-factory/shell": "^6.0.49",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "e107d6f692d008add950e000d2653bcbbd711a24"
+  "gitHead": "0bc016c1f46f81fcac0afd43609fd6fdb7fda857"
 }

package/server/controllers/common.ts

@@ -1,7 +1,7 @@
 import { Role, User } from '@things-factory/auth-base'
 
 import { ActivitySearchKeyItem } from '../service/activity/activity-search-key-item-type'
-import { AssigneeItem } from '../service/activity/activity'
+import { AssigneeItem, MultipleInstanceType } from '../service/activity/activity'
 import { ActivityInstance, ActivityInstanceStatus } from '../service/activity-instance/activity-instance'
 import { ActivityThread, ActivityThreadStatus } from '../service/activity-thread/activity-thread'
 import { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'
@@ -80,7 +80,9 @@ export async function evalActivityInstanceState(
           ? ActivityInstanceStatus.Aborted
           : ActivityInstanceStatus.Ended,
         reason: '',
-        output: activityInstance.activity.multiple
+        output: [MultipleInstanceType.Parallel, MultipleInstanceType.Sequential].includes(
+          activityInstance.activity.multiple
+        )
           ? activityThreads
               .filter(thread => (thread.state = ActivityThreadStatus.Ended))
               .reduce((sum, thread) => {

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

@@ -70,10 +70,6 @@ export class ActivityHistory implements HistoryEntityInterface<Activity> {
   @Field({ nullable: true })
   priority?: number = 1
 
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  startable?: boolean
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   startingType?: ActivityStartingType

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

@@ -40,9 +40,6 @@ export class NewActivity {
   @Field({ nullable: true })
   priority?: number
 
-  @Field({ nullable: true })
-  startable?: boolean
-
   @Field({ nullable: true })
   startingType?: ActivityStartingType
 
@@ -127,9 +124,6 @@ export class ActivityPatch {
   @Field({ nullable: true })
   priority?: number
 
-  @Field({ nullable: true })
-  startable?: boolean
-
   @Field({ nullable: true })
   startingType?: ActivityStartingType
 

package/server/service/activity/activity.ts

@@ -59,7 +59,7 @@ registerEnumType(ActivityType, {
 })
 
 export enum MultipleInstanceType {
-  Single = '',
+  Single = 'single',
   Parallel = 'parallel',
   Sequential = 'sequential'
 }
@@ -143,10 +143,6 @@ export class Activity {
   @Field({ nullable: true })
   priority?: number = 1
 
-  @Column({ nullable: true })
-  @Field({ nullable: true, description: 'Whether the task can be started arbitrarily by a user with privileges' })
-  startable?: boolean
-
   @Column({ nullable: true })
   @Field({ nullable: true, description: 'Whether the purpose of starting the activity is to issue or post' })
   startingType?: ActivityStartingType

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

@@ -1,6 +1,12 @@
 import { Field, ObjectType } from 'type-graphql'
 
-import { Activity, ActivityStartingType, ActivityType, ActivityUIType } from '../activity/activity'
+import {
+  Activity,
+  ActivityStartingType,
+  ActivityType,
+  ActivityUIType,
+  MultipleInstanceType
+} from '../activity/activity'
 import { ActivityModelItem } from '../activity/activity-model-type'
 
 @ObjectType({ description: 'Entity for InstallableActivity' })
@@ -26,12 +32,16 @@ export class InstallableActivity {
   @Field({ nullable: true })
   priority?: number = 1
 
-  @Field({ nullable: true })
-  startable?: boolean
-
   @Field({ nullable: true })
   startingType?: ActivityStartingType
 
+  @Field({
+    nullable: true,
+    description:
+      'Parallel or sequential are properties as a multi-instance activity, otherwise it means a single instance.'
+  })
+  multiple?: MultipleInstanceType
+
   @Field(type => [ActivityModelItem], { nullable: true })
   model?: ActivityModelItem[]