@open-mercato/core 0.6.4-develop.4371.1.8f3030407e → 0.6.4

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

@@ -78,12 +78,14 @@ export type DictionaryEntrySelectProps = {
   labels: DictionarySelectLabels
   manageHref?: string
   selectClassName?: string
+  seedOptions?: DictionaryOption[]
   allowInlineCreate?: boolean
   allowAppearance?: boolean
   appearanceLabels?: AppearanceSelectorLabels
   disabled?: boolean
   showLabelInput?: boolean
   showManage?: boolean
+  sortOptions?: 'label_asc' | 'none'
   /**
    * When false, hides the read-only appearance preview (color swatch + icon + hex)
    * rendered below the trigger for the currently-selected entry. Defaults to true to
@@ -102,12 +104,14 @@ export function DictionaryEntrySelect({
   labels,
   manageHref,
   selectClassName,
+  seedOptions,
   allowInlineCreate = true,
   allowAppearance = false,
   appearanceLabels,
   disabled: disabledProp = false,
   showLabelInput = true,
   showManage = true,
+  sortOptions = 'label_asc',
   showActiveAppearance = true,
 }: DictionaryEntrySelectProps) {
   const pathname = usePathname()
@@ -125,7 +129,7 @@ export function DictionaryEntrySelect({
     setLoading(true)
     try {
       const items = await fetchOptions()
-      setOptions(items.sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: 'base' })))
+      setOptions(sortOptions === 'none' ? items : items.slice().sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: 'base' })))
     } catch (err) {
       console.error('DictionaryEntrySelect.fetchOptions failed', err)
       flash(labels.errorLoad, 'error')
@@ -133,7 +137,7 @@ export function DictionaryEntrySelect({
     } finally {
       setLoading(false)
     }
-  }, [fetchOptions, labels.errorLoad])
+  }, [fetchOptions, labels.errorLoad, sortOptions])
 
   React.useEffect(() => {
     loadOptions().catch(() => {})
@@ -152,10 +156,39 @@ export function DictionaryEntrySelect({
     if (!dialogOpen) resetDialogState()
   }, [dialogOpen, resetDialogState])
 
+  const mergedOptions = React.useMemo(() => {
+    if (!Array.isArray(seedOptions) || !seedOptions.length) return options
+    const merged: DictionaryOption[] = []
+    const seen = new Set<string>()
+    for (const option of seedOptions) {
+      if (!option.value || seen.has(option.value)) continue
+      seen.add(option.value)
+      merged.push(option)
+    }
+    for (const option of options) {
+      if (seen.has(option.value)) continue
+      seen.add(option.value)
+      merged.push(option)
+    }
+    return merged
+  }, [options, seedOptions])
+
   const activeOption = React.useMemo(
-    () => options.find((option) => option.value === value) ?? null,
-    [options, value],
+    () => mergedOptions.find((option) => option.value === value) ?? null,
+    [mergedOptions, value],
   )
+  const displayOptions = React.useMemo(() => {
+    if (!value || activeOption) return mergedOptions
+    return [
+      {
+        value,
+        label: value,
+        color: null,
+        icon: null,
+      },
+      ...mergedOptions,
+    ]
+  }, [activeOption, mergedOptions, value])
 
   const handleCreate = React.useCallback(async () => {
     if (!createOption) return
@@ -181,7 +214,10 @@ export function DictionaryEntrySelect({
           color: payload.color ?? null,
           icon: payload.icon ?? null,
         })
-        return Array.from(map.values()).sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: 'base' }))
+        const nextOptions = Array.from(map.values())
+        return sortOptions === 'none'
+          ? nextOptions
+          : nextOptions.sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: 'base' }))
       })
       await loadOptions()
       onChange(payload.value)
@@ -207,6 +243,7 @@ export function DictionaryEntrySelect({
     newLabel,
     newValue,
     onChange,
+    sortOptions,
   ])
 
   const handleDialogKeyDown = React.useCallback(
@@ -247,13 +284,21 @@ export function DictionaryEntrySelect({
     () => buildHrefWithReturnTo(manageLink, returnTo),
     [manageLink, returnTo],
   )
+  const optionsKey = React.useMemo(
+    () => displayOptions.map((option) => `${option.value}:${option.label}`).join('\0'),
+    [displayOptions],
+  )
 
   return (
     <div className="space-y-2">
       <div className="flex items-center gap-2">
         <Select
-          value={value || undefined}
-          onValueChange={(next) => onChange(next || undefined)}
+          key={`dictionary-entry:${value ?? ''}:${optionsKey}`}
+          value={value ?? ''}
+          onValueChange={(next) => {
+            if (!next) return
+            onChange(next)
+          }}
           disabled={disabled}
         >
           <SelectTrigger
@@ -261,10 +306,12 @@ export function DictionaryEntrySelect({
             className={selectClassName}
             title={activeOption?.label ?? undefined}
           >
-            <SelectValue placeholder={labels.placeholder} />
+            <SelectValue placeholder={labels.placeholder}>
+              {activeOption?.label}
+            </SelectValue>
           </SelectTrigger>
           <SelectContent>
-            {options.map((option) => (
+            {displayOptions.map((option) => (
               <SelectItem key={option.value} value={option.value}>
                 {option.label}
               </SelectItem>

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

@@ -19,6 +19,7 @@ type DictionarySelectControlProps = {
   selectClassName?: string
   disabled?: boolean
   priorityValues?: string[]
+  seedOptions?: Array<{ value: string; label: string; color?: string | null; icon?: string | null }>
 }
 
 export function DictionarySelectControl({
@@ -29,6 +30,7 @@ export function DictionarySelectControl({
   selectClassName,
   disabled = false,
   priorityValues,
+  seedOptions,
 }: DictionarySelectControlProps) {
   const t = useT()
   const queryClient = useQueryClient()
@@ -191,6 +193,13 @@ export function DictionarySelectControl({
       allowAppearance
       allowInlineCreate={effectiveAllowInlineCreate}
       selectClassName={selectClassName}
+      seedOptions={seedOptions?.map((option) => ({
+        value: option.value,
+        label: option.label,
+        color: option.color ?? null,
+        icon: option.icon ?? null,
+      }))}
+      sortOptions="none"
       disabled={disabled}
       manageHref="/backend/config/dictionaries"
     />

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

@@ -451,7 +451,10 @@ export function renderDictionaryColor(color: string | null | undefined, classNam
   )
 }
 
-export function normalizeDictionaryEntries(items: unknown): DictionaryDisplayEntry[] {
+export function normalizeDictionaryEntries(
+  items: unknown,
+  options: { sort?: boolean } = {},
+): DictionaryDisplayEntry[] {
   if (!Array.isArray(items)) return []
   const entries: DictionaryDisplayEntry[] = []
   for (const item of items) {
@@ -468,6 +471,7 @@ export function normalizeDictionaryEntries(items: unknown): DictionaryDisplayEnt
     const icon = typeof candidate.icon === 'string' && candidate.icon.trim().length ? candidate.icon.trim() : null
     entries.push({ value: rawValue, label, color, icon })
   }
+  if (options.sort === false) return entries
   return entries.sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: 'base' }))
 }
 

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

@@ -71,6 +71,7 @@ export const dictionaryEntriesQueryOptions = (dictionaryId: string, scopeVersion
     }
     const normalized = normalizeDictionaryEntries(
       parsed.map(({ value, label, color, icon }) => ({ value, label, color, icon })),
+      { sort: false },
     )
     return {
       entries: normalized,

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

@@ -1,11 +1,14 @@
 import { Entity, Index, ManyToOne, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 import { OptionalProps } from '@mikro-orm/core'
+import type { DictionaryEntrySortMode } from '../lib/entrySort'
 
 export type DictionaryManagerVisibility = 'default' | 'hidden'
 
 @Entity({ tableName: 'dictionaries' })
 @Unique({ name: 'dictionaries_scope_key_unique', properties: ['organizationId', 'tenantId', 'key'] })
 export class Dictionary {
+  [OptionalProps]?: 'entrySortMode'
+
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
 
@@ -33,6 +36,9 @@ export class Dictionary {
   @Property({ name: 'manager_visibility', type: 'text', default: 'default' })
   managerVisibility: DictionaryManagerVisibility = 'default'
 
+  @Property({ name: 'entry_sort_mode', type: 'text', default: 'label_asc' })
+  entrySortMode: DictionaryEntrySortMode = 'label_asc'
+
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()
 

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

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { dictionaryEntrySortModeSchema } from '../lib/entrySort'
 
 export const dictionaryKeySchema = z
   .string()
@@ -20,6 +21,7 @@ export const upsertDictionarySchema = z.object({
   description: z.string().trim().max(2000).optional(),
   isSystem: z.boolean().optional(),
   isActive: z.boolean().optional(),
+  entrySortMode: dictionaryEntrySortModeSchema.optional(),
 })
 
 export type UpsertDictionaryInput = z.infer<typeof upsertDictionarySchema>

package/src/modules/dictionaries/fields/dictionary.tsx

@@ -50,7 +50,7 @@ function DictionaryDefaultSelector({
         {t('dictionaries.customFields.defaultValue', 'Default value')}
       </label>
       <Select
-        value={defaultValue || undefined}
+        value={defaultValue ?? ''}
         onValueChange={(next) => onChange(next ?? '')}
       >
         <SelectTrigger size="sm">
@@ -137,7 +137,7 @@ function DictionaryFieldDefEditor({ def, onChange }: { def: { configJson?: Dicti
           {t('dictionaries.customFields.dictionaryLabel', 'Dictionary source')}
         </label>
         <Select
-          value={selectedId || undefined}
+          value={selectedId ?? ''}
           onValueChange={(next) => onChange({ dictionaryId: next || undefined })}
         >
           <SelectTrigger size="sm">

package/src/modules/dictionaries/i18n/de.json

@@ -5,6 +5,8 @@
   "dictionaries.config.dialog.descriptionLabel": "Beschreibung",
   "dictionaries.config.dialog.descriptionPlaceholder": "Erklären Sie, wie dieses Wörterbuch verwendet wird (optional).",
   "dictionaries.config.dialog.editTitle": "Wörterbuch bearbeiten",
+  "dictionaries.config.dialog.entrySortModeHelp": "Steuert die Reihenfolge, die Wörterbuch-APIs und Dropdowns zurückgeben.",
+  "dictionaries.config.dialog.entrySortModeLabel": "Sortierung der Einträge",
   "dictionaries.config.dialog.keyErrorLength": "Der Schlüssel darf höchstens 100 Zeichen haben.",
   "dictionaries.config.dialog.keyErrorPattern": "Verwenden Sie Kleinbuchstaben, Zahlen, Bindestrich oder Unterstrich.",
   "dictionaries.config.dialog.keyErrorRequired": "Schlüssel ist erforderlich.",
@@ -68,6 +70,12 @@
   "dictionaries.config.list.loading": "Wörterbücher werden geladen…",
   "dictionaries.config.list.title": "Wörterbücher",
   "dictionaries.config.nav.title": "Wörterbücher",
+  "dictionaries.config.sortModes.createdAtAsc": "Älteste zuerst",
+  "dictionaries.config.sortModes.createdAtDesc": "Neueste zuerst",
+  "dictionaries.config.sortModes.labelAsc": "A bis Z",
+  "dictionaries.config.sortModes.labelDesc": "Z bis A",
+  "dictionaries.config.sortModes.valueAsc": "Wert A bis Z",
+  "dictionaries.config.sortModes.valueDesc": "Wert Z bis A",
   "dictionaries.config.success.create": "Wörterbuch erstellt.",
   "dictionaries.config.success.delete": "Wörterbuch gelöscht.",
   "dictionaries.config.success.update": "Wörterbuch aktualisiert.",
@@ -101,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Wörterbucheintrag nicht gefunden",
   "dictionaries.errors.entry_required": "Wert ist erforderlich",
   "dictionaries.errors.entry_update_failed": "Wörterbucheintrag konnte nicht aktualisiert werden.",
+  "dictionaries.errors.invalid_key": "Verwenden Sie Kleinbuchstaben, Zahlen, Bindestrich oder Unterstrich.",
   "dictionaries.errors.not_found": "Wörterbuch nicht gefunden",
   "dictionaries.errors.organization_required": "Organisationskontext ist erforderlich",
   "dictionaries.errors.unauthorized": "Nicht autorisiert",

package/src/modules/dictionaries/i18n/en.json

@@ -5,6 +5,8 @@
   "dictionaries.config.dialog.descriptionLabel": "Description",
   "dictionaries.config.dialog.descriptionPlaceholder": "Explain how this dictionary is used (optional).",
   "dictionaries.config.dialog.editTitle": "Edit dictionary",
+  "dictionaries.config.dialog.entrySortModeHelp": "Controls the order returned by dictionary entry APIs and dropdowns.",
+  "dictionaries.config.dialog.entrySortModeLabel": "Entry sort order",
   "dictionaries.config.dialog.keyErrorLength": "Key must be at most 100 characters long.",
   "dictionaries.config.dialog.keyErrorPattern": "Use lowercase letters, numbers, hyphen, or underscore.",
   "dictionaries.config.dialog.keyErrorRequired": "Key is required.",
@@ -68,6 +70,12 @@
   "dictionaries.config.list.loading": "Loading dictionaries…",
   "dictionaries.config.list.title": "Dictionaries",
   "dictionaries.config.nav.title": "Dictionaries",
+  "dictionaries.config.sortModes.createdAtAsc": "Oldest first",
+  "dictionaries.config.sortModes.createdAtDesc": "Newest first",
+  "dictionaries.config.sortModes.labelAsc": "A to Z",
+  "dictionaries.config.sortModes.labelDesc": "Z to A",
+  "dictionaries.config.sortModes.valueAsc": "Value A to Z",
+  "dictionaries.config.sortModes.valueDesc": "Value Z to A",
   "dictionaries.config.success.create": "Dictionary created.",
   "dictionaries.config.success.delete": "Dictionary deleted.",
   "dictionaries.config.success.update": "Dictionary updated.",
@@ -101,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Dictionary entry not found",
   "dictionaries.errors.entry_required": "Value is required",
   "dictionaries.errors.entry_update_failed": "Failed to update dictionary entry.",
+  "dictionaries.errors.invalid_key": "Use lowercase letters, numbers, hyphen, or underscore.",
   "dictionaries.errors.not_found": "Dictionary not found",
   "dictionaries.errors.organization_required": "Organization context is required",
   "dictionaries.errors.unauthorized": "Unauthorized",

package/src/modules/dictionaries/i18n/es.json

@@ -5,6 +5,8 @@
   "dictionaries.config.dialog.descriptionLabel": "Descripción",
   "dictionaries.config.dialog.descriptionPlaceholder": "Explica cómo se usa este diccionario (opcional).",
   "dictionaries.config.dialog.editTitle": "Editar diccionario",
+  "dictionaries.config.dialog.entrySortModeHelp": "Controla el orden devuelto por las API de entradas del diccionario y los desplegables.",
+  "dictionaries.config.dialog.entrySortModeLabel": "Orden de entradas",
   "dictionaries.config.dialog.keyErrorLength": "La clave debe tener como máximo 100 caracteres.",
   "dictionaries.config.dialog.keyErrorPattern": "Usa letras minúsculas, números, guion o guion bajo.",
   "dictionaries.config.dialog.keyErrorRequired": "La clave es obligatoria.",
@@ -68,6 +70,12 @@
   "dictionaries.config.list.loading": "Cargando diccionarios…",
   "dictionaries.config.list.title": "Diccionarios",
   "dictionaries.config.nav.title": "Diccionarios",
+  "dictionaries.config.sortModes.createdAtAsc": "Más antiguos primero",
+  "dictionaries.config.sortModes.createdAtDesc": "Más recientes primero",
+  "dictionaries.config.sortModes.labelAsc": "A a Z",
+  "dictionaries.config.sortModes.labelDesc": "Z a A",
+  "dictionaries.config.sortModes.valueAsc": "Valor A a Z",
+  "dictionaries.config.sortModes.valueDesc": "Valor Z a A",
   "dictionaries.config.success.create": "Diccionario creado.",
   "dictionaries.config.success.delete": "Diccionario eliminado.",
   "dictionaries.config.success.update": "Diccionario actualizado.",
@@ -101,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Entrada de diccionario no encontrada",
   "dictionaries.errors.entry_required": "El valor es obligatorio",
   "dictionaries.errors.entry_update_failed": "Error al actualizar la entrada de diccionario.",
+  "dictionaries.errors.invalid_key": "Usa letras minúsculas, números, guion o guion bajo.",
   "dictionaries.errors.not_found": "Diccionario no encontrado",
   "dictionaries.errors.organization_required": "Se requiere un contexto de organización",
   "dictionaries.errors.unauthorized": "No autorizado",

package/src/modules/dictionaries/i18n/pl.json

@@ -5,6 +5,8 @@
   "dictionaries.config.dialog.descriptionLabel": "Opis",
   "dictionaries.config.dialog.descriptionPlaceholder": "Opisz, do czego służy ten słownik (opcjonalnie).",
   "dictionaries.config.dialog.editTitle": "Edytuj słownik",
+  "dictionaries.config.dialog.entrySortModeHelp": "Określa kolejność zwracaną przez API wpisów słownika i listy wyboru.",
+  "dictionaries.config.dialog.entrySortModeLabel": "Kolejność wpisów",
   "dictionaries.config.dialog.keyErrorLength": "Klucz może mieć maksymalnie 100 znaków.",
   "dictionaries.config.dialog.keyErrorPattern": "Używaj małych liter, cyfr, myślnika lub podkreślenia.",
   "dictionaries.config.dialog.keyErrorRequired": "Klucz jest wymagany.",
@@ -68,6 +70,12 @@
   "dictionaries.config.list.loading": "Ładowanie słowników…",
   "dictionaries.config.list.title": "Słowniki",
   "dictionaries.config.nav.title": "Słowniki",
+  "dictionaries.config.sortModes.createdAtAsc": "Najstarsze najpierw",
+  "dictionaries.config.sortModes.createdAtDesc": "Najnowsze najpierw",
+  "dictionaries.config.sortModes.labelAsc": "A do Z",
+  "dictionaries.config.sortModes.labelDesc": "Z do A",
+  "dictionaries.config.sortModes.valueAsc": "Wartość A do Z",
+  "dictionaries.config.sortModes.valueDesc": "Wartość Z do A",
   "dictionaries.config.success.create": "Słownik został utworzony.",
   "dictionaries.config.success.delete": "Słownik został usunięty.",
   "dictionaries.config.success.update": "Słownik został zaktualizowany.",
@@ -101,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Nie znaleziono wpisu słownika",
   "dictionaries.errors.entry_required": "Wartość jest wymagana",
   "dictionaries.errors.entry_update_failed": "Nie udało się zaktualizować wpisu słownikowego.",
+  "dictionaries.errors.invalid_key": "Użyj małych liter, cyfr, łącznika lub podkreślenia.",
   "dictionaries.errors.not_found": "Nie znaleziono słownika",
   "dictionaries.errors.organization_required": "Wymagany jest kontekst organizacji",
   "dictionaries.errors.unauthorized": "Brak autoryzacji",

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

@@ -0,0 +1,73 @@
+import { z } from 'zod'
+
+export const dictionaryEntrySortModes = [
+  'label_asc',
+  'label_desc',
+  'value_asc',
+  'value_desc',
+  'created_at_asc',
+  'created_at_desc',
+] as const
+
+export const dictionaryEntrySortModeSchema = z.enum(dictionaryEntrySortModes)
+
+export type DictionaryEntrySortMode = z.infer<typeof dictionaryEntrySortModeSchema>
+
+export const DEFAULT_DICTIONARY_ENTRY_SORT_MODE: DictionaryEntrySortMode = 'label_asc'
+
+export type DictionaryEntrySortItem = {
+  id?: string | null
+  value?: string | null
+  label?: string | null
+  createdAt?: Date | string | number | null
+}
+
+export function resolveDictionaryEntrySortMode(value: unknown): DictionaryEntrySortMode {
+  const parsed = dictionaryEntrySortModeSchema.safeParse(value)
+  return parsed.success ? parsed.data : DEFAULT_DICTIONARY_ENTRY_SORT_MODE
+}
+
+function compareText(left: unknown, right: unknown): number {
+  const leftText = typeof left === 'string' ? left : ''
+  const rightText = typeof right === 'string' ? right : ''
+  return leftText.localeCompare(rightText, undefined, { sensitivity: 'base' })
+}
+
+function timestamp(value: DictionaryEntrySortItem['createdAt']): number {
+  if (value instanceof Date) return value.getTime()
+  if (typeof value === 'number') return Number.isFinite(value) ? value : 0
+  if (typeof value === 'string') {
+    const parsed = Date.parse(value)
+    return Number.isFinite(parsed) ? parsed : 0
+  }
+  return 0
+}
+
+function compareByMode(left: DictionaryEntrySortItem, right: DictionaryEntrySortItem, mode: DictionaryEntrySortMode): number {
+  switch (mode) {
+    case 'label_desc':
+      return compareText(right.label ?? right.value, left.label ?? left.value)
+    case 'value_asc':
+      return compareText(left.value, right.value)
+    case 'value_desc':
+      return compareText(right.value, left.value)
+    case 'created_at_asc':
+      return timestamp(left.createdAt) - timestamp(right.createdAt)
+    case 'created_at_desc':
+      return timestamp(right.createdAt) - timestamp(left.createdAt)
+    case 'label_asc':
+    default:
+      return compareText(left.label ?? left.value, right.label ?? right.value)
+  }
+}
+
+export function sortDictionaryEntries<T extends DictionaryEntrySortItem>(
+  entries: T[],
+  mode: DictionaryEntrySortMode = DEFAULT_DICTIONARY_ENTRY_SORT_MODE,
+): T[] {
+  return entries.slice().sort((left, right) => {
+    const primary = compareByMode(left, right, mode)
+    if (primary !== 0) return primary
+    return compareText(left.id, right.id)
+  })
+}