From ac5eb53617ff2576f9be246ef41dea800a40a2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B8=D0=BC=D0=B8=D0=BD?= <zimin.an@nstart.space>
Date: Mon, 22 Jun 2026 09:39:16 +0000
Subject: [PATCH] =?UTF-8?q?fix(ui):=20edit-=D1=84=D0=BE=D1=80=D0=BC=D0=B0?=
 =?UTF-8?q?=20=D1=83=D0=B2=D0=B0=D0=B6=D0=B0=D0=B5=D1=82=20as-of=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BC=D0=BB=D0=B0=D0=B9=D0=BD=D0=B0=20(=D0=BD?=
 =?UTF-8?q?=D0=B5=20now)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ordinis-admin-ui/src/api/queries.ts            | 18 +++++++++++++++---
 .../src/routes/dictionaries.$name.tsx          |  5 ++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ordinis-admin-ui/src/api/queries.ts b/ordinis-admin-ui/src/api/queries.ts
index 4b92000..4d1cb09 100644
--- a/ordinis-admin-ui/src/api/queries.ts
+++ b/ordinis-admin-ui/src/api/queries.ts
@@ -316,12 +316,23 @@ export const mySchemaDraftsQuery = (page = 0, size = 50) =>
 export const useMySchemaDrafts = (page = 0, size = 50) =>
   useQuery(mySchemaDraftsQuery(page, size))
 
-export const recordRawQuery = (dictionaryName: string, businessKey: string) =>
+export const recordRawQuery = (
+  dictionaryName: string,
+  businessKey: string,
+  at?: string,
+) =>
   queryOptions({
-    queryKey: ['record-raw', dictionaryName, businessKey] as const,
+    // at в queryKey — иначе time-travel snapshot закешируется под тем же ключом
+    // что и now-версия, и при смене as-of вернётся stale.
+    queryKey: ['record-raw', dictionaryName, businessKey, at ?? null] as const,
     queryFn: async (): Promise<RecordResponse> => {
       const { data } = await apiClient.get<RecordResponse>(
         `/dictionaries/${dictionaryName}/records/${encodeURIComponent(businessKey)}`,
+        // at пробрасываем в backend (GET принимает ?at=) — резолв активной
+        // версии на момент таймлайна, а не на now. Без этого открытие записи
+        // в time-travel режиме бьёт now → RECORD_NOT_ACTIVE для записей,
+        // закрытых между as-of и now.
+        at ? { params: { at } } : undefined,
       )
       return data
     },
@@ -948,9 +959,10 @@ export const useAiFeatureAvailable = () => useQuery(aiFeatureAvailableQuery)
 export const useRecordRaw = (
   dictionaryName: string,
   businessKey: string | undefined,
+  at?: string,
 ) =>
   useQuery({
-    ...recordRawQuery(dictionaryName, businessKey ?? ''),
+    ...recordRawQuery(dictionaryName, businessKey ?? '', at),
     enabled: Boolean(businessKey),
   })
 
diff --git a/ordinis-admin-ui/src/routes/dictionaries.$name.tsx b/ordinis-admin-ui/src/routes/dictionaries.$name.tsx
index 2198937..b4eb68a 100644
--- a/ordinis-admin-ui/src/routes/dictionaries.$name.tsx
+++ b/ordinis-admin-ui/src/routes/dictionaries.$name.tsx
@@ -659,7 +659,10 @@ function DictionaryDetail() {
   }, [extraColumns, t])
 
   const editingKey = edit.kind === 'edit' ? edit.record.businessKey : undefined
-  const rawRecordQuery = useRecordRaw(name, editingKey)
+  // timeTravelAt пробрасываем: в time-travel режиме edit-форма должна
+  // резолвить запись на момент таймлайна, а не на now (иначе закрытая между
+  // as-of и now запись → RECORD_NOT_ACTIVE).
+  const rawRecordQuery = useRecordRaw(name, editingKey, timeTravelAt)
 
   const handleSubmit = (req: CreateRecordRequest) => {
     // Fill validFrom at submit (review #5): defaultValues в RHF берётся