@things-factory/organization 10.1.228 → 10.1.230

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "10.1.228",
+  "version": "10.1.230",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -43,5 +43,5 @@
     "@things-factory/shell": "^10.1.228",
     "exceljs": "4.2.0"
   },
-  "gitHead": "fc4ede44617418df8701e83b83d177db4142a8f3"
+  "gitHead": "27f533e9f72834aac95fd6e7287e5ae1862164da"
 }

package/tests/department-open-fields.test.ts

@@ -0,0 +1,72 @@
+import { readFileSync } from 'fs'
+import path from 'path'
+
+import { ROLE_TASKS } from '../server/role-tasks'
+
+/**
+ * Every seat reads the departments; the people in them stay the roster's (ADR-0139, the user 2026-10-29).
+ *
+ * A sales seat saving an opportunity was refused `department:query`: the opportunity names a department. The
+ * department's own fields say nothing about anybody; `manager` and `members` lead to employee records. So those two
+ * ask `employee:query` on the field, and the list doors are searched, filtered and sorted only by the open fields -
+ * filtering by a closed one would tell, by whether a department stays in the list, what it holds.
+ */
+const read = (file: string) => readFileSync(path.resolve(__dirname, '..', file), 'utf-8')
+const CLOSED = ['manager', 'members']
+
+describe('the department list every seat reads', () => {
+  const entity = read('server/service/department/department.ts')
+  const doors = read('server/service/department/department-query.ts')
+
+  it.each(CLOSED)('★ %s asks employee:query on the declared field', field => {
+    expect(entity).toMatch(
+      new RegExp(`@Directive\\('@privilege\\(category: "employee", privilege: "query", domainOwnerGranted: true\\)'\\)\\n  @Field\\([^\\n]*\\)\\n  ${field}\\?:`)
+    )
+  })
+
+  it.each(CLOSED)('★ %s is nullable, so a seat refused it still gets the list above it', field => {
+    expect(entity).toMatch(new RegExp(`  @Field\\([^\\n]*\\{ nullable: true \\}\\)\\n  ${field}\\?:`))
+  })
+
+  it("★ members are resolved - the department's own employees in its domain - so a seat that may read them gets them", () => {
+    const resolver = doors.slice(doors.indexOf('async members('), doors.indexOf('@FieldResolver', doors.indexOf('async members(')))
+    expect(doors).toMatch(/@FieldResolver\(type => \[Employee\], \{ nullable: true \}\)\n  async members\(/)
+    expect(resolver).toMatch(/domain: \{ id: department\.domainId \}, department: \{ id: department\.id \}/)
+  })
+
+  it('★ no other field of a department asks a privilege', () => {
+    const asked = [...entity.matchAll(/@privilege\([^\n]*\n  @Field\([^\n]*\)\n  (\w+)\?:/g)].map(match => match[1])
+    expect(asked.sort()).toEqual([...CLOSED].sort())
+  })
+
+  it('★ every list door reads by the same rules, and those rules name no closed field', () => {
+    const rules = doors.slice(doors.indexOf('const DEPARTMENT_LIST_RULES = {'), doors.indexOf('}', doors.indexOf('const DEPARTMENT_LIST_RULES = {')))
+    for (const key of ['searchables', 'filterables', 'sortables']) expect([key, rules.includes(`${key}: [`)]).toEqual([key, true])
+    for (const field of [...CLOSED, 'managerId']) expect([field, rules.includes(`'${field}'`)]).toEqual([field, false])
+    for (const door of ['async departmentRoots(', 'async departments(', 'async children(']) {
+      const body = doors.slice(doors.indexOf(door), doors.indexOf('getManyAndCount', doors.indexOf(door)))
+      expect([door, body.includes('...DEPARTMENT_LIST_RULES')]).toEqual([door, true])
+    }
+    expect(doors.match(/searchables: \[/g)).toHaveLength(1)
+  })
+
+  it('★ the department picker asks nothing a seat without employee:query is refused', () => {
+    const picker = read('client/component/department-selector.ts')
+    const fragment = picker.slice(picker.indexOf('fragment SubDepartment on Department'), picker.indexOf('`', picker.indexOf('fragment SubDepartment on Department')))
+    for (const field of CLOSED) expect([field, new RegExp(`^\\s+${field}\\b`, 'm').test(fragment)]).toEqual([field, false])
+  })
+
+  it('★ the department table does not offer sorting by its head', () => {
+    const screen = read('client/pages/department/department-list-page.ts')
+    const column = screen.slice(screen.indexOf("name: 'manager',"), screen.indexOf("type: 'checkbox'", screen.indexOf("name: 'manager',")))
+    expect(column).toMatch(/\n          sortable: false,\n          width: 120/)
+  })
+
+  it('★ reading the departments is a task of its own, holding department:query alone, named in every language', () => {
+    expect(ROLE_TASKS.find(task => task.id === 'organization.departments-reading')?.grants).toEqual([{ category: 'department', axes: ['query'] }])
+    for (const lang of ['en', 'ko', 'ja', 'zh', 'ms', 'es']) {
+      const words = JSON.parse(read(`translations/${lang}.json`))
+      expect([lang, !!words['task.organization.departments-reading.name'], !!words['task.organization.departments-reading.description']]).toEqual([lang, true, true])
+    }
+  })
+})

package/tests/employee-profile-db.test.ts

@@ -123,6 +123,20 @@ describe("an employee's own profile", () => {
     expect(await dataSource.getRepository(organization.EmployeeProfile).count()).toBe(1)
   })
 
+  it('★ read back newest first, as written by its end - the stored rows keep the order written', async () => {
+    const lee = await person('lee')
+    const saved = await ask(lee, SAVE, {
+      profile: {
+        projects: [{ name: 'old', startedOn: '2015-01', endedOn: '2016-01' }, { name: 'now', startedOn: '2024-01' }, { name: 'mid', startedOn: '2019-01', endedOn: '2021-06' }]
+      }
+    })
+    expect(saved.errors).toBeUndefined()
+    expect(saved.data.saveMyEmployeeProfile.projects.map((row: any) => row.name)).toEqual(['now', 'mid', 'old'])
+    expect((await ask(lee, MINE)).data.myEmployeeProfile.projects.map((row: any) => row.name)).toEqual(['now', 'mid', 'old'])
+    const [stored] = await dataSource.query(`SELECT projects FROM employee_profiles WHERE deleted_at IS NULL ORDER BY updated_at DESC LIMIT 1`)
+    expect(JSON.parse(stored.projects).map((row: any) => row.name)).toEqual(['old', 'now', 'mid'])
+  })
+
   it('★ adding from a résumé takes nothing away, and reaches only one\'s own', async () => {
     const kim = await person('kim')
     const park = await person('park')

package/tests/employee-profile-document.test.ts

@@ -1,6 +1,8 @@
 import { Workbook } from 'exceljs'
 
 import {
+  COLUMN_WIDTHS,
+  ROSTER_WIDTHS,
   careerLengthOf,
   careerMonths,
   heightOf,
@@ -21,6 +23,7 @@ import {
   sheetNamesOf,
   type ProfileSheetWords
 } from '../server/service/employee-profile/employee-profile-document'
+import { inShowingOrder, newestFirst } from '../server/service/employee-profile/employee-profile-rules'
 
 /** The profiles a quotation attaches - one layout, painted as Excel and as HTML for PDF (ADR-0169 decision 5). */
 const COUNTS: Record<string, (...args: number[]) => string> = {
@@ -108,14 +111,59 @@ describe('one layout of a staffing profile', () => {
     expect(periodOf(undefined, undefined, 'now')).toBe('')
   })
 
-  it('a roster: how many and their experience on average, then one line a person in the order picked', () => {
+  it('★ newest first, as a résumé reads: by the end, one still going on top, then by the start; undated rows last', () => {
+    const careers = [
+      { company: 'A', startedOn: '2010-03', endedOn: '2014-02' },
+      { company: 'undated' },
+      { company: 'B', startedOn: '2014-03', endedOn: '2019-12' },
+      { company: 'now', startedOn: '2020-01' },
+      { company: 'C', startedOn: '2016-01', endedOn: '2019-12' }
+    ]
+    expect(newestFirst(careers).map(row => row.company)).toEqual(['now', 'C', 'B', 'A', 'undated'])
+    expect(careers[0].company).toBe('A')
+    expect(newestFirst([{ name: 'old', acquiredOn: '2015-05-01' }, { name: 'new', acquiredOn: '2023-01-10' }]).map(row => row.name)).toEqual(['new', 'old'])
+  })
+
+  it('★ a profile is shown in that order wherever it is read - put in it as it is loaded, the stored order untouched', () => {
+    const profile = inShowingOrder({ careers: [{ company: 'old', startedOn: '2001-01', endedOn: '2005-01' }, { company: 'now', startedOn: '2010-01' }], projects: null as any, skills: ['b', 'a'] } as any)
+    expect(profile.careers.map((row: any) => row.company)).toEqual(['now', 'old'])
+    expect(profile.projects).toBeNull()
+    expect(profile.skills).toEqual(['b', 'a'])
+    const entity = require('fs').readFileSync(require('path').join(__dirname, '../server/service/employee-profile/employee-profile.ts'), 'utf8')
+    expect(entity).toMatch(/^  @AfterLoad\(\)\n  showNewestFirst\(\) \{\n    inShowingOrder\(this\)/m)
+  })
+
+  it('★ every dated table of the page reads newest first', () => {
+    const person = {
+      ...KIM,
+      profile: {
+        projects: [{ name: 'P-old', startedOn: '2018-01', endedOn: '2018-06' }, { name: 'P-new', startedOn: '2024-01' }],
+        careers: [{ company: 'C-old', startedOn: '2010-01', endedOn: '2012-01' }, { company: 'C-new', startedOn: '2012-02', endedOn: '2015-01' }],
+        certificates: [{ name: 'T-old', acquiredOn: '2011-01-01' }, { name: 'T-new', acquiredOn: '2020-01-01' }],
+        educations: [{ school: 'E-old', startedOn: '2001-03', endedOn: '2005-02' }, { school: 'E-new', startedOn: '2005-03', endedOn: '2007-02' }]
+      }
+    }
+    const text = profileSheetLayout(person as any, WORDS, 'Co', TODAY).flatMap(line => line.cells.map(cell => cell.value)).join('|')
+    for (const [newer, older] of [['P-new', 'P-old'], ['C-new', 'C-old'], ['T-new', 'T-old'], ['E-new', 'E-old']]) expect(text.indexOf(newer)).toBeLessThan(text.indexOf(older))
+  })
+
+  it('a roster: how many and their experience on average, then two lines a person in the order picked', () => {
     const lines = rosterLayout([KIM, { name: '박지민', hiredOn: '2025-10-01' }], WORDS, 'C', TODAY)
     expect(valuesOf(lines[0])).toEqual(['C', '<writtenOn> 2026.10.28'])
     expect(valuesOf(lines[1])).toEqual(['<rosterTitle>'])
     const average = Math.round((careerMonths(KIM, TODAY) + 13) / 2)
     expect(valuesOf(lines[2])).toEqual([`2people  ·  <averageCareer> ${Math.floor(average / 12)}y${average % 12}m`])
-    expect(valuesOf(lines[5])).toEqual(['<number>', '<name>', '<department>', '<jobPosition>', '<careerLength>', '<skills>'])
-    expect(lines.slice(6).map(line => valuesOf(line).slice(0, 2))).toEqual([['1', '김하늘'], ['2', '박지민']])
+    expect(valuesOf(lines[5])).toEqual(['<number>', '<name>', '<department>', '<jobPosition>', '<careerLength>'])
+    expect(lines.slice(6).map(line => valuesOf(line).slice(0, 2))).toEqual([['1', '김하늘'], ['TypeScript, PostgreSQL'], ['2', '박지민']])
+    /* The number runs down the person's two lines; the skills sit under the name; none written, one line. */
+    expect([lines[6].cells[0].col, lines[6].cells[0].rows]).toEqual([1, 2])
+    expect(lines[7].cells.map(cell => [cell.col, cell.span ?? 1, cell.role])).toEqual([[2, 5, 'value']])
+    expect(lines[8].cells[0].rows).toBe(1)
+    const three = rosterLayout([KIM, { name: '박지민' }, KIM], WORDS, 'C', TODAY).slice(6)
+    expect(three.map(line => [valuesOf(line)[0], line.zebra ?? false])).toEqual([['1', false], ['TypeScript, PostgreSQL', false], ['2', true], ['3', false], ['TypeScript, PostgreSQL', false]])
+    /* The roster's own widths: a narrow number; the pages keep theirs. */
+    expect(ROSTER_WIDTHS[0]).toBeLessThan(Math.min(...ROSTER_WIDTHS.slice(1)))
+    expect(ROSTER_WIDTHS.reduce((sum, one) => sum + one, 0)).toBe(COLUMN_WIDTHS.reduce((sum, one) => sum + one, 0))
     expect(rosterTaglineOf([], WORDS, TODAY)).toBe('0people')
   })
 })
@@ -141,6 +189,15 @@ describe('painted as Excel', () => {
   it('★ several people open with the roster, then a sheet a person in the order picked - read back from the file', async () => {
     const book = await readBack([KIM, { name: '박지민' }])
     expect(book.worksheets.map(sheet => sheet.name)).toEqual(['<rosterTitle>', '김하늘', '박지민'])
+    /* The number is merged down the person's two lines, its text at the top. */
+    const roster = book.worksheets[0]
+    expect(roster.getCell('A7').isMerged && roster.getCell('A8').isMerged).toBe(true)
+    expect(roster.getCell('A8').master.address).toBe('A7')
+    expect(roster.getCell('A7').value).toBe('1')
+    expect(roster.getCell('A7').alignment?.vertical).toBe('top')
+    expect(roster.getCell('A9').isMerged).toBe(false)
+    /* The roster sheet takes its own widths - a narrow number - and a person's sheet the page's. */
+    expect(book.worksheets.map(sheet => sheet.getColumn(1).width)).toEqual([ROSTER_WIDTHS[0], COLUMN_WIDTHS[0], COLUMN_WIDTHS[0]])
     expect((await readBack([KIM])).worksheets.map(sheet => sheet.name)).toEqual(['김하늘'])
   })
 
@@ -177,6 +234,12 @@ describe('painted as HTML for the PDF', () => {
   it('★ a page a person after the roster, the same cells, spans as colspan, text escaped', () => {
     const html = profileHtml([KIM, { name: '<b>박</b>' }], WORDS, 'C', TODAY)
     expect(html.match(/<section class="sheet">/g)).toHaveLength(3)
+    /* The roster's number spans the person's two lines; the second line leaves its column out. */
+    expect(html).toContain('<td class="value" rowspan="2" style="vertical-align:top">1</td>')
+    expect(html).toMatch(/rowspan="2"[^]*?<\/tr><tr[^>]*><td class="value" colspan="5">TypeScript, PostgreSQL<\/td><\/tr>/)
+    const firstCol = [...html.matchAll(/<colgroup><col style="width:([\d.]+)%">/g)].map(match => Number(match[1]))
+    expect(firstCol[0]).toBeCloseTo((ROSTER_WIDTHS[0] / 104) * 100, 1)
+    expect(firstCol[1]).toBeCloseTo((COLUMN_WIDTHS[0] / 104) * 100, 1)
     expect(html).toContain('<td class="name" colspan="6">김하늘</td>')
     expect(html).toContain('<span class="tag">TypeScript</span><span class="tag">PostgreSQL</span>')
     expect(html).toMatch(/<tr class="zebra"|<tr style/)

package/translations/en.json

@@ -102,6 +102,8 @@
   "label.supervisor-person": "supervisor",
   "task.organization.people-reading.name": "Reading employees and departments",
   "task.organization.people-reading.description": "Reads employee and department records. Pay accounts are not among them.",
+  "task.organization.departments-reading.name": "Reading departments",
+  "task.organization.departments-reading.description": "Reads the department list (name, code, description, parent, extension, picture). The head and the members are not among them.",
   "task.organization.people-keeping.name": "Keeping employees and departments",
   "task.organization.people-keeping.description": "Reads and changes employee and department records. Pay accounts are not among them.",
   "task.organization.pay-accounts.name": "Keeping employees' pay accounts",

package/translations/es.json

@@ -102,6 +102,8 @@
   "label.supervisor-person": "supervisor",
   "task.organization.people-reading.name": "Leer empleados y departamentos",
   "task.organization.people-reading.description": "Lee los registros de empleados y departamentos. Las cuentas de nómina no se incluyen.",
+  "task.organization.departments-reading.name": "Leer departamentos",
+  "task.organization.departments-reading.description": "Lee la lista de departamentos (nombre, código, descripción, superior, extensión, foto). El responsable y los miembros no se incluyen.",
   "task.organization.people-keeping.name": "Mantener empleados y departamentos",
   "task.organization.people-keeping.description": "Lee y modifica los registros de empleados y departamentos. Las cuentas de nómina no se incluyen.",
   "task.organization.pay-accounts.name": "Cuentas de nómina de los empleados",

package/translations/ja.json

@@ -102,6 +102,8 @@
   "label.supervisor-person": "上司",
   "task.organization.people-reading.name": "社員・部署の閲覧",
   "task.organization.people-reading.description": "社員と部署の記録を読む。給与口座は含まない。",
+  "task.organization.departments-reading.name": "部署の閲覧",
+  "task.organization.departments-reading.description": "部署一覧(名前・コード・説明・上位・内線・写真)を読む。部署長と所属社員は含まない。",
   "task.organization.people-keeping.name": "社員・部署の管理",
   "task.organization.people-keeping.description": "社員と部署の記録を読み、変更する。給与口座は含まない。",
   "task.organization.pay-accounts.name": "社員の給与口座",

package/translations/ko.json

@@ -102,6 +102,8 @@
   "label.supervisor-person": "상사",
   "task.organization.people-reading.name": "직원·부서 열람",
   "task.organization.people-reading.description": "직원과 부서 기록을 읽는다. 급여 계좌는 빠진다.",
+  "task.organization.departments-reading.name": "부서 열람",
+  "task.organization.departments-reading.description": "부서 목록(이름·코드·설명·상위·내선·사진)을 읽는다. 부서장과 소속 직원은 빠진다.",
   "task.organization.people-keeping.name": "직원·부서 관리",
   "task.organization.people-keeping.description": "직원과 부서 기록을 읽고 바꾼다. 급여 계좌는 빠진다.",
   "task.organization.pay-accounts.name": "직원 급여 계좌",

package/translations/ms.json

@@ -102,6 +102,8 @@
   "label.supervisor-person": "penyelia",
   "task.organization.people-reading.name": "Membaca pekerja dan jabatan",
   "task.organization.people-reading.description": "Membaca rekod pekerja dan jabatan. Akaun gaji tidak termasuk.",
+  "task.organization.departments-reading.name": "Membaca jabatan",
+  "task.organization.departments-reading.description": "Membaca senarai jabatan (nama, kod, keterangan, induk, sambungan, gambar). Ketua dan ahli jabatan tidak termasuk.",
   "task.organization.people-keeping.name": "Menyelenggara pekerja dan jabatan",
   "task.organization.people-keeping.description": "Membaca dan mengubah rekod pekerja dan jabatan. Akaun gaji tidak termasuk.",
   "task.organization.pay-accounts.name": "Akaun gaji pekerja",

package/translations/zh.json

@@ -102,6 +102,8 @@
   "label.supervisor-person": "上级",
   "task.organization.people-reading.name": "查看员工与部门",
   "task.organization.people-reading.description": "读取员工和部门记录。不含工资账户。",
+  "task.organization.departments-reading.name": "查看部门",
+  "task.organization.departments-reading.description": "读取部门列表(名称、代码、说明、上级、分机、照片)。不含部门负责人和所属员工。",
   "task.organization.people-keeping.name": "管理员工与部门",
   "task.organization.people-keeping.description": "读取并修改员工和部门记录。不含工资账户。",
   "task.organization.pay-accounts.name": "员工工资账户",