@things-factory/ai-assistant 10.1.104 → 10.1.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ai-assistant",
-  "version": "10.1.104",
+  "version": "10.1.107",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -34,11 +34,11 @@
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
     "@things-factory/ai-client-base": "^10.1.81",
-    "@things-factory/apptool-base": "^10.1.79",
-    "@things-factory/attachment-base": "^10.1.79",
-    "@things-factory/auth-base": "^10.1.79",
+    "@things-factory/apptool-base": "^10.1.106",
+    "@things-factory/attachment-base": "^10.1.107",
+    "@things-factory/auth-base": "^10.1.107",
     "@things-factory/env": "^10.1.20",
-    "@things-factory/shell": "^10.1.79",
+    "@things-factory/shell": "^10.1.106",
     "dompurify": "^3.0.0",
     "graphql-scalars": "^1.22.0",
     "graphql-tag": "^2.12.6",
@@ -51,5 +51,5 @@
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.0"
   },
-  "gitHead": "0d05c7573220c6da2dec2654a4b86d7bd8e3c4fb"
+  "gitHead": "65a3d5889e687d8122a65f029b926b1a4769d1c0"
 }

package/server/service/data-entry/data-entry-update.test.ts

@@ -110,6 +110,13 @@ describe('the card', () => {
     expect(rows[0].issues).toEqual([{ field: 'spentDate', code: 'not-changeable', blocking: false }, { code: 'no-change', blocking: true }])
     expect(rows[1].issues).toEqual([{ field: 'category', code: 'not-in-list', params: { values: ['교통비', '회의비'] }, blocking: true }])
   })
+
+  it('★ a field restated as it already is is not a change - not shown, not written (the model sent the name back with the note)', async () => {
+    const result: any = await proposeChanges(expense, { changes: [{ ref: 'l1', values: { merchant: '카카오T', amount: '12400', category: '회의비' } }] }, { host: {} }, run)
+    expect(result.rows[0]).toMatchObject({ before: { category: '교통비' }, values: { category: '회의비' }, issues: [] })
+    expect(Object.keys(result.rows[0].values)).toEqual(['category'])
+    expect(result.columns.map((one: any) => one.name)).toEqual(['category'])
+  })
 })
 
 describe('changing what the person pressed', () => {

package/server/service/data-entry/entry-update.ts

@@ -115,8 +115,12 @@ export function changeRows(target: EntryTarget, picked: { id: string; via: Chang
       if (record) before[name] = record[name] ?? null
     }
     if (!record) issues.push({ code: 'record-not-found', blocking: true })
-    else if (Object.keys(values).length && Object.keys(values).every(name => sameFieldValue(fields.get(name)!, before[name], values[name])))
-      issues.push({ code: 'no-change', blocking: true })
+    else {
+      /* A field the model restated as it already is does not change - the card shows it as no change, and it is not written. */
+      const same = Object.keys(values).filter(name => fields.has(name) && !issues.some(issue => issue.field === name) && sameFieldValue(fields.get(name)!, before[name], values[name]))
+      if (same.length && same.length === Object.keys(values).length) issues.push({ code: 'no-change', blocking: true })
+      else for (const name of same) delete values[name], delete before[name]
+    }
     if (!Object.keys(values).length && !issues.some(issue => issue.blocking)) issues.push({ code: 'nothing-to-change', blocking: true })
     return { index, id: one.id, via: one.via, ...(record && target.update?.labelOf ? { label: target.update.labelOf(record) } : {}), before, values, issues }
   })

package/test/entry-proposal.test.ts

@@ -11,6 +11,7 @@ import {
   entryOutcomeNote,
   entryProposalHandler,
   entryReadyCount,
+  entryTitle,
   latestEntryKeys,
   type EntryApplyAnswer
 } from '../client/utils/entry-proposal'
@@ -21,6 +22,24 @@ const t = (key: string, options: any = {}) =>
 const card = (key: string, target = 'office.expense-line', rows: any[] = []) => ({ key, kind: 'entry', target, rows })
 
 describe('the entry card', () => {
+  it('★ is titled by its kind - a 수정안 is never titled as a 입력안', () => {
+    const named = (key: string, options: any = {}) => (key === 'label.office-entry-counterparty' ? 'counterparty' : t(key, options))
+    expect(entryTitle({ kind: 'entry', target: 'office.counterparty', labelKey: 'label.office-entry-counterparty', rows: [] }, named)).toBe('counterparty to enter')
+    expect(entryTitle({ kind: 'entry', op: 'update', target: 'office.counterparty', labelKey: 'label.office-entry-counterparty', rows: [] }, named)).toBe('counterparty to change')
+  })
+
+  it('★ every target label names the record only - the card adds 입력안 or 수정안', () => {
+    /* The framework's own declarers; the applications hold the same rule in their translations. */
+    const offending: string[] = []
+    for (const root of ['../../ops-master', '../../organization', '../../i18n-base'])
+      for (const lang of ['ko', 'ja', 'zh', 'ms']) {
+        const table: Record<string, string> = JSON.parse(readFileSync(join(__dirname, root, 'translations', `${lang}.json`), 'utf8'))
+        for (const [key, value] of Object.entries(table))
+          if (/^label\.[a-z0-9-]+-entry-/.test(key) && /입력안|수정안|入力案|录入方案|cadangan/.test(value)) offending.push(`${root}/${lang}: ${key}`)
+      }
+    expect(offending).toEqual([])
+  })
+
   it('★ counts only the rows that will go in', () => {
     const p = card('k', undefined, [
       { index: 0, values: {}, sources: [], issues: [] },

package/translations/en.json

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "{count} figures",
   "ai-assistant.workspace.contains-steps": "{count} progress",
   "ai-assistant.entry.change": "change {count} records",
+  "ai-assistant.entry.title-create": "{name} to enter",
+  "ai-assistant.entry.title-update": "{name} to change",
   "ai-assistant.entry.changed": "changed {count} records.",
   "ai-assistant.entry.changed-none": "no record was changed.",
   "ai-assistant.entry.changes": "{count} records",

package/translations/ja.json

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "指標 {count}",
   "ai-assistant.workspace.contains-steps": "経過 {count}",
   "ai-assistant.entry.change": "{count}件を修正",
+  "ai-assistant.entry.title-create": "{name}の入力案",
+  "ai-assistant.entry.title-update": "{name}の修正案",
   "ai-assistant.entry.changed": "{count}件を修正しました。",
   "ai-assistant.entry.changed-none": "修正された記録はありません。",
   "ai-assistant.entry.changes": "{count}件",

package/translations/ko.json

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "수치 {count}",
   "ai-assistant.workspace.contains-steps": "경과 {count}",
   "ai-assistant.entry.change": "{count}건 고치기",
+  "ai-assistant.entry.title-create": "{name} 입력안",
+  "ai-assistant.entry.title-update": "{name} 수정안",
   "ai-assistant.entry.changed": "{count}건을 고쳤습니다.",
   "ai-assistant.entry.changed-none": "고친 기록이 없습니다.",
   "ai-assistant.entry.changes": "{count}건",

package/translations/ms.json

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "{count} angka",
   "ai-assistant.workspace.contains-steps": "{count} kemajuan",
   "ai-assistant.entry.change": "ubah {count} rekod",
+  "ai-assistant.entry.title-create": "cadangan kemasukan {name}",
+  "ai-assistant.entry.title-update": "cadangan perubahan {name}",
   "ai-assistant.entry.changed": "{count} rekod diubah.",
   "ai-assistant.entry.changed-none": "tiada rekod diubah.",
   "ai-assistant.entry.changes": "{count} rekod",

package/translations/zh.json

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "指标 {count}",
   "ai-assistant.workspace.contains-steps": "进度 {count}",
   "ai-assistant.entry.change": "修改{count}条",
+  "ai-assistant.entry.title-create": "{name}录入方案",
+  "ai-assistant.entry.title-update": "{name}修改方案",
   "ai-assistant.entry.changed": "已修改{count}条。",
   "ai-assistant.entry.changed-none": "未修改任何记录。",
   "ai-assistant.entry.changes": "{count}条",