@open-mercato/core 0.6.4-develop.3929.1.fcf7afece2 → 0.6.4-develop.3944.1.4100aa7fbe

package/src/modules/customers/components/detail/create/dealCustomFieldControl.tsx

@@ -0,0 +1,310 @@
+"use client"
+
+import * as React from 'react'
+import { format } from 'date-fns/format'
+import { parseISO } from 'date-fns/parseISO'
+import type { CrudField, CrudFieldOption } from '@open-mercato/ui/backend/CrudForm'
+import { Label } from '@open-mercato/ui/primitives/label'
+import { Input } from '@open-mercato/ui/primitives/input'
+import { Textarea } from '@open-mercato/ui/primitives/textarea'
+import { CheckboxField } from '@open-mercato/ui/primitives/checkbox-field'
+import { DatePicker } from '@open-mercato/ui/primitives/date-picker'
+import { TagInput } from '@open-mercato/ui/primitives/tag-input'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@open-mercato/ui/primitives/select'
+import { Checkbox } from '@open-mercato/ui/primitives/checkbox'
+
+export type DealCustomFieldControlProps = {
+  field: CrudField
+  value: unknown
+  onChange: (value: unknown) => void
+  error?: string
+  disabled?: boolean
+}
+
+const SELECT_CLEAR_SENTINEL = '__deal_custom_field_select_clear__'
+
+function toStringArray(value: unknown): string[] {
+  if (!Array.isArray(value)) return []
+  return value.filter((item): item is string => typeof item === 'string')
+}
+
+function toDate(value: unknown): Date | null {
+  if (value instanceof Date) return value
+  if (typeof value === 'string' && value) {
+    const parsed = parseISO(value)
+    return Number.isNaN(parsed.getTime()) ? null : parsed
+  }
+  return null
+}
+
+function useResolvedOptions(field: CrudField): CrudFieldOption[] {
+  const builtin = field.type === 'custom' ? null : field
+  const staticOptions = builtin?.options
+  const loadOptions = builtin?.loadOptions
+  const [loadedOptions, setLoadedOptions] = React.useState<CrudFieldOption[]>([])
+
+  React.useEffect(() => {
+    if (staticOptions && staticOptions.length > 0) return
+    if (typeof loadOptions !== 'function') return
+    let cancelled = false
+    loadOptions()
+      .then((options) => {
+        if (!cancelled) setLoadedOptions(options)
+      })
+      .catch(() => {
+        if (!cancelled) setLoadedOptions([])
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [staticOptions, loadOptions])
+
+  if (staticOptions && staticOptions.length > 0) return staticOptions
+  return loadedOptions
+}
+
+function FieldShell({
+  label,
+  required,
+  description,
+  error,
+  children,
+}: {
+  label: string
+  required?: boolean
+  description?: React.ReactNode
+  error?: string
+  children: React.ReactNode
+}) {
+  const fieldId = React.useId()
+  const control = React.isValidElement(children)
+    ? React.cloneElement(children as React.ReactElement<{ id?: string }>, { id: fieldId })
+    : children
+  return (
+    <div className="space-y-1">
+      {label.trim().length > 0 ? (
+        <Label htmlFor={fieldId}>
+          {label}
+          {required ? <span className="text-destructive"> *</span> : null}
+        </Label>
+      ) : null}
+      {control}
+      {description ? <p className="text-xs text-muted-foreground">{description}</p> : null}
+      {error ? <p className="text-xs text-status-error-text">{error}</p> : null}
+    </div>
+  )
+}
+
+export function DealCustomFieldControl({
+  field,
+  value,
+  onChange,
+  error,
+  disabled = false,
+}: DealCustomFieldControlProps) {
+  const options = useResolvedOptions(field)
+  const ariaInvalid = error ? true : undefined
+
+  if (field.type === 'checkbox') {
+    return (
+      <div className="space-y-1">
+        <CheckboxField
+          label={field.label}
+          description={field.description}
+          checked={value === true}
+          onCheckedChange={(next) => onChange(next === true)}
+          disabled={disabled}
+          aria-invalid={ariaInvalid}
+        />
+        {error ? <p className="text-xs text-status-error-text">{error}</p> : null}
+      </div>
+    )
+  }
+
+  if (field.type === 'custom') {
+    return (
+      <FieldShell
+        label={field.label}
+        required={field.required}
+        description={field.description}
+        error={error}
+      >
+        {field.component({
+          id: field.id,
+          value,
+          error,
+          setValue: onChange,
+          disabled,
+          autoFocus: false,
+        })}
+      </FieldShell>
+    )
+  }
+
+  let control: React.ReactNode
+
+  switch (field.type) {
+    case 'number':
+      control = (
+        <Input
+          type="number"
+          inputMode="numeric"
+          value={typeof value === 'number' || typeof value === 'string' ? String(value) : ''}
+          placeholder={field.placeholder}
+          disabled={disabled}
+          aria-invalid={ariaInvalid}
+          onChange={(event) => {
+            const raw = event.target.value
+            if (raw === '') {
+              onChange(undefined)
+              return
+            }
+            const parsed = Number(raw)
+            onChange(Number.isNaN(parsed) ? raw : parsed)
+          }}
+        />
+      )
+      break
+    case 'date':
+    case 'datepicker':
+      control = (
+        <DatePicker
+          value={toDate(value)}
+          onChange={(date) => onChange(date ? format(date, 'yyyy-MM-dd') : undefined)}
+          disabled={disabled}
+          placeholder={field.placeholder}
+          aria-invalid={ariaInvalid}
+        />
+      )
+      break
+    case 'datetime':
+    case 'datetime-local':
+      control = (
+        <DatePicker
+          withTime
+          value={toDate(value)}
+          onChange={(date) => onChange(date ? date.toISOString() : undefined)}
+          disabled={disabled}
+          placeholder={field.placeholder}
+          aria-invalid={ariaInvalid}
+        />
+      )
+      break
+    case 'tags':
+      control = (
+        <TagInput
+          value={toStringArray(value)}
+          onChange={(next) => onChange(next)}
+          placeholder={field.placeholder}
+          disabled={disabled}
+          aria-invalid={ariaInvalid}
+        />
+      )
+      break
+    case 'richtext':
+      control = (
+        <Textarea
+          value={value == null ? '' : String(value)}
+          placeholder={field.placeholder}
+          disabled={disabled}
+          aria-invalid={ariaInvalid}
+          onChange={(event) => onChange(event.target.value)}
+        />
+      )
+      break
+    case 'select': {
+      if (field.multiple) {
+        const selected = toStringArray(value)
+        control = (
+          <div className="flex flex-wrap gap-3">
+            {options.map((option) => {
+              const checked = selected.includes(option.value)
+              return (
+                <label key={option.value} className="inline-flex cursor-pointer items-center gap-2">
+                  <Checkbox
+                    checked={checked}
+                    disabled={disabled}
+                    onCheckedChange={(state) => {
+                      const next = new Set(selected)
+                      if (state === true) next.add(option.value)
+                      else next.delete(option.value)
+                      onChange(Array.from(next))
+                    }}
+                  />
+                  <span className="text-sm">{option.label}</span>
+                </label>
+              )
+            })}
+          </div>
+        )
+      } else {
+        const selectedValue = Array.isArray(value)
+          ? String(value[0] ?? '')
+          : value == null
+            ? ''
+            : String(value)
+        control = (
+          <Select
+            value={selectedValue}
+            disabled={disabled}
+            onValueChange={(next) => {
+              if (!next || next === SELECT_CLEAR_SENTINEL) {
+                onChange(null)
+                return
+              }
+              onChange(next)
+            }}
+          >
+            <SelectTrigger aria-invalid={ariaInvalid}>
+              <SelectValue placeholder={field.placeholder} />
+            </SelectTrigger>
+            <SelectContent>
+              {!field.required && selectedValue ? (
+                <SelectItem value={SELECT_CLEAR_SENTINEL}>—</SelectItem>
+              ) : null}
+              {options
+                .filter((option) => option.value !== '')
+                .map((option) => (
+                  <SelectItem key={option.value} value={option.value}>
+                    {option.label}
+                  </SelectItem>
+                ))}
+            </SelectContent>
+          </Select>
+        )
+      }
+      break
+    }
+    case 'text':
+    default:
+      control = (
+        <Input
+          value={value == null ? '' : String(value)}
+          placeholder={field.placeholder}
+          disabled={disabled}
+          aria-invalid={ariaInvalid}
+          onChange={(event) => onChange(event.target.value)}
+        />
+      )
+      break
+  }
+
+  return (
+    <FieldShell
+      label={field.label}
+      required={field.required}
+      description={field.description}
+      error={error}
+    >
+      {control}
+    </FieldShell>
+  )
+}
+
+export default DealCustomFieldControl

package/src/modules/customers/components/detail/create/dealFormTypes.ts

@@ -0,0 +1,29 @@
+export type Translate = (key: string, fallback: string, params?: Record<string, string | number>) => string
+
+export type BaseValues = {
+  title: string
+  status: string
+  pipelineId: string
+  pipelineStageId: string
+  valueAmount: string
+  valueCurrency: string
+  probability: string
+  expectedCloseAt: string
+  description: string
+  personIds: string[]
+  companyIds: string[]
+}
+
+export const EMPTY_VALUES: BaseValues = {
+  title: '',
+  status: '',
+  pipelineId: '',
+  pipelineStageId: '',
+  valueAmount: '',
+  valueCurrency: '',
+  probability: '',
+  expectedCloseAt: '',
+  description: '',
+  personIds: [],
+  companyIds: [],
+}

package/src/modules/customers/components/detail/create/dealNumericInput.ts

@@ -0,0 +1,20 @@
+/**
+ * Input sanitizers for the deal create form's numeric fields. They guarantee the
+ * underlying state only ever holds a valid numeric string (or empty), so non-numeric
+ * input can never reach the zod schema and surface a raw "expected number" type error.
+ */
+
+/** Keep only digits and a single decimal point; strips letters, signs, and extra dots. */
+export function sanitizeAmount(raw: string): string {
+  const cleaned = raw.replace(/[^\d.]/g, '')
+  const firstDot = cleaned.indexOf('.')
+  if (firstDot === -1) return cleaned
+  return cleaned.slice(0, firstDot + 1) + cleaned.slice(firstDot + 1).replace(/\./g, '')
+}
+
+/** Digits only, clamped to 0–100, so probability is always a valid percentage. */
+export function sanitizeProbability(raw: string): string {
+  const digits = raw.replace(/\D/g, '')
+  if (!digits) return ''
+  return String(Math.min(100, Number(digits)))
+}

package/src/modules/customers/components/detail/create/useDealCustomFields.ts

@@ -0,0 +1,118 @@
+"use client"
+
+import * as React from 'react'
+import {
+  validateValuesAgainstDefs,
+  type CustomFieldDefLike,
+} from '@open-mercato/shared/modules/entities/validation'
+import type { CrudField } from '@open-mercato/ui/backend/CrudForm'
+import type { CustomFieldDefDto } from '@open-mercato/ui/backend/utils/customFieldDefs'
+import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
+import { normalizeCustomFieldSubmitValue } from '../customFieldUtils'
+import type { DealCustomAttributesLoadState } from './DealCustomAttributes'
+import type { Translate } from './dealFormTypes'
+
+function isEmptyCustomFieldValue(field: CrudField, value: unknown): boolean {
+  if (value === undefined || value === null) return true
+  if (typeof value === 'string') return value.trim() === ''
+  if (Array.isArray(value)) return value.length === 0
+  return field.type === 'checkbox' && value !== true
+}
+
+function mapCustomDefinitionsForValidation(definitions: CustomFieldDefDto[]): CustomFieldDefLike[] {
+  return definitions.map((definition) => ({
+    key: definition.key,
+    kind: definition.kind,
+    configJson: {
+      validation: Array.isArray(definition.validation) ? definition.validation : [],
+    },
+  }))
+}
+
+export type UseDealCustomFieldsResult = {
+  customValues: Record<string, unknown>
+  customFieldsLoaded: boolean
+  customCount: number
+  handleCustomChange: (key: string, value: unknown) => void
+  handleCustomAttributesLoaded: (state: DealCustomAttributesLoadState) => void
+  validateCustomFields: (source: Record<string, unknown>) => Record<string, string>
+  collectNormalizedCustomValues: (source: Record<string, unknown>) => Record<string, unknown>
+}
+
+export function useDealCustomFields(tr: Translate): UseDealCustomFieldsResult {
+  const [customValues, setCustomValues] = React.useState<Record<string, unknown>>({})
+  const [customFields, setCustomFields] = React.useState<CrudField[]>([])
+  const [customDefinitions, setCustomDefinitions] = React.useState<CustomFieldDefDto[]>([])
+  const [customFieldsLoaded, setCustomFieldsLoaded] = React.useState(false)
+  const [customCount, setCustomCount] = React.useState(0)
+  const customDefaultsAppliedRef = React.useRef(false)
+
+  const handleCustomChange = React.useCallback((key: string, value: unknown) => {
+    setCustomValues((current) => ({ ...current, [key]: value }))
+  }, [])
+
+  const handleCustomAttributesLoaded = React.useCallback((state: DealCustomAttributesLoadState) => {
+    setCustomFields(state.fields)
+    setCustomDefinitions(state.definitions)
+    setCustomFieldsLoaded(true)
+    setCustomCount(state.fields.length)
+
+    if (customDefaultsAppliedRef.current || state.definitions.length === 0) return
+    customDefaultsAppliedRef.current = true
+    setCustomValues((current) => {
+      let changed = false
+      const next = { ...current }
+      for (const definition of state.definitions) {
+        if (definition.defaultValue === undefined || definition.defaultValue === null) continue
+        const fieldId = `cf_${definition.key}`
+        if (next[fieldId] !== undefined) continue
+        next[fieldId] = definition.defaultValue
+        changed = true
+      }
+      return changed ? next : current
+    })
+  }, [])
+
+  const collectNormalizedCustomValues = React.useCallback((source: Record<string, unknown>) =>
+    collectCustomFieldValues(source, {
+      transform: (value) => normalizeCustomFieldSubmitValue(value),
+    }), [])
+
+  const validateCustomFields = React.useCallback((source: Record<string, unknown>) => {
+    const fieldErrors: Record<string, string> = {}
+    const requiredMessage = tr('ui.forms.errors.required', 'Required')
+
+    for (const field of customFields) {
+      if (!field.required) continue
+      if (isEmptyCustomFieldValue(field, source[field.id])) {
+        fieldErrors[field.id] = requiredMessage
+      }
+    }
+
+    if (customDefinitions.length > 0) {
+      const result = validateValuesAgainstDefs(
+        collectNormalizedCustomValues(source),
+        mapCustomDefinitionsForValidation(customDefinitions),
+      )
+      if (!result.ok) {
+        for (const [fieldId, message] of Object.entries(result.fieldErrors)) {
+          if (!fieldErrors[fieldId]) fieldErrors[fieldId] = tr(message, message)
+        }
+      }
+    }
+
+    return fieldErrors
+  }, [collectNormalizedCustomValues, customDefinitions, customFields, tr])
+
+  return {
+    customValues,
+    customFieldsLoaded,
+    customCount,
+    handleCustomChange,
+    handleCustomAttributesLoaded,
+    validateCustomFields,
+    collectNormalizedCustomValues,
+  }
+}
+
+export default useDealCustomFields

package/src/modules/customers/components/detail/create/useDealPipelines.ts

@@ -0,0 +1,80 @@
+"use client"
+
+import * as React from 'react'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+
+export type PipelineOption = {
+  id: string
+  name: string
+  isDefault: boolean
+}
+
+export type PipelineStageOption = {
+  id: string
+  label: string
+  order: number
+}
+
+export type UseDealPipelinesResult = {
+  pipelines: PipelineOption[]
+  stages: PipelineStageOption[]
+  loadStages: (pipelineId: string) => Promise<void>
+}
+
+export function useDealPipelines(): UseDealPipelinesResult {
+  const [pipelines, setPipelines] = React.useState<PipelineOption[]>([])
+  const [stages, setStages] = React.useState<PipelineStageOption[]>([])
+  const mountedRef = React.useRef(true)
+
+  React.useEffect(() => {
+    mountedRef.current = true
+    return () => {
+      mountedRef.current = false
+    }
+  }, [])
+
+  React.useEffect(() => {
+    let cancelled = false
+    ;(async () => {
+      try {
+        const call = await apiCall<{ items: PipelineOption[] }>('/api/customers/pipelines')
+        if (cancelled || !mountedRef.current) return
+        if (call.ok && call.result?.items) {
+          setPipelines(call.result.items)
+        }
+      } catch {
+        if (!cancelled && mountedRef.current) setPipelines([])
+      }
+    })().catch(() => {
+      // The inner try/catch already resets pipelines on failure; this guards the IIFE promise only.
+    })
+    return () => {
+      cancelled = true
+    }
+  }, [])
+
+  const loadStages = React.useCallback(async (pipelineId: string) => {
+    if (!pipelineId) {
+      if (mountedRef.current) setStages([])
+      return
+    }
+    try {
+      const call = await apiCall<{ items: PipelineStageOption[] }>(
+        `/api/customers/pipeline-stages?pipelineId=${encodeURIComponent(pipelineId)}`,
+      )
+      if (!mountedRef.current) return
+      if (call.ok && call.result?.items) {
+        const sorted = [...call.result.items].sort((a, b) => a.order - b.order)
+        setStages(sorted)
+      } else {
+        setStages([])
+      }
+    } catch {
+      if (mountedRef.current) setStages([])
+    }
+  }, [])
+
+  return { pipelines, stages, loadStages }
+}
+
+export default useDealPipelines

package/src/modules/customers/components/formConfig.tsx

@@ -113,6 +113,7 @@ type DictionarySelectFieldProps = {
   allowAppearance?: boolean
   showManage?: boolean
   showLabelInput?: boolean
+  showActiveAppearance?: boolean
 }
 
 const emailValidationSchema = z.string().email()
@@ -141,6 +142,7 @@ export function DictionarySelectField({
   allowAppearance = false,
   showManage = false,
   showLabelInput = true,
+  showActiveAppearance = true,
 }: DictionarySelectFieldProps) {
   const t = useT()
   const queryClient = useQueryClient()
@@ -237,6 +239,7 @@ export function DictionarySelectField({
       allowAppearance={allowAppearance}
       showManage={showManage}
       showLabelInput={showLabelInput}
+      showActiveAppearance={showActiveAppearance}
     />
   )
 }

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

@@ -665,8 +665,34 @@
   "customers.deal_analyzer.sheet.dock": "Seitlich andocken",
   "customers.deal_analyzer.sheet.title": "Deal-Analyse",
   "customers.deal_analyzer.sheet.welcomeTitle": "Deal-Analyse",
+  "customers.deals.create.associations.companiesPlaceholder": "Unternehmen nach Name oder Domain suchen…",
+  "customers.deals.create.associations.peoplePlaceholder": "Personen nach Name oder E-Mail suchen…",
+  "customers.deals.create.back": "Zurück zu Deals",
+  "customers.deals.create.cancel": "Abbrechen",
   "customers.deals.create.error": "Deal konnte nicht erstellt werden.",
+  "customers.deals.create.fields.datePlaceholder": "Datum auswählen",
+  "customers.deals.create.fields.expectedCloseAt": "Voraussichtliches Abschlussdatum",
+  "customers.deals.create.fields.probability": "Wahrscheinlichkeit",
+  "customers.deals.create.fields.stageOf": "· Phase {position} von {total}",
+  "customers.deals.create.fields.title": "Deal-Titel",
+  "customers.deals.create.fields.valueAmount": "Deal-Wert",
+  "customers.deals.create.hints.pipelineStage": "Die Phasen hängen von der ausgewählten Pipeline ab",
+  "customers.deals.create.hints.probability": "0 – 100 %, für den gewichteten Pipeline-Wert verwendet",
+  "customers.deals.create.hints.title": "Kurzer, aussagekräftiger Name auf den Pipeline-Karten",
+  "customers.deals.create.hints.valueAmount": "Potenzieller Umsatz aus dieser Opportunity",
+  "customers.deals.create.sections.associations.subtitle": "Personen und Unternehmen mit diesem Deal verknüpfen",
+  "customers.deals.create.sections.associations.title": "Verknüpfungen",
+  "customers.deals.create.sections.custom.empty": "Noch keine benutzerdefinierten Felder für Deals definiert.",
+  "customers.deals.create.sections.custom.loading": "Benutzerdefinierte Felder werden geladen…",
+  "customers.deals.create.sections.custom.manage": "Felder verwalten",
+  "customers.deals.create.sections.custom.subtitle": "{count} Felder für diesen Mandanten definiert",
+  "customers.deals.create.sections.custom.title": "Benutzerdefinierte Attribute",
+  "customers.deals.create.sections.details.subtitle": "Wichtigste Opportunity-Infos",
   "customers.deals.create.submit": "Deal erstellen",
+  "customers.deals.create.tips.item1": "Verwenden Sie im Titel das Format Firmenname + kurzes Ergebnis (z. B. \"Copperleaf — Q3 Renewal\")",
+  "customers.deals.create.tips.item2": "Legen Sie die Wahrscheinlichkeit nach Pipeline-Phase fest: Qualifizierung 10-25 %, Angebot 30-50 %, Verhandlung 50-75 %, Vertrag 75-90 %",
+  "customers.deals.create.tips.item3": "Verknüpfen Sie den wichtigsten Entscheider als erste Person — er erhält standardmäßig die E-Mail-CC bei Aktivitäten",
+  "customers.deals.create.tips.title": "Tipps für bessere Deals",
   "customers.deals.create.title": "Deal erstellen",
   "customers.deals.detail.actions.apply": "Apply",
   "customers.deals.detail.actions.backToList": "Zurück zu Deals",

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

@@ -665,8 +665,34 @@
   "customers.deal_analyzer.sheet.dock": "Dock to side",
   "customers.deal_analyzer.sheet.title": "Deal Analyzer",
   "customers.deal_analyzer.sheet.welcomeTitle": "Deal Analyzer",
+  "customers.deals.create.associations.companiesPlaceholder": "Search companies by name or domain…",
+  "customers.deals.create.associations.peoplePlaceholder": "Search people by name or email…",
+  "customers.deals.create.back": "Back to deals",
+  "customers.deals.create.cancel": "Cancel",
   "customers.deals.create.error": "Failed to create deal.",
+  "customers.deals.create.fields.datePlaceholder": "Pick a date",
+  "customers.deals.create.fields.expectedCloseAt": "Expected close date",
+  "customers.deals.create.fields.probability": "Probability",
+  "customers.deals.create.fields.stageOf": "· stage {position} of {total}",
+  "customers.deals.create.fields.title": "Deal title",
+  "customers.deals.create.fields.valueAmount": "Deal value",
+  "customers.deals.create.hints.pipelineStage": "Stages depend on the selected pipeline",
+  "customers.deals.create.hints.probability": "0 – 100%, used for weighted pipeline value",
+  "customers.deals.create.hints.title": "Short, descriptive name shown on pipeline cards",
+  "customers.deals.create.hints.valueAmount": "Potential revenue from this opportunity",
+  "customers.deals.create.sections.associations.subtitle": "Link people and companies to this deal",
+  "customers.deals.create.sections.associations.title": "Associations",
+  "customers.deals.create.sections.custom.empty": "No custom fields defined for deals yet.",
+  "customers.deals.create.sections.custom.loading": "Loading custom fields…",
+  "customers.deals.create.sections.custom.manage": "Manage fields",
+  "customers.deals.create.sections.custom.subtitle": "{count} fields defined for this tenant",
+  "customers.deals.create.sections.custom.title": "Custom attributes",
+  "customers.deals.create.sections.details.subtitle": "Core opportunity info",
   "customers.deals.create.submit": "Create deal",
+  "customers.deals.create.tips.item1": "Use the company name + short deliverable format in the title (e.g. \"Copperleaf — Q3 Renewal\")",
+  "customers.deals.create.tips.item2": "Set probability based on pipeline stage: Qual 10-25%, Proposal 30-50%, Negotiation 50-75%, Contract 75-90%",
+  "customers.deals.create.tips.item3": "Link primary decision maker as first person — they get default email CC on activities",
+  "customers.deals.create.tips.title": "Tips for better deals",
   "customers.deals.create.title": "Create deal",
   "customers.deals.detail.actions.apply": "Apply",
   "customers.deals.detail.actions.backToList": "Back to deals",