@things-factory/organization 10.1.27 → 10.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "10.1.27",
+  "version": "10.1.29",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -36,10 +36,10 @@
     "@operato/p13n": "^10.0.0",
     "@operato/popup": "^10.15.0",
     "@operato/shell": "^10.0.0",
-    "@things-factory/auth-base": "^10.1.27",
-    "@things-factory/code-ui": "^10.1.27",
-    "@things-factory/contact": "^10.1.27",
-    "@things-factory/shell": "^10.1.27"
+    "@things-factory/auth-base": "^10.1.29",
+    "@things-factory/code-ui": "^10.1.29",
+    "@things-factory/contact": "^10.1.29",
+    "@things-factory/shell": "^10.1.29"
   },
-  "gitHead": "d04dc762cacf2aac8ba0b0f5d768eca365fc09da"
+  "gitHead": "e6bf9dec003fe5e794746aaeb5852b3b50478232"
 }

package/tests/department-query-shape.test.ts

@@ -0,0 +1,130 @@
+import { existsSync, readFileSync } from 'fs'
+import path from 'path'
+
+/**
+ * A screen's query has to match the schema it is sent to.
+ *
+ * The employee list reads the departments its rail draws. The screen this was folded in from asked
+ * `departmentRoots { ...DepartmentFragment children { … } }` and the fragment asked for a field
+ * named `state`. departmentRoots answers with a DepartmentList, and Department has no `state`, so
+ * the server refused the whole document with 400 and the rail stayed empty - for as long as nobody
+ * opened the console. Type checking cannot see this: a gql`` document is a template literal.
+ *
+ * These read the server's own Department for the field list, so the check follows the type rather
+ * than a copy of it.
+ */
+
+const here = (file: string) => readFileSync(path.resolve(__dirname, '..', file), 'utf-8')
+
+/** Field names the Department object type actually declares. */
+function departmentFields(): string[] {
+  const source = here('server/service/department/department.ts')
+  const names: string[] = []
+
+  for (const match of source.matchAll(/@Field\([^)]*\)[^\n]*\n\s*(?:readonly\s+)?([A-Za-z_]\w*)\??[?!]?\s*[:?]/g)) {
+    names.push(match[1])
+  }
+
+  return names
+}
+
+/** The field names a fragment body asks for, ignoring nested selections. */
+function fragmentFields(source: string, fragmentName: string): string[] {
+  const start = source.indexOf(`fragment ${fragmentName} on `)
+  const body = source.slice(start, source.indexOf('`', start))
+  const names: string[] = []
+  let depth = 0
+
+  for (const line of body.split('\n').slice(1)) {
+    const text = line.trim()
+    if (!text) continue
+    if (text.includes('}')) depth -= (text.match(/}/g) || []).length
+    if (depth === 0) {
+      const name = text.match(/^([a-zA-Z_]\w*)/)
+      if (name) names.push(name[1])
+    }
+    if (text.includes('{')) depth += (text.match(/{/g) || []).length
+  }
+
+  return names
+}
+
+describe('the department query matches the schema', () => {
+  const screen = here('client/pages/employee/employee-list-page.ts')
+
+  it('★ every field the fragment asks for exists on Department', () => {
+    const declared = departmentFields()
+    expect(declared).toContain('controlNo')
+    expect(declared).not.toContain('state')
+
+    const asked = fragmentFields(screen, 'EmployeeDepartmentFragment')
+    expect(asked.length).toBeGreaterThan(3)
+    expect(asked.filter(name => !declared.includes(name))).toEqual([])
+  })
+
+  it('★ the roots come out of the list the query returns', () => {
+    /* departmentRoots returns DepartmentList; a fragment spread straight onto it is refused. */
+    expect(screen).toMatch(/departmentRoots \{\s*items \{/)
+    /*
+     * Every root, not the first. An organization can have more than one top level department and
+     * the tree draws an array; taking [0] hid the second one with nothing said.
+     */
+    expect(screen).toMatch(/this\.departments = response\.data\.responses\?\.items\b/)
+    expect(screen).not.toMatch(/this\.departments = response\.data\.responses\?\.items\?\.\[0\]/)
+  })
+})
+
+describe('the employee list is the one screen for people', () => {
+  /*
+   * Two screens drew the same fifteen columns of a person; one of them just had a department tree
+   * beside it. Folding them together (architect ruling, 2026-09-18) leaves one screen where the
+   * rail narrows the list, and one place for anything that has to be said about a person's row.
+   */
+  const screen = here('client/pages/employee/employee-list-page.ts')
+
+  it('★ the rail narrows the list, and it is the only place a department is chosen', () => {
+    expect(screen).toMatch(/<ox-tree/)
+    expect(screen).toMatch(/name: 'departmentId', operator: 'eq', value: this\.selectedDepartment\.id/)
+    /* A second department field in the filter row would be the same condition twice. */
+    expect(screen).toMatch(/name: 'department',[\s\S]{0,400}?filter: false/)
+  })
+
+  it('★ the folded screens are gone, routes and registrations with them', () => {
+    /*
+     * Two screens were folded into one each: the by-department employee screen into the employee
+     * list, and the department tree with its side editor into the department table, which draws the
+     * hierarchy in a tree column and shows what each department is (architect ruling 2026-09-18,
+     * user 2026-09-18).
+     */
+    for (const gone of [
+      'client/pages/employee/employees-by-department.ts',
+      'client/pages/department/department-tree-page.ts'
+    ]) {
+      expect([gone, existsSync(path.resolve(__dirname, '..', gone))]).toEqual([gone, false])
+    }
+
+    for (const page of ['employees-by-department', 'department-tree']) {
+      expect([page, here('client/route.ts').includes(page)]).toEqual([page, false])
+      expect([page, here('things-factory.config.js').includes(page)]).toEqual([page, false])
+    }
+  })
+})
+
+describe('the department table is the department screen', () => {
+  const screen = here('client/pages/department/department-list-page.ts')
+
+  it('★ the hierarchy is a column, so the table can hold what each department is', () => {
+    expect(screen).toMatch(/type: 'tree',\s*\n\s*name: 'name'/)
+    expect(screen).toMatch(/childrenProperty: 'children'/)
+    /* the columns beside the hierarchy - what the folded screen could only show one at a time */
+    for (const column of ['controlNo', 'description', 'manager', 'active']) {
+      expect([column, screen.includes(`name: '${column}'`)]).toEqual([column, true])
+    }
+  })
+
+  it('★ the count is the rows it draws, not the roots it fetched', () => {
+    /* departmentRoots counts top level departments; this screen draws each one with its subtree. */
+    expect(screen).toMatch(/const countTree = \(list: any\[\]\): number =>/)
+    expect(screen).toMatch(/total: countTree\(records\)/)
+  })
+})

package/things-factory.config.js

@@ -6,8 +6,6 @@ export default {
   routes: [
     { tagname: 'employee-list-page', page: 'employee-list' },
     { tagname: 'department-list-page', page: 'department-list' },
-    { tagname: 'department-tree-page', page: 'department-tree' },
-    { tagname: 'employees-by-department', page: 'employees-by-department' },
     { tagname: 'approval-line-list-page', page: 'approval-line-list' },
     { tagname: 'common-approval-line-templates-page', page: 'common-approval-line-templates-page' },
     { tagname: 'my-approval-line-templates-page', page: 'my-approval-line-templates-page' }

package/translations/en.json

@@ -9,9 +9,9 @@
   "button.register-account": "register",
   "button.view": "view",
   "error.contact-information-required": "Contact information is required for this employee.",
+  "error.employee-already-registered": "This employee is already registered as a system user.",
   "error.multiple-employees-for-user": "this account is linked to more than one employee record, so it is unclear which one is acting — a domain administrator must leave one",
   "error.no-employee-for-user": "this account is not linked to an employee record — a domain administrator can link it in the employee list",
-  "error.employee-already-registered": "This employee is already registered as a system user.",
   "field.approval-line": "approval line",
   "field.approver": "approver",
   "field.control-no": "control No.",
@@ -36,6 +36,7 @@
   "label.control-no": "control No.",
   "label.department": "department",
   "label.employee": "employee",
+  "label.fold": "fold",
   "label.hired-on": "hired on",
   "label.job-position": "job position",
   "label.job-responsibility": "job responsibility",
@@ -47,10 +48,16 @@
   "label.picture": "picture",
   "label.retired-at": "retired at",
   "prompt.sure to empty approval line ?": "sure to empty approval line ?",
+  "text.add the first department": "fill in a control number and a name, then add",
+  "text.all departments": "everyone",
   "text.approval-line-empty": "no approver — a submission completes at once",
   "text.approver-unknown": "(no name)",
   "text.deleted": "deleted",
+  "text.department-not-selected": "no department is selected",
+  "text.department-with-children-cannot-be-deleted": "a department with sub-departments cannot be deleted",
+  "text.departments are made on the department screen": "departments are made on the department screen",
   "text.info_x_successfully": "{x} done",
+  "text.no departments yet": "no departments yet",
   "text.no-common-approval-line-description": "a shared approval line is a route the organization sets. everyone can pick it.",
   "text.no-common-approval-line-title": "no shared approval lines",
   "text.no-my-approval-line-description": "save a route you use often and you will not have to pick it again each time.",
@@ -70,12 +77,10 @@
   "title.common-approval-line template list": "shared approval lines",
   "title.contact list": "contact list",
   "title.department list": "departments",
-  "title.department tree": "department hierarchy",
   "title.employee list": "employees",
-  "title.employees-by-department": "Employees By Department",
+  "title.import employee": "import employees",
   "title.lookup system-user": "lookup system user",
   "title.my-approval-line template list": "my approval lines",
   "title.organization": "organization",
-  "text.department-not-selected": "no department is selected",
-  "text.department-with-children-cannot-be-deleted": "a department with sub-departments cannot be deleted"
+  "title.recipients editor": "recipients editor"
 }

package/translations/ja.json

@@ -9,9 +9,9 @@
   "button.register-account": "アカウント登録",
   "button.view": "表示",
   "error.contact-information-required": "この従業員には連絡先情報が必要です。",
+  "error.employee-already-registered": "この従業員はすでにシステムユーザーとして登録されています。",
   "error.multiple-employees-for-user": "このアカウントに紐づく社員情報が複数あり、どの社員として処理するか判断できません。ドメイン管理者が一つだけ残す必要があります。",
   "error.no-employee-for-user": "このアカウントに紐づく社員情報がありません。ドメイン管理者が社員一覧で紐づけできます。",
-  "error.employee-already-registered": "この従業員はすでにシステムユーザーとして登録されています。",
   "field.approval-line": "決裁ライン",
   "field.approver": "決裁者",
   "field.control-no": "管理番号",
@@ -36,6 +36,7 @@
   "label.control-no": "管理番号",
   "label.department": "部署",
   "label.employee": "職員",
+  "label.fold": "折りたたむ",
   "label.hired-on": "入社日",
   "label.job-position": "役職",
   "label.job-responsibility": "職務責任",
@@ -47,10 +48,16 @@
   "label.picture": "写真",
   "label.retired-at": "退職日時",
   "prompt.sure to empty approval line ?": "承認ラインを空にしますか？",
+  "text.add the first department": "管理番号と名前を入力して追加してください",
+  "text.all departments": "全体",
   "text.approval-line-empty": "決裁者がいません — 提出すると即完了します",
   "text.approver-unknown": "（名前なし）",
   "text.deleted": "削除しました",
+  "text.department-not-selected": "部署が選択されていません",
+  "text.department-with-children-cannot-be-deleted": "下位部署がある部署は削除できません",
+  "text.departments are made on the department screen": "部署は部署画面で作成します",
   "text.info_x_successfully": "{x}しました",
+  "text.no departments yet": "部署がまだありません",
   "text.no-common-approval-line-description": "共用の決裁ラインは組織が定める決裁経路です。全員が選んで使えます。",
   "text.no-common-approval-line-title": "共用の決裁ラインがありません",
   "text.no-my-approval-line-description": "よく使う経路を保存しておけば、提出するたびに選び直さなくて済みます。",
@@ -70,12 +77,10 @@
   "title.common-approval-line template list": "共用の決裁ライン",
   "title.contact list": "連絡先リスト",
   "title.department list": "部署",
-  "title.department tree": "部署階層図",
   "title.employee list": "従業員",
-  "title.employees-by-department": "部署別の従業員",
+  "title.import employee": "社員の取り込み",
   "title.lookup system-user": "システムユーザーを検索",
   "title.my-approval-line template list": "自分の決裁ライン",
   "title.organization": "組織",
-  "text.department-not-selected": "部署が選択されていません",
-  "text.department-with-children-cannot-be-deleted": "下位部署がある部署は削除できません"
+  "title.recipients editor": "受信者リストの編集"
 }

package/translations/ko.json

@@ -9,9 +9,9 @@
   "button.register-account": "계정 등록",
   "button.view": "보기",
   "error.contact-information-required": "해당 직원의 연락처 정보가 필요합니다.",
+  "error.employee-already-registered": "해당 직원은 이미 시스템 사용자로 등록되어 있습니다.",
   "error.multiple-employees-for-user": "이 계정에 연결된 직원 정보가 둘 이상이어서 어느 직원으로 처리할지 알 수 없습니다. 도메인 관리자가 하나만 남겨야 합니다.",
   "error.no-employee-for-user": "이 계정에 연결된 직원 정보가 없습니다. 도메인 관리자가 직원 목록에서 연결해 줄 수 있습니다.",
-  "error.employee-already-registered": "해당 직원은 이미 시스템 사용자로 등록되어 있습니다.",
   "field.approval-line": "결재선",
   "field.approver": "결재자",
   "field.control-no": "관리 번호",
@@ -36,6 +36,7 @@
   "label.control-no": "관리번호",
   "label.department": "부서",
   "label.employee": "직원",
+  "label.fold": "접기",
   "label.hired-on": "입사일",
   "label.job-position": "직급",
   "label.job-responsibility": "직책",
@@ -47,10 +48,16 @@
   "label.picture": "사진",
   "label.retired-at": "퇴사일",
   "prompt.sure to empty approval line ?": "결재라인을 비우시겠습니까 ?",
+  "text.add the first department": "관리번호와 이름을 적고 추가하십시오",
+  "text.all departments": "전체",
   "text.approval-line-empty": "결재자가 없습니다 — 올리면 곧 완료됩니다",
   "text.approver-unknown": "(이름 없음)",
   "text.deleted": "삭제했습니다",
+  "text.department-not-selected": "선택한 부서가 없습니다",
+  "text.department-with-children-cannot-be-deleted": "하위 부서가 있는 부서는 삭제할 수 없습니다",
+  "text.departments are made on the department screen": "부서는 부서 화면에서 만듭니다",
   "text.info_x_successfully": "{x}했습니다",
+  "text.no departments yet": "아직 부서가 없습니다",
   "text.no-common-approval-line-description": "공용 결재선은 조직이 정해 두는 결재 경로입니다. 모두가 골라 쓸 수 있습니다.",
   "text.no-common-approval-line-title": "공용 결재선이 없습니다",
   "text.no-my-approval-line-description": "자주 쓰는 결재 경로를 만들어 두면 올릴 때마다 다시 고르지 않아도 됩니다.",
@@ -70,12 +77,10 @@
   "title.common-approval-line template list": "공용 결재선",
   "title.contact list": "연락처 관리",
   "title.department list": "부서",
-  "title.department tree": "부서 조직도",
   "title.employee list": "직원",
-  "title.employees-by-department": "부서별 직원",
+  "title.import employee": "직원 가져오기",
   "title.lookup system-user": "시스템 사용자 검색",
   "title.my-approval-line template list": "내 결재선",
   "title.organization": "조직",
-  "text.department-not-selected": "선택한 부서가 없습니다",
-  "text.department-with-children-cannot-be-deleted": "하위 부서가 있는 부서는 삭제할 수 없습니다"
+  "title.recipients editor": "수신자 목록 편집"
 }

package/translations/ms.json

@@ -6,11 +6,12 @@
   "button.detach": "lepaskan",
   "button.edit-contact": "edit kenalan",
   "button.edit-detail": "edit butiran",
+  "button.register-account": "daftar akaun",
   "button.view": "lihat",
   "error.contact-information-required": "Maklumat hubungan diperlukan untuk pekerja ini.",
+  "error.employee-already-registered": "Pekerja ini sudah didaftarkan sebagai pengguna sistem.",
   "error.multiple-employees-for-user": "akaun ini dipautkan kepada lebih daripada satu rekod pekerja, jadi tidak jelas yang mana bertindak — pentadbir domain perlu meninggalkan satu",
   "error.no-employee-for-user": "akaun ini tidak dipautkan kepada rekod pekerja — pentadbir domain boleh memautkannya dalam senarai pekerja",
-  "error.employee-already-registered": "Pekerja ini sudah didaftarkan sebagai pengguna sistem.",
   "field.approval-line": "talian kelulusan",
   "field.approver": "penyetuju",
   "field.control-no": "nombor kawalan",
@@ -35,6 +36,7 @@
   "label.control-no": "nombor kawalan",
   "label.department": "jabatan",
   "label.employee": "pekerja",
+  "label.fold": "lipat",
   "label.hired-on": "diberhentikan pada",
   "label.job-position": "jawatan kerja",
   "label.job-responsibility": "tanggungjawab kerja",
@@ -46,10 +48,16 @@
   "label.picture": "gambar",
   "label.retired-at": "bersara pada",
   "prompt.sure to empty approval line ?": "pasti mahu kosongkan garis kelulusan?",
+  "text.add the first department": "isi nombor kawalan dan nama, kemudian tambah",
+  "text.all departments": "semua",
   "text.approval-line-empty": "tiada pelulus — penghantaran selesai serta-merta",
   "text.approver-unknown": "(tiada nama)",
   "text.deleted": "dipadam",
+  "text.department-not-selected": "tiada jabatan dipilih",
+  "text.department-with-children-cannot-be-deleted": "jabatan yang mempunyai sub-jabatan tidak boleh dipadam",
+  "text.departments are made on the department screen": "jabatan dibuat pada skrin jabatan",
   "text.info_x_successfully": "{x} selesai",
+  "text.no departments yet": "belum ada jabatan",
   "text.no-common-approval-line-description": "talian kelulusan kongsi ialah laluan yang ditetapkan organisasi. semua orang boleh memilihnya.",
   "text.no-common-approval-line-title": "tiada talian kelulusan kongsi",
   "text.no-my-approval-line-description": "simpan laluan yang sering anda guna supaya anda tidak perlu memilihnya semula setiap kali.",
@@ -69,12 +77,10 @@
   "title.common-approval-line template list": "talian kelulusan kongsi",
   "title.contact list": "senarai kenalan",
   "title.department list": "jabatan",
-  "title.department tree": "hierarki jabatan",
   "title.employee list": "pekerja",
-  "title.employees-by-department": "pekerja mengikut jabatan",
+  "title.import employee": "import pekerja",
   "title.lookup system-user": "cari pengguna sistem",
   "title.my-approval-line template list": "talian kelulusan saya",
   "title.organization": "organisasi",
-  "text.department-not-selected": "tiada jabatan dipilih",
-  "text.department-with-children-cannot-be-deleted": "jabatan yang mempunyai sub-jabatan tidak boleh dipadam"
+  "title.recipients editor": "penyunting penerima"
 }

package/translations/zh.json

@@ -9,9 +9,9 @@
   "button.register-account": "注册账户",
   "button.view": "查看",
   "error.contact-information-required": "该员工需要联系信息。",
+  "error.employee-already-registered": "该员工已注册为系统用户。",
   "error.multiple-employees-for-user": "此账号关联了多条员工信息，无法判断以哪一位员工身份处理。域管理员需只保留一条。",
   "error.no-employee-for-user": "此账号未关联员工信息。域管理员可在员工列表中进行关联。",
-  "error.employee-already-registered": "该员工已注册为系统用户。",
   "field.approval-line": "审批线",
   "field.approver": "审批人",
   "field.control-no": "控制编号",
@@ -36,6 +36,7 @@
   "label.control-no": "控制编号",
   "label.department": "部门",
   "label.employee": "员工",
+  "label.fold": "折叠",
   "label.hired-on": "入职日期",
   "label.job-position": "职位",
   "label.job-responsibility": "工作职责",
@@ -47,10 +48,16 @@
   "label.picture": "照片",
   "label.retired-at": "退休时间",
   "prompt.sure to empty approval line ?": "确定要清空审批行吗？",
+  "text.add the first department": "填写管理编号和名称后添加",
+  "text.all departments": "全部",
   "text.approval-line-empty": "没有审批人 — 提交后立即完成",
   "text.approver-unknown": "（无名称）",
   "text.deleted": "已删除",
+  "text.department-not-selected": "未选择部门",
+  "text.department-with-children-cannot-be-deleted": "有下级部门的部门不能删除",
+  "text.departments are made on the department screen": "部门在部门页面创建",
   "text.info_x_successfully": "已{x}",
+  "text.no departments yet": "尚无部门",
   "text.no-common-approval-line-description": "共用审批线是组织设定的审批路径，所有人都可以选用。",
   "text.no-common-approval-line-title": "没有共用审批线",
   "text.no-my-approval-line-description": "把常用的审批路径保存下来，以后提交时就不用每次重新选择。",
@@ -70,12 +77,10 @@
   "title.common-approval-line template list": "共用审批线",
   "title.contact list": "联系人列表",
   "title.department list": "部门",
-  "title.department tree": "部门层级图",
   "title.employee list": "员工",
-  "title.employees-by-department": "按部门分类的员工",
+  "title.import employee": "导入员工",
   "title.lookup system-user": "查找系统用户",
   "title.my-approval-line template list": "我的审批线",
   "title.organization": "组织",
-  "text.department-not-selected": "未选择部门",
-  "text.department-with-children-cannot-be-deleted": "有下级部门的部门不能删除"
+  "title.recipients editor": "收件人列表编辑"
 }

package/dist-client/pages/department/department-tree-page.d.ts

@@ -1,39 +0,0 @@
-import '@operato/data-tree';
-import '@operato/list-state/ox-page-state.js';
-import { PropertyValues } from 'lit';
-import { PageView } from '@operato/shell';
-import { DepartmentImporter } from './department-importer';
-import { Department } from '../../types/department';
-import { DepartmentView } from '../../component/department-view';
-declare const DepartmentTreePage_base: (new (...args: any[]) => import("lit").LitElement) & typeof PageView & import("@open-wc/dedupe-mixin").Constructor<import("@open-wc/scoped-elements/types/src/types").ScopedElementsHost>;
-export declare class DepartmentTreePage extends DepartmentTreePage_base {
-    static styles: import("lit").CSSResult[];
-    static get scopedElements(): {
-        'department-importer': typeof DepartmentImporter;
-    };
-    root?: Department;
-    selected?: Department;
-    department?: Department;
-    modified: boolean;
-    appendable: boolean;
-    /** The first read of the tree; a refresh keeps the tree it has on screen. */
-    loading: boolean;
-    /** Why the tree could not be read - shown instead of an empty tree (ADR-0060 decision 8). */
-    loadError: unknown;
-    departmentView: DepartmentView;
-    get context(): {
-        title: string;
-        help: string;
-    };
-    render(): import("lit-html").TemplateResult<1>;
-    updated(changes: PropertyValues<this>): void;
-    onSelect(e: CustomEvent): void;
-    reset(): void;
-    create(): Promise<void>;
-    save(): Promise<void>;
-    delete(): Promise<void>;
-    pageInitialized(lifecycle: any): Promise<void>;
-    pageUpdated(changes: any, lifecycle: any): Promise<void>;
-    fetch(): Promise<void>;
-}
-export {};