@open-mercato/core 0.6.7-develop.6862.1.c11a64ce0a → 0.6.7

package/src/modules/data_sync/lib/sync-run-service.ts

@@ -26,27 +26,6 @@ type SyncScope = {
   tenantId: string
 }
 
-/**
- * Raised when a batch commit loses the ownership compare-and-swap, meaning
- * another delivery of the same job advanced the run while this worker was
- * streaming.
- *
- * BullMQ guarantees at-least-once delivery: a job whose lock is not renewed is
- * redelivered under the SAME job id, whether the previous worker died or is only
- * blocked. No identity token can tell those apart, so ownership is enforced here
- * — on the write that matters — instead of at claim time. The loser aborts and
- * leaves the run to the worker that is still making progress.
- */
-export class SyncRunOwnershipConflictError extends Error {
-  constructor(
-    readonly runId: string,
-    readonly expectedBatchesCompleted: number,
-  ) {
-    super(`[internal] Sync run ${runId} advanced past batch ${expectedBatchesCompleted} under a concurrent worker`)
-    this.name = 'SyncRunOwnershipConflictError'
-  }
-}
-
 export function createSyncRunService(em: EntityManager) {
   async function resolveCursorRow(run: SyncRun, scope: SyncScope): Promise<SyncCursor | null> {
     return findOneWithDecryption(
@@ -171,11 +150,7 @@ export function createSyncRunService(em: EntityManager) {
             organizationId: scope.organizationId,
             tenantId: scope.tenantId,
             deletedAt: null,
-            // A BullMQ stalled-job redelivery finds the run in `running` after
-            // the previous worker was hard-killed. Treat that transition as an
-            // idempotent claim while still excluding terminal states so a
-            // cancelled or completed run cannot be revived.
-            status: { $in: ['pending', 'running'] },
+            status: 'pending',
           },
           {
             status,
@@ -203,12 +178,6 @@ export function createSyncRunService(em: EntityManager) {
       return row
     },
 
-    /**
-     * @deprecated Use {@link commitBatchProgress}, which writes counters and
-     * cursor in one transaction behind the ownership fence. This method updates
-     * counters unfenced, so two deliveries of the same job can lose each other's
-     * increments. Kept for external callers only.
-     */
     async updateCounts(
       runId: string,
       delta: Partial<Pick<SyncRun, 'createdCount' | 'updatedCount' | 'skippedCount' | 'failedCount' | 'batchesCompleted'>>,
@@ -226,11 +195,6 @@ export function createSyncRunService(em: EntityManager) {
       return row
     },
 
-    /**
-     * @deprecated Use {@link commitBatchProgress}. This method advances the
-     * cursor without the ownership fence, so a stale delivery can move the
-     * cursor of a run another worker owns. Kept for external callers only.
-     */
     async updateCursor(runId: string, cursor: string, scope: SyncScope): Promise<void> {
       const run = await this.getRun(runId, scope)
       if (!run) return
@@ -240,61 +204,16 @@ export function createSyncRunService(em: EntityManager) {
       ], { transaction: true })
     },
 
-    /**
-     * Commits one batch's counters and cursor in a single transaction.
-     *
-     * Passing `expectedBatchesCompleted` fences the write: the run must still be
-     * `running` and still sit on that batch count, or another delivery of the
-     * same BullMQ job owns the run and this commit throws
-     * `SyncRunOwnershipConflictError` and rolls back. Omitting it keeps the
-     * legacy unguarded write for callers outside the engine.
-     *
-     * The fence token is `batchesCompleted` rather than `cursor` because it
-     * advances by construction on every commit. A cursor is a free-form adapter
-     * string that an adapter may legitimately repeat between batches — the
-     * Akeneo products adapter does, between its final page and the
-     * reconciliation batch that follows it — and a repeated token fences
-     * nothing.
-     *
-     * The guard's `UPDATE` also holds the row lock for the rest of the
-     * transaction, so a competing commit blocks here and then re-reads the
-     * advanced count instead of interleaving with this one. That is what lets
-     * the counters below stay a plain read-modify-write against the snapshot
-     * read above: a commit that wins the fence has proven that nothing else
-     * landed since it read.
-     */
     async commitBatchProgress(
       runId: string,
       delta: Partial<Pick<SyncRun, 'createdCount' | 'updatedCount' | 'skippedCount' | 'failedCount' | 'batchesCompleted'>>,
       cursor: string,
       scope: SyncScope,
-      expectedBatchesCompleted?: number,
     ): Promise<SyncRun | null> {
       const run = await this.getRun(runId, scope)
       if (!run) return null
       const cursorRow = await resolveCursorRow(run, scope)
-      const claimRunOwnership = async () => {
-        if ((delta.batchesCompleted ?? 0) < 1) {
-          throw new Error(`[internal] A fenced commit for sync run ${runId} must advance batchesCompleted`)
-        }
-        const owned = await em.nativeUpdate(
-          SyncRun,
-          {
-            id: runId,
-            organizationId: scope.organizationId,
-            tenantId: scope.tenantId,
-            deletedAt: null,
-            status: 'running',
-            batchesCompleted: expectedBatchesCompleted,
-          },
-          { updatedAt: new Date() },
-        )
-        if (owned === 0) {
-          throw new SyncRunOwnershipConflictError(runId, expectedBatchesCompleted ?? 0)
-        }
-      }
       await withAtomicFlush(em, [
-        ...(expectedBatchesCompleted === undefined ? [] : [claimRunOwnership]),
         () => {
           run.createdCount += delta.createdCount ?? 0
           run.updatedCount += delta.updatedCount ?? 0

package/src/modules/data_sync/workers/sync-export.ts

@@ -2,11 +2,6 @@ import type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'
 import type { ProgressService } from '../../progress/lib/progressService'
 import type { SyncEngine } from '../lib/sync-engine'
 import type { SyncRunService } from '../lib/sync-run-service'
-import {
-  DATA_SYNC_EXPORT_QUEUE,
-  DATA_SYNC_LOCK_DURATION_MS,
-  DATA_SYNC_MAX_STALLED_COUNT,
-} from '../lib/queue-policy'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('data_sync').child({ component: 'sync-export' })
@@ -22,11 +17,9 @@ type SyncJobPayload = {
 }
 
 export const metadata: WorkerMeta = {
-  queue: DATA_SYNC_EXPORT_QUEUE,
+  queue: 'data-sync-export',
   id: 'data-sync:export',
   concurrency: 5,
-  lockDuration: DATA_SYNC_LOCK_DURATION_MS,
-  maxStalledCount: DATA_SYNC_MAX_STALLED_COUNT,
 }
 
 type HandlerContext = JobContext & {

package/src/modules/data_sync/workers/sync-import.ts

@@ -2,11 +2,6 @@ import type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'
 import type { ProgressService } from '../../progress/lib/progressService'
 import type { SyncEngine } from '../lib/sync-engine'
 import type { SyncRunService } from '../lib/sync-run-service'
-import {
-  DATA_SYNC_IMPORT_QUEUE,
-  DATA_SYNC_LOCK_DURATION_MS,
-  DATA_SYNC_MAX_STALLED_COUNT,
-} from '../lib/queue-policy'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('data_sync').child({ component: 'sync-import' })
@@ -22,11 +17,9 @@ type SyncJobPayload = {
 }
 
 export const metadata: WorkerMeta = {
-  queue: DATA_SYNC_IMPORT_QUEUE,
+  queue: 'data-sync-import',
   id: 'data-sync:import',
   concurrency: 5,
-  lockDuration: DATA_SYNC_LOCK_DURATION_MS,
-  maxStalledCount: DATA_SYNC_MAX_STALLED_COUNT,
 }
 
 type HandlerContext = JobContext & {

package/src/modules/dictionaries/api/[dictionaryId]/entries/route.ts

@@ -3,11 +3,7 @@ import { z } from 'zod'
 import { runWithCacheTenant } from '@open-mercato/cache'
 import { Dictionary, DictionaryEntry } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { resolveDictionariesRouteContext, resolveDictionaryActorId } from '@open-mercato/core/modules/dictionaries/api/context'
-import {
-  createDictionaryEntrySchema,
-  listDictionaryEntriesQuerySchema,
-  DICTIONARY_ENTRIES_MAX_LIMIT,
-} from '@open-mercato/core/modules/dictionaries/data/validators'
+import { createDictionaryEntrySchema } from '@open-mercato/core/modules/dictionaries/data/validators'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -18,7 +14,6 @@ import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/op
 import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import {
   createDictionaryEntrySchema as createEntryDocSchema,
-  dictionaryEntriesQuerySchema,
   dictionaryEntryListResponseSchema,
   dictionaryEntryResponseSchema,
   dictionaryIdParamsSchema,
@@ -50,10 +45,8 @@ function buildEntriesCacheKey(params: {
   dictionaryId: string
   organizationId: string | null
   sortMode: string
-  limit: number
-  offset: number
 }): string {
-  return `dictionaries:entries:${params.dictionaryId}:org=${params.organizationId ?? 'null'}:sort=${params.sortMode}:limit=${params.limit}:offset=${params.offset}`
+  return `dictionaries:entries:${params.dictionaryId}:org=${params.organizationId ?? 'null'}:sort=${params.sortMode}`
 }
 
 async function loadDictionary(
@@ -100,11 +93,6 @@ export async function GET(req: Request, ctx: { params?: { dictionaryId?: string
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
     const { dictionaryId } = paramsSchema.parse({ dictionaryId: ctx.params?.dictionaryId })
-    const requestUrl = new URL(req.url)
-    const { limit, offset } = listDictionaryEntriesQuerySchema.parse({
-      limit: requestUrl.searchParams.get('limit') ?? undefined,
-      offset: requestUrl.searchParams.get('offset') ?? undefined,
-    })
     const dictionary = await loadDictionary(context, dictionaryId, { allowInherited: true })
     const dictionaryTenantId = dictionary.tenantId
     const dictionaryOrgId = dictionary.organizationId ?? null
@@ -114,12 +102,9 @@ export async function GET(req: Request, ctx: { params?: { dictionaryId?: string
     // decrypted+sorted options payload. The entry writes flow through the
     // command bus (resourceKind dictionaries.entry), which already flushes the
     // matching collection tag post-commit — no new invalidation wiring needed.
-    // Only the default page is cached: keying the cache on caller-supplied
-    // pagination would let any reader mint unbounded distinct cache entries.
-    const isDefaultPage = limit === DICTIONARY_ENTRIES_MAX_LIMIT && offset === 0
-    const cache = isCrudCacheEnabled() && isDefaultPage ? resolveCrudCache(context.container) : null
+    const cache = isCrudCacheEnabled() ? resolveCrudCache(context.container) : null
     const cacheKey = cache
-      ? buildEntriesCacheKey({ dictionaryId, organizationId: dictionaryOrgId, sortMode, limit, offset })
+      ? buildEntriesCacheKey({ dictionaryId, organizationId: dictionaryOrgId, sortMode })
       : null
 
     if (cache && cacheKey) {
@@ -129,19 +114,15 @@ export async function GET(req: Request, ctx: { params?: { dictionaryId?: string
       }
     }
 
-    const entriesFilter = {
-      dictionary,
-      organizationId: dictionary.organizationId,
-      tenantId: dictionary.tenantId,
-    }
-    const total = await context.em.count(DictionaryEntry, entriesFilter)
-    // Bound the decrypt+sort work per request: page membership is decided by a
-    // stable database ordering, and the dictionary's sort mode orders the page.
     const entries = await findWithDecryption(
       context.em,
       DictionaryEntry,
-      entriesFilter,
-      { orderBy: { position: 'asc', id: 'asc' }, limit, offset },
+      {
+        dictionary,
+        organizationId: dictionary.organizationId,
+        tenantId: dictionary.tenantId,
+      },
+      {},
       { tenantId: dictionary.tenantId, organizationId: dictionary.organizationId },
     )
     const sortedEntries = sortDictionaryEntries(entries, sortMode)
@@ -158,14 +139,6 @@ export async function GET(req: Request, ctx: { params?: { dictionaryId?: string
         createdAt: entry.createdAt,
         updatedAt: entry.updatedAt,
       })),
-      total,
-      limit,
-      offset,
-      hasMore: offset + sortedEntries.length < total,
-      // Page membership comes from the database ordering, while the page itself
-      // is ordered in memory. A client assembling several pages has to re-apply
-      // the same comparator, so it needs the mode that produced this ordering.
-      sortMode,
     }
 
     if (cache && cacheKey) {
@@ -292,9 +265,8 @@ export async function POST(req: Request, ctx: { params?: { dictionaryId?: string
 
 const dictionaryEntriesGetDoc: OpenApiMethodDoc = {
   summary: 'List dictionary entries',
-  description: `Returns entries for the specified dictionary ordered by its configured entry sort mode. The number of entries returned per request is capped at ${DICTIONARY_ENTRIES_MAX_LIMIT}; use \`limit\` and \`offset\` with the \`total\`/\`hasMore\` response fields to page through larger dictionaries.`,
+  description: 'Returns entries for the specified dictionary ordered by its configured entry sort mode.',
   tags: [dictionariesTag],
-  query: dictionaryEntriesQuerySchema,
   responses: [
     { status: 200, description: 'Dictionary entries.', schema: dictionaryEntryListResponseSchema },
   ],

package/src/modules/dictionaries/api/openapi.ts

@@ -5,7 +5,6 @@ import {
   updateDictionaryEntrySchema,
   reorderDictionaryEntriesSchema,
   setDefaultDictionaryEntrySchema,
-  DICTIONARY_ENTRIES_MAX_LIMIT,
 } from '@open-mercato/core/modules/dictionaries/data/validators'
 import { dictionaryEntrySortModeSchema } from '@open-mercato/core/modules/dictionaries/lib/entrySort'
 
@@ -58,24 +57,6 @@ export const dictionaryEntrySchema = z.object({
 
 export const dictionaryEntryListResponseSchema = z.object({
   items: z.array(dictionaryEntrySchema),
-  total: z.number().int(),
-  limit: z.number().int(),
-  offset: z.number().int(),
-  hasMore: z.boolean(),
-  sortMode: dictionaryEntrySortModeSchema.describe(
-    'Sort mode that ordered this page. Clients assembling multiple pages must re-apply it across the combined set.',
-  ),
-})
-
-export const dictionaryEntriesQuerySchema = z.object({
-  limit: z.coerce
-    .number()
-    .int()
-    .positive()
-    .max(DICTIONARY_ENTRIES_MAX_LIMIT)
-    .optional()
-    .describe(`Maximum entries to return. Defaults to and is capped at ${DICTIONARY_ENTRIES_MAX_LIMIT}.`),
-  offset: z.coerce.number().int().min(0).optional().describe('Number of entries to skip. Defaults to 0.'),
 })
 
 export const dictionaryEntryResponseSchema = dictionaryEntrySchema

package/src/modules/dictionaries/components/DictionaryEntrySelect.tsx

@@ -398,7 +398,7 @@ export function DictionaryEntrySelect({
                       labels={appearanceLabels ?? DEFAULT_APPEARANCE_LABELS}
                     />
                   ) : null}
-                  {formError ? <p className="text-sm text-status-error-text">{formError}</p> : null}
+                  {formError ? <p className="text-sm text-red-600">{formError}</p> : null}
                 </div>
                 <DialogFooter>
                   <Button type="button" variant="outline" onClick={() => setDialogOpen(false)} disabled={saving}>

package/src/modules/dictionaries/components/hooks/useDictionaryEntries.ts

@@ -1,5 +1,6 @@
 "use client"
 
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { useQuery, type QueryClient, type UseQueryResult } from '@tanstack/react-query'
 import {
   createDictionaryMap,
@@ -7,7 +8,6 @@ import {
   type DictionaryDisplayEntry,
   type DictionaryMap,
 } from '../dictionaryAppearance'
-import { fetchAllDictionaryEntries } from '../../lib/fetchAllEntries'
 
 export type DictionaryEntryRecord = DictionaryDisplayEntry & {
   id: string
@@ -28,46 +28,47 @@ const BASE_DICTIONARY_ENTRIES_KEY = ['dictionaries', 'entries'] as const
 export const dictionaryEntriesQueryKey = (dictionaryId: string, scopeVersion = 0) =>
   [...BASE_DICTIONARY_ENTRIES_KEY, dictionaryId, `scope:${scopeVersion}`] as const
 
-function parseDictionaryEntryItems(items: unknown[]): DictionaryEntryRecord[] {
-  const parsed: DictionaryEntryRecord[] = []
-  for (const item of items) {
-    if (!item || typeof item !== 'object') continue
-    const data = item as Record<string, unknown>
-    const id = typeof data.id === 'string' ? data.id : ''
-    const value = typeof data.value === 'string' ? data.value.trim() : ''
-    if (!id || !value) continue
-    const label =
-      typeof data.label === 'string' && data.label.trim().length ? data.label.trim() : value
-    const color =
-      typeof data.color === 'string' && /^#([0-9a-fA-F]{6})$/.test(data.color)
-        ? `#${data.color.slice(1).toLowerCase()}`
-        : null
-    const icon = typeof data.icon === 'string' && data.icon.trim().length ? data.icon.trim() : null
-    const createdAt = typeof data.createdAt === 'string' ? data.createdAt : null
-    const updatedAt = typeof data.updatedAt === 'string' ? data.updatedAt : null
-    parsed.push({
-      id,
-      value,
-      label,
-      color,
-      icon,
-      createdAt,
-      updatedAt,
-    })
-  }
-  return parsed
-}
-
 export const dictionaryEntriesQueryOptions = (dictionaryId: string, scopeVersion = 0) => ({
   queryKey: dictionaryEntriesQueryKey(dictionaryId, scopeVersion),
   staleTime: DICTIONARY_ENTRIES_STALE_TIME,
   gcTime: DICTIONARY_ENTRIES_STALE_TIME,
   queryFn: async (): Promise<DictionaryEntriesQueryData> => {
-    const pages = await fetchAllDictionaryEntries(dictionaryId)
-    if (!pages.ok) {
-      throw new Error(pages.errorMessage ?? 'Failed to load dictionary entries.')
+    const call = await apiCall<Record<string, unknown>>(`/api/dictionaries/${dictionaryId}/entries`)
+    const payload = call.result ?? {}
+    if (!call.ok) {
+      const message =
+        typeof payload.error === 'string'
+          ? payload.error
+          : 'Failed to load dictionary entries.'
+      throw new Error(message)
+    }
+    const items = Array.isArray(payload.items) ? payload.items : []
+    const parsed: DictionaryEntryRecord[] = []
+    for (const item of items) {
+      if (!item || typeof item !== 'object') continue
+      const data = item as Record<string, unknown>
+      const id = typeof data.id === 'string' ? data.id : ''
+      const value = typeof data.value === 'string' ? data.value.trim() : ''
+      if (!id || !value) continue
+      const label =
+        typeof data.label === 'string' && data.label.trim().length ? data.label.trim() : value
+      const color =
+        typeof data.color === 'string' && /^#([0-9a-fA-F]{6})$/.test(data.color)
+          ? `#${data.color.slice(1).toLowerCase()}`
+          : null
+      const icon = typeof data.icon === 'string' && data.icon.trim().length ? data.icon.trim() : null
+      const createdAt = typeof data.createdAt === 'string' ? data.createdAt : null
+      const updatedAt = typeof data.updatedAt === 'string' ? data.updatedAt : null
+      parsed.push({
+        id,
+        value,
+        label,
+        color,
+        icon,
+        createdAt,
+        updatedAt,
+      })
     }
-    const parsed = parseDictionaryEntryItems(pages.items)
     const normalized = normalizeDictionaryEntries(
       parsed.map(({ value, label, color, icon }) => ({ value, label, color, icon })),
       { sort: false },

package/src/modules/dictionaries/data/validators.ts

@@ -26,20 +26,6 @@ export const upsertDictionarySchema = z.object({
 
 export type UpsertDictionaryInput = z.infer<typeof upsertDictionarySchema>
 
-export const DICTIONARY_ENTRIES_MAX_LIMIT = 500
-
-export const listDictionaryEntriesQuerySchema = z.object({
-  limit: z.coerce
-    .number()
-    .int()
-    .positive()
-    .max(DICTIONARY_ENTRIES_MAX_LIMIT)
-    .catch(DICTIONARY_ENTRIES_MAX_LIMIT),
-  offset: z.coerce.number().int().min(0).catch(0),
-})
-
-export type ListDictionaryEntriesQuery = z.infer<typeof listDictionaryEntriesQuerySchema>
-
 export const createDictionaryEntrySchema = z.object({
   value: z.string().trim().min(1).max(150),
   label: z.string().trim().min(1).max(150).optional(),

package/src/modules/dictionaries/lib/clientEntries.ts

@@ -1,7 +1,6 @@
 "use client"
 
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
-import { fetchAllDictionaryEntries } from './fetchAllEntries'
 
 type DictionarySummary = {
   id: string
@@ -60,8 +59,8 @@ export async function loadDictionaryEntriesByKey(key: string): Promise<Dictionar
   const dictionary = normalizeDictionaryList(dictionariesCall.result?.items).find((item) => item.key === key)
   if (!dictionary) return []
 
-  const entries = await fetchAllDictionaryEntries(dictionary.id)
-  if (!entries.ok) return []
+  const entriesCall = await apiCall<{ items?: unknown[] }>(`/api/dictionaries/${dictionary.id}/entries`)
+  if (!entriesCall.ok) return []
 
-  return normalizeDictionaryEntries(entries.items)
+  return normalizeDictionaryEntries(entriesCall.result?.items)
 }

package/src/modules/directory/api/organization-branding/route.ts

@@ -32,13 +32,11 @@ const brandingResponseSchema = z.object({
   organizationName: z.string(),
   tenantId: z.string().uuid(),
   logoUrl: z.string().nullable(),
-  logoPreserveAspectRatio: z.boolean(),
   updatedAt: z.string().nullable(),
 })
 
 const brandingUpdateSchema = z.object({
   logoUrl: organizationUpdateSchema.shape.logoUrl,
-  logoPreserveAspectRatio: organizationUpdateSchema.shape.logoPreserveAspectRatio,
 })
 
 const errorSchema = z.object({
@@ -134,7 +132,6 @@ function toResponsePayload(organization: Organization, tenantId: string) {
     organizationName: organization.name,
     tenantId,
     logoUrl: organization.logoUrl ?? null,
-    logoPreserveAspectRatio: !!organization.logoPreserveAspectRatio,
     updatedAt: toIsoOrNull(organization.updatedAt),
   }
 }
@@ -214,12 +211,7 @@ export async function PUT(req: Request) {
       operation: 'update',
       requestMethod: req.method,
       requestHeaders: req.headers,
-      mutationPayload: {
-        logoUrl: parsed.data.logoUrl ?? null,
-        ...(parsed.data.logoPreserveAspectRatio !== undefined
-          ? { logoPreserveAspectRatio: parsed.data.logoPreserveAspectRatio }
-          : {}),
-      },
+      mutationPayload: { logoUrl: parsed.data.logoUrl ?? null },
     })
     if (guardResult && !guardResult.ok) {
       return NextResponse.json(guardResult.body, { status: guardResult.status })
@@ -240,9 +232,6 @@ export async function PUT(req: Request) {
           id: resolved.organizationId,
           tenantId: resolved.tenantId,
           logoUrl: parsed.data.logoUrl ?? null,
-          ...(parsed.data.logoPreserveAspectRatio !== undefined
-            ? { logoPreserveAspectRatio: parsed.data.logoPreserveAspectRatio }
-            : {}),
         },
         ctx,
       },