@open-mercato/ui 0.6.2-develop.3461.1.605f31c2c9 → 0.6.2

package/src/backend/detail/AttachmentMetadataDialog.tsx

@@ -533,7 +533,7 @@ export function AttachmentMetadataDialog({ open, onOpenChange, item, availableTa
                   {item.fileName}
                 </div>
                 <div className="text-xs text-muted-foreground">
-                  {formatFileSize(item.fileSize)} \u2022 {item.partitionTitle ?? item.partitionCode}
+                  {formatFileSize(item.fileSize)} {'\u2022'} {item.partitionTitle ?? item.partitionCode}
                 </div>
               </div>
               {downloadUrl ? (

package/src/backend/detail/InlineEditors.tsx

@@ -17,7 +17,7 @@ import { Textarea } from '@open-mercato/ui/primitives/textarea'
 import { DatePicker } from '@open-mercato/ui/primitives/date-picker'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { cn } from '@open-mercato/shared/lib/utils'
-import { format } from 'date-fns'
+import { format } from 'date-fns/format'
 import { LoadingMessage } from './LoadingMessage'
 import { mapCrudServerErrorToFormErrors } from '../utils/serverErrors'
 import { MarkdownPreview } from '../markdown'

package/src/backend/injection/__tests__/useAppEvent.test.ts

@@ -0,0 +1,16 @@
+import { matchesPattern } from '../useAppEvent'
+
+describe('matchesPattern', () => {
+  it('matches DOM event wildcard patterns without regex execution', () => {
+    expect(matchesPattern('*', 'customers.person.created')).toBe(true)
+    expect(matchesPattern('customers.person.*', 'customers.person.created')).toBe(true)
+    expect(matchesPattern('customers.*.created', 'customers.person.created')).toBe(true)
+    expect(matchesPattern('sales.*', 'customers.person.created')).toBe(false)
+  })
+
+  it('treats regex metacharacters as literal event characters', () => {
+    expect(matchesPattern('customers.(person).*', 'customers.(person).created')).toBe(true)
+    expect(matchesPattern('customers.+.*', 'customers.person.created')).toBe(false)
+  })
+})
+

package/src/backend/injection/useAppEvent.ts

@@ -1,6 +1,7 @@
 "use client"
 import { useEffect, useRef } from 'react'
 import type { AppEventPayload } from '@open-mercato/shared/modules/widgets/injection'
+import { matchWildcardPattern } from '@open-mercato/shared/lib/patterns/wildcard'
 
 /**
  * DOM Event Bridge event name.
@@ -23,15 +24,7 @@ export const APP_EVENT_DOM_NAME = 'om:event'
  * matchesPattern('*', 'anything.here') // true
  */
 export function matchesPattern(pattern: string, eventId: string): boolean {
-  if (pattern === '*') return true
-  if (!pattern.includes('*')) return pattern === eventId
-  const escapedPattern = pattern
-    .replace(/[|\\{}()[\]^$+?.]/g, '\\$&')
-    .replace(/\*/g, '.*')
-  const regex = new RegExp(
-    '^' + escapedPattern + '$',
-  )
-  return regex.test(eventId)
+  return matchWildcardPattern(eventId, pattern)
 }
 
 /**

package/src/backend/injection/widgetRegistry.ts

@@ -1,5 +1,6 @@
 import type { ModuleInjectionWidgetEntry } from '@open-mercato/shared/modules/registry'
 import type { InjectionWidgetModule } from '@open-mercato/shared/modules/widgets/injection'
+import { applyInjectionWidgetOverridesToEntries } from '@open-mercato/shared/modules/overrides'
 
 type Entry = ModuleInjectionWidgetEntry
 
@@ -10,7 +11,7 @@ export function registerInjectionWidgets(entries: Entry[]) {
   if (_injectionWidgetEntries !== null && process.env.NODE_ENV === 'development') {
     console.debug('[Bootstrap] Injection widgets re-registered (this may occur during HMR)')
   }
-  _injectionWidgetEntries = entries
+  _injectionWidgetEntries = applyInjectionWidgetOverridesToEntries(entries)
 }
 
 export function getInjectionWidgets(): Entry[] {

package/src/backend/messages/__tests__/MessageComposer.test.tsx

@@ -121,6 +121,78 @@ describe('MessageComposer draft flow', () => {
     expect(flash).toHaveBeenCalledWith('Draft saved.', 'success')
   })
 
+  it('sends an existing draft via PATCH with isDraft=false', async () => {
+    renderWithProviders(
+      <MessageComposer
+        inline
+        variant="compose"
+        messageId="draft-1"
+        defaultValues={{
+          recipients: ['11111111-1111-4111-8111-111111111111'],
+          subject: 'Existing draft',
+          body: 'Existing draft body',
+        }}
+      />,
+      { dict: {} },
+    )
+
+    fireEvent.click(await screen.findByRole('button', { name: 'Send' }))
+
+    await waitFor(() => {
+      expect(apiCall).toHaveBeenCalledWith(
+        '/api/messages/draft-1',
+        expect.objectContaining({
+          method: 'PATCH',
+        }),
+      )
+    })
+
+    const updateRequest = (apiCall as jest.Mock).mock.calls.find(
+      (call) => call[0] === '/api/messages/draft-1' && call[1]?.method === 'PATCH',
+    )
+    const payload = JSON.parse(updateRequest?.[1]?.body ?? '{}') as Record<string, unknown>
+    expect(payload.isDraft).toBe(false)
+    expect(payload.recipients).toEqual([{ userId: '11111111-1111-4111-8111-111111111111', type: 'to' }])
+    expect(flash).toHaveBeenCalledWith('Message sent.', 'success')
+  })
+
+  it('saves an existing draft via PATCH without a draft transition flag', async () => {
+    renderWithProviders(
+      <MessageComposer
+        inline
+        variant="compose"
+        messageId="draft-1"
+        defaultValues={{
+          subject: 'Existing draft',
+          body: 'Existing draft body',
+        }}
+      />,
+      { dict: {} },
+    )
+
+    fireEvent.click(await screen.findByRole('button', { name: 'Save draft' }))
+
+    await waitFor(() => {
+      expect(apiCall).toHaveBeenCalledWith(
+        '/api/messages/draft-1',
+        expect.objectContaining({
+          method: 'PATCH',
+        }),
+      )
+    })
+
+    const updateRequest = (apiCall as jest.Mock).mock.calls.find(
+      (call) => call[0] === '/api/messages/draft-1' && call[1]?.method === 'PATCH',
+    )
+    const payload = JSON.parse(updateRequest?.[1]?.body ?? '{}') as Record<string, unknown>
+    expect(payload).not.toHaveProperty('isDraft')
+    expect(payload).toEqual(expect.objectContaining({
+      subject: 'Existing draft',
+      body: 'Existing draft body',
+    }))
+    expect(flash).toHaveBeenCalledWith('Draft saved.', 'success')
+  })
+
   it('keeps the send action disabled after a successful compose submit until the composer resets', async () => {
     let resolveMessagePost!: (value: {
       ok: boolean
@@ -342,6 +414,11 @@ describe('MessageComposer draft flow', () => {
     await waitFor(() => {
       expect(apiCall).toHaveBeenCalledWith(
         expect.stringMatching(/^\/api\/auth\/users\?/),
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            'x-om-forbidden-redirect': '0',
+          }),
+        }),
       )
     })
   })

package/src/backend/messages/useMessageCompose.ts

@@ -16,6 +16,8 @@ import {
   useComposeSendOperation,
   useForwardSubmitOperation,
   useReplySubmitOperation,
+  useSendDraftOperation,
+  useUpdateDraftOperation,
 } from './useMessageComposeOperations'
 
 function toErrorMessage(payload: unknown): string | null {
@@ -410,7 +412,17 @@ export function useMessageCompose({
     params.set('pageSize', '100')
     // Recipient lookup is filtered in TagsInput because incremental auth user search is unreliable.
 
-    const call = await apiCall<{ items?: UserListItem[] }>(`/api/auth/users?${params.toString()}`)
+    const call = await apiCall<{ items?: UserListItem[] }>(
+      `/api/auth/users?${params.toString()}`,
+      {
+        headers: {
+          'x-om-forbidden-redirect': '0',
+        },
+      },
+    ).catch(() => null)
+    if (!call) {
+      return []
+    }
     if (!call.ok) {
       return []
     }
@@ -477,6 +489,7 @@ export function useMessageCompose({
 
   const composeDraftOperation = useComposeDraftOperation({
     t,
+    messageId,
     messageType,
     priority,
     visibility,
@@ -514,16 +527,59 @@ export function useMessageCompose({
     sendViaEmail,
   })
 
+  const sendDraftOperation = useSendDraftOperation({
+    t,
+    messageId: messageId ?? '',
+    messageType,
+    priority,
+    visibility,
+    externalEmail,
+    recipientIds,
+    subject,
+    body,
+    bodyFormat,
+    sendViaEmail,
+    contextObject,
+    defaultValues,
+    contextActionOptions,
+    normalizedRequiredActionMode,
+    shouldShowContextActions,
+    contextActionRequired,
+    contextActionType,
+  })
+
+  const updateDraftOperation = useUpdateDraftOperation({
+    t,
+    messageId: messageId ?? '',
+    messageType,
+    priority,
+    visibility,
+    externalEmail,
+    recipientIds,
+    subject,
+    body,
+    bodyFormat,
+    sendViaEmail,
+    contextObject,
+    defaultValues,
+    contextActionOptions,
+    normalizedRequiredActionMode,
+    shouldShowContextActions,
+    contextActionRequired,
+    contextActionType,
+  })
+
   const handleSubmit = React.useCallback(async ({ saveAsDraft = false }: { saveAsDraft?: boolean } = {}) => {
     if (submitting) return false
 
     setSubmitError(null)
 
+    const isEditingExistingDraft = variant === 'compose' && Boolean(messageId)
     const isComposeDraftSubmit = saveAsDraft && variant === 'compose'
     const operation = isComposeDraftSubmit
-      ? composeDraftOperation
+      ? (isEditingExistingDraft ? updateDraftOperation : composeDraftOperation)
       : variant === 'compose'
-        ? composeSendOperation
+        ? (isEditingExistingDraft ? sendDraftOperation : composeSendOperation)
         : variant === 'reply'
           ? replyOperation
           : forwardOperation
@@ -556,10 +612,10 @@ export function useMessageCompose({
       }
 
       if (!shouldReturnFalse) {
-        const { endpoint, payload } = operation.buildRequest({ attachmentIds: nextAttachmentIds })
+        const { endpoint, method, payload } = operation.buildRequest({ attachmentIds: nextAttachmentIds })
 
         const call = await apiCall<{ id?: string }>(endpoint, {
-          method: 'POST',
+          method,
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify(payload),
         })
@@ -612,11 +668,14 @@ export function useMessageCompose({
     forwardOperation,
     inline,
     loadAttachmentIds,
+    messageId,
     onOpenChange,
     onSuccess,
     replyOperation,
+    sendDraftOperation,
     submitting,
     t,
+    updateDraftOperation,
     variant,
   ])
 

package/src/backend/messages/useMessageComposeOperations.ts

@@ -16,6 +16,7 @@ type MessageRecipient = {
 
 type SubmitRequest = {
   endpoint: string
+  method: 'POST' | 'PATCH'
   payload: Record<string, unknown>
 }
 
@@ -67,6 +68,7 @@ type ForwardOperationParams = {
 }
 
 type DraftOperationParams = Omit<ComposeOperationParams, 'createableMessageTypes'>
+  & { messageId?: string }
 
 function isValidEmailAddress(value: string): boolean {
   const email = value.trim()
@@ -182,6 +184,7 @@ export function useComposeSendOperation(params: ComposeOperationParams): BaseOpe
     },
     buildRequest: ({ attachmentIds }) => ({
       endpoint: '/api/messages',
+      method: 'POST',
       payload: buildComposePayload(params, { attachmentIds, isDraft: false }),
     }),
     successMessage: params.t('messages.flash.sentSuccess', 'Message sent.'),
@@ -192,10 +195,24 @@ export function useComposeSendOperation(params: ComposeOperationParams): BaseOpe
 export function useComposeDraftOperation(params: DraftOperationParams): BaseOperation {
   return React.useMemo(() => ({
     validate: () => null,
-    buildRequest: ({ attachmentIds }) => ({
-      endpoint: '/api/messages',
-      payload: buildComposePayload(params, { attachmentIds, isDraft: true }),
-    }),
+    buildRequest: ({ attachmentIds }) => {
+      const payload = buildComposePayload(params, { attachmentIds, isDraft: true })
+      if (!params.messageId) {
+        return {
+          endpoint: '/api/messages',
+          method: 'POST',
+          payload,
+        }
+      }
+
+      const draftUpdatePayload = { ...payload }
+      delete draftUpdatePayload.isDraft
+      return {
+        endpoint: `/api/messages/${encodeURIComponent(params.messageId)}`,
+        method: 'PATCH',
+        payload: draftUpdatePayload,
+      }
+    },
     successMessage: params.t('messages.flash.draftSaved', 'Draft saved.'),
     requiresAttachmentRefresh: true,
   }), [params])
@@ -214,6 +231,7 @@ export function useReplySubmitOperation(params: ReplyOperationParams): BaseOpera
     },
     buildRequest: ({ attachmentIds }) => ({
       endpoint: `/api/messages/${encodeURIComponent(params.messageId ?? '')}/reply`,
+      method: 'POST',
       payload: {
         body: params.body,
         bodyFormat: params.bodyFormat,
@@ -244,6 +262,7 @@ export function useForwardSubmitOperation(params: ForwardOperationParams): BaseO
     },
     buildRequest: () => ({
       endpoint: `/api/messages/${encodeURIComponent(params.messageId ?? '')}/forward`,
+      method: 'POST',
       payload: {
         recipients: mapRecipients(params.recipientIds),
         body: params.body,
@@ -256,4 +275,51 @@ export function useForwardSubmitOperation(params: ForwardOperationParams): BaseO
   }), [params])
 }
 
+type SendDraftOperationParams = DraftOperationParams & { messageId: string }
+
+export function useSendDraftOperation(params: SendDraftOperationParams): BaseOperation {
+  return React.useMemo(() => ({
+    validate: () => {
+      if (params.visibility !== 'public' && params.recipientIds.length === 0) {
+        return params.t('messages.errors.noRecipients', 'Please add at least one recipient.')
+      }
+      if (params.visibility === 'public' && !isValidEmailAddress(params.externalEmail.trim())) {
+        return params.t('messages.errors.noExternalEmail', 'Please enter a valid external email.')
+      }
+      if (!params.subject.trim()) {
+        return params.t('messages.errors.noSubject', 'Please enter a subject.')
+      }
+      if (!params.body.trim()) {
+        return params.t('messages.errors.noBody', 'Please enter a message.')
+      }
+      return null
+    },
+    buildRequest: ({ attachmentIds }) => ({
+      endpoint: `/api/messages/${encodeURIComponent(params.messageId)}`,
+      method: 'PATCH' as const,
+      payload: buildComposePayload(params, { attachmentIds, isDraft: false }),
+    }),
+    successMessage: params.t('messages.flash.sentSuccess', 'Message sent.'),
+    requiresAttachmentRefresh: true,
+  }), [params])
+}
+
+type UpdateDraftOperationParams = DraftOperationParams & { messageId: string }
+
+export function useUpdateDraftOperation(params: UpdateDraftOperationParams): BaseOperation {
+  return React.useMemo(() => ({
+    validate: () => null,
+    buildRequest: ({ attachmentIds }) => {
+      const { isDraft: _omit, ...payload } = buildComposePayload(params, { attachmentIds, isDraft: true })
+      return {
+        endpoint: `/api/messages/${encodeURIComponent(params.messageId)}`,
+        method: 'PATCH' as const,
+        payload,
+      }
+    },
+    successMessage: params.t('messages.flash.draftSaved', 'Draft saved.'),
+    requiresAttachmentRefresh: true,
+  }), [params])
+}
+
 export type MessageComposeSubmitOperation = BaseOperation

package/src/backend/schedule/ScheduleCalendar.tsx

@@ -2,7 +2,17 @@
 
 import * as React from 'react'
 import { Calendar, dateFnsLocalizer, type View, type SlotInfo } from 'react-big-calendar'
-import { addDays, differenceInCalendarDays, endOfDay, endOfMonth, endOfWeek, format, getDay, parse, startOfDay, startOfMonth, startOfWeek } from 'date-fns'
+import { addDays } from 'date-fns/addDays'
+import { differenceInCalendarDays } from 'date-fns/differenceInCalendarDays'
+import { endOfDay } from 'date-fns/endOfDay'
+import { endOfMonth } from 'date-fns/endOfMonth'
+import { endOfWeek } from 'date-fns/endOfWeek'
+import { format } from 'date-fns/format'
+import { getDay } from 'date-fns/getDay'
+import { parse } from 'date-fns/parse'
+import { startOfDay } from 'date-fns/startOfDay'
+import { startOfMonth } from 'date-fns/startOfMonth'
+import { startOfWeek } from 'date-fns/startOfWeek'
 import { enUS } from 'date-fns/locale/en-US'
 import type { ScheduleItem, ScheduleRange, ScheduleSlot, ScheduleViewMode } from './types'
 import { Button } from '../../primitives/button'

package/src/backend/schedule/ScheduleToolbar.tsx

@@ -6,7 +6,17 @@ import { Input } from '../../primitives/input'
 import type { ScheduleRange, ScheduleViewMode } from './types'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { addDays, addMonths, addWeeks, differenceInCalendarDays, endOfDay, endOfMonth, endOfWeek, format, startOfDay, startOfMonth, startOfWeek } from 'date-fns'
+import { addDays } from 'date-fns/addDays'
+import { addMonths } from 'date-fns/addMonths'
+import { addWeeks } from 'date-fns/addWeeks'
+import { differenceInCalendarDays } from 'date-fns/differenceInCalendarDays'
+import { endOfDay } from 'date-fns/endOfDay'
+import { endOfMonth } from 'date-fns/endOfMonth'
+import { endOfWeek } from 'date-fns/endOfWeek'
+import { format } from 'date-fns/format'
+import { startOfDay } from 'date-fns/startOfDay'
+import { startOfMonth } from 'date-fns/startOfMonth'
+import { startOfWeek } from 'date-fns/startOfWeek'
 import { enUS } from 'date-fns/locale/en-US'
 import { ChevronLeft, ChevronRight } from 'lucide-react'
 

package/src/primitives/calendar.tsx

@@ -4,8 +4,8 @@ import * as React from 'react'
 import { DayPicker, useDayPicker } from 'react-day-picker'
 import type { DayPickerProps, CalendarMonth } from 'react-day-picker'
 import { ChevronLeft, ChevronRight } from 'lucide-react'
-import { format } from 'date-fns'
-import type { Locale } from 'date-fns'
+import { format } from 'date-fns/format'
+import type { Locale } from 'date-fns/locale'
 import { cn } from '@open-mercato/shared/lib/utils'
 
 export type CalendarProps = DayPickerProps

package/src/primitives/date-format.ts

@@ -1,5 +1,5 @@
-import { format as formatDateFns } from 'date-fns'
-import type { Locale } from 'date-fns'
+import { format as formatDateFns } from 'date-fns/format'
+import type { Locale } from 'date-fns/locale'
 
 type LocaleLike = Locale | string | null | undefined
 

package/src/primitives/date-picker-helpers.ts

@@ -1,12 +1,10 @@
-import {
-  startOfDay,
-  endOfDay,
-  startOfMonth,
-  startOfYear,
-  subDays,
-  subMonths,
-  subYears,
-} from 'date-fns'
+import { endOfDay } from 'date-fns/endOfDay'
+import { startOfDay } from 'date-fns/startOfDay'
+import { startOfMonth } from 'date-fns/startOfMonth'
+import { startOfYear } from 'date-fns/startOfYear'
+import { subDays } from 'date-fns/subDays'
+import { subMonths } from 'date-fns/subMonths'
+import { subYears } from 'date-fns/subYears'
 import type { DateRange } from '../backend/date-range/dateRanges'
 
 export type DateRangePresetItem = {

package/src/primitives/date-picker.tsx

@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from 'react'
-import type { Locale } from 'date-fns'
+import type { Locale } from 'date-fns/locale'
 import { CalendarIcon } from 'lucide-react'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -233,7 +233,7 @@ export function DatePicker({
           onSelect={handleDaySelect}
           locale={locale}
           disabled={disabledMatcher}
-          initialFocus
+          autoFocus
         />
         {withTime && (
           <div className="flex items-center gap-2 border-t px-3 py-2">

package/src/primitives/date-range-picker.tsx

@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from 'react'
-import type { Locale } from 'date-fns'
+import type { Locale } from 'date-fns/locale'
 import { CalendarIcon } from 'lucide-react'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -244,7 +244,7 @@ export function DateRangePicker({
               locale={locale}
               disabled={disabledMatcher}
               numberOfMonths={numberOfMonths}
-              initialFocus
+              autoFocus
             />
           </div>
         </div>