@things-factory/worklist 10.1.167 → 10.1.169
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-client/components/activity-starter-form.js +2 -0
- package/dist-client/components/activity-starter-form.js.map +1 -1
- package/dist-client/components/decision-content.d.ts +35 -0
- package/dist-client/components/decision-content.js +310 -0
- package/dist-client/components/decision-content.js.map +1 -0
- package/dist-client/components/decision-slots.d.ts +8 -0
- package/dist-client/components/decision-slots.js +17 -0
- package/dist-client/components/decision-slots.js.map +1 -1
- package/dist-client/components/work-box-groups.d.ts +25 -0
- package/dist-client/components/work-box-groups.js +98 -0
- package/dist-client/components/work-box-groups.js.map +1 -0
- package/dist-client/my-work-menus.d.ts +1 -6
- package/dist-client/my-work-menus.js +0 -1
- package/dist-client/my-work-menus.js.map +1 -1
- package/dist-client/pages/activity/activity-list-page.js +1 -0
- package/dist-client/pages/activity/activity-list-page.js.map +1 -1
- package/dist-client/pages/activity-approval/activity-approval-page.d.ts +2 -52
- package/dist-client/pages/activity-approval/activity-approval-page.js +9 -298
- package/dist-client/pages/activity-approval/activity-approval-page.js.map +1 -1
- package/dist-client/pages/activity-catalog/activity-detail-page.js +9 -2
- package/dist-client/pages/activity-catalog/activity-detail-page.js.map +1 -1
- package/dist-client/pages/activity-instance/activity-instance-start-page.js +3 -0
- package/dist-client/pages/activity-instance/activity-instance-start-page.js.map +1 -1
- package/dist-client/pages/activity-instance/activity-instance-view.d.ts +10 -1
- package/dist-client/pages/activity-instance/activity-instance-view.js +31 -2
- package/dist-client/pages/activity-instance/activity-instance-view.js.map +1 -1
- package/dist-client/pages/activity-thread/activity-thread-page.d.ts +6 -2
- package/dist-client/pages/activity-thread/activity-thread-page.js +32 -16
- package/dist-client/pages/activity-thread/activity-thread-page.js.map +1 -1
- package/dist-client/pages/activity-thread/activity-thread-view-page.js +3 -2
- package/dist-client/pages/activity-thread/activity-thread-view-page.js.map +1 -1
- package/dist-client/pages/activity-thread/thread-sections.d.ts +34 -0
- package/dist-client/pages/activity-thread/thread-sections.js +36 -0
- package/dist-client/pages/activity-thread/thread-sections.js.map +1 -0
- package/dist-client/pages/todo/approval-pending-list-page.d.ts +1 -0
- package/dist-client/pages/todo/approval-pending-list-page.js +10 -77
- package/dist-client/pages/todo/approval-pending-list-page.js.map +1 -1
- package/dist-client/pages/todo/draft-list-page.d.ts +20 -0
- package/dist-client/pages/todo/draft-list-page.js +103 -5
- package/dist-client/pages/todo/draft-list-page.js.map +1 -1
- package/dist-client/pages/todo/todo-list-page.d.ts +19 -0
- package/dist-client/pages/todo/todo-list-page.js +147 -23
- package/dist-client/pages/todo/todo-list-page.js.map +1 -1
- package/dist-client/pages/todo/work-box.d.ts +36 -0
- package/dist-client/pages/todo/work-box.js +44 -0
- package/dist-client/pages/todo/work-box.js.map +1 -0
- package/dist-client/pages/work-door/work-doors-page.d.ts +1 -15
- package/dist-client/pages/work-door/work-doors-page.js +18 -43
- package/dist-client/pages/work-door/work-doors-page.js.map +1 -1
- package/dist-client/route.d.ts +1 -1
- package/dist-client/route.js +0 -3
- package/dist-client/route.js.map +1 -1
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-client/types/activity.d.ts +2 -0
- package/dist-client/types/activity.js.map +1 -1
- package/dist-server/controllers/activity-approval/create-approval.js +2 -1
- package/dist-server/controllers/activity-approval/create-approval.js.map +1 -1
- package/dist-server/controllers/activity-approval/resolve-judgeable-seats.js +2 -1
- package/dist-server/controllers/activity-approval/resolve-judgeable-seats.js.map +1 -1
- package/dist-server/service/activity-summary/index.d.ts +1 -1
- package/dist-server/service/activity-summary/open-work.d.ts +0 -1
- package/dist-server/service/activity-summary/open-work.js +3 -15
- package/dist-server/service/activity-summary/open-work.js.map +1 -1
- package/dist-server/service/activity-thread/activity-thread-query.d.ts +3 -0
- package/dist-server/service/activity-thread/activity-thread-query.js +24 -5
- package/dist-server/service/activity-thread/activity-thread-query.js.map +1 -1
- package/dist-server/service/activity-thread/index.d.ts +1 -1
- package/dist-server/service/activity-thread/my-open-threads.d.ts +23 -4
- package/dist-server/service/activity-thread/my-open-threads.js +38 -7
- package/dist-server/service/activity-thread/my-open-threads.js.map +1 -1
- package/dist-server/service/index.d.ts +3 -3
- package/dist-server/service/work-door/approval-line-standing.d.ts +14 -0
- package/dist-server/service/work-door/approval-line-standing.js +23 -5
- package/dist-server/service/work-door/approval-line-standing.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/tests/open-doors.test.ts +3 -2
- package/things-factory.config.js +0 -1
- package/translations/en.json +10 -2
- package/translations/es.json +10 -2
- package/translations/ja.json +10 -2
- package/translations/ko.json +10 -2
- package/translations/ms.json +10 -2
- package/translations/zh.json +10 -2
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.approvalLineRefusal = approvalLineRefusal;
|
|
4
|
+
exports.seatRoleId = seatRoleId;
|
|
5
|
+
exports.seatPersonId = seatPersonId;
|
|
4
6
|
exports.judgeApprovalLine = judgeApprovalLine;
|
|
5
7
|
exports.rolesNamedIn = rolesNamedIn;
|
|
6
8
|
const shell_1 = require("@things-factory/shell");
|
|
@@ -14,6 +16,20 @@ function approvalLineRefusal(refusal) {
|
|
|
14
16
|
const params = { role: refusal.params?.role ?? null, personId: refusal.params?.personId ?? null };
|
|
15
17
|
return new shell_1.Refusal(refusal.code, params, LINE_REFUSAL_ENGLISH[refusal.code].replace('{role}', params.role ?? ''));
|
|
16
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* A seat's role, read the way submission reads it (`create-approval`, `resolve-judgeable-seats`).
|
|
21
|
+
*
|
|
22
|
+
* The approval line editor writes what it picked under `approver` and leaves `value` empty; seeded
|
|
23
|
+
* lines carry both. Reading `value` alone here drew 「결재자 없음」 on the door screen for a line that
|
|
24
|
+
* submits. One function, so the screen and submission cannot read a seat two ways again.
|
|
25
|
+
*/
|
|
26
|
+
function seatRoleId(seat) {
|
|
27
|
+
return seat?.value || seat?.approver?.id || undefined;
|
|
28
|
+
}
|
|
29
|
+
/** A person seat, read the way submission reads it (`getSystemUserFromOrgMemberItem`: approver first). */
|
|
30
|
+
function seatPersonId(seat) {
|
|
31
|
+
return seat?.approver?.id || seat?.value || undefined;
|
|
32
|
+
}
|
|
17
33
|
const REFERENCE = 'reference';
|
|
18
34
|
const ROLE = 'Role';
|
|
19
35
|
const PERSON = 'Employee';
|
|
@@ -24,14 +40,16 @@ async function judgeApprovalLine(line, reader) {
|
|
|
24
40
|
}
|
|
25
41
|
for (const seat of seats) {
|
|
26
42
|
if (seat?.type === ROLE) {
|
|
27
|
-
|
|
28
|
-
|
|
43
|
+
const role = seatRoleId(seat);
|
|
44
|
+
if (!role || !(await reader.roleHasMembers(role))) {
|
|
45
|
+
return { approvers: 0, refusal: { code: 'approval-role-empty', params: { role: role ?? '' } } };
|
|
29
46
|
}
|
|
30
47
|
continue;
|
|
31
48
|
}
|
|
32
49
|
if (seat?.type === PERSON) {
|
|
33
|
-
|
|
34
|
-
|
|
50
|
+
const person = seatPersonId(seat);
|
|
51
|
+
if (!person || !(await reader.personIsHere(person))) {
|
|
52
|
+
return { approvers: 0, refusal: { code: 'approval-person-absent', params: { personId: person ?? '' } } };
|
|
35
53
|
}
|
|
36
54
|
}
|
|
37
55
|
}
|
|
@@ -41,7 +59,7 @@ async function judgeApprovalLine(line, reader) {
|
|
|
41
59
|
function rolesNamedIn(line) {
|
|
42
60
|
return (line ?? [])
|
|
43
61
|
.filter(seat => seat?.participation !== REFERENCE && seat?.type === ROLE)
|
|
44
|
-
.map(seat => seat
|
|
62
|
+
.map(seat => seatRoleId(seat))
|
|
45
63
|
.filter((one) => !!one);
|
|
46
64
|
}
|
|
47
65
|
//# sourceMappingURL=approval-line-standing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval-line-standing.js","sourceRoot":"","sources":["../../../server/service/work-door/approval-line-standing.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"approval-line-standing.js","sourceRoot":"","sources":["../../../server/service/work-door/approval-line-standing.ts"],"names":[],"mappings":"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","sourcesContent":["import { Refusal } from '@things-factory/shell'\n\n/**\n * 결재선이 **차 있나** — 순수 판단. DB 도 TypeORM 도 모른다.\n *\n * ═══════════════════════════════════════════════════════════════════════════\n * ── 「있다」와 「찼다」가 다르다 ───────────────────────────────────────────\n * 앞서는 `approvalLine?.length` 만 셌다. 그러면 **역할을 지목해 놓고 그 역할에 사람이 하나도 없는**\n * 결재선이 「찼다」로 읽힌다. 문 현황 화면은 「이 문은 섰습니다」라고 그리고, 현장이 상신을 누르는\n * 순간 워크리스트가 `approver is not set` 으로 던진다 — **준비됐다고 말해 놓고 쓸 때 터지는** 부류다.\n *\n * 실 테넌트에서 이것이 예외가 아니다. 미라텍에는 이 제품이 세운 역할이 하나도 없다\n * (§`project_mes_roles_locked_behind_demo`). 역할을 지목한 결재선은 거기서 전부 빈 자리를 가리킨다.\n *\n * ── 불을 돌려주지 않는다. 그리고 **union 으로도 안 돌려준다** ────────────\n * 막은 쪽이 이유를 말한다. `true`/`false` 하나면 화면이 「왜 안 되나」를 **다시 세게 되고**, 그러면\n * 정의가 두 곳이 된다 — 이 판단을 한 곳으로 모은 이유가 없어진다.\n *\n * 그래서 처음에 `{ok:true} | {ok:false, code}` 로 두었는데, 이 패키지의 `server/tsconfig.json` 은\n * **`strict: false`** 라 `strictNullChecks` 가 없고, 그러면 TS 가 **boolean 판별자로 union 을 안\n * 좁힌다.** `if (r.ok) return` 뒤에서 `r.code` 를 읽으면 컴파일이 깨진다 — 하루에 소비자 둘이\n * 연달아 걸렸고 그중 하나는 서버를 아예 못 뜨게 했다.\n *\n * 그래서 **한 객체에 선택 칸**이다. `if (standing.refusal)` 하나로 어디서나 읽힌다.\n * [합의했다] ADR-0047 ⑤(개정)\n *\n * ```\n * approval-line-missing 결재선 자체가 없다 누가 결재하는지를 정해야 한다\n * approval-role-empty 역할은 있는데 사람이 없다 그 역할에 사람을 넣어야 한다\n * approval-person-absent 지목한 사람이 여기 없다 다른 사람을 지목하거나 그 사람을 넣어야 한다\n * ```\n *\n * 관리자가 할 일이 다르므로 코드가 셋이다.\n *\n * ── 참조는 세지 않는다 ───────────────────────────────────────────────────\n * `participation: 'reference'` 는 의견만 내고 결재를 막지 않는다. 참조자 역할이 비었다고 거절하면\n * **결재와 무관한 이유로** 막는 것이 된다. 참조만 있는 결재선은 결재 없이 끝나므로 「없다」로 읽는다.\n *\n * ── 읽는 것은 부르는 쪽이 넘긴다 ─────────────────────────────────────────\n * 포트 하나를 받는다. 이 판단이 `manager` 를 받으면 TypeORM 을 알게 되어 순수 시험이 서지 않고,\n * **어느 도메인으로 좁혔나**가 부르는 쪽에서 안 보이게 된다. 포트의 수명은 **판정 하나**다 — 더\n * 오래 살면 역할에 사람을 넣은 직후에도 옛 답을 내놓는다.\n *\n * ── 사람을 직접 지목한 자리도 읽는다 ─────────────────────────────────────\n * 「이 제품은 역할만 쓴다」로 닫지 않는다. 그렇게 두면 **없는 사람을 지목한 결재선이 「찼다」로\n * 그려지고 상신 순간 터진다** — 역할에서 고친 그 모양이 사람 축으로 다시 나는 것이고, 「없음」이\n * 안전하지 않은 쪽으로 기우는 것이다. 게다가 이 정의는 워크리스트의 `ApprovalLineItem` 을 읽는\n * 공용 자리라, 다른 제품이 사람을 지목하는 날 조용히 틀린다.\n *\n * `Myself` · `MyDepartment` · `MySupervisor` 는 **상신할 때 그 사람으로 풀리는** 자리라 미리 셀 것이\n * 없다. 부서 지목(`Department`)은 부서장이 있어야 풀리는데 그 코드는 아직 없다 — 지어내지 않는다.\n *\n * [합의했다] operato-application/adr/ADR-0047.md ③⑤\n * ═══════════════════════════════════════════════════════════════════════════\n */\n\n/** 결재선 한 자리 — `ApprovalLineItem` 중 이 판단이 보는 칸만. */\nexport interface ApprovalSeat {\n /** `OrgMemberTargetType` — 역할이면 `'Role'`. */\n type?: string\n /** 역할이면 role id, 사람이면 user id. */\n value?: string\n /** 편집기가 고른 대상. 편집기는 `value` 를 안 쓰고 여기에만 적는다(§`seatRoleId`). */\n approver?: { id?: string }\n /** 비어 있으면 결재다(`ApprovalLineItem.participation` 의 규약). */\n participation?: string\n}\n\nexport type ApprovalLineRefusal = 'approval-line-missing' | 'approval-role-empty' | 'approval-person-absent'\n\nexport interface ApprovalLineStanding {\n /** 이 결재선이 지나는 자리 수. 안 서는 결재선이면 0. */\n approvers: number\n /**\n * 왜 안 서나 — **있으면 안 서는 것이다.** 없으면 선다.\n *\n * `params` 는 그 코드가 가리키는 것 하나다: 역할이 비었으면 그 역할, 사람이 없으면 그 사람.\n */\n refusal?: {\n code: ApprovalLineRefusal\n params?: { role?: string; personId?: string }\n }\n}\n\nconst LINE_REFUSAL_ENGLISH: Record<ApprovalLineRefusal, string> = {\n 'approval-line-missing': 'this form has no approval line. set who approves it.',\n 'approval-role-empty': 'nobody holds the role {role} named in the approval line. add a person to that role.',\n 'approval-person-absent': 'the person named in the approval line is not in this site. name someone else in the approval line.'\n}\n\n/** A line that does not stand, as a refusal. The params are the one thing the code points at. */\nexport function approvalLineRefusal(refusal: NonNullable<ApprovalLineStanding['refusal']>): Refusal {\n const params = { role: refusal.params?.role ?? null, personId: refusal.params?.personId ?? null }\n\n return new Refusal(refusal.code, params, LINE_REFUSAL_ENGLISH[refusal.code].replace('{role}', params.role ?? ''))\n}\n\n/** 결재선의 자리가 실제로 사람으로 풀리나 — 읽는 것은 부르는 쪽 일이다. */\nexport interface ApprovalSeatReader {\n /** 그 역할에 사람이 하나 이상 있나. */\n roleHasMembers(roleId: string): Promise<boolean>\n /** 지목한 그 사람이 이 공장에 있고 계정이 붙어 있나. */\n personIsHere(personId: string): Promise<boolean>\n}\n\n/**\n * A seat's role, read the way submission reads it (`create-approval`, `resolve-judgeable-seats`).\n *\n * The approval line editor writes what it picked under `approver` and leaves `value` empty; seeded\n * lines carry both. Reading `value` alone here drew 「결재자 없음」 on the door screen for a line that\n * submits. One function, so the screen and submission cannot read a seat two ways again.\n */\nexport function seatRoleId(seat?: ApprovalSeat | null): string | undefined {\n return seat?.value || seat?.approver?.id || undefined\n}\n\n/** A person seat, read the way submission reads it (`getSystemUserFromOrgMemberItem`: approver first). */\nexport function seatPersonId(seat?: ApprovalSeat | null): string | undefined {\n return seat?.approver?.id || seat?.value || undefined\n}\n\nconst REFERENCE = 'reference'\nconst ROLE = 'Role'\nconst PERSON = 'Employee'\n\nexport async function judgeApprovalLine(\n line: ApprovalSeat[] | undefined | null,\n reader: ApprovalSeatReader\n): Promise<ApprovalLineStanding> {\n const seats = (line ?? []).filter(seat => seat?.participation !== REFERENCE)\n\n if (!seats.length) {\n return { approvers: 0, refusal: { code: 'approval-line-missing' } }\n }\n\n for (const seat of seats) {\n if (seat?.type === ROLE) {\n const role = seatRoleId(seat)\n\n if (!role || !(await reader.roleHasMembers(role))) {\n return { approvers: 0, refusal: { code: 'approval-role-empty', params: { role: role ?? '' } } }\n }\n\n continue\n }\n\n if (seat?.type === PERSON) {\n const person = seatPersonId(seat)\n\n if (!person || !(await reader.personIsHere(person))) {\n return { approvers: 0, refusal: { code: 'approval-person-absent', params: { personId: person ?? '' } } }\n }\n }\n }\n\n return { approvers: seats.length }\n}\n\n/** 결재선에서 **역할을 지목한 자리**의 id 들 — 부르는 쪽이 미리 읽어 둘 때 쓴다. */\nexport function rolesNamedIn(line: ApprovalSeat[] | undefined | null): string[] {\n return (line ?? [])\n .filter(seat => seat?.participation !== REFERENCE && seat?.type === ROLE)\n .map(seat => seatRoleId(seat))\n .filter((one): one is string => !!one)\n}\n"]}
|