@things-factory/figure-ui 10.1.79 → 10.1.82

package/client/modeller/fields.ts

@@ -14,7 +14,8 @@ export type Axis3 = 'x' | 'y' | 'z'
 const AXES: readonly Axis3[] = ['x', 'y', 'z']
 
 export type FieldGroup =
-  | { kind: 'vector'; name: 'position' | 'rotation' | 'size'; cells: Record<Axis3, FieldLike> }
+  /* A cell is missing where a rule sets that axis instead of a number: a floor part's height position (ADR-0097). */
+  | { kind: 'vector'; name: 'position' | 'rotation' | 'size'; cells: Partial<Record<Axis3, FieldLike>> }
   | { kind: 'single'; name: string; field: FieldLike }
 
 /** The name a single value goes by: its id without the part, `dimension.` and corner numbers read as words. */
@@ -24,9 +25,14 @@ function nameOf(rest: string): string {
 
 /**
  * The part's own values (`<part>.…`), or with no part the figure's (`size.x` …). Position, rotation and size come
- * first, each only when all three of its axes are there; the rest follow in the order they are declared.
+ * first, each as one row when any of its axes is there -- an axis a rule sets shows as held, not as a stray single
+ * further down; the rest follow in the order they are declared.
  */
 export function groupFields(fields: readonly FieldLike[], part?: string): { vectors: FieldGroup[]; singles: FieldGroup[] } {
+  /*
+    A part is always placed and turned, so its position and turn rows stand even when a rule sets every axis (a
+    fastened part): the screen shows the numbers the rule gives. Its size row stands only when it has a field of its own.
+  */
   const prefix = part ? `${part}.` : ''
   const own = fields.filter(f => (part ? f.id.startsWith(prefix) : !f.id.includes('.') || /^size\.[xyz]$/.test(f.id)))
   const byId = new Map(own.map(f => [f.id, f]))
@@ -34,9 +40,11 @@ export function groupFields(fields: readonly FieldLike[], part?: string): { vect
   const vectors: FieldGroup[] = []
   for (const name of ['position', 'rotation', 'size'] as const) {
     const ids = AXES.map(axis => `${prefix}${name}.${axis}`)
-    if (!ids.every(id => byId.has(id))) continue
+    if (!ids.some(id => byId.has(id)) && !(part && name !== 'size')) continue
     ids.forEach(id => used.add(id))
-    vectors.push({ kind: 'vector', name, cells: { x: byId.get(ids[0]!)!, y: byId.get(ids[1]!)!, z: byId.get(ids[2]!)! } })
+    const cells: Partial<Record<Axis3, FieldLike>> = {}
+    AXES.forEach((axis, i) => byId.has(ids[i]!) && (cells[axis] = byId.get(ids[i]!)!))
+    vectors.push({ kind: 'vector', name, cells })
   }
   const singles: FieldGroup[] = own.filter(f => !used.has(f.id)).map(field => ({ kind: 'single', name: nameOf(field.id.slice(prefix.length)), field }))
   return { vectors, singles }

package/client/modeller/figure-facts.ts

@@ -38,14 +38,14 @@ export function figureFigureFacts(source: string): FigureFigureFacts {
     name: asset.name,
     parts,
     declared: !!asset.occupancy,
-    placement: asset.occupancy?.placement as Placement | undefined,
+    placement: asset.placement as Placement | undefined,
     mounting: found ? { part: found[1], face: found[2] as FigureFace } : undefined,
     suggested: suggestedMountOf(asset, parts)
   }
 }
 
 function suggestedMountOf(asset: FigureAsset, parts: string[]): { part: string; face: FigureFace } | undefined {
-  const placement = (asset.occupancy?.placement ?? 'floor') as Placement
+  const placement = (asset.placement ?? 'floor') as Placement
   if (placement === 'center' || !parts.length) return undefined
   let boxes
   try {

package/client/modeller/figure-first-save.ts

@@ -7,12 +7,15 @@ import { CommonPopupStyles, FormFieldStyles } from '@operato/styles'
 import '@material/web/button/filled-button.js'
 import '@material/web/button/text-button.js'
 
-import { firstSaveRefusalOf, releasableType, typeOf, type FirstSave } from './first-save.js'
+import { firstSaveRefusalOf, releasableType, suggestTypeOf, typeOf, type FirstSave } from './first-save.js'
 
 /**
  * The first save of a new figure: its type and its name, asked once, in the suite's popup look.
  * Closes with the answer, or with nothing when cancelled -- then nothing is saved.
  */
+/** The shape of an identifier the modeller offers (`suggestTypeOf`'s random form). */
+const OFFERED = /^FIG_[0-9A-Z]{6}$/
+
 @customElement('figure-first-save')
 export class FigureFirstSave extends LitElement {
   static styles = [
@@ -47,16 +50,41 @@ export class FigureFirstSave extends LitElement {
   /** Type names already used in this domain. */
   @property({ attribute: false }) taken: string[] = []
   @state() private refusal: { key: string; type?: string } | null = null
+  /** The identifier offered, while the author has not changed it. */
+  @state() private suggested = ''
+
+  /*
+    Asked for a name first, with a valid identifier already there to keep or change (Q-D3). The identifier is not the
+    name: renaming does not change it, and a retried first save opens on the one answered before (the page keeps it).
+    Only an offered one found taken -- told by the server, or in the list -- is offered again; one the author typed is
+    kept as typed, and its refusal said.
+  */
+  willUpdate(changed: Map<string, unknown>) {
+    if (!(changed.has('type') || changed.has('taken'))) return
+    const offeredAndTaken = OFFERED.test(this.type) && this.taken.includes(this.type)
+    if (!this.type || offeredAndTaken) this.type = this.suggested = suggestTypeOf(this.name, this.taken)
+    else if (OFFERED.test(this.type)) this.suggested = this.type
+  }
 
   render() {
     return html`
       <div class="what">${i18next.t('figure.text.save-new-figure-desc')}</div>
       <div field>
-        <label for="type">${i18next.t('figure.label.figure-type')}</label>
+        <label for="name">${i18next.t('figure.label.name')}</label>
+        <input
+          id="name"
+          autofocus
+          .value=${this.name}
+          placeholder=${i18next.t('figure.text.figure-name-example')}
+          @input=${(e: Event) => (this.name = (e.target as HTMLInputElement).value)}
+          @keydown=${this.onKey}
+        />
+      </div>
+      <div field>
+        <label for="type">${i18next.t('figure.label.figure-identifier')}</label>
         <input
           id="type"
           type-field
-          autofocus
           .value=${this.type}
           placeholder=${i18next.t('figure.text.figure-type-example')}
           @input=${(e: Event) => {
@@ -66,17 +94,11 @@ export class FigureFirstSave extends LitElement {
           }}
           @keydown=${this.onKey}
         />
-        ${this.type && !releasableType(this.type) ? html`<div class="note">${i18next.t('figure.text.type-name-will-not-release')}</div>` : nothing}
-      </div>
-      <div field>
-        <label for="name">${i18next.t('figure.label.name')}</label>
-        <input
-          id="name"
-          .value=${this.name}
-          placeholder=${i18next.t('figure.text.figure-name-example')}
-          @input=${(e: Event) => (this.name = (e.target as HTMLInputElement).value)}
-          @keydown=${this.onKey}
-        />
+        ${this.type && !releasableType(this.type)
+          ? html`<div class="note">${i18next.t('figure.text.type-name-will-not-release')}</div>`
+          : this.suggested && this.type === this.suggested
+            ? html`<div class="note">${i18next.t('figure.text.identifier-suggested')}</div>`
+            : nothing}
       </div>
       ${this.refusal ? html`<div class="failure" role="alert">${i18next.t(this.refusal.key, { type: this.refusal.type })}</div>` : nothing}
       <ox-popup-actions>

package/client/modeller/figure-history-panel.ts

@@ -1,3 +1,6 @@
+import { openPopup } from '@operato/layout'
+import './figure-revert-choice.js'
+import type { RevertChoice } from './figure-revert-choice.js'
 import '@material/web/icon/icon.js'
 
 import { gateFindingStyles, renderGateFinding } from './gate-findings.js'
@@ -7,7 +10,10 @@ import { customElement, property, state } from 'lit/decorators.js'
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
 
-import { fetchFigureVersions, inspectFigure, releaseFigure, revertFigureVersion } from '../graphql/index.js'
+import { fetchFigureVersions, fetchReplacedDrafts, inspectFigure, releaseFigure, revertFigureVersion, undoFigureRevert } from '../graphql/index.js'
+import type { KeptDraft } from '../graphql/index.js'
+import { afterRevertAnswer, revertOutcomeUnknown, revertRequestFor } from './revert-request.js'
+import type { RevertRequest } from './revert-request.js'
 import type { FigureGateFinding, FigureInspection, FigureVersion } from '../types.js'
 import { OxPrompt } from '@operato/popup'
 
@@ -29,6 +35,10 @@ import { OxPrompt } from '@operato/popup'
  *
  * 옛 판의 정본·속성·그림이 돌아오고 이름·설명은 그대로다. 되살렸다고 그 판이 다시 발행되지는
  * 않는다 — 다시 내보내려면 발행을 한 번 더 하고, 그때 번호는 이미 쓴 다음 번호를 받는다.
+ *
+ * 덮이는 초안은 서버가 같은 트랜잭션에서 보관하고, 「되돌리기 전 초안」에 남는다(ADR-0097 §5.6, 디자이너 2026-09-27).
+ * 발행 판과 섞지 않는다. 다시 접속해도 거기서 찾고, 가장 최근 것은 「되돌리기 취소」로 되살린다 — 되돌린 뒤 모델이
+ * 바뀌었으면 서버가 거절하고 보관본은 남는다.
  */
 @customElement('figure-history-panel')
 export class FigureHistoryPanel extends localize(i18next)(LitElement) {
@@ -209,6 +219,10 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
   @property({ type: Number }) figureVersion = 0
   /** 저장하지 않은 것이 있나 — 있으면 발행을 막는다. */
   @property({ type: Boolean }) dirty = false
+  /** Saves the edits in hand before reverting; `ok` only when the save is known to have happened. */
+  @property({ attribute: false }) saveFirst?: () => Promise<{ ok: boolean; reason?: string }>
+  /** The source the server is confirmed to hold: a revert goes on only while the server still holds it. */
+  @property({ attribute: false }) serverSource?: () => string | undefined
   /**
    * 행의 타입. 판정 하나(`type-is-placeholder`)가 이것을 본다 — 자산은 타입을 원본에 적지 않아서, 타입을 바꾸면
    * 원본도 dirty 도 그대로다. 그래서 이 값이 바뀌면 판정을 다시 묻는다. 안 그러면 타입을 정한 뒤에도 「임시 타입」
@@ -217,6 +231,13 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
   @property({ type: String }) figureType?: string
 
   @state() private versions: FigureVersion[] = []
+  /** Drafts reverts kept, newest first -- apart from the released versions. */
+  @state() private kept: KeptDraft[] = []
+  /**
+   * A revert or undo whose answer never came back. Asked again, it goes with the same request id, so the server
+   * answers with what it did rather than doing it twice. Any answer -- done or refused -- lets it go.
+   */
+  private pending?: RevertRequest
   @state() private busy = false
   @state() private failure = ''
   /**
@@ -257,20 +278,29 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
   private async reload() {
     if (!this.figureId) {
       this.versions = []
+      this.kept = []
       return
     }
 
     try {
-      this.versions = await fetchFigureVersions(this.figureId)
+      ;[this.versions, this.kept] = await Promise.all([fetchFigureVersions(this.figureId), fetchReplacedDrafts(this.figureId)])
       this.failure = ''
     } catch (e) {
       this.failure = (e as Error).message
     }
   }
 
+  /** The release section in view, focus on it: where the top bar's "release" leads (ADR-0097 §5.6, Q-D2). */
+  async showRelease() {
+    await this.updateComplete
+    const section = this.renderRoot.querySelector<HTMLElement>('section[release]')
+    section?.scrollIntoView({ block: 'start', behavior: 'smooth' })
+    ;(section?.querySelector<HTMLElement>('input[note]:not([disabled]), button[release]:not([disabled])') ?? section)?.focus({ preventScroll: true })
+  }
+
   render() {
     return html`
-      <section>
+      <section release tabindex="-1">
         <h3>${i18next.t('figure.label.release')}</h3>
         ${this.figureId ? this.renderRelease() : html`<p quiet>${i18next.t('figure.text.save-the-figure-before-releasing')}</p>`}
       </section>
@@ -283,6 +313,15 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
             </ul>`
           : html`<p quiet>${i18next.t('figure.text.nothing-released-yet')}</p>`}
       </section>
+
+      ${this.kept.length
+        ? html`<section kept>
+            <h3>${i18next.t('figure.label.kept-drafts')}</h3>
+            <ul>
+              ${this.kept.map((kept, index) => this.renderKept(kept, index === 0))}
+            </ul>
+          </section>`
+        : nothing}
     `
   }
 
@@ -397,6 +436,31 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
     `
   }
 
+  /*
+    Only the newest can be taken back: an undo holds only while the figure is what that revert wrote, and a later
+    revert or undo has written something else since. The older ones stay listed -- found, not offered.
+  */
+  private renderKept(kept: KeptDraft, newest: boolean) {
+    const what =
+      kept.kind === 'undo'
+        ? i18next.t('figure.text.kept-before-undo')
+        : i18next.t('figure.text.kept-before-revert', { version: String(kept.revertedToVersion ?? '') })
+    return html`
+      <li>
+        <span no>${what}</span>
+        <span when>
+          ${kept.createdAt ? new Date(kept.createdAt).toLocaleString() : ''} ${kept.creator?.name ? ` · ${kept.creator.name}` : ''}
+          ${kept.restoredAt ? ` · ${i18next.t('figure.text.kept-restored')}` : ''}
+        </span>
+        ${newest && !kept.restoredAt
+          ? html`<button revert undo ?disabled=${this.busy} @click=${() => this.undo(kept)}>
+              ${i18next.t(kept.kind === 'undo' ? 'figure.button.redo-revert' : 'figure.button.undo-revert')}
+            </button>`
+          : nothing}
+      </li>
+    `
+  }
+
   private async release() {
     const input = this.renderRoot.querySelector('input[note]') as HTMLInputElement
     const comment = input?.value?.trim()
@@ -418,24 +482,71 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
     }
   }
 
+  /**
+   * Edits not saved yet: saved first, let go, or kept -- asked with the three (designer 2026-09-27, Q-D1). Reverting and
+   * taking a revert back both reopen the figure from the server, so edits not saved would go without a word. `true` to
+   * go on.
+   */
+  private async settleUnsaved(purpose: 'revert' | 'undo', version = 0): Promise<boolean> {
+    const choice = await openPopup<RevertChoice>(
+      html`<figure-revert-choice .version=${version} .purpose=${purpose}></figure-revert-choice>`,
+      { backdrop: true, size: 'small', title: i18next.t(purpose === 'undo' ? 'figure.button.undo-revert' : 'figure.button.revert') }
+    ).result
+    if (!choice) return false
+    if (choice === 'save') {
+      /* Saved, and known to be: a save that failed or whose outcome is not known goes no further. */
+      const saved = await this.saveFirst?.()
+      if (!saved?.ok) {
+        this.failure = i18next.t('figure.text.revert-held-unsaved', { reason: saved?.reason ?? '' })
+        return false
+      }
+    }
+    return true
+  }
+
   private async revert(version: number) {
-    /* 되돌아갈 수 없는 조작은 아니지만(판본은 남는다), 지금 화면의 것이 덮인다 — 이름으로 확인한다. */
-    const agreed = await OxPrompt.open({
-      type: 'warning',
-      title: i18next.t('figure.button.revert'),
-      text: i18next.t('figure.text.revert-to-version-confirm', { version }),
-      confirmButton: { text: i18next.t('figure.button.revert') },
-      cancelButton: { text: i18next.t('figure.button.keep-editing') }
-    })
-    if (!agreed) {
+    this.failure = ''
+    if (this.dirty) {
+      if (!(await this.settleUnsaved('revert', version))) return
+    } else {
+      /* 지금 초안은 서버가 보관하지만, 화면의 것이 그 판으로 바뀐다 — 이름으로 확인한다. */
+      const agreed = await OxPrompt.open({
+        type: 'warning',
+        title: i18next.t('figure.button.revert'),
+        text: i18next.t('figure.text.revert-to-version-confirm', { version }),
+        confirmButton: { text: i18next.t('figure.button.revert') },
+        cancelButton: { text: i18next.t('figure.button.keep-editing') }
+      })
+      if (!agreed) {
+        return
+      }
+    }
+
+    /* Read after any save above: what the server is now confirmed to hold. */
+    const expected = this.serverSource?.()
+    if (expected === undefined) {
+      this.failure = i18next.t('figure.text.revert-needs-server-source')
       return
     }
+    await this.send(`revert:${version}:${expected}`, requestId => revertFigureVersion(this.figureId!, version, requestId, expected))
+  }
 
+  private async undo(kept: KeptDraft) {
+    this.failure = ''
+    if (this.dirty && !(await this.settleUnsaved('undo'))) return
+    await this.send(`undo:${kept.id}`, requestId => undoFigureRevert(kept.id, requestId))
+  }
+
+  /** One revert or undo: a new request id, or the one whose answer was lost when the same is asked again. */
+  private async send(key: string, request: (requestId: string) => Promise<unknown>) {
+    const sent = revertRequestFor(this.pending, key)
+    this.pending = sent
     this.busy = true
     this.failure = ''
 
     try {
-      const result = await revertFigureVersion(this.figureId!, version)
+      const result = await request(sent.requestId)
+      this.pending = undefined
       this.dispatchEvent(new CustomEvent('figure-reverted', { detail: result, bubbles: true, composed: true }))
       await this.reload()
       /*
@@ -445,7 +556,15 @@ export class FigureHistoryPanel extends localize(i18next)(LitElement) {
       */
       await this.inspect()
     } catch (e) {
-      this.failure = (e as Error).message
+      const code = (e as { code?: string })?.code
+      /* Not known whether it happened: kept, so the next press asks with the same id. Anything the server said: let go. */
+      this.pending = afterRevertAnswer(sent, code)
+      if (revertOutcomeUnknown(code)) this.failure = i18next.t('figure.text.revert-unconfirmed')
+      else {
+        /* Refused: the kept list may have changed under us (another session's undo), so it is read again. */
+        await this.reload()
+        this.failure = (e as Error).message
+      }
     } finally {
       this.busy = false
     }