@things-factory/worklist 6.0.37 → 6.0.40

package/dist-client/types/activity-instance.d.ts

@@ -5,7 +5,7 @@ import { Activity, ActivityType, ActivityUIType } from './activity';
 export declare enum ActivityInstanceStatus {
     Draft = "draft",
     Posted = "posted",
-    WaitingAssignment = "waiting-assignment",
+    PendingAssignment = "pending-assignment",
     Assigned = "assigned",
     Started = "started",
     Pending = "pending",

package/dist-client/types/activity-instance.js

@@ -2,7 +2,7 @@ export var ActivityInstanceStatus;
 (function (ActivityInstanceStatus) {
     ActivityInstanceStatus["Draft"] = "draft";
     ActivityInstanceStatus["Posted"] = "posted";
-    ActivityInstanceStatus["WaitingAssignment"] = "waiting-assignment";
+    ActivityInstanceStatus["PendingAssignment"] = "pending-assignment";
     ActivityInstanceStatus["Assigned"] = "assigned";
     ActivityInstanceStatus["Started"] = "started";
     ActivityInstanceStatus["Pending"] = "pending";

package/dist-client/types/activity-instance.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-instance.js","sourceRoot":"","sources":["../../client/types/activity-instance.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,sBASX;AATD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,kEAAwC,CAAA;IACxC,+CAAqB,CAAA;IACrB,6CAAmB,CAAA;IACnB,6CAAmB,CAAA;IACnB,yCAAe,CAAA;IACf,6CAAmB,CAAA;AACrB,CAAC,EATW,sBAAsB,KAAtB,sBAAsB,QASjC;AAED,MAAM,OAAO,YAAY;CAMxB;AAED,MAAM,OAAO,gBAAgB;IAA7B;QAGE,YAAO,GAAY,CAAC,CAAA;QAYpB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAQnB,aAAQ,GAAY,CAAC,CAAA;QAMrB,eAAU,GAAY,CAAC,CAAA;QAEvB,eAAU,GAAY,CAAC,CAAA;IA2DzB,CAAC;IATC,aAAa;QACX,QAAQ,IAAI,CAAC,KAAK,EAAE;YAClB,KAAK,sBAAsB,CAAC,MAAM,CAAC;YACnC,KAAK,sBAAsB,CAAC,QAAQ;gBAClC,OAAO,IAAI,CAAA;YACb;gBACE,OAAO,KAAK,CAAA;SACf;IACH,CAAC;CACF","sourcesContent":["import { Domain, User, Role } from '@operato/shell'\nimport { OrgMemberTargetType, OrgMemberTarget, ApprovalLineItem } from '@things-factory/organization'\n\nimport { ActivityThread } from './activity-thread'\nimport { Activity, ActivityType, ActivityUIType } from './activity'\n\nexport enum ActivityInstanceStatus {\n  Draft = 'draft',\n  Posted = 'posted',\n  WaitingAssignment = 'waiting-assignment',\n  Assigned = 'assigned',\n  Started = 'started',\n  Pending = 'pending',\n  Ended = 'ended',\n  Aborted = 'aborted'\n}\n\nexport class AssigneeItem {\n  type?: OrgMemberTargetType\n\n  value?: string\n\n  assignee?: OrgMemberTarget\n}\n\nexport class ActivityInstance {\n  id?: string\n\n  version?: number = 1\n\n  domain?: Domain\n\n  name?: string\n\n  description?: string\n\n  activityType?: ActivityType\n\n  adhocType?: string\n\n  key01?: string = ''\n\n  key02?: string = ''\n\n  key03?: string = ''\n\n  key04?: string = ''\n\n  key05?: string = ''\n\n  activityThreads?: ActivityThread[]\n\n  uiType?: ActivityUIType\n\n  uiSource?: string\n\n  priority?: number = 1\n\n  state?: ActivityInstanceStatus\n\n  reason?: string\n\n  threadsMin?: number = 0\n\n  threadsMax?: number = 0\n\n  input?: { [key: string]: any }\n\n  output?: { [key: string]: any }\n\n  refBy?: string\n\n  activity?: Activity\n\n  assigneeRole?: Role\n\n  supervisoryRole?: Role\n\n  dueAt?: Date\n\n  transaction?: string\n\n  assignees?: AssigneeItem[]\n\n  approvalLine?: ApprovalLineItem[]\n\n  createdAt?: Date\n\n  updatedAt?: Date\n\n  assignedAt?: Date\n\n  startedAt?: Date\n\n  terminatedAt?: Date\n\n  creator?: User\n\n  creatorId?: string\n\n  updater?: User\n\n  updaterId?: string\n\n  starter?: User\n\n  starterId?: string\n\n  terminator?: User\n\n  terminatorId?: string\n\n  thumbnail?: string\n\n  isDelegatable(): boolean {\n    switch (this.state) {\n      case ActivityInstanceStatus.Posted:\n      case ActivityInstanceStatus.Assigned:\n        return true\n      default:\n        return false\n    }\n  }\n}\n"]}
+{"version":3,"file":"activity-instance.js","sourceRoot":"","sources":["../../client/types/activity-instance.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,sBASX;AATD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,kEAAwC,CAAA;IACxC,+CAAqB,CAAA;IACrB,6CAAmB,CAAA;IACnB,6CAAmB,CAAA;IACnB,yCAAe,CAAA;IACf,6CAAmB,CAAA;AACrB,CAAC,EATW,sBAAsB,KAAtB,sBAAsB,QASjC;AAED,MAAM,OAAO,YAAY;CAMxB;AAED,MAAM,OAAO,gBAAgB;IAA7B;QAGE,YAAO,GAAY,CAAC,CAAA;QAYpB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAEnB,UAAK,GAAY,EAAE,CAAA;QAQnB,aAAQ,GAAY,CAAC,CAAA;QAMrB,eAAU,GAAY,CAAC,CAAA;QAEvB,eAAU,GAAY,CAAC,CAAA;IA2DzB,CAAC;IATC,aAAa;QACX,QAAQ,IAAI,CAAC,KAAK,EAAE;YAClB,KAAK,sBAAsB,CAAC,MAAM,CAAC;YACnC,KAAK,sBAAsB,CAAC,QAAQ;gBAClC,OAAO,IAAI,CAAA;YACb;gBACE,OAAO,KAAK,CAAA;SACf;IACH,CAAC;CACF","sourcesContent":["import { Domain, User, Role } from '@operato/shell'\nimport { OrgMemberTargetType, OrgMemberTarget, ApprovalLineItem } from '@things-factory/organization'\n\nimport { ActivityThread } from './activity-thread'\nimport { Activity, ActivityType, ActivityUIType } from './activity'\n\nexport enum ActivityInstanceStatus {\n  Draft = 'draft',\n  Posted = 'posted',\n  PendingAssignment = 'pending-assignment',\n  Assigned = 'assigned',\n  Started = 'started',\n  Pending = 'pending',\n  Ended = 'ended',\n  Aborted = 'aborted'\n}\n\nexport class AssigneeItem {\n  type?: OrgMemberTargetType\n\n  value?: string\n\n  assignee?: OrgMemberTarget\n}\n\nexport class ActivityInstance {\n  id?: string\n\n  version?: number = 1\n\n  domain?: Domain\n\n  name?: string\n\n  description?: string\n\n  activityType?: ActivityType\n\n  adhocType?: string\n\n  key01?: string = ''\n\n  key02?: string = ''\n\n  key03?: string = ''\n\n  key04?: string = ''\n\n  key05?: string = ''\n\n  activityThreads?: ActivityThread[]\n\n  uiType?: ActivityUIType\n\n  uiSource?: string\n\n  priority?: number = 1\n\n  state?: ActivityInstanceStatus\n\n  reason?: string\n\n  threadsMin?: number = 0\n\n  threadsMax?: number = 0\n\n  input?: { [key: string]: any }\n\n  output?: { [key: string]: any }\n\n  refBy?: string\n\n  activity?: Activity\n\n  assigneeRole?: Role\n\n  supervisoryRole?: Role\n\n  dueAt?: Date\n\n  transaction?: string\n\n  assignees?: AssigneeItem[]\n\n  approvalLine?: ApprovalLineItem[]\n\n  createdAt?: Date\n\n  updatedAt?: Date\n\n  assignedAt?: Date\n\n  startedAt?: Date\n\n  terminatedAt?: Date\n\n  creator?: User\n\n  creatorId?: string\n\n  updater?: User\n\n  updaterId?: string\n\n  starter?: User\n\n  starterId?: string\n\n  terminator?: User\n\n  terminatorId?: string\n\n  thumbnail?: string\n\n  isDelegatable(): boolean {\n    switch (this.state) {\n      case ActivityInstanceStatus.Posted:\n      case ActivityInstanceStatus.Assigned:\n        return true\n      default:\n        return false\n    }\n  }\n}\n"]}

package/dist-client/types/activity.d.ts

@@ -42,9 +42,6 @@ export declare class Activity {
     schedule?: string;
     timzeone?: string;
     standardTime?: number;
-    cycleTime?: number;
-    tactTime?: number;
-    leadTime?: number;
     issuerRole?: Role;
     assigneeRole?: Role;
     supervisoryRole?: Role;

package/dist-client/types/activity.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../client/types/activity.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,uCAAqB,CAAA;IACrB,2CAAyB,CAAA;AAC3B,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB;AAED,MAAM,CAAN,IAAY,YAWX;AAXD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,8CAA8B,CAAA;IAC9B,iCAAiB,CAAA;IACjB,0CAA0B,CAAA;IAC1B,6BAAa,CAAA;AACf,CAAC,EAXW,YAAY,KAAZ,YAAY,QAWvB;AAED,MAAM,CAAN,IAAY,cAOX;AAPD,WAAY,cAAc;IACxB,yCAAuB,CAAA;IACvB,uCAAqB,CAAA;IACrB,iCAAe,CAAA;IACf,kDAAgC,CAAA;IAChC,+BAAa,CAAA;IACb,uCAAqB,CAAA;AACvB,CAAC,EAPW,cAAc,KAAd,cAAc,QAOzB;AAED,MAAM,OAAO,QAAQ;IAArB;QAGE,YAAO,GAAY,CAAC,CAAA;QAgBpB,aAAQ,GAAY,CAAC,CAAA;IAiDvB,CAAC;CAAA","sourcesContent":["import { Domain, User, Role } from '@operato/shell'\nimport { ApprovalLineItem, AssigneeItem } from '@things-factory/organization'\n\nimport { ActivityModelItem } from './activity-model-type'\nimport { ActivitySearchKeyItem } from './activity-search-key-item-type'\n\nexport enum ActivityStatus {\n  Draft = 'draft',\n  Released = 'released',\n  Deprecated = 'deprecated'\n}\n\nexport enum ActivityType {\n  Task = 'task',\n  Service = 'service',\n  Send = 'send',\n  Receive = 'receive',\n  User = 'user',\n  Manual = 'manual',\n  BusinessRule = 'business-rule',\n  Script = 'script',\n  Subprocess = 'sub-process',\n  Call = 'call'\n}\n\nexport enum ActivityUIType {\n  Generated = 'generated',\n  Template = 'template',\n  Board = 'board',\n  CustomElement = 'custom-element',\n  Page = 'page',\n  External = 'external'\n}\n\nexport class Activity {\n  id?: string\n\n  version?: number = 1\n\n  domain?: Domain\n\n  name?: string\n\n  description?: string\n\n  activityType?: ActivityType\n\n  state?: ActivityStatus\n\n  searchKeys?: ActivitySearchKeyItem[]\n\n  model?: ActivityModelItem[]\n\n  priority?: number = 1\n\n  startable?: boolean\n\n  schedule?: string\n\n  timzeone?: string\n\n  standardTime?: number\n\n  cycleTime?: number\n\n  tactTime?: number\n\n  leadTime?: number\n\n  issuerRole?: Role\n\n  assigneeRole?: Role\n\n  supervisoryRole?: Role\n\n  assignees?: AssigneeItem[]\n\n  approvalLine?: ApprovalLineItem[]\n\n  uiType?: ActivityUIType\n\n  uiSource?: string\n\n  viewType?: ActivityUIType\n\n  viewSource?: string\n\n  reportType?: ActivityUIType\n\n  reportSource?: string\n\n  createdAt?: Date\n\n  updatedAt?: Date\n\n  client?: User\n\n  creator?: User\n\n  updater?: User\n\n  thumbnail?: string\n}\n"]}
+{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../client/types/activity.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,uCAAqB,CAAA;IACrB,2CAAyB,CAAA;AAC3B,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB;AAED,MAAM,CAAN,IAAY,YAWX;AAXD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,6BAAa,CAAA;IACb,mCAAmB,CAAA;IACnB,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,8CAA8B,CAAA;IAC9B,iCAAiB,CAAA;IACjB,0CAA0B,CAAA;IAC1B,6BAAa,CAAA;AACf,CAAC,EAXW,YAAY,KAAZ,YAAY,QAWvB;AAED,MAAM,CAAN,IAAY,cAOX;AAPD,WAAY,cAAc;IACxB,yCAAuB,CAAA;IACvB,uCAAqB,CAAA;IACrB,iCAAe,CAAA;IACf,kDAAgC,CAAA;IAChC,+BAAa,CAAA;IACb,uCAAqB,CAAA;AACvB,CAAC,EAPW,cAAc,KAAd,cAAc,QAOzB;AAED,MAAM,OAAO,QAAQ;IAArB;QAGE,YAAO,GAAY,CAAC,CAAA;QAgBpB,aAAQ,GAAY,CAAC,CAAA;IA2CvB,CAAC;CAAA","sourcesContent":["import { Domain, User, Role } from '@operato/shell'\nimport { ApprovalLineItem, AssigneeItem } from '@things-factory/organization'\n\nimport { ActivityModelItem } from './activity-model-type'\nimport { ActivitySearchKeyItem } from './activity-search-key-item-type'\n\nexport enum ActivityStatus {\n  Draft = 'draft',\n  Released = 'released',\n  Deprecated = 'deprecated'\n}\n\nexport enum ActivityType {\n  Task = 'task',\n  Service = 'service',\n  Send = 'send',\n  Receive = 'receive',\n  User = 'user',\n  Manual = 'manual',\n  BusinessRule = 'business-rule',\n  Script = 'script',\n  Subprocess = 'sub-process',\n  Call = 'call'\n}\n\nexport enum ActivityUIType {\n  Generated = 'generated',\n  Template = 'template',\n  Board = 'board',\n  CustomElement = 'custom-element',\n  Page = 'page',\n  External = 'external'\n}\n\nexport class Activity {\n  id?: string\n\n  version?: number = 1\n\n  domain?: Domain\n\n  name?: string\n\n  description?: string\n\n  activityType?: ActivityType\n\n  state?: ActivityStatus\n\n  searchKeys?: ActivitySearchKeyItem[]\n\n  model?: ActivityModelItem[]\n\n  priority?: number = 1\n\n  startable?: boolean\n\n  schedule?: string\n\n  timzeone?: string\n\n  standardTime?: number\n\n  issuerRole?: Role\n\n  assigneeRole?: Role\n\n  supervisoryRole?: Role\n\n  assignees?: AssigneeItem[]\n\n  approvalLine?: ApprovalLineItem[]\n\n  uiType?: ActivityUIType\n\n  uiSource?: string\n\n  viewType?: ActivityUIType\n\n  viewSource?: string\n\n  reportType?: ActivityUIType\n\n  reportSource?: string\n\n  createdAt?: Date\n\n  updatedAt?: Date\n\n  client?: User\n\n  creator?: User\n\n  updater?: User\n\n  thumbnail?: string\n}\n"]}

package/dist-server/controllers/activity-instance/end.js

@@ -15,6 +15,9 @@ async function end({ id, output, reason }, context) {
             activityInstance: id
         }));
     }
+    if (!activityInstance.startedAt) {
+        activityInstance.startedAt = new Date();
+    }
     return await repository.save(Object.assign(Object.assign({}, activityInstance), { reason,
         output, transaction: 'end', state: await (0, common_1.evalActivityInstanceState)(id, context), updater: user, terminatedAt: new Date(), terminator: user }));
 }

package/dist-server/controllers/activity-instance/end.js.map

@@ -1 +1 @@
-{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/end.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AACpF,sCAAqD;AAE9C,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAErD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC;KACpH,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,gBAAgB,KACnB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,EACnD,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;AACJ,CAAC;AA9BD,kBA8BC","sourcesContent":["import { ActivityInstance } from '../../service/activity-instance/activity-instance'\nimport { evalActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    output,\n    transaction: 'end',\n    state: await evalActivityInstanceState(id, context),\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n}\n"]}
+{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/end.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AACpF,sCAAqD;AAE9C,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAErD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC;KACpH,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE;QAC/B,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACxC;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,gBAAgB,KACnB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,EACnD,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;AACJ,CAAC;AAlCD,kBAkCC","sourcesContent":["import { ActivityInstance } from '../../service/activity-instance/activity-instance'\nimport { evalActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  if (!activityInstance.startedAt) {\n    activityInstance.startedAt = new Date()\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    output,\n    transaction: 'end',\n    state: await evalActivityInstanceState(id, context),\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n}\n"]}

package/dist-server/controllers/activity-instance/post.js

@@ -7,7 +7,7 @@ const common_1 = require("../common");
 async function post(activityInstance, context) {
     const { domain, user, tx } = context.state;
     const issuedAt = new Date();
-    var { id, name, description, assignees, uiType, uiSource, viewType, viewSource, dueAt, approvalLine, activityId, activityType, assigneeRole, supervisoryRole, input } = activityInstance;
+    var { id, name, description, assignees, uiType, uiSource, viewType, viewSource, dueAt, priority, approvalLine, activityId, activityType, assigneeRole, supervisoryRole, input } = activityInstance;
     var origin = id
         ? await tx.getRepository(activity_instance_1.ActivityInstance).findOne({
             where: { domain: { id: domain.id }, id },
@@ -46,6 +46,7 @@ async function post(activityInstance, context) {
         activityInstance.viewSource = viewSource || activity.viewSource;
         activityInstance.assigneeRole = assigneeRole || activity.assigneeRole;
         activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole;
+        activityInstance.priority = priority !== null && priority !== void 0 ? priority : activity.priority;
         if (!assignees || !approvalLine) {
             activityInstance.adhocType = 'standard';
             activityInstance.refBy = activityId;

package/dist-server/controllers/activity-instance/post.js.map

@@ -1 +1 @@
-{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/post.ts"],"names":[],"mappings":";;;AAAA,8DAA0D;AAC1D,yFAA4G;AAE5G,sCAKkB;AAEX,KAAK,UAAU,IAAI,CACxB,gBAAsC,EACtC,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAA;IAC3B,IAAI,EACF,EAAE,EACF,IAAI,EACJ,WAAW,EACX,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,KAAK,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,KAAK,EACN,GAAG,gBAAgB,CAAA;IAEpB,IAAI,MAAM,GAAG,EAAE;QACb,CAAC,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACxC,SAAS,EAAE;gBACT,QAAQ;gBACR,UAAU;gBACV,cAAc;gBACd,iBAAiB;gBACjB,SAAS;gBACT,SAAS;gBACT,SAAS;gBACT,YAAY;aACb;SACF,CAAC;QACJ,CAAC,CAAC,IAAI,CAAA;IAER,IAAI,CAAC,MAAM,IAAI,UAAU,EAAE;QACzB,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAA;QAC3C,IAAI,QAAQ,GAAG,EAAc,CAAA;QAE7B,IAAI,UAAU,EAAE;YACd,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;gBAClC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;gBACpD,SAAS,EAAE,CAAC,cAAc,EAAE,iBAAiB,CAAC;aAC/C,CAAC,CAAA;YAEF,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,0BAA0B,EAAE;oBACpC,QAAQ,EAAE,UAAU;iBACrB,CAAC,CACH,CAAA;aACF;SACF;QAED,gBAAgB,CAAC,IAAI,GAAG,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAA;QAC7C,gBAAgB,CAAC,WAAW,GAAG,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAA;QAClE,gBAAgB,CAAC,YAAY,GAAG,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAA;QACrE,gBAAgB,CAAC,MAAM,GAAG,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAA;QACnD,gBAAgB,CAAC,QAAQ,GAAG,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAA;QACzD,gBAAgB,CAAC,QAAQ,GAAG,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAA;QACzD,gBAAgB,CAAC,UAAU,GAAG,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAA;QAC/D,gBAAgB,CAAC,YAAY,GAAG,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAA;QACrE,gBAAgB,CAAC,eAAe,GAAG,eAAe,IAAI,QAAQ,CAAC,eAAe,CAAA;QAE9E,IAAI,CAAC,SAAS,IAAI,CAAC,YAAY,EAAE;YAC/B,gBAAgB,CAAC,SAAS,GAAG,UAAU,CAAA;YACvC,gBAAgB,CAAC,KAAK,GAAG,UAAU,CAAA;YACnC,IAAI,CAAC,SAAS,EAAE;gBACd,SAAS,GAAG,gBAAgB,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAA;aAC5D;YACD,IAAI,CAAC,YAAY,EAAE;gBACjB,YAAY,GAAG,gBAAgB,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;aACrE;YAED,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,YAAY,EAAE;gBACnC,gBAAgB,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC,CAAA;aACrF;SACF;KACF;IAED,MAAM,kBAAkB,GAAG,IAAA,+BAAsB,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,EAAE,KAAK,CAAC,CAAA;IAE9E,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,IAAI,yEAC1D,OAAO,EAAE,IAAI,IACV,MAAM,GACN,gBAAgB,KACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,KACL,kBAAkB,KACrB,KAAK,EAAE,0CAAsB,CAAC,MAAM,EACpC,MAAM,EACN,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,IAAI,EACb,QAAQ,IACR,CAAA;IAEF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAA,uCAA8B,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CACrF,CAAA;IAED,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,UAAU,KAAK,CAAC,IAAI,MAAM,CAAC,cAAc,EAAE;QACjF,MAAM,IAAA,6CAAoC,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;KACpE;IAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,MAAM,IAAA,sCAA6B,EAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;KAC5E;IAED,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;AAC9E,CAAC;AAlHD,oBAkHC","sourcesContent":["import { Activity } from '../../service/activity/activity'\nimport { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'\nimport { ActivityInstancePost } from '../../service/activity-instance/activity-instance-type'\nimport {\n  createActivityThreadsForAllRoleUsers,\n  createActivityThreadsForUsers,\n  getSystemUserFromOrgMemberItem,\n  fillActivitySearchKeys\n} from '../common'\n\nexport async function post(\n  activityInstance: ActivityInstancePost,\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const issuedAt = new Date()\n  var {\n    id,\n    name,\n    description,\n    assignees,\n    uiType,\n    uiSource,\n    viewType,\n    viewSource,\n    dueAt,\n    approvalLine,\n    activityId,\n    activityType,\n    assigneeRole,\n    supervisoryRole,\n    input\n  } = activityInstance\n\n  var origin = id\n    ? await tx.getRepository(ActivityInstance).findOne({\n        where: { domain: { id: domain.id }, id },\n        relations: [\n          'domain',\n          'activity',\n          'assigneeRole',\n          'supervisoryRole',\n          'updater',\n          'creator',\n          'starter',\n          'terminator'\n        ]\n      })\n    : null\n\n  if (!origin && activityId) {\n    var repository = tx.getRepository(Activity)\n    var activity = {} as Activity\n\n    if (activityId) {\n      activity = await repository.findOne({\n        where: { domain: { id: domain.id }, id: activityId },\n        relations: ['assigneeRole', 'supervisoryRole']\n      })\n\n      if (!activity) {\n        throw new Error(\n          context.t('error.activity not found', {\n            activity: activityId\n          })\n        )\n      }\n    }\n\n    activityInstance.name = name || activity.name\n    activityInstance.description = description || activity.description\n    activityInstance.activityType = activityType || activity.activityType\n    activityInstance.uiType = uiType || activity.uiType\n    activityInstance.uiSource = uiSource || activity.uiSource\n    activityInstance.viewType = viewType || activity.viewType\n    activityInstance.viewSource = viewSource || activity.viewSource\n    activityInstance.assigneeRole = assigneeRole || activity.assigneeRole\n    activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole\n\n    if (!assignees || !approvalLine) {\n      activityInstance.adhocType = 'standard'\n      activityInstance.refBy = activityId\n      if (!assignees) {\n        assignees = activityInstance.assignees = activity.assignees\n      }\n      if (!approvalLine) {\n        approvalLine = activityInstance.approvalLine = activity.approvalLine\n      }\n\n      if (!dueAt && activity.standardTime) {\n        activityInstance.dueAt = new Date(issuedAt.getTime() + activity.standardTime * 1000)\n      }\n    }\n  }\n\n  const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)\n\n  const posted = await tx.getRepository(ActivityInstance).save({\n    creator: user,\n    ...origin,\n    ...activityInstance,\n    transaction: 'post',\n    activity,\n    ...activitySearchKeys,\n    state: ActivityInstanceStatus.Posted,\n    domain,\n    issuer: user,\n    updater: user,\n    issuedAt\n  })\n\n  const assignedUsers = await Promise.all(\n    (assignees || []).map(assignee => getSystemUserFromOrgMemberItem(assignee, context))\n  )\n\n  if (assignedUsers.length == 0 && posted.threadsMin === 0 && posted.assigneeRoleId) {\n    await createActivityThreadsForAllRoleUsers('post', posted, context)\n  }\n\n  if (assignedUsers.length > 0) {\n    await createActivityThreadsForUsers('post', posted, assignedUsers, context)\n  }\n\n  return await tx.getRepository(ActivityInstance).findOneBy({ id: posted.id })\n}\n"]}
+{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/post.ts"],"names":[],"mappings":"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","sourcesContent":["import { Activity } from '../../service/activity/activity'\nimport { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'\nimport { ActivityInstancePost } from '../../service/activity-instance/activity-instance-type'\nimport {\n  createActivityThreadsForAllRoleUsers,\n  createActivityThreadsForUsers,\n  getSystemUserFromOrgMemberItem,\n  fillActivitySearchKeys\n} from '../common'\n\nexport async function post(\n  activityInstance: ActivityInstancePost,\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const issuedAt = new Date()\n  var {\n    id,\n    name,\n    description,\n    assignees,\n    uiType,\n    uiSource,\n    viewType,\n    viewSource,\n    dueAt,\n    priority,\n    approvalLine,\n    activityId,\n    activityType,\n    assigneeRole,\n    supervisoryRole,\n    input\n  } = activityInstance\n\n  var origin = id\n    ? await tx.getRepository(ActivityInstance).findOne({\n        where: { domain: { id: domain.id }, id },\n        relations: [\n          'domain',\n          'activity',\n          'assigneeRole',\n          'supervisoryRole',\n          'updater',\n          'creator',\n          'starter',\n          'terminator'\n        ]\n      })\n    : null\n\n  if (!origin && activityId) {\n    var repository = tx.getRepository(Activity)\n    var activity = {} as Activity\n\n    if (activityId) {\n      activity = await repository.findOne({\n        where: { domain: { id: domain.id }, id: activityId },\n        relations: ['assigneeRole', 'supervisoryRole']\n      })\n\n      if (!activity) {\n        throw new Error(\n          context.t('error.activity not found', {\n            activity: activityId\n          })\n        )\n      }\n    }\n\n    activityInstance.name = name || activity.name\n    activityInstance.description = description || activity.description\n    activityInstance.activityType = activityType || activity.activityType\n    activityInstance.uiType = uiType || activity.uiType\n    activityInstance.uiSource = uiSource || activity.uiSource\n    activityInstance.viewType = viewType || activity.viewType\n    activityInstance.viewSource = viewSource || activity.viewSource\n    activityInstance.assigneeRole = assigneeRole || activity.assigneeRole\n    activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole\n    activityInstance.priority = priority ?? activity.priority\n\n    if (!assignees || !approvalLine) {\n      activityInstance.adhocType = 'standard'\n      activityInstance.refBy = activityId\n      if (!assignees) {\n        assignees = activityInstance.assignees = activity.assignees\n      }\n      if (!approvalLine) {\n        approvalLine = activityInstance.approvalLine = activity.approvalLine\n      }\n\n      if (!dueAt && activity.standardTime) {\n        activityInstance.dueAt = new Date(issuedAt.getTime() + activity.standardTime * 1000)\n      }\n    }\n  }\n\n  const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)\n\n  const posted = await tx.getRepository(ActivityInstance).save({\n    creator: user,\n    ...origin,\n    ...activityInstance,\n    transaction: 'post',\n    activity,\n    ...activitySearchKeys,\n    state: ActivityInstanceStatus.Posted,\n    domain,\n    issuer: user,\n    updater: user,\n    issuedAt\n  })\n\n  const assignedUsers = await Promise.all(\n    (assignees || []).map(assignee => getSystemUserFromOrgMemberItem(assignee, context))\n  )\n\n  if (assignedUsers.length == 0 && posted.threadsMin === 0 && posted.assigneeRoleId) {\n    await createActivityThreadsForAllRoleUsers('post', posted, context)\n  }\n\n  if (assignedUsers.length > 0) {\n    await createActivityThreadsForUsers('post', posted, assignedUsers, context)\n  }\n\n  return await tx.getRepository(ActivityInstance).findOneBy({ id: posted.id })\n}\n"]}

package/dist-server/controllers/activity-instance/terminate.js

@@ -15,6 +15,9 @@ async function terminate({ id, output, reason }, context) {
             activityInstance: id
         }));
     }
+    if (!activityInstance.startedAt) {
+        activityInstance.startedAt = new Date();
+    }
     return await repository.save(Object.assign(Object.assign({}, activityInstance), { reason,
         output, transaction: 'terminate', state: await (0, common_1.evalActivityInstanceState)(id, context), updater: user, terminatedAt: new Date(), terminator: user }));
 }

package/dist-server/controllers/activity-instance/terminate.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminate.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/terminate.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AACpF,sCAAqD;AAE9C,KAAK,UAAU,SAAS,CAC7B,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAErD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC;KACpH,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,gBAAgB,KACnB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,EACnD,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;AACJ,CAAC;AA/BD,8BA+BC","sourcesContent":["import { ActivityInstance } from '../../service/activity-instance/activity-instance'\nimport { evalActivityInstanceState } from '../common'\n\nexport async function terminate(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    output,\n    transaction: 'terminate',\n    state: await evalActivityInstanceState(id, context),\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n}\n"]}
+{"version":3,"file":"terminate.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/terminate.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AACpF,sCAAqD;AAE9C,KAAK,UAAU,SAAS,CAC7B,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAErD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC;KACpH,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE;QAC/B,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACxC;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,gBAAgB,KACnB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,EACnD,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;AACJ,CAAC;AAnCD,8BAmCC","sourcesContent":["import { ActivityInstance } from '../../service/activity-instance/activity-instance'\nimport { evalActivityInstanceState } from '../common'\n\nexport async function terminate(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  if (!activityInstance.startedAt) {\n    activityInstance.startedAt = new Date()\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    output,\n    transaction: 'terminate',\n    state: await evalActivityInstanceState(id, context),\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n}\n"]}

package/dist-server/controllers/activity-thread/abort.js

@@ -15,9 +15,12 @@ async function abort({ id, reason }, context) {
             activityThread: id
         }));
     }
-    const result = await repository.save(Object.assign(Object.assign({}, activityThread), { reason, state: activity_thread_1.ActivityThreadStatus.Aborted, transaction: 'abort', updater: user, terminatedAt: new Date(), terminator: user }));
+    if (!activityThread.startedAt) {
+        activityThread.startedAt = new Date();
+    }
+    activityThread = await repository.save(Object.assign(Object.assign({}, activityThread), { reason, state: activity_thread_1.ActivityThreadStatus.Aborted, transaction: 'abort', updater: user, terminatedAt: new Date(), terminator: user }));
     await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
-    return result;
+    return activityThread;
 }
 exports.abort = abort;
 //# sourceMappingURL=abort.js.map

package/dist-server/controllers/activity-thread/abort.js.map

@@ -1 +1 @@
-{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/abort.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,MAAM,EAAkC,EAC9C,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEjD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;KAC5E,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC/B,cAAc,KACjB,MAAM,EACN,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AAlCD,sBAkCC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function abort(\n  { id, reason }: { id: string; reason: string },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  const result = await repository.save({\n    ...activityThread,\n    reason,\n    state: ActivityThreadStatus.Aborted,\n    transaction: 'abort',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/abort.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,MAAM,EAAkC,EAC9C,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEjD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;KAC5E,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,iCACjC,cAAc,KACjB,MAAM,EACN,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,cAAc,CAAA;AACvB,CAAC;AAtCD,sBAsCC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function abort(\n  { id, reason }: { id: string; reason: string },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  activityThread = await repository.save({\n    ...activityThread,\n    reason,\n    state: ActivityThreadStatus.Aborted,\n    transaction: 'abort',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return activityThread\n}\n"]}

package/dist-server/controllers/activity-thread/adjust.js

@@ -10,6 +10,14 @@ async function adjust(id, patch, context) {
         where: { domain: { id: domain.id }, id },
         relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
     });
+    if (!activityThread) {
+        throw new Error(context.t('error.activity-thread not found', {
+            activityThread: id
+        }));
+    }
+    if (!activityThread.startedAt) {
+        activityThread.startedAt = new Date();
+    }
     const result = await repository.save(Object.assign(Object.assign(Object.assign({}, activityThread), patch), { transaction: 'adjust', updater: user }));
     await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
     return result;

package/dist-server/controllers/activity-thread/adjust.js.map

@@ -1 +1 @@
-{"version":3,"file":"adjust.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/adjust.ts"],"names":[],"mappings":";;;AAAA,mFAA8E;AAE9E,sCAAuD;AAEhD,KAAK,UAAU,MAAM,CAC1B,EAAU,EACV,KAA0B,EAC1B,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;KAC5E,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,+CAC/B,cAAc,GACd,KAAK,KACR,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AAvBD,wBAuBC","sourcesContent":["import { ActivityThread } from '../../service/activity-thread/activity-thread'\nimport { ActivityThreadPatch } from '../../service/activity-thread/activity-thread-type'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function adjust(\n  id: string,\n  patch: ActivityThreadPatch,\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityThread)\n\n  const activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']\n  })\n\n  const result = await repository.save({\n    ...activityThread,\n    ...patch,\n    transaction: 'adjust',\n    updater: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"adjust.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/adjust.ts"],"names":[],"mappings":";;;AAAA,mFAA8E;AAE9E,sCAAuD;AAEhD,KAAK,UAAU,MAAM,CAC1B,EAAU,EACV,KAA0B,EAC1B,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;KAC5E,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,+CAC/B,cAAc,GACd,KAAK,KACR,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AAnCD,wBAmCC","sourcesContent":["import { ActivityThread } from '../../service/activity-thread/activity-thread'\nimport { ActivityThreadPatch } from '../../service/activity-thread/activity-thread-type'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function adjust(\n  id: string,\n  patch: ActivityThreadPatch,\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityThread)\n\n  const activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  const result = await repository.save({\n    ...activityThread,\n    ...patch,\n    transaction: 'adjust',\n    updater: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-thread/end.js

@@ -14,10 +14,13 @@ async function end({ id, output, reason }, context) {
             activityThread: id
         }));
     }
-    const result = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
+    if (!activityThread.startedAt) {
+        activityThread.startedAt = new Date();
+    }
+    activityThread = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
         output, transaction: 'end', state: activity_thread_1.ActivityThreadStatus.Ended, updater: user, terminatedAt: new Date() }));
     await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
-    return result;
+    return activityThread;
 }
 exports.end = end;
 //# sourceMappingURL=end.js.map

package/dist-server/controllers/activity-thread/end.js.map

@@ -1 +1 @@
-{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/end.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC/B,cAAc,KACjB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,sCAAoB,CAAC,KAAK,EACjC,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AAjCD,kBAiCC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  const result = await repository.save({\n    ...activityThread,\n    reason,\n    output,\n    transaction: 'end',\n    state: ActivityThreadStatus.Ended,\n    updater: user,\n    terminatedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/end.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,iCACjC,cAAc,KACjB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,sCAAoB,CAAC,KAAK,EACjC,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,cAAc,CAAA;AACvB,CAAC;AArCD,kBAqCC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  activityThread = await repository.save({\n    ...activityThread,\n    reason,\n    output,\n    transaction: 'end',\n    state: ActivityThreadStatus.Ended,\n    updater: user,\n    terminatedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return activityThread\n}\n"]}

package/dist-server/controllers/activity-thread/save.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.save = void 0;
-const activity_thread_1 = require("../../service/activity-thread/activity-thread");
 const common_1 = require("../common");
+const activity_thread_1 = require("../../service/activity-thread/activity-thread");
 async function save(id, save, context) {
     const { domain, user, tx } = context.state;
     const repository = tx.getRepository(activity_thread_1.ActivityThread);
-    const activityThread = await repository.findOne({
+    var activityThread = await repository.findOne({
         where: { domain: { id: domain.id }, id }
     });
     if (!activityThread) {
@@ -14,9 +14,12 @@ async function save(id, save, context) {
             activityThread: id
         }));
     }
-    const result = await repository.save(Object.assign(Object.assign(Object.assign({}, activityThread), save), { transaction: 'save', updater: user }));
+    if (!activityThread.startedAt) {
+        activityThread.startedAt = new Date();
+    }
+    activityThread = await repository.save(Object.assign(Object.assign(Object.assign({}, activityThread), save), { state: activity_thread_1.ActivityThreadStatus.Started, transaction: 'save', updater: user }));
     await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
-    return result;
+    return activityThread;
 }
 exports.save = save;
 //# sourceMappingURL=save.js.map

package/dist-server/controllers/activity-thread/save.js.map

@@ -1 +1 @@
-{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/save.ts"],"names":[],"mappings":";;;AAAA,mFAA8E;AAE9E,sCAAuD;AAEhD,KAAK,UAAU,IAAI,CAAC,EAAU,EAAE,IAAwB,EAAE,OAAwB;IACvF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,+CAC/B,cAAc,GACd,IAAI,KACP,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AA1BD,oBA0BC","sourcesContent":["import { ActivityThread } from '../../service/activity-thread/activity-thread'\nimport { ActivityThreadSave } from '../../service/activity-thread/activity-thread-type'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function save(id: string, save: ActivityThreadSave, context: ResolverContext): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityThread)\n\n  const activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  const result = await repository.save({\n    ...activityThread,\n    ...save,\n    transaction: 'save',\n    updater: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/save.ts"],"names":[],"mappings":";;;AACA,sCAAuD;AACvD,mFAAoG;AAE7F,KAAK,UAAU,IAAI,CAAC,EAAU,EAAE,IAAwB,EAAE,OAAwB;IACvF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,+CACjC,cAAc,GACd,IAAI,KACP,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,cAAc,CAAA;AACvB,CAAC;AA/BD,oBA+BC","sourcesContent":["import { ActivityThreadSave } from '../../service/activity-thread/activity-thread-type'\nimport { updateActivityInstanceState } from '../common'\nimport { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\n\nexport async function save(id: string, save: ActivityThreadSave, context: ResolverContext): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  activityThread = await repository.save({\n    ...activityThread,\n    ...save,\n    state: ActivityThreadStatus.Started,\n    transaction: 'save',\n    updater: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return activityThread\n}\n"]}

package/dist-server/controllers/activity-thread/submit.js

@@ -16,6 +16,9 @@ async function submit({ id, output, reason }, context) {
             activityThread: id
         }));
     }
+    if (!activityThread.startedAt) {
+        activityThread.startedAt = new Date();
+    }
     const approvalLine = activityThread.activityInstance.approvalLine;
     if (approvalLine && approvalLine.length > 0) {
         var approverUser = await (0, common_1.getSystemUserFromOrgMemberItem)(approvalLine[0], context);
@@ -33,15 +36,15 @@ async function submit({ id, output, reason }, context) {
             creator: user,
             updater: user
         });
-        var result = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
+        activityThread = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
             output, transaction: 'submit', state: activity_thread_1.ActivityThreadStatus.Submitted, updater: user }));
     }
     else {
-        var result = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
+        activityThread = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
             output, transaction: 'end', state: activity_thread_1.ActivityThreadStatus.Ended, updater: user, terminator: user, terminatedAt: new Date() }));
     }
     await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
-    return result;
+    return activityThread;
 }
 exports.submit = submit;
 //# sourceMappingURL=submit.js.map

package/dist-server/controllers/activity-thread/submit.js.map

@@ -1 +1 @@
-{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/submit.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,yFAA8G;AAC9G,sCAAuF;AAIhF,KAAK,UAAU,MAAM,CAC1B,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAChC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,MAAM,YAAY,GAAuB,cAAc,CAAC,gBAAgB,CAAC,YAAY,CAAA;IAErF,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3C,IAAI,YAAY,GAAG,MAAM,IAAA,uCAA8B,EAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;QAEjF,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,yDAAyD,CAAA;SAChE;QAED,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,IAAI,CAAC;YAC5C,MAAM;YACN,cAAc;YACd,KAAK,EAAE,cAAc,CAAC,KAAK;YAC3B,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,4CAAwB,CAAC,OAAO;YAC1C,WAAW,EAAE,QAAQ;YACrB,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QAEF,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC7B,cAAc,KACjB,MAAM;YACN,MAAM,EACN,WAAW,EAAE,QAAQ,EACrB,KAAK,EAAE,sCAAoB,CAAC,SAAS,EACrC,OAAO,EAAE,IAAI,IACb,CAAA;KACH;SAAM;QACL,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC7B,cAAc,KACjB,MAAM;YACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,sCAAoB,CAAC,KAAK,EACjC,OAAO,EAAE,IAAI,EACb,UAAU,EAAE,IAAI,EAChB,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;KACH;IAED,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AAlED,wBAkEC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { getSystemUserFromOrgMemberItem, updateActivityInstanceState } from '../common'\nimport { User } from '@things-factory/auth-base'\nimport { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'\n\nexport async function submit(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityInstance']\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine\n\n  if (approvalLine && approvalLine.length > 0) {\n    var approverUser = await getSystemUserFromOrgMemberItem(approvalLine[0], context)\n\n    if (!approverUser) {\n      throw 'Cannot specify the approval user for this approval line'\n    }\n\n    await tx.getRepository(ActivityApproval).save({\n      domain,\n      activityThread,\n      round: activityThread.round,\n      order: 1,\n      judgment: ActivityApprovalJudgment.Pending,\n      transaction: 'submit',\n      approver: approverUser,\n      creator: user,\n      updater: user\n    })\n\n    var result = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'submit',\n      state: ActivityThreadStatus.Submitted,\n      updater: user\n    })\n  } else {\n    var result = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'end',\n      state: ActivityThreadStatus.Ended,\n      updater: user,\n      terminator: user,\n      terminatedAt: new Date()\n    })\n  }\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/submit.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,yFAA8G;AAC9G,sCAAuF;AAIhF,KAAK,UAAU,MAAM,CAC1B,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAY;IAEZ,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAChC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,MAAM,YAAY,GAAuB,cAAc,CAAC,gBAAgB,CAAC,YAAY,CAAA;IAErF,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3C,IAAI,YAAY,GAAG,MAAM,IAAA,uCAA8B,EAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;QAEjF,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,yDAAyD,CAAA;SAChE;QAED,MAAM,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAC,IAAI,CAAC;YAC5C,MAAM;YACN,cAAc;YACd,KAAK,EAAE,cAAc,CAAC,KAAK;YAC3B,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,4CAAwB,CAAC,OAAO;YAC1C,WAAW,EAAE,QAAQ;YACrB,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QAEF,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,iCACjC,cAAc,KACjB,MAAM;YACN,MAAM,EACN,WAAW,EAAE,QAAQ,EACrB,KAAK,EAAE,sCAAoB,CAAC,SAAS,EACrC,OAAO,EAAE,IAAI,IACb,CAAA;KACH;SAAM;QACL,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,iCACjC,cAAc,KACjB,MAAM;YACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,sCAAoB,CAAC,KAAK,EACjC,OAAO,EAAE,IAAI,EACb,UAAU,EAAE,IAAI,EAChB,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;KACH;IAED,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,cAAc,CAAA;AACvB,CAAC;AAtED,wBAsEC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { getSystemUserFromOrgMemberItem, updateActivityInstanceState } from '../common'\nimport { User } from '@things-factory/auth-base'\nimport { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'\n\nexport async function submit(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: any\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityInstance']\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine\n\n  if (approvalLine && approvalLine.length > 0) {\n    var approverUser = await getSystemUserFromOrgMemberItem(approvalLine[0], context)\n\n    if (!approverUser) {\n      throw 'Cannot specify the approval user for this approval line'\n    }\n\n    await tx.getRepository(ActivityApproval).save({\n      domain,\n      activityThread,\n      round: activityThread.round,\n      order: 1,\n      judgment: ActivityApprovalJudgment.Pending,\n      transaction: 'submit',\n      approver: approverUser,\n      creator: user,\n      updater: user\n    })\n\n    activityThread = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'submit',\n      state: ActivityThreadStatus.Submitted,\n      updater: user\n    })\n  } else {\n    activityThread = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'end',\n      state: ActivityThreadStatus.Ended,\n      updater: user,\n      terminator: user,\n      terminatedAt: new Date()\n    })\n  }\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return activityThread\n}\n"]}

package/dist-server/controllers/common.js

@@ -37,7 +37,7 @@ async function evalActivityInstanceState(id, context) {
             };
         case threadsMin > validThreads.length:
             return {
-                state: activity_instance_1.ActivityInstanceStatus.WaitingAssignment
+                state: activity_instance_1.ActivityInstanceStatus.PendingAssignment
             };
         case pendingStartedThreads.length > 0:
             return {

package/dist-server/controllers/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../server/controllers/common.ts"],"names":[],"mappings":"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","sourcesContent":["import { Role, User } from '@things-factory/auth-base'\n\nimport { ActivitySearchKeyItem } from '../service/activity/activity-search-key-item-type'\nimport { ActivityInstance, ActivityInstanceStatus, AssigneeItem } from '../service/activity-instance/activity-instance'\nimport { ActivityThread, ActivityThreadStatus } from '../service/activity-thread/activity-thread'\nimport { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'\nimport { ActivityInstallations } from './activity-installation/activity-installation-controller'\n\nexport async function updateActivityInstanceState(id: string, context: ResolverContext) {\n  const { tx } = context.state\n\n  var activityInstance = await tx.getRepository(ActivityInstance).findOne({\n    where: { id },\n    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']\n  })\n\n  activityInstance = await tx.getRepository(ActivityInstance).save({\n    ...activityInstance,\n    transaction: 'thread' /* change by transaction of activity thread */,\n    ...(await evalActivityInstanceState(id, context))\n  })\n\n  await ActivityInstallations.callback(activityInstance.activity.name, activityInstance, context)\n}\n\nexport async function evalActivityInstanceState(\n  id: string,\n  context: ResolverContext\n): Promise<Partial<ActivityInstance>> {\n  const { tx, user } = context.state\n\n  const activityInstance = await tx.getRepository(ActivityInstance).findOne({\n    where: { id },\n    relations: ['activityThreads']\n  })\n  const { threadsMin, activityThreads, state, dueAt } = activityInstance\n\n  const validThreads = activityThreads.filter(thread => thread.isValid())\n  const pendingStartedThreads = activityThreads.filter(thread => thread.isPendingStarted())\n  const pendingEndedThreads = activityThreads.filter(thread => thread.isPendingEnded())\n\n  switch (true) {\n    case state === ActivityInstanceStatus.Draft:\n    case state === ActivityInstanceStatus.Ended:\n    case state === ActivityInstanceStatus.Aborted:\n      return {}\n    case validThreads.length === 0:\n      return {\n        state: ActivityInstanceStatus.Posted\n      }\n    case threadsMin > validThreads.length:\n      return {\n        state: ActivityInstanceStatus.WaitingAssignment\n      }\n    case pendingStartedThreads.length > 0:\n      return {\n        state: ActivityInstanceStatus.Assigned,\n        assignedAt: new Date()\n      }\n    case pendingEndedThreads.length > 0:\n      var started = !dueAt || dueAt.getTime() > Date.now()\n      var changed =\n        (started && state !== ActivityInstanceStatus.Started) || (!started && state !== ActivityInstanceStatus.Pending)\n\n      return !changed\n        ? null\n        : started\n        ? {\n            state: ActivityInstanceStatus.Started,\n            startedAt: new Date(),\n            starter: user\n          }\n        : {\n            state: ActivityInstanceStatus.Pending\n          }\n    default:\n      return {\n        state: activityThreads.find(thread => thread.state == ActivityThreadStatus.Aborted)\n          ? ActivityInstanceStatus.Aborted\n          : ActivityInstanceStatus.Ended,\n        reason: '',\n        output: activityThreads\n          .filter(thread => (thread.state = ActivityThreadStatus.Ended))\n          .reduce((sum, thread) => {\n            sum[thread.assigneeId] = thread.output\n            return sum\n          }, {} as any),\n        terminatedAt: new Date(),\n        terminator: user\n      }\n  }\n}\n\nexport async function createActivityThreadsForUsers(\n  transaction: string,\n  activityInstance: ActivityInstance,\n  assignees: User[],\n  context: ResolverContext\n): Promise<ActivityThread[]> {\n  const { domain, user, tx } = context.state\n\n  const threadRepo = tx.getRepository(ActivityThread)\n  const now = new Date()\n\n  const distinct = assignees.filter((assignee, idx) => {\n    return assignee && !assignees.slice(0, idx).find(x => x.id == assignee.id)\n  })\n\n  const result = await threadRepo.save(\n    distinct.map(assignee => {\n      return {\n        assignee,\n        state: ActivityThreadStatus.Assigned,\n        activityInstance,\n        domain,\n        transaction,\n        creator: user,\n        updater: user,\n        dueAt: activityInstance.dueAt,\n        assignedAt: now\n      } as any\n    })\n  )\n\n  await updateActivityInstanceState(activityInstance.id, context)\n\n  return result\n}\n\nexport async function createActivityThreadsForAllRoleUsers(\n  transaction: string,\n  activityInstance: ActivityInstance,\n  context: ResolverContext\n): Promise<ActivityThread[]> {\n  const { tx } = context.state\n\n  // find how many users are having given role\n  const assigneeRole = (await tx.getRepository(Role).findOne({\n    where: { id: activityInstance.assigneeRoleId },\n    relations: ['users']\n  })) as Role\n  const assignees = (assigneeRole?.users || []).filter(user => user.userType == 'user')\n\n  if (assignees.length === 0) {\n    throw new Error(\"there's no users having given role\")\n  }\n\n  // create activity-thread for all of users having given role\n  return await createActivityThreadsForUsers(transaction, activityInstance, assignees, context)\n}\n\nexport async function getSystemUserFromMyDepartmentManager(context: ResolverContext): Promise<User> {\n  const { domain, user, tx } = context.state\n\n  const employee = await tx.getRepository(Employee).findOneBy({\n    domain: { id: domain.id },\n    user: { id: user.id }\n  })\n\n  if (!employee || !employee.departmentId) {\n    return\n  }\n\n  const department = await tx.getRepository(Department).findOne({\n    where: {\n      id: employee.departmentId\n    }\n  })\n\n  if (!department || !department.managerId) return\n\n  const manager = await tx.getRepository(Employee).findOne({\n    where: {\n      domain: { id: domain.id },\n      id: department.managerId\n    },\n    relations: ['user']\n  })\n\n  return manager?.user\n}\n\nexport async function getSystemUserFromMySupervosor(context: ResolverContext): Promise<User> {\n  const { domain, user, tx } = context.state\n\n  const employee = await tx.getRepository(Employee).findOneBy({\n    domain: { id: domain.id },\n    user: { id: user.id }\n  })\n\n  if (!employee || !employee.supervisorId) {\n    return\n  }\n\n  const supervisor = await tx.getRepository(Employee).findOne({\n    where: {\n      id: employee.supervisorId\n    },\n    relations: ['user']\n  })\n\n  return supervisor?.user\n}\n\nexport async function getSystemUserFromOrgMemberItem(\n  item: AssigneeItem | ApprovalLineItem,\n  context: ResolverContext\n): Promise<User> {\n  const { domain, user, tx } = context.state\n\n  const { type, value: id } = item\n\n  if (type == OrgMemberTargetType.Employee) {\n    const employee = await tx.getRepository(Employee).findOne({ where: { id }, relations: ['user'] })\n\n    if (!employee || !employee.user) {\n      return\n    }\n    return employee.user\n  } else if (type == OrgMemberTargetType.Department) {\n    const department = await tx.getRepository(Department).findOne({ where: { id }, relations: ['manager'] })\n\n    if (!department || !department.manager) {\n      return\n    }\n    return await tx.getRepository(User).findOneBy({ id: department.manager.userId })\n  } else if (type == OrgMemberTargetType.Role) {\n    const role = await tx.getRepository(Role).findOne({ where: { id }, relations: ['users'] })\n\n    if (!role || !role.users || !role.users[0]) {\n      return\n    }\n\n    return await tx.getRepository(User).findOneBy({ id: role.users[0].id })\n  } else if (type == OrgMemberTargetType.Myself) {\n    return user\n  } else if (type == OrgMemberTargetType.MyDepartment) {\n    return await getSystemUserFromMyDepartmentManager(context)\n  } else if (type == OrgMemberTargetType.MySupervisor) {\n    return await getSystemUserFromMySupervosor(context)\n  }\n}\n\nexport function fillActivitySearchKeys(searchKeys: ActivitySearchKeyItem[], input: { [key: string]: any }) {\n  if (!input || typeof input !== 'object') {\n    return\n  }\n\n  return searchKeys?.reduce((sum, key, index) => {\n    const value = input[key.inputKey]\n    if (value != null) {\n      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value\n    }\n    return sum\n  }, {})\n}\n"]}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../server/controllers/common.ts"],"names":[],"mappings":"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","sourcesContent":["import { Role, User } from '@things-factory/auth-base'\n\nimport { ActivitySearchKeyItem } from '../service/activity/activity-search-key-item-type'\nimport { ActivityInstance, ActivityInstanceStatus, AssigneeItem } from '../service/activity-instance/activity-instance'\nimport { ActivityThread, ActivityThreadStatus } from '../service/activity-thread/activity-thread'\nimport { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'\nimport { ActivityInstallations } from './activity-installation/activity-installation-controller'\n\nexport async function updateActivityInstanceState(id: string, context: ResolverContext) {\n  const { tx } = context.state\n\n  var activityInstance = await tx.getRepository(ActivityInstance).findOne({\n    where: { id },\n    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']\n  })\n\n  activityInstance = await tx.getRepository(ActivityInstance).save({\n    ...activityInstance,\n    transaction: 'thread' /* change by transaction of activity thread */,\n    ...(await evalActivityInstanceState(id, context))\n  })\n\n  await ActivityInstallations.callback(activityInstance.activity.name, activityInstance, context)\n}\n\nexport async function evalActivityInstanceState(\n  id: string,\n  context: ResolverContext\n): Promise<Partial<ActivityInstance>> {\n  const { tx, user } = context.state\n\n  const activityInstance = await tx.getRepository(ActivityInstance).findOne({\n    where: { id },\n    relations: ['activityThreads']\n  })\n  const { threadsMin, activityThreads, state, dueAt } = activityInstance\n\n  const validThreads = activityThreads.filter(thread => thread.isValid())\n  const pendingStartedThreads = activityThreads.filter(thread => thread.isPendingStarted())\n  const pendingEndedThreads = activityThreads.filter(thread => thread.isPendingEnded())\n\n  switch (true) {\n    case state === ActivityInstanceStatus.Draft:\n    case state === ActivityInstanceStatus.Ended:\n    case state === ActivityInstanceStatus.Aborted:\n      return {}\n    case validThreads.length === 0:\n      return {\n        state: ActivityInstanceStatus.Posted\n      }\n    case threadsMin > validThreads.length:\n      return {\n        state: ActivityInstanceStatus.PendingAssignment\n      }\n    case pendingStartedThreads.length > 0:\n      return {\n        state: ActivityInstanceStatus.Assigned,\n        assignedAt: new Date()\n      }\n    case pendingEndedThreads.length > 0:\n      var started = !dueAt || dueAt.getTime() > Date.now()\n      var changed =\n        (started && state !== ActivityInstanceStatus.Started) || (!started && state !== ActivityInstanceStatus.Pending)\n\n      return !changed\n        ? null\n        : started\n        ? {\n            state: ActivityInstanceStatus.Started,\n            startedAt: new Date(),\n            starter: user\n          }\n        : {\n            state: ActivityInstanceStatus.Pending\n          }\n    default:\n      return {\n        state: activityThreads.find(thread => thread.state == ActivityThreadStatus.Aborted)\n          ? ActivityInstanceStatus.Aborted\n          : ActivityInstanceStatus.Ended,\n        reason: '',\n        output: activityThreads\n          .filter(thread => (thread.state = ActivityThreadStatus.Ended))\n          .reduce((sum, thread) => {\n            sum[thread.assigneeId] = thread.output\n            return sum\n          }, {} as any),\n        terminatedAt: new Date(),\n        terminator: user\n      }\n  }\n}\n\nexport async function createActivityThreadsForUsers(\n  transaction: string,\n  activityInstance: ActivityInstance,\n  assignees: User[],\n  context: ResolverContext\n): Promise<ActivityThread[]> {\n  const { domain, user, tx } = context.state\n\n  const threadRepo = tx.getRepository(ActivityThread)\n  const now = new Date()\n\n  const distinct = assignees.filter((assignee, idx) => {\n    return assignee && !assignees.slice(0, idx).find(x => x.id == assignee.id)\n  })\n\n  const result = await threadRepo.save(\n    distinct.map(assignee => {\n      return {\n        assignee,\n        state: ActivityThreadStatus.Assigned,\n        activityInstance,\n        domain,\n        transaction,\n        creator: user,\n        updater: user,\n        dueAt: activityInstance.dueAt,\n        assignedAt: now\n      } as any\n    })\n  )\n\n  await updateActivityInstanceState(activityInstance.id, context)\n\n  return result\n}\n\nexport async function createActivityThreadsForAllRoleUsers(\n  transaction: string,\n  activityInstance: ActivityInstance,\n  context: ResolverContext\n): Promise<ActivityThread[]> {\n  const { tx } = context.state\n\n  // find how many users are having given role\n  const assigneeRole = (await tx.getRepository(Role).findOne({\n    where: { id: activityInstance.assigneeRoleId },\n    relations: ['users']\n  })) as Role\n  const assignees = (assigneeRole?.users || []).filter(user => user.userType == 'user')\n\n  if (assignees.length === 0) {\n    throw new Error(\"there's no users having given role\")\n  }\n\n  // create activity-thread for all of users having given role\n  return await createActivityThreadsForUsers(transaction, activityInstance, assignees, context)\n}\n\nexport async function getSystemUserFromMyDepartmentManager(context: ResolverContext): Promise<User> {\n  const { domain, user, tx } = context.state\n\n  const employee = await tx.getRepository(Employee).findOneBy({\n    domain: { id: domain.id },\n    user: { id: user.id }\n  })\n\n  if (!employee || !employee.departmentId) {\n    return\n  }\n\n  const department = await tx.getRepository(Department).findOne({\n    where: {\n      id: employee.departmentId\n    }\n  })\n\n  if (!department || !department.managerId) return\n\n  const manager = await tx.getRepository(Employee).findOne({\n    where: {\n      domain: { id: domain.id },\n      id: department.managerId\n    },\n    relations: ['user']\n  })\n\n  return manager?.user\n}\n\nexport async function getSystemUserFromMySupervosor(context: ResolverContext): Promise<User> {\n  const { domain, user, tx } = context.state\n\n  const employee = await tx.getRepository(Employee).findOneBy({\n    domain: { id: domain.id },\n    user: { id: user.id }\n  })\n\n  if (!employee || !employee.supervisorId) {\n    return\n  }\n\n  const supervisor = await tx.getRepository(Employee).findOne({\n    where: {\n      id: employee.supervisorId\n    },\n    relations: ['user']\n  })\n\n  return supervisor?.user\n}\n\nexport async function getSystemUserFromOrgMemberItem(\n  item: AssigneeItem | ApprovalLineItem,\n  context: ResolverContext\n): Promise<User> {\n  const { domain, user, tx } = context.state\n\n  const { type, value: id } = item\n\n  if (type == OrgMemberTargetType.Employee) {\n    const employee = await tx.getRepository(Employee).findOne({ where: { id }, relations: ['user'] })\n\n    if (!employee || !employee.user) {\n      return\n    }\n    return employee.user\n  } else if (type == OrgMemberTargetType.Department) {\n    const department = await tx.getRepository(Department).findOne({ where: { id }, relations: ['manager'] })\n\n    if (!department || !department.manager) {\n      return\n    }\n    return await tx.getRepository(User).findOneBy({ id: department.manager.userId })\n  } else if (type == OrgMemberTargetType.Role) {\n    const role = await tx.getRepository(Role).findOne({ where: { id }, relations: ['users'] })\n\n    if (!role || !role.users || !role.users[0]) {\n      return\n    }\n\n    return await tx.getRepository(User).findOneBy({ id: role.users[0].id })\n  } else if (type == OrgMemberTargetType.Myself) {\n    return user\n  } else if (type == OrgMemberTargetType.MyDepartment) {\n    return await getSystemUserFromMyDepartmentManager(context)\n  } else if (type == OrgMemberTargetType.MySupervisor) {\n    return await getSystemUserFromMySupervosor(context)\n  }\n}\n\nexport function fillActivitySearchKeys(searchKeys: ActivitySearchKeyItem[], input: { [key: string]: any }) {\n  if (!input || typeof input !== 'object') {\n    return\n  }\n\n  return searchKeys?.reduce((sum, key, index) => {\n    const value = input[key.inputKey]\n    if (value != null) {\n      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value\n    }\n    return sum\n  }, {})\n}\n"]}

package/dist-server/service/activity/activity-history.js

@@ -96,21 +96,6 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", Number)
 ], ActivityHistory.prototype, "standardTime", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], ActivityHistory.prototype, "cycleTime", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], ActivityHistory.prototype, "tactTime", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], ActivityHistory.prototype, "leadTime", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, { nullable: true }),
     (0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),

package/dist-server/service/activity/activity-history.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-history.js","sourceRoot":"","sources":["../../../server/service/activity/activity-history.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, ObjectType } from 'type-graphql'\nimport { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'\n\nimport {\n  HistoryActionColumn,\n  HistoryActionType,\n  HistoryEntityInterface,\n  HistoryOriginalIdColumn\n} from '@operato/typeorm-history'\nimport { Role, User } from '@things-factory/auth-base'\nimport { config } from '@things-factory/env'\nimport { Domain } from '@things-factory/shell'\nimport { ApprovalLineItem } from '@things-factory/organization'\n\nimport { AssigneeItem } from '../activity-instance/activity-instance'\nimport { Activity, ActivityStatus, ActivityType, ActivityUIType } from './activity'\nimport { ActivityModelItem } from './activity-model-type'\n\nconst ORMCONFIG = config.get('ormconfig', {})\nconst DATABASE_TYPE = ORMCONFIG.type\n\n@Entity()\n@Index(\n  'ix_activity_history_0',\n  (activityHistory: ActivityHistory) => [activityHistory.originalId, activityHistory.version],\n  { unique: true }\n)\n@Index(\n  'ix_activity_history_1',\n  (activityHistory: ActivityHistory) => [activityHistory.domain, activityHistory.originalId, activityHistory.version],\n  { unique: true }\n)\n@ObjectType({ description: 'History Entity of Activity' })\nexport class ActivityHistory implements HistoryEntityInterface<Activity> {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @Column({ nullable: true, default: 1 })\n  @Field({ nullable: true })\n  version?: number = 1\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((activity: Activity) => activity.domain)\n  domainId?: string\n\n  @Column()\n  @Field({ nullable: true })\n  name?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  description?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  activityType?: ActivityType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  state?: ActivityStatus\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [ActivityModelItem], { nullable: true })\n  model?: ActivityModelItem[]\n\n  @Column({ nullable: true, default: 1 })\n  @Field({ nullable: true })\n  priority?: number = 1\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  startable?: boolean\n\n  @Column({\n    nullable: true\n  })\n  @Field({ nullable: true })\n  schedule?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  timezone?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  scheduleId?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  standardTime?: number\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  cycleTime?: number\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  tactTime?: number\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  leadTime?: number\n\n  @ManyToOne(type => Role, { nullable: true })\n  @Field(type => Role, { nullable: true })\n  issuerRole?: Role\n\n  @RelationId((activity: Activity) => activity.issuerRole)\n  issuerRoleId?: string\n\n  @ManyToOne(type => Role, { nullable: true })\n  @Field(type => Role, { nullable: true })\n  assigneeRole?: Role\n\n  @RelationId((activity: Activity) => activity.assigneeRole)\n  assigneeRoleId?: string\n\n  @ManyToOne(type => Role, { nullable: true })\n  @Field(type => Role, { nullable: true })\n  supervisoryRole?: Role\n\n  @RelationId((activity: Activity) => activity.supervisoryRole)\n  supervisoryRoleId?: string\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [AssigneeItem], { nullable: true, description: 'Who to resolve for the activity.' })\n  assignees?: AssigneeItem[]\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [ApprovalLineItem], {\n    nullable: true,\n    description: 'Approval line for handling the activity.'\n  })\n  approvalLine?: ApprovalLineItem[]\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'The type of UI to be shown when a task is performed' })\n  uiType?: ActivityUIType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  uiSource?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'The type of view to be shown when a task is approved' })\n  viewType?: ActivityUIType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  viewSource?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'The type of report to be shown when a task is approved' })\n  reportType?: ActivityUIType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  reportSource?: string\n\n  @Column()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @Column()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  creator?: User\n\n  @RelationId((activity: Activity) => activity.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  updater?: User\n\n  @RelationId((activity: Activity) => activity.updater)\n  updaterId?: string\n\n  @HistoryOriginalIdColumn()\n  public originalId!: string\n\n  @HistoryActionColumn({\n    nullable: false,\n    type:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? 'enum'\n        : DATABASE_TYPE == 'oracle'\n        ? 'varchar2'\n        : 'smallint',\n    enum: HistoryActionType\n  })\n  public action!: HistoryActionType\n}\n"]}
+{"version":3,"file":"activity-history.js","sourceRoot":"","sources":["../../../server/service/activity/activity-history.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, ObjectType } from 'type-graphql'\nimport { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'\n\nimport {\n  HistoryActionColumn,\n  HistoryActionType,\n  HistoryEntityInterface,\n  HistoryOriginalIdColumn\n} from '@operato/typeorm-history'\nimport { Role, User } from '@things-factory/auth-base'\nimport { config } from '@things-factory/env'\nimport { Domain } from '@things-factory/shell'\nimport { ApprovalLineItem } from '@things-factory/organization'\n\nimport { AssigneeItem } from '../activity-instance/activity-instance'\nimport { Activity, ActivityStatus, ActivityType, ActivityUIType } from './activity'\nimport { ActivityModelItem } from './activity-model-type'\n\nconst ORMCONFIG = config.get('ormconfig', {})\nconst DATABASE_TYPE = ORMCONFIG.type\n\n@Entity()\n@Index(\n  'ix_activity_history_0',\n  (activityHistory: ActivityHistory) => [activityHistory.originalId, activityHistory.version],\n  { unique: true }\n)\n@Index(\n  'ix_activity_history_1',\n  (activityHistory: ActivityHistory) => [activityHistory.domain, activityHistory.originalId, activityHistory.version],\n  { unique: true }\n)\n@ObjectType({ description: 'History Entity of Activity' })\nexport class ActivityHistory implements HistoryEntityInterface<Activity> {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @Column({ nullable: true, default: 1 })\n  @Field({ nullable: true })\n  version?: number = 1\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((activity: Activity) => activity.domain)\n  domainId?: string\n\n  @Column()\n  @Field({ nullable: true })\n  name?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  description?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  activityType?: ActivityType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  state?: ActivityStatus\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [ActivityModelItem], { nullable: true })\n  model?: ActivityModelItem[]\n\n  @Column({ nullable: true, default: 1 })\n  @Field({ nullable: true })\n  priority?: number = 1\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  startable?: boolean\n\n  @Column({\n    nullable: true\n  })\n  @Field({ nullable: true })\n  schedule?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  timezone?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  scheduleId?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  standardTime?: number\n\n  @ManyToOne(type => Role, { nullable: true })\n  @Field(type => Role, { nullable: true })\n  issuerRole?: Role\n\n  @RelationId((activity: Activity) => activity.issuerRole)\n  issuerRoleId?: string\n\n  @ManyToOne(type => Role, { nullable: true })\n  @Field(type => Role, { nullable: true })\n  assigneeRole?: Role\n\n  @RelationId((activity: Activity) => activity.assigneeRole)\n  assigneeRoleId?: string\n\n  @ManyToOne(type => Role, { nullable: true })\n  @Field(type => Role, { nullable: true })\n  supervisoryRole?: Role\n\n  @RelationId((activity: Activity) => activity.supervisoryRole)\n  supervisoryRoleId?: string\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [AssigneeItem], { nullable: true, description: 'Who to resolve for the activity.' })\n  assignees?: AssigneeItem[]\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [ApprovalLineItem], {\n    nullable: true,\n    description: 'Approval line for handling the activity.'\n  })\n  approvalLine?: ApprovalLineItem[]\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'The type of UI to be shown when a task is performed' })\n  uiType?: ActivityUIType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  uiSource?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'The type of view to be shown when a task is approved' })\n  viewType?: ActivityUIType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  viewSource?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'The type of report to be shown when a task is approved' })\n  reportType?: ActivityUIType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  reportSource?: string\n\n  @Column()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @Column()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  creator?: User\n\n  @RelationId((activity: Activity) => activity.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field({ nullable: true })\n  updater?: User\n\n  @RelationId((activity: Activity) => activity.updater)\n  updaterId?: string\n\n  @HistoryOriginalIdColumn()\n  public originalId!: string\n\n  @HistoryActionColumn({\n    nullable: false,\n    type:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? 'enum'\n        : DATABASE_TYPE == 'oracle'\n        ? 'varchar2'\n        : 'smallint',\n    enum: HistoryActionType\n  })\n  public action!: HistoryActionType\n}\n"]}

package/dist-server/service/activity/activity-type.js

@@ -56,18 +56,6 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", Number)
 ], NewActivity.prototype, "standardTime", void 0);
-tslib_1.__decorate([
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], NewActivity.prototype, "cycleTime", void 0);
-tslib_1.__decorate([
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], NewActivity.prototype, "tactTime", void 0);
-tslib_1.__decorate([
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], NewActivity.prototype, "leadTime", void 0);
 tslib_1.__decorate([
     (0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
     tslib_1.__metadata("design:type", shell_1.ObjectRef)
@@ -178,18 +166,6 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", Number)
 ], ActivityPatch.prototype, "standardTime", void 0);
-tslib_1.__decorate([
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], ActivityPatch.prototype, "cycleTime", void 0);
-tslib_1.__decorate([
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], ActivityPatch.prototype, "tactTime", void 0);
-tslib_1.__decorate([
-    (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", Number)
-], ActivityPatch.prototype, "leadTime", void 0);
 tslib_1.__decorate([
     (0, type_graphql_1.Field)(type => shell_1.ObjectRef, { nullable: true }),
     tslib_1.__metadata("design:type", shell_1.ObjectRef)