@things-factory/worklist 10.1.258 → 10.1.260

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "10.1.258",
+  "version": "10.1.260",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "exports": {
@@ -57,16 +57,16 @@
     "@operato/p13n": "^10.29.43",
     "@operato/popup": "^10.29.43",
     "@operato/shell": "^10.29.69",
-    "@things-factory/attachment-base": "^10.1.258",
-    "@things-factory/auth-base": "^10.1.258",
-    "@things-factory/board-service": "^10.1.258",
-    "@things-factory/context-ui": "^10.1.258",
-    "@things-factory/i18n-base": "^10.1.258",
-    "@things-factory/notification": "^10.1.258",
-    "@things-factory/organization": "^10.1.258",
-    "@things-factory/personalization": "^10.1.258",
-    "@things-factory/scheduler-client": "^10.1.258",
-    "@things-factory/shell": "^10.1.258"
+    "@things-factory/attachment-base": "^10.1.260",
+    "@things-factory/auth-base": "^10.1.260",
+    "@things-factory/board-service": "^10.1.260",
+    "@things-factory/context-ui": "^10.1.260",
+    "@things-factory/i18n-base": "^10.1.260",
+    "@things-factory/notification": "^10.1.260",
+    "@things-factory/organization": "^10.1.260",
+    "@things-factory/personalization": "^10.1.260",
+    "@things-factory/scheduler-client": "^10.1.260",
+    "@things-factory/shell": "^10.1.260"
   },
-  "gitHead": "c7b7e3b4e9aa1b36a246ccee312a4124a50924dd"
+  "gitHead": "72de583ba0394dcf8195ef723b0ee4217507e0e5"
 }

package/tests/assign-role-pool.test.ts

@@ -19,6 +19,8 @@ const { createSqliteTestDataSource } = require(join(__dirname, '..', '..', 'ops-
 const DIST = join(__dirname, '..', 'dist-server')
 const { Activity } = require(join(DIST, 'service', 'activity', 'activity.js'))
 const { ActivityInstance } = require(join(DIST, 'service', 'activity-instance', 'activity-instance.js'))
+const { ActivityInstanceHistory } = require(join(DIST, 'service', 'activity-instance', 'activity-instance-history.js'))
+const { ActivityInstanceHistoryEntitySubscriber } = require(join(DIST, 'service', 'activity-instance', 'event-subscriber.js'))
 const { ActivityThread } = require(join(DIST, 'service', 'activity-thread', 'activity-thread.js'))
 const { ActivityApproval } = require(join(DIST, 'service', 'activity-approval', 'activity-approval.js'))
 const { myOpenThreadsWhere } = require(join(DIST, 'service', 'activity-thread', 'my-open-threads.js'))
@@ -46,7 +48,10 @@ let theirPool: any
 let activity: any
 
 beforeAll(async () => {
-  db = createSqliteTestDataSource([Activity, ActivityInstance, ActivityThread, ActivityApproval])
+  /* The case's history subscriber is on, as on a server - every write here also writes a history row or is refused. */
+  db = createSqliteTestDataSource([Activity, ActivityInstance, ActivityInstanceHistory, ActivityThread, ActivityApproval], {
+    subscribers: [ActivityInstanceHistoryEntitySubscriber]
+  })
   await db.initialize()
 
   here = await db.getRepository(Domain).save({ name: 'here', subdomain: 'here' })
@@ -85,6 +90,10 @@ const reread = (instance: any) =>
 /** The pool's role ids, in no particular order - sorted to compare. */
 const poolOf = (row: any) => (row?.assigneeRoles || []).map((role: any) => role.id).sort()
 
+/** The case's last history row - what its history says it is now. */
+const lastHistoryOf = async (instance: any) =>
+  (await db.getRepository(ActivityInstanceHistory).find({ where: { originalId: instance.id }, order: { version: 'DESC' } }))[0]
+
 const threadsOf = (instance: any) => db.getRepository(ActivityThread).find({ where: { activityInstance: { id: instance.id } } })
 
 /** The to-do list's own condition (my-open-threads.ts), for one case. */
@@ -154,6 +163,23 @@ describe('assign to a role', () => {
     expect(await onTheListOf(member, [pool], instance)).toBe(0)
   })
 
+  it("the case's history keeps the pool it was put in, and the one it moved to", async () => {
+    const instance = await aCase({ name: 'pay the invoice' })
+
+    await assignAs(manager, { id: instance.id, assigneeRoles: [pool.id] })
+
+    const put = await lastHistoryOf(instance)
+    expect(put.name).toBe('pay the invoice')
+    expect(put.assigneeRoleIds).toEqual([pool.id])
+    expect(put.threadsMin).toBe(1)
+
+    await assignAs(manager, { id: instance.id, assigneeRoles: [anotherPool.id] })
+
+    const moved = await lastHistoryOf(instance)
+    expect(moved.version).toBeGreaterThan(put.version)
+    expect(moved.assigneeRoleIds).toEqual([anotherPool.id])
+  })
+
   it.each(['assigned', 'started', 'unassigned', 'ended', 'draft'])('a case %s is refused by name and left as it was', async state => {
     const instance = await aCase({ state })
 

package/tests/complete-db.test.ts

@@ -0,0 +1,62 @@
+import { join } from 'path'
+
+/**
+ * Completing a case whose work is done (`complete`), through the real controllers on sqlite: a to-do handed to two
+ * people ends as done for both - every thread ended, the case ended - where `abort` would have said aborted.
+ *
+ * Reads dist-server - run the package's build:server first.
+ */
+
+const { createSqliteTestDataSource } = require(join(__dirname, '..', '..', 'ops-master', 'test', 'support', 'database.cjs'))
+const DIST = join(__dirname, '..', 'dist-server')
+const { ActivityInstance } = require(join(DIST, 'service', 'activity-instance', 'activity-instance.js'))
+const { ActivityThread } = require(join(DIST, 'service', 'activity-thread', 'activity-thread.js'))
+const { ActivityApproval } = require(join(DIST, 'service', 'activity-approval', 'activity-approval.js'))
+const { Activity } = require(join(DIST, 'service', 'activity', 'activity.js'))
+const { issue } = require(join(DIST, 'controllers', 'activity-instance', 'issue.js'))
+const { assign } = require(join(DIST, 'controllers', 'activity-instance', 'assign.js'))
+const { complete } = require(join(DIST, 'controllers', 'activity-instance', 'complete.js'))
+const { Domain } = require('@things-factory/shell')
+const { User } = require('@things-factory/auth-base')
+const { Employee } = require('@things-factory/organization')
+
+let db: any
+let here: any
+let kim: any
+let lee: any
+let todo: any
+
+beforeAll(async () => {
+  db = createSqliteTestDataSource([ActivityInstance, ActivityThread, ActivityApproval, Activity, Employee])
+  await db.initialize()
+  here = await db.getRepository(Domain).save({ name: 'here', subdomain: 'complete-here' })
+  const person = (name: string) => db.getRepository(User).save({ name, email: `${name}@example.com`, password: 'x', status: 'activated', userType: 'user', domains: [here] })
+  kim = await person('kim')
+  lee = await person('lee')
+  todo = await db.getRepository(Activity).save({ domain: here, name: 'Steps', activityType: 'user', startingType: 'issue', multiple: 'single', state: 'released' })
+})
+
+afterAll(async () => {
+  await db?.destroy()
+})
+
+const asUser = (user: any, work: (context: any) => Promise<any>) =>
+  db.transaction((tx: any) => work({ state: { domain: here, user, tx, afterCommit: [] }, t: (key: string) => key }))
+
+test('a to-do held by two people ends as done for both', async () => {
+  const instance = await asUser(kim, async context => {
+    const one = await issue({ name: 'steps of a joining', description: 'steps', activityId: todo.id, assignees: [], threadsMin: 0 } as any, context)
+    await assign({ id: one.id, assignees: [kim.email, lee.email], reason: 'steps' }, context)
+    return one
+  })
+  const before = await db.getRepository(ActivityThread).find({ where: { activityInstance: { id: instance.id } } })
+  expect(before.map((one: any) => one.state).sort()).toEqual(['assigned', 'assigned'])
+
+  const done = await asUser(kim, context => complete({ id: instance.id, reason: 'steps done' }, context))
+  expect(done.state).toBe('ended')
+  const after = await db.getRepository(ActivityThread).find({ where: { activityInstance: { id: instance.id } } })
+  expect(after.map((one: any) => one.state)).toEqual(['ended', 'ended'])
+  expect(after.every((one: any) => one.terminatedAt)).toBe(true)
+
+  await expect(asUser(kim, context => complete({ id: instance.id }, context))).rejects.toThrow(/already terminated/)
+})

package/translations/en.json

@@ -409,7 +409,7 @@
   "field.approval-requester": "Requester",
   "field.approval-department": "Department",
   "field.approval-step": "Step",
-  "field.approval-waiting-on": "Waiting on",
+  "field.approval-approver": "Approver",
   "field.approval-waited": "Waited",
   "field.approval-due-at": "Due",
   "field.approval-raised-at": "Raised",
@@ -421,5 +421,6 @@
   "label.approval-progress-overdue": "Overdue",
   "text.waited-days": "{days}d {hours}h",
   "text.waited-hours": "{hours}h {minutes}m",
-  "text.waited-minutes": "{minutes}m"
+  "text.waited-minutes": "{minutes}m",
+  "label.filter": "Filter"
 }

package/translations/es.json

@@ -409,7 +409,7 @@
   "field.approval-requester": "Solicitante",
   "field.approval-department": "Departamento",
   "field.approval-step": "Paso",
-  "field.approval-waiting-on": "Espera a",
+  "field.approval-approver": "Aprobador",
   "field.approval-waited": "Tiempo de espera",
   "field.approval-due-at": "Vencimiento",
   "field.approval-raised-at": "Enviado",
@@ -421,5 +421,6 @@
   "label.approval-progress-overdue": "Vencido",
   "text.waited-days": "{days} d {hours} h",
   "text.waited-hours": "{hours} h {minutes} min",
-  "text.waited-minutes": "{minutes} min"
+  "text.waited-minutes": "{minutes} min",
+  "label.filter": "Filtro"
 }

package/translations/ja.json

@@ -409,7 +409,7 @@
   "field.approval-requester": "申請者",
   "field.approval-department": "部署",
   "field.approval-step": "段階",
-  "field.approval-waiting-on": "待っている人",
+  "field.approval-approver": "決裁者",
   "field.approval-waited": "待ち時間",
   "field.approval-due-at": "期限",
   "field.approval-raised-at": "申請日時",
@@ -421,5 +421,6 @@
   "label.approval-progress-overdue": "期限超過",
   "text.waited-days": "{days}日 {hours}時間",
   "text.waited-hours": "{hours}時間 {minutes}分",
-  "text.waited-minutes": "{minutes}分"
+  "text.waited-minutes": "{minutes}分",
+  "label.filter": "フィルター"
 }

package/translations/ko.json

@@ -409,7 +409,7 @@
   "field.approval-requester": "올린 사람",
   "field.approval-department": "부서",
   "field.approval-step": "단계",
-  "field.approval-waiting-on": "기다리는 사람",
+  "field.approval-approver": "결재자",
   "field.approval-waited": "기다린 시간",
   "field.approval-due-at": "기한",
   "field.approval-raised-at": "올린 때",
@@ -421,5 +421,6 @@
   "label.approval-progress-overdue": "기한 넘김",
   "text.waited-days": "{days}일 {hours}시간",
   "text.waited-hours": "{hours}시간 {minutes}분",
-  "text.waited-minutes": "{minutes}분"
+  "text.waited-minutes": "{minutes}분",
+  "label.filter": "필터"
 }

package/translations/ms.json

@@ -409,7 +409,7 @@
   "field.approval-requester": "Pemohon",
   "field.approval-department": "Jabatan",
   "field.approval-step": "Langkah",
-  "field.approval-waiting-on": "Menunggu",
+  "field.approval-approver": "Pelulus",
   "field.approval-waited": "Tempoh menunggu",
   "field.approval-due-at": "Tarikh akhir",
   "field.approval-raised-at": "Dihantar",
@@ -421,5 +421,6 @@
   "label.approval-progress-overdue": "Lewat tempoh",
   "text.waited-days": "{days}h {hours}j",
   "text.waited-hours": "{hours}j {minutes}m",
-  "text.waited-minutes": "{minutes}m"
+  "text.waited-minutes": "{minutes}m",
+  "label.filter": "Penapis"
 }

package/translations/zh.json

@@ -409,7 +409,7 @@
   "field.approval-requester": "申请人",
   "field.approval-department": "部门",
   "field.approval-step": "步骤",
-  "field.approval-waiting-on": "等待审批人",
+  "field.approval-approver": "审批人",
   "field.approval-waited": "已等待",
   "field.approval-due-at": "期限",
   "field.approval-raised-at": "提交时间",
@@ -421,5 +421,6 @@
   "label.approval-progress-overdue": "已逾期",
   "text.waited-days": "{days}天 {hours}小时",
   "text.waited-hours": "{hours}小时 {minutes}分",
-  "text.waited-minutes": "{minutes}分"
+  "text.waited-minutes": "{minutes}分",
+  "label.filter": "筛选"
 }