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

package/src/modules/customers/components/detail/ActivityTimeline.tsx

@@ -18,7 +18,7 @@ const TYPE_ICONS: Record<string, React.ComponentType<{ className?: string }>> =
 interface ActivityTimelineProps {
   activities: InteractionSummary[]
   onEdit?: (activity: InteractionSummary) => void
-  onMarkDone?: (activityId: string) => void | Promise<void>
+  onMarkDone?: (activityId: string, updatedAt?: string | null) => void | Promise<void>
 }
 
 export function ActivityTimeline({ activities, onEdit, onMarkDone }: ActivityTimelineProps) {
@@ -77,7 +77,7 @@ function TimelineEntry({
   t: TranslateFn
   withBorder: boolean
   onEdit?: (activity: InteractionSummary) => void
-  onMarkDone?: (activityId: string) => void | Promise<void>
+  onMarkDone?: (activityId: string, updatedAt?: string | null) => void | Promise<void>
 }) {
   const dateStr = activity.scheduledAt ?? activity.occurredAt ?? activity.createdAt
   const TypeIcon = TYPE_ICONS[activity.interactionType]
@@ -91,7 +91,7 @@ function TimelineEntry({
     if (!onMarkDone || markingDone) return
     setMarkingDone(true)
     try {
-      await onMarkDone(activity.id)
+      await onMarkDone(activity.id, activity.updatedAt)
     } finally {
       setMarkingDone(false)
     }

package/src/modules/customers/components/detail/AddressesSection.tsx

@@ -107,6 +107,7 @@ export function AddressesSection({
       const response = await apiCallOrThrow<Record<string, unknown>>(
         '/api/customers/addresses',
         {
+          // optimistic-lock-exempt: address link add/remove sub-resource
           method: 'POST',
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({
@@ -123,6 +124,7 @@ export function AddressesSection({
       await apiCallOrThrow(
         '/api/customers/addresses',
         {
+          // optimistic-lock-exempt: address link add/remove sub-resource
           method: 'PUT',
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({
@@ -138,6 +140,7 @@ export function AddressesSection({
       await apiCallOrThrow(
         '/api/customers/addresses',
         {
+          // optimistic-lock-exempt: address link add/remove sub-resource
           method: 'DELETE',
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({ id }),
@@ -170,6 +173,7 @@ export function AddressesSection({
       const response = await apiCallOrThrow<Record<string, unknown>>(
         '/api/customers/dictionaries/address-types',
         {
+          // optimistic-lock-exempt: address-type dictionary create-only
           method: 'POST',
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({ value }),

package/src/modules/customers/components/detail/AnnualRevenueField.tsx

@@ -249,6 +249,7 @@ export function AnnualRevenueField({
               allowInlineCreate={false}
               allowAppearance={false}
               selectClassName="w-full"
+              sortOptions="none"
               disabled={currencyDictionaryLoading}
               showLabelInput={false}
             />

package/src/modules/customers/components/detail/CompanyPeopleSection.tsx

@@ -360,6 +360,7 @@ export function CompanyPeopleSection({
         for (const personId of addedIds) {
           await runWriteMutation(
             () =>
+              // optimistic-lock-exempt: person-company link add/remove
               apiCallOrThrow(
                 `/api/customers/people/${encodeURIComponent(personId)}/companies`,
                 {
@@ -514,6 +515,7 @@ export function CompanyPeopleSection({
       try {
         await runWriteMutation(
           () =>
+            // optimistic-lock-exempt: person-company link add/remove
             apiCallOrThrow(
               `/api/customers/people/${encodeURIComponent(personId)}/companies/${encodeURIComponent(companyId)}`,
               { method: 'DELETE' },

package/src/modules/customers/components/detail/ComposeEmailDialog.tsx

@@ -0,0 +1,329 @@
+'use client'
+
+import * as React from 'react'
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@open-mercato/ui/primitives/dialog'
+import { Button } from '@open-mercato/ui/primitives/button'
+import { Input } from '@open-mercato/ui/primitives/input'
+import { Label } from '@open-mercato/ui/primitives/label'
+import { Textarea } from '@open-mercato/ui/primitives/textarea'
+import { RadioGroup } from '@open-mercato/ui/primitives/radio'
+import { RadioField } from '@open-mercato/ui/primitives/radio-field'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@open-mercato/ui/primitives/select'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+
+export interface ComposeEmailChannel {
+  id: string
+  displayName: string
+  externalIdentifier?: string | null
+  providerKey: 'gmail' | 'imap' | string
+  isPrimary?: boolean
+}
+
+export interface ComposeEmailValues {
+  userChannelId: string
+  to: string[]
+  cc?: string[]
+  bcc?: string[]
+  subject: string
+  body: string
+  bodyFormat: 'text' | 'html'
+  visibility: 'private' | 'shared'
+  inReplyTo?: string
+  references?: string[]
+  /** When replying, the messages.message id of the parent so the reply joins its thread. */
+  parentMessageId?: string
+}
+
+export interface ComposeEmailDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  defaultRecipient?: string | null
+  channels: ComposeEmailChannel[]
+  replyTo?: {
+    inReplyTo?: string
+    references?: string[]
+    to: string[]
+    cc?: string[]
+    subject: string
+    parentMessageId?: string
+  } | null
+  onSend: (values: ComposeEmailValues) => Promise<{ messageId: string | null }>
+}
+
+function parseRecipients(raw: string): string[] {
+  return raw
+    .split(/[,;\s]+/)
+    .map((s) => s.trim())
+    .filter(Boolean)
+}
+
+function defaultChannelId(channels: ComposeEmailChannel[]): string {
+  const primary = channels.find((c) => c.isPrimary)
+  return primary?.id ?? channels[0]?.id ?? ''
+}
+
+/** Single source of truth for the dialog's seeded form values (reply prefill, default recipient, primary channel). */
+function deriveComposeInitialState(
+  replyTo: ComposeEmailDialogProps['replyTo'],
+  defaultRecipient: string | null | undefined,
+  channels: ComposeEmailChannel[],
+): { to: string; cc: string; showCc: boolean; subject: string; channelId: string } {
+  const cc = replyTo?.cc && replyTo.cc.length > 0 ? replyTo.cc.join(', ') : ''
+  return {
+    to: replyTo ? replyTo.to.join(', ') : (defaultRecipient ?? ''),
+    cc,
+    showCc: Boolean(cc),
+    subject: replyTo?.subject ?? '',
+    channelId: defaultChannelId(channels),
+  }
+}
+
+export function ComposeEmailDialog({
+  open,
+  onOpenChange,
+  channels,
+  defaultRecipient,
+  replyTo,
+  onSend,
+}: ComposeEmailDialogProps) {
+  const t = useT()
+
+  const initial = React.useMemo(
+    () => deriveComposeInitialState(replyTo, defaultRecipient, channels),
+    [replyTo, defaultRecipient, channels],
+  )
+
+  const [to, setTo] = React.useState(initial.to)
+  const [showCc, setShowCc] = React.useState(initial.showCc)
+  const [cc, setCc] = React.useState(initial.cc)
+  const [subject, setSubject] = React.useState(initial.subject)
+  const [body, setBody] = React.useState('')
+  const [visibility, setVisibility] = React.useState<'private' | 'shared'>('private')
+  const [channelId, setChannelId] = React.useState(initial.channelId)
+  const [busy, setBusy] = React.useState(false)
+  const [error, setError] = React.useState<string | null>(null)
+
+  // Reset the form whenever the dialog (re)opens or its seed inputs change.
+  React.useEffect(() => {
+    if (!open) return
+    const next = deriveComposeInitialState(replyTo, defaultRecipient, channels)
+    setTo(next.to)
+    setCc(next.cc)
+    setShowCc(next.showCc)
+    setSubject(next.subject)
+    setBody('')
+    setVisibility('private')
+    setChannelId(next.channelId)
+    setError(null)
+    setBusy(false)
+  }, [open, replyTo, defaultRecipient, channels])
+
+  const toList = React.useMemo(() => parseRecipients(to), [to])
+  const isSendDisabled =
+    busy ||
+    toList.length === 0 ||
+    subject.trim().length === 0 ||
+    body.trim().length === 0 ||
+    !channelId
+
+  const handleSend = React.useCallback(async () => {
+    setError(null)
+    setBusy(true)
+    try {
+      const ccList = showCc ? parseRecipients(cc) : undefined
+      const values: ComposeEmailValues = {
+        userChannelId: channelId,
+        to: toList,
+        cc: ccList && ccList.length > 0 ? ccList : undefined,
+        subject: subject.trim(),
+        body: body.trim(),
+        bodyFormat: 'text',
+        visibility,
+        inReplyTo: replyTo?.inReplyTo,
+        references: replyTo?.references,
+        parentMessageId: replyTo?.parentMessageId,
+      }
+      await onSend(values)
+      onOpenChange(false)
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err)
+      setError(message)
+    } finally {
+      setBusy(false)
+    }
+  }, [showCc, cc, channelId, toList, subject, body, visibility, replyTo, onSend, onOpenChange])
+
+  const handleKeyDown = React.useCallback(
+    (event: React.KeyboardEvent) => {
+      if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
+        if (!isSendDisabled) {
+          void handleSend()
+        }
+      }
+    },
+    [isSendDisabled, handleSend],
+  )
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-2xl" onKeyDown={handleKeyDown}>
+        <DialogHeader>
+          <DialogTitle>
+            {replyTo
+              ? t('customers.email.compose.replyTitle', 'Reply')
+              : t('customers.email.compose.title', 'Compose email')}
+          </DialogTitle>
+        </DialogHeader>
+
+        <div className="flex flex-col gap-4">
+          {/* To */}
+          <div className="flex flex-col gap-1.5">
+            <div className="flex items-center justify-between">
+              <Label htmlFor="compose-to">
+                {t('customers.email.compose.to', 'To')}
+              </Label>
+              {!showCc && (
+                <Button
+                  type="button"
+                  variant="link"
+                  size="2xs"
+                  className="text-muted-foreground hover:text-foreground"
+                  onClick={() => setShowCc(true)}
+                  aria-label={t('customers.email.compose.addCc.ariaLabel', 'Add Cc recipients')}
+                >
+                  {t('customers.email.compose.addCc', '+ Cc')}
+                </Button>
+              )}
+            </div>
+            <Input
+              id="compose-to"
+              value={to}
+              onChange={(e) => setTo(e.target.value)}
+              placeholder={t('customers.email.compose.toPlaceholder', 'recipient@example.com')}
+              autoComplete="off"
+            />
+          </div>
+
+          {/* Cc (collapsible) */}
+          {showCc && (
+            <div className="flex flex-col gap-1.5">
+              <Label htmlFor="compose-cc">
+                {t('customers.email.compose.cc', 'Cc')}
+              </Label>
+              <Input
+                id="compose-cc"
+                value={cc}
+                onChange={(e) => setCc(e.target.value)}
+                placeholder={t('customers.email.compose.ccPlaceholder', 'cc@example.com')}
+                autoComplete="off"
+              />
+            </div>
+          )}
+
+          {/* Subject */}
+          <div className="flex flex-col gap-1.5">
+            <Label htmlFor="compose-subject">
+              {t('customers.email.compose.subject', 'Subject')}
+            </Label>
+            <Input
+              id="compose-subject"
+              value={subject}
+              onChange={(e) => setSubject(e.target.value)}
+              placeholder={t('customers.email.compose.subjectPlaceholder', 'Email subject')}
+            />
+          </div>
+
+          {/* Body */}
+          <div className="flex flex-col gap-1.5">
+            <Label htmlFor="compose-body">
+              {t('customers.email.compose.body', 'Body')}
+            </Label>
+            <Textarea
+              id="compose-body"
+              value={body}
+              onChange={(e) => setBody(e.target.value)}
+              placeholder={t('customers.email.compose.bodyPlaceholder', 'Write your message...')}
+              rows={8}
+            />
+          </div>
+
+          {/* Visibility */}
+          <div className="flex flex-col gap-2">
+            <Label>
+              {t('customers.email.compose.visibility', 'Visibility')}
+            </Label>
+            <RadioGroup
+              value={visibility}
+              onValueChange={(val) => setVisibility(val as 'private' | 'shared')}
+              className="flex flex-row gap-4"
+            >
+              <RadioField
+                value="private"
+                label={t('customers.email.compose.visibilityPrivate', 'Private to me')}
+              />
+              <RadioField
+                value="shared"
+                label={t('customers.email.compose.visibilityShared', 'Visible to teammates')}
+              />
+            </RadioGroup>
+          </div>
+
+          {/* Send as (channel selector) */}
+          {channels.length > 0 && (
+            <div className="flex flex-col gap-1.5">
+              <Label htmlFor="compose-channel">
+                {t('customers.email.compose.sendAs', 'Send as')}
+              </Label>
+              <Select value={channelId} onValueChange={setChannelId}>
+                <SelectTrigger id="compose-channel">
+                  <SelectValue placeholder={t('customers.email.compose.selectChannel', 'Select account')} />
+                </SelectTrigger>
+                <SelectContent>
+                  {channels.map((ch) => (
+                    <SelectItem key={ch.id} value={ch.id}>
+                      {ch.displayName}
+                      {ch.externalIdentifier ? ` (${ch.externalIdentifier})` : ''}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          )}
+
+          {/* Inline error */}
+          {error && (
+            <p className="text-sm text-status-error-text" role="alert">
+              {error}
+            </p>
+          )}
+        </div>
+
+        <DialogFooter>
+          <Button
+            type="button"
+            variant="outline"
+            onClick={() => onOpenChange(false)}
+            disabled={busy}
+          >
+            {t('customers.email.compose.cancel', 'Cancel')}
+          </Button>
+          <Button
+            type="button"
+            onClick={() => void handleSend()}
+            disabled={isSendDisabled}
+          >
+            {busy
+              ? t('customers.email.compose.sending', 'Sending...')
+              : t('customers.email.compose.send', 'Send')}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}

package/src/modules/customers/components/detail/DealForm.tsx

@@ -805,11 +805,12 @@ export function DealForm({
       label: t('customers.people.detail.deals.fields.pipeline', 'Pipeline'),
       type: 'custom',
       layout: 'half',
-      component: ({ value, setValue }) => (
+      component: ({ value, setValue, setFormValue }) => (
         <Select
           value={typeof value === 'string' && value ? value : undefined}
           onValueChange={(next) => {
             setValue(next ?? '')
+            setFormValue?.('pipelineStageId', '')
             loadStagesForPipeline(next ?? '').catch(() => {})
           }}
           disabled={disabled}
@@ -869,6 +870,7 @@ export function DealForm({
             allowInlineCreate={false}
             allowAppearance={false}
             selectClassName="w-full"
+            sortOptions="none"
             disabled={disabled}
             showLabelInput={false}
           />

package/src/modules/customers/components/detail/DealsSection.tsx

@@ -226,6 +226,14 @@ function normalizeDeal(deal: Partial<DealSummary> & { id: string; title?: string
     status: typeof deal.status === 'string' ? deal.status : deal.status ?? null,
     pipelineStage:
       typeof deal.pipelineStage === 'string' ? deal.pipelineStage : deal.pipelineStage ?? null,
+    pipelineId:
+      typeof deal.pipelineId === 'string' && deal.pipelineId.trim().length
+        ? deal.pipelineId.trim()
+        : deal.pipelineId ?? null,
+    pipelineStageId:
+      typeof deal.pipelineStageId === 'string' && deal.pipelineStageId.trim().length
+        ? deal.pipelineStageId.trim()
+        : deal.pipelineStageId ?? null,
     valueAmount: toNumber(deal.valueAmount ?? null),
     valueCurrency:
       typeof deal.valueCurrency === 'string' && deal.valueCurrency.trim().length
@@ -413,6 +421,18 @@ export function DealsSection({
             : typeof record.pipeline_stage === 'string' && record.pipeline_stage.trim().length
               ? record.pipeline_stage.trim()
               : null
+        const pipelineId =
+          typeof record.pipelineId === 'string' && record.pipelineId.trim().length
+            ? record.pipelineId.trim()
+            : typeof record.pipeline_id === 'string' && record.pipeline_id.trim().length
+              ? record.pipeline_id.trim()
+              : null
+        const pipelineStageId =
+          typeof record.pipelineStageId === 'string' && record.pipelineStageId.trim().length
+            ? record.pipelineStageId.trim()
+            : typeof record.pipeline_stage_id === 'string' && record.pipeline_stage_id.trim().length
+              ? record.pipeline_stage_id.trim()
+              : null
         const valueAmount = toNumber(record.valueAmount ?? record.value_amount)
         const valueCurrencyRaw = record.valueCurrency ?? record.value_currency ?? null
         const valueCurrency =
@@ -494,6 +514,8 @@ export function DealsSection({
           title,
           status,
           pipelineStage,
+          pipelineId,
+          pipelineStageId,
           valueAmount,
           valueCurrency,
           probability,
@@ -629,6 +651,7 @@ export function DealsSection({
               : currentCompanyIds
           await runWriteMutation(
             () =>
+              // optimistic-lock-exempt: deal association list (link)
               updateCrud(
                 'customers/deals',
                 { id: dealId, personIds: nextPersonIds, companyIds: nextCompanyIds },
@@ -662,6 +685,7 @@ export function DealsSection({
               : currentCompanyIds
           await runWriteMutation(
             () =>
+              // optimistic-lock-exempt: deal association list (unlink)
               updateCrud(
                 'customers/deals',
                 { id: dealId, personIds: nextPersonIds, companyIds: nextCompanyIds },
@@ -727,6 +751,8 @@ export function DealsSection({
           title: base.title,
           status: base.status ?? undefined,
           pipelineStage: base.pipelineStage ?? undefined,
+          pipelineId: base.pipelineId ?? undefined,
+          pipelineStageId: base.pipelineStageId ?? undefined,
           valueAmount: typeof base.valueAmount === 'number' ? base.valueAmount : undefined,
           valueCurrency: base.valueCurrency ?? undefined,
           probability: typeof base.probability === 'number' ? base.probability : undefined,
@@ -738,6 +764,7 @@ export function DealsSection({
         if (Object.keys(custom).length) payload.customFields = custom
         const { result } = await runWriteMutation(
           () =>
+            // optimistic-lock-exempt: deal create-only, no prior version
             createCrud<{ id?: string }>('customers/deals', payload, {
               errorMessage: translate('customers.people.detail.deals.error', 'Failed to save deal.'),
             }),
@@ -761,6 +788,8 @@ export function DealsSection({
             title: base.title,
             status: base.status ?? null,
             pipelineStage: base.pipelineStage ?? null,
+            pipelineId: base.pipelineId ?? null,
+            pipelineStageId: base.pipelineStageId ?? null,
             valueAmount: base.valueAmount ?? null,
             valueCurrency: base.valueCurrency ?? null,
             probability: base.probability ?? null,
@@ -822,6 +851,7 @@ export function DealsSection({
         }
         await runWriteMutation(
           () =>
+            // optimistic-lock-exempt: deal association list (unlink)
             updateCrud('customers/deals', payload, {
               errorMessage: translate('customers.people.detail.deals.unlinkError', 'Failed to unlink deal.'),
             }),