@things-factory/figure-ui 10.1.241 → 10.1.244

package/test/save-landed.test.ts

@@ -214,3 +214,78 @@ test('the answer lost after the picture was written: read back by its hash, it w
   assert.equal(session.read().dirty, false, 'source and picture both landed')
   assert.equal(await thumbnailHashOf('not a picture'), undefined)
 })
+
+/*
+  A real conflict -- another editor saved first -- leaves the edits here, with the server's latest kept to compare with
+  and, only when the person says so, to write over or to leave as it is by keeping the edits as a copy (2026-11-01 audit
+  item 6).
+*/
+test('a conflict keeps the latest; written over, the next save expects it; another change meanwhile is a conflict again', async () => {
+  const s = server()
+  const session = createFigureProductSession(s.store)
+  await session.open('a')
+  session.command({ kind: 'rename', name: 'Mine' } as never)
+  const theirs = serializeFigureAsset(addFigureBox(createFigureAsset('Theirs'), { id: 'body', size: { x: 50, y: 50, z: 50 }, position: { x: 0, y: 25, z: 0 } }))
+  s.setRow(theirs)
+  await assert.rejects(session.save(), { code: 'FIGURE_SOURCE_CONFLICT' })
+  assert.deepEqual(session.read().conflict, { latest: theirs })
+  assert.equal(session.read().dirty, true)
+  assert.equal(session.read().name, 'Mine', 'the edits stay')
+  /* Still the other's: saving again is the same conflict. */
+  await assert.rejects(session.save(), { code: 'FIGURE_SOURCE_CONFLICT' })
+  session.overwriteConflict()
+  assert.equal(session.read().conflict, undefined)
+  const third = serializeFigureAsset(createFigureAsset('Third'))
+  s.setRow(third)
+  await assert.rejects(session.save(), { code: 'FIGURE_SOURCE_CONFLICT' }, 'written over only while the latest is what was read')
+  assert.deepEqual(session.read().conflict, { latest: third })
+  session.overwriteConflict()
+  await session.save()
+  assert.equal(JSON.parse(s.row()).name, 'Mine')
+  assert.equal(session.read().conflict, undefined)
+  assert.equal(session.read().dirty, false)
+})
+
+test('a conflict kept as a copy: a new figure under a new creation id, the edits with it, the other figure untouched', async () => {
+  const s = server()
+  const saved: { id?: string; creationId?: string; type?: string }[] = []
+  const rowWrites: [string, object][] = []
+  const store = {
+    ...s.store,
+    save: async (q: { id?: string; source: string; expectedSource?: string; creationId?: string; type?: string }) => (saved.push(q), q.id ? s.store.save(q) : { id: q.creationId!, source: q.source }),
+    updateCatalog: async (id: string, patch: object) => (rowWrites.push([id, patch]), {})
+  }
+  const session = createFigureProductSession(store)
+  await session.open('a')
+  const opened = session.read().creationId
+  assert.throws(() => session.detachAsCopy(), { code: 'SESSION_NO_CONFLICT' }, 'only after a conflict')
+  session.command({ kind: 'rename', name: 'Mine' } as never)
+  session.editCatalog({ category: 'equipment', tags: ['new-tag'], type: 'gate-2' }, { type: 'gate' })
+  const theirs = serializeFigureAsset(createFigureAsset('Theirs'))
+  s.setRow(theirs)
+  await assert.rejects(session.save(), { code: 'FIGURE_SOURCE_CONFLICT' })
+  const copy = session.detachAsCopy()
+  assert.deepEqual(copy.catalog, { category: 'equipment', tags: ['new-tag'] }, 'the category and tags go with the copy; its type is asked anew')
+  assert.equal(copy.id, undefined)
+  assert.notEqual(copy.creationId, opened)
+  assert.equal(copy.conflict, undefined)
+  assert.equal(copy.name, 'Mine')
+  await session.save({ type: 'gate-copy' })
+  assert.deepEqual(saved.at(-1), { ...saved.at(-1), id: undefined, creationId: copy.creationId, type: 'gate-copy', expectedSource: undefined })
+  assert.equal(session.read().id, copy.creationId)
+  assert.deepEqual(rowWrites, [[copy.creationId, { category: 'equipment', tags: ['new-tag'] }]], 'written to the copy once it has a row')
+  assert.equal(session.read().dirty, false)
+  assert.equal(s.row(), theirs, 'the figure it came from is as the server had it')
+})
+
+test('the latest not readable: the conflict stands, and it cannot be written over blind', async () => {
+  const s = server()
+  const session = createFigureProductSession(s.store)
+  await session.open('a')
+  session.command({ kind: 'rename', name: 'Mine' } as never)
+  s.setRow(serializeFigureAsset(createFigureAsset('Theirs')))
+  s.state.loadFails = true
+  await assert.rejects(session.save(), { code: 'FIGURE_SOURCE_CONFLICT' })
+  assert.deepEqual(session.read().conflict, { latest: undefined })
+  assert.throws(() => session.overwriteConflict(), { code: 'SESSION_NO_CONFLICT' })
+})

package/translations/en.json

@@ -1294,5 +1294,16 @@
   "figure.text.data-capability-fields": "Data {name} reads itself: {fields}.",
   "figure.label.data-binding-resting": "resting",
   "figure.text.data-binding-rests": "In {where} the {name} capability does this instead.",
-  "figure.text.data-binding-rests-targets": "In {where} the {name} capability does this instead for: {targets}"
+  "figure.text.data-binding-rests-targets": "In {where} the {name} capability does this instead for: {targets}",
+  "figure.title.save-conflict": "save conflict",
+  "figure.text.save-conflict-desc": "This figure was saved elsewhere first. Your edits are still here on this screen.",
+  "figure.label.conflict-changed": "parts that differ",
+  "figure.label.conflict-mine-only": "parts only in your edits",
+  "figure.label.conflict-theirs-only": "parts only in the latest",
+  "figure.text.conflict-other-changed": "Settings outside the parts (name, inputs, capabilities...) differ too.",
+  "figure.text.conflict-latest-unread": "The latest could not be read, so it was not compared. It cannot be overwritten.",
+  "figure.button.save-as-copy": "save as a copy",
+  "figure.button.open-latest": "open the latest in a new tab",
+  "figure.button.overwrite-latest": "overwrite with my edits",
+  "figure.text.overwrite-latest-warning": "What changed in the latest is replaced by your edits and not kept. Overwrite?"
 }

package/translations/es.json

@@ -1294,5 +1294,16 @@
   "figure.text.data-capability-fields": "Datos que {name} lee por sí misma: {fields}.",
   "figure.label.data-binding-resting": "en pausa",
   "figure.text.data-binding-rests": "En {where} la capacidad {name} se encarga en su lugar.",
-  "figure.text.data-binding-rests-targets": "En {where} la capacidad {name} se encarga en su lugar de: {targets}"
+  "figure.text.data-binding-rests-targets": "En {where} la capacidad {name} se encarga en su lugar de: {targets}",
+  "figure.title.save-conflict": "conflicto al guardar",
+  "figure.text.save-conflict-desc": "Esta figura se guardó antes en otro lugar. Tus ediciones siguen en esta pantalla.",
+  "figure.label.conflict-changed": "partes distintas",
+  "figure.label.conflict-mine-only": "partes solo en tus ediciones",
+  "figure.label.conflict-theirs-only": "partes solo en la última versión",
+  "figure.text.conflict-other-changed": "También difieren ajustes fuera de las partes (nombre, entradas, capacidades...).",
+  "figure.text.conflict-latest-unread": "No se pudo leer la última versión, así que no se comparó. No se puede sobrescribir.",
+  "figure.button.save-as-copy": "guardar como copia",
+  "figure.button.open-latest": "abrir la última versión en una pestaña nueva",
+  "figure.button.overwrite-latest": "sobrescribir con mis ediciones",
+  "figure.text.overwrite-latest-warning": "Lo que cambió en la última versión se reemplaza por tus ediciones y no se conserva. ¿Sobrescribir?"
 }

package/translations/ja.json

@@ -1294,5 +1294,16 @@
   "figure.text.data-capability-fields": "{name} 能力が読むデータ: {fields}。",
   "figure.label.data-binding-resting": "休止",
   "figure.text.data-binding-rests": "{where} では {name} 能力が代わりに受け持ちます。",
-  "figure.text.data-binding-rests-targets": "{where} では {name} 能力が代わりに受け持ちます: {targets}"
+  "figure.text.data-binding-rests-targets": "{where} では {name} 能力が代わりに受け持ちます: {targets}",
+  "figure.title.save-conflict": "保存の競合",
+  "figure.text.save-conflict-desc": "別の場所でこの Figure が先に保存されました。編集内容はこの画面にそのまま残っています。",
+  "figure.label.conflict-changed": "異なる部品",
+  "figure.label.conflict-mine-only": "自分の編集にだけある部品",
+  "figure.label.conflict-theirs-only": "最新版にだけある部品",
+  "figure.text.conflict-other-changed": "部品以外の設定（名前・入力・能力など）も異なります。",
+  "figure.text.conflict-latest-unread": "最新版を読み込めなかったため比較できませんでした。上書きはできません。",
+  "figure.button.save-as-copy": "コピーとして保存",
+  "figure.button.open-latest": "最新版を新しいタブで開く",
+  "figure.button.overwrite-latest": "自分の編集で上書き",
+  "figure.text.overwrite-latest-warning": "最新版で変更された内容は自分の編集に置き換えられ、残りません。上書きしますか？"
 }

package/translations/ko.json

@@ -1294,5 +1294,16 @@
   "figure.text.data-capability-fields": "{name} 능력이 읽는 데이터: {fields}.",
   "figure.label.data-binding-resting": "쉼",
   "figure.text.data-binding-rests": "{where}에서는 {name} 능력이 대신합니다.",
-  "figure.text.data-binding-rests-targets": "{where}에서는 {name} 능력이 대신합니다: {targets}"
+  "figure.text.data-binding-rests-targets": "{where}에서는 {name} 능력이 대신합니다: {targets}",
+  "figure.title.save-conflict": "저장 충돌",
+  "figure.text.save-conflict-desc": "다른 곳에서 이 피규어를 먼저 저장했습니다. 내 편집은 이 화면에 그대로 있습니다.",
+  "figure.label.conflict-changed": "달라진 부품",
+  "figure.label.conflict-mine-only": "내 편집에만 있는 부품",
+  "figure.label.conflict-theirs-only": "최신본에만 있는 부품",
+  "figure.text.conflict-other-changed": "부품 밖의 설정(이름·입력·능력 등)도 다릅니다.",
+  "figure.text.conflict-latest-unread": "최신본을 읽지 못해 비교하지 못했습니다. 덮어쓰기는 할 수 없습니다.",
+  "figure.button.save-as-copy": "사본으로 저장",
+  "figure.button.open-latest": "최신본을 새 탭에서 열기",
+  "figure.button.overwrite-latest": "내 편집으로 덮어쓰기",
+  "figure.text.overwrite-latest-warning": "최신본에서 바뀐 내용은 내 편집으로 바뀌고 남지 않습니다. 덮어쓸까요?"
 }

package/translations/ms.json

@@ -1294,5 +1294,16 @@
   "figure.text.data-capability-fields": "Data yang {name} baca sendiri: {fields}.",
   "figure.label.data-binding-resting": "rehat",
   "figure.text.data-binding-rests": "Dalam {where} keupayaan {name} mengambil alih.",
-  "figure.text.data-binding-rests-targets": "Dalam {where} keupayaan {name} mengambil alih: {targets}"
+  "figure.text.data-binding-rests-targets": "Dalam {where} keupayaan {name} mengambil alih: {targets}",
+  "figure.title.save-conflict": "konflik simpanan",
+  "figure.text.save-conflict-desc": "Figura ini telah disimpan di tempat lain dahulu. Suntingan anda masih ada pada skrin ini.",
+  "figure.label.conflict-changed": "bahagian yang berbeza",
+  "figure.label.conflict-mine-only": "bahagian hanya dalam suntingan anda",
+  "figure.label.conflict-theirs-only": "bahagian hanya dalam versi terkini",
+  "figure.text.conflict-other-changed": "Tetapan di luar bahagian (nama, input, keupayaan...) juga berbeza.",
+  "figure.text.conflict-latest-unread": "Versi terkini tidak dapat dibaca, jadi tidak dibandingkan. Ia tidak boleh ditulis ganti.",
+  "figure.button.save-as-copy": "simpan sebagai salinan",
+  "figure.button.open-latest": "buka versi terkini dalam tab baharu",
+  "figure.button.overwrite-latest": "tulis ganti dengan suntingan saya",
+  "figure.text.overwrite-latest-warning": "Perubahan dalam versi terkini akan diganti oleh suntingan anda dan tidak disimpan. Tulis ganti?"
 }

package/translations/zh.json

@@ -1294,5 +1294,16 @@
   "figure.text.data-capability-fields": "{name} 能力自己读取的数据：{fields}。",
   "figure.label.data-binding-resting": "暂停",
   "figure.text.data-binding-rests": "在 {where} 中由 {name} 能力代为处理。",
-  "figure.text.data-binding-rests-targets": "在 {where} 中由 {name} 能力代为处理：{targets}"
+  "figure.text.data-binding-rests-targets": "在 {where} 中由 {name} 能力代为处理：{targets}",
+  "figure.title.save-conflict": "保存冲突",
+  "figure.text.save-conflict-desc": "此 Figure 已在别处先行保存。你的编辑仍保留在此画面中。",
+  "figure.label.conflict-changed": "不同的部件",
+  "figure.label.conflict-mine-only": "仅在你的编辑中的部件",
+  "figure.label.conflict-theirs-only": "仅在最新版本中的部件",
+  "figure.text.conflict-other-changed": "部件以外的设置（名称、输入、能力等）也不同。",
+  "figure.text.conflict-latest-unread": "无法读取最新版本，因此未能比较。无法覆盖。",
+  "figure.button.save-as-copy": "另存为副本",
+  "figure.button.open-latest": "在新标签页中打开最新版本",
+  "figure.button.overwrite-latest": "用我的编辑覆盖",
+  "figure.text.overwrite-latest-warning": "最新版本中的更改将被你的编辑替换且不会保留。要覆盖吗？"
 }