@things-factory/worklist 10.1.248 → 10.1.250

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "10.1.248",
+  "version": "10.1.250",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "exports": {
@@ -55,16 +55,16 @@
     "@operato/moment-timezone-es": "^10.0.0",
     "@operato/p13n": "^10.29.43",
     "@operato/popup": "^10.29.43",
-    "@things-factory/attachment-base": "^10.1.247",
-    "@things-factory/auth-base": "^10.1.247",
-    "@things-factory/board-service": "^10.1.247",
+    "@things-factory/attachment-base": "^10.1.250",
+    "@things-factory/auth-base": "^10.1.250",
+    "@things-factory/board-service": "^10.1.250",
     "@things-factory/context-ui": "^10.1.247",
-    "@things-factory/i18n-base": "^10.1.247",
-    "@things-factory/notification": "^10.1.248",
-    "@things-factory/organization": "^10.1.247",
-    "@things-factory/personalization": "^10.1.247",
-    "@things-factory/scheduler-client": "^10.1.247",
+    "@things-factory/i18n-base": "^10.1.250",
+    "@things-factory/notification": "^10.1.250",
+    "@things-factory/organization": "^10.1.250",
+    "@things-factory/personalization": "^10.1.250",
+    "@things-factory/scheduler-client": "^10.1.250",
     "@things-factory/shell": "^10.1.247"
   },
-  "gitHead": "ca390a4b791d6e8630388167d3da6031034b5a5e"
+  "gitHead": "4fdb6d24ef24f43d9e158d4c6d6396ad3097bb9e"
 }

package/shared/approval-step.d.ts

@@ -0,0 +1,21 @@
+/** The fields of an approval row the rule reads. */
+export interface ApprovalStepRow {
+  round?: number | null
+  order?: number | null
+  judgment?: string | null
+  participation?: string | null
+}
+
+/** The judgments after which a row waits on nothing more. */
+export const TERMINATED_JUDGMENTS: readonly ['approved', 'escalated', 'delegated', 'rejected', 'aborted', 'closed']
+
+export function isTerminated(judgment: string | null | undefined): boolean
+
+/** The latest round — 0 when there are no approvals. */
+export function latestRound(approvals: readonly ApprovalStepRow[] | null | undefined): number
+
+/** The step waited on now; undefined when nothing is waited on. */
+export function currentStepOf(approvals: readonly ApprovalStepRow[] | null | undefined): { round: number; order: number } | undefined
+
+/** The rows of the step waited on now. */
+export function currentStepRows<T extends ApprovalStepRow>(approvals: readonly T[] | null | undefined): T[]

package/shared/approval-step.js

@@ -0,0 +1,55 @@
+/*
+ * Whose turn an approval waits on — read by the server (approval progress, Office's "waiting on") and by the screens'
+ * approval-line ribbons. Hand-written .js with a .d.ts beside it, as `task-followup`: a .ts here would be taken into
+ * the client's compile and move its rootDir up to the package root.
+ *
+ * ── Why one file (ADR-0183 decision 2, 2026-11-04) ─────────────────────────
+ * The rule lived twice and the two answered differently: Office's `waitingOn` ignored the round, the ribbon's
+ * `currentApprovalOrder` counted a reference seat — one who comments and never decides — as the step waited on.
+ */
+
+/** The judgments after which a row waits on nothing more. The list queries read this very array. */
+const TERMINATED_JUDGMENTS = ['approved', 'escalated', 'delegated', 'rejected', 'aborted', 'closed']
+
+function isTerminated(judgment) {
+  return TERMINATED_JUDGMENTS.includes(judgment ?? '')
+}
+
+/** The latest round — a resubmission raises it, and the judgments of an earlier round are past. 0 when none. */
+function latestRound(approvals) {
+  return (approvals || []).reduce((max, one) => Math.max(max, Number(one?.round) || 0), 0)
+}
+
+/**
+ * The step waited on now: in the latest round, among the deciding (non-reference) rows not yet judged, the lowest
+ * order. Undefined when nothing is waited on — no approvals, or every one judged.
+ */
+function currentStepOf(approvals) {
+  const round = latestRound(approvals)
+  const open = (approvals || []).filter(
+    one => (Number(one?.round) || 0) === round && one?.participation !== 'reference' && !isTerminated(one?.judgment)
+  )
+  if (!open.length) return undefined
+
+  return { round, order: Math.min(...open.map(one => Number(one?.order) || 0)) }
+}
+
+/** The rows of the step waited on now — a role's row and a person's row may share one order. */
+function currentStepRows(approvals) {
+  const step = currentStepOf(approvals)
+  if (!step) return []
+
+  return (approvals || []).filter(
+    one =>
+      (Number(one?.round) || 0) === step.round &&
+      (Number(one?.order) || 0) === step.order &&
+      one?.participation !== 'reference' &&
+      !isTerminated(one?.judgment)
+  )
+}
+
+exports.TERMINATED_JUDGMENTS = TERMINATED_JUDGMENTS
+exports.isTerminated = isTerminated
+exports.latestRound = latestRound
+exports.currentStepOf = currentStepOf
+exports.currentStepRows = currentStepRows

package/tests/approval-progress-db.test.ts

@@ -0,0 +1,143 @@
+import { join } from 'path'
+
+/**
+ * 결재 현황 through the real resolver on sqlite (ADR-0183): every kind of approval in one list, its requester and
+ * department, whom it waits on - a role as its holders - and the counts the chips show.
+ *
+ * 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 { ApprovalProgressQuery } = require(join(DIST, 'service', 'approval-progress', 'approval-progress-query.js'))
+const { waitingOn } = require(join(DIST, 'service', 'approval-progress', 'waiting-on.js'))
+const shell = require('@things-factory/shell')
+const { Role, User } = require('@things-factory/auth-base')
+const { Department, Employee } = require('@things-factory/organization')
+
+let db: any
+let here: any
+let elsewhere: any
+let kim: any
+let lee: any
+let ceo: any
+let holder: any
+let heads: any
+let dev: any
+let sales: any
+let weekly: any
+let leave: any
+
+const asAdmin = () => ({ state: { domain: here, user: ceo }, t: (key: string) => key }) as any
+const progress = (filter: any = {}, pagination: any = undefined) =>
+  new ApprovalProgressQuery().approvalProgress(filter, pagination, asAdmin())
+
+/* One clock across the cases - each row is made an hour after the one before, so the waiting order is defined. */
+let at = Date.parse('2026-11-01T00:00:00Z')
+
+/** A case of `activity` put up by `requester`, its line's rows given as [order, judgment, seat, participation?]. */
+async function aCase(domain: any, activity: any, name: string, requester: any, rows: any[][], extra: any = {}) {
+  const instance = await db.getRepository(ActivityInstance).save({
+    domain, activity, name, state: 'started', creator: requester, issuer: requester,
+    approvalLine: rows.map(([, , , participation]) => ({ participation: participation ?? 'approval' })), ...extra
+  })
+  const thread = await db.getRepository(ActivityThread).save({
+    domain, name, round: 1, state: 'submitted', assignee: requester, activityInstance: instance
+  })
+  for (const [order, judgment, seat, participation] of rows) {
+    at += 3600_000
+    await db.getRepository(ActivityApproval).save({
+      domain, activityThread: thread, order, round: 1, judgment, participation: participation ?? 'approval',
+      ...(seat === heads ? { approverRole: seat } : { approver: seat }),
+      createdAt: new Date(at), terminatedAt: judgment ? new Date(at + 60_000) : null
+    })
+  }
+  return instance
+}
+
+beforeAll(async () => {
+  db = createSqliteTestDataSource([ActivityInstance, ActivityThread, ActivityApproval, Activity, Employee, Department])
+  await db.initialize()
+  shell.addDataSource('default', db)
+
+  here = await db.getRepository(shell.Domain).save({ name: 'here', subdomain: 'here' })
+  elsewhere = await db.getRepository(shell.Domain).save({ name: 'elsewhere', subdomain: 'elsewhere' })
+
+  const person = (name: string) =>
+    db.getRepository(User).save({ name, email: `${name}@example.com`, password: 'x', status: 'activated', domains: [here] })
+  kim = await person('kim')
+  lee = await person('lee')
+  ceo = await person('ceo')
+  holder = await person('holder')
+  heads = await db.getRepository(Role).save({ name: 'heads', domain: here, users: [holder] })
+
+  dev = await db.getRepository(Department).save({ domain: here, name: '개발', controlNo: 'D1' })
+  sales = await db.getRepository(Department).save({ domain: here, name: '영업', controlNo: 'D2' })
+  await db.getRepository(Employee).save({ domain: here, controlNo: 'E1', name: '김개발', user: kim, department: dev, active: true })
+  await db.getRepository(Employee).save({ domain: here, controlNo: 'E2', name: '이영업', user: lee, department: sales, active: true })
+
+  weekly = await db.getRepository(Activity).save({ domain: here, name: 'Office Weekly Report', label: '주간업무보고' })
+  leave = await db.getRepository(Activity).save({ domain: here, name: 'Office Leave Request', label: '휴가 신청' })
+  const other = await db.getRepository(Activity).save({ domain: elsewhere, name: 'Office Leave Request' })
+
+  /* kim's weekly report: the head (a role) approved, now the CEO's turn - and it is past due. */
+  await aCase(here, weekly, '주간보고 11월 1주 김개발', kim, [[1, 'approved', heads], [2, '', ceo]], { dueAt: new Date('2026-11-02T00:00:00Z') })
+  /* lee's weekly report waits on the head role, a reference seated before it. */
+  await aCase(here, weekly, '주간보고 11월 1주 이영업', lee, [[1, '', ceo, 'reference'], [2, '', heads]])
+  /* kim's leave was rejected - an office door closes the case on a rejection. */
+  const rejected = await aCase(here, leave, '휴가 11-10 김개발', kim, [[1, 'rejected', ceo]])
+  await db.getRepository(ActivityInstance).update(rejected.id, { state: 'aborted' })
+  /* Another domain's case never shows here. */
+  await aCase(elsewhere, other, '남의 휴가', kim, [[1, '', ceo]])
+})
+
+afterAll(async () => db?.destroy())
+
+it('★ shows every kind of approval of this domain, the waiting first', async () => {
+  const list = await progress()
+
+  expect(list.total).toBe(3)
+  expect(list.items.map((one: any) => one.headline)).toEqual(['주간보고 11월 1주 김개발', '주간보고 11월 1주 이영업', '휴가 11-10 김개발'])
+  expect(list.kinds.map((one: any) => one.label)).toEqual(['주간업무보고', '휴가 신청'])
+})
+
+it('★ names the requester, their department, the step and whom it waits on', async () => {
+  const [first, second, third] = (await progress()).items
+
+  expect(first).toMatchObject({ requesterName: '김개발', departmentName: '개발', state: 'PENDING', step: 2, steps: 2, waitingOn: ['ceo'], overdue: true })
+  /* A role's seat names its holders and the role; the reference before it is not a step. */
+  expect(second).toMatchObject({ requesterName: '이영업', departmentName: '영업', step: 1, steps: 1, waitingOn: ['holder'], waitingRole: 'heads', overdue: false })
+  expect(third).toMatchObject({ state: 'REJECTED', waitingOn: [] })
+})
+
+it('★ counts each state and the overdue under the other conditions', async () => {
+  const list = await progress({ states: ['REJECTED'], activityNames: ['Office Weekly Report', 'Office Leave Request'] })
+
+  expect(list.total).toBe(1)
+  expect(list.counts).toEqual([
+    { state: 'PENDING', count: 2 },
+    { state: 'APPROVED', count: 0 },
+    { state: 'REJECTED', count: 1 },
+    { state: 'ABORTED', count: 0 }
+  ])
+  expect((await progress()).overdue).toBe(1)
+})
+
+it('filters by kind, department and overdue, and pages', async () => {
+  expect((await progress({ activityNames: ['Office Leave Request'] })).total).toBe(1)
+  expect((await progress({ departmentIds: [sales.id] })).items.map((one: any) => one.requesterName)).toEqual(['이영업'])
+  expect((await progress({ overdueOnly: true })).total).toBe(1)
+
+  const page = await progress({}, { page: 2, limit: 2 })
+  expect(page.total).toBe(3)
+  expect(page.items.map((one: any) => one.headline)).toEqual(['휴가 11-10 김개발'])
+})
+
+it("names whom a case waits on by its instance - Office's approval doors read it", async () => {
+  const [first] = (await progress()).items
+  expect(await waitingOn(db.manager, first.id)).toEqual(['ceo'])
+})

package/things-factory.config.js

@@ -18,6 +18,7 @@ export default {
     { tagname: 'activity-list-page', page: 'activity-list' },
     { tagname: 'activity-page', page: 'activity' },
     { tagname: 'activity-instance-search-page', page: 'activity-instance-search' },
+    { tagname: 'approval-progress-page', page: 'approval-progress' },
     { tagname: 'activity-instance-list-page', page: 'activity-instance-list' },
     { tagname: 'activity-instance-start-page', page: 'activity-instance-start' },
     { tagname: 'activity-thread-page', page: 'activity-thread' },

package/translations/en.json

@@ -402,5 +402,24 @@
   "error.approval line is empty but approval was required": "\"{activity}\" has no approval line. It was submitted to be approved, so it is not sent on - left as it is, it would be confirmed without approval.",
   "error.activityInstance not found": "This task could not be found. Reload the list.",
   "error.activityInstance state should be draft": "Only a draft can be changed. This task has already been submitted.",
-  "error.no user holds the assignee roles": "Nobody holds the assignee roles ({roles}). Give the role to someone first."
+  "error.no user holds the assignee roles": "Nobody holds the assignee roles ({roles}). Give the role to someone first.",
+  "title.approval progress": "Approval progress",
+  "field.approval-kind": "Kind",
+  "field.approval-headline": "Subject",
+  "field.approval-requester": "Requester",
+  "field.approval-department": "Department",
+  "field.approval-step": "Step",
+  "field.approval-waiting-on": "Waiting on",
+  "field.approval-waited": "Waited",
+  "field.approval-due-at": "Due",
+  "field.approval-raised-at": "Raised",
+  "field.approval-ended-at": "Ended",
+  "label.approval-progress-pending": "In progress",
+  "label.approval-progress-approved": "Approved",
+  "label.approval-progress-rejected": "Rejected",
+  "label.approval-progress-aborted": "Stopped",
+  "label.approval-progress-overdue": "Overdue",
+  "text.waited-days": "{days}d {hours}h",
+  "text.waited-hours": "{hours}h {minutes}m",
+  "text.waited-minutes": "{minutes}m"
 }

package/translations/es.json

@@ -402,5 +402,24 @@
   "error.approval line is empty but approval was required": "\"{activity}\" no tiene línea de aprobación. Se envió para ser aprobado, así que no se envía: tal como está se confirmaría sin aprobación.",
   "error.activityInstance not found": "No se encontró esta tarea. Vuelva a cargar la lista.",
   "error.activityInstance state should be draft": "Solo se puede cambiar un borrador. Esta tarea ya se envió.",
-  "error.no user holds the assignee roles": "Nadie tiene los roles asignados ({roles}). Asigne primero el rol a alguien."
+  "error.no user holds the assignee roles": "Nadie tiene los roles asignados ({roles}). Asigne primero el rol a alguien.",
+  "title.approval progress": "Estado de aprobaciones",
+  "field.approval-kind": "Tipo",
+  "field.approval-headline": "Asunto",
+  "field.approval-requester": "Solicitante",
+  "field.approval-department": "Departamento",
+  "field.approval-step": "Paso",
+  "field.approval-waiting-on": "Espera a",
+  "field.approval-waited": "Tiempo de espera",
+  "field.approval-due-at": "Vencimiento",
+  "field.approval-raised-at": "Enviado",
+  "field.approval-ended-at": "Finalizado",
+  "label.approval-progress-pending": "En curso",
+  "label.approval-progress-approved": "Aprobado",
+  "label.approval-progress-rejected": "Rechazado",
+  "label.approval-progress-aborted": "Detenido",
+  "label.approval-progress-overdue": "Vencido",
+  "text.waited-days": "{days} d {hours} h",
+  "text.waited-hours": "{hours} h {minutes} min",
+  "text.waited-minutes": "{minutes} min"
 }

package/translations/ja.json

@@ -402,5 +402,24 @@
   "error.approval line is empty but approval was required": "「{activity}」に承認ラインがありません。承認を受ける前提で提出されたため送りません。このままでは承認なしで確定します。",
   "error.activityInstance not found": "この作業が見つかりません。一覧を再読み込みしてください。",
   "error.activityInstance state should be draft": "下書きのときだけ変更できます。この作業はすでに提出されています。",
-  "error.no user holds the assignee roles": "担当ロール({roles})を持つユーザーがいません。先にロールにユーザーを割り当ててください。"
+  "error.no user holds the assignee roles": "担当ロール({roles})を持つユーザーがいません。先にロールにユーザーを割り当ててください。",
+  "title.approval progress": "決裁状況",
+  "field.approval-kind": "種類",
+  "field.approval-headline": "件名",
+  "field.approval-requester": "申請者",
+  "field.approval-department": "部署",
+  "field.approval-step": "段階",
+  "field.approval-waiting-on": "待っている人",
+  "field.approval-waited": "待ち時間",
+  "field.approval-due-at": "期限",
+  "field.approval-raised-at": "申請日時",
+  "field.approval-ended-at": "終了日時",
+  "label.approval-progress-pending": "進行中",
+  "label.approval-progress-approved": "承認",
+  "label.approval-progress-rejected": "差戻し",
+  "label.approval-progress-aborted": "中止",
+  "label.approval-progress-overdue": "期限超過",
+  "text.waited-days": "{days}日 {hours}時間",
+  "text.waited-hours": "{hours}時間 {minutes}分",
+  "text.waited-minutes": "{minutes}分"
 }

package/translations/ko.json

@@ -402,5 +402,24 @@
   "error.approval line is empty but approval was required": "\"{activity}\" 에 결재선이 없습니다. 이 건은 결재를 받기로 하고 낸 것이라 올리지 않습니다 — 그대로 두면 결재 없이 확정됩니다.",
   "error.activityInstance not found": "이 작업을 찾을 수 없습니다. 목록을 새로 불러오세요.",
   "error.activityInstance state should be draft": "초안일 때만 고칠 수 있습니다. 이 작업은 이미 올라갔습니다.",
-  "error.no user holds the assignee roles": "담당 역할({roles})을 가진 사용자가 없습니다. 역할에 사용자를 먼저 지정해 주세요."
+  "error.no user holds the assignee roles": "담당 역할({roles})을 가진 사용자가 없습니다. 역할에 사용자를 먼저 지정해 주세요.",
+  "title.approval progress": "결재 현황",
+  "field.approval-kind": "종류",
+  "field.approval-headline": "제목",
+  "field.approval-requester": "올린 사람",
+  "field.approval-department": "부서",
+  "field.approval-step": "단계",
+  "field.approval-waiting-on": "기다리는 사람",
+  "field.approval-waited": "기다린 시간",
+  "field.approval-due-at": "기한",
+  "field.approval-raised-at": "올린 때",
+  "field.approval-ended-at": "끝난 때",
+  "label.approval-progress-pending": "진행 중",
+  "label.approval-progress-approved": "승인",
+  "label.approval-progress-rejected": "반려",
+  "label.approval-progress-aborted": "중단",
+  "label.approval-progress-overdue": "기한 넘김",
+  "text.waited-days": "{days}일 {hours}시간",
+  "text.waited-hours": "{hours}시간 {minutes}분",
+  "text.waited-minutes": "{minutes}분"
 }

package/translations/ms.json

@@ -402,5 +402,24 @@
   "error.approval line is empty but approval was required": "\"{activity}\" tiada barisan kelulusan. Ia dihantar untuk diluluskan, jadi ia tidak dihantar - jika dibiarkan ia akan disahkan tanpa kelulusan.",
   "error.activityInstance not found": "Tugas ini tidak dapat ditemui. Muat semula senarai.",
   "error.activityInstance state should be draft": "Hanya draf boleh diubah. Tugas ini telah dihantar.",
-  "error.no user holds the assignee roles": "Tiada pengguna memegang peranan tugasan ({roles}). Berikan peranan kepada seseorang dahulu."
+  "error.no user holds the assignee roles": "Tiada pengguna memegang peranan tugasan ({roles}). Berikan peranan kepada seseorang dahulu.",
+  "title.approval progress": "Kemajuan kelulusan",
+  "field.approval-kind": "Jenis",
+  "field.approval-headline": "Perkara",
+  "field.approval-requester": "Pemohon",
+  "field.approval-department": "Jabatan",
+  "field.approval-step": "Langkah",
+  "field.approval-waiting-on": "Menunggu",
+  "field.approval-waited": "Tempoh menunggu",
+  "field.approval-due-at": "Tarikh akhir",
+  "field.approval-raised-at": "Dihantar",
+  "field.approval-ended-at": "Tamat",
+  "label.approval-progress-pending": "Dalam proses",
+  "label.approval-progress-approved": "Diluluskan",
+  "label.approval-progress-rejected": "Ditolak",
+  "label.approval-progress-aborted": "Dihentikan",
+  "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"
 }

package/translations/zh.json

@@ -402,5 +402,24 @@
   "error.approval line is empty but approval was required": "\"{activity}\" 没有审批线。此件是按需审批提交的,因此不会提交——否则将未经审批即确定。",
   "error.activityInstance not found": "找不到此任务。请重新加载列表。",
   "error.activityInstance state should be draft": "只有草稿可以修改。此任务已提交。",
-  "error.no user holds the assignee roles": "没有用户拥有负责角色({roles})。请先为角色指定用户。"
+  "error.no user holds the assignee roles": "没有用户拥有负责角色({roles})。请先为角色指定用户。",
+  "title.approval progress": "审批状况",
+  "field.approval-kind": "类型",
+  "field.approval-headline": "标题",
+  "field.approval-requester": "申请人",
+  "field.approval-department": "部门",
+  "field.approval-step": "步骤",
+  "field.approval-waiting-on": "等待审批人",
+  "field.approval-waited": "已等待",
+  "field.approval-due-at": "期限",
+  "field.approval-raised-at": "提交时间",
+  "field.approval-ended-at": "结束时间",
+  "label.approval-progress-pending": "进行中",
+  "label.approval-progress-approved": "已批准",
+  "label.approval-progress-rejected": "驳回",
+  "label.approval-progress-aborted": "中止",
+  "label.approval-progress-overdue": "已逾期",
+  "text.waited-days": "{days}天 {hours}小时",
+  "text.waited-hours": "{hours}小时 {minutes}分",
+  "text.waited-minutes": "{minutes}分"
 }