@open-mercato/ui 0.6.7-develop.6834.1.e76f4b8cbc → 0.6.7-develop.6851.1.c1680b00d8

package/src/backend/utils/__tests__/apiCall.test.ts

@@ -107,3 +107,64 @@ describe('readApiResultOrThrow', () => {
     expect(result).toBeNull()
   })
 })
+
+describe('aborted requests', () => {
+  beforeEach(() => {
+    jest.resetAllMocks()
+  })
+
+  function createAbortedBodyResponse(): Response {
+    const abortError = new Error('The operation was aborted.')
+    abortError.name = 'AbortError'
+    const response = {
+      ok: true,
+      status: 200,
+      headers: new Map<string, string>(),
+      text: jest.fn(async () => { throw abortError }),
+      clone: () => response,
+    } as unknown as Response
+    return response
+  }
+
+  it('rejects with AbortError instead of reporting an empty payload', async () => {
+    ;(apiFetch as jest.Mock).mockResolvedValue(createAbortedBodyResponse())
+    const controller = new AbortController()
+    controller.abort()
+
+    await expect(
+      readApiResultOrThrow('/api/interactions', { signal: controller.signal }),
+    ).rejects.toMatchObject({ name: 'AbortError' })
+  })
+
+  it('does not mask a genuinely empty payload when the request was not aborted', async () => {
+    ;(apiFetch as jest.Mock).mockResolvedValue(createMockResponse('', { status: 200 }))
+    const controller = new AbortController()
+
+    await expect(
+      readApiResultOrThrow('/api/interactions', { signal: controller.signal }),
+    ).rejects.toThrow('Missing response payload (200)')
+  })
+
+  it('keeps the caller-provided fallback when one is configured', async () => {
+    ;(apiFetch as jest.Mock).mockResolvedValue(createAbortedBodyResponse())
+    const controller = new AbortController()
+    controller.abort()
+
+    const call = await apiCall<{ items: string[] }>(
+      '/api/interactions',
+      { signal: controller.signal },
+      { fallback: { items: [] } },
+    )
+    expect(call.result).toEqual({ items: [] })
+  })
+
+  it('propagates AbortError raised by a custom parser', async () => {
+    ;(apiFetch as jest.Mock).mockResolvedValue(createMockResponse('{}', { status: 200 }))
+    const abortError = new Error('The operation was aborted.')
+    abortError.name = 'AbortError'
+
+    await expect(
+      apiCall('/api/interactions', undefined, { parse: async () => { throw abortError } }),
+    ).rejects.toMatchObject({ name: 'AbortError' })
+  })
+})

package/src/backend/utils/apiCall.ts

@@ -19,6 +19,27 @@ export type ApiCallResult<TReturn> = {
 
 const scopedRequestHeaders = createScopedHeaderStack()
 
+function isAbortError(error: unknown): boolean {
+  return typeof error === 'object'
+    && error !== null
+    && (error as { name?: unknown }).name === 'AbortError'
+}
+
+function createAbortError(): Error {
+  if (typeof DOMException === 'function') {
+    return new DOMException('[internal] The operation was aborted.', 'AbortError')
+  }
+  const error = new Error('[internal] The operation was aborted.')
+  error.name = 'AbortError'
+  return error
+}
+
+function resolveAbortSignal(input: RequestInfo | URL, init?: RequestInit): AbortSignal | null {
+  if (init?.signal) return init.signal
+  if (typeof Request !== 'undefined' && input instanceof Request) return input.signal ?? null
+  return null
+}
+
 function mergeHeaders(base: HeadersInit | undefined, extra: Record<string, string>): HeadersInit {
   if (!base) return extra
   if (typeof Headers !== 'undefined' && base instanceof Headers) {
@@ -63,9 +84,16 @@ export async function apiCall<TReturn = Record<string, unknown>>(
       : response
     if (parser) result = await parser(source)
     else result = await readJsonSafe<TReturn>(source, fallback)
-  } catch {
+  } catch (err) {
+    if (isAbortError(err)) throw err
     result = fallback
   }
+  // `readJsonSafe` swallows the abort that cancels an in-flight body read, so a
+  // request aborted after its response headers arrived would otherwise look like
+  // a successful call that returned an empty payload.
+  if (result == null && resolveAbortSignal(input, init)?.aborted) {
+    throw createAbortError()
+  }
   return {
     ok: response.ok,
     status: response.status,

package/src/backend/utils/customFieldDefs.ts

@@ -39,6 +39,7 @@ export type CustomFieldDefDto = {
   dictionaryId?: string
   dictionaryInlineCreate?: boolean
   defaultValue?: string | number | boolean | null
+  relatedEntityId?: string
 }
 
 export type CustomFieldsetGroupDto = {

package/src/frontend/LanguageSwitcher.tsx

@@ -24,6 +24,7 @@ export function LanguageSwitcher() {
     pl: t('common.languages.polish', 'Polski'),
     es: t('common.languages.spanish', 'Español'),
     de: t('common.languages.german', 'Deutsch'),
+    ko: t('common.languages.korean', '한국어'),
   }
 
   async function setLocale(locale: Locale) {