@open-mercato/core 0.6.2-develop.3467.1.2a1818709d → 0.6.3-develop.3484.1.1427e58147

package/src/modules/customers/components/detail/schedule/useScheduleFormState.ts

@@ -1,5 +1,4 @@
 import * as React from 'react'
-import { format } from 'date-fns'
 import type { ActivityType } from './fieldConfig'
 
 export type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'
@@ -63,6 +62,18 @@ const DEFAULT_REMINDER_MINUTES: Record<ActivityType, number> = {
   email: 15,
 }
 
+function padDatePart(value: number): string {
+  return String(value).padStart(2, '0')
+}
+
+function formatLocalDateInput(date: Date): string {
+  return `${date.getFullYear()}-${padDatePart(date.getMonth() + 1)}-${padDatePart(date.getDate())}`
+}
+
+function formatLocalTimeInput(date: Date): string {
+  return `${padDatePart(date.getHours())}:${padDatePart(date.getMinutes())}`
+}
+
 interface UseScheduleFormStateParams {
   open: boolean
   editData: ScheduleActivityEditData | null | undefined
@@ -71,7 +82,7 @@ interface UseScheduleFormStateParams {
 export function useScheduleFormState({ open, editData }: UseScheduleFormStateParams) {
   const [activityType, setActivityType] = React.useState<ActivityType>('meeting')
   const [title, setTitle] = React.useState('')
-  const [date, setDate] = React.useState(() => format(new Date(), 'yyyy-MM-dd'))
+  const [date, setDate] = React.useState(() => formatLocalDateInput(new Date()))
   const [startTime, setStartTime] = React.useState('10:00')
   const [duration, setDuration] = React.useState(30)
   const [allDay, setAllDay] = React.useState(false)
@@ -101,15 +112,15 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
         // For historical activities the canonical timestamp is `occurredAt`; for
         // planned/future ones it's `scheduledAt`. Without this fallback editing a
         // past activity prefilled to "today" instead of its actual moment (#1807).
-        // Use `date-fns` `format(...)` so the seed values are in the user's local
-        // timezone (matches the cluster-E local-day convention).
+        // Keep seed values in the user's local timezone, matching the cluster-E
+        // local-day convention.
         const sourceTimestamp = editData.occurredAt ?? editData.scheduledAt ?? null
         const seedDate = sourceTimestamp ? new Date(sourceTimestamp) : new Date()
         const seedDateValid = !Number.isNaN(seedDate.getTime())
         const fallbackNow = new Date()
         const dateForForm = seedDateValid ? seedDate : fallbackNow
-        setDate(format(dateForForm, 'yyyy-MM-dd'))
-        setStartTime(format(dateForForm, 'HH:mm'))
+        setDate(formatLocalDateInput(dateForForm))
+        setStartTime(formatLocalTimeInput(dateForForm))
         setDuration(editData.durationMinutes ?? 30)
         setAllDay(editData.allDay ?? false)
         setDescription(editData.body ?? '')
@@ -170,7 +181,7 @@ export function useScheduleFormState({ open, editData }: UseScheduleFormStatePar
         // Create mode: reset all fields
         setActivityType('meeting')
         setTitle('')
-        setDate(format(new Date(), 'yyyy-MM-dd'))
+        setDate(formatLocalDateInput(new Date()))
         setStartTime('10:00')
         setDuration(30)
         setAllDay(false)

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

@@ -40,14 +40,15 @@ export const listIntegrationLogsQuerySchema = z.object({
 
 export type ListIntegrationLogsQuery = z.infer<typeof listIntegrationLogsQuerySchema>
 
-const optionalBooleanQuery = z.union([z.boolean(), z.string(), z.null(), z.undefined()])
-  .transform((value) => {
+const optionalBooleanQuery = z.preprocess(
+  (value) => {
     if (value === undefined || value === '' || value === null) return undefined
     if (value === true || value === 'true' || value === '1') return true
     if (value === false || value === 'false' || value === '0') return false
     return value
-  })
-  .pipe(z.boolean().optional())
+  },
+  z.boolean().optional(),
+)
 
 export const integrationMarketplaceHealthStatusSchema = z.enum(['healthy', 'degraded', 'unhealthy', 'unconfigured'])
 

package/src/modules/messages/commands/messages.ts

@@ -2,7 +2,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { z } from 'zod'
 import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/commands'
 import { extractUndoPayload, type UndoPayload } from '@open-mercato/shared/lib/commands/undo'
-import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { Message, MessageObject, MessageRecipient, type MessageActionData } from '../data/entities'
 import { emitMessagesEvent } from '../events'
 import {
@@ -368,6 +368,20 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
     if (message.senderUserId !== input.userId) throw new Error('Access denied')
     if (!message.isDraft) throw new Error('Only draft messages can be edited')
 
+    const isSending = input.isDraft === false
+    const preloadedRecipients = isSending && !input.recipients
+      ? await findWithDecryption(
+        em,
+        MessageRecipient,
+        { messageId: message.id, deletedAt: null },
+        undefined,
+        {
+          tenantId: input.tenantId,
+          organizationId: input.organizationId,
+        },
+      )
+      : null
+
     const nextMessageType = input.type ?? message.type
     if (input.objects) {
       const objectValidationError = validateMessageObjectsForType(nextMessageType, input.objects)
@@ -454,12 +468,50 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
       )
     }
 
+    if (isSending) {
+      const finalVisibility = input.visibility ?? message.visibility
+      const finalSubject = input.subject ?? message.subject
+      const finalBody = input.body ?? message.body
+      const finalRecipientCount = input.recipients
+        ? input.recipients.length
+        : (preloadedRecipients?.length ?? 0)
+
+      if (finalVisibility !== 'public' && finalRecipientCount === 0) {
+        throw new Error('at least one recipient is required')
+      }
+      if (!finalSubject?.trim()) throw new Error('subject is required')
+      if (!finalBody?.trim()) throw new Error('body is required')
+
+      message.isDraft = false
+      message.status = 'sent'
+      message.sentAt = new Date()
+      if (!message.threadId) message.threadId = message.id
+    }
+
     await em.flush()
     await emitMessageIndexUpsert(ctx.container, {
       messageId: message.id,
       tenantId: input.tenantId,
       organizationId: input.organizationId,
     })
+
+    if (isSending) {
+      const recipientUserIds = input.recipients
+        ? input.recipients.map((r) => r.userId)
+        : (preloadedRecipients ?? []).map((r) => r.recipientUserId)
+      const resolvedVisibility = input.visibility ?? message.visibility
+      const resolvedSendViaEmail = input.sendViaEmail ?? message.sendViaEmail
+      await emitMessageSentEvent(ctx.container, {
+        messageId: message.id,
+        senderUserId: input.userId,
+        recipientUserIds,
+        sendViaEmail: resolvedVisibility === 'public' ? true : resolvedSendViaEmail,
+        externalEmail: message.externalEmail ?? null,
+        tenantId: input.tenantId,
+        organizationId: input.organizationId,
+      })
+    }
+
     return { ok: true, id: message.id }
   },
   async captureAfter(rawInput, _result, ctx) {
@@ -473,7 +525,7 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
   buildLog: async ({ input, snapshots }) => {
     const parsed = updateDraftCommandSchema.parse(input)
     return {
-      actionLabel: 'Update draft message',
+      actionLabel: parsed.isDraft === false ? 'Send draft message' : 'Update draft message',
       resourceKind: 'messages.message',
       resourceId: parsed.messageId,
       tenantId: parsed.tenantId,

package/src/modules/messages/components/MessagesInboxPageClient.tsx

@@ -19,6 +19,11 @@ import { DefaultMessageListItem } from './defaults/DefaultMessageListItem'
 import { getMessageListParticipantLabel } from './messageListLabels'
 import { toErrorMessage } from './message-detail/utils'
 import { useMessagesInboxBulkActions, type MessageFolder } from './useMessagesInboxBulkActions'
+import {
+  buildMessagesInboxFilters,
+  buildMessagesListParams,
+  type SenderOption,
+} from './inboxFilters'
 
 type MessageListItem = {
   id: string
@@ -106,30 +111,13 @@ export function MessagesInboxPageClient() {
       scopeVersion,
     ],
     queryFn: async () => {
-      const params = new URLSearchParams()
-      params.set('folder', folder)
-      params.set('page', String(page))
-      params.set('pageSize', String(pageSize))
-
-      if (search.trim()) {
-        params.set('search', search.trim())
-      }
-
-      const status = typeof filterValues.status === 'string' ? filterValues.status.trim() : ''
-      const type = typeof filterValues.type === 'string' ? filterValues.type.trim() : ''
-      const hasObjects = typeof filterValues.hasObjects === 'string' ? filterValues.hasObjects.trim() : ''
-      const hasAttachments = typeof filterValues.hasAttachments === 'string' ? filterValues.hasAttachments.trim() : ''
-      const hasActions = typeof filterValues.hasActions === 'string' ? filterValues.hasActions.trim() : ''
-      const senderId = typeof filterValues.senderId === 'string' ? filterValues.senderId.trim() : ''
-      const since = typeof filterValues.since === 'string' ? filterValues.since.trim() : ''
-
-      if (status) params.set('status', status)
-      if (type) params.set('type', type)
-      if (hasObjects) params.set('hasObjects', hasObjects)
-      if (hasAttachments) params.set('hasAttachments', hasAttachments)
-      if (hasActions) params.set('hasActions', hasActions)
-      if (senderId) params.set('senderId', senderId)
-      if (since) params.set('since', since)
+      const params = buildMessagesListParams({
+        folder,
+        page,
+        pageSize,
+        search,
+        filterValues,
+      })
 
       const call = await apiCall<MessageListResponse>(`/api/messages?${params.toString()}`)
       if (!call.ok) {
@@ -191,6 +179,19 @@ export function MessagesInboxPageClient() {
     return map
   }, [messageTypesQuery.data, t])
 
+  const [senderOptions, setSenderOptions] = React.useState<SenderOption[]>([])
+  const senderOptionsScopeRef = React.useRef(scopeVersion)
+
+  const mergeSenderOptions = React.useCallback((incoming: SenderOption[]) => {
+    if (incoming.length === 0) return
+    setSenderOptions((prev) => {
+      const map = new Map<string, SenderOption>()
+      for (const opt of prev) map.set(opt.value, opt)
+      for (const opt of incoming) map.set(opt.value, opt)
+      return Array.from(map.values())
+    })
+  }, [])
+
   const loadSenderOptions = React.useCallback(async (query?: string) => {
     const params = new URLSearchParams()
     params.set('page', '1')
@@ -203,7 +204,7 @@ export function MessagesInboxPageClient() {
     if (!call.ok) return []
 
     const items = Array.isArray(call.result?.items) ? call.result?.items ?? [] : []
-    return items.flatMap((item) => {
+    const next: SenderOption[] = items.flatMap((item) => {
       if (!item || typeof item.id !== 'string' || item.id.trim().length === 0) return []
       const name = typeof item.name === 'string' && item.name.trim().length > 0 ? item.name.trim() : null
       const email = typeof item.email === 'string' && item.email.trim().length > 0 ? item.email.trim() : null
@@ -214,7 +215,19 @@ export function MessagesInboxPageClient() {
         description: email && email !== label ? email : null,
       }]
     })
-  }, [])
+    if (senderOptionsScopeRef.current === scopeVersion) {
+      mergeSenderOptions(next)
+    }
+    return next
+  }, [mergeSenderOptions, scopeVersion])
+
+  React.useEffect(() => {
+    senderOptionsScopeRef.current = scopeVersion
+    setSenderOptions([])
+    loadSenderOptions().catch((error: unknown) => {
+      console.warn('[messages] Failed to load sender filter options', error)
+    })
+  }, [loadSenderOptions, scopeVersion])
 
   const listItemComponentKeyByType = React.useMemo(() => {
     const map: Record<string, string | null> = {}
@@ -230,69 +243,13 @@ export function MessagesInboxPageClient() {
       label: t(item.labelKey, item.type),
     }))
 
-    return [
-      {
-        id: 'status',
-        label: t('messages.filters.status', 'Status'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'unread', label: t('messages.status.unread', 'Unread') },
-          { value: 'read', label: t('messages.status.read', 'Read') },
-          { value: 'archived', label: t('messages.status.archived', 'Archived') },
-        ],
-      },
-      {
-        id: 'type',
-        label: t('messages.filters.type', 'Type'),
-        type: 'select',
-        options: [{ value: '', label: t('messages.filters.all', 'All') }, ...typeOptions],
-      },
-      {
-        id: 'hasObjects',
-        label: t('messages.filters.hasObjects', 'Objects'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'true', label: t('common.yes', 'Yes') },
-          { value: 'false', label: t('common.no', 'No') },
-        ],
-      },
-      {
-        id: 'hasAttachments',
-        label: t('messages.filters.hasAttachments', 'Attachments'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'true', label: t('common.yes', 'Yes') },
-          { value: 'false', label: t('common.no', 'No') },
-        ],
-      },
-      {
-        id: 'hasActions',
-        label: t('messages.filters.hasActions', 'Actions'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'true', label: t('common.yes', 'Yes') },
-          { value: 'false', label: t('common.no', 'No') },
-        ],
-      },
-      {
-        id: 'senderId',
-        label: t('messages.filters.sender', 'Sender'),
-        type: 'select',
-        options: [{ value: '', label: t('messages.filters.all', 'All') }],
-        loadOptions: loadSenderOptions,
-      },
-      {
-        id: 'since',
-        label: t('messages.filters.since', 'Sent after'),
-        type: 'text',
-        placeholder: t('messages.filters.sincePlaceholder', 'YYYY-MM-DDTHH:mm:ssZ'),
-      },
-    ]
-  }, [loadSenderOptions, messageTypesQuery.data, t])
+    return buildMessagesInboxFilters({
+      t,
+      typeOptions,
+      senderOptions,
+      loadSenderOptions,
+    })
+  }, [loadSenderOptions, messageTypesQuery.data, senderOptions, t])
 
   const columns = React.useMemo<ColumnDef<MessageListItem>[]>(() => [
     {

package/src/modules/messages/components/inboxFilters.ts

@@ -0,0 +1,162 @@
+import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
+
+type Translator = (key: string, fallback?: string) => string
+
+export type SenderOption = {
+  value: string
+  label: string
+  description?: string | null
+}
+
+export type MessagesInboxFilterContext = {
+  t: Translator
+  typeOptions: { value: string; label: string }[]
+  senderOptions: SenderOption[]
+  loadSenderOptions: (query?: string) => Promise<SenderOption[]>
+}
+
+export function buildMessagesInboxFilters({
+  t,
+  typeOptions,
+  senderOptions,
+  loadSenderOptions,
+}: MessagesInboxFilterContext): FilterDef[] {
+  const senderLabel = (val: string): string => {
+    const match = senderOptions.find((opt) => opt.value === val)
+    return match?.label ?? val
+  }
+
+  return [
+    {
+      id: 'status',
+      label: t('messages.filters.status', 'Status'),
+      type: 'select',
+      options: [
+        { value: '', label: t('messages.filters.all', 'All') },
+        { value: 'unread', label: t('messages.status.unread', 'Unread') },
+        { value: 'read', label: t('messages.status.read', 'Read') },
+        { value: 'archived', label: t('messages.status.archived', 'Archived') },
+      ],
+    },
+    {
+      id: 'type',
+      label: t('messages.filters.type', 'Type'),
+      type: 'select',
+      options: [{ value: '', label: t('messages.filters.all', 'All') }, ...typeOptions],
+    },
+    {
+      id: 'hasObjects',
+      label: t('messages.filters.hasObjects', 'Has objects'),
+      type: 'select',
+      options: [
+        { value: '', label: t('messages.filters.all', 'All') },
+        { value: 'true', label: t('common.yes', 'Yes') },
+        { value: 'false', label: t('common.no', 'No') },
+      ],
+    },
+    {
+      id: 'hasAttachments',
+      label: t('messages.filters.hasAttachments', 'Has attachments'),
+      type: 'select',
+      options: [
+        { value: '', label: t('messages.filters.all', 'All') },
+        { value: 'true', label: t('common.yes', 'Yes') },
+        { value: 'false', label: t('common.no', 'No') },
+      ],
+    },
+    {
+      id: 'hasActions',
+      label: t('messages.filters.hasActions', 'Has actions'),
+      type: 'select',
+      options: [
+        { value: '', label: t('messages.filters.all', 'All') },
+        { value: 'true', label: t('common.yes', 'Yes') },
+        { value: 'false', label: t('common.no', 'No') },
+      ],
+    },
+    {
+      id: 'senderId',
+      label: t('messages.filters.sender', 'Sender'),
+      type: 'combobox',
+      placeholder: t('messages.filters.senderEmpty', 'Type to search users'),
+      options: senderOptions,
+      loadOptions: loadSenderOptions,
+      formatValue: senderLabel,
+      formatDescription: (val: string) =>
+        senderOptions.find((opt) => opt.value === val)?.description ?? null,
+    },
+    {
+      id: 'since',
+      label: t('messages.filters.since', 'Sent after'),
+      type: 'text',
+      placeholder: t('messages.filters.sincePlaceholder', 'YYYY-MM-DD'),
+    },
+  ]
+}
+
+const DATE_ONLY_PATTERN = /^\d{4}-\d{2}-\d{2}$/
+
+export function normalizeMessagesSinceValue(input: string): string | null {
+  const trimmed = input.trim()
+  if (!trimmed) return null
+  if (DATE_ONLY_PATTERN.test(trimmed)) {
+    const parsed = new Date(`${trimmed}T00:00:00.000Z`)
+    if (Number.isNaN(parsed.getTime())) return null
+    if (parsed.toISOString().slice(0, 10) !== trimmed) return null
+    return parsed.toISOString()
+  }
+  const parsed = new Date(trimmed)
+  if (Number.isNaN(parsed.getTime())) return null
+  return parsed.toISOString()
+}
+
+export type BuildMessagesListParamsOptions = {
+  folder: string
+  page: number
+  pageSize: number
+  search: string
+  filterValues: FilterValues
+}
+
+export function buildMessagesListParams({
+  folder,
+  page,
+  pageSize,
+  search,
+  filterValues,
+}: BuildMessagesListParamsOptions): URLSearchParams {
+  const params = new URLSearchParams()
+  params.set('folder', folder)
+  params.set('page', String(page))
+  params.set('pageSize', String(pageSize))
+
+  if (search.trim()) {
+    params.set('search', search.trim())
+  }
+
+  const stringValue = (id: string): string => {
+    const raw = filterValues[id]
+    return typeof raw === 'string' ? raw.trim() : ''
+  }
+
+  const status = stringValue('status')
+  const type = stringValue('type')
+  const hasObjects = stringValue('hasObjects')
+  const hasAttachments = stringValue('hasAttachments')
+  const hasActions = stringValue('hasActions')
+  const senderId = stringValue('senderId')
+  const sinceRaw = stringValue('since')
+
+  if (status) params.set('status', status)
+  if (type) params.set('type', type)
+  if (hasObjects) params.set('hasObjects', hasObjects)
+  if (hasAttachments) params.set('hasAttachments', hasAttachments)
+  if (hasActions) params.set('hasActions', hasActions)
+  if (senderId) params.set('senderId', senderId)
+  if (sinceRaw) {
+    const normalized = normalizeMessagesSinceValue(sinceRaw)
+    if (normalized) params.set('since', normalized)
+  }
+
+  return params
+}

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

@@ -186,6 +186,7 @@ export const updateDraftSchema = z.object({
   attachmentIds: z.array(z.string().uuid()).optional(),
   actionData: messageActionDataSchema.optional(),
   sendViaEmail: z.boolean().optional(),
+  isDraft: z.literal(false).optional(),
 }).superRefine((value, ctx) => {
   if (value.recipients) {
     const duplicateRecipientIds = collectDuplicateRecipientIds(value.recipients)

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

@@ -131,12 +131,13 @@
   "messages.externalName": "Externer Name",
   "messages.fields.type": "Nachrichtentyp",
   "messages.filters.all": "Alle",
-  "messages.filters.hasActions": "Aktionen",
-  "messages.filters.hasAttachments": "Anhänge",
-  "messages.filters.hasObjects": "Objekte",
+  "messages.filters.hasActions": "Hat Aktionen",
+  "messages.filters.hasAttachments": "Hat Anhänge",
+  "messages.filters.hasObjects": "Hat Objekte",
   "messages.filters.sender": "Absender",
+  "messages.filters.senderEmpty": "Tippe, um Benutzer zu suchen",
   "messages.filters.since": "Gesendet nach",
-  "messages.filters.sincePlaceholder": "YYYY-MM-DDTHH:mm:ssZ",
+  "messages.filters.sincePlaceholder": "YYYY-MM-DD",
   "messages.filters.status": "Status",
   "messages.filters.type": "Typ",
   "messages.flash.actionSuccess": "Aktion abgeschlossen.",

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

@@ -131,12 +131,13 @@
   "messages.externalName": "External name",
   "messages.fields.type": "Message type",
   "messages.filters.all": "All",
-  "messages.filters.hasActions": "Actions",
-  "messages.filters.hasAttachments": "Attachments",
-  "messages.filters.hasObjects": "Objects",
+  "messages.filters.hasActions": "Has actions",
+  "messages.filters.hasAttachments": "Has attachments",
+  "messages.filters.hasObjects": "Has objects",
   "messages.filters.sender": "Sender",
+  "messages.filters.senderEmpty": "Type to search users",
   "messages.filters.since": "Sent after",
-  "messages.filters.sincePlaceholder": "YYYY-MM-DDTHH:mm:ssZ",
+  "messages.filters.sincePlaceholder": "YYYY-MM-DD",
   "messages.filters.status": "Status",
   "messages.filters.type": "Type",
   "messages.flash.actionSuccess": "Action completed.",

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

@@ -131,12 +131,13 @@
   "messages.externalName": "Nombre externo",
   "messages.fields.type": "Tipo de mensaje",
   "messages.filters.all": "Todos",
-  "messages.filters.hasActions": "Acciones",
-  "messages.filters.hasAttachments": "Adjuntos",
-  "messages.filters.hasObjects": "Objetos",
+  "messages.filters.hasActions": "Tiene acciones",
+  "messages.filters.hasAttachments": "Tiene adjuntos",
+  "messages.filters.hasObjects": "Tiene objetos",
   "messages.filters.sender": "Remitente",
+  "messages.filters.senderEmpty": "Escribe para buscar usuarios",
   "messages.filters.since": "Enviado después de",
-  "messages.filters.sincePlaceholder": "YYYY-MM-DDTHH:mm:ssZ",
+  "messages.filters.sincePlaceholder": "YYYY-MM-DD",
   "messages.filters.status": "Estado",
   "messages.filters.type": "Tipo",
   "messages.flash.actionSuccess": "Acción completada.",

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

@@ -131,12 +131,13 @@
   "messages.externalName": "Nazwa zewnętrzna",
   "messages.fields.type": "Typ wiadomości",
   "messages.filters.all": "Wszystkie",
-  "messages.filters.hasActions": "Akcje",
-  "messages.filters.hasAttachments": "Załączniki",
-  "messages.filters.hasObjects": "Obiekty",
+  "messages.filters.hasActions": "Ma akcje",
+  "messages.filters.hasAttachments": "Ma załączniki",
+  "messages.filters.hasObjects": "Ma obiekty",
   "messages.filters.sender": "Nadawca",
+  "messages.filters.senderEmpty": "Wpisz, aby wyszukać użytkowników",
   "messages.filters.since": "Wysłane po",
-  "messages.filters.sincePlaceholder": "YYYY-MM-DDTHH:mm:ssZ",
+  "messages.filters.sincePlaceholder": "RRRR-MM-DD",
   "messages.filters.status": "Status",
   "messages.filters.type": "Typ",
   "messages.flash.actionSuccess": "Akcja wykonana.",

package/src/modules/sales/api/order-adjustments/route.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import type { EntityManager } from '@mikro-orm/core'
 import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -85,7 +86,7 @@ const crud = makeCrudRoute({
       const filters: Record<string, unknown> = {}
       if (query.orderId) filters.order_id = { $eq: query.orderId }
       try {
-        const em = ctx.container.resolve('em')
+        const em = ctx.container.resolve<EntityManager>('em')
         const cfFilters = await buildCustomFieldFiltersFromQuery({
           entityId: E.sales.sales_order_adjustment,
           query,

package/src/modules/sales/api/quote-adjustments/route.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import type { EntityManager } from '@mikro-orm/core'
 import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -82,7 +83,7 @@ const crud = makeCrudRoute({
       const filters: Record<string, unknown> = {}
       if (query.quoteId) filters.quote_id = { $eq: query.quoteId }
       try {
-        const em = ctx.container.resolve('em')
+        const em = ctx.container.resolve<EntityManager>('em')
         const cfFilters = await buildCustomFieldFiltersFromQuery({
           entityId: E.sales.sales_quote_adjustment,
           query,

package/src/modules/sales/lib/makeSalesLineRoute.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import type { EntityManager } from '@mikro-orm/core'
 import { makeCrudRoute, type CrudCtx } from '@open-mercato/shared/lib/crud/factory'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -210,7 +211,7 @@ export function makeSalesLineRoute(config: SalesLineRouteConfig) {
         if (query.id) filters.id = { $eq: query.id }
         if (query[parentFkParam]) filters[parentFkColumn] = { $eq: query[parentFkParam] }
         try {
-          const em = ctx.container.resolve('em')
+          const em = ctx.container.resolve<EntityManager>('em')
           const cfFilters = await buildCustomFieldFiltersFromQuery({
             entityId,
             query,

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

@@ -280,6 +280,7 @@
   "staff.messageObjects.notFound": "Nicht gefunden",
   "staff.messageObjects.team.title": "Team",
   "staff.messageObjects.teamMember.title": "Teammitglied",
+  "staff.messages.leaveRequestApproval": "Urlaubsantrag – Genehmigung",
   "staff.myAvailability.empty.profileRequired": "Erstelle dein Teamprofil, um Verfügbarkeit zu verwalten.",
   "staff.myAvailability.errors.load": "Verfügbarkeit konnte nicht geladen werden.",
   "staff.myAvailability.loading": "Verfügbarkeit wird geladen...",

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

@@ -280,6 +280,7 @@
   "staff.messageObjects.notFound": "Not found",
   "staff.messageObjects.team.title": "Team",
   "staff.messageObjects.teamMember.title": "Team member",
+  "staff.messages.leaveRequestApproval": "Leave request approval",
   "staff.myAvailability.empty.profileRequired": "Create your team member profile to manage availability.",
   "staff.myAvailability.errors.load": "Failed to load availability.",
   "staff.myAvailability.loading": "Loading availability...",