@things-factory/worklist 6.2.105 → 6.2.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.2.105",
+  "version": "6.2.111",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -32,12 +32,12 @@
     "@operato/grist-editor": "^1.0.0",
     "@things-factory/attachment-base": "^6.2.103",
     "@things-factory/auth-base": "^6.2.103",
-    "@things-factory/board-service": "^6.2.105",
+    "@things-factory/board-service": "^6.2.111",
     "@things-factory/context-ui": "^6.2.103",
-    "@things-factory/organization": "^6.2.103",
+    "@things-factory/organization": "^6.2.111",
     "@things-factory/scheduler-client": "^6.2.103",
     "@things-factory/shell": "^6.2.103",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "891a2aea81fd948e4e8b342f88914ed579252c41"
+  "gitHead": "8424feb14ae84e99377321dc36454358631a560c"
 }

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

@@ -1,10 +1,11 @@
+import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
 
 export async function _abort(
   { activityApproval, comment }: { activityApproval: ActivityApproval; comment: string },
   context: ResolverContext
 ): Promise<ActivityApproval> {
-  const { domain, user, tx } = context.state
+  const { user, tx } = context.state
 
   var result = await tx.getRepository(ActivityApproval).save({
     ...activityApproval,
@@ -16,5 +17,15 @@ export async function _abort(
     terminator: user
   })
 
+  await tx.getRepository(ActivityThread).save({
+    ...activityApproval.activityThread,
+    transaction: 'abort',
+    reason: comment,
+    state: ActivityThreadStatus.Aborted,
+    updater: user,
+    terminatedAt: new Date(),
+    terminator: user
+  })
+
   return result
 }

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

@@ -2,10 +2,7 @@ import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activi
 import { updateActivityInstanceState } from '../common'
 import { _abort } from './_abort'
 
-export async function abort(
-  { id, comment }: { id: string; comment: string },
-  context: ResolverContext
-): Promise<ActivityApproval> {
+export async function abort({ id, comment }: { id: string; comment: string }, context: ResolverContext): Promise<ActivityApproval> {
   const { domain, user, tx } = context.state
 
   var repository = tx.getRepository(ActivityApproval)
@@ -38,11 +35,7 @@ export async function abort(
 
   var result = await _abort({ activityApproval, comment }, context)
 
-  await updateActivityInstanceState(
-    activityApproval.activityThread.activityInstanceId,
-    { causedBy: [activityApproval.activityThread] },
-    context
-  )
+  await updateActivityInstanceState(activityApproval.activityThread.activityInstanceId, { causedBy: [activityApproval.activityThread] }, context)
 
   return result
 }

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

@@ -4,10 +4,7 @@ import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activi
 import { ApprovalLineItem } from '@things-factory/organization'
 import { updateActivityInstanceState } from '../common'
 
-export async function approve(
-  { id, comment }: { id: string; comment: string },
-  context: ResolverContext
-): Promise<ActivityApproval> {
+export async function approve({ id, comment }: { id: string; comment: string }, context: ResolverContext): Promise<ActivityApproval> {
   const { domain, user, tx } = context.state
 
   var repository = tx.getRepository(ActivityApproval)
@@ -77,6 +74,7 @@ export async function approve(
     activityThread = await tx.getRepository(ActivityThread).save({
       ...activityThread,
       transaction: 'escalate',
+      reaseon: comment,
       state: ActivityThreadStatus.Escalated,
       updater: user
     })
@@ -84,6 +82,7 @@ export async function approve(
     activityThread = await tx.getRepository(ActivityThread).save({
       ...activityThread,
       transaction: 'approve',
+      reason: comment,
       state: ActivityThreadStatus.Ended,
       terminatedAt: new Date(),
       terminator: user,

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

@@ -1,11 +1,9 @@
 import { User } from '@things-factory/auth-base'
 import { ObjectRef } from '@things-factory/shell'
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
+import { ActivityThread } from '../../service/activity-thread/activity-thread'
 
-export async function delegate(
-  { id, to, comment }: { id: string; to: ObjectRef; comment: string },
-  context: ResolverContext
-): Promise<ActivityApproval> {
+export async function delegate({ id, to, comment }: { id: string; to: ObjectRef; comment: string }, context: ResolverContext): Promise<ActivityApproval> {
   const { domain, user, tx } = context.state
 
   var repository = tx.getRepository(ActivityApproval)
@@ -50,13 +48,15 @@ export async function delegate(
   })
 
   /* terminate origin approval */
-  return await repository.save({
+  const result = await repository.save({
     ...activityApproval,
     judgment: ActivityApprovalJudgment.Delegated,
-    comment,
+    reason: comment,
     transaction: 'delegate',
     updater: user,
     terminator: user,
     terminatedAt: new Date()
   })
+
+  return result
 }

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

@@ -2,10 +2,7 @@ import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thr
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
 import { updateActivityInstanceState } from '../common'
 
-export async function reject(
-  { id, comment }: { id: string; comment: string },
-  context: ResolverContext
-): Promise<ActivityApproval> {
+export async function reject({ id, comment }: { id: string; comment: string }, context: ResolverContext): Promise<ActivityApproval> {
   const { domain, user, tx } = context.state
 
   var repository = tx.getRepository(ActivityApproval)
@@ -49,15 +46,12 @@ export async function reject(
   var activityThread = await tx.getRepository(ActivityThread).save({
     ...activityApproval.activityThread,
     transaction: 'reject',
+    reason: comment,
     state: ActivityThreadStatus.Rejected,
     updater: user
   })
 
-  await updateActivityInstanceState(
-    activityApproval.activityThread.activityInstanceId,
-    { causedBy: [activityThread] },
-    context
-  )
+  await updateActivityInstanceState(activityApproval.activityThread.activityInstanceId, { causedBy: [activityThread] }, context)
 
   return result
 }

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

@@ -2,10 +2,7 @@ import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thr
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
 import { _abort as abortActivityApproval } from '../activity-approval/_abort'
 
-export async function _abort(
-  { activityThread, reason }: { activityThread: ActivityThread; reason: string },
-  context: ResolverContext
-): Promise<ActivityThread> {
+export async function _abort({ activityThread, reason }: { activityThread: ActivityThread; reason: string }, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   var repository = tx.getRepository(ActivityThread)

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

@@ -2,10 +2,7 @@ import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thr
 import { updateActivityInstanceState } from '../common'
 import { _abort } from './_abort'
 
-export async function abort(
-  { id, reason }: { id: string; reason: string },
-  context: ResolverContext
-): Promise<ActivityThread> {
+export async function abort({ id, reason }: { id: string; reason: string }, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   var repository = tx.getRepository(ActivityThread)

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

@@ -50,9 +50,9 @@ export async function delegate(
 
   const result = await repository.save({
     ...activityThread,
-    reason,
     assignee,
     transaction: 'delegate',
+    reason,
     state: ActivityThreadStatus.Assigned,
     updater: user,
     assignedAt: new Date()

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

@@ -1,10 +1,7 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { updateActivityInstanceState } from '../common'
 
-export async function end(
-  { id, output, reason }: { id: string; output?: object; reason?: string },
-  context: ResolverContext
-): Promise<ActivityThread> {
+export async function end({ id, output, reason }: { id: string; output?: object; reason?: string }, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   const repository = tx.getRepository(ActivityThread)

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

@@ -1,12 +1,7 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { updateActivityInstanceState } from '../common'
 
-export async function restart(
-  id: string,
-  output: object,
-  reason: string,
-  context: ResolverContext
-): Promise<ActivityThread> {
+export async function restart(id: string, output: object, reason: string, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   const repository = tx.getRepository(ActivityThread)

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

@@ -2,7 +2,7 @@ import { ActivityThreadSave } from '../../service/activity-thread/activity-threa
 import { updateActivityInstanceState } from '../common'
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 
-export async function save(id: string, save: ActivityThreadSave, context: ResolverContext): Promise<ActivityThread> {
+export async function save(id: string, save: ActivityThreadSave, reason: string, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
   const repository = tx.getRepository(ActivityThread)
 

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

@@ -1,12 +1,7 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { updateActivityInstanceState } from '../common'
 
-export async function start(
-  id: string,
-  output: object,
-  reason: string,
-  context: ResolverContext
-): Promise<ActivityThread> {
+export async function start(id: string, output: object, reason: string, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   const repository = tx.getRepository(ActivityThread)

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

@@ -1,13 +1,9 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'
 import { getSystemUserFromOrgMemberItem, updateActivityInstanceState } from '../common'
-import { User } from '@things-factory/auth-base'
-import { Department, Employee, ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'
+import { ApprovalLineItem } from '@things-factory/organization'
 
-export async function submit(
-  { id, output, reason }: { id: string; output?: object; reason?: string },
-  context: ResolverContext
-): Promise<ActivityThread> {
+export async function submit({ id, output, reason }: { id: string; output?: object; reason?: string }, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   const repository = tx.getRepository(ActivityThread)

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

@@ -1,8 +1,7 @@
 import { withFilter } from 'graphql-subscriptions'
 import { Resolver, Root, Subscription } from 'type-graphql'
 
-import { User } from '@things-factory/auth-base'
-import { getRepository, pubsub } from '@things-factory/shell'
+import { pubsub } from '@things-factory/shell'
 
 import { ActivityApproval } from './activity-approval'
 

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

@@ -1,14 +1,4 @@
-import {
-  CreateDateColumn,
-  UpdateDateColumn,
-  Entity,
-  Index,
-  Column,
-  RelationId,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn
-} from 'typeorm'
+import { CreateDateColumn, UpdateDateColumn, Entity, Index, Column, RelationId, ManyToOne, OneToMany, PrimaryGeneratedColumn } from 'typeorm'
 import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 
 import { Domain } from '@things-factory/shell'

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

@@ -0,0 +1,34 @@
+import { FieldResolver, Resolver, Root } from 'type-graphql'
+
+import { User } from '@things-factory/auth-base'
+import { Domain, getRepository } from '@things-factory/shell'
+
+import { ActivityThreadHistory } from './activity-thread-history'
+
+@Resolver(ActivityThreadHistory)
+export class ActivityThreadHistoryQuery {
+  @FieldResolver(type => User)
+  async assignee(@Root() activityThreadHistory: ActivityThreadHistory): Promise<User> {
+    return activityThreadHistory.assigneeId ? activityThreadHistory.assignee || (await getRepository(User).findOneBy({ id: activityThreadHistory.assigneeId })) : null
+  }
+
+  @FieldResolver(type => Domain)
+  async domain(@Root() activityThreadHistory: ActivityThreadHistory): Promise<Domain> {
+    return await getRepository(Domain).findOneBy({ id: activityThreadHistory.domainId })
+  }
+
+  @FieldResolver(type => User)
+  async updater(@Root() activityThreadHistory: ActivityThreadHistory): Promise<User> {
+    return activityThreadHistory.updaterId && (await getRepository(User).findOneBy({ id: activityThreadHistory.updaterId }))
+  }
+
+  @FieldResolver(type => User)
+  async creator(@Root() activityThreadHistory: ActivityThreadHistory): Promise<User> {
+    return activityThreadHistory.creatorId && (await getRepository(User).findOneBy({ id: activityThreadHistory.creatorId }))
+  }
+
+  @FieldResolver(type => User)
+  async terminator(@Root() activityThreadHistory: ActivityThreadHistory): Promise<User> {
+    return activityThreadHistory.terminatorId && (await getRepository(User).findOneBy({ id: activityThreadHistory.terminatorId }))
+  }
+}

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

@@ -1,12 +1,7 @@
 import { Field, ID, Int, ObjectType } from 'type-graphql'
 import { Column, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId } from 'typeorm'
 
-import {
-  HistoryActionColumn,
-  HistoryActionType,
-  HistoryEntityInterface,
-  HistoryOriginalIdColumn
-} from '@operato/typeorm-history'
+import { HistoryActionColumn, HistoryActionType, HistoryEntityInterface, HistoryOriginalIdColumn } from '@operato/typeorm-history'
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
@@ -18,18 +13,12 @@ const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 
 @Entity()
-@Index(
-  'ix_activity_thread_history_0',
-  (activityThreadHistory: ActivityThreadHistory) => [activityThreadHistory.originalId, activityThreadHistory.version],
-  { unique: true }
-)
+@Index('ix_activity_thread_history_0', (activityThreadHistory: ActivityThreadHistory) => [activityThreadHistory.originalId, activityThreadHistory.version], {
+  unique: true
+})
 @Index(
   'ix_activity_thread_history_1',
-  (activityThreadHistory: ActivityThreadHistory) => [
-    activityThreadHistory.domain,
-    activityThreadHistory.originalId,
-    activityThreadHistory.version
-  ],
+  (activityThreadHistory: ActivityThreadHistory) => [activityThreadHistory.domain, activityThreadHistory.originalId, activityThreadHistory.version],
   { unique: true }
 )
 @ObjectType({ description: 'History Entity of ActivityThread' })
@@ -82,6 +71,10 @@ export class ActivityThreadHistory implements HistoryEntityInterface<ActivityThr
   @Field({ nullable: true })
   transaction: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'Specific reason for the execution of the last transaction' })
+  reason?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   dueAt?: Date
@@ -132,12 +125,7 @@ export class ActivityThreadHistory implements HistoryEntityInterface<ActivityThr
 
   @HistoryActionColumn({
     nullable: false,
-    type:
-      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'enum'
-        : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+    type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'enum' : DATABASE_TYPE == 'oracle' ? 'varchar2' : 'smallint',
     enum: HistoryActionType
   })
   public action!: HistoryActionType

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

@@ -3,15 +3,7 @@ import { In } from 'typeorm'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
-import {
-  abort,
-  delegate,
-  end,
-  restart,
-  save as saveActivityThread,
-  start,
-  submit
-} from '../../controllers/activity-thread'
+import { abort, delegate, end, restart, save as saveActivityThread, start, submit } from '../../controllers/activity-thread'
 import { ActivityThread } from './activity-thread'
 import { ActivityThreadSave } from './activity-thread-type'
 
@@ -55,12 +47,8 @@ export class ActivityThreadMutation {
 
   @Directive('@transaction')
   @Mutation(returns => ActivityThread, { description: 'To save ActivityThread information' })
-  async saveActivityThread(
-    @Arg('id') id: string,
-    @Arg('save') save: ActivityThreadSave,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityThread> {
-    return await saveActivityThread(id, save, context)
+  async saveActivityThread(@Arg('id') id: string, @Arg('save') save: ActivityThreadSave, @Ctx() context: ResolverContext): Promise<ActivityThread> {
+    return await saveActivityThread(id, save, '', context)
   }
 
   @Directive('@transaction')
@@ -87,11 +75,7 @@ export class ActivityThreadMutation {
 
   @Directive('@transaction')
   @Mutation(returns => ActivityThread, { description: 'To abort a ActivityThread' })
-  async abortActivityThread(
-    @Arg('id') id: string,
-    @Arg('reason', { nullable: true }) reason: string,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityThread> {
+  async abortActivityThread(@Arg('id') id: string, @Arg('reason', { nullable: true }) reason: string, @Ctx() context: ResolverContext): Promise<ActivityThread> {
     return await abort({ id, reason }, context)
   }
 

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

@@ -7,6 +7,7 @@ import { ActivityInstance } from '../activity-instance/activity-instance'
 import { ActivityThread, ActivityThreadStatus } from './activity-thread'
 import { ActivityApproval } from '../activity-approval/activity-approval'
 import { ActivityThreadList } from './activity-thread-type'
+import { ActivityThreadHistory } from './activity-thread-history'
 
 @Resolver(ActivityThread)
 export class ActivityThreadQuery {
@@ -95,9 +96,7 @@ export class ActivityThreadQuery {
 
   @FieldResolver(type => User)
   async assignee(@Root() activityThread: ActivityThread): Promise<User> {
-    return activityThread.assigneeId
-      ? activityThread.assignee || (await getRepository(User).findOneBy({ id: activityThread.assigneeId }))
-      : null
+    return activityThread.assigneeId ? activityThread.assignee || (await getRepository(User).findOneBy({ id: activityThread.assigneeId })) : null
   }
 
   @FieldResolver(type => ActivityInstance)
@@ -106,15 +105,24 @@ export class ActivityThreadQuery {
   }
 
   @FieldResolver(type => [ActivityApproval])
-  async activityApprovals(
-    @Root() activityThread: ActivityThread,
-    @Ctx() context: ResolverContext
-  ): Promise<ActivityApproval[]> {
+  async activityApprovals(@Root() activityThread: ActivityThread, @Ctx() context: ResolverContext): Promise<ActivityApproval[]> {
     return await getRepository(ActivityApproval).findBy({
       activityThread: { id: activityThread.id }
     })
   }
 
+  @FieldResolver(type => [ActivityThreadHistory])
+  async activityThreadHistories(@Root() activityThread: ActivityThread, @Ctx() context: ResolverContext): Promise<ActivityThreadHistory[]> {
+    return await getRepository(ActivityThreadHistory).find({
+      where: {
+        originalId: activityThread.id
+      },
+      order: {
+        version: 'ASC'
+      }
+    })
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() activityThread: ActivityThread): Promise<Domain> {
     return await getRepository(Domain).findOneBy({ id: activityThread.domainId })

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

@@ -1,16 +1,5 @@
 import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  OneToMany,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  VersionColumn,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, OneToMany, ManyToOne, PrimaryGeneratedColumn, RelationId, VersionColumn, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Domain, ScalarObject } from '@things-factory/shell'
@@ -34,13 +23,9 @@ registerEnumType(ActivityThreadStatus, {
 })
 
 @Entity()
-@Index(
-  'ix_activity_thread_0',
-  (activityThread: ActivityThread) => [activityThread.activityInstance, activityThread.assignee],
-  {
-    unique: true
-  }
-)
+@Index('ix_activity_thread_0', (activityThread: ActivityThread) => [activityThread.activityInstance, activityThread.assignee], {
+  unique: true
+})
 @ObjectType({ description: 'Entity for ActivityThread' })
 export class ActivityThread {
   @PrimaryGeneratedColumn('uuid')
@@ -88,6 +73,10 @@ export class ActivityThread {
   @Field({ nullable: true })
   transaction?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'Specific reason for the execution of the last transaction' })
+  reason?: string
+
   @OneToMany(type => ActivityApproval, activityApproval => activityApproval.activityThread)
   @Field(type => [ActivityApproval])
   activityApprovals?: ActivityApproval[]

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

@@ -2,9 +2,10 @@ import { ActivityThread } from './activity-thread'
 import { ActivityThreadHistory } from './activity-thread-history'
 import { ActivityThreadMutation } from './activity-thread-mutation'
 import { ActivityThreadQuery } from './activity-thread-query'
+import { ActivityThreadHistoryQuery } from './activity-thread-history-query'
 import { ActivityThreadSubscription } from './activity-thread-subscription'
 import { ActivityThreadHistoryEntitySubscriber, ActivityThreadSubscriber } from './event-subscriber'
 
 export const entities = [ActivityThread, ActivityThreadHistory]
-export const resolvers = [ActivityThreadQuery, ActivityThreadMutation, ActivityThreadSubscription]
+export const resolvers = [ActivityThreadQuery, ActivityThreadHistoryQuery, ActivityThreadMutation, ActivityThreadSubscription]
 export const subscribers = [ActivityThreadSubscriber, ActivityThreadHistoryEntitySubscriber]

package/translations/en.json

@@ -82,6 +82,15 @@
   "label.activity-state-rejected": "rejected",
   "label.activity-state-ended": "ended",
   "label.activity-state-aborted": "aborted",
+  "label.activity-transaction-abort": "abort",
+  "label.activity-transaction-approve": "approve",
+  "label.activity-transaction-end": "end",
+  "label.activity-transaction-issue": "issue",
+  "label.activity-transaction-post": "post",
+  "label.activity-transaction-reject": "reject",
+  "label.activity-transaction-restart": "restart",
+  "label.activity-transaction-save": "save",
+  "label.activity-transaction-submit": "submit",
   "label.days": "days",
   "label.filter-released": "released",
   "label.filter-draft": "aborted",
@@ -97,11 +106,12 @@
   "label.hours": "hours",
   "label.information": "information",
   "label.minutes": "minutes",
-  "label.review-and-approval": "review and approval",
   "label.seconds": "seconds",
+  "label.timeline": "timeline",
   "text.assign": "assign",
   "text.draft": "draft",
   "text.installable-activities": "installable activities",
+  "text.no activity thread info": "no activity thread information",
   "text.pick": "pick",
   "text.save": "save",
   "text.enter a comment": "please, enter a comment",

package/translations/ja.json

@@ -73,7 +73,7 @@
   "label.activity-state-deprecated": "廃棄済み",
   "label.activity-state-pending-assignment": "割当待機",
   "label.activity-state-assigned": "割当済み",
-  "label.activity-state-started": "進行中",
+  "label.activity-state-started": "開始された",
   "label.activity-state-delegated": "委任済み",
   "label.activity-state-submitted": "提出済み",
   "label.activity-state-escalated": "上位承認中",
@@ -82,6 +82,15 @@
   "label.activity-state-approved": "承認済み",
   "label.activity-state-ended": "完了済み",
   "label.activity-state-aborted": "キャンセル済み",
+  "label.activity-transaction-abort": "中止",
+  "label.activity-transaction-approve": "承認",
+  "label.activity-transaction-end": "終了",
+  "label.activity-transaction-issue": "発行",
+  "label.activity-transaction-post": "投稿",
+  "label.activity-transaction-reject": "拒否",
+  "label.activity-transaction-restart": "再開",
+  "label.activity-transaction-save": "保存",
+  "label.activity-transaction-submit": "提出",
   "label.days": "日",
   "label.filter-released": "配布",
   "label.filter-draft": "ドラフト",
@@ -97,8 +106,8 @@
   "label.hours": "時間",
   "label.information": "基本情報",
   "label.minutes": "分",
-  "label.review-and-approval": "レビューと承認",
   "label.seconds": "秒",
+  "label.timeline": "タイムライン",
   "text.assign": "割当",
   "text.draft": "ドラフト保存",
   "text.installable-activities": "設置可能業務",
@@ -106,6 +115,7 @@
   "text.save": "保存",
   "text.enter a comment": "コメントを残してください。",
   "text.explain the reason for approval/rejection": "承認/却下の理由を簡潔に説明してください。",
+  "text.no activity thread info": "アクティビティスレッド情報なし",
   "text.task_is_finished_successfully": "業務が成功的に完了しました。",
   "text.task_is_saved_successfully": "業務が正常に保存されました。",
   "text.task_is_started_successfully": "業務が正常に開始されました。",