@open-mercato/core 0.6.2-develop.3446.1.bd060c6017 → 0.6.2-develop.3467.1.2a1818709d

package/src/modules/auth/backend/users/[id]/edit/page.tsx

@@ -17,6 +17,7 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { formatPasswordRequirements, getPasswordPolicy } from '@open-mercato/shared/lib/auth/passwordPolicy'
 import { UserConsentsPanel } from '@open-mercato/core/modules/auth/components/UserConsentsPanel'
+import { normalizeDisplayNameInput } from '@open-mercato/core/modules/auth/lib/displayName'
 
 type EditUserFormValues = {
   email: string
@@ -442,7 +443,7 @@ export default function EditUserPage({ params }: { params?: { id?: string } }) {
             const payload = {
               id: id ? String(id) : '',
               email: values.email,
-              name: typeof values.name === 'string' && values.name.trim().length ? values.name.trim() : undefined,
+              name: normalizeDisplayNameInput(values.name),
               password: values.password && values.password.trim() ? values.password : undefined,
               organizationId: values.organizationId ? values.organizationId : undefined,
               roles: Array.isArray(values.roles) ? values.roles : [],

package/src/modules/auth/backend/users/create/page.tsx

@@ -14,6 +14,7 @@ import { RadioGroup } from '@open-mercato/ui/primitives/radio'
 import { RadioField } from '@open-mercato/ui/primitives/radio-field'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { formatPasswordRequirements, getPasswordPolicy } from '@open-mercato/shared/lib/auth/passwordPolicy'
+import { normalizeDisplayNameInput } from '@open-mercato/core/modules/auth/lib/displayName'
 
 type CreateUserFormValues = {
   email: string
@@ -326,7 +327,7 @@ export default function CreateUserPage() {
             const customFields = collectCustomFieldValues(values)
             const payload: Record<string, unknown> = {
               email: values.email,
-              name: typeof values.name === 'string' && values.name.trim().length ? values.name.trim() : undefined,
+              name: normalizeDisplayNameInput(values.name),
               organizationId: values.organizationId ? values.organizationId : null,
               roles: Array.isArray(values.roles) ? values.roles : [],
               ...(Object.keys(customFields).length ? { customFields } : {}),

package/src/modules/auth/commands/users.ts

@@ -37,6 +37,7 @@ import InviteUserEmail from '@open-mercato/core/modules/auth/emails/InviteUserEm
 import { INVITE_TOKEN_TTL_MS } from '@open-mercato/core/modules/auth/lib/inviteToken'
 import { getSecurityEmailBaseUrl } from '@open-mercato/shared/lib/url'
 import { generateAuthToken, hashAuthToken } from '@open-mercato/core/modules/auth/lib/tokenHash'
+import { normalizeDisplayNameInput } from '@open-mercato/core/modules/auth/lib/displayName'
 
 type SerializedUser = {
   email: string
@@ -76,12 +77,8 @@ type UserSnapshots = {
 const passwordSchema = buildPasswordSchema()
 
 const displayNameSchema = z.preprocess(
-  (value) => {
-    if (typeof value !== 'string') return value
-    const trimmed = value.trim()
-    return trimmed.length ? trimmed : undefined
-  },
-  z.string().trim().min(1).max(120).optional(),
+  normalizeDisplayNameInput,
+  z.string().trim().min(1).max(120).nullable().optional(),
 )
 
 const createSchema = z.object({
@@ -589,7 +586,7 @@ const updateUserCommand: CommandHandler<Record<string, unknown>, User> = {
         entity.organizationId = before.organizationId ?? null
         entity.tenantId = before.tenantId ?? null
         entity.passwordHash = before.passwordHash ?? null
-        entity.name = before.name ?? undefined
+        entity.name = before.name ?? null
         entity.isConfirmed = before.isConfirmed
       },
     })
@@ -715,7 +712,7 @@ const deleteUserCommand: CommandHandler<{ body?: Record<string, unknown>; query?
       user.organizationId = before.organizationId ?? null
       user.tenantId = before.tenantId ?? null
       user.passwordHash = before.passwordHash ?? null
-      user.name = before.name ?? undefined
+      user.name = before.name ?? null
       user.isConfirmed = before.isConfirmed
       await em.flush()
     } else {

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

@@ -19,7 +19,7 @@ export class User {
   emailHash?: string | null
 
   @Property({ type: 'text', nullable: true })
-  name?: string
+  name?: string | null
 
   @Property({ name: 'password_hash', type: 'text', nullable: true })
   passwordHash?: string | null

package/src/modules/auth/frontend/login.tsx

@@ -13,6 +13,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import { clearAllOperations } from '@open-mercato/ui/backend/operations/store'
+import { notifyAuthIdentityChange } from '@open-mercato/ui/backend/AuthSessionGuard'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { X } from 'lucide-react'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
@@ -125,6 +126,43 @@ export default function LoginPage() {
     setClientReady(true)
   }, [])
 
+  useEffect(() => {
+    let cancelled = false
+    void (async () => {
+      try {
+        const res = await apiCall<{ userId?: string }>('/api/auth/feature-check', {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ features: [] }),
+          cache: 'no-store',
+        })
+        if (cancelled) return
+        const activeUserId = typeof res.result?.userId === 'string' ? res.result.userId : ''
+        if (!activeUserId) return
+        const rawRedirect = searchParams.get('redirect') || ''
+        let destination = '/backend'
+        if (rawRedirect) {
+          try {
+            const resolved = new URL(rawRedirect, window.location.origin)
+            if (
+              resolved.origin === window.location.origin &&
+              resolved.pathname.startsWith('/') &&
+              !resolved.pathname.includes('//')
+            ) {
+              destination = resolved.pathname + resolved.search + resolved.hash
+            }
+          } catch {
+            // fall back to /backend
+          }
+        }
+        router.replace(destination)
+      } catch {
+        // ignore — leave login form usable on network failure
+      }
+    })()
+    return () => { cancelled = true }
+  }, [router, searchParams])
+
   useEffect(() => {
     const tenantParam = (searchParams.get('tenant') || '').trim()
     if (tenantParam) {
@@ -212,6 +250,7 @@ export default function LoginPage() {
       const res = await fetch('/api/auth/login', { method: 'POST', body: form })
       if (res.redirected) {
         clearAllOperations()
+        notifyAuthIdentityChange()
         // NextResponse.redirect from API
         router.replace(res.url)
         return
@@ -265,6 +304,7 @@ export default function LoginPage() {
       const data = await res.json().catch(() => null) as LoginResponseEventDetail
       emitLoginResponseEvent(data)
       clearAllOperations()
+      notifyAuthIdentityChange()
       if (data && typeof data.redirect === 'string' && data.redirect.length > 0) {
         router.replace(data.redirect)
       }

package/src/modules/auth/lib/displayName.ts

@@ -0,0 +1,6 @@
+export function normalizeDisplayNameInput(value: unknown): unknown {
+  if (value === null) return null
+  if (typeof value !== 'string') return value
+  const trimmed = value.trim()
+  return trimmed.length > 0 ? trimmed : null
+}

package/src/modules/business_rules/lib/rule-evaluator.ts

@@ -77,7 +77,7 @@ export async function evaluate(
     }
   }
 
-  const evaluationTime = Date.now() - startTime
+  const evaluationTime = Math.max(0, Date.now() - startTime)
 
   // Determine if conditions were met (at least one rule matched)
   const conditionsPassed = matchedRules.length > 0
@@ -140,7 +140,7 @@ export async function evaluateSingleRule(
     // Evaluate conditions
     const conditionsPassed = await evaluateConditions(rule.conditionExpression, data, context)
 
-    const evaluationTime = Date.now() - startTime
+    const evaluationTime = Math.max(0, Date.now() - startTime)
 
     console.log('[RULE EVAL] Final result:', {
       ruleId: rule.ruleId,
@@ -156,7 +156,7 @@ export async function evaluateSingleRule(
       evaluationTime,
     }
   } catch (error) {
-    const evaluationTime = Date.now() - startTime
+    const evaluationTime = Math.max(0, Date.now() - startTime)
     const errorMessage = error instanceof Error ? error.message : String(error)
 
     console.log('[RULE EVAL] ✗ ERROR:', errorMessage)

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

@@ -16,6 +16,7 @@ import { useAppEvent } from '@open-mercato/ui/backend/injection/useAppEvent'
 import { Archive, ChevronDown, FilePenLine, Inbox, Layers, Send } from 'lucide-react'
 import { getMessageUiComponentRegistry } from './utils/typeUiRegistry'
 import { DefaultMessageListItem } from './defaults/DefaultMessageListItem'
+import { getMessageListParticipantLabel } from './messageListLabels'
 import { toErrorMessage } from './message-detail/utils'
 import { useMessagesInboxBulkActions, type MessageFolder } from './useMessagesInboxBulkActions'
 
@@ -33,6 +34,7 @@ type MessageListItem = {
   objectCount: number
   hasAttachments: boolean
   attachmentCount: number
+  recipientCount?: number
   hasActions: boolean
   actionTaken?: string | null
   sentAt?: string | null
@@ -319,11 +321,12 @@ export function MessagesInboxPageClient() {
               bodyFormat: 'text' as const,
               priority: (item.priority as 'low' | 'normal' | 'high' | 'urgent') ?? 'normal',
               sentAt: item.sentAt ? new Date(item.sentAt) : null,
-              senderName: item.senderName || item.senderEmail || item.senderUserId,
+              senderName: getMessageListParticipantLabel(item, folder, t),
               hasObjects: item.hasObjects,
               objectCount: item.objectCount,
               hasAttachments: item.hasAttachments,
               attachmentCount: item.attachmentCount,
+              recipientCount: item.recipientCount ?? 0,
               hasActions: item.hasActions,
               actionTaken: item.actionTaken ?? null,
               unread: item.status === 'unread',
@@ -333,7 +336,7 @@ export function MessagesInboxPageClient() {
         )
       },
     },
-  ], [listItemComponentKeyByType, messageTypeLabelMap, messageUiRegistry, router, t])
+  ], [folder, listItemComponentKeyByType, messageTypeLabelMap, messageUiRegistry, router, t])
 
   const folderOptions = React.useMemo(() => [
     { id: 'inbox' as const, label: t('messages.folder.inbox', 'Inbox'), icon: Inbox },

package/src/modules/messages/components/defaults/DefaultMessageListItem.tsx

@@ -31,7 +31,7 @@ function formatSentTime(value: Date | null): string {
 
 function truncateWords(value: string, maxWords: number): string {
   const normalized = value.trim().replace(/\s+/g, ' ')
-  if (!normalized) return '—'
+  if (!normalized) return ''
   const words = normalized.split(' ')
   if (words.length <= maxWords) return normalized
   return `${words.slice(0, maxWords).join(' ')}...`
@@ -39,8 +39,8 @@ function truncateWords(value: string, maxWords: number): string {
 
 export function DefaultMessageListItem({ message, onClick }: MessageListItemProps) {
   const t = useT()
-  const senderLabel = message.senderName || '—'
-  const subject = message.subject || '—'
+  const senderLabel = message.senderName?.trim() || t('messages.list.noRecipient', '(No recipient)')
+  const subject = message.subject.trim() || t('messages.list.noSubject', '(No subject)')
   const absoluteSentAt = formatDateTime(message.sentAt)
   const sentAtLabel = formatSentTime(message.sentAt)
   const bodyPreview = truncateWords(message.body || '', 16)
@@ -75,8 +75,12 @@ export function DefaultMessageListItem({ message, onClick }: MessageListItemProp
           <span className={cn('truncate text-foreground', message.unread ? 'font-semibold' : 'font-normal')}>
             {subject}
           </span>
-          <span className="text-muted-foreground">-</span>
-          <span className="truncate text-muted-foreground">{bodyPreview}</span>
+          {bodyPreview ? (
+            <>
+              <span className="text-muted-foreground">-</span>
+              <span className="truncate text-muted-foreground">{bodyPreview}</span>
+            </>
+          ) : null}
         </div>
 
         <div className="flex flex-shrink-0 items-center gap-1.5 text-muted-foreground">

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

@@ -0,0 +1,29 @@
+import type { MessageFolder } from './useMessagesInboxBulkActions'
+
+type Translate = (key: string, fallback: string, params?: Record<string, string | number>) => string
+
+type MessageParticipantSource = {
+  senderName?: string | null
+  senderEmail?: string | null
+  senderUserId: string
+  recipientCount?: number | null
+}
+
+function normalizeLabel(value: string | null | undefined): string | null {
+  const normalized = value?.trim()
+  return normalized ? normalized : null
+}
+
+export function getMessageListParticipantLabel(
+  item: MessageParticipantSource,
+  folder: MessageFolder,
+  t: Translate,
+): string {
+  if ((folder === 'sent' || folder === 'drafts') && Number(item.recipientCount ?? 0) <= 0) {
+    return t('messages.list.noRecipient', '(No recipient)')
+  }
+
+  return normalizeLabel(item.senderName)
+    ?? normalizeLabel(item.senderEmail)
+    ?? item.senderUserId
+}

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

@@ -13,7 +13,7 @@ import { toErrorMessage } from './message-detail/utils'
 
 export type MessageFolder = 'inbox' | 'sent' | 'drafts' | 'archived' | 'all'
 
-type MessageBulkActionId = 'markRead' | 'markUnread' | 'archive' | 'delete'
+export type MessageBulkActionId = 'markRead' | 'markUnread' | 'archive' | 'delete'
 
 type BulkExecutionSummary = {
   action: MessageBulkActionId
@@ -31,6 +31,13 @@ type MessageBulkRequestConfig = {
   errorFallback: string
 }
 
+type MessageBulkActionDefinition = {
+  id: string
+  labelKey: string
+  labelFallback: string
+  destructive?: boolean
+}
+
 type MessageInboxBulkMutationContext = {
   actionId: MessageBulkActionId
   messageIds: string[]
@@ -87,6 +94,42 @@ const MESSAGE_BULK_REQUESTS: Record<MessageBulkActionId, MessageBulkRequestConfi
   },
 }
 
+const MESSAGE_BULK_ACTIONS: Record<MessageBulkActionId, MessageBulkActionDefinition> = {
+  markRead: {
+    id: 'messages-mark-read',
+    labelKey: 'messages.actions.markRead',
+    labelFallback: 'Mark read',
+  },
+  markUnread: {
+    id: 'messages-mark-unread',
+    labelKey: 'messages.actions.markUnread',
+    labelFallback: 'Mark unread',
+  },
+  archive: {
+    id: 'messages-archive',
+    labelKey: 'messages.actions.archive',
+    labelFallback: 'Archive',
+  },
+  delete: {
+    id: 'messages-delete',
+    labelKey: 'messages.actions.delete',
+    labelFallback: 'Delete',
+    destructive: true,
+  },
+}
+
+const MESSAGE_BULK_ACTION_IDS_BY_FOLDER = {
+  inbox: ['markRead', 'markUnread', 'archive', 'delete'],
+  archived: ['markRead', 'markUnread', 'delete'],
+  sent: ['delete'],
+  drafts: ['delete'],
+  all: [],
+} satisfies Record<MessageFolder, readonly MessageBulkActionId[]>
+
+export function getMessageBulkActionIdsForFolder(folder: MessageFolder): MessageBulkActionId[] {
+  return [...MESSAGE_BULK_ACTION_IDS_BY_FOLDER[folder]]
+}
+
 function normalizeSelectionScopeValue(value: unknown): unknown {
   if (value == null) return undefined
   if (typeof value === 'string') {
@@ -287,31 +330,20 @@ export function useMessagesInboxBulkActions<T extends MessageInboxBulkRow>({
   }, [confirm, filterValues, folder, page, queryClient, retryLastMutation, runMutation, search, t])
 
   const bulkActions = React.useMemo<BulkAction<T>[] | undefined>(
-    () => folder === 'inbox'
-      ? [
-          {
-            id: 'messages-mark-read',
-            label: t('messages.actions.markRead', 'Mark read'),
-            onExecute: (selectedRows: T[]) => executeBulkAction('markRead', selectedRows),
-          },
-          {
-            id: 'messages-mark-unread',
-            label: t('messages.actions.markUnread', 'Mark unread'),
-            onExecute: (selectedRows: T[]) => executeBulkAction('markUnread', selectedRows),
-          },
-          {
-            id: 'messages-archive',
-            label: t('messages.actions.archive', 'Archive'),
-            onExecute: (selectedRows: T[]) => executeBulkAction('archive', selectedRows),
-          },
-          {
-            id: 'messages-delete',
-            label: t('messages.actions.delete', 'Delete'),
-            destructive: true,
-            onExecute: (selectedRows: T[]) => executeBulkAction('delete', selectedRows),
-          },
-        ]
-      : undefined,
+    () => {
+      const actionIds = getMessageBulkActionIdsForFolder(folder)
+      if (actionIds.length === 0) return undefined
+
+      return actionIds.map((actionId) => {
+        const action = MESSAGE_BULK_ACTIONS[actionId]
+        return {
+          id: action.id,
+          label: t(action.labelKey, action.labelFallback),
+          destructive: action.destructive,
+          onExecute: (selectedRows: T[]) => executeBulkAction(actionId, selectedRows),
+        }
+      })
+    },
     [executeBulkAction, folder, t],
   )
 

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

@@ -159,6 +159,8 @@
   "messages.forwardNote": "Optionale Notiz",
   "messages.includeAttachments": "Anhänge einschließen",
   "messages.includeAttachmentsHint": "Anhänge aus der Originalnachricht übernehmen.",
+  "messages.list.noRecipient": "(Kein Empfänger)",
+  "messages.list.noSubject": "(Kein Betreff)",
   "messages.loading.attachments": "Anhänge werden geladen...",
   "messages.loading.detail": "Nachricht wird geladen...",
   "messages.loading.objectTypes": "Objekttypen werden geladen...",

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

@@ -159,6 +159,8 @@
   "messages.forwardNote": "Optional note",
   "messages.includeAttachments": "Include attachments",
   "messages.includeAttachmentsHint": "Carry over attachments from the original message.",
+  "messages.list.noRecipient": "(No recipient)",
+  "messages.list.noSubject": "(No subject)",
   "messages.loading.attachments": "Loading attachments...",
   "messages.loading.detail": "Loading message...",
   "messages.loading.objectTypes": "Loading object types...",

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

@@ -159,6 +159,8 @@
   "messages.forwardNote": "Nota opcional",
   "messages.includeAttachments": "Incluir adjuntos",
   "messages.includeAttachmentsHint": "Conservar adjuntos del mensaje original.",
+  "messages.list.noRecipient": "(Sin destinatario)",
+  "messages.list.noSubject": "(Sin asunto)",
   "messages.loading.attachments": "Cargando adjuntos...",
   "messages.loading.detail": "Cargando mensaje...",
   "messages.loading.objectTypes": "Cargando tipos de objeto...",

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

@@ -159,6 +159,8 @@
   "messages.forwardNote": "Notatka opcjonalna",
   "messages.includeAttachments": "Dołącz załączniki",
   "messages.includeAttachmentsHint": "Przenieś załączniki z oryginalnej wiadomości.",
+  "messages.list.noRecipient": "(Brak odbiorcy)",
+  "messages.list.noSubject": "(Brak tematu)",
   "messages.loading.attachments": "Ładowanie załączników...",
   "messages.loading.detail": "Ładowanie wiadomości...",
   "messages.loading.objectTypes": "Ładowanie typów obiektów...",