@open-mercato/core 0.5.1-develop.2663.2c29774b5b → 0.5.1-develop.2681.c559bb2bc3

package/src/modules/dictionaries/commands/factory.ts

@@ -34,6 +34,8 @@ export type DictionaryEntrySnapshot = {
   icon: string | null
   createdAt: string
   updatedAt: string
+  position?: number
+  isDefault?: boolean
 }
 
 export type DictionaryEntryUndoPayload = {
@@ -41,7 +43,7 @@ export type DictionaryEntryUndoPayload = {
   after?: DictionaryEntrySnapshot | null
 }
 
-const ENTRY_CHANGE_KEYS = ['value', 'label', 'color', 'icon'] as const
+const ENTRY_CHANGE_KEYS = ['value', 'label', 'color', 'icon', 'position', 'isDefault'] as const
 
 type ResolveDictionaryForCreate<TCreate> = (options: {
   em: EntityManager
@@ -102,6 +104,8 @@ async function loadSnapshot(em: EntityManager, id: string): Promise<DictionaryEn
     label: entry.label,
     color: entry.color ?? null,
     icon: entry.icon ?? null,
+    position: entry.position ?? 0,
+    isDefault: entry.isDefault ?? false,
     createdAt:
       entry.createdAt instanceof Date
         ? entry.createdAt.toISOString()
@@ -119,6 +123,8 @@ function applySnapshot(entry: DictionaryEntry, snapshot: DictionaryEntrySnapshot
   entry.label = snapshot.label
   entry.color = snapshot.color ?? null
   entry.icon = snapshot.icon ?? null
+  if (snapshot.position !== undefined) entry.position = snapshot.position
+  if (snapshot.isDefault !== undefined) entry.isDefault = snapshot.isDefault
   entry.organizationId = snapshot.organizationId
   entry.tenantId = snapshot.tenantId
   entry.createdAt = new Date(snapshot.createdAt)
@@ -145,6 +151,7 @@ function sanitizeCreatePayload(input: any): {
   label: string
   color: string | null
   icon: string | null
+  position: number | undefined
 } {
   const rawValue = typeof input?.value === 'string' ? input.value.trim() : ''
   if (!rawValue) {
@@ -155,7 +162,8 @@ function sanitizeCreatePayload(input: any): {
   const label = rawLabel || rawValue
   const color = sanitizeDictionaryColor(input?.color ?? null)
   const icon = sanitizeDictionaryIcon(input?.icon ?? null)
-  return { value: rawValue, normalized, label, color, icon }
+  const position = typeof input?.position === 'number' ? input.position : undefined
+  return { value: rawValue, normalized, label, color, icon, position }
 }
 
 function sanitizeUpdatePayload(input: any): {
@@ -164,6 +172,8 @@ function sanitizeUpdatePayload(input: any): {
   label?: string
   color?: string | null
   icon?: string | null
+  position?: number
+  isDefault?: boolean
 } {
   const payload: {
     value?: string
@@ -171,6 +181,8 @@ function sanitizeUpdatePayload(input: any): {
     label?: string
     color?: string | null
     icon?: string | null
+    position?: number
+    isDefault?: boolean
   } = {}
   if (Object.prototype.hasOwnProperty.call(input, 'value')) {
     const rawValue = typeof input?.value === 'string' ? input.value.trim() : ''
@@ -190,6 +202,15 @@ function sanitizeUpdatePayload(input: any): {
   if (Object.prototype.hasOwnProperty.call(input, 'icon')) {
     payload.icon = sanitizeDictionaryIcon(input?.icon ?? null)
   }
+  if (Object.prototype.hasOwnProperty.call(input, 'position')) {
+    const rawPosition = typeof input?.position === 'number' ? input.position : undefined
+    if (rawPosition !== undefined) {
+      payload.position = rawPosition
+    }
+  }
+  if (Object.prototype.hasOwnProperty.call(input, 'isDefault')) {
+    payload.isDefault = typeof input?.isDefault === 'boolean' ? input.isDefault : undefined
+  }
   return payload
 }
 
@@ -216,7 +237,7 @@ export function registerDictionaryEntryCommands<TCreate, TUpdate>(
       const { dictionary, scope } = await config.resolveDictionaryForCreate({ em, ctx, parsed })
       scopeEnsurer(ctx, scope)
 
-      const { value, normalized, label, color, icon } = sanitizeCreatePayload(parsed)
+      const { value, normalized, label, color, icon, position } = sanitizeCreatePayload(parsed)
       const duplicate = await em.findOne(DictionaryEntry, {
         dictionary,
         tenantId: scope.tenantId,
@@ -236,6 +257,7 @@ export function registerDictionaryEntryCommands<TCreate, TUpdate>(
         label,
         color,
         icon,
+        ...(position !== undefined ? { position } : {}),
         createdAt: new Date(),
         updatedAt: new Date(),
       })
@@ -331,6 +353,12 @@ export function registerDictionaryEntryCommands<TCreate, TUpdate>(
       if (Object.prototype.hasOwnProperty.call(updates, 'icon')) {
         entry.icon = updates.icon ?? null
       }
+      if (updates.position !== undefined) {
+        entry.position = updates.position
+      }
+      if (updates.isDefault !== undefined) {
+        entry.isDefault = updates.isDefault
+      }
       await em.flush()
       return { entryId: entry.id }
     },

package/src/modules/dictionaries/commands/index.ts

@@ -1 +1,2 @@
 import './entries'
+import './entry-operations'

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

@@ -11,6 +11,7 @@ export type DictionaryTableEntry = {
   label: string
   color: string | null
   icon: string | null
+  usageCount?: number
   organizationId?: string | null
   tenantId?: string | null
   isInherited?: boolean
@@ -30,6 +31,7 @@ export type DictionaryTableTranslations = {
   inheritedLabel: string
   inheritedTooltip: string
   emptyLabel: string
+  usageCountLabel?: string
   searchPlaceholder?: string
 }
 
@@ -83,12 +85,19 @@ export function DictionaryTable({
       header: translations.valueColumn,
       meta: { priority: 1 },
       cell: ({ getValue, row }) => (
-        <div className="flex items-center gap-2">
-          <span className="font-medium">{String(getValue())}</span>
-          {row.original.isInherited ? (
-            <span className="rounded bg-muted px-2 py-0.5 text-xs text-muted-foreground" title={translations.inheritedTooltip}>
-              {translations.inheritedLabel}
-            </span>
+        <div className="space-y-1">
+          <div className="flex items-center gap-2">
+            <span className="font-medium">{String(getValue())}</span>
+            {row.original.isInherited ? (
+              <span className="rounded bg-muted px-2 py-0.5 text-xs text-muted-foreground" title={translations.inheritedTooltip}>
+                {translations.inheritedLabel}
+              </span>
+            ) : null}
+          </div>
+          {typeof row.original.usageCount === 'number' && row.original.usageCount > 0 && translations.usageCountLabel ? (
+            <div className="text-xs text-muted-foreground">
+              {translations.usageCountLabel.replace('{{count}}', String(row.original.usageCount))}
+            </div>
           ) : null}
         </div>
       ),

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

@@ -5,6 +5,7 @@ import {
   Unique,
   Index,
   ManyToOne,
+  OptionalProps,
 } from '@mikro-orm/core'
 
 export type DictionaryManagerVisibility = 'default' | 'hidden'
@@ -53,6 +54,8 @@ export class Dictionary {
 @Index({ name: 'dictionary_entries_scope_idx', properties: ['dictionary', 'organizationId', 'tenantId'] })
 @Unique({ name: 'dictionary_entries_unique', properties: ['dictionary', 'organizationId', 'tenantId', 'normalizedValue'] })
 export class DictionaryEntry {
+  [OptionalProps]?: 'position' | 'isDefault' | 'createdAt' | 'updatedAt'
+
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
 
@@ -80,6 +83,12 @@ export class DictionaryEntry {
   @Property({ type: 'text', nullable: true })
   icon?: string | null
 
+  @Property({ type: 'int', default: 0 })
+  position: number = 0
+
+  @Property({ name: 'is_default', type: 'boolean', default: false })
+  isDefault: boolean = false
+
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()
 

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

@@ -29,6 +29,7 @@ export const createDictionaryEntrySchema = z.object({
   label: z.string().trim().min(1).max(150).optional(),
   color: hexColorSchema.nullable().optional(),
   icon: iconSchema.nullable().optional(),
+  position: z.number().int().min(0).optional(),
 })
 
 export type CreateDictionaryEntryInput = z.infer<typeof createDictionaryEntrySchema>
@@ -38,6 +39,8 @@ const dictionaryEntryUpdateFieldsSchema = z.object({
   label: z.string().trim().min(1).max(150).optional(),
   color: hexColorSchema.nullable().optional(),
   icon: iconSchema.nullable().optional(),
+  position: z.number().int().min(0).optional(),
+  isDefault: z.boolean().optional(),
 })
 
 const validateDictionaryEntryUpdate = (payload: z.infer<typeof dictionaryEntryUpdateFieldsSchema>) =>
@@ -68,3 +71,34 @@ export const dictionaryEntryCommandUpdateSchema = z
   })
 
 export type DictionaryEntryCommandUpdateInput = z.infer<typeof dictionaryEntryCommandUpdateSchema>
+
+export const reorderDictionaryEntriesSchema = z.object({
+  entries: z.array(z.object({
+    id: z.string().uuid(),
+    position: z.number().int().min(0),
+  })).min(1),
+})
+
+export type ReorderDictionaryEntriesInput = z.infer<typeof reorderDictionaryEntriesSchema>
+
+export const reorderDictionaryEntriesCommandSchema = reorderDictionaryEntriesSchema.extend({
+  dictionaryId: z.string().uuid(),
+  tenantId: z.string().uuid(),
+  organizationId: z.string().uuid(),
+})
+
+export type ReorderDictionaryEntriesCommandInput = z.infer<typeof reorderDictionaryEntriesCommandSchema>
+
+export const setDefaultDictionaryEntrySchema = z.object({
+  entryId: z.string().uuid(),
+})
+
+export type SetDefaultDictionaryEntryInput = z.infer<typeof setDefaultDictionaryEntrySchema>
+
+export const setDefaultDictionaryEntryCommandSchema = setDefaultDictionaryEntrySchema.extend({
+  dictionaryId: z.string().uuid(),
+  tenantId: z.string().uuid(),
+  organizationId: z.string().uuid(),
+})
+
+export type SetDefaultDictionaryEntryCommandInput = z.infer<typeof setDefaultDictionaryEntryCommandSchema>

package/src/modules/dictionaries/events.ts

@@ -0,0 +1,20 @@
+import { createModuleEvents } from '@open-mercato/shared/modules/events'
+
+const events = [
+  { id: 'dictionaries.entry.created', label: 'Dictionary Entry Created', entity: 'entry', category: 'crud' },
+  { id: 'dictionaries.entry.updated', label: 'Dictionary Entry Updated', entity: 'entry', category: 'crud' },
+  { id: 'dictionaries.entry.deleted', label: 'Dictionary Entry Deleted', entity: 'entry', category: 'crud' },
+] as const
+
+export const eventsConfig = createModuleEvents({
+  moduleId: 'dictionaries',
+  events,
+})
+
+/** Type-safe event emitter for dictionaries module */
+export const emitDictionariesEvent = eventsConfig.emit
+
+/** Event IDs that can be emitted by the dictionaries module */
+export type DictionariesEventId = typeof events[number]['id']
+
+export default eventsConfig

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

@@ -88,6 +88,8 @@
   "dictionaries.customFields.selector.placeholder": "Eintrag auswählen",
   "dictionaries.entries.audit.create": "Wörterbucheintrag hinzufügen",
   "dictionaries.entries.audit.delete": "Wörterbucheintrag löschen",
+  "dictionaries.entries.audit.reorder": "Wörterbucheinträge neu ordnen",
+  "dictionaries.entries.audit.set_default": "Standard-Wörterbucheintrag festlegen",
   "dictionaries.entries.audit.update": "Wörterbucheintrag aktualisieren",
   "dictionaries.entries.create": "Wörterbucheintrag hinzufügen",
   "dictionaries.entries.delete": "Wörterbucheintrag löschen",

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

@@ -88,6 +88,8 @@
   "dictionaries.customFields.selector.placeholder": "Select an entry",
   "dictionaries.entries.audit.create": "Add dictionary entry",
   "dictionaries.entries.audit.delete": "Delete dictionary entry",
+  "dictionaries.entries.audit.reorder": "Reorder dictionary entries",
+  "dictionaries.entries.audit.set_default": "Set default dictionary entry",
   "dictionaries.entries.audit.update": "Update dictionary entry",
   "dictionaries.entries.create": "Add dictionary entry",
   "dictionaries.entries.delete": "Delete dictionary entry",

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

@@ -88,6 +88,8 @@
   "dictionaries.customFields.selector.placeholder": "Selecciona una entrada",
   "dictionaries.entries.audit.create": "Agregar entrada de diccionario",
   "dictionaries.entries.audit.delete": "Eliminar entrada de diccionario",
+  "dictionaries.entries.audit.reorder": "Reordenar entradas del diccionario",
+  "dictionaries.entries.audit.set_default": "Establecer entrada predeterminada",
   "dictionaries.entries.audit.update": "Actualizar entrada de diccionario",
   "dictionaries.entries.create": "Agregar entrada de diccionario",
   "dictionaries.entries.delete": "Eliminar entrada de diccionario",

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

@@ -88,6 +88,8 @@
   "dictionaries.customFields.selector.placeholder": "Wybierz wpis",
   "dictionaries.entries.audit.create": "Dodaj wpis słownika",
   "dictionaries.entries.audit.delete": "Usuń wpis słownika",
+  "dictionaries.entries.audit.reorder": "Zmień kolejność wpisów słownika",
+  "dictionaries.entries.audit.set_default": "Ustaw domyślny wpis słownika",
   "dictionaries.entries.audit.update": "Zaktualizuj wpis słownika",
   "dictionaries.entries.create": "Dodaj wpis słownika",
   "dictionaries.entries.delete": "Usuń wpis słownika",

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

@@ -0,0 +1,66 @@
+"use client"
+
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+
+type DictionarySummary = {
+  id: string
+  key: string
+}
+
+export type DictionaryEntryOption = {
+  id: string
+  value: string
+  label: string
+  color: string | null
+  icon: string | null
+}
+
+function normalizeDictionaryList(items: unknown): DictionarySummary[] {
+  if (!Array.isArray(items)) return []
+  return items
+    .map((item) => {
+      if (!item || typeof item !== 'object') return null
+      const record = item as Record<string, unknown>
+      const id = typeof record.id === 'string' ? record.id : null
+      const key = typeof record.key === 'string' ? record.key : null
+      if (!id || !key) return null
+      return { id, key }
+    })
+    .filter((item): item is DictionarySummary => !!item)
+}
+
+function normalizeDictionaryEntries(items: unknown): DictionaryEntryOption[] {
+  if (!Array.isArray(items)) return []
+  return items
+    .map((item) => {
+      if (!item || typeof item !== 'object') return null
+      const record = item as Record<string, unknown>
+      const id = typeof record.id === 'string' ? record.id : null
+      const value = typeof record.value === 'string' ? record.value : null
+      if (!id || !value) return null
+      return {
+        id,
+        value,
+        label:
+          typeof record.label === 'string' && record.label.trim().length > 0
+            ? record.label
+            : value,
+        color: typeof record.color === 'string' ? record.color : null,
+        icon: typeof record.icon === 'string' ? record.icon : null,
+      }
+    })
+    .filter((item): item is DictionaryEntryOption => !!item)
+}
+
+export async function loadDictionaryEntriesByKey(key: string): Promise<DictionaryEntryOption[]> {
+  const dictionariesCall = await apiCall<{ items?: unknown[] }>('/api/dictionaries')
+  if (!dictionariesCall.ok) return []
+
+  const dictionary = normalizeDictionaryList(dictionariesCall.result?.items).find((item) => item.key === key)
+  if (!dictionary) return []
+
+  const entriesCall = await apiCall<{ items?: unknown[] }>(`/api/dictionaries/${dictionary.id}/entries`)
+  if (!entriesCall.ok) return []
+
+  return normalizeDictionaryEntries(entriesCall.result?.items)
+}